remove build-cli-merge

Merge branch 'dev' into brendan/cli-codesign
codesign cli on macos by building it on macos
2026-03-26 09:26:21 +08:00 · 2026-03-25 13:15:32 +08:00 · 2026-03-25 13:14:04 +08:00 · 2026-03-25 04:45:37 +00:00 · 2026-03-25 04:43:48 +00:00 · 2026-03-24 23:55:10 -04:00
214 changed files with 10701 additions and 6936 deletions
@@ -10,6 +10,9 @@
 adamdotdevin
 -agusbasari29 AI PR slop
 ariane-emory
 -atharvau AI review spamming literally every PR
 -danieljoshuanazareth
 -danieljoshuanazareth
 edemaine
 -florianleibert
 fwang
@@ -17,8 +20,8 @@ iamdavidhill
 jayair
 kitlangton
 kommander
 -opencode2026
 r44vc0rp
 rekram1-node
 -spider-yamet clawdbot/llm psychosis, spam pinging the team
 thdxr
 -OpenCode2026
@@ -0,0 +1,24 @@
 name: close-issues
 on:
  schedule:
    - cron: "0 2 * * *" # Daily at 2:00 AM
  workflow_dispatch:
 jobs:
  close:
    runs-on: ubuntu-latest
    permissions:
      contents: read
      issues: write
    steps:
      - uses: actions/checkout@v4
      - uses: oven-sh/setup-bun@v2
        with:
          bun-version: latest
      - name: Close stale issues
        env:
          GITHUB_TOKEN: ${{ github.token }}
        run: bun script/github/close-issues.ts
@@ -11,7 +11,7 @@ concurrency: ${{ github.workflow }}-${{ github.ref }}
 jobs:
  deploy:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
@@ -56,7 +56,7 @@ jobs:
          nix build ".#packages.${SYSTEM}.node_modules_updater" --no-link 2>&1 | tee "$BUILD_LOG" || true
          # Extract hash from build log with portability
-          HASH="$(grep -oE 'sha256-[A-Za-z0-9+/=]+' "$BUILD_LOG" | tail -n1 || true)"
+          HASH="$(nix run --inputs-from . nixpkgs#gnugrep -- -oP 'got:\s*\Ksha256-[A-Za-z0-9+/=]+' "$BUILD_LOG" | tail -n1 || true)"
          if [ -z "$HASH" ]; then
            echo "::error::Failed to compute hash for ${SYSTEM}"
@@ -67,7 +67,7 @@ jobs:
      tag: ${{ steps.version.outputs.tag }}
      repo: ${{ steps.version.outputs.repo }}
-  build-cli:
+  build-cli-linux-win:
    needs: version
    runs-on: blacksmith-4vcpu-ubuntu-2404
    if: github.repository == 'anomalyco/opencode'
@@ -94,17 +94,74 @@ jobs:
          OPENCODE_RELEASE: ${{ needs.version.outputs.release }}
          GH_REPO: ${{ needs.version.outputs.repo }}
          GH_TOKEN: ${{ steps.committer.outputs.token }}
          OPENCODE_BUILD_OS: linux,win32
          OPENCODE_SKIP_RELEASE_UPLOAD: "1"
      - uses: actions/upload-artifact@v4
        with:
-          name: opencode-cli
+          name: opencode-cli-linux-win
          path: packages/opencode/dist
  build-cli-darwin:
    needs: version
    runs-on: macos-latest
    if: github.repository == 'anomalyco/opencode'
    steps:
      - uses: actions/checkout@v3
        with:
          fetch-tags: true
      - uses: ./.github/actions/setup-bun
      - name: Setup git committer
        id: committer
        uses: ./.github/actions/setup-git-committer
        with:
          opencode-app-id: ${{ vars.OPENCODE_APP_ID }}
          opencode-app-secret: ${{ secrets.OPENCODE_APP_SECRET }}
      - uses: apple-actions/import-codesign-certs@v2
        with:
          keychain: build
          p12-file-base64: ${{ secrets.APPLE_CERTIFICATE }}
          p12-password: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
      - name: Resolve signing identity
        run: |
          CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep "Developer ID Application")
          CERT_ID=$(echo "$CERT_INFO" | awk -F'"' '{print $2}')
          if [ -z "$CERT_ID" ]; then
            echo "Developer ID Application identity not found"
            exit 1
          fi
          echo "CERT_ID=$CERT_ID" >> $GITHUB_ENV
      - name: Build
        id: build
        run: |
          ./packages/opencode/script/build.ts
        env:
          OPENCODE_VERSION: ${{ needs.version.outputs.version }}
          OPENCODE_RELEASE: ${{ needs.version.outputs.release }}
          GH_REPO: ${{ needs.version.outputs.repo }}
          GH_TOKEN: ${{ steps.committer.outputs.token }}
          APPLE_SIGNING_IDENTITY: ${{ env.CERT_ID }}
          OPENCODE_BUILD_OS: darwin
          OPENCODE_SKIP_RELEASE_UPLOAD: "1"
      - name: Verify darwin signatures
        run: |
          for file in packages/opencode/dist/opencode-darwin-*/bin/opencode; do
            codesign -vvv --verify "$file"
          done
      - uses: actions/upload-artifact@v4
        with:
          name: opencode-cli-darwin
          path: packages/opencode/dist
    outputs:
      version: ${{ needs.version.outputs.version }}
  build-tauri:
    needs:
      - build-cli
      - version
    continue-on-error: false
    strategy:
@@ -248,7 +305,6 @@ jobs:
  build-electron:
    needs:
      - build-cli
      - version
    continue-on-error: false
    strategy:
@@ -372,7 +428,8 @@ jobs:
  publish:
    needs:
      - version
-      - build-cli
+      - build-cli-darwin
      - build-cli-linux-win
      - build-tauri
      - build-electron
    runs-on: blacksmith-4vcpu-ubuntu-2404
@@ -408,8 +465,9 @@ jobs:
      - uses: actions/download-artifact@v4
        with:
-          name: opencode-cli
+          pattern: opencode-cli-*
          path: packages/opencode/dist
          merge-multiple: true
      - uses: actions/download-artifact@v4
        if: needs.version.outputs.release
@@ -1,33 +0,0 @@
 name: 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"
@@ -33,6 +33,6 @@ jobs:
        with:
          issue-id: ${{ github.event.issue.number }}
          comment-id: ${{ github.event.comment.id }}
-          roles: admin,maintain
+          roles: admin,maintain,write
        env:
          GITHUB_TOKEN: ${{ steps.committer.outputs.token }}
@@ -0,0 +1,21 @@
 ---
 model: opencode/kimi-k2.5
 ---
 create UPCOMING_CHANGELOG.md
 it should have sections
 ```
 # TUI
 # Desktop
 # Core
 # Misc
 ```
 go through each PR merged since the last tag
 for each PR spawn a subagent to summarize what the PR was about. focus on user facing changes. if it was entirely internal or code related you can ignore it. also skip docs updates. each subagent should append its summary to UPCOMING_CHANGELOG.md into the appropriate section.
@@ -137,4 +137,4 @@ OpenCode 内置两种 Agent，可用 `Tab` 键快速切换：
 ---
-**加入我们的社区** [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=de8k6664-1b5e-43f2-8efd-21d6772647b5&qr_code=true) | [X.com](https://x.com/opencode)
+**加入我们的社区** [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=738j8655-cd59-4633-a30a-1124e0096789&qr_code=true) | [X.com](https://x.com/opencode)
@@ -137,4 +137,4 @@ OpenCode 內建了兩種 Agent，您可以使用 `Tab` 鍵快速切換。
 ---
-**加入我們的社群** [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=de8k6664-1b5e-43f2-8efd-21d6772647b5&qr_code=true) | [X.com](https://x.com/opencode)
+**加入我們的社群** [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=738j8655-cd59-4633-a30a-1124e0096789&qr_code=true) | [X.com](https://x.com/opencode)
@@ -26,7 +26,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -41,9 +41,11 @@
        "@solid-primitives/resize-observer": "2.1.3",
        "@solid-primitives/scroll": "2.1.3",
        "@solid-primitives/storage": "catalog:",
        "@solid-primitives/timer": "1.4.4",
        "@solid-primitives/websocket": "1.3.1",
        "@solidjs/meta": "catalog:",
        "@solidjs/router": "catalog:",
        "@tanstack/solid-query": "5.91.4",
        "@thisbeyond/solid-dnd": "0.7.5",
        "diff": "catalog:",
        "effect": "catalog:",
@@ -77,7 +79,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -111,7 +113,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -128,7 +130,7 @@
      "devDependencies": {
        "@cloudflare/workers-types": "catalog:",
        "@tsconfig/node22": "22.0.2",
-        "@types/bun": "1.3.0",
+        "@types/bun": "catalog:",
        "@types/node": "catalog:",
        "@typescript/native-preview": "catalog:",
        "drizzle-kit": "catalog:",
@@ -138,7 +140,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@ai-sdk/anthropic": "2.0.0",
        "@ai-sdk/openai": "2.0.2",
@@ -162,7 +164,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -186,7 +188,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -219,7 +221,7 @@
    },
    "packages/desktop-electron": {
      "name": "@opencode-ai/desktop-electron",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -250,7 +252,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@opencode-ai/util": "workspace:*",
@@ -279,7 +281,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -295,7 +297,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -336,8 +338,8 @@
        "@opencode-ai/sdk": "workspace:*",
        "@opencode-ai/util": "workspace:*",
        "@openrouter/ai-sdk-provider": "1.5.4",
-        "@opentui/core": "0.1.87",
+        "@opentui/core": "0.1.90",
-        "@opentui/solid": "0.1.87",
+        "@opentui/solid": "0.1.90",
        "@parcel/watcher": "2.5.1",
        "@pierre/diffs": "catalog:",
        "@solid-primitives/event-bus": "1.1.2",
@@ -356,7 +358,7 @@
        "drizzle-orm": "catalog:",
        "effect": "catalog:",
        "fuzzysort": "3.1.0",
-        "gitlab-ai-provider": "5.2.2",
+        "gitlab-ai-provider": "5.3.2",
        "glob": "13.0.5",
        "google-auth-library": "10.5.0",
        "gray-matter": "4.0.3",
@@ -368,6 +370,7 @@
        "minimatch": "10.0.3",
        "open": "10.1.2",
        "opencode-gitlab-auth": "2.0.0",
        "opencode-poe-auth": "0.0.1",
        "opentui-spinner": "0.0.6",
        "partial-json": "0.1.7",
        "remeda": "catalog:",
@@ -419,7 +422,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "zod": "catalog:",
@@ -443,7 +446,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "devDependencies": {
        "@hey-api/openapi-ts": "0.90.10",
        "@tsconfig/node22": "catalog:",
@@ -454,7 +457,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -489,7 +492,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -535,7 +538,7 @@
    },
    "packages/util": {
      "name": "@opencode-ai/util",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "zod": "catalog:",
      },
@@ -546,7 +549,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.2.27",
+      "version": "1.3.2",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -610,7 +613,7 @@
    "@tailwindcss/vite": "4.1.11",
    "@tsconfig/bun": "1.0.9",
    "@tsconfig/node22": "22.0.2",
-    "@types/bun": "1.3.9",
+    "@types/bun": "1.3.11",
    "@types/luxon": "3.7.1",
    "@types/node": "22.13.9",
    "@types/semver": "7.7.1",
@@ -1446,21 +1449,21 @@
    "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],
-    "@opentui/core": ["@opentui/core@0.1.87", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.87", "@opentui/core-darwin-x64": "0.1.87", "@opentui/core-linux-arm64": "0.1.87", "@opentui/core-linux-x64": "0.1.87", "@opentui/core-win32-arm64": "0.1.87", "@opentui/core-win32-x64": "0.1.87", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-dhsmMv0IqKftwG7J/pBrLBj2armsYIg5R3LBvciRQI/6X89GufP4l1u0+QTACAx6iR4SYJJNVNQ2tdX8LM9rMw=="],
+    "@opentui/core": ["@opentui/core@0.1.90", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.90", "@opentui/core-darwin-x64": "0.1.90", "@opentui/core-linux-arm64": "0.1.90", "@opentui/core-linux-x64": "0.1.90", "@opentui/core-win32-arm64": "0.1.90", "@opentui/core-win32-x64": "0.1.90", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-Os2dviqWVETU3kaK36lbSvdcI93GAWhw0xb9ng/d0DWYuM9scRmAhLHiOayp61saWv/BR8OJXeuQYHvrp5rd6A=="],
-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.87", "", { "os": "darwin", "cpu": "arm64" }, "sha512-G8oq85diOfkU6n0T1CxCle7oDmpKxwhcdhZ9khBMU5IrfLx9ZDuCM3F6MsiRQWdvPPCq2oomNbd64bYkPamYgw=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.90", "", { "os": "darwin", "cpu": "arm64" }, "sha512-XFrm2zCg1SlHPQ5A2HX/I4dCrmTjYaCJIIpo3QuPIvZBGH3aBMdWDJh2tXw7AB5Mmh8X1K4hDkP5nlK9x0Ewow=="],
-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.87", "", { "os": "darwin", "cpu": "x64" }, "sha512-MYTFQfOHm6qO7YaY4GHK9u/oJlXY6djaaxl5I+k4p2mk3vvuFIl/AP1ypITwBFjyV5gyp7PRWFp4nGfY9oN8bw=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.90", "", { "os": "darwin", "cpu": "x64" }, "sha512-vbDpUsnlZ+0CeVKyBBXE+l2+X1XoVncMxMOhXTiMtud2/Cwu+Vfs/g3LC/6Zv08yaytA+9g7Z8sdf0QCqFyQ4w=="],
-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.87", "", { "os": "linux", "cpu": "arm64" }, "sha512-he8o1h5M6oskRJ7wE+xKJgmWnv5ZwN6gB3M/Z+SeHtOMPa5cZmi3TefTjG54llEgFfx0F9RcqHof7TJ/GNxRkw=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.90", "", { "os": "linux", "cpu": "arm64" }, "sha512-OTbvBTP5mVQ4uwKyuz6b59ElG+D0i1Ln+q6cVhNkLgeRLySIn1uXEzUFQGlnVgb8lFDANsn3yQmdv+R+Cpw0og=="],
-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.87", "", { "os": "linux", "cpu": "x64" }, "sha512-aiUwjPlH4yDcB8/6YDKSmMkaoGAAltL0Xo0AzXyAtJXWK5tkCSaYjEVwzJ/rYRkr4Magnad+Mjth4AQUWdR2AA=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.90", "", { "os": "linux", "cpu": "x64" }, "sha512-2PJi/LLlO7tGk9Ful/n+6iBdg1RFrA9ibU7wVneE6Z1P0LCYeu7bpwMzea1TXL0eAQWPHsjTs9aPlqPxln0EJw=="],
-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.87", "", { "os": "win32", "cpu": "arm64" }, "sha512-cmP0pOyREjWGniHqbDmaMY7U+1AyagrD8VseJbU0cGpNgVpG2/gbrJUGdfdLB0SNb+mzLdx6SOjdxtrElwRCQA=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.90", "", { "os": "win32", "cpu": "arm64" }, "sha512-+sTRaOb7gCMZ6iLuuG4y9kzyweJzBDcIJN0Xh49ikFWTwVECDXEVtXahNGlw57avm2yYUoNzmpBjK/LV7zBj9A=="],
-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.87", "", { "os": "win32", "cpu": "x64" }, "sha512-N2GErAAP8iODf2RPp86pilPaVKiD6G4pkpZL5nLGbKsl0bndrVTpSqZcn8+/nQwFZDPD/AsiRTYNOfWOblhzOw=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.90", "", { "os": "win32", "cpu": "x64" }, "sha512-aVFyErckWp4oW9NJ/ZDKBUAlTlfVUiRXGP63JXFOoeqI7EYaM8uBt6rgZAJuUdFWCN2Q66WRS8Y2mk+0BJwVBg=="],
-    "@opentui/solid": ["@opentui/solid@0.1.87", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.87", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.9", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.9" } }, "sha512-lRT9t30l8+FtgOjjWJcdb2MT6hP8/RKqwGgYwTI7fXrOqdhxxwdP2SM+rH2l3suHeASheiTdlvPAo230iUcsvg=="],
+    "@opentui/solid": ["@opentui/solid@0.1.90", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.90", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.10", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.11" } }, "sha512-zEHDpJOTGS707ts5j4diqoWuFLSqV6yARKl1H0FJkwWOotu+rxCyksL+C0gX0jJUonAw2cjlZ2NNtZY8g78zkg=="],
    "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],
@@ -1888,6 +1891,8 @@
    "@solid-primitives/storage": ["@solid-primitives/storage@4.3.3", "", { "dependencies": { "@solid-primitives/utils": "^6.3.2" }, "peerDependencies": { "@tauri-apps/plugin-store": "*", "solid-js": "^1.6.12" }, "optionalPeers": ["@tauri-apps/plugin-store"] }, "sha512-ACbNwMZ1s8VAvld6EUXkDkX/US3IhtlPLxg6+B2s9MwNUugwdd51I98LPEaHrdLpqPmyzqgoJe0TxEFlf3Dqrw=="],
    "@solid-primitives/timer": ["@solid-primitives/timer@1.4.4", "", { "peerDependencies": { "solid-js": "^1.6.12" } }, "sha512-Ayjyb3+v1hyU92vuLUN0tVHq2mmTCPGxSDLGJMsDydRqx9ZfJIc9xj6cxK4XvdY3pif3ps2mIv52pjgToybEpQ=="],
    "@solid-primitives/trigger": ["@solid-primitives/trigger@1.2.3", "", { "dependencies": { "@solid-primitives/utils": "^6.4.0" }, "peerDependencies": { "solid-js": "^1.6.12" } }, "sha512-Za2JebEiDyfamjmDwRaESYqBBYOlgYGzB8kHYH0QrkXyLf2qNADlKdGN+z3vWSLCTDcKxChS43Kssjuc0OZhng=="],
    "@solid-primitives/utils": ["@solid-primitives/utils@6.4.0", "", { "peerDependencies": { "solid-js": "^1.6.12" } }, "sha512-AeGTBg8Wtkh/0s+evyLtP8piQoS4wyqqQaAFs2HJcFMMjYAtUgo+ZPduRXLjPlqKVc2ejeR544oeqpbn8Egn8A=="],
@@ -1966,10 +1971,14 @@
    "@tanstack/directive-functions-plugin": ["@tanstack/directive-functions-plugin@1.134.5", "", { "dependencies": { "@babel/code-frame": "7.27.1", "@babel/core": "^7.27.7", "@babel/traverse": "^7.27.7", "@babel/types": "^7.27.7", "@tanstack/router-utils": "1.133.19", "babel-dead-code-elimination": "^1.0.10", "pathe": "^2.0.3", "tiny-invariant": "^1.3.3" }, "peerDependencies": { "vite": ">=6.0.0 || >=7.0.0" } }, "sha512-J3oawV8uBRBbPoLgMdyHt+LxzTNuWRKNJJuCLWsm/yq6v0IQSvIVCgfD2+liIiSnDPxGZ8ExduPXy8IzS70eXw=="],
    "@tanstack/query-core": ["@tanstack/query-core@5.91.2", "", {}, "sha512-Uz2pTgPC1mhqrrSGg18RKCWT/pkduAYtxbcyIyKBhw7dTWjXZIzqmpzO2lBkyWr4hlImQgpu1m1pei3UnkFRWw=="],
    "@tanstack/router-utils": ["@tanstack/router-utils@1.133.19", "", { "dependencies": { "@babel/core": "^7.27.4", "@babel/generator": "^7.27.5", "@babel/parser": "^7.27.5", "@babel/preset-typescript": "^7.27.1", "ansis": "^4.1.0", "diff": "^8.0.2", "pathe": "^2.0.3", "tinyglobby": "^0.2.15" } }, "sha512-WEp5D2gPxvlLDRXwD/fV7RXjYtqaqJNXKB/L6OyZEbT+9BG/Ib2d7oG9GSUZNNMGPGYAlhBUOi3xutySsk6rxA=="],
    "@tanstack/server-functions-plugin": ["@tanstack/server-functions-plugin@1.134.5", "", { "dependencies": { "@babel/code-frame": "7.27.1", "@babel/core": "^7.27.7", "@babel/plugin-syntax-jsx": "^7.27.1", "@babel/plugin-syntax-typescript": "^7.27.1", "@babel/template": "^7.27.2", "@babel/traverse": "^7.27.7", "@babel/types": "^7.27.7", "@tanstack/directive-functions-plugin": "1.134.5", "babel-dead-code-elimination": "^1.0.9", "tiny-invariant": "^1.3.3" } }, "sha512-2sWxq70T+dOEUlE3sHlXjEPhaFZfdPYlWTSkHchWXrFGw2YOAa+hzD6L9wHMjGDQezYd03ue8tQlHG+9Jzbzgw=="],
    "@tanstack/solid-query": ["@tanstack/solid-query@5.91.4", "", { "dependencies": { "@tanstack/query-core": "5.91.2" }, "peerDependencies": { "solid-js": "^1.6.0" } }, "sha512-oCEgn8iT7WnF/7ISd7usBpUK1C9EdvQfg8ZUpKNKZ4edVClICZrCX6f3/Bp8ZlwQnL21KLc2rp+CejEuehlRxg=="],
    "@tauri-apps/api": ["@tauri-apps/api@2.10.1", "", {}, "sha512-hKL/jWf293UDSUN09rR69hrToyIXBb8CjGaWC7gfinvnQrBVvnLr08FeFi38gxtugAVyVcTa5/FD/Xnkb1siBw=="],
    "@tauri-apps/cli": ["@tauri-apps/cli@2.10.1", "", { "optionalDependencies": { "@tauri-apps/cli-darwin-arm64": "2.10.1", "@tauri-apps/cli-darwin-x64": "2.10.1", "@tauri-apps/cli-linux-arm-gnueabihf": "2.10.1", "@tauri-apps/cli-linux-arm64-gnu": "2.10.1", "@tauri-apps/cli-linux-arm64-musl": "2.10.1", "@tauri-apps/cli-linux-riscv64-gnu": "2.10.1", "@tauri-apps/cli-linux-x64-gnu": "2.10.1", "@tauri-apps/cli-linux-x64-musl": "2.10.1", "@tauri-apps/cli-win32-arm64-msvc": "2.10.1", "@tauri-apps/cli-win32-ia32-msvc": "2.10.1", "@tauri-apps/cli-win32-x64-msvc": "2.10.1" }, "bin": { "tauri": "tauri.js" } }, "sha512-jQNGF/5quwORdZSSLtTluyKQ+o6SMa/AUICfhf4egCGFdMHqWssApVgYSbg+jmrZoc8e1DscNvjTnXtlHLS11g=="],
@@ -2052,7 +2061,7 @@
    "@types/braces": ["@types/braces@3.0.5", "", {}, "sha512-SQFof9H+LXeWNz8wDe7oN5zu7ket0qwMu5vZubW4GCJ8Kkeh6nBWUz87+KTz/G3Kqsrp0j/W253XJb3KMEeg3w=="],
-    "@types/bun": ["@types/bun@1.3.9", "", { "dependencies": { "bun-types": "1.3.9" } }, "sha512-KQ571yULOdWJiMH+RIWIOZ7B2RXQGpL1YQrBtLIV3FqDcCu6FsbFUBwhdKUlCKUpS3PJDsHlJ1QKlpxoVR+xtw=="],
+    "@types/bun": ["@types/bun@1.3.11", "", { "dependencies": { "bun-types": "1.3.11" } }, "sha512-5vPne5QvtpjGpsGYXiFyycfpDF2ECyPcTSsFBMa0fraoxiQyMJ3SmuQIGhzPg2WJuWxVBoxWJ2kClYTcw/4fAg=="],
    "@types/cacheable-request": ["@types/cacheable-request@6.0.3", "", { "dependencies": { "@types/http-cache-semantics": "*", "@types/keyv": "^3.1.4", "@types/node": "*", "@types/responselike": "^1.0.0" } }, "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="],
@@ -2448,7 +2457,7 @@
    "bun-pty": ["bun-pty@0.4.8", "", {}, "sha512-rO70Mrbr13+jxHHHu2YBkk2pNqrJE5cJn29WE++PUr+GFA0hq/VgtQPZANJ8dJo6d7XImvBk37Innt8GM7O28w=="],
-    "bun-types": ["bun-types@1.3.9", "", { "dependencies": { "@types/node": "*" } }, "sha512-+UBWWOakIP4Tswh0Bt0QD0alpTY8cb5hvgiYeWCMet9YukHbzuruIEeXC2D7nMJPB12kbh8C7XJykSexEqGKJg=="],
+    "bun-types": ["bun-types@1.3.11", "", { "dependencies": { "@types/node": "*" } }, "sha512-1KGPpoxQWl9f6wcZh57LvrPIInQMn2TQ7jsgxqpRzg+l0QPOFvJVH7HmvHo/AiPgwXy+/Thf6Ov3EdVn1vOabg=="],
    "bun-webgpu": ["bun-webgpu@0.1.5", "", { "dependencies": { "@webgpu/types": "^0.1.60" }, "optionalDependencies": { "bun-webgpu-darwin-arm64": "^0.1.5", "bun-webgpu-darwin-x64": "^0.1.5", "bun-webgpu-linux-x64": "^0.1.5", "bun-webgpu-win32-x64": "^0.1.5" } }, "sha512-91/K6S5whZKX7CWAm9AylhyKrLGRz6BUiiPiM/kXadSnD4rffljCD/q9cNFftm5YXhx4MvLqw33yEilxogJvwA=="],
@@ -3028,7 +3037,7 @@
    "github-slugger": ["github-slugger@2.0.0", "", {}, "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw=="],
-    "gitlab-ai-provider": ["gitlab-ai-provider@5.2.2", "", { "dependencies": { "@anthropic-ai/sdk": "^0.71.0", "@anycable/core": "^0.9.2", "graphql-request": "^6.1.0", "isomorphic-ws": "^5.0.0", "openai": "^6.16.0", "socket.io-client": "^4.8.1", "vscode-jsonrpc": "^8.2.1", "zod": "^3.25.76" }, "peerDependencies": { "@ai-sdk/provider": ">=2.0.0", "@ai-sdk/provider-utils": ">=3.0.0" } }, "sha512-ejwnie62rimfVHbjYZ2tsnqwLjF9YLgXD3OQA458gHz8hUvw7vEnhuyuMv5PmWQtyS3ISAghiX7r5SBhUWeCTA=="],
+    "gitlab-ai-provider": ["gitlab-ai-provider@5.3.2", "", { "dependencies": { "@anthropic-ai/sdk": "^0.71.0", "@anycable/core": "^0.9.2", "graphql-request": "^6.1.0", "isomorphic-ws": "^5.0.0", "openai": "^6.16.0", "socket.io-client": "^4.8.1", "vscode-jsonrpc": "^8.2.1", "zod": "^3.25.76" }, "peerDependencies": { "@ai-sdk/provider": ">=2.0.0", "@ai-sdk/provider-utils": ">=3.0.0" } }, "sha512-EiAipDMa4Ngsxp4MMaua5YHWsHhc9kGXKmBxulJg1Gueb+5IZmMwxaVtgWTGWZITxC3tzKEeRt/3U4McE2vTIA=="],
    "glob": ["glob@13.0.5", "", { "dependencies": { "minimatch": "^10.2.1", "minipass": "^7.1.2", "path-scurry": "^2.0.0" } }, "sha512-BzXxZg24Ibra1pbQ/zE7Kys4Ua1ks7Bn6pKLkVPZ9FZe4JQS6/Q7ef3LG1H+k7lUf5l4T3PLSyYyYJVYUvfgTw=="],
@@ -3784,6 +3793,8 @@
    "opencode-gitlab-auth": ["opencode-gitlab-auth@2.0.0", "", { "dependencies": { "@fastify/rate-limit": "^10.2.0", "@opencode-ai/plugin": "*", "fastify": "^5.2.0", "open": "^10.0.0" } }, "sha512-jmZOOvYIurRScQCtdBqIW5HbP1JbmIiq7UtI7NGgn2vjke46g9d4NVPBg5/ZmFFVIBwZcgyFgJ7b8kGEOR9ujA=="],
    "opencode-poe-auth": ["opencode-poe-auth@0.0.1", "", { "dependencies": { "open": "^10.0.0", "poe-oauth": "*" }, "peerDependencies": { "@opencode-ai/plugin": "*" } }, "sha512-cXqTlS6AXHzo1oBdosnxbT47ZJEZ9WXn050X8Re6wZ1vaNnTpB/l2fMQt90evT7RBK0fB8UjXQUDMKyd7bbiqg=="],
    "opencontrol": ["opencontrol@0.0.6", "", { "dependencies": { "@modelcontextprotocol/sdk": "1.6.1", "@tsconfig/bun": "1.0.7", "hono": "4.7.4", "zod": "3.24.2", "zod-to-json-schema": "3.24.3" }, "bin": { "opencontrol": "bin/index.mjs" } }, "sha512-QeCrpOK5D15QV8kjnGVeD/BHFLwcVr+sn4T6KKmP0WAMs2pww56e4h+eOGHb5iPOufUQXbdbBKi6WV2kk7tefQ=="],
    "openid-client": ["openid-client@5.6.4", "", { "dependencies": { "jose": "^4.15.4", "lru-cache": "^6.0.0", "object-hash": "^2.2.0", "oidc-token-hash": "^5.0.3" } }, "sha512-T1h3B10BRPKfcObdBklX639tVz+xh34O7GjofqrqiAQdm7eHsQ00ih18x6wuJ/E6FxdtS2u3FmUGPDeEcMwzNA=="],
@@ -3916,6 +3927,8 @@
    "pngjs": ["pngjs@7.0.0", "", {}, "sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow=="],
    "poe-oauth": ["poe-oauth@0.0.3", "", {}, "sha512-KgxDylcuq/mov8URSplrBGjrIjkQwjN/Ml8BhqaGsAvHzYN3yhuROdv1sDRfwqncg7TT8XzJvMeJAWmv/4NDLw=="],
    "possible-typed-array-names": ["possible-typed-array-names@1.1.0", "", {}, "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg=="],
    "postcss": ["postcss@8.5.8", "", { "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg=="],
@@ -5198,8 +5211,6 @@
    "@opentui/solid/@babel/core": ["@babel/core@7.28.0", "", { "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.0", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", "@babel/helpers": "^7.27.6", "@babel/parser": "^7.28.0", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.0", "@babel/types": "^7.28.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ=="],
    "@opentui/solid/babel-preset-solid": ["babel-preset-solid@1.9.9", "", { "dependencies": { "babel-plugin-jsx-dom-expressions": "^0.40.1" }, "peerDependencies": { "@babel/core": "^7.0.0", "solid-js": "^1.9.8" }, "optionalPeers": ["solid-js"] }, "sha512-pCnxWrciluXCeli/dj5PIEHgbNzim3evtTn12snjqqg8QZWJNMjH1AWIp4iG/tbVjqQ72aBEymMSagvmgxubXw=="],
    "@oslojs/jwt/@oslojs/encoding": ["@oslojs/encoding@0.4.1", "", {}, "sha512-hkjo6MuIK/kQR5CrGNdAPZhS01ZCXuWDRJ187zh6qqF2+yMHZpD9fAYpX8q2bOO6Ryhl3XpCT6kUX76N8hhm4Q=="],
    "@pierre/diffs/@shikijs/transformers": ["@shikijs/transformers@3.20.0", "", { "dependencies": { "@shikijs/core": "3.20.0", "@shikijs/types": "3.20.0" } }, "sha512-PrHHMRr3Q5W1qB/42kJW6laqFyWdhrPF2hNR9qjOm1xcSiAO3hAHo7HaVyHE6pMyevmy3i51O8kuGGXC78uK3g=="],
@@ -5538,6 +5549,8 @@
    "opencode-gitlab-auth/open": ["open@10.2.0", "", { "dependencies": { "default-browser": "^5.2.1", "define-lazy-prop": "^3.0.0", "is-inside-container": "^1.0.0", "wsl-utils": "^0.1.0" } }, "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA=="],
    "opencode-poe-auth/open": ["open@10.2.0", "", { "dependencies": { "default-browser": "^5.2.1", "define-lazy-prop": "^3.0.0", "is-inside-container": "^1.0.0", "wsl-utils": "^0.1.0" } }, "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA=="],
    "opencontrol/@modelcontextprotocol/sdk": ["@modelcontextprotocol/sdk@1.6.1", "", { "dependencies": { "content-type": "^1.0.5", "cors": "^2.8.5", "eventsource": "^3.0.2", "express": "^5.0.1", "express-rate-limit": "^7.5.0", "pkce-challenge": "^4.1.0", "raw-body": "^3.0.0", "zod": "^3.23.8", "zod-to-json-schema": "^3.24.1" } }, "sha512-oxzMzYCkZHMntzuyerehK3fV6A2Kwh5BD6CGEJSVDU2QNEhfLOptf2X7esQgaHZXHZY0oHmMsOtIDLP71UJXgA=="],
    "opencontrol/@tsconfig/bun": ["@tsconfig/bun@1.0.7", "", {}, "sha512-udGrGJBNQdXGVulehc1aWT73wkR9wdaGBtB6yL70RJsqwW/yJhIg6ZbRlPOfIUiFNrnBuYLBi9CSmMKfDC7dvA=="],
@@ -6290,6 +6303,8 @@
    "opencode-gitlab-auth/open/wsl-utils": ["wsl-utils@0.1.0", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="],
    "opencode-poe-auth/open/wsl-utils": ["wsl-utils@0.1.0", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="],
    "opencode/@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="],
    "opencode/@ai-sdk/openai-compatible/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="],
@@ -2,11 +2,11 @@
  "nodes": {
    "nixpkgs": {
      "locked": {
-        "lastModified": 1772091128,
+        "lastModified": 1773909469,
-        "narHash": "sha256-TnrYykX8Mf/Ugtkix6V+PjW7miU2yClA6uqWl/v6KWM=",
+        "narHash": "sha256-vglVrLfHjFIzIdV9A27Ugul6rh3I1qHbbitGW7dk420=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "3f0336406035444b4a24b942788334af5f906259",
+        "rev": "7149c06513f335be57f26fcbbbe34afda923882b",
        "type": "github"
      },
      "original": {
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-P0RJfQF8APTYVGP6hLJRrOkRSl5nVDNxdcGcZECPPJE=",
+    "x86_64-linux": "sha256-MmN2+NfHeLPDClpLPOlCAZTmwI94M6XgNAqXrW5Ls4I=",
-    "aarch64-linux": "sha256-ZtMjTcd35X3JhJIdn3DilFsp7i/IZIcNaKZFnSzW/nk=",
+    "aarch64-linux": "sha256-whVIlmDvoMmEMUY2Yxx2vAmFDuKQic6ChY1V+9gLd84=",
-    "aarch64-darwin": "sha256-Uw/okFDRxxKQMfEsj8MXuHyhpugxZGgIKtu89Getlz8=",
+    "aarch64-darwin": "sha256-TulGiC24w3usk26hKr3PyccatvIfmAlHgEJaOTUf3pQ=",
-    "x86_64-darwin": "sha256-ZySIgT1HbWZWnaQ0W0eURKC43BTupRmmply92JDFPWA="
+    "x86_64-darwin": "sha256-T8NWm0bBybJKThRdp/jQdxilv1Ec9SF1iVT3udSoZOg="
  }
 }
@@ -4,7 +4,7 @@
  "description": "AI-powered development tool",
  "private": true,
  "type": "module",
-  "packageManager": "bun@1.3.10",
+  "packageManager": "bun@1.3.11",
  "scripts": {
    "dev": "bun run --cwd packages/opencode --conditions=browser src/index.ts",
    "dev:desktop": "bun --cwd packages/desktop tauri dev",
@@ -26,7 +26,7 @@
    ],
    "catalog": {
      "@effect/platform-node": "4.0.0-beta.35",
-      "@types/bun": "1.3.9",
+      "@types/bun": "1.3.11",
      "@octokit/rest": "22.0.0",
      "@hono/zod-validator": "0.4.2",
      "ulid": "3.0.1",
@@ -175,9 +175,9 @@ export async function runTerminal(page: Page, input: { cmd: string; token: strin
  await expect.poll(() => terminalHas(page, { term, token: input.token }), { timeout }).toBe(true)
 }
-export async function openPalette(page: Page) {
+export async function openPalette(page: Page, key = "K") {
  await defocus(page)
-  await page.keyboard.press(`${modKey}+P`)
+  await page.keyboard.press(`${modKey}+${key}`)
  const dialog = page.getByRole("dialog")
  await expect(dialog).toBeVisible()
@@ -1,5 +1,5 @@
 import { test, expect } from "../fixtures"
-import { openPalette } from "../actions"
+import { closeDialog, openPalette } from "../actions"
 test("search palette opens and closes", async ({ page, gotoSession }) => {
  await gotoSession()
@@ -9,3 +9,12 @@ test("search palette opens and closes", async ({ page, gotoSession }) => {
  await page.keyboard.press("Escape")
  await expect(dialog).toHaveCount(0)
 })
 test("search palette also opens with cmd+p", async ({ page, gotoSession }) => {
  await gotoSession()
  const dialog = await openPalette(page, "P")
  await closeDialog(page, dialog)
  await expect(dialog).toHaveCount(0)
 })
@@ -108,7 +108,10 @@ test("prompt history restores unsent draft with arrow navigation", async ({ page
    await page.keyboard.type(draft)
    await wait(page, draft)
-    await edge(page, "start")
+    // Clear the draft before navigating history (ArrowUp only works when prompt is empty)
    await prompt.fill("")
    await wait(page, "")
    await page.keyboard.press("ArrowUp")
    await wait(page, second)
@@ -119,7 +122,7 @@ test("prompt history restores unsent draft with arrow navigation", async ({ page
    await wait(page, second)
    await page.keyboard.press("ArrowDown")
-    await wait(page, draft)
+    await wait(page, "")
  })
 })
@@ -241,7 +241,7 @@ test("changing file open keybind works", async ({ page, gotoSession }) => {
  await expect(keybindButton).toBeVisible()
  const initialKeybind = await keybindButton.textContent()
-  expect(initialKeybind).toContain("P")
+  expect(initialKeybind).toContain("K")
  await keybindButton.click()
  await expect(keybindButton).toHaveText(/press/i)
@@ -1,6 +1,16 @@
 import { test, expect } from "../fixtures"
-import { cleanupSession, closeSidebar, hoverSessionItem } from "../actions"
+import {
  defocus,
  cleanupSession,
  cleanupTestProject,
  closeSidebar,
  createTestProject,
  hoverSessionItem,
  openSidebar,
  waitSession,
 } from "../actions"
 import { projectSwitchSelector } from "../selectors"
 import { dirSlug } from "../utils"
 test("collapsed sidebar popover stays open when archiving a session", async ({ page, slug, sdk, gotoSession }) => {
  const stamp = Date.now()
@@ -37,3 +47,72 @@ test("collapsed sidebar popover stays open when archiving a session", async ({ p
    await cleanupSession({ sdk, sessionID: two.id })
  }
 })
 test("open sidebar project popover stays closed after clicking avatar", async ({ page, withProject }) => {
  await page.setViewportSize({ width: 1400, height: 800 })
  const other = await createTestProject()
  const slug = dirSlug(other)
  try {
    await withProject(
      async () => {
        await openSidebar(page)
        const project = page.locator(projectSwitchSelector(slug)).first()
        const card = page.locator('[data-component="hover-card-content"]')
        await expect(project).toBeVisible()
        await project.hover()
        await expect(card.getByText(/recent sessions/i)).toBeVisible()
        await page.mouse.down()
        await expect(card).toHaveCount(0)
        await page.mouse.up()
        await waitSession(page, { directory: other })
        await expect(card).toHaveCount(0)
      },
      { extra: [other] },
    )
  } finally {
    await cleanupTestProject(other)
  }
 })
 test("open sidebar project switch activates on first tabbed enter", async ({ page, withProject }) => {
  await page.setViewportSize({ width: 1400, height: 800 })
  const other = await createTestProject()
  const slug = dirSlug(other)
  try {
    await withProject(
      async () => {
        await openSidebar(page)
        await defocus(page)
        const project = page.locator(projectSwitchSelector(slug)).first()
        await expect(project).toBeVisible()
        let hit = false
        for (let i = 0; i < 20; i++) {
          hit = await project.evaluate((el) => {
            return el.matches(":focus") || !!el.parentElement?.matches(":focus")
          })
          if (hit) break
          await page.keyboard.press("Tab")
        }
        expect(hit).toBe(true)
        await page.keyboard.press("Enter")
        await waitSession(page, { directory: other })
      },
      { extra: [other] },
    )
  } finally {
    await cleanupTestProject(other)
  }
 })
@@ -1,7 +1,7 @@
 import type { Page } from "@playwright/test"
 import { runTerminal, waitTerminalReady } from "../actions"
 import { test, expect } from "../fixtures"
-import { terminalSelector } from "../selectors"
+import { dropdownMenuContentSelector, terminalSelector } from "../selectors"
 import { terminalToggleKey, workspacePersistKey } from "../utils"
 type State = {
@@ -130,3 +130,39 @@ test("closing the active terminal tab falls back to the previous tab", async ({
      .toEqual({ count: 1, first: true })
  })
 })
 test("terminal tab can be renamed from the context menu", async ({ page, withProject }) => {
  await withProject(async ({ directory, gotoSession }) => {
    const key = workspacePersistKey(directory, "terminal")
    const rename = `E2E term ${Date.now()}`
    const tab = page.locator('#terminal-panel [data-slot="tabs-trigger"]').first()
    await gotoSession()
    await open(page)
    await expect(tab).toContainText(/Terminal 1/)
    await tab.click({ button: "right" })
    const menu = page.locator(dropdownMenuContentSelector).first()
    await expect(menu).toBeVisible()
    await menu.getByRole("menuitem", { name: /^Rename$/i }).click()
    await expect(menu).toHaveCount(0)
    const input = page.locator('#terminal-panel input[type="text"]').first()
    await expect(input).toBeVisible()
    await input.fill(rename)
    await input.press("Enter")
    await expect(input).toHaveCount(0)
    await expect(tab).toContainText(rename)
    await expect
      .poll(
        async () => {
          const state = await store(page, key)
          return state?.all[0]?.title
        },
        { timeout: 5_000 },
      )
      .toBe(rename)
  })
 })
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.2.27",
+  "version": "1.3.2",
  "description": "",
  "type": "module",
  "exports": {
@@ -51,9 +51,11 @@
    "@solid-primitives/resize-observer": "2.1.3",
    "@solid-primitives/scroll": "2.1.3",
    "@solid-primitives/storage": "catalog:",
    "@solid-primitives/timer": "1.4.4",
    "@solid-primitives/websocket": "1.3.1",
    "@solidjs/meta": "catalog:",
    "@solidjs/router": "catalog:",
    "@tanstack/solid-query": "5.91.4",
    "@thisbeyond/solid-dnd": "0.7.5",
    "diff": "catalog:",
    "effect": "catalog:",
@@ -9,6 +9,7 @@ import { Splash } from "@opencode-ai/ui/logo"
 import { ThemeProvider } from "@opencode-ai/ui/theme"
 import { MetaProvider } from "@solidjs/meta"
 import { type BaseRouterProps, Navigate, Route, Router } from "@solidjs/router"
 import { QueryClient, QueryClientProvider } from "@tanstack/solid-query"
 import { type Duration, Effect } from "effect"
 import {
  type Component,
@@ -81,6 +82,11 @@ function MarkedProviderWithNativeParser(props: ParentProps) {
  return <MarkedProvider nativeParser={platform.parseMarkdown}>{props.children}</MarkedProvider>
 }
 function QueryProvider(props: ParentProps) {
  const client = new QueryClient()
  return <QueryClientProvider client={client}>{props.children}</QueryClientProvider>
 }
 function AppShellProviders(props: ParentProps) {
  return (
    <SettingsProvider>
@@ -136,11 +142,13 @@ export function AppBaseProviders(props: ParentProps) {
        <LanguageProvider>
          <UiI18nBridge>
            <ErrorBoundary fallback={(error) => <ErrorPage error={error} />}>
              <QueryProvider>
                <DialogProvider>
                  <MarkedProviderWithNativeParser>
                    <FileComponentProvider component={File}>{props.children}</FileComponentProvider>
                  </MarkedProviderWithNativeParser>
                </DialogProvider>
              </QueryProvider>
            </ErrorBoundary>
          </UiI18nBridge>
        </LanguageProvider>
@@ -55,7 +55,7 @@ function Cell(props: { bad?: boolean; dim?: boolean; label: string; tip: string;
    <Tooltip value={props.tip} placement="top">
      <div
        classList={{
-          "flex min-h-[42px] w-full min-w-0 flex-col items-center justify-center rounded-[8px] bg-white/5 px-0.5 py-1 text-center": true,
+          "flex min-h-[42px] w-full min-w-0 flex-col items-center justify-center rounded-[8px] px-0.5 py-1 text-center": true,
          "col-span-2": !!props.wide,
        }}
      >
@@ -363,11 +363,7 @@ export function DebugBar() {
  return (
    <aside
      aria-label={language.t("debugBar.ariaLabel")}
-      class="pointer-events-auto fixed bottom-3 right-3 z-50 w-[308px] max-w-[calc(100vw-1.5rem)] overflow-hidden rounded-xl border p-0.5 text-text-on-interactive-base shadow-[var(--shadow-lg-border-base)] sm:bottom-4 sm:right-4 sm:w-[324px]"
+      class="pointer-events-auto fixed bottom-3 right-3 z-50 w-[308px] max-w-[calc(100vw-1.5rem)] overflow-hidden rounded-xl border border-border-base bg-surface-raised-stronger-non-alpha p-0.5 text-text-strong shadow-[var(--shadow-lg-border-base)] sm:bottom-4 sm:right-4 sm:w-[324px]"
      style={{
        "background-color": "color-mix(in srgb, var(--icon-interactive-base) 42%, black)",
        "border-color": "color-mix(in srgb, white 14%, transparent)",
      }}
    >
      <div class="grid grid-cols-5 gap-px font-mono">
        <Cell
@@ -12,10 +12,9 @@ import { showToast } from "@opencode-ai/ui/toast"
 import { createMemo, Match, onCleanup, onMount, Switch } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { Link } from "@/components/link"
 import { useLanguage } from "@/context/language"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { useGlobalSync } from "@/context/global-sync"
-import { DialogSelectModel } from "./dialog-select-model"
+import { useLanguage } from "@/context/language"
 import { DialogSelectProvider } from "./dialog-select-provider"
 export function DialogConnectProvider(props: { provider: string }) {
@@ -34,7 +34,6 @@ export type FormState = {
  apiKey: string
  models: ModelRow[]
  headers: HeaderRow[]
  saving: boolean
  err: {
    providerID?: string
    name?: string
@@ -16,7 +16,6 @@ describe("validateCustomProvider", () => {
          { row: "h0", key: " X-Test ", value: " enabled ", err: {} },
          { row: "h1", key: "", value: "", err: {} },
        ],
        saving: false,
        err: {},
      },
      t,
@@ -60,7 +59,6 @@ describe("validateCustomProvider", () => {
          { row: "h0", key: "Authorization", value: "one", err: {} },
          { row: "h1", key: "authorization", value: "two", err: {} },
        ],
        saving: false,
        err: {},
      },
      t,
@@ -3,6 +3,7 @@ import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { useMutation } from "@tanstack/solid-query"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { showToast } from "@opencode-ai/ui/toast"
 import { batch, For } from "solid-js"
@@ -31,7 +32,6 @@ export function DialogCustomProvider(props: Props) {
    apiKey: "",
    models: [modelRow()],
    headers: [headerRow()],
    saving: false,
    err: {},
  })
@@ -116,33 +116,28 @@ export function DialogCustomProvider(props: Props) {
    return output.result
  }
-  const save = async (e: SubmitEvent) => {
+  const saveMutation = useMutation(() => ({
-    e.preventDefault()
+    mutationFn: async (result: NonNullable<ReturnType<typeof validate>>) => {
    if (form.saving) return
    const result = validate()
    if (!result) return
    setForm("saving", true)
      const disabledProviders = globalSync.data.config.disabled_providers ?? []
      const nextDisabled = disabledProviders.filter((id) => id !== result.providerID)
-    const auth = result.key
+      if (result.key) {
-      ? globalSDK.client.auth.set({
+        await globalSDK.client.auth.set({
          providerID: result.providerID,
          auth: {
            type: "api",
            key: result.key,
          },
        })
-      : Promise.resolve()
+      }
-    auth
+      await globalSync.updateConfig({
-      .then(() =>
+        provider: { [result.providerID]: result.config },
-        globalSync.updateConfig({ provider: { [result.providerID]: result.config }, disabled_providers: nextDisabled }),
+        disabled_providers: nextDisabled,
-      )
+      })
-      .then(() => {
+      return result
    },
    onSuccess: (result) => {
      dialog.close()
      showToast({
        variant: "success",
@@ -150,14 +145,20 @@ export function DialogCustomProvider(props: Props) {
        title: language.t("provider.connect.toast.connected.title", { provider: result.name }),
        description: language.t("provider.connect.toast.connected.description", { provider: result.name }),
      })
-      })
+    },
-      .catch((err: unknown) => {
+    onError: (err) => {
      const message = err instanceof Error ? err.message : String(err)
      showToast({ title: language.t("common.requestFailed"), description: message })
-      })
+    },
-      .finally(() => {
+  }))
-        setForm("saving", false)
+
-      })
+  const save = (e: SubmitEvent) => {
    e.preventDefault()
    if (saveMutation.isPending) return
    const result = validate()
    if (!result) return
    saveMutation.mutate(result)
  }
  return (
@@ -312,8 +313,14 @@ export function DialogCustomProvider(props: Props) {
            </Button>
          </div>
-          <Button class="w-auto self-start" type="submit" size="large" variant="primary" disabled={form.saving}>
+          <Button
-            {form.saving ? language.t("common.saving") : language.t("common.submit")}
+            class="w-auto self-start"
            type="submit"
            size="large"
            variant="primary"
            disabled={saveMutation.isPending}
          >
            {saveMutation.isPending ? language.t("common.saving") : language.t("common.submit")}
          </Button>
        </form>
      </div>
@@ -2,6 +2,7 @@ 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 { useMutation } from "@tanstack/solid-query"
 import { Icon } from "@opencode-ai/ui/icon"
 import { createMemo, For, Show } from "solid-js"
 import { createStore } from "solid-js/store"
@@ -28,7 +29,6 @@ export function DialogEditProject(props: { project: LocalProject }) {
    color: props.project.icon?.color || "pink",
    iconUrl: props.project.icon?.override || "",
    startup: props.project.commands?.start ?? "",
    saving: false,
    dragOver: false,
    iconHover: false,
  })
@@ -71,12 +71,8 @@ export function DialogEditProject(props: { project: LocalProject }) {
    setStore("iconUrl", "")
  }
-  async function handleSubmit(e: SubmitEvent) {
+  const saveMutation = useMutation(() => ({
-    e.preventDefault()
+    mutationFn: async () => {
    await Promise.resolve()
      .then(async () => {
        setStore("saving", true)
      const name = store.name.trim() === folderName() ? "" : store.name.trim()
      const start = store.startup.trim()
@@ -99,10 +95,13 @@ export function DialogEditProject(props: { project: LocalProject }) {
        commands: { start: start || undefined },
      })
      dialog.close()
-      })
+    },
-      .finally(() => {
+  }))
-        setStore("saving", false)
+
-      })
+  function handleSubmit(e: SubmitEvent) {
    e.preventDefault()
    if (saveMutation.isPending) return
    saveMutation.mutate()
  }
  return (
@@ -246,8 +245,8 @@ export function DialogEditProject(props: { project: LocalProject }) {
          <Button type="button" variant="ghost" size="large" onClick={() => dialog.close()}>
            {language.t("common.cancel")}
          </Button>
-          <Button type="submit" variant="primary" size="large" disabled={store.saving}>
+          <Button type="submit" variant="primary" size="large" disabled={saveMutation.isPending}>
-            {store.saving ? language.t("common.saving") : language.t("common.save")}
+            {saveMutation.isPending ? language.t("common.saving") : language.t("common.save")}
          </Button>
        </div>
      </form>
@@ -1,4 +1,5 @@
-import { Component, createMemo, createSignal, Show } from "solid-js"
+import { useMutation } from "@tanstack/solid-query"
 import { Component, createMemo, Show } from "solid-js"
 import { useSync } from "@/context/sync"
 import { useSDK } from "@/context/sdk"
 import { Dialog } from "@opencode-ai/ui/dialog"
@@ -17,7 +18,6 @@ export const DialogSelectMcp: Component = () => {
  const sync = useSync()
  const sdk = useSDK()
  const language = useLanguage()
  const [loading, setLoading] = createSignal<string | null>(null)
  const items = createMemo(() =>
    Object.entries(sync.data.mcp ?? {})
@@ -25,10 +25,8 @@ export const DialogSelectMcp: Component = () => {
      .sort((a, b) => a.name.localeCompare(b.name)),
  )
-  const toggle = async (name: string) => {
+  const toggle = useMutation(() => ({
-    if (loading()) return
+    mutationFn: async (name: string) => {
    setLoading(name)
    try {
      const status = sync.data.mcp[name]
      if (status?.status === "connected") {
        await sdk.client.mcp.disconnect({ name })
@@ -38,10 +36,8 @@ export const DialogSelectMcp: Component = () => {
      const result = await sdk.client.mcp.status()
      if (result.data) sync.set("mcp", result.data)
-    } finally {
+    },
-      setLoading(null)
+  }))
    }
  }
  const enabledCount = createMemo(() => items().filter((i) => i.status === "connected").length)
  const totalCount = createMemo(() => items().length)
@@ -59,7 +55,8 @@ export const DialogSelectMcp: Component = () => {
        filterKeys={["name", "status"]}
        sortBy={(a, b) => a.name.localeCompare(b.name)}
        onSelect={(x) => {
-          if (x) toggle(x.name)
+          if (!x || toggle.isPending) return
          toggle.mutate(x.name)
        }}
      >
        {(i) => {
@@ -83,7 +80,7 @@ export const DialogSelectMcp: Component = () => {
                  <Show when={statusLabel()}>
                    <span class="text-11-regular text-text-weaker">{statusLabel()}</span>
                  </Show>
-                  <Show when={loading() === i.name}>
+                  <Show when={toggle.isPending && toggle.variables === i.name}>
                    <span class="text-11-regular text-text-weak">{language.t("common.loading.ellipsis")}</span>
                  </Show>
                </div>
@@ -92,7 +89,14 @@ export const DialogSelectMcp: Component = () => {
                </Show>
              </div>
              <div onClick={(e) => e.stopPropagation()}>
-                <Switch checked={enabled()} disabled={loading() === i.name} onChange={() => toggle(i.name)} />
+                <Switch
                  checked={enabled()}
                  disabled={toggle.isPending && toggle.variables === i.name}
                  onChange={() => {
                    if (toggle.isPending) return
                    toggle.mutate(i.name)
                  }}
                />
              </div>
            </div>
          )
@@ -6,6 +6,7 @@ import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { List } from "@opencode-ai/ui/list"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { useMutation } from "@tanstack/solid-query"
 import { showToast } from "@opencode-ai/ui/toast"
 import { useNavigate } from "@solidjs/router"
 import { createEffect, createMemo, createResource, onCleanup, Show } from "solid-js"
@@ -186,7 +187,6 @@ export function DialogSelectServer() {
      name: "",
      username: DEFAULT_USERNAME,
      password: "",
      adding: false,
      error: "",
      showForm: false,
      status: undefined as boolean | undefined,
@@ -198,7 +198,6 @@ export function DialogSelectServer() {
      username: "",
      password: "",
      error: "",
      busy: false,
      status: undefined as boolean | undefined,
    },
  })
@@ -209,7 +208,6 @@ export function DialogSelectServer() {
      name: "",
      username: DEFAULT_USERNAME,
      password: "",
      adding: false,
      error: "",
      showForm: false,
      status: undefined,
@@ -224,10 +222,78 @@ export function DialogSelectServer() {
      password: "",
      error: "",
      status: undefined,
      busy: false,
    })
  }
  const addMutation = useMutation(() => ({
    mutationFn: async (value: string) => {
      const normalized = normalizeServerUrl(value)
      if (!normalized) {
        resetAdd()
        return
      }
      const conn: ServerConnection.Http = {
        type: "http",
        http: { url: normalized },
      }
      if (store.addServer.name.trim()) conn.displayName = store.addServer.name.trim()
      if (store.addServer.password) conn.http.password = store.addServer.password
      if (store.addServer.password && store.addServer.username) conn.http.username = store.addServer.username
      const result = await checkServerHealth(conn.http)
      if (!result.healthy) {
        setStore("addServer", { error: language.t("dialog.server.add.error") })
        return
      }
      resetAdd()
      await select(conn, true)
    },
  }))
  const editMutation = useMutation(() => ({
    mutationFn: async (input: { original: ServerConnection.Any; value: string }) => {
      if (input.original.type !== "http") return
      const normalized = normalizeServerUrl(input.value)
      if (!normalized) {
        resetEdit()
        return
      }
      const name = store.editServer.name.trim() || undefined
      const username = store.editServer.username || undefined
      const password = store.editServer.password || undefined
      const existingName = input.original.displayName
      if (
        normalized === input.original.http.url &&
        name === existingName &&
        username === input.original.http.username &&
        password === input.original.http.password
      ) {
        resetEdit()
        return
      }
      const conn: ServerConnection.Http = {
        type: "http",
        displayName: name,
        http: { url: normalized, username, password },
      }
      const result = await checkServerHealth(conn.http)
      if (!result.healthy) {
        setStore("editServer", { error: language.t("dialog.server.add.error") })
        return
      }
      if (normalized === input.original.http.url) {
        server.add(conn)
      } else {
        replaceServer(input.original, conn)
      }
      resetEdit()
    },
  }))
  const replaceServer = (original: ServerConnection.Http, next: ServerConnection.Http) => {
    const active = server.key
    const newConn = server.add(next)
@@ -296,7 +362,7 @@ export function DialogSelectServer() {
  }
  const handleAddChange = (value: string) => {
-    if (store.addServer.adding) return
+    if (addMutation.isPending) return
    setStore("addServer", { url: value, error: "" })
    void previewStatus(value, store.addServer.username, store.addServer.password, (next) =>
      setStore("addServer", { status: next }),
@@ -304,12 +370,12 @@ export function DialogSelectServer() {
  }
  const handleAddNameChange = (value: string) => {
-    if (store.addServer.adding) return
+    if (addMutation.isPending) return
    setStore("addServer", { name: value, error: "" })
  }
  const handleAddUsernameChange = (value: string) => {
-    if (store.addServer.adding) return
+    if (addMutation.isPending) return
    setStore("addServer", { username: value, error: "" })
    void previewStatus(store.addServer.url, value, store.addServer.password, (next) =>
      setStore("addServer", { status: next }),
@@ -317,7 +383,7 @@ export function DialogSelectServer() {
  }
  const handleAddPasswordChange = (value: string) => {
-    if (store.addServer.adding) return
+    if (addMutation.isPending) return
    setStore("addServer", { password: value, error: "" })
    void previewStatus(store.addServer.url, store.addServer.username, value, (next) =>
      setStore("addServer", { status: next }),
@@ -325,7 +391,7 @@ export function DialogSelectServer() {
  }
  const handleEditChange = (value: string) => {
-    if (store.editServer.busy) return
+    if (editMutation.isPending) return
    setStore("editServer", { value, error: "" })
    void previewStatus(value, store.editServer.username, store.editServer.password, (next) =>
      setStore("editServer", { status: next }),
@@ -333,12 +399,12 @@ export function DialogSelectServer() {
  }
  const handleEditNameChange = (value: string) => {
-    if (store.editServer.busy) return
+    if (editMutation.isPending) return
    setStore("editServer", { name: value, error: "" })
  }
  const handleEditUsernameChange = (value: string) => {
-    if (store.editServer.busy) return
+    if (editMutation.isPending) return
    setStore("editServer", { username: value, error: "" })
    void previewStatus(store.editServer.value, value, store.editServer.password, (next) =>
      setStore("editServer", { status: next }),
@@ -346,85 +412,13 @@ export function DialogSelectServer() {
  }
  const handleEditPasswordChange = (value: string) => {
-    if (store.editServer.busy) return
+    if (editMutation.isPending) return
    setStore("editServer", { password: value, error: "" })
    void previewStatus(store.editServer.value, store.editServer.username, value, (next) =>
      setStore("editServer", { status: next }),
    )
  }
  async function handleAdd(value: string) {
    if (store.addServer.adding) return
    const normalized = normalizeServerUrl(value)
    if (!normalized) {
      resetAdd()
      return
    }
    setStore("addServer", { adding: true, error: "" })
    const conn: ServerConnection.Http = {
      type: "http",
      http: { url: normalized },
    }
    if (store.addServer.name.trim()) conn.displayName = store.addServer.name.trim()
    if (store.addServer.password) conn.http.password = store.addServer.password
    if (store.addServer.password && store.addServer.username) conn.http.username = store.addServer.username
    const result = await checkServerHealth(conn.http)
    setStore("addServer", { adding: false })
    if (!result.healthy) {
      setStore("addServer", { error: language.t("dialog.server.add.error") })
      return
    }
    resetAdd()
    await select(conn, true)
  }
  async function handleEdit(original: ServerConnection.Any, value: string) {
    if (store.editServer.busy || original.type !== "http") return
    const normalized = normalizeServerUrl(value)
    if (!normalized) {
      resetEdit()
      return
    }
    const name = store.editServer.name.trim() || undefined
    const username = store.editServer.username || undefined
    const password = store.editServer.password || undefined
    const existingName = original.displayName
    if (
      normalized === original.http.url &&
      name === existingName &&
      username === original.http.username &&
      password === original.http.password
    ) {
      resetEdit()
      return
    }
    setStore("editServer", { busy: true, error: "" })
    const conn: ServerConnection.Http = {
      type: "http",
      displayName: name,
      http: { url: normalized, username, password },
    }
    const result = await checkServerHealth(conn.http)
    setStore("editServer", { busy: false })
    if (!result.healthy) {
      setStore("editServer", { error: language.t("dialog.server.add.error") })
      return
    }
    if (normalized === original.http.url) {
      server.add(conn)
    } else {
      replaceServer(original, conn)
    }
    resetEdit()
  }
  const mode = createMemo<"list" | "add" | "edit">(() => {
    if (store.editServer.id) return "edit"
    if (store.addServer.showForm) return "add"
@@ -464,23 +458,26 @@ export function DialogSelectServer() {
      password: conn.http.password ?? "",
      error: "",
      status: store.status[ServerConnection.key(conn)]?.healthy,
      busy: false,
    })
  }
  const submitForm = () => {
    if (mode() === "add") {
-      void handleAdd(store.addServer.url)
+      if (addMutation.isPending) return
      setStore("addServer", { error: "" })
      addMutation.mutate(store.addServer.url)
      return
    }
    const original = editing()
    if (!original) return
-    void handleEdit(original, store.editServer.value)
+    if (editMutation.isPending) return
    setStore("editServer", { error: "" })
    editMutation.mutate({ original, value: store.editServer.value })
  }
  const isFormMode = createMemo(() => mode() !== "list")
  const isAddMode = createMemo(() => mode() === "add")
-  const formBusy = createMemo(() => (isAddMode() ? store.addServer.adding : store.editServer.busy))
+  const formBusy = createMemo(() => (isAddMode() ? addMutation.isPending : editMutation.isPending))
  const formTitle = createMemo(() => {
    if (!isFormMode()) return language.t("dialog.server.title")
@@ -1043,7 +1043,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    return true
  }
-  const { addAttachment, removeAttachment, handlePaste } = createPromptAttachments({
+  const { addAttachments, removeAttachment, handlePaste } = createPromptAttachments({
    editor: () => editorRef,
    isDialogActive: () => !!dialog.active,
    setDraggingType: (type) => setStore("draggingType", type),
@@ -1388,11 +1388,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
              class="hidden"
              onChange={(e) => {
                const list = e.currentTarget.files
-                if (list) {
+                if (list) void addAttachments(Array.from(list))
                  for (const file of Array.from(list)) {
                    void addAttachment(file)
                  }
                }
                e.currentTarget.value = ""
              }}
            />
@@ -1501,7 +1497,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                        >
                          <Show when={local.model.current()?.provider?.id}>
                            <ProviderIcon
-                              id={local.model.current()!.provider.id}
+                              id={local.model.current()?.provider?.id ?? ""}
                              class="size-4 shrink-0 opacity-40 group-hover:opacity-100 transition-opacity duration-150"
                              style={{ "will-change": "opacity", transform: "translateZ(0)" }}
                            />
@@ -1533,7 +1529,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                      >
                        <Show when={local.model.current()?.provider?.id}>
                          <ProviderIcon
-                            id={local.model.current()!.provider.id}
+                            id={local.model.current()?.provider?.id ?? ""}
                            class="size-4 shrink-0 opacity-40 group-hover:opacity-100 transition-opacity duration-150"
                            style={{ "will-change": "opacity", transform: "translateZ(0)" }}
                          />
@@ -71,6 +71,18 @@ export function createPromptAttachments(input: PromptAttachmentsInput) {
  const addAttachment = (file: File) => add(file)
  const addAttachments = async (files: File[], toast = true) => {
    let found = false
    for (const file of files) {
      const ok = await add(file, false)
      if (ok) found = true
    }
    if (!found && files.length > 0 && toast) warn()
    return found
  }
  const removeAttachment = (id: string) => {
    const current = prompt.current()
    const next = current.filter((part) => part.type !== "image" || part.id !== id)
@@ -84,18 +96,14 @@ export function createPromptAttachments(input: PromptAttachmentsInput) {
    event.preventDefault()
    event.stopPropagation()
-    const items = Array.from(clipboardData.items)
+    const files = Array.from(clipboardData.items).flatMap((item) => {
-    const fileItems = items.filter((item) => item.kind === "file")
+      if (item.kind !== "file") return []
    if (fileItems.length > 0) {
      let found = false
      for (const item of fileItems) {
      const file = item.getAsFile()
-        if (!file) continue
+      return file ? [file] : []
-        const ok = await add(file, false)
+    })
-        if (ok) found = true
+
-      }
+    if (files.length > 0) {
-      if (!found) warn()
+      await addAttachments(files)
      return
    }
@@ -169,12 +177,7 @@ export function createPromptAttachments(input: PromptAttachmentsInput) {
    const dropped = event.dataTransfer?.files
    if (!dropped) return
-    let found = false
+    await addAttachments(Array.from(dropped))
    for (const file of Array.from(dropped)) {
      const ok = await add(file, false)
      if (ok) found = true
    }
    if (!found && dropped.length > 0) warn()
  }
  onMount(() => {
@@ -191,6 +194,7 @@ export function createPromptAttachments(input: PromptAttachmentsInput) {
  return {
    addAttachment,
    addAttachments,
    removeAttachment,
    handlePaste,
  }
@@ -49,6 +49,32 @@ describe("buildRequestParts", () => {
    expect(result.optimisticParts.every((part) => part.sessionID === "ses_1" && part.messageID === "msg_1")).toBe(true)
  })
  test("keeps multiple uploaded attachments in order", () => {
    const result = buildRequestParts({
      prompt: [{ type: "text", content: "check these", start: 0, end: 11 }],
      context: [],
      images: [
        { type: "image", id: "img_1", filename: "a.png", mime: "image/png", dataUrl: "data:image/png;base64,AAA" },
        {
          type: "image",
          id: "img_2",
          filename: "b.pdf",
          mime: "application/pdf",
          dataUrl: "data:application/pdf;base64,BBB",
        },
      ],
      text: "check these",
      messageID: "msg_multi",
      sessionID: "ses_multi",
      sessionDirectory: "/repo",
    })
    const files = result.requestParts.filter((part) => part.type === "file" && part.url.startsWith("data:"))
    expect(files).toHaveLength(2)
    expect(files.map((part) => (part.type === "file" ? part.filename : ""))).toEqual(["a.png", "b.pdf"])
  })
  test("deduplicates context files when prompt already includes same path", () => {
    const prompt: Prompt = [{ type: "file", path: "src/foo.ts", content: "@src/foo.ts", start: 0, end: 11 }]
@@ -126,7 +126,7 @@ describe("prompt-input history", () => {
  test("canNavigateHistoryAtCursor only allows prompt boundaries", () => {
    const value = "a\nb\nc"
-    expect(canNavigateHistoryAtCursor("up", value, 0)).toBe(true)
+    expect(canNavigateHistoryAtCursor("up", value, 0)).toBe(false)
    expect(canNavigateHistoryAtCursor("down", value, 0)).toBe(false)
    expect(canNavigateHistoryAtCursor("up", value, 2)).toBe(false)
@@ -135,11 +135,14 @@ describe("prompt-input history", () => {
    expect(canNavigateHistoryAtCursor("up", value, 5)).toBe(false)
    expect(canNavigateHistoryAtCursor("down", value, 5)).toBe(true)
-    expect(canNavigateHistoryAtCursor("up", "abc", 0)).toBe(true)
+    expect(canNavigateHistoryAtCursor("up", "abc", 0)).toBe(false)
    expect(canNavigateHistoryAtCursor("down", "abc", 3)).toBe(true)
    expect(canNavigateHistoryAtCursor("up", "abc", 1)).toBe(false)
    expect(canNavigateHistoryAtCursor("down", "abc", 1)).toBe(false)
    expect(canNavigateHistoryAtCursor("up", "", 0)).toBe(true)
    expect(canNavigateHistoryAtCursor("down", "", 0)).toBe(true)
    expect(canNavigateHistoryAtCursor("up", "abc", 0, true)).toBe(true)
    expect(canNavigateHistoryAtCursor("up", "abc", 3, true)).toBe(true)
    expect(canNavigateHistoryAtCursor("down", "abc", 0, true)).toBe(true)
@@ -27,7 +27,7 @@ export function canNavigateHistoryAtCursor(direction: "up" | "down", text: strin
  const atStart = position === 0
  const atEnd = position === text.length
  if (inHistory) return atStart || atEnd
-  if (direction === "up") return position === 0
+  if (direction === "up") return position === 0 && text.length === 0
  return position === text.length
 }
@@ -267,14 +267,14 @@ export function SessionContextTab() {
  return (
    <ScrollView
-      class="@container h-full pb-10"
+      class="@container h-full"
      viewportRef={(el) => {
        scroll = el
        restoreScroll()
      }}
      onScroll={handleScroll}
    >
-      <div class="px-6 pt-4 flex flex-col gap-10">
+      <div class="px-6 pt-4 pb-10 flex flex-col gap-10">
        <div class="grid grid-cols-1 @[32rem]:grid-cols-2 gap-4">
          <For each={stats}>
            {(stat) => <Stat label={language.t(stat.label as Parameters<typeof language.t>[0])} value={stat.value()} />}
@@ -24,6 +24,7 @@ export function SortableTerminalTab(props: { terminal: LocalPTY; onClose?: () =>
  })
  let input: HTMLInputElement | undefined
  let blurFrame: number | undefined
  let editRequested = false
  const isDefaultTitle = () => {
    const number = props.terminal.titleNumber
@@ -168,8 +169,14 @@ export function SortableTerminalTab(props: { terminal: LocalPTY; onClose?: () =>
                left: `${store.menuPosition.x}px`,
                top: `${store.menuPosition.y}px`,
              }}
              onCloseAutoFocus={(e) => {
                if (!editRequested) return
                e.preventDefault()
                editRequested = false
                requestAnimationFrame(() => edit())
              }}
            >
-              <DropdownMenu.Item onSelect={edit}>
+              <DropdownMenu.Item onSelect={() => (editRequested = true)}>
                <Icon name="edit" class="w-4 h-4 mr-2" />
                {language.t("common.rename")}
              </DropdownMenu.Item>
@@ -4,6 +4,7 @@ import { Icon } from "@opencode-ai/ui/icon"
 import { Popover } from "@opencode-ai/ui/popover"
 import { Switch } from "@opencode-ai/ui/switch"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { useMutation } from "@tanstack/solid-query"
 import { showToast } from "@opencode-ai/ui/toast"
 import { useNavigate } from "@solidjs/router"
 import { type Accessor, createEffect, createMemo, createSignal, For, type JSXElement, onCleanup, Show } from "solid-js"
@@ -130,41 +131,30 @@ const useDefaultServerKey = (
  }
 }
-const useMcpToggle = (input: {
+const useMcpToggleMutation = () => {
-  sync: ReturnType<typeof useSync>
+  const sync = useSync()
-  sdk: ReturnType<typeof useSDK>
+  const sdk = useSDK()
-  language: ReturnType<typeof useLanguage>
+  const language = useLanguage()
 }) => {
  const [loading, setLoading] = createSignal<string | null>(null)
-  const toggle = async (name: string) => {
+  return useMutation(() => ({
-    if (loading()) return
+    mutationFn: async (name: string) => {
-    setLoading(name)
+      const status = sync.data.mcp[name]
-
+      await (status?.status === "connected" ? sdk.client.mcp.disconnect({ name }) : sdk.client.mcp.connect({ name }))
-    try {
+      const result = await sdk.client.mcp.status()
-      const status = input.sync.data.mcp[name]
+      if (result.data) sync.set("mcp", result.data)
-      await (status?.status === "connected"
+    },
-        ? input.sdk.client.mcp.disconnect({ name })
+    onError: (err) => {
        : input.sdk.client.mcp.connect({ name }))
      const result = await input.sdk.client.mcp.status()
      if (result.data) input.sync.set("mcp", result.data)
    } catch (err) {
      showToast({
        variant: "error",
-        title: input.language.t("common.requestFailed"),
+        title: language.t("common.requestFailed"),
        description: err instanceof Error ? err.message : String(err),
      })
-    } finally {
+    },
-      setLoading(null)
+  }))
    }
  }
  return { loading, toggle }
 }
 export function StatusPopover() {
  const sync = useSync()
  const sdk = useSDK()
  const server = useServer()
  const platform = usePlatform()
  const dialog = useDialog()
@@ -181,7 +171,7 @@ export function StatusPopover() {
  })
  const health = useServerHealth(servers)
  const sortedServers = createMemo(() => listServersByHealth(servers(), server.key, health))
-  const mcp = useMcpToggle({ sync, sdk, language })
+  const toggleMcp = useMcpToggleMutation()
  const defaultServer = useDefaultServerKey(platform.getDefaultServer)
  const mcpNames = createMemo(() => Object.keys(sync.data.mcp ?? {}).sort((a, b) => a.localeCompare(b)))
  const mcpStatus = (name: string) => sync.data.mcp?.[name]?.status
@@ -337,8 +327,11 @@ export function StatusPopover() {
                        <button
                          type="button"
                          class="flex items-center gap-2 w-full h-8 pl-3 pr-2 py-1 rounded-md hover:bg-surface-raised-base-hover transition-colors text-left"
-                          onClick={() => mcp.toggle(name)}
+                          onClick={() => {
-                          disabled={mcp.loading() === name}
+                            if (toggleMcp.isPending) return
                            toggleMcp.mutate(name)
                          }}
                          disabled={toggleMcp.isPending && toggleMcp.variables === name}
                        >
                          <div
                            classList={{
@@ -354,8 +347,11 @@ export function StatusPopover() {
                          <div onClick={(event) => event.stopPropagation()}>
                            <Switch
                              checked={enabled()}
-                              disabled={mcp.loading() === name}
+                              disabled={toggleMcp.isPending && toggleMcp.variables === name}
-                              onChange={() => mcp.toggle(name)}
+                              onChange={() => {
                                if (toggleMcp.isPending) return
                                toggleMcp.mutate(name)
                              }}
                            />
                          </div>
                        </button>
@@ -40,4 +40,11 @@ describe("command keybind helpers", () => {
    expect(display.includes("Alt") || display.includes("⌥")).toBe(true)
    expect(formatKeybind("none")).toBe("")
  })
  test("formatKeybind prefers the first combo", () => {
    const display = formatKeybind("mod+k,mod+p")
    expect(display.includes("K") || display.includes("k")).toBe(true)
    expect(display.includes("P") || display.includes("p")).toBe(false)
  })
 })
@@ -15,6 +15,8 @@ import type { State, VcsCache } from "./types"
 import { trimSessions } from "./session-trim"
 import { dropSessionCaches } from "./session-cache"
 const SKIP_PARTS = new Set(["patch", "step-start", "step-finish"])
 export function applyGlobalEvent(input: {
  event: { type: string; properties?: unknown }
  project: Project[]
@@ -211,6 +213,7 @@ export function applyDirectoryEvent(input: {
    }
    case "message.part.updated": {
      const part = (event.properties as { part: Part }).part
      if (SKIP_PARTS.has(part.type)) break
      const parts = input.store.part[part.messageID]
      if (!parts) {
        input.setStore("part", part.messageID, [part])
@@ -14,6 +14,8 @@ import { useSDK } from "./sdk"
 import type { Message, Part } from "@opencode-ai/sdk/v2/client"
 import { SESSION_CACHE_LIMIT, dropSessionCaches, pickSessionCacheEvictions } from "./global-sync/session-cache"
 const SKIP_PARTS = new Set(["patch", "step-start", "step-finish"])
 function sortParts(parts: Part[]) {
  return parts.filter((part) => !!part?.id).sort((a, b) => cmp(a.id, b.id))
 }
@@ -336,7 +338,8 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
          batch(() => {
            input.setStore("message", input.sessionID, reconcile(message, { key: "id" }))
            for (const p of next.part) {
-              input.setStore("part", p.id, p.part)
+              const filtered = p.part.filter((x) => !SKIP_PARTS.has(x.type))
              if (filtered.length) input.setStore("part", p.id, filtered)
            }
            setMeta("limit", key, message.length)
            setMeta("cursor", key, next.cursor)
@@ -23,6 +23,8 @@ export const dict = {
  "command.sidebar.toggle": "Toggle sidebar",
  "command.project.open": "Open project",
  "command.project.previous": "Previous project",
  "command.project.next": "Next project",
  "command.provider.connect": "Connect provider",
  "command.server.switch": "Switch server",
  "command.settings.open": "Open settings",
@@ -274,7 +276,7 @@ export const dict = {
  "prompt.context.includeActiveFile": "Include active file",
  "prompt.context.removeActiveFile": "Remove active file from context",
  "prompt.context.removeFile": "Remove file from context",
-  "prompt.action.attachFile": "Add file",
+  "prompt.action.attachFile": "Add files",
  "prompt.attachment.remove": "Remove attachment",
  "prompt.action.send": "Send",
  "prompt.action.stop": "Stop",
@@ -211,13 +211,22 @@ export default function Layout(props: ParentProps) {
  onMount(() => {
    const stop = () => setState("sizing", false)
    const blur = () => reset()
    const hide = () => {
      if (document.visibilityState !== "hidden") return
      reset()
    }
    window.addEventListener("pointerup", stop)
    window.addEventListener("pointercancel", stop)
    window.addEventListener("blur", stop)
    window.addEventListener("blur", blur)
    document.addEventListener("visibilitychange", hide)
    onCleanup(() => {
      window.removeEventListener("pointerup", stop)
      window.removeEventListener("pointercancel", stop)
      window.removeEventListener("blur", stop)
      window.removeEventListener("blur", blur)
      document.removeEventListener("visibilitychange", hide)
    })
  })
@@ -237,6 +246,12 @@ export default function Layout(props: ParentProps) {
    navLeave.current = undefined
  }
  const reset = () => {
    disarm()
    setState("hoverSession", undefined)
    setHoverProject(undefined)
  }
  const arm = () => {
    if (layout.sidebar.opened()) return
    if (state.hoverProject === undefined) return
@@ -305,8 +320,7 @@ export default function Layout(props: ParentProps) {
  const clearSidebarHoverState = () => {
    if (layout.sidebar.opened()) return
-    setState("hoverSession", undefined)
+    reset()
    setHoverProject(undefined)
  }
  const navigateWithSidebarReset = (href: string) => {
@@ -936,6 +950,26 @@ export default function Layout(props: ParentProps) {
    navigateToSession(session)
  }
  function navigateProjectByOffset(offset: number) {
    const projects = layout.projects.list()
    if (projects.length === 0) return
    const current = currentProject()?.worktree
    const fallback = currentDir() ? projectRoot(currentDir()) : undefined
    const active = current ?? fallback
    const index = active ? projects.findIndex((project) => project.worktree === active) : -1
    const target =
      index === -1
        ? offset > 0
          ? projects[0]
          : projects[projects.length - 1]
        : projects[(index + offset + projects.length) % projects.length]
    if (!target) return
    openProject(target.worktree)
  }
  function navigateSessionByUnseen(offset: number) {
    const sessions = currentSessions()
    if (sessions.length === 0) return
@@ -1002,6 +1036,20 @@ export default function Layout(props: ParentProps) {
        keybind: "mod+o",
        onSelect: () => chooseProject(),
      },
      {
        id: "project.previous",
        title: language.t("command.project.previous"),
        category: language.t("command.category.project"),
        keybind: "mod+alt+arrowup",
        onSelect: () => navigateProjectByOffset(-1),
      },
      {
        id: "project.next",
        title: language.t("command.project.next"),
        category: language.t("command.category.project"),
        keybind: "mod+alt+arrowdown",
        onSelect: () => navigateProjectByOffset(1),
      },
      {
        id: "provider.connect",
        title: language.t("command.provider.connect"),
@@ -1750,6 +1798,9 @@ export default function Layout(props: ParentProps) {
    document.documentElement.style.setProperty("--dialog-left-margin", `${sidebarWidth}px`)
  })
  const side = createMemo(() => Math.max(layout.sidebar.width(), 244))
  const panel = createMemo(() => Math.max(side() - 64, 0))
  const loadedSessionDirs = new Set<string>()
  createEffect(
@@ -1941,6 +1992,10 @@ export default function Layout(props: ParentProps) {
    onProjectMouseEnter: (worktree, event) => aim.enter(worktree, event),
    onProjectMouseLeave: (worktree) => aim.leave(worktree),
    onProjectFocus: (worktree) => aim.activate(worktree),
    onHoverOpenChanged: (worktree, hoverOpen) => {
      if (!hoverOpen && state.hoverProject && state.hoverProject !== worktree) return
      setState("hoverProject", hoverOpen ? worktree : undefined)
    },
    navigateToProject,
    openSidebar: () => layout.sidebar.open(),
    closeProject,
@@ -2022,7 +2077,7 @@ export default function Layout(props: ParentProps) {
          "max-w-full overflow-hidden": panelProps.mobile,
        }}
        style={{
-          width: panelProps.mobile ? undefined : `${Math.max(Math.max(layout.sidebar.width(), 244) - 64, 0)}px`,
+          width: panelProps.mobile ? undefined : `${panel()}px`,
        }}
      >
        <Show
@@ -2085,9 +2140,11 @@ export default function Layout(props: ParentProps) {
                    variant="ghost"
                    data-action="project-menu"
                    data-project={slug()}
-                    class="shrink-0 size-6 rounded-md data-[expanded]:bg-surface-base-active"
+                    class="shrink-0 size-6 rounded-md transition-opacity data-[expanded]:bg-surface-base-active"
                    classList={{
-                      "opacity-0 group-hover/project:opacity-100 data-[expanded]:opacity-100": !panelProps.mobile,
+                      "opacity-100": panelProps.mobile || merged(),
                      "opacity-0 group-hover/project:opacity-100 group-focus-within/project:opacity-100 data-[expanded]:opacity-100":
                        !panelProps.mobile && !merged(),
                    }}
                    aria-label={language.t("common.moreOptions")}
                  />
@@ -2312,7 +2369,7 @@ export default function Layout(props: ParentProps) {
                "absolute inset-y-0 left-0": true,
                "z-10": true,
              }}
-              style={{ width: `${Math.max(layout.sidebar.width(), 244)}px` }}
+              style={{ width: `${side()}px` }}
              ref={(el) => {
                setState("nav", el)
              }}
@@ -2327,25 +2384,28 @@ export default function Layout(props: ParentProps) {
              }}
            >
              <div class="@container w-full h-full contain-strict">{sidebarContent()}</div>
            </nav>
            <Show when={layout.sidebar.opened()}>
-                <div onPointerDown={() => setState("sizing", true)}>
+              <div
                class="hidden xl:block absolute inset-y-0 z-30 w-0 overflow-visible"
                style={{ left: `${side()}px` }}
                onPointerDown={() => setState("sizing", true)}
              >
                <ResizeHandle
                  direction="horizontal"
                  size={layout.sidebar.width()}
                  min={244}
                  max={typeof window === "undefined" ? 1000 : window.innerWidth * 0.3 + 64}
                    collapseThreshold={244}
                  onResize={(w) => {
                    setState("sizing", true)
                    if (sizet !== undefined) clearTimeout(sizet)
                    sizet = window.setTimeout(() => setState("sizing", false), 120)
                    layout.sidebar.resize(w)
                  }}
                    onCollapse={layout.sidebar.close}
                />
              </div>
            </Show>
            </nav>
            <div
              class="hidden xl:block pointer-events-none absolute top-0 right-0 z-0 border-t border-border-weaker-base"
@@ -2386,7 +2446,7 @@ export default function Layout(props: ParentProps) {
                  !state.sizing,
              }}
              style={{
-                "--main-left": layout.sidebar.opened() ? `${Math.max(layout.sidebar.width(), 244)}px` : "4rem",
+                "--main-left": layout.sidebar.opened() ? `${side()}px` : "4rem",
              }}
            >
              <main
@@ -2433,7 +2493,7 @@ export default function Layout(props: ParentProps) {
                "duration-180 ease-out": state.peeked && !layout.sidebar.opened(),
                "duration-120 ease-in": !state.peeked || layout.sidebar.opened(),
              }}
-              style={{ left: `calc(4rem + ${Math.max(Math.max(layout.sidebar.width(), 244) - 64, 0)}px)` }}
+              style={{ left: `calc(4rem + ${panel()}px)` }}
            >
              <div class="h-full w-px" style={{ "box-shadow": "var(--shadow-sidebar-overlay)" }} />
            </div>
@@ -104,7 +104,7 @@ const SessionRow = (props: {
 }): JSX.Element => (
  <A
    href={`/${props.slug}/session/${props.session.id}`}
-    class={`flex items-center justify-between gap-3 min-w-0 text-left w-full focus:outline-none transition-[padding] ${props.mobile ? "pr-7" : ""} group-hover/session:pr-7 group-focus-within/session:pr-7 group-active/session:pr-7 ${props.dense ? "py-0.5" : "py-1"}`}
+    class={`flex items-center gap-1 min-w-0 w-full text-left focus:outline-none ${props.dense ? "py-0.5" : "py-1"}`}
    onPointerDown={props.warmPress}
    onPointerEnter={props.warmHover}
    onPointerLeave={props.cancelHoverPrefetch}
@@ -115,7 +115,6 @@ const SessionRow = (props: {
      props.clearHoverProjectSoon()
    }}
  >
    <div class="flex items-center gap-1 w-full">
    <div
      class="shrink-0 size-6 flex items-center justify-center"
      style={{ color: props.tint() ?? "var(--icon-interactive-base)" }}
@@ -135,10 +134,7 @@ const SessionRow = (props: {
        </Match>
      </Switch>
    </div>
-      <span class="text-14-regular text-text-strong grow-1 min-w-0 overflow-hidden text-ellipsis truncate">
+    <span class="text-14-regular text-text-strong min-w-0 flex-1 truncate">{props.session.title}</span>
        {props.session.title}
      </span>
    </div>
  </A>
 )
@@ -157,16 +153,30 @@ const SessionHoverPreview = (props: {
  messageLabel: (message: Message) => string | undefined
  onMessageSelect: (message: Message) => void
  trigger: JSX.Element
-}): JSX.Element => (
+}): JSX.Element => {
  let ref: HTMLDivElement | undefined
  return (
    <HoverCard
      openDelay={1000}
      closeDelay={props.sidebarHovering() ? 600 : 0}
      placement="right-start"
      gutter={16}
      shift={-2}
-    trigger={props.trigger}
+      trigger={
        <div ref={ref} class="min-w-0 w-full">
          {props.trigger}
        </div>
      }
      open={props.hoverSession() === props.session.id}
-    onOpenChange={(open) => props.setHoverSession(open ? props.session.id : undefined)}
+      onOpenChange={(open) => {
        if (!open) {
          props.setHoverSession(undefined)
          return
        }
        if (!ref?.matches(":hover")) return
        props.setHoverSession(props.session.id)
      }}
    >
      <Show
        when={props.hoverReady()}
@@ -185,6 +195,7 @@ const SessionHoverPreview = (props: {
      </Show>
    </HoverCard>
  )
 }
 export const SessionItem = (props: SessionItemProps): JSX.Element => {
  const params = useParams()
@@ -298,13 +309,20 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
  return (
    <div
      data-session-id={props.session.id}
-      class="group/session relative w-full rounded-md cursor-default pl-2 pr-3 transition-colors
+      class="group/session relative w-full min-w-0 rounded-md cursor-default pl-2 pr-3 transition-colors
             hover:bg-surface-raised-base-hover [&:has(:focus-visible)]:bg-surface-raised-base-hover has-[[data-expanded]]:bg-surface-raised-base-hover has-[.active]:bg-surface-base-active"
    >
      <div class="flex min-w-0 items-center gap-1">
        <div class="min-w-0 flex-1">
          <Show
            when={hoverEnabled()}
            fallback={
-          <Tooltip placement={props.mobile ? "bottom" : "right"} value={props.session.title} gutter={10}>
+              <Tooltip
                placement={props.mobile ? "bottom" : "right"}
                value={props.session.title}
                gutter={10}
                class="min-w-0 w-full"
              >
                {item}
              </Tooltip>
            }
@@ -331,14 +349,15 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
              trigger={item}
            />
          </Show>
        </div>
        <div
-        class={`absolute ${props.dense ? "top-0.5 right-0.5" : "top-1 right-1"} flex items-center gap-0.5 transition-opacity`}
+          class="shrink-0 overflow-hidden transition-[width,opacity]"
          classList={{
-          "opacity-100 pointer-events-auto": !!props.mobile,
+            "w-6 opacity-100 pointer-events-auto": !!props.mobile,
-          "opacity-0 pointer-events-none": !props.mobile,
+            "w-0 opacity-0 pointer-events-none": !props.mobile,
-          "group-hover/session:opacity-100 group-hover/session:pointer-events-auto": true,
+            "group-hover/session:w-6 group-hover/session:opacity-100 group-hover/session:pointer-events-auto": true,
-          "group-focus-within/session:opacity-100 group-focus-within/session:pointer-events-auto": true,
+            "group-focus-within/session:w-6 group-focus-within/session:opacity-100 group-focus-within/session:pointer-events-auto": true,
          }}
        >
          <Tooltip value={language.t("common.archive")} placement="top">
@@ -356,6 +375,7 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
          </Tooltip>
        </div>
      </div>
    </div>
  )
 }
@@ -375,30 +395,26 @@ export const NewSessionItem = (props: {
    <A
      href={`/${props.slug}/session`}
      end
-      class={`flex items-center justify-between gap-3 min-w-0 text-left w-full focus:outline-none ${props.dense ? "py-0.5" : "py-1"}`}
+      class={`flex items-center gap-1 min-w-0 w-full text-left focus:outline-none ${props.dense ? "py-0.5" : "py-1"}`}
      onClick={() => {
        props.setHoverSession(undefined)
        if (layout.sidebar.opened()) return
        props.clearHoverProjectSoon()
      }}
    >
      <div class="flex items-center gap-1 w-full">
      <div class="shrink-0 size-6 flex items-center justify-center">
        <Icon name="new-session" size="small" class="text-icon-weak" />
      </div>
-        <span class="text-14-regular text-text-strong grow-1 min-w-0 overflow-hidden text-ellipsis truncate">
+      <span class="text-14-regular text-text-strong min-w-0 flex-1 truncate">{label}</span>
          {label}
        </span>
      </div>
    </A>
  )
  return (
-    <div class="group/session relative w-full rounded-md cursor-default transition-colors pl-2 pr-3 hover:bg-surface-raised-base-hover [&:has(:focus-visible)]:bg-surface-raised-base-hover has-[.active]:bg-surface-base-active">
+    <div class="group/session relative w-full min-w-0 rounded-md cursor-default transition-colors pl-2 pr-3 hover:bg-surface-raised-base-hover [&:has(:focus-visible)]:bg-surface-raised-base-hover has-[.active]:bg-surface-base-active">
      <Show
        when={!tooltip()}
        fallback={
-          <Tooltip placement={props.mobile ? "bottom" : "right"} value={label} gutter={10}>
+          <Tooltip placement={props.mobile ? "bottom" : "right"} value={label} gutter={10} class="min-w-0 w-full">
            {item}
          </Tooltip>
        }
@@ -23,6 +23,7 @@ export type ProjectSidebarContext = {
  onProjectMouseEnter: (worktree: string, event: MouseEvent) => void
  onProjectMouseLeave: (worktree: string) => void
  onProjectFocus: (worktree: string) => void
  onHoverOpenChanged: (worktree: string, hovered: boolean) => void
  navigateToProject: (directory: string) => void
  openSidebar: () => void
  closeProject: (directory: string) => void
@@ -109,8 +110,14 @@ const ProjectTile = (props: {
          "bg-surface-base-hover border border-border-weak-base": !props.selected() && props.active(),
        }}
        onPointerDown={(event) => {
          if (event.button === 0 && !event.ctrlKey) {
            props.setOpen(false)
            props.setSuppressHover(true)
            return
          }
          if (!props.overlay()) return
          if (event.button !== 2 && !(event.button === 0 && event.ctrlKey)) return
          props.setOpen(false)
          props.setSuppressHover(true)
          event.preventDefault()
        }}
@@ -130,12 +137,11 @@ const ProjectTile = (props: {
          props.onProjectFocus(props.project.worktree)
        }}
        onClick={() => {
          props.setOpen(false)
          if (props.selected()) {
            props.setSuppressHover(true)
            layout.sidebar.toggle()
            return
          }
          props.setSuppressHover(false)
          props.navigateToProject(props.project.worktree)
        }}
        onBlur={() => props.setOpen(false)}
@@ -192,7 +198,6 @@ const ProjectPreviewPanel = (props: {
  projectChildren: Accessor<Map<string, string[]>>
  workspaceSessions: (directory: string) => ReturnType<typeof sortedRootSessions>
  workspaceChildren: (directory: string) => Map<string, string[]>
  setOpen: (value: boolean) => void
  ctx: ProjectSidebarContext
  language: ReturnType<typeof useLanguage>
 }): JSX.Element => (
@@ -259,7 +264,7 @@ const ProjectPreviewPanel = (props: {
        class="flex w-full text-left justify-start text-text-base px-2 hover:bg-transparent active:bg-transparent"
        onClick={() => {
          props.ctx.openSidebar()
-          props.setOpen(false)
+          props.ctx.onHoverOpenChanged(props.project.worktree, false)
          if (props.selected()) return
          props.ctx.navigateToProject(props.project.worktree)
        }}
@@ -284,28 +289,16 @@ export const SortableProject = (props: {
  const workspaceEnabled = createMemo(() => props.ctx.workspacesEnabled(props.project))
  const dirs = createMemo(() => props.ctx.workspaceIds(props.project))
  const [state, setState] = createStore({
    open: false,
    menu: false,
    suppressHover: false,
  })
  const isHoverProject = () => props.ctx.hoverProject() === props.project.worktree
  const preview = createMemo(() => !props.mobile && props.ctx.sidebarOpened())
  const overlay = createMemo(() => !props.mobile && !props.ctx.sidebarOpened())
-  const active = createMemo(
+  const active = createMemo(() => state.menu || (preview() ? isHoverProject() : overlay() && isHoverProject()))
    () => state.menu || (preview() ? state.open : overlay() && props.ctx.hoverProject() === props.project.worktree),
  )
-  createEffect(() => {
+  const hoverOpen = () => isHoverProject() && preview() && !selected() && !state.menu
    if (preview()) return
    if (!state.open) return
    setState("open", false)
  })
  createEffect(() => {
    if (!selected()) return
    if (!state.open) return
    setState("open", false)
  })
  const label = (directory: string) => {
    const [data] = globalSync.child(directory, { bootstrap: false })
@@ -346,7 +339,7 @@ export const SortableProject = (props: {
      workspacesEnabled={props.ctx.workspacesEnabled}
      closeProject={props.ctx.closeProject}
      setMenu={(value) => setState("menu", value)}
-      setOpen={(value) => setState("open", value)}
+      setOpen={(value) => props.ctx.onHoverOpenChanged(props.project.worktree, value)}
      setSuppressHover={(value) => setState("suppressHover", value)}
      language={language}
    />
@@ -357,7 +350,7 @@ export const SortableProject = (props: {
    <div use:sortable classList={{ "opacity-30": sortable.isActiveDraggable }}>
      <Show when={preview() && !selected()} fallback={tile()}>
        <HoverCard
-          open={!state.suppressHover && state.open && !state.menu}
+          open={!state.suppressHover && hoverOpen() && !state.menu}
          openDelay={0}
          closeDelay={0}
          placement="right-start"
@@ -366,7 +359,7 @@ export const SortableProject = (props: {
          onOpenChange={(value) => {
            if (state.menu) return
            if (value && state.suppressHover) return
-            setState("open", value)
+            props.ctx.onHoverOpenChanged(props.project.worktree, value)
            if (value) props.ctx.setHoverSession(undefined)
          }}
        >
@@ -381,7 +374,6 @@ export const SortableProject = (props: {
            projectChildren={projectChildren}
            workspaceSessions={workspaceSessions}
            workspaceChildren={workspaceChildren}
            setOpen={(value) => setState("open", value)}
            ctx={props.ctx}
            language={language}
          />
@@ -1,5 +1,6 @@
 import type { Project, UserMessage } from "@opencode-ai/sdk/v2"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useMutation } from "@tanstack/solid-query"
 import {
  batch,
  onCleanup,
@@ -40,7 +41,13 @@ import { useSync } from "@/context/sync"
 import { useTerminal } from "@/context/terminal"
 import { type FollowupDraft, sendFollowupDraft } from "@/components/prompt-input/submit"
 import { createSessionComposerState, SessionComposerRegion } from "@/pages/session/composer"
-import { createOpenReviewFile, createSessionTabs, createSizing, focusTerminalById } from "@/pages/session/helpers"
+import {
  createOpenReviewFile,
  createSessionTabs,
  createSizing,
  focusTerminalById,
  shouldFocusTerminalOnKeyDown,
 } from "@/pages/session/helpers"
 import { MessageTimeline } from "@/pages/session/message-timeline"
 import { type DiffStyle, SessionReviewTab, type SessionReviewTabProps } from "@/pages/session/review-tab"
 import { useSessionLayout } from "@/pages/session/session-layout"
@@ -239,14 +246,19 @@ function createSessionHistoryWindow(input: SessionHistoryWindowInput) {
    if (added <= 0) return
    if (growth <= 0) return
    if (opts?.prefetch) {
      const current = turnStart()
      preserveScroll(() => setTurnStart(current + growth))
      return
    }
    if (turnStart() !== start) return
    const reveal = !opts?.prefetch
    const currentRendered = renderedUserMessages().length
    const base = Math.max(beforeRendered, currentRendered)
-    const target = reveal ? Math.min(afterVisible, base + turnBatch) : base
+    const target = Math.min(afterVisible, base + turnBatch)
-    const nextStart = Math.max(0, afterVisible - target)
+    preserveScroll(() => setTurnStart(Math.max(0, afterVisible - target)))
    preserveScroll(() => setTurnStart(nextStart))
  }
  const onScrollerScroll = () => {
@@ -327,10 +339,7 @@ export default function Page() {
  })
  const [ui, setUi] = createStore({
    git: false,
    pendingMessage: undefined as string | undefined,
    restoring: undefined as string | undefined,
    reverting: false,
    reviewSnap: false,
    scrollGesture: 0,
    scroll: {
@@ -506,7 +515,6 @@ export default function Page() {
  const [followup, setFollowup] = createStore({
    items: {} as Record<string, (FollowupDraft & { id: string })[] | undefined>,
    sending: {} as Record<string, string | undefined>,
    failed: {} as Record<string, string | undefined>,
    paused: {} as Record<string, boolean | undefined>,
    edit: {} as Record<
@@ -644,25 +652,24 @@ export default function Page() {
    globalSync.set("project", [...list, next])
  }
-  function initGit() {
+  const gitMutation = useMutation(() => ({
-    if (ui.git) return
+    mutationFn: () => sdk.client.project.initGit(),
-    setUi("git", true)
+    onSuccess: (x) => {
    void sdk.client.project
      .initGit()
      .then((x) => {
      if (!x.data) return
      upsert(x.data)
-      })
+    },
-      .catch((err) => {
+    onError: (err) => {
      showToast({
        variant: "error",
        title: language.t("common.requestFailed"),
        description: formatServerError(err, language.t),
      })
-      })
+    },
-      .finally(() => {
+  }))
-        setUi("git", false)
+
-      })
+  function initGit() {
    if (gitMutation.isPending) return
    gitMutation.mutate()
  }
  let inputRef!: HTMLDivElement
@@ -854,7 +861,7 @@ export default function Page() {
    // Prefer the open terminal over the composer when it can take focus
    if (view().terminal.opened()) {
      const id = terminal.active()
-      if (id && focusTerminalById(id)) return
+      if (id && shouldFocusTerminalOnKeyDown(event) && focusTerminalById(id)) return
    }
    // Only treat explicit scroll keys as potential "user scroll" gestures.
@@ -961,8 +968,8 @@ export default function Page() {
              {language.t("session.review.noVcs.createGit.description")}
            </div>
          </div>
-          <Button size="large" disabled={ui.git} onClick={initGit}>
+          <Button size="large" disabled={gitMutation.isPending} onClick={initGit}>
-            {ui.git
+            {gitMutation.isPending
              ? language.t("session.review.noVcs.createGit.actionLoading")
              : language.t("session.review.noVcs.createGit.action")}
          </Button>
@@ -1379,10 +1386,40 @@ export default function Page() {
    return followup.edit[id]
  })
  const followupMutation = useMutation(() => ({
    mutationFn: async (input: { sessionID: string; id: string; manual?: boolean }) => {
      const item = (followup.items[input.sessionID] ?? []).find((entry) => entry.id === input.id)
      if (!item) return
      if (input.manual) setFollowup("paused", input.sessionID, undefined)
      setFollowup("failed", input.sessionID, undefined)
      const ok = await sendFollowupDraft({
        client: sdk.client,
        sync,
        globalSync,
        draft: item,
        optimisticBusy: item.sessionDirectory === sdk.directory,
      }).catch((err) => {
        setFollowup("failed", input.sessionID, input.id)
        fail(err)
        return false
      })
      if (!ok) return
      setFollowup("items", input.sessionID, (items) => (items ?? []).filter((entry) => entry.id !== input.id))
      if (input.manual) resumeScroll()
    },
  }))
  const followupBusy = (sessionID: string) =>
    followupMutation.isPending && followupMutation.variables?.sessionID === sessionID
  const sendingFollowup = createMemo(() => {
    const id = params.id
    if (!id) return
-    return followup.sending[id]
+    if (!followupBusy(id)) return
    return followupMutation.variables?.id
  })
  const queueEnabled = createMemo(() => {
@@ -1422,37 +1459,15 @@ export default function Page() {
  const sendFollowup = (sessionID: string, id: string, opts?: { manual?: boolean }) => {
    const item = (followup.items[sessionID] ?? []).find((entry) => entry.id === id)
    if (!item) return Promise.resolve()
-    if (followup.sending[sessionID]) return Promise.resolve()
+    if (followupBusy(sessionID)) return Promise.resolve()
-    if (opts?.manual) setFollowup("paused", sessionID, undefined)
+    return followupMutation.mutateAsync({ sessionID, id, manual: opts?.manual })
    setFollowup("sending", sessionID, id)
    setFollowup("failed", sessionID, undefined)
    return sendFollowupDraft({
      client: sdk.client,
      sync,
      globalSync,
      draft: item,
      optimisticBusy: item.sessionDirectory === sdk.directory,
    })
      .then((ok) => {
        if (ok === false) return
        setFollowup("items", sessionID, (items) => (items ?? []).filter((entry) => entry.id !== id))
        if (opts?.manual) resumeScroll()
      })
      .catch((err) => {
        setFollowup("failed", sessionID, id)
        fail(err)
      })
      .finally(() => {
        setFollowup("sending", sessionID, (value) => (value === id ? undefined : value))
      })
  }
  const editFollowup = (id: string) => {
    const sessionID = params.id
    if (!sessionID) return
-    if (followup.sending[sessionID]) return
+    if (followupBusy(sessionID)) return
    const item = queuedFollowups().find((entry) => entry.id === id)
    if (!item) return
@@ -1475,6 +1490,74 @@ export default function Page() {
  const halt = (sessionID: string) =>
    busy(sessionID) ? sdk.client.session.abort({ sessionID }).catch(() => {}) : Promise.resolve()
  const revertMutation = useMutation(() => ({
    mutationFn: async (input: { sessionID: string; messageID: string }) => {
      const prev = prompt.current().slice()
      const last = info()?.revert
      const value = draft(input.messageID)
      batch(() => {
        roll(input.sessionID, { messageID: input.messageID })
        prompt.set(value)
      })
      await halt(input.sessionID)
        .then(() => sdk.client.session.revert(input))
        .then((result) => {
          if (result.data) merge(result.data)
        })
        .catch((err) => {
          batch(() => {
            roll(input.sessionID, last)
            prompt.set(prev)
          })
          fail(err)
        })
    },
  }))
  const restoreMutation = useMutation(() => ({
    mutationFn: async (id: string) => {
      const sessionID = params.id
      if (!sessionID) return
      const next = userMessages().find((item) => item.id > id)
      const prev = prompt.current().slice()
      const last = info()?.revert
      batch(() => {
        roll(sessionID, next ? { messageID: next.id } : undefined)
        if (next) {
          prompt.set(draft(next.id))
          return
        }
        prompt.reset()
      })
      const task = !next
        ? halt(sessionID).then(() => sdk.client.session.unrevert({ sessionID }))
        : halt(sessionID).then(() =>
            sdk.client.session.revert({
              sessionID,
              messageID: next.id,
            }),
          )
      await task
        .then((result) => {
          if (result.data) merge(result.data)
        })
        .catch((err) => {
          batch(() => {
            roll(sessionID, last)
            prompt.set(prev)
          })
          fail(err)
        })
    },
  }))
  const reverting = createMemo(() => revertMutation.isPending || restoreMutation.isPending)
  const restoring = createMemo(() => (restoreMutation.isPending ? restoreMutation.variables : undefined))
  const fork = (input: { sessionID: string; messageID: string }) => {
    const value = draft(input.messageID)
    const dir = base64Encode(sdk.directory)
@@ -1496,77 +1579,13 @@ export default function Page() {
  }
  const revert = (input: { sessionID: string; messageID: string }) => {
-    if (ui.reverting || ui.restoring) return
+    if (reverting()) return
-    const prev = prompt.current().slice()
+    return revertMutation.mutateAsync(input)
    const last = info()?.revert
    const value = draft(input.messageID)
    batch(() => {
      setUi("reverting", true)
      roll(input.sessionID, { messageID: input.messageID })
      prompt.set(value)
    })
    return halt(input.sessionID)
      .then(() => sdk.client.session.revert(input))
      .then((result) => {
        if (result.data) merge(result.data)
      })
      .catch((err) => {
        batch(() => {
          roll(input.sessionID, last)
          prompt.set(prev)
        })
        fail(err)
      })
      .finally(() => {
        setUi("reverting", false)
      })
  }
  const restore = (id: string) => {
-    const sessionID = params.id
+    if (!params.id || reverting()) return
-    if (!sessionID || ui.restoring || ui.reverting) return
+    return restoreMutation.mutateAsync(id)
    const next = userMessages().find((item) => item.id > id)
    const prev = prompt.current().slice()
    const last = info()?.revert
    batch(() => {
      setUi("restoring", id)
      setUi("reverting", true)
      roll(sessionID, next ? { messageID: next.id } : undefined)
      if (next) {
        prompt.set(draft(next.id))
        return
      }
      prompt.reset()
    })
    const task = !next
      ? halt(sessionID).then(() => sdk.client.session.unrevert({ sessionID }))
      : halt(sessionID).then(() =>
          sdk.client.session.revert({
            sessionID,
            messageID: next.id,
          }),
        )
    return task
      .then((result) => {
        if (result.data) merge(result.data)
      })
      .catch((err) => {
        batch(() => {
          roll(sessionID, last)
          prompt.set(prev)
        })
        fail(err)
      })
      .finally(() => {
        batch(() => {
          setUi("restoring", (value) => (value === id ? undefined : value))
          setUi("reverting", false)
        })
      })
  }
  const rolled = createMemo(() => {
@@ -1585,7 +1604,7 @@ export default function Page() {
    const item = queuedFollowups()[0]
    if (!item) return
-    if (followup.sending[sessionID]) return
+    if (followupBusy(sessionID)) return
    if (followup.failed[sessionID] === item.id) return
    if (followup.paused[sessionID]) return
    if (composer.blocked()) return
@@ -1780,8 +1799,8 @@ export default function Page() {
              rolled().length > 0
                ? {
                    items: rolled(),
-                    restoring: ui.restoring,
+                    restoring: restoring(),
-                    disabled: ui.reverting,
+                    disabled: reverting(),
                    onRestore: restore,
                  }
                : undefined
@@ -1,5 +1,6 @@
 import { For, Show, createMemo, onCleanup, onMount, type Component } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useMutation } from "@tanstack/solid-query"
 import { Button } from "@opencode-ai/ui/button"
 import { DockPrompt } from "@opencode-ai/ui/dock-prompt"
 import { Icon } from "@opencode-ai/ui/icon"
@@ -24,7 +25,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    custom: cached?.custom ?? ([] as string[]),
    customOn: cached?.customOn ?? ([] as boolean[]),
    editing: false,
    sending: false,
  })
  let root: HTMLDivElement | undefined
@@ -126,36 +126,40 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    showToast({ title: language.t("common.requestFailed"), description: message })
  }
-  const reply = async (answers: QuestionAnswer[]) => {
+  const replyMutation = useMutation(() => ({
-    if (store.sending) return
+    mutationFn: (answers: QuestionAnswer[]) => sdk.client.question.reply({ requestID: props.request.id, answers }),
-
+    onMutate: () => {
      props.onSubmit()
-    setStore("sending", true)
+    },
-    try {
+    onSuccess: () => {
      await sdk.client.question.reply({ requestID: props.request.id, answers })
      replied = true
      cache.delete(props.request.id)
-    } catch (err) {
+    },
-      fail(err)
+    onError: fail,
-    } finally {
+  }))
-      setStore("sending", false)
+
-    }
+  const rejectMutation = useMutation(() => ({
    mutationFn: () => sdk.client.question.reject({ requestID: props.request.id }),
    onMutate: () => {
      props.onSubmit()
    },
    onSuccess: () => {
      replied = true
      cache.delete(props.request.id)
    },
    onError: fail,
  }))
  const sending = createMemo(() => replyMutation.isPending || rejectMutation.isPending)
  const reply = async (answers: QuestionAnswer[]) => {
    if (sending()) return
    await replyMutation.mutateAsync(answers)
  }
  const reject = async () => {
-    if (store.sending) return
+    if (sending()) return
-
+    await rejectMutation.mutateAsync()
    props.onSubmit()
    setStore("sending", true)
    try {
      await sdk.client.question.reject({ requestID: props.request.id })
      replied = true
      cache.delete(props.request.id)
    } catch (err) {
      fail(err)
    } finally {
      setStore("sending", false)
    }
  }
  const submit = () => void reply(questions().map((_, i) => store.answers[i] ?? []))
@@ -175,7 +179,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
  }
  const customToggle = () => {
-    if (store.sending) return
+    if (sending()) return
    if (!multi()) {
      setStore("customOn", store.tab, true)
@@ -198,14 +202,14 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
  }
  const customOpen = () => {
-    if (store.sending) return
+    if (sending()) return
    if (!on()) setStore("customOn", store.tab, true)
    setStore("editing", true)
    customUpdate(input(), true)
  }
  const selectOption = (optIndex: number) => {
-    if (store.sending) return
+    if (sending()) return
    if (optIndex === options().length) {
      customOpen()
@@ -227,7 +231,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
  }
  const next = () => {
-    if (store.sending) return
+    if (sending()) return
    if (store.editing) commitCustom()
    if (store.tab >= total() - 1) {
@@ -240,14 +244,14 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
  }
  const back = () => {
-    if (store.sending) return
+    if (sending()) return
    if (store.tab <= 0) return
    setStore("tab", store.tab - 1)
    setStore("editing", false)
  }
  const jump = (tab: number) => {
-    if (store.sending) return
+    if (sending()) return
    setStore("tab", tab)
    setStore("editing", false)
  }
@@ -270,7 +274,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
                    (store.answers[i()]?.length ?? 0) > 0 ||
                    (store.customOn[i()] === true && (store.custom[i()] ?? "").trim().length > 0)
                  }
-                  disabled={store.sending}
+                  disabled={sending()}
                  onClick={() => jump(i())}
                  aria-label={`${language.t("ui.tool.questions")} ${i() + 1}`}
                />
@@ -281,16 +285,16 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
      }
      footer={
        <>
-          <Button variant="ghost" size="large" disabled={store.sending} onClick={reject}>
+          <Button variant="ghost" size="large" disabled={sending()} onClick={reject}>
            {language.t("ui.common.dismiss")}
          </Button>
          <div data-slot="question-footer-actions">
            <Show when={store.tab > 0}>
-              <Button variant="secondary" size="large" disabled={store.sending} onClick={back}>
+              <Button variant="secondary" size="large" disabled={sending()} onClick={back}>
                {language.t("ui.common.back")}
              </Button>
            </Show>
-            <Button variant={last() ? "primary" : "secondary"} size="large" disabled={store.sending} onClick={next}>
+            <Button variant={last() ? "primary" : "secondary"} size="large" disabled={sending()} onClick={next}>
              {last() ? language.t("ui.common.submit") : language.t("ui.common.next")}
            </Button>
          </div>
@@ -311,7 +315,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
                data-picked={picked()}
                role={multi() ? "checkbox" : "radio"}
                aria-checked={picked()}
-                disabled={store.sending}
+                disabled={sending()}
                onClick={() => selectOption(i())}
              >
                <span data-slot="question-option-check" aria-hidden="true">
@@ -345,7 +349,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
              data-picked={on()}
              role={multi() ? "checkbox" : "radio"}
              aria-checked={on()}
-              disabled={store.sending}
+              disabled={sending()}
              onClick={customOpen}
            >
              <span
@@ -377,7 +381,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
            role={multi() ? "checkbox" : "radio"}
            aria-checked={on()}
            onMouseDown={(e) => {
-              if (store.sending) {
+              if (sending()) {
                e.preventDefault()
                return
              }
@@ -419,7 +423,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
                placeholder={language.t("ui.question.custom.placeholder")}
                value={input()}
                rows={1}
-                disabled={store.sending}
+                disabled={sending()}
                onKeyDown={(e) => {
                  if (e.key === "Escape") {
                    e.preventDefault()
@@ -7,6 +7,7 @@ import {
  createSessionTabs,
  focusTerminalById,
  getTabReorderIndex,
  shouldFocusTerminalOnKeyDown,
 } from "./helpers"
 describe("createOpenReviewFile", () => {
@@ -86,6 +87,26 @@ describe("focusTerminalById", () => {
  })
 })
 describe("shouldFocusTerminalOnKeyDown", () => {
  test("skips pure modifier keys", () => {
    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Meta", metaKey: true }))).toBe(false)
    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Control", ctrlKey: true }))).toBe(false)
    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Alt", altKey: true }))).toBe(false)
    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "Shift", shiftKey: true }))).toBe(false)
  })
  test("skips shortcut key combos", () => {
    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "c", metaKey: true }))).toBe(false)
    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "c", ctrlKey: true }))).toBe(false)
    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "ArrowLeft", altKey: true }))).toBe(false)
  })
  test("keeps plain typing focused on terminal", () => {
    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "a" }))).toBe(true)
    expect(shouldFocusTerminalOnKeyDown(new KeyboardEvent("keydown", { key: "A", shiftKey: true }))).toBe(true)
  })
 })
 describe("getTabReorderIndex", () => {
  test("returns target index for valid drag reorder", () => {
    expect(getTabReorderIndex(["a", "b", "c"], "a", "c")).toBe(2)
@@ -93,6 +93,13 @@ export const focusTerminalById = (id: string) => {
  return true
 }
 const skip = new Set(["Alt", "Control", "Meta", "Shift"])
 export const shouldFocusTerminalOnKeyDown = (event: Pick<KeyboardEvent, "key" | "ctrlKey" | "metaKey" | "altKey">) => {
  if (skip.has(event.key)) return false
  return !(event.ctrlKey || event.metaKey || event.altKey)
 }
 export const createOpenReviewFile = (input: {
  showAllFiles: () => void
  tabForPath: (path: string) => string
@@ -1,6 +1,7 @@
-import { For, createEffect, createMemo, on, onCleanup, Show, Index, type JSX } from "solid-js"
+import { For, createEffect, createMemo, on, onCleanup, Show, Index, type JSX, createSignal } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { useNavigate } from "@solidjs/router"
 import { useMutation } from "@tanstack/solid-query"
 import { Button } from "@opencode-ai/ui/button"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { Icon } from "@opencode-ai/ui/icon"
@@ -29,6 +30,7 @@ import { useSDK } from "@/context/sdk"
 import { useSync } from "@/context/sync"
 import { messageAgentColor } from "@/utils/agent"
 import { parseCommentNote, readCommentMetadata } from "@/utils/comment-note"
 import { makeTimer } from "@solid-primitives/timer"
 type MessageComment = {
  path: string
@@ -249,38 +251,21 @@ export function MessageTimeline(props: {
  const working = createMemo(() => !!pending() || sessionStatus().type !== "idle")
  const tint = createMemo(() => messageAgentColor(sessionMessages(), sync.data.agent))
-  const [slot, setSlot] = createStore({
+  const [timeoutDone, setTimeoutDone] = createSignal(true)
-    open: false,
+
-    show: false,
+  const workingStatus = createMemo<"hidden" | "showing" | "hiding">((prev) => {
-    fade: false,
+    if (working()) return "showing"
    if (prev === "showing" || !timeoutDone()) return "hiding"
    return "hidden"
  })
-  let f: number | undefined
+  createEffect(() => {
-  const clear = () => {
+    if (workingStatus() !== "hiding") return
-    if (f !== undefined) window.clearTimeout(f)
+
-    f = undefined
+    setTimeoutDone(false)
-  }
+    makeTimer(() => setTimeoutDone(true), 260, setTimeout)
  })
  onCleanup(clear)
  createEffect(
    on(
      working,
      (on, prev) => {
        clear()
        if (on) {
          setSlot({ open: true, show: true, fade: false })
          return
        }
        if (prev) {
          setSlot({ open: false, show: true, fade: true })
          f = window.setTimeout(() => setSlot({ show: false, fade: false }), 260)
          return
        }
        setSlot({ open: false, show: false, fade: false })
      },
      { defer: true },
    ),
  )
  const activeMessageID = createMemo(() => {
    const parentID = pending()?.parentID
    if (parentID) {
@@ -321,7 +306,6 @@ export function MessageTimeline(props: {
  const [title, setTitle] = createStore({
    draft: "",
    editing: false,
    saving: false,
    menuOpen: false,
    pendingRename: false,
    pendingShare: false,
@@ -335,38 +319,6 @@ export function MessageTimeline(props: {
  let more: HTMLButtonElement | undefined
  const [req, setReq] = createStore({ share: false, unshare: false })
  const shareSession = () => {
    const id = sessionID()
    if (!id || req.share) return
    if (!shareEnabled()) return
    setReq("share", true)
    globalSDK.client.session
      .share({ sessionID: id, directory: sdk.directory })
      .catch((err: unknown) => {
        console.error("Failed to share session", err)
      })
      .finally(() => {
        setReq("share", false)
      })
  }
  const unshareSession = () => {
    const id = sessionID()
    if (!id || req.unshare) return
    if (!shareEnabled()) return
    setReq("unshare", true)
    globalSDK.client.session
      .unshare({ sessionID: id, directory: sdk.directory })
      .catch((err: unknown) => {
        console.error("Failed to unshare session", err)
      })
      .finally(() => {
        setReq("unshare", false)
      })
  }
  const viewShare = () => {
    const url = shareUrl()
    if (!url) return
@@ -382,6 +334,54 @@ export function MessageTimeline(props: {
    return language.t("common.requestFailed")
  }
  const shareMutation = useMutation(() => ({
    mutationFn: (id: string) => globalSDK.client.session.share({ sessionID: id, directory: sdk.directory }),
    onError: (err) => {
      console.error("Failed to share session", err)
    },
  }))
  const unshareMutation = useMutation(() => ({
    mutationFn: (id: string) => globalSDK.client.session.unshare({ sessionID: id, directory: sdk.directory }),
    onError: (err) => {
      console.error("Failed to unshare session", err)
    },
  }))
  const titleMutation = useMutation(() => ({
    mutationFn: (input: { id: string; title: string }) =>
      sdk.client.session.update({ sessionID: input.id, title: input.title }),
    onSuccess: (_, input) => {
      sync.set(
        produce((draft) => {
          const index = draft.session.findIndex((s) => s.id === input.id)
          if (index !== -1) draft.session[index].title = input.title
        }),
      )
      setTitle("editing", false)
    },
    onError: (err) => {
      showToast({
        title: language.t("common.requestFailed"),
        description: errorMessage(err),
      })
    },
  }))
  const shareSession = () => {
    const id = sessionID()
    if (!id || shareMutation.isPending) return
    if (!shareEnabled()) return
    shareMutation.mutate(id)
  }
  const unshareSession = () => {
    const id = sessionID()
    if (!id || unshareMutation.isPending) return
    if (!shareEnabled()) return
    unshareMutation.mutate(id)
  }
  createEffect(
    on(
      sessionKey,
@@ -389,7 +389,6 @@ export function MessageTimeline(props: {
        setTitle({
          draft: "",
          editing: false,
          saving: false,
          menuOpen: false,
          pendingRename: false,
          pendingShare: false,
@@ -408,40 +407,22 @@ export function MessageTimeline(props: {
  }
  const closeTitleEditor = () => {
-    if (title.saving) return
+    if (titleMutation.isPending) return
-    setTitle({ editing: false, saving: false })
+    setTitle("editing", false)
  }
-  const saveTitleEditor = async () => {
+  const saveTitleEditor = () => {
    const id = sessionID()
    if (!id) return
-    if (title.saving) return
+    if (titleMutation.isPending) return
    const next = title.draft.trim()
    if (!next || next === (titleValue() ?? "")) {
-      setTitle({ editing: false, saving: false })
+      setTitle("editing", false)
      return
    }
-    setTitle("saving", true)
+    titleMutation.mutate({ id, title: next })
    await sdk.client.session
      .update({ sessionID: id, title: next })
      .then(() => {
        sync.set(
          produce((draft) => {
            const index = draft.session.findIndex((s) => s.id === id)
            if (index !== -1) draft.session[index].title = next
          }),
        )
        setTitle({ editing: false, saving: false })
      })
      .catch((err) => {
        setTitle("saving", false)
        showToast({
          title: language.t("common.requestFailed"),
          description: errorMessage(err),
        })
      })
  }
  const navigateAfterSessionRemoval = (sessionID: string, parentID?: string, nextSessionID?: string) => {
@@ -679,17 +660,15 @@ export function MessageTimeline(props: {
                      <div
                        class="shrink-0 flex items-center justify-center overflow-hidden transition-[width,margin] duration-300 ease-[cubic-bezier(0.22,1,0.36,1)]"
                        style={{
-                          width: slot.open ? "16px" : "0px",
+                          width: working() ? "16px" : "0px",
-                          "margin-right": slot.open ? "8px" : "0px",
+                          "margin-right": working() ? "8px" : "0px",
                        }}
                        aria-hidden="true"
                      >
-                        <Show when={slot.show}>
+                        <Show when={workingStatus() !== "hidden"}>
                          <div
                            class="transition-opacity duration-200 ease-out"
-                            classList={{
+                            classList={{ "opacity-0": workingStatus() === "hiding" }}
                              "opacity-0": slot.fade,
                            }}
                          >
                            <Spinner class="size-4" style={{ color: tint() ?? "var(--icon-interactive-base)" }} />
                          </div>
@@ -712,7 +691,7 @@ export function MessageTimeline(props: {
                              titleRef = el
                            }}
                            value={title.draft}
-                            disabled={title.saving}
+                            disabled={titleMutation.isPending}
                            class="text-14-medium text-text-strong grow-1 min-w-0 rounded-[6px]"
                            style={{ "--inline-input-shadow": "var(--shadow-xs-border-select)" }}
                            onInput={(event) => setTitle("draft", event.currentTarget.value)}
@@ -863,9 +842,9 @@ export function MessageTimeline(props: {
                                        variant="primary"
                                        class="w-full"
                                        onClick={shareSession}
-                                        disabled={req.share}
+                                        disabled={shareMutation.isPending}
                                      >
-                                        {req.share
+                                        {shareMutation.isPending
                                          ? language.t("session.share.action.publishing")
                                          : language.t("session.share.action.publish")}
                                      </Button>
@@ -886,9 +865,9 @@ export function MessageTimeline(props: {
                                          variant="secondary"
                                          class="w-full shadow-none border border-border-weak-base"
                                          onClick={unshareSession}
-                                          disabled={req.unshare}
+                                          disabled={unshareMutation.isPending}
                                        >
-                                          {req.unshare
+                                          {unshareMutation.isPending
                                            ? language.t("session.share.action.unpublishing")
                                            : language.t("session.share.action.unpublish")}
                                        </Button>
@@ -897,7 +876,7 @@ export function MessageTimeline(props: {
                                          variant="primary"
                                          class="w-full"
                                          onClick={viewShare}
-                                          disabled={req.unshare}
+                                          disabled={unshareMutation.isPending}
                                        >
                                          {language.t("session.share.action.view")}
                                        </Button>
@@ -915,7 +894,6 @@ export function MessageTimeline(props: {
                </div>
              </div>
            </Show>
            <div
              role="log"
              class="flex flex-col gap-12 items-start justify-start pb-16 transition-[margin]"
@@ -945,7 +923,15 @@ export function MessageTimeline(props: {
                {(messageID) => {
                  const active = createMemo(() => activeMessageID() === messageID)
                  const comments = createMemo(() => messageComments(sync.data.part[messageID] ?? []), [], {
-                    equals: (a, b) => JSON.stringify(a) === JSON.stringify(b),
+                    equals: (a, b) =>
                      a.length === b.length &&
                      a.every(
                        (c, i) =>
                          c.path === b[i].path &&
                          c.comment === b[i].comment &&
                          c.selection?.startLine === b[i].selection?.startLine &&
                          c.selection?.endLine === b[i].selection?.endLine,
                      ),
                  })
                  const commentCount = createMemo(() => comments().length)
                  return (
@@ -1001,6 +987,7 @@ export function MessageTimeline(props: {
                      <SessionTurn
                        sessionID={sessionID() ?? ""}
                        messageID={messageID}
                        messages={sessionMessages()}
                        actions={props.actions}
                        active={active()}
                        status={active() ? sessionStatus() : undefined}
@@ -438,12 +438,10 @@ export function SessionSidePanel(props: {
                  size={layout.fileTree.width()}
                  min={200}
                  max={480}
                  collapseThreshold={160}
                  onResize={(width) => {
                    props.size.touch()
                    layout.fileTree.resize(width)
                  }}
                  onCollapse={layout.fileTree.close}
                />
              </div>
            </Show>
@@ -255,7 +255,7 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
        id: "file.open",
        title: language.t("command.file.open"),
        description: language.t("palette.search.placeholder"),
-        keybind: "mod+p",
+        keybind: "mod+k,mod+p",
        slash: "open",
        onSelect: () => dialog.show(() => <DialogSelectFile onOpenFile={showAllFiles} />),
      }),
@@ -0,0 +1,44 @@
 import { describe, expect, test } from "bun:test"
 import type { Part } from "@opencode-ai/sdk/v2"
 import { extractPromptFromParts } from "./prompt"
 describe("extractPromptFromParts", () => {
  test("restores multiple uploaded attachments", () => {
    const parts = [
      {
        id: "text_1",
        type: "text",
        text: "check these",
        sessionID: "ses_1",
        messageID: "msg_1",
      },
      {
        id: "file_1",
        type: "file",
        mime: "image/png",
        url: "data:image/png;base64,AAA",
        filename: "a.png",
        sessionID: "ses_1",
        messageID: "msg_1",
      },
      {
        id: "file_2",
        type: "file",
        mime: "application/pdf",
        url: "data:application/pdf;base64,BBB",
        filename: "b.pdf",
        sessionID: "ses_1",
        messageID: "msg_1",
      },
    ] satisfies Part[]
    const result = extractPromptFromParts(parts)
    expect(result).toHaveLength(3)
    expect(result[0]).toMatchObject({ type: "text", content: "check these" })
    expect(result.slice(1)).toMatchObject([
      { type: "image", filename: "a.png", mime: "image/png", dataUrl: "data:image/png;base64,AAA" },
      { type: "image", filename: "b.pdf", mime: "application/pdf", dataUrl: "data:application/pdf;base64,BBB" },
    ])
  })
 })
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.2.27",
+  "version": "1.3.2",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -2,6 +2,6 @@ import { redirect } from "@solidjs/router"
 export async function GET() {
  return redirect(
-    "https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=de8k6664-1b5e-43f2-8efd-21d6772647b5&qr_code=true",
+    "https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=738j8655-cd59-4633-a30a-1124e0096789&qr_code=true",
  )
 }
@@ -24,7 +24,13 @@ import {
  FreeUsageLimitError,
  SubscriptionUsageLimitError,
 } from "./error"
-import { createBodyConverter, createStreamPartConverter, createResponseConverter, UsageInfo } from "./provider/provider"
+import {
  buildCostChunk,
  createBodyConverter,
  createStreamPartConverter,
  createResponseConverter,
  UsageInfo,
 } from "./provider/provider"
 import { anthropicHelper } from "./provider/anthropic"
 import { googleHelper } from "./provider/google"
 import { openaiHelper } from "./provider/openai"
@@ -90,7 +96,7 @@ export async function handler(
    const projectId = input.request.headers.get("x-opencode-project") ?? ""
    const ocClient = input.request.headers.get("x-opencode-client") ?? ""
    logger.metric({
-      is_tream: isStream,
+      is_stream: isStream,
      session: sessionId,
      request: requestId,
      client: ocClient,
@@ -230,7 +236,7 @@ export async function handler(
      const body = JSON.stringify(
        responseConverter({
          ...json,
-          cost: calculateOccuredCost(billingSource, costInfo),
+          cost: calculateOccurredCost(billingSource, costInfo),
        }),
      )
      logger.metric({ response_length: body.length })
@@ -274,8 +280,8 @@ export async function handler(
                  await trialLimiter?.track(usageInfo)
                  await trackUsage(sessionId, billingSource, authInfo, modelInfo, providerInfo, usageInfo, costInfo)
                  await reload(billingSource, authInfo, costInfo)
-                  const cost = calculateOccuredCost(billingSource, costInfo)
+                  const cost = calculateOccurredCost(billingSource, costInfo)
-                  c.enqueue(encoder.encode(usageParser.buidlCostChunk(cost)))
+                  c.enqueue(encoder.encode(buildCostChunk(opts.format, cost)))
                }
                c.close()
                return
@@ -334,6 +340,13 @@ export async function handler(
      "error.message": error.message,
      "error.cause": error.cause?.toString(),
    })
    if (error.message.startsWith("Failed query")) {
      try {
        logger.metric({
          "error.cause2": JSON.stringify(error.cause),
        })
      } catch (e) {}
    }
    // Note: both top level "type" and "error.type" fields are used by the @ai-sdk/anthropic client to render the error message.
    if (
@@ -455,12 +468,17 @@ export async function handler(
      ...modelProvider,
      ...zenData.providers[modelProvider.id],
      ...(() => {
-        const format = zenData.providers[modelProvider.id].format
+        const providerProps = zenData.providers[modelProvider.id]
        const format = providerProps.format
        const providerModel = modelProvider.model
        if (format === "anthropic") return anthropicHelper({ reqModel, providerModel })
        if (format === "google") return googleHelper({ reqModel, providerModel })
        if (format === "openai") return openaiHelper({ reqModel, providerModel })
-        return oaCompatHelper({ reqModel, providerModel })
+        return oaCompatHelper({
          reqModel,
          providerModel,
          adjustCacheUsage: providerProps.adjustCacheUsage,
        })
      })(),
    }
  }
@@ -818,7 +836,7 @@ export async function handler(
    }
  }
-  function calculateOccuredCost(billingSource: BillingSource, costInfo: CostInfo) {
+  function calculateOccurredCost(billingSource: BillingSource, costInfo: CostInfo) {
    return billingSource === "balance" ? (costInfo.totalCostInCent / 100).toFixed(8) : "0"
  }
@@ -20,6 +20,7 @@ export const anthropicHelper: ProviderHelper = ({ reqModel, providerModel }) =>
  const isBedrockModelArn = providerModel.startsWith("arn:aws:bedrock:")
  const isBedrockModelID = providerModel.startsWith("global.anthropic.")
  const isBedrock = isBedrockModelArn || isBedrockModelID
  const isDatabricks = providerModel.startsWith("databricks-claude-")
  const supports1m = reqModel.includes("sonnet") || reqModel.includes("opus-4-6")
  return {
    format: "anthropic",
@@ -28,7 +29,7 @@ export const anthropicHelper: ProviderHelper = ({ reqModel, providerModel }) =>
        ? `${providerApi}/model/${isBedrockModelArn ? encodeURIComponent(providerModel) : providerModel}/${isStream ? "invoke-with-response-stream" : "invoke"}`
        : providerApi + "/messages",
    modifyHeaders: (headers: Headers, body: Record<string, any>, apiKey: string) => {
-      if (isBedrock) {
+      if (isBedrock || isDatabricks) {
        headers.set("Authorization", `Bearer ${apiKey}`)
      } else {
        headers.set("x-api-key", apiKey)
@@ -47,6 +48,11 @@ export const anthropicHelper: ProviderHelper = ({ reqModel, providerModel }) =>
            model: undefined,
            stream: undefined,
          }
        : isDatabricks
          ? {
              anthropic_version: "bedrock-2023-05-31",
              anthropic_beta: supports1m ? ["context-1m-2025-08-07"] : undefined,
            }
          : {
              service_tier: "standard_only",
            }),
@@ -167,7 +173,6 @@ export const anthropicHelper: ProviderHelper = ({ reqModel, providerModel }) =>
          }
        },
        retrieve: () => usage,
        buidlCostChunk: (cost: string) => `event: ping\ndata: ${JSON.stringify({ type: "ping", cost })}\n\n`,
      }
    },
    normalizeUsage: (usage: Usage) => ({
@@ -56,7 +56,6 @@ export const googleHelper: ProviderHelper = ({ providerModel }) => ({
        usage = json.usageMetadata
      },
      retrieve: () => usage,
      buidlCostChunk: (cost: string) => `data: ${JSON.stringify({ type: "ping", cost })}\n\n`,
    }
  },
  normalizeUsage: (usage: Usage) => {
@@ -21,7 +21,7 @@ type Usage = {
  }
 }
-export const oaCompatHelper: ProviderHelper = () => ({
+export const oaCompatHelper: ProviderHelper = ({ adjustCacheUsage }) => ({
  format: "oa-compat",
  modifyUrl: (providerApi: string) => providerApi + "/chat/completions",
  modifyHeaders: (headers: Headers, body: Record<string, any>, apiKey: string) => {
@@ -54,14 +54,18 @@ export const oaCompatHelper: ProviderHelper = () => ({
        usage = json.usage
      },
      retrieve: () => usage,
      buidlCostChunk: (cost: string) => `data: ${JSON.stringify({ choices: [], cost })}\n\n`,
    }
  },
  normalizeUsage: (usage: Usage) => {
-    const inputTokens = usage.prompt_tokens ?? 0
+    let inputTokens = usage.prompt_tokens ?? 0
    const outputTokens = usage.completion_tokens ?? 0
    const reasoningTokens = usage.completion_tokens_details?.reasoning_tokens ?? undefined
-    const cacheReadTokens = usage.cached_tokens ?? usage.prompt_tokens_details?.cached_tokens ?? undefined
+    let cacheReadTokens = usage.cached_tokens ?? usage.prompt_tokens_details?.cached_tokens ?? undefined
    if (adjustCacheUsage && !cacheReadTokens) {
      cacheReadTokens = Math.floor(inputTokens * 0.9)
    }
    return {
      inputTokens: inputTokens - (cacheReadTokens ?? 0),
      outputTokens,
@@ -44,7 +44,6 @@ export const openaiHelper: ProviderHelper = () => ({
        usage = json.response.usage
      },
      retrieve: () => usage,
      buidlCostChunk: (cost: string) => `event: ping\ndata: ${JSON.stringify({ type: "ping", cost })}\n\n`,
    }
  },
  normalizeUsage: (usage: Usage) => {
@@ -33,7 +33,7 @@ export type UsageInfo = {
  cacheWrite1hTokens?: number
 }
-export type ProviderHelper = (input: { reqModel: string; providerModel: string }) => {
+export type ProviderHelper = (input: { reqModel: string; providerModel: string; adjustCacheUsage?: boolean }) => {
  format: ZenData.Format
  modifyUrl: (providerApi: string, isStream?: boolean) => string
  modifyHeaders: (headers: Headers, body: Record<string, any>, apiKey: string) => void
@@ -43,7 +43,6 @@ export type ProviderHelper = (input: { reqModel: string; providerModel: string }
  createUsageParser: () => {
    parse: (chunk: string) => void
    retrieve: () => any
    buidlCostChunk: (cost: string) => string
  }
  normalizeUsage: (usage: any) => UsageInfo
 }
@@ -162,6 +161,19 @@ export interface CommonChunk {
  }
 }
 export function buildCostChunk(format: ZenData.Format, cost: string): string {
  switch (format) {
    case "anthropic":
      return `event: ping\ndata: ${JSON.stringify({ type: "ping", cost })}\n\n`
    case "openai":
      return `event: ping\ndata: ${JSON.stringify({ type: "ping", cost })}\n\n`
    case "oa-compat":
      return `data: ${JSON.stringify({ choices: [], cost })}\n\n`
    default:
      return `data: ${JSON.stringify({ type: "ping", cost })}\n\n`
  }
 }
 export function createBodyConverter(from: ZenData.Format, to: ZenData.Format) {
  return (body: any): any => {
    if (from === to) return body
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.2.27",
+  "version": "1.3.2",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -42,7 +42,7 @@
  "devDependencies": {
    "@cloudflare/workers-types": "catalog:",
    "@tsconfig/node22": "22.0.2",
-    "@types/bun": "1.3.0",
+    "@types/bun": "catalog:",
    "@types/node": "catalog:",
    "drizzle-kit": "catalog:",
    "mysql2": "3.14.4",
@@ -1,7 +1,14 @@
 import { Database, and, eq, sql } from "../src/drizzle/index.js"
 import { AuthTable } from "../src/schema/auth.sql.js"
 import { UserTable } from "../src/schema/user.sql.js"
-import { BillingTable, PaymentTable, SubscriptionTable, BlackPlans, UsageTable } from "../src/schema/billing.sql.js"
+import {
  BillingTable,
  PaymentTable,
  SubscriptionTable,
  BlackPlans,
  UsageTable,
  LiteTable,
 } from "../src/schema/billing.sql.js"
 import { WorkspaceTable } from "../src/schema/workspace.sql.js"
 import { KeyTable } from "../src/schema/key.sql.js"
 import { BlackData } from "../src/black.js"
@@ -72,11 +79,13 @@ else {
        workspaceID: UserTable.workspaceID,
        workspaceName: WorkspaceTable.name,
        role: UserTable.role,
-        subscribed: SubscriptionTable.timeCreated,
+        black: SubscriptionTable.timeCreated,
        lite: LiteTable.timeCreated,
      })
      .from(UserTable)
      .rightJoin(WorkspaceTable, eq(WorkspaceTable.id, UserTable.workspaceID))
      .leftJoin(SubscriptionTable, eq(SubscriptionTable.userID, UserTable.id))
      .leftJoin(LiteTable, eq(LiteTable.userID, UserTable.id))
      .where(eq(UserTable.accountID, accountID))
      .then((rows) =>
        rows.map((row) => ({
@@ -84,7 +93,8 @@ else {
          workspaceID: row.workspaceID,
          workspaceName: row.workspaceName,
          role: row.role,
-          subscribed: formatDate(row.subscribed),
+          black: formatDate(row.black),
          lite: formatDate(row.lite),
        })),
      ),
  )
@@ -151,13 +161,14 @@ async function printWorkspace(workspaceID: string) {
        balance: BillingTable.balance,
        customerID: BillingTable.customerID,
        reload: BillingTable.reload,
-        subscriptionID: BillingTable.subscriptionID,
+        blackSubscriptionID: BillingTable.subscriptionID,
-        subscription: {
+        blackSubscription: {
          plan: BillingTable.subscriptionPlan,
          booked: BillingTable.timeSubscriptionBooked,
          enrichment: BillingTable.subscription,
        },
-        timeSubscriptionSelected: BillingTable.timeSubscriptionSelected,
+        timeBlackSubscriptionSelected: BillingTable.timeSubscriptionSelected,
        liteSubscriptionID: BillingTable.liteSubscriptionID,
      })
      .from(BillingTable)
      .where(eq(BillingTable.workspaceID, workspace.id))
@@ -167,16 +178,21 @@ async function printWorkspace(workspaceID: string) {
            balance: `$${(row.balance / 100000000).toFixed(2)}`,
            reload: row.reload ? "yes" : "no",
            customerID: row.customerID,
-            subscriptionID: row.subscriptionID,
+            liteSubscriptionID: row.liteSubscriptionID,
-            subscription: row.subscriptionID
+            blackSubscriptionID: row.blackSubscriptionID,
            blackSubscription: row.blackSubscriptionID
              ? [
-                  `Black ${row.subscription.enrichment!.plan}`,
+                  `Black ${row.blackSubscription.enrichment!.plan}`,
-                  row.subscription.enrichment!.seats > 1 ? `X ${row.subscription.enrichment!.seats} seats` : "",
+                  row.blackSubscription.enrichment!.seats > 1
-                  row.subscription.enrichment!.coupon ? `(coupon: ${row.subscription.enrichment!.coupon})` : "",
+                    ? `X ${row.blackSubscription.enrichment!.seats} seats`
-                  `(ref: ${row.subscriptionID})`,
+                    : "",
                  row.blackSubscription.enrichment!.coupon
                    ? `(coupon: ${row.blackSubscription.enrichment!.coupon})`
                    : "",
                  `(ref: ${row.blackSubscriptionID})`,
                ].join(" ")
-              : row.subscription.booked
+              : row.blackSubscription.booked
-                ? `Waitlist ${row.subscription.plan} plan${row.timeSubscriptionSelected ? " (selected)" : ""}`
+                ? `Waitlist ${row.blackSubscription.plan} plan${row.timeBlackSubscriptionSelected ? " (selected)" : ""}`
                : undefined,
          }))[0],
      ),
@@ -48,6 +48,7 @@ export namespace ZenData {
    headerMappings: z.record(z.string(), z.string()).optional(),
    payloadModifier: z.record(z.string(), z.any()).optional(),
    payloadMappings: z.record(z.string(), z.string()).optional(),
    adjustCacheUsage: z.boolean().optional(),
  })
  const ModelsSchema = z.object({
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.2.27",
+  "version": "1.3.2",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.2.27",
+  "version": "1.3.2",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -4,7 +4,7 @@ FROM ${REGISTRY}/build/base:24.04
 SHELL ["/bin/bash", "-lc"]
 ARG NODE_VERSION=24.4.0
-ARG BUN_VERSION=1.3.5
+ARG BUN_VERSION=1.3.11
 ENV BUN_INSTALL=/opt/bun
 ENV PATH=/opt/bun/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop-electron",
  "private": true,
-  "version": "1.2.27",
+  "version": "1.3.2",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
@@ -35,6 +35,7 @@ export type CommandEvent =
 export type SqliteMigrationProgress = { type: "InProgress"; value: number } | { type: "Done" }
 export type CommandChild = {
  pid: number | undefined
  kill: () => void
 }
@@ -191,7 +192,7 @@ export function spawnCommand(args: string, extraEnv: Record<string, string>) {
    treeKill(child.pid)
  }
-  return { events, child: { kill }, exit }
+  return { events, child: { pid: child.pid, kill }, exit }
 }
 function handleSqliteProgress(events: EventEmitter, line: string) {
@@ -81,6 +81,17 @@ function setupApp() {
    killSidecar()
  })
  app.on("will-quit", () => {
    killSidecar()
  })
  for (const signal of ["SIGINT", "SIGTERM"] as const) {
    process.on(signal, () => {
      killSidecar()
      app.exit(0)
    })
  }
  void app.whenReady().then(async () => {
    // migrate()
    app.setAsDefaultProtocolClient("opencode")
@@ -234,8 +245,15 @@ registerIpcHandlers({
 function killSidecar() {
  if (!sidecar) return
  const pid = sidecar.pid
  sidecar.kill()
  sidecar = null
  // tree-kill is async; also send process group signal as immediate fallback
  if (pid && process.platform !== "win32") {
    try {
      process.kill(-pid, "SIGTERM")
    } catch {}
  }
 }
 function ensureLoopbackNoProxy() {
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.2.27",
+  "version": "1.3.2",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.2.27",
+  "version": "1.3.2",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 id = "opencode"
 name = "OpenCode"
 description = "The open source coding agent."
-version = "1.2.27"
+version = "1.3.2"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/anomalyco/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
 icon = "./icons/opencode.svg"
 [agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.27/opencode-darwin-arm64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.2/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]
 [agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.27/opencode-darwin-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.2/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]
 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.27/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.2/opencode-linux-arm64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]
 [agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.27/opencode-linux-x64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.2/opencode-linux-x64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]
 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.27/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.2/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.2.27",
+  "version": "1.3.2",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.2.27",
+  "version": "1.3.2",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
@@ -89,8 +89,6 @@
    "@ai-sdk/xai": "2.0.51",
    "@aws-sdk/credential-providers": "3.993.0",
    "@clack/prompts": "1.0.0-alpha.1",
    "gitlab-ai-provider": "5.2.2",
    "opencode-gitlab-auth": "2.0.0",
    "@effect/platform-node": "catalog:",
    "@hono/standard-validator": "0.1.5",
    "@hono/zod-validator": "catalog:",
@@ -103,8 +101,8 @@
    "@opencode-ai/sdk": "workspace:*",
    "@opencode-ai/util": "workspace:*",
    "@openrouter/ai-sdk-provider": "1.5.4",
-    "@opentui/core": "0.1.87",
+    "@opentui/core": "0.1.90",
-    "@opentui/solid": "0.1.87",
+    "@opentui/solid": "0.1.90",
    "@parcel/watcher": "2.5.1",
    "@pierre/diffs": "catalog:",
    "@solid-primitives/event-bus": "1.1.2",
@@ -123,6 +121,7 @@
    "drizzle-orm": "catalog:",
    "effect": "catalog:",
    "fuzzysort": "3.1.0",
    "gitlab-ai-provider": "5.3.2",
    "glob": "13.0.5",
    "google-auth-library": "10.5.0",
    "gray-matter": "4.0.3",
@@ -133,8 +132,10 @@
    "mime-types": "3.0.2",
    "minimatch": "10.0.3",
    "open": "10.1.2",
    "opencode-gitlab-auth": "2.0.0",
    "opentui-spinner": "0.0.6",
    "partial-json": "0.1.7",
    "opencode-poe-auth": "0.0.1",
    "remeda": "catalog:",
    "semver": "^7.6.3",
    "solid-js": "catalog:",
@@ -101,6 +101,14 @@ export default {
        ],
      },
    },
    {
      filetype: "kotlin",
      wasm: "https://github.com/fwcd/tree-sitter-kotlin/releases/download/0.3.8/tree-sitter-kotlin.wasm",
      queries: {
        highlights: ["https://raw.githubusercontent.com/fwcd/tree-sitter-kotlin/0.3.8/queries/highlights.scm"],
        locals: ["https://raw.githubusercontent.com/nvim-treesitter/nvim-treesitter/master/queries/kotlin/locals.scm"],
      },
    },
    {
      filetype: "ruby",
      wasm: "https://github.com/tree-sitter/tree-sitter-ruby/releases/download/v0.23.1/tree-sitter-ruby.wasm",
@@ -158,6 +166,15 @@ export default {
      //   },
      // },
    },
    {
      filetype: "hcl",
      wasm: "https://github.com/tree-sitter-grammars/tree-sitter-hcl/releases/download/v1.2.0/tree-sitter-hcl.wasm",
      queries: {
        highlights: [
          "https://raw.githubusercontent.com/nvim-treesitter/nvim-treesitter/master/queries/hcl/highlights.scm",
        ],
      },
    },
    {
      filetype: "json",
      wasm: "https://github.com/tree-sitter/tree-sitter-json/releases/download/v0.24.8/tree-sitter-json.wasm",
@@ -203,6 +220,16 @@ export default {
        ],
      },
    },
    {
      filetype: "lua",
      wasm: "https://github.com/tree-sitter-grammars/tree-sitter-lua/releases/download/v0.5.0/tree-sitter-lua.wasm",
      queries: {
        highlights: [
          "https://raw.githubusercontent.com/tree-sitter-grammars/tree-sitter-lua/v0.5.0/queries/highlights.scm",
        ],
        locals: ["https://raw.githubusercontent.com/tree-sitter-grammars/tree-sitter-lua/v0.5.0/queries/locals.scm"],
      },
    },
    {
      filetype: "ocaml",
      wasm: "https://github.com/tree-sitter/tree-sitter-ocaml/releases/download/v0.24.2/tree-sitter-ocaml.wasm",
@@ -236,6 +263,15 @@ export default {
        ],
      },
    },
    {
      filetype: "toml",
      wasm: "https://github.com/tree-sitter-grammars/tree-sitter-toml/releases/download/v0.7.0/tree-sitter-toml.wasm",
      queries: {
        highlights: [
          "https://raw.githubusercontent.com/nvim-treesitter/nvim-treesitter/master/queries/toml/highlights.scm",
        ],
      },
    },
    {
      filetype: "nix",
      // TODO: Replace with official tree-sitter-nix WASM when published
@@ -21,10 +21,14 @@ const modelsData = process.env.MODELS_DEV_API_JSON
  ? await Bun.file(process.env.MODELS_DEV_API_JSON).text()
  : await fetch(`${modelsUrl}/api.json`).then((x) => x.text())
 await Bun.write(
-  path.join(dir, "src/provider/models-snapshot.ts"),
+  path.join(dir, "src/provider/models-snapshot.js"),
-  `// Auto-generated by build.ts - do not edit\nexport const snapshot = ${modelsData} as const\n`,
+  `// @ts-nocheck\n// Auto-generated by build.ts - do not edit\nexport const snapshot = ${modelsData}\n`,
 )
-console.log("Generated models-snapshot.ts")
+await Bun.write(
  path.join(dir, "src/provider/models-snapshot.d.ts"),
  `// Auto-generated by build.ts - do not edit\nexport declare const snapshot: Record<string, unknown>\n`,
 )
 console.log("Generated models-snapshot.js")
 // Load migrations from migration directories
 const migrationDirs = (
@@ -59,6 +63,10 @@ console.log(`Loaded ${migrations.length} migrations`)
 const singleFlag = process.argv.includes("--single")
 const baselineFlag = process.argv.includes("--baseline")
 const skipInstall = process.argv.includes("--skip-install")
 const skipUpload = process.argv.includes("--skip-release-upload") || process.env.OPENCODE_SKIP_RELEASE_UPLOAD === "1"
 const sign = process.env.APPLE_SIGNING_IDENTITY
 const entitlements = process.env.OPENCODE_CODESIGN_ENTITLEMENTS || path.join(dir, "script/entitlements.plist")
 const raw = process.env.OPENCODE_BUILD_OS?.trim()
 const allTargets: {
  os: string
@@ -144,6 +152,31 @@ const targets = singleFlag
    })
  : allTargets
 const os = raw
  ? Array.from(
      new Set(
        raw
          .split(",")
          .map((x) => x.trim())
          .filter(Boolean),
      ),
    )
  : undefined
 if (os) {
  const set = new Set(allTargets.map((item) => item.os))
  const bad = os.filter((item) => !set.has(item))
  if (bad.length > 0) {
    throw new Error(`Invalid OPENCODE_BUILD_OS value: ${bad.join(", ")}`)
  }
 }
 const list = os ? targets.filter((item) => os.includes(item.os)) : targets
 if (list.length === 0) {
  throw new Error("No build targets selected")
 }
 await $`rm -rf dist`
 const binaries: Record<string, string> = {}
@@ -151,7 +184,7 @@ if (!skipInstall) {
  await $`bun install --os="*" --cpu="*" @opentui/core@${pkg.dependencies["@opentui/core"]}`
  await $`bun install --os="*" --cpu="*" @parcel/watcher@${pkg.dependencies["@parcel/watcher"]}`
 }
-for (const item of targets) {
+for (const item of list) {
  const name = [
    pkg.name,
    // changing to win32 flags npm for some reason
@@ -199,6 +232,37 @@ for (const item of targets) {
    },
  })
  if (item.os === "darwin") {
    if (Script.release && process.platform !== "darwin") {
      throw new Error("darwin release binaries must be built on macOS runners")
    }
    if (Script.release && !sign) {
      throw new Error("APPLE_SIGNING_IDENTITY is required for darwin release binaries")
    }
    if (process.platform === "darwin" && sign) {
      if (!fs.existsSync(entitlements)) {
        throw new Error(`Codesign entitlements file not found: ${entitlements}`)
      }
      const file = `dist/${name}/bin/opencode`
      console.log(`codesigning ${name}`)
      await $`codesign --entitlements ${entitlements} -vvvv --deep --sign ${sign} ${file} --force`
      await $`codesign -vvv --verify ${file}`
    }
  }
  // Smoke test: only run if binary is for current platform
  if (item.os === process.platform && item.arch === process.arch && !item.abi) {
    const binaryPath = `dist/${name}/bin/opencode`
    console.log(`Running smoke test: ${binaryPath} --version`)
    try {
      const versionOutput = await $`${binaryPath} --version`.text()
      console.log(`Smoke test passed: ${versionOutput.trim()}`)
    } catch (e) {
      console.error(`Smoke test failed for ${name}:`, e)
      process.exit(1)
    }
  }
  await $`rm -rf ./dist/${name}/bin/tui`
  await Bun.file(`dist/${name}/package.json`).write(
    JSON.stringify(
@@ -223,7 +287,9 @@ if (Script.release) {
      await $`zip -r ../../${key}.zip *`.cwd(`dist/${key}/bin`)
    }
  }
  if (!skipUpload) {
    await $`gh release upload v${Script.version} ./dist/*.zip ./dist/*.tar.gz --clobber --repo ${process.env.GH_REPO}`
  }
 }
 export { binaries }
@@ -0,0 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
    <key>com.apple.security.cs.allow-jit</key>
    <true/>
    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
    <true/>
    <key>com.apple.security.cs.disable-executable-page-protection</key>
    <true/>
    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
    <true/>
    <key>com.apple.security.cs.disable-library-validation</key>
    <true/>
 </dict>
 </plist>
@@ -11,7 +11,6 @@ const seed = async () => {
  const { Instance } = await import("../src/project/instance")
  const { InstanceBootstrap } = await import("../src/project/bootstrap")
  const { Config } = await import("../src/config/config")
  const { disposeRuntime } = await import("../src/effect/runtime")
  const { Session } = await import("../src/session")
  const { MessageID, PartID } = await import("../src/session/schema")
  const { Project } = await import("../src/project/project")
@@ -55,7 +54,6 @@ const seed = async () => {
    })
  } finally {
    await Instance.disposeAll().catch(() => {})
    await disposeRuntime().catch(() => {})
  }
 }
@@ -4,18 +4,18 @@ Practical reference for new and migrated Effect code in `packages/opencode`.
 ## Choose scope
-Use the shared runtime for process-wide services with one lifecycle for the whole app.
+Use `InstanceState` (from `src/effect/instance-state.ts`) for services that need per-directory state, per-instance cleanup, or project-bound background work. InstanceState uses a `ScopedCache` keyed by directory, so each open project gets its own copy of the state that is automatically cleaned up on disposal.
-Use `src/effect/instances.ts` for services that are created per directory or need `InstanceContext`, per-project state, or per-instance cleanup.
+Use `makeRunPromise` (from `src/effect/run-service.ts`) to create a per-service `ManagedRuntime` that lazily initializes and shares layers via a global `memoMap`.
- Shared runtime: config readers, stateless helpers, global clients
+- Global services (no per-directory state): Account, Auth, Installation, Truncate
- Instance-scoped: watchers, per-project caches, session state, project-bound background work
+- Instance-scoped (per-directory state via InstanceState): File, FileTime, FileWatcher, Format, Permission, Question, Skill, Snapshot, Vcs, ProviderAuth
-Rule of thumb: if two open directories should not share one copy of the service, it belongs in `Instances`.
+Rule of thumb: if two open directories should not share one copy of the service, it needs `InstanceState`.
 ## Service shape
-For a fully migrated module, use the public namespace directly:
+Every service follows the same pattern — a single namespace with the service definition, layer, `runPromise`, and async facade functions:
 ```ts
 export namespace Foo {
@@ -28,53 +28,86 @@ export namespace Foo {
  export const layer = Layer.effect(
    Service,
    Effect.gen(function* () {
-      return Service.of({
+      // For instance-scoped services:
-        get: Effect.fn("Foo.get")(function* (id) {
+      const state = yield* InstanceState.make<State>(
-          return yield* ...
+        Effect.fn("Foo.state")(() => Effect.succeed({ ... })),
-        }),
+      )
      const get = Effect.fn("Foo.get")(function* (id: FooID) {
        const s = yield* InstanceState.get(state)
        // ...
      })
      return Service.of({ get })
    }),
  )
-  export const defaultLayer = layer.pipe(Layer.provide(FooRepo.defaultLayer))
+  // Optional: wire dependencies
  export const defaultLayer = layer.pipe(Layer.provide(FooDep.layer))
  // Per-service runtime (inside the namespace)
  const runPromise = makeRunPromise(Service, defaultLayer)
  // Async facade functions
  export async function get(id: FooID) {
    return runPromise((svc) => svc.get(id))
  }
 }
 ```
 Rules:
- Keep `Interface`, `Service`, `layer`, and `defaultLayer` on the owning namespace
+- Keep everything in one namespace, one file — no separate `service.ts` / `index.ts` split
- Export `defaultLayer` only when wiring dependencies is useful
+- `runPromise` goes inside the namespace (not exported unless tests need it)
- Use the direct namespace form once the module is fully migrated
+- Facade functions are plain `async function` — no `fn()` wrappers
 - Use `Effect.fn("Namespace.method")` for all Effect functions (for tracing)
 - No `Layer.fresh` — InstanceState handles per-directory isolation
-## Temporary mixed-mode pattern
+## Schema → Zod interop
-Prefer a single namespace whenever possible.
+When a service uses Effect Schema internally but needs Zod schemas for the HTTP layer, derive Zod from Schema using the `zod()` helper from `@/util/effect-zod`:
 Use a `*Effect` namespace only when there is a real mixed-mode split, usually because a legacy boundary facade still exists or because merging everything immediately would create awkward cycles.
 ```ts
-export namespace FooEffect {
+import { zod } from "@/util/effect-zod"
  export interface Interface {
    readonly get: (id: FooID) => Effect.Effect<Foo, FooError>
  }
-  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Foo") {}
+export const ZodInfo = zod(Info) // derives z.ZodType from Schema.Union
  export const layer = Layer.effect(...)
 }
 ```
-Then keep the old boundary thin:
+See `Auth.ZodInfo` for the canonical example.
 ## InstanceState init patterns
 The `InstanceState.make` init callback receives a `Scope`, so you can use `Effect.acquireRelease`, `Effect.addFinalizer`, and `Effect.forkScoped` inside it. Resources acquired this way are automatically cleaned up when the instance is disposed or invalidated by `ScopedCache`. This makes it the right place for:
 - **Subscriptions**: Use `Effect.acquireRelease` to subscribe and auto-unsubscribe:
 ```ts
-export namespace Foo {
+const cache =
-  export function get(id: FooID) {
+  yield *
-    return runtime.runPromise(FooEffect.Service.use((svc) => svc.get(id)))
+  InstanceState.make<State>(
-  }
+    Effect.fn("Foo.state")(function* (ctx) {
      // ... load state ...
      yield* Effect.acquireRelease(
        Effect.sync(() =>
          Bus.subscribeAll((event) => {
            /* handle */
          }),
        ),
        (unsub) => Effect.sync(unsub),
      )
      return {
        /* state */
      }
    }),
  )
 ```
-Remove the `Effect` suffix when the boundary split is gone.
+- **Background fibers**: Use `Effect.forkScoped` — the fiber is interrupted on disposal.
 - **Side effects at init**: Config notification, event wiring, etc. all belong in the init closure. Callers just do `InstanceState.get(cache)` to trigger everything, and `ScopedCache` deduplicates automatically.
 The key insight: don't split init into a separate method with a `started` flag. Put everything in the `InstanceState.make` closure and let `ScopedCache` handle the run-once semantics.
 ## Scheduled Tasks
@@ -107,30 +140,31 @@ That is fine for leaf files like `schema.ts`. Keep the service surface in the ow
 ## Migration checklist
-Done now:
+Fully migrated (single namespace, InstanceState where needed, flattened facade):
- [x] `AccountEffect` (mixed-mode)
+- [x] `Account` — `account/index.ts`
- [x] `AuthEffect` (mixed-mode)
+- [x] `Auth` — `auth/index.ts` (uses `zod()` helper for Schema→Zod interop)
- [x] `TruncateEffect` (mixed-mode)
+- [x] `File` — `file/index.ts`
- [x] `Question`
+- [x] `FileTime` — `file/time.ts`
- [x] `PermissionNext`
+- [x] `FileWatcher` — `file/watcher.ts`
- [x] `ProviderAuth`
+- [x] `Format` — `format/index.ts`
- [x] `FileWatcher`
+- [x] `Installation` — `installation/index.ts`
- [x] `FileTime`
+- [x] `Permission` — `permission/index.ts`
- [x] `Format`
+- [x] `ProviderAuth` — `provider/auth.ts`
- [x] `Vcs`
+- [x] `Question` — `question/index.ts`
- [x] `Skill`
+- [x] `Skill` — `skill/index.ts`
- [x] `Discovery`
+- [x] `Snapshot` — `snapshot/index.ts`
- [x] `File`
+- [x] `Truncate` — `tool/truncate.ts`
- [x] `Snapshot`
+- [x] `Vcs` — `project/vcs.ts`
 - [x] `Discovery` — `skill/discovery.ts`
 - [x] `SessionStatus`
 Still open and likely worth migrating:
- [ ] `Plugin`
+- [x] `Plugin`
- [ ] `ToolRegistry`
+- [x] `ToolRegistry`
 - [ ] `Pty`
- [ ] `Worktree`
+- [x] `Worktree`
 - [ ] `Installation`
 - [ ] `Bus`
 - [x] `Command`
 - [ ] `Config`
@@ -139,6 +173,6 @@ Still open and likely worth migrating:
 - [ ] `SessionPrompt`
 - [ ] `SessionCompaction`
 - [ ] `Provider`
- [ ] `Project`
+- [x] `Project`
 - [ ] `LSP`
 - [ ] `MCP`
@@ -1,380 +0,0 @@
 import { Clock, Duration, Effect, Layer, Option, Schema, SchemaGetter, ServiceMap } from "effect"
 import { FetchHttpClient, HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
 import { withTransientReadRetry } from "@/util/effect-http-client"
 import { AccountRepo, type AccountRow } from "./repo"
 import {
  type AccountError,
  AccessToken,
  AccountID,
  DeviceCode,
  Info,
  RefreshToken,
  AccountServiceError,
  Login,
  Org,
  OrgID,
  PollDenied,
  PollError,
  PollExpired,
  PollPending,
  type PollResult,
  PollSlow,
  PollSuccess,
  UserCode,
 } from "./schema"
 export {
  AccountID,
  type AccountError,
  AccountRepoError,
  AccountServiceError,
  AccessToken,
  RefreshToken,
  DeviceCode,
  UserCode,
  Info,
  Org,
  OrgID,
  Login,
  PollSuccess,
  PollPending,
  PollSlow,
  PollExpired,
  PollDenied,
  PollError,
  PollResult,
 } from "./schema"
 export type AccountOrgs = {
  account: Info
  orgs: readonly Org[]
 }
 class RemoteConfig extends Schema.Class<RemoteConfig>("RemoteConfig")({
  config: Schema.Record(Schema.String, Schema.Json),
 }) {}
 const DurationFromSeconds = Schema.Number.pipe(
  Schema.decodeTo(Schema.Duration, {
    decode: SchemaGetter.transform((n) => Duration.seconds(n)),
    encode: SchemaGetter.transform((d) => Duration.toSeconds(d)),
  }),
 )
 class TokenRefresh extends Schema.Class<TokenRefresh>("TokenRefresh")({
  access_token: AccessToken,
  refresh_token: RefreshToken,
  expires_in: DurationFromSeconds,
 }) {}
 class DeviceAuth extends Schema.Class<DeviceAuth>("DeviceAuth")({
  device_code: DeviceCode,
  user_code: UserCode,
  verification_uri_complete: Schema.String,
  expires_in: DurationFromSeconds,
  interval: DurationFromSeconds,
 }) {}
 class DeviceTokenSuccess extends Schema.Class<DeviceTokenSuccess>("DeviceTokenSuccess")({
  access_token: AccessToken,
  refresh_token: RefreshToken,
  token_type: Schema.Literal("Bearer"),
  expires_in: DurationFromSeconds,
 }) {}
 class DeviceTokenError extends Schema.Class<DeviceTokenError>("DeviceTokenError")({
  error: Schema.String,
  error_description: Schema.String,
 }) {
  toPollResult(): PollResult {
    if (this.error === "authorization_pending") return new PollPending()
    if (this.error === "slow_down") return new PollSlow()
    if (this.error === "expired_token") return new PollExpired()
    if (this.error === "access_denied") return new PollDenied()
    return new PollError({ cause: this.error })
  }
 }
 const DeviceToken = Schema.Union([DeviceTokenSuccess, DeviceTokenError])
 class User extends Schema.Class<User>("User")({
  id: AccountID,
  email: Schema.String,
 }) {}
 class ClientId extends Schema.Class<ClientId>("ClientId")({ client_id: Schema.String }) {}
 class DeviceTokenRequest extends Schema.Class<DeviceTokenRequest>("DeviceTokenRequest")({
  grant_type: Schema.String,
  device_code: DeviceCode,
  client_id: Schema.String,
 }) {}
 class TokenRefreshRequest extends Schema.Class<TokenRefreshRequest>("TokenRefreshRequest")({
  grant_type: Schema.String,
  refresh_token: RefreshToken,
  client_id: Schema.String,
 }) {}
 const clientId = "opencode-cli"
 const mapAccountServiceError =
  (message = "Account service operation failed") =>
  <A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, AccountServiceError, R> =>
    effect.pipe(
      Effect.mapError((cause) =>
        cause instanceof AccountServiceError ? cause : new AccountServiceError({ message, cause }),
      ),
    )
 export namespace Account {
  export interface Interface {
    readonly active: () => Effect.Effect<Option.Option<Info>, AccountError>
    readonly list: () => Effect.Effect<Info[], AccountError>
    readonly orgsByAccount: () => Effect.Effect<readonly AccountOrgs[], AccountError>
    readonly remove: (accountID: AccountID) => Effect.Effect<void, AccountError>
    readonly use: (accountID: AccountID, orgID: Option.Option<OrgID>) => Effect.Effect<void, AccountError>
    readonly orgs: (accountID: AccountID) => Effect.Effect<readonly Org[], AccountError>
    readonly config: (
      accountID: AccountID,
      orgID: OrgID,
    ) => Effect.Effect<Option.Option<Record<string, unknown>>, AccountError>
    readonly token: (accountID: AccountID) => Effect.Effect<Option.Option<AccessToken>, AccountError>
    readonly login: (url: string) => Effect.Effect<Login, AccountError>
    readonly poll: (input: Login) => Effect.Effect<PollResult, AccountError>
  }
  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Account") {}
  export const layer: Layer.Layer<Service, never, AccountRepo | HttpClient.HttpClient> = Layer.effect(
    Service,
    Effect.gen(function* () {
      const repo = yield* AccountRepo
      const http = yield* HttpClient.HttpClient
      const httpRead = withTransientReadRetry(http)
      const httpOk = HttpClient.filterStatusOk(http)
      const httpReadOk = HttpClient.filterStatusOk(httpRead)
      const executeRead = (request: HttpClientRequest.HttpClientRequest) =>
        httpRead.execute(request).pipe(mapAccountServiceError("HTTP request failed"))
      const executeReadOk = (request: HttpClientRequest.HttpClientRequest) =>
        httpReadOk.execute(request).pipe(mapAccountServiceError("HTTP request failed"))
      const executeEffectOk = <E>(request: Effect.Effect<HttpClientRequest.HttpClientRequest, E>) =>
        request.pipe(
          Effect.flatMap((req) => httpOk.execute(req)),
          mapAccountServiceError("HTTP request failed"),
        )
      const executeEffect = <E>(request: Effect.Effect<HttpClientRequest.HttpClientRequest, E>) =>
        request.pipe(
          Effect.flatMap((req) => http.execute(req)),
          mapAccountServiceError("HTTP request failed"),
        )
      const resolveToken = Effect.fnUntraced(function* (row: AccountRow) {
        const now = yield* Clock.currentTimeMillis
        if (row.token_expiry && row.token_expiry > now) return row.access_token
        const response = yield* executeEffectOk(
          HttpClientRequest.post(`${row.url}/auth/device/token`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.schemaBodyJson(TokenRefreshRequest)(
              new TokenRefreshRequest({
                grant_type: "refresh_token",
                refresh_token: row.refresh_token,
                client_id: clientId,
              }),
            ),
          ),
        )
        const parsed = yield* HttpClientResponse.schemaBodyJson(TokenRefresh)(response).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
        const expiry = Option.some(now + Duration.toMillis(parsed.expires_in))
        yield* repo.persistToken({
          accountID: row.id,
          accessToken: parsed.access_token,
          refreshToken: parsed.refresh_token,
          expiry,
        })
        return parsed.access_token
      })
      const resolveAccess = Effect.fnUntraced(function* (accountID: AccountID) {
        const maybeAccount = yield* repo.getRow(accountID)
        if (Option.isNone(maybeAccount)) return Option.none()
        const account = maybeAccount.value
        const accessToken = yield* resolveToken(account)
        return Option.some({ account, accessToken })
      })
      const fetchOrgs = Effect.fnUntraced(function* (url: string, accessToken: AccessToken) {
        const response = yield* executeReadOk(
          HttpClientRequest.get(`${url}/api/orgs`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.bearerToken(accessToken),
          ),
        )
        return yield* HttpClientResponse.schemaBodyJson(Schema.Array(Org))(response).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
      })
      const fetchUser = Effect.fnUntraced(function* (url: string, accessToken: AccessToken) {
        const response = yield* executeReadOk(
          HttpClientRequest.get(`${url}/api/user`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.bearerToken(accessToken),
          ),
        )
        return yield* HttpClientResponse.schemaBodyJson(User)(response).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
      })
      const token = Effect.fn("Account.token")((accountID: AccountID) =>
        resolveAccess(accountID).pipe(Effect.map(Option.map((r) => r.accessToken))),
      )
      const orgsByAccount = Effect.fn("Account.orgsByAccount")(function* () {
        const accounts = yield* repo.list()
        const [errors, results] = yield* Effect.partition(
          accounts,
          (account) => orgs(account.id).pipe(Effect.map((orgs) => ({ account, orgs }))),
          { concurrency: 3 },
        )
        for (const error of errors) {
          yield* Effect.logWarning("failed to fetch orgs for account").pipe(
            Effect.annotateLogs({ error: String(error) }),
          )
        }
        return results
      })
      const orgs = Effect.fn("Account.orgs")(function* (accountID: AccountID) {
        const resolved = yield* resolveAccess(accountID)
        if (Option.isNone(resolved)) return []
        const { account, accessToken } = resolved.value
        return yield* fetchOrgs(account.url, accessToken)
      })
      const config = Effect.fn("Account.config")(function* (accountID: AccountID, orgID: OrgID) {
        const resolved = yield* resolveAccess(accountID)
        if (Option.isNone(resolved)) return Option.none()
        const { account, accessToken } = resolved.value
        const response = yield* executeRead(
          HttpClientRequest.get(`${account.url}/api/config`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.bearerToken(accessToken),
            HttpClientRequest.setHeaders({ "x-org-id": orgID }),
          ),
        )
        if (response.status === 404) return Option.none()
        const ok = yield* HttpClientResponse.filterStatusOk(response).pipe(mapAccountServiceError())
        const parsed = yield* HttpClientResponse.schemaBodyJson(RemoteConfig)(ok).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
        return Option.some(parsed.config)
      })
      const login = Effect.fn("Account.login")(function* (server: string) {
        const response = yield* executeEffectOk(
          HttpClientRequest.post(`${server}/auth/device/code`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.schemaBodyJson(ClientId)(new ClientId({ client_id: clientId })),
          ),
        )
        const parsed = yield* HttpClientResponse.schemaBodyJson(DeviceAuth)(response).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
        return new Login({
          code: parsed.device_code,
          user: parsed.user_code,
          url: `${server}${parsed.verification_uri_complete}`,
          server,
          expiry: parsed.expires_in,
          interval: parsed.interval,
        })
      })
      const poll = Effect.fn("Account.poll")(function* (input: Login) {
        const response = yield* executeEffect(
          HttpClientRequest.post(`${input.server}/auth/device/token`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.schemaBodyJson(DeviceTokenRequest)(
              new DeviceTokenRequest({
                grant_type: "urn:ietf:params:oauth:grant-type:device_code",
                device_code: input.code,
                client_id: clientId,
              }),
            ),
          ),
        )
        const parsed = yield* HttpClientResponse.schemaBodyJson(DeviceToken)(response).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
        if (parsed instanceof DeviceTokenError) return parsed.toPollResult()
        const accessToken = parsed.access_token
        const user = fetchUser(input.server, accessToken)
        const orgs = fetchOrgs(input.server, accessToken)
        const [account, remoteOrgs] = yield* Effect.all([user, orgs], { concurrency: 2 })
        // TODO: When there are multiple orgs, let the user choose
        const firstOrgID = remoteOrgs.length > 0 ? Option.some(remoteOrgs[0].id) : Option.none<OrgID>()
        const now = yield* Clock.currentTimeMillis
        const expiry = now + Duration.toMillis(parsed.expires_in)
        const refreshToken = parsed.refresh_token
        yield* repo.persistAccount({
          id: account.id,
          email: account.email,
          url: input.server,
          accessToken,
          refreshToken,
          expiry,
          orgID: firstOrgID,
        })
        return new PollSuccess({ email: account.email })
      })
      return Service.of({
        active: repo.active,
        list: repo.list,
        orgsByAccount,
        remove: repo.remove,
        use: repo.use,
        orgs,
        config,
        token,
        login,
        poll,
      })
    }),
  )
  export const defaultLayer = layer.pipe(Layer.provide(AccountRepo.layer), Layer.provide(FetchHttpClient.layer))
 }
@@ -1,34 +1,397 @@
-import { Effect, Option } from "effect"
+import { Clock, Duration, Effect, Layer, Option, Schema, SchemaGetter, ServiceMap } from "effect"
 import { FetchHttpClient, HttpClient, HttpClientRequest, HttpClientResponse } from "effect/unstable/http"
-import { Account as S, type AccountError, type AccessToken, AccountID, Info as Model, OrgID } from "./effect"
+import { makeRunPromise } from "@/effect/run-service"
 import { withTransientReadRetry } from "@/util/effect-http-client"
 import { AccountRepo, type AccountRow } from "./repo"
 import {
  type AccountError,
  AccessToken,
  AccountID,
  DeviceCode,
  Info,
  RefreshToken,
  AccountServiceError,
  Login,
  Org,
  OrgID,
  PollDenied,
  PollError,
  PollExpired,
  PollPending,
  type PollResult,
  PollSlow,
  PollSuccess,
  UserCode,
 } from "./schema"
-export { AccessToken, AccountID, OrgID } from "./effect"
+export {
  AccountID,
  type AccountError,
  AccountRepoError,
  AccountServiceError,
  AccessToken,
  RefreshToken,
  DeviceCode,
  UserCode,
  Info,
  Org,
  OrgID,
  Login,
  PollSuccess,
  PollPending,
  PollSlow,
  PollExpired,
  PollDenied,
  PollError,
  PollResult,
 } from "./schema"
-import { runtime } from "@/effect/runtime"
+export type AccountOrgs = {
-
+  account: Info
-function runSync<A>(f: (service: S.Interface) => Effect.Effect<A, AccountError>) {
+  orgs: readonly Org[]
  return runtime.runSync(S.Service.use(f))
 }
-function runPromise<A>(f: (service: S.Interface) => Effect.Effect<A, AccountError>) {
+class RemoteConfig extends Schema.Class<RemoteConfig>("RemoteConfig")({
-  return runtime.runPromise(S.Service.use(f))
+  config: Schema.Record(Schema.String, Schema.Json),
 }) {}
 const DurationFromSeconds = Schema.Number.pipe(
  Schema.decodeTo(Schema.Duration, {
    decode: SchemaGetter.transform((n) => Duration.seconds(n)),
    encode: SchemaGetter.transform((d) => Duration.toSeconds(d)),
  }),
 )
 class TokenRefresh extends Schema.Class<TokenRefresh>("TokenRefresh")({
  access_token: AccessToken,
  refresh_token: RefreshToken,
  expires_in: DurationFromSeconds,
 }) {}
 class DeviceAuth extends Schema.Class<DeviceAuth>("DeviceAuth")({
  device_code: DeviceCode,
  user_code: UserCode,
  verification_uri_complete: Schema.String,
  expires_in: DurationFromSeconds,
  interval: DurationFromSeconds,
 }) {}
 class DeviceTokenSuccess extends Schema.Class<DeviceTokenSuccess>("DeviceTokenSuccess")({
  access_token: AccessToken,
  refresh_token: RefreshToken,
  token_type: Schema.Literal("Bearer"),
  expires_in: DurationFromSeconds,
 }) {}
 class DeviceTokenError extends Schema.Class<DeviceTokenError>("DeviceTokenError")({
  error: Schema.String,
  error_description: Schema.String,
 }) {
  toPollResult(): PollResult {
    if (this.error === "authorization_pending") return new PollPending()
    if (this.error === "slow_down") return new PollSlow()
    if (this.error === "expired_token") return new PollExpired()
    if (this.error === "access_denied") return new PollDenied()
    return new PollError({ cause: this.error })
  }
 }
 const DeviceToken = Schema.Union([DeviceTokenSuccess, DeviceTokenError])
 class User extends Schema.Class<User>("User")({
  id: AccountID,
  email: Schema.String,
 }) {}
 class ClientId extends Schema.Class<ClientId>("ClientId")({ client_id: Schema.String }) {}
 class DeviceTokenRequest extends Schema.Class<DeviceTokenRequest>("DeviceTokenRequest")({
  grant_type: Schema.String,
  device_code: DeviceCode,
  client_id: Schema.String,
 }) {}
 class TokenRefreshRequest extends Schema.Class<TokenRefreshRequest>("TokenRefreshRequest")({
  grant_type: Schema.String,
  refresh_token: RefreshToken,
  client_id: Schema.String,
 }) {}
 const clientId = "opencode-cli"
 const mapAccountServiceError =
  (message = "Account service operation failed") =>
  <A, E, R>(effect: Effect.Effect<A, E, R>): Effect.Effect<A, AccountServiceError, R> =>
    effect.pipe(
      Effect.mapError((cause) =>
        cause instanceof AccountServiceError ? cause : new AccountServiceError({ message, cause }),
      ),
    )
 export namespace Account {
-  export const Info = Model
+  export interface Interface {
-  export type Info = Model
+    readonly active: () => Effect.Effect<Option.Option<Info>, AccountError>
    readonly list: () => Effect.Effect<Info[], AccountError>
    readonly orgsByAccount: () => Effect.Effect<readonly AccountOrgs[], AccountError>
    readonly remove: (accountID: AccountID) => Effect.Effect<void, AccountError>
    readonly use: (accountID: AccountID, orgID: Option.Option<OrgID>) => Effect.Effect<void, AccountError>
    readonly orgs: (accountID: AccountID) => Effect.Effect<readonly Org[], AccountError>
    readonly config: (
      accountID: AccountID,
      orgID: OrgID,
    ) => Effect.Effect<Option.Option<Record<string, unknown>>, AccountError>
    readonly token: (accountID: AccountID) => Effect.Effect<Option.Option<AccessToken>, AccountError>
    readonly login: (url: string) => Effect.Effect<Login, AccountError>
    readonly poll: (input: Login) => Effect.Effect<PollResult, AccountError>
  }
-  export function active(): Info | undefined {
+  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Account") {}
-    return Option.getOrUndefined(runSync((service) => service.active()))
+
  export const layer: Layer.Layer<Service, never, AccountRepo | HttpClient.HttpClient> = Layer.effect(
    Service,
    Effect.gen(function* () {
      const repo = yield* AccountRepo
      const http = yield* HttpClient.HttpClient
      const httpRead = withTransientReadRetry(http)
      const httpOk = HttpClient.filterStatusOk(http)
      const httpReadOk = HttpClient.filterStatusOk(httpRead)
      const executeRead = (request: HttpClientRequest.HttpClientRequest) =>
        httpRead.execute(request).pipe(mapAccountServiceError("HTTP request failed"))
      const executeReadOk = (request: HttpClientRequest.HttpClientRequest) =>
        httpReadOk.execute(request).pipe(mapAccountServiceError("HTTP request failed"))
      const executeEffectOk = <E>(request: Effect.Effect<HttpClientRequest.HttpClientRequest, E>) =>
        request.pipe(
          Effect.flatMap((req) => httpOk.execute(req)),
          mapAccountServiceError("HTTP request failed"),
        )
      const executeEffect = <E>(request: Effect.Effect<HttpClientRequest.HttpClientRequest, E>) =>
        request.pipe(
          Effect.flatMap((req) => http.execute(req)),
          mapAccountServiceError("HTTP request failed"),
        )
      const resolveToken = Effect.fnUntraced(function* (row: AccountRow) {
        const now = yield* Clock.currentTimeMillis
        if (row.token_expiry && row.token_expiry > now) return row.access_token
        const response = yield* executeEffectOk(
          HttpClientRequest.post(`${row.url}/auth/device/token`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.schemaBodyJson(TokenRefreshRequest)(
              new TokenRefreshRequest({
                grant_type: "refresh_token",
                refresh_token: row.refresh_token,
                client_id: clientId,
              }),
            ),
          ),
        )
        const parsed = yield* HttpClientResponse.schemaBodyJson(TokenRefresh)(response).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
        const expiry = Option.some(now + Duration.toMillis(parsed.expires_in))
        yield* repo.persistToken({
          accountID: row.id,
          accessToken: parsed.access_token,
          refreshToken: parsed.refresh_token,
          expiry,
        })
        return parsed.access_token
      })
      const resolveAccess = Effect.fnUntraced(function* (accountID: AccountID) {
        const maybeAccount = yield* repo.getRow(accountID)
        if (Option.isNone(maybeAccount)) return Option.none()
        const account = maybeAccount.value
        const accessToken = yield* resolveToken(account)
        return Option.some({ account, accessToken })
      })
      const fetchOrgs = Effect.fnUntraced(function* (url: string, accessToken: AccessToken) {
        const response = yield* executeReadOk(
          HttpClientRequest.get(`${url}/api/orgs`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.bearerToken(accessToken),
          ),
        )
        return yield* HttpClientResponse.schemaBodyJson(Schema.Array(Org))(response).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
      })
      const fetchUser = Effect.fnUntraced(function* (url: string, accessToken: AccessToken) {
        const response = yield* executeReadOk(
          HttpClientRequest.get(`${url}/api/user`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.bearerToken(accessToken),
          ),
        )
        return yield* HttpClientResponse.schemaBodyJson(User)(response).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
      })
      const token = Effect.fn("Account.token")((accountID: AccountID) =>
        resolveAccess(accountID).pipe(Effect.map(Option.map((r) => r.accessToken))),
      )
      const orgsByAccount = Effect.fn("Account.orgsByAccount")(function* () {
        const accounts = yield* repo.list()
        const [errors, results] = yield* Effect.partition(
          accounts,
          (account) => orgs(account.id).pipe(Effect.map((orgs) => ({ account, orgs }))),
          { concurrency: 3 },
        )
        for (const error of errors) {
          yield* Effect.logWarning("failed to fetch orgs for account").pipe(
            Effect.annotateLogs({ error: String(error) }),
          )
        }
        return results
      })
      const orgs = Effect.fn("Account.orgs")(function* (accountID: AccountID) {
        const resolved = yield* resolveAccess(accountID)
        if (Option.isNone(resolved)) return []
        const { account, accessToken } = resolved.value
        return yield* fetchOrgs(account.url, accessToken)
      })
      const config = Effect.fn("Account.config")(function* (accountID: AccountID, orgID: OrgID) {
        const resolved = yield* resolveAccess(accountID)
        if (Option.isNone(resolved)) return Option.none()
        const { account, accessToken } = resolved.value
        const response = yield* executeRead(
          HttpClientRequest.get(`${account.url}/api/config`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.bearerToken(accessToken),
            HttpClientRequest.setHeaders({ "x-org-id": orgID }),
          ),
        )
        if (response.status === 404) return Option.none()
        const ok = yield* HttpClientResponse.filterStatusOk(response).pipe(mapAccountServiceError())
        const parsed = yield* HttpClientResponse.schemaBodyJson(RemoteConfig)(ok).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
        return Option.some(parsed.config)
      })
      const login = Effect.fn("Account.login")(function* (server: string) {
        const response = yield* executeEffectOk(
          HttpClientRequest.post(`${server}/auth/device/code`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.schemaBodyJson(ClientId)(new ClientId({ client_id: clientId })),
          ),
        )
        const parsed = yield* HttpClientResponse.schemaBodyJson(DeviceAuth)(response).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
        return new Login({
          code: parsed.device_code,
          user: parsed.user_code,
          url: `${server}${parsed.verification_uri_complete}`,
          server,
          expiry: parsed.expires_in,
          interval: parsed.interval,
        })
      })
      const poll = Effect.fn("Account.poll")(function* (input: Login) {
        const response = yield* executeEffect(
          HttpClientRequest.post(`${input.server}/auth/device/token`).pipe(
            HttpClientRequest.acceptJson,
            HttpClientRequest.schemaBodyJson(DeviceTokenRequest)(
              new DeviceTokenRequest({
                grant_type: "urn:ietf:params:oauth:grant-type:device_code",
                device_code: input.code,
                client_id: clientId,
              }),
            ),
          ),
        )
        const parsed = yield* HttpClientResponse.schemaBodyJson(DeviceToken)(response).pipe(
          mapAccountServiceError("Failed to decode response"),
        )
        if (parsed instanceof DeviceTokenError) return parsed.toPollResult()
        const accessToken = parsed.access_token
        const user = fetchUser(input.server, accessToken)
        const orgs = fetchOrgs(input.server, accessToken)
        const [account, remoteOrgs] = yield* Effect.all([user, orgs], { concurrency: 2 })
        // TODO: When there are multiple orgs, let the user choose
        const firstOrgID = remoteOrgs.length > 0 ? Option.some(remoteOrgs[0].id) : Option.none<OrgID>()
        const now = yield* Clock.currentTimeMillis
        const expiry = now + Duration.toMillis(parsed.expires_in)
        const refreshToken = parsed.refresh_token
        yield* repo.persistAccount({
          id: account.id,
          email: account.email,
          url: input.server,
          accessToken,
          refreshToken,
          expiry,
          orgID: firstOrgID,
        })
        return new PollSuccess({ email: account.email })
      })
      return Service.of({
        active: repo.active,
        list: repo.list,
        orgsByAccount,
        remove: repo.remove,
        use: repo.use,
        orgs,
        config,
        token,
        login,
        poll,
      })
    }),
  )
  export const defaultLayer = layer.pipe(Layer.provide(AccountRepo.layer), Layer.provide(FetchHttpClient.layer))
  export const runPromise = makeRunPromise(Service, defaultLayer)
  export async function active(): Promise<Info | undefined> {
    return Option.getOrUndefined(await runPromise((service) => service.active()))
  }
  export async function config(accountID: AccountID, orgID: OrgID): Promise<Record<string, unknown> | undefined> {
-    const config = await runPromise((service) => service.config(accountID, orgID))
+    const cfg = await runPromise((service) => service.config(accountID, orgID))
-    return Option.getOrUndefined(config)
+    return Option.getOrUndefined(cfg)
  }
  export async function token(accountID: AccountID): Promise<AccessToken | undefined> {
-    const token = await runPromise((service) => service.token(accountID))
+    const t = await runPromise((service) => service.token(accountID))
-    return Option.getOrUndefined(token)
+    return Option.getOrUndefined(t)
  }
 }
@@ -3,7 +3,6 @@ import z from "zod"
 import { Provider } from "../provider/provider"
 import { ModelID, ProviderID } from "../provider/schema"
 import { generateObject, streamObject, type ModelMessage } from "ai"
 import { SystemPrompt } from "../session/system"
 import { Instance } from "../project/instance"
 import { Truncate } from "../tool/truncate"
 import { Auth } from "../auth"
@@ -14,12 +13,15 @@ import PROMPT_COMPACTION from "./prompt/compaction.txt"
 import PROMPT_EXPLORE from "./prompt/explore.txt"
 import PROMPT_SUMMARY from "./prompt/summary.txt"
 import PROMPT_TITLE from "./prompt/title.txt"
-import { PermissionNext } from "@/permission"
+import { Permission } from "@/permission"
 import { mergeDeep, pipe, sortBy, values } from "remeda"
 import { Global } from "@/global"
 import path from "path"
 import { Plugin } from "@/plugin"
 import { Skill } from "../skill"
 import { Effect, ServiceMap, Layer } from "effect"
 import { InstanceState } from "@/effect/instance-state"
 import { makeRunPromise } from "@/effect/run-service"
 export namespace Agent {
  export const Info = z
@@ -32,7 +34,7 @@ export namespace Agent {
      topP: z.number().optional(),
      temperature: z.number().optional(),
      color: z.string().optional(),
-      permission: PermissionNext.Ruleset,
+      permission: Permission.Ruleset,
      model: z
        .object({
          modelID: ModelID.zod,
@@ -49,12 +51,37 @@ export namespace Agent {
    })
  export type Info = z.infer<typeof Info>
-  const state = Instance.state(async () => {
+  export interface Interface {
-    const cfg = await Config.get()
+    readonly get: (agent: string) => Effect.Effect<Agent.Info>
    readonly list: () => Effect.Effect<Agent.Info[]>
    readonly defaultAgent: () => Effect.Effect<string>
    readonly generate: (input: {
      description: string
      model?: { providerID: ProviderID; modelID: ModelID }
    }) => Effect.Effect<{
      identifier: string
      whenToUse: string
      systemPrompt: string
    }>
  }
-    const skillDirs = await Skill.dirs()
+  type State = Omit<Interface, "generate">
  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Agent") {}
  export const layer = Layer.effect(
    Service,
    Effect.gen(function* () {
      const config = () => Effect.promise(() => Config.get())
      const auth = yield* Auth.Service
      const state = yield* InstanceState.make<State>(
        Effect.fn("Agent.state")(function* (ctx) {
          const cfg = yield* config()
          const skillDirs = yield* Effect.promise(() => Skill.dirs())
          const whitelistedDirs = [Truncate.GLOB, ...skillDirs.map((dir) => path.join(dir, "*"))]
-    const defaults = PermissionNext.fromConfig({
+
          const defaults = Permission.fromConfig({
            "*": "allow",
            doom_loop: "ask",
            external_directory: {
@@ -72,16 +99,17 @@ export namespace Agent {
              "*.env.example": "allow",
            },
          })
    const user = PermissionNext.fromConfig(cfg.permission ?? {})
-    const result: Record<string, Info> = {
+          const user = Permission.fromConfig(cfg.permission ?? {})
          const agents: Record<string, Info> = {
            build: {
              name: "build",
              description: "The default agent. Executes tools based on configured permissions.",
              options: {},
-        permission: PermissionNext.merge(
+              permission: Permission.merge(
                defaults,
-          PermissionNext.fromConfig({
+                Permission.fromConfig({
                  question: "allow",
                  plan_enter: "allow",
                }),
@@ -94,9 +122,9 @@ export namespace Agent {
              name: "plan",
              description: "Plan mode. Disallows all edit tools.",
              options: {},
-        permission: PermissionNext.merge(
+              permission: Permission.merge(
                defaults,
-          PermissionNext.fromConfig({
+                Permission.fromConfig({
                  question: "allow",
                  plan_exit: "allow",
                  external_directory: {
@@ -105,7 +133,8 @@ export namespace Agent {
                  edit: {
                    "*": "deny",
                    [path.join(".opencode", "plans", "*.md")]: "allow",
-              [path.relative(Instance.worktree, path.join(Global.Path.data, path.join("plans", "*.md")))]: "allow",
+                    [path.relative(Instance.worktree, path.join(Global.Path.data, path.join("plans", "*.md")))]:
                      "allow",
                  },
                }),
                user,
@@ -116,9 +145,9 @@ export namespace Agent {
            general: {
              name: "general",
              description: `General-purpose agent for researching complex questions and executing multi-step tasks. Use this agent to execute multiple units of work in parallel.`,
-        permission: PermissionNext.merge(
+              permission: Permission.merge(
                defaults,
-          PermissionNext.fromConfig({
+                Permission.fromConfig({
                  todoread: "deny",
                  todowrite: "deny",
                }),
@@ -130,9 +159,9 @@ export namespace Agent {
            },
            explore: {
              name: "explore",
-        permission: PermissionNext.merge(
+              permission: Permission.merge(
                defaults,
-          PermissionNext.fromConfig({
+                Permission.fromConfig({
                  "*": "deny",
                  grep: "allow",
                  glob: "allow",
@@ -161,9 +190,9 @@ export namespace Agent {
              native: true,
              hidden: true,
              prompt: PROMPT_COMPACTION,
-        permission: PermissionNext.merge(
+              permission: Permission.merge(
                defaults,
-          PermissionNext.fromConfig({
+                Permission.fromConfig({
                  "*": "deny",
                }),
                user,
@@ -177,9 +206,9 @@ export namespace Agent {
              native: true,
              hidden: true,
              temperature: 0.5,
-        permission: PermissionNext.merge(
+              permission: Permission.merge(
                defaults,
-          PermissionNext.fromConfig({
+                Permission.fromConfig({
                  "*": "deny",
                }),
                user,
@@ -192,9 +221,9 @@ export namespace Agent {
              options: {},
              native: true,
              hidden: true,
-        permission: PermissionNext.merge(
+              permission: Permission.merge(
                defaults,
-          PermissionNext.fromConfig({
+                Permission.fromConfig({
                  "*": "deny",
                }),
                user,
@@ -205,15 +234,15 @@ export namespace Agent {
          for (const [key, value] of Object.entries(cfg.agent ?? {})) {
            if (value.disable) {
-        delete result[key]
+              delete agents[key]
              continue
            }
-      let item = result[key]
+            let item = agents[key]
            if (!item)
-        item = result[key] = {
+              item = agents[key] = {
                name: key,
                mode: "all",
-          permission: PermissionNext.merge(defaults, user),
+                permission: Permission.merge(defaults, user),
                options: {},
                native: false,
              }
@@ -229,12 +258,12 @@ export namespace Agent {
            item.name = value.name ?? item.name
            item.steps = value.steps ?? item.steps
            item.options = mergeDeep(item.options, value.options ?? {})
-      item.permission = PermissionNext.merge(item.permission, PermissionNext.fromConfig(value.permission ?? {}))
+            item.permission = Permission.merge(item.permission, Permission.fromConfig(value.permission ?? {}))
          }
          // Ensure Truncate.GLOB is allowed unless explicitly configured
-    for (const name in result) {
+          for (const name in agents) {
-      const agent = result[name]
+            const agent = agents[name]
            const explicit = agent.permission.some((r) => {
              if (r.permission !== "external_directory") return false
              if (r.action !== "deny") return false
@@ -242,57 +271,74 @@ export namespace Agent {
            })
            if (explicit) continue
-      result[name].permission = PermissionNext.merge(
+            agents[name].permission = Permission.merge(
-        result[name].permission,
+              agents[name].permission,
-        PermissionNext.fromConfig({ external_directory: { [Truncate.GLOB]: "allow" } }),
+              Permission.fromConfig({ external_directory: { [Truncate.GLOB]: "allow" } }),
            )
          }
-    return result
+          const get = Effect.fnUntraced(function* (agent: string) {
            return agents[agent]
          })
-  export async function get(agent: string) {
+          const list = Effect.fnUntraced(function* () {
-    return state().then((x) => x[agent])
+            const cfg = yield* config()
  }
  export async function list() {
    const cfg = await Config.get()
            return pipe(
-      await state(),
+              agents,
              values(),
              sortBy(
                [(x) => (cfg.default_agent ? x.name === cfg.default_agent : x.name === "build"), "desc"],
                [(x) => x.name, "asc"],
              ),
            )
-  }
+          })
-  export async function defaultAgent() {
+          const defaultAgent = Effect.fnUntraced(function* () {
-    const cfg = await Config.get()
+            const c = yield* config()
-    const agents = await state()
+            if (c.default_agent) {
-
+              const agent = agents[c.default_agent]
-    if (cfg.default_agent) {
+              if (!agent) throw new Error(`default agent "${c.default_agent}" not found`)
-      const agent = agents[cfg.default_agent]
+              if (agent.mode === "subagent") throw new Error(`default agent "${c.default_agent}" is a subagent`)
-      if (!agent) throw new Error(`default agent "${cfg.default_agent}" not found`)
+              if (agent.hidden === true) throw new Error(`default agent "${c.default_agent}" is hidden`)
      if (agent.mode === "subagent") throw new Error(`default agent "${cfg.default_agent}" is a subagent`)
      if (agent.hidden === true) throw new Error(`default agent "${cfg.default_agent}" is hidden`)
              return agent.name
            }
            const visible = Object.values(agents).find((a) => a.mode !== "subagent" && a.hidden !== true)
            if (!visible) throw new Error("no primary visible agent found")
            return visible.name
          })
-    const primaryVisible = Object.values(agents).find((a) => a.mode !== "subagent" && a.hidden !== true)
+          return {
-    if (!primaryVisible) throw new Error("no primary visible agent found")
+            get,
-    return primaryVisible.name
+            list,
-  }
+            defaultAgent,
          } satisfies State
        }),
      )
-  export async function generate(input: { description: string; model?: { providerID: ProviderID; modelID: ModelID } }) {
+      return Service.of({
-    const cfg = await Config.get()
+        get: Effect.fn("Agent.get")(function* (agent: string) {
-    const defaultModel = input.model ?? (await Provider.defaultModel())
+          return yield* InstanceState.useEffect(state, (s) => s.get(agent))
-    const model = await Provider.getModel(defaultModel.providerID, defaultModel.modelID)
+        }),
-    const language = await Provider.getLanguage(model)
+        list: Effect.fn("Agent.list")(function* () {
          return yield* InstanceState.useEffect(state, (s) => s.list())
        }),
        defaultAgent: Effect.fn("Agent.defaultAgent")(function* () {
          return yield* InstanceState.useEffect(state, (s) => s.defaultAgent())
        }),
        generate: Effect.fn("Agent.generate")(function* (input: {
          description: string
          model?: { providerID: ProviderID; modelID: ModelID }
        }) {
          const cfg = yield* config()
          const model = input.model ?? (yield* Effect.promise(() => Provider.defaultModel()))
          const resolved = yield* Effect.promise(() => Provider.getModel(model.providerID, model.modelID))
          const language = yield* Effect.promise(() => Provider.getLanguage(resolved))
          const system = [PROMPT_GENERATE]
-    await Plugin.trigger("experimental.chat.system.transform", { model }, { system })
+          yield* Effect.promise(() =>
-    const existing = await list()
+            Plugin.trigger("experimental.chat.system.transform", { model: resolved }, { system }),
          )
          const existing = yield* InstanceState.useEffect(state, (s) => s.list())
          const params = {
            experimental_telemetry: {
@@ -323,10 +369,12 @@ export namespace Agent {
          } satisfies Parameters<typeof generateObject>[0]
          // TODO: clean this up so provider specific logic doesnt bleed over
-    if (defaultModel.providerID === "openai" && (await Auth.get(defaultModel.providerID))?.type === "oauth") {
+          const authInfo = yield* auth.get(model.providerID).pipe(Effect.orDie)
          if (model.providerID === "openai" && authInfo?.type === "oauth") {
            return yield* Effect.promise(async () => {
              const result = streamObject({
                ...params,
-        providerOptions: ProviderTransform.providerOptions(model, {
+                providerOptions: ProviderTransform.providerOptions(resolved, {
                  store: false,
                }),
                onError: () => {},
@@ -335,9 +383,32 @@ export namespace Agent {
                if (part.type === "error") throw part.error
              }
              return result.object
            })
          }
-    const result = await generateObject(params)
+          return yield* Effect.promise(() => generateObject(params).then((r) => r.object))
-    return result.object
+        }),
      })
    }),
  )
  export const defaultLayer = layer.pipe(Layer.provide(Auth.layer))
  const runPromise = makeRunPromise(Service, defaultLayer)
  export async function get(agent: string) {
    return runPromise((svc) => svc.get(agent))
  }
  export async function list() {
    return runPromise((svc) => svc.list())
  }
  export async function defaultAgent() {
    return runPromise((svc) => svc.defaultAgent())
  }
  export async function generate(input: { description: string; model?: { providerID: ProviderID; modelID: ModelID } }) {
    return runPromise((svc) => svc.generate(input))
  }
 }
@@ -1,94 +0,0 @@
 import path from "path"
 import { Effect, Layer, Record, Result, Schema, ServiceMap } from "effect"
 import { Global } from "../global"
 import { Filesystem } from "../util/filesystem"
 export const OAUTH_DUMMY_KEY = "opencode-oauth-dummy-key"
 export class Oauth extends Schema.Class<Oauth>("OAuth")({
  type: Schema.Literal("oauth"),
  refresh: Schema.String,
  access: Schema.String,
  expires: Schema.Number,
  accountId: Schema.optional(Schema.String),
  enterpriseUrl: Schema.optional(Schema.String),
 }) {}
 export class Api extends Schema.Class<Api>("ApiAuth")({
  type: Schema.Literal("api"),
  key: Schema.String,
 }) {}
 export class WellKnown extends Schema.Class<WellKnown>("WellKnownAuth")({
  type: Schema.Literal("wellknown"),
  key: Schema.String,
  token: Schema.String,
 }) {}
 export const Info = Schema.Union([Oauth, Api, WellKnown])
 export type Info = Schema.Schema.Type<typeof Info>
 export class AuthError extends Schema.TaggedErrorClass<AuthError>()("AuthError", {
  message: Schema.String,
  cause: Schema.optional(Schema.Defect),
 }) {}
 const file = path.join(Global.Path.data, "auth.json")
 const fail = (message: string) => (cause: unknown) => new AuthError({ message, cause })
 export namespace Auth {
  export interface Interface {
    readonly get: (providerID: string) => Effect.Effect<Info | undefined, AuthError>
    readonly all: () => Effect.Effect<Record<string, Info>, AuthError>
    readonly set: (key: string, info: Info) => Effect.Effect<void, AuthError>
    readonly remove: (key: string) => Effect.Effect<void, AuthError>
  }
  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Auth") {}
  export const layer = Layer.effect(
    Service,
    Effect.gen(function* () {
      const decode = Schema.decodeUnknownOption(Info)
      const all = Effect.fn("Auth.all")(() =>
        Effect.tryPromise({
          try: async () => {
            const data = await Filesystem.readJson<Record<string, unknown>>(file).catch(() => ({}))
            return Record.filterMap(data, (value) => Result.fromOption(decode(value), () => undefined))
          },
          catch: fail("Failed to read auth data"),
        }),
      )
      const get = Effect.fn("Auth.get")(function* (providerID: string) {
        return (yield* all())[providerID]
      })
      const set = Effect.fn("Auth.set")(function* (key: string, info: Info) {
        const norm = key.replace(/\/+$/, "")
        const data = yield* all()
        if (norm !== key) delete data[key]
        delete data[norm + "/"]
        yield* Effect.tryPromise({
          try: () => Filesystem.writeJson(file, { ...data, [norm]: info }, 0o600),
          catch: fail("Failed to write auth data"),
        })
      })
      const remove = Effect.fn("Auth.remove")(function* (key: string) {
        const norm = key.replace(/\/+$/, "")
        const data = yield* all()
        delete data[key]
        delete data[norm]
        yield* Effect.tryPromise({
          try: () => Filesystem.writeJson(file, data, 0o600),
          catch: fail("Failed to write auth data"),
        })
      })
      return Service.of({ get, all, set, remove })
    }),
  )
 }
@@ -1,43 +1,101 @@
-import { Effect } from "effect"
+import path from "path"
-import z from "zod"
+import { Effect, Layer, Record, Result, Schema, ServiceMap } from "effect"
-import { runtime } from "@/effect/runtime"
+import { makeRunPromise } from "@/effect/run-service"
-import * as S from "./effect"
+import { zod } from "@/util/effect-zod"
 import { Global } from "../global"
 import { Filesystem } from "../util/filesystem"
-export { OAUTH_DUMMY_KEY } from "./effect"
+export const OAUTH_DUMMY_KEY = "opencode-oauth-dummy-key"
-function runPromise<A>(f: (service: S.Auth.Interface) => Effect.Effect<A, S.AuthError>) {
+const file = path.join(Global.Path.data, "auth.json")
-  return runtime.runPromise(S.Auth.Service.use(f))
+
-}
+const fail = (message: string) => (cause: unknown) => new Auth.AuthError({ message, cause })
 export namespace Auth {
-  export const Oauth = z
+  export class Oauth extends Schema.Class<Oauth>("OAuth")({
-    .object({
+    type: Schema.Literal("oauth"),
-      type: z.literal("oauth"),
+    refresh: Schema.String,
-      refresh: z.string(),
+    access: Schema.String,
-      access: z.string(),
+    expires: Schema.Number,
-      expires: z.number(),
+    accountId: Schema.optional(Schema.String),
-      accountId: z.string().optional(),
+    enterpriseUrl: Schema.optional(Schema.String),
-      enterpriseUrl: z.string().optional(),
+  }) {}
    })
    .meta({ ref: "OAuth" })
-  export const Api = z
+  export class Api extends Schema.Class<Api>("ApiAuth")({
-    .object({
+    type: Schema.Literal("api"),
-      type: z.literal("api"),
+    key: Schema.String,
-      key: z.string(),
+  }) {}
    })
    .meta({ ref: "ApiAuth" })
-  export const WellKnown = z
+  export class WellKnown extends Schema.Class<WellKnown>("WellKnownAuth")({
-    .object({
+    type: Schema.Literal("wellknown"),
-      type: z.literal("wellknown"),
+    key: Schema.String,
-      key: z.string(),
+    token: Schema.String,
-      token: z.string(),
+  }) {}
    })
    .meta({ ref: "WellKnownAuth" })
-  export const Info = z.discriminatedUnion("type", [Oauth, Api, WellKnown]).meta({ ref: "Auth" })
+  const _Info = Schema.Union([Oauth, Api, WellKnown]).annotate({ discriminator: "type", identifier: "Auth" })
-  export type Info = z.infer<typeof Info>
+  export const Info = Object.assign(_Info, { zod: zod(_Info) })
  export type Info = Schema.Schema.Type<typeof _Info>
  export class AuthError extends Schema.TaggedErrorClass<AuthError>()("AuthError", {
    message: Schema.String,
    cause: Schema.optional(Schema.Defect),
  }) {}
  export interface Interface {
    readonly get: (providerID: string) => Effect.Effect<Info | undefined, AuthError>
    readonly all: () => Effect.Effect<Record<string, Info>, AuthError>
    readonly set: (key: string, info: Info) => Effect.Effect<void, AuthError>
    readonly remove: (key: string) => Effect.Effect<void, AuthError>
  }
  export class Service extends ServiceMap.Service<Service, Interface>()("@opencode/Auth") {}
  export const layer = Layer.effect(
    Service,
    Effect.gen(function* () {
      const decode = Schema.decodeUnknownOption(Info)
      const all = Effect.fn("Auth.all")(() =>
        Effect.tryPromise({
          try: async () => {
            const data = await Filesystem.readJson<Record<string, unknown>>(file).catch(() => ({}))
            return Record.filterMap(data, (value) => Result.fromOption(decode(value), () => undefined))
          },
          catch: fail("Failed to read auth data"),
        }),
      )
      const get = Effect.fn("Auth.get")(function* (providerID: string) {
        return (yield* all())[providerID]
      })
      const set = Effect.fn("Auth.set")(function* (key: string, info: Info) {
        const norm = key.replace(/\/+$/, "")
        const data = yield* all()
        if (norm !== key) delete data[key]
        delete data[norm + "/"]
        yield* Effect.tryPromise({
          try: () => Filesystem.writeJson(file, { ...data, [norm]: info }, 0o600),
          catch: fail("Failed to write auth data"),
        })
      })
      const remove = Effect.fn("Auth.remove")(function* (key: string) {
        const norm = key.replace(/\/+$/, "")
        const data = yield* all()
        delete data[key]
        delete data[norm]
        yield* Effect.tryPromise({
          try: () => Filesystem.writeJson(file, data, 0o600),
          catch: fail("Failed to write auth data"),
        })
      })
      return Service.of({ get, all, set, remove })
    }),
  )
  const runPromise = makeRunPromise(Service, layer)
  export async function get(providerID: string) {
    return runPromise((service) => service.get(providerID))
@@ -1,5 +1,5 @@
 import z from "zod"
-import type { ZodObject, ZodRawShape } from "zod"
+import type { ZodType } from "zod"
 import { Log } from "../util/log"
 export namespace BusEvent {
@@ -9,7 +9,7 @@ export namespace BusEvent {
  const registry = new Map<string, Definition>()
-  export function define<Type extends string, Properties extends ZodObject<ZodRawShape>>(type: Type, properties: Properties) {
+  export function define<Type extends string, Properties extends ZodType>(type: Type, properties: Properties) {
    const result = {
      type,
      properties,
@@ -4,7 +4,7 @@ export const GlobalBus = new EventEmitter<{
  event: [
    {
      directory?: string
-      payload: { type: string; properties: Record<string, unknown> }
+      payload: any
    },
  ]
 }>()
@@ -1,8 +1,7 @@
 import { cmd } from "./cmd"
 import { Duration, Effect, Match, Option } from "effect"
 import { UI } from "../ui"
-import { runtime } from "@/effect/runtime"
+import { AccountID, Account, OrgID, PollExpired, type PollResult } from "@/account"
 import { AccountID, Account, OrgID, PollExpired, type PollResult } from "@/account/effect"
 import { type AccountError } from "@/account/schema"
 import * as Prompt from "../effect/prompt"
 import open from "open"
@@ -11,6 +10,26 @@ const openBrowser = (url: string) => Effect.promise(() => open(url).catch(() =>
 const println = (msg: string) => Effect.sync(() => UI.println(msg))
 const dim = (value: string) => UI.Style.TEXT_DIM + value + UI.Style.TEXT_NORMAL
 const activeSuffix = (isActive: boolean) => (isActive ? dim(" (active)") : "")
 export const formatAccountLabel = (account: { email: string; url: string }, isActive: boolean) =>
  `${account.email} ${dim(account.url)}${activeSuffix(isActive)}`
 const formatOrgChoiceLabel = (account: { email: string }, org: { name: string }, isActive: boolean) =>
  `${org.name} (${account.email})${activeSuffix(isActive)}`
 export const formatOrgLine = (
  account: { email: string; url: string },
  org: { id: string; name: string },
  isActive: boolean,
 ) => {
  const dot = isActive ? UI.Style.TEXT_SUCCESS + "●" + UI.Style.TEXT_NORMAL : " "
  const name = isActive ? UI.Style.TEXT_HIGHLIGHT_BOLD + org.name + UI.Style.TEXT_NORMAL : org.name
  return `  ${dot} ${name}  ${dim(account.email)}  ${dim(account.url)}  ${dim(org.id)}`
 }
 const isActiveOrgChoice = (
  active: Option.Option<{ id: AccountID; active_org_id: OrgID | null }>,
  choice: { accountID: AccountID; orgID: OrgID },
@@ -77,10 +96,9 @@ const logoutEffect = Effect.fn("logout")(function* (email?: string) {
  const opts = accounts.map((a) => {
    const isActive = Option.isSome(activeID) && activeID.value === a.id
    const server = UI.Style.TEXT_DIM + a.url + UI.Style.TEXT_NORMAL
    return {
      value: a,
-      label: isActive ? `${a.email} ${server}` + UI.Style.TEXT_DIM + " (active)" : `${a.email} ${server}`,
+      label: formatAccountLabel(a, isActive),
    }
  })
@@ -110,9 +128,7 @@ const switchEffect = Effect.fn("switch")(function* () {
      const isActive = isActiveOrgChoice(active, { accountID: group.account.id, orgID: org.id })
      return {
        value: { orgID: org.id, accountID: group.account.id, label: org.name },
-        label: isActive
+        label: formatOrgChoiceLabel(group.account, org, isActive),
          ? `${org.name} (${group.account.email})` + UI.Style.TEXT_DIM + " (active)"
          : `${org.name} (${group.account.email})`,
      }
    }),
  )
@@ -140,15 +156,21 @@ const orgsEffect = Effect.fn("orgs")(function* () {
  for (const group of groups) {
    for (const org of group.orgs) {
      const isActive = isActiveOrgChoice(active, { accountID: group.account.id, orgID: org.id })
-      const dot = isActive ? UI.Style.TEXT_SUCCESS + "●" + UI.Style.TEXT_NORMAL : " "
+      yield* println(formatOrgLine(group.account, org, isActive))
      const name = isActive ? UI.Style.TEXT_HIGHLIGHT_BOLD + org.name + UI.Style.TEXT_NORMAL : org.name
      const email = UI.Style.TEXT_DIM + group.account.email + UI.Style.TEXT_NORMAL
      const id = UI.Style.TEXT_DIM + org.id + UI.Style.TEXT_NORMAL
      yield* println(`  ${dot} ${name}  ${email}  ${id}`)
    }
  }
 })
 const openEffect = Effect.fn("open")(function* () {
  const service = yield* Account.Service
  const active = yield* service.active()
  if (Option.isNone(active)) return yield* println("No active account")
  const url = active.value.url
  yield* openBrowser(url)
  yield* Prompt.outro("Opened " + url)
 })
 export const LoginCommand = cmd({
  command: "login <url>",
  describe: false,
@@ -160,7 +182,7 @@ export const LoginCommand = cmd({
    }),
  async handler(args) {
    UI.empty()
-    await runtime.runPromise(loginEffect(args.url))
+    await Account.runPromise((_svc) => loginEffect(args.url))
  },
 })
@@ -174,7 +196,7 @@ export const LogoutCommand = cmd({
    }),
  async handler(args) {
    UI.empty()
-    await runtime.runPromise(logoutEffect(args.email))
+    await Account.runPromise((_svc) => logoutEffect(args.email))
  },
 })
@@ -183,7 +205,7 @@ export const SwitchCommand = cmd({
  describe: false,
  async handler() {
    UI.empty()
-    await runtime.runPromise(switchEffect())
+    await Account.runPromise((_svc) => switchEffect())
  },
 })
@@ -192,7 +214,16 @@ export const OrgsCommand = cmd({
  describe: false,
  async handler() {
    UI.empty()
-    await runtime.runPromise(orgsEffect())
+    await Account.runPromise((_svc) => orgsEffect())
  },
 })
 export const OpenCommand = cmd({
  command: "open",
  describe: false,
  async handler() {
    UI.empty()
    await Account.runPromise((_svc) => openEffect())
  },
 })
@@ -217,6 +248,10 @@ export const ConsoleCommand = cmd({
        ...OrgsCommand,
        describe: "list orgs",
      })
      .command({
        ...OpenCommand,
        describe: "open active console account",
      })
      .demandCommand(),
  async handler() {},
 })
@@ -7,7 +7,7 @@ import type { MessageV2 } from "../../../session/message-v2"
 import { MessageID, PartID } from "../../../session/schema"
 import { ToolRegistry } from "../../../tool/registry"
 import { Instance } from "../../../project/instance"
-import { PermissionNext } from "../../../permission"
+import { Permission } from "../../../permission"
 import { iife } from "../../../util/iife"
 import { bootstrap } from "../../bootstrap"
 import { cmd } from "../cmd"
@@ -75,7 +75,7 @@ async function getAvailableTools(agent: Agent.Info) {
 }
 async function resolveTools(agent: Agent.Info, availableTools: Awaited<ReturnType<typeof getAvailableTools>>) {
-  const disabled = PermissionNext.disabled(
+  const disabled = Permission.disabled(
    availableTools.map((tool) => tool.id),
    agent.permission,
  )
@@ -145,7 +145,7 @@ async function createToolContext(agent: Agent.Info) {
  }
  await Session.updateMessage(message)
-  const ruleset = PermissionNext.merge(agent.permission, session.permission ?? [])
+  const ruleset = Permission.merge(agent.permission, session.permission ?? [])
  return {
    sessionID: session.id,
@@ -155,11 +155,11 @@ async function createToolContext(agent: Agent.Info) {
    abort: new AbortController().signal,
    messages: [],
    metadata: () => {},
-    async ask(req: Omit<PermissionNext.Request, "id" | "sessionID" | "tool">) {
+    async ask(req: Omit<Permission.Request, "id" | "sessionID" | "tool">) {
      for (const pattern of req.patterns) {
-        const rule = PermissionNext.evaluate(req.permission, pattern, ruleset)
+        const rule = Permission.evaluate(req.permission, pattern, ruleset)
        if (rule.action === "deny") {
-          throw new PermissionNext.DeniedError({ ruleset })
+          throw new Permission.DeniedError({ ruleset })
        }
      }
    },
@@ -11,7 +11,7 @@ import { createOpencodeClient, type Message, type OpencodeClient, type ToolPart
 import { Server } from "../../server/server"
 import { Provider } from "../../provider/provider"
 import { Agent } from "../../agent/agent"
-import { PermissionNext } from "../../permission"
+import { Permission } from "../../permission"
 import { Tool } from "../../tool/tool"
 import { GlobTool } from "../../tool/glob"
 import { GrepTool } from "../../tool/grep"
@@ -354,7 +354,7 @@ export const RunCommand = cmd({
      process.exit(1)
    }
-    const rules: PermissionNext.Ruleset = [
+    const rules: Permission.Ruleset = [
      {
        permission: "question",
        action: "deny",
@@ -5,8 +5,8 @@ import { MouseButton, TextAttributes } from "@opentui/core"
 import { RouteProvider, useRoute } from "@tui/context/route"
 import { Switch, Match, createEffect, untrack, ErrorBoundary, createSignal, onMount, batch, Show, on } from "solid-js"
 import { win32DisableProcessedInput, win32FlushInputBuffer, win32InstallCtrlCGuard } from "./win32"
 import { Installation } from "@/installation"
 import { Flag } from "@/flag/flag"
 import semver from "semver"
 import { DialogProvider, useDialog } from "@tui/ui/dialog"
 import { DialogProvider as DialogProviderList } from "@tui/component/dialog-provider"
 import { SDKProvider, useSDK } from "@tui/context/sdk"
@@ -29,6 +29,7 @@ import { PromptHistoryProvider } from "./component/prompt/history"
 import { FrecencyProvider } from "./component/prompt/frecency"
 import { PromptStashProvider } from "./component/prompt/stash"
 import { DialogAlert } from "./ui/dialog-alert"
 import { DialogConfirm } from "./ui/dialog-confirm"
 import { ToastProvider, useToast } from "./ui/toast"
 import { ExitProvider, useExit } from "./context/exit"
 import { Session as SessionApi } from "@/session"
@@ -103,11 +104,13 @@ async function getTerminalBackgroundColor(): Promise<"dark" | "light"> {
 }
 import type { EventSource } from "./context/sdk"
 import { Installation } from "@/installation"
 export function tui(input: {
  url: string
  args: Args
  config: TuiConfig.Info
  onSnapshot?: () => Promise<string[]>
  directory?: string
  fetch?: typeof fetch
  headers?: RequestInit["headers"]
@@ -158,7 +161,7 @@ export function tui(input: {
                                        <FrecencyProvider>
                                          <PromptHistoryProvider>
                                            <PromptRefProvider>
-                                              <App />
+                                              <App onSnapshot={input.onSnapshot} />
                                            </PromptRefProvider>
                                          </PromptHistoryProvider>
                                        </FrecencyProvider>
@@ -199,7 +202,7 @@ export function tui(input: {
  })
 }
-function App() {
+function App(props: { onSnapshot?: () => Promise<string[]> }) {
  const route = useRoute()
  const dimensions = useTerminalDimensions()
  const renderer = useRenderer()
@@ -210,7 +213,7 @@ function App() {
  const command = useCommandDialog()
  const sdk = useSDK()
  const toast = useToast()
-  const { theme, mode, setMode } = useTheme()
+  const { theme, mode, setMode, locked, lock, unlock } = useTheme()
  const sync = useSync()
  const exit = useExit()
  const promptRef = usePromptRef()
@@ -555,7 +558,7 @@ function App() {
      category: "System",
    },
    {
-      title: "Toggle appearance",
+      title: "Toggle Theme Mode",
      value: "theme.switch_mode",
      onSelect: (dialog) => {
        setMode(mode() === "dark" ? "light" : "dark")
@@ -563,6 +566,16 @@ function App() {
      },
      category: "System",
    },
    {
      title: locked() ? "Unlock Theme Mode" : "Lock Theme Mode",
      value: "theme.mode.lock",
      onSelect: (dialog) => {
        if (locked()) unlock()
        else lock()
        dialog.clear()
      },
      category: "System",
    },
    {
      title: "Help",
      value: "help.show",
@@ -615,11 +628,11 @@ function App() {
      title: "Write heap snapshot",
      category: "System",
      value: "app.heap_snapshot",
-      onSelect: (dialog) => {
+      onSelect: async (dialog) => {
-        const path = writeHeapSnapshot()
+        const files = await props.onSnapshot?.()
        toast.show({
          variant: "info",
-          message: `Heap snapshot written to ${path}`,
+          message: `Heap snapshot written to ${files?.join(", ")}`,
          duration: 5000,
        })
        dialog.clear()
@@ -729,13 +742,51 @@ function App() {
    })
  })
-  sdk.event.on(Installation.Event.UpdateAvailable.type, (evt) => {
+  sdk.event.on("installation.update-available", async (evt) => {
    const version = evt.properties.version
    const skipped = kv.get("skipped_version")
    if (skipped && !semver.gt(version, skipped)) return
    const choice = await DialogConfirm.show(
      dialog,
      `Update Available`,
      `A new release v${version} is available. Would you like to update now?`,
      "skip",
    )
    if (choice === false) {
      kv.set("skipped_version", version)
      return
    }
    if (choice !== true) return
    toast.show({
      variant: "info",
-      title: "Update Available",
+      message: `Updating to v${version}...`,
-      message: `OpenCode v${evt.properties.version} is available. Run 'opencode upgrade' to update manually.`,
+      duration: 30000,
    })
    const result = await sdk.client.global.upgrade({ target: version })
    if (result.error || !result.data?.success) {
      toast.show({
        variant: "error",
        title: "Update Failed",
        message: "Update failed",
        duration: 10000,
      })
      return
    }
    await DialogAlert.show(
      dialog,
      "Update Complete",
      `Successfully updated to OpenCode v${result.data.version}. Please restart the application.`,
    )
    exit()
  })
  return (
@@ -1,4 +1,4 @@
-import { BoxRenderable, TextareaRenderable, MouseEvent, PasteEvent, t, dim, fg } from "@opentui/core"
+import { BoxRenderable, TextareaRenderable, MouseEvent, PasteEvent, decodePasteBytes, t, dim, fg } from "@opentui/core"
 import { createEffect, createMemo, type JSX, onMount, createSignal, onCleanup, on, Show, Switch, Match } from "solid-js"
 import "opentui-spinner/solid"
 import path from "path"
@@ -934,7 +934,7 @@ export function Prompt(props: PromptProps) {
                // Normalize line endings at the boundary
                // Windows ConPTY/Terminal often sends CR-only newlines in bracketed paste
                // Replace CRLF first, then any remaining CR
-                const normalizedText = event.text.replace(/\r\n/g, "\n").replace(/\r/g, "\n")
+                const normalizedText = decodePasteBytes(event.bytes).replace(/\r\n/g, "\n").replace(/\r/g, "\n")
                const pastedContent = normalizedText.trim()
                if (!pastedContent) {
                  command.trigger("prompt.paste")
@@ -53,6 +53,7 @@ export const { use: useExit, provider: ExitProvider } = createSimpleContext({
        message: store,
      },
    )
    process.on("SIGHUP", () => exit())
    return exit
  },
 })
@@ -1,6 +1,6 @@
-import { SyntaxStyle, RGBA, type TerminalColors } from "@opentui/core"
+import { CliRenderEvents, SyntaxStyle, RGBA, type TerminalColors } from "@opentui/core"
 import path from "path"
-import { createEffect, createMemo, onMount } from "solid-js"
+import { createEffect, createMemo, onCleanup, onMount } from "solid-js"
 import { createSimpleContext } from "./helper"
 import { Glob } from "../../../../util/glob"
 import aura from "./theme/aura.json" with { type: "json" }
@@ -280,11 +280,18 @@ function ansiToRgba(code: number): RGBA {
 export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
  name: "Theme",
  init: (props: { mode: "dark" | "light" }) => {
    const renderer = useRenderer()
    const config = useTuiConfig()
    const kv = useKV()
    const pick = (value: unknown) => {
      if (value === "dark" || value === "light") return value
      return
    }
    const lock = pick(kv.get("theme_mode_lock"))
    const [store, setStore] = createStore({
      themes: DEFAULT_THEMES,
-      mode: kv.get("theme_mode", props.mode),
+      mode: lock ?? pick(kv.get("theme_mode", props.mode)) ?? props.mode,
      lock,
      active: (config.theme ?? kv.get("theme", "opencode")) as string,
      ready: false,
    })
@@ -295,7 +302,7 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
    })
    function init() {
-      resolveSystemTheme()
+      resolveSystemTheme(store.mode)
      getCustomThemes()
        .then((custom) => {
          setStore(
@@ -316,14 +323,12 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
    onMount(init)
-    function resolveSystemTheme() {
+    function resolveSystemTheme(mode: "dark" | "light" = store.mode) {
      console.log("resolveSystemTheme")
      renderer
        .getPalette({
          size: 16,
        })
        .then((colors) => {
          console.log(colors.palette)
          if (!colors.palette[0]) {
            if (store.active === "system") {
              setStore(
@@ -337,7 +342,7 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
          }
          setStore(
            produce((draft) => {
-              draft.themes.system = generateSystem(colors, store.mode)
+              draft.themes.system = generateSystem(colors, mode)
              if (store.active === "system") {
                draft.ready = true
              }
@@ -346,16 +351,44 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
        })
    }
-    const renderer = useRenderer()
+    function apply(mode: "dark" | "light") {
-    process.on("SIGUSR2", async () => {
+      kv.set("theme_mode", mode)
      if (store.mode === mode) return
      setStore("mode", mode)
      renderer.clearPaletteCache()
-      init()
+      resolveSystemTheme(mode)
    }
    function pin(mode: "dark" | "light" = store.mode) {
      setStore("lock", mode)
      kv.set("theme_mode_lock", mode)
      apply(mode)
    }
    function free() {
      setStore("lock", undefined)
      kv.set("theme_mode_lock", undefined)
      const mode = renderer.themeMode
      if (mode) apply(mode)
    }
    const handle = (mode: "dark" | "light") => {
      if (store.lock) return
      apply(mode)
    }
    renderer.on(CliRenderEvents.THEME_MODE, handle)
    onCleanup(() => {
      renderer.off(CliRenderEvents.THEME_MODE, handle)
    })
    const values = createMemo(() => {
      return resolveTheme(store.themes[store.active] ?? store.themes.opencode, store.mode)
    })
    createEffect(() => {
      renderer.setBackgroundColor(values().background)
    })
    const syntax = createMemo(() => generateSyntax(values()))
    const subtleSyntax = createMemo(() => generateSubtleSyntax(values()))
@@ -377,9 +410,17 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
      mode() {
        return store.mode
      },
      locked() {
        return store.lock !== undefined
      },
      lock() {
        pin(store.mode)
      },
      unlock() {
        free()
      },
      setMode(mode: "dark" | "light") {
-        setStore("mode", mode)
+        pin(mode)
        kv.set("theme_mode", mode)
      },
      set(theme: string) {
        setStore("active", theme)
@@ -428,7 +469,7 @@ export function tint(base: RGBA, overlay: RGBA, alpha: number): RGBA {
 function generateSystem(colors: TerminalColors, mode: "dark" | "light"): ThemeJson {
  const bg = RGBA.fromHex(colors.defaultBackground ?? colors.palette[0]!)
  const fg = RGBA.fromHex(colors.defaultForeground ?? colors.palette[7]!)
-  const transparent = RGBA.fromInts(0, 0, 0, 0)
+  const transparent = RGBA.fromValues(bg.r, bg.g, bg.b, 0)
  const isDark = mode == "dark"
  const col = (i: number) => {
@@ -1465,6 +1465,8 @@ function TextPart(props: { last: boolean; part: TextPart; message: AssistantMess
              streaming={true}
              content={props.part.text.trim()}
              conceal={ctx.conceal()}
              fg={theme.markdownText}
              bg={theme.background}
            />
          </Match>
          <Match when={!Flag.OPENCODE_EXPERIMENTAL_MARKDOWN}>
@@ -1667,6 +1669,7 @@ function InlineTool(props: {
  const denied = createMemo(
    () =>
      error()?.includes("QuestionRejectedError") ||
      error()?.includes("rejected permission") ||
      error()?.includes("specified a rule") ||
      error()?.includes("user dismissed"),
@@ -14,6 +14,7 @@ import type { EventSource } from "./context/sdk"
 import { win32DisableProcessedInput, win32InstallCtrlCGuard } from "./win32"
 import { TuiConfig } from "@/config/tui"
 import { Instance } from "@/project/instance"
 import { writeHeapSnapshot } from "v8"
 declare global {
  const OPENCODE_WORKER_PATH: string
@@ -201,6 +202,11 @@ export const TuiThreadCommand = cmd({
      try {
        await tui({
          url: transport.url,
          async onSnapshot() {
            const tui = writeHeapSnapshot("tui.heapsnapshot")
            const server = await client.call("snapshot", undefined)
            return [tui, server]
          },
          config,
          directory: cwd,
          fetch: transport.fetch,
@@ -11,8 +11,11 @@ export type DialogConfirmProps = {
  message: string
  onConfirm?: () => void
  onCancel?: () => void
  label?: string
 }
 export type DialogConfirmResult = boolean | undefined
 export function DialogConfirm(props: DialogConfirmProps) {
  const dialog = useDialog()
  const { theme } = useTheme()
@@ -45,7 +48,7 @@ export function DialogConfirm(props: DialogConfirmProps) {
        <text fg={theme.textMuted}>{props.message}</text>
      </box>
      <box flexDirection="row" justifyContent="flex-end" paddingBottom={1}>
-        <For each={["cancel", "confirm"]}>
+        <For each={["cancel", "confirm"] as const}>
          {(key) => (
            <box
              paddingLeft={1}
@@ -58,7 +61,7 @@ export function DialogConfirm(props: DialogConfirmProps) {
              }}
            >
              <text fg={key === store.active ? theme.selectedListItemText : theme.textMuted}>
-                {Locale.titlecase(key)}
+                {Locale.titlecase(key === "cancel" ? (props.label ?? key) : key)}
              </text>
            </box>
          )}
@@ -68,8 +71,8 @@ export function DialogConfirm(props: DialogConfirmProps) {
  )
 }
-DialogConfirm.show = (dialog: DialogContext, title: string, message: string) => {
+DialogConfirm.show = (dialog: DialogContext, title: string, message: string, label?: string) => {
-  return new Promise<boolean>((resolve) => {
+  return new Promise<DialogConfirmResult>((resolve) => {
    dialog.replace(
      () => (
        <DialogConfirm
@@ -77,9 +80,10 @@ DialogConfirm.show = (dialog: DialogContext, title: string, message: string) =>
          message={message}
          onConfirm={() => resolve(true)}
          onCancel={() => resolve(false)}
          label={label}
        />
      ),
-      () => resolve(false),
+      () => resolve(undefined),
    )
  })
 }
@@ -10,6 +10,7 @@ import { GlobalBus } from "@/bus/global"
 import { createOpencodeClient, type Event } from "@opencode-ai/sdk/v2"
 import { Flag } from "@/flag/flag"
 import { setTimeout as sleep } from "node:timers/promises"
 import { writeHeapSnapshot } from "node:v8"
 await Log.init({
  print: process.argv.includes("--print-logs"),
@@ -117,6 +118,10 @@ export const rpc = {
      body,
    }
  },
  snapshot() {
    const result = writeHeapSnapshot("server.heapsnapshot")
    return result
  },
  async server(input: { port: number; hostname: string; mdns?: boolean; cors?: string[] }) {
    if (server) await server.stop(true)
    server = await Server.listen(input)
@@ -8,12 +8,18 @@ export async function upgrade() {
  const method = await Installation.method()
  const latest = await Installation.latest(method).catch(() => {})
  if (!latest) return
  if (Installation.VERSION === latest) return
-  if (config.autoupdate === false || Flag.OPENCODE_DISABLE_AUTOUPDATE) {
+  if (Flag.OPENCODE_ALWAYS_NOTIFY_UPDATE) {
    await Bus.publish(Installation.Event.UpdateAvailable, { version: latest })
    return
  }
-  if (config.autoupdate === "notify") {
+
  if (Installation.VERSION === latest) return
  if (config.autoupdate === false || Flag.OPENCODE_DISABLE_AUTOUPDATE) return
  const kind = Installation.getReleaseType(Installation.VERSION, latest)
  if (config.autoupdate === "notify" || kind !== "patch") {
    await Bus.publish(Installation.Event.UpdateAvailable, { version: latest })
    return
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brendan Allan	a638728201	remove build-cli-merge	2026-03-26 09:26:21 +08:00
Brendan Allan	28cb8efa4b	Merge branch 'dev' into brendan/cli-codesign	2026-03-25 13:15:32 +08:00
Brendan Allan	b0bd728275	codesign cli on macos by building it on macos	2026-03-25 13:14:04 +08:00
Luke Parker	700f57112a	fix: provide merge context to beta conflict resolver (#19055 )	2026-03-25 04:45:37 +00:00
Dax	0a80ef4278	fix(opencode): avoid snapshotting files over 2MB (#19043 )	2026-03-25 04:43:48 +00:00
Dax Raad	4f9667c4bb	Change issue close reason from not_planned to completed	2026-03-24 23:55:10 -04:00
Dax Raad	be142b00bd	Process issues sequentially to avoid rate limits	2026-03-24 23:54:27 -04:00
Dax Raad	45c2573979	Fix close-issues workflow permissions - Add contents: read permission for checkout - Use github.token instead of secrets.GITHUB_TOKEN	2026-03-24 23:51:46 -04:00
Dax Raad	79e9d19019	Add close-issues script and GitHub Action - Create script/github/close-issues.ts to close stale issues after 60 days - Add GitHub Action workflow to run daily at 2 AM - Remove old stale-issues workflow to avoid conflicts	2026-03-24 23:50:35 -04:00
Dax Raad	958a80cc05	fix: increase operations-per-run to 1000 and pin stale action to v10.2.0 The stale-issues workflow was hitting the default 30 operations limit, preventing it from processing all 2900+ issues/PRs. Increased to 1000 to handle the full backlog. Also pinned to exact v10.2.0 for reproducibility.	2026-03-24 23:38:15 -04:00
Kit Langton	4647aa80ac	effectify Worktree service (#18679 )	2026-03-24 20:26:21 -04:00
Adam	a379eb3867	Revert "fix(app): startup efficiency (#18854 )" This reverts commit `546748a461`.	2026-03-24 18:36:37 -05:00
Adam	cbe1337f24	Revert "fix(app): more startup efficiency (#18985 )" This reverts commit `98b3340cee`.	2026-03-24 18:36:25 -05:00
Kit Langton	50f6aa3763	fix(opencode): skip typechecking generated models snapshot (#19018 )	2026-03-24 19:11:45 -04:00
opencode	0dcdf5f529	release: v1.3.2	2026-03-24 22:50:35 +00:00
Dax Raad	4586b41ffd	change model for changelog	2026-03-24 18:25:52 -04:00
Dax Raad	35884defd8	ci	2026-03-24 18:24:34 -04:00
Dax	15dc33d1a3	feat(tui): add heap snapshot functionality for TUI and server (#19028 )	2026-03-24 18:20:11 -04:00
opencode-agent[bot]	1398674e53	chore: update nix node_modules hashes	2026-03-24 22:07:32 +00:00
Jay V	afc4c831eb	tweak: use theme tokens for debug bar surface	2026-03-24 22:07:32 +00:00
opencode	ec64ceabec	release: v1.3.1	2026-03-24 22:07:24 +00:00
Dax	56644be95a	fix(core): restore SIGHUP exit handler (#16057 ) (#18527 )	2026-03-24 17:42:58 -04:00
Kamil Jopek	00d3b831fc	feat: add Poe OAuth auth plugin (#18477 )	2026-03-24 16:17:47 -05:00
Adam	b848b7ebae	fix(app): session timeline jumping on scroll (#18993 )	2026-03-24 13:51:09 -05:00
opencode-agent[bot]	e837dcc1c5	chore: generate	2026-03-24 18:43:20 +00:00
Nicholas Hansen	024979f3fd	feat(bedrock): Add token caching for any amazon-bedrock provider (#18959 )	2026-03-24 13:42:20 -05:00
opencode-agent[bot]	bc608fb081	chore: update nix node_modules hashes	2026-03-24 18:40:28 +00:00
Adam	9838f56a6f	fix(app): sidebar ux	2026-03-24 13:35:20 -05:00
Adam	98b3340cee	fix(app): more startup efficiency (#18985 )	2026-03-24 13:23:41 -05:00
Aiden ClineandKit Langton	5e684c6e80	chore: effectify agent.ts (#18971 ) Co-authored-by: Kit Langton <kit.langton@gmail.com>	2026-03-24 18:15:23 +00:00
Caleb Norton	2c1d8a90d5	fix: nix hash update parsing... again (#18989 )	2026-03-24 13:06:46 -05:00
opencode-agent[bot]	8994cbfc0f	chore: generate	2026-03-24 18:05:43 +00:00
Adam	42a773481e	fix(app): sidebar truncation	2026-03-24 13:04:32 -05:00
Kit Langton	539b01f20f	effectify Project service (#18808 )	2026-03-24 14:04:22 -04:00
Ryan SkidmoreandAiden Cline	814a515a8a	fix: improve plugin system robustness — agent/command resolution, async errors, hook timing, two-phase init (#18280 ) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>	2026-03-24 12:50:55 -05:00
Caleb NortonandAiden Cline	235a82aea9	chore: update flake.lock (#18976 ) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>	2026-03-24 12:50:25 -05:00
Vladimir Glafirov	9330bc5339	fix: route GitLab Duo Workflow system prompt via flowConfig (#18928 )	2026-03-24 12:33:18 -05:00
Caleb Norton	1238d1f61a	fix: nix hash update parsing (#18979 )	2026-03-24 12:32:48 -05:00
opencode-agent[bot]	1d3232b388	chore: generate	2026-03-24 17:05:02 +00:00
Kit Langton	5c1bb5de86	fix: remove flaky cross-spawn spawner tests (#18977 )	2026-03-24 13:04:04 -04:00
Jack	7c5ed771c3	fix: update Feishu community links for zh locales (#18975 )	2026-03-25 01:03:01 +08:00
opencode-agent[bot]	31c4a4fb47	chore: update nix node_modules hashes	2026-03-24 16:43:24 +00:00
Caleb Norton	037077285a	fix: better nix hash detection (#18957 )	2026-03-24 11:30:39 -05:00
Kit Langton	41c77ccb33	fix: restore cross-spawn behavior for effect child processes (#18798 )	2026-03-24 10:35:24 -04:00
Adam	546748a461	fix(app): startup efficiency (#18854 )	2026-03-24 09:10:24 -05:00
Burak Yigit Kaya	c9c93eac00	fix(ui): eliminate N+1 reactive subscriptions in SessionTurn (#18924 )	2026-03-24 09:02:22 -05:00
Burak Yigit Kaya	3f1a4abe6d	fix(app): use optional chaining for model.current() in ProviderIcon (#18927 )	2026-03-24 09:01:58 -05:00
Burak Yigit Kaya	431e0586ad	fix(app): filter non-renderable part types from browser store (#18926 )	2026-03-24 09:01:25 -05:00
Shoubhit Dash	fde201c286	fix(app): stop terminal autofocus on shortcuts (#18931 )	2026-03-24 11:16:16 +00:00
Sebastian	d3debc191f	manually lock/unlock theme mode (#18905 )	2026-03-24 10:00:19 +01:00
Frank	34f43fff89	sync	2026-03-24 01:00:20 -04:00
opencode-agent[bot]	49623aa519	chore: update nix node_modules hashes	2026-03-24 03:14:22 +00:00
Vladimir Glafirov	f1340472ec	chore: bump gitlab-ai-provider to 5.3.1 for GPT-5.4 model support (#18849 )	2026-03-23 22:00:36 -05:00
Frank	a8b28826a0	wip: zen	2026-03-23 22:24:58 -04:00
Frank	a03a2b6eab	Zen: adjust cache tokens	2026-03-23 20:33:11 -04:00
Sebastian	ad78b79b8a	use renderer theme mode to switch dark/light mode (#18851 )	2026-03-24 00:32:48 +01:00
opencode-agent[bot]	9a006d8700	chore: generate	2026-03-23 17:12:55 +00:00
Kit Langton	3a0bf2f39f	fix console account URL handling (#18809 )	2026-03-23 13:11:38 -04:00
Frank	b556979634	ci: fix	2026-03-23 12:47:42 -04:00
Aiden Cline	691644eeeb	tweak: add back setting user agent in requests (#18795 )	2026-03-23 15:34:59 +00:00
Abhishek Keshri	4aebaaf067	feat(tui): add syntax highlighting for kotlin, hcl, lua, toml (#18198 )	2026-03-23 16:15:24 +01:00
David Hill	77b3b46788	tui: keep file tree open at its minimum resized width (#18777 )	2026-03-23 20:06:43 +08:00
Brendan Allan	36dfe1646b	fix(app): only navigate prompt history when input is empty (#18775 )	2026-03-23 11:48:34 +00:00
opencode-agent[bot]	6926dc26d1	chore: update nix node_modules hashes	2026-03-23 10:52:56 +00:00
opencode-agent[bot]	eb74e4a6d2	chore: update nix node_modules hashes	2026-03-23 10:37:23 +00:00
opencode-agent[bot]	85d8e143bf	chore: generate	2026-03-23 10:35:30 +00:00
Brendan Allan	8e1b53b32c	fix(app): handle session busy state better (#18758 )	2026-03-23 10:34:32 +00:00
Brendan Allan	0a7dfc03ee	fix(app): lift up project hover state to layout (#18732 )	2026-03-23 08:58:20 +00:00
Brendan Allan	4c27e7fc64	electron: more robust sidecar kill handling (#18742 )	2026-03-23 08:44:23 +00:00
Shoubhit Dash	0f5626d2e4	fix(app): prefer cmd+k for command palette (#18731 )	2026-03-23 08:00:24 +00:00
Shoubhit Dash	5ea95451dd	fix(app): prevent stale session hover preview on refocus (#18727 )	2026-03-23 07:25:30 +00:00
Shoubhit Dash	9239d877b9	fix(app): batch multi-file prompt attachments (#18722 )	2026-03-23 06:44:17 +00:00
github-actions[bot]	fc68c24433	Update VOUCHED list https://github.com/anomalyco/opencode/issues/18718#issuecomment-4108322776	2026-03-23 06:28:47 +00:00
Luke Parker	db9619dad6	Add 'write' role to vouch manage action (#18718 )	2026-03-23 06:27:35 +00:00
James Long	84d9b38873	fix(core): fix file watcher test (#18698 )	2026-03-23 03:35:17 +00:00
opencode-agent[bot]	8035c3435b	chore: update nix node_modules hashes	2026-03-23 01:03:20 +00:00
Sebastian	71e7603d71	Upgrade opentui to 0.1.90 (#18551 )	2026-03-23 01:45:34 +01:00
David Hill	40e49c5b49	tui: keep patch tool counts visible with long filenames (#18678 )	2026-03-23 00:45:11 +00:00
Luke Parker	afe9b97274	fix(app): restore keyboard project switching in open sidebar (#18682 )	2026-03-23 00:39:46 +00:00
opencode-agent[bot]	3b3549902d	chore: update nix node_modules hashes	2026-03-23 00:29:45 +00:00
David Hill	e9a9c75c1f	tweak(ui): fix padding bottom on the context tab (#18680 )	2026-03-23 00:23:45 +00:00
David HillandLukeParkerDev	2b171828b0	tui: prevent project avatar popover flicker when switching projects (#18660 ) Co-authored-by: LukeParkerDev <10430890+Hona@users.noreply.github.com>	2026-03-23 10:20:49 +10:00
Luke Parker	8dd817023a	chore: bump Bun to 1.3.11 (#18144 )	2026-03-23 10:19:21 +10:00
Dax Raad	0d6c601365	changelog slash command	2026-03-22 19:45:23 -04:00
opencode-agent[bot]	5460bf9989	chore: generate	2026-03-22 23:32:09 +00:00
opencode	eb3bfffad4	release: v1.3.0	2026-03-22 23:32:01 +00:00
Dax	e2d03ce38c	feat: interactive update flow for non-patch releases (#18662 )	2026-03-22 23:12:40 +00:00
David Hill	32f9dc6383	fix(ui): stop auto close of sidebar on resize (#18647 )	2026-03-23 08:53:12 +10:00
FilipandBrendan Allan	c529529f84	fix(app): terminal rename from context menu (#18263 ) Co-authored-by: Brendan Allan <brendonovich@outlook.com>	2026-03-22 04:39:51 +00:00
Kit Langton	13bac9c91a	effectify Pty service (#18572 )	2026-03-22 01:17:13 +00:00
Kit Langton	fe53af4819	effectify ToolRegistry service (#18571 )	2026-03-22 01:06:01 +00:00
opencode-agent[bot]	e82c5a9a28	chore: generate	2026-03-22 00:51:19 +00:00
Kit Langton	3236f228fb	effectify Plugin service (#18570 )	2026-03-22 00:50:22 +00:00
Kit Langton	0e0e7a4a4b	effectify Command service (#18568 )	2026-03-22 00:21:41 +00:00
Kit Langton	10a3d6c54e	effectify SessionStatus service (#18565 )	2026-03-21 23:55:07 +00:00
opencode-agent[bot]	832b8e252e	chore: update nix node_modules hashes	2026-03-21 19:17:12 +00:00
Sebastian	040f551c57	Upgrade opentui to 0.1.88 (#18079 )	2026-03-21 19:00:42 +00:00
Protocol Zero	cc818f8032	fix(provider): only set thinkingConfig for models with reasoning capability (#18283 )	2026-03-21 11:57:52 -05:00
opencode-agent[bot]	d5337b41f4	chore: update nix node_modules hashes	2026-03-21 15:47:15 +00:00
opencode-agent[bot]	9f7a76d6c0	chore: generate	2026-03-21 15:34:05 +00:00
Brendan Allan	6a16db4b92	app: manage mutation loading states with tanstack query (#18501 )	2026-03-21 23:33:04 +08:00
Brendan Allan	9ad6588f3e	app: allow navigating projects with keybinds (#18502 )	2026-03-21 22:13:09 +08:00
opencode-agent[bot]	fb6bf0b35e	chore: generate	2026-03-21 13:12:54 +00:00
Dax Raad	f80343b875	fix annotation	2026-03-21 09:11:15 -04:00
Frank	9b805e1cc4	wip: zen	2026-03-21 04:07:51 -04:00
opencode-agent[bot]	2e0d5d2308	chore: generate	2026-03-21 04:52:23 +00:00
Kit Langton	38e0dc9ccd	Move service state into InstanceState, flatten service facades (#18483 )	2026-03-21 04:51:35 +00:00
opencode-agent[bot]	40aeaa120d	chore: generate	2026-03-21 03:11:28 +00:00
Kit Langton	6a64177589	fix(zen): emit cost chunk in client-facing format, not upstream format (#16817 )	2026-03-20 23:10:34 -04:00
Dax Raad	5dc47905a9	allow customizing DB location	2026-03-20 22:49:55 -04:00
Aiden Cline	dc0044882c	ignore: add danieljoshuanazareth to disavow list (#18476 )	2026-03-20 21:34:07 -04:00
github-actions[bot]	45ae7dc653	Update VOUCHED list https://github.com/anomalyco/opencode/issues/18464#issuecomment-4101766628	2026-03-21 01:28:40 +00:00
Dax Raad	129fe1e350	ci	2026-03-20 17:00:05 -04:00
Kit Langton	214a6c6cf1	fix: switch consumers to service imports to break bundle cycles (#18438 )	2026-03-20 20:55:46 +00:00
Dax Raad	3f249aba6d	commit and push	2026-03-20 16:36:19 -04:00
Dax Raad	5c6ec1caac	fix question cross out	2026-03-20 15:50:04 -04:00
@@ -137,4 +137,4 @@ OpenCode 内置两种 Agent，可用 `Tab` 键快速切换：

	`---`	`---`

	`加入我们的社区 [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=de8k6664-1b5e-43f2-8efd-21d6772647b5&qr_code=true) \| [X.com](https://x.com/opencode)`	`加入我们的社区 [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=738j8655-cd59-4633-a30a-1124e0096789&qr_code=true) \| [X.com](https://x.com/opencode)`
@@ -137,4 +137,4 @@ OpenCode 內建了兩種 Agent，您可以使用 `Tab` 鍵快速切換。

	`---`	`---`

	`加入我們的社群 [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=de8k6664-1b5e-43f2-8efd-21d6772647b5&qr_code=true) \| [X.com](https://x.com/opencode)`	`加入我們的社群 [飞书](https://applink.feishu.cn/client/chat/chatter/add_by_link?link_token=738j8655-cd59-4633-a30a-1124e0096789&qr_code=true) \| [X.com](https://x.com/opencode)`