style: update current todo style

2025-12-24 00:52:00 +00:00
715 changed files with 15097 additions and 110272 deletions
@@ -1,4 +0,0 @@
 # web + desktop packages
 packages/app/      @adamdotdevin
 packages/tauri/    @adamdotdevin
 packages/desktop/  @adamdotdevin
@@ -11,14 +11,6 @@ body:
    validations:
      required: true
  - type: input
    id: plugins
    attributes:
      label: Plugins
      description: What plugins are you using?
    validations:
      required: false
  - type: input
    id: opencode-version
    attributes:
@@ -1,3 +0,0 @@
 ### What does this PR do?
 ### How did you verify your code works?
@@ -5,9 +5,6 @@ on:
    - cron: "0 */12 * * *"
  workflow_dispatch:
 env:
  LOOKBACK_HOURS: 4
 jobs:
  update-docs:
    if: github.repository == 'sst/opencode'
@@ -28,9 +25,9 @@ jobs:
      - name: Get recent commits
        id: commits
        run: |
-          COMMITS=$(git log --since="${{ env.LOOKBACK_HOURS }} hours ago" --pretty=format:"- %h %s" 2>/dev/null || echo "")
+          COMMITS=$(git log --since="4 hours ago" --pretty=format:"- %h %s" 2>/dev/null || echo "")
          if [ -z "$COMMITS" ]; then
-            echo "No commits in the last ${{ env.LOOKBACK_HOURS }} hours"
+            echo "No commits in the last 4 hours"
            echo "has_commits=false" >> $GITHUB_OUTPUT
          else
            echo "has_commits=true" >> $GITHUB_OUTPUT
@@ -50,7 +47,7 @@ jobs:
          model: opencode/gpt-5.2
          agent: docs
          prompt: |
-            Review the following commits from the last ${{ env.LOOKBACK_HOURS }} hours and identify any new features that may need documentation.
+            Review the following commits from the last 4 hours and identify any new features that may need documentation.
            <recent_commits>
            ${{ steps.commits.outputs.list }}
@@ -28,8 +28,8 @@ jobs:
          OPENCODE_PERMISSION: |
            {
              "bash": {
-                "*": "deny",
+                "gh issue*": "allow",
-                "gh issue*": "allow"
+                "*": "deny"
              },
              "webfetch": "deny"
            }
@@ -1,65 +0,0 @@
 name: Duplicate PR Check
 on:
  pull_request_target:
    types: [opened]
 jobs:
  check-duplicates:
    if: |
      github.event.pull_request.user.login != 'actions-user' &&
      github.event.pull_request.user.login != 'opencode' &&
      github.event.pull_request.user.login != 'rekram1-node' &&
      github.event.pull_request.user.login != 'thdxr' &&
      github.event.pull_request.user.login != 'kommander' &&
      github.event.pull_request.user.login != 'jayair' &&
      github.event.pull_request.user.login != 'fwang' &&
      github.event.pull_request.user.login != 'adamdotdevin' &&
      github.event.pull_request.user.login != 'iamdavidhill' &&
      github.event.pull_request.user.login != 'opencode-agent[bot]'
    runs-on: blacksmith-4vcpu-ubuntu-2404
    permissions:
      contents: read
      pull-requests: write
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
        with:
          fetch-depth: 1
      - name: Setup Bun
        uses: ./.github/actions/setup-bun
      - name: Install dependencies
        run: bun install
      - name: Install opencode
        run: curl -fsSL https://opencode.ai/install | bash
      - name: Build prompt
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          PR_NUMBER: ${{ github.event.pull_request.number }}
        run: |
          {
            echo "Check for duplicate PRs related to this new PR:"
            echo ""
            echo "CURRENT_PR_NUMBER: $PR_NUMBER"
            echo ""
            echo "Title: $(gh pr view "$PR_NUMBER" --json title --jq .title)"
            echo ""
            echo "Description:"
            gh pr view "$PR_NUMBER" --json body --jq .body
          } > pr_info.txt
      - name: Check for duplicate PRs
        env:
          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          PR_NUMBER: ${{ github.event.pull_request.number }}
        run: |
          COMMENT=$(bun script/duplicate-pr.ts -f pr_info.txt "Check the attached file for PR details and search for duplicates")
          gh pr comment "$PR_NUMBER" --body "_The following comment was made by an LLM, it may be inaccurate:_
          $COMMENT"
@@ -1,46 +0,0 @@
 name: nix desktop
 on:
  push:
    branches: [dev]
    paths:
      - "flake.nix"
      - "flake.lock"
      - "nix/**"
      - "packages/app/**"
      - "packages/desktop/**"
      - ".github/workflows/nix-desktop.yml"
  pull_request:
    paths:
      - "flake.nix"
      - "flake.lock"
      - "nix/**"
      - "packages/app/**"
      - "packages/desktop/**"
      - ".github/workflows/nix-desktop.yml"
  workflow_dispatch:
 jobs:
  build-desktop:
    strategy:
      fail-fast: false
      matrix:
        os:
          - blacksmith-4vcpu-ubuntu-2404
          - blacksmith-4vcpu-ubuntu-2404-arm
          - macos-15-intel
          - macos-latest
    runs-on: ${{ matrix.os }}
    timeout-minutes: 60
    steps:
      - name: Checkout repository
        uses: actions/checkout@v6
      - name: Setup Nix
        uses: nixbuild/nix-quick-install-action@v34
      - name: Build desktop via flake
        run: |
          set -euo pipefail
          nix --version
          nix build .#desktop -L
@@ -26,7 +26,7 @@ jobs:
      - uses: ./.github/actions/setup-bun
      - name: Run opencode
-        uses: anomalyco/opencode/github@latest
+        uses: sst/opencode/github@latest
        env:
          OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
          OPENCODE_PERMISSION: '{"bash": "deny"}'
@@ -1,139 +0,0 @@
 name: PR Standards
 on:
  pull_request_target:
    types: [opened, edited, synchronize]
 jobs:
  check-standards:
    if: |
      github.event.pull_request.user.login != 'actions-user' &&
      github.event.pull_request.user.login != 'opencode' &&
      github.event.pull_request.user.login != 'rekram1-node' &&
      github.event.pull_request.user.login != 'thdxr' &&
      github.event.pull_request.user.login != 'kommander' &&
      github.event.pull_request.user.login != 'jayair' &&
      github.event.pull_request.user.login != 'fwang' &&
      github.event.pull_request.user.login != 'adamdotdevin' &&
      github.event.pull_request.user.login != 'iamdavidhill' &&
      github.event.pull_request.user.login != 'opencode-agent[bot]'
    runs-on: ubuntu-latest
    permissions:
      pull-requests: write
    steps:
      - name: Check PR standards
        uses: actions/github-script@v7
        with:
          script: |
            const pr = context.payload.pull_request;
            const title = pr.title;
            async function addLabel(label) {
              await github.rest.issues.addLabels({
                owner: context.repo.owner,
                repo: context.repo.repo,
                issue_number: pr.number,
                labels: [label]
              });
            }
            async function removeLabel(label) {
              try {
                await github.rest.issues.removeLabel({
                  owner: context.repo.owner,
                  repo: context.repo.repo,
                  issue_number: pr.number,
                  name: label
                });
              } catch (e) {
                // Label wasn't present, ignore
              }
            }
            async function comment(marker, body) {
              const markerText = `<!-- pr-standards:${marker} -->`;
              const { data: comments } = await github.rest.issues.listComments({
                owner: context.repo.owner,
                repo: context.repo.repo,
                issue_number: pr.number
              });
              const existing = comments.find(c => c.body.includes(markerText));
              if (existing) return;
              await github.rest.issues.createComment({
                owner: context.repo.owner,
                repo: context.repo.repo,
                issue_number: pr.number,
                body: markerText + '\n' + body
              });
            }
            // Step 1: Check title format
            // Matches: feat:, feat(scope):, feat (scope):, etc.
            const titlePattern = /^(feat|fix|docs|chore|refactor|test)\s*(\([a-zA-Z0-9-]+\))?\s*:/;
            const hasValidTitle = titlePattern.test(title);
            if (!hasValidTitle) {
              await addLabel('needs:title');
              await comment('title', `Hey! Your PR title \`${title}\` doesn't follow conventional commit format.
            Please update it to start with one of:
            - \`feat:\` or \`feat(scope):\` new feature
            - \`fix:\` or \`fix(scope):\` bug fix
            - \`docs:\` or \`docs(scope):\` documentation changes
            - \`chore:\` or \`chore(scope):\` maintenance tasks
            - \`refactor:\` or \`refactor(scope):\` code refactoring
            - \`test:\` or \`test(scope):\` adding or updating tests
            Where \`scope\` is the package name (e.g., \`app\`, \`desktop\`, \`opencode\`).
            See [CONTRIBUTING.md](../blob/dev/CONTRIBUTING.md#pr-titles) for details.`);
              return;
            }
            await removeLabel('needs:title');
            // Step 2: Check for linked issue (skip for docs/refactor PRs)
            const skipIssueCheck = /^(docs|refactor)\s*(\([a-zA-Z0-9-]+\))?\s*:/.test(title);
            if (skipIssueCheck) {
              await removeLabel('needs:issue');
              console.log('Skipping issue check for docs/refactor PR');
              return;
            }
            const query = `
              query($owner: String!, $repo: String!, $number: Int!) {
                repository(owner: $owner, name: $repo) {
                  pullRequest(number: $number) {
                    closingIssuesReferences(first: 1) {
                      totalCount
                    }
                  }
                }
              }
            `;
            const result = await github.graphql(query, {
              owner: context.repo.owner,
              repo: context.repo.repo,
              number: pr.number
            });
            const linkedIssues = result.repository.pullRequest.closingIssuesReferences.totalCount;
            if (linkedIssues === 0) {
              await addLabel('needs:issue');
              await comment('issue', `Thanks for your contribution!
            This PR doesn't have a linked issue. All PRs must reference an existing issue.
            Please:
            1. Open an issue describing the bug/feature (if one doesn't exist)
            2. Add \`Fixes #<number>\` or \`Closes #<number>\` to this PR description
            See [CONTRIBUTING.md](../blob/dev/CONTRIBUTING.md#issue-first-policy) for details.`);
              return;
            }
            await removeLabel('needs:issue');
            console.log('PR meets all standards');
@@ -31,7 +31,7 @@ permissions:
 jobs:
  publish:
    runs-on: blacksmith-4vcpu-ubuntu-2404
-    if: github.repository == 'anomalyco/opencode'
+    if: github.repository == 'sst/opencode'
    steps:
      - uses: actions/checkout@v3
        with:
@@ -92,7 +92,7 @@ jobs:
  publish-tauri:
    needs: publish
-    continue-on-error: false
+    continue-on-error: true
    strategy:
      fail-fast: false
      matrix:
@@ -177,22 +177,8 @@ jobs:
          cargo tauri --version
      - name: Build and upload artifacts
-        uses: Wandalen/wretry.action@v3
+        timeout-minutes: 20
-        timeout-minutes: 60
+        uses: tauri-apps/tauri-action@390cbe447412ced1303d35abe75287949e43437a
        with:
          attempt_limit: 3
          attempt_delay: 10000
          action: tauri-apps/tauri-action@390cbe447412ced1303d35abe75287949e43437a
          with: |
            projectPath: packages/desktop
            uploadWorkflowArtifacts: true
            tauriScript: ${{ (contains(matrix.settings.host, 'ubuntu') && 'cargo tauri') || '' }}
            args: --target ${{ matrix.settings.target }} --config ./src-tauri/tauri.prod.conf.json --verbose
            updaterJsonPreferNsis: true
            releaseId: ${{ needs.publish.outputs.release }}
            tagName: ${{ needs.publish.outputs.tag }}
            releaseAssetNamePattern: opencode-desktop-[platform]-[arch][ext]
            releaseDraft: true
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          TAURI_BUNDLER_NEW_APPIMAGE_FORMAT: true
@@ -204,6 +190,16 @@ jobs:
          APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
          APPLE_API_KEY: ${{ secrets.APPLE_API_KEY }}
          APPLE_API_KEY_PATH: ${{ runner.temp }}/apple-api-key.p8
        with:
          projectPath: packages/desktop
          uploadWorkflowArtifacts: true
          tauriScript: ${{ (contains(matrix.settings.host, 'ubuntu') && 'cargo tauri') || '' }}
          args: --target ${{ matrix.settings.target }} --config ./src-tauri/tauri.prod.conf.json --verbose
          updaterJsonPreferNsis: true
          releaseId: ${{ needs.publish.outputs.release }}
          tagName: ${{ needs.publish.outputs.tag }}
          releaseAssetNamePattern: opencode-desktop-[platform]-[arch][ext]
          releaseDraft: true
  publish-release:
    needs:
@@ -47,7 +47,7 @@ jobs:
        env:
          ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          OPENCODE_PERMISSION: '{ "bash": {  "*": "deny", "gh*": "allow", "gh pr review*": "deny" } }'
+          OPENCODE_PERMISSION: '{ "bash": { "gh*": "allow", "gh pr review*": "deny", "*": "deny" } }'
          PR_TITLE: ${{ steps.pr-details.outputs.title }}
        run: |
          PR_BODY=$(jq -r .body pr_data.json)
@@ -64,7 +64,7 @@ jobs:
          Please check all the code changes in this pull request against the style guide, also look for any bugs if they exist. Diffs are important but make sure you read the entire file to get proper context. Make it clear the suggestions are merely suggestions and the human can decide what to do
          When critiquing code against the style guide, be sure that the code is ACTUALLY in violation, don't complain about else statements if they already use early returns there. You may complain about excessive nesting though, regardless of else statement usage.
-          When critiquing code style don't be a zealot, we don't like "let" statements but sometimes they are the simplest option, if someone does a bunch of nesting with let, they should consider using iife (see packages/opencode/src/util.iife.ts)
+          When critiquing code style don't be a zealot, we don't like "let" statements but sometimes they are the simpliest option, if someone does a bunch of nesting with let, they should consider using iife (see packages/opencode/src/util.iife.ts)
          Use the gh cli to create comments on the files for the violations. Try to leave the comment on the exact line number. If you have a suggested fix include it in a suggestion code block.
          If you are writing suggested fixes, BE SURE THAT the change you are recommending is actually valid typescript, often I have seen missing closing "}" or other syntax errors.
@@ -1,33 +0,0 @@
 name: "Auto-close stale issues"
 on:
  schedule:
    - cron: "30 1 * * *" # Daily at 1:30 AM
  workflow_dispatch:
 env:
  DAYS_BEFORE_STALE: 90
  DAYS_BEFORE_CLOSE: 7
 jobs:
  stale:
    runs-on: ubuntu-latest
    permissions:
      issues: write
    steps:
      - uses: actions/stale@v10
        with:
          days-before-stale: ${{ env.DAYS_BEFORE_STALE }}
          days-before-close: ${{ env.DAYS_BEFORE_CLOSE }}
          stale-issue-label: "stale"
          close-issue-message: |
            [automated] Closing due to ${{ env.DAYS_BEFORE_STALE }}+ days of inactivity.
            Feel free to reopen if you still need this!
          stale-issue-message: |
            [automated] This issue has had no activity for ${{ env.DAYS_BEFORE_STALE }} days.
            It will be closed in ${{ env.DAYS_BEFORE_CLOSE }} days if there's no new activity.
          remove-stale-when-updated: true
          exempt-issue-labels: "pinned,security,feature-request,on-hold"
          start-date: "2025-12-27"
@@ -9,7 +9,7 @@ concurrency: ${{ github.workflow }}-${{ github.ref }}
 jobs:
  stats:
-    if: github.repository == 'anomalyco/opencode'
+    if: github.repository == 'sst/opencode'
    runs-on: blacksmith-4vcpu-ubuntu-2404
    permissions:
      contents: write
@@ -2,8 +2,8 @@ name: "sync-zed-extension"
 on:
  workflow_dispatch:
-  release:
+  # release:
-    types: [published]
+  #   types: [published]
 jobs:
  zed:
@@ -31,5 +31,4 @@ jobs:
        run: |
          ./script/sync-zed.ts ${{ steps.get_tag.outputs.tag }}
        env:
-          ZED_EXTENSIONS_PAT: ${{ secrets.ZED_EXTENSIONS_PAT }}
+          GITHUB_TOKEN: ${{ secrets.SST_GITHUB_TOKEN }}
          ZED_PR_PAT: ${{ secrets.ZED_PR_PAT }}
@@ -2,9 +2,11 @@ name: test
 on:
  push:
-    branches:
+    branches-ignore:
-      - dev
+      - production
  pull_request:
    branches-ignore:
      - production
  workflow_dispatch:
 jobs:
  test:
@@ -10,24 +10,22 @@ on:
      - "bun.lock"
      - "package.json"
      - "packages/*/package.json"
      - ".github/workflows/update-nix-hashes.yml"
  pull_request:
    paths:
      - "bun.lock"
      - "package.json"
      - "packages/*/package.json"
      - ".github/workflows/update-nix-hashes.yml"
 jobs:
-  update-flake:
+  update:
    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
    runs-on: blacksmith-4vcpu-ubuntu-2404
    env:
-      TITLE: flake.lock
+      SYSTEM: x86_64-linux
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          fetch-depth: 0
@@ -35,270 +33,39 @@ jobs:
          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
      - name: Setup Nix
-        uses: nixbuild/nix-quick-install-action@v34
+        uses: DeterminateSystems/nix-installer-action@v20
      - name: Configure git
        run: |
          git config --global user.email "action@github.com"
          git config --global user.name "Github Action"
-      - name: Update ${{ env.TITLE }}
+      - name: Update flake.lock
        run: |
          set -euo pipefail
-          echo "Updating $TITLE..."
+          echo "📦 Updating flake.lock..."
          nix flake update
-          echo "$TITLE updated successfully"
+          echo "✅ flake.lock updated successfully"
-      - name: Commit ${{ env.TITLE }} changes
+      - name: Update node_modules hash
        run: |
          set -euo pipefail
          echo "🔄 Updating node_modules hash..."
          nix/scripts/update-hashes.sh
          echo "✅ node_modules hash updated successfully"
      - name: Commit hash changes
        env:
          TARGET_BRANCH: ${{ github.head_ref || github.ref_name }}
        run: |
          set -euo pipefail
-          echo "Checking for changes in tracked files..."
+          echo "🔍 Checking for changes in tracked Nix files..."
          summarize() {
            local status="$1"
            {
-              echo "### Nix $TITLE"
+              echo "### Nix Hash Update"
              echo ""
              echo "- ref: ${GITHUB_REF_NAME}"
              echo "- status: ${status}"
            } >> "$GITHUB_STEP_SUMMARY"
            if [ -n "${GITHUB_SERVER_URL:-}" ] && [ -n "${GITHUB_REPOSITORY:-}" ] && [ -n "${GITHUB_RUN_ID:-}" ]; then
              echo "- run: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" >> "$GITHUB_STEP_SUMMARY"
            fi
            echo "" >> "$GITHUB_STEP_SUMMARY"
          }
          FILES=(flake.lock flake.nix)
          STATUS="$(git status --short -- "${FILES[@]}" || true)"
          if [ -z "$STATUS" ]; then
            echo "No changes detected."
            summarize "no changes"
            exit 0
          fi
          echo "Changes detected:"
          echo "$STATUS"
          echo "Staging files..."
          git add "${FILES[@]}"
          echo "Committing changes..."
          git commit -m "Update $TITLE"
          echo "Changes committed"
          BRANCH="${TARGET_BRANCH:-${GITHUB_REF_NAME}}"
          echo "Pulling latest from branch: $BRANCH"
          git pull --rebase --autostash origin "$BRANCH"
          echo "Pushing changes to branch: $BRANCH"
          git push origin HEAD:"$BRANCH"
          echo "Changes pushed successfully"
          summarize "committed $(git rev-parse --short HEAD)"
  compute-node-modules-hash:
    needs: update-flake
    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
    strategy:
      fail-fast: false
      matrix:
        include:
          - system: x86_64-linux
            host: blacksmith-4vcpu-ubuntu-2404
          - system: aarch64-linux
            host: blacksmith-4vcpu-ubuntu-2404-arm
          - system: x86_64-darwin
            host: macos-15-intel
          - system: aarch64-darwin
            host: macos-latest
    runs-on: ${{ matrix.host }}
    env:
      SYSTEM: ${{ matrix.system }}
    steps:
      - name: Checkout repository
        uses: actions/checkout@v6
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          fetch-depth: 0
          ref: ${{ github.head_ref || github.ref_name }}
          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
      - name: Setup Nix
        uses: nixbuild/nix-quick-install-action@v34
      - name: Compute node_modules hash
        run: |
          set -euo pipefail
          DUMMY="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
          HASH_FILE="nix/hashes.json"
          OUTPUT_FILE="hash-${SYSTEM}.txt"
          export NIX_KEEP_OUTPUTS=1
          export NIX_KEEP_DERIVATIONS=1
          BUILD_LOG=$(mktemp)
          TMP_JSON=$(mktemp)
          trap 'rm -f "$BUILD_LOG" "$TMP_JSON"' EXIT
          if [ ! -f "$HASH_FILE" ]; then
            mkdir -p "$(dirname "$HASH_FILE")"
            echo '{"nodeModules":{}}' > "$HASH_FILE"
          fi
          # Set dummy hash to force nix to rebuild and reveal correct hash
          jq --arg system "$SYSTEM" --arg value "$DUMMY" \
            '.nodeModules = (.nodeModules // {}) | .nodeModules[$system] = $value' "$HASH_FILE" > "$TMP_JSON"
          mv "$TMP_JSON" "$HASH_FILE"
          MODULES_ATTR=".#packages.${SYSTEM}.default.node_modules"
          DRV_PATH="$(nix eval --raw "${MODULES_ATTR}.drvPath")"
          echo "Building node_modules for ${SYSTEM} to discover correct hash..."
          echo "Attempting to realize derivation: ${DRV_PATH}"
          REALISE_OUT=$(nix-store --realise "$DRV_PATH" --keep-failed 2>&1 | tee "$BUILD_LOG" || true)
          BUILD_PATH=$(echo "$REALISE_OUT" | grep "^/nix/store/" | head -n1 || true)
          CORRECT_HASH=""
          if [ -n "$BUILD_PATH" ] && [ -d "$BUILD_PATH" ]; then
            echo "Realized node_modules output: $BUILD_PATH"
            CORRECT_HASH=$(nix hash path --sri "$BUILD_PATH" 2>/dev/null || true)
          fi
          # Try to extract hash from build log
          if [ -z "$CORRECT_HASH" ]; then
            CORRECT_HASH="$(grep -E 'got:\s+sha256-[A-Za-z0-9+/=]+' "$BUILD_LOG" | awk '{print $2}' | head -n1 || true)"
          fi
          if [ -z "$CORRECT_HASH" ]; then
            CORRECT_HASH="$(grep -A2 'hash mismatch' "$BUILD_LOG" | grep 'got:' | awk '{print $2}' | sed 's/sha256:/sha256-/' || true)"
          fi
          # Try to hash from kept failed build directory
          if [ -z "$CORRECT_HASH" ]; then
            KEPT_DIR=$(grep -oE "build directory.*'[^']+'" "$BUILD_LOG" | grep -oE "'/[^']+'" | tr -d "'" | head -n1 || true)
            if [ -z "$KEPT_DIR" ]; then
              KEPT_DIR=$(grep -oE '/nix/var/nix/builds/[^ ]+' "$BUILD_LOG" | head -n1 || true)
            fi
            if [ -n "$KEPT_DIR" ] && [ -d "$KEPT_DIR" ]; then
              HASH_PATH="$KEPT_DIR"
              [ -d "$KEPT_DIR/build" ] && HASH_PATH="$KEPT_DIR/build"
              if [ -d "$HASH_PATH/node_modules" ]; then
                CORRECT_HASH=$(nix hash path --sri "$HASH_PATH" 2>/dev/null || true)
              fi
            fi
          fi
          if [ -z "$CORRECT_HASH" ]; then
            echo "Failed to determine correct node_modules hash for ${SYSTEM}."
            cat "$BUILD_LOG"
            exit 1
          fi
          echo "$CORRECT_HASH" > "$OUTPUT_FILE"
          echo "Hash for ${SYSTEM}: $CORRECT_HASH"
      - name: Upload hash artifact
        uses: actions/upload-artifact@v6
        with:
          name: hash-${{ matrix.system }}
          path: hash-${{ matrix.system }}.txt
          retention-days: 1
  commit-node-modules-hashes:
    needs: compute-node-modules-hash
    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
    runs-on: blacksmith-4vcpu-ubuntu-2404
    env:
      TITLE: node_modules hashes
    steps:
      - name: Checkout repository
        uses: actions/checkout@v6
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          fetch-depth: 0
          ref: ${{ github.head_ref || github.ref_name }}
          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
      - name: Configure git
        run: |
          git config --global user.email "action@github.com"
          git config --global user.name "Github Action"
      - name: Pull latest changes
        env:
          TARGET_BRANCH: ${{ github.head_ref || github.ref_name }}
        run: |
          BRANCH="${TARGET_BRANCH:-${GITHUB_REF_NAME}}"
          git pull --rebase --autostash origin "$BRANCH"
      - name: Download all hash artifacts
        uses: actions/download-artifact@v7
        with:
          pattern: hash-*
          merge-multiple: true
      - name: Merge hashes into hashes.json
        run: |
          set -euo pipefail
          HASH_FILE="nix/hashes.json"
          if [ ! -f "$HASH_FILE" ]; then
            mkdir -p "$(dirname "$HASH_FILE")"
            echo '{"nodeModules":{}}' > "$HASH_FILE"
          fi
          echo "Merging hashes into ${HASH_FILE}..."
          shopt -s nullglob
          files=(hash-*.txt)
          if [ ${#files[@]} -eq 0 ]; then
            echo "No hash files found, nothing to update"
            exit 0
          fi
          EXPECTED_SYSTEMS="x86_64-linux aarch64-linux x86_64-darwin aarch64-darwin"
          for sys in $EXPECTED_SYSTEMS; do
            if [ ! -f "hash-${sys}.txt" ]; then
              echo "WARNING: Missing hash file for $sys"
            fi
          done
          for f in "${files[@]}"; do
            system="${f#hash-}"
            system="${system%.txt}"
            hash=$(cat "$f")
            if [ -z "$hash" ]; then
              echo "WARNING: Empty hash for $system, skipping"
              continue
            fi
            echo "  $system: $hash"
            jq --arg sys "$system" --arg h "$hash" \
              '.nodeModules = (.nodeModules // {}) | .nodeModules[$sys] = $h' "$HASH_FILE" > "${HASH_FILE}.tmp"
            mv "${HASH_FILE}.tmp" "$HASH_FILE"
          done
          echo "All hashes merged:"
          cat "$HASH_FILE"
      - name: Commit ${{ env.TITLE }} changes
        env:
          TARGET_BRANCH: ${{ github.head_ref || github.ref_name }}
        run: |
          set -euo pipefail
          HASH_FILE="nix/hashes.json"
          echo "Checking for changes..."
          summarize() {
            local status="$1"
            {
              echo "### Nix $TITLE"
              echo ""
              echo "- ref: ${GITHUB_REF_NAME}"
              echo "- status: ${status}"
@@ -309,22 +76,27 @@ jobs:
            echo "" >> "$GITHUB_STEP_SUMMARY"
          }
-          FILES=("$HASH_FILE")
+          FILES=(flake.lock flake.nix nix/node-modules.nix nix/hashes.json)
          STATUS="$(git status --short -- "${FILES[@]}" || true)"
          if [ -z "$STATUS" ]; then
-            echo "No changes detected."
+            echo "✅ No changes detected. Hashes are already up to date."
            summarize "no changes"
            exit 0
          fi
-          echo "Changes detected:"
+          echo "📝 Changes detected:"
          echo "$STATUS"
          echo "🔗 Staging files..."
          git add "${FILES[@]}"
-          git commit -m "Update $TITLE"
+          echo "💾 Committing changes..."
          git commit -m "Update Nix flake.lock and hashes"
          echo "✅ Changes committed"
          BRANCH="${TARGET_BRANCH:-${GITHUB_REF_NAME}}"
-          git pull --rebase --autostash origin "$BRANCH"
+          echo "🌳 Pulling latest from branch: $BRANCH"
          git pull --rebase origin "$BRANCH"
          echo "🚀 Pushing changes to branch: $BRANCH"
          git push origin HEAD:"$BRANCH"
-          echo "Changes pushed successfully"
+          echo "✅ Changes pushed successfully"
          summarize "committed $(git rev-parse --short HEAD)"
@@ -20,9 +20,3 @@ opencode.json
 a.out
 target
 .scripts
 .direnv/
 # Local dev files
 opencode-dev
 logs/
 *.bun-build
@@ -1,14 +1,11 @@
 ---
 description: ALWAYS use this when writing docs
 color: "#38A3EE"
 ---
 You are an expert technical documentation writer
 You are not verbose
 Use a relaxed and friendly tone
 The title of the page should be a word or a 2-3 word phrase
 The description should be one short line, should not start with "The", should
@@ -1,26 +0,0 @@
 ---
 mode: primary
 hidden: true
 model: opencode/claude-haiku-4-5
 color: "#E67E22"
 tools:
  "*": false
  "github-pr-search": true
 ---
 You are a duplicate PR detection agent. When a PR is opened, your job is to search for potentially duplicate or related open PRs.
 Use the github-pr-search tool to search for PRs that might be addressing the same issue or feature.
 IMPORTANT: The input will contain a line `CURRENT_PR_NUMBER: NNNN`. This is the current PR number, you should not mark that the current PR as a duplicate of itself.
 Search using keywords from the PR title and description. Try multiple searches with different relevant terms.
 If you find potential duplicates:
 - List them with their titles and URLs
 - Briefly explain why they might be related
 If no duplicates are found, say so clearly. BUT ONLY SAY "No duplicate PRs found" (don't say anything else if no dups)
 Keep your response concise and actionable.
@@ -0,0 +1,10 @@
 ---
 description: Use this agent when you are asked to commit and push code changes to a git repository.
 mode: subagent
 ---
 You commit and push to git
 Commit messages should be brief since they are used to generate release notes.
 Messages should say WHY the change was made and not WHAT was changed.
@@ -2,7 +2,6 @@
 mode: primary
 hidden: true
 model: opencode/claude-haiku-4-5
 color: "#44BA81"
 tools:
  "*": false
  "github-triage": true
@@ -45,9 +44,9 @@ Desktop app issues:
 #### zen
-**Only** add if the issue mentions "zen" or "opencode zen" or "opencode black".
+**Only** add if the issue mentions "zen" or "opencode zen". Zen is our gateway for coding models. **Do not** add for other gateways or inference providers.
-If the issue doesn't have "zen" or "opencode black" in it then don't add zen label
+If the issue doesn't have "zen" in it then don't add zen label
 #### docs
@@ -1,24 +0,0 @@
 ---
 description: "Bump AI sdk dependencies minor / patch versions only"
 ---
 Please read @package.json and @packages/opencode/package.json.
 Your job is to look into AI SDK dependencies, figure out if they have versions that can be upgraded (minor or patch versions ONLY no major ignore major changes).
 I want a report of every dependency and the version that can be upgraded to.
 What would be even better is if you can give me links to the changelog for each dependency, or at least some reference info so I can see what bugs were fixed or new features were added.
 Consider using subagents for each dep to save your context window.
 Here is a short list of some deps (please be comprehensive tho):
 - "ai"
 - "@ai-sdk/openai"
 - "@ai-sdk/anthropic"
 - "@openrouter/ai-sdk-provider"
 - etc, etc
 DO NOT upgrade the dependencies yet, just make a list of all dependencies and their versions that can be upgraded to minor or patch versions only.
 Write up your findings to ai-sdk-updates.md
@@ -3,7 +3,7 @@ description: "find issue(s) on github"
 model: opencode/claude-haiku-4-5
 ---
-Search through existing issues in anomalyco/opencode using the gh cli to find issues matching this query:
+Search through existing issues in sst/opencode using the gh cli to find issues matching this query:
 $ARGUMENTS
@@ -10,14 +10,8 @@
      "options": {},
    },
  },
-  "mcp": {
+  "mcp": {},
    "context7": {
      "type": "remote",
      "url": "https://mcp.context7.com/mcp",
    },
  },
  "tools": {
    "github-triage": false,
    "github-pr-search": false,
  },
 }
@@ -1,57 +0,0 @@
 /// <reference path="../env.d.ts" />
 import { tool } from "@opencode-ai/plugin"
 import DESCRIPTION from "./github-pr-search.txt"
 async function githubFetch(endpoint: string, options: RequestInit = {}) {
  const response = await fetch(`https://api.github.com${endpoint}`, {
    ...options,
    headers: {
      Authorization: `Bearer ${process.env.GITHUB_TOKEN}`,
      Accept: "application/vnd.github+json",
      "Content-Type": "application/json",
      ...options.headers,
    },
  })
  if (!response.ok) {
    throw new Error(`GitHub API error: ${response.status} ${response.statusText}`)
  }
  return response.json()
 }
 interface PR {
  title: string
  html_url: string
 }
 export default tool({
  description: DESCRIPTION,
  args: {
    query: tool.schema.string().describe("Search query for PR titles and descriptions"),
    limit: tool.schema.number().describe("Maximum number of results to return").default(10),
    offset: tool.schema.number().describe("Number of results to skip for pagination").default(0),
  },
  async execute(args) {
    const owner = "anomalyco"
    const repo = "opencode"
    const page = Math.floor(args.offset / args.limit) + 1
    const searchQuery = encodeURIComponent(`${args.query} repo:${owner}/${repo} type:pr state:open`)
    const result = await githubFetch(
      `/search/issues?q=${searchQuery}&per_page=${args.limit}&page=${page}&sort=updated&order=desc`,
    )
    if (result.total_count === 0) {
      return `No PRs found matching "${args.query}"`
    }
    const prs = result.items as PR[]
    if (prs.length === 0) {
      return `No other PRs found matching "${args.query}"`
    }
    const formatted = prs.map((pr) => `${pr.title}\n${pr.html_url}`).join("\n\n")
    return `Found ${result.total_count} PRs (showing ${prs.length}):\n\n${formatted}`
  },
 })
@@ -1,10 +0,0 @@
 Use this tool to search GitHub pull requests by title and description.
 This tool searches PRs in the sst/opencode repository and returns LLM-friendly results including:
 - PR number and title
 - Author
 - State (open/closed/merged)
 - Labels
 - Description snippet
 Use the query parameter to search for keywords that might appear in PR titles or descriptions.
@@ -40,7 +40,7 @@ export default tool({
  async execute(args) {
    const issue = getIssueNumber()
    // const octokit = new Octokit({ auth: process.env.GITHUB_TOKEN })
-    const owner = "anomalyco"
+    const owner = "sst"
    const repo = "opencode"
    const results: string[] = []
@@ -1,4 +1,7 @@
- To test opencode in `packages/opencode`, run `bun dev`.
+## Debugging
- To regenerate the JavaScript SDK, run `./packages/sdk/js/script/build.ts`.
+
 - To test opencode in the `packages/opencode` directory you can run `bun dev`
 ## Tool Calling
 - ALWAYS USE PARALLEL TOOLS WHEN APPLICABLE.
 - The default branch in this repo is `dev`.
@@ -14,10 +14,10 @@ However, any UI or core product feature must go through a design review with the
 If you are unsure if a PR would be accepted, feel free to ask a maintainer or look for issues with any of the following labels:
- [`help wanted`](https://github.com/anomalyco/opencode/issues?q=is%3Aissue%20state%3Aopen%20label%3Ahelp-wanted)
+- [`help wanted`](https://github.com/sst/opencode/issues?q=is%3Aissue%20state%3Aopen%20label%3Ahelp-wanted)
- [`good first issue`](https://github.com/anomalyco/opencode/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22)
+- [`good first issue`](https://github.com/sst/opencode/issues?q=is%3Aissue%20state%3Aopen%20label%3A%22good%20first%20issue%22)
- [`bug`](https://github.com/anomalyco/opencode/issues?q=is%3Aissue%20state%3Aopen%20label%3Abug)
+- [`bug`](https://github.com/sst/opencode/issues?q=is%3Aissue%20state%3Aopen%20label%3Abug)
- [`perf`](https://github.com/anomalyco/opencode/issues?q=is%3Aopen%20is%3Aissue%20label%3A%22perf%22)
+- [`perf`](https://github.com/sst/opencode/issues?q=is%3Aopen%20is%3Aissue%20label%3A%22perf%22)
 > [!NOTE]
 > PRs that ignore these guardrails will likely be closed.
@@ -34,82 +34,11 @@ Want to take on an issue? Leave a comment and a maintainer may assign it to you
  bun dev
  ```
 ### Running against a different directory
 By default, `bun dev` runs OpenCode in the `packages/opencode` directory. To run it against a different directory or repository:
 ```bash
 bun dev <directory>
 ```
 To run OpenCode in the root of the opencode repo itself:
 ```bash
 bun dev .
 ```
 ### Building a "localcode"
 To compile a standalone executable:
 ```bash
 ./packages/opencode/script/build.ts --single
 ```
 Then run it with:
 ```bash
 ./packages/opencode/dist/opencode-<platform>/bin/opencode
 ```
 Replace `<platform>` with your platform (e.g., `darwin-arm64`, `linux-x64`).
 - Core pieces:
  - `packages/opencode`: OpenCode core business logic & server.
  - `packages/opencode/src/cli/cmd/tui/`: The TUI code, written in SolidJS with [opentui](https://github.com/sst/opentui)
  - `packages/app`: The shared web UI components, written in SolidJS
  - `packages/desktop`: The native desktop app, built with Tauri (wraps `packages/app`)
  - `packages/plugin`: Source for `@opencode-ai/plugin`
 ### Running the Web App
 To test UI changes during development, run the web app:
 ```bash
 bun run --cwd packages/app dev
 ```
 This starts a local dev server at http://localhost:5173 (or similar port shown in output). Most UI changes can be tested here.
 ### Running the Desktop App
 The desktop app is a native Tauri application that wraps the web UI.
 To run the native desktop app:
 ```bash
 bun run --cwd packages/desktop tauri dev
 ```
 This starts the web dev server on http://localhost:1420 and opens the native window.
 If you only want the web dev server (no native shell):
 ```bash
 bun run --cwd packages/desktop dev
 ```
 To create a production `dist/` and build the native app bundle:
 ```bash
 bun run --cwd packages/desktop tauri build
 ```
 This runs `bun run --cwd packages/desktop build` automatically via Tauri’s `beforeBuildCommand`.
 > [!NOTE]
 > Running the desktop app requires additional Tauri dependencies (Rust toolchain, platform-specific libraries). See the [Tauri prerequisites](https://v2.tauri.app/start/prerequisites/) for setup instructions.
 > [!NOTE]
 > If you make changes to the API or SDK (e.g. `packages/opencode/src/server/server.ts`), run `./script/generate.ts` to regenerate the SDK and related files.
@@ -124,12 +53,12 @@ your debugger via that URL. Other methods can result in breakpoints being mapped
 Caveats:
 - `*.tsx` files won't have their breakpoints correctly mapped. This seems due to Bun currently not supporting source maps on code transformed
  via `BunPlugin`s (currently necessary due to our dependency on `@opentui/solid`). Currently, the best you can do in terms of debugging `*.tsx`
  files is writing a `debugger;` statement. Debugging facilities like stepping won't work, but at least you will be informed if a specific code
  is triggered.
 - If you want to run the OpenCode TUI and have breakpoints triggered in the server code, you might need to run `bun dev spawn` instead of
  the usual `bun dev`. This is because `bun dev` runs the server in a worker thread and breakpoints might not work there.
 - If `spawn` does not work for you, you can debug the server separately:
  - Debug server: `bun run --inspect=ws://localhost:6499/ ./src/index.ts serve --port 4096`,
    then attach TUI with `opencode attach http://localhost:4096`
  - Debug TUI: `bun run --inspect=ws://localhost:6499/ --conditions=browser ./src/index.ts`
 Other tips and tricks:
@@ -149,63 +78,11 @@ With that said, you may want to try these methods, as they might work for you.
 ## Pull Request Expectations
-### Issue First Policy
+- Try to keep pull requests small and focused.
-
+- Link relevant issue(s) in the description
 **All PRs must reference an existing issue.** Before opening a PR, open an issue describing the bug or feature. This helps maintainers triage and prevents duplicate work. PRs without a linked issue may be closed without review.
 - Use `Fixes #123` or `Closes #123` in your PR description to link the issue
 - For small fixes, a brief issue is fine - just enough context for maintainers to understand the problem
 ### General Requirements
 - Keep pull requests small and focused
 - Explain the issue and why your change fixes it
- Before adding new functionality, ensure it doesn't already exist elsewhere in the codebase
+- Avoid having verbose LLM generated PR descriptions
-
+- Before adding new functions or functionality, ensure that such behavior doesn't already exist elsewhere in the codebase.
 ### UI Changes
 If your PR includes UI changes, please include screenshots or videos showing the before and after. This helps maintainers review faster and gives you quicker feedback.
 ### Logic Changes
 For non-UI changes (bug fixes, new features, refactors), explain **how you verified it works**:
 - What did you test?
 - How can a reviewer reproduce/confirm the fix?
 ### No AI-Generated Walls of Text
 Long, AI-generated PR descriptions and issues are not acceptable and may be ignored. Respect the maintainers' time:
 - Write short, focused descriptions
 - Explain what changed and why in your own words
 - If you can't explain it briefly, your PR might be too large
 ### PR Titles
 PR titles should follow conventional commit standards:
 - `feat:` new feature or functionality
 - `fix:` bug fix
 - `docs:` documentation or README changes
 - `chore:` maintenance tasks, dependency updates, etc.
 - `refactor:` code refactoring without changing behavior
 - `test:` adding or updating tests
 You can optionally include a scope to indicate which package is affected:
 - `feat(app):` feature in the app package
 - `fix(desktop):` bug fix in the desktop package
 - `chore(opencode):` maintenance in the opencode package
 Examples:
 - `docs: update contributing guidelines`
 - `fix: resolve crash on startup`
 - `feat: add dark mode support`
 - `feat(app): add dark mode support`
 - `fix(desktop): resolve crash on startup`
 - `chore: bump dependency versions`
 ### Style Preferences
@@ -11,7 +11,7 @@
 <p align="center">
  <a href="https://opencode.ai/discord"><img alt="Discord" src="https://img.shields.io/discord/1391832426048651334?style=flat-square&label=discord" /></a>
  <a href="https://www.npmjs.com/package/opencode-ai"><img alt="npm" src="https://img.shields.io/npm/v/opencode-ai?style=flat-square" /></a>
-  <a href="https://github.com/anomalyco/opencode/actions/workflows/publish.yml"><img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/anomalyco/opencode/publish.yml?style=flat-square&branch=dev" /></a>
+  <a href="https://github.com/sst/opencode/actions/workflows/publish.yml"><img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/sst/opencode/publish.yml?style=flat-square&branch=dev" /></a>
 </p>
 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
@@ -28,11 +28,10 @@ curl -fsSL https://opencode.ai/install | bash
 npm i -g opencode-ai@latest        # or bun/pnpm/yarn
 scoop bucket add extras; scoop install extras/opencode  # Windows
 choco install opencode             # Windows
-brew install anomalyco/tap/opencode # macOS and Linux (recommended, always up to date)
+brew install opencode              # macOS and Linux
 brew install opencode              # macOS and Linux (official brew formula, updated less)
 paru -S opencode-bin               # Arch Linux
-mise use -g opencode               # Any OS
+mise use -g github:sst/opencode # Any OS
-nix run nixpkgs#opencode           # or github:anomalyco/opencode for latest dev branch
+nix run nixpkgs#opencode           # or github:sst/opencode for latest dev branch
 ```
 > [!TIP]
@@ -40,7 +39,7 @@ nix run nixpkgs#opencode           # or github:anomalyco/opencode for latest dev
 ### Desktop App (BETA)
-OpenCode is also available as a desktop application. Download directly from the [releases page](https://github.com/anomalyco/opencode/releases) or [opencode.ai/download](https://opencode.ai/download).
+OpenCode is also available as a desktop application. Download directly from the [releases page](https://github.com/sst/opencode/releases) or [opencode.ai/download](https://opencode.ai/download).
 | Platform              | Download                              |
 | --------------------- | ------------------------------------- |
@@ -71,7 +70,8 @@ XDG_BIN_DIR=$HOME/.local/bin curl -fsSL https://opencode.ai/install | bash
 ### Agents
-OpenCode includes two built-in agents you can switch between with the `Tab` key.
+OpenCode includes two built-in agents you can switch between,
 you can switch between these using the `Tab` key.
 - **build** - Default, full access agent for development work
 - **plan** - Read-only agent for analysis and code exploration
@@ -79,7 +79,7 @@ OpenCode includes two built-in agents you can switch between with the `Tab` key.
  - Asks permission before running bash commands
  - Ideal for exploring unfamiliar codebases or planning changes
-Also, included is a **general** subagent for complex searches and multistep tasks.
+Also, included is a **general** subagent for complex searches and multi-step tasks.
 This is used internally and can be invoked using `@general` in messages.
 Learn more about [agents](https://opencode.ai/docs/agents).
@@ -98,7 +98,7 @@ If you are working on a project that's related to OpenCode and is using "opencod
 ### FAQ
-#### How is this different from Claude Code?
+#### How is this different than Claude Code?
 It's very similar to Claude Code in terms of capability. Here are the key differences:
@@ -108,6 +108,10 @@ It's very similar to Claude Code in terms of capability. Here are the key differ
 - A focus on TUI. OpenCode is built by neovim users and the creators of [terminal.shop](https://terminal.shop); we are going to push the limits of what's possible in the terminal.
 - A client/server architecture. This for example can allow OpenCode to run on your computer, while you can drive it remotely from a mobile app. Meaning that the TUI frontend is just one of the possible clients.
 #### What's the other repo?
 The other confusingly named repo has no relation to this one. You can [read the story behind it here](https://x.com/thdxr/status/1933561254481666466).
 ---
 **Join our community** [Discord](https://discord.gg/opencode) | [X.com](https://x.com/opencode)
@@ -1,116 +0,0 @@
 <p align="center">
  <a href="https://opencode.ai">
    <picture>
      <source srcset="packages/console/app/src/asset/logo-ornate-dark.svg" media="(prefers-color-scheme: dark)">
      <source srcset="packages/console/app/src/asset/logo-ornate-light.svg" media="(prefers-color-scheme: light)">
      <img src="packages/console/app/src/asset/logo-ornate-light.svg" alt="OpenCode logo">
    </picture>
  </a>
 </p>
 <p align="center">开源的 AI Coding Agent。</p>
 <p align="center">
  <a href="https://opencode.ai/discord"><img alt="Discord" src="https://img.shields.io/discord/1391832426048651334?style=flat-square&label=discord" /></a>
  <a href="https://www.npmjs.com/package/opencode-ai"><img alt="npm" src="https://img.shields.io/npm/v/opencode-ai?style=flat-square" /></a>
  <a href="https://github.com/anomalyco/opencode/actions/workflows/publish.yml"><img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/anomalyco/opencode/publish.yml?style=flat-square&branch=dev" /></a>
 </p>
 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
 ---
 ### 安装
 ```bash
 # 直接安装 (YOLO)
 curl -fsSL https://opencode.ai/install | bash
 # 软件包管理器
 npm i -g opencode-ai@latest        # 也可使用 bun/pnpm/yarn
 scoop bucket add extras; scoop install extras/opencode  # Windows
 choco install opencode             # Windows
 brew install anomalyco/tap/opencode # macOS 和 Linux（推荐，始终保持最新）
 brew install opencode              # macOS 和 Linux（官方 brew formula，更新频率较低）
 paru -S opencode-bin               # Arch Linux
 mise use -g opencode               # 任意系统
 nix run nixpkgs#opencode           # 或用 github:anomalyco/opencode 获取最新 dev 分支
 ```
 > [!TIP]
 > 安装前请先移除 0.1.x 之前的旧版本。
 ### 桌面应用程序 (BETA)
 OpenCode 也提供桌面版应用。可直接从 [发布页 (releases page)](https://github.com/anomalyco/opencode/releases) 或 [opencode.ai/download](https://opencode.ai/download) 下载。
 | 平台                  | 下载文件                              |
 | --------------------- | ------------------------------------- |
 | macOS (Apple Silicon) | `opencode-desktop-darwin-aarch64.dmg` |
 | macOS (Intel)         | `opencode-desktop-darwin-x64.dmg`     |
 | Windows               | `opencode-desktop-windows-x64.exe`    |
 | Linux                 | `.deb`、`.rpm` 或 AppImage            |
 ```bash
 # macOS (Homebrew Cask)
 brew install --cask opencode-desktop
 ```
 #### 安装目录
 安装脚本按照以下优先级决定安装路径：
 1. `$OPENCODE_INSTALL_DIR` - 自定义安装目录
 2. `$XDG_BIN_DIR` - 符合 XDG 基础目录规范的路径
 3. `$HOME/bin` - 如果存在或可创建的用户二进制目录
 4. `$HOME/.opencode/bin` - 默认备用路径
 ```bash
 # 示例
 OPENCODE_INSTALL_DIR=/usr/local/bin curl -fsSL https://opencode.ai/install | bash
 XDG_BIN_DIR=$HOME/.local/bin curl -fsSL https://opencode.ai/install | bash
 ```
 ### Agents
 OpenCode 内置两种 Agent，可用 `Tab` 键快速切换：
 - **build** - 默认模式，具备完整权限，适合开发工作
 - **plan** - 只读模式，适合代码分析与探索
  - 默认拒绝修改文件
  - 运行 bash 命令前会询问
  - 便于探索未知代码库或规划改动
 另外还包含一个 **general** 子 Agent，用于复杂搜索和多步任务，内部使用，也可在消息中输入 `@general` 调用。
 了解更多 [Agents](https://opencode.ai/docs/agents) 相关信息。
 ### 文档
 更多配置说明请查看我们的 [**官方文档**](https://opencode.ai/docs)。
 ### 参与贡献
 如有兴趣贡献代码，请在提交 PR 前阅读 [贡献指南 (Contributing Docs)](./CONTRIBUTING.md)。
 ### 基于 OpenCode 进行开发
 如果你在项目名中使用了 “opencode”（如 “opencode-dashboard” 或 “opencode-mobile”），请在 README 里注明该项目不是 OpenCode 团队官方开发，且不存在隶属关系。
 ### 常见问题 (FAQ)
 #### 这和 Claude Code 有什么不同？
 功能上很相似，关键差异：
 - 100% 开源。
 - 不绑定特定提供商。推荐使用 [OpenCode Zen](https://opencode.ai/zen) 的模型，但也可搭配 Claude、OpenAI、Google 甚至本地模型。模型迭代会缩小差异、降低成本，因此保持 provider-agnostic 很重要。
 - 内置 LSP 支持。
 - 聚焦终端界面 (TUI)。OpenCode 由 Neovim 爱好者和 [terminal.shop](https://terminal.shop) 的创建者打造，会持续探索终端的极限。
 - 客户端/服务器架构。可在本机运行，同时用移动设备远程驱动。TUI 只是众多潜在客户端之一。
 #### 另一个同名的仓库是什么？
 另一个名字相近的仓库与本项目无关。[点击这里了解背后故事](https://x.com/thdxr/status/1933561254481666466)。
 ---
 **加入我们的社区** [Discord](https://discord.gg/opencode) | [X.com](https://x.com/opencode)
@@ -11,7 +11,7 @@
 <p align="center">
  <a href="https://opencode.ai/discord"><img alt="Discord" src="https://img.shields.io/discord/1391832426048651334?style=flat-square&label=discord" /></a>
  <a href="https://www.npmjs.com/package/opencode-ai"><img alt="npm" src="https://img.shields.io/npm/v/opencode-ai?style=flat-square" /></a>
-  <a href="https://github.com/anomalyco/opencode/actions/workflows/publish.yml"><img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/anomalyco/opencode/publish.yml?style=flat-square&branch=dev" /></a>
+  <a href="https://github.com/sst/opencode/actions/workflows/publish.yml"><img alt="Build status" src="https://img.shields.io/github/actions/workflow/status/sst/opencode/publish.yml?style=flat-square&branch=dev" /></a>
 </p>
 [![OpenCode Terminal UI](packages/web/src/assets/lander/screenshot.png)](https://opencode.ai)
@@ -28,11 +28,10 @@ curl -fsSL https://opencode.ai/install | bash
 npm i -g opencode-ai@latest        # 也可使用 bun/pnpm/yarn
 scoop bucket add extras; scoop install extras/opencode  # Windows
 choco install opencode             # Windows
-brew install anomalyco/tap/opencode # macOS 與 Linux（推薦，始終保持最新）
+brew install opencode              # macOS 與 Linux
 brew install opencode              # macOS 與 Linux（官方 brew formula，更新頻率較低）
 paru -S opencode-bin               # Arch Linux
-mise use -g github:anomalyco/opencode    # 任何作業系統
+mise use -g github:sst/opencode    # 任何作業系統
-nix run nixpkgs#opencode           # 或使用 github:anomalyco/opencode 以取得最新開發分支
+nix run nixpkgs#opencode           # 或使用 github:sst/opencode 以取得最新開發分支
 ```
 > [!TIP]
@@ -40,7 +39,7 @@ nix run nixpkgs#opencode           # 或使用 github:anomalyco/opencode 以取
 ### 桌面應用程式 (BETA)
-OpenCode 也提供桌面版應用程式。您可以直接從 [發佈頁面 (releases page)](https://github.com/anomalyco/opencode/releases) 或 [opencode.ai/download](https://opencode.ai/download) 下載。
+OpenCode 也提供桌面版應用程式。您可以直接從 [發佈頁面 (releases page)](https://github.com/sst/opencode/releases) 或 [opencode.ai/download](https://opencode.ai/download) 下載。
 | 平台                  | 下載連結                              |
 | --------------------- | ------------------------------------- |
@@ -1,40 +0,0 @@
 # Security
 ## Threat Model
 ### Overview
 OpenCode is an AI-powered coding assistant that runs locally on your machine. It provides an agent system with access to powerful tools including shell execution, file operations, and web access.
 ### No Sandbox
 OpenCode does **not** sandbox the agent. The permission system exists as a UX feature to help users stay aware of what actions the agent is taking - it prompts for confirmation before executing commands, writing files, etc. However, it is not designed to provide security isolation.
 If you need true isolation, run OpenCode inside a Docker container or VM.
 ### Server Mode
 Server mode is opt-in only. When enabled, set `OPENCODE_SERVER_PASSWORD` to require HTTP Basic Auth. Without this, the server runs unauthenticated (with a warning). It is the end user's responsibility to secure the server - any functionality it provides is not a vulnerability.
 ### Out of Scope
 | Category                        | Rationale                                                               |
 | ------------------------------- | ----------------------------------------------------------------------- |
 | **Server access when opted-in** | If you enable server mode, API access is expected behavior              |
 | **Sandbox escapes**             | The permission system is not a sandbox (see above)                      |
 | **LLM provider data handling**  | Data sent to your configured LLM provider is governed by their policies |
 | **MCP server behavior**         | External MCP servers you configure are outside our trust boundary       |
 ---
 # Reporting Security Issues
 We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.
 To report a security issue, please use the GitHub Security Advisory ["Report a Vulnerability"](https://github.com/anomalyco/opencode/security/advisories/new) tab.
 The team will send a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
 ## Escalation
 If you do not receive an acknowledgement of your report within 6 business days, you may send an email to security@anoma.ly
@@ -1,205 +1,181 @@
 # Download Stats
-| Date       | GitHub Downloads     | npm Downloads        | Total                |
+| Date       | GitHub Downloads    | npm Downloads       | Total               |
-| ---------- | -------------------- | -------------------- | -------------------- |
+| ---------- | ------------------- | ------------------- | ------------------- |
-| 2025-06-29 | 18,789 (+0)          | 39,420 (+0)          | 58,209 (+0)          |
+| 2025-06-29 | 18,789 (+0)         | 39,420 (+0)         | 58,209 (+0)         |
-| 2025-06-30 | 20,127 (+1,338)      | 41,059 (+1,639)      | 61,186 (+2,977)      |
+| 2025-06-30 | 20,127 (+1,338)     | 41,059 (+1,639)     | 61,186 (+2,977)     |
-| 2025-07-01 | 22,108 (+1,981)      | 43,745 (+2,686)      | 65,853 (+4,667)      |
+| 2025-07-01 | 22,108 (+1,981)     | 43,745 (+2,686)     | 65,853 (+4,667)     |
-| 2025-07-02 | 24,814 (+2,706)      | 46,168 (+2,423)      | 70,982 (+5,129)      |
+| 2025-07-02 | 24,814 (+2,706)     | 46,168 (+2,423)     | 70,982 (+5,129)     |
-| 2025-07-03 | 27,834 (+3,020)      | 49,955 (+3,787)      | 77,789 (+6,807)      |
+| 2025-07-03 | 27,834 (+3,020)     | 49,955 (+3,787)     | 77,789 (+6,807)     |
-| 2025-07-04 | 30,608 (+2,774)      | 54,758 (+4,803)      | 85,366 (+7,577)      |
+| 2025-07-04 | 30,608 (+2,774)     | 54,758 (+4,803)     | 85,366 (+7,577)     |
-| 2025-07-05 | 32,524 (+1,916)      | 58,371 (+3,613)      | 90,895 (+5,529)      |
+| 2025-07-05 | 32,524 (+1,916)     | 58,371 (+3,613)     | 90,895 (+5,529)     |
-| 2025-07-06 | 33,766 (+1,242)      | 59,694 (+1,323)      | 93,460 (+2,565)      |
+| 2025-07-06 | 33,766 (+1,242)     | 59,694 (+1,323)     | 93,460 (+2,565)     |
-| 2025-07-08 | 38,052 (+4,286)      | 64,468 (+4,774)      | 102,520 (+9,060)     |
+| 2025-07-08 | 38,052 (+4,286)     | 64,468 (+4,774)     | 102,520 (+9,060)    |
-| 2025-07-09 | 40,924 (+2,872)      | 67,935 (+3,467)      | 108,859 (+6,339)     |
+| 2025-07-09 | 40,924 (+2,872)     | 67,935 (+3,467)     | 108,859 (+6,339)    |
-| 2025-07-10 | 43,796 (+2,872)      | 71,402 (+3,467)      | 115,198 (+6,339)     |
+| 2025-07-10 | 43,796 (+2,872)     | 71,402 (+3,467)     | 115,198 (+6,339)    |
-| 2025-07-11 | 46,982 (+3,186)      | 77,462 (+6,060)      | 124,444 (+9,246)     |
+| 2025-07-11 | 46,982 (+3,186)     | 77,462 (+6,060)     | 124,444 (+9,246)    |
-| 2025-07-12 | 49,302 (+2,320)      | 82,177 (+4,715)      | 131,479 (+7,035)     |
+| 2025-07-12 | 49,302 (+2,320)     | 82,177 (+4,715)     | 131,479 (+7,035)    |
-| 2025-07-13 | 50,803 (+1,501)      | 86,394 (+4,217)      | 137,197 (+5,718)     |
+| 2025-07-13 | 50,803 (+1,501)     | 86,394 (+4,217)     | 137,197 (+5,718)    |
-| 2025-07-14 | 53,283 (+2,480)      | 87,860 (+1,466)      | 141,143 (+3,946)     |
+| 2025-07-14 | 53,283 (+2,480)     | 87,860 (+1,466)     | 141,143 (+3,946)    |
-| 2025-07-15 | 57,590 (+4,307)      | 91,036 (+3,176)      | 148,626 (+7,483)     |
+| 2025-07-15 | 57,590 (+4,307)     | 91,036 (+3,176)     | 148,626 (+7,483)    |
-| 2025-07-16 | 62,313 (+4,723)      | 95,258 (+4,222)      | 157,571 (+8,945)     |
+| 2025-07-16 | 62,313 (+4,723)     | 95,258 (+4,222)     | 157,571 (+8,945)    |
-| 2025-07-17 | 66,684 (+4,371)      | 100,048 (+4,790)     | 166,732 (+9,161)     |
+| 2025-07-17 | 66,684 (+4,371)     | 100,048 (+4,790)    | 166,732 (+9,161)    |
-| 2025-07-18 | 70,379 (+3,695)      | 102,587 (+2,539)     | 172,966 (+6,234)     |
+| 2025-07-18 | 70,379 (+3,695)     | 102,587 (+2,539)    | 172,966 (+6,234)    |
-| 2025-07-19 | 73,497 (+3,117)      | 105,904 (+3,317)     | 179,401 (+6,434)     |
+| 2025-07-19 | 73,497 (+3,117)     | 105,904 (+3,317)    | 179,401 (+6,434)    |
-| 2025-07-20 | 76,453 (+2,956)      | 109,044 (+3,140)     | 185,497 (+6,096)     |
+| 2025-07-20 | 76,453 (+2,956)     | 109,044 (+3,140)    | 185,497 (+6,096)    |
-| 2025-07-21 | 80,197 (+3,744)      | 113,537 (+4,493)     | 193,734 (+8,237)     |
+| 2025-07-21 | 80,197 (+3,744)     | 113,537 (+4,493)    | 193,734 (+8,237)    |
-| 2025-07-22 | 84,251 (+4,054)      | 118,073 (+4,536)     | 202,324 (+8,590)     |
+| 2025-07-22 | 84,251 (+4,054)     | 118,073 (+4,536)    | 202,324 (+8,590)    |
-| 2025-07-23 | 88,589 (+4,338)      | 121,436 (+3,363)     | 210,025 (+7,701)     |
+| 2025-07-23 | 88,589 (+4,338)     | 121,436 (+3,363)    | 210,025 (+7,701)    |
-| 2025-07-24 | 92,469 (+3,880)      | 124,091 (+2,655)     | 216,560 (+6,535)     |
+| 2025-07-24 | 92,469 (+3,880)     | 124,091 (+2,655)    | 216,560 (+6,535)    |
-| 2025-07-25 | 96,417 (+3,948)      | 126,985 (+2,894)     | 223,402 (+6,842)     |
+| 2025-07-25 | 96,417 (+3,948)     | 126,985 (+2,894)    | 223,402 (+6,842)    |
-| 2025-07-26 | 100,646 (+4,229)     | 131,411 (+4,426)     | 232,057 (+8,655)     |
+| 2025-07-26 | 100,646 (+4,229)    | 131,411 (+4,426)    | 232,057 (+8,655)    |
-| 2025-07-27 | 102,644 (+1,998)     | 134,736 (+3,325)     | 237,380 (+5,323)     |
+| 2025-07-27 | 102,644 (+1,998)    | 134,736 (+3,325)    | 237,380 (+5,323)    |
-| 2025-07-28 | 105,446 (+2,802)     | 136,016 (+1,280)     | 241,462 (+4,082)     |
+| 2025-07-28 | 105,446 (+2,802)    | 136,016 (+1,280)    | 241,462 (+4,082)    |
-| 2025-07-29 | 108,998 (+3,552)     | 137,542 (+1,526)     | 246,540 (+5,078)     |
+| 2025-07-29 | 108,998 (+3,552)    | 137,542 (+1,526)    | 246,540 (+5,078)    |
-| 2025-07-30 | 113,544 (+4,546)     | 140,317 (+2,775)     | 253,861 (+7,321)     |
+| 2025-07-30 | 113,544 (+4,546)    | 140,317 (+2,775)    | 253,861 (+7,321)    |
-| 2025-07-31 | 118,339 (+4,795)     | 143,344 (+3,027)     | 261,683 (+7,822)     |
+| 2025-07-31 | 118,339 (+4,795)    | 143,344 (+3,027)    | 261,683 (+7,822)    |
-| 2025-08-01 | 123,539 (+5,200)     | 146,680 (+3,336)     | 270,219 (+8,536)     |
+| 2025-08-01 | 123,539 (+5,200)    | 146,680 (+3,336)    | 270,219 (+8,536)    |
-| 2025-08-02 | 127,864 (+4,325)     | 149,236 (+2,556)     | 277,100 (+6,881)     |
+| 2025-08-02 | 127,864 (+4,325)    | 149,236 (+2,556)    | 277,100 (+6,881)    |
-| 2025-08-03 | 131,397 (+3,533)     | 150,451 (+1,215)     | 281,848 (+4,748)     |
+| 2025-08-03 | 131,397 (+3,533)    | 150,451 (+1,215)    | 281,848 (+4,748)    |
-| 2025-08-04 | 136,266 (+4,869)     | 153,260 (+2,809)     | 289,526 (+7,678)     |
+| 2025-08-04 | 136,266 (+4,869)    | 153,260 (+2,809)    | 289,526 (+7,678)    |
-| 2025-08-05 | 141,596 (+5,330)     | 155,752 (+2,492)     | 297,348 (+7,822)     |
+| 2025-08-05 | 141,596 (+5,330)    | 155,752 (+2,492)    | 297,348 (+7,822)    |
-| 2025-08-06 | 147,067 (+5,471)     | 158,309 (+2,557)     | 305,376 (+8,028)     |
+| 2025-08-06 | 147,067 (+5,471)    | 158,309 (+2,557)    | 305,376 (+8,028)    |
-| 2025-08-07 | 152,591 (+5,524)     | 160,889 (+2,580)     | 313,480 (+8,104)     |
+| 2025-08-07 | 152,591 (+5,524)    | 160,889 (+2,580)    | 313,480 (+8,104)    |
-| 2025-08-08 | 158,187 (+5,596)     | 163,448 (+2,559)     | 321,635 (+8,155)     |
+| 2025-08-08 | 158,187 (+5,596)    | 163,448 (+2,559)    | 321,635 (+8,155)    |
-| 2025-08-09 | 162,770 (+4,583)     | 165,721 (+2,273)     | 328,491 (+6,856)     |
+| 2025-08-09 | 162,770 (+4,583)    | 165,721 (+2,273)    | 328,491 (+6,856)    |
-| 2025-08-10 | 165,695 (+2,925)     | 167,109 (+1,388)     | 332,804 (+4,313)     |
+| 2025-08-10 | 165,695 (+2,925)    | 167,109 (+1,388)    | 332,804 (+4,313)    |
-| 2025-08-11 | 169,297 (+3,602)     | 167,953 (+844)       | 337,250 (+4,446)     |
+| 2025-08-11 | 169,297 (+3,602)    | 167,953 (+844)      | 337,250 (+4,446)    |
-| 2025-08-12 | 176,307 (+7,010)     | 171,876 (+3,923)     | 348,183 (+10,933)    |
+| 2025-08-12 | 176,307 (+7,010)    | 171,876 (+3,923)    | 348,183 (+10,933)   |
-| 2025-08-13 | 182,997 (+6,690)     | 177,182 (+5,306)     | 360,179 (+11,996)    |
+| 2025-08-13 | 182,997 (+6,690)    | 177,182 (+5,306)    | 360,179 (+11,996)   |
-| 2025-08-14 | 189,063 (+6,066)     | 179,741 (+2,559)     | 368,804 (+8,625)     |
+| 2025-08-14 | 189,063 (+6,066)    | 179,741 (+2,559)    | 368,804 (+8,625)    |
-| 2025-08-15 | 193,608 (+4,545)     | 181,792 (+2,051)     | 375,400 (+6,596)     |
+| 2025-08-15 | 193,608 (+4,545)    | 181,792 (+2,051)    | 375,400 (+6,596)    |
-| 2025-08-16 | 198,118 (+4,510)     | 184,558 (+2,766)     | 382,676 (+7,276)     |
+| 2025-08-16 | 198,118 (+4,510)    | 184,558 (+2,766)    | 382,676 (+7,276)    |
-| 2025-08-17 | 201,299 (+3,181)     | 186,269 (+1,711)     | 387,568 (+4,892)     |
+| 2025-08-17 | 201,299 (+3,181)    | 186,269 (+1,711)    | 387,568 (+4,892)    |
-| 2025-08-18 | 204,559 (+3,260)     | 187,399 (+1,130)     | 391,958 (+4,390)     |
+| 2025-08-18 | 204,559 (+3,260)    | 187,399 (+1,130)    | 391,958 (+4,390)    |
-| 2025-08-19 | 209,814 (+5,255)     | 189,668 (+2,269)     | 399,482 (+7,524)     |
+| 2025-08-19 | 209,814 (+5,255)    | 189,668 (+2,269)    | 399,482 (+7,524)    |
-| 2025-08-20 | 214,497 (+4,683)     | 191,481 (+1,813)     | 405,978 (+6,496)     |
+| 2025-08-20 | 214,497 (+4,683)    | 191,481 (+1,813)    | 405,978 (+6,496)    |
-| 2025-08-21 | 220,465 (+5,968)     | 194,784 (+3,303)     | 415,249 (+9,271)     |
+| 2025-08-21 | 220,465 (+5,968)    | 194,784 (+3,303)    | 415,249 (+9,271)    |
-| 2025-08-22 | 225,899 (+5,434)     | 197,204 (+2,420)     | 423,103 (+7,854)     |
+| 2025-08-22 | 225,899 (+5,434)    | 197,204 (+2,420)    | 423,103 (+7,854)    |
-| 2025-08-23 | 229,005 (+3,106)     | 199,238 (+2,034)     | 428,243 (+5,140)     |
+| 2025-08-23 | 229,005 (+3,106)    | 199,238 (+2,034)    | 428,243 (+5,140)    |
-| 2025-08-24 | 232,098 (+3,093)     | 201,157 (+1,919)     | 433,255 (+5,012)     |
+| 2025-08-24 | 232,098 (+3,093)    | 201,157 (+1,919)    | 433,255 (+5,012)    |
-| 2025-08-25 | 236,607 (+4,509)     | 202,650 (+1,493)     | 439,257 (+6,002)     |
+| 2025-08-25 | 236,607 (+4,509)    | 202,650 (+1,493)    | 439,257 (+6,002)    |
-| 2025-08-26 | 242,783 (+6,176)     | 205,242 (+2,592)     | 448,025 (+8,768)     |
+| 2025-08-26 | 242,783 (+6,176)    | 205,242 (+2,592)    | 448,025 (+8,768)    |
-| 2025-08-27 | 248,409 (+5,626)     | 205,242 (+0)         | 453,651 (+5,626)     |
+| 2025-08-27 | 248,409 (+5,626)    | 205,242 (+0)        | 453,651 (+5,626)    |
-| 2025-08-28 | 252,796 (+4,387)     | 205,242 (+0)         | 458,038 (+4,387)     |
+| 2025-08-28 | 252,796 (+4,387)    | 205,242 (+0)        | 458,038 (+4,387)    |
-| 2025-08-29 | 256,045 (+3,249)     | 211,075 (+5,833)     | 467,120 (+9,082)     |
+| 2025-08-29 | 256,045 (+3,249)    | 211,075 (+5,833)    | 467,120 (+9,082)    |
-| 2025-08-30 | 258,863 (+2,818)     | 212,397 (+1,322)     | 471,260 (+4,140)     |
+| 2025-08-30 | 258,863 (+2,818)    | 212,397 (+1,322)    | 471,260 (+4,140)    |
-| 2025-08-31 | 262,004 (+3,141)     | 213,944 (+1,547)     | 475,948 (+4,688)     |
+| 2025-08-31 | 262,004 (+3,141)    | 213,944 (+1,547)    | 475,948 (+4,688)    |
-| 2025-09-01 | 265,359 (+3,355)     | 215,115 (+1,171)     | 480,474 (+4,526)     |
+| 2025-09-01 | 265,359 (+3,355)    | 215,115 (+1,171)    | 480,474 (+4,526)    |
-| 2025-09-02 | 270,483 (+5,124)     | 217,075 (+1,960)     | 487,558 (+7,084)     |
+| 2025-09-02 | 270,483 (+5,124)    | 217,075 (+1,960)    | 487,558 (+7,084)    |
-| 2025-09-03 | 274,793 (+4,310)     | 219,755 (+2,680)     | 494,548 (+6,990)     |
+| 2025-09-03 | 274,793 (+4,310)    | 219,755 (+2,680)    | 494,548 (+6,990)    |
-| 2025-09-04 | 280,430 (+5,637)     | 222,103 (+2,348)     | 502,533 (+7,985)     |
+| 2025-09-04 | 280,430 (+5,637)    | 222,103 (+2,348)    | 502,533 (+7,985)    |
-| 2025-09-05 | 283,769 (+3,339)     | 223,793 (+1,690)     | 507,562 (+5,029)     |
+| 2025-09-05 | 283,769 (+3,339)    | 223,793 (+1,690)    | 507,562 (+5,029)    |
-| 2025-09-06 | 286,245 (+2,476)     | 225,036 (+1,243)     | 511,281 (+3,719)     |
+| 2025-09-06 | 286,245 (+2,476)    | 225,036 (+1,243)    | 511,281 (+3,719)    |
-| 2025-09-07 | 288,623 (+2,378)     | 225,866 (+830)       | 514,489 (+3,208)     |
+| 2025-09-07 | 288,623 (+2,378)    | 225,866 (+830)      | 514,489 (+3,208)    |
-| 2025-09-08 | 293,341 (+4,718)     | 227,073 (+1,207)     | 520,414 (+5,925)     |
+| 2025-09-08 | 293,341 (+4,718)    | 227,073 (+1,207)    | 520,414 (+5,925)    |
-| 2025-09-09 | 300,036 (+6,695)     | 229,788 (+2,715)     | 529,824 (+9,410)     |
+| 2025-09-09 | 300,036 (+6,695)    | 229,788 (+2,715)    | 529,824 (+9,410)    |
-| 2025-09-10 | 307,287 (+7,251)     | 233,435 (+3,647)     | 540,722 (+10,898)    |
+| 2025-09-10 | 307,287 (+7,251)    | 233,435 (+3,647)    | 540,722 (+10,898)   |
-| 2025-09-11 | 314,083 (+6,796)     | 237,356 (+3,921)     | 551,439 (+10,717)    |
+| 2025-09-11 | 314,083 (+6,796)    | 237,356 (+3,921)    | 551,439 (+10,717)   |
-| 2025-09-12 | 321,046 (+6,963)     | 240,728 (+3,372)     | 561,774 (+10,335)    |
+| 2025-09-12 | 321,046 (+6,963)    | 240,728 (+3,372)    | 561,774 (+10,335)   |
-| 2025-09-13 | 324,894 (+3,848)     | 245,539 (+4,811)     | 570,433 (+8,659)     |
+| 2025-09-13 | 324,894 (+3,848)    | 245,539 (+4,811)    | 570,433 (+8,659)    |
-| 2025-09-14 | 328,876 (+3,982)     | 248,245 (+2,706)     | 577,121 (+6,688)     |
+| 2025-09-14 | 328,876 (+3,982)    | 248,245 (+2,706)    | 577,121 (+6,688)    |
-| 2025-09-15 | 334,201 (+5,325)     | 250,983 (+2,738)     | 585,184 (+8,063)     |
+| 2025-09-15 | 334,201 (+5,325)    | 250,983 (+2,738)    | 585,184 (+8,063)    |
-| 2025-09-16 | 342,609 (+8,408)     | 255,264 (+4,281)     | 597,873 (+12,689)    |
+| 2025-09-16 | 342,609 (+8,408)    | 255,264 (+4,281)    | 597,873 (+12,689)   |
-| 2025-09-17 | 351,117 (+8,508)     | 260,970 (+5,706)     | 612,087 (+14,214)    |
+| 2025-09-17 | 351,117 (+8,508)    | 260,970 (+5,706)    | 612,087 (+14,214)   |
-| 2025-09-18 | 358,717 (+7,600)     | 266,922 (+5,952)     | 625,639 (+13,552)    |
+| 2025-09-18 | 358,717 (+7,600)    | 266,922 (+5,952)    | 625,639 (+13,552)   |
-| 2025-09-19 | 365,401 (+6,684)     | 271,859 (+4,937)     | 637,260 (+11,621)    |
+| 2025-09-19 | 365,401 (+6,684)    | 271,859 (+4,937)    | 637,260 (+11,621)   |
-| 2025-09-20 | 372,092 (+6,691)     | 276,917 (+5,058)     | 649,009 (+11,749)    |
+| 2025-09-20 | 372,092 (+6,691)    | 276,917 (+5,058)    | 649,009 (+11,749)   |
-| 2025-09-21 | 377,079 (+4,987)     | 280,261 (+3,344)     | 657,340 (+8,331)     |
+| 2025-09-21 | 377,079 (+4,987)    | 280,261 (+3,344)    | 657,340 (+8,331)    |
-| 2025-09-22 | 382,492 (+5,413)     | 284,009 (+3,748)     | 666,501 (+9,161)     |
+| 2025-09-22 | 382,492 (+5,413)    | 284,009 (+3,748)    | 666,501 (+9,161)    |
-| 2025-09-23 | 387,008 (+4,516)     | 289,129 (+5,120)     | 676,137 (+9,636)     |
+| 2025-09-23 | 387,008 (+4,516)    | 289,129 (+5,120)    | 676,137 (+9,636)    |
-| 2025-09-24 | 393,325 (+6,317)     | 294,927 (+5,798)     | 688,252 (+12,115)    |
+| 2025-09-24 | 393,325 (+6,317)    | 294,927 (+5,798)    | 688,252 (+12,115)   |
-| 2025-09-25 | 398,879 (+5,554)     | 301,663 (+6,736)     | 700,542 (+12,290)    |
+| 2025-09-25 | 398,879 (+5,554)    | 301,663 (+6,736)    | 700,542 (+12,290)   |
-| 2025-09-26 | 404,334 (+5,455)     | 306,713 (+5,050)     | 711,047 (+10,505)    |
+| 2025-09-26 | 404,334 (+5,455)    | 306,713 (+5,050)    | 711,047 (+10,505)   |
-| 2025-09-27 | 411,618 (+7,284)     | 317,763 (+11,050)    | 729,381 (+18,334)    |
+| 2025-09-27 | 411,618 (+7,284)    | 317,763 (+11,050)   | 729,381 (+18,334)   |
-| 2025-09-28 | 414,910 (+3,292)     | 322,522 (+4,759)     | 737,432 (+8,051)     |
+| 2025-09-28 | 414,910 (+3,292)    | 322,522 (+4,759)    | 737,432 (+8,051)    |
-| 2025-09-29 | 419,919 (+5,009)     | 328,033 (+5,511)     | 747,952 (+10,520)    |
+| 2025-09-29 | 419,919 (+5,009)    | 328,033 (+5,511)    | 747,952 (+10,520)   |
-| 2025-09-30 | 427,991 (+8,072)     | 336,472 (+8,439)     | 764,463 (+16,511)    |
+| 2025-09-30 | 427,991 (+8,072)    | 336,472 (+8,439)    | 764,463 (+16,511)   |
-| 2025-10-01 | 433,591 (+5,600)     | 341,742 (+5,270)     | 775,333 (+10,870)    |
+| 2025-10-01 | 433,591 (+5,600)    | 341,742 (+5,270)    | 775,333 (+10,870)   |
-| 2025-10-02 | 440,852 (+7,261)     | 348,099 (+6,357)     | 788,951 (+13,618)    |
+| 2025-10-02 | 440,852 (+7,261)    | 348,099 (+6,357)    | 788,951 (+13,618)   |
-| 2025-10-03 | 446,829 (+5,977)     | 359,937 (+11,838)    | 806,766 (+17,815)    |
+| 2025-10-03 | 446,829 (+5,977)    | 359,937 (+11,838)   | 806,766 (+17,815)   |
-| 2025-10-04 | 452,561 (+5,732)     | 370,386 (+10,449)    | 822,947 (+16,181)    |
+| 2025-10-04 | 452,561 (+5,732)    | 370,386 (+10,449)   | 822,947 (+16,181)   |
-| 2025-10-05 | 455,559 (+2,998)     | 374,745 (+4,359)     | 830,304 (+7,357)     |
+| 2025-10-05 | 455,559 (+2,998)    | 374,745 (+4,359)    | 830,304 (+7,357)    |
-| 2025-10-06 | 460,927 (+5,368)     | 379,489 (+4,744)     | 840,416 (+10,112)    |
+| 2025-10-06 | 460,927 (+5,368)    | 379,489 (+4,744)    | 840,416 (+10,112)   |
-| 2025-10-07 | 467,336 (+6,409)     | 385,438 (+5,949)     | 852,774 (+12,358)    |
+| 2025-10-07 | 467,336 (+6,409)    | 385,438 (+5,949)    | 852,774 (+12,358)   |
-| 2025-10-08 | 474,643 (+7,307)     | 394,139 (+8,701)     | 868,782 (+16,008)    |
+| 2025-10-08 | 474,643 (+7,307)    | 394,139 (+8,701)    | 868,782 (+16,008)   |
-| 2025-10-09 | 479,203 (+4,560)     | 400,526 (+6,387)     | 879,729 (+10,947)    |
+| 2025-10-09 | 479,203 (+4,560)    | 400,526 (+6,387)    | 879,729 (+10,947)   |
-| 2025-10-10 | 484,374 (+5,171)     | 406,015 (+5,489)     | 890,389 (+10,660)    |
+| 2025-10-10 | 484,374 (+5,171)    | 406,015 (+5,489)    | 890,389 (+10,660)   |
-| 2025-10-11 | 488,427 (+4,053)     | 414,699 (+8,684)     | 903,126 (+12,737)    |
+| 2025-10-11 | 488,427 (+4,053)    | 414,699 (+8,684)    | 903,126 (+12,737)   |
-| 2025-10-12 | 492,125 (+3,698)     | 418,745 (+4,046)     | 910,870 (+7,744)     |
+| 2025-10-12 | 492,125 (+3,698)    | 418,745 (+4,046)    | 910,870 (+7,744)    |
-| 2025-10-14 | 505,130 (+13,005)    | 429,286 (+10,541)    | 934,416 (+23,546)    |
+| 2025-10-14 | 505,130 (+13,005)   | 429,286 (+10,541)   | 934,416 (+23,546)   |
-| 2025-10-15 | 512,717 (+7,587)     | 439,290 (+10,004)    | 952,007 (+17,591)    |
+| 2025-10-15 | 512,717 (+7,587)    | 439,290 (+10,004)   | 952,007 (+17,591)   |
-| 2025-10-16 | 517,719 (+5,002)     | 447,137 (+7,847)     | 964,856 (+12,849)    |
+| 2025-10-16 | 517,719 (+5,002)    | 447,137 (+7,847)    | 964,856 (+12,849)   |
-| 2025-10-17 | 526,239 (+8,520)     | 457,467 (+10,330)    | 983,706 (+18,850)    |
+| 2025-10-17 | 526,239 (+8,520)    | 457,467 (+10,330)   | 983,706 (+18,850)   |
-| 2025-10-18 | 531,564 (+5,325)     | 465,272 (+7,805)     | 996,836 (+13,130)    |
+| 2025-10-18 | 531,564 (+5,325)    | 465,272 (+7,805)    | 996,836 (+13,130)   |
-| 2025-10-19 | 536,209 (+4,645)     | 469,078 (+3,806)     | 1,005,287 (+8,451)   |
+| 2025-10-19 | 536,209 (+4,645)    | 469,078 (+3,806)    | 1,005,287 (+8,451)  |
-| 2025-10-20 | 541,264 (+5,055)     | 472,952 (+3,874)     | 1,014,216 (+8,929)   |
+| 2025-10-20 | 541,264 (+5,055)    | 472,952 (+3,874)    | 1,014,216 (+8,929)  |
-| 2025-10-21 | 548,721 (+7,457)     | 479,703 (+6,751)     | 1,028,424 (+14,208)  |
+| 2025-10-21 | 548,721 (+7,457)    | 479,703 (+6,751)    | 1,028,424 (+14,208) |
-| 2025-10-22 | 557,949 (+9,228)     | 491,395 (+11,692)    | 1,049,344 (+20,920)  |
+| 2025-10-22 | 557,949 (+9,228)    | 491,395 (+11,692)   | 1,049,344 (+20,920) |
-| 2025-10-23 | 564,716 (+6,767)     | 498,736 (+7,341)     | 1,063,452 (+14,108)  |
+| 2025-10-23 | 564,716 (+6,767)    | 498,736 (+7,341)    | 1,063,452 (+14,108) |
-| 2025-10-24 | 572,692 (+7,976)     | 506,905 (+8,169)     | 1,079,597 (+16,145)  |
+| 2025-10-24 | 572,692 (+7,976)    | 506,905 (+8,169)    | 1,079,597 (+16,145) |
-| 2025-10-25 | 578,927 (+6,235)     | 516,129 (+9,224)     | 1,095,056 (+15,459)  |
+| 2025-10-25 | 578,927 (+6,235)    | 516,129 (+9,224)    | 1,095,056 (+15,459) |
-| 2025-10-26 | 584,409 (+5,482)     | 521,179 (+5,050)     | 1,105,588 (+10,532)  |
+| 2025-10-26 | 584,409 (+5,482)    | 521,179 (+5,050)    | 1,105,588 (+10,532) |
-| 2025-10-27 | 589,999 (+5,590)     | 526,001 (+4,822)     | 1,116,000 (+10,412)  |
+| 2025-10-27 | 589,999 (+5,590)    | 526,001 (+4,822)    | 1,116,000 (+10,412) |
-| 2025-10-28 | 595,776 (+5,777)     | 532,438 (+6,437)     | 1,128,214 (+12,214)  |
+| 2025-10-28 | 595,776 (+5,777)    | 532,438 (+6,437)    | 1,128,214 (+12,214) |
-| 2025-10-29 | 606,259 (+10,483)    | 542,064 (+9,626)     | 1,148,323 (+20,109)  |
+| 2025-10-29 | 606,259 (+10,483)   | 542,064 (+9,626)    | 1,148,323 (+20,109) |
-| 2025-10-30 | 613,746 (+7,487)     | 542,064 (+0)         | 1,155,810 (+7,487)   |
+| 2025-10-30 | 613,746 (+7,487)    | 542,064 (+0)        | 1,155,810 (+7,487)  |
-| 2025-10-30 | 617,846 (+4,100)     | 555,026 (+12,962)    | 1,172,872 (+17,062)  |
+| 2025-10-30 | 617,846 (+4,100)    | 555,026 (+12,962)   | 1,172,872 (+17,062) |
-| 2025-10-31 | 626,612 (+8,766)     | 564,579 (+9,553)     | 1,191,191 (+18,319)  |
+| 2025-10-31 | 626,612 (+8,766)    | 564,579 (+9,553)    | 1,191,191 (+18,319) |
-| 2025-11-01 | 636,100 (+9,488)     | 581,806 (+17,227)    | 1,217,906 (+26,715)  |
+| 2025-11-01 | 636,100 (+9,488)    | 581,806 (+17,227)   | 1,217,906 (+26,715) |
-| 2025-11-02 | 644,067 (+7,967)     | 590,004 (+8,198)     | 1,234,071 (+16,165)  |
+| 2025-11-02 | 644,067 (+7,967)    | 590,004 (+8,198)    | 1,234,071 (+16,165) |
-| 2025-11-03 | 653,130 (+9,063)     | 597,139 (+7,135)     | 1,250,269 (+16,198)  |
+| 2025-11-03 | 653,130 (+9,063)    | 597,139 (+7,135)    | 1,250,269 (+16,198) |
-| 2025-11-04 | 663,912 (+10,782)    | 608,056 (+10,917)    | 1,271,968 (+21,699)  |
+| 2025-11-04 | 663,912 (+10,782)   | 608,056 (+10,917)   | 1,271,968 (+21,699) |
-| 2025-11-05 | 675,074 (+11,162)    | 619,690 (+11,634)    | 1,294,764 (+22,796)  |
+| 2025-11-05 | 675,074 (+11,162)   | 619,690 (+11,634)   | 1,294,764 (+22,796) |
-| 2025-11-06 | 686,252 (+11,178)    | 630,885 (+11,195)    | 1,317,137 (+22,373)  |
+| 2025-11-06 | 686,252 (+11,178)   | 630,885 (+11,195)   | 1,317,137 (+22,373) |
-| 2025-11-07 | 696,646 (+10,394)    | 642,146 (+11,261)    | 1,338,792 (+21,655)  |
+| 2025-11-07 | 696,646 (+10,394)   | 642,146 (+11,261)   | 1,338,792 (+21,655) |
-| 2025-11-08 | 706,035 (+9,389)     | 653,489 (+11,343)    | 1,359,524 (+20,732)  |
+| 2025-11-08 | 706,035 (+9,389)    | 653,489 (+11,343)   | 1,359,524 (+20,732) |
-| 2025-11-09 | 713,462 (+7,427)     | 660,459 (+6,970)     | 1,373,921 (+14,397)  |
+| 2025-11-09 | 713,462 (+7,427)    | 660,459 (+6,970)    | 1,373,921 (+14,397) |
-| 2025-11-10 | 722,288 (+8,826)     | 668,225 (+7,766)     | 1,390,513 (+16,592)  |
+| 2025-11-10 | 722,288 (+8,826)    | 668,225 (+7,766)    | 1,390,513 (+16,592) |
-| 2025-11-11 | 729,769 (+7,481)     | 677,501 (+9,276)     | 1,407,270 (+16,757)  |
+| 2025-11-11 | 729,769 (+7,481)    | 677,501 (+9,276)    | 1,407,270 (+16,757) |
-| 2025-11-12 | 740,180 (+10,411)    | 686,454 (+8,953)     | 1,426,634 (+19,364)  |
+| 2025-11-12 | 740,180 (+10,411)   | 686,454 (+8,953)    | 1,426,634 (+19,364) |
-| 2025-11-13 | 749,905 (+9,725)     | 696,157 (+9,703)     | 1,446,062 (+19,428)  |
+| 2025-11-13 | 749,905 (+9,725)    | 696,157 (+9,703)    | 1,446,062 (+19,428) |
-| 2025-11-14 | 759,928 (+10,023)    | 705,237 (+9,080)     | 1,465,165 (+19,103)  |
+| 2025-11-14 | 759,928 (+10,023)   | 705,237 (+9,080)    | 1,465,165 (+19,103) |
-| 2025-11-15 | 765,955 (+6,027)     | 712,870 (+7,633)     | 1,478,825 (+13,660)  |
+| 2025-11-15 | 765,955 (+6,027)    | 712,870 (+7,633)    | 1,478,825 (+13,660) |
-| 2025-11-16 | 771,069 (+5,114)     | 716,596 (+3,726)     | 1,487,665 (+8,840)   |
+| 2025-11-16 | 771,069 (+5,114)    | 716,596 (+3,726)    | 1,487,665 (+8,840)  |
-| 2025-11-17 | 780,161 (+9,092)     | 723,339 (+6,743)     | 1,503,500 (+15,835)  |
+| 2025-11-17 | 780,161 (+9,092)    | 723,339 (+6,743)    | 1,503,500 (+15,835) |
-| 2025-11-18 | 791,563 (+11,402)    | 732,544 (+9,205)     | 1,524,107 (+20,607)  |
+| 2025-11-18 | 791,563 (+11,402)   | 732,544 (+9,205)    | 1,524,107 (+20,607) |
-| 2025-11-19 | 804,409 (+12,846)    | 747,624 (+15,080)    | 1,552,033 (+27,926)  |
+| 2025-11-19 | 804,409 (+12,846)   | 747,624 (+15,080)   | 1,552,033 (+27,926) |
-| 2025-11-20 | 814,620 (+10,211)    | 757,907 (+10,283)    | 1,572,527 (+20,494)  |
+| 2025-11-20 | 814,620 (+10,211)   | 757,907 (+10,283)   | 1,572,527 (+20,494) |
-| 2025-11-21 | 826,309 (+11,689)    | 769,307 (+11,400)    | 1,595,616 (+23,089)  |
+| 2025-11-21 | 826,309 (+11,689)   | 769,307 (+11,400)   | 1,595,616 (+23,089) |
-| 2025-11-22 | 837,269 (+10,960)    | 780,996 (+11,689)    | 1,618,265 (+22,649)  |
+| 2025-11-22 | 837,269 (+10,960)   | 780,996 (+11,689)   | 1,618,265 (+22,649) |
-| 2025-11-23 | 846,609 (+9,340)     | 795,069 (+14,073)    | 1,641,678 (+23,413)  |
+| 2025-11-23 | 846,609 (+9,340)    | 795,069 (+14,073)   | 1,641,678 (+23,413) |
-| 2025-11-24 | 856,733 (+10,124)    | 804,033 (+8,964)     | 1,660,766 (+19,088)  |
+| 2025-11-24 | 856,733 (+10,124)   | 804,033 (+8,964)    | 1,660,766 (+19,088) |
-| 2025-11-25 | 869,423 (+12,690)    | 817,339 (+13,306)    | 1,686,762 (+25,996)  |
+| 2025-11-25 | 869,423 (+12,690)   | 817,339 (+13,306)   | 1,686,762 (+25,996) |
-| 2025-11-26 | 881,414 (+11,991)    | 832,518 (+15,179)    | 1,713,932 (+27,170)  |
+| 2025-11-26 | 881,414 (+11,991)   | 832,518 (+15,179)   | 1,713,932 (+27,170) |
-| 2025-11-27 | 893,960 (+12,546)    | 846,180 (+13,662)    | 1,740,140 (+26,208)  |
+| 2025-11-27 | 893,960 (+12,546)   | 846,180 (+13,662)   | 1,740,140 (+26,208) |
-| 2025-11-28 | 901,741 (+7,781)     | 856,482 (+10,302)    | 1,758,223 (+18,083)  |
+| 2025-11-28 | 901,741 (+7,781)    | 856,482 (+10,302)   | 1,758,223 (+18,083) |
-| 2025-11-29 | 908,689 (+6,948)     | 863,361 (+6,879)     | 1,772,050 (+13,827)  |
+| 2025-11-29 | 908,689 (+6,948)    | 863,361 (+6,879)    | 1,772,050 (+13,827) |
-| 2025-11-30 | 916,116 (+7,427)     | 870,194 (+6,833)     | 1,786,310 (+14,260)  |
+| 2025-11-30 | 916,116 (+7,427)    | 870,194 (+6,833)    | 1,786,310 (+14,260) |
-| 2025-12-01 | 925,898 (+9,782)     | 876,500 (+6,306)     | 1,802,398 (+16,088)  |
+| 2025-12-01 | 925,898 (+9,782)    | 876,500 (+6,306)    | 1,802,398 (+16,088) |
-| 2025-12-02 | 939,250 (+13,352)    | 890,919 (+14,419)    | 1,830,169 (+27,771)  |
+| 2025-12-02 | 939,250 (+13,352)   | 890,919 (+14,419)   | 1,830,169 (+27,771) |
-| 2025-12-03 | 952,249 (+12,999)    | 903,713 (+12,794)    | 1,855,962 (+25,793)  |
+| 2025-12-03 | 952,249 (+12,999)   | 903,713 (+12,794)   | 1,855,962 (+25,793) |
-| 2025-12-04 | 965,611 (+13,362)    | 916,471 (+12,758)    | 1,882,082 (+26,120)  |
+| 2025-12-04 | 965,611 (+13,362)   | 916,471 (+12,758)   | 1,882,082 (+26,120) |
-| 2025-12-05 | 977,996 (+12,385)    | 930,616 (+14,145)    | 1,908,612 (+26,530)  |
+| 2025-12-05 | 977,996 (+12,385)   | 930,616 (+14,145)   | 1,908,612 (+26,530) |
-| 2025-12-06 | 987,884 (+9,888)     | 943,773 (+13,157)    | 1,931,657 (+23,045)  |
+| 2025-12-06 | 987,884 (+9,888)    | 943,773 (+13,157)   | 1,931,657 (+23,045) |
-| 2025-12-07 | 994,046 (+6,162)     | 951,425 (+7,652)     | 1,945,471 (+13,814)  |
+| 2025-12-07 | 994,046 (+6,162)    | 951,425 (+7,652)    | 1,945,471 (+13,814) |
-| 2025-12-08 | 1,000,898 (+6,852)   | 957,149 (+5,724)     | 1,958,047 (+12,576)  |
+| 2025-12-08 | 1,000,898 (+6,852)  | 957,149 (+5,724)    | 1,958,047 (+12,576) |
-| 2025-12-09 | 1,011,488 (+10,590)  | 973,922 (+16,773)    | 1,985,410 (+27,363)  |
+| 2025-12-09 | 1,011,488 (+10,590) | 973,922 (+16,773)   | 1,985,410 (+27,363) |
-| 2025-12-10 | 1,025,891 (+14,403)  | 991,708 (+17,786)    | 2,017,599 (+32,189)  |
+| 2025-12-10 | 1,025,891 (+14,403) | 991,708 (+17,786)   | 2,017,599 (+32,189) |
-| 2025-12-11 | 1,045,110 (+19,219)  | 1,010,559 (+18,851)  | 2,055,669 (+38,070)  |
+| 2025-12-11 | 1,045,110 (+19,219) | 1,010,559 (+18,851) | 2,055,669 (+38,070) |
-| 2025-12-12 | 1,061,340 (+16,230)  | 1,030,838 (+20,279)  | 2,092,178 (+36,509)  |
+| 2025-12-12 | 1,061,340 (+16,230) | 1,030,838 (+20,279) | 2,092,178 (+36,509) |
-| 2025-12-13 | 1,073,561 (+12,221)  | 1,044,608 (+13,770)  | 2,118,169 (+25,991)  |
+| 2025-12-13 | 1,073,561 (+12,221) | 1,044,608 (+13,770) | 2,118,169 (+25,991) |
-| 2025-12-14 | 1,082,042 (+8,481)   | 1,052,425 (+7,817)   | 2,134,467 (+16,298)  |
+| 2025-12-14 | 1,082,042 (+8,481)  | 1,052,425 (+7,817)  | 2,134,467 (+16,298) |
-| 2025-12-15 | 1,093,632 (+11,590)  | 1,059,078 (+6,653)   | 2,152,710 (+18,243)  |
+| 2025-12-15 | 1,093,632 (+11,590) | 1,059,078 (+6,653)  | 2,152,710 (+18,243) |
-| 2025-12-16 | 1,120,477 (+26,845)  | 1,078,022 (+18,944)  | 2,198,499 (+45,789)  |
+| 2025-12-16 | 1,120,477 (+26,845) | 1,078,022 (+18,944) | 2,198,499 (+45,789) |
-| 2025-12-17 | 1,151,067 (+30,590)  | 1,097,661 (+19,639)  | 2,248,728 (+50,229)  |
+| 2025-12-17 | 1,151,067 (+30,590) | 1,097,661 (+19,639) | 2,248,728 (+50,229) |
-| 2025-12-18 | 1,178,658 (+27,591)  | 1,113,418 (+15,757)  | 2,292,076 (+43,348)  |
+| 2025-12-18 | 1,178,658 (+27,591) | 1,113,418 (+15,757) | 2,292,076 (+43,348) |
-| 2025-12-19 | 1,203,485 (+24,827)  | 1,129,698 (+16,280)  | 2,333,183 (+41,107)  |
+| 2025-12-19 | 1,203,485 (+24,827) | 1,129,698 (+16,280) | 2,333,183 (+41,107) |
-| 2025-12-20 | 1,223,000 (+19,515)  | 1,146,258 (+16,560)  | 2,369,258 (+36,075)  |
+| 2025-12-20 | 1,223,000 (+19,515) | 1,146,258 (+16,560) | 2,369,258 (+36,075) |
-| 2025-12-21 | 1,242,675 (+19,675)  | 1,158,909 (+12,651)  | 2,401,584 (+32,326)  |
+| 2025-12-21 | 1,242,675 (+19,675) | 1,158,909 (+12,651) | 2,401,584 (+32,326) |
-| 2025-12-22 | 1,262,522 (+19,847)  | 1,169,121 (+10,212)  | 2,431,643 (+30,059)  |
+| 2025-12-22 | 1,262,522 (+19,847) | 1,169,121 (+10,212) | 2,431,643 (+30,059) |
-| 2025-12-23 | 1,286,548 (+24,026)  | 1,186,439 (+17,318)  | 2,472,987 (+41,344)  |
+| 2025-12-23 | 1,286,548 (+24,026) | 1,186,439 (+17,318) | 2,472,987 (+41,344) |
 | 2025-12-24 | 1,309,323 (+22,775)  | 1,203,767 (+17,328)  | 2,513,090 (+40,103)  |
 | 2025-12-25 | 1,333,032 (+23,709)  | 1,217,283 (+13,516)  | 2,550,315 (+37,225)  |
 | 2025-12-26 | 1,352,411 (+19,379)  | 1,227,615 (+10,332)  | 2,580,026 (+29,711)  |
 | 2025-12-27 | 1,371,771 (+19,360)  | 1,238,236 (+10,621)  | 2,610,007 (+29,981)  |
 | 2025-12-28 | 1,390,388 (+18,617)  | 1,245,690 (+7,454)   | 2,636,078 (+26,071)  |
 | 2025-12-29 | 1,415,560 (+25,172)  | 1,257,101 (+11,411)  | 2,672,661 (+36,583)  |
 | 2025-12-30 | 1,445,450 (+29,890)  | 1,272,689 (+15,588)  | 2,718,139 (+45,478)  |
 | 2025-12-31 | 1,479,598 (+34,148)  | 1,293,235 (+20,546)  | 2,772,833 (+54,694)  |
 | 2026-01-01 | 1,508,883 (+29,285)  | 1,309,874 (+16,639)  | 2,818,757 (+45,924)  |
 | 2026-01-02 | 1,563,474 (+54,591)  | 1,320,959 (+11,085)  | 2,884,433 (+65,676)  |
 | 2026-01-03 | 1,618,065 (+54,591)  | 1,331,914 (+10,955)  | 2,949,979 (+65,546)  |
 | 2026-01-04 | 1,672,656 (+39,702)  | 1,339,883 (+7,969)   | 3,012,539 (+62,560)  |
 | 2026-01-05 | 1,738,171 (+65,515)  | 1,353,043 (+13,160)  | 3,091,214 (+78,675)  |
 | 2026-01-06 | 1,960,988 (+222,817) | 1,377,377 (+24,334)  | 3,338,365 (+247,151) |
 | 2026-01-07 | 2,123,239 (+162,251) | 1,398,648 (+21,271)  | 3,521,887 (+183,522) |
 | 2026-01-08 | 2,272,630 (+149,391) | 1,432,480 (+33,832)  | 3,705,110 (+183,223) |
 | 2026-01-09 | 2,443,565 (+170,935) | 1,469,451 (+36,971)  | 3,913,016 (+207,906) |
 | 2026-01-10 | 2,632,023 (+188,458) | 1,503,670 (+34,219)  | 4,135,693 (+222,677) |
 | 2026-01-11 | 2,836,394 (+204,371) | 1,530,479 (+26,809)  | 4,366,873 (+231,180) |
 | 2026-01-12 | 3,053,594 (+217,200) | 1,553,671 (+23,192)  | 4,607,265 (+240,392) |
 | 2026-01-13 | 3,297,078 (+243,484) | 1,595,062 (+41,391)  | 4,892,140 (+284,875) |
 | 2026-01-14 | 3,568,928 (+271,850) | 1,645,362 (+50,300)  | 5,214,290 (+322,150) |
 | 2026-01-16 | 4,121,550 (+552,622) | 1,754,418 (+109,056) | 5,875,968 (+661,678) |
 | 2026-01-17 | 4,389,558 (+268,008) | 1,805,315 (+50,897)  | 6,194,873 (+318,905) |
@@ -1,71 +1,12 @@
 ## Style Guide
- Keep things in one function unless composable or reusable
+- Try to keep things in one function unless composable or reusable
- Avoid unnecessary destructuring. Instead of `const { a, b } = obj`, use `obj.a` and `obj.b` to preserve context
+- DO NOT do unnecessary destructuring of variables
- Avoid `try`/`catch` where possible
+- DO NOT use `else` statements unless necessary
- Avoid using the `any` type
+- DO NOT use `try`/`catch` if it can be avoided
- Prefer single word variable names where possible
+- AVOID `try`/`catch` where possible
- Use Bun APIs when possible, like `Bun.file()`
+- AVOID `else` statements
-
+- AVOID using `any` type
-# Avoid let statements
+- AVOID `let` statements
-
+- PREFER single word variable names where possible
-We don't like `let` statements, especially combined with if/else statements.
+- Use as many bun apis as possible like Bun.file()
 Prefer `const`.
 Good:
 ```ts
 const foo = condition ? 1 : 2
 ```
 Bad:
 ```ts
 let foo
 if (condition) foo = 1
 else foo = 2
 ```
 # Avoid else statements
 Prefer early returns or using an `iife` to avoid else statements.
 Good:
 ```ts
 function foo() {
  if (condition) return 1
  return 2
 }
 ```
 Bad:
 ```ts
 function foo() {
  if (condition) return 1
  else return 2
 }
 ```
 # Prefer single word naming
 Try your best to find a single word name for your variables, functions, etc.
 Only use multiple words if you cannot.
 Good:
 ```ts
 const foo = 1
 const bar = 2
 const baz = 3
 ```
 Bad:
 ```ts
 const fooBar = 1
 const barBaz = 2
 const bazFoo = 3
 ```
@@ -1,6 +1,2 @@
 [install]
 exact = true
 [test]
 root = "./do-not-run-tests-from-root"
@@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1768456270,
+        "lastModified": 1766410818,
-        "narHash": "sha256-NgaL2CCiUR6nsqUIY4yxkzz07iQUlUCany44CFv+OxY=",
+        "narHash": "sha256-ruVneSx6wFy5PMw1ow3BE+znl653TJ6+eeNUj4B/9y8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "f4606b01b39e09065df37905a2133905246db9ed",
+        "rev": "3a7affa77a5a539afa1c7859e2c31abdb1aeadf3",
        "type": "github"
      },
      "original": {
@@ -7,7 +7,6 @@
  outputs =
    {
      self,
      nixpkgs,
      ...
    }:
@@ -18,7 +17,7 @@
        "aarch64-darwin"
        "x86_64-darwin"
      ];
-      inherit (nixpkgs) lib;
+      lib = nixpkgs.lib;
      forEachSystem = lib.genAttrs systems;
      pkgsFor = system: nixpkgs.legacyPackages.${system};
      packageJson = builtins.fromJSON (builtins.readFile ./packages/opencode/package.json);
@@ -28,28 +27,11 @@
        "aarch64-darwin" = "bun-darwin-arm64";
        "x86_64-darwin" = "bun-darwin-x64";
      };
-
+      defaultNodeModules = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
      # Parse "bun-{os}-{cpu}" to {os, cpu}
      parseBunTarget =
        target:
        let
          parts = lib.splitString "-" target;
        in
        {
          os = builtins.elemAt parts 1;
          cpu = builtins.elemAt parts 2;
        };
      hashesFile = "${./nix}/hashes.json";
      hashesData =
        if builtins.pathExists hashesFile then builtins.fromJSON (builtins.readFile hashesFile) else { };
-      # Lookup hash: supports per-system ({system: hash}) or legacy single hash
+      nodeModulesHash = hashesData.nodeModules or defaultNodeModules;
      nodeModulesHashFor =
        system:
        if builtins.isAttrs hashesData.nodeModules then
          hashesData.nodeModules.${system}
        else
          hashesData.nodeModules;
      modelsDev = forEachSystem (
        system:
        let
@@ -81,36 +63,44 @@
        system:
        let
          pkgs = pkgsFor system;
          bunPlatform = parseBunTarget bunTarget.${system};
          mkNodeModules = pkgs.callPackage ./nix/node-modules.nix {
-            hash = nodeModulesHashFor system;
+            hash = nodeModulesHash;
            bunCpu = bunPlatform.cpu;
            bunOs = bunPlatform.os;
          };
-          mkOpencode = pkgs.callPackage ./nix/opencode.nix { };
+          mkPackage = pkgs.callPackage ./nix/opencode.nix { };
-          mkDesktop = pkgs.callPackage ./nix/desktop.nix { };
+        in
-
+        {
-          opencodePkg = mkOpencode {
+          default = mkPackage {
-            inherit (packageJson) version;
+            version = packageJson.version;
            src = ./.;
            scripts = ./nix/scripts;
            target = bunTarget.${system};
            modelsDev = "${modelsDev.${system}}/dist/_api.json";
            inherit mkNodeModules;
          };
          desktopPkg = mkDesktop {
            inherit (packageJson) version;
            src = ./.;
            scripts = ./nix/scripts;
            mkNodeModules = mkNodeModules;
            opencode = opencodePkg;
          };
        }
      );
      apps = forEachSystem (
        system:
        let
          pkgs = pkgsFor system;
        in
        {
-          default = self.packages.${system}.opencode;
+          opencode-dev = {
-          opencode = opencodePkg;
+            type = "app";
-          desktop = desktopPkg;
+            meta = {
              description = "Nix devshell shell for OpenCode";
              runtimeInputs = [ pkgs.bun ];
            };
            program = "${
              pkgs.writeShellApplication {
                name = "opencode-dev";
                text = ''
                  exec bun run dev "$@"
                '';
              }
            }/bin/opencode-dev";
          };
        }
      );
    };
@@ -81,14 +81,13 @@ This will walk you through installing the GitHub app, creating the workflow, and
       permissions:
         id-token: write
       steps:
-          - name: Checkout repository
+         - name: Checkout repository
-            uses: actions/checkout@v6
+           uses: actions/checkout@v4
-            with:
+           with:
-              fetch-depth: 1
+             fetch-depth: 1
              persist-credentials: false
-          - name: Run opencode
+         - name: Run opencode
-           uses: anomalyco/opencode/github@latest
+           uses: sst/opencode/github@latest
           env:
             ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
           with:
@@ -99,7 +98,7 @@ This will walk you through installing the GitHub app, creating the workflow, and
 ## Support
-This is an early release. If you encounter issues or have feedback, please create an issue at https://github.com/anomalyco/opencode/issues.
+This is an early release. If you encounter issues or have feedback, please create an issue at https://github.com/sst/opencode/issues.
 ## Development
@@ -41,7 +41,7 @@ runs:
      id: version
      shell: bash
      run: |
-        VERSION=$(curl -sf https://api.github.com/repos/anomalyco/opencode/releases/latest | grep -o '"tag_name": *"[^"]*"' | cut -d'"' -f4)
+        VERSION=$(curl -sf https://api.github.com/repos/sst/opencode/releases/latest | grep -o '"tag_name": *"[^"]*"' | cut -d'"' -f4)
        echo "version=${VERSION:-latest}" >> $GITHUB_OUTPUT
    - name: Cache opencode
@@ -281,7 +281,7 @@ async function assertOpencodeConnected() {
      connected = true
      break
    } catch (e) {}
-    await Bun.sleep(300)
+    await new Promise((resolve) => setTimeout(resolve, 300))
  } while (retry++ < 30)
  if (!connected) {
@@ -3,7 +3,6 @@
  "module": "index.ts",
  "type": "module",
  "private": true,
  "license": "MIT",
  "devDependencies": {
    "@types/bun": "catalog:"
  },
@@ -76,7 +76,6 @@ export const stripeWebhook = new stripe.WebhookEndpoint("StripeWebhookEndpoint",
    "checkout.session.completed",
    "checkout.session.expired",
    "charge.refunded",
    "invoice.payment_succeeded",
    "customer.created",
    "customer.deleted",
    "customer.updated",
@@ -98,32 +97,14 @@ export const stripeWebhook = new stripe.WebhookEndpoint("StripeWebhookEndpoint",
  ],
 })
 const zenProduct = new stripe.Product("ZenBlack", {
  name: "OpenCode Black",
 })
 const zenPrice = new stripe.Price("ZenBlackPrice", {
  product: zenProduct.id,
  unitAmount: 20000,
  currency: "usd",
  recurring: {
    interval: "month",
    intervalCount: 1,
  },
 })
 const ZEN_MODELS = [
  new sst.Secret("ZEN_MODELS1"),
  new sst.Secret("ZEN_MODELS2"),
  new sst.Secret("ZEN_MODELS3"),
  new sst.Secret("ZEN_MODELS4"),
  new sst.Secret("ZEN_MODELS5"),
  new sst.Secret("ZEN_MODELS6"),
  new sst.Secret("ZEN_MODELS7"),
  new sst.Secret("ZEN_MODELS8"),
 ]
 const ZEN_BLACK = new sst.Secret("ZEN_BLACK")
 const STRIPE_SECRET_KEY = new sst.Secret("STRIPE_SECRET_KEY")
 const STRIPE_PUBLISHABLE_KEY = new sst.Secret("STRIPE_PUBLISHABLE_KEY")
 const AUTH_API_URL = new sst.Linkable("AUTH_API_URL", {
  properties: { value: auth.url.apply((url) => url!) },
 })
@@ -164,8 +145,6 @@ new sst.cloudflare.x.SolidStart("Console", {
    EMAILOCTOPUS_API_KEY,
    AWS_SES_ACCESS_KEY_ID,
    AWS_SES_SECRET_ACCESS_KEY,
    ZEN_BLACK,
    new sst.Secret("ZEN_SESSION_SECRET"),
    ...ZEN_MODELS,
    ...($dev
      ? [
@@ -179,7 +158,6 @@ new sst.cloudflare.x.SolidStart("Console", {
    //VITE_DOCS_URL: web.url.apply((url) => url!),
    //VITE_API_URL: gateway.url.apply((url) => url!),
    VITE_AUTH_URL: auth.url.apply((url) => url!),
    VITE_STRIPE_PUBLISHABLE_KEY: STRIPE_PUBLISHABLE_KEY.value,
  },
  transform: {
    server: {
@@ -16,19 +16,16 @@ Usage: install.sh [options]
 Options:
    -h, --help              Display this help message
    -v, --version <version> Install a specific version (e.g., 1.0.180)
    -b, --binary <path>     Install from a local binary instead of downloading
        --no-modify-path    Don't modify shell config files (.zshrc, .bashrc, etc.)
 Examples:
    curl -fsSL https://opencode.ai/install | bash
    curl -fsSL https://opencode.ai/install | bash -s -- --version 1.0.180
    ./install --binary /path/to/opencode
 EOF
 }
 requested_version=${VERSION:-}
 no_modify_path=false
 binary_path=""
 while [[ $# -gt 0 ]]; do
    case "$1" in
@@ -45,15 +42,6 @@ while [[ $# -gt 0 ]]; do
                exit 1
            fi
            ;;
        -b|--binary)
            if [[ -n "${2:-}" ]]; then
                binary_path="$2"
                shift 2
            else
                echo -e "${RED}Error: --binary requires a path argument${NC}"
                exit 1
            fi
            ;;
        --no-modify-path)
            no_modify_path=true
            shift
@@ -65,129 +53,110 @@ while [[ $# -gt 0 ]]; do
    esac
 done
 raw_os=$(uname -s)
 os=$(echo "$raw_os" | tr '[:upper:]' '[:lower:]')
 case "$raw_os" in
  Darwin*) os="darwin" ;;
  Linux*) os="linux" ;;
  MINGW*|MSYS*|CYGWIN*) os="windows" ;;
 esac
 arch=$(uname -m)
 if [[ "$arch" == "aarch64" ]]; then
  arch="arm64"
 fi
 if [[ "$arch" == "x86_64" ]]; then
  arch="x64"
 fi
 if [ "$os" = "darwin" ] && [ "$arch" = "x64" ]; then
  rosetta_flag=$(sysctl -n sysctl.proc_translated 2>/dev/null || echo 0)
  if [ "$rosetta_flag" = "1" ]; then
    arch="arm64"
  fi
 fi
 combo="$os-$arch"
 case "$combo" in
  linux-x64|linux-arm64|darwin-x64|darwin-arm64|windows-x64)
    ;;
  *)
    echo -e "${RED}Unsupported OS/Arch: $os/$arch${NC}"
    exit 1
    ;;
 esac
 archive_ext=".zip"
 if [ "$os" = "linux" ]; then
  archive_ext=".tar.gz"
 fi
 is_musl=false
 if [ "$os" = "linux" ]; then
  if [ -f /etc/alpine-release ]; then
    is_musl=true
  fi
  if command -v ldd >/dev/null 2>&1; then
    if ldd --version 2>&1 | grep -qi musl; then
      is_musl=true
    fi
  fi
 fi
 needs_baseline=false
 if [ "$arch" = "x64" ]; then
  if [ "$os" = "linux" ]; then
    if ! grep -qi avx2 /proc/cpuinfo 2>/dev/null; then
      needs_baseline=true
    fi
  fi
  if [ "$os" = "darwin" ]; then
    avx2=$(sysctl -n hw.optional.avx2_0 2>/dev/null || echo 0)
    if [ "$avx2" != "1" ]; then
      needs_baseline=true
    fi
  fi
 fi
 target="$os-$arch"
 if [ "$needs_baseline" = "true" ]; then
  target="$target-baseline"
 fi
 if [ "$is_musl" = "true" ]; then
  target="$target-musl"
 fi
 filename="$APP-$target$archive_ext"
 if [ "$os" = "linux" ]; then
    if ! command -v tar >/dev/null 2>&1; then
         echo -e "${RED}Error: 'tar' is required but not installed.${NC}"
         exit 1
    fi
 else
    if ! command -v unzip >/dev/null 2>&1; then
        echo -e "${RED}Error: 'unzip' is required but not installed.${NC}"
        exit 1
    fi
 fi
 INSTALL_DIR=$HOME/.opencode/bin
 mkdir -p "$INSTALL_DIR"
-# If --binary is provided, skip all download/detection logic
+if [ -z "$requested_version" ]; then
-if [ -n "$binary_path" ]; then
+    url="https://github.com/sst/opencode/releases/latest/download/$filename"
-    if [ ! -f "$binary_path" ]; then
+    specific_version=$(curl -s https://api.github.com/repos/sst/opencode/releases/latest | sed -n 's/.*"tag_name": *"v\([^"]*\)".*/\1/p')
-        echo -e "${RED}Error: Binary not found at ${binary_path}${NC}"
+
    if [[ $? -ne 0 || -z "$specific_version" ]]; then
        echo -e "${RED}Failed to fetch version information${NC}"
        exit 1
    fi
    specific_version="local"
 else
-    raw_os=$(uname -s)
+    url="https://github.com/sst/opencode/releases/download/v${requested_version}/$filename"
-    os=$(echo "$raw_os" | tr '[:upper:]' '[:lower:]')
+    specific_version=$requested_version
    case "$raw_os" in
      Darwin*) os="darwin" ;;
      Linux*) os="linux" ;;
      MINGW*|MSYS*|CYGWIN*) os="windows" ;;
    esac
    arch=$(uname -m)
    if [[ "$arch" == "aarch64" ]]; then
      arch="arm64"
    fi
    if [[ "$arch" == "x86_64" ]]; then
      arch="x64"
    fi
    if [ "$os" = "darwin" ] && [ "$arch" = "x64" ]; then
      rosetta_flag=$(sysctl -n sysctl.proc_translated 2>/dev/null || echo 0)
      if [ "$rosetta_flag" = "1" ]; then
        arch="arm64"
      fi
    fi
    combo="$os-$arch"
    case "$combo" in
      linux-x64|linux-arm64|darwin-x64|darwin-arm64|windows-x64)
        ;;
      *)
        echo -e "${RED}Unsupported OS/Arch: $os/$arch${NC}"
        exit 1
        ;;
    esac
    archive_ext=".zip"
    if [ "$os" = "linux" ]; then
      archive_ext=".tar.gz"
    fi
    is_musl=false
    if [ "$os" = "linux" ]; then
      if [ -f /etc/alpine-release ]; then
        is_musl=true
      fi
      if command -v ldd >/dev/null 2>&1; then
        if ldd --version 2>&1 | grep -qi musl; then
          is_musl=true
        fi
      fi
    fi
    needs_baseline=false
    if [ "$arch" = "x64" ]; then
      if [ "$os" = "linux" ]; then
        if ! grep -qi avx2 /proc/cpuinfo 2>/dev/null; then
          needs_baseline=true
        fi
      fi
      if [ "$os" = "darwin" ]; then
        avx2=$(sysctl -n hw.optional.avx2_0 2>/dev/null || echo 0)
        if [ "$avx2" != "1" ]; then
          needs_baseline=true
        fi
      fi
    fi
    target="$os-$arch"
    if [ "$needs_baseline" = "true" ]; then
      target="$target-baseline"
    fi
    if [ "$is_musl" = "true" ]; then
      target="$target-musl"
    fi
    filename="$APP-$target$archive_ext"
    if [ "$os" = "linux" ]; then
        if ! command -v tar >/dev/null 2>&1; then
             echo -e "${RED}Error: 'tar' is required but not installed.${NC}"
             exit 1
        fi
    else
        if ! command -v unzip >/dev/null 2>&1; then
            echo -e "${RED}Error: 'unzip' is required but not installed.${NC}"
            exit 1
        fi
    fi
    if [ -z "$requested_version" ]; then
        url="https://github.com/anomalyco/opencode/releases/latest/download/$filename"
        specific_version=$(curl -s https://api.github.com/repos/anomalyco/opencode/releases/latest | sed -n 's/.*"tag_name": *"v\([^"]*\)".*/\1/p')
        if [[ $? -ne 0 || -z "$specific_version" ]]; then
            echo -e "${RED}Failed to fetch version information${NC}"
            exit 1
        fi
    else
        # Strip leading 'v' if present
        requested_version="${requested_version#v}"
        url="https://github.com/anomalyco/opencode/releases/download/v${requested_version}/$filename"
        specific_version=$requested_version
        # Verify the release exists before downloading
        http_status=$(curl -sI -o /dev/null -w "%{http_code}" "https://github.com/anomalyco/opencode/releases/tag/v${requested_version}")
        if [ "$http_status" = "404" ]; then
            echo -e "${RED}Error: Release v${requested_version} not found${NC}"
            echo -e "${MUTED}Available releases: https://github.com/anomalyco/opencode/releases${NC}"
            exit 1
        fi
    fi
 fi
 print_message() {
@@ -208,8 +177,11 @@ check_version() {
    if command -v opencode >/dev/null 2>&1; then
        opencode_path=$(which opencode)
-        ## Check the installed version
+
-        installed_version=$(opencode --version 2>/dev/null || echo "")
+        ## TODO: check if version is installed
        # installed_version=$(opencode version)
        installed_version="0.0.1"
        installed_version=$(echo $installed_version | awk '{print $2}')
        if [[ "$installed_version" != "$specific_version" ]]; then
            print_message info "${MUTED}Installed version: ${NC}$installed_version."
@@ -285,11 +257,11 @@ download_with_progress() {
    {
        local length=0
        local bytes=0
-
+        
        while IFS=" " read -r -a line; do
            [ "${#line[@]}" -lt 2 ] && continue
            local tag="${line[0]} ${line[1]}"
-
+            
            if [ "$tag" = "0000: content-length:" ]; then
                length="${line[2]}"
                length=$(echo "$length" | tr -d '\r')
@@ -314,7 +286,7 @@ download_and_install() {
    print_message info "\n${MUTED}Installing ${NC}opencode ${MUTED}version: ${NC}$specific_version"
    local tmp_dir="${TMPDIR:-/tmp}/opencode_install_$$"
    mkdir -p "$tmp_dir"
-
+    
    if [[ "$os" == "windows" ]] || ! [ -t 2 ] || ! download_with_progress "$url" "$tmp_dir/$filename"; then
        # Fallback to standard curl on Windows, non-TTY environments, or if custom progress fails
        curl -# -L -o "$tmp_dir/$filename" "$url"
@@ -325,24 +297,14 @@ download_and_install() {
    else
        unzip -q "$tmp_dir/$filename" -d "$tmp_dir"
    fi
-
+    
    mv "$tmp_dir/opencode" "$INSTALL_DIR"
    chmod 755 "${INSTALL_DIR}/opencode"
    rm -rf "$tmp_dir"
 }
-install_from_binary() {
+check_version
-    print_message info "\n${MUTED}Installing ${NC}opencode ${MUTED}from: ${NC}$binary_path"
+download_and_install
    cp "$binary_path" "${INSTALL_DIR}/opencode"
    chmod 755 "${INSTALL_DIR}/opencode"
 }
 if [ -n "$binary_path" ]; then
    install_from_binary
 else
    check_version
    download_and_install
 fi
 add_to_path() {
@@ -369,7 +331,7 @@ case $current_shell in
        config_files="$HOME/.config/fish/config.fish"
    ;;
    zsh)
-        config_files="${ZDOTDIR:-$HOME}/.zshrc ${ZDOTDIR:-$HOME}/.zshenv $XDG_CONFIG_HOME/zsh/.zshrc $XDG_CONFIG_HOME/zsh/.zshenv"
+        config_files="$HOME/.zshrc $HOME/.zshenv $XDG_CONFIG_HOME/zsh/.zshrc $XDG_CONFIG_HOME/zsh/.zshenv"
    ;;
    bash)
        config_files="$HOME/.bashrc $HOME/.bash_profile $HOME/.profile $XDG_CONFIG_HOME/bash/.bashrc $XDG_CONFIG_HOME/bash/.bash_profile"
@@ -444,3 +406,4 @@ echo -e ""
 echo -e "${MUTED}For more information visit ${NC}https://opencode.ai/docs"
 echo -e ""
 echo -e ""
@@ -1,167 +0,0 @@
 {
  lib,
  stdenv,
  rustPlatform,
  bun,
  pkg-config,
  dbus ? null,
  openssl,
  glib ? null,
  gtk3 ? null,
  libsoup_3 ? null,
  webkitgtk_4_1 ? null,
  librsvg ? null,
  libappindicator-gtk3 ? null,
  cargo,
  rustc,
  makeBinaryWrapper,
  copyDesktopItems,
  makeDesktopItem,
  nodejs,
  jq,
 }:
 args:
 let
  scripts = args.scripts;
  mkModules =
    attrs:
    args.mkNodeModules (
      attrs
      // {
        canonicalizeScript = scripts + "/canonicalize-node-modules.ts";
        normalizeBinsScript = scripts + "/normalize-bun-binaries.ts";
      }
    );
 in
 rustPlatform.buildRustPackage rec {
  pname = "opencode-desktop";
  version = args.version;
  src = args.src;
  # We need to set the root for cargo, but we also need access to the whole repo.
  postUnpack = ''
    # Update sourceRoot to point to the tauri app
    sourceRoot+=/packages/desktop/src-tauri
  '';
  cargoLock = {
    lockFile = ../packages/desktop/src-tauri/Cargo.lock;
    allowBuiltinFetchGit = true;
  };
  node_modules = mkModules {
    version = version;
    src = src;
  };
  nativeBuildInputs = [
    pkg-config
    bun
    makeBinaryWrapper
    copyDesktopItems
    cargo
    rustc
    nodejs
    jq
  ];
  # based on packages/desktop/src-tauri/release/appstream.metainfo.xml
  desktopItems = lib.optionals stdenv.isLinux [
    (makeDesktopItem {
      name = "ai.opencode.opencode";
      desktopName = "OpenCode";
      comment = "Open source AI coding agent";
      exec = "opencode-desktop";
      icon = "opencode";
      terminal = false;
      type = "Application";
      categories = [ "Development" "IDE" ];
      startupWMClass = "opencode";
    })
  ];
  buildInputs = [
    openssl
  ]
  ++ lib.optionals stdenv.isLinux [
    dbus
    glib
    gtk3
    libsoup_3
    webkitgtk_4_1
    librsvg
    libappindicator-gtk3
  ];
  preBuild = ''
    # Restore node_modules
    pushd ../../..
    # Copy node_modules from the fixed-output derivation
    # We use cp -r --no-preserve=mode to ensure we can write to them if needed,
    # though we usually just read.
    cp -r ${node_modules}/node_modules .
    cp -r ${node_modules}/packages .
    # Ensure node_modules is writable so patchShebangs can update script headers
    chmod -R u+w node_modules
    # Ensure workspace packages are writable for tsgo incremental outputs (.tsbuildinfo)
    chmod -R u+w packages
    # Patch shebangs so scripts can run
    patchShebangs node_modules
    # Copy sidecar
    mkdir -p packages/desktop/src-tauri/sidecars
    targetTriple=${stdenv.hostPlatform.rust.rustcTarget}
    cp ${args.opencode}/bin/opencode packages/desktop/src-tauri/sidecars/opencode-cli-$targetTriple
    # Merge prod config into tauri.conf.json
    if ! jq -s '.[0] * .[1]' \
      packages/desktop/src-tauri/tauri.conf.json \
      packages/desktop/src-tauri/tauri.prod.conf.json \
      > packages/desktop/src-tauri/tauri.conf.json.tmp; then
      echo "Error: failed to merge tauri.conf.json with tauri.prod.conf.json" >&2
      exit 1
    fi
    mv packages/desktop/src-tauri/tauri.conf.json.tmp packages/desktop/src-tauri/tauri.conf.json
    # Build the frontend
    cd packages/desktop
    # The 'build' script runs 'bun run typecheck && vite build'.
    bun run build
    popd
  '';
  # Tauri bundles the assets during the rust build phase (which happens after preBuild).
  # It looks for them in the location specified in tauri.conf.json.
  postInstall = lib.optionalString stdenv.isLinux ''
    # Install icon
    mkdir -p $out/share/icons/hicolor/128x128/apps
    cp ../../../packages/desktop/src-tauri/icons/prod/128x128.png $out/share/icons/hicolor/128x128/apps/opencode.png
    # Wrap the binary to ensure it finds the libraries
    wrapProgram $out/bin/opencode-desktop \
      --prefix LD_LIBRARY_PATH : ${
        lib.makeLibraryPath [
          gtk3
          webkitgtk_4_1
          librsvg
          glib
          libsoup_3
        ]
      }
  '';
  meta = with lib; {
    description = "OpenCode Desktop App";
    homepage = "https://opencode.ai";
    license = licenses.mit;
    maintainers = with maintainers; [ ];
    mainProgram = "opencode-desktop";
    platforms = platforms.linux ++ platforms.darwin;
  };
 }
@@ -1,8 +1,3 @@
 {
-  "nodeModules": {
+  "nodeModules": "sha256-CDOAY2h2AAcSuVqV1uyxDmfzSa/vV8lnXOKDgAC4mgg="
    "x86_64-linux": "sha256-4zchRpxzvHnPMcwumgL9yaX0deIXS5IGPp131eYsSvg=",
    "aarch64-linux": "sha256-3/BSRsl5pI0Iz3qAFZxIkOehFLZ2Ox9UsbdDHYzqlVg=",
    "aarch64-darwin": "sha256-86d/G1q6xiHSSlm+/irXoKLb/yLQbV348uuSrBV70+Q=",
    "x86_64-darwin": "sha256-WYaP44PWRGtoG1DIuUJUH4DvuaCuFhlJZ9fPzGsiIfE="
  }
 }
@@ -1,28 +1,18 @@
-{
+{ hash, lib, stdenvNoCC, bun, cacert, curl }:
  hash,
  lib,
  stdenvNoCC,
  bun,
  cacert,
  curl,
  bunCpu,
  bunOs,
 }:
 args:
 stdenvNoCC.mkDerivation {
  pname = "opencode-node_modules";
-  inherit (args) version src;
+  version = args.version;
  src = args.src;
-  impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+  impureEnvVars =
-    "GIT_PROXY_COMMAND"
+    lib.fetchers.proxyImpureEnvVars
-    "SOCKS_SERVER"
+    ++ [
-  ];
+      "GIT_PROXY_COMMAND"
      "SOCKS_SERVER"
    ];
-  nativeBuildInputs = [
+  nativeBuildInputs = [ bun cacert curl ];
    bun
    cacert
    curl
  ];
  dontConfigure = true;
@@ -31,8 +21,8 @@ stdenvNoCC.mkDerivation {
    export HOME=$(mktemp -d)
    export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
    bun install \
-      --cpu="${bunCpu}" \
+      --cpu="*" \
-      --os="${bunOs}" \
+      --os="*" \
      --frozen-lockfile \
      --ignore-scripts \
      --no-progress \
@@ -1,13 +1,7 @@
-{
+{ lib, stdenvNoCC, bun, ripgrep, makeBinaryWrapper }:
  lib,
  stdenvNoCC,
  bun,
  ripgrep,
  makeBinaryWrapper,
 }:
 args:
 let
-  inherit (args) scripts;
+  scripts = args.scripts;
  mkModules =
    attrs:
    args.mkNodeModules (
@@ -20,10 +14,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "opencode";
-  inherit (args) version src;
+  version = args.version;
  src = args.src;
  node_modules = mkModules {
-    inherit (finalAttrs) version src;
+    version = finalAttrs.version;
    src = finalAttrs.src;
  };
  nativeBuildInputs = [
@@ -125,7 +122,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
      It combines a TypeScript/JavaScript core with a Go-based TUI
      to provide an interactive AI coding experience.
    '';
-    homepage = "https://github.com/anomalyco/opencode";
+    homepage = "https://github.com/sst/opencode";
    license = lib.licenses.mit;
    platforms = [
      "aarch64-linux"
@@ -60,12 +60,7 @@ const result = await Bun.build({
  compile: {
    target,
    outfile: "opencode",
-    autoloadBunfig: false,
+    execArgv: ["--user-agent=opencode/" + version, '--env-file=""', "--"],
    autoloadDotenv: false,
    //@ts-ignore (bun types aren't up to date)
    autoloadTsconfig: true,
    autoloadPackageJson: true,
    execArgv: ["--user-agent=opencode/" + version, "--use-system-ca", "--"],
    windows: {},
  },
 })
@@ -31,13 +31,9 @@ for (const [name, wasmPath] of byName) {
 next = next.replaceAll("tree-sitter.wasm", mainWasm).replaceAll("web-tree-sitter/tree-sitter.wasm", mainWasm)
 // Collapse any relative prefixes before absolute store paths (e.g., "../../../..//nix/store/...")
 const nixStorePrefix = process.env.NIX_STORE || "/nix/store"
 next = next.replace(/(\.\/)+/g, "./")
-next = next.replace(
+next = next.replace(/(\.\.\/)+\/?(\/nix\/store[^"']+)/g, "/$2")
-  new RegExp(`(\\.\\.\\/)+\\/{1,2}(${nixStorePrefix.replace(/^\//, "").replace(/\//g, "\\/")}[^"']+)`, "g"),
+next = next.replace(/(["'])\/{2,}(\/nix\/store[^"']+)(["'])/g, "$1/$2$3")
-  "/$2",
+next = next.replace(/(["'])\/\/(nix\/store[^"']+)(["'])/g, "$1/$2$3")
 )
 next = next.replace(new RegExp(`(["'])\\/{2,}(\\/${nixStorePrefix.replace(/\//g, "\\/")}[^"']+)(["'])`, "g"), "$1$2$3")
 next = next.replace(new RegExp(`(["'])\\/\\/(${nixStorePrefix.replace(/\//g, "\\/")}[^"']+)(["'])`, "g"), "$1$2$3")
 if (next !== content) fs.writeFileSync(file, next)
@@ -0,0 +1,112 @@
 #!/usr/bin/env bash
 set -euo pipefail
 DUMMY="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
 SYSTEM=${SYSTEM:-x86_64-linux}
 DEFAULT_HASH_FILE=${MODULES_HASH_FILE:-nix/hashes.json}
 HASH_FILE=${HASH_FILE:-$DEFAULT_HASH_FILE}
 if [ ! -f "$HASH_FILE" ]; then
  cat >"$HASH_FILE" <<EOF
 {
  "nodeModules": "$DUMMY"
 }
 EOF
 fi
 if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
  if ! git ls-files --error-unmatch "$HASH_FILE" >/dev/null 2>&1; then
    git add -N "$HASH_FILE" >/dev/null 2>&1 || true
  fi
 fi
 export DUMMY
 export NIX_KEEP_OUTPUTS=1
 export NIX_KEEP_DERIVATIONS=1
 cleanup() {
  rm -f "${JSON_OUTPUT:-}" "${BUILD_LOG:-}" "${TMP_EXPR:-}"
 }
 trap cleanup EXIT
 write_node_modules_hash() {
  local value="$1"
  local temp
  temp=$(mktemp)
  jq --arg value "$value" '.nodeModules = $value' "$HASH_FILE" >"$temp"
  mv "$temp" "$HASH_FILE"
 }
 TARGET="packages.${SYSTEM}.default"
 MODULES_ATTR=".#packages.${SYSTEM}.default.node_modules"
 CORRECT_HASH=""
 DRV_PATH="$(nix eval --raw "${MODULES_ATTR}.drvPath")"
 echo "Setting dummy node_modules outputHash for ${SYSTEM}..."
 write_node_modules_hash "$DUMMY"
 BUILD_LOG=$(mktemp)
 JSON_OUTPUT=$(mktemp)
 echo "Building node_modules for ${SYSTEM} to discover correct outputHash..."
 echo "Attempting to realize derivation: ${DRV_PATH}"
 REALISE_OUT=$(nix-store --realise "$DRV_PATH" --keep-failed 2>&1 | tee "$BUILD_LOG" || true)
 BUILD_PATH=$(echo "$REALISE_OUT" | grep "^/nix/store/" | head -n1 || true)
 if [ -n "$BUILD_PATH" ] && [ -d "$BUILD_PATH" ]; then
  echo "Realized node_modules output: $BUILD_PATH"
  CORRECT_HASH=$(nix hash path --sri "$BUILD_PATH" 2>/dev/null || true)
 fi
 if [ -z "$CORRECT_HASH" ]; then
  CORRECT_HASH="$(grep -E 'got:\s+sha256-[A-Za-z0-9+/=]+' "$BUILD_LOG" | awk '{print $2}' | head -n1 || true)"
  if [ -z "$CORRECT_HASH" ]; then
    CORRECT_HASH="$(grep -A2 'hash mismatch' "$BUILD_LOG" | grep 'got:' | awk '{print $2}' | sed 's/sha256:/sha256-/' || true)"
  fi
  if [ -z "$CORRECT_HASH" ]; then
    echo "Searching for kept failed build directory..."
    KEPT_DIR=$(grep -oE "build directory.*'[^']+'" "$BUILD_LOG" | grep -oE "'/[^']+'" | tr -d "'" | head -n1)
    if [ -z "$KEPT_DIR" ]; then
      KEPT_DIR=$(grep -oE '/nix/var/nix/builds/[^ ]+' "$BUILD_LOG" | head -n1)
    fi
    if [ -n "$KEPT_DIR" ] && [ -d "$KEPT_DIR" ]; then
      echo "Found kept build directory: $KEPT_DIR"
      if [ -d "$KEPT_DIR/build" ]; then
        HASH_PATH="$KEPT_DIR/build"
      else
        HASH_PATH="$KEPT_DIR"
      fi
      echo "Attempting to hash: $HASH_PATH"
      ls -la "$HASH_PATH" || true
      if [ -d "$HASH_PATH/node_modules" ]; then
        CORRECT_HASH=$(nix hash path --sri "$HASH_PATH" 2>/dev/null || true)
        echo "Computed hash from kept build: $CORRECT_HASH"
      fi
    fi
  fi
 fi
 if [ -z "$CORRECT_HASH" ]; then
  echo "Failed to determine correct node_modules hash for ${SYSTEM}."
  echo "Build log:"
  cat "$BUILD_LOG"
  exit 1
 fi
 write_node_modules_hash "$CORRECT_HASH"
 jq -e --arg hash "$CORRECT_HASH" '.nodeModules == $hash' "$HASH_FILE" >/dev/null
 echo "node_modules hash updated for ${SYSTEM}: $CORRECT_HASH"
 rm -f "$BUILD_LOG"
 unset BUILD_LOG
@@ -10,8 +10,7 @@
    "typecheck": "bun turbo typecheck",
    "prepare": "husky",
    "random": "echo 'Random script'",
-    "hello": "echo 'Hello World!'",
+    "hello": "echo 'Hello World!'"
    "test": "echo 'do not run tests from root' && exit 1"
  },
  "workspaces": {
    "packages": [
@@ -21,7 +20,7 @@
      "packages/slack"
    ],
    "catalog": {
-      "@types/bun": "1.3.5",
+      "@types/bun": "1.3.4",
      "@octokit/rest": "22.0.0",
      "@hono/zod-validator": "0.4.2",
      "ulid": "3.0.1",
@@ -36,14 +35,11 @@
      "@solid-primitives/storage": "4.3.3",
      "@tailwindcss/vite": "4.1.11",
      "diff": "8.0.2",
-      "dompurify": "3.3.1",
+      "ai": "5.0.97",
      "ai": "5.0.119",
      "hono": "4.10.7",
      "hono-openapi": "1.1.2",
      "fuzzysort": "3.1.0",
      "luxon": "3.6.1",
      "marked": "17.0.1",
      "marked-shiki": "1.2.1",
      "typescript": "5.8.2",
      "@typescript/native-preview": "7.0.0-dev.20251207.1",
      "zod": "4.1.8",
@@ -69,6 +65,13 @@
    "turbo": "2.5.6"
  },
  "dependencies": {
    "@ai-sdk/cerebras": "1.0.33",
    "@ai-sdk/cohere": "2.0.21",
    "@ai-sdk/deepinfra": "1.0.30",
    "@ai-sdk/gateway": "2.0.23",
    "@ai-sdk/groq": "2.0.33",
    "@ai-sdk/perplexity": "2.0.22",
    "@ai-sdk/togetherai": "1.0.30",
    "@aws-sdk/client-s3": "3.933.0",
    "@opencode-ai/plugin": "workspace:*",
    "@opencode-ai/script": "workspace:*",
@@ -77,7 +80,7 @@
  },
  "repository": {
    "type": "git",
-    "url": "https://github.com/anomalyco/opencode"
+    "url": "https://github.com/sst/opencode"
  },
  "license": "MIT",
  "prettier": {
@@ -1,13 +1,28 @@
-## Debugging
+# Agent Guidelines for @opencode/app
- To test the opencode app, use the playwright MCP server, the app is already
+## Build/Test Commands
  running at http://localhost:3000
 - NEVER try to restart the app, or the server process, EVER.
-## SolidJS
+- **Development**: `bun run dev` (starts Vite dev server on port 3000)
 - **Build**: `bun run build` (production build)
 - **Preview**: `bun run serve` (preview production build)
 - **Validation**: Use `bun run typecheck` only - do not build or run project for validation
 - **Testing**: Do not create or run automated tests
- Always prefer `createStore` over multiple `createSignal` calls
+## Code Style
-## Tool Calling
+- **Framework**: SolidJS with TypeScript
 - **Imports**: Use `@/` alias for src/ directory (e.g., `import Button from "@/ui/button"`)
 - **Formatting**: Prettier configured with semicolons disabled, 120 character line width
 - **Components**: Use function declarations, splitProps for component props
 - **Types**: Define interfaces for component props, avoid `any` type
 - **CSS**: TailwindCSS with custom CSS variables theme system
 - **Naming**: PascalCase for components, camelCase for variables/functions, snake_case for file names
 - **File Structure**: UI primitives in `/ui/`, higher-level components in `/components/`, pages in `/pages/`, providers in `/providers/`
- ALWAYS USE PARALLEL TOOLS WHEN APPLICABLE.
+## Key Dependencies
 - SolidJS, @solidjs/router, @kobalte/core (UI primitives)
 - TailwindCSS 4.x with @tailwindcss/vite
 - Custom theme system with CSS variables
 No special rules files found.
@@ -1,8 +1,8 @@
 ## Usage
-Dependencies for these templates are managed with [pnpm](https://pnpm.io) using `pnpm up -Lri`.
+Those templates dependencies are maintained via [pnpm](https://pnpm.io) via `pnpm up -Lri`.
-This is the reason you see a `pnpm-lock.yaml`. That said, any package manager will work. This file can safely be removed once you clone a template.
+This is the reason you see a `pnpm-lock.yaml`. That being said, any package manager will work. This file can be safely be removed once you clone a template.
 ```bash
 $ npm install # or pnpm install or yarn install
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en" style="background-color: var(--background-base)">
+<html lang="en">
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1" />
@@ -13,11 +13,16 @@
    <meta name="theme-color" content="#131010" media="(prefers-color-scheme: dark)" />
    <meta property="og:image" content="/social-share.png" />
    <meta property="twitter:image" content="/social-share.png" />
    <script id="oc-theme-preload-script" src="/oc-theme-preload.js"></script>
  </head>
-  <body class="antialiased overscroll-none text-12-regular overflow-hidden">
+  <body class="antialiased overscroll-none select-none text-12-regular overflow-hidden">
    <script>
      ;(function () {
        const savedTheme = localStorage.getItem("theme") || "oc-1"
        document.documentElement.setAttribute("data-theme", savedTheme)
      })()
    </script>
    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root" class="flex flex-col h-dvh p-px"></div>
+    <div id="root" class="flex flex-col h-screen"></div>
    <script src="/src/entry.tsx" type="module"></script>
  </body>
 </html>
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.1.25",
+  "version": "1.0.193",
  "description": "",
  "type": "module",
  "exports": {
@@ -49,8 +49,8 @@
    "fuzzysort": "catalog:",
    "ghostty-web": "0.3.0",
    "luxon": "catalog:",
-    "marked": "catalog:",
+    "marked": "16.2.0",
-    "marked-shiki": "catalog:",
+    "marked-shiki": "1.2.1",
    "remeda": "catalog:",
    "shiki": "catalog:",
    "solid-js": "catalog:",
@@ -1,17 +0,0 @@
 /assets/*.js
  Content-Type: application/javascript
 /assets/*.mjs
  Content-Type: application/javascript
 /assets/*.css
  Content-Type: text/css
 /*.js
  Content-Type: application/javascript
 /*.mjs
  Content-Type: application/javascript
 /*.css
  Content-Type: text/css
@@ -1,28 +0,0 @@
 ;(function () {
  var themeId = localStorage.getItem("opencode-theme-id")
  if (!themeId) return
  var scheme = localStorage.getItem("opencode-color-scheme") || "system"
  var isDark = scheme === "dark" || (scheme === "system" && matchMedia("(prefers-color-scheme: dark)").matches)
  var mode = isDark ? "dark" : "light"
  document.documentElement.dataset.theme = themeId
  document.documentElement.dataset.colorScheme = mode
  if (themeId === "oc-1") return
  var css = localStorage.getItem("opencode-theme-css-" + themeId + "-" + mode)
  if (css) {
    var style = document.createElement("style")
    style.id = "oc-theme-preload"
    style.textContent =
      ":root{color-scheme:" +
      mode +
      ";--text-mix-blend-mode:" +
      (isDark ? "plus-lighter" : "multiply") +
      ";" +
      css +
      "}"
    document.head.appendChild(style)
  }
 })()
@@ -242,53 +242,6 @@ describe("SerializeAddon", () => {
      expect(term2.buffer.active.getLine(2)?.translateToString(true)).toBe("total 42")
    })
    test("serialized output should restore after Terminal.reset()", async () => {
      const { term, addon } = createTerminal()
      const content = [
        "\x1b[1;32m❯\x1b[0m \x1b[34mcd\x1b[0m /some/path",
        "\x1b[1;32m❯\x1b[0m \x1b[34mls\x1b[0m -la",
        "total 42",
      ].join("\r\n")
      await writeAndWait(term, content)
      const serialized = addon.serialize()
      const { term: term2 } = createTerminal()
      terminals.push(term2)
      term2.reset()
      await writeAndWait(term2, serialized)
      expect(term2.buffer.active.getLine(0)?.translateToString(true)).toContain("cd /some/path")
      expect(term2.buffer.active.getLine(1)?.translateToString(true)).toContain("ls -la")
      expect(term2.buffer.active.getLine(2)?.translateToString(true)).toBe("total 42")
    })
    test("alternate buffer should round-trip without garbage", async () => {
      const { term, addon } = createTerminal(20, 5)
      await writeAndWait(term, "normal\r\n")
      await writeAndWait(term, "\x1b[?1049h\x1b[HALT")
      expect(term.buffer.active.type).toBe("alternate")
      const serialized = addon.serialize()
      const { term: term2 } = createTerminal(20, 5)
      terminals.push(term2)
      await writeAndWait(term2, serialized)
      expect(term2.buffer.active.type).toBe("alternate")
      const line = term2.buffer.active.getLine(0)
      expect(line?.translateToString(true)).toBe("ALT")
      // Ensure a cell beyond content isn't garbage
      const cellCode = line?.getCell(10)?.getCode()
      expect(cellCode === 0 || cellCode === 32).toBe(true)
    })
    test("serialized output written to new terminal should match original colors", async () => {
      const { term, addon } = createTerminal(40, 5)
@@ -157,6 +157,23 @@ function equalFlags(cell1: IBufferCell, cell2: IBufferCell): boolean {
 abstract class BaseSerializeHandler {
  constructor(protected readonly _buffer: IBuffer) {}
  private _isRealContent(codepoint: number): boolean {
    if (codepoint === 0) return false
    if (codepoint >= 0xf000) return false
    return true
  }
  private _findLastContentColumn(line: IBufferLine): number {
    let lastContent = -1
    for (let col = 0; col < line.length; col++) {
      const cell = line.getCell(col)
      if (cell && this._isRealContent(cell.getCode())) {
        lastContent = col
      }
    }
    return lastContent + 1
  }
  public serialize(range: IBufferRange, excludeFinalCursorPosition?: boolean): string {
    let oldCell = this._buffer.getNullCell()
@@ -165,14 +182,14 @@ abstract class BaseSerializeHandler {
    const startColumn = range.start.x
    const endColumn = range.end.x
-    this._beforeSerialize(endRow - startRow + 1, startRow, endRow)
+    this._beforeSerialize(endRow - startRow, startRow, endRow)
    for (let row = startRow; row <= endRow; row++) {
      const line = this._buffer.getLine(row)
      if (line) {
        const startLineColumn = row === range.start.y ? startColumn : 0
-        const endLineColumn = Math.min(endColumn, line.length)
+        const maxColumn = row === range.end.y ? endColumn : this._findLastContentColumn(line)
-
+        const endLineColumn = Math.min(maxColumn, line.length)
        for (let col = startLineColumn; col < endLineColumn; col++) {
          const c = line.getCell(col)
          if (!c) {
@@ -226,13 +243,6 @@ class StringSerializeHandler extends BaseSerializeHandler {
  protected _beforeSerialize(rows: number, start: number, _end: number): void {
    this._allRows = new Array<string>(rows)
    this._allRowSeparators = new Array<string>(rows)
    this._rowIndex = 0
    this._currentRow = ""
    this._nullCellCount = 0
    this._cursorStyle = this._buffer.getNullCell()
    this._lastContentCursorRow = start
    this._lastCursorRow = start
    this._firstRow = start
@@ -241,11 +251,6 @@ class StringSerializeHandler extends BaseSerializeHandler {
  protected _rowEnd(row: number, isLastRow: boolean): void {
    let rowSeparator = ""
    if (this._nullCellCount > 0) {
      this._currentRow += " ".repeat(this._nullCellCount)
      this._nullCellCount = 0
    }
    if (!isLastRow) {
      const nextLine = this._buffer.getLine(row + 1)
@@ -383,8 +388,7 @@ class StringSerializeHandler extends BaseSerializeHandler {
    }
    const codepoint = cell.getCode()
-    const isInvalidCodepoint = codepoint > 0x10ffff || (codepoint >= 0xd800 && codepoint <= 0xdfff)
+    const isGarbage = codepoint >= 0xf000
    const isGarbage = isInvalidCodepoint || (codepoint >= 0xf000 && cell.getWidth() === 1)
    const isEmptyCell = codepoint === 0 || cell.getChars() === "" || isGarbage
    const sgrSeq = this._diffStyle(cell, this._cursorStyle)
@@ -393,7 +397,7 @@ class StringSerializeHandler extends BaseSerializeHandler {
    if (styleChanged) {
      if (this._nullCellCount > 0) {
-        this._currentRow += " ".repeat(this._nullCellCount)
+        this._currentRow += `\u001b[${this._nullCellCount}C`
        this._nullCellCount = 0
      }
@@ -413,7 +417,7 @@ class StringSerializeHandler extends BaseSerializeHandler {
      this._nullCellCount += cell.getWidth()
    } else {
      if (this._nullCellCount > 0) {
-        this._currentRow += " ".repeat(this._nullCellCount)
+        this._currentRow += `\u001b[${this._nullCellCount}C`
        this._nullCellCount = 0
      }
@@ -1,5 +1,5 @@
 import "@/index.css"
-import { ErrorBoundary, Show, lazy, type ParentProps } from "solid-js"
+import { ErrorBoundary, Show } from "solid-js"
 import { Router, Route, Navigate } from "@solidjs/router"
 import { MetaProvider } from "@solidjs/meta"
 import { Font } from "@opencode-ai/ui/font"
@@ -8,120 +8,85 @@ import { DiffComponentProvider } from "@opencode-ai/ui/context/diff"
 import { CodeComponentProvider } from "@opencode-ai/ui/context/code"
 import { Diff } from "@opencode-ai/ui/diff"
 import { Code } from "@opencode-ai/ui/code"
 import { ThemeProvider } from "@opencode-ai/ui/theme"
 import { GlobalSyncProvider } from "@/context/global-sync"
 import { PermissionProvider } from "@/context/permission"
 import { LayoutProvider } from "@/context/layout"
 import { GlobalSDKProvider } from "@/context/global-sdk"
 import { ServerProvider, useServer } from "@/context/server"
 import { TerminalProvider } from "@/context/terminal"
 import { PromptProvider } from "@/context/prompt"
 import { FileProvider } from "@/context/file"
 import { NotificationProvider } from "@/context/notification"
 import { DialogProvider } from "@opencode-ai/ui/context/dialog"
 import { CommandProvider } from "@/context/command"
 import { Logo } from "@opencode-ai/ui/logo"
 import Layout from "@/pages/layout"
 import Home from "@/pages/home"
 import DirectoryLayout from "@/pages/directory-layout"
 import Session from "@/pages/session"
 import { ErrorPage } from "./pages/error"
 import { iife } from "@opencode-ai/util/iife"
 import { Suspense } from "solid-js"
 const Home = lazy(() => import("@/pages/home"))
 const Session = lazy(() => import("@/pages/session"))
 const Loading = () => <div class="size-full flex items-center justify-center text-text-weak">Loading...</div>
 declare global {
  interface Window {
-    __OPENCODE__?: { updaterEnabled?: boolean; serverPassword?: string }
+    __OPENCODE__?: { updaterEnabled?: boolean; port?: number }
  }
 }
-export function AppBaseProviders(props: ParentProps) {
+const url = iife(() => {
  const param = new URLSearchParams(document.location.search).get("url")
  if (param) return param
  if (location.hostname.includes("opencode.ai")) return "http://localhost:4096"
  if (window.__OPENCODE__) return `http://127.0.0.1:${window.__OPENCODE__.port}`
  if (import.meta.env.DEV)
    return `http://${import.meta.env.VITE_OPENCODE_SERVER_HOST ?? "localhost"}:${import.meta.env.VITE_OPENCODE_SERVER_PORT ?? "4096"}`
  return "http://localhost:4096"
 })
 export function App() {
  return (
    <MetaProvider>
      <Font />
-      <ThemeProvider>
+      <ErrorBoundary fallback={(error) => <ErrorPage error={error} />}>
-        <ErrorBoundary fallback={(error) => <ErrorPage error={error} />}>
+        <DialogProvider>
-          <DialogProvider>
+          <MarkedProvider>
-            <MarkedProvider>
+            <DiffComponentProvider component={Diff}>
-              <DiffComponentProvider component={Diff}>
+              <CodeComponentProvider component={Code}>
-                <CodeComponentProvider component={Code}>{props.children}</CodeComponentProvider>
+                <GlobalSDKProvider url={url}>
-              </DiffComponentProvider>
+                  <GlobalSyncProvider>
-            </MarkedProvider>
+                    <LayoutProvider>
-          </DialogProvider>
+                      <NotificationProvider>
-        </ErrorBoundary>
+                        <Router
-      </ThemeProvider>
+                          root={(props) => (
                            <CommandProvider>
                              <Layout>{props.children}</Layout>
                            </CommandProvider>
                          )}
                        >
                          <Route path="/" component={Home} />
                          <Route path="/:dir" component={DirectoryLayout}>
                            <Route path="/" component={() => <Navigate href="session" />} />
                            <Route
                              path="/session/:id?"
                              component={(p) => (
                                <Show when={p.params.id || true} keyed>
                                  <TerminalProvider>
                                    <PromptProvider>
                                      <Session />
                                    </PromptProvider>
                                  </TerminalProvider>
                                </Show>
                              )}
                            />
                          </Route>
                        </Router>
                      </NotificationProvider>
                    </LayoutProvider>
                  </GlobalSyncProvider>
                </GlobalSDKProvider>
              </CodeComponentProvider>
            </DiffComponentProvider>
          </MarkedProvider>
        </DialogProvider>
      </ErrorBoundary>
    </MetaProvider>
  )
 }
 function ServerKey(props: ParentProps) {
  const server = useServer()
  return (
    <Show when={server.url} keyed>
      {props.children}
    </Show>
  )
 }
 export function AppInterface(props: { defaultUrl?: string }) {
  const defaultServerUrl = () => {
    if (props.defaultUrl) return props.defaultUrl
    if (location.hostname.includes("opencode.ai")) return "http://localhost:4096"
    if (import.meta.env.DEV)
      return `http://${import.meta.env.VITE_OPENCODE_SERVER_HOST ?? "localhost"}:${import.meta.env.VITE_OPENCODE_SERVER_PORT ?? "4096"}`
    return window.location.origin
  }
  return (
    <ServerProvider defaultUrl={defaultServerUrl()}>
      <ServerKey>
        <GlobalSDKProvider>
          <GlobalSyncProvider>
            <Router
              root={(props) => (
                <PermissionProvider>
                  <LayoutProvider>
                    <NotificationProvider>
                      <CommandProvider>
                        <Layout>{props.children}</Layout>
                      </CommandProvider>
                    </NotificationProvider>
                  </LayoutProvider>
                </PermissionProvider>
              )}
            >
              <Route
                path="/"
                component={() => (
                  <Suspense fallback={<Loading />}>
                    <Home />
                  </Suspense>
                )}
              />
              <Route path="/:dir" component={DirectoryLayout}>
                <Route path="/" component={() => <Navigate href="session" />} />
                <Route
                  path="/session/:id?"
                  component={() => (
                    <TerminalProvider>
                      <FileProvider>
                        <PromptProvider>
                          <Suspense fallback={<Loading />}>
                            <Session />
                          </Suspense>
                        </PromptProvider>
                      </FileProvider>
                    </TerminalProvider>
                  )}
                />
              </Route>
            </Router>
          </GlobalSyncProvider>
        </GlobalSDKProvider>
      </ServerKey>
    </ServerProvider>
  )
 }
@@ -1,176 +0,0 @@
 import { Button } from "@opencode-ai/ui/button"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { Icon } from "@opencode-ai/ui/icon"
 import { createMemo, createSignal, For, Show } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { type LocalProject, getAvatarColors } from "@/context/layout"
 import { getFilename } from "@opencode-ai/util/path"
 import { Avatar } from "@opencode-ai/ui/avatar"
 const AVATAR_COLOR_KEYS = ["pink", "mint", "orange", "purple", "cyan", "lime"] as const
 export function DialogEditProject(props: { project: LocalProject }) {
  const dialog = useDialog()
  const globalSDK = useGlobalSDK()
  const folderName = createMemo(() => getFilename(props.project.worktree))
  const defaultName = createMemo(() => props.project.name || folderName())
  const [store, setStore] = createStore({
    name: defaultName(),
    color: props.project.icon?.color || "pink",
    iconUrl: props.project.icon?.url || "",
    saving: false,
  })
  const [dragOver, setDragOver] = createSignal(false)
  function handleFileSelect(file: File) {
    if (!file.type.startsWith("image/")) return
    const reader = new FileReader()
    reader.onload = (e) => setStore("iconUrl", e.target?.result as string)
    reader.readAsDataURL(file)
  }
  function handleDrop(e: DragEvent) {
    e.preventDefault()
    setDragOver(false)
    const file = e.dataTransfer?.files[0]
    if (file) handleFileSelect(file)
  }
  function handleDragOver(e: DragEvent) {
    e.preventDefault()
    setDragOver(true)
  }
  function handleDragLeave() {
    setDragOver(false)
  }
  function handleInputChange(e: Event) {
    const input = e.target as HTMLInputElement
    const file = input.files?.[0]
    if (file) handleFileSelect(file)
  }
  function clearIcon() {
    setStore("iconUrl", "")
  }
  async function handleSubmit(e: SubmitEvent) {
    e.preventDefault()
    if (!props.project.id) return
    setStore("saving", true)
    const name = store.name.trim() === folderName() ? "" : store.name.trim()
    await globalSDK.client.project.update({
      projectID: props.project.id,
      name,
      icon: { color: store.color, url: store.iconUrl },
    })
    setStore("saving", false)
    dialog.close()
  }
  return (
    <Dialog title="Edit project">
      <form onSubmit={handleSubmit} class="flex flex-col gap-6 px-2.5 pb-3">
        <div class="flex flex-col gap-4">
          <TextField
            autofocus
            type="text"
            label="Name"
            placeholder={folderName()}
            value={store.name}
            onChange={(v) => setStore("name", v)}
          />
          <div class="flex flex-col gap-2">
            <label class="text-12-medium text-text-weak">Icon</label>
            <div class="flex gap-3 items-start">
              <div class="relative">
                <div
                  class="size-16 rounded-lg overflow-hidden border border-dashed transition-colors cursor-pointer"
                  classList={{
                    "border-text-interactive-base bg-surface-info-base/20": dragOver(),
                    "border-border-base hover:border-border-strong": !dragOver(),
                  }}
                  onDrop={handleDrop}
                  onDragOver={handleDragOver}
                  onDragLeave={handleDragLeave}
                  onClick={() => document.getElementById("icon-upload")?.click()}
                >
                  <Show
                    when={store.iconUrl}
                    fallback={
                      <div class="size-full flex items-center justify-center">
                        <Avatar
                          fallback={store.name || defaultName()}
                          {...getAvatarColors(store.color)}
                          class="size-full"
                        />
                      </div>
                    }
                  >
                    <img src={store.iconUrl} alt="Project icon" class="size-full object-cover" />
                  </Show>
                </div>
                <Show when={store.iconUrl}>
                  <button
                    type="button"
                    class="absolute -top-1.5 -right-1.5 size-5 rounded-full bg-surface-raised-base border border-border-base flex items-center justify-center hover:bg-surface-raised-base-hover"
                    onClick={clearIcon}
                  >
                    <Icon name="close" class="size-3 text-icon-base" />
                  </button>
                </Show>
              </div>
              <input id="icon-upload" type="file" accept="image/*" class="hidden" onChange={handleInputChange} />
              <div class="flex flex-col gap-1.5 text-12-regular text-text-weak">
                <span>Click or drag an image</span>
                <span>Recommended: 128x128px</span>
              </div>
            </div>
          </div>
          <Show when={!store.iconUrl}>
            <div class="flex flex-col gap-2">
              <label class="text-12-medium text-text-weak">Color</label>
              <div class="flex gap-2">
                <For each={AVATAR_COLOR_KEYS}>
                  {(color) => (
                    <button
                      type="button"
                      class="relative size-8 rounded-md transition-all"
                      classList={{
                        "ring-2 ring-offset-2 ring-offset-surface-base ring-text-interactive-base":
                          store.color === color,
                      }}
                      style={{ background: getAvatarColors(color).background }}
                      onClick={() => setStore("color", color)}
                    >
                      <Avatar fallback={store.name || defaultName()} {...getAvatarColors(color)} class="size-full" />
                    </button>
                  )}
                </For>
              </div>
            </div>
          </Show>
        </div>
        <div class="flex justify-end gap-2">
          <Button type="button" variant="ghost" size="large" onClick={() => dialog.close()}>
            Cancel
          </Button>
          <Button type="submit" variant="primary" size="large" disabled={store.saving}>
            {store.saving ? "Saving..." : "Save"}
          </Button>
        </div>
      </form>
    </Dialog>
  )
 }
@@ -1,99 +0,0 @@
 import { Component, createMemo } from "solid-js"
 import { useNavigate, useParams } from "@solidjs/router"
 import { useSync } from "@/context/sync"
 import { useSDK } from "@/context/sdk"
 import { usePrompt } from "@/context/prompt"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { List } from "@opencode-ai/ui/list"
 import { extractPromptFromParts } from "@/utils/prompt"
 import type { TextPart as SDKTextPart } from "@opencode-ai/sdk/v2/client"
 import { base64Encode } from "@opencode-ai/util/encode"
 interface ForkableMessage {
  id: string
  text: string
  time: string
 }
 function formatTime(date: Date): string {
  return date.toLocaleTimeString(undefined, { timeStyle: "short" })
 }
 export const DialogFork: Component = () => {
  const params = useParams()
  const navigate = useNavigate()
  const sync = useSync()
  const sdk = useSDK()
  const prompt = usePrompt()
  const dialog = useDialog()
  const messages = createMemo((): ForkableMessage[] => {
    const sessionID = params.id
    if (!sessionID) return []
    const msgs = sync.data.message[sessionID] ?? []
    const result: ForkableMessage[] = []
    for (const message of msgs) {
      if (message.role !== "user") continue
      const parts = sync.data.part[message.id] ?? []
      const textPart = parts.find((x): x is SDKTextPart => x.type === "text" && !x.synthetic && !x.ignored)
      if (!textPart) continue
      result.push({
        id: message.id,
        text: textPart.text.replace(/\n/g, " ").slice(0, 200),
        time: formatTime(new Date(message.time.created)),
      })
    }
    return result.reverse()
  })
  const handleSelect = (item: ForkableMessage | undefined) => {
    if (!item) return
    const sessionID = params.id
    if (!sessionID) return
    const parts = sync.data.part[item.id] ?? []
    const restored = extractPromptFromParts(parts, { directory: sdk.directory })
    dialog.close()
    sdk.client.session.fork({ sessionID, messageID: item.id }).then((forked) => {
      if (!forked.data) return
      navigate(`/${base64Encode(sdk.directory)}/session/${forked.data.id}`)
      requestAnimationFrame(() => {
        prompt.set(restored)
      })
    })
  }
  return (
    <Dialog title="Fork from message">
      <List
        class="flex-1 min-h-0 [&_[data-slot=list-scroll]]:flex-1 [&_[data-slot=list-scroll]]:min-h-0"
        search={{ placeholder: "Search", autofocus: true }}
        emptyMessage="No messages to fork from"
        key={(x) => x.id}
        items={messages}
        filterKeys={["text"]}
        onSelect={handleSelect}
      >
        {(item) => (
          <div class="w-full flex items-center gap-2">
            <span class="truncate flex-1 min-w-0 text-left" style={{ "font-weight": "400" }}>
              {item.text}
            </span>
            <span class="text-text-weak shrink-0" style={{ "font-weight": "400" }}>
              {item.time}
            </span>
          </div>
        )}
      </List>
    </Dialog>
  )
 }
@@ -1,114 +0,0 @@
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { List } from "@opencode-ai/ui/list"
 import { getDirectory, getFilename } from "@opencode-ai/util/path"
 import { createMemo } from "solid-js"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { useGlobalSync } from "@/context/global-sync"
 interface DialogSelectDirectoryProps {
  title?: string
  multiple?: boolean
  onSelect: (result: string | string[] | null) => void
 }
 export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
  const sync = useGlobalSync()
  const sdk = useGlobalSDK()
  const dialog = useDialog()
  const home = createMemo(() => sync.data.path.home)
  const root = createMemo(() => sync.data.path.home || sync.data.path.directory)
  function join(base: string | undefined, rel: string) {
    const b = (base ?? "").replace(/[\\/]+$/, "")
    const r = rel.replace(/^[\\/]+/, "").replace(/[\\/]+$/, "")
    if (!b) return r
    if (!r) return b
    return b + "/" + r
  }
  function display(rel: string) {
    const full = join(root(), rel)
    const h = home()
    if (!h) return full
    if (full === h) return "~"
    if (full.startsWith(h + "/") || full.startsWith(h + "\\")) {
      return "~" + full.slice(h.length)
    }
    return full
  }
  function normalizeQuery(query: string) {
    const h = home()
    if (!query) return query
    if (query.startsWith("~/")) return query.slice(2)
    if (h) {
      const lc = query.toLowerCase()
      const hc = h.toLowerCase()
      if (lc === hc || lc.startsWith(hc + "/") || lc.startsWith(hc + "\\")) {
        return query.slice(h.length).replace(/^[\\/]+/, "")
      }
    }
    return query
  }
  async function fetchDirs(query: string) {
    const directory = root()
    if (!directory) return [] as string[]
    const results = await sdk.client.find
      .files({ directory, query, type: "directory", limit: 50 })
      .then((x) => x.data ?? [])
      .catch(() => [])
    return results.map((x) => x.replace(/[\\/]+$/, ""))
  }
  const directories = async (filter: string) => {
    const query = normalizeQuery(filter.trim())
    return fetchDirs(query)
  }
  function resolve(rel: string) {
    const absolute = join(root(), rel)
    props.onSelect(props.multiple ? [absolute] : absolute)
    dialog.close()
  }
  return (
    <Dialog title={props.title ?? "Open project"}>
      <List
        search={{ placeholder: "Search folders", autofocus: true }}
        emptyMessage="No folders found"
        items={directories}
        key={(x) => x}
        onSelect={(path) => {
          if (!path) return
          resolve(path)
        }}
      >
        {(rel) => {
          const path = display(rel)
          return (
            <div class="w-full flex items-center justify-between rounded-md">
              <div class="flex items-center gap-x-3 grow min-w-0">
                <FileIcon node={{ path: rel, type: "directory" }} class="shrink-0 size-4" />
                <div class="flex items-center text-14-regular min-w-0">
                  <span class="text-text-weak whitespace-nowrap overflow-hidden overflow-ellipsis truncate min-w-0">
                    {getDirectory(path)}
                  </span>
                  <span class="text-text-strong whitespace-nowrap">{getFilename(path)}</span>
                </div>
              </div>
            </div>
          )
        }}
      </List>
    </Dialog>
  )
 }
@@ -1,179 +1,46 @@
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { Keybind } from "@opencode-ai/ui/keybind"
 import { List } from "@opencode-ai/ui/list"
 import { getDirectory, getFilename } from "@opencode-ai/util/path"
 import { useParams } from "@solidjs/router"
-import { createMemo, createSignal, onCleanup, Show } from "solid-js"
+import { createMemo } from "solid-js"
 import { formatKeybind, useCommand, type CommandOption } from "@/context/command"
 import { useLayout } from "@/context/layout"
-import { useFile } from "@/context/file"
+import { useLocal } from "@/context/local"
 type EntryType = "command" | "file"
 type Entry = {
  id: string
  type: EntryType
  title: string
  description?: string
  keybind?: string
  category: "Commands" | "Files"
  option?: CommandOption
  path?: string
 }
 export function DialogSelectFile() {
  const command = useCommand()
  const layout = useLayout()
-  const file = useFile()
+  const local = useLocal()
  const dialog = useDialog()
  const params = useParams()
  const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
  const tabs = createMemo(() => layout.tabs(sessionKey()))
  const view = createMemo(() => layout.view(sessionKey()))
  const state = { cleanup: undefined as (() => void) | void, committed: false }
  const [grouped, setGrouped] = createSignal(false)
  const common = ["session.new", "session.previous", "session.next", "terminal.toggle", "review.toggle"]
  const limit = 5
  const allowed = createMemo(() =>
    command.options.filter(
      (option) => !option.disabled && !option.id.startsWith("suggested.") && option.id !== "file.open",
    ),
  )
  const commandItem = (option: CommandOption): Entry => ({
    id: "command:" + option.id,
    type: "command",
    title: option.title,
    description: option.description,
    keybind: option.keybind,
    category: "Commands",
    option,
  })
  const fileItem = (path: string): Entry => ({
    id: "file:" + path,
    type: "file",
    title: path,
    category: "Files",
    path,
  })
  const list = createMemo(() => allowed().map(commandItem))
  const picks = createMemo(() => {
    const all = allowed()
    const order = new Map(common.map((id, index) => [id, index]))
    const picked = all.filter((option) => order.has(option.id))
    const base = picked.length ? picked : all.slice(0, limit)
    const sorted = picked.length ? [...base].sort((a, b) => (order.get(a.id) ?? 0) - (order.get(b.id) ?? 0)) : base
    return sorted.map(commandItem)
  })
  const recent = createMemo(() => {
    const all = tabs().all()
    const active = tabs().active()
    const order = active ? [active, ...all.filter((item) => item !== active)] : all
    const seen = new Set<string>()
    const items: Entry[] = []
    for (const item of order) {
      const path = file.pathFromTab(item)
      if (!path) continue
      if (seen.has(path)) continue
      seen.add(path)
      items.push(fileItem(path))
    }
    return items.slice(0, limit)
  })
  const items = async (filter: string) => {
    const query = filter.trim()
    setGrouped(query.length > 0)
    if (!query) return [...picks(), ...recent()]
    const files = await file.searchFiles(query)
    const entries = files.map(fileItem)
    return [...list(), ...entries]
  }
  const handleMove = (item: Entry | undefined) => {
    state.cleanup?.()
    if (!item) return
    if (item.type !== "command") return
    state.cleanup = item.option?.onHighlight?.()
  }
  const open = (path: string) => {
    const value = file.tab(path)
    tabs().open(value)
    file.load(path)
    view().reviewPanel.open()
  }
  const handleSelect = (item: Entry | undefined) => {
    if (!item) return
    state.committed = true
    state.cleanup = undefined
    dialog.close()
    if (item.type === "command") {
      item.option?.onSelect?.("palette")
      return
    }
    if (!item.path) return
    open(item.path)
  }
  onCleanup(() => {
    if (state.committed) return
    state.cleanup?.()
  })
  return (
-    <Dialog class="pt-3 pb-0 !max-h-[480px]">
+    <Dialog title="Select file">
      <List
-        search={{ placeholder: "Search files and commands", autofocus: true, hideIcon: true, class: "pl-3 pr-2 !mb-0" }}
+        search={{ placeholder: "Search files", autofocus: true }}
-        emptyMessage="No results found"
+        emptyMessage="No files found"
-        items={items}
+        items={local.file.searchFiles}
-        key={(item) => item.id}
+        key={(x) => x}
-        filterKeys={["title", "description", "category"]}
+        onSelect={(path) => {
-        groupBy={(item) => item.category}
+          if (path) {
-        onMove={handleMove}
+            tabs().open("file://" + path)
-        onSelect={handleSelect}
+          }
          dialog.close()
        }}
      >
-        {(item) => (
+        {(i) => (
-          <Show
+          <div class="w-full flex items-center justify-between rounded-md">
-            when={item.type === "command"}
+            <div class="flex items-center gap-x-3 grow min-w-0">
-            fallback={
+              <FileIcon node={{ path: i, type: "file" }} class="shrink-0 size-4" />
-              <div class="w-full flex items-center justify-between rounded-md">
+              <div class="flex items-center text-14-regular">
-                <div class="flex items-center gap-x-3 grow min-w-0">
+                <span class="text-text-weak whitespace-nowrap overflow-hidden overflow-ellipsis truncate min-w-0">
-                  <FileIcon node={{ path: item.path ?? "", type: "file" }} class="shrink-0 size-4" />
+                  {getDirectory(i)}
-                  <div class="flex items-center text-14-regular">
+                </span>
-                    <span class="text-text-weak whitespace-nowrap overflow-hidden overflow-ellipsis truncate min-w-0">
+                <span class="text-text-strong whitespace-nowrap">{getFilename(i)}</span>
                      {getDirectory(item.path ?? "")}
                    </span>
                    <span class="text-text-strong whitespace-nowrap">{getFilename(item.path ?? "")}</span>
                  </div>
                </div>
              </div>
            }
          >
            <div class="w-full flex items-center justify-between gap-4 pl-1">
              <div class="flex items-center gap-2 min-w-0">
                <span class="text-14-regular text-text-strong whitespace-nowrap">{item.title}</span>
                <Show when={item.description}>
                  <span class="text-14-regular text-text-weak truncate">{item.description}</span>
                </Show>
              </div>
              <Show when={item.keybind}>
                <Keybind class="rounded-[4px]">{formatKeybind(item.keybind ?? "")}</Keybind>
              </Show>
            </div>
-          </Show>
+          </div>
        )}
      </List>
    </Dialog>
@@ -1,91 +0,0 @@
 import { Component, createMemo, createSignal, Show } from "solid-js"
 import { useSync } from "@/context/sync"
 import { useSDK } from "@/context/sdk"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { List } from "@opencode-ai/ui/list"
 import { Switch } from "@opencode-ai/ui/switch"
 export const DialogSelectMcp: Component = () => {
  const sync = useSync()
  const sdk = useSDK()
  const [loading, setLoading] = createSignal<string | null>(null)
  const items = createMemo(() =>
    Object.entries(sync.data.mcp ?? {})
      .map(([name, status]) => ({ name, status: status.status }))
      .sort((a, b) => a.name.localeCompare(b.name)),
  )
  const toggle = async (name: string) => {
    if (loading()) return
    setLoading(name)
    const status = sync.data.mcp[name]
    if (status?.status === "connected") {
      await sdk.client.mcp.disconnect({ name })
    } else {
      await sdk.client.mcp.connect({ name })
    }
    const result = await sdk.client.mcp.status()
    if (result.data) sync.set("mcp", result.data)
    setLoading(null)
  }
  const enabledCount = createMemo(() => items().filter((i) => i.status === "connected").length)
  const totalCount = createMemo(() => items().length)
  return (
    <Dialog title="MCPs" description={`${enabledCount()} of ${totalCount()} enabled`}>
      <List
        search={{ placeholder: "Search", autofocus: true }}
        emptyMessage="No MCPs configured"
        key={(x) => x?.name ?? ""}
        items={items}
        filterKeys={["name", "status"]}
        sortBy={(a, b) => a.name.localeCompare(b.name)}
        onSelect={(x) => {
          if (x) toggle(x.name)
        }}
      >
        {(i) => {
          const mcpStatus = () => sync.data.mcp[i.name]
          const status = () => mcpStatus()?.status
          const error = () => {
            const s = mcpStatus()
            return s?.status === "failed" ? s.error : undefined
          }
          const enabled = () => status() === "connected"
          return (
            <div class="w-full flex items-center justify-between gap-x-3">
              <div class="flex flex-col gap-0.5 min-w-0">
                <div class="flex items-center gap-2">
                  <span class="truncate">{i.name}</span>
                  <Show when={status() === "connected"}>
                    <span class="text-11-regular text-text-weaker">connected</span>
                  </Show>
                  <Show when={status() === "failed"}>
                    <span class="text-11-regular text-text-weaker">failed</span>
                  </Show>
                  <Show when={status() === "needs_auth"}>
                    <span class="text-11-regular text-text-weaker">needs auth</span>
                  </Show>
                  <Show when={status() === "disabled"}>
                    <span class="text-11-regular text-text-weaker">disabled</span>
                  </Show>
                  <Show when={loading() === i.name}>
                    <span class="text-11-regular text-text-weak">...</span>
                  </Show>
                </div>
                <Show when={error()}>
                  <span class="text-11-regular text-text-weaker truncate">{error()}</span>
                </Show>
              </div>
              <div onClick={(e) => e.stopPropagation()}>
                <Switch checked={enabled()} disabled={loading() === i.name} onChange={() => toggle(i.name)} />
              </div>
            </div>
          )
        }}
      </List>
    </Dialog>
  )
 }
@@ -1,5 +1,4 @@
-import { Popover as Kobalte } from "@kobalte/core/popover"
+import { Component, createMemo, Show } from "solid-js"
 import { Component, createMemo, createSignal, JSX, Show } from "solid-js"
 import { useLocal } from "@/context/local"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { popularProviders } from "@/hooks/use-providers"
@@ -10,12 +9,9 @@ import { List } from "@opencode-ai/ui/list"
 import { DialogSelectProvider } from "./dialog-select-provider"
 import { DialogManageModels } from "./dialog-manage-models"
-const ModelList: Component<{
+export const DialogSelectModel: Component<{ provider?: string }> = (props) => {
  provider?: string
  class?: string
  onSelect: () => void
 }> = (props) => {
  const local = useLocal()
  const dialog = useDialog()
  const models = createMemo(() =>
    local.model
@@ -24,70 +20,6 @@ const ModelList: Component<{
      .filter((m) => (props.provider ? m.provider.id === props.provider : true)),
  )
  return (
    <List
      class={`flex-1 min-h-0 [&_[data-slot=list-scroll]]:flex-1 [&_[data-slot=list-scroll]]:min-h-0 ${props.class ?? ""}`}
      search={{ placeholder: "Search models", autofocus: true }}
      emptyMessage="No model results"
      key={(x) => `${x.provider.id}:${x.id}`}
      items={models}
      current={local.model.current()}
      filterKeys={["provider.name", "name", "id"]}
      sortBy={(a, b) => a.name.localeCompare(b.name)}
      groupBy={(x) => x.provider.name}
      sortGroupsBy={(a, b) => {
        if (a.category === "Recent" && b.category !== "Recent") return -1
        if (b.category === "Recent" && a.category !== "Recent") return 1
        const aProvider = a.items[0].provider.id
        const bProvider = b.items[0].provider.id
        if (popularProviders.includes(aProvider) && !popularProviders.includes(bProvider)) return -1
        if (!popularProviders.includes(aProvider) && popularProviders.includes(bProvider)) return 1
        return popularProviders.indexOf(aProvider) - popularProviders.indexOf(bProvider)
      }}
      onSelect={(x) => {
        local.model.set(x ? { modelID: x.id, providerID: x.provider.id } : undefined, {
          recent: true,
        })
        props.onSelect()
      }}
    >
      {(i) => (
        <div class="w-full flex items-center gap-x-2 text-13-regular">
          <span class="truncate">{i.name}</span>
          <Show when={i.provider.id === "opencode" && (!i.cost || i.cost?.input === 0)}>
            <Tag>Free</Tag>
          </Show>
          <Show when={i.latest}>
            <Tag>Latest</Tag>
          </Show>
        </div>
      )}
    </List>
  )
 }
 export const ModelSelectorPopover: Component<{
  provider?: string
  children: JSX.Element
 }> = (props) => {
  const [open, setOpen] = createSignal(false)
  return (
    <Kobalte open={open()} onOpenChange={setOpen} placement="top-start" gutter={8}>
      <Kobalte.Trigger as="div">{props.children}</Kobalte.Trigger>
      <Kobalte.Portal>
        <Kobalte.Content class="w-72 h-80 flex flex-col rounded-md border border-border-base bg-surface-raised-stronger-non-alpha shadow-md z-50 outline-none overflow-hidden">
          <Kobalte.Title class="sr-only">Select model</Kobalte.Title>
          <ModelList provider={props.provider} onSelect={() => setOpen(false)} class="p-1" />
        </Kobalte.Content>
      </Kobalte.Portal>
    </Kobalte>
  )
 }
 export const DialogSelectModel: Component<{ provider?: string }> = (props) => {
  const dialog = useDialog()
  return (
    <Dialog
      title="Select model"
@@ -102,7 +34,43 @@ export const DialogSelectModel: Component<{ provider?: string }> = (props) => {
        </Button>
      }
    >
-      <ModelList provider={props.provider} onSelect={() => dialog.close()} />
+      <List
        search={{ placeholder: "Search models", autofocus: true }}
        emptyMessage="No model results"
        key={(x) => `${x.provider.id}:${x.id}`}
        items={models}
        current={local.model.current()}
        filterKeys={["provider.name", "name", "id"]}
        sortBy={(a, b) => a.name.localeCompare(b.name)}
        groupBy={(x) => x.provider.name}
        sortGroupsBy={(a, b) => {
          if (a.category === "Recent" && b.category !== "Recent") return -1
          if (b.category === "Recent" && a.category !== "Recent") return 1
          const aProvider = a.items[0].provider.id
          const bProvider = b.items[0].provider.id
          if (popularProviders.includes(aProvider) && !popularProviders.includes(bProvider)) return -1
          if (!popularProviders.includes(aProvider) && popularProviders.includes(bProvider)) return 1
          return popularProviders.indexOf(aProvider) - popularProviders.indexOf(bProvider)
        }}
        onSelect={(x) => {
          local.model.set(x ? { modelID: x.id, providerID: x.provider.id } : undefined, {
            recent: true,
          })
          dialog.close()
        }}
      >
        {(i) => (
          <div class="w-full flex items-center gap-x-3">
            <span>{i.name}</span>
            <Show when={i.provider.id === "opencode" && (!i.cost || i.cost?.input === 0)}>
              <Tag>Free</Tag>
            </Show>
            <Show when={i.latest}>
              <Tag>Latest</Tag>
            </Show>
          </div>
        )}
      </List>
      <Button
        variant="ghost"
        class="ml-3 mt-5 mb-6 text-text-base self-start"
@@ -1,246 +0,0 @@
 import { createResource, createEffect, createMemo, onCleanup, Show } from "solid-js"
 import { createStore, reconcile } from "solid-js/store"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { List } from "@opencode-ai/ui/list"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { Button } from "@opencode-ai/ui/button"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { normalizeServerUrl, serverDisplayName, useServer } from "@/context/server"
 import { usePlatform } from "@/context/platform"
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { useNavigate } from "@solidjs/router"
 type ServerStatus = { healthy: boolean; version?: string }
 async function checkHealth(url: string, fetch?: typeof globalThis.fetch): Promise<ServerStatus> {
  const sdk = createOpencodeClient({
    baseUrl: url,
    fetch,
    signal: AbortSignal.timeout(3000),
  })
  return sdk.global
    .health()
    .then((x) => ({ healthy: x.data?.healthy === true, version: x.data?.version }))
    .catch(() => ({ healthy: false }))
 }
 export function DialogSelectServer() {
  const navigate = useNavigate()
  const dialog = useDialog()
  const server = useServer()
  const platform = usePlatform()
  const [store, setStore] = createStore({
    url: "",
    adding: false,
    error: "",
    status: {} as Record<string, ServerStatus | undefined>,
  })
  const [defaultUrl, defaultUrlActions] = createResource(() => platform.getDefaultServerUrl?.())
  const isDesktop = platform.platform === "desktop"
  const items = createMemo(() => {
    const current = server.url
    const list = server.list
    if (!current) return list
    if (!list.includes(current)) return [current, ...list]
    return [current, ...list.filter((x) => x !== current)]
  })
  const current = createMemo(() => items().find((x) => x === server.url) ?? items()[0])
  const sortedItems = createMemo(() => {
    const list = items()
    if (!list.length) return list
    const active = current()
    const order = new Map(list.map((url, index) => [url, index] as const))
    const rank = (value?: ServerStatus) => {
      if (value?.healthy === true) return 0
      if (value?.healthy === false) return 2
      return 1
    }
    return list.slice().sort((a, b) => {
      if (a === active) return -1
      if (b === active) return 1
      const diff = rank(store.status[a]) - rank(store.status[b])
      if (diff !== 0) return diff
      return (order.get(a) ?? 0) - (order.get(b) ?? 0)
    })
  })
  async function refreshHealth() {
    const results: Record<string, ServerStatus> = {}
    await Promise.all(
      items().map(async (url) => {
        results[url] = await checkHealth(url, platform.fetch)
      }),
    )
    setStore("status", reconcile(results))
  }
  createEffect(() => {
    items()
    refreshHealth()
    const interval = setInterval(refreshHealth, 10_000)
    onCleanup(() => clearInterval(interval))
  })
  function select(value: string, persist?: boolean) {
    if (!persist && store.status[value]?.healthy === false) return
    dialog.close()
    if (persist) {
      server.add(value)
      navigate("/")
      return
    }
    server.setActive(value)
    navigate("/")
  }
  async function handleSubmit(e: SubmitEvent) {
    e.preventDefault()
    const value = normalizeServerUrl(store.url)
    if (!value) return
    setStore("adding", true)
    setStore("error", "")
    const result = await checkHealth(value, platform.fetch)
    setStore("adding", false)
    if (!result.healthy) {
      setStore("error", "Could not connect to server")
      return
    }
    setStore("url", "")
    select(value, true)
  }
  async function handleRemove(url: string) {
    server.remove(url)
  }
  return (
    <Dialog title="Servers" description="Switch which OpenCode server this app connects to.">
      <div class="flex flex-col gap-4 pb-4">
        <List
          search={{ placeholder: "Search servers", autofocus: true }}
          emptyMessage="No servers yet"
          items={sortedItems}
          key={(x) => x}
          current={current()}
          onSelect={(x) => {
            if (x) select(x)
          }}
        >
          {(i) => (
            <div class="flex items-center gap-2 min-w-0 flex-1 group/item">
              <div
                class="flex items-center gap-2 min-w-0 flex-1"
                classList={{ "opacity-50": store.status[i]?.healthy === false }}
              >
                <div
                  classList={{
                    "size-1.5 rounded-full shrink-0": true,
                    "bg-icon-success-base": store.status[i]?.healthy === true,
                    "bg-icon-critical-base": store.status[i]?.healthy === false,
                    "bg-border-weak-base": store.status[i] === undefined,
                  }}
                />
                <span class="truncate">{serverDisplayName(i)}</span>
                <span class="text-text-weak">{store.status[i]?.version}</span>
              </div>
              <Show when={current() !== i && server.list.includes(i)}>
                <IconButton
                  icon="circle-x"
                  variant="ghost"
                  class="bg-transparent transition-opacity shrink-0 hover:scale-110"
                  onClick={(e) => {
                    e.stopPropagation()
                    handleRemove(i)
                  }}
                />
              </Show>
            </div>
          )}
        </List>
        <div class="mt-6 px-3 flex flex-col gap-1.5">
          <div class="px-3">
            <h3 class="text-14-regular text-text-weak">Add a server</h3>
          </div>
          <form onSubmit={handleSubmit}>
            <div class="flex items-start gap-2">
              <div class="flex-1 min-w-0 h-auto">
                <TextField
                  type="text"
                  label="Server URL"
                  hideLabel
                  placeholder="http://localhost:4096"
                  value={store.url}
                  onChange={(v) => {
                    setStore("url", v)
                    setStore("error", "")
                  }}
                  validationState={store.error ? "invalid" : "valid"}
                  error={store.error}
                />
              </div>
              <Button type="submit" variant="secondary" icon="plus-small" size="large" disabled={store.adding}>
                {store.adding ? "Checking..." : "Add"}
              </Button>
            </div>
          </form>
        </div>
        <Show when={isDesktop}>
          <div class="mt-6 px-3 flex flex-col gap-1.5">
            <div class="px-3">
              <h3 class="text-14-regular text-text-weak">Default server</h3>
              <p class="text-12-regular text-text-weak mt-1">
                Connect to this server on app launch instead of starting a local server. Requires restart.
              </p>
            </div>
            <div class="flex items-center gap-2 px-3 py-2">
              <Show
                when={defaultUrl()}
                fallback={
                  <Show
                    when={server.url}
                    fallback={<span class="text-14-regular text-text-weak">No server selected</span>}
                  >
                    <Button
                      variant="secondary"
                      size="small"
                      onClick={async () => {
                        await platform.setDefaultServerUrl?.(server.url)
                        defaultUrlActions.refetch(server.url)
                      }}
                    >
                      Set current server as default
                    </Button>
                  </Show>
                }
              >
                <div class="flex items-center gap-2 flex-1 min-w-0">
                  <span class="truncate text-14-regular">{serverDisplayName(defaultUrl()!)}</span>
                </div>
                <Button
                  variant="ghost"
                  size="small"
                  onClick={async () => {
                    await platform.setDefaultServerUrl?.(null)
                    defaultUrlActions.refetch()
                  }}
                >
                  Clear
                </Button>
              </Show>
            </div>
          </div>
        </Show>
      </div>
    </Dialog>
  )
 }
@@ -2,7 +2,7 @@ import { useLocal, type LocalFile } from "@/context/local"
 import { Collapsible } from "@opencode-ai/ui/collapsible"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
-import { For, Match, Switch, type ComponentProps, type ParentProps } from "solid-js"
+import { For, Match, Switch, Show, type ComponentProps, type ParentProps } from "solid-js"
 import { Dynamic } from "solid-js/web"
 export default function FileTree(props: {
@@ -57,14 +57,14 @@ export default function FileTree(props: {
          "text-text-muted/40": p.node.ignored,
          "text-text-muted/80": !p.node.ignored,
          // "!text-text": local.file.active()?.path === p.node.path,
-          // "!text-primary": local.file.changed(p.node.path),
+          "!text-primary": local.file.changed(p.node.path),
        }}
      >
        {p.node.name}
      </span>
-      {/* <Show when={local.file.changed(p.node.path)}> */}
+      <Show when={local.file.changed(p.node.path)}>
-      {/*   <span class="ml-auto mr-1 w-1.5 h-1.5 rounded-full bg-primary/50 shrink-0" /> */}
+        <span class="ml-auto mr-1 w-1.5 h-1.5 rounded-full bg-primary/50 shrink-0" />
-      {/* </Show> */}
+      </Show>
    </Dynamic>
  )
@@ -0,0 +1,209 @@
 import { useGlobalSync } from "@/context/global-sync"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { useLayout } from "@/context/layout"
 import { Session } from "@opencode-ai/sdk/v2/client"
 import { Button } from "@opencode-ai/ui/button"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Mark } from "@opencode-ai/ui/logo"
 import { Popover } from "@opencode-ai/ui/popover"
 import { Select } from "@opencode-ai/ui/select"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { base64Decode } from "@opencode-ai/util/encode"
 import { useCommand } from "@/context/command"
 import { getFilename } from "@opencode-ai/util/path"
 import { A, useParams } from "@solidjs/router"
 import { createMemo, createResource, Show } from "solid-js"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { iife } from "@opencode-ai/util/iife"
 export function Header(props: {
  navigateToProject: (directory: string) => void
  navigateToSession: (session: Session | undefined) => void
  onMobileMenuToggle?: () => void
 }) {
  const globalSync = useGlobalSync()
  const globalSDK = useGlobalSDK()
  const layout = useLayout()
  const params = useParams()
  const command = useCommand()
  return (
    <header class="h-12 shrink-0 bg-background-base border-b border-border-weak-base flex" data-tauri-drag-region>
      <button
        type="button"
        class="xl:hidden w-12 shrink-0 flex items-center justify-center border-r border-border-weak-base hover:bg-surface-raised-base-hover active:bg-surface-raised-base-active transition-colors"
        onClick={props.onMobileMenuToggle}
      >
        <Icon name="menu" size="small" />
      </button>
      <A
        href="/"
        classList={{
          "hidden xl:flex": true,
          "w-12 shrink-0 px-4 py-3.5": true,
          "items-center justify-start self-stretch": true,
          "border-r border-border-weak-base": true,
        }}
        style={{ width: layout.sidebar.opened() ? `${layout.sidebar.width()}px` : undefined }}
        data-tauri-drag-region
      >
        <Mark class="shrink-0" />
      </A>
      <div class="pl-4 px-6 flex items-center justify-between gap-4 w-full">
        <Show when={layout.projects.list().length > 0 && params.dir}>
          {(directory) => {
            const currentDirectory = createMemo(() => base64Decode(directory()))
            const store = createMemo(() => globalSync.child(currentDirectory())[0])
            const sessions = createMemo(() => (store().session ?? []).filter((s) => !s.parentID))
            const currentSession = createMemo(() => sessions().find((s) => s.id === params.id))
            const shareEnabled = createMemo(() => store().config.share !== "disabled")
            return (
              <>
                <div class="flex items-center gap-3 min-w-0">
                  <div class="flex items-center gap-2 min-w-0">
                    <div class="hidden xl:flex items-center gap-2">
                      <Select
                        options={layout.projects.list().map((project) => project.worktree)}
                        current={currentDirectory()}
                        label={(x) => getFilename(x)}
                        onSelect={(x) => (x ? props.navigateToProject(x) : undefined)}
                        class="text-14-regular text-text-base"
                        variant="ghost"
                      >
                        {/* @ts-ignore */}
                        {(i) => (
                          <div class="flex items-center gap-2">
                            <Icon name="folder" size="small" />
                            <div class="text-text-strong">{getFilename(i)}</div>
                          </div>
                        )}
                      </Select>
                      <div class="text-text-weaker">/</div>
                    </div>
                    <Select
                      options={sessions()}
                      current={currentSession()}
                      placeholder="New session"
                      label={(x) => x.title}
                      value={(x) => x.id}
                      onSelect={props.navigateToSession}
                      class="text-14-regular text-text-base max-w-[calc(100vw-180px)] md:max-w-md"
                      variant="ghost"
                    />
                  </div>
                  <Show when={currentSession()}>
                    <Tooltip
                      class="hidden xl:block"
                      value={
                        <div class="flex items-center gap-2">
                          <span>New session</span>
                          <span class="text-icon-base text-12-medium">{command.keybind("session.new")}</span>
                        </div>
                      }
                    >
                      <Button as={A} href={`/${params.dir}/session`} icon="plus-small">
                        New session
                      </Button>
                    </Tooltip>
                  </Show>
                </div>
                <div class="flex items-center gap-4">
                  <Tooltip
                    class="hidden md:block shrink-0"
                    value={
                      <div class="flex items-center gap-2">
                        <span>Toggle review</span>
                        <span class="text-icon-base text-12-medium">{command.keybind("review.toggle")}</span>
                      </div>
                    }
                  >
                    <Button variant="ghost" class="group/review-toggle size-6 p-0" onClick={layout.review.toggle}>
                      <div class="relative flex items-center justify-center size-4 [&>*]:absolute [&>*]:inset-0">
                        <Icon
                          size="small"
                          name={layout.review.opened() ? "layout-right-full" : "layout-right"}
                          class="group-hover/review-toggle:hidden"
                        />
                        <Icon
                          size="small"
                          name="layout-right-partial"
                          class="hidden group-hover/review-toggle:inline-block"
                        />
                        <Icon
                          size="small"
                          name={layout.review.opened() ? "layout-right" : "layout-right-full"}
                          class="hidden group-active/review-toggle:inline-block"
                        />
                      </div>
                    </Button>
                  </Tooltip>
                  <Tooltip
                    class="hidden md:block shrink-0"
                    value={
                      <div class="flex items-center gap-2">
                        <span>Toggle terminal</span>
                        <span class="text-icon-base text-12-medium">{command.keybind("terminal.toggle")}</span>
                      </div>
                    }
                  >
                    <Button variant="ghost" class="group/terminal-toggle size-6 p-0" onClick={layout.terminal.toggle}>
                      <div class="relative flex items-center justify-center size-4 [&>*]:absolute [&>*]:inset-0">
                        <Icon
                          size="small"
                          name={layout.terminal.opened() ? "layout-bottom-full" : "layout-bottom"}
                          class="group-hover/terminal-toggle:hidden"
                        />
                        <Icon
                          size="small"
                          name="layout-bottom-partial"
                          class="hidden group-hover/terminal-toggle:inline-block"
                        />
                        <Icon
                          size="small"
                          name={layout.terminal.opened() ? "layout-bottom" : "layout-bottom-full"}
                          class="hidden group-active/terminal-toggle:inline-block"
                        />
                      </div>
                    </Button>
                  </Tooltip>
                  <Show when={shareEnabled() && currentSession()}>
                    <Popover
                      title="Share session"
                      trigger={
                        <Tooltip class="shrink-0" value="Share session">
                          <IconButton icon="share" variant="ghost" class="" />
                        </Tooltip>
                      }
                    >
                      {iife(() => {
                        const [url] = createResource(
                          () => currentSession(),
                          async (session) => {
                            if (!session) return
                            let shareURL = session.share?.url
                            if (!shareURL) {
                              shareURL = await globalSDK.client.session
                                .share({ sessionID: session.id, directory: currentDirectory() })
                                .then((r) => r.data?.share?.url)
                            }
                            return shareURL
                          },
                        )
                        return (
                          <Show when={url()}>
                            {(url) => <TextField value={url()} readOnly copyable class="w-72" />}
                          </Show>
                        )
                      })}
                    </Popover>
                  </Show>
                </div>
              </>
            )
          }}
        </Show>
      </div>
    </header>
  )
 }
@@ -1,26 +1,13 @@
-import { Match, Show, Switch, createMemo } from "solid-js"
+import { createMemo, Show } from "solid-js"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { ProgressCircle } from "@opencode-ai/ui/progress-circle"
 import { Button } from "@opencode-ai/ui/button"
 import { useParams } from "@solidjs/router"
 import { AssistantMessage } from "@opencode-ai/sdk/v2/client"
 import { useLayout } from "@/context/layout"
 import { useSync } from "@/context/sync"
 import { useParams } from "@solidjs/router"
 import { AssistantMessage } from "@opencode-ai/sdk/v2"
-interface SessionContextUsageProps {
+export function SessionContextUsage() {
  variant?: "button" | "indicator"
 }
 export function SessionContextUsage(props: SessionContextUsageProps) {
  const sync = useSync()
  const params = useParams()
  const layout = useLayout()
  const variant = createMemo(() => props.variant ?? "button")
  const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
  const tabs = createMemo(() => layout.tabs(sessionKey()))
  const view = createMemo(() => layout.view(sessionKey()))
  const messages = createMemo(() => (params.id ? (sync.data.message[params.id] ?? []) : []))
  const cost = createMemo(() => {
@@ -32,11 +19,7 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
  })
  const context = createMemo(() => {
-    const last = messages().findLast((x) => {
+    const last = messages().findLast((x) => x.role === "assistant" && x.tokens.output > 0) as AssistantMessage
      if (x.role !== "assistant") return false
      const total = x.tokens.input + x.tokens.output + x.tokens.reasoning + x.tokens.cache.read + x.tokens.cache.write
      return total > 0
    }) as AssistantMessage
    if (!last) return
    const total =
      last.tokens.input + last.tokens.output + last.tokens.reasoning + last.tokens.cache.read + last.tokens.cache.write
@@ -47,57 +30,35 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
    }
  })
  const openContext = () => {
    if (!params.id) return
    view().reviewPanel.open()
    tabs().open("context")
    tabs().setActive("context")
  }
  const circle = () => (
    <div class="p-1">
      <ProgressCircle size={16} strokeWidth={2} percentage={context()?.percentage ?? 0} />
    </div>
  )
  const tooltipValue = () => (
    <div>
      <Show when={context()}>
        {(ctx) => (
          <>
            <div class="flex items-center gap-2">
              <span class="text-text-invert-strong">{ctx().tokens}</span>
              <span class="text-text-invert-base">Tokens</span>
            </div>
            <div class="flex items-center gap-2">
              <span class="text-text-invert-strong">{ctx().percentage ?? 0}%</span>
              <span class="text-text-invert-base">Usage</span>
            </div>
          </>
        )}
      </Show>
      <div class="flex items-center gap-2">
        <span class="text-text-invert-strong">{cost()}</span>
        <span class="text-text-invert-base">Cost</span>
      </div>
      <Show when={variant() === "button"}>
        <div class="text-11-regular text-text-invert-base mt-1">Click to view context</div>
      </Show>
    </div>
  )
  return (
-    <Show when={params.id}>
+    <Show when={context?.()}>
-      <Tooltip value={tooltipValue()} placement="top">
+      {(ctx) => (
-        <Switch>
+        <Tooltip
-          <Match when={variant() === "indicator"}>{circle()}</Match>
+          openDelay={300}
-          <Match when={true}>
+          value={
-            <Button type="button" variant="ghost" class="size-6" onClick={openContext}>
+            <div class="flex flex-col gap-1 p-2">
-              {circle()}
+              <div class="flex justify-between gap-4">
-            </Button>
+                <span class="text-text-weaker">Tokens</span>
-          </Match>
+                <span class="text-text-strong">{ctx().tokens}</span>
-        </Switch>
+              </div>
-      </Tooltip>
+              <div class="flex justify-between gap-4">
                <span class="text-text-weaker">Usage</span>
                <span class="text-text-strong">{ctx().percentage ?? 0}%</span>
              </div>
              <div class="flex justify-between gap-4">
                <span class="text-text-weaker">Cost</span>
                <span class="text-text-strong">{cost()}</span>
              </div>
            </div>
          }
          placement="top"
        >
          <div class="flex items-center gap-1">
            <span class="text-12-medium text-text-weak">{`${ctx().percentage ?? 0}%`}</span>
            <ProgressCircle size={16} strokeWidth={2} percentage={ctx().percentage ?? 0} />
          </div>
        </Tooltip>
      )}
    </Show>
  )
 }
@@ -1,38 +0,0 @@
 import { createMemo, Show } from "solid-js"
 import { useSync } from "@/context/sync"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 export function SessionLspIndicator() {
  const sync = useSync()
  const lspStats = createMemo(() => {
    const lsp = sync.data.lsp ?? []
    const connected = lsp.filter((s) => s.status === "connected").length
    const hasError = lsp.some((s) => s.status === "error")
    const total = lsp.length
    return { connected, hasError, total }
  })
  const tooltipContent = createMemo(() => {
    const lsp = sync.data.lsp ?? []
    if (lsp.length === 0) return "No LSP servers"
    return lsp.map((s) => s.name).join(", ")
  })
  return (
    <Show when={lspStats().total > 0}>
      <Tooltip placement="top" value={tooltipContent()}>
        <div class="flex items-center gap-1 px-2 cursor-default select-none">
          <div
            classList={{
              "size-1.5 rounded-full": true,
              "bg-icon-critical-base": lspStats().hasError,
              "bg-icon-success-base": !lspStats().hasError && lspStats().connected > 0,
            }}
          />
          <span class="text-12-regular text-text-weak">{lspStats().connected} LSP</span>
        </div>
      </Tooltip>
    </Show>
  )
 }
@@ -1,34 +0,0 @@
 import { createMemo, Show } from "solid-js"
 import { Button } from "@opencode-ai/ui/button"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useSync } from "@/context/sync"
 import { DialogSelectMcp } from "@/components/dialog-select-mcp"
 export function SessionMcpIndicator() {
  const sync = useSync()
  const dialog = useDialog()
  const mcpStats = createMemo(() => {
    const mcp = sync.data.mcp ?? {}
    const entries = Object.entries(mcp)
    const enabled = entries.filter(([, status]) => status.status === "connected").length
    const failed = entries.some(([, status]) => status.status === "failed")
    const total = entries.length
    return { enabled, failed, total }
  })
  return (
    <Show when={mcpStats().total > 0}>
      <Button variant="ghost" onClick={() => dialog.show(() => <DialogSelectMcp />)}>
        <div
          classList={{
            "size-1.5 rounded-full": true,
            "bg-icon-critical-base": mcpStats().failed,
            "bg-icon-success-base": !mcpStats().failed && mcpStats().enabled > 0,
          }}
        />
        <span class="text-12-regular text-text-weak">{mcpStats().enabled} MCP</span>
      </Button>
    </Show>
  )
 }
@@ -1,5 +0,0 @@
 export { SessionHeader } from "./session-header"
 export { SessionContextTab } from "./session-context-tab"
 export { SortableTab, FileVisual } from "./session-sortable-tab"
 export { SortableTerminalTab } from "./session-sortable-terminal-tab"
 export { NewSessionView } from "./session-new-view"
@@ -1,425 +0,0 @@
 import { createMemo, createEffect, on, onCleanup, For, Show } from "solid-js"
 import type { JSX } from "solid-js"
 import { useParams } from "@solidjs/router"
 import { DateTime } from "luxon"
 import { useSync } from "@/context/sync"
 import { useLayout } from "@/context/layout"
 import { checksum } from "@opencode-ai/util/encode"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Accordion } from "@opencode-ai/ui/accordion"
 import { StickyAccordionHeader } from "@opencode-ai/ui/sticky-accordion-header"
 import { Code } from "@opencode-ai/ui/code"
 import { Markdown } from "@opencode-ai/ui/markdown"
 import type { AssistantMessage, Message, Part, UserMessage } from "@opencode-ai/sdk/v2/client"
 interface SessionContextTabProps {
  messages: () => Message[]
  visibleUserMessages: () => UserMessage[]
  view: () => ReturnType<ReturnType<typeof useLayout>["view"]>
  info: () => ReturnType<ReturnType<typeof useSync>["session"]["get"]>
 }
 export function SessionContextTab(props: SessionContextTabProps) {
  const params = useParams()
  const sync = useSync()
  const ctx = createMemo(() => {
    const last = props.messages().findLast((x) => {
      if (x.role !== "assistant") return false
      const total = x.tokens.input + x.tokens.output + x.tokens.reasoning + x.tokens.cache.read + x.tokens.cache.write
      return total > 0
    }) as AssistantMessage
    if (!last) return
    const provider = sync.data.provider.all.find((x) => x.id === last.providerID)
    const model = provider?.models[last.modelID]
    const limit = model?.limit.context
    const input = last.tokens.input
    const output = last.tokens.output
    const reasoning = last.tokens.reasoning
    const cacheRead = last.tokens.cache.read
    const cacheWrite = last.tokens.cache.write
    const total = input + output + reasoning + cacheRead + cacheWrite
    const usage = limit ? Math.round((total / limit) * 100) : null
    return {
      message: last,
      provider,
      model,
      limit,
      input,
      output,
      reasoning,
      cacheRead,
      cacheWrite,
      total,
      usage,
    }
  })
  const cost = createMemo(() => {
    const total = props.messages().reduce((sum, x) => sum + (x.role === "assistant" ? x.cost : 0), 0)
    return new Intl.NumberFormat("en-US", {
      style: "currency",
      currency: "USD",
    }).format(total)
  })
  const counts = createMemo(() => {
    const all = props.messages()
    const user = all.reduce((count, x) => count + (x.role === "user" ? 1 : 0), 0)
    const assistant = all.reduce((count, x) => count + (x.role === "assistant" ? 1 : 0), 0)
    return {
      all: all.length,
      user,
      assistant,
    }
  })
  const systemPrompt = createMemo(() => {
    const msg = props.visibleUserMessages().findLast((m) => !!m.system)
    const system = msg?.system
    if (!system) return
    const trimmed = system.trim()
    if (!trimmed) return
    return trimmed
  })
  const number = (value: number | null | undefined) => {
    if (value === undefined) return "—"
    if (value === null) return "—"
    return value.toLocaleString()
  }
  const percent = (value: number | null | undefined) => {
    if (value === undefined) return "—"
    if (value === null) return "—"
    return value.toString() + "%"
  }
  const time = (value: number | undefined) => {
    if (!value) return "—"
    return DateTime.fromMillis(value).toLocaleString(DateTime.DATETIME_MED)
  }
  const providerLabel = createMemo(() => {
    const c = ctx()
    if (!c) return "—"
    return c.provider?.name ?? c.message.providerID
  })
  const modelLabel = createMemo(() => {
    const c = ctx()
    if (!c) return "—"
    if (c.model?.name) return c.model.name
    return c.message.modelID
  })
  const breakdown = createMemo(
    on(
      () => [ctx()?.message.id, ctx()?.input, props.messages().length, systemPrompt()],
      () => {
        const c = ctx()
        if (!c) return []
        const input = c.input
        if (!input) return []
        const out = {
          system: systemPrompt()?.length ?? 0,
          user: 0,
          assistant: 0,
          tool: 0,
        }
        for (const msg of props.messages()) {
          const parts = (sync.data.part[msg.id] ?? []) as Part[]
          if (msg.role === "user") {
            for (const part of parts) {
              if (part.type === "text") out.user += part.text.length
              if (part.type === "file") out.user += part.source?.text.value.length ?? 0
              if (part.type === "agent") out.user += part.source?.value.length ?? 0
            }
            continue
          }
          if (msg.role === "assistant") {
            for (const part of parts) {
              if (part.type === "text") out.assistant += part.text.length
              if (part.type === "reasoning") out.assistant += part.text.length
              if (part.type === "tool") {
                out.tool += Object.keys(part.state.input).length * 16
                if (part.state.status === "pending") out.tool += part.state.raw.length
                if (part.state.status === "completed") out.tool += part.state.output.length
                if (part.state.status === "error") out.tool += part.state.error.length
              }
            }
          }
        }
        const estimateTokens = (chars: number) => Math.ceil(chars / 4)
        const system = estimateTokens(out.system)
        const user = estimateTokens(out.user)
        const assistant = estimateTokens(out.assistant)
        const tool = estimateTokens(out.tool)
        const estimated = system + user + assistant + tool
        const pct = (tokens: number) => (tokens / input) * 100
        const pctLabel = (tokens: number) => (Math.round(pct(tokens) * 10) / 10).toString() + "%"
        const build = (tokens: { system: number; user: number; assistant: number; tool: number; other: number }) => {
          return [
            {
              key: "system",
              label: "System",
              tokens: tokens.system,
              width: pct(tokens.system),
              percent: pctLabel(tokens.system),
              color: "var(--syntax-info)",
            },
            {
              key: "user",
              label: "User",
              tokens: tokens.user,
              width: pct(tokens.user),
              percent: pctLabel(tokens.user),
              color: "var(--syntax-success)",
            },
            {
              key: "assistant",
              label: "Assistant",
              tokens: tokens.assistant,
              width: pct(tokens.assistant),
              percent: pctLabel(tokens.assistant),
              color: "var(--syntax-property)",
            },
            {
              key: "tool",
              label: "Tool Calls",
              tokens: tokens.tool,
              width: pct(tokens.tool),
              percent: pctLabel(tokens.tool),
              color: "var(--syntax-warning)",
            },
            {
              key: "other",
              label: "Other",
              tokens: tokens.other,
              width: pct(tokens.other),
              percent: pctLabel(tokens.other),
              color: "var(--syntax-comment)",
            },
          ].filter((x) => x.tokens > 0)
        }
        if (estimated <= input) {
          return build({ system, user, assistant, tool, other: input - estimated })
        }
        const scale = input / estimated
        const scaled = {
          system: Math.floor(system * scale),
          user: Math.floor(user * scale),
          assistant: Math.floor(assistant * scale),
          tool: Math.floor(tool * scale),
        }
        const scaledTotal = scaled.system + scaled.user + scaled.assistant + scaled.tool
        return build({ ...scaled, other: Math.max(0, input - scaledTotal) })
      },
    ),
  )
  function Stat(statProps: { label: string; value: JSX.Element }) {
    return (
      <div class="flex flex-col gap-1">
        <div class="text-12-regular text-text-weak">{statProps.label}</div>
        <div class="text-12-medium text-text-strong">{statProps.value}</div>
      </div>
    )
  }
  const stats = createMemo(() => {
    const c = ctx()
    const count = counts()
    return [
      { label: "Session", value: props.info()?.title ?? params.id ?? "—" },
      { label: "Messages", value: count.all.toLocaleString() },
      { label: "Provider", value: providerLabel() },
      { label: "Model", value: modelLabel() },
      { label: "Context Limit", value: number(c?.limit) },
      { label: "Total Tokens", value: number(c?.total) },
      { label: "Usage", value: percent(c?.usage) },
      { label: "Input Tokens", value: number(c?.input) },
      { label: "Output Tokens", value: number(c?.output) },
      { label: "Reasoning Tokens", value: number(c?.reasoning) },
      { label: "Cache Tokens (read/write)", value: `${number(c?.cacheRead)} / ${number(c?.cacheWrite)}` },
      { label: "User Messages", value: count.user.toLocaleString() },
      { label: "Assistant Messages", value: count.assistant.toLocaleString() },
      { label: "Total Cost", value: cost() },
      { label: "Session Created", value: time(props.info()?.time.created) },
      { label: "Last Activity", value: time(c?.message.time.created) },
    ] satisfies { label: string; value: JSX.Element }[]
  })
  function RawMessageContent(msgProps: { message: Message }) {
    const file = createMemo(() => {
      const parts = (sync.data.part[msgProps.message.id] ?? []) as Part[]
      const contents = JSON.stringify({ message: msgProps.message, parts }, null, 2)
      return {
        name: `${msgProps.message.role}-${msgProps.message.id}.json`,
        contents,
        cacheKey: checksum(contents),
      }
    })
    return <Code file={file()} overflow="wrap" class="select-text" />
  }
  function RawMessage(msgProps: { message: Message }) {
    return (
      <Accordion.Item value={msgProps.message.id}>
        <StickyAccordionHeader>
          <Accordion.Trigger>
            <div class="flex items-center justify-between gap-2 w-full">
              <div class="min-w-0 truncate">
                {msgProps.message.role} <span class="text-text-base">• {msgProps.message.id}</span>
              </div>
              <div class="flex items-center gap-3">
                <div class="shrink-0 text-12-regular text-text-weak">{time(msgProps.message.time.created)}</div>
                <Icon name="chevron-grabber-vertical" size="small" class="shrink-0 text-text-weak" />
              </div>
            </div>
          </Accordion.Trigger>
        </StickyAccordionHeader>
        <Accordion.Content class="bg-background-base">
          <div class="p-3">
            <RawMessageContent message={msgProps.message} />
          </div>
        </Accordion.Content>
      </Accordion.Item>
    )
  }
  let scroll: HTMLDivElement | undefined
  let frame: number | undefined
  let pending: { x: number; y: number } | undefined
  const restoreScroll = (retries = 0) => {
    const el = scroll
    if (!el) return
    const s = props.view()?.scroll("context")
    if (!s) return
    // Wait for content to be scrollable - content may not have rendered yet
    if (el.scrollHeight <= el.clientHeight && retries < 10) {
      requestAnimationFrame(() => restoreScroll(retries + 1))
      return
    }
    if (el.scrollTop !== s.y) el.scrollTop = s.y
    if (el.scrollLeft !== s.x) el.scrollLeft = s.x
  }
  const handleScroll = (event: Event & { currentTarget: HTMLDivElement }) => {
    pending = {
      x: event.currentTarget.scrollLeft,
      y: event.currentTarget.scrollTop,
    }
    if (frame !== undefined) return
    frame = requestAnimationFrame(() => {
      frame = undefined
      const next = pending
      pending = undefined
      if (!next) return
      props.view().setScroll("context", next)
    })
  }
  createEffect(
    on(
      () => props.messages().length,
      () => {
        requestAnimationFrame(restoreScroll)
      },
      { defer: true },
    ),
  )
  onCleanup(() => {
    if (frame === undefined) return
    cancelAnimationFrame(frame)
  })
  return (
    <div
      class="@container h-full overflow-y-auto no-scrollbar pb-10"
      ref={(el) => {
        scroll = el
        restoreScroll()
      }}
      onScroll={handleScroll}
    >
      <div class="px-6 pt-4 flex flex-col gap-10">
        <div class="grid grid-cols-1 @[32rem]:grid-cols-2 gap-4">
          <For each={stats()}>{(stat) => <Stat label={stat.label} value={stat.value} />}</For>
        </div>
        <Show when={breakdown().length > 0}>
          <div class="flex flex-col gap-2">
            <div class="text-12-regular text-text-weak">Context Breakdown</div>
            <div class="h-2 w-full rounded-full bg-surface-base overflow-hidden flex">
              <For each={breakdown()}>
                {(segment) => (
                  <div
                    class="h-full"
                    style={{
                      width: `${segment.width}%`,
                      "background-color": segment.color,
                    }}
                  />
                )}
              </For>
            </div>
            <div class="flex flex-wrap gap-x-3 gap-y-1">
              <For each={breakdown()}>
                {(segment) => (
                  <div class="flex items-center gap-1 text-11-regular text-text-weak">
                    <div class="size-2 rounded-sm" style={{ "background-color": segment.color }} />
                    <div>{segment.label}</div>
                    <div class="text-text-weaker">{segment.percent}</div>
                  </div>
                )}
              </For>
            </div>
            <div class="hidden text-11-regular text-text-weaker">
              Approximate breakdown of input tokens. "Other" includes tool definitions and overhead.
            </div>
          </div>
        </Show>
        <Show when={systemPrompt()}>
          {(prompt) => (
            <div class="flex flex-col gap-2">
              <div class="text-12-regular text-text-weak">System Prompt</div>
              <div class="border border-border-base rounded-md bg-surface-base px-3 py-2">
                <Markdown text={prompt()} class="text-12-regular" />
              </div>
            </div>
          )}
        </Show>
        <div class="flex flex-col gap-2">
          <div class="text-12-regular text-text-weak">Raw messages</div>
          <Accordion multiple>
            <For each={props.messages()}>{(message) => <RawMessage message={message} />}</For>
          </Accordion>
        </div>
      </div>
    </div>
  )
 }
@@ -1,203 +0,0 @@
 import { createMemo, createResource, Show } from "solid-js"
 import { Portal } from "solid-js/web"
 import { useParams } from "@solidjs/router"
 import { useLayout } from "@/context/layout"
 import { useCommand } from "@/context/command"
 // import { useServer } from "@/context/server"
 // import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useSync } from "@/context/sync"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { getFilename } from "@opencode-ai/util/path"
 import { base64Decode } from "@opencode-ai/util/encode"
 import { iife } from "@opencode-ai/util/iife"
 import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Button } from "@opencode-ai/ui/button"
 import { Tooltip, TooltipKeybind } from "@opencode-ai/ui/tooltip"
 import { Popover } from "@opencode-ai/ui/popover"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { Keybind } from "@opencode-ai/ui/keybind"
 export function SessionHeader() {
  const globalSDK = useGlobalSDK()
  const layout = useLayout()
  const params = useParams()
  const command = useCommand()
  // const server = useServer()
  // const dialog = useDialog()
  const sync = useSync()
  const projectDirectory = createMemo(() => base64Decode(params.dir ?? ""))
  const project = createMemo(() => {
    const directory = projectDirectory()
    if (!directory) return
    return layout.projects.list().find((p) => p.worktree === directory || p.sandboxes?.includes(directory))
  })
  const name = createMemo(() => {
    const current = project()
    if (current) return current.name || getFilename(current.worktree)
    return getFilename(projectDirectory())
  })
  const hotkey = createMemo(() => command.keybind("file.open"))
  const currentSession = createMemo(() => sync.data.session.find((s) => s.id === params.id))
  const shareEnabled = createMemo(() => sync.data.config.share !== "disabled")
  const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
  const view = createMemo(() => layout.view(sessionKey()))
  const centerMount = createMemo(() => document.getElementById("opencode-titlebar-center"))
  const rightMount = createMemo(() => document.getElementById("opencode-titlebar-right"))
  return (
    <>
      <Show when={centerMount()}>
        {(mount) => (
          <Portal mount={mount()}>
            <button
              type="button"
              class="hidden md:flex w-[320px] p-1 pl-1.5 items-center gap-2 justify-between rounded-md border border-border-weak-base bg-surface-raised-base transition-colors cursor-default hover:bg-surface-raised-base-hover focus:bg-surface-raised-base-hover active:bg-surface-raised-base-active"
              onClick={() => command.trigger("file.open")}
            >
              <div class="flex items-center gap-2">
                <Icon name="magnifying-glass" size="normal" class="icon-base" />
                <span class="flex-1 min-w-0 text-14-regular text-text-weak truncate h-3.5 flex items-center overflow-visible">
                  Search {name()}
                </span>
              </div>
              <Show when={hotkey()}>{(keybind) => <Keybind>{keybind()}</Keybind>}</Show>
            </button>
          </Portal>
        )}
      </Show>
      <Show when={rightMount()}>
        {(mount) => (
          <Portal mount={mount()}>
            <div class="flex items-center gap-3">
              {/* <div class="hidden md:flex items-center gap-1"> */}
              {/*   <Button */}
              {/*     size="small" */}
              {/*     variant="ghost" */}
              {/*     onClick={() => { */}
              {/*       dialog.show(() => <DialogSelectServer />) */}
              {/*     }} */}
              {/*   > */}
              {/*     <div */}
              {/*       classList={{ */}
              {/*         "size-1.5 rounded-full": true, */}
              {/*         "bg-icon-success-base": server.healthy() === true, */}
              {/*         "bg-icon-critical-base": server.healthy() === false, */}
              {/*         "bg-border-weak-base": server.healthy() === undefined, */}
              {/*       }} */}
              {/*     /> */}
              {/*     <Icon name="server" size="small" class="text-icon-weak" /> */}
              {/*     <span class="text-12-regular text-text-weak truncate max-w-[200px]">{server.name}</span> */}
              {/*   </Button> */}
              {/*   <SessionLspIndicator /> */}
              {/*   <SessionMcpIndicator /> */}
              {/* </div> */}
              <div class="flex items-center gap-1">
                <Show when={currentSession()?.summary?.files}>
                  <TooltipKeybind
                    class="hidden md:block shrink-0"
                    title="Toggle review"
                    keybind={command.keybind("review.toggle")}
                  >
                    <Button
                      variant="ghost"
                      class="group/review-toggle size-6 p-0"
                      onClick={() => view().reviewPanel.toggle()}
                    >
                      <div class="relative flex items-center justify-center size-4 [&>*]:absolute [&>*]:inset-0">
                        <Icon
                          name={view().reviewPanel.opened() ? "layout-right" : "layout-left"}
                          size="small"
                          class="group-hover/review-toggle:hidden"
                        />
                        <Icon
                          name={view().reviewPanel.opened() ? "layout-right-partial" : "layout-left-partial"}
                          size="small"
                          class="hidden group-hover/review-toggle:inline-block"
                        />
                        <Icon
                          name={view().reviewPanel.opened() ? "layout-right-full" : "layout-left-full"}
                          size="small"
                          class="hidden group-active/review-toggle:inline-block"
                        />
                      </div>
                    </Button>
                  </TooltipKeybind>
                </Show>
                <TooltipKeybind
                  class="hidden md:block shrink-0"
                  title="Toggle terminal"
                  keybind={command.keybind("terminal.toggle")}
                >
                  <Button
                    variant="ghost"
                    class="group/terminal-toggle size-6 p-0"
                    onClick={() => view().terminal.toggle()}
                  >
                    <div class="relative flex items-center justify-center size-4 [&>*]:absolute [&>*]:inset-0">
                      <Icon
                        size="small"
                        name={view().terminal.opened() ? "layout-bottom-full" : "layout-bottom"}
                        class="group-hover/terminal-toggle:hidden"
                      />
                      <Icon
                        size="small"
                        name="layout-bottom-partial"
                        class="hidden group-hover/terminal-toggle:inline-block"
                      />
                      <Icon
                        size="small"
                        name={view().terminal.opened() ? "layout-bottom" : "layout-bottom-full"}
                        class="hidden group-active/terminal-toggle:inline-block"
                      />
                    </div>
                  </Button>
                </TooltipKeybind>
              </div>
              <Show when={shareEnabled() && currentSession()}>
                <Popover
                  title="Share session"
                  trigger={
                    <Tooltip class="shrink-0" value="Share session">
                      <IconButton icon="share" variant="ghost" class="" />
                    </Tooltip>
                  }
                >
                  {iife(() => {
                    const [url] = createResource(
                      () => currentSession(),
                      async (session) => {
                        if (!session) return
                        let shareURL = session.share?.url
                        if (!shareURL) {
                          shareURL = await globalSDK.client.session
                            .share({ sessionID: session.id, directory: projectDirectory() })
                            .then((r) => r.data?.share?.url)
                            .catch((e) => {
                              console.error("Failed to share session", e)
                              return undefined
                            })
                        }
                        return shareURL
                      },
                      { initialValue: "" },
                    )
                    return (
                      <Show when={url.latest}>
                        {(shareUrl) => <TextField value={shareUrl()} readOnly copyable class="w-72" />}
                      </Show>
                    )
                  })}
                </Popover>
              </Show>
            </div>
          </Portal>
        )}
      </Show>
    </>
  )
 }
@@ -1,89 +0,0 @@
 import { Show, createMemo } from "solid-js"
 import { DateTime } from "luxon"
 import { useSync } from "@/context/sync"
 import { Icon } from "@opencode-ai/ui/icon"
 import { getDirectory, getFilename } from "@opencode-ai/util/path"
 import { Select } from "@opencode-ai/ui/select"
 const MAIN_WORKTREE = "main"
 const CREATE_WORKTREE = "create"
 interface NewSessionViewProps {
  worktree: string
  onWorktreeChange: (value: string) => void
 }
 export function NewSessionView(props: NewSessionViewProps) {
  const sync = useSync()
  const sandboxes = createMemo(() => sync.project?.sandboxes ?? [])
  const options = createMemo(() => [MAIN_WORKTREE, ...sandboxes(), CREATE_WORKTREE])
  const current = createMemo(() => {
    const selection = props.worktree
    if (options().includes(selection)) return selection
    return MAIN_WORKTREE
  })
  const projectRoot = createMemo(() => sync.project?.worktree ?? sync.data.path.directory)
  const isWorktree = createMemo(() => {
    const project = sync.project
    if (!project) return false
    return sync.data.path.directory !== project.worktree
  })
  const label = (value: string) => {
    if (value === MAIN_WORKTREE) {
      if (isWorktree()) return "Main branch"
      const branch = sync.data.vcs?.branch
      if (branch) return `Main branch (${branch})`
      return "Main branch"
    }
    if (value === CREATE_WORKTREE) return "Create new worktree"
    return getFilename(value)
  }
  return (
    <div
      class="size-full flex flex-col pb-45 justify-end items-start gap-4 flex-[1_0_0] self-stretch max-w-200 mx-auto px-6"
      style={{ "padding-bottom": "calc(var(--prompt-height, 11.25rem) + 64px)" }}
    >
      <div class="text-20-medium text-text-weaker">New session</div>
      <div class="flex justify-center items-center gap-3">
        <Icon name="folder" size="small" />
        <div class="text-12-medium text-text-weak">
          {getDirectory(projectRoot())}
          <span class="text-text-strong">{getFilename(projectRoot())}</span>
        </div>
      </div>
      <div class="flex justify-center items-center gap-1">
        <Icon name="branch" size="small" />
        <Select
          options={options()}
          current={current()}
          value={(x) => x}
          label={label}
          onSelect={(value) => {
            props.onWorktreeChange(value ?? MAIN_WORKTREE)
          }}
          size="normal"
          variant="ghost"
          class="text-12-medium"
        />
      </div>
      <Show when={sync.project}>
        {(project) => (
          <div class="flex justify-center items-center gap-3">
            <Icon name="pencil-line" size="small" />
            <div class="text-12-medium text-text-weak">
              Last modified&nbsp;
              <span class="text-text-strong">
                {DateTime.fromMillis(project().time.updated ?? project().time.created).toRelative()}
              </span>
            </div>
          </div>
        )}
      </Show>
    </div>
  )
 }
@@ -1,49 +0,0 @@
 import { createMemo, Show } from "solid-js"
 import type { JSX } from "solid-js"
 import { createSortable } from "@thisbeyond/solid-dnd"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { getFilename } from "@opencode-ai/util/path"
 import { useFile } from "@/context/file"
 export function FileVisual(props: { path: string; active?: boolean }): JSX.Element {
  return (
    <div class="flex items-center gap-x-1.5">
      <FileIcon
        node={{ path: props.path, type: "file" }}
        classList={{
          "grayscale-100 group-data-[selected]/tab:grayscale-0": !props.active,
          "grayscale-0": props.active,
        }}
      />
      <span class="text-14-medium">{getFilename(props.path)}</span>
    </div>
  )
 }
 export function SortableTab(props: { tab: string; onTabClose: (tab: string) => void }): JSX.Element {
  const file = useFile()
  const sortable = createSortable(props.tab)
  const path = createMemo(() => file.pathFromTab(props.tab))
  return (
    // @ts-ignore
    <div use:sortable classList={{ "h-full": true, "opacity-0": sortable.isActiveDraggable }}>
      <div class="relative h-full">
        <Tabs.Trigger
          value={props.tab}
          closeButton={
            <Tooltip value="Close tab" placement="bottom">
              <IconButton icon="close" variant="ghost" onClick={() => props.onTabClose(props.tab)} />
            </Tooltip>
          }
          hideCloseButton
          onMiddleClick={() => props.onTabClose(props.tab)}
        >
          <Show when={path()}>{(p) => <FileVisual path={p()} />}</Show>
        </Tabs.Trigger>
      </div>
    </div>
  )
 }
@@ -1,27 +0,0 @@
 import type { JSX } from "solid-js"
 import { createSortable } from "@thisbeyond/solid-dnd"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { useTerminal, type LocalPTY } from "@/context/terminal"
 export function SortableTerminalTab(props: { terminal: LocalPTY }): JSX.Element {
  const terminal = useTerminal()
  const sortable = createSortable(props.terminal.id)
  return (
    // @ts-ignore
    <div use:sortable classList={{ "h-full": true, "opacity-0": sortable.isActiveDraggable }}>
      <div class="relative h-full">
        <Tabs.Trigger
          value={props.terminal.id}
          closeButton={
            terminal.all().length > 1 && (
              <IconButton icon="close" variant="ghost" onClick={() => terminal.close(props.terminal.id)} />
            )
          }
        >
          {props.terminal.title}
        </Tabs.Trigger>
      </div>
    </div>
  )
 }
@@ -1,9 +1,9 @@
-import type { Ghostty, Terminal as Term, FitAddon } from "ghostty-web"
+import { Ghostty, Terminal as Term, FitAddon } from "ghostty-web"
-import { ComponentProps, createEffect, createSignal, onCleanup, onMount, splitProps } from "solid-js"
+import { ComponentProps, onCleanup, onMount, splitProps } from "solid-js"
 import { useSDK } from "@/context/sdk"
 import { SerializeAddon } from "@/addons/serialize"
 import { LocalPTY } from "@/context/terminal"
-import { resolveThemeVariant, useTheme, withAlpha, type HexColor } from "@opencode-ai/ui/theme"
+import { usePrefersDark } from "@solid-primitives/media"
 export interface TerminalProps extends ComponentProps<"div"> {
  pty: LocalPTY
@@ -12,244 +12,116 @@ export interface TerminalProps extends ComponentProps<"div"> {
  onConnectError?: (error: unknown) => void
 }
 type TerminalColors = {
  background: string
  foreground: string
  cursor: string
  selectionBackground: string
 }
 const DEFAULT_TERMINAL_COLORS: Record<"light" | "dark", TerminalColors> = {
  light: {
    background: "#fcfcfc",
    foreground: "#211e1e",
    cursor: "#211e1e",
    selectionBackground: withAlpha("#211e1e", 0.2),
  },
  dark: {
    background: "#191515",
    foreground: "#d4d4d4",
    cursor: "#d4d4d4",
    selectionBackground: withAlpha("#d4d4d4", 0.25),
  },
 }
 export const Terminal = (props: TerminalProps) => {
  const sdk = useSDK()
  const theme = useTheme()
  let container!: HTMLDivElement
  const [local, others] = splitProps(props, ["pty", "class", "classList", "onConnectError"])
-  let ws: WebSocket | undefined
+  let ws: WebSocket
-  let term: Term | undefined
+  let term: Term
  let ghostty: Ghostty
  let serializeAddon: SerializeAddon
  let fitAddon: FitAddon
  let handleResize: () => void
-  let handleTextareaFocus: () => void
+  const prefersDark = usePrefersDark()
  let handleTextareaBlur: () => void
  let reconnect: number | undefined
  let disposed = false
  const getTerminalColors = (): TerminalColors => {
    const mode = theme.mode()
    const fallback = DEFAULT_TERMINAL_COLORS[mode]
    const currentTheme = theme.themes()[theme.themeId()]
    if (!currentTheme) return fallback
    const variant = mode === "dark" ? currentTheme.dark : currentTheme.light
    if (!variant?.seeds) return fallback
    const resolved = resolveThemeVariant(variant, mode === "dark")
    const text = resolved["text-stronger"] ?? fallback.foreground
    const background = resolved["background-stronger"] ?? fallback.background
    const alpha = mode === "dark" ? 0.25 : 0.2
    const base = text.startsWith("#") ? (text as HexColor) : (fallback.foreground as HexColor)
    const selectionBackground = withAlpha(base, alpha)
    return {
      background,
      foreground: text,
      cursor: text,
      selectionBackground,
    }
  }
  const [terminalColors, setTerminalColors] = createSignal<TerminalColors>(getTerminalColors())
  createEffect(() => {
    const colors = getTerminalColors()
    setTerminalColors(colors)
    if (!term) return
    const setOption = (term as unknown as { setOption?: (key: string, value: TerminalColors) => void }).setOption
    if (!setOption) return
    setOption("theme", colors)
  })
  const focusTerminal = () => {
    const t = term
    if (!t) return
    t.focus()
    setTimeout(() => t.textarea?.focus(), 0)
  }
  const handlePointerDown = () => {
    const activeElement = document.activeElement
    if (activeElement instanceof HTMLElement && activeElement !== container) {
      activeElement.blur()
    }
    focusTerminal()
  }
  onMount(async () => {
-    const mod = await import("ghostty-web")
+    ghostty = await Ghostty.load()
    ghostty = await mod.Ghostty.load()
-    const url = new URL(sdk.url + `/pty/${local.pty.id}/connect?directory=${encodeURIComponent(sdk.directory)}`)
+    ws = new WebSocket(sdk.url + `/pty/${local.pty.id}/connect?directory=${encodeURIComponent(sdk.directory)}`)
-    if (window.__OPENCODE__?.serverPassword) {
+    term = new Term({
      url.username = "opencode"
      url.password = window.__OPENCODE__?.serverPassword
    }
    const socket = new WebSocket(url)
    ws = socket
    const t = new mod.Terminal({
      cursorBlink: true,
      cursorStyle: "bar",
      fontSize: 14,
      fontFamily: "IBM Plex Mono, monospace",
      allowTransparency: true,
-      theme: terminalColors(),
+      theme: prefersDark()
        ? {
            background: "#191515",
            foreground: "#d4d4d4",
            cursor: "#d4d4d4",
          }
        : {
            background: "#fcfcfc",
            foreground: "#211e1e",
            cursor: "#211e1e",
          },
      scrollback: 10_000,
      ghostty,
    })
-    term = t
+    term.attachCustomKeyEventHandler((event) => {
    const copy = () => {
      const selection = t.getSelection()
      if (!selection) return false
      const body = document.body
      if (body) {
        const textarea = document.createElement("textarea")
        textarea.value = selection
        textarea.setAttribute("readonly", "")
        textarea.style.position = "fixed"
        textarea.style.opacity = "0"
        body.appendChild(textarea)
        textarea.select()
        const copied = document.execCommand("copy")
        body.removeChild(textarea)
        if (copied) return true
      }
      const clipboard = navigator.clipboard
      if (clipboard?.writeText) {
        clipboard.writeText(selection).catch(() => {})
        return true
      }
      return false
    }
    t.attachCustomKeyEventHandler((event) => {
      const key = event.key.toLowerCase()
      if (event.ctrlKey && event.shiftKey && !event.metaKey && key === "c") {
        copy()
        return true
      }
      if (event.metaKey && !event.ctrlKey && !event.altKey && key === "c") {
        if (!t.hasSelection()) return true
        copy()
        return true
      }
      // allow for ctrl-` to toggle terminal in parent
-      if (event.ctrlKey && key === "`") {
+      if (event.ctrlKey && event.key.toLowerCase() === "`") {
        event.preventDefault()
        return true
      }
      return false
    })
-    fitAddon = new mod.FitAddon()
+    fitAddon = new FitAddon()
    serializeAddon = new SerializeAddon()
-    t.loadAddon(serializeAddon)
+    term.loadAddon(serializeAddon)
-    t.loadAddon(fitAddon)
+    term.loadAddon(fitAddon)
-    t.open(container)
+    term.open(container)
    container.addEventListener("pointerdown", handlePointerDown)
    handleTextareaFocus = () => {
      t.options.cursorBlink = true
    }
    handleTextareaBlur = () => {
      t.options.cursorBlink = false
    }
    t.textarea?.addEventListener("focus", handleTextareaFocus)
    t.textarea?.addEventListener("blur", handleTextareaBlur)
    focusTerminal()
    if (local.pty.buffer) {
      if (local.pty.rows && local.pty.cols) {
-        t.resize(local.pty.cols, local.pty.rows)
+        term.resize(local.pty.cols, local.pty.rows)
      }
-      t.write(local.pty.buffer, () => {
+      term.reset()
-        if (local.pty.scrollY) {
+      term.write(local.pty.buffer)
-          t.scrollToLine(local.pty.scrollY)
+      if (local.pty.scrollY) {
-        }
+        term.scrollToLine(local.pty.scrollY)
-        fitAddon.fit()
+      }
-      })
+      fitAddon.fit()
    }
    container.focus()
    fitAddon.observeResize()
    handleResize = () => fitAddon.fit()
    window.addEventListener("resize", handleResize)
-    t.onResize(async (size) => {
+    term.onResize(async (size) => {
-      if (socket.readyState === WebSocket.OPEN) {
+      if (ws && ws.readyState === WebSocket.OPEN) {
-        await sdk.client.pty
+        await sdk.client.pty.update({
-          .update({
+          ptyID: local.pty.id,
-            ptyID: local.pty.id,
+          size: {
-            size: {
+            cols: size.cols,
-              cols: size.cols,
+            rows: size.rows,
-              rows: size.rows,
+          },
-            },
+        })
          })
          .catch(() => {})
      }
    })
-    t.onData((data) => {
+    term.onData((data) => {
-      if (socket.readyState === WebSocket.OPEN) {
+      if (ws && ws.readyState === WebSocket.OPEN) {
-        socket.send(data)
+        ws.send(data)
      }
    })
-    t.onKey((key) => {
+    term.onKey((key) => {
      if (key.key == "Enter") {
        props.onSubmit?.()
      }
    })
-    // t.onScroll((ydisp) => {
+    // term.onScroll((ydisp) => {
    // console.log("Scroll position:", ydisp)
    // })
-    socket.addEventListener("open", () => {
+    ws.addEventListener("open", () => {
      console.log("WebSocket connected")
-      sdk.client.pty
+      sdk.client.pty.update({
-        .update({
+        ptyID: local.pty.id,
-          ptyID: local.pty.id,
+        size: {
-          size: {
+          cols: term.cols,
-            cols: t.cols,
+          rows: term.rows,
-            rows: t.rows,
+        },
-          },
+      })
        })
        .catch(() => {})
    })
-    socket.addEventListener("message", (event) => {
+    ws.addEventListener("message", (event) => {
-      t.write(event.data)
+      term.write(event.data)
    })
-    socket.addEventListener("error", (error) => {
+    ws.addEventListener("error", (error) => {
      console.error("WebSocket error:", error)
      props.onConnectError?.(error)
    })
-    socket.addEventListener("close", () => {
+    ws.addEventListener("close", () => {
      console.log("WebSocket disconnected")
    })
  })
@@ -258,24 +130,18 @@ export const Terminal = (props: TerminalProps) => {
    if (handleResize) {
      window.removeEventListener("resize", handleResize)
    }
-    container.removeEventListener("pointerdown", handlePointerDown)
+    if (serializeAddon && props.onCleanup) {
    term?.textarea?.removeEventListener("focus", handleTextareaFocus)
    term?.textarea?.removeEventListener("blur", handleTextareaBlur)
    const t = term
    if (serializeAddon && props.onCleanup && t) {
      const buffer = serializeAddon.serialize()
      props.onCleanup({
        ...local.pty,
        buffer,
-        rows: t.rows,
+        rows: term.rows,
-        cols: t.cols,
+        cols: term.cols,
-        scrollY: t.getViewportY(),
+        scrollY: term.getViewportY(),
      })
    }
    ws?.close()
-    t?.dispose()
+    term?.dispose()
  })
  return (
@@ -283,10 +149,8 @@ export const Terminal = (props: TerminalProps) => {
      ref={container}
      data-component="terminal"
      data-prevent-autofocus
      style={{ "background-color": terminalColors().background }}
      classList={{
        ...(local.classList ?? {}),
        "select-text": true,
        "size-full px-6 py-3 font-mono": true,
        [local.class ?? ""]: !!local.class,
      }}
@@ -1,118 +0,0 @@
 import { createEffect, createMemo, Show } from "solid-js"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { TooltipKeybind } from "@opencode-ai/ui/tooltip"
 import { useTheme } from "@opencode-ai/ui/theme"
 import { useLayout } from "@/context/layout"
 import { usePlatform } from "@/context/platform"
 import { useCommand } from "@/context/command"
 export function Titlebar() {
  const layout = useLayout()
  const platform = usePlatform()
  const command = useCommand()
  const theme = useTheme()
  const mac = createMemo(() => platform.platform === "desktop" && platform.os === "macos")
  const reserve = createMemo(
    () => platform.platform === "desktop" && (platform.os === "windows" || platform.os === "linux"),
  )
  const web = createMemo(() => platform.platform === "web")
  const getWin = () => {
    if (platform.platform !== "desktop") return
    const tauri = (
      window as unknown as {
        __TAURI__?: { window?: { getCurrentWindow?: () => { startDragging?: () => Promise<void> } } }
      }
    ).__TAURI__
    if (!tauri?.window?.getCurrentWindow) return
    return tauri.window.getCurrentWindow()
  }
  createEffect(() => {
    if (platform.platform !== "desktop") return
    const scheme = theme.colorScheme()
    const value = scheme === "system" ? null : scheme
    const tauri = (window as unknown as { __TAURI__?: { webviewWindow?: { getCurrentWebviewWindow?: () => unknown } } })
      .__TAURI__
    const get = tauri?.webviewWindow?.getCurrentWebviewWindow
    if (!get) return
    const win = get() as { setTheme?: (theme?: "light" | "dark" | null) => Promise<void> }
    if (!win.setTheme) return
    void win.setTheme(value).catch(() => undefined)
  })
  const interactive = (target: EventTarget | null) => {
    if (!(target instanceof Element)) return false
    const selector =
      "button, a, input, textarea, select, option, [role='button'], [role='menuitem'], [contenteditable='true'], [contenteditable='']"
    return !!target.closest(selector)
  }
  const drag = (e: MouseEvent) => {
    if (platform.platform !== "desktop") return
    if (e.buttons !== 1) return
    if (interactive(e.target)) return
    const win = getWin()
    if (!win?.startDragging) return
    e.preventDefault()
    void win.startDragging().catch(() => undefined)
  }
  return (
    <header class="h-10 shrink-0 bg-background-base flex items-center relative">
      <div
        classList={{
          "flex items-center w-full min-w-0 pr-2": true,
          "pl-2": !mac(),
        }}
        onMouseDown={drag}
      >
        <Show when={mac()}>
          <div class="w-[72px] h-full shrink-0" data-tauri-drag-region />
          <div class="xl:hidden w-10 shrink-0 flex items-center justify-center">
            <IconButton icon="menu" variant="ghost" class="size-8 rounded-md" onClick={layout.mobileSidebar.toggle} />
          </div>
        </Show>
        <Show when={!mac()}>
          <div class="xl:hidden w-[48px] shrink-0 flex items-center justify-center">
            <IconButton icon="menu" variant="ghost" class="size-8 rounded-md" onClick={layout.mobileSidebar.toggle} />
          </div>
        </Show>
        <TooltipKeybind
          class={web() ? "hidden xl:flex shrink-0 ml-14" : "hidden xl:flex shrink-0"}
          placement="bottom"
          title="Toggle sidebar"
          keybind={command.keybind("sidebar.toggle")}
        >
          <IconButton
            icon={layout.sidebar.opened() ? "layout-left" : "layout-right"}
            variant="ghost"
            class="size-8 rounded-md"
            onClick={layout.sidebar.toggle}
          />
        </TooltipKeybind>
        <div id="opencode-titlebar-left" class="flex items-center gap-3 min-w-0 px-2" />
        <div class="flex-1 h-full" data-tauri-drag-region />
        <div id="opencode-titlebar-right" class="flex items-center gap-3 shrink-0" />
        <Show when={reserve()}>
          <div class="w-[120px] h-full shrink-0" data-tauri-drag-region />
        </Show>
      </div>
      <div class="absolute inset-0 flex items-center justify-center pointer-events-none">
        <div id="opencode-titlebar-center" class="pointer-events-auto" />
      </div>
    </header>
  )
 }
@@ -1,6 +1,8 @@
-import { createMemo, createSignal, onCleanup, onMount, type Accessor } from "solid-js"
+import { createMemo, createSignal, onCleanup, onMount, Show, type Accessor } from "solid-js"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { List } from "@opencode-ai/ui/list"
 const IS_MAC = typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform)
@@ -24,7 +26,6 @@ export interface CommandOption {
  suggested?: boolean
  disabled?: boolean
  onSelect?: (source?: "palette" | "keybind" | "slash") => void
  onHighlight?: () => (() => void) | void
 }
 export function parseKeybind(config: string): Keybind[] {
@@ -105,42 +106,60 @@ export function formatKeybind(config: string): string {
  if (kb.meta) parts.push(IS_MAC ? "⌘" : "Meta")
  if (kb.key) {
-    const arrows: Record<string, string> = {
+    const displayKey = kb.key.length === 1 ? kb.key.toUpperCase() : kb.key.charAt(0).toUpperCase() + kb.key.slice(1)
      arrowup: "↑",
      arrowdown: "↓",
      arrowleft: "←",
      arrowright: "→",
    }
    const displayKey =
      arrows[kb.key.toLowerCase()] ??
      (kb.key.length === 1 ? kb.key.toUpperCase() : kb.key.charAt(0).toUpperCase() + kb.key.slice(1))
    parts.push(displayKey)
  }
  return IS_MAC ? parts.join("") : parts.join("+")
 }
 function DialogCommand(props: { options: CommandOption[] }) {
  const dialog = useDialog()
  return (
    <Dialog title="Commands">
      <List
        search={{ placeholder: "Search commands", autofocus: true }}
        emptyMessage="No commands found"
        items={() => props.options.filter((x) => !x.id.startsWith("suggested.") || !x.disabled)}
        key={(x) => x?.id}
        filterKeys={["title", "description", "category"]}
        groupBy={(x) => x.category ?? ""}
        onSelect={(option) => {
          if (option) {
            dialog.close()
            option.onSelect?.("palette")
          }
        }}
      >
        {(option) => (
          <div class="w-full flex items-center justify-between gap-4">
            <div class="flex items-center gap-2 min-w-0">
              <span class="text-14-regular text-text-strong whitespace-nowrap">{option.title}</span>
              <Show when={option.description}>
                <span class="text-14-regular text-text-weak truncate">{option.description}</span>
              </Show>
            </div>
            <Show when={option.keybind}>
              <span class="text-12-regular text-text-subtle shrink-0">{formatKeybind(option.keybind!)}</span>
            </Show>
          </div>
        )}
      </List>
    </Dialog>
  )
 }
 export const { use: useCommand, provider: CommandProvider } = createSimpleContext({
  name: "Command",
  init: () => {
    const dialog = useDialog()
    const [registrations, setRegistrations] = createSignal<Accessor<CommandOption[]>[]>([])
    const [suspendCount, setSuspendCount] = createSignal(0)
    const dialog = useDialog()
    const options = createMemo(() => {
-      const seen = new Set<string>()
+      const all = registrations().flatMap((x) => x())
      const all: CommandOption[] = []
      for (const reg of registrations()) {
        for (const opt of reg()) {
          if (seen.has(opt.id)) continue
          seen.add(opt.id)
          all.push(opt)
        }
      }
      const suggested = all.filter((x) => x.suggested && !x.disabled)
      return [
        ...suggested.map((x) => ({
          ...x,
@@ -153,21 +172,14 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex
    const suspended = () => suspendCount() > 0
-    const run = (id: string, source?: "palette" | "keybind" | "slash") => {
+    const showPalette = () => {
-      for (const option of options()) {
+      if (!dialog.active) {
-        if (option.id === id || option.id === "suggested." + id) {
+        dialog.show(() => <DialogCommand options={options().filter((x) => !x.disabled)} />)
          option.onSelect?.(source)
          return
        }
      }
    }
    const showPalette = () => {
      run("file.open", "palette")
    }
    const handleKeyDown = (event: KeyboardEvent) => {
-      if (suspended() || dialog.active) return
+      if (suspended()) return
      const paletteKeybinds = parseKeybind("mod+shift+p")
      if (matchKeybind(paletteKeybinds, event)) {
@@ -206,7 +218,12 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex
        })
      },
      trigger(id: string, source?: "palette" | "keybind" | "slash") {
-        run(id, source)
+        for (const option of options()) {
          if (option.id === id || option.id === "suggested." + id) {
            option.onSelect?.(source)
            return
          }
        }
      },
      keybind(id: string) {
        const option = options().find((x) => x.id === id || x.id === "suggested." + id)
@@ -1,393 +0,0 @@
 import { createEffect, createMemo, createRoot, onCleanup } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import type { FileContent } from "@opencode-ai/sdk/v2"
 import { showToast } from "@opencode-ai/ui/toast"
 import { useParams } from "@solidjs/router"
 import { getFilename } from "@opencode-ai/util/path"
 import { useSDK } from "./sdk"
 import { useSync } from "./sync"
 import { Persist, persisted } from "@/utils/persist"
 export type FileSelection = {
  startLine: number
  startChar: number
  endLine: number
  endChar: number
 }
 export type SelectedLineRange = {
  start: number
  end: number
  side?: "additions" | "deletions"
  endSide?: "additions" | "deletions"
 }
 export type FileViewState = {
  scrollTop?: number
  scrollLeft?: number
  selectedLines?: SelectedLineRange | null
 }
 export type FileState = {
  path: string
  name: string
  loaded?: boolean
  loading?: boolean
  error?: string
  content?: FileContent
 }
 function stripFileProtocol(input: string) {
  if (!input.startsWith("file://")) return input
  return input.slice("file://".length)
 }
 function stripQueryAndHash(input: string) {
  const hashIndex = input.indexOf("#")
  const queryIndex = input.indexOf("?")
  if (hashIndex !== -1 && queryIndex !== -1) {
    return input.slice(0, Math.min(hashIndex, queryIndex))
  }
  if (hashIndex !== -1) return input.slice(0, hashIndex)
  if (queryIndex !== -1) return input.slice(0, queryIndex)
  return input
 }
 export function selectionFromLines(range: SelectedLineRange): FileSelection {
  const startLine = Math.min(range.start, range.end)
  const endLine = Math.max(range.start, range.end)
  return {
    startLine,
    endLine,
    startChar: 0,
    endChar: 0,
  }
 }
 function normalizeSelectedLines(range: SelectedLineRange): SelectedLineRange {
  if (range.start <= range.end) return range
  const startSide = range.side
  const endSide = range.endSide ?? startSide
  return {
    ...range,
    start: range.end,
    end: range.start,
    side: endSide,
    endSide: startSide !== endSide ? startSide : undefined,
  }
 }
 const WORKSPACE_KEY = "__workspace__"
 const MAX_FILE_VIEW_SESSIONS = 20
 const MAX_VIEW_FILES = 500
 type ViewSession = ReturnType<typeof createViewSession>
 type ViewCacheEntry = {
  value: ViewSession
  dispose: VoidFunction
 }
 function createViewSession(dir: string, id: string | undefined) {
  const legacyViewKey = `${dir}/file${id ? "/" + id : ""}.v1`
  const [view, setView, _, ready] = persisted(
    Persist.scoped(dir, id, "file-view", [legacyViewKey]),
    createStore<{
      file: Record<string, FileViewState>
    }>({
      file: {},
    }),
  )
  const meta = { pruned: false }
  const pruneView = (keep?: string) => {
    const keys = Object.keys(view.file)
    if (keys.length <= MAX_VIEW_FILES) return
    const drop = keys.filter((key) => key !== keep).slice(0, keys.length - MAX_VIEW_FILES)
    if (drop.length === 0) return
    setView(
      produce((draft) => {
        for (const key of drop) {
          delete draft.file[key]
        }
      }),
    )
  }
  createEffect(() => {
    if (!ready()) return
    if (meta.pruned) return
    meta.pruned = true
    pruneView()
  })
  const scrollTop = (path: string) => view.file[path]?.scrollTop
  const scrollLeft = (path: string) => view.file[path]?.scrollLeft
  const selectedLines = (path: string) => view.file[path]?.selectedLines
  const setScrollTop = (path: string, top: number) => {
    setView("file", path, (current) => {
      if (current?.scrollTop === top) return current
      return {
        ...(current ?? {}),
        scrollTop: top,
      }
    })
    pruneView(path)
  }
  const setScrollLeft = (path: string, left: number) => {
    setView("file", path, (current) => {
      if (current?.scrollLeft === left) return current
      return {
        ...(current ?? {}),
        scrollLeft: left,
      }
    })
    pruneView(path)
  }
  const setSelectedLines = (path: string, range: SelectedLineRange | null) => {
    const next = range ? normalizeSelectedLines(range) : null
    setView("file", path, (current) => {
      if (current?.selectedLines === next) return current
      return {
        ...(current ?? {}),
        selectedLines: next,
      }
    })
    pruneView(path)
  }
  return {
    ready,
    scrollTop,
    scrollLeft,
    selectedLines,
    setScrollTop,
    setScrollLeft,
    setSelectedLines,
  }
 }
 export const { use: useFile, provider: FileProvider } = createSimpleContext({
  name: "File",
  gate: false,
  init: () => {
    const sdk = useSDK()
    const sync = useSync()
    const params = useParams()
    const directory = createMemo(() => sync.data.path.directory)
    function normalize(input: string) {
      const root = directory()
      const prefix = root.endsWith("/") ? root : root + "/"
      let path = stripQueryAndHash(stripFileProtocol(input))
      if (path.startsWith(prefix)) {
        path = path.slice(prefix.length)
      }
      if (path.startsWith(root)) {
        path = path.slice(root.length)
      }
      if (path.startsWith("./")) {
        path = path.slice(2)
      }
      if (path.startsWith("/")) {
        path = path.slice(1)
      }
      return path
    }
    function tab(input: string) {
      const path = normalize(input)
      return `file://${path}`
    }
    function pathFromTab(tabValue: string) {
      if (!tabValue.startsWith("file://")) return
      return normalize(tabValue)
    }
    const inflight = new Map<string, Promise<void>>()
    const [store, setStore] = createStore<{
      file: Record<string, FileState>
    }>({
      file: {},
    })
    const viewCache = new Map<string, ViewCacheEntry>()
    const disposeViews = () => {
      for (const entry of viewCache.values()) {
        entry.dispose()
      }
      viewCache.clear()
    }
    const pruneViews = () => {
      while (viewCache.size > MAX_FILE_VIEW_SESSIONS) {
        const first = viewCache.keys().next().value
        if (!first) return
        const entry = viewCache.get(first)
        entry?.dispose()
        viewCache.delete(first)
      }
    }
    const loadView = (dir: string, id: string | undefined) => {
      const key = `${dir}:${id ?? WORKSPACE_KEY}`
      const existing = viewCache.get(key)
      if (existing) {
        viewCache.delete(key)
        viewCache.set(key, existing)
        return existing.value
      }
      const entry = createRoot((dispose) => ({
        value: createViewSession(dir, id),
        dispose,
      }))
      viewCache.set(key, entry)
      pruneViews()
      return entry.value
    }
    const view = createMemo(() => loadView(params.dir!, params.id))
    function ensure(path: string) {
      if (!path) return
      if (store.file[path]) return
      setStore("file", path, { path, name: getFilename(path) })
    }
    function load(input: string, options?: { force?: boolean }) {
      const path = normalize(input)
      if (!path) return Promise.resolve()
      ensure(path)
      const current = store.file[path]
      if (!options?.force && current?.loaded) return Promise.resolve()
      const pending = inflight.get(path)
      if (pending) return pending
      setStore(
        "file",
        path,
        produce((draft) => {
          draft.loading = true
          draft.error = undefined
        }),
      )
      const promise = sdk.client.file
        .read({ path })
        .then((x) => {
          setStore(
            "file",
            path,
            produce((draft) => {
              draft.loaded = true
              draft.loading = false
              draft.content = x.data
            }),
          )
        })
        .catch((e) => {
          setStore(
            "file",
            path,
            produce((draft) => {
              draft.loading = false
              draft.error = e.message
            }),
          )
          showToast({
            variant: "error",
            title: "Failed to load file",
            description: e.message,
          })
        })
        .finally(() => {
          inflight.delete(path)
        })
      inflight.set(path, promise)
      return promise
    }
    const stop = sdk.event.listen((e) => {
      const event = e.details
      if (event.type !== "file.watcher.updated") return
      const path = normalize(event.properties.file)
      if (!path) return
      if (path.startsWith(".git/")) return
      if (!store.file[path]) return
      load(path, { force: true })
    })
    const get = (input: string) => store.file[normalize(input)]
    const scrollTop = (input: string) => view().scrollTop(normalize(input))
    const scrollLeft = (input: string) => view().scrollLeft(normalize(input))
    const selectedLines = (input: string) => view().selectedLines(normalize(input))
    const setScrollTop = (input: string, top: number) => {
      const path = normalize(input)
      view().setScrollTop(path, top)
    }
    const setScrollLeft = (input: string, left: number) => {
      const path = normalize(input)
      view().setScrollLeft(path, left)
    }
    const setSelectedLines = (input: string, range: SelectedLineRange | null) => {
      const path = normalize(input)
      view().setSelectedLines(path, range)
    }
    onCleanup(() => {
      stop()
      disposeViews()
    })
    return {
      ready: () => view().ready(),
      normalize,
      tab,
      pathFromTab,
      get,
      load,
      scrollTop,
      scrollLeft,
      setScrollTop,
      setScrollLeft,
      selectedLines,
      setSelectedLines,
      searchFiles: (query: string) =>
        sdk.client.find.files({ query, dirs: "false" }).then((x) => (x.data ?? []).map(normalize)),
      searchFilesAndDirectories: (query: string) =>
        sdk.client.find.files({ query, dirs: "true" }).then((x) => (x.data ?? []).map(normalize)),
    }
  },
 })
@@ -1,106 +1,34 @@
 import { createOpencodeClient, type Event } from "@opencode-ai/sdk/v2/client"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { createGlobalEmitter } from "@solid-primitives/event-bus"
 import { batch, onCleanup } from "solid-js"
 import { usePlatform } from "./platform"
 import { useServer } from "./server"
 export const { use: useGlobalSDK, provider: GlobalSDKProvider } = createSimpleContext({
  name: "GlobalSDK",
-  init: () => {
+  init: (props: { url: string }) => {
    const server = useServer()
    const platform = usePlatform()
    const abort = new AbortController()
    const eventSdk = createOpencodeClient({
-      baseUrl: server.url,
+      baseUrl: props.url,
-      signal: abort.signal,
+      // signal: AbortSignal.timeout(1000 * 60 * 10),
      fetch: platform.fetch,
    })
    const emitter = createGlobalEmitter<{
      [key: string]: Event
    }>()
-    type Queued = { directory: string; payload: Event }
+    eventSdk.global.event().then(async (events) => {
    let queue: Array<Queued | undefined> = []
    const coalesced = new Map<string, number>()
    let timer: ReturnType<typeof setTimeout> | undefined
    let last = 0
    const key = (directory: string, payload: Event) => {
      if (payload.type === "session.status") return `session.status:${directory}:${payload.properties.sessionID}`
      if (payload.type === "lsp.updated") return `lsp.updated:${directory}`
      if (payload.type === "message.part.updated") {
        const part = payload.properties.part
        return `message.part.updated:${directory}:${part.messageID}:${part.id}`
      }
    }
    const flush = () => {
      if (timer) clearTimeout(timer)
      timer = undefined
      const events = queue
      queue = []
      coalesced.clear()
      if (events.length === 0) return
      last = Date.now()
      batch(() => {
        for (const event of events) {
          if (!event) continue
          emitter.emit(event.directory, event.payload)
        }
      })
    }
    const schedule = () => {
      if (timer) return
      const elapsed = Date.now() - last
      timer = setTimeout(flush, Math.max(0, 16 - elapsed))
    }
    const stop = () => {
      flush()
    }
    void (async () => {
      const events = await eventSdk.global.event()
      let yielded = Date.now()
      for await (const event of events.stream) {
-        const directory = event.directory ?? "global"
+        // console.log("event", event)
-        const payload = event.payload
+        emitter.emit(event.directory ?? "global", event.payload)
        const k = key(directory, payload)
        if (k) {
          const i = coalesced.get(k)
          if (i !== undefined) {
            queue[i] = undefined
          }
          coalesced.set(k, queue.length)
        }
        queue.push({ directory, payload })
        schedule()
        if (Date.now() - yielded < 8) continue
        yielded = Date.now()
        await new Promise<void>((resolve) => setTimeout(resolve, 0))
      }
    })()
      .finally(stop)
      .catch(() => undefined)
    onCleanup(() => {
      abort.abort()
      stop()
    })
    const platform = usePlatform()
    const sdk = createOpencodeClient({
-      baseUrl: server.url,
+      baseUrl: props.url,
      signal: AbortSignal.timeout(1000 * 60 * 10),
      fetch: platform.fetch,
      throwOnError: true,
    })
-    return { url: server.url, client: sdk, event: emitter }
+    return { url: props.url, client: sdk, event: emitter }
  },
 })
@@ -5,6 +5,8 @@ import {
  type Part,
  type Config,
  type Path,
  type File,
  type FileNode,
  type Project,
  type FileDiff,
  type Todo,
@@ -12,39 +14,19 @@ import {
  type ProviderListResponse,
  type ProviderAuthResponse,
  type Command,
  type McpStatus,
  type LspStatus,
  type VcsInfo,
  type PermissionRequest,
  type QuestionRequest,
  createOpencodeClient,
 } from "@opencode-ai/sdk/v2/client"
-import { createStore, produce, reconcile, type SetStoreFunction, type Store } from "solid-js/store"
+import { createStore, produce, reconcile } from "solid-js/store"
 import { Binary } from "@opencode-ai/util/binary"
 import { retry } from "@opencode-ai/util/retry"
 import { useGlobalSDK } from "./global-sdk"
 import { ErrorPage, type InitError } from "../pages/error"
-import {
+import { createContext, useContext, onMount, type ParentProps, Switch, Match } from "solid-js"
  batch,
  createContext,
  createEffect,
  getOwner,
  runWithOwner,
  useContext,
  onCleanup,
  onMount,
  type Accessor,
  type ParentProps,
  Switch,
  Match,
 } from "solid-js"
 import { showToast } from "@opencode-ai/ui/toast"
 import { getFilename } from "@opencode-ai/util/path"
 import { usePlatform } from "./platform"
 import { Persist, persisted } from "@/utils/persist"
 type State = {
-  status: "loading" | "partial" | "complete"
+  ready: boolean
  agent: Agent[]
  command: Command[]
  project: string
@@ -52,7 +34,6 @@ type State = {
  config: Config
  path: Path
  session: Session[]
  sessionTotal: number
  session_status: {
    [sessionID: string]: SessionStatus
  }
@@ -62,17 +43,6 @@ type State = {
  todo: {
    [sessionID: string]: Todo[]
  }
  permission: {
    [sessionID: string]: PermissionRequest[]
  }
  question: {
    [sessionID: string]: QuestionRequest[]
  }
  mcp: {
    [name: string]: McpStatus
  }
  lsp: LspStatus[]
  vcs: VcsInfo | undefined
  limit: number
  message: {
    [sessionID: string]: Message[]
@@ -80,20 +50,12 @@ type State = {
  part: {
    [messageID: string]: Part[]
  }
-}
+  node: FileNode[]
-
+  changes: File[]
 type VcsCache = {
  store: Store<{ value: VcsInfo | undefined }>
  setStore: SetStoreFunction<{ value: VcsInfo | undefined }>
  ready: Accessor<boolean>
 }
 function createGlobalSync() {
  const globalSDK = useGlobalSDK()
  const platform = usePlatform()
  const owner = getOwner()
  if (!owner) throw new Error("GlobalSync must be created within owner")
  const vcsCache = new Map<string, VcsCache>()
  const [globalStore, setGlobalStore] = createStore<{
    ready: boolean
    error?: InitError
@@ -101,90 +63,61 @@ function createGlobalSync() {
    project: Project[]
    provider: ProviderListResponse
    provider_auth: ProviderAuthResponse
    children: Record<string, State>
  }>({
    ready: false,
    path: { state: "", config: "", worktree: "", directory: "", home: "" },
    project: [],
    provider: { all: [], connected: [], default: {} },
    provider_auth: {},
    children: {},
  })
-  const children: Record<string, [Store<State>, SetStoreFunction<State>]> = {}
+  const children: Record<string, ReturnType<typeof createStore<State>>> = {}
  function child(directory: string) {
    if (!directory) console.error("No directory provided")
    if (!children[directory]) {
-      const cache = runWithOwner(owner, () =>
+      setGlobalStore("children", directory, {
-        persisted(
+        project: "",
-          Persist.workspace(directory, "vcs", ["vcs.v1"]),
+        provider: { all: [], connected: [], default: {} },
-          createStore({ value: undefined as VcsInfo | undefined }),
+        config: {},
-        ),
+        path: { state: "", config: "", worktree: "", directory: "", home: "" },
-      )
+        ready: false,
-      if (!cache) throw new Error("Failed to create persisted cache")
+        agent: [],
-      vcsCache.set(directory, { store: cache[0], setStore: cache[1], ready: cache[3] })
+        command: [],
-
+        session: [],
-      const init = () => {
+        session_status: {},
-        children[directory] = createStore<State>({
+        session_diff: {},
-          project: "",
+        todo: {},
-          provider: { all: [], connected: [], default: {} },
+        limit: 5,
-          config: {},
+        message: {},
-          path: { state: "", config: "", worktree: "", directory: "", home: "" },
+        part: {},
-          status: "loading" as const,
+        node: [],
-          agent: [],
+        changes: [],
-          command: [],
+      })
-          session: [],
+      children[directory] = createStore(globalStore.children[directory])
-          sessionTotal: 0,
+      bootstrapInstance(directory)
          session_status: {},
          session_diff: {},
          todo: {},
          permission: {},
          question: {},
          mcp: {},
          lsp: [],
          vcs: cache[0].value,
          limit: 5,
          message: {},
          part: {},
        })
        bootstrapInstance(directory)
      }
      runWithOwner(owner, init)
    }
-    const childStore = children[directory]
+    return children[directory]
    if (!childStore) throw new Error("Failed to create store")
    return childStore
  }
  async function loadSessions(directory: string) {
    const [store, setStore] = child(directory)
-    const limit = store.limit
+    globalSDK.client.session
-
+      .list({ directory })
    return globalSDK.client.session
      .list({ directory, roots: true })
      .then((x) => {
        const nonArchived = (x.data ?? [])
          .filter((s) => !!s?.id)
          .filter((s) => !s.time?.archived)
          .slice()
          .sort((a, b) => a.id.localeCompare(b.id))
        const sandboxWorkspace = globalStore.project.some((p) => (p.sandboxes ?? []).includes(directory))
        if (sandboxWorkspace) {
          setStore("session", reconcile(nonArchived, { key: "id" }))
          return
        }
        const fourHoursAgo = Date.now() - 4 * 60 * 60 * 1000
        const nonArchived = (x.data ?? [])
          .slice()
          .filter((s) => !s.time.archived)
          .sort((a, b) => a.id.localeCompare(b.id))
        // Include up to the limit, plus any updated in the last 4 hours
        const sessions = nonArchived.filter((s, i) => {
-          if (i < limit) return true
+          if (i < store.limit) return true
-          const updated = new Date(s.time?.updated ?? s.time?.created).getTime()
+          const updated = new Date(s.time.updated).getTime()
          return updated > fourHoursAgo
        })
-        // Store total session count (used for "load more" pagination)
+        setStore("session", sessions)
        setStore("sessionTotal", nonArchived.length)
        setStore("session", reconcile(sessions, { key: "id" }))
      })
      .catch((err) => {
        console.error("Failed to load sessions", err)
@@ -195,129 +128,30 @@ function createGlobalSync() {
  async function bootstrapInstance(directory: string) {
    if (!directory) return
-    const [store, setStore] = child(directory)
+    const [, setStore] = child(directory)
    const cache = vcsCache.get(directory)
    if (!cache) return
    const sdk = createOpencodeClient({
      baseUrl: globalSDK.url,
      fetch: platform.fetch,
      directory,
      throwOnError: true,
    })
-
+    const load = {
    createEffect(() => {
      if (!cache.ready()) return
      const cached = cache.store.value
      if (!cached?.branch) return
      setStore("vcs", (value) => value ?? cached)
    })
    const blockingRequests = {
      project: () => sdk.project.current().then((x) => setStore("project", x.data!.id)),
-      provider: () =>
+      provider: () => sdk.provider.list().then((x) => setStore("provider", x.data!)),
-        sdk.provider.list().then((x) => {
+      path: () => sdk.path.get().then((x) => setStore("path", x.data!)),
          const data = x.data!
          setStore("provider", {
            ...data,
            all: data.all.map((provider) => ({
              ...provider,
              models: Object.fromEntries(
                Object.entries(provider.models).filter(([, info]) => info.status !== "deprecated"),
              ),
            })),
          })
        }),
      agent: () => sdk.app.agents().then((x) => setStore("agent", x.data ?? [])),
      command: () => sdk.command.list().then((x) => setStore("command", x.data ?? [])),
      session: () => loadSessions(directory),
      status: () => sdk.session.status().then((x) => setStore("session_status", x.data!)),
      config: () => sdk.config.get().then((x) => setStore("config", x.data!)),
      changes: () => sdk.file.status().then((x) => setStore("changes", x.data!)),
      node: () => sdk.file.list({ path: "/" }).then((x) => setStore("node", x.data!)),
    }
-    await Promise.all(Object.values(blockingRequests).map((p) => retry(p).catch((e) => setGlobalStore("error", e))))
+    await Promise.all(Object.values(load).map((p) => retry(p).catch((e) => setGlobalStore("error", e))))
-      .then(() => {
+      .then(() => setStore("ready", true))
        if (store.status !== "complete") setStore("status", "partial")
        // non-blocking
        Promise.all([
          sdk.path.get().then((x) => setStore("path", x.data!)),
          sdk.command.list().then((x) => setStore("command", x.data ?? [])),
          sdk.session.status().then((x) => setStore("session_status", x.data!)),
          loadSessions(directory),
          sdk.mcp.status().then((x) => setStore("mcp", x.data!)),
          sdk.lsp.status().then((x) => setStore("lsp", x.data!)),
          sdk.vcs.get().then((x) => {
            const next = x.data ?? store.vcs
            setStore("vcs", next)
            if (next?.branch) cache.setStore("value", next)
          }),
          sdk.permission.list().then((x) => {
            const grouped: Record<string, PermissionRequest[]> = {}
            for (const perm of x.data ?? []) {
              if (!perm?.id || !perm.sessionID) continue
              const existing = grouped[perm.sessionID]
              if (existing) {
                existing.push(perm)
                continue
              }
              grouped[perm.sessionID] = [perm]
            }
            batch(() => {
              for (const sessionID of Object.keys(store.permission)) {
                if (grouped[sessionID]) continue
                setStore("permission", sessionID, [])
              }
              for (const [sessionID, permissions] of Object.entries(grouped)) {
                setStore(
                  "permission",
                  sessionID,
                  reconcile(
                    permissions
                      .filter((p) => !!p?.id)
                      .slice()
                      .sort((a, b) => a.id.localeCompare(b.id)),
                    { key: "id" },
                  ),
                )
              }
            })
          }),
          sdk.question.list().then((x) => {
            const grouped: Record<string, QuestionRequest[]> = {}
            for (const question of x.data ?? []) {
              if (!question?.id || !question.sessionID) continue
              const existing = grouped[question.sessionID]
              if (existing) {
                existing.push(question)
                continue
              }
              grouped[question.sessionID] = [question]
            }
            batch(() => {
              for (const sessionID of Object.keys(store.question)) {
                if (grouped[sessionID]) continue
                setStore("question", sessionID, [])
              }
              for (const [sessionID, questions] of Object.entries(grouped)) {
                setStore(
                  "question",
                  sessionID,
                  reconcile(
                    questions
                      .filter((q) => !!q?.id)
                      .slice()
                      .sort((a, b) => a.id.localeCompare(b.id)),
                    { key: "id" },
                  ),
                )
              }
            })
          }),
        ]).then(() => {
          setStore("status", "complete")
        })
      })
      .catch((e) => setGlobalStore("error", e))
  }
-  const unsub = globalSDK.event.listen((e) => {
+  globalSDK.event.listen((e) => {
    const directory = e.name
    const event = e.details
@@ -351,23 +185,6 @@ function createGlobalSync() {
        bootstrapInstance(directory)
        break
      }
      case "session.created": {
        const result = Binary.search(store.session, event.properties.info.id, (s) => s.id)
        if (result.found) {
          setStore("session", result.index, reconcile(event.properties.info))
          break
        }
        setStore(
          "session",
          produce((draft) => {
            draft.splice(result.index, 0, event.properties.info)
          }),
        )
        if (!event.properties.info.parentID) {
          setStore("sessionTotal", store.sessionTotal + 1)
        }
        break
      }
      case "session.updated": {
        const result = Binary.search(store.session, event.properties.info.id, (s) => s.id)
        if (event.properties.info.time.archived) {
@@ -379,8 +196,6 @@ function createGlobalSync() {
              }),
            )
          }
          if (event.properties.info.parentID) break
          setStore("sessionTotal", (value) => Math.max(0, value - 1))
          break
        }
        if (result.found) {
@@ -396,13 +211,13 @@ function createGlobalSync() {
        break
      }
      case "session.diff":
-        setStore("session_diff", event.properties.sessionID, reconcile(event.properties.diff, { key: "file" }))
+        setStore("session_diff", event.properties.sessionID, event.properties.diff)
        break
      case "todo.updated":
-        setStore("todo", event.properties.sessionID, reconcile(event.properties.todos, { key: "id" }))
+        setStore("todo", event.properties.sessionID, event.properties.todos)
        break
      case "session.status": {
-        setStore("session_status", event.properties.sessionID, reconcile(event.properties.status))
+        setStore("session_status", event.properties.sessionID, event.properties.status)
        break
      }
      case "message.updated": {
@@ -476,107 +291,11 @@ function createGlobalSync() {
        }
        break
      }
      case "vcs.branch.updated": {
        const next = { branch: event.properties.branch }
        setStore("vcs", next)
        const cache = vcsCache.get(directory)
        if (cache) cache.setStore("value", next)
        break
      }
      case "permission.asked": {
        const sessionID = event.properties.sessionID
        const permissions = store.permission[sessionID]
        if (!permissions) {
          setStore("permission", sessionID, [event.properties])
          break
        }
        const result = Binary.search(permissions, event.properties.id, (p) => p.id)
        if (result.found) {
          setStore("permission", sessionID, result.index, reconcile(event.properties))
          break
        }
        setStore(
          "permission",
          sessionID,
          produce((draft) => {
            draft.splice(result.index, 0, event.properties)
          }),
        )
        break
      }
      case "permission.replied": {
        const permissions = store.permission[event.properties.sessionID]
        if (!permissions) break
        const result = Binary.search(permissions, event.properties.requestID, (p) => p.id)
        if (!result.found) break
        setStore(
          "permission",
          event.properties.sessionID,
          produce((draft) => {
            draft.splice(result.index, 1)
          }),
        )
        break
      }
      case "question.asked": {
        const sessionID = event.properties.sessionID
        const questions = store.question[sessionID]
        if (!questions) {
          setStore("question", sessionID, [event.properties])
          break
        }
        const result = Binary.search(questions, event.properties.id, (q) => q.id)
        if (result.found) {
          setStore("question", sessionID, result.index, reconcile(event.properties))
          break
        }
        setStore(
          "question",
          sessionID,
          produce((draft) => {
            draft.splice(result.index, 0, event.properties)
          }),
        )
        break
      }
      case "question.replied":
      case "question.rejected": {
        const questions = store.question[event.properties.sessionID]
        if (!questions) break
        const result = Binary.search(questions, event.properties.requestID, (q) => q.id)
        if (!result.found) break
        setStore(
          "question",
          event.properties.sessionID,
          produce((draft) => {
            draft.splice(result.index, 1)
          }),
        )
        break
      }
      case "lsp.updated": {
        const sdk = createOpencodeClient({
          baseUrl: globalSDK.url,
          fetch: platform.fetch,
          directory,
          throwOnError: true,
        })
        sdk.lsp.status().then((x) => setStore("lsp", x.data ?? []))
        break
      }
    }
  })
  onCleanup(unsub)
  async function bootstrap() {
-    const health = await globalSDK.client.global
+    const health = await globalSDK.client.global.health().then((x) => x.data)
      .health()
      .then((x) => x.data)
      .catch(() => undefined)
    if (!health?.healthy) {
      setGlobalStore(
        "error",
@@ -593,26 +312,15 @@ function createGlobalSync() {
      ),
      retry(() =>
        globalSDK.client.project.list().then(async (x) => {
-          const projects = (x.data ?? [])
+          setGlobalStore(
-            .filter((p) => !!p?.id)
+            "project",
-            .filter((p) => !!p.worktree && !p.worktree.includes("opencode-test"))
+            x.data!.filter((p) => !p.worktree.includes("opencode-test")).sort((a, b) => a.id.localeCompare(b.id)),
-            .slice()
+          )
            .sort((a, b) => a.id.localeCompare(b.id))
          setGlobalStore("project", projects)
        }),
      ),
      retry(() =>
        globalSDK.client.provider.list().then((x) => {
-          const data = x.data!
+          setGlobalStore("provider", x.data ?? {})
          setGlobalStore("provider", {
            ...data,
            all: data.all.map((provider) => ({
              ...provider,
              models: Object.fromEntries(
                Object.entries(provider.models).filter(([, info]) => info.status !== "deprecated"),
              ),
            })),
          })
        }),
      ),
      retry(() =>
@@ -1,73 +0,0 @@
 import { describe, expect, test } from "bun:test"
 import { createRoot } from "solid-js"
 import { createStore } from "solid-js/store"
 import { makePersisted, type SyncStorage } from "@solid-primitives/storage"
 import { createScrollPersistence } from "./layout-scroll"
 describe("createScrollPersistence", () => {
  test("debounces persisted scroll writes", async () => {
    const key = "layout-scroll.test"
    const data = new Map<string, string>()
    const writes: string[] = []
    const stats = { flushes: 0 }
    const storage = {
      getItem: (k: string) => data.get(k) ?? null,
      setItem: (k: string, v: string) => {
        data.set(k, v)
        if (k === key) writes.push(v)
      },
      removeItem: (k: string) => {
        data.delete(k)
      },
    } as SyncStorage
    await new Promise<void>((resolve, reject) => {
      createRoot((dispose) => {
        const [raw, setRaw] = createStore({
          sessionView: {} as Record<string, { scroll: Record<string, { x: number; y: number }> }>,
        })
        const [store, setStore] = makePersisted([raw, setRaw], { name: key, storage })
        const scroll = createScrollPersistence({
          debounceMs: 30,
          getSnapshot: (sessionKey) => store.sessionView[sessionKey]?.scroll,
          onFlush: (sessionKey, next) => {
            stats.flushes += 1
            const current = store.sessionView[sessionKey]
            if (!current) {
              setStore("sessionView", sessionKey, { scroll: next })
              return
            }
            setStore("sessionView", sessionKey, "scroll", (prev) => ({ ...(prev ?? {}), ...next }))
          },
        })
        const run = async () => {
          await new Promise((r) => setTimeout(r, 0))
          writes.length = 0
          for (const i of Array.from({ length: 100 }, (_, n) => n)) {
            scroll.setScroll("session", "review", { x: 0, y: i })
          }
          await new Promise((r) => setTimeout(r, 120))
          expect(stats.flushes).toBeGreaterThanOrEqual(1)
          expect(writes.length).toBeGreaterThanOrEqual(1)
          expect(writes.length).toBeLessThanOrEqual(2)
        }
        void run()
          .then(resolve)
          .catch(reject)
          .finally(() => {
            scroll.dispose()
            dispose()
          })
      })
    })
  })
 })
@@ -1,118 +0,0 @@
 import { createStore, produce } from "solid-js/store"
 export type SessionScroll = {
  x: number
  y: number
 }
 type ScrollMap = Record<string, SessionScroll>
 type Options = {
  debounceMs?: number
  getSnapshot: (sessionKey: string) => ScrollMap | undefined
  onFlush: (sessionKey: string, scroll: ScrollMap) => void
 }
 export function createScrollPersistence(opts: Options) {
  const wait = opts.debounceMs ?? 200
  const [cache, setCache] = createStore<Record<string, ScrollMap>>({})
  const dirty = new Set<string>()
  const timers = new Map<string, ReturnType<typeof setTimeout>>()
  function clone(input?: ScrollMap) {
    const out: ScrollMap = {}
    if (!input) return out
    for (const key of Object.keys(input)) {
      const pos = input[key]
      if (!pos) continue
      out[key] = { x: pos.x, y: pos.y }
    }
    return out
  }
  function seed(sessionKey: string) {
    if (cache[sessionKey]) return
    setCache(sessionKey, clone(opts.getSnapshot(sessionKey)))
  }
  function scroll(sessionKey: string, tab: string) {
    seed(sessionKey)
    return cache[sessionKey]?.[tab] ?? opts.getSnapshot(sessionKey)?.[tab]
  }
  function schedule(sessionKey: string) {
    const prev = timers.get(sessionKey)
    if (prev) clearTimeout(prev)
    timers.set(
      sessionKey,
      setTimeout(() => flush(sessionKey), wait),
    )
  }
  function setScroll(sessionKey: string, tab: string, pos: SessionScroll) {
    seed(sessionKey)
    const prev = cache[sessionKey]?.[tab]
    if (prev?.x === pos.x && prev?.y === pos.y) return
    setCache(sessionKey, tab, { x: pos.x, y: pos.y })
    dirty.add(sessionKey)
    schedule(sessionKey)
  }
  function flush(sessionKey: string) {
    const timer = timers.get(sessionKey)
    if (timer) clearTimeout(timer)
    timers.delete(sessionKey)
    if (!dirty.has(sessionKey)) return
    dirty.delete(sessionKey)
    opts.onFlush(sessionKey, clone(cache[sessionKey]))
  }
  function flushAll() {
    const keys = Array.from(dirty)
    if (keys.length === 0) return
    for (const key of keys) {
      flush(key)
    }
  }
  function drop(keys: string[]) {
    if (keys.length === 0) return
    for (const key of keys) {
      const timer = timers.get(key)
      if (timer) clearTimeout(timer)
      timers.delete(key)
      dirty.delete(key)
    }
    setCache(
      produce((draft) => {
        for (const key of keys) {
          delete draft[key]
        }
      }),
    )
  }
  function dispose() {
    drop(Array.from(timers.keys()))
  }
  return {
    cache,
    drop,
    flush,
    flushAll,
    scroll,
    seed,
    setScroll,
    dispose,
  }
 }
@@ -1,13 +1,10 @@
 import { createStore, produce } from "solid-js/store"
-import { batch, createEffect, createMemo, onCleanup, onMount } from "solid-js"
+import { batch, createMemo, onMount } from "solid-js"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { useGlobalSync } from "./global-sync"
 import { useGlobalSDK } from "./global-sdk"
 import { useServer } from "./server"
 import { Project } from "@opencode-ai/sdk/v2"
-import { Persist, persisted, removePersisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"
 import { same } from "@/utils/same"
 import { createScrollPersistence, type SessionScroll } from "./layout-scroll"
 const AVATAR_COLOR_KEYS = ["pink", "mint", "orange", "purple", "cyan", "lime"] as const
 export type AvatarColorKey = (typeof AVATAR_COLOR_KEYS)[number]
@@ -30,184 +27,35 @@ type SessionTabs = {
  all: string[]
 }
 type SessionView = {
  scroll: Record<string, SessionScroll>
  reviewOpen?: string[]
  terminalOpened?: boolean
  reviewPanelOpened?: boolean
 }
 export type LocalProject = Partial<Project> & { worktree: string; expanded: boolean }
 export type ReviewDiffStyle = "unified" | "split"
 export const { use: useLayout, provider: LayoutProvider } = createSimpleContext({
  name: "Layout",
  init: () => {
    const globalSdk = useGlobalSDK()
    const globalSync = useGlobalSync()
    const server = useServer()
    const isRecord = (value: unknown): value is Record<string, unknown> =>
      typeof value === "object" && value !== null && !Array.isArray(value)
    const migrate = (value: unknown) => {
      if (!isRecord(value)) return value
      const sidebar = value.sidebar
      if (!isRecord(sidebar)) return value
      if (typeof sidebar.workspaces !== "boolean") return value
      return {
        ...value,
        sidebar: {
          ...sidebar,
          workspaces: {},
          workspacesDefault: sidebar.workspaces,
        },
      }
    }
    const target = Persist.global("layout", ["layout.v6"])
    const [store, setStore, _, ready] = persisted(
-      { ...target, migrate },
+      "layout.v3",
      createStore({
        projects: [] as { worktree: string; expanded: boolean }[],
        sidebar: {
          opened: false,
-          width: 344,
+          width: 280,
          workspaces: {} as Record<string, boolean>,
          workspacesDefault: false,
        },
        terminal: {
          opened: false,
          height: 280,
        },
        review: {
-          diffStyle: "split" as ReviewDiffStyle,
+          opened: true,
        },
        session: {
          width: 600,
        },
        mobileSidebar: {
          opened: false,
        },
        sessionTabs: {} as Record<string, SessionTabs>,
        sessionView: {} as Record<string, SessionView>,
      }),
    )
    const MAX_SESSION_KEYS = 50
    const meta = { active: undefined as string | undefined, pruned: false }
    const used = new Map<string, number>()
    const SESSION_STATE_KEYS = [
      { key: "prompt", legacy: "prompt", version: "v2" },
      { key: "terminal", legacy: "terminal", version: "v1" },
      { key: "file-view", legacy: "file", version: "v1" },
    ] as const
    const dropSessionState = (keys: string[]) => {
      for (const key of keys) {
        const parts = key.split("/")
        const dir = parts[0]
        const session = parts[1]
        if (!dir) continue
        for (const entry of SESSION_STATE_KEYS) {
          const target = session ? Persist.session(dir, session, entry.key) : Persist.workspace(dir, entry.key)
          void removePersisted(target)
          const legacyKey = `${dir}/${entry.legacy}${session ? "/" + session : ""}.${entry.version}`
          void removePersisted({ key: legacyKey })
        }
      }
    }
    function prune(keep?: string) {
      if (!keep) return
      const keys = new Set<string>()
      for (const key of Object.keys(store.sessionView)) keys.add(key)
      for (const key of Object.keys(store.sessionTabs)) keys.add(key)
      if (keys.size <= MAX_SESSION_KEYS) return
      const score = (key: string) => {
        if (key === keep) return Number.MAX_SAFE_INTEGER
        return used.get(key) ?? 0
      }
      const ordered = Array.from(keys).sort((a, b) => score(b) - score(a))
      const drop = ordered.slice(MAX_SESSION_KEYS)
      if (drop.length === 0) return
      setStore(
        produce((draft) => {
          for (const key of drop) {
            delete draft.sessionView[key]
            delete draft.sessionTabs[key]
          }
        }),
      )
      scroll.drop(drop)
      dropSessionState(drop)
      for (const key of drop) {
        used.delete(key)
      }
    }
    function touch(sessionKey: string) {
      meta.active = sessionKey
      used.set(sessionKey, Date.now())
      if (!ready()) return
      if (meta.pruned) return
      meta.pruned = true
      prune(sessionKey)
    }
    const scroll = createScrollPersistence({
      debounceMs: 250,
      getSnapshot: (sessionKey) => store.sessionView[sessionKey]?.scroll,
      onFlush: (sessionKey, next) => {
        const current = store.sessionView[sessionKey]
        const keep = meta.active ?? sessionKey
        if (!current) {
          setStore("sessionView", sessionKey, { scroll: next, terminalOpened: false, reviewPanelOpened: true })
          prune(keep)
          return
        }
        setStore("sessionView", sessionKey, "scroll", (prev) => ({ ...(prev ?? {}), ...next }))
        prune(keep)
      },
    })
    createEffect(() => {
      if (!ready()) return
      if (meta.pruned) return
      const active = meta.active
      if (!active) return
      meta.pruned = true
      prune(active)
    })
    onMount(() => {
      const flush = () => batch(() => scroll.flushAll())
      const handleVisibility = () => {
        if (document.visibilityState !== "hidden") return
        flush()
      }
      window.addEventListener("pagehide", flush)
      document.addEventListener("visibilitychange", handleVisibility)
      onCleanup(() => {
        window.removeEventListener("pagehide", flush)
        document.removeEventListener("visibilitychange", handleVisibility)
        scroll.dispose()
      })
    })
    const usedColors = new Set<AvatarColorKey>()
    function pickAvailableColor(): AvatarColorKey {
@@ -217,16 +65,11 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
    }
    function enrich(project: { worktree: string; expanded: boolean }) {
-      const [childStore] = globalSync.child(project.worktree)
+      const metadata = globalSync.data.project.find((x) => x.worktree === project.worktree)
      const projectID = childStore.project
      const metadata = projectID
        ? globalSync.data.project.find((x) => x.id === projectID)
        : globalSync.data.project.find((x) => x.worktree === project.worktree)
      return [
        {
          ...(metadata ?? {}),
          ...project,
-          icon: { url: metadata?.icon?.url, color: metadata?.icon?.color },
+          ...(metadata ?? {}),
        },
      ]
    }
@@ -242,47 +85,12 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
      return project
    }
-    const roots = createMemo(() => {
+    const enriched = createMemo(() => store.projects.flatMap(enrich))
      const map = new Map<string, string>()
      for (const project of globalSync.data.project) {
        const sandboxes = project.sandboxes ?? []
        for (const sandbox of sandboxes) {
          map.set(sandbox, project.worktree)
        }
      }
      return map
    })
    createEffect(() => {
      const map = roots()
      if (map.size === 0) return
      const projects = server.projects.list()
      const seen = new Set(projects.map((project) => project.worktree))
      batch(() => {
        for (const project of projects) {
          const root = map.get(project.worktree)
          if (!root) continue
          server.projects.close(project.worktree)
          if (!seen.has(root)) {
            server.projects.open(root)
            seen.add(root)
          }
          if (project.expanded) server.projects.expand(root)
        }
      })
    })
    const enriched = createMemo(() => server.projects.list().flatMap(enrich))
    const list = createMemo(() => enriched().flatMap(colorize))
    onMount(() => {
      Promise.all(
-        server.projects.list().map((project) => {
+        store.projects.map((project) => {
          return globalSync.project.loadSessions(project.worktree)
        }),
      )
@@ -293,22 +101,32 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
      projects: {
        list,
        open(directory: string) {
-          const root = roots().get(directory) ?? directory
+          if (store.projects.find((x) => x.worktree === directory)) {
-          if (server.projects.list().find((x) => x.worktree === root)) return
+            return
-          globalSync.project.loadSessions(root)
+          }
-          server.projects.open(root)
+          globalSync.project.loadSessions(directory)
          setStore("projects", (x) => [{ worktree: directory, expanded: true }, ...x])
        },
        close(directory: string) {
-          server.projects.close(directory)
+          setStore("projects", (x) => x.filter((x) => x.worktree !== directory))
        },
        expand(directory: string) {
-          server.projects.expand(directory)
+          const index = store.projects.findIndex((x) => x.worktree === directory)
          if (index !== -1) setStore("projects", index, "expanded", true)
        },
        collapse(directory: string) {
-          server.projects.collapse(directory)
+          const index = store.projects.findIndex((x) => x.worktree === directory)
          if (index !== -1) setStore("projects", index, "expanded", false)
        },
        move(directory: string, toIndex: number) {
-          server.projects.move(directory, toIndex)
+          setStore("projects", (projects) => {
            const fromIndex = projects.findIndex((x) => x.worktree === directory)
            if (fromIndex === -1 || fromIndex === toIndex) return projects
            const result = [...projects]
            const [item] = result.splice(fromIndex, 1)
            result.splice(toIndex, 0, item)
            return result
          })
        },
      },
      sidebar: {
@@ -326,31 +144,33 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        resize(width: number) {
          setStore("sidebar", "width", width)
        },
        workspaces(directory: string) {
          return createMemo(() => store.sidebar.workspaces[directory] ?? store.sidebar.workspacesDefault ?? false)
        },
        setWorkspaces(directory: string, value: boolean) {
          setStore("sidebar", "workspaces", directory, value)
        },
        toggleWorkspaces(directory: string) {
          const current = store.sidebar.workspaces[directory] ?? store.sidebar.workspacesDefault ?? false
          setStore("sidebar", "workspaces", directory, !current)
        },
      },
      terminal: {
        opened: createMemo(() => store.terminal.opened),
        open() {
          setStore("terminal", "opened", true)
        },
        close() {
          setStore("terminal", "opened", false)
        },
        toggle() {
          setStore("terminal", "opened", (x) => !x)
        },
        height: createMemo(() => store.terminal.height),
        resize(height: number) {
          setStore("terminal", "height", height)
        },
      },
      review: {
-        diffStyle: createMemo(() => store.review?.diffStyle ?? "split"),
+        opened: createMemo(() => store.review?.opened ?? true),
-        setDiffStyle(diffStyle: ReviewDiffStyle) {
+        open() {
-          if (!store.review) {
+          setStore("review", "opened", true)
-            setStore("review", { diffStyle })
+        },
-            return
+        close() {
-          }
+          setStore("review", "opened", false)
-          setStore("review", "diffStyle", diffStyle)
+        },
        toggle() {
          setStore("review", "opened", (x) => !x)
        },
      },
      session: {
@@ -358,107 +178,12 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        resize(width: number) {
          if (!store.session) {
            setStore("session", { width })
-            return
+          } else {
            setStore("session", "width", width)
          }
          setStore("session", "width", width)
        },
      },
      mobileSidebar: {
        opened: createMemo(() => store.mobileSidebar?.opened ?? false),
        show() {
          setStore("mobileSidebar", "opened", true)
        },
        hide() {
          setStore("mobileSidebar", "opened", false)
        },
        toggle() {
          setStore("mobileSidebar", "opened", (x) => !x)
        },
      },
      view(sessionKey: string) {
        touch(sessionKey)
        scroll.seed(sessionKey)
        const s = createMemo(() => store.sessionView[sessionKey] ?? { scroll: {} })
        const terminalOpened = createMemo(() => s().terminalOpened ?? false)
        const reviewPanelOpened = createMemo(() => s().reviewPanelOpened ?? true)
        function setTerminalOpened(next: boolean) {
          const current = store.sessionView[sessionKey]
          if (!current) {
            setStore("sessionView", sessionKey, { scroll: {}, terminalOpened: next, reviewPanelOpened: true })
            return
          }
          const value = current.terminalOpened ?? false
          if (value === next) return
          setStore("sessionView", sessionKey, "terminalOpened", next)
        }
        function setReviewPanelOpened(next: boolean) {
          const current = store.sessionView[sessionKey]
          if (!current) {
            setStore("sessionView", sessionKey, { scroll: {}, terminalOpened: false, reviewPanelOpened: next })
            return
          }
          const value = current.reviewPanelOpened ?? true
          if (value === next) return
          setStore("sessionView", sessionKey, "reviewPanelOpened", next)
        }
        return {
          scroll(tab: string) {
            return scroll.scroll(sessionKey, tab)
          },
          setScroll(tab: string, pos: SessionScroll) {
            scroll.setScroll(sessionKey, tab, pos)
          },
          terminal: {
            opened: terminalOpened,
            open() {
              setTerminalOpened(true)
            },
            close() {
              setTerminalOpened(false)
            },
            toggle() {
              setTerminalOpened(!terminalOpened())
            },
          },
          reviewPanel: {
            opened: reviewPanelOpened,
            open() {
              setReviewPanelOpened(true)
            },
            close() {
              setReviewPanelOpened(false)
            },
            toggle() {
              setReviewPanelOpened(!reviewPanelOpened())
            },
          },
          review: {
            open: createMemo(() => s().reviewOpen),
            setOpen(open: string[]) {
              const current = store.sessionView[sessionKey]
              if (!current) {
                setStore("sessionView", sessionKey, {
                  scroll: {},
                  terminalOpened: false,
                  reviewPanelOpened: true,
                  reviewOpen: open,
                })
                return
              }
              if (same(current.reviewOpen, open)) return
              setStore("sessionView", sessionKey, "reviewOpen", open)
            },
          },
        }
      },
      tabs(sessionKey: string) {
        touch(sessionKey)
        const tabs = createMemo(() => store.sessionTabs[sessionKey] ?? { all: [] })
        return {
          tabs,
@@ -480,55 +205,38 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
          },
          async open(tab: string) {
            const current = store.sessionTabs[sessionKey] ?? { all: [] }
-
+            if (tab !== "review") {
-            if (tab === "review") {
+              if (!current.all.includes(tab)) {
-              if (!store.sessionTabs[sessionKey]) {
+                if (!store.sessionTabs[sessionKey]) {
-                setStore("sessionTabs", sessionKey, { all: [], active: tab })
+                  setStore("sessionTabs", sessionKey, { all: [tab], active: tab })
                } else {
                  setStore("sessionTabs", sessionKey, "all", [...current.all, tab])
                  setStore("sessionTabs", sessionKey, "active", tab)
                }
                return
              }
              setStore("sessionTabs", sessionKey, "active", tab)
              return
            }
            if (tab === "context") {
              const all = [tab, ...current.all.filter((x) => x !== tab)]
              if (!store.sessionTabs[sessionKey]) {
                setStore("sessionTabs", sessionKey, { all, active: tab })
                return
              }
              setStore("sessionTabs", sessionKey, "all", all)
              setStore("sessionTabs", sessionKey, "active", tab)
              return
            }
            if (!current.all.includes(tab)) {
              if (!store.sessionTabs[sessionKey]) {
                setStore("sessionTabs", sessionKey, { all: [tab], active: tab })
                return
              }
              setStore("sessionTabs", sessionKey, "all", [...current.all, tab])
              setStore("sessionTabs", sessionKey, "active", tab)
              return
            }
            if (!store.sessionTabs[sessionKey]) {
-              setStore("sessionTabs", sessionKey, { all: current.all, active: tab })
+              setStore("sessionTabs", sessionKey, { all: [], active: tab })
-              return
+            } else {
              setStore("sessionTabs", sessionKey, "active", tab)
            }
            setStore("sessionTabs", sessionKey, "active", tab)
          },
          close(tab: string) {
            const current = store.sessionTabs[sessionKey]
            if (!current) return
            const all = current.all.filter((x) => x !== tab)
            batch(() => {
-              setStore("sessionTabs", sessionKey, "all", all)
+              setStore(
-              if (current.active !== tab) return
+                "sessionTabs",
-
+                sessionKey,
-              const index = current.all.findIndex((f) => f === tab)
+                "all",
-              const next = all[index - 1] ?? all[0]
+                current.all.filter((x) => x !== tab),
-              setStore("sessionTabs", sessionKey, "active", next)
+              )
              if (current.active === tab) {
                const index = current.all.findIndex((f) => f === tab)
                const previous = current.all[Math.max(0, index - 1)]
                setStore("sessionTabs", sessionKey, "active", previous)
              }
            })
          },
          move(tab: string, to: number) {
@@ -1,5 +1,5 @@
 import { createStore, produce, reconcile } from "solid-js/store"
-import { batch, createMemo, onCleanup } from "solid-js"
+import { batch, createEffect, createMemo } from "solid-js"
 import { filter, firstBy, flat, groupBy, mapValues, pipe, uniqueBy, values } from "remeda"
 import type { FileContent, FileNode, Model, Provider, File as FileStatus } from "@opencode-ai/sdk/v2"
 import { createSimpleContext } from "@opencode-ai/ui/context"
@@ -8,8 +8,7 @@ import { useSync } from "./sync"
 import { base64Encode } from "@opencode-ai/util/encode"
 import { useProviders } from "@/hooks/use-providers"
 import { DateTime } from "luxon"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"
 import { showToast } from "@opencode-ai/ui/toast"
 export type LocalFile = FileNode &
  Partial<{
@@ -62,43 +61,44 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
      }
    }
    // Automatically update model when agent changes
    createEffect(() => {
      const value = agent.current()
      if (value.model) {
        if (isModelValid(value.model))
          model.set({
            providerID: value.model.providerID,
            modelID: value.model.modelID,
          })
        // else
        //   toast.show({
        //     type: "warning",
        //     message: `Agent ${value.name}'s configured model ${value.model.providerID}/${value.model.modelID} is not valid`,
        //     duration: 3000,
        //   })
      }
    })
    const agent = (() => {
      const list = createMemo(() => sync.data.agent.filter((x) => x.mode !== "subagent" && !x.hidden))
      const [store, setStore] = createStore<{
-        current?: string
+        current: string
      }>({
-        current: list()[0]?.name,
+        current: list()[0].name,
      })
      return {
        list,
        current() {
-          const available = list()
+          return list().find((x) => x.name === store.current)!
          if (available.length === 0) return undefined
          return available.find((x) => x.name === store.current) ?? available[0]
        },
        set(name: string | undefined) {
-          const available = list()
+          setStore("current", name ?? list()[0].name)
          if (available.length === 0) {
            setStore("current", undefined)
            return
          }
          if (name && available.some((x) => x.name === name)) {
            setStore("current", name)
            return
          }
          setStore("current", available[0].name)
        },
        move(direction: 1 | -1) {
-          const available = list()
+          let next = list().findIndex((x) => x.name === store.current) + direction
-          if (available.length === 0) {
+          if (next < 0) next = list().length - 1
-            setStore("current", undefined)
+          if (next >= list().length) next = 0
-            return
+          const value = list()[next]
          }
          let next = available.findIndex((x) => x.name === store.current) + direction
          if (next < 0) next = available.length - 1
          if (next >= available.length) next = 0
          const value = available[next]
          if (!value) return
          setStore("current", value.name)
          if (value.model)
            model.set({
@@ -111,15 +111,13 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
    const model = (() => {
      const [store, setStore, _, modelReady] = persisted(
-        Persist.global("model", ["model.v1"]),
+        "model.v1",
        createStore<{
          user: (ModelKey & { visibility: "show" | "hide"; favorite?: boolean })[]
          recent: ModelKey[]
          variant?: Record<string, string | undefined>
        }>({
          user: [],
          recent: [],
          variant: {},
        }),
      )
@@ -160,16 +158,6 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
        ),
      )
      const latestSet = createMemo(() => new Set(latest().map((x) => `${x.providerID}:${x.modelID}`)))
      const userVisibilityMap = createMemo(() => {
        const map = new Map<string, "show" | "hide">()
        for (const item of store.user) {
          map.set(`${item.providerID}:${item.modelID}`, item.visibility)
        }
        return map
      })
      const list = createMemo(() =>
        available().map((m) => ({
          ...m,
@@ -211,13 +199,11 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
      const current = createMemo(() => {
        const a = agent.current()
        if (!a) return undefined
        const key = getFirstValidModel(
          () => ephemeral.model[a.name],
          () => a.model,
          fallbackModel,
-        )
+        )!
        if (!key) return undefined
        return find(key)
      })
@@ -263,8 +249,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
        cycle,
        set(model: ModelKey | undefined, options?: { recent?: boolean }) {
          batch(() => {
-            const currentAgent = agent.current()
+            setEphemeral("model", agent.current().name, model ?? fallbackModel())
            if (currentAgent) setEphemeral("model", currentAgent.name, model ?? fallbackModel())
            if (model) updateVisibility(model, "show")
            if (options?.recent && model) {
              const uniq = uniqueBy([model, ...store.recent], (x) => x.providerID + x.modelID)
@@ -274,58 +259,16 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
          })
        },
        visible(model: ModelKey) {
-          const key = `${model.providerID}:${model.modelID}`
+          const user = store.user.find((x) => x.modelID === model.modelID && x.providerID === model.providerID)
-          const visibility = userVisibilityMap().get(key)
+          return (
-          if (visibility === "hide") return false
+            user?.visibility !== "hide" &&
-          if (visibility === "show") return true
+            (latest().find((x) => x.modelID === model.modelID && x.providerID === model.providerID) ||
-          if (latestSet().has(key)) return true
+              user?.visibility === "show")
-          // For models without valid release_date (e.g. custom models), show by default
+          )
          const m = find(model)
          if (!m?.release_date || !DateTime.fromISO(m.release_date).isValid) return true
          return false
        },
        setVisibility(model: ModelKey, visible: boolean) {
          updateVisibility(model, visible ? "show" : "hide")
        },
        variant: {
          current() {
            const m = current()
            if (!m) return undefined
            const key = `${m.provider.id}/${m.id}`
            return store.variant?.[key]
          },
          list() {
            const m = current()
            if (!m) return []
            if (!m.variants) return []
            return Object.keys(m.variants)
          },
          set(value: string | undefined) {
            const m = current()
            if (!m) return
            const key = `${m.provider.id}/${m.id}`
            if (!store.variant) {
              setStore("variant", { [key]: value })
            } else {
              setStore("variant", key, value)
            }
          },
          cycle() {
            const variants = this.list()
            if (variants.length === 0) return
            const currentVariant = this.current()
            if (!currentVariant) {
              this.set(variants[0])
              return
            }
            const index = variants.indexOf(currentVariant)
            if (index === -1 || index === variants.length - 1) {
              this.set(undefined)
              return
            }
            this.set(variants[index + 1])
          },
        },
      }
    })()
@@ -333,11 +276,11 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
      const [store, setStore] = createStore<{
        node: Record<string, LocalFile>
      }>({
-        node: {}, //  Object.fromEntries(sync.data.node.map((x) => [x.path, x])),
+        node: Object.fromEntries(sync.data.node.map((x) => [x.path, x])),
      })
-      // const changeset = createMemo(() => new Set(sync.data.changes.map((f) => f.path)))
+      const changeset = createMemo(() => new Set(sync.data.changes.map((f) => f.path)))
-      // const changes = createMemo(() => Array.from(changeset()).sort((a, b) => a.localeCompare(b)))
+      const changes = createMemo(() => Array.from(changeset()).sort((a, b) => a.localeCompare(b)))
      // createEffect((prev: FileStatus[]) => {
      //   const removed = prev.filter((p) => !sync.data.changes.find((c) => c.path === p.path))
@@ -365,16 +308,16 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
      //   return sync.data.changes
      // }, sync.data.changes)
-      // const changed = (path: string) => {
+      const changed = (path: string) => {
-      //   const node = store.node[path]
+        const node = store.node[path]
-      //   if (node?.status) return true
+        if (node?.status) return true
-      //   const set = changeset()
+        const set = changeset()
-      //   if (set.has(path)) return true
+        if (set.has(path)) return true
-      //   for (const p of set) {
+        for (const p of set) {
-      //     if (p.startsWith(path ? path + "/" : "")) return true
+          if (p.startsWith(path ? path + "/" : "")) return true
-      //   }
+        }
-      //   return false
+        return false
-      // }
+      }
      // const resetNode = (path: string) => {
      //   setStore("node", path, {
@@ -393,26 +336,17 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
      const load = async (path: string) => {
        const relativePath = relative(path)
-        await sdk.client.file
+        await sdk.client.file.read({ path: relativePath }).then((x) => {
-          .read({ path: relativePath })
+          if (!store.node[relativePath]) return
-          .then((x) => {
+          setStore(
-            if (!store.node[relativePath]) return
+            "node",
-            setStore(
+            relativePath,
-              "node",
+            produce((draft) => {
-              relativePath,
+              draft.loaded = true
-              produce((draft) => {
+              draft.content = x.data
-                draft.loaded = true
+            }),
-                draft.content = x.data
+          )
-              }),
+        })
            )
          })
          .catch((e) => {
            showToast({
              variant: "error",
              title: "Failed to load file",
              description: e.message,
            })
          })
      }
      const fetch = async (path: string) => {
@@ -443,7 +377,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
        //   ]
        // })
        // setStore("active", relativePath)
-        // context.addActive()
+        context.addActive()
        if (options?.pinned) setStore("node", path, "pinned", true)
        if (options?.view && store.node[relativePath].view === undefined) setStore("node", path, "view", options.view)
        if (store.node[relativePath]?.loaded) return
@@ -451,27 +385,24 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
      }
      const list = async (path: string) => {
-        return sdk.client.file
+        return sdk.client.file.list({ path: path + "/" }).then((x) => {
-          .list({ path: path + "/" })
+          setStore(
-          .then((x) => {
+            "node",
-            setStore(
+            produce((draft) => {
-              "node",
+              x.data!.forEach((node) => {
-              produce((draft) => {
+                if (node.path in draft) return
-                x.data!.forEach((node) => {
+                draft[node.path] = node
-                  if (node.path in draft) return
+              })
-                  draft[node.path] = node
+            }),
-                })
+          )
-              }),
+        })
            )
          })
          .catch(() => {})
      }
      const searchFiles = (query: string) => sdk.client.find.files({ query, dirs: "false" }).then((x) => x.data!)
      const searchFilesAndDirectories = (query: string) =>
        sdk.client.find.files({ query, dirs: "true" }).then((x) => x.data!)
-      const unsub = sdk.event.listen((e) => {
+      sdk.event.listen((e) => {
        const event = e.details
        switch (event.type) {
          case "file.watcher.updated":
@@ -481,7 +412,6 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
            break
        }
      })
      onCleanup(unsub)
      return {
        node: async (path: string) => {
@@ -536,8 +466,8 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
        setChangeIndex(path: string, index: number | undefined) {
          setStore("node", path, "selectedChange", index)
        },
-        // changes,
+        changes,
-        // changed,
+        changed,
        children(path: string) {
          return Object.values(store.node).filter(
            (x) =>
@@ -552,11 +482,66 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
      }
    })()
    const context = (() => {
      const [store, setStore] = createStore<{
        activeTab: boolean
        files: string[]
        activeFile?: string
        items: (ContextItem & { key: string })[]
      }>({
        activeTab: true,
        files: [],
        items: [],
      })
      const files = createMemo(() => store.files.map((x) => file.node(x)))
      const activeFile = createMemo(() => (store.activeFile ? file.node(store.activeFile) : undefined))
      return {
        all() {
          return store.items
        },
        // active() {
        //   return store.activeTab ? file.active() : undefined
        // },
        addActive() {
          setStore("activeTab", true)
        },
        removeActive() {
          setStore("activeTab", false)
        },
        add(item: ContextItem) {
          let key = item.type
          switch (item.type) {
            case "file":
              key += `${item.path}:${item.selection?.startLine}:${item.selection?.endLine}`
              break
          }
          if (store.items.find((x) => x.key === key)) return
          setStore("items", (x) => [...x, { key, ...item }])
        },
        remove(key: string) {
          setStore("items", (x) => x.filter((x) => x.key !== key))
        },
        files,
        openFile(path: string) {
          file.init(path).then(() => {
            setStore("files", (x) => [...x, path])
            setStore("activeFile", path)
          })
        },
        activeFile,
        setActiveFile(path: string | undefined) {
          setStore("activeFile", path)
        },
      }
    })()
    const result = {
      slug: createMemo(() => base64Encode(sdk.directory)),
      model,
      agent,
      file,
      context,
    }
    return result
  },
@@ -1,16 +1,13 @@
 import { createStore } from "solid-js/store"
 import { createEffect, onCleanup } from "solid-js"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { useGlobalSDK } from "./global-sdk"
 import { useGlobalSync } from "./global-sync"
 import { usePlatform } from "@/context/platform"
 import { Binary } from "@opencode-ai/util/binary"
 import { base64Encode } from "@opencode-ai/util/encode"
 import { EventSessionError } from "@opencode-ai/sdk/v2"
 import { makeAudioPlayer } from "@solid-primitives/audio"
 import idleSound from "@opencode-ai/ui/audio/staplebops-01.aac"
 import errorSound from "@opencode-ai/ui/audio/nope-03.aac"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"
 type NotificationBase = {
  directory?: string
@@ -31,16 +28,6 @@ type ErrorNotification = NotificationBase & {
 export type Notification = TurnCompleteNotification | ErrorNotification
 const MAX_NOTIFICATIONS = 500
 const NOTIFICATION_TTL_MS = 1000 * 60 * 60 * 24 * 30
 function pruneNotifications(list: Notification[]) {
  const cutoff = Date.now() - NOTIFICATION_TTL_MS
  const pruned = list.filter((n) => n.time >= cutoff)
  if (pruned.length <= MAX_NOTIFICATIONS) return pruned
  return pruned.slice(pruned.length - MAX_NOTIFICATIONS)
 }
 export const { use: useNotification, provider: NotificationProvider } = createSimpleContext({
  name: "Notification",
  init: () => {
@@ -56,29 +43,15 @@ export const { use: useNotification, provider: NotificationProvider } = createSi
    const globalSDK = useGlobalSDK()
    const globalSync = useGlobalSync()
    const platform = usePlatform()
    const [store, setStore, _, ready] = persisted(
-      Persist.global("notification", ["notification.v1"]),
+      "notification.v1",
      createStore({
        list: [] as Notification[],
      }),
    )
-    const meta = { pruned: false }
+    globalSDK.event.listen((e) => {
    createEffect(() => {
      if (!ready()) return
      if (meta.pruned) return
      meta.pruned = true
      setStore("list", pruneNotifications(store.list))
    })
    const append = (notification: Notification) => {
      setStore("list", (list) => pruneNotifications([...list, notification]))
    }
    const unsub = globalSDK.event.listen((e) => {
      const directory = e.name
      const event = e.details
      const base = {
@@ -91,44 +64,39 @@ export const { use: useNotification, provider: NotificationProvider } = createSi
          const sessionID = event.properties.sessionID
          const [syncStore] = globalSync.child(directory)
          const match = Binary.search(syncStore.session, sessionID, (s) => s.id)
-          const session = match.found ? syncStore.session[match.index] : undefined
+          const isChild = match.found && syncStore.session[match.index].parentID
-          if (session?.parentID) break
+          if (isChild) break
          try {
            idlePlayer?.play()
          } catch {}
-          append({
+          setStore("list", store.list.length, {
            ...base,
            type: "turn-complete",
            session: sessionID,
          })
          const href = `/${base64Encode(directory)}/session/${sessionID}`
          void platform.notify("Response ready", session?.title ?? sessionID, href)
          break
        }
        case "session.error": {
          const sessionID = event.properties.sessionID
-          const [syncStore] = globalSync.child(directory)
+          if (sessionID) {
-          const match = sessionID ? Binary.search(syncStore.session, sessionID, (s) => s.id) : undefined
+            const [syncStore] = globalSync.child(directory)
-          const session = sessionID && match?.found ? syncStore.session[match.index] : undefined
+            const match = Binary.search(syncStore.session, sessionID, (s) => s.id)
-          if (session?.parentID) break
+            const isChild = match.found && syncStore.session[match.index].parentID
            if (isChild) break
          }
          try {
            errorPlayer?.play()
          } catch {}
-          const error = "error" in event.properties ? event.properties.error : undefined
+          setStore("list", store.list.length, {
          append({
            ...base,
            type: "error",
            session: sessionID ?? "global",
-            error,
+            error: "error" in event.properties ? event.properties.error : undefined,
          })
          const description = session?.title ?? (typeof error === "string" ? error : "An error occurred")
          const href = sessionID ? `/${base64Encode(directory)}/session/${sessionID}` : `/${base64Encode(directory)}`
          void platform.notify("Session error", description, href)
          break
        }
      }
    })
    onCleanup(unsub)
    return {
      ready,
@@ -1,167 +0,0 @@
 import { createMemo, onCleanup } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import type { PermissionRequest } from "@opencode-ai/sdk/v2/client"
 import { Persist, persisted } from "@/utils/persist"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { useGlobalSync } from "./global-sync"
 import { useParams } from "@solidjs/router"
 import { base64Decode, base64Encode } from "@opencode-ai/util/encode"
 type PermissionRespondFn = (input: {
  sessionID: string
  permissionID: string
  response: "once" | "always" | "reject"
  directory?: string
 }) => void
 function shouldAutoAccept(perm: PermissionRequest) {
  return perm.permission === "edit"
 }
 function isNonAllowRule(rule: unknown) {
  if (!rule) return false
  if (typeof rule === "string") return rule !== "allow"
  if (typeof rule !== "object") return false
  if (Array.isArray(rule)) return false
  for (const action of Object.values(rule)) {
    if (action !== "allow") return true
  }
  return false
 }
 function hasAutoAcceptPermissionConfig(permission: unknown) {
  if (!permission) return false
  if (typeof permission === "string") return permission !== "allow"
  if (typeof permission !== "object") return false
  if (Array.isArray(permission)) return false
  const config = permission as Record<string, unknown>
  if (isNonAllowRule(config.edit)) return true
  if (isNonAllowRule(config.write)) return true
  return false
 }
 export const { use: usePermission, provider: PermissionProvider } = createSimpleContext({
  name: "Permission",
  init: () => {
    const params = useParams()
    const globalSDK = useGlobalSDK()
    const globalSync = useGlobalSync()
    const permissionsEnabled = createMemo(() => {
      const directory = params.dir ? base64Decode(params.dir) : undefined
      if (!directory) return false
      const [store] = globalSync.child(directory)
      return hasAutoAcceptPermissionConfig(store.config.permission)
    })
    const [store, setStore, _, ready] = persisted(
      Persist.global("permission", ["permission.v3"]),
      createStore({
        autoAcceptEdits: {} as Record<string, boolean>,
      }),
    )
    const responded = new Set<string>()
    const respond: PermissionRespondFn = (input) => {
      globalSDK.client.permission.respond(input).catch(() => {
        responded.delete(input.permissionID)
      })
    }
    function respondOnce(permission: PermissionRequest, directory?: string) {
      if (responded.has(permission.id)) return
      responded.add(permission.id)
      respond({
        sessionID: permission.sessionID,
        permissionID: permission.id,
        response: "once",
        directory,
      })
    }
    function acceptKey(sessionID: string, directory?: string) {
      if (!directory) return sessionID
      return `${base64Encode(directory)}/${sessionID}`
    }
    function isAutoAccepting(sessionID: string, directory?: string) {
      const key = acceptKey(sessionID, directory)
      return store.autoAcceptEdits[key] ?? store.autoAcceptEdits[sessionID] ?? false
    }
    const unsubscribe = globalSDK.event.listen((e) => {
      const event = e.details
      if (event?.type !== "permission.asked") return
      const perm = event.properties
      if (!isAutoAccepting(perm.sessionID, e.name)) return
      if (!shouldAutoAccept(perm)) return
      respondOnce(perm, e.name)
    })
    onCleanup(unsubscribe)
    function enable(sessionID: string, directory: string) {
      const key = acceptKey(sessionID, directory)
      setStore(
        produce((draft) => {
          draft.autoAcceptEdits[key] = true
          delete draft.autoAcceptEdits[sessionID]
        }),
      )
      globalSDK.client.permission
        .list({ directory })
        .then((x) => {
          for (const perm of x.data ?? []) {
            if (!perm?.id) continue
            if (perm.sessionID !== sessionID) continue
            if (!shouldAutoAccept(perm)) continue
            respondOnce(perm, directory)
          }
        })
        .catch(() => undefined)
    }
    function disable(sessionID: string, directory?: string) {
      const key = directory ? acceptKey(sessionID, directory) : undefined
      setStore(
        produce((draft) => {
          if (key) delete draft.autoAcceptEdits[key]
          delete draft.autoAcceptEdits[sessionID]
        }),
      )
    }
    return {
      ready,
      respond,
      autoResponds(permission: PermissionRequest, directory?: string) {
        return isAutoAccepting(permission.sessionID, directory) && shouldAutoAccept(permission)
      },
      isAutoAccepting,
      toggleAutoAccept(sessionID: string, directory: string) {
        if (isAutoAccepting(sessionID, directory)) {
          disable(sessionID, directory)
          return
        }
        enable(sessionID, directory)
      },
      enableAutoAccept(sessionID: string, directory: string) {
        if (isAutoAccepting(sessionID, directory)) return
        enable(sessionID, directory)
      },
      disableAutoAccept(sessionID: string, directory?: string) {
        disable(sessionID, directory)
      },
      permissionsEnabled,
    }
  },
 })
@@ -3,13 +3,7 @@ import { AsyncStorage, SyncStorage } from "@solid-primitives/storage"
 export type Platform = {
  /** Platform discriminator */
-  platform: "web" | "desktop"
+  platform: "web" | "tauri"
  /** Desktop OS (Tauri only) */
  os?: "macos" | "windows" | "linux"
  /** App version */
  version?: string
  /** Open a URL in the default browser */
  openLink(url: string): void
@@ -17,10 +11,7 @@ export type Platform = {
  /** Restart the app  */
  restart(): Promise<void>
-  /** Send a system notification (optional deep link) */
+  /** Open native directory picker dialog (Tauri only) */
  notify(title: string, description?: string, href?: string): Promise<void>
  /** Open directory picker dialog (native on Tauri, server-backed on web) */
  openDirectoryPickerDialog?(opts?: { title?: string; multiple?: boolean }): Promise<string | string[] | null>
  /** Open native file picker dialog (Tauri only) */
@@ -40,12 +31,6 @@ export type Platform = {
  /** Fetch override */
  fetch?: typeof fetch
  /** Get the configured default server URL (desktop only) */
  getDefaultServerUrl?(): Promise<string | null>
  /** Set the default server URL to use on app startup (desktop only) */
  setDefaultServerUrl?(url: string | null): Promise<void>
 }
 export const { use: usePlatform, provider: PlatformProvider } = createSimpleContext({
@@ -1,9 +1,9 @@
 import { createStore } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
-import { batch, createMemo, createRoot, onCleanup } from "solid-js"
+import { batch, createMemo } from "solid-js"
 import { useParams } from "@solidjs/router"
-import type { FileSelection } from "@/context/file"
+import { TextSelection } from "./local"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"
 interface PartBase {
  content: string
@@ -18,12 +18,7 @@ export interface TextPart extends PartBase {
 export interface FileAttachmentPart extends PartBase {
  type: "file"
  path: string
-  selection?: FileSelection
+  selection?: TextSelection
 }
 export interface AgentPart extends PartBase {
  type: "agent"
  name: string
 }
 export interface ImageAttachmentPart {
@@ -34,27 +29,11 @@ export interface ImageAttachmentPart {
  dataUrl: string
 }
-export type ContentPart = TextPart | FileAttachmentPart | AgentPart | ImageAttachmentPart
+export type ContentPart = TextPart | FileAttachmentPart | ImageAttachmentPart
 export type Prompt = ContentPart[]
 export type FileContextItem = {
  type: "file"
  path: string
  selection?: FileSelection
 }
 export type ContextItem = FileContextItem
 export const DEFAULT_PROMPT: Prompt = [{ type: "text", content: "", start: 0, end: 0 }]
 function isSelectionEqual(a?: FileSelection, b?: FileSelection) {
  if (!a && !b) return true
  if (!a || !b) return false
  return (
    a.startLine === b.startLine && a.startChar === b.startChar && a.endLine === b.endLine && a.endChar === b.endChar
  )
 }
 export function isPromptEqual(promptA: Prompt, promptB: Prompt): boolean {
  if (promptA.length !== promptB.length) return false
  for (let i = 0; i < promptA.length; i++) {
@@ -64,13 +43,7 @@ export function isPromptEqual(promptA: Prompt, promptB: Prompt): boolean {
    if (partA.type === "text" && partA.content !== (partB as TextPart).content) {
      return false
    }
-    if (partA.type === "file") {
+    if (partA.type === "file" && partA.path !== (partB as FileAttachmentPart).path) {
      const fileA = partA as FileAttachmentPart
      const fileB = partB as FileAttachmentPart
      if (fileA.path !== fileB.path) return false
      if (!isSelectionEqual(fileA.selection, fileB.selection)) return false
    }
    if (partA.type === "agent" && partA.name !== (partB as AgentPart).name) {
      return false
    }
    if (partA.type === "image" && partA.id !== (partB as ImageAttachmentPart).id) {
@@ -80,7 +53,7 @@ export function isPromptEqual(promptA: Prompt, promptB: Prompt): boolean {
  return true
 }
-function cloneSelection(selection?: FileSelection) {
+function cloneSelection(selection?: TextSelection) {
  if (!selection) return undefined
  return { ...selection }
 }
@@ -88,7 +61,6 @@ function cloneSelection(selection?: FileSelection) {
 function clonePart(part: ContentPart): ContentPart {
  if (part.type === "text") return { ...part }
  if (part.type === "image") return { ...part }
  if (part.type === "agent") return { ...part }
  return {
    ...part,
    selection: cloneSelection(part.selection),
@@ -99,146 +71,41 @@ function clonePrompt(prompt: Prompt): Prompt {
  return prompt.map(clonePart)
 }
 const WORKSPACE_KEY = "__workspace__"
 const MAX_PROMPT_SESSIONS = 20
 type PromptSession = ReturnType<typeof createPromptSession>
 type PromptCacheEntry = {
  value: PromptSession
  dispose: VoidFunction
 }
 function createPromptSession(dir: string, id: string | undefined) {
  const legacy = `${dir}/prompt${id ? "/" + id : ""}.v2`
  const [store, setStore, _, ready] = persisted(
    Persist.scoped(dir, id, "prompt", [legacy]),
    createStore<{
      prompt: Prompt
      cursor?: number
      context: {
        activeTab: boolean
        items: (ContextItem & { key: string })[]
      }
    }>({
      prompt: clonePrompt(DEFAULT_PROMPT),
      cursor: undefined,
      context: {
        activeTab: true,
        items: [],
      },
    }),
  )
  function keyForItem(item: ContextItem) {
    if (item.type !== "file") return item.type
    const start = item.selection?.startLine
    const end = item.selection?.endLine
    return `${item.type}:${item.path}:${start}:${end}`
  }
  return {
    ready,
    current: createMemo(() => store.prompt),
    cursor: createMemo(() => store.cursor),
    dirty: createMemo(() => !isPromptEqual(store.prompt, DEFAULT_PROMPT)),
    context: {
      activeTab: createMemo(() => store.context.activeTab),
      items: createMemo(() => store.context.items),
      addActive() {
        setStore("context", "activeTab", true)
      },
      removeActive() {
        setStore("context", "activeTab", false)
      },
      add(item: ContextItem) {
        const key = keyForItem(item)
        if (store.context.items.find((x) => x.key === key)) return
        setStore("context", "items", (items) => [...items, { key, ...item }])
      },
      remove(key: string) {
        setStore("context", "items", (items) => items.filter((x) => x.key !== key))
      },
    },
    set(prompt: Prompt, cursorPosition?: number) {
      const next = clonePrompt(prompt)
      batch(() => {
        setStore("prompt", next)
        if (cursorPosition !== undefined) setStore("cursor", cursorPosition)
      })
    },
    reset() {
      batch(() => {
        setStore("prompt", clonePrompt(DEFAULT_PROMPT))
        setStore("cursor", 0)
      })
    },
  }
 }
 export const { use: usePrompt, provider: PromptProvider } = createSimpleContext({
  name: "Prompt",
  gate: false,
  init: () => {
    const params = useParams()
-    const cache = new Map<string, PromptCacheEntry>()
+    const name = createMemo(() => `${params.dir}/prompt${params.id ? "/" + params.id : ""}.v1`)
-    const disposeAll = () => {
+    const [store, setStore, _, ready] = persisted(
-      for (const entry of cache.values()) {
+      name(),
-        entry.dispose()
+      createStore<{
-      }
+        prompt: Prompt
-      cache.clear()
+        cursor?: number
-    }
+      }>({
-
+        prompt: clonePrompt(DEFAULT_PROMPT),
-    onCleanup(disposeAll)
+        cursor: undefined,
-
+      }),
-    const prune = () => {
+    )
      while (cache.size > MAX_PROMPT_SESSIONS) {
        const first = cache.keys().next().value
        if (!first) return
        const entry = cache.get(first)
        entry?.dispose()
        cache.delete(first)
      }
    }
    const load = (dir: string, id: string | undefined) => {
      const key = `${dir}:${id ?? WORKSPACE_KEY}`
      const existing = cache.get(key)
      if (existing) {
        cache.delete(key)
        cache.set(key, existing)
        return existing.value
      }
      const entry = createRoot((dispose) => ({
        value: createPromptSession(dir, id),
        dispose,
      }))
      cache.set(key, entry)
      prune()
      return entry.value
    }
    const session = createMemo(() => load(params.dir!, params.id))
    return {
-      ready: () => session().ready(),
+      ready,
-      current: () => session().current(),
+      current: createMemo(() => store.prompt),
-      cursor: () => session().cursor(),
+      cursor: createMemo(() => store.cursor),
-      dirty: () => session().dirty(),
+      dirty: createMemo(() => !isPromptEqual(store.prompt, DEFAULT_PROMPT)),
-      context: {
+      set(prompt: Prompt, cursorPosition?: number) {
-        activeTab: () => session().context.activeTab(),
+        const next = clonePrompt(prompt)
-        items: () => session().context.items(),
+        batch(() => {
-        addActive: () => session().context.addActive(),
+          setStore("prompt", next)
-        removeActive: () => session().context.removeActive(),
+          if (cursorPosition !== undefined) setStore("cursor", cursorPosition)
-        add: (item: ContextItem) => session().context.add(item),
+        })
-        remove: (key: string) => session().context.remove(key),
+      },
      reset() {
        batch(() => {
          setStore("prompt", clonePrompt(DEFAULT_PROMPT))
          setStore("cursor", 0)
        })
      },
      set: (prompt: Prompt, cursorPosition?: number) => session().set(prompt, cursorPosition),
      reset: () => session().reset(),
    }
  },
 })
@@ -1,7 +1,6 @@
 import { createOpencodeClient, type Event } from "@opencode-ai/sdk/v2/client"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { createGlobalEmitter } from "@solid-primitives/event-bus"
 import { onCleanup } from "solid-js"
 import { useGlobalSDK } from "./global-sdk"
 import { usePlatform } from "./platform"
@@ -12,6 +11,7 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
    const globalSDK = useGlobalSDK()
    const sdk = createOpencodeClient({
      baseUrl: globalSDK.url,
      signal: AbortSignal.timeout(1000 * 60 * 10),
      fetch: platform.fetch,
      directory: props.directory,
      throwOnError: true,
@@ -21,10 +21,9 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
      [key in Event["type"]]: Extract<Event, { type: key }>
    }>()
-    const unsub = globalSDK.event.on(props.directory, (event) => {
+    globalSDK.event.on(props.directory, async (event) => {
      emitter.emit(event.type, event)
    })
    onCleanup(unsub)
    return { directory: props.directory, client: sdk, event: emitter, url: globalSDK.url }
  },
@@ -1,214 +0,0 @@
 import { createOpencodeClient } from "@opencode-ai/sdk/v2/client"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { batch, createEffect, createMemo, createSignal, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
 import { usePlatform } from "@/context/platform"
 import { Persist, persisted } from "@/utils/persist"
 type StoredProject = { worktree: string; expanded: boolean }
 export function normalizeServerUrl(input: string) {
  const trimmed = input.trim()
  if (!trimmed) return
  const withProtocol = /^https?:\/\//.test(trimmed) ? trimmed : `http://${trimmed}`
  return withProtocol.replace(/\/+$/, "")
 }
 export function serverDisplayName(url: string) {
  if (!url) return ""
  return url.replace(/^https?:\/\//, "").replace(/\/+$/, "")
 }
 function projectsKey(url: string) {
  if (!url) return ""
  const host = url.replace(/^https?:\/\//, "").split(":")[0]
  if (host === "localhost" || host === "127.0.0.1") return "local"
  return url
 }
 export const { use: useServer, provider: ServerProvider } = createSimpleContext({
  name: "Server",
  init: (props: { defaultUrl: string }) => {
    const platform = usePlatform()
    const [store, setStore, _, ready] = persisted(
      Persist.global("server", ["server.v3"]),
      createStore({
        list: [] as string[],
        projects: {} as Record<string, StoredProject[]>,
        lastProject: {} as Record<string, string>,
      }),
    )
    const [active, setActiveRaw] = createSignal("")
    function setActive(input: string) {
      const url = normalizeServerUrl(input)
      if (!url) return
      setActiveRaw(url)
    }
    function add(input: string) {
      const url = normalizeServerUrl(input)
      if (!url) return
      const fallback = normalizeServerUrl(props.defaultUrl)
      if (fallback && url === fallback) {
        setActiveRaw(url)
        return
      }
      batch(() => {
        if (!store.list.includes(url)) {
          setStore("list", store.list.length, url)
        }
        setActiveRaw(url)
      })
    }
    function remove(input: string) {
      const url = normalizeServerUrl(input)
      if (!url) return
      const list = store.list.filter((x) => x !== url)
      const next = active() === url ? (list[0] ?? normalizeServerUrl(props.defaultUrl) ?? "") : active()
      batch(() => {
        setStore("list", list)
        setActiveRaw(next)
      })
    }
    createEffect(() => {
      if (!ready()) return
      if (active()) return
      const url = normalizeServerUrl(props.defaultUrl)
      if (!url) return
      setActiveRaw(url)
    })
    const isReady = createMemo(() => ready() && !!active())
    const [healthy, setHealthy] = createSignal<boolean | undefined>(undefined)
    const check = (url: string) => {
      const sdk = createOpencodeClient({
        baseUrl: url,
        fetch: platform.fetch,
        signal: AbortSignal.timeout(3000),
      })
      return sdk.global
        .health()
        .then((x) => x.data?.healthy === true)
        .catch(() => false)
    }
    createEffect(() => {
      const url = active()
      if (!url) return
      setHealthy(undefined)
      let alive = true
      let busy = false
      const run = () => {
        if (busy) return
        busy = true
        void check(url)
          .then((next) => {
            if (!alive) return
            setHealthy(next)
          })
          .finally(() => {
            busy = false
          })
      }
      run()
      const interval = setInterval(run, 10_000)
      onCleanup(() => {
        alive = false
        clearInterval(interval)
      })
    })
    const origin = createMemo(() => projectsKey(active()))
    const projectsList = createMemo(() => store.projects[origin()] ?? [])
    const isLocal = createMemo(() => origin() === "local")
    return {
      ready: isReady,
      healthy,
      isLocal,
      get url() {
        return active()
      },
      get name() {
        return serverDisplayName(active())
      },
      get list() {
        return store.list
      },
      setActive,
      add,
      remove,
      projects: {
        list: projectsList,
        open(directory: string) {
          const key = origin()
          if (!key) return
          const current = store.projects[key] ?? []
          if (current.find((x) => x.worktree === directory)) return
          setStore("projects", key, [{ worktree: directory, expanded: true }, ...current])
        },
        close(directory: string) {
          const key = origin()
          if (!key) return
          const current = store.projects[key] ?? []
          setStore(
            "projects",
            key,
            current.filter((x) => x.worktree !== directory),
          )
        },
        expand(directory: string) {
          const key = origin()
          if (!key) return
          const current = store.projects[key] ?? []
          const index = current.findIndex((x) => x.worktree === directory)
          if (index !== -1) setStore("projects", key, index, "expanded", true)
        },
        collapse(directory: string) {
          const key = origin()
          if (!key) return
          const current = store.projects[key] ?? []
          const index = current.findIndex((x) => x.worktree === directory)
          if (index !== -1) setStore("projects", key, index, "expanded", false)
        },
        move(directory: string, toIndex: number) {
          const key = origin()
          if (!key) return
          const current = store.projects[key] ?? []
          const fromIndex = current.findIndex((x) => x.worktree === directory)
          if (fromIndex === -1 || fromIndex === toIndex) return
          const result = [...current]
          const [item] = result.splice(fromIndex, 1)
          result.splice(toIndex, 0, item)
          setStore("projects", key, result)
        },
        last() {
          const key = origin()
          if (!key) return
          return store.lastProject[key]
        },
        touch(directory: string) {
          const key = origin()
          if (!key) return
          setStore("lastProject", key, directory)
        },
      },
    }
  },
 })
@@ -1,5 +1,5 @@
-import { batch, createMemo } from "solid-js"
+import { produce } from "solid-js/store"
-import { createStore, produce, reconcile } from "solid-js/store"
+import { createMemo } from "solid-js"
 import { Binary } from "@opencode-ai/util/binary"
 import { retry } from "@opencode-ai/util/retry"
 import { createSimpleContext } from "@opencode-ai/ui/context"
@@ -14,85 +14,12 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
    const sdk = useSDK()
    const [store, setStore] = globalSync.child(sdk.directory)
    const absolute = (path: string) => (store.path.directory + "/" + path).replace("//", "/")
    const chunk = 400
    const inflight = new Map<string, Promise<void>>()
    const inflightDiff = new Map<string, Promise<void>>()
    const inflightTodo = new Map<string, Promise<void>>()
    const [meta, setMeta] = createStore({
      limit: {} as Record<string, number>,
      complete: {} as Record<string, boolean>,
      loading: {} as Record<string, boolean>,
    })
    const getSession = (sessionID: string) => {
      const match = Binary.search(store.session, sessionID, (s) => s.id)
      if (match.found) return store.session[match.index]
      return undefined
    }
    const limitFor = (count: number) => {
      if (count <= chunk) return chunk
      return Math.ceil(count / chunk) * chunk
    }
    const hydrateMessages = (sessionID: string) => {
      if (meta.limit[sessionID] !== undefined) return
      const messages = store.message[sessionID]
      if (!messages) return
      const limit = limitFor(messages.length)
      setMeta("limit", sessionID, limit)
      setMeta("complete", sessionID, messages.length < limit)
    }
    const loadMessages = async (sessionID: string, limit: number) => {
      if (meta.loading[sessionID]) return
      setMeta("loading", sessionID, true)
      await retry(() => sdk.client.session.messages({ sessionID, limit }))
        .then((messages) => {
          const items = (messages.data ?? []).filter((x) => !!x?.info?.id)
          const next = items
            .map((x) => x.info)
            .filter((m) => !!m?.id)
            .slice()
            .sort((a, b) => a.id.localeCompare(b.id))
          batch(() => {
            setStore("message", sessionID, reconcile(next, { key: "id" }))
            for (const message of items) {
              setStore(
                "part",
                message.info.id,
                reconcile(
                  message.parts
                    .filter((p) => !!p?.id)
                    .slice()
                    .sort((a, b) => a.id.localeCompare(b.id)),
                  { key: "id" },
                ),
              )
            }
            setMeta("limit", sessionID, limit)
            setMeta("complete", sessionID, next.length < limit)
          })
        })
        .finally(() => {
          setMeta("loading", sessionID, false)
        })
    }
    return {
      data: store,
      set: setStore,
      get status() {
        return store.status
      },
      get ready() {
-        return store.status !== "loading"
+        return store.ready
      },
      get project() {
        const match = Binary.search(globalSync.data.project, store.project, (p) => p.id)
@@ -100,7 +27,11 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
        return undefined
      },
      session: {
-        get: getSession,
+        get(sessionID: string) {
          const match = Binary.search(store.session, sessionID, (s) => s.id)
          if (match.found) return store.session[match.index]
          return undefined
        },
        addOptimisticMessage(input: {
          sessionID: string
          messageID: string
@@ -125,115 +56,42 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
                const result = Binary.search(messages, input.messageID, (m) => m.id)
                messages.splice(result.index, 0, message)
              }
-              draft.part[input.messageID] = input.parts
+              draft.part[input.messageID] = input.parts.slice()
                .filter((p) => !!p?.id)
                .slice()
                .sort((a, b) => a.id.localeCompare(b.id))
            }),
          )
        },
-        async sync(sessionID: string) {
+        async sync(sessionID: string, _isRetry = false) {
-          const hasSession = getSession(sessionID) !== undefined
+          const [session, messages, todo, diff] = await Promise.all([
-          hydrateMessages(sessionID)
+            retry(() => sdk.client.session.get({ sessionID })),
-
+            retry(() => sdk.client.session.messages({ sessionID, limit: 100 })),
-          const hasMessages = store.message[sessionID] !== undefined
+            retry(() => sdk.client.session.todo({ sessionID })),
-          if (hasSession && hasMessages) return
+            retry(() => sdk.client.session.diff({ sessionID })),
-
+          ])
-          const pending = inflight.get(sessionID)
+          setStore(
-          if (pending) return pending
+            produce((draft) => {
-
+              const match = Binary.search(draft.session, sessionID, (s) => s.id)
-          const limit = meta.limit[sessionID] ?? chunk
+              if (match.found) draft.session[match.index] = session.data!
-
+              if (!match.found) draft.session.splice(match.index, 0, session.data!)
-          const sessionReq = hasSession
+              draft.todo[sessionID] = todo.data ?? []
-            ? Promise.resolve()
+              draft.message[sessionID] = messages
-            : retry(() => sdk.client.session.get({ sessionID })).then((session) => {
+                .data!.map((x) => x.info)
-                const data = session.data
+                .slice()
-                if (!data) return
+                .sort((a, b) => a.id.localeCompare(b.id))
-                setStore(
+              for (const message of messages.data!) {
-                  "session",
+                draft.part[message.info.id] = message.parts.slice().sort((a, b) => a.id.localeCompare(b.id))
-                  produce((draft) => {
+              }
-                    const match = Binary.search(draft, sessionID, (s) => s.id)
+              draft.session_diff[sessionID] = diff.data ?? []
-                    if (match.found) {
+            }),
-                      draft[match.index] = data
+          )
                      return
                    }
                    draft.splice(match.index, 0, data)
                  }),
                )
              })
          const messagesReq = hasMessages ? Promise.resolve() : loadMessages(sessionID, limit)
          const promise = Promise.all([sessionReq, messagesReq])
            .then(() => {})
            .finally(() => {
              inflight.delete(sessionID)
            })
          inflight.set(sessionID, promise)
          return promise
        },
        async diff(sessionID: string) {
          if (store.session_diff[sessionID] !== undefined) return
          const pending = inflightDiff.get(sessionID)
          if (pending) return pending
          const promise = retry(() => sdk.client.session.diff({ sessionID }))
            .then((diff) => {
              setStore("session_diff", sessionID, reconcile(diff.data ?? [], { key: "file" }))
            })
            .finally(() => {
              inflightDiff.delete(sessionID)
            })
          inflightDiff.set(sessionID, promise)
          return promise
        },
        async todo(sessionID: string) {
          if (store.todo[sessionID] !== undefined) return
          const pending = inflightTodo.get(sessionID)
          if (pending) return pending
          const promise = retry(() => sdk.client.session.todo({ sessionID }))
            .then((todo) => {
              setStore("todo", sessionID, reconcile(todo.data ?? [], { key: "id" }))
            })
            .finally(() => {
              inflightTodo.delete(sessionID)
            })
          inflightTodo.set(sessionID, promise)
          return promise
        },
        history: {
          more(sessionID: string) {
            if (store.message[sessionID] === undefined) return false
            if (meta.limit[sessionID] === undefined) return false
            if (meta.complete[sessionID]) return false
            return true
          },
          loading(sessionID: string) {
            return meta.loading[sessionID] ?? false
          },
          async loadMore(sessionID: string, count = chunk) {
            if (meta.loading[sessionID]) return
            if (meta.complete[sessionID]) return
            const current = meta.limit[sessionID] ?? chunk
            await loadMessages(sessionID, current + count)
          },
        },
        fetch: async (count = 10) => {
          setStore("limit", (x) => x + count)
          await sdk.client.session.list().then((x) => {
            const sessions = (x.data ?? [])
              .filter((s) => !!s?.id)
              .slice()
              .sort((a, b) => a.id.localeCompare(b.id))
              .slice(0, store.limit)
-            setStore("session", reconcile(sessions, { key: "id" }))
+            setStore("session", sessions)
          })
        },
        more: createMemo(() => store.session.length >= store.limit),
@@ -1,63 +1,42 @@
 import { createStore, produce } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
-import { batch, createMemo, createRoot, onCleanup } from "solid-js"
+import { batch, createMemo } from "solid-js"
 import { useParams } from "@solidjs/router"
 import { useSDK } from "./sdk"
-import { Persist, persisted } from "@/utils/persist"
+import { persisted } from "@/utils/persist"
 export type LocalPTY = {
  id: string
  title: string
  titleNumber: number
  rows?: number
  cols?: number
  buffer?: string
  scrollY?: number
 }
-const WORKSPACE_KEY = "__workspace__"
+export const { use: useTerminal, provider: TerminalProvider } = createSimpleContext({
-const MAX_TERMINAL_SESSIONS = 20
+  name: "Terminal",
  init: () => {
    const sdk = useSDK()
    const params = useParams()
    const name = createMemo(() => `${params.dir}/terminal${params.id ? "/" + params.id : ""}.v1`)
-type TerminalSession = ReturnType<typeof createTerminalSession>
+    const [store, setStore, _, ready] = persisted(
      name(),
      createStore<{
        active?: string
        all: LocalPTY[]
      }>({
        all: [],
      }),
    )
-type TerminalCacheEntry = {
+    return {
-  value: TerminalSession
+      ready,
-  dispose: VoidFunction
+      all: createMemo(() => Object.values(store.all)),
-}
+      active: createMemo(() => store.active),
-
+      new() {
-function createTerminalSession(sdk: ReturnType<typeof useSDK>, dir: string, id: string | undefined) {
+        sdk.client.pty.create({ title: `Terminal ${store.all.length + 1}` }).then((pty) => {
  const legacy = `${dir}/terminal${id ? "/" + id : ""}.v1`
  const [store, setStore, _, ready] = persisted(
    Persist.scoped(dir, id, "terminal", [legacy]),
    createStore<{
      active?: string
      all: LocalPTY[]
    }>({
      all: [],
    }),
  )
  return {
    ready,
    all: createMemo(() => Object.values(store.all)),
    active: createMemo(() => store.active),
    new() {
      const existingTitleNumbers = new Set(
        store.all.map((pty) => {
          const match = pty.titleNumber
          return match
        }),
      )
      let nextNumber = 1
      while (existingTitleNumbers.has(nextNumber)) {
        nextNumber++
      }
      sdk.client.pty
        .create({ title: `Terminal ${nextNumber}` })
        .then((pty) => {
          const id = pty.data?.id
          if (!id) return
          setStore("all", [
@@ -65,138 +44,62 @@ function createTerminalSession(sdk: ReturnType<typeof useSDK>, dir: string, id:
            {
              id,
              title: pty.data?.title ?? "Terminal",
              titleNumber: nextNumber,
            },
          ])
          setStore("active", id)
        })
-        .catch((e) => {
+      },
-          console.error("Failed to create terminal", e)
+      update(pty: Partial<LocalPTY> & { id: string }) {
-        })
+        setStore("all", (x) => x.map((x) => (x.id === pty.id ? { ...x, ...pty } : x)))
-    },
+        sdk.client.pty.update({
    update(pty: Partial<LocalPTY> & { id: string }) {
      setStore("all", (x) => x.map((x) => (x.id === pty.id ? { ...x, ...pty } : x)))
      sdk.client.pty
        .update({
          ptyID: pty.id,
          title: pty.title,
          size: pty.cols && pty.rows ? { rows: pty.rows, cols: pty.cols } : undefined,
        })
-        .catch((e) => {
+      },
-          console.error("Failed to update terminal", e)
+      async clone(id: string) {
-        })
+        const index = store.all.findIndex((x) => x.id === id)
-    },
+        const pty = store.all[index]
-    async clone(id: string) {
+        if (!pty) return
-      const index = store.all.findIndex((x) => x.id === id)
+        const clone = await sdk.client.pty.create({
      const pty = store.all[index]
      if (!pty) return
      const clone = await sdk.client.pty
        .create({
          title: pty.title,
        })
-        .catch((e) => {
+        if (!clone.data) return
-          console.error("Failed to clone terminal", e)
+        setStore("all", index, {
-          return undefined
+          ...pty,
          ...clone.data,
        })
-      if (!clone?.data) return
+        if (store.active === pty.id) {
-      setStore("all", index, {
+          setStore("active", clone.data.id)
-        ...pty,
+        }
-        ...clone.data,
+      },
-      })
+      open(id: string) {
-      if (store.active === pty.id) {
+        setStore("active", id)
-        setStore("active", clone.data.id)
+      },
-      }
+      async close(id: string) {
-    },
+        batch(() => {
-    open(id: string) {
+          setStore(
-      setStore("active", id)
+            "all",
-    },
+            store.all.filter((x) => x.id !== id),
-    async close(id: string) {
+          )
-      batch(() => {
+          if (store.active === id) {
            const index = store.all.findIndex((f) => f.id === id)
            const previous = store.all[Math.max(0, index - 1)]
            setStore("active", previous?.id)
          }
        })
        await sdk.client.pty.remove({ ptyID: id })
      },
      move(id: string, to: number) {
        const index = store.all.findIndex((f) => f.id === id)
        if (index === -1) return
        setStore(
          "all",
-          store.all.filter((x) => x.id !== id),
+          produce((all) => {
            all.splice(to, 0, all.splice(index, 1)[0])
          }),
        )
-        if (store.active === id) {
+      },
          const index = store.all.findIndex((f) => f.id === id)
          const previous = store.all[Math.max(0, index - 1)]
          setStore("active", previous?.id)
        }
      })
      await sdk.client.pty.remove({ ptyID: id }).catch((e) => {
        console.error("Failed to close terminal", e)
      })
    },
    move(id: string, to: number) {
      const index = store.all.findIndex((f) => f.id === id)
      if (index === -1) return
      setStore(
        "all",
        produce((all) => {
          all.splice(to, 0, all.splice(index, 1)[0])
        }),
      )
    },
  }
 }
 export const { use: useTerminal, provider: TerminalProvider } = createSimpleContext({
  name: "Terminal",
  gate: false,
  init: () => {
    const sdk = useSDK()
    const params = useParams()
    const cache = new Map<string, TerminalCacheEntry>()
    const disposeAll = () => {
      for (const entry of cache.values()) {
        entry.dispose()
      }
      cache.clear()
    }
    onCleanup(disposeAll)
    const prune = () => {
      while (cache.size > MAX_TERMINAL_SESSIONS) {
        const first = cache.keys().next().value
        if (!first) return
        const entry = cache.get(first)
        entry?.dispose()
        cache.delete(first)
      }
    }
    const load = (dir: string, id: string | undefined) => {
      const key = `${dir}:${id ?? WORKSPACE_KEY}`
      const existing = cache.get(key)
      if (existing) {
        cache.delete(key)
        cache.set(key, existing)
        return existing.value
      }
      const entry = createRoot((dispose) => ({
        value: createTerminalSession(sdk, dir, id),
        dispose,
      }))
      cache.set(key, entry)
      prune()
      return entry.value
    }
    const session = createMemo(() => load(params.dir!, params.id))
    return {
      ready: () => session().ready(),
      all: () => session().all(),
      active: () => session().active(),
      new: () => session().new(),
      update: (pty: Partial<LocalPTY> & { id: string }) => session().update(pty),
      clone: (id: string) => session().clone(id),
      open: (id: string) => session().open(id),
      close: (id: string) => session().close(id),
      move: (id: string, to: number) => session().move(id, to),
    }
  },
 })
@@ -1,8 +1,7 @@
 // @refresh reload
 import { render } from "solid-js/web"
-import { AppBaseProviders, AppInterface } from "@/app"
+import { App } from "@/app"
 import { Platform, PlatformProvider } from "@/context/platform"
 import pkg from "../package.json"
 const root = document.getElementById("root")
 if (import.meta.env.DEV && !(root instanceof HTMLElement)) {
@@ -13,51 +12,18 @@ if (import.meta.env.DEV && !(root instanceof HTMLElement)) {
 const platform: Platform = {
  platform: "web",
  version: pkg.version,
  openLink(url: string) {
    window.open(url, "_blank")
  },
  restart: async () => {
    window.location.reload()
  },
  notify: async (title, description, href) => {
    if (!("Notification" in window)) return
    const permission =
      Notification.permission === "default"
        ? await Notification.requestPermission().catch(() => "denied")
        : Notification.permission
    if (permission !== "granted") return
    const inView = document.visibilityState === "visible" && document.hasFocus()
    if (inView) return
    await Promise.resolve()
      .then(() => {
        const notification = new Notification(title, {
          body: description ?? "",
          icon: "https://opencode.ai/favicon-96x96.png",
        })
        notification.onclick = () => {
          window.focus()
          if (href) {
            window.history.pushState(null, "", href)
            window.dispatchEvent(new PopStateEvent("popstate"))
          }
          notification.close()
        }
      })
      .catch(() => undefined)
  },
 }
 render(
  () => (
    <PlatformProvider value={platform}>
-      <AppBaseProviders>
+      <App />
        <AppInterface />
      </AppBaseProviders>
    </PlatformProvider>
  ),
  root!,
--- a/Show More
+++ b/Show More
		`@@ -1,3 +0,0 @@`
			`### What does this PR do?`

			`### How did you verify your code works?`