feat: make plan mode the default, remove experimental flag

- Remove OPENCODE_EXPERIMENTAL_PLAN_MODE flag from flag.ts - Update prompt.ts to always use plan mode logic - Update registry.ts to always include plan tools in CLI - Remove flag documentation from cli.mdx
2026-02-10 10:54:28 +00:00 · 2026-02-02 10:40:40 -05:00
156 changed files with 2563 additions and 5176 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,5 +1,4 @@
 # web + desktop packages
 packages/app/      @adamdotdevin
 packages/tauri/    @adamdotdevin
-packages/desktop/src-tauri/  @brendonovich
 packages/desktop/  @adamdotdevin
--- a/.github/workflows/close-stale-prs.yml
+++ b/.github/workflows/close-stale-prs.yml
@@ -18,7 +18,6 @@ permissions:
 jobs:
  close-stale-prs:
    runs-on: ubuntu-latest
-    timeout-minutes: 15
    steps:
      - name: Close inactive PRs
        uses: actions/github-script@v8
@@ -26,15 +25,6 @@ jobs:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
            const DAYS_INACTIVE = 60
-            const MAX_RETRIES = 3
-
-            // Adaptive delay: fast for small batches, slower for large to respect
-            // GitHub's 80 content-generating requests/minute limit
-            const SMALL_BATCH_THRESHOLD = 10
-            const SMALL_BATCH_DELAY_MS = 1000  // 1s for daily operations (≤10 PRs)
-            const LARGE_BATCH_DELAY_MS = 2000  // 2s for backlog (>10 PRs) = ~30 ops/min, well under 80 limit
-
-            const startTime = Date.now()
            const cutoff = new Date(Date.now() - DAYS_INACTIVE * 24 * 60 * 60 * 1000)
            const { owner, repo } = context.repo
            const dryRun = context.payload.inputs?.dryRun === "true"
@@ -42,42 +32,6 @@ jobs:
            core.info(`Dry run mode: ${dryRun}`)
            core.info(`Cutoff date: ${cutoff.toISOString()}`)

-            function sleep(ms) {
-              return new Promise(resolve => setTimeout(resolve, ms))
-            }
-
-            async function withRetry(fn, description = 'API call') {
-              let lastError
-              for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
-                try {
-                  const result = await fn()
-                  return result
-                } catch (error) {
-                  lastError = error
-                  const isRateLimited = error.status === 403 &&
-                    (error.message?.includes('rate limit') || error.message?.includes('secondary'))
-
-                  if (!isRateLimited) {
-                    throw error
-                  }
-
-                  // Parse retry-after header, default to 60 seconds
-                  const retryAfter = error.response?.headers?.['retry-after']
-                    ? parseInt(error.response.headers['retry-after'])
-                    : 60
-
-                  // Exponential backoff: retryAfter * 2^attempt
-                  const backoffMs = retryAfter * 1000 * Math.pow(2, attempt)
-
-                  core.warning(`${description}: Rate limited (attempt ${attempt + 1}/${MAX_RETRIES}). Waiting ${backoffMs / 1000}s before retry...`)
-
-                  await sleep(backoffMs)
-                }
-              }
-              core.error(`${description}: Max retries (${MAX_RETRIES}) exceeded`)
-              throw lastError
-            }
-
            const query = `
              query($owner: String!, $repo: String!, $cursor: String) {
                repository(owner: $owner, name: $repo) {
@@ -119,27 +73,17 @@ jobs:
            const allPrs = []
            let cursor = null
            let hasNextPage = true
-            let pageCount = 0

            while (hasNextPage) {
-              pageCount++
-              core.info(`Fetching page ${pageCount} of open PRs...`)
-
-              const result = await withRetry(
-                () => github.graphql(query, { owner, repo, cursor }),
-                `GraphQL page ${pageCount}`
-              )
+              const result = await github.graphql(query, {
+                owner,
+                repo,
+                cursor,
+              })

              allPrs.push(...result.repository.pullRequests.nodes)
              hasNextPage = result.repository.pullRequests.pageInfo.hasNextPage
              cursor = result.repository.pullRequests.pageInfo.endCursor
-
-              core.info(`Page ${pageCount}: fetched ${result.repository.pullRequests.nodes.length} PRs (total: ${allPrs.length})`)
-
-              // Delay between pagination requests (use small batch delay for reads)
-              if (hasNextPage) {
-                await sleep(SMALL_BATCH_DELAY_MS)
-              }
            }

            core.info(`Found ${allPrs.length} open pull requests`)
@@ -170,66 +114,28 @@ jobs:

            core.info(`Found ${stalePrs.length} stale pull requests`)

-            // ============================================
-            // Close stale PRs
-            // ============================================
-            const requestDelayMs = stalePrs.length > SMALL_BATCH_THRESHOLD
-              ? LARGE_BATCH_DELAY_MS
-              : SMALL_BATCH_DELAY_MS
-
-            core.info(`Using ${requestDelayMs}ms delay between operations (${stalePrs.length > SMALL_BATCH_THRESHOLD ? 'large' : 'small'} batch mode)`)
-
-            let closedCount = 0
-            let skippedCount = 0
-
            for (const pr of stalePrs) {
              const issue_number = pr.number
              const closeComment = `Closing this pull request because it has had no updates for more than ${DAYS_INACTIVE} days. If you plan to continue working on it, feel free to reopen or open a new PR.`

              if (dryRun) {
-                core.info(`[dry-run] Would close PR #${issue_number} from ${pr.author?.login || 'unknown'}: ${pr.title}`)
+                core.info(`[dry-run] Would close PR #${issue_number} from ${pr.author.login}: ${pr.title}`)
                continue
              }

-              try {
-                // Add comment
-                await withRetry(
-                  () => github.rest.issues.createComment({
-                    owner,
-                    repo,
-                    issue_number,
-                    body: closeComment,
-                  }),
-                  `Comment on PR #${issue_number}`
-                )
+              await github.rest.issues.createComment({
+                owner,
+                repo,
+                issue_number,
+                body: closeComment,
+              })

-                // Close PR
-                await withRetry(
-                  () => github.rest.pulls.update({
-                    owner,
-                    repo,
-                    pull_number: issue_number,
-                    state: "closed",
-                  }),
-                  `Close PR #${issue_number}`
-                )
+              await github.rest.pulls.update({
+                owner,
+                repo,
+                pull_number: issue_number,
+                state: "closed",
+              })

-                closedCount++
-                core.info(`Closed PR #${issue_number} from ${pr.author?.login || 'unknown'}: ${pr.title}`)
-
-                // Delay before processing next PR
-                await sleep(requestDelayMs)
-              } catch (error) {
-                skippedCount++
-                core.error(`Failed to close PR #${issue_number}: ${error.message}`)
-              }
+              core.info(`Closed PR #${issue_number} from ${pr.author.login}: ${pr.title}`)
            }
-
-            const elapsed = Math.round((Date.now() - startTime) / 1000)
-            core.info(`\n========== Summary ==========`)
-            core.info(`Total open PRs found: ${allPrs.length}`)
-            core.info(`Stale PRs identified: ${stalePrs.length}`)
-            core.info(`PRs closed: ${closedCount}`)
-            core.info(`PRs skipped (errors): ${skippedCount}`)
-            core.info(`Elapsed time: ${elapsed}s`)
-            core.info(`=============================`)
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ node_modules
 .env
 .idea
 .vscode
-.codex
 *~
 playground
 tmp
--- a/.opencode/opencode.jsonc
+++ b/.opencode/opencode.jsonc
@@ -1,5 +1,6 @@
 {
  "$schema": "https://opencode.ai/config.json",
+  // "plugin": ["opencode-openai-codex-auth"],
  // "enterprise": {
  //   "url": "https://enterprise.dev.opencode.ai",
  // },
@@ -8,7 +9,12 @@
      "options": {},
    },
  },
-  "mcp": {},
+  "mcp": {
+    "context7": {
+      "type": "remote",
+      "url": "https://mcp.context7.com/mcp",
+    },
+  },
  "tools": {
    "github-triage": false,
    "github-pr-search": false,
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ The install script respects the following priority order for the installation pa

 1. `$OPENCODE_INSTALL_DIR` - Custom installation directory
 2. `$XDG_BIN_DIR` - XDG Base Directory Specification compliant path
-3. `$HOME/bin` - Standard user binary directory (if it exists or can be created)
+3. `$HOME/bin` - Standard user binary directory (if exists or can be created)
 4. `$HOME/.opencode/bin` - Default fallback

 ```bash
@@ -95,20 +95,20 @@ XDG_BIN_DIR=$HOME/.local/bin curl -fsSL https://opencode.ai/install | bash

 OpenCode includes two built-in agents you can switch between with the `Tab` key.

- **build** - Default, full-access agent for development work
+- **build** - Default, full access agent for development work
 - **plan** - Read-only agent for analysis and code exploration
  - Denies file edits by default
  - Asks permission before running bash commands
  - Ideal for exploring unfamiliar codebases or planning changes

-Also included is a **general** subagent for complex searches and multistep tasks.
+Also, included is a **general** subagent for complex searches and multistep tasks.
 This is used internally and can be invoked using `@general` in messages.

 Learn more about [agents](https://opencode.ai/docs/agents).

 ### Documentation

-For more info on how to configure OpenCode, [**head over to our docs**](https://opencode.ai/docs).
+For more info on how to configure OpenCode [**head over to our docs**](https://opencode.ai/docs).

 ### Contributing

@@ -116,7 +116,7 @@ If you're interested in contributing to OpenCode, please read our [contributing

 ### Building on OpenCode

-If you are working on a project that's related to OpenCode and is using "opencode" as part of its name, for example "opencode-dashboard" or "opencode-mobile", please add a note to your README to clarify that it is not built by the OpenCode team and is not affiliated with us in any way.
+If you are working on a project that's related to OpenCode and is using "opencode" as a part of its name; for example, "opencode-dashboard" or "opencode-mobile", please add a note to your README to clarify that it is not built by the OpenCode team and is not affiliated with us in any way.

 ### FAQ

@@ -125,10 +125,10 @@ If you are working on a project that's related to OpenCode and is using "opencod
 It's very similar to Claude Code in terms of capability. Here are the key differences:

 - 100% open source
- Not coupled to any provider. Although we recommend the models we provide through [OpenCode Zen](https://opencode.ai/zen), OpenCode can be used with Claude, OpenAI, Google, or even local models. As models evolve, the gaps between them will close and pricing will drop, so being provider-agnostic is important.
- Out-of-the-box LSP support
+- Not coupled to any provider. Although we recommend the models we provide through [OpenCode Zen](https://opencode.ai/zen); OpenCode can be used with Claude, OpenAI, Google or even local models. As models evolve the gaps between them will close and pricing will drop so being provider-agnostic is important.
+- Out of the box LSP support
 - A focus on TUI. OpenCode is built by neovim users and the creators of [terminal.shop](https://terminal.shop); we are going to push the limits of what's possible in the terminal.
- A client/server architecture. This, for example, can allow OpenCode to run on your computer while you drive it remotely from a mobile app, meaning that the TUI frontend is just one of the possible clients.
+- A client/server architecture. This for example can allow OpenCode to run on your computer, while you can drive it remotely from a mobile app. Meaning that the TUI frontend is just one of the possible clients.

 ---

--- a/bun.lock
+++ b/bun.lock
@@ -23,7 +23,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -73,7 +73,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -107,7 +107,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -134,7 +134,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@ai-sdk/anthropic": "2.0.0",
        "@ai-sdk/openai": "2.0.2",
@@ -158,7 +158,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -182,7 +182,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -213,7 +213,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@opencode-ai/util": "workspace:*",
@@ -242,7 +242,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -258,7 +258,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -286,7 +286,7 @@
        "@ai-sdk/vercel": "1.0.33",
        "@ai-sdk/xai": "2.0.56",
        "@clack/prompts": "1.0.0-alpha.1",
-        "@gitlab/gitlab-ai-provider": "3.4.0",
+        "@gitlab/gitlab-ai-provider": "3.3.1",
        "@hono/standard-validator": "0.1.5",
        "@hono/zod-validator": "catalog:",
        "@modelcontextprotocol/sdk": "1.25.2",
@@ -307,9 +307,8 @@
        "@standard-schema/spec": "1.0.0",
        "@zip.js/zip.js": "2.7.62",
        "ai": "catalog:",
-        "ai-gateway-provider": "2.3.1",
        "bonjour-service": "1.3.0",
-        "bun-pty": "0.4.8",
+        "bun-pty": "0.4.4",
        "chokidar": "4.0.3",
        "clipboardy": "4.0.0",
        "decimal.js": "10.5.0",
@@ -363,7 +362,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "zod": "catalog:",
@@ -383,7 +382,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "devDependencies": {
        "@hey-api/openapi-ts": "0.90.10",
        "@tsconfig/node22": "catalog:",
@@ -394,7 +393,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -407,7 +406,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -449,7 +448,7 @@
    },
    "packages/util": {
      "name": "@opencode-ai/util",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "zod": "catalog:",
      },
@@ -460,7 +459,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.1.51",
+      "version": "1.1.48",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -570,16 +569,8 @@

    "@ai-sdk/cohere": ["@ai-sdk/cohere@2.0.22", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-yJ9kP5cEDJwo8qpITq5TQFD8YNfNtW+HbyvWwrKMbFzmiMvIZuk95HIaFXE7PCTuZsqMA05yYu+qX/vQ3rNKjA=="],

-    "@ai-sdk/deepgram": ["@ai-sdk/deepgram@1.0.22", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-lqmINr+1Jy2yGXxnQB6IrC2xMtUY5uK96pyKfqTj1kLlXGatKnJfXF7WTkOGgQrFqIYqpjDz+sPVR3n0KUEUtA=="],
-
    "@ai-sdk/deepinfra": ["@ai-sdk/deepinfra@1.0.33", "", { "dependencies": { "@ai-sdk/openai-compatible": "1.0.32", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-hn2y8Q+2iZgGNVJyzPsH8EECECryFMVmxBJrBvBWoi8xcJPRyt0fZP5dOSLyGg3q0oxmPS9M0Eq0NNlKot/bYQ=="],

-    "@ai-sdk/deepseek": ["@ai-sdk/deepseek@1.0.33", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-NiKjvqXI/96e/7SjZGgQH141PBqggsF7fNbjGTv4RgVWayMXp9mj0Ou2NjAUGwwxJwj/qseY0gXiDCYaHWFBkw=="],
-
-    "@ai-sdk/elevenlabs": ["@ai-sdk/elevenlabs@1.0.22", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-4d5EKu0OW7Gf5WFpGo4ixn0iWEwA+GpteqUjEznWGmi7qdLE5zdkbRik5B1HrDDiw5P90yO51xBex/Fp50JcVA=="],
-
-    "@ai-sdk/fireworks": ["@ai-sdk/fireworks@1.0.33", "", { "dependencies": { "@ai-sdk/openai-compatible": "1.0.32", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-WWOz5Kj+5fVe94h7WeReqjUOVtAquDE2kM575FUc8CsVxH2tRfA5cLa8nu3bknSezsKt3i67YM6mvCRxiXCkWA=="],
-
    "@ai-sdk/gateway": ["@ai-sdk/gateway@2.0.30", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20", "@vercel/oidc": "3.1.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-5Nrkj8B4MzkkOfjjA+Cs5pamkbkK4lI11bx80QV7TFcen/hWA8wEC+UVzwuM5H2zpekoNMjvl6GonHnR62XIZw=="],

    "@ai-sdk/google": ["@ai-sdk/google@2.0.52", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-2XUnGi3f7TV4ujoAhA+Fg3idUoG/+Y2xjCRg70a1/m0DH1KSQqYaCboJ1C19y6ZHGdf5KNT20eJdswP6TvrY2g=="],
@@ -934,7 +925,7 @@

    "@fontsource/inter": ["@fontsource/inter@5.2.8", "", {}, "sha512-P6r5WnJoKiNVV+zvW2xM13gNdFhAEpQ9dQJHt3naLvfg+LkF2ldgSLiF4T41lf1SQCM9QmkqPTn4TH568IRagg=="],

-    "@gitlab/gitlab-ai-provider": ["@gitlab/gitlab-ai-provider@3.4.0", "", { "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-1fEZgqjSZ0WLesftw/J5UtFuJCYFDvCZCHhTH5PZAmpDEmCwllJBoe84L3+vIk38V2FGDMTW128iKTB2mVzr3A=="],
+    "@gitlab/gitlab-ai-provider": ["@gitlab/gitlab-ai-provider@3.3.1", "", { "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-J4/LfVcxOKbR2gfoBWRKp1BpWppprC2Cz/Ff5E0B/0lS341CDtZwzkgWvHfkM/XU6q83JRs059dS0cR8VOODOQ=="],

    "@graphql-typed-document-node/core": ["@graphql-typed-document-node/core@3.2.0", "", { "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ=="],

@@ -1958,8 +1949,6 @@

    "ai": ["ai@5.0.124", "", { "dependencies": { "@ai-sdk/gateway": "2.0.30", "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20", "@opentelemetry/api": "1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-Li6Jw9F9qsvFJXZPBfxj38ddP2iURCnMs96f9Q3OeQzrDVcl1hvtwSEAuxA/qmfh6SDV2ERqFUOFzigvr0697g=="],

-    "ai-gateway-provider": ["ai-gateway-provider@2.3.1", "", { "dependencies": { "@ai-sdk/provider": "^2.0.0", "@ai-sdk/provider-utils": "^3.0.19", "ai": "^5.0.116" }, "optionalDependencies": { "@ai-sdk/amazon-bedrock": "^3.0.71", "@ai-sdk/anthropic": "^2.0.56", "@ai-sdk/azure": "^2.0.90", "@ai-sdk/cerebras": "^1.0.33", "@ai-sdk/cohere": "^2.0.21", "@ai-sdk/deepgram": "^1.0.21", "@ai-sdk/deepseek": "^1.0.32", "@ai-sdk/elevenlabs": "^1.0.21", "@ai-sdk/fireworks": "^1.0.30", "@ai-sdk/google": "^2.0.51", "@ai-sdk/google-vertex": "3.0.90", "@ai-sdk/groq": "^2.0.33", "@ai-sdk/mistral": "^2.0.26", "@ai-sdk/openai": "^2.0.88", "@ai-sdk/perplexity": "^2.0.22", "@ai-sdk/xai": "^2.0.42", "@openrouter/ai-sdk-provider": "^1.5.3" }, "peerDependencies": { "@ai-sdk/openai-compatible": "^1.0.29" } }, "sha512-PqI6TVNEDNwr7kOhy7XUGnA8XJB1SpeA9aLqGjr0CyWkKgH+y+ofPm8MZGZ74DOwVejDF+POZq0Qs9jKEKUeYg=="],
-
    "ajv": ["ajv@8.17.1", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="],

    "ajv-formats": ["ajv-formats@3.0.1", "", { "dependencies": { "ajv": "^8.0.0" } }, "sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ=="],
@@ -2108,7 +2097,7 @@

    "bun-ffi-structs": ["bun-ffi-structs@0.1.2", "", { "peerDependencies": { "typescript": "^5" } }, "sha512-Lh1oQAYHDcnesJauieA4UNkWGXY9hYck7OA5IaRwE3Bp6K2F2pJSNYqq+hIy7P3uOvo3km3oxS8304g5gDMl/w=="],

-    "bun-pty": ["bun-pty@0.4.8", "", {}, "sha512-rO70Mrbr13+jxHHHu2YBkk2pNqrJE5cJn29WE++PUr+GFA0hq/VgtQPZANJ8dJo6d7XImvBk37Innt8GM7O28w=="],
+    "bun-pty": ["bun-pty@0.4.4", "", {}, "sha512-WK4G6uWsZgu1v4hKIlw6G1q2AOf8Rbga2Yr7RnxArVjjyb+mtVa/CFc9GOJf+OYSJSH8k7LonAtQOVeNAddRyg=="],

    "bun-types": ["bun-types@1.3.5", "", { "dependencies": { "@types/node": "*" } }, "sha512-inmAYe2PFLs0SUbFOWSVD24sg1jFlMPxOjOSSCYqUgn4Hsc3rDc7dFvfVYjFPNHtov6kgUeulV4SxbuIV/stPw=="],

@@ -4000,8 +3989,6 @@

    "@ai-sdk/deepinfra/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.32", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-YspqqyJPzHjqWrjt4y/Wgc2aJgCcQj5uIJgZpq2Ar/lH30cEVhgE+keePDbjKpetD9UwNggCj7u6kO3unS23OQ=="],

-    "@ai-sdk/fireworks/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.32", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-YspqqyJPzHjqWrjt4y/Wgc2aJgCcQj5uIJgZpq2Ar/lH30cEVhgE+keePDbjKpetD9UwNggCj7u6kO3unS23OQ=="],
-
    "@ai-sdk/google-vertex/@ai-sdk/anthropic": ["@ai-sdk/anthropic@2.0.58", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-CkNW5L1Arv8gPtPlEmKd+yf/SG9ucJf0XQdpMG8OiYEtEMc2smuCA+tyCp8zI7IBVg/FE7nUfFHntQFaOjRwJQ=="],

    "@ai-sdk/openai/@ai-sdk/provider": ["@ai-sdk/provider@2.0.0", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA=="],
@@ -4286,14 +4273,6 @@

    "accepts/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],

-    "ai-gateway-provider/@ai-sdk/anthropic": ["@ai-sdk/anthropic@2.0.58", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-CkNW5L1Arv8gPtPlEmKd+yf/SG9ucJf0XQdpMG8OiYEtEMc2smuCA+tyCp8zI7IBVg/FE7nUfFHntQFaOjRwJQ=="],
-
-    "ai-gateway-provider/@ai-sdk/google-vertex": ["@ai-sdk/google-vertex@3.0.90", "", { "dependencies": { "@ai-sdk/anthropic": "2.0.56", "@ai-sdk/google": "2.0.46", "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.19", "google-auth-library": "^10.5.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-C9MLe1KZGg1ZbupV2osygHtL5qngyCDA6ATatunyfTbIe8TXKG8HGni/3O6ifbnI5qxTidIn150Ox7eIFZVMYg=="],
-
-    "ai-gateway-provider/@ai-sdk/openai": ["@ai-sdk/openai@2.0.89", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-4+qWkBCbL9HPKbgrUO/F2uXZ8GqrYxHa8SWEYIzxEJ9zvWw3ISr3t1/27O1i8MGSym+PzEyHBT48EV4LAwWaEw=="],
-
-    "ai-gateway-provider/@ai-sdk/openai-compatible": ["@ai-sdk/openai-compatible@1.0.32", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@ai-sdk/provider-utils": "3.0.20" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-YspqqyJPzHjqWrjt4y/Wgc2aJgCcQj5uIJgZpq2Ar/lH30cEVhgE+keePDbjKpetD9UwNggCj7u6kO3unS23OQ=="],
-
    "ansi-align/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],

    "anymatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],
@@ -4826,14 +4805,6 @@

    "accepts/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],

-    "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/anthropic": ["@ai-sdk/anthropic@2.0.56", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.19" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-XHJKu0Yvfu9SPzRfsAFESa+9T7f2YJY6TxykKMfRsAwpeWAiX/Gbx5J5uM15AzYC3Rw8tVP3oH+j7jEivENirQ=="],
-
-    "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/google": ["@ai-sdk/google@2.0.46", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.19" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-8PK6u4sGE/kXebd7ZkTp+0aya4kNqzoqpS5m7cHY2NfTK6fhPc6GNvE+MZIZIoHQTp5ed86wGBdeBPpFaaUtyg=="],
-
-    "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/provider": ["@ai-sdk/provider@2.0.0", "", { "dependencies": { "json-schema": "^0.4.0" } }, "sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA=="],
-
-    "ai-gateway-provider/@ai-sdk/google-vertex/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.19", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-W41Wc9/jbUVXVwCN/7bWa4IKe8MtxO3EyA0Hfhx6grnmiYlCvpI8neSYWFE0zScXJkgA/YK3BRybzgyiXuu6JA=="],
-
    "ansi-align/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],

    "ansi-align/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-9XlAYCNdBhw8NmfJoYNjvQYhSn02rFhWvbJtlOnnCjc=",
-    "aarch64-linux": "sha256-Mdz3gAy8auN7mhMHRaWyH/exHGO9eYDyUMQKqscg6Xc=",
-    "aarch64-darwin": "sha256-NDB6+NVZ4+9+Yds/cjEGQAn9Tl/LRuEjEH6wV5dTdVg=",
-    "x86_64-darwin": "sha256-LGJ5TJYgyK8Vn0BliEeJdoblcubj5ZIjvJoUtdVXfvU="
+    "x86_64-linux": "sha256-4I0lpBnbAi7IZMURTMLysjrqdsNvXJf8802NrJnpdks=",
+    "aarch64-linux": "sha256-WOGKsPlcQVSbL8TDr1JYO/2ucPTV2Hy0TXJKWv8EoVw=",
+    "aarch64-darwin": "sha256-LuvjwGm1QsHoLxuvSSp4VsDIv02Z/rTONsU32arQMuw=",
+    "x86_64-darwin": "sha256-AbglfgCWj/r+wHfle+e+D3b/xPcwwg4IK7j5iwn9nzw="
  }
 }
--- a/packages/app/e2e/fixtures.ts
+++ b/packages/app/e2e/fixtures.ts
@@ -1,5 +1,5 @@
-import { test as base, expect, type Page } from "@playwright/test"
-import { cleanupTestProject, createTestProject, seedProjects } from "./actions"
+import { test as base, expect } from "@playwright/test"
+import { seedProjects } from "./actions"
 import { promptSelector } from "./selectors"
 import { createSdk, dirSlug, getWorktree, sessionPath } from "./utils"

@@ -8,14 +8,6 @@ export const settingsKey = "settings.v3"
 type TestFixtures = {
  sdk: ReturnType<typeof createSdk>
  gotoSession: (sessionID?: string) => Promise<void>
-  withProject: <T>(
-    callback: (project: {
-      directory: string
-      slug: string
-      gotoSession: (sessionID?: string) => Promise<void>
-    }) => Promise<T>,
-    options?: { extra?: string[] },
-  ) => Promise<T>
 }

 type WorkerFixtures = {
@@ -41,7 +33,17 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({
    await use(createSdk(directory))
  },
  gotoSession: async ({ page, directory }, use) => {
-    await seedStorage(page, { directory })
+    await seedProjects(page, { directory })
+    await page.addInitScript(() => {
+      localStorage.setItem(
+        "opencode.global.dat:model",
+        JSON.stringify({
+          recent: [{ providerID: "opencode", modelID: "big-pickle" }],
+          user: [],
+          variant: {},
+        }),
+      )
+    })

    const gotoSession = async (sessionID?: string) => {
      await page.goto(sessionPath(directory, sessionID))
@@ -49,39 +51,6 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({
    }
    await use(gotoSession)
  },
-  withProject: async ({ page }, use) => {
-    await use(async (callback, options) => {
-      const directory = await createTestProject()
-      const slug = dirSlug(directory)
-      await seedStorage(page, { directory, extra: options?.extra })
-
-      const gotoSession = async (sessionID?: string) => {
-        await page.goto(sessionPath(directory, sessionID))
-        await expect(page.locator(promptSelector)).toBeVisible()
-      }
-
-      try {
-        await gotoSession()
-        return await callback({ directory, slug, gotoSession })
-      } finally {
-        await cleanupTestProject(directory)
-      }
-    })
-  },
 })

-async function seedStorage(page: Page, input: { directory: string; extra?: string[] }) {
-  await seedProjects(page, input)
-  await page.addInitScript(() => {
-    localStorage.setItem(
-      "opencode.global.dat:model",
-      JSON.stringify({
-        recent: [{ providerID: "opencode", modelID: "big-pickle" }],
-        user: [],
-        variant: {},
-      }),
-    )
-  })
-}
-
 export { expect }
--- a/packages/app/e2e/projects/project-edit.spec.ts
+++ b/packages/app/e2e/projects/project-edit.spec.ts
@@ -1,53 +1,52 @@
 import { test, expect } from "../fixtures"
 import { openSidebar } from "../actions"

-test("dialog edit project updates name and startup script", async ({ page, withProject }) => {
+test("dialog edit project updates name and startup script", async ({ page, gotoSession }) => {
+  await gotoSession()
  await page.setViewportSize({ width: 1400, height: 800 })

-  await withProject(async () => {
-    await openSidebar(page)
-
-    const open = async () => {
-      const header = page.locator(".group\\/project").first()
-      await header.hover()
-      const trigger = header.getByRole("button", { name: "More options" }).first()
-      await expect(trigger).toBeVisible()
-      await trigger.click({ force: true })
-
-      const menu = page.locator('[data-component="dropdown-menu-content"]').first()
-      await expect(menu).toBeVisible()
-
-      const editItem = menu.getByRole("menuitem", { name: "Edit" }).first()
-      await expect(editItem).toBeVisible()
-      await editItem.click({ force: true })
-
-      const dialog = page.getByRole("dialog")
-      await expect(dialog).toBeVisible()
-      await expect(dialog.getByRole("heading", { level: 2 })).toHaveText("Edit project")
-      return dialog
-    }
-
-    const name = `e2e project ${Date.now()}`
-    const startup = `echo e2e_${Date.now()}`
-
-    const dialog = await open()
-
-    const nameInput = dialog.getByLabel("Name")
-    await nameInput.fill(name)
-
-    const startupInput = dialog.getByLabel("Workspace startup script")
-    await startupInput.fill(startup)
-
-    await dialog.getByRole("button", { name: "Save" }).click()
-    await expect(dialog).toHaveCount(0)
+  await openSidebar(page)

+  const open = async () => {
    const header = page.locator(".group\\/project").first()
-    await expect(header).toContainText(name)
+    await header.hover()
+    const trigger = header.getByRole("button", { name: "More options" }).first()
+    await expect(trigger).toBeVisible()
+    await trigger.click({ force: true })

-    const reopened = await open()
-    await expect(reopened.getByLabel("Name")).toHaveValue(name)
-    await expect(reopened.getByLabel("Workspace startup script")).toHaveValue(startup)
-    await reopened.getByRole("button", { name: "Cancel" }).click()
-    await expect(reopened).toHaveCount(0)
-  })
+    const menu = page.locator('[data-component="dropdown-menu-content"]').first()
+    await expect(menu).toBeVisible()
+
+    const editItem = menu.getByRole("menuitem", { name: "Edit" }).first()
+    await expect(editItem).toBeVisible()
+    await editItem.click({ force: true })
+
+    const dialog = page.getByRole("dialog")
+    await expect(dialog).toBeVisible()
+    await expect(dialog.getByRole("heading", { level: 2 })).toHaveText("Edit project")
+    return dialog
+  }
+
+  const name = `e2e project ${Date.now()}`
+  const startup = `echo e2e_${Date.now()}`
+
+  const dialog = await open()
+
+  const nameInput = dialog.getByLabel("Name")
+  await nameInput.fill(name)
+
+  const startupInput = dialog.getByLabel("Workspace startup script")
+  await startupInput.fill(startup)
+
+  await dialog.getByRole("button", { name: "Save" }).click()
+  await expect(dialog).toHaveCount(0)
+
+  const header = page.locator(".group\\/project").first()
+  await expect(header).toContainText(name)
+
+  const reopened = await open()
+  await expect(reopened.getByLabel("Name")).toHaveValue(name)
+  await expect(reopened.getByLabel("Workspace startup script")).toHaveValue(startup)
+  await reopened.getByRole("button", { name: "Cancel" }).click()
+  await expect(reopened).toHaveCount(0)
 })
--- a/packages/app/e2e/projects/projects-close.spec.ts
+++ b/packages/app/e2e/projects/projects-close.spec.ts
@@ -1,73 +1,69 @@
 import { test, expect } from "../fixtures"
-import { createTestProject, cleanupTestProject, openSidebar, clickMenuItem } from "../actions"
+import { createTestProject, seedProjects, cleanupTestProject, openSidebar, clickMenuItem } from "../actions"
 import { projectCloseHoverSelector, projectCloseMenuSelector, projectSwitchSelector } from "../selectors"
 import { dirSlug } from "../utils"

-test("can close a project via hover card close button", async ({ page, withProject }) => {
+test("can close a project via hover card close button", async ({ page, directory, gotoSession }) => {
  await page.setViewportSize({ width: 1400, height: 800 })

  const other = await createTestProject()
  const otherSlug = dirSlug(other)
+  await seedProjects(page, { directory, extra: [other] })

  try {
-    await withProject(
-      async () => {
-        await openSidebar(page)
+    await gotoSession()

-        const otherButton = page.locator(projectSwitchSelector(otherSlug)).first()
-        await expect(otherButton).toBeVisible()
-        await otherButton.hover()
+    await openSidebar(page)

-        const close = page.locator(projectCloseHoverSelector(otherSlug)).first()
-        await expect(close).toBeVisible()
-        await close.click()
+    const otherButton = page.locator(projectSwitchSelector(otherSlug)).first()
+    await expect(otherButton).toBeVisible()
+    await otherButton.hover()

-        await expect(otherButton).toHaveCount(0)
-      },
-      { extra: [other] },
-    )
+    const close = page.locator(projectCloseHoverSelector(otherSlug)).first()
+    await expect(close).toBeVisible()
+    await close.click()
+
+    await expect(otherButton).toHaveCount(0)
  } finally {
    await cleanupTestProject(other)
  }
 })

-test("can close a project via project header more options menu", async ({ page, withProject }) => {
+test("can close a project via project header more options menu", async ({ page, directory, gotoSession }) => {
  await page.setViewportSize({ width: 1400, height: 800 })

  const other = await createTestProject()
  const otherName = other.split("/").pop() ?? other
  const otherSlug = dirSlug(other)
+  await seedProjects(page, { directory, extra: [other] })

  try {
-    await withProject(
-      async () => {
-        await openSidebar(page)
+    await gotoSession()

-        const otherButton = page.locator(projectSwitchSelector(otherSlug)).first()
-        await expect(otherButton).toBeVisible()
-        await otherButton.click()
+    await openSidebar(page)

-        await expect(page).toHaveURL(new RegExp(`/${otherSlug}/session`))
+    const otherButton = page.locator(projectSwitchSelector(otherSlug)).first()
+    await expect(otherButton).toBeVisible()
+    await otherButton.click()

-        const header = page
-          .locator(".group\\/project")
-          .filter({ has: page.locator(`[data-action="project-menu"][data-project="${otherSlug}"]`) })
-          .first()
-        await expect(header).toContainText(otherName)
+    await expect(page).toHaveURL(new RegExp(`/${otherSlug}/session`))

-        const trigger = header.locator(`[data-action="project-menu"][data-project="${otherSlug}"]`).first()
-        await expect(trigger).toHaveCount(1)
-        await trigger.focus()
-        await page.keyboard.press("Enter")
+    const header = page
+      .locator(".group\\/project")
+      .filter({ has: page.locator(`[data-action="project-menu"][data-project="${otherSlug}"]`) })
+      .first()
+    await expect(header).toContainText(otherName)

-        const menu = page.locator('[data-component="dropdown-menu-content"]').first()
-        await expect(menu).toBeVisible({ timeout: 10_000 })
+    const trigger = header.locator(`[data-action="project-menu"][data-project="${otherSlug}"]`).first()
+    await expect(trigger).toHaveCount(1)
+    await trigger.focus()
+    await page.keyboard.press("Enter")

-        await clickMenuItem(menu, /^Close$/i, { force: true })
-        await expect(otherButton).toHaveCount(0)
-      },
-      { extra: [other] },
-    )
+    const menu = page.locator('[data-component="dropdown-menu-content"]').first()
+    await expect(menu).toBeVisible({ timeout: 10_000 })
+
+    await clickMenuItem(menu, /^Close$/i, { force: true })
+    await expect(otherButton).toHaveCount(0)
  } finally {
    await cleanupTestProject(other)
  }
--- a/packages/app/e2e/projects/projects-switch.spec.ts
+++ b/packages/app/e2e/projects/projects-switch.spec.ts
@@ -1,34 +1,33 @@
 import { test, expect } from "../fixtures"
-import { defocus, createTestProject, cleanupTestProject } from "../actions"
+import { defocus, createTestProject, seedProjects, cleanupTestProject } from "../actions"
 import { projectSwitchSelector } from "../selectors"
 import { dirSlug } from "../utils"

-test("can switch between projects from sidebar", async ({ page, withProject }) => {
+test("can switch between projects from sidebar", async ({ page, directory, gotoSession }) => {
  await page.setViewportSize({ width: 1400, height: 800 })

  const other = await createTestProject()
  const otherSlug = dirSlug(other)

+  await seedProjects(page, { directory, extra: [other] })
+
  try {
-    await withProject(
-      async ({ directory }) => {
-        await defocus(page)
+    await gotoSession()

-        const currentSlug = dirSlug(directory)
-        const otherButton = page.locator(projectSwitchSelector(otherSlug)).first()
-        await expect(otherButton).toBeVisible()
-        await otherButton.click()
+    await defocus(page)

-        await expect(page).toHaveURL(new RegExp(`/${otherSlug}/session`))
+    const currentSlug = dirSlug(directory)
+    const otherButton = page.locator(projectSwitchSelector(otherSlug)).first()
+    await expect(otherButton).toBeVisible()
+    await otherButton.click()

-        const currentButton = page.locator(projectSwitchSelector(currentSlug)).first()
-        await expect(currentButton).toBeVisible()
-        await currentButton.click()
+    await expect(page).toHaveURL(new RegExp(`/${otherSlug}/session`))

-        await expect(page).toHaveURL(new RegExp(`/${currentSlug}/session`))
-      },
-      { extra: [other] },
-    )
+    const currentButton = page.locator(projectSwitchSelector(currentSlug)).first()
+    await expect(currentButton).toBeVisible()
+    await currentButton.click()
+
+    await expect(page).toHaveURL(new RegExp(`/${currentSlug}/session`))
  } finally {
    await cleanupTestProject(other)
  }
--- a/packages/app/e2e/projects/workspaces.spec.ts
+++ b/packages/app/e2e/projects/workspaces.spec.ts
@@ -10,20 +10,33 @@ import {
  cleanupTestProject,
  clickMenuItem,
  confirmDialog,
+  createTestProject,
  openSidebar,
  openWorkspaceMenu,
+  seedProjects,
  setWorkspacesEnabled,
 } from "../actions"
-import { inlineInputSelector, workspaceItemSelector } from "../selectors"
+import { inlineInputSelector, projectSwitchSelector, workspaceItemSelector } from "../selectors"
+import { dirSlug } from "../utils"

 function slugFromUrl(url: string) {
  return /\/([^/]+)\/session(?:\/|$)/.exec(url)?.[1] ?? ""
 }

-async function setupWorkspaceTest(page: Page, project: { slug: string }) {
-  const rootSlug = project.slug
+async function setupWorkspaceTest(page: Page, directory: string, gotoSession: () => Promise<void>) {
+  const project = await createTestProject()
+  const rootSlug = dirSlug(project)
+  await seedProjects(page, { directory, extra: [project] })
+
+  await gotoSession()
  await openSidebar(page)

+  const target = page.locator(projectSwitchSelector(rootSlug)).first()
+  await expect(target).toBeVisible()
+  await target.click()
+  await expect(page).toHaveURL(new RegExp(`/${rootSlug}/session`))
+
+  await openSidebar(page)
  await setWorkspacesEnabled(page, rootSlug, true)

  await page.getByRole("button", { name: "New workspace" }).first().click()
@@ -57,13 +70,25 @@ async function setupWorkspaceTest(page: Page, project: { slug: string }) {
    )
    .toBe(true)

-  return { rootSlug, slug, directory: dir }
+  return { project, rootSlug, slug, directory: dir }
 }

-test("can enable and disable workspaces from project menu", async ({ page, withProject }) => {
+test("can enable and disable workspaces from project menu", async ({ page, directory, gotoSession }) => {
  await page.setViewportSize({ width: 1400, height: 800 })

-  await withProject(async ({ slug }) => {
+  const project = await createTestProject()
+  const slug = dirSlug(project)
+  await seedProjects(page, { directory, extra: [project] })
+
+  try {
+    await gotoSession()
+    await openSidebar(page)
+
+    const target = page.locator(projectSwitchSelector(slug)).first()
+    await expect(target).toBeVisible()
+    await target.click()
+    await expect(page).toHaveURL(new RegExp(`/${slug}/session`))
+
    await openSidebar(page)

    await expect(page.getByRole("button", { name: "New session" }).first()).toBeVisible()
@@ -76,13 +101,27 @@ test("can enable and disable workspaces from project menu", async ({ page, withP
    await setWorkspacesEnabled(page, slug, false)
    await expect(page.getByRole("button", { name: "New session" }).first()).toBeVisible()
    await expect(page.locator(workspaceItemSelector(slug))).toHaveCount(0)
-  })
+  } finally {
+    await cleanupTestProject(project)
+  }
 })

-test("can create a workspace", async ({ page, withProject }) => {
+test("can create a workspace", async ({ page, directory, gotoSession }) => {
  await page.setViewportSize({ width: 1400, height: 800 })

-  await withProject(async ({ slug }) => {
+  const project = await createTestProject()
+  const slug = dirSlug(project)
+  await seedProjects(page, { directory, extra: [project] })
+
+  try {
+    await gotoSession()
+    await openSidebar(page)
+
+    const target = page.locator(projectSwitchSelector(slug)).first()
+    await expect(target).toBeVisible()
+    await target.click()
+    await expect(page).toHaveURL(new RegExp(`/${slug}/session`))
+
    await openSidebar(page)
    await setWorkspacesEnabled(page, slug, true)

@@ -123,15 +162,17 @@ test("can create a workspace", async ({ page, withProject }) => {
    await expect(page.locator(workspaceItemSelector(workspaceSlug)).first()).toBeVisible()

    await cleanupTestProject(workspaceDir)
-  })
+  } finally {
+    await cleanupTestProject(project)
+  }
 })

-test("can rename a workspace", async ({ page, withProject }) => {
+test("can rename a workspace", async ({ page, directory, gotoSession }) => {
  await page.setViewportSize({ width: 1400, height: 800 })

-  await withProject(async (project) => {
-    const { slug } = await setupWorkspaceTest(page, project)
+  const { project, slug } = await setupWorkspaceTest(page, directory, gotoSession)

+  try {
    const rename = `e2e workspace ${Date.now()}`
    const menu = await openWorkspaceMenu(page, slug)
    await clickMenuItem(menu, /^Rename$/i, { force: true })
@@ -145,15 +186,17 @@ test("can rename a workspace", async ({ page, withProject }) => {
    await input.fill(rename)
    await input.press("Enter")
    await expect(item).toContainText(rename)
-  })
+  } finally {
+    await cleanupTestProject(project)
+  }
 })

-test("can reset a workspace", async ({ page, sdk, withProject }) => {
+test("can reset a workspace", async ({ page, directory, sdk, gotoSession }) => {
  await page.setViewportSize({ width: 1400, height: 800 })

-  await withProject(async (project) => {
-    const { slug, directory: createdDir } = await setupWorkspaceTest(page, project)
+  const { project, slug, directory: createdDir } = await setupWorkspaceTest(page, directory, gotoSession)

+  try {
    const readme = path.join(createdDir, "README.md")
    const extra = path.join(createdDir, `e2e_reset_${Date.now()}.txt`)
    const original = await fs.readFile(readme, "utf8")
@@ -207,15 +250,17 @@ test("can reset a workspace", async ({ page, sdk, withProject }) => {
          .catch(() => false)
      })
      .toBe(false)
-  })
+  } finally {
+    await cleanupTestProject(project)
+  }
 })

-test("can delete a workspace", async ({ page, withProject }) => {
+test("can delete a workspace", async ({ page, directory, gotoSession }) => {
  await page.setViewportSize({ width: 1400, height: 800 })

-  await withProject(async (project) => {
-    const { rootSlug, slug } = await setupWorkspaceTest(page, project)
+  const { project, rootSlug, slug } = await setupWorkspaceTest(page, directory, gotoSession)

+  try {
    const menu = await openWorkspaceMenu(page, slug)
    await clickMenuItem(menu, /^Delete$/i, { force: true })
    await confirmDialog(page, /^Delete workspace$/i)
@@ -223,111 +268,124 @@ test("can delete a workspace", async ({ page, withProject }) => {
    await expect(page).toHaveURL(new RegExp(`/${rootSlug}/session`))
    await expect(page.locator(workspaceItemSelector(slug))).toHaveCount(0)
    await expect(page.locator(workspaceItemSelector(rootSlug)).first()).toBeVisible()
-  })
+  } finally {
+    await cleanupTestProject(project)
+  }
 })

-test("can reorder workspaces by drag and drop", async ({ page, withProject }) => {
+test("can reorder workspaces by drag and drop", async ({ page, directory, gotoSession }) => {
  await page.setViewportSize({ width: 1400, height: 800 })
-  await withProject(async ({ slug: rootSlug }) => {
-    const workspaces = [] as { directory: string; slug: string }[]

-    const listSlugs = async () => {
-      const nodes = page.locator('[data-component="sidebar-nav-desktop"] [data-component="workspace-item"]')
-      const slugs = await nodes.evaluateAll((els) => {
-        return els.map((el) => el.getAttribute("data-workspace") ?? "").filter((x) => x.length > 0)
-      })
-      return slugs
-    }
+  const project = await createTestProject()
+  const rootSlug = dirSlug(project)
+  await seedProjects(page, { directory, extra: [project] })

-    const waitReady = async (slug: string) => {
+  const workspaces = [] as { directory: string; slug: string }[]
+
+  const listSlugs = async () => {
+    const nodes = page.locator('[data-component="sidebar-nav-desktop"] [data-component="workspace-item"]')
+    const slugs = await nodes.evaluateAll((els) => {
+      return els.map((el) => el.getAttribute("data-workspace") ?? "").filter((x) => x.length > 0)
+    })
+    return slugs
+  }
+
+  const waitReady = async (slug: string) => {
+    await expect
+      .poll(
+        async () => {
+          const item = page.locator(workspaceItemSelector(slug)).first()
+          try {
+            await item.hover({ timeout: 500 })
+            return true
+          } catch {
+            return false
+          }
+        },
+        { timeout: 60_000 },
+      )
+      .toBe(true)
+  }
+
+  const drag = async (from: string, to: string) => {
+    const src = page.locator(workspaceItemSelector(from)).first()
+    const dst = page.locator(workspaceItemSelector(to)).first()
+
+    await src.scrollIntoViewIfNeeded()
+    await dst.scrollIntoViewIfNeeded()
+
+    const a = await src.boundingBox()
+    const b = await dst.boundingBox()
+    if (!a || !b) throw new Error("Failed to resolve workspace drag bounds")
+
+    await page.mouse.move(a.x + a.width / 2, a.y + a.height / 2)
+    await page.mouse.down()
+    await page.mouse.move(b.x + b.width / 2, b.y + b.height / 2, { steps: 12 })
+    await page.mouse.up()
+  }
+
+  try {
+    await gotoSession()
+    await openSidebar(page)
+
+    const target = page.locator(projectSwitchSelector(rootSlug)).first()
+    await expect(target).toBeVisible()
+    await target.click()
+    await expect(page).toHaveURL(new RegExp(`/${rootSlug}/session`))
+
+    await openSidebar(page)
+    await setWorkspacesEnabled(page, rootSlug, true)
+
+    for (const _ of [0, 1]) {
+      const prev = slugFromUrl(page.url())
+      await page.getByRole("button", { name: "New workspace" }).first().click()
      await expect
        .poll(
-          async () => {
-            const item = page.locator(workspaceItemSelector(slug)).first()
-            try {
-              await item.hover({ timeout: 500 })
-              return true
-            } catch {
-              return false
-            }
+          () => {
+            const slug = slugFromUrl(page.url())
+            return slug.length > 0 && slug !== rootSlug && slug !== prev
          },
-          { timeout: 60_000 },
+          { timeout: 45_000 },
        )
        .toBe(true)
-    }

-    const drag = async (from: string, to: string) => {
-      const src = page.locator(workspaceItemSelector(from)).first()
-      const dst = page.locator(workspaceItemSelector(to)).first()
+      const slug = slugFromUrl(page.url())
+      const dir = base64Decode(slug)
+      workspaces.push({ slug, directory: dir })

-      await src.scrollIntoViewIfNeeded()
-      await dst.scrollIntoViewIfNeeded()
-
-      const a = await src.boundingBox()
-      const b = await dst.boundingBox()
-      if (!a || !b) throw new Error("Failed to resolve workspace drag bounds")
-
-      await page.mouse.move(a.x + a.width / 2, a.y + a.height / 2)
-      await page.mouse.down()
-      await page.mouse.move(b.x + b.width / 2, b.y + b.height / 2, { steps: 12 })
-      await page.mouse.up()
-    }
-
-    try {
      await openSidebar(page)
-
-      await setWorkspacesEnabled(page, rootSlug, true)
-
-      for (const _ of [0, 1]) {
-        const prev = slugFromUrl(page.url())
-        await page.getByRole("button", { name: "New workspace" }).first().click()
-        await expect
-          .poll(
-            () => {
-              const slug = slugFromUrl(page.url())
-              return slug.length > 0 && slug !== rootSlug && slug !== prev
-            },
-            { timeout: 45_000 },
-          )
-          .toBe(true)
-
-        const slug = slugFromUrl(page.url())
-        const dir = base64Decode(slug)
-        workspaces.push({ slug, directory: dir })
-
-        await openSidebar(page)
-      }
-
-      if (workspaces.length !== 2) throw new Error("Expected two created workspaces")
-
-      const a = workspaces[0].slug
-      const b = workspaces[1].slug
-
-      await waitReady(a)
-      await waitReady(b)
-
-      const list = async () => {
-        const slugs = await listSlugs()
-        return slugs.filter((s) => s !== rootSlug && (s === a || s === b)).slice(0, 2)
-      }
-
-      await expect
-        .poll(async () => {
-          const slugs = await list()
-          return slugs.length === 2
-        })
-        .toBe(true)
-
-      const before = await list()
-      const from = before[1]
-      const to = before[0]
-      if (!from || !to) throw new Error("Failed to resolve initial workspace order")
-
-      await drag(from, to)
-
-      await expect.poll(async () => await list()).toEqual([from, to])
-    } finally {
-      await Promise.all(workspaces.map((w) => cleanupTestProject(w.directory)))
    }
-  })
+
+    if (workspaces.length !== 2) throw new Error("Expected two created workspaces")
+
+    const a = workspaces[0].slug
+    const b = workspaces[1].slug
+
+    await waitReady(a)
+    await waitReady(b)
+
+    const list = async () => {
+      const slugs = await listSlugs()
+      return slugs.filter((s) => s !== rootSlug && (s === a || s === b)).slice(0, 2)
+    }
+
+    await expect
+      .poll(async () => {
+        const slugs = await list()
+        return slugs.length === 2
+      })
+      .toBe(true)
+
+    const before = await list()
+    const from = before[1]
+    const to = before[0]
+    if (!from || !to) throw new Error("Failed to resolve initial workspace order")
+
+    await drag(from, to)
+
+    await expect.poll(async () => await list()).toEqual([from, to])
+  } finally {
+    await Promise.all(workspaces.map((w) => cleanupTestProject(w.directory)))
+    await cleanupTestProject(project)
+  }
 })
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.1.51",
+  "version": "1.1.48",
  "description": "",
  "type": "module",
  "exports": {
--- a/packages/app/playwright.config.ts
+++ b/packages/app/playwright.config.ts
@@ -6,6 +6,7 @@ const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "localhost"
 const serverPort = process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"
 const command = `bun run dev -- --host 0.0.0.0 --port ${port}`
 const reuse = !process.env.CI
+const win = process.platform === "win32"

 export default defineConfig({
  testDir: "./e2e",
@@ -14,7 +15,8 @@ export default defineConfig({
  expect: {
    timeout: 10_000,
  },
-  fullyParallel: true,
+  fullyParallel: !win,
+  workers: win ? 1 : undefined,
  forbidOnly: !!process.env.CI,
  retries: process.env.CI ? 2 : 0,
  reporter: [["html", { outputFolder: "e2e/playwright-report", open: "never" }], ["line"]],
--- a/packages/app/src/addons/serialize.ts
+++ b/packages/app/src/addons/serialize.ts
@@ -241,19 +241,19 @@ class StringSerializeHandler extends BaseSerializeHandler {
  protected _rowEnd(row: number, isLastRow: boolean): void {
    let rowSeparator = ""

-    const nextLine = isLastRow ? undefined : this._buffer.getLine(row + 1)
-    const wrapped = !!nextLine?.isWrapped
-
-    if (this._nullCellCount > 0 && wrapped) {
+    if (this._nullCellCount > 0) {
      this._currentRow += " ".repeat(this._nullCellCount)
+      this._nullCellCount = 0
    }

-    this._nullCellCount = 0
+    if (!isLastRow) {
+      const nextLine = this._buffer.getLine(row + 1)

-    if (!isLastRow && !wrapped) {
-      rowSeparator = "\r\n"
-      this._lastCursorRow = row + 1
-      this._lastCursorCol = 0
+      if (!nextLine?.isWrapped) {
+        rowSeparator = "\r\n"
+        this._lastCursorRow = row + 1
+        this._lastCursorCol = 0
+      }
    }

    this._allRows[this._rowIndex] = this._currentRow
@@ -389,7 +389,7 @@ class StringSerializeHandler extends BaseSerializeHandler {

    const sgrSeq = this._diffStyle(cell, this._cursorStyle)

-    const styleChanged = sgrSeq.length > 0
+    const styleChanged = isEmptyCell ? !equalBg(this._cursorStyle, cell) : sgrSeq.length > 0

    if (styleChanged) {
      if (this._nullCellCount > 0) {
@@ -442,24 +442,12 @@ class StringSerializeHandler extends BaseSerializeHandler {
      }
    }

-    if (excludeFinalCursorPosition) return content
-
-    const absoluteCursorRow = (this._buffer.baseY ?? 0) + this._buffer.cursorY
-    const cursorRow = constrain(absoluteCursorRow - this._firstRow + 1, 1, Number.MAX_SAFE_INTEGER)
-    const cursorCol = this._buffer.cursorX + 1
-    content += `\u001b[${cursorRow};${cursorCol}H`
-
-    const line = this._buffer.getLine(absoluteCursorRow)
-    const cell = line?.getCell(this._buffer.cursorX)
-    const style = (() => {
-      if (!cell) return this._buffer.getNullCell()
-      if (cell.getWidth() !== 0) return cell
-      if (this._buffer.cursorX > 0) return line?.getCell(this._buffer.cursorX - 1) ?? cell
-      return cell
-    })()
-
-    const sgrSeq = this._diffStyle(style, this._cursorStyle)
-    if (sgrSeq.length) content += `\u001b[${sgrSeq.join(";")}m`
+    if (!excludeFinalCursorPosition) {
+      const absoluteCursorRow = (this._buffer.baseY ?? 0) + this._buffer.cursorY
+      const cursorRow = constrain(absoluteCursorRow - this._firstRow + 1, 1, Number.MAX_SAFE_INTEGER)
+      const cursorCol = this._buffer.cursorX + 1
+      content += `\u001b[${cursorRow};${cursorCol}H`
+    }

    return content
  }
--- a/packages/app/src/components/dialog-edit-project.tsx
+++ b/packages/app/src/components/dialog-edit-project.tsx
@@ -158,22 +158,22 @@ export function DialogEditProject(props: { project: LocalProject }) {
                  </Show>
                </div>
                <div
-                  class="absolute inset-0 size-16 bg-surface-raised-stronger-non-alpha/90 rounded-[6px] z-10 pointer-events-none flex items-center justify-center transition-opacity"
+                  class="absolute inset-0 size-16 bg-black/60 rounded-[6px] z-10 pointer-events-none flex items-center justify-center transition-opacity"
                  classList={{
                    "opacity-100": store.iconHover && !store.iconUrl,
                    "opacity-0": !(store.iconHover && !store.iconUrl),
                  }}
                >
-                  <Icon name="cloud-upload" size="large" class="text-icon-on-interactive-base drop-shadow-sm" />
+                  <Icon name="cloud-upload" size="large" class="text-icon-invert-base" />
                </div>
                <div
-                  class="absolute inset-0 size-16 bg-surface-raised-stronger-non-alpha/90 rounded-[6px] z-10 pointer-events-none flex items-center justify-center transition-opacity"
+                  class="absolute inset-0 size-16 bg-black/60 rounded-[6px] z-10 pointer-events-none flex items-center justify-center transition-opacity"
                  classList={{
                    "opacity-100": store.iconHover && !!store.iconUrl,
                    "opacity-0": !(store.iconHover && !!store.iconUrl),
                  }}
                >
-                  <Icon name="trash" size="large" class="text-icon-on-interactive-base drop-shadow-sm" />
+                  <Icon name="trash" size="large" class="text-icon-invert-base" />
                </div>
              </div>
              <input id="icon-upload" type="file" accept="image/*" class="hidden" onChange={handleInputChange} />
--- a/packages/app/src/components/dialog-select-directory.tsx
+++ b/packages/app/src/components/dialog-select-directory.tsx
@@ -4,11 +4,10 @@ import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { List } from "@opencode-ai/ui/list"
 import { getDirectory, getFilename } from "@opencode-ai/util/path"
 import fuzzysort from "fuzzysort"
-import { createMemo, createResource, createSignal } from "solid-js"
+import { createMemo } from "solid-js"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { useGlobalSync } from "@/context/global-sync"
 import { useLanguage } from "@/context/language"
-import type { ListRef } from "@opencode-ai/ui/list"

 interface DialogSelectDirectoryProps {
  title?: string
@@ -16,47 +15,18 @@ interface DialogSelectDirectoryProps {
  onSelect: (result: string | string[] | null) => void
 }

-type Row = {
-  absolute: string
-  search: string
-}
-
 export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
  const sync = useGlobalSync()
  const sdk = useGlobalSDK()
  const dialog = useDialog()
  const language = useLanguage()

-  const [filter, setFilter] = createSignal("")
+  const home = createMemo(() => sync.data.path.home)

-  let list: ListRef | undefined
-
-  const missingBase = createMemo(() => !(sync.data.path.home || sync.data.path.directory))
-
-  const [fallbackPath] = createResource(
-    () => (missingBase() ? true : undefined),
-    async () => {
-      return sdk.client.path
-        .get()
-        .then((x) => x.data)
-        .catch(() => undefined)
-    },
-    { initialValue: undefined },
-  )
-
-  const home = createMemo(() => sync.data.path.home || fallbackPath()?.home || "")
-
-  const start = createMemo(
-    () => sync.data.path.home || sync.data.path.directory || fallbackPath()?.home || fallbackPath()?.directory,
-  )
+  const start = createMemo(() => sync.data.path.home || sync.data.path.directory)

  const cache = new Map<string, Promise<Array<{ name: string; absolute: string }>>>()

-  const clean = (value: string) => {
-    const first = (value ?? "").split(/\r?\n/)[0] ?? ""
-    return first.replace(/[\u0000-\u001F\u007F]/g, "").trim()
-  }
-
  function normalize(input: string) {
    const v = input.replaceAll("\\", "/")
    if (v.startsWith("//") && !v.startsWith("///")) return "//" + v.slice(2).replace(/\/+/g, "/")
@@ -94,67 +64,24 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
    return ""
  }

-  function parentOf(input: string) {
-    const v = trimTrailing(input)
-    if (v === "/") return v
-    if (v === "//") return v
-    if (/^[A-Za-z]:\/$/.test(v)) return v
-
-    const i = v.lastIndexOf("/")
-    if (i <= 0) return "/"
-    if (i === 2 && /^[A-Za-z]:/.test(v)) return v.slice(0, 3)
-    return v.slice(0, i)
-  }
-
-  function modeOf(input: string) {
-    const raw = normalizeDriveRoot(input.trim())
-    if (!raw) return "relative" as const
-    if (raw.startsWith("~")) return "tilde" as const
-    if (rootOf(raw)) return "absolute" as const
-    return "relative" as const
-  }
-
-  function display(path: string, input: string) {
+  function display(path: string) {
    const full = trimTrailing(path)
-    if (modeOf(input) === "absolute") return full
-
-    return tildeOf(full) || full
-  }
-
-  function tildeOf(absolute: string) {
-    const full = trimTrailing(absolute)
    const h = home()
-    if (!h) return ""
+    if (!h) return full

    const hn = trimTrailing(h)
    const lc = full.toLowerCase()
    const hc = hn.toLowerCase()
    if (lc === hc) return "~"
    if (lc.startsWith(hc + "/")) return "~" + full.slice(hn.length)
-    return ""
+    return full
  }

-  function row(absolute: string): Row {
-    const full = trimTrailing(absolute)
-    const tilde = tildeOf(full)
-
-    const withSlash = (value: string) => {
-      if (!value) return ""
-      if (value.endsWith("/")) return value
-      return value + "/"
-    }
-
-    const search = Array.from(
-      new Set([full, withSlash(full), tilde, withSlash(tilde), getFilename(full)].filter(Boolean)),
-    ).join("\n")
-    return { absolute: full, search }
-  }
-
-  function scoped(value: string) {
+  function scoped(filter: string) {
    const base = start()
    if (!base) return

-    const raw = normalizeDriveRoot(value)
+    const raw = normalizeDriveRoot(filter.trim())
    if (!raw) return { directory: trimTrailing(base), path: "" }

    const h = home()
@@ -195,25 +122,21 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
  }

  const directories = async (filter: string) => {
-    const value = clean(filter)
-    const scopedInput = scoped(value)
-    if (!scopedInput) return [] as string[]
+    const input = scoped(filter)
+    if (!input) return [] as string[]

-    const raw = normalizeDriveRoot(value)
+    const raw = normalizeDriveRoot(filter.trim())
    const isPath = raw.startsWith("~") || !!rootOf(raw) || raw.includes("/")

-    const query = normalizeDriveRoot(scopedInput.path)
+    const query = normalizeDriveRoot(input.path)

-    const find = () =>
-      sdk.client.find
-        .files({ directory: scopedInput.directory, query, type: "directory", limit: 50 })
+    if (!isPath) {
+      const results = await sdk.client.find
+        .files({ directory: input.directory, query, type: "directory", limit: 50 })
        .then((x) => x.data ?? [])
        .catch(() => [])

-    if (!isPath) {
-      const results = await find()
-
-      return results.map((rel) => join(scopedInput.directory, rel)).slice(0, 50)
+      return results.map((rel) => join(input.directory, rel)).slice(0, 50)
    }

    const segments = query.replace(/^\/+/, "").split("/")
@@ -222,10 +145,17 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {

    const cap = 12
    const branch = 4
-    let paths = [scopedInput.directory]
+    let paths = [input.directory]
    for (const part of head) {
      if (part === "..") {
-        paths = paths.map(parentOf)
+        paths = paths.map((p) => {
+          const v = trimTrailing(p)
+          if (v === "/") return v
+          if (/^[A-Za-z]:\/$/.test(v)) return v
+          const i = v.lastIndexOf("/")
+          if (i <= 0) return "/"
+          return v.slice(0, i)
+        })
        continue
      }

@@ -235,27 +165,7 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
    }

    const out = (await Promise.all(paths.map((p) => match(p, tail, 50)))).flat()
-    const deduped = Array.from(new Set(out))
-    const base = raw.startsWith("~") ? trimTrailing(scopedInput.directory) : ""
-    const expand = !raw.endsWith("/")
-    if (!expand || !tail) {
-      const items = base ? Array.from(new Set([base, ...deduped])) : deduped
-      return items.slice(0, 50)
-    }
-
-    const needle = tail.toLowerCase()
-    const exact = deduped.filter((p) => getFilename(p).toLowerCase() === needle)
-    const target = exact[0]
-    if (!target) return deduped.slice(0, 50)
-
-    const children = await match(target, "", 30)
-    const items = Array.from(new Set([...deduped, ...children]))
-    return (base ? Array.from(new Set([base, ...items])) : items).slice(0, 50)
-  }
-
-  const items = async (value: string) => {
-    const results = await directories(value)
-    return results.map(row)
+    return Array.from(new Set(out)).slice(0, 50)
  }

  function resolve(absolute: string) {
@@ -269,52 +179,24 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
        search={{ placeholder: language.t("dialog.directory.search.placeholder"), autofocus: true }}
        emptyMessage={language.t("dialog.directory.empty")}
        loadingMessage={language.t("common.loading")}
-        items={items}
-        key={(x) => x.absolute}
-        filterKeys={["search"]}
-        ref={(r) => (list = r)}
-        onFilter={(value) => setFilter(clean(value))}
-        onKeyEvent={(e, item) => {
-          if (e.key !== "Tab") return
-          if (e.shiftKey) return
-          if (!item) return
-
-          e.preventDefault()
-          e.stopPropagation()
-
-          const value = display(item.absolute, filter())
-          list?.setFilter(value.endsWith("/") ? value : value + "/")
-        }}
+        items={directories}
+        key={(x) => x}
        onSelect={(path) => {
          if (!path) return
-          resolve(path.absolute)
+          resolve(path)
        }}
      >
-        {(item) => {
-          const path = display(item.absolute, filter())
-          if (path === "~") {
-            return (
-              <div class="w-full flex items-center justify-between rounded-md">
-                <div class="flex items-center gap-x-3 grow min-w-0">
-                  <FileIcon node={{ path: item.absolute, type: "directory" }} class="shrink-0 size-4" />
-                  <div class="flex items-center text-14-regular min-w-0">
-                    <span class="text-text-strong whitespace-nowrap">~</span>
-                    <span class="text-text-weak whitespace-nowrap">/</span>
-                  </div>
-                </div>
-              </div>
-            )
-          }
+        {(absolute) => {
+          const path = display(absolute)
          return (
            <div class="w-full flex items-center justify-between rounded-md">
              <div class="flex items-center gap-x-3 grow min-w-0">
-                <FileIcon node={{ path: item.absolute, type: "directory" }} class="shrink-0 size-4" />
+                <FileIcon node={{ path: absolute, type: "directory" }} class="shrink-0 size-4" />
                <div class="flex items-center text-14-regular min-w-0">
                  <span class="text-text-weak whitespace-nowrap overflow-hidden overflow-ellipsis truncate min-w-0">
                    {getDirectory(path)}
                  </span>
                  <span class="text-text-strong whitespace-nowrap">{getFilename(path)}</span>
-                  <span class="text-text-weak whitespace-nowrap">/</span>
                </div>
              </div>
            </div>
--- a/packages/app/src/components/dialog-select-file.tsx
+++ b/packages/app/src/components/dialog-select-file.tsx
@@ -1,22 +1,17 @@
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
-import { Icon } from "@opencode-ai/ui/icon"
 import { Keybind } from "@opencode-ai/ui/keybind"
 import { List } from "@opencode-ai/ui/list"
-import { base64Encode } from "@opencode-ai/util/encode"
 import { getDirectory, getFilename } from "@opencode-ai/util/path"
-import { useNavigate, useParams } from "@solidjs/router"
-import { createMemo, createSignal, Match, onCleanup, Show, Switch } from "solid-js"
+import { useParams } from "@solidjs/router"
+import { createMemo, createSignal, onCleanup, Show } from "solid-js"
 import { formatKeybind, useCommand, type CommandOption } from "@/context/command"
-import { useGlobalSDK } from "@/context/global-sdk"
-import { useGlobalSync } from "@/context/global-sync"
 import { useLayout } from "@/context/layout"
 import { useFile } from "@/context/file"
 import { useLanguage } from "@/context/language"
-import { decode64 } from "@/utils/base64"

-type EntryType = "command" | "file" | "session"
+type EntryType = "command" | "file"

 type Entry = {
  id: string
@@ -27,9 +22,6 @@ type Entry = {
  category: string
  option?: CommandOption
  path?: string
-  directory?: string
-  sessionID?: string
-  archived?: number
 }

 type DialogSelectFileMode = "all" | "files"
@@ -41,9 +33,6 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
  const file = useFile()
  const dialog = useDialog()
  const params = useParams()
-  const navigate = useNavigate()
-  const globalSDK = useGlobalSDK()
-  const globalSync = useGlobalSync()
  const filesOnly = () => props.mode === "files"
  const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
  const tabs = createMemo(() => layout.tabs(sessionKey))
@@ -84,52 +73,6 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
    path,
  })

-  const projectDirectory = createMemo(() => decode64(params.dir) ?? "")
-  const project = createMemo(() => {
-    const directory = projectDirectory()
-    if (!directory) return
-    return layout.projects.list().find((p) => p.worktree === directory || p.sandboxes?.includes(directory))
-  })
-  const workspaces = createMemo(() => {
-    const directory = projectDirectory()
-    const current = project()
-    if (!current) return directory ? [directory] : []
-
-    const dirs = [current.worktree, ...(current.sandboxes ?? [])]
-    if (directory && !dirs.includes(directory)) return [...dirs, directory]
-    return dirs
-  })
-  const homedir = createMemo(() => globalSync.data.path.home)
-  const label = (directory: string) => {
-    const current = project()
-    const kind =
-      current && directory === current.worktree
-        ? language.t("workspace.type.local")
-        : language.t("workspace.type.sandbox")
-    const [store] = globalSync.child(directory, { bootstrap: false })
-    const home = homedir()
-    const path = home ? directory.replace(home, "~") : directory
-    const name = store.vcs?.branch ?? getFilename(directory)
-    return `${kind} : ${name || path}`
-  }
-
-  const sessionItem = (input: {
-    directory: string
-    id: string
-    title: string
-    description: string
-    archived?: number
-  }): Entry => ({
-    id: `session:${input.directory}:${input.id}`,
-    type: "session",
-    title: input.title,
-    description: input.description,
-    category: language.t("command.category.session"),
-    directory: input.directory,
-    sessionID: input.id,
-    archived: input.archived,
-  })
-
  const list = createMemo(() => allowed().map(commandItem))

  const picks = createMemo(() => {
@@ -179,68 +122,6 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
    return out
  }

-  const sessionToken = { value: 0 }
-  let sessionInflight: Promise<Entry[]> | undefined
-  let sessionAll: Entry[] | undefined
-
-  const sessions = (text: string) => {
-    const query = text.trim()
-    if (!query) {
-      sessionToken.value += 1
-      sessionInflight = undefined
-      sessionAll = undefined
-      return [] as Entry[]
-    }
-
-    if (sessionAll) return sessionAll
-    if (sessionInflight) return sessionInflight
-
-    const current = sessionToken.value
-    const dirs = workspaces()
-    if (dirs.length === 0) return [] as Entry[]
-
-    sessionInflight = Promise.all(
-      dirs.map((directory) => {
-        const description = label(directory)
-        return globalSDK.client.session
-          .list({ directory, roots: true })
-          .then((x) =>
-            (x.data ?? [])
-              .filter((s) => !!s?.id)
-              .map((s) => ({
-                id: s.id,
-                title: s.title ?? language.t("command.session.new"),
-                description,
-                directory,
-                archived: s.time?.archived,
-              })),
-          )
-          .catch(() => [] as { id: string; title: string; description: string; directory: string; archived?: number }[])
-      }),
-    )
-      .then((results) => {
-        if (sessionToken.value !== current) return [] as Entry[]
-        const seen = new Set<string>()
-        const next = results
-          .flat()
-          .filter((item) => {
-            const key = `${item.directory}:${item.id}`
-            if (seen.has(key)) return false
-            seen.add(key)
-            return true
-          })
-          .map(sessionItem)
-        sessionAll = next
-        return next
-      })
-      .catch(() => [] as Entry[])
-      .finally(() => {
-        sessionInflight = undefined
-      })
-
-    return sessionInflight
-  }
-
  const items = async (text: string) => {
    const query = text.trim()
    setGrouped(query.length > 0)
@@ -265,10 +146,9 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
      const files = await file.searchFiles(query)
      return files.map(fileItem)
    }
-
-    const [files, nextSessions] = await Promise.all([file.searchFiles(query), Promise.resolve(sessions(query))])
+    const files = await file.searchFiles(query)
    const entries = files.map(fileItem)
-    return [...list(), ...nextSessions, ...entries]
+    return [...list(), ...entries]
  }

  const handleMove = (item: Entry | undefined) => {
@@ -298,12 +178,6 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
      return
    }

-    if (item.type === "session") {
-      if (!item.directory || !item.sessionID) return
-      navigate(`/${base64Encode(item.directory)}/session/${item.sessionID}`)
-      return
-    }
-
    if (!item.path) return
    open(item.path)
  }
@@ -328,12 +202,13 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
        items={items}
        key={(item) => item.id}
        filterKeys={["title", "description", "category"]}
-        groupBy={grouped() ? (item) => item.category : () => ""}
+        groupBy={(item) => item.category}
        onMove={handleMove}
        onSelect={handleSelect}
      >
        {(item) => (
-          <Switch
+          <Show
+            when={item.type === "command"}
            fallback={
              <div class="w-full flex items-center justify-between rounded-md pl-1">
                <div class="flex items-center gap-x-3 grow min-w-0">
@@ -348,43 +223,18 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
              </div>
            }
          >
-            <Match when={item.type === "command"}>
-              <div class="w-full flex items-center justify-between gap-4">
-                <div class="flex items-center gap-2 min-w-0">
-                  <span class="text-14-regular text-text-strong whitespace-nowrap">{item.title}</span>
-                  <Show when={item.description}>
-                    <span class="text-14-regular text-text-weak truncate">{item.description}</span>
-                  </Show>
-                </div>
-                <Show when={item.keybind}>
-                  <Keybind class="rounded-[4px]">{formatKeybind(item.keybind ?? "")}</Keybind>
+            <div class="w-full flex items-center justify-between gap-4">
+              <div class="flex items-center gap-2 min-w-0">
+                <span class="text-14-regular text-text-strong whitespace-nowrap">{item.title}</span>
+                <Show when={item.description}>
+                  <span class="text-14-regular text-text-weak truncate">{item.description}</span>
                </Show>
              </div>
-            </Match>
-            <Match when={item.type === "session"}>
-              <div class="w-full flex items-center justify-between rounded-md pl-1">
-                <div class="flex items-center gap-x-3 grow min-w-0">
-                  <Icon name="bubble-5" size="small" class="shrink-0 text-icon-weak" />
-                  <div class="flex items-center gap-2 min-w-0">
-                    <span
-                      class="text-14-regular text-text-strong truncate"
-                      classList={{ "opacity-70": !!item.archived }}
-                    >
-                      {item.title}
-                    </span>
-                    <Show when={item.description}>
-                      <span
-                        class="text-14-regular text-text-weak truncate"
-                        classList={{ "opacity-70": !!item.archived }}
-                      >
-                        {item.description}
-                      </span>
-                    </Show>
-                  </div>
-                </div>
-              </div>
-            </Match>
-          </Switch>
+              <Show when={item.keybind}>
+                <Keybind class="rounded-[4px]">{formatKeybind(item.keybind ?? "")}</Keybind>
+              </Show>
+            </div>
+          </Show>
        )}
      </List>
    </Dialog>
--- a/packages/app/src/components/dialog-select-model.tsx
+++ b/packages/app/src/components/dialog-select-model.tsx
@@ -54,6 +54,7 @@ const ModelList: Component<{
          class="w-full"
          placement="right-start"
          gutter={12}
+          forceMount={false}
          value={
            <ModelTooltip
              model={item}
@@ -89,9 +90,10 @@ const ModelList: Component<{

 export function ModelSelectorPopover<T extends ValidComponent = "div">(props: {
  provider?: string
-  children?: JSX.Element
+  children?: JSX.Element | ((open: boolean) => JSX.Element)
  triggerAs?: T
  triggerProps?: ComponentProps<T>
+  gutter?: number
 }) {
  const [store, setStore] = createStore<{
    open: boolean
@@ -174,14 +176,14 @@ export function ModelSelectorPopover<T extends ValidComponent = "div">(props: {
      }}
      modal={false}
      placement="top-start"
-      gutter={8}
+      gutter={props.gutter ?? 8}
    >
      <Kobalte.Trigger
        ref={(el) => setStore("trigger", el)}
        as={props.triggerAs ?? "div"}
        {...(props.triggerProps as any)}
      >
-        {props.children}
+        {typeof props.children === "function" ? props.children(store.open) : props.children}
      </Kobalte.Trigger>
      <Kobalte.Portal>
        <Kobalte.Content
@@ -213,7 +215,7 @@ export function ModelSelectorPopover<T extends ValidComponent = "div">(props: {
            class="p-1"
            action={
              <div class="flex items-center gap-1">
-                <Tooltip placement="top" value={language.t("command.provider.connect")}>
+                <Tooltip placement="top" forceMount={false} value={language.t("command.provider.connect")}>
                  <IconButton
                    icon="plus-small"
                    variant="ghost"
@@ -223,7 +225,7 @@ export function ModelSelectorPopover<T extends ValidComponent = "div">(props: {
                    onClick={handleConnectProvider}
                  />
                </Tooltip>
-                <Tooltip placement="top" value={language.t("dialog.model.manage")}>
+                <Tooltip placement="top" forceMount={false} value={language.t("dialog.model.manage")}>
                  <IconButton
                    icon="sliders"
                    variant="ghost"
--- a/packages/app/src/components/file-tree.tsx
+++ b/packages/app/src/components/file-tree.tsx
@@ -130,57 +130,10 @@ export default function FileTree(props: {
    const nodes = file.tree.children(props.path)
    const current = filter()
    if (!current) return nodes
-
-    const parent = (path: string) => {
-      const idx = path.lastIndexOf("/")
-      if (idx === -1) return ""
-      return path.slice(0, idx)
-    }
-
-    const leaf = (path: string) => {
-      const idx = path.lastIndexOf("/")
-      return idx === -1 ? path : path.slice(idx + 1)
-    }
-
-    const out = nodes.filter((node) => {
+    return nodes.filter((node) => {
      if (node.type === "file") return current.files.has(node.path)
      return current.dirs.has(node.path)
    })
-
-    const seen = new Set(out.map((node) => node.path))
-
-    for (const dir of current.dirs) {
-      if (parent(dir) !== props.path) continue
-      if (seen.has(dir)) continue
-      out.push({
-        name: leaf(dir),
-        path: dir,
-        absolute: dir,
-        type: "directory",
-        ignored: false,
-      })
-      seen.add(dir)
-    }
-
-    for (const item of current.files) {
-      if (parent(item) !== props.path) continue
-      if (seen.has(item)) continue
-      out.push({
-        name: leaf(item),
-        path: item,
-        absolute: item,
-        type: "file",
-        ignored: false,
-      })
-      seen.add(item)
-    }
-
-    return out.toSorted((a, b) => {
-      if (a.type !== b.type) {
-        return a.type === "directory" ? -1 : 1
-      }
-      return a.name.localeCompare(b.name)
-    })
  })

  const Node = (
@@ -321,6 +274,7 @@ export default function FileTree(props: {

            return (
              <Tooltip
+                forceMount={false}
                openDelay={2000}
                placement="bottom-start"
                class="w-full"
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -32,7 +32,9 @@ import { useNavigate, useParams } from "@solidjs/router"
 import { useSync } from "@/context/sync"
 import { useComments } from "@/context/comments"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
+import { MorphChevron } from "@opencode-ai/ui/morph-chevron"
 import { Button } from "@opencode-ai/ui/button"
+import { CycleLabel } from "@opencode-ai/ui/cycle-label"
 import { Icon } from "@opencode-ai/ui/icon"
 import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import type { IconName } from "@opencode-ai/ui/icons/provider"
@@ -42,6 +44,7 @@ import { Select } from "@opencode-ai/ui/select"
 import { getDirectory, getFilename, getFilenameTruncated } from "@opencode-ai/util/path"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { ImagePreview } from "@opencode-ai/ui/image-preview"
+import { ReasoningIcon } from "@opencode-ai/ui/reasoning-icon"
 import { ModelSelectorPopover } from "@/components/dialog-select-model"
 import { DialogSelectModelUnpaid } from "@/components/dialog-select-model-unpaid"
 import { useProviders } from "@/hooks/use-providers"
@@ -1132,7 +1135,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    const images = imageAttachments().slice()
    const mode = store.mode

-    if (text.trim().length === 0 && images.length === 0 && commentCount() === 0) {
+    if (text.trim().length === 0 && images.length === 0) {
      if (working()) abort()
      return
    }
@@ -1220,10 +1223,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
          })
          return undefined
        })
-      if (session) {
-        layout.handoff.setTabs(base64Encode(sessionDirectory), session.id)
-        navigate(`/${base64Encode(sessionDirectory)}/session/${session.id}`)
-      }
+      if (session) navigate(`/${base64Encode(sessionDirectory)}/session/${session.id}`)
    }
    if (!session) return

@@ -1257,7 +1257,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      clearInput()
      client.session
        .shell({
-          sessionID: session.id,
+          sessionID: session?.id || "",
          agent,
          model,
          command: text,
@@ -1280,7 +1280,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
        clearInput()
        client.session
          .command({
-            sessionID: session.id,
+            sessionID: session?.id || "",
            command: commandName,
            arguments: args.join(" "),
            agent,
@@ -1436,13 +1436,13 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

    const optimisticParts = requestParts.map((part) => ({
      ...part,
-      sessionID: session.id,
+      sessionID: session?.id || "",
      messageID,
    })) as unknown as Part[]

    const optimisticMessage: Message = {
      id: messageID,
-      sessionID: session.id,
+      sessionID: session?.id || "",
      role: "user",
      time: { created: Date.now() },
      agent,
@@ -1453,9 +1453,9 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      if (sessionDirectory === projectDirectory) {
        sync.set(
          produce((draft) => {
-            const messages = draft.message[session.id]
+            const messages = draft.message[session?.id || ""]
            if (!messages) {
-              draft.message[session.id] = [optimisticMessage]
+              draft.message[session?.id || ""] = [optimisticMessage]
            } else {
              const result = Binary.search(messages, messageID, (m) => m.id)
              messages.splice(result.index, 0, optimisticMessage)
@@ -1463,7 +1463,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
            draft.part[messageID] = optimisticParts
              .filter((p) => !!p?.id)
              .slice()
-              .sort((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))
+              .sort((a, b) => a.id.localeCompare(b.id))
          }),
        )
        return
@@ -1471,9 +1471,9 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

      globalSync.child(sessionDirectory)[1](
        produce((draft) => {
-          const messages = draft.message[session.id]
+          const messages = draft.message[session?.id || ""]
          if (!messages) {
-            draft.message[session.id] = [optimisticMessage]
+            draft.message[session?.id || ""] = [optimisticMessage]
          } else {
            const result = Binary.search(messages, messageID, (m) => m.id)
            messages.splice(result.index, 0, optimisticMessage)
@@ -1481,7 +1481,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
          draft.part[messageID] = optimisticParts
            .filter((p) => !!p?.id)
            .slice()
-            .sort((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))
+            .sort((a, b) => a.id.localeCompare(b.id))
        }),
      )
    }
@@ -1490,7 +1490,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      if (sessionDirectory === projectDirectory) {
        sync.set(
          produce((draft) => {
-            const messages = draft.message[session.id]
+            const messages = draft.message[session?.id || ""]
            if (messages) {
              const result = Binary.search(messages, messageID, (m) => m.id)
              if (result.found) messages.splice(result.index, 1)
@@ -1503,7 +1503,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

      globalSync.child(sessionDirectory)[1](
        produce((draft) => {
-          const messages = draft.message[session.id]
+          const messages = draft.message[session?.id || ""]
          if (messages) {
            const result = Binary.search(messages, messageID, (m) => m.id)
            if (result.found) messages.splice(result.index, 1)
@@ -1524,15 +1524,15 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      const worktree = WorktreeState.get(sessionDirectory)
      if (!worktree || worktree.status !== "pending") return true

-      if (sessionDirectory === projectDirectory) {
-        sync.set("session_status", session.id, { type: "busy" })
+      if (sessionDirectory === projectDirectory && session?.id) {
+        sync.set("session_status", session?.id, { type: "busy" })
      }

      const controller = new AbortController()

      const cleanup = () => {
-        if (sessionDirectory === projectDirectory) {
-          sync.set("session_status", session.id, { type: "idle" })
+        if (sessionDirectory === projectDirectory && session?.id) {
+          sync.set("session_status", session?.id, { type: "idle" })
        }
        removeOptimisticMessage()
        for (const item of commentItems) {
@@ -1549,7 +1549,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
        restoreInput()
      }

-      pending.set(session.id, { abort: controller, cleanup })
+      pending.set(session?.id || "", { abort: controller, cleanup })

      const abort = new Promise<Awaited<ReturnType<typeof WorktreeState.wait>>>((resolve) => {
        if (controller.signal.aborted) {
@@ -1577,7 +1577,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
        if (timer.id === undefined) return
        clearTimeout(timer.id)
      })
-      pending.delete(session.id)
+      pending.delete(session?.id || "")
      if (controller.signal.aborted) return false
      if (result.status === "failed") throw new Error(result.message)
      return true
@@ -1587,7 +1587,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      const ok = await waitForWorktree()
      if (!ok) return
      await client.session.prompt({
-        sessionID: session.id,
+        sessionID: session?.id || "",
        agent,
        model,
        messageID,
@@ -1597,9 +1597,9 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    }

    void send().catch((err) => {
-      pending.delete(session.id)
-      if (sessionDirectory === projectDirectory) {
-        sync.set("session_status", session.id, { type: "idle" })
+      pending.delete(session?.id || "")
+      if (sessionDirectory === projectDirectory && session?.id) {
+        sync.set("session_status", session?.id, { type: "idle" })
      }
      showToast({
        title: language.t("prompt.toast.promptSendFailed.title"),
@@ -1621,6 +1621,28 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    })
  }

+  const currrentModelVariant = createMemo(() => {
+    const modelVariant = local.model.variant.current() ?? ""
+    return modelVariant === "xhigh"
+      ? "xHigh"
+      : modelVariant.length > 0
+        ? modelVariant[0].toUpperCase() + modelVariant.slice(1)
+        : "Default"
+  })
+
+  const reasoningPercentage = createMemo(() => {
+    const variants = local.model.variant.list()
+    const current = local.model.variant.current()
+    const totalEntries = variants.length + 1
+
+    if (totalEntries <= 2 || current === "Default") {
+      return 0
+    }
+
+    const currentIndex = current ? variants.indexOf(current) + 1 : 0
+    return ((currentIndex + 1) / totalEntries) * 100
+  }, [local.model.variant])
+
  return (
    <div class="relative size-full _max-h-[320px] flex flex-col gap-3">
      <Show when={store.popover}>
@@ -1673,7 +1695,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                          </>
                        }
                      >
-                        <Icon name="brain" size="small" class="text-icon-info-active shrink-0" />
+                        <Icon name="brain" size="normal" class="text-icon-info-active shrink-0" />
                        <span class="text-14-regular text-text-strong whitespace-nowrap">
                          @{(item as { type: "agent"; name: string }).name}
                        </span>
@@ -1738,9 +1760,9 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
        }}
      >
        <Show when={store.dragging}>
-          <div class="absolute inset-0 z-10 flex items-center justify-center bg-surface-raised-stronger-non-alpha/90 pointer-events-none">
+          <div class="absolute inset-0 z-10 flex items-center justify-center bg-surface-raised-stronger-non-alpha/90 mr-1 pointer-events-none">
            <div class="flex flex-col items-center gap-2 text-text-weak">
-              <Icon name="photo" class="size-8" />
+              <Icon name="photo" size={18} class="text-icon-base stroke-1.5" />
              <span class="text-14-regular">{language.t("prompt.dropzone.label")}</span>
            </div>
          </div>
@@ -1779,7 +1801,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                      }}
                    >
                      <div class="flex items-center gap-1.5">
-                        <FileIcon node={{ path: item.path, type: "file" }} class="shrink-0 size-3.5" />
+                        <FileIcon node={{ path: item.path, type: "file" }} class="shrink-0 size-7" />
                        <div class="flex items-center text-11-regular min-w-0 font-medium">
                          <span class="text-text-strong whitespace-nowrap">{getFilenameTruncated(item.path, 14)}</span>
                          <Show when={item.selection}>
@@ -1796,7 +1818,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                          type="button"
                          icon="close-small"
                          variant="ghost"
-                          class="ml-auto size-3.5 opacity-0 group-hover:opacity-100 transition-all"
+                          class="ml-auto size-7 opacity-0 group-hover:opacity-100 transition-all"
                          onClick={(e) => {
                            e.stopPropagation()
                            if (item.commentID) comments.remove(item.path, item.commentID)
@@ -1826,7 +1848,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                    when={attachment.mime.startsWith("image/")}
                    fallback={
                      <div class="size-16 rounded-md bg-surface-base flex items-center justify-center border border-border-base">
-                        <Icon name="folder" class="size-6 text-text-weak" />
+                        <Icon name="folder" size="normal" class="size-6 text-text-base" />
                      </div>
                    }
                  >
@@ -1899,8 +1921,8 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
            </div>
          </Show>
        </div>
-        <div class="relative p-3 flex items-center justify-between gap-2">
-          <div class="flex items-center gap-2 min-w-0 flex-1">
+        <div class="relative p-3 flex items-center justify-between">
+          <div class="flex items-center justify-start gap-2">
            <Switch>
              <Match when={store.mode === "shell"}>
                <div class="flex items-center gap-2 px-2 h-6">
@@ -1912,7 +1934,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
              <Match when={store.mode === "normal"}>
                <TooltipKeybind
                  placement="top"
-                  gutter={8}
                  title={language.t("command.agent.cycle")}
                  keybind={command.keybind("agent.cycle")}
                >
@@ -1920,9 +1941,9 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                    options={local.agent.list().map((agent) => agent.name)}
                    current={local.agent.current()?.name ?? ""}
                    onSelect={local.agent.set}
-                    class={`capitalize ${local.model.variant.list().length > 0 ? "max-w-[80px]" : "max-w-[120px]"}`}
-                    valueClass="truncate"
+                    class="capitalize"
                    variant="ghost"
+                    gutter={12}
                  />
                </TooltipKeybind>
                <Show
@@ -1930,68 +1951,66 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                  fallback={
                    <TooltipKeybind
                      placement="top"
-                      gutter={8}
                      title={language.t("command.model.choose")}
                      keybind={command.keybind("model.choose")}
                    >
                      <Button
                        as="div"
                        variant="ghost"
-                        class="px-2 min-w-0 max-w-[240px]"
+                        class="px-2"
                        onClick={() => dialog.show(() => <DialogSelectModelUnpaid />)}
                      >
                        <Show when={local.model.current()?.provider?.id}>
                          <ProviderIcon id={local.model.current()!.provider.id as IconName} class="size-4 shrink-0" />
                        </Show>
-                        <span class="truncate">
-                          {local.model.current()?.name ?? language.t("dialog.model.select.title")}
-                        </span>
-                        <Icon name="chevron-down" size="small" class="shrink-0" />
+                        {local.model.current()?.name ?? language.t("dialog.model.select.title")}
+                        <MorphChevron
+                          expanded={!!dialog.active?.id && dialog.active.id.startsWith("select-model-unpaid")}
+                        />
                      </Button>
                    </TooltipKeybind>
                  }
                >
                  <TooltipKeybind
                    placement="top"
-                    gutter={8}
                    title={language.t("command.model.choose")}
                    keybind={command.keybind("model.choose")}
                  >
-                    <ModelSelectorPopover
-                      triggerAs={Button}
-                      triggerProps={{ variant: "ghost", class: "min-w-0 max-w-[240px]" }}
-                    >
-                      <Show when={local.model.current()?.provider?.id}>
-                        <ProviderIcon id={local.model.current()!.provider.id as IconName} class="size-4 shrink-0" />
-                      </Show>
-                      <span class="truncate">
-                        {local.model.current()?.name ?? language.t("dialog.model.select.title")}
-                      </span>
-                      <Icon name="chevron-down" size="small" class="shrink-0" />
+                    <ModelSelectorPopover triggerAs={Button} triggerProps={{ variant: "ghost" }} gutter={12}>
+                      {(open) => (
+                        <>
+                          <Show when={local.model.current()?.provider?.id}>
+                            <ProviderIcon id={local.model.current()!.provider.id as IconName} class="size-4 shrink-0" />
+                          </Show>
+                          {local.model.current()?.name ?? language.t("dialog.model.select.title")}
+                          <MorphChevron expanded={open} class="text-text-weak" />
+                        </>
+                      )}
                    </ModelSelectorPopover>
                  </TooltipKeybind>
                </Show>
                <Show when={local.model.variant.list().length > 0}>
                  <TooltipKeybind
                    placement="top"
-                    gutter={8}
                    title={language.t("command.model.variant.cycle")}
                    keybind={command.keybind("model.variant.cycle")}
                  >
                    <Button
                      data-action="model-variant-cycle"
                      variant="ghost"
-                      class="text-text-base _hidden group-hover/prompt-input:inline-block capitalize text-12-regular"
+                      class="text-text-strong text-12-regular"
                      onClick={() => local.model.variant.cycle()}
                    >
-                      {local.model.variant.current() ?? language.t("common.default")}
+                      <Show when={local.model.variant.list().length > 1}>
+                        <ReasoningIcon percentage={reasoningPercentage()} size={16} strokeWidth={1.25} />
+                      </Show>
+                      <CycleLabel value={currrentModelVariant()} />
                    </Button>
                  </TooltipKeybind>
                </Show>
                <Show when={permission.permissionsEnabled() && params.id}>
                  <TooltipKeybind
                    placement="top"
-                    gutter={8}
                    title={language.t("command.permissions.autoaccept.enable")}
                    keybind={command.keybind("permissions.autoaccept")}
                  >
@@ -1999,7 +2018,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                      variant="ghost"
                      onClick={() => permission.toggleAutoAccept(params.id!, sdk.directory)}
                      classList={{
-                        "_hidden group-hover/prompt-input:flex size-6 items-center justify-center": true,
+                        "_hidden group-hover/prompt-input:flex items-center justify-center": true,
                        "text-text-base": !permission.isAutoAccepting(params.id!, sdk.directory),
                        "hover:bg-surface-success-base": permission.isAutoAccepting(params.id!, sdk.directory),
                      }}
@@ -2021,7 +2040,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
              </Match>
            </Switch>
          </div>
-          <div class="flex items-center gap-1 shrink-0">
+          <div class="flex items-center gap-1 absolute right-3 bottom-3">
            <input
              ref={fileInputRef}
              type="file"
@@ -2033,18 +2052,19 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                e.currentTarget.value = ""
              }}
            />
-            <div class="flex items-center gap-1 mr-1">
+            <div class="flex items-center gap-1.5 mr-1.5">
              <SessionContextUsage />
              <Show when={store.mode === "normal"}>
                <Tooltip placement="top" value={language.t("prompt.action.attachFile")}>
                  <Button
                    type="button"
                    variant="ghost"
-                    class="size-6 px-1"
+                    size="small"
+                    class="px-1"
                    onClick={() => fileInputRef.click()}
                    aria-label={language.t("prompt.action.attachFile")}
                  >
-                    <Icon name="photo" class="size-4.5" />
+                    <Icon name="photo" class="size-6 text-icon-base" />
                  </Button>
                </Tooltip>
              </Show>
@@ -2063,7 +2083,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                  <Match when={true}>
                    <div class="flex items-center gap-2">
                      <span>{language.t("prompt.action.send")}</span>
-                      <Icon name="enter" size="small" class="text-icon-base" />
+                      <Icon name="enter" size="normal" class="text-icon-base" />
                    </div>
                  </Match>
                </Switch>
@@ -2071,10 +2091,10 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
            >
              <IconButton
                type="submit"
-                disabled={!prompt.dirty() && !working() && commentCount() === 0}
+                disabled={!prompt.dirty() && !working()}
                icon={working() ? "stop" : "arrow-up"}
                variant="primary"
-                class="h-6 w-4.5"
+                class="h-6 w-5.5"
                aria-label={working() ? language.t("prompt.action.stop") : language.t("prompt.action.send")}
              />
            </Tooltip>
--- a/packages/app/src/components/session-context-usage.tsx
+++ b/packages/app/src/components/session-context-usage.tsx
@@ -64,7 +64,7 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
  }

  const circle = () => (
-    <div class="flex items-center justify-center">
+    <div class="p-1">
      <ProgressCircle size={16} strokeWidth={2} percentage={context()?.percentage ?? 0} />
    </div>
  )
--- a/packages/app/src/components/settings-general.tsx
+++ b/packages/app/src/components/settings-general.tsx
@@ -5,6 +5,7 @@ import { Select } from "@opencode-ai/ui/select"
 import { Switch } from "@opencode-ai/ui/switch"
 import { useTheme, type ColorScheme } from "@opencode-ai/ui/theme"
 import { showToast } from "@opencode-ai/ui/toast"
+import { ScrollFade } from "@opencode-ai/ui/scroll-fade"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
 import { useSettings, monoFontFamily } from "@/context/settings"
@@ -130,7 +131,12 @@ export const SettingsGeneral: Component = () => {
  const soundOptions = [...SOUND_OPTIONS]

  return (
-    <div class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10">
+    <ScrollFade
+      direction="vertical"
+      fadeStartSize={0}
+      fadeEndSize={16}
+      class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10"
+    >
      <div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-raised-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
        <div class="flex flex-col gap-1 pt-6 pb-8">
          <h2 class="text-16-medium text-text-strong">{language.t("settings.tab.general")}</h2>
@@ -226,7 +232,7 @@ export const SettingsGeneral: Component = () => {
                variant="secondary"
                size="small"
                triggerVariant="settings"
-                triggerStyle={{ "font-family": monoFontFamily(settings.appearance.font()), "min-width": "180px" }}
+                triggerStyle={{ "font-family": monoFontFamily(settings.appearance.font()), "field-sizing": "content" }}
              >
                {(option) => (
                  <span style={{ "font-family": monoFontFamily(option?.value) }}>
@@ -411,7 +417,7 @@ export const SettingsGeneral: Component = () => {
          </div>
        </div>
      </div>
-    </div>
+    </ScrollFade>
  )
 }

--- a/packages/app/src/components/settings-keybinds.tsx
+++ b/packages/app/src/components/settings-keybinds.tsx
@@ -5,6 +5,7 @@ import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { showToast } from "@opencode-ai/ui/toast"
+import { ScrollFade } from "@opencode-ai/ui/scroll-fade"
 import fuzzysort from "fuzzysort"
 import { formatKeybind, parseKeybind, useCommand } from "@/context/command"
 import { useLanguage } from "@/context/language"
@@ -352,7 +353,12 @@ export const SettingsKeybinds: Component = () => {
  })

  return (
-    <div class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10">
+    <ScrollFade
+      direction="vertical"
+      fadeStartSize={0}
+      fadeEndSize={16}
+      class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10"
+    >
      <div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-raised-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
        <div class="flex flex-col gap-4 pt-6 pb-6 max-w-[720px]">
          <div class="flex items-center justify-between gap-4">
@@ -430,6 +436,6 @@ export const SettingsKeybinds: Component = () => {
          </div>
        </Show>
      </div>
-    </div>
+    </ScrollFade>
  )
 }
--- a/packages/app/src/components/settings-models.tsx
+++ b/packages/app/src/components/settings-models.tsx
@@ -9,6 +9,7 @@ import { type Component, For, Show } from "solid-js"
 import { useLanguage } from "@/context/language"
 import { useModels } from "@/context/models"
 import { popularProviders } from "@/hooks/use-providers"
+import { ScrollFade } from "@opencode-ai/ui/scroll-fade"

 type ModelItem = ReturnType<ReturnType<typeof useModels>["list"]>[number]

@@ -39,7 +40,12 @@ export const SettingsModels: Component = () => {
  })

  return (
-    <div class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10">
+    <ScrollFade
+      direction="vertical"
+      fadeStartSize={0}
+      fadeEndSize={16}
+      class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10"
+    >
      <div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-raised-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
        <div class="flex flex-col gap-4 pt-6 pb-6 max-w-[720px]">
          <h2 class="text-16-medium text-text-strong">{language.t("settings.models.title")}</h2>
@@ -125,6 +131,6 @@ export const SettingsModels: Component = () => {
          </Show>
        </Show>
      </div>
-    </div>
+    </ScrollFade>
  )
 }
--- a/packages/app/src/components/settings-providers.tsx
+++ b/packages/app/src/components/settings-providers.tsx
@@ -12,6 +12,7 @@ import { useGlobalSync } from "@/context/global-sync"
 import { DialogConnectProvider } from "./dialog-connect-provider"
 import { DialogSelectProvider } from "./dialog-select-provider"
 import { DialogCustomProvider } from "./dialog-custom-provider"
+import { ScrollFade } from "@opencode-ai/ui/scroll-fade"

 type ProviderSource = "env" | "api" | "config" | "custom"
 type ProviderMeta = { source?: ProviderSource }
@@ -115,7 +116,12 @@ export const SettingsProviders: Component = () => {
  }

  return (
-    <div class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10">
+    <ScrollFade
+      direction="vertical"
+      fadeStartSize={0}
+      fadeEndSize={16}
+      class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10"
+    >
      <div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-raised-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
        <div class="flex flex-col gap-1 pt-6 pb-8 max-w-[720px]">
          <h2 class="text-16-medium text-text-strong">{language.t("settings.providers.title")}</h2>
@@ -226,11 +232,11 @@ export const SettingsProviders: Component = () => {
            </For>

            <div
-              class="flex items-center justify-between gap-4 min-h-16 border-b border-border-weak-base last:border-none flex-wrap py-3"
+              class="flex items-center justify-between gap-4 h-16 border-b border-border-weak-base last:border-none"
              data-component="custom-provider-section"
            >
              <div class="flex flex-col min-w-0">
-                <div class="flex flex-wrap items-center gap-x-3 gap-y-1">
+                <div class="flex items-center gap-x-3">
                  <ProviderIcon id={icon("synthetic")} class="size-5 shrink-0 icon-strong-base" />
                  <span class="text-14-medium text-text-strong">Custom provider</span>
                  <Tag>{language.t("settings.providers.tag.custom")}</Tag>
@@ -261,6 +267,6 @@ export const SettingsProviders: Component = () => {
          </Button>
        </div>
      </div>
-    </div>
+    </ScrollFade>
  )
 }
--- a/packages/app/src/components/terminal.tsx
+++ b/packages/app/src/components/terminal.tsx
@@ -146,7 +146,6 @@ export const Terminal = (props: TerminalProps) => {
      const once = { value: false }

      const url = new URL(sdk.url + `/pty/${local.pty.id}/connect?directory=${encodeURIComponent(sdk.directory)}`)
-      url.protocol = url.protocol === "https:" ? "wss:" : "ws:"
      if (window.__OPENCODE__?.serverPassword) {
        url.username = "opencode"
        url.password = window.__OPENCODE__?.serverPassword
--- a/packages/app/src/components/titlebar.tsx
+++ b/packages/app/src/components/titlebar.tsx
@@ -137,6 +137,7 @@ export function Titlebar() {
    <header
      class="h-10 shrink-0 bg-background-base relative grid grid-cols-[auto_minmax(0,1fr)_auto] items-center"
      style={{ "min-height": minHeight() }}
+      data-tauri-drag-region
    >
      <div
        classList={{
@@ -144,9 +145,10 @@ export function Titlebar() {
          "pl-2": !mac(),
        }}
        onMouseDown={drag}
+        data-tauri-drag-region
      >
        <Show when={mac()}>
-          <div class="h-full shrink-0" style={{ width: `${72 / zoom()}px` }} />
+          <div class="h-full shrink-0" style={{ width: `${72 / zoom()}px` }} data-tauri-drag-region />
          <div class="xl:hidden w-10 shrink-0 flex items-center justify-center">
            <IconButton
              icon="menu"
@@ -220,10 +222,13 @@ export function Titlebar() {
            </Tooltip>
          </div>
        </div>
-        <div id="opencode-titlebar-left" class="flex items-center gap-3 min-w-0 px-2" />
+        <div id="opencode-titlebar-left" class="flex items-center gap-3 min-w-0 px-2" data-tauri-drag-region />
      </div>

-      <div class="min-w-0 flex items-center justify-center pointer-events-none lg:absolute lg:inset-0 lg:flex lg:items-center lg:justify-center">
+      <div
+        class="min-w-0 flex items-center justify-center pointer-events-none lg:absolute lg:inset-0 lg:flex lg:items-center lg:justify-center"
+        data-tauri-drag-region
+      >
        <div id="opencode-titlebar-center" class="pointer-events-auto w-full min-w-0 flex justify-center lg:w-fit" />
      </div>

@@ -233,8 +238,9 @@ export function Titlebar() {
          "pr-6": !windows(),
        }}
        onMouseDown={drag}
+        data-tauri-drag-region
      >
-        <div id="opencode-titlebar-right" class="flex items-center gap-3 shrink-0 justify-end" />
+        <div id="opencode-titlebar-right" class="flex items-center gap-3 shrink-0 justify-end" data-tauri-drag-region />
        <Show when={windows()}>
          <div class="w-6 shrink-0" />
          <div data-tauri-decorum-tb class="flex flex-row" />
--- a/packages/app/src/context/global-sync.tsx
+++ b/packages/app/src/context/global-sync.tsx
@@ -119,8 +119,6 @@ type ChildOptions = {
  bootstrap?: boolean
 }

-const cmp = (a: string, b: string) => (a < b ? -1 : a > b ? 1 : 0)
-
 function normalizeProviderList(input: ProviderListResponse): ProviderListResponse {
  return {
    ...input,
@@ -299,7 +297,7 @@ function createGlobalSync() {
    const aUpdated = sessionUpdatedAt(a)
    const bUpdated = sessionUpdatedAt(b)
    if (aUpdated !== bUpdated) return bUpdated - aUpdated
-    return cmp(a.id, b.id)
+    return a.id.localeCompare(b.id)
  }

  function takeRecentSessions(sessions: Session[], limit: number, cutoff: number) {
@@ -327,7 +325,7 @@ function createGlobalSync() {
    const all = input
      .filter((s) => !!s?.id)
      .filter((s) => !s.time?.archived)
-      .sort((a, b) => cmp(a.id, b.id))
+      .sort((a, b) => a.id.localeCompare(b.id))

    const roots = all.filter((s) => !s.parentID)
    const children = all.filter((s) => !!s.parentID)
@@ -344,7 +342,7 @@ function createGlobalSync() {
      return sessionUpdatedAt(s) > cutoff
    })

-    return [...keepRoots, ...keepChildren].sort((a, b) => cmp(a.id, b.id))
+    return [...keepRoots, ...keepChildren].sort((a, b) => a.id.localeCompare(b.id))
  }

  function ensureChild(directory: string) {
@@ -459,7 +457,7 @@ function createGlobalSync() {
        const nonArchived = (x.data ?? [])
          .filter((s) => !!s?.id)
          .filter((s) => !s.time?.archived)
-          .sort((a, b) => cmp(a.id, b.id))
+          .sort((a, b) => a.id.localeCompare(b.id))

        // Read the current limit at resolve-time so callers that bump the limit while
        // a request is in-flight still get the expanded result.
@@ -561,7 +559,7 @@ function createGlobalSync() {
                "permission",
                sessionID,
                reconcile(
-                  permissions.filter((p) => !!p?.id).sort((a, b) => cmp(a.id, b.id)),
+                  permissions.filter((p) => !!p?.id).sort((a, b) => a.id.localeCompare(b.id)),
                  { key: "id" },
                ),
              )
@@ -590,7 +588,7 @@ function createGlobalSync() {
                "question",
                sessionID,
                reconcile(
-                  questions.filter((q) => !!q?.id).sort((a, b) => cmp(a.id, b.id)),
+                  questions.filter((q) => !!q?.id).sort((a, b) => a.id.localeCompare(b.id)),
                  { key: "id" },
                ),
              )
@@ -988,7 +986,7 @@ function createGlobalSync() {
            .filter((p) => !!p?.id)
            .filter((p) => !!p.worktree && !p.worktree.includes("opencode-test"))
            .slice()
-            .sort((a, b) => cmp(a.id, b.id))
+            .sort((a, b) => a.id.localeCompare(b.id))
          setGlobalStore("project", projects)
        }),
      ),
--- a/packages/app/src/context/layout.tsx
+++ b/packages/app/src/context/layout.tsx
@@ -33,14 +33,6 @@ type SessionTabs = {
 type SessionView = {
  scroll: Record<string, SessionScroll>
  reviewOpen?: string[]
-  pendingMessage?: string
-  pendingMessageAt?: number
-}
-
-type TabHandoff = {
-  dir: string
-  id: string
-  at: number
 }

 export type LocalProject = Partial<Project> & { worktree: string; expanded: boolean }
@@ -123,14 +115,10 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        },
        sessionTabs: {} as Record<string, SessionTabs>,
        sessionView: {} as Record<string, SessionView>,
-        handoff: {
-          tabs: undefined as TabHandoff | undefined,
-        },
      }),
    )

    const MAX_SESSION_KEYS = 50
-    const PENDING_MESSAGE_TTL_MS = 2 * 60 * 1000
    const meta = { active: undefined as string | undefined, pruned: false }
    const used = new Map<string, number>()

@@ -423,16 +411,6 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(

    return {
      ready,
-      handoff: {
-        tabs: createMemo(() => store.handoff?.tabs),
-        setTabs(dir: string, id: string) {
-          setStore("handoff", "tabs", { dir, id, at: Date.now() })
-        },
-        clearTabs() {
-          if (!store.handoff?.tabs) return
-          setStore("handoff", "tabs", undefined)
-        },
-      },
      projects: {
        list,
        open(directory: string) {
@@ -558,49 +536,6 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
          setStore("mobileSidebar", "opened", (x) => !x)
        },
      },
-      pendingMessage: {
-        set(sessionKey: string, messageID: string) {
-          const at = Date.now()
-          touch(sessionKey)
-          const current = store.sessionView[sessionKey]
-          if (!current) {
-            setStore("sessionView", sessionKey, {
-              scroll: {},
-              pendingMessage: messageID,
-              pendingMessageAt: at,
-            })
-            prune(meta.active ?? sessionKey)
-            return
-          }
-
-          setStore(
-            "sessionView",
-            sessionKey,
-            produce((draft) => {
-              draft.pendingMessage = messageID
-              draft.pendingMessageAt = at
-            }),
-          )
-        },
-        consume(sessionKey: string) {
-          const current = store.sessionView[sessionKey]
-          const message = current?.pendingMessage
-          const at = current?.pendingMessageAt
-          if (!message || !at) return
-
-          setStore(
-            "sessionView",
-            sessionKey,
-            produce((draft) => {
-              delete draft.pendingMessage
-              delete draft.pendingMessageAt
-            }),
-          )
-
-          if (Date.now() - at > PENDING_MESSAGE_TTL_MS) return
-          return message
-        },
-      },
      view(sessionKey: string | Accessor<string>) {
        const key = typeof sessionKey === "function" ? sessionKey : () => sessionKey

@@ -747,15 +682,12 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
            if (!current) return

            const all = current.all.filter((x) => x !== tab)
-            if (current.active !== tab) {
-              setStore("sessionTabs", session, "all", all)
-              return
-            }
-
-            const index = current.all.findIndex((f) => f === tab)
-            const next = current.all[index - 1] ?? current.all[index + 1] ?? all[0]
            batch(() => {
              setStore("sessionTabs", session, "all", all)
+              if (current.active !== tab) return
+
+              const index = current.all.findIndex((f) => f === tab)
+              const next = all[index - 1] ?? all[0]
              setStore("sessionTabs", session, "active", next)
            })
          },
--- a/packages/app/src/context/sync.tsx
+++ b/packages/app/src/context/sync.tsx
@@ -9,8 +9,6 @@ import type { Message, Part } from "@opencode-ai/sdk/v2/client"

 const keyFor = (directory: string, id: string) => `${directory}\n${id}`

-const cmp = (a: string, b: string) => (a < b ? -1 : a > b ? 1 : 0)
-
 export const { use: useSync, provider: SyncProvider } = createSimpleContext({
  name: "Sync",
  init: () => {
@@ -61,7 +59,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
          const next = items
            .map((x) => x.info)
            .filter((m) => !!m?.id)
-            .sort((a, b) => cmp(a.id, b.id))
+            .sort((a, b) => a.id.localeCompare(b.id))

          batch(() => {
            input.setStore("message", input.sessionID, reconcile(next, { key: "id" }))
@@ -71,7 +69,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
                "part",
                message.info.id,
                reconcile(
-                  message.parts.filter((p) => !!p?.id).sort((a, b) => cmp(a.id, b.id)),
+                  message.parts.filter((p) => !!p?.id).sort((a, b) => a.id.localeCompare(b.id)),
                  { key: "id" },
                ),
              )
@@ -131,7 +129,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
                const result = Binary.search(messages, input.messageID, (m) => m.id)
                messages.splice(result.index, 0, message)
              }
-              draft.part[input.messageID] = input.parts.filter((p) => !!p?.id).sort((a, b) => cmp(a.id, b.id))
+              draft.part[input.messageID] = input.parts.filter((p) => !!p?.id).sort((a, b) => a.id.localeCompare(b.id))
            }),
          )
        },
@@ -273,7 +271,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
          await client.session.list().then((x) => {
            const sessions = (x.data ?? [])
              .filter((s) => !!s?.id)
-              .sort((a, b) => cmp(a.id, b.id))
+              .sort((a, b) => a.id.localeCompare(b.id))
              .slice(0, store.limit)
            setStore("session", reconcile(sessions, { key: "id" }))
          })
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -44,6 +44,7 @@ export const dict = {

  "command.session.new": "جلسة جديدة",
  "command.file.open": "فتح ملف",
+  "command.file.open.description": "البحث في الملفات والأوامر",
  "command.context.addSelection": "إضافة التحديد إلى السياق",
  "command.context.addSelection.description": "إضافة الأسطر المحددة من الملف الحالي",
  "command.terminal.toggle": "تبديل المحطة الطرفية",
@@ -69,7 +70,6 @@ export const dict = {
  "command.model.variant.cycle.description": "التبديل إلى مستوى الجهد التالي",
  "command.permissions.autoaccept.enable": "قبول التعديلات تلقائيًا",
  "command.permissions.autoaccept.disable": "إيقاف قبول التعديلات تلقائيًا",
-  "command.workspace.toggle": "تبديل مساحات العمل",
  "command.session.undo": "تراجع",
  "command.session.undo.description": "تراجع عن الرسالة الأخيرة",
  "command.session.redo": "إعادة",
@@ -83,7 +83,7 @@ export const dict = {
  "command.session.unshare": "إلغاء مشاركة الجلسة",
  "command.session.unshare.description": "إيقاف مشاركة هذه الجلسة",

-  "palette.search.placeholder": "البحث في الملفات والأوامر والجلسات",
+  "palette.search.placeholder": "البحث في الملفات والأوامر",
  "palette.empty": "لا توجد نتائج",
  "palette.group.commands": "الأوامر",
  "palette.group.files": "الملفات",
@@ -348,11 +348,6 @@ export const dict = {
  "toast.permissions.autoaccept.off.title": "توقف قبول التعديلات تلقائيًا",
  "toast.permissions.autoaccept.off.description": "ستتطلب أذونات التحرير والكتابة موافقة",

-  "toast.workspace.enabled.title": "تم تمكين مساحات العمل",
-  "toast.workspace.enabled.description": "الآن يتم عرض عدة worktrees في الشريط الجانبي",
-  "toast.workspace.disabled.title": "تم تعطيل مساحات العمل",
-  "toast.workspace.disabled.description": "يتم عرض worktree الرئيسي فقط في الشريط الجانبي",
-
  "toast.model.none.title": "لم يتم تحديد نموذج",
  "toast.model.none.description": "قم بتوصيل موفر لتلخيص هذه الجلسة",

--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -44,6 +44,7 @@ export const dict = {

  "command.session.new": "Nova sessão",
  "command.file.open": "Abrir arquivo",
+  "command.file.open.description": "Buscar arquivos e comandos",
  "command.context.addSelection": "Adicionar seleção ao contexto",
  "command.context.addSelection.description": "Adicionar as linhas selecionadas do arquivo atual",
  "command.terminal.toggle": "Alternar terminal",
@@ -69,7 +70,6 @@ export const dict = {
  "command.model.variant.cycle.description": "Mudar para o próximo nível de esforço",
  "command.permissions.autoaccept.enable": "Aceitar edições automaticamente",
  "command.permissions.autoaccept.disable": "Parar de aceitar edições automaticamente",
-  "command.workspace.toggle": "Alternar espaços de trabalho",
  "command.session.undo": "Desfazer",
  "command.session.undo.description": "Desfazer a última mensagem",
  "command.session.redo": "Refazer",
@@ -83,7 +83,7 @@ export const dict = {
  "command.session.unshare": "Parar de compartilhar sessão",
  "command.session.unshare.description": "Parar de compartilhar esta sessão",

-  "palette.search.placeholder": "Buscar arquivos, comandos e sessões",
+  "palette.search.placeholder": "Buscar arquivos e comandos",
  "palette.empty": "Nenhum resultado encontrado",
  "palette.group.commands": "Comandos",
  "palette.group.files": "Arquivos",
@@ -347,11 +347,6 @@ export const dict = {
  "toast.permissions.autoaccept.off.title": "Parou de aceitar edições automaticamente",
  "toast.permissions.autoaccept.off.description": "Permissões de edição e escrita exigirão aprovação",

-  "toast.workspace.enabled.title": "Espaços de trabalho ativados",
-  "toast.workspace.enabled.description": "Várias worktrees agora são exibidas na barra lateral",
-  "toast.workspace.disabled.title": "Espaços de trabalho desativados",
-  "toast.workspace.disabled.description": "Apenas a worktree principal é exibida na barra lateral",
-
  "toast.model.none.title": "Nenhum modelo selecionado",
  "toast.model.none.description": "Conecte um provedor para resumir esta sessão",

--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -44,6 +44,7 @@ export const dict = {

  "command.session.new": "Ny session",
  "command.file.open": "Åbn fil",
+  "command.file.open.description": "Søg i filer og kommandoer",
  "command.context.addSelection": "Tilføj markering til kontekst",
  "command.context.addSelection.description": "Tilføj markerede linjer fra den aktuelle fil",
  "command.terminal.toggle": "Skift terminal",
@@ -69,7 +70,6 @@ export const dict = {
  "command.model.variant.cycle.description": "Skift til næste indsatsniveau",
  "command.permissions.autoaccept.enable": "Accepter ændringer automatisk",
  "command.permissions.autoaccept.disable": "Stop automatisk accept af ændringer",
-  "command.workspace.toggle": "Skift arbejdsområder",
  "command.session.undo": "Fortryd",
  "command.session.undo.description": "Fortryd den sidste besked",
  "command.session.redo": "Omgør",
@@ -83,7 +83,7 @@ export const dict = {
  "command.session.unshare": "Stop deling af session",
  "command.session.unshare.description": "Stop med at dele denne session",

-  "palette.search.placeholder": "Søg i filer, kommandoer og sessioner",
+  "palette.search.placeholder": "Søg i filer og kommandoer",
  "palette.empty": "Ingen resultater fundet",
  "palette.group.commands": "Kommandoer",
  "palette.group.files": "Filer",
@@ -349,11 +349,6 @@ export const dict = {
  "toast.permissions.autoaccept.off.title": "Stoppede automatisk accept af ændringer",
  "toast.permissions.autoaccept.off.description": "Redigerings- og skrivetilladelser vil kræve godkendelse",

-  "toast.workspace.enabled.title": "Arbejdsområder aktiveret",
-  "toast.workspace.enabled.description": "Flere worktrees vises nu i sidepanelet",
-  "toast.workspace.disabled.title": "Arbejdsområder deaktiveret",
-  "toast.workspace.disabled.description": "Kun hoved-worktree vises i sidepanelet",
-
  "toast.model.none.title": "Ingen model valgt",
  "toast.model.none.description": "Forbind en udbyder for at opsummere denne session",

--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -48,6 +48,7 @@ export const dict = {

  "command.session.new": "Neue Sitzung",
  "command.file.open": "Datei öffnen",
+  "command.file.open.description": "Dateien und Befehle durchsuchen",
  "command.context.addSelection": "Auswahl zum Kontext hinzufügen",
  "command.context.addSelection.description": "Ausgewählte Zeilen aus der aktuellen Datei hinzufügen",
  "command.terminal.toggle": "Terminal umschalten",
@@ -73,7 +74,6 @@ export const dict = {
  "command.model.variant.cycle.description": "Zum nächsten Aufwandslevel wechseln",
  "command.permissions.autoaccept.enable": "Änderungen automatisch akzeptieren",
  "command.permissions.autoaccept.disable": "Automatische Annahme von Änderungen stoppen",
-  "command.workspace.toggle": "Arbeitsbereiche umschalten",
  "command.session.undo": "Rückgängig",
  "command.session.undo.description": "Letzte Nachricht rückgängig machen",
  "command.session.redo": "Wiederherstellen",
@@ -87,7 +87,7 @@ export const dict = {
  "command.session.unshare": "Teilen der Sitzung aufheben",
  "command.session.unshare.description": "Teilen dieser Sitzung beenden",

-  "palette.search.placeholder": "Dateien, Befehle und Sitzungen durchsuchen",
+  "palette.search.placeholder": "Dateien und Befehle durchsuchen",
  "palette.empty": "Keine Ergebnisse gefunden",
  "palette.group.commands": "Befehle",
  "palette.group.files": "Dateien",
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -44,6 +44,7 @@ export const dict = {

  "command.session.new": "New session",
  "command.file.open": "Open file",
+  "command.file.open.description": "Search files and commands",
  "command.tab.close": "Close tab",
  "command.context.addSelection": "Add selection to context",
  "command.context.addSelection.description": "Add selected lines from the current file",
@@ -70,8 +71,6 @@ export const dict = {
  "command.model.variant.cycle.description": "Switch to the next effort level",
  "command.permissions.autoaccept.enable": "Auto-accept edits",
  "command.permissions.autoaccept.disable": "Stop auto-accepting edits",
-  "command.workspace.toggle": "Toggle workspaces",
-  "command.workspace.toggle.description": "Enable or disable multiple workspaces in the sidebar",
  "command.session.undo": "Undo",
  "command.session.undo.description": "Undo the last message",
  "command.session.redo": "Redo",
@@ -85,7 +84,7 @@ export const dict = {
  "command.session.unshare": "Unshare session",
  "command.session.unshare.description": "Stop sharing this session",

-  "palette.search.placeholder": "Search files, commands, and sessions",
+  "palette.search.placeholder": "Search files and commands",
  "palette.empty": "No results found",
  "palette.group.commands": "Commands",
  "palette.group.files": "Files",
@@ -351,11 +350,6 @@ export const dict = {
  "toast.theme.title": "Theme switched",
  "toast.scheme.title": "Color scheme",

-  "toast.workspace.enabled.title": "Workspaces enabled",
-  "toast.workspace.enabled.description": "Multiple worktrees are now shown in the sidebar",
-  "toast.workspace.disabled.title": "Workspaces disabled",
-  "toast.workspace.disabled.description": "Only the main worktree is shown in the sidebar",
-
  "toast.permissions.autoaccept.on.title": "Auto-accepting edits",
  "toast.permissions.autoaccept.on.description": "Edit and write permissions will be automatically approved",
  "toast.permissions.autoaccept.off.title": "Stopped auto-accepting edits",
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -44,6 +44,7 @@ export const dict = {

  "command.session.new": "Nueva sesión",
  "command.file.open": "Abrir archivo",
+  "command.file.open.description": "Buscar archivos y comandos",
  "command.context.addSelection": "Añadir selección al contexto",
  "command.context.addSelection.description": "Añadir las líneas seleccionadas del archivo actual",
  "command.terminal.toggle": "Alternar terminal",
@@ -69,7 +70,6 @@ export const dict = {
  "command.model.variant.cycle.description": "Cambiar al siguiente nivel de esfuerzo",
  "command.permissions.autoaccept.enable": "Aceptar ediciones automáticamente",
  "command.permissions.autoaccept.disable": "Dejar de aceptar ediciones automáticamente",
-  "command.workspace.toggle": "Alternar espacios de trabajo",
  "command.session.undo": "Deshacer",
  "command.session.undo.description": "Deshacer el último mensaje",
  "command.session.redo": "Rehacer",
@@ -83,7 +83,7 @@ export const dict = {
  "command.session.unshare": "Dejar de compartir sesión",
  "command.session.unshare.description": "Dejar de compartir esta sesión",

-  "palette.search.placeholder": "Buscar archivos, comandos y sesiones",
+  "palette.search.placeholder": "Buscar archivos y comandos",
  "palette.empty": "No se encontraron resultados",
  "palette.group.commands": "Comandos",
  "palette.group.files": "Archivos",
@@ -350,11 +350,6 @@ export const dict = {
  "toast.permissions.autoaccept.off.title": "Se dejó de aceptar ediciones automáticamente",
  "toast.permissions.autoaccept.off.description": "Los permisos de edición y escritura requerirán aprobación",

-  "toast.workspace.enabled.title": "Espacios de trabajo habilitados",
-  "toast.workspace.enabled.description": "Ahora se muestran varios worktrees en la barra lateral",
-  "toast.workspace.disabled.title": "Espacios de trabajo deshabilitados",
-  "toast.workspace.disabled.description": "Solo se muestra el worktree principal en la barra lateral",
-
  "toast.model.none.title": "Ningún modelo seleccionado",
  "toast.model.none.description": "Conecta un proveedor para resumir esta sesión",

--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -44,6 +44,7 @@ export const dict = {

  "command.session.new": "Nouvelle session",
  "command.file.open": "Ouvrir un fichier",
+  "command.file.open.description": "Rechercher des fichiers et des commandes",
  "command.context.addSelection": "Ajouter la sélection au contexte",
  "command.context.addSelection.description": "Ajouter les lignes sélectionnées du fichier actuel",
  "command.terminal.toggle": "Basculer le terminal",
@@ -69,7 +70,6 @@ export const dict = {
  "command.model.variant.cycle.description": "Passer au niveau d'effort suivant",
  "command.permissions.autoaccept.enable": "Accepter automatiquement les modifications",
  "command.permissions.autoaccept.disable": "Arrêter l'acceptation automatique des modifications",
-  "command.workspace.toggle": "Basculer les espaces de travail",
  "command.session.undo": "Annuler",
  "command.session.undo.description": "Annuler le dernier message",
  "command.session.redo": "Rétablir",
@@ -83,7 +83,7 @@ export const dict = {
  "command.session.unshare": "Ne plus partager la session",
  "command.session.unshare.description": "Arrêter de partager cette session",

-  "palette.search.placeholder": "Rechercher des fichiers, des commandes et des sessions",
+  "palette.search.placeholder": "Rechercher des fichiers et des commandes",
  "palette.empty": "Aucun résultat trouvé",
  "palette.group.commands": "Commandes",
  "palette.group.files": "Fichiers",
@@ -352,11 +352,6 @@ export const dict = {
  "toast.permissions.autoaccept.off.description":
    "Les permissions de modification et d'écriture nécessiteront une approbation",

-  "toast.workspace.enabled.title": "Espaces de travail activés",
-  "toast.workspace.enabled.description": "Plusieurs worktrees sont désormais affichés dans la barre latérale",
-  "toast.workspace.disabled.title": "Espaces de travail désactivés",
-  "toast.workspace.disabled.description": "Seul le worktree principal est affiché dans la barre latérale",
-
  "toast.model.none.title": "Aucun modèle sélectionné",
  "toast.model.none.description": "Connectez un fournisseur pour résumer cette session",

--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -44,6 +44,7 @@ export const dict = {

  "command.session.new": "新しいセッション",
  "command.file.open": "ファイルを開く",
+  "command.file.open.description": "ファイルとコマンドを検索",
  "command.context.addSelection": "選択範囲をコンテキストに追加",
  "command.context.addSelection.description": "現在のファイルから選択した行を追加",
  "command.terminal.toggle": "ターミナルの切り替え",
@@ -69,7 +70,6 @@ export const dict = {
  "command.model.variant.cycle.description": "次の思考レベルに切り替え",
  "command.permissions.autoaccept.enable": "編集を自動承認",
  "command.permissions.autoaccept.disable": "編集の自動承認を停止",
-  "command.workspace.toggle": "ワークスペースを切り替え",
  "command.session.undo": "元に戻す",
  "command.session.undo.description": "最後のメッセージを元に戻す",
  "command.session.redo": "やり直す",
@@ -83,7 +83,7 @@ export const dict = {
  "command.session.unshare": "セッションの共有を停止",
  "command.session.unshare.description": "このセッションの共有を停止",

-  "palette.search.placeholder": "ファイル、コマンド、セッションを検索",
+  "palette.search.placeholder": "ファイルとコマンドを検索",
  "palette.empty": "結果が見つかりません",
  "palette.group.commands": "コマンド",
  "palette.group.files": "ファイル",
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -48,6 +48,7 @@ export const dict = {

  "command.session.new": "새 세션",
  "command.file.open": "파일 열기",
+  "command.file.open.description": "파일 및 명령어 검색",
  "command.context.addSelection": "선택 영역을 컨텍스트에 추가",
  "command.context.addSelection.description": "현재 파일에서 선택한 줄을 추가",
  "command.terminal.toggle": "터미널 토글",
@@ -73,7 +74,6 @@ export const dict = {
  "command.model.variant.cycle.description": "다음 생각 수준으로 전환",
  "command.permissions.autoaccept.enable": "편집 자동 수락",
  "command.permissions.autoaccept.disable": "편집 자동 수락 중지",
-  "command.workspace.toggle": "작업 공간 전환",
  "command.session.undo": "실행 취소",
  "command.session.undo.description": "마지막 메시지 실행 취소",
  "command.session.redo": "다시 실행",
@@ -87,7 +87,7 @@ export const dict = {
  "command.session.unshare": "세션 공유 중지",
  "command.session.unshare.description": "이 세션 공유 중지",

-  "palette.search.placeholder": "파일, 명령어 및 세션 검색",
+  "palette.search.placeholder": "파일 및 명령어 검색",
  "palette.empty": "결과 없음",
  "palette.group.commands": "명령어",
  "palette.group.files": "파일",
@@ -351,11 +351,6 @@ export const dict = {
  "toast.permissions.autoaccept.off.title": "편집 자동 수락 중지됨",
  "toast.permissions.autoaccept.off.description": "편집 및 쓰기 권한 승인이 필요합니다",

-  "toast.workspace.enabled.title": "작업 공간 활성화됨",
-  "toast.workspace.enabled.description": "이제 사이드바에 여러 작업 트리가 표시됩니다",
-  "toast.workspace.disabled.title": "작업 공간 비활성화됨",
-  "toast.workspace.disabled.description": "사이드바에 메인 작업 트리만 표시됩니다",
-
  "toast.model.none.title": "선택된 모델 없음",
  "toast.model.none.description": "이 세션을 요약하려면 공급자를 연결하세요",

--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -47,6 +47,7 @@ export const dict = {

  "command.session.new": "Ny sesjon",
  "command.file.open": "Åpne fil",
+  "command.file.open.description": "Søk i filer og kommandoer",
  "command.context.addSelection": "Legg til markering i kontekst",
  "command.context.addSelection.description": "Legg til valgte linjer fra gjeldende fil",
  "command.terminal.toggle": "Veksle terminal",
@@ -72,7 +73,6 @@ export const dict = {
  "command.model.variant.cycle.description": "Bytt til neste innsatsnivå",
  "command.permissions.autoaccept.enable": "Godta endringer automatisk",
  "command.permissions.autoaccept.disable": "Slutt å godta endringer automatisk",
-  "command.workspace.toggle": "Veksle arbeidsområder",
  "command.session.undo": "Angre",
  "command.session.undo.description": "Angre siste melding",
  "command.session.redo": "Gjør om",
@@ -86,7 +86,7 @@ export const dict = {
  "command.session.unshare": "Slutt å dele sesjon",
  "command.session.unshare.description": "Slutt å dele denne sesjonen",

-  "palette.search.placeholder": "Søk i filer, kommandoer og sesjoner",
+  "palette.search.placeholder": "Søk i filer og kommandoer",
  "palette.empty": "Ingen resultater funnet",
  "palette.group.commands": "Kommandoer",
  "palette.group.files": "Filer",
@@ -351,11 +351,6 @@ export const dict = {
  "toast.permissions.autoaccept.off.title": "Sluttet å godta endringer automatisk",
  "toast.permissions.autoaccept.off.description": "Redigerings- og skrivetillatelser vil kreve godkjenning",

-  "toast.workspace.enabled.title": "Arbeidsområder aktivert",
-  "toast.workspace.enabled.description": "Flere worktrees vises nå i sidefeltet",
-  "toast.workspace.disabled.title": "Arbeidsområder deaktivert",
-  "toast.workspace.disabled.description": "Kun hoved-worktree vises i sidefeltet",
-
  "toast.model.none.title": "Ingen modell valgt",
  "toast.model.none.description": "Koble til en leverandør for å oppsummere denne sesjonen",

--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -44,6 +44,7 @@ export const dict = {

  "command.session.new": "Nowa sesja",
  "command.file.open": "Otwórz plik",
+  "command.file.open.description": "Szukaj plików i poleceń",
  "command.context.addSelection": "Dodaj zaznaczenie do kontekstu",
  "command.context.addSelection.description": "Dodaj zaznaczone linie z bieżącego pliku",
  "command.terminal.toggle": "Przełącz terminal",
@@ -69,7 +70,6 @@ export const dict = {
  "command.model.variant.cycle.description": "Przełącz na następny poziom wysiłku",
  "command.permissions.autoaccept.enable": "Automatyczne akceptowanie edycji",
  "command.permissions.autoaccept.disable": "Zatrzymaj automatyczne akceptowanie edycji",
-  "command.workspace.toggle": "Przełącz przestrzenie robocze",
  "command.session.undo": "Cofnij",
  "command.session.undo.description": "Cofnij ostatnią wiadomość",
  "command.session.redo": "Ponów",
@@ -83,7 +83,7 @@ export const dict = {
  "command.session.unshare": "Przestań udostępniać sesję",
  "command.session.unshare.description": "Zatrzymaj udostępnianie tej sesji",

-  "palette.search.placeholder": "Szukaj plików, poleceń i sesji",
+  "palette.search.placeholder": "Szukaj plików i poleceń",
  "palette.empty": "Brak wyników",
  "palette.group.commands": "Polecenia",
  "palette.group.files": "Pliki",
@@ -349,11 +349,6 @@ export const dict = {
  "toast.permissions.autoaccept.off.title": "Zatrzymano automatyczne akceptowanie edycji",
  "toast.permissions.autoaccept.off.description": "Uprawnienia do edycji i zapisu będą wymagały zatwierdzenia",

-  "toast.workspace.enabled.title": "Przestrzenie robocze włączone",
-  "toast.workspace.enabled.description": "Kilka worktree jest teraz wyświetlanych na pasku bocznym",
-  "toast.workspace.disabled.title": "Przestrzenie robocze wyłączone",
-  "toast.workspace.disabled.description": "Tylko główny worktree jest wyświetlany na pasku bocznym",
-
  "toast.model.none.title": "Nie wybrano modelu",
  "toast.model.none.description": "Połącz dostawcę, aby podsumować tę sesję",

--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -44,6 +44,7 @@ export const dict = {

  "command.session.new": "Новая сессия",
  "command.file.open": "Открыть файл",
+  "command.file.open.description": "Поиск файлов и команд",
  "command.context.addSelection": "Добавить выделение в контекст",
  "command.context.addSelection.description": "Добавить выбранные строки из текущего файла",
  "command.terminal.toggle": "Переключить терминал",
@@ -69,7 +70,6 @@ export const dict = {
  "command.model.variant.cycle.description": "Переключиться к следующему уровню усилий",
  "command.permissions.autoaccept.enable": "Авто-принятие изменений",
  "command.permissions.autoaccept.disable": "Прекратить авто-принятие изменений",
-  "command.workspace.toggle": "Переключить рабочие пространства",
  "command.session.undo": "Отменить",
  "command.session.undo.description": "Отменить последнее сообщение",
  "command.session.redo": "Повторить",
@@ -83,7 +83,7 @@ export const dict = {
  "command.session.unshare": "Отменить публикацию",
  "command.session.unshare.description": "Прекратить публикацию сессии",

-  "palette.search.placeholder": "Поиск файлов, команд и сессий",
+  "palette.search.placeholder": "Поиск файлов и команд",
  "palette.empty": "Ничего не найдено",
  "palette.group.commands": "Команды",
  "palette.group.files": "Файлы",
@@ -350,11 +350,6 @@ export const dict = {
  "toast.permissions.autoaccept.off.title": "Авто-принятие остановлено",
  "toast.permissions.autoaccept.off.description": "Редактирование и запись потребуют подтверждения",

-  "toast.workspace.enabled.title": "Рабочие пространства включены",
-  "toast.workspace.enabled.description": "В боковой панели теперь отображаются несколько рабочих деревьев",
-  "toast.workspace.disabled.title": "Рабочие пространства отключены",
-  "toast.workspace.disabled.description": "В боковой панели отображается только главное рабочее дерево",
-
  "toast.model.none.title": "Модель не выбрана",
  "toast.model.none.description": "Подключите провайдера для суммаризации сессии",

--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -44,6 +44,7 @@ export const dict = {

  "command.session.new": "เซสชันใหม่",
  "command.file.open": "เปิดไฟล์",
+  "command.file.open.description": "ค้นหาไฟล์และคำสั่ง",
  "command.context.addSelection": "เพิ่มส่วนที่เลือกไปยังบริบท",
  "command.context.addSelection.description": "เพิ่มบรรทัดที่เลือกจากไฟล์ปัจจุบัน",
  "command.terminal.toggle": "สลับเทอร์มินัล",
@@ -69,7 +70,6 @@ export const dict = {
  "command.model.variant.cycle.description": "สลับไปยังระดับความพยายามถัดไป",
  "command.permissions.autoaccept.enable": "ยอมรับการแก้ไขโดยอัตโนมัติ",
  "command.permissions.autoaccept.disable": "หยุดยอมรับการแก้ไขโดยอัตโนมัติ",
-  "command.workspace.toggle": "สลับพื้นที่ทำงาน",
  "command.session.undo": "ยกเลิก",
  "command.session.undo.description": "ยกเลิกข้อความล่าสุด",
  "command.session.redo": "ทำซ้ำ",
@@ -83,7 +83,7 @@ export const dict = {
  "command.session.unshare": "ยกเลิกการแชร์เซสชัน",
  "command.session.unshare.description": "หยุดการแชร์เซสชันนี้",

-  "palette.search.placeholder": "ค้นหาไฟล์ คำสั่ง และเซสชัน",
+  "palette.search.placeholder": "ค้นหาไฟล์และคำสั่ง",
  "palette.empty": "ไม่พบผลลัพธ์",
  "palette.group.commands": "คำสั่ง",
  "palette.group.files": "ไฟล์",
@@ -349,15 +349,10 @@ export const dict = {
  "toast.scheme.title": "โทนสี",

  "toast.permissions.autoaccept.on.title": "กำลังยอมรับการแก้ไขโดยอัตโนมัติ",
-  "toast.permissions.autoaccept.on.description": "สิทธิ์การแก้ไขและจะได้รับเขียนการอนุมัติโดยอัตโนมัติ",
+  "toast.permissions.autoaccept.on.description": "สิทธิ์การแก้ไขและเขียนจะได้รับการอนุมัติโดยอัตโนมัติ",
  "toast.permissions.autoaccept.off.title": "หยุดยอมรับการแก้ไขโดยอัตโนมัติ",
  "toast.permissions.autoaccept.off.description": "สิทธิ์การแก้ไขและเขียนจะต้องได้รับการอนุมัติ",

-  "toast.workspace.enabled.title": "เปิดใช้งานพื้นที่ทำงานแล้ว",
-  "toast.workspace.enabled.description": "ตอนนี้จะแสดง worktree หลายรายการในแถบด้านข้าง",
-  "toast.workspace.disabled.title": "ปิดใช้งานพื้นที่ทำงานแล้ว",
-  "toast.workspace.disabled.description": "จะแสดงเฉพาะ worktree หลักในแถบด้านข้าง",
-
  "toast.model.none.title": "ไม่ได้เลือกโมเดล",
  "toast.model.none.description": "เชื่อมต่อผู้ให้บริการเพื่อสรุปเซสชันนี้",

--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -48,6 +48,7 @@ export const dict = {

  "command.session.new": "新建会话",
  "command.file.open": "打开文件",
+  "command.file.open.description": "搜索文件和命令",
  "command.context.addSelection": "将所选内容添加到上下文",
  "command.context.addSelection.description": "添加当前文件中选中的行",
  "command.terminal.toggle": "切换终端",
@@ -73,7 +74,6 @@ export const dict = {
  "command.model.variant.cycle.description": "切换到下一个强度等级",
  "command.permissions.autoaccept.enable": "自动接受编辑",
  "command.permissions.autoaccept.disable": "停止自动接受编辑",
-  "command.workspace.toggle": "切换工作区",
  "command.session.undo": "撤销",
  "command.session.undo.description": "撤销上一条消息",
  "command.session.redo": "重做",
@@ -87,7 +87,7 @@ export const dict = {
  "command.session.unshare": "取消分享会话",
  "command.session.unshare.description": "停止分享此会话",

-  "palette.search.placeholder": "搜索文件、命令和会话",
+  "palette.search.placeholder": "搜索文件和命令",
  "palette.empty": "未找到结果",
  "palette.group.commands": "命令",
  "palette.group.files": "文件",
@@ -344,12 +344,7 @@ export const dict = {
  "toast.language.description": "已切换到{{language}}",

  "toast.theme.title": "主题已切换",
-  "toast.scheme.title": "颜色方案",
-
-  "toast.workspace.enabled.title": "工作区已启用",
-  "toast.workspace.enabled.description": "侧边栏现在显示多个工作树",
-  "toast.workspace.disabled.title": "工作区已禁用",
-  "toast.workspace.disabled.description": "侧边栏只显示主工作树",
+  "toast.scheme.title": "配色方案",

  "toast.permissions.autoaccept.on.title": "自动接受编辑",
  "toast.permissions.autoaccept.on.description": "编辑和写入权限将自动获批",
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -48,6 +48,7 @@ export const dict = {

  "command.session.new": "新增工作階段",
  "command.file.open": "開啟檔案",
+  "command.file.open.description": "搜尋檔案和命令",
  "command.context.addSelection": "將選取內容加入上下文",
  "command.context.addSelection.description": "加入目前檔案中選取的行",
  "command.terminal.toggle": "切換終端機",
@@ -73,7 +74,6 @@ export const dict = {
  "command.model.variant.cycle.description": "切換到下一個強度等級",
  "command.permissions.autoaccept.enable": "自動接受編輯",
  "command.permissions.autoaccept.disable": "停止自動接受編輯",
-  "command.workspace.toggle": "切換工作區",
  "command.session.undo": "復原",
  "command.session.undo.description": "復原上一則訊息",
  "command.session.redo": "重做",
@@ -87,7 +87,7 @@ export const dict = {
  "command.session.unshare": "取消分享工作階段",
  "command.session.unshare.description": "停止分享此工作階段",

-  "palette.search.placeholder": "搜尋檔案、命令和工作階段",
+  "palette.search.placeholder": "搜尋檔案和命令",
  "palette.empty": "找不到結果",
  "palette.group.commands": "命令",
  "palette.group.files": "檔案",
@@ -341,12 +341,7 @@ export const dict = {
  "toast.language.description": "已切換到 {{language}}",

  "toast.theme.title": "主題已切換",
-  "toast.scheme.title": "顏色方案",
-
-  "toast.workspace.enabled.title": "工作區已啟用",
-  "toast.workspace.enabled.description": "側邊欄現在顯示多個工作樹",
-  "toast.workspace.disabled.title": "工作區已停用",
-  "toast.workspace.disabled.description": "側邊欄只顯示主工作樹",
+  "toast.scheme.title": "配色方案",

  "toast.permissions.autoaccept.on.title": "自動接受編輯",
  "toast.permissions.autoaccept.on.description": "編輯和寫入權限將自動獲准",
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -31,7 +31,6 @@ import { Tooltip, TooltipKeybind } from "@opencode-ai/ui/tooltip"
 import { HoverCard } from "@opencode-ai/ui/hover-card"
 import { MessageNav } from "@opencode-ai/ui/message-nav"
 import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
-import { ContextMenu } from "@opencode-ai/ui/context-menu"
 import { Collapsible } from "@opencode-ai/ui/collapsible"
 import { DiffChanges } from "@opencode-ai/ui/diff-changes"
 import { Spinner } from "@opencode-ai/ui/spinner"
@@ -109,7 +108,7 @@ export default function Layout(props: ParentProps) {
  const command = useCommand()
  const theme = useTheme()
  const language = useLanguage()
-  const initialDirectory = decode64(params.dir)
+  const initialDir = params.dir
  const availableThemeEntries = createMemo(() => Object.entries(theme.themes()))
  const colorSchemeOrder: ColorScheme[] = ["system", "light", "dark"]
  const colorSchemeKey: Record<ColorScheme, "theme.scheme.system" | "theme.scheme.light" | "theme.scheme.dark"> = {
@@ -120,7 +119,7 @@ export default function Layout(props: ParentProps) {
  const colorSchemeLabel = (scheme: ColorScheme) => language.t(colorSchemeKey[scheme])

  const [state, setState] = createStore({
-    autoselect: !initialDirectory,
+    autoselect: !params.dir,
    busyWorkspaces: new Set<string>(),
    hoverSession: undefined as string | undefined,
    hoverProject: undefined as string | undefined,
@@ -180,21 +179,13 @@ export default function Layout(props: ParentProps) {

  const autoselecting = createMemo(() => {
    if (params.dir) return false
+    if (initialDir) return false
    if (!state.autoselect) return false
    if (!pageReady()) return true
    if (!layoutReady()) return true
    const list = layout.projects.list()
-    if (list.length > 0) return true
-    return !!server.projects.last()
-  })
-
-  createEffect(() => {
-    if (!state.autoselect) return
-    const dir = params.dir
-    if (!dir) return
-    const directory = decode64(dir)
-    if (!directory) return
-    setState("autoselect", false)
+    if (list.length === 0) return false
+    return true
  })

  const editorOpen = (id: string) => editor.active === id
@@ -507,7 +498,7 @@ export default function Layout(props: ParentProps) {
      const bUpdated = b.time.updated ?? b.time.created
      const aRecent = aUpdated > oneMinuteAgo
      const bRecent = bUpdated > oneMinuteAgo
-      if (aRecent && bRecent) return a.id < b.id ? -1 : a.id > b.id ? 1 : 0
+      if (aRecent && bRecent) return a.id.localeCompare(b.id)
      if (aRecent && !bRecent) return -1
      if (!aRecent && bRecent) return 1
      return bUpdated - aUpdated
@@ -574,18 +565,11 @@ export default function Layout(props: ParentProps) {
        if (!value.ready) return
        if (!value.layoutReady) return
        if (!state.autoselect) return
+        if (initialDir) return
        if (value.dir) return
+        if (value.list.length === 0) return

        const last = server.projects.last()
-
-        if (value.list.length === 0) {
-          if (!last) return
-          setState("autoselect", false)
-          openProject(last, false)
-          navigateToProject(last)
-          return
-        }
-
        const next = value.list.find((project) => project.worktree === last) ?? value.list[0]
        if (!next) return
        setState("autoselect", false)
@@ -754,7 +738,7 @@ export default function Layout(props: ParentProps) {
  }

  async function prefetchMessages(directory: string, sessionID: string, token: number) {
-    const [store, setStore] = globalSync.child(directory, { bootstrap: false })
+    const [, setStore] = globalSync.child(directory, { bootstrap: false })

    return retry(() => globalSDK.client.session.messages({ directory, sessionID, limit: prefetchChunk }))
      .then((messages) => {
@@ -765,49 +749,23 @@ export default function Layout(props: ParentProps) {
          .map((x) => x.info)
          .filter((m) => !!m?.id)
          .slice()
-          .sort((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))
-
-        const current = store.message[sessionID] ?? []
-        const merged = (() => {
-          if (current.length === 0) return next
-
-          const map = new Map<string, Message>()
-          for (const item of current) {
-            if (!item?.id) continue
-            map.set(item.id, item)
-          }
-          for (const item of next) {
-            map.set(item.id, item)
-          }
-          return [...map.values()].sort((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))
-        })()
+          .sort((a, b) => a.id.localeCompare(b.id))

        batch(() => {
-          setStore("message", sessionID, reconcile(merged, { key: "id" }))
+          setStore("message", sessionID, reconcile(next, { key: "id" }))

          for (const message of items) {
-            const currentParts = store.part[message.info.id] ?? []
-            const mergedParts = (() => {
-              if (currentParts.length === 0) {
-                return message.parts
+            setStore(
+              "part",
+              message.info.id,
+              reconcile(
+                message.parts
                  .filter((p) => !!p?.id)
                  .slice()
-                  .sort((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))
-              }
-
-              const map = new Map<string, (typeof currentParts)[number]>()
-              for (const item of currentParts) {
-                if (!item?.id) continue
-                map.set(item.id, item)
-              }
-              for (const item of message.parts) {
-                if (!item?.id) continue
-                map.set(item.id, item)
-              }
-              return [...map.values()].sort((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))
-            })()
-
-            setStore("part", message.info.id, reconcile(mergedParts, { key: "id" }))
+                  .sort((a, b) => a.id.localeCompare(b.id)),
+                { key: "id" },
+              ),
+            )
          }
        })
      })
@@ -1000,6 +958,69 @@ export default function Layout(props: ParentProps) {
    }
  }

+  async function deleteSession(session: Session) {
+    const [store, setStore] = globalSync.child(session.directory)
+    const sessions = (store.session ?? []).filter((s) => !s.parentID && !s.time?.archived)
+    const index = sessions.findIndex((s) => s.id === session.id)
+    const nextSession = sessions[index + 1] ?? sessions[index - 1]
+
+    const result = await globalSDK.client.session
+      .delete({ directory: session.directory, sessionID: session.id })
+      .then((x) => x.data)
+      .catch((err) => {
+        showToast({
+          title: language.t("session.delete.failed.title"),
+          description: errorMessage(err),
+        })
+        return false
+      })
+
+    if (!result) return
+
+    setStore(
+      produce((draft) => {
+        const removed = new Set<string>([session.id])
+
+        const byParent = new Map<string, string[]>()
+        for (const item of draft.session) {
+          const parentID = item.parentID
+          if (!parentID) continue
+          const existing = byParent.get(parentID)
+          if (existing) {
+            existing.push(item.id)
+            continue
+          }
+          byParent.set(parentID, [item.id])
+        }
+
+        const stack = [session.id]
+        while (stack.length) {
+          const parentID = stack.pop()
+          if (!parentID) continue
+
+          const children = byParent.get(parentID)
+          if (!children) continue
+
+          for (const child of children) {
+            if (removed.has(child)) continue
+            removed.add(child)
+            stack.push(child)
+          }
+        }
+
+        draft.session = draft.session.filter((s) => !removed.has(s.id))
+      }),
+    )
+
+    if (session.id === params.id) {
+      if (nextSession) {
+        navigate(`/${params.dir}/session/${nextSession.id}`)
+      } else {
+        navigate(`/${params.dir}/session`)
+      }
+    }
+  }
+
  command.register(() => {
    const commands: CommandOption[] = [
      {
@@ -1074,29 +1095,6 @@ export default function Layout(props: ParentProps) {
          if (session) archiveSession(session)
        },
      },
-      {
-        id: "workspace.toggle",
-        title: language.t("command.workspace.toggle"),
-        description: language.t("command.workspace.toggle.description"),
-        category: language.t("command.category.workspace"),
-        slash: "workspace",
-        disabled: !currentProject() || currentProject()?.vcs !== "git",
-        onSelect: () => {
-          const project = currentProject()
-          if (!project) return
-          if (project.vcs !== "git") return
-          const wasEnabled = layout.sidebar.workspaces(project.worktree)()
-          layout.sidebar.toggleWorkspaces(project.worktree)
-          showToast({
-            title: wasEnabled
-              ? language.t("toast.workspace.disabled.title")
-              : language.t("toast.workspace.enabled.title"),
-            description: wasEnabled
-              ? language.t("toast.workspace.disabled.description")
-              : language.t("toast.workspace.enabled.description"),
-          })
-        },
-      },
      {
        id: "theme.cycle",
        title: language.t("command.theme.cycle"),
@@ -1253,6 +1251,15 @@ export default function Layout(props: ParentProps) {
    globalSync.project.meta(project.worktree, { name })
  }

+  async function renameSession(session: Session, next: string) {
+    if (next === session.title) return
+    await globalSDK.client.session.update({
+      directory: session.directory,
+      sessionID: session.id,
+      title: next,
+    })
+  }
+
  const renameWorkspace = (directory: string, next: string, projectId?: string, branch?: string) => {
    const current = workspaceName(directory, projectId, branch) ?? branch ?? getFilename(directory)
    if (current === next) return
@@ -1403,6 +1410,33 @@ export default function Layout(props: ParentProps) {
    })
  }

+  function DialogDeleteSession(props: { session: Session }) {
+    const handleDelete = async () => {
+      await deleteSession(props.session)
+      dialog.close()
+    }
+
+    return (
+      <Dialog title={language.t("session.delete.title")} fit>
+        <div class="flex flex-col gap-4 pl-6 pr-2.5 pb-3">
+          <div class="flex flex-col gap-1">
+            <span class="text-14-regular text-text-strong">
+              {language.t("session.delete.confirm", { name: props.session.title })}
+            </span>
+          </div>
+          <div class="flex justify-end gap-2">
+            <Button variant="ghost" size="large" onClick={() => dialog.close()}>
+              {language.t("common.cancel")}
+            </Button>
+            <Button variant="primary" size="large" onClick={handleDelete}>
+              {language.t("session.delete.button")}
+            </Button>
+          </div>
+        </div>
+      </Dialog>
+    )
+  }
+
  function DialogDeleteWorkspace(props: { root: string; directory: string }) {
    const name = createMemo(() => getFilename(props.directory))
    const [data, setData] = createStore({
@@ -1756,6 +1790,10 @@ export default function Layout(props: ParentProps) {
    const hoverAllowed = createMemo(() => !props.mobile && sidebarExpanded())
    const hoverEnabled = createMemo(() => (props.popover ?? true) && hoverAllowed())
    const isActive = createMemo(() => props.session.id === params.id)
+    const [menu, setMenu] = createStore({
+      open: false,
+      pendingRename: false,
+    })

    const hoverPrefetch = { current: undefined as ReturnType<typeof setTimeout> | undefined }
    const cancelHoverPrefetch = () => {
@@ -1782,7 +1820,7 @@ export default function Layout(props: ParentProps) {
    const item = (
      <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 justify-between gap-3 min-w-0 text-left w-full focus:outline-none transition-[padding] ${menu.open ? "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"}`}
        onPointerEnter={scheduleHoverPrefetch}
        onPointerLeave={cancelHoverPrefetch}
        onMouseEnter={scheduleHoverPrefetch}
@@ -1814,9 +1852,14 @@ export default function Layout(props: ParentProps) {
              </Match>
            </Switch>
          </div>
-          <span class="text-14-regular text-text-strong grow-1 min-w-0 overflow-hidden text-ellipsis truncate">
-            {props.session.title}
-          </span>
+          <InlineEditor
+            id={`session:${props.session.id}`}
+            value={() => props.session.title}
+            onSave={(next) => renameSession(props.session, next)}
+            class="text-14-regular text-text-strong grow-1 min-w-0 overflow-hidden text-ellipsis truncate"
+            displayClass="text-14-regular text-text-strong grow-1 min-w-0 overflow-hidden text-ellipsis truncate"
+            stopPropagation
+          />
          <Show when={props.session.summary}>
            {(summary) => (
              <div class="group-hover/session:hidden group-active/session:hidden group-focus-within/session:hidden">
@@ -1864,10 +1907,7 @@ export default function Layout(props: ParentProps) {
                  getLabel={messageLabel}
                  onMessageSelect={(message) => {
                    if (!isActive()) {
-                      layout.pendingMessage.set(
-                        `${base64Encode(props.session.directory)}/${props.session.id}`,
-                        message.id,
-                      )
+                      sessionStorage.setItem("opencode.pendingMessage", `${props.session.id}|${message.id}`)
                      navigate(`${props.slug}/session/${props.session.id}`)
                      return
                    }
@@ -1884,25 +1924,49 @@ export default function Layout(props: ParentProps) {
        <div
          class={`absolute ${props.dense ? "top-0.5 right-0.5" : "top-1 right-1"} flex items-center gap-0.5 transition-opacity`}
          classList={{
-            "opacity-100 pointer-events-auto": !!props.mobile,
-            "opacity-0 pointer-events-none": !props.mobile,
+            "opacity-100 pointer-events-auto": menu.open,
+            "opacity-0 pointer-events-none": !menu.open,
            "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,
          }}
        >
-          <Tooltip value={language.t("common.archive")} placement="top">
-            <IconButton
-              icon="archive"
-              variant="ghost"
-              class="size-6 rounded-md"
-              aria-label={language.t("common.archive")}
-              onClick={(event) => {
-                event.preventDefault()
-                event.stopPropagation()
-                void archiveSession(props.session)
-              }}
-            />
-          </Tooltip>
+          <DropdownMenu modal={!sidebarHovering()} open={menu.open} onOpenChange={(open) => setMenu("open", open)}>
+            <Tooltip value={language.t("common.moreOptions")} placement="top">
+              <DropdownMenu.Trigger
+                as={IconButton}
+                icon="dot-grid"
+                variant="ghost"
+                class="size-6 rounded-md data-[expanded]:bg-surface-base-active"
+                aria-label={language.t("common.moreOptions")}
+              />
+            </Tooltip>
+            <DropdownMenu.Portal mount={!props.mobile ? state.nav : undefined}>
+              <DropdownMenu.Content
+                onCloseAutoFocus={(event) => {
+                  if (!menu.pendingRename) return
+                  event.preventDefault()
+                  setMenu("pendingRename", false)
+                  openEditor(`session:${props.session.id}`, props.session.title)
+                }}
+              >
+                <DropdownMenu.Item
+                  onSelect={() => {
+                    setMenu("pendingRename", true)
+                    setMenu("open", false)
+                  }}
+                >
+                  <DropdownMenu.ItemLabel>{language.t("common.rename")}</DropdownMenu.ItemLabel>
+                </DropdownMenu.Item>
+                <DropdownMenu.Item onSelect={() => archiveSession(props.session)}>
+                  <DropdownMenu.ItemLabel>{language.t("common.archive")}</DropdownMenu.ItemLabel>
+                </DropdownMenu.Item>
+                <DropdownMenu.Separator />
+                <DropdownMenu.Item onSelect={() => dialog.show(() => <DialogDeleteSession session={props.session} />)}>
+                  <DropdownMenu.ItemLabel>{language.t("common.delete")}</DropdownMenu.ItemLabel>
+                </DropdownMenu.Item>
+              </DropdownMenu.Content>
+            </DropdownMenu.Portal>
+          </DropdownMenu>
        </div>
      </div>
    )
@@ -2246,13 +2310,10 @@ export default function Layout(props: ParentProps) {
      () => props.project.vcs === "git" && layout.sidebar.workspaces(props.project.worktree)(),
    )
    const [open, setOpen] = createSignal(false)
-    const [menu, setMenu] = createSignal(false)

    const preview = createMemo(() => !props.mobile && layout.sidebar.opened())
    const overlay = createMemo(() => !props.mobile && !layout.sidebar.opened())
-    const active = createMemo(
-      () => menu() || (preview() ? open() : overlay() && state.hoverProject === props.project.worktree),
-    )
+    const active = createMemo(() => (preview() ? open() : overlay() && state.hoverProject === props.project.worktree))

    createEffect(() => {
      if (preview()) return
@@ -2290,95 +2351,50 @@ export default function Layout(props: ParentProps) {
    }

    const projectName = () => props.project.name || getFilename(props.project.worktree)
-    const Trigger = () => (
-      <ContextMenu
-        modal={!sidebarHovering()}
-        onOpenChange={(value) => {
-          setMenu(value)
-          if (value) setOpen(false)
+    const trigger = (
+      <button
+        type="button"
+        aria-label={projectName()}
+        data-action="project-switch"
+        data-project={base64Encode(props.project.worktree)}
+        classList={{
+          "flex items-center justify-center size-10 p-1 rounded-lg overflow-hidden transition-colors cursor-default": true,
+          "bg-transparent border-2 border-icon-strong-base hover:bg-surface-base-hover": selected(),
+          "bg-transparent border border-transparent hover:bg-surface-base-hover hover:border-border-weak-base":
+            !selected() && !active(),
+          "bg-surface-base-hover border border-border-weak-base": !selected() && active(),
        }}
+        onMouseEnter={() => {
+          if (!overlay()) return
+          globalSync.child(props.project.worktree)
+          setState("hoverProject", props.project.worktree)
+          setState("hoverSession", undefined)
+        }}
+        onFocus={() => {
+          if (!overlay()) return
+          globalSync.child(props.project.worktree)
+          setState("hoverProject", props.project.worktree)
+          setState("hoverSession", undefined)
+        }}
+        onClick={() => navigateToProject(props.project.worktree)}
+        onBlur={() => setOpen(false)}
      >
-        <ContextMenu.Trigger
-          as="button"
-          type="button"
-          aria-label={projectName()}
-          data-action="project-switch"
-          data-project={base64Encode(props.project.worktree)}
-          classList={{
-            "flex items-center justify-center size-10 p-1 rounded-lg overflow-hidden transition-colors cursor-default": true,
-            "bg-transparent border-2 border-icon-strong-base hover:bg-surface-base-hover": selected(),
-            "bg-transparent border border-transparent hover:bg-surface-base-hover hover:border-border-weak-base":
-              !selected() && !active(),
-            "bg-surface-base-hover border border-border-weak-base": !selected() && active(),
-          }}
-          onMouseEnter={() => {
-            if (!overlay()) return
-            globalSync.child(props.project.worktree)
-            setState("hoverProject", props.project.worktree)
-            setState("hoverSession", undefined)
-          }}
-          onFocus={() => {
-            if (!overlay()) return
-            globalSync.child(props.project.worktree)
-            setState("hoverProject", props.project.worktree)
-            setState("hoverSession", undefined)
-          }}
-          onClick={() => navigateToProject(props.project.worktree)}
-          onBlur={() => setOpen(false)}
-        >
-          <ProjectIcon project={props.project} notify />
-        </ContextMenu.Trigger>
-        <ContextMenu.Portal mount={!props.mobile ? state.nav : undefined}>
-          <ContextMenu.Content>
-            <ContextMenu.Item onSelect={() => dialog.show(() => <DialogEditProject project={props.project} />)}>
-              <ContextMenu.ItemLabel>{language.t("common.edit")}</ContextMenu.ItemLabel>
-            </ContextMenu.Item>
-            <ContextMenu.Item
-              data-action="project-workspaces-toggle"
-              data-project={base64Encode(props.project.worktree)}
-              disabled={props.project.vcs !== "git" && !layout.sidebar.workspaces(props.project.worktree)()}
-              onSelect={() => {
-                const enabled = layout.sidebar.workspaces(props.project.worktree)()
-                if (enabled) {
-                  layout.sidebar.toggleWorkspaces(props.project.worktree)
-                  return
-                }
-                if (props.project.vcs !== "git") return
-                layout.sidebar.toggleWorkspaces(props.project.worktree)
-              }}
-            >
-              <ContextMenu.ItemLabel>
-                {layout.sidebar.workspaces(props.project.worktree)()
-                  ? language.t("sidebar.workspaces.disable")
-                  : language.t("sidebar.workspaces.enable")}
-              </ContextMenu.ItemLabel>
-            </ContextMenu.Item>
-            <ContextMenu.Separator />
-            <ContextMenu.Item
-              data-action="project-close-menu"
-              data-project={base64Encode(props.project.worktree)}
-              onSelect={() => closeProject(props.project.worktree)}
-            >
-              <ContextMenu.ItemLabel>{language.t("common.close")}</ContextMenu.ItemLabel>
-            </ContextMenu.Item>
-          </ContextMenu.Content>
-        </ContextMenu.Portal>
-      </ContextMenu>
+        <ProjectIcon project={props.project} notify />
+      </button>
    )

    return (
      // @ts-ignore
      <div use:sortable classList={{ "opacity-30": sortable.isActiveDraggable }}>
-        <Show when={preview()} fallback={<Trigger />}>
+        <Show when={preview()} fallback={trigger}>
          <HoverCard
-            open={open() && !menu()}
+            open={open()}
            openDelay={0}
            closeDelay={0}
            placement="right-start"
            gutter={6}
-            trigger={<Trigger />}
+            trigger={trigger}
            onOpenChange={(value) => {
-              if (menu()) return
              setOpen(value)
              if (value) setState("hoverSession", undefined)
            }}
@@ -2599,7 +2615,7 @@ export default function Layout(props: ParentProps) {
        }}
        style={{ width: panelProps.mobile ? undefined : `${Math.max(layout.sidebar.width() - 64, 0)}px` }}
      >
-        <Show when={panelProps.project}>
+        <Show when={panelProps.project} keyed>
          {(p) => (
            <>
              <div class="shrink-0 px-2 py-1">
@@ -2608,7 +2624,7 @@ export default function Layout(props: ParentProps) {
                    <InlineEditor
                      id={`project:${projectId()}`}
                      value={projectName}
-                      onSave={(next) => renameProject(p(), next)}
+                      onSave={(next) => renameProject(p, next)}
                      class="text-16-medium text-text-strong truncate"
                      displayClass="text-16-medium text-text-strong truncate"
                      stopPropagation
@@ -2617,7 +2633,7 @@ export default function Layout(props: ParentProps) {
                    <Tooltip
                      placement="bottom"
                      gutter={2}
-                      value={p().worktree}
+                      value={p.worktree}
                      class="shrink-0"
                      contentStyle={{
                        "max-width": "640px",
@@ -2625,7 +2641,7 @@ export default function Layout(props: ParentProps) {
                      }}
                    >
                      <span class="text-12-regular text-text-base truncate select-text">
-                        {p().worktree.replace(homedir(), "~")}
+                        {p.worktree.replace(homedir(), "~")}
                      </span>
                    </Tooltip>
                  </div>
@@ -2636,31 +2652,31 @@ export default function Layout(props: ParentProps) {
                      icon="dot-grid"
                      variant="ghost"
                      data-action="project-menu"
-                      data-project={base64Encode(p().worktree)}
+                      data-project={base64Encode(p.worktree)}
                      class="shrink-0 size-6 rounded-md opacity-0 group-hover/project:opacity-100 data-[expanded]:opacity-100 data-[expanded]:bg-surface-base-active"
                      aria-label={language.t("common.moreOptions")}
                    />
                    <DropdownMenu.Portal mount={!panelProps.mobile ? state.nav : undefined}>
                      <DropdownMenu.Content class="mt-1">
-                        <DropdownMenu.Item onSelect={() => dialog.show(() => <DialogEditProject project={p()} />)}>
+                        <DropdownMenu.Item onSelect={() => dialog.show(() => <DialogEditProject project={p} />)}>
                          <DropdownMenu.ItemLabel>{language.t("common.edit")}</DropdownMenu.ItemLabel>
                        </DropdownMenu.Item>
                        <DropdownMenu.Item
                          data-action="project-workspaces-toggle"
-                          data-project={base64Encode(p().worktree)}
-                          disabled={p().vcs !== "git" && !layout.sidebar.workspaces(p().worktree)()}
+                          data-project={base64Encode(p.worktree)}
+                          disabled={p.vcs !== "git" && !layout.sidebar.workspaces(p.worktree)()}
                          onSelect={() => {
-                            const enabled = layout.sidebar.workspaces(p().worktree)()
+                            const enabled = layout.sidebar.workspaces(p.worktree)()
                            if (enabled) {
-                              layout.sidebar.toggleWorkspaces(p().worktree)
+                              layout.sidebar.toggleWorkspaces(p.worktree)
                              return
                            }
-                            if (p().vcs !== "git") return
-                            layout.sidebar.toggleWorkspaces(p().worktree)
+                            if (p.vcs !== "git") return
+                            layout.sidebar.toggleWorkspaces(p.worktree)
                          }}
                        >
                          <DropdownMenu.ItemLabel>
-                            {layout.sidebar.workspaces(p().worktree)()
+                            {layout.sidebar.workspaces(p.worktree)()
                              ? language.t("sidebar.workspaces.disable")
                              : language.t("sidebar.workspaces.enable")}
                          </DropdownMenu.ItemLabel>
@@ -2668,8 +2684,8 @@ export default function Layout(props: ParentProps) {
                        <DropdownMenu.Separator />
                        <DropdownMenu.Item
                          data-action="project-close-menu"
-                          data-project={base64Encode(p().worktree)}
-                          onSelect={() => closeProject(p().worktree)}
+                          data-project={base64Encode(p.worktree)}
+                          onSelect={() => closeProject(p.worktree)}
                        >
                          <DropdownMenu.ItemLabel>{language.t("common.close")}</DropdownMenu.ItemLabel>
                        </DropdownMenu.Item>
@@ -2679,109 +2695,103 @@ export default function Layout(props: ParentProps) {
                </div>
              </div>

-              <div class="flex-1 min-h-0 flex flex-col">
-                <Show
-                  when={workspacesEnabled()}
-                  fallback={
-                    <>
-                      <div class="shrink-0 py-4 px-3">
-                        <TooltipKeybind
-                          title={language.t("command.session.new")}
-                          keybind={command.keybind("session.new")}
-                          placement="top"
-                        >
-                          <Button
-                            size="large"
-                            icon="plus-small"
-                            class="w-full"
-                            onClick={() => {
-                              if (!layout.sidebar.opened()) {
-                                setState("hoverSession", undefined)
-                                setState("hoverProject", undefined)
-                              }
-                              navigate(`/${base64Encode(p().worktree)}/session`)
-                              layout.mobileSidebar.hide()
-                            }}
-                          >
-                            {language.t("command.session.new")}
-                          </Button>
-                        </TooltipKeybind>
-                      </div>
-                      <div class="flex-1 min-h-0">
-                        <LocalWorkspace project={p()} mobile={panelProps.mobile} />
-                      </div>
-                    </>
-                  }
-                >
+              <Show
+                when={workspacesEnabled()}
+                fallback={
                  <>
-                    <div class="shrink-0 py-4 px-3">
+                    <div class="py-4 px-3">
                      <TooltipKeybind
-                        title={language.t("workspace.new")}
-                        keybind={command.keybind("workspace.new")}
+                        title={language.t("command.session.new")}
+                        keybind={command.keybind("session.new")}
                        placement="top"
                      >
-                        <Button size="large" icon="plus-small" class="w-full" onClick={() => createWorkspace(p())}>
-                          {language.t("workspace.new")}
+                        <Button
+                          size="large"
+                          icon="plus-small"
+                          class="w-full"
+                          onClick={() => {
+                            if (!layout.sidebar.opened()) {
+                              setState("hoverSession", undefined)
+                              setState("hoverProject", undefined)
+                            }
+                            navigate(`/${base64Encode(p.worktree)}/session`)
+                            layout.mobileSidebar.hide()
+                          }}
+                        >
+                          {language.t("command.session.new")}
                        </Button>
                      </TooltipKeybind>
                    </div>
-                    <div class="relative flex-1 min-h-0">
-                      <DragDropProvider
-                        onDragStart={handleWorkspaceDragStart}
-                        onDragEnd={handleWorkspaceDragEnd}
-                        onDragOver={handleWorkspaceDragOver}
-                        collisionDetector={closestCenter}
-                      >
-                        <DragDropSensors />
-                        <ConstrainDragXAxis />
-                        <div
-                          ref={(el) => {
-                            if (!panelProps.mobile) scrollContainerRef = el
-                          }}
-                          class="size-full flex flex-col py-2 gap-4 overflow-y-auto no-scrollbar [overflow-anchor:none]"
-                        >
-                          <SortableProvider ids={workspaces()}>
-                            <For each={workspaces()}>
-                              {(directory) => (
-                                <SortableWorkspace directory={directory} project={p()} mobile={panelProps.mobile} />
-                              )}
-                            </For>
-                          </SortableProvider>
-                        </div>
-                        <DragOverlay>
-                          <WorkspaceDragOverlay />
-                        </DragOverlay>
-                      </DragDropProvider>
+                    <div class="flex-1 min-h-0">
+                      <LocalWorkspace project={p} mobile={panelProps.mobile} />
                    </div>
                  </>
-                </Show>
-              </div>
+                }
+              >
+                <>
+                  <div class="py-4 px-3">
+                    <TooltipKeybind
+                      title={language.t("workspace.new")}
+                      keybind={command.keybind("workspace.new")}
+                      placement="top"
+                    >
+                      <Button size="large" icon="plus-small" class="w-full" onClick={() => createWorkspace(p)}>
+                        {language.t("workspace.new")}
+                      </Button>
+                    </TooltipKeybind>
+                  </div>
+                  <div class="relative flex-1 min-h-0">
+                    <DragDropProvider
+                      onDragStart={handleWorkspaceDragStart}
+                      onDragEnd={handleWorkspaceDragEnd}
+                      onDragOver={handleWorkspaceDragOver}
+                      collisionDetector={closestCenter}
+                    >
+                      <DragDropSensors />
+                      <ConstrainDragXAxis />
+                      <div
+                        ref={(el) => {
+                          if (!panelProps.mobile) scrollContainerRef = el
+                        }}
+                        class="size-full flex flex-col py-2 gap-4 overflow-y-auto no-scrollbar [overflow-anchor:none]"
+                      >
+                        <SortableProvider ids={workspaces()}>
+                          <For each={workspaces()}>
+                            {(directory) => (
+                              <SortableWorkspace directory={directory} project={p} mobile={panelProps.mobile} />
+                            )}
+                          </For>
+                        </SortableProvider>
+                      </div>
+                      <DragOverlay>
+                        <WorkspaceDragOverlay />
+                      </DragOverlay>
+                    </DragDropProvider>
+                  </div>
+                </>
+              </Show>
            </>
          )}
        </Show>
-
-        <div
-          class="shrink-0 px-2 py-3 border-t border-border-weak-base"
-          classList={{
-            hidden: !(providers.all().length > 0 && providers.paid().length === 0),
-          }}
-        >
-          <div class="rounded-md bg-background-base shadow-xs-border-base">
-            <div class="p-3 flex flex-col gap-2">
-              <div class="text-12-medium text-text-strong">{language.t("sidebar.gettingStarted.title")}</div>
-              <div class="text-text-base">{language.t("sidebar.gettingStarted.line1")}</div>
-              <div class="text-text-base">{language.t("sidebar.gettingStarted.line2")}</div>
+        <Show when={providers.all().length > 0 && providers.paid().length === 0}>
+          <div class="shrink-0 px-2 py-3 border-t border-border-weak-base">
+            <div class="rounded-md bg-background-base shadow-xs-border-base">
+              <div class="p-3 flex flex-col gap-2">
+                <div class="text-12-medium text-text-strong">{language.t("sidebar.gettingStarted.title")}</div>
+                <div class="text-text-base">{language.t("sidebar.gettingStarted.line1")}</div>
+                <div class="text-text-base">{language.t("sidebar.gettingStarted.line2")}</div>
+              </div>
+              <Button
+                class="flex w-full text-left justify-start text-12-medium text-text-strong stroke-[1.5px] rounded-md rounded-t-none shadow-none border-t border-border-weak-base px-3"
+                size="large"
+                icon="plus"
+                onClick={connectProvider}
+              >
+                {language.t("command.provider.connect")}
+              </Button>
            </div>
-            <Button
-              class="flex w-full text-left justify-start text-12-medium text-text-strong stroke-[1.5px] rounded-md rounded-t-none shadow-none border-t border-border-weak-base px-3"
-              size="large"
-              icon="plus"
-              onClick={connectProvider}
-            >
-              {language.t("command.provider.connect")}
-            </Button>
          </div>
-        </div>
+        </Show>
      </div>
    )
  }
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -16,16 +16,13 @@ import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { Dynamic } from "solid-js/web"
 import { useLocal } from "@/context/local"
 import { selectionFromLines, useFile, type FileSelection, type SelectedLineRange } from "@/context/file"
-import { createStore, produce } from "solid-js/store"
+import { createStore } from "solid-js/store"
 import { PromptInput } from "@/components/prompt-input"
 import { SessionContextUsage } from "@/components/session-context-usage"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Button } from "@opencode-ai/ui/button"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Tooltip, TooltipKeybind } from "@opencode-ai/ui/tooltip"
-import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
-import { Dialog } from "@opencode-ai/ui/dialog"
-import { InlineInput } from "@opencode-ai/ui/inline-input"
 import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { useCodeComponent } from "@opencode-ai/ui/context/code"
@@ -76,31 +73,10 @@ import { same } from "@/utils/same"

 type DiffStyle = "unified" | "split"

-type HandoffSession = {
-  prompt: string
-  files: Record<string, SelectedLineRange | null>
-}
-
-const HANDOFF_MAX = 40
-
 const handoff = {
-  session: new Map<string, HandoffSession>(),
-  terminal: new Map<string, string[]>(),
-}
-
-const touch = <K, V>(map: Map<K, V>, key: K, value: V) => {
-  map.delete(key)
-  map.set(key, value)
-  while (map.size > HANDOFF_MAX) {
-    const first = map.keys().next().value
-    if (first === undefined) return
-    map.delete(first)
-  }
-}
-
-const setSessionHandoff = (key: string, patch: Partial<HandoffSession>) => {
-  const prev = handoff.session.get(key) ?? { prompt: "", files: {} }
-  touch(handoff.session, key, { ...prev, ...patch })
+  prompt: "",
+  terminals: [] as string[],
+  files: {} as Record<string, SelectedLineRange | null>,
 }

 interface SessionReviewTabProps {
@@ -304,47 +280,9 @@ export default function Page() {
      .finally(() => setUi("responding", false))
  }
  const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
-  const workspaceKey = createMemo(() => params.dir ?? "")
-  const workspaceTabs = createMemo(() => layout.tabs(workspaceKey))
  const tabs = createMemo(() => layout.tabs(sessionKey))
  const view = createMemo(() => layout.view(sessionKey))

-  createEffect(
-    on(
-      () => params.id,
-      (id, prev) => {
-        if (!id) return
-        if (prev) return
-
-        const pending = layout.handoff.tabs()
-        if (!pending) return
-        if (Date.now() - pending.at > 60_000) {
-          layout.handoff.clearTabs()
-          return
-        }
-
-        if (pending.id !== id) return
-        layout.handoff.clearTabs()
-        if (pending.dir !== (params.dir ?? "")) return
-
-        const from = workspaceTabs().tabs()
-        if (from.all.length === 0 && !from.active) return
-
-        const current = tabs().tabs()
-        if (current.all.length > 0 || current.active) return
-
-        const all = normalizeTabs(from.all)
-        const active = from.active ? normalizeTab(from.active) : undefined
-        tabs().setAll(all)
-        tabs().setActive(active && all.includes(active) ? active : all[0])
-
-        workspaceTabs().setAll([])
-        workspaceTabs().setActive(undefined)
-      },
-      { defer: true },
-    ),
-  )
-
  if (import.meta.env.DEV) {
    createEffect(
      on(
@@ -460,213 +398,6 @@ export default function Page() {
    if (!id) return false
    return sync.session.history.loading(id)
  })
-
-  const [title, setTitle] = createStore({
-    draft: "",
-    editing: false,
-    saving: false,
-    menuOpen: false,
-    pendingRename: false,
-  })
-  let titleRef: HTMLInputElement | undefined
-
-  const errorMessage = (err: unknown) => {
-    if (err && typeof err === "object" && "data" in err) {
-      const data = (err as { data?: { message?: string } }).data
-      if (data?.message) return data.message
-    }
-    if (err instanceof Error) return err.message
-    return language.t("common.requestFailed")
-  }
-
-  createEffect(
-    on(
-      () => params.id,
-      () => setTitle({ draft: "", editing: false, saving: false, menuOpen: false, pendingRename: false }),
-      { defer: true },
-    ),
-  )
-
-  const openTitleEditor = () => {
-    if (!params.id) return
-    setTitle({ editing: true, draft: info()?.title ?? "" })
-    requestAnimationFrame(() => {
-      titleRef?.focus()
-      titleRef?.select()
-    })
-  }
-
-  const closeTitleEditor = () => {
-    if (title.saving) return
-    setTitle({ editing: false, saving: false })
-  }
-
-  const saveTitleEditor = async () => {
-    const sessionID = params.id
-    if (!sessionID) return
-    if (title.saving) return
-
-    const next = title.draft.trim()
-    if (!next || next === (info()?.title ?? "")) {
-      setTitle({ editing: false, saving: false })
-      return
-    }
-
-    setTitle("saving", true)
-    await sdk.client.session
-      .update({ sessionID, title: next })
-      .then(() => {
-        sync.set(
-          produce((draft) => {
-            const index = draft.session.findIndex((s) => s.id === sessionID)
-            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),
-        })
-      })
-  }
-
-  async function archiveSession(sessionID: string) {
-    const session = sync.session.get(sessionID)
-    if (!session) return
-
-    const sessions = sync.data.session ?? []
-    const index = sessions.findIndex((s) => s.id === sessionID)
-    const nextSession = index === -1 ? undefined : (sessions[index + 1] ?? sessions[index - 1])
-
-    await sdk.client.session
-      .update({ sessionID, time: { archived: Date.now() } })
-      .then(() => {
-        sync.set(
-          produce((draft) => {
-            const index = draft.session.findIndex((s) => s.id === sessionID)
-            if (index !== -1) draft.session.splice(index, 1)
-          }),
-        )
-
-        if (params.id !== sessionID) return
-        if (session.parentID) {
-          navigate(`/${params.dir}/session/${session.parentID}`)
-          return
-        }
-        if (nextSession) {
-          navigate(`/${params.dir}/session/${nextSession.id}`)
-          return
-        }
-        navigate(`/${params.dir}/session`)
-      })
-      .catch((err) => {
-        showToast({
-          title: language.t("common.requestFailed"),
-          description: errorMessage(err),
-        })
-      })
-  }
-
-  async function deleteSession(sessionID: string) {
-    const session = sync.session.get(sessionID)
-    if (!session) return false
-
-    const sessions = (sync.data.session ?? []).filter((s) => !s.parentID && !s.time?.archived)
-    const index = sessions.findIndex((s) => s.id === sessionID)
-    const nextSession = index === -1 ? undefined : (sessions[index + 1] ?? sessions[index - 1])
-
-    const result = await sdk.client.session
-      .delete({ sessionID })
-      .then((x) => x.data)
-      .catch((err) => {
-        showToast({
-          title: language.t("session.delete.failed.title"),
-          description: errorMessage(err),
-        })
-        return false
-      })
-
-    if (!result) return false
-
-    sync.set(
-      produce((draft) => {
-        const removed = new Set<string>([sessionID])
-
-        const byParent = new Map<string, string[]>()
-        for (const item of draft.session) {
-          const parentID = item.parentID
-          if (!parentID) continue
-          const existing = byParent.get(parentID)
-          if (existing) {
-            existing.push(item.id)
-            continue
-          }
-          byParent.set(parentID, [item.id])
-        }
-
-        const stack = [sessionID]
-        while (stack.length) {
-          const parentID = stack.pop()
-          if (!parentID) continue
-
-          const children = byParent.get(parentID)
-          if (!children) continue
-
-          for (const child of children) {
-            if (removed.has(child)) continue
-            removed.add(child)
-            stack.push(child)
-          }
-        }
-
-        draft.session = draft.session.filter((s) => !removed.has(s.id))
-      }),
-    )
-
-    if (params.id !== sessionID) return true
-    if (session.parentID) {
-      navigate(`/${params.dir}/session/${session.parentID}`)
-      return true
-    }
-    if (nextSession) {
-      navigate(`/${params.dir}/session/${nextSession.id}`)
-      return true
-    }
-    navigate(`/${params.dir}/session`)
-    return true
-  }
-
-  function DialogDeleteSession(props: { sessionID: string }) {
-    const title = createMemo(() => sync.session.get(props.sessionID)?.title ?? language.t("command.session.new"))
-    const handleDelete = async () => {
-      await deleteSession(props.sessionID)
-      dialog.close()
-    }
-
-    return (
-      <Dialog title={language.t("session.delete.title")} fit>
-        <div class="flex flex-col gap-4 pl-6 pr-2.5 pb-3">
-          <div class="flex flex-col gap-1">
-            <span class="text-14-regular text-text-strong">
-              {language.t("session.delete.confirm", { name: title() })}
-            </span>
-          </div>
-          <div class="flex justify-end gap-2">
-            <Button variant="ghost" size="large" onClick={() => dialog.close()}>
-              {language.t("common.cancel")}
-            </Button>
-            <Button variant="primary" size="large" onClick={handleDelete}>
-              {language.t("session.delete.button")}
-            </Button>
-          </div>
-        </div>
-      </Dialog>
-    )
-  }
-
  const emptyUserMessages: UserMessage[] = []
  const userMessages = createMemo(
    () => messages().filter((m) => m.role === "user") as UserMessage[],
@@ -769,7 +500,9 @@ export default function Page() {
    const out = new Map<string, "add" | "del" | "mix">()
    for (const diff of diffs()) {
      const file = normalize(diff.file)
-      const kind = diff.status === "added" ? "add" : diff.status === "deleted" ? "del" : "mix"
+      const add = diff.additions > 0
+      const del = diff.deletions > 0
+      const kind = add && del ? "mix" : add ? "add" : del ? "del" : "mix"

      out.set(file, kind)

@@ -814,10 +547,8 @@ export default function Page() {
  const hasScrollGesture = () => Date.now() - ui.scrollGesture < scrollGestureWindowMs

  createEffect(() => {
-    sdk.directory
-    const id = params.id
-    if (!id) return
-    sync.session.sync(id)
+    if (!params.id) return
+    sync.session.sync(params.id)
  })

  createEffect(() => {
@@ -885,22 +616,10 @@ export default function Page() {

  createEffect(
    on(
-      sessionKey,
+      () => params.id,
      () => {
        setStore("messageId", undefined)
        setStore("expanded", {})
-        setUi("autoCreated", false)
-      },
-      { defer: true },
-    ),
-  )
-
-  createEffect(
-    on(
-      () => params.dir,
-      (dir) => {
-        if (!dir) return
-        setStore("newSessionWorktree", "main")
      },
      { defer: true },
    ),
@@ -964,7 +683,7 @@ export default function Page() {
    {
      id: "file.open",
      title: language.t("command.file.open"),
-      description: language.t("palette.search.placeholder"),
+      description: language.t("command.file.open.description"),
      category: language.t("command.category.file"),
      keybind: "mod+p",
      slash: "open",
@@ -1408,15 +1127,12 @@ export default function Page() {
    activeDiff: undefined as string | undefined,
  })

-  createEffect(
-    on(
-      sessionKey,
-      () => {
-        setTree({ reviewScroll: undefined, pendingDiff: undefined, activeDiff: undefined })
-      },
-      { defer: true },
-    ),
-  )
+  const reviewScroll = () => tree.reviewScroll
+  const setReviewScroll = (value: HTMLDivElement | undefined) => setTree("reviewScroll", value)
+  const pendingDiff = () => tree.pendingDiff
+  const setPendingDiff = (value: string | undefined) => setTree("pendingDiff", value)
+  const activeDiff = () => tree.activeDiff
+  const setActiveDiff = (value: string | undefined) => setTree("activeDiff", value)

  const showAllFiles = () => {
    if (fileTreeTab() !== "changes") return
@@ -1437,8 +1153,8 @@ export default function Page() {
                view={view}
                diffStyle={layout.review.diffStyle()}
                onDiffStyleChange={layout.review.setDiffStyle}
-                onScrollRef={(el) => setTree("reviewScroll", el)}
-                focusedFile={tree.activeDiff}
+                onScrollRef={setReviewScroll}
+                focusedFile={activeDiff()}
                onLineComment={(comment) => addCommentToContext({ ...comment, origin: "review" })}
                comments={comments.all()}
                focusedComment={comments.focus()}
@@ -1488,7 +1204,7 @@ export default function Page() {
  }

  const reviewDiffTop = (path: string) => {
-    const root = tree.reviewScroll
+    const root = reviewScroll()
    if (!root) return

    const id = reviewDiffId(path)
@@ -1504,7 +1220,7 @@ export default function Page() {
  }

  const scrollToReviewDiff = (path: string) => {
-    const root = tree.reviewScroll
+    const root = reviewScroll()
    if (!root) return false

    const top = reviewDiffTop(path)
@@ -1518,23 +1234,24 @@ export default function Page() {
  const focusReviewDiff = (path: string) => {
    const current = view().review.open() ?? []
    if (!current.includes(path)) view().review.setOpen([...current, path])
-    setTree({ activeDiff: path, pendingDiff: path })
+    setActiveDiff(path)
+    setPendingDiff(path)
  }

  createEffect(() => {
-    const pending = tree.pendingDiff
+    const pending = pendingDiff()
    if (!pending) return
-    if (!tree.reviewScroll) return
+    if (!reviewScroll()) return
    if (!diffsReady()) return

    const attempt = (count: number) => {
-      if (tree.pendingDiff !== pending) return
+      if (pendingDiff() !== pending) return
      if (count > 60) {
-        setTree("pendingDiff", undefined)
+        setPendingDiff(undefined)
        return
      }

-      const root = tree.reviewScroll
+      const root = reviewScroll()
      if (!root) {
        requestAnimationFrame(() => attempt(count + 1))
        return
@@ -1552,7 +1269,7 @@ export default function Page() {
      }

      if (Math.abs(root.scrollTop - top) <= 1) {
-        setTree("pendingDiff", undefined)
+        setPendingDiff(undefined)
        return
      }

@@ -1595,17 +1312,13 @@ export default function Page() {
    void sync.session.diff(id)
  })

-  let treeDir: string | undefined
  createEffect(() => {
-    const dir = sdk.directory
    if (!isDesktop()) return
    if (!layout.fileTree.opened()) return
    if (sync.status === "loading") return

    fileTreeTab()
-    const refresh = treeDir !== dir
-    treeDir = dir
-    void (refresh ? file.tree.refresh("") : file.tree.list(""))
+    void file.tree.list("")
  })

  const autoScroll = createAutoScroll({
@@ -1640,18 +1353,6 @@ export default function Page() {
  let scrollSpyFrame: number | undefined
  let scrollSpyTarget: HTMLDivElement | undefined

-  createEffect(
-    on(
-      sessionKey,
-      () => {
-        if (scrollSpyFrame !== undefined) cancelAnimationFrame(scrollSpyFrame)
-        scrollSpyFrame = undefined
-        scrollSpyTarget = undefined
-      },
-      { defer: true },
-    ),
-  )
-
  const anchor = (id: string) => `message-${id}`

  const setScrollRef = (el: HTMLDivElement | undefined) => {
@@ -1766,14 +1467,20 @@ export default function Page() {
    window.history.replaceState(null, "", `#${anchor(id)}`)
  }

-  createEffect(
-    on(sessionKey, (key) => {
-      if (!params.id) return
-      const messageID = layout.pendingMessage.consume(key)
-      if (!messageID) return
-      setUi("pendingMessage", messageID)
-    }),
-  )
+  createEffect(() => {
+    const sessionID = params.id
+    if (!sessionID) return
+    const raw = sessionStorage.getItem("opencode.pendingMessage")
+    if (!raw) return
+    const parts = raw.split("|")
+    const pendingSessionID = parts[0]
+    const messageID = parts[1]
+    if (!pendingSessionID || !messageID) return
+    if (pendingSessionID !== sessionID) return
+
+    sessionStorage.removeItem("opencode.pendingMessage")
+    setUi("pendingMessage", messageID)
+  })

  const scrollToElement = (el: HTMLElement, behavior: ScrollBehavior) => {
    const root = scroller
@@ -1987,7 +1694,7 @@ export default function Page() {

  createEffect(() => {
    if (!prompt.ready()) return
-    setSessionHandoff(sessionKey(), { prompt: previewPrompt() })
+    handoff.prompt = previewPrompt()
  })

  createEffect(() => {
@@ -2007,22 +1714,20 @@ export default function Page() {
      return language.t("terminal.title")
    }

-    touch(handoff.terminal, params.dir!, terminal.all().map(label))
+    handoff.terminals = terminal.all().map(label)
  })

  createEffect(() => {
    if (!file.ready()) return
-    setSessionHandoff(sessionKey(), {
-      files: Object.fromEntries(
-        tabs()
-          .all()
-          .flatMap((tab) => {
-            const path = file.pathFromTab(tab)
-            if (!path) return []
-            return [[path, file.selectedLines(path) ?? null] as const]
-          }),
-      ),
-    })
+    handoff.files = Object.fromEntries(
+      tabs()
+        .all()
+        .flatMap((tab) => {
+          const path = file.pathFromTab(tab)
+          if (!path) return []
+          return [[path, file.selectedLines(path) ?? null] as const]
+        }),
+    )
  })

  onCleanup(() => {
@@ -2068,7 +1773,7 @@ export default function Page() {
        <div
          classList={{
            "@container relative shrink-0 flex flex-col min-h-0 h-full bg-background-stronger": true,
-            "flex-1 pt-2 md:pt-3": true,
+            "flex-1 pt-6 md:pt-3": true,
            "md:flex-none": layout.fileTree.opened(),
          }}
          style={{
@@ -2098,7 +1803,7 @@ export default function Page() {
                                diffs={diffs}
                                view={view}
                                diffStyle="unified"
-                                focusedFile={tree.activeDiff}
+                                focusedFile={activeDiff()}
                                onLineComment={(comment) => addCommentToContext({ ...comment, origin: "review" })}
                                comments={comments.all()}
                                focusedComment={comments.focus()}
@@ -2247,112 +1952,24 @@ export default function Page() {
                              "sticky top-0 z-30 bg-background-stronger": true,
                              "w-full": true,
                              "px-4 md:px-6": true,
-                              "md:max-w-200 md:mx-auto 3xl:max-w-[1200px] 4xl:max-w-[1600px] 5xl:max-w-[1900px]":
+                              "md:max-w-200 md:mx-auto 3xl:max-w-[1200px] 3xl:mx-auto 4xl:max-w-[1600px] 4xl:mx-auto 5xl:max-w-[1900px] 5xl:mx-auto":
                                centered(),
                            }}
                          >
-                            <div class="h-10 w-full flex items-center justify-between gap-2">
-                              <div class="flex items-center gap-1 min-w-0 flex-1">
-                                <Show when={info()?.parentID}>
-                                  <IconButton
-                                    tabIndex={-1}
-                                    icon="arrow-left"
-                                    variant="ghost"
-                                    onClick={() => {
-                                      navigate(`/${params.dir}/session/${info()?.parentID}`)
-                                    }}
-                                    aria-label={language.t("common.goBack")}
-                                  />
-                                </Show>
-                                <Show when={info()?.title || title.editing}>
-                                  <Show
-                                    when={title.editing}
-                                    fallback={
-                                      <h1
-                                        class="text-16-medium text-text-strong truncate min-w-0"
-                                        onDblClick={openTitleEditor}
-                                      >
-                                        {info()?.title}
-                                      </h1>
-                                    }
-                                  >
-                                    <InlineInput
-                                      ref={(el) => {
-                                        titleRef = el
-                                      }}
-                                      value={title.draft}
-                                      disabled={title.saving}
-                                      class="text-16-medium text-text-strong grow-1 min-w-0"
-                                      onInput={(event) => setTitle("draft", event.currentTarget.value)}
-                                      onKeyDown={(event) => {
-                                        event.stopPropagation()
-                                        if (event.key === "Enter") {
-                                          event.preventDefault()
-                                          void saveTitleEditor()
-                                          return
-                                        }
-                                        if (event.key === "Escape") {
-                                          event.preventDefault()
-                                          closeTitleEditor()
-                                        }
-                                      }}
-                                      onBlur={() => closeTitleEditor()}
-                                    />
-                                  </Show>
-                                </Show>
-                              </div>
-                              <Show when={params.id}>
-                                {(id) => (
-                                  <div class="shrink-0 flex items-center">
-                                    <DropdownMenu
-                                      open={title.menuOpen}
-                                      onOpenChange={(open) => setTitle("menuOpen", open)}
-                                    >
-                                      <Tooltip value={language.t("common.moreOptions")} placement="top">
-                                        <DropdownMenu.Trigger
-                                          as={IconButton}
-                                          icon="dot-grid"
-                                          variant="ghost"
-                                          class="size-6 rounded-md data-[expanded]:bg-surface-base-active"
-                                          aria-label={language.t("common.moreOptions")}
-                                        />
-                                      </Tooltip>
-                                      <DropdownMenu.Portal>
-                                        <DropdownMenu.Content
-                                          onCloseAutoFocus={(event) => {
-                                            if (!title.pendingRename) return
-                                            event.preventDefault()
-                                            setTitle("pendingRename", false)
-                                            openTitleEditor()
-                                          }}
-                                        >
-                                          <DropdownMenu.Item
-                                            onSelect={() => {
-                                              setTitle({ pendingRename: true, menuOpen: false })
-                                            }}
-                                          >
-                                            <DropdownMenu.ItemLabel>
-                                              {language.t("common.rename")}
-                                            </DropdownMenu.ItemLabel>
-                                          </DropdownMenu.Item>
-                                          <DropdownMenu.Item onSelect={() => void archiveSession(id())}>
-                                            <DropdownMenu.ItemLabel>
-                                              {language.t("common.archive")}
-                                            </DropdownMenu.ItemLabel>
-                                          </DropdownMenu.Item>
-                                          <DropdownMenu.Separator />
-                                          <DropdownMenu.Item
-                                            onSelect={() => dialog.show(() => <DialogDeleteSession sessionID={id()} />)}
-                                          >
-                                            <DropdownMenu.ItemLabel>
-                                              {language.t("common.delete")}
-                                            </DropdownMenu.ItemLabel>
-                                          </DropdownMenu.Item>
-                                        </DropdownMenu.Content>
-                                      </DropdownMenu.Portal>
-                                    </DropdownMenu>
-                                  </div>
-                                )}
+                            <div class="h-10 flex items-center gap-1">
+                              <Show when={info()?.parentID}>
+                                <IconButton
+                                  tabIndex={-1}
+                                  icon="arrow-left"
+                                  variant="ghost"
+                                  onClick={() => {
+                                    navigate(`/${params.dir}/session/${info()?.parentID}`)
+                                  }}
+                                  aria-label={language.t("common.goBack")}
+                                />
+                              </Show>
+                              <Show when={info()?.title}>
+                                <h1 class="text-16-medium text-text-strong truncate">{info()?.title}</h1>
                              </Show>
                            </div>
                          </div>
@@ -2361,10 +1978,10 @@ export default function Page() {
                        <div
                          ref={autoScroll.contentRef}
                          role="log"
-                          class="flex flex-col gap-12 items-start justify-start pb-[calc(var(--prompt-height,8rem)+64px)] md:pb-[calc(var(--prompt-height,10rem)+64px)] transition-[margin]"
+                          class="flex flex-col gap-32 items-start justify-start pb-[calc(var(--prompt-height,8rem)+64px)] md:pb-[calc(var(--prompt-height,10rem)+64px)] transition-[margin]"
                          classList={{
                            "w-full": true,
-                            "md:max-w-200 md:mx-auto 3xl:max-w-[1200px] 4xl:max-w-[1600px] 5xl:max-w-[1900px]":
+                            "md:max-w-200 md:mx-auto 3xl:max-w-[1200px] 3xl:mx-auto 4xl:max-w-[1600px] 4xl:mx-auto 5xl:max-w-[1900px] 5xl:mx-auto":
                              centered(),
                            "mt-0.5": centered(),
                            "mt-0": !centered(),
@@ -2532,7 +2149,7 @@ export default function Page() {
                when={prompt.ready()}
                fallback={
                  <div class="w-full min-h-32 md:min-h-40 rounded-md border border-border-weak-base bg-background-base/50 px-4 py-3 text-text-weak whitespace-pre-wrap pointer-events-none">
-                    {handoff.session.get(sessionKey())?.prompt || language.t("prompt.loading")}
+                    {handoff.prompt || language.t("prompt.loading")}
                  </div>
                }
              >
@@ -2783,7 +2400,7 @@ export default function Page() {
                            const p = path()
                            if (!p) return null
                            if (file.ready()) return file.selectedLines(p) ?? null
-                            return handoff.session.get(sessionKey())?.files[p] ?? null
+                            return handoff.files[p] ?? null
                          })

                          let wrap: HTMLDivElement | undefined
@@ -3277,7 +2894,7 @@ export default function Page() {
                              allowed={diffFiles()}
                              kinds={kinds()}
                              draggable={false}
-                              active={tree.activeDiff}
+                              active={activeDiff()}
                              onFileClick={(node) => focusReviewDiff(node.path)}
                            />
                          </Show>
@@ -3337,7 +2954,7 @@ export default function Page() {
            fallback={
              <div class="flex flex-col h-full pointer-events-none">
                <div class="h-10 flex items-center gap-2 px-2 border-b border-border-weak-base bg-background-stronger overflow-hidden">
-                  <For each={handoff.terminal.get(params.dir!) ?? []}>
+                  <For each={handoff.terminals}>
                    {(title) => (
                      <div class="px-2 py-1 rounded-md bg-surface-base text-14-regular text-text-weak truncate max-w-40">
                        {title}
--- a/packages/console/app/package.json
+++ b/packages/console/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.1.51",
+  "version": "1.1.48",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/console/app/src/routes/zen/util/handler.ts
+++ b/packages/console/app/src/routes/zen/util/handler.ts
@@ -79,7 +79,7 @@ export async function handler(
    const dataDumper = createDataDumper(sessionId, requestId, projectId)
    const trialLimiter = createTrialLimiter(modelInfo.trial, ip, ocClient)
    const isTrial = await trialLimiter?.isTrial()
-    const rateLimiter = createRateLimiter(modelInfo.rateLimit, ip, input.request.headers)
+    const rateLimiter = createRateLimiter(modelInfo.rateLimit, ip)
    await rateLimiter?.check()
    const stickyTracker = createStickyTracker(modelInfo.stickyProvider, sessionId)
    const stickyProvider = await stickyTracker?.get()
--- a/packages/console/app/src/routes/zen/util/rateLimiter.ts
+++ b/packages/console/app/src/routes/zen/util/rateLimiter.ts
@@ -4,11 +4,9 @@ import { RateLimitError } from "./error"
 import { logger } from "./logger"
 import { ZenData } from "@opencode-ai/console-core/model.js"

-export function createRateLimiter(limit: ZenData.RateLimit | undefined, rawIp: string, headers: Headers) {
+export function createRateLimiter(limit: ZenData.RateLimit | undefined, rawIp: string) {
  if (!limit) return

-  const limitValue = limit.checkHeader && !headers.get(limit.checkHeader) ? limit.fallbackValue! : limit.value
-
  const ip = !rawIp.length ? "unknown" : rawIp
  const now = Date.now()
  const intervals =
@@ -34,7 +32,7 @@ export function createRateLimiter(limit: ZenData.RateLimit | undefined, rawIp: s
      )
      const total = rows.reduce((sum, r) => sum + r.count, 0)
      logger.debug(`rate limit total: ${total}`)
-      if (total >= limitValue) throw new RateLimitError(`Rate limit exceeded. Please try again later.`)
+      if (total >= limit.value) throw new RateLimitError(`Rate limit exceeded. Please try again later.`)
    },
  }
 }
--- a/packages/console/core/package.json
+++ b/packages/console/core/package.json
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.1.51",
+  "version": "1.1.48",
  "private": true,
  "type": "module",
  "license": "MIT",
--- a/packages/console/core/src/model.ts
+++ b/packages/console/core/src/model.ts
@@ -21,8 +21,6 @@ export namespace ZenData {
  const RateLimitSchema = z.object({
    period: z.enum(["day", "rolling"]),
    value: z.number().int(),
-    checkHeader: z.string().optional(),
-    fallbackValue: z.number().int().optional(),
  })
  export type Format = z.infer<typeof FormatSchema>
  export type Trial = z.infer<typeof TrialSchema>
--- a/packages/console/function/package.json
+++ b/packages/console/function/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.1.51",
+  "version": "1.1.48",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
--- a/packages/console/mail/package.json
+++ b/packages/console/mail/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.1.51",
+  "version": "1.1.48",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
--- a/packages/desktop/index.html
+++ b/packages/desktop/index.html
@@ -17,7 +17,7 @@
  </head>
  <body class="antialiased overscroll-none text-12-regular overflow-hidden">
    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root" class="flex flex-col h-dvh"></div>
+    <div id="root" class="flex flex-col h-dvh p-px"></div>
    <div data-tauri-decorum-tb class="w-0 h-0 hidden" />
    <script src="/src/index.tsx" type="module"></script>
  </body>
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.1.51",
+  "version": "1.1.48",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/desktop/src-tauri/tauri.conf.json
+++ b/packages/desktop/src-tauri/tauri.conf.json
@@ -42,13 +42,6 @@
    "active": true,
    "targets": ["deb", "rpm", "dmg", "nsis", "app"],
    "externalBin": ["sidecars/opencode-cli"],
-    "linux": {
-      "rpm": {
-        "compression": {
-          "type": "none"
-        }
-      }
-    },
    "macOS": {
      "entitlements": "./entitlements.plist"
    },
--- a/packages/desktop/src-tauri/tauri.prod.conf.json
+++ b/packages/desktop/src-tauri/tauri.prod.conf.json
@@ -21,11 +21,6 @@
        "files": {
          "/usr/share/metainfo/ai.opencode.opencode.metainfo.xml": "release/appstream.metainfo.xml"
        }
-      },
-      "rpm": {
-        "compression": {
-          "type": "none"
-        }
      }
    }
  },
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.1.51",
+  "version": "1.1.48",
  "private": true,
  "type": "module",
  "license": "MIT",
--- a/packages/extensions/zed/extension.toml
+++ b/packages/extensions/zed/extension.toml
@@ -1,7 +1,7 @@
 id = "opencode"
 name = "OpenCode"
 description = "The open source coding agent."
-version = "1.1.51"
+version = "1.1.48"
 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.1.51/opencode-darwin-arm64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.48/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.darwin-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.51/opencode-darwin-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.48/opencode-darwin-x64.zip"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.51/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.48/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.1.51/opencode-linux-x64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.48/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.1.51/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.1.48/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.1.51",
+  "version": "1.1.48",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.1.51",
+  "version": "1.1.48",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
@@ -20,7 +20,6 @@
  "bin": {
    "opencode": "./bin/opencode"
  },
-  "randomField": "this-is-a-random-value-12345",
  "exports": {
    "./*": "./src/*.ts"
  },
@@ -71,7 +70,7 @@
    "@ai-sdk/vercel": "1.0.33",
    "@ai-sdk/xai": "2.0.56",
    "@clack/prompts": "1.0.0-alpha.1",
-    "@gitlab/gitlab-ai-provider": "3.4.0",
+    "@gitlab/gitlab-ai-provider": "3.3.1",
    "@hono/standard-validator": "0.1.5",
    "@hono/zod-validator": "catalog:",
    "@modelcontextprotocol/sdk": "1.25.2",
@@ -92,9 +91,8 @@
    "@standard-schema/spec": "1.0.0",
    "@zip.js/zip.js": "2.7.62",
    "ai": "catalog:",
-    "ai-gateway-provider": "2.3.1",
    "bonjour-service": "1.3.0",
-    "bun-pty": "0.4.8",
+    "bun-pty": "0.4.4",
    "chokidar": "4.0.3",
    "clipboardy": "4.0.0",
    "decimal.js": "10.5.0",
--- a/packages/opencode/script/publish.ts
+++ b/packages/opencode/script/publish.ts
@@ -18,7 +18,6 @@ const version = Object.values(binaries)[0]
 await $`mkdir -p ./dist/${pkg.name}`
 await $`cp -r ./bin ./dist/${pkg.name}/bin`
 await $`cp ./script/postinstall.mjs ./dist/${pkg.name}/postinstall.mjs`
-await Bun.file(`./dist/${pkg.name}/LICENSE`).write(await Bun.file("../../LICENSE").text())

 await Bun.file(`./dist/${pkg.name}/package.json`).write(
  JSON.stringify(
@@ -31,7 +30,6 @@ await Bun.file(`./dist/${pkg.name}/package.json`).write(
        postinstall: "bun ./postinstall.mjs || node ./postinstall.mjs",
      },
      version: version,
-      license: pkg.license,
      optionalDependencies: binaries,
    },
    null,
--- a/packages/opencode/src/agent/agent.ts
+++ b/packages/opencode/src/agent/agent.ts
@@ -18,7 +18,6 @@ import { mergeDeep, pipe, sortBy, values } from "remeda"
 import { Global } from "@/global"
 import path from "path"
 import { Plugin } from "@/plugin"
-import { Skill } from "../skill"

 export namespace Agent {
  export const Info = z
@@ -51,14 +50,13 @@ export namespace Agent {
  const state = Instance.state(async () => {
    const cfg = await Config.get()

-    const skillDirs = await Skill.dirs()
    const defaults = PermissionNext.fromConfig({
      "*": "allow",
      doom_loop: "ask",
      external_directory: {
        "*": "ask",
+        [Truncate.DIR]: "allow",
        [Truncate.GLOB]: "allow",
-        ...Object.fromEntries(skillDirs.map((dir) => [path.join(dir, "*"), "allow"])),
      },
      question: "deny",
      plan_enter: "deny",
@@ -142,6 +140,7 @@ export namespace Agent {
            codesearch: "allow",
            read: "allow",
            external_directory: {
+              [Truncate.DIR]: "allow",
              [Truncate.GLOB]: "allow",
            },
          }),
@@ -230,19 +229,19 @@ export namespace Agent {
      item.permission = PermissionNext.merge(item.permission, PermissionNext.fromConfig(value.permission ?? {}))
    }

-    // Ensure Truncate.GLOB is allowed unless explicitly configured
+    // Ensure Truncate.DIR is allowed unless explicitly configured
    for (const name in result) {
      const agent = result[name]
      const explicit = agent.permission.some((r) => {
        if (r.permission !== "external_directory") return false
        if (r.action !== "deny") return false
-        return r.pattern === Truncate.GLOB
+        return r.pattern === Truncate.DIR || r.pattern === Truncate.GLOB
      })
      if (explicit) continue

      result[name].permission = PermissionNext.merge(
        result[name].permission,
-        PermissionNext.fromConfig({ external_directory: { [Truncate.GLOB]: "allow" } }),
+        PermissionNext.fromConfig({ external_directory: { [Truncate.DIR]: "allow", [Truncate.GLOB]: "allow" } }),
      )
    }

--- a/packages/opencode/src/bun/index.ts
+++ b/packages/opencode/src/bun/index.ts
@@ -5,11 +5,12 @@ import path from "path"
 import { Filesystem } from "../util/filesystem"
 import { NamedError } from "@opencode-ai/util/error"
 import { readableStreamToText } from "bun"
+import { createRequire } from "module"
 import { Lock } from "../util/lock"
-import { PackageRegistry } from "./registry"

 export namespace BunProc {
  const log = Log.create({ service: "bun" })
+  const req = createRequire(import.meta.url)

  export async function run(cmd: string[], options?: Bun.SpawnOptions.OptionsObject<any, any, any>) {
    log.info("running", {
@@ -74,17 +75,7 @@ export namespace BunProc {
    const dependencies = parsed.dependencies ?? {}
    if (!parsed.dependencies) parsed.dependencies = dependencies
    const modExists = await Filesystem.exists(mod)
-    const cachedVersion = dependencies[pkg]
-
-    if (!modExists || !cachedVersion) {
-      // continue to install
-    } else if (version !== "latest" && cachedVersion === version) {
-      return mod
-    } else if (version === "latest") {
-      const isOutdated = await PackageRegistry.isOutdated(pkg, cachedVersion, Global.Path.cache)
-      if (!isOutdated) return mod
-      log.info("Cached version is outdated, proceeding with install", { pkg, cachedVersion })
-    }
+    if (dependencies[pkg] === version && modExists) return mod

    const proxied = !!(
      process.env.HTTP_PROXY ||
--- a/packages/opencode/src/bun/registry.ts
+++ b/packages/opencode/src/bun/registry.ts
@@ -1,48 +0,0 @@
-import { readableStreamToText, semver } from "bun"
-import { Log } from "../util/log"
-
-export namespace PackageRegistry {
-  const log = Log.create({ service: "bun" })
-
-  function which() {
-    return process.execPath
-  }
-
-  export async function info(pkg: string, field: string, cwd?: string): Promise<string | null> {
-    const result = Bun.spawn([which(), "info", pkg, field], {
-      cwd,
-      stdout: "pipe",
-      stderr: "pipe",
-      env: {
-        ...process.env,
-        BUN_BE_BUN: "1",
-      },
-    })
-
-    const code = await result.exited
-    const stdout = result.stdout ? await readableStreamToText(result.stdout) : ""
-    const stderr = result.stderr ? await readableStreamToText(result.stderr) : ""
-
-    if (code !== 0) {
-      log.warn("bun info failed", { pkg, field, code, stderr })
-      return null
-    }
-
-    const value = stdout.trim()
-    if (!value) return null
-    return value
-  }
-
-  export async function isOutdated(pkg: string, cachedVersion: string, cwd?: string): Promise<boolean> {
-    const latestVersion = await info(pkg, "version", cwd)
-    if (!latestVersion) {
-      log.warn("Failed to resolve latest version, using cached", { pkg, cachedVersion })
-      return false
-    }
-
-    const isRange = /[\s^~*xX<>|=]/.test(cachedVersion)
-    if (isRange) return !semver.satisfies(latestVersion, cachedVersion)
-
-    return semver.order(cachedVersion, latestVersion) === -1
-  }
-}
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -4,211 +4,25 @@ import { UI } from "../ui"
 import { cmd } from "./cmd"
 import { Flag } from "../../flag/flag"
 import { bootstrap } from "../bootstrap"
+import { Command } from "../../command"
 import { EOL } from "os"
-import { createOpencodeClient, type Message, type OpencodeClient, type ToolPart } from "@opencode-ai/sdk/v2"
+import { select } from "@clack/prompts"
+import { createOpencodeClient, type OpencodeClient } from "@opencode-ai/sdk/v2"
 import { Server } from "../../server/server"
 import { Provider } from "../../provider/provider"
 import { Agent } from "../../agent/agent"
-import { PermissionNext } from "../../permission/next"
-import { Tool } from "../../tool/tool"
-import { GlobTool } from "../../tool/glob"
-import { GrepTool } from "../../tool/grep"
-import { ListTool } from "../../tool/ls"
-import { ReadTool } from "../../tool/read"
-import { WebFetchTool } from "../../tool/webfetch"
-import { EditTool } from "../../tool/edit"
-import { WriteTool } from "../../tool/write"
-import { CodeSearchTool } from "../../tool/codesearch"
-import { WebSearchTool } from "../../tool/websearch"
-import { TaskTool } from "../../tool/task"
-import { SkillTool } from "../../tool/skill"
-import { BashTool } from "../../tool/bash"
-import { TodoWriteTool } from "../../tool/todo"
-import { Locale } from "../../util/locale"

-type ToolProps<T extends Tool.Info> = {
-  input: Tool.InferParameters<T>
-  metadata: Tool.InferMetadata<T>
-  part: ToolPart
-}
-
-function props<T extends Tool.Info>(part: ToolPart): ToolProps<T> {
-  const state = part.state
-  return {
-    input: state.input as Tool.InferParameters<T>,
-    metadata: ("metadata" in state ? state.metadata : {}) as Tool.InferMetadata<T>,
-    part,
-  }
-}
-
-type Inline = {
-  icon: string
-  title: string
-  description?: string
-}
-
-function inline(info: Inline) {
-  const suffix = info.description ? UI.Style.TEXT_DIM + ` ${info.description}` + UI.Style.TEXT_NORMAL : ""
-  UI.println(UI.Style.TEXT_NORMAL + info.icon, UI.Style.TEXT_NORMAL + info.title + suffix)
-}
-
-function block(info: Inline, output?: string) {
-  UI.empty()
-  inline(info)
-  if (!output?.trim()) return
-  UI.println(output)
-  UI.empty()
-}
-
-function fallback(part: ToolPart) {
-  const state = part.state
-  const input = "input" in state ? state.input : undefined
-  const title =
-    ("title" in state && state.title ? state.title : undefined) ||
-    (input && typeof input === "object" && Object.keys(input).length > 0 ? JSON.stringify(input) : "Unknown")
-  inline({
-    icon: "⚙",
-    title: `${part.tool} ${title}`,
-  })
-}
-
-function glob(info: ToolProps<typeof GlobTool>) {
-  const root = info.input.path ?? ""
-  const title = `Glob "${info.input.pattern}"`
-  const suffix = root ? `in ${normalizePath(root)}` : ""
-  const num = info.metadata.count
-  const description =
-    num === undefined ? suffix : `${suffix}${suffix ? " · " : ""}${num} ${num === 1 ? "match" : "matches"}`
-  inline({
-    icon: "✱",
-    title,
-    ...(description && { description }),
-  })
-}
-
-function grep(info: ToolProps<typeof GrepTool>) {
-  const root = info.input.path ?? ""
-  const title = `Grep "${info.input.pattern}"`
-  const suffix = root ? `in ${normalizePath(root)}` : ""
-  const num = info.metadata.matches
-  const description =
-    num === undefined ? suffix : `${suffix}${suffix ? " · " : ""}${num} ${num === 1 ? "match" : "matches"}`
-  inline({
-    icon: "✱",
-    title,
-    ...(description && { description }),
-  })
-}
-
-function list(info: ToolProps<typeof ListTool>) {
-  const dir = info.input.path ? normalizePath(info.input.path) : ""
-  inline({
-    icon: "→",
-    title: dir ? `List ${dir}` : "List",
-  })
-}
-
-function read(info: ToolProps<typeof ReadTool>) {
-  const file = normalizePath(info.input.filePath)
-  const pairs = Object.entries(info.input).filter(([key, value]) => {
-    if (key === "filePath") return false
-    return typeof value === "string" || typeof value === "number" || typeof value === "boolean"
-  })
-  const description = pairs.length ? `[${pairs.map(([key, value]) => `${key}=${value}`).join(", ")}]` : undefined
-  inline({
-    icon: "→",
-    title: `Read ${file}`,
-    ...(description && { description }),
-  })
-}
-
-function write(info: ToolProps<typeof WriteTool>) {
-  block(
-    {
-      icon: "←",
-      title: `Write ${normalizePath(info.input.filePath)}`,
-    },
-    info.part.state.status === "completed" ? info.part.state.output : undefined,
-  )
-}
-
-function webfetch(info: ToolProps<typeof WebFetchTool>) {
-  inline({
-    icon: "%",
-    title: `WebFetch ${info.input.url}`,
-  })
-}
-
-function edit(info: ToolProps<typeof EditTool>) {
-  const title = normalizePath(info.input.filePath)
-  const diff = info.metadata.diff
-  block(
-    {
-      icon: "←",
-      title: `Edit ${title}`,
-    },
-    diff,
-  )
-}
-
-function codesearch(info: ToolProps<typeof CodeSearchTool>) {
-  inline({
-    icon: "◇",
-    title: `Exa Code Search "${info.input.query}"`,
-  })
-}
-
-function websearch(info: ToolProps<typeof WebSearchTool>) {
-  inline({
-    icon: "◈",
-    title: `Exa Web Search "${info.input.query}"`,
-  })
-}
-
-function task(info: ToolProps<typeof TaskTool>) {
-  const agent = Locale.titlecase(info.input.subagent_type)
-  const desc = info.input.description
-  const started = info.part.state.status === "running"
-  const name = desc ?? `${agent} Task`
-  inline({
-    icon: started ? "•" : "✓",
-    title: name,
-    description: desc ? `${agent} Agent` : undefined,
-  })
-}
-
-function skill(info: ToolProps<typeof SkillTool>) {
-  inline({
-    icon: "→",
-    title: `Skill "${info.input.name}"`,
-  })
-}
-
-function bash(info: ToolProps<typeof BashTool>) {
-  const output = info.part.state.status === "completed" ? info.part.state.output?.trim() : undefined
-  block(
-    {
-      icon: "$",
-      title: `${info.input.command}`,
-    },
-    output,
-  )
-}
-
-function todo(info: ToolProps<typeof TodoWriteTool>) {
-  block(
-    {
-      icon: "#",
-      title: "Todos",
-    },
-    info.input.todos.map((item) => `${item.status === "completed" ? "[x]" : "[ ]"} ${item.content}`).join("\n"),
-  )
-}
-
-function normalizePath(input?: string) {
-  if (!input) return ""
-  if (path.isAbsolute(input)) return path.relative(process.cwd(), input) || "."
-  return input
+const TOOL: Record<string, [string, string]> = {
+  todowrite: ["Todo", UI.Style.TEXT_WARNING_BOLD],
+  todoread: ["Todo", UI.Style.TEXT_WARNING_BOLD],
+  bash: ["Bash", UI.Style.TEXT_DANGER_BOLD],
+  edit: ["Edit", UI.Style.TEXT_SUCCESS_BOLD],
+  glob: ["Glob", UI.Style.TEXT_INFO_BOLD],
+  grep: ["Grep", UI.Style.TEXT_INFO_BOLD],
+  list: ["List", UI.Style.TEXT_INFO_BOLD],
+  read: ["Read", UI.Style.TEXT_HIGHLIGHT_BOLD],
+  write: ["Write", UI.Style.TEXT_SUCCESS_BOLD],
+  websearch: ["Search", UI.Style.TEXT_DIM_BOLD],
 }

 export const RunCommand = cmd({
@@ -277,22 +91,17 @@ export const RunCommand = cmd({
        type: "string",
        describe: "model variant (provider-specific reasoning effort, e.g., high, max, minimal)",
      })
-      .option("thinking", {
-        type: "boolean",
-        describe: "show thinking blocks",
-        default: false,
-      })
  },
  handler: async (args) => {
    let message = [...args.message, ...(args["--"] || [])]
      .map((arg) => (arg.includes(" ") ? `"${arg.replace(/"/g, '\\"')}"` : arg))
      .join(" ")

-    const files: { type: "file"; url: string; filename: string; mime: string }[] = []
+    const fileParts: any[] = []
    if (args.file) {
-      const list = Array.isArray(args.file) ? args.file : [args.file]
+      const files = Array.isArray(args.file) ? args.file : [args.file]

-      for (const filePath of list) {
+      for (const filePath of files) {
        const resolvedPath = path.resolve(process.cwd(), filePath)
        const file = Bun.file(resolvedPath)
        const stats = await file.stat().catch(() => {})
@@ -308,7 +117,7 @@ export const RunCommand = cmd({
        const stat = await file.stat()
        const mime = stat.isDirectory() ? "application/x-directory" : "text/plain"

-        files.push({
+        fileParts.push({
          type: "file",
          url: `file://${resolvedPath}`,
          filename: path.basename(resolvedPath),
@@ -324,75 +133,17 @@ export const RunCommand = cmd({
      process.exit(1)
    }

-    const rules: PermissionNext.Ruleset = [
-      {
-        permission: "question",
-        action: "deny",
-        pattern: "*",
-      },
-      {
-        permission: "plan_enter",
-        action: "deny",
-        pattern: "*",
-      },
-      {
-        permission: "plan_exit",
-        action: "deny",
-        pattern: "*",
-      },
-    ]
-
-    function title() {
-      if (args.title === undefined) return
-      if (args.title !== "") return args.title
-      return message.slice(0, 50) + (message.length > 50 ? "..." : "")
-    }
-
-    async function session(sdk: OpencodeClient) {
-      if (args.continue) {
-        const result = await sdk.session.list()
-        return result.data?.find((s) => !s.parentID)?.id
-      }
-      if (args.session) return args.session
-      const name = title()
-      const result = await sdk.session.create({ title: name, permission: rules })
-      return result.data?.id
-    }
-
-    async function share(sdk: OpencodeClient, sessionID: string) {
-      const cfg = await sdk.config.get()
-      if (!cfg.data) return
-      if (cfg.data.share !== "auto" && !Flag.OPENCODE_AUTO_SHARE && !args.share) return
-      const res = await sdk.session.share({ sessionID }).catch((error) => {
-        if (error instanceof Error && error.message.includes("disabled")) {
-          UI.println(UI.Style.TEXT_DANGER_BOLD + "!  " + error.message)
-        }
-        return { error }
-      })
-      if (!res.error && "data" in res && res.data?.share?.url) {
-        UI.println(UI.Style.TEXT_INFO_BOLD + "~  " + res.data.share.url)
-      }
-    }
-
-    async function execute(sdk: OpencodeClient) {
-      function tool(part: ToolPart) {
-        if (part.tool === "bash") return bash(props<typeof BashTool>(part))
-        if (part.tool === "glob") return glob(props<typeof GlobTool>(part))
-        if (part.tool === "grep") return grep(props<typeof GrepTool>(part))
-        if (part.tool === "list") return list(props<typeof ListTool>(part))
-        if (part.tool === "read") return read(props<typeof ReadTool>(part))
-        if (part.tool === "write") return write(props<typeof WriteTool>(part))
-        if (part.tool === "webfetch") return webfetch(props<typeof WebFetchTool>(part))
-        if (part.tool === "edit") return edit(props<typeof EditTool>(part))
-        if (part.tool === "codesearch") return codesearch(props<typeof CodeSearchTool>(part))
-        if (part.tool === "websearch") return websearch(props<typeof WebSearchTool>(part))
-        if (part.tool === "task") return task(props<typeof TaskTool>(part))
-        if (part.tool === "todowrite") return todo(props<typeof TodoWriteTool>(part))
-        if (part.tool === "skill") return skill(props<typeof SkillTool>(part))
-        return fallback(part)
+    const execute = async (sdk: OpencodeClient, sessionID: string) => {
+      const printEvent = (color: string, type: string, title: string) => {
+        UI.println(
+          color + `|`,
+          UI.Style.TEXT_NORMAL + UI.Style.TEXT_DIM + ` ${type.padEnd(7, " ")}`,
+          "",
+          UI.Style.TEXT_NORMAL + title,
+        )
      }

-      function emit(type: string, data: Record<string, unknown>) {
+      const outputJsonEvent = (type: string, data: any) => {
        if (args.format === "json") {
          process.stdout.write(JSON.stringify({ type, timestamp: Date.now(), sessionID, ...data }) + EOL)
          return true
@@ -401,77 +152,41 @@ export const RunCommand = cmd({
      }

      const events = await sdk.event.subscribe()
-      let error: string | undefined
-
-      async function loop() {
-        const toggles = new Map<string, boolean>()
+      let errorMsg: string | undefined

+      const eventProcessor = (async () => {
        for await (const event of events.stream) {
-          if (
-            event.type === "message.updated" &&
-            event.properties.info.role === "assistant" &&
-            args.format !== "json" &&
-            toggles.get("start") !== true
-          ) {
-            UI.empty()
-            UI.println(`> ${event.properties.info.agent} · ${event.properties.info.modelID}`)
-            UI.empty()
-            toggles.set("start", true)
-          }
-
          if (event.type === "message.part.updated") {
            const part = event.properties.part
            if (part.sessionID !== sessionID) continue

            if (part.type === "tool" && part.state.status === "completed") {
-              if (emit("tool_use", { part })) continue
-              tool(part)
-            }
-
-            if (
-              part.type === "tool" &&
-              part.tool === "task" &&
-              part.state.status === "running" &&
-              args.format !== "json"
-            ) {
-              if (toggles.get(part.id) === true) continue
-              task(props<typeof TaskTool>(part))
-              toggles.set(part.id, true)
+              if (outputJsonEvent("tool_use", { part })) continue
+              const [tool, color] = TOOL[part.tool] ?? [part.tool, UI.Style.TEXT_INFO_BOLD]
+              const title =
+                part.state.title ||
+                (Object.keys(part.state.input).length > 0 ? JSON.stringify(part.state.input) : "Unknown")
+              printEvent(color, tool, title)
+              if (part.tool === "bash" && part.state.output?.trim()) {
+                UI.println()
+                UI.println(part.state.output)
+              }
            }

            if (part.type === "step-start") {
-              if (emit("step_start", { part })) continue
+              if (outputJsonEvent("step_start", { part })) continue
            }

            if (part.type === "step-finish") {
-              if (emit("step_finish", { part })) continue
+              if (outputJsonEvent("step_finish", { part })) continue
            }

            if (part.type === "text" && part.time?.end) {
-              if (emit("text", { part })) continue
-              const text = part.text.trim()
-              if (!text) continue
-              if (!process.stdout.isTTY) {
-                process.stdout.write(text + EOL)
-                continue
-              }
-              UI.empty()
-              UI.println(text)
-              UI.empty()
-            }
-
-            if (part.type === "reasoning" && part.time?.end && args.thinking) {
-              if (emit("reasoning", { part })) continue
-              const text = part.text.trim()
-              if (!text) continue
-              const line = `Thinking: ${text}`
-              if (process.stdout.isTTY) {
-                UI.empty()
-                UI.println(`${UI.Style.TEXT_DIM}\u001b[3m${line}\u001b[0m${UI.Style.TEXT_NORMAL}`)
-                UI.empty()
-                continue
-              }
-              process.stdout.write(line + EOL)
+              if (outputJsonEvent("text", { part })) continue
+              const isPiped = !process.stdout.isTTY
+              if (!isPiped) UI.println()
+              process.stdout.write((isPiped ? part.text : UI.markdown(part.text)) + EOL)
+              if (!isPiped) UI.println()
            }
          }

@@ -482,40 +197,42 @@ export const RunCommand = cmd({
            if ("data" in props.error && props.error.data && "message" in props.error.data) {
              err = String(props.error.data.message)
            }
-            error = error ? error + EOL + err : err
-            if (emit("error", { error: props.error })) continue
+            errorMsg = errorMsg ? errorMsg + EOL + err : err
+            if (outputJsonEvent("error", { error: props.error })) continue
            UI.error(err)
          }

-          if (
-            event.type === "session.status" &&
-            event.properties.sessionID === sessionID &&
-            event.properties.status.type === "idle"
-          ) {
+          if (event.type === "session.idle" && event.properties.sessionID === sessionID) {
            break
          }

          if (event.type === "permission.asked") {
            const permission = event.properties
            if (permission.sessionID !== sessionID) continue
-            UI.println(
-              UI.Style.TEXT_WARNING_BOLD + "!",
-              UI.Style.TEXT_NORMAL +
-                `permission requested: ${permission.permission} (${permission.patterns.join(", ")}); auto-rejecting`,
-            )
-            await sdk.permission.reply({
-              requestID: permission.id,
-              reply: "reject",
+            const result = await select({
+              message: `Permission required: ${permission.permission} (${permission.patterns.join(", ")})`,
+              options: [
+                { value: "once", label: "Allow once" },
+                { value: "always", label: "Always allow: " + permission.always.join(", ") },
+                { value: "reject", label: "Reject" },
+              ],
+              initialValue: "once",
+            }).catch(() => "reject")
+            const response = (result.toString().includes("cancel") ? "reject" : result) as "once" | "always" | "reject"
+            await sdk.permission.respond({
+              sessionID,
+              permissionID: permission.id,
+              response,
            })
          }
        }
-      }
+      })()

      // Validate agent if specified
-      const agent = await (async () => {
+      const resolvedAgent = await (async () => {
        if (!args.agent) return undefined
-        const entry = await Agent.get(args.agent)
-        if (!entry) {
+        const agent = await Agent.get(args.agent)
+        if (!agent) {
          UI.println(
            UI.Style.TEXT_WARNING_BOLD + "!",
            UI.Style.TEXT_NORMAL,
@@ -523,7 +240,7 @@ export const RunCommand = cmd({
          )
          return undefined
        }
-        if (entry.mode === "subagent") {
+        if (agent.mode === "subagent") {
          UI.println(
            UI.Style.TEXT_WARNING_BOLD + "!",
            UI.Style.TEXT_NORMAL,
@@ -534,42 +251,91 @@ export const RunCommand = cmd({
        return args.agent
      })()

-      const sessionID = await session(sdk)
-      if (!sessionID) {
-        UI.error("Session not found")
-        process.exit(1)
-      }
-      await share(sdk, sessionID)
-
-      loop().catch((e) => {
-        console.error(e)
-        process.exit(1)
-      })
-
      if (args.command) {
        await sdk.session.command({
          sessionID,
-          agent,
+          agent: resolvedAgent,
          model: args.model,
          command: args.command,
          arguments: message,
          variant: args.variant,
        })
      } else {
-        const model = args.model ? Provider.parseModel(args.model) : undefined
+        const modelParam = args.model ? Provider.parseModel(args.model) : undefined
        await sdk.session.prompt({
          sessionID,
-          agent,
-          model,
+          agent: resolvedAgent,
+          model: modelParam,
          variant: args.variant,
-          parts: [...files, { type: "text", text: message }],
+          parts: [...fileParts, { type: "text", text: message }],
        })
      }
+
+      await eventProcessor
+      if (errorMsg) process.exit(1)
    }

    if (args.attach) {
      const sdk = createOpencodeClient({ baseUrl: args.attach })
-      return await execute(sdk)
+
+      const sessionID = await (async () => {
+        if (args.continue) {
+          const result = await sdk.session.list()
+          return result.data?.find((s) => !s.parentID)?.id
+        }
+        if (args.session) return args.session
+
+        const title =
+          args.title !== undefined
+            ? args.title === ""
+              ? message.slice(0, 50) + (message.length > 50 ? "..." : "")
+              : args.title
+            : undefined
+
+        const result = await sdk.session.create(
+          title
+            ? {
+                title,
+                permission: [
+                  {
+                    permission: "question",
+                    action: "deny",
+                    pattern: "*",
+                  },
+                ],
+              }
+            : {
+                permission: [
+                  {
+                    permission: "question",
+                    action: "deny",
+                    pattern: "*",
+                  },
+                ],
+              },
+        )
+        return result.data?.id
+      })()
+
+      if (!sessionID) {
+        UI.error("Session not found")
+        process.exit(1)
+      }
+
+      const cfgResult = await sdk.config.get()
+      if (cfgResult.data && (cfgResult.data.share === "auto" || Flag.OPENCODE_AUTO_SHARE || args.share)) {
+        const shareResult = await sdk.session.share({ sessionID }).catch((error) => {
+          if (error instanceof Error && error.message.includes("disabled")) {
+            UI.println(UI.Style.TEXT_DANGER_BOLD + "!  " + error.message)
+          }
+          return { error }
+        })
+        if (!shareResult.error && "data" in shareResult && shareResult.data?.share?.url) {
+          UI.println(UI.Style.TEXT_INFO_BOLD + "~  " + shareResult.data.share.url)
+        }
+      }
+
+      return await execute(sdk, sessionID)
    }

    await bootstrap(process.cwd(), async () => {
@@ -578,7 +344,52 @@ export const RunCommand = cmd({
        return Server.App().fetch(request)
      }) as typeof globalThis.fetch
      const sdk = createOpencodeClient({ baseUrl: "http://opencode.internal", fetch: fetchFn })
-      await execute(sdk)
+
+      if (args.command) {
+        const exists = await Command.get(args.command)
+        if (!exists) {
+          UI.error(`Command "${args.command}" not found`)
+          process.exit(1)
+        }
+      }
+
+      const sessionID = await (async () => {
+        if (args.continue) {
+          const result = await sdk.session.list()
+          return result.data?.find((s) => !s.parentID)?.id
+        }
+        if (args.session) return args.session
+
+        const title =
+          args.title !== undefined
+            ? args.title === ""
+              ? message.slice(0, 50) + (message.length > 50 ? "..." : "")
+              : args.title
+            : undefined
+
+        const result = await sdk.session.create(title ? { title } : {})
+        return result.data?.id
+      })()
+
+      if (!sessionID) {
+        UI.error("Session not found")
+        process.exit(1)
+      }
+
+      const cfgResult = await sdk.config.get()
+      if (cfgResult.data && (cfgResult.data.share === "auto" || Flag.OPENCODE_AUTO_SHARE || args.share)) {
+        const shareResult = await sdk.session.share({ sessionID }).catch((error) => {
+          if (error instanceof Error && error.message.includes("disabled")) {
+            UI.println(UI.Style.TEXT_DANGER_BOLD + "!  " + error.message)
+          }
+          return { error }
+        })
+        if (!shareResult.error && "data" in shareResult && shareResult.data?.share?.url) {
+          UI.println(UI.Style.TEXT_INFO_BOLD + "~  " + shareResult.data.share.url)
+        }
+      }
+
+      await execute(sdk, sessionID)
    })
  },
 })
--- a/packages/opencode/src/cli/cmd/tui/app.tsx
+++ b/packages/opencode/src/cli/cmd/tui/app.tsx
@@ -187,6 +187,7 @@ function App() {
  const route = useRoute()
  const dimensions = useTerminalDimensions()
  const renderer = useRenderer()
+  Clipboard.setRenderer(renderer)
  renderer.disableStdoutInterception()
  const dialog = useDialog()
  const local = useLocal()
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/autocomplete.tsx
@@ -129,16 +129,6 @@ export function Autocomplete(props: {
    return props.input().getTextRange(store.index + 1, props.input().cursorOffset)
  })

-  // filter() reads reactive props.value plus non-reactive cursor/text state.
-  // On keypress those can be briefly out of sync, so filter() may return an empty/partial string.
-  // Copy it into search in an effect because effects run after reactive updates have been rendered and painted
-  // so the input has settled and all consumers read the same stable value.
-  const [search, setSearch] = createSignal("")
-  createEffect(() => {
-    const next = filter()
-    setSearch(next ? next : "")
-  })
-
  // When the filter changes due to how TUI works, the mousemove might still be triggered
  // via a synthetic event as the layout moves underneath the cursor. This is a workaround to make sure the input mode remains keyboard so
  // that the mouseover event doesn't trigger when filtering.
@@ -218,7 +208,7 @@ export function Autocomplete(props: {
  }

  const [files] = createResource(
-    () => search(),
+    () => filter(),
    async (query) => {
      if (!store.visible || store.visible === "/") return []

@@ -388,9 +378,9 @@ export function Autocomplete(props: {
    const mixed: AutocompleteOption[] =
      store.visible === "@" ? [...agentsValue, ...(filesValue || []), ...mcpResources()] : [...commandsValue]

-    const searchValue = search()
+    const currentFilter = filter()

-    if (!searchValue) {
+    if (!currentFilter) {
      return mixed
    }

@@ -398,7 +388,7 @@ export function Autocomplete(props: {
      return prev
    }

-    const result = fuzzysort.go(removeLineRange(searchValue), mixed, {
+    const result = fuzzysort.go(removeLineRange(currentFilter), mixed, {
      keys: [
        (obj) => removeLineRange((obj.value ?? obj.display).trimEnd()),
        "description",
@@ -408,7 +398,7 @@ export function Autocomplete(props: {
      scoreFn: (objResults) => {
        const displayResult = objResults[0]
        let score = objResults.score
-        if (displayResult && displayResult.target.startsWith(store.visible + searchValue)) {
+        if (displayResult && displayResult.target.startsWith(store.visible + currentFilter)) {
          score *= 2
        }
        const frecencyScore = objResults.obj.path ? frecency.getFrecency(objResults.obj.path) : 0
--- a/packages/opencode/src/cli/cmd/tui/context/local.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/local.tsx
@@ -35,7 +35,6 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({

    const agent = iife(() => {
      const agents = createMemo(() => sync.data.agent.filter((x) => x.mode !== "subagent" && !x.hidden))
-      const visibleAgents = createMemo(() => sync.data.agent.filter((x) => !x.hidden))
      const [agentStore, setAgentStore] = createStore<{
        current: string
      }>({
@@ -49,7 +48,6 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
        theme.warning,
        theme.primary,
        theme.error,
-        theme.info,
      ])
      return {
        list() {
@@ -77,16 +75,11 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
          })
        },
        color(name: string) {
-          const index = visibleAgents().findIndex((x) => x.name === name)
+          const all = sync.data.agent
+          const agent = all.find((x) => x.name === name)
+          if (agent?.color) return RGBA.fromHex(agent.color)
+          const index = all.findIndex((x) => x.name === name)
          if (index === -1) return colors()[0]
-          const agent = visibleAgents()[index]
-
-          if (agent?.color) {
-            const color = agent.color
-            if (color.startsWith("#")) return RGBA.fromHex(color)
-            // already validated by config, just satisfying TS here
-            return theme[color as keyof typeof theme] as RGBA
-          }
          return colors()[index % colors().length]
        },
      }
--- a/packages/opencode/src/cli/cmd/tui/context/theme.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/theme.tsx
@@ -41,6 +41,7 @@ import { useRenderer } from "@opentui/solid"
 import { createStore, produce } from "solid-js/store"
 import { Global } from "@/global"
 import { Filesystem } from "@/util/filesystem"
+import { useSDK } from "./sdk"

 type ThemeColors = {
  primary: RGBA
@@ -428,7 +429,6 @@ 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 isDark = mode == "dark"

  const col = (i: number) => {
@@ -479,8 +479,8 @@ function generateSystem(colors: TerminalColors, mode: "dark" | "light"): ThemeJs
      textMuted,
      selectedListItemText: bg,

-      // Background colors - use transparent to respect terminal transparency
-      background: transparent,
+      // Background colors
+      background: bg,
      backgroundPanel: grays[2],
      backgroundElement: grays[3],
      backgroundMenu: grays[3],
--- a/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
+++ b/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
@@ -1,23 +1,12 @@
 import { $ } from "bun"
+import type { CliRenderer } from "@opentui/core"
 import { platform, release } from "os"
 import clipboardy from "clipboardy"
 import { lazy } from "../../../../util/lazy.js"
 import { tmpdir } from "os"
 import path from "path"

-/**
- * Writes text to clipboard via OSC 52 escape sequence.
- * This allows clipboard operations to work over SSH by having
- * the terminal emulator handle the clipboard locally.
- */
-function writeOsc52(text: string): void {
-  if (!process.stdout.isTTY) return
-  const base64 = Buffer.from(text).toString("base64")
-  const osc52 = `\x1b]52;c;${base64}\x07`
-  const passthrough = process.env["TMUX"] || process.env["STY"]
-  const sequence = passthrough ? `\x1bPtmux;\x1b${osc52}\x1b\\` : osc52
-  process.stdout.write(sequence)
-}
+const rendererRef = { current: undefined as CliRenderer | undefined }

 export namespace Clipboard {
  export interface Content {
@@ -25,6 +14,10 @@ export namespace Clipboard {
    mime: string
  }

+  export function setRenderer(renderer: CliRenderer | undefined): void {
+    rendererRef.current = renderer
+  }
+
  export async function read(): Promise<Content | undefined> {
    const os = platform()

@@ -153,7 +146,11 @@ export namespace Clipboard {
  })

  export async function copy(text: string): Promise<void> {
-    writeOsc52(text)
+    const renderer = rendererRef.current
+    if (renderer) {
+      const copied = renderer.copyToClipboardOSC52(text)
+      if (copied) return
+    }
    await getCopyMethod()(text)
  }
 }
--- a/packages/opencode/src/cli/cmd/web.ts
+++ b/packages/opencode/src/cli/cmd/web.ts
@@ -63,7 +63,7 @@ export const WebCommand = cmd({
        UI.println(
          UI.Style.TEXT_INFO_BOLD + "  mDNS:              ",
          UI.Style.TEXT_NORMAL,
-          `${opts.mdnsDomain}:${server.port}`,
+          `opencode.local:${server.port}`,
        )
      }

--- a/packages/opencode/src/cli/network.ts
+++ b/packages/opencode/src/cli/network.ts
@@ -17,11 +17,6 @@ const options = {
    describe: "enable mDNS service discovery (defaults hostname to 0.0.0.0)",
    default: false,
  },
-  "mdns-domain": {
-    type: "string" as const,
-    describe: "custom domain name for mDNS service (default: opencode.local)",
-    default: "opencode.local",
-  },
  cors: {
    type: "string" as const,
    array: true,
@@ -41,11 +36,9 @@ export async function resolveNetworkOptions(args: NetworkOptions) {
  const portExplicitlySet = process.argv.includes("--port")
  const hostnameExplicitlySet = process.argv.includes("--hostname")
  const mdnsExplicitlySet = process.argv.includes("--mdns")
-  const mdnsDomainExplicitlySet = process.argv.includes("--mdns-domain")
  const corsExplicitlySet = process.argv.includes("--cors")

  const mdns = mdnsExplicitlySet ? args.mdns : (config?.server?.mdns ?? args.mdns)
-  const mdnsDomain = mdnsDomainExplicitlySet ? args["mdns-domain"] : (config?.server?.mdnsDomain ?? args["mdns-domain"])
  const port = portExplicitlySet ? args.port : (config?.server?.port ?? args.port)
  const hostname = hostnameExplicitlySet
    ? args.hostname
@@ -56,5 +49,5 @@ export async function resolveNetworkOptions(args: NetworkOptions) {
  const argsCors = Array.isArray(args.cors) ? args.cors : args.cors ? [args.cors] : []
  const cors = [...configCors, ...argsCors]

-  return { hostname, port, mdns, mdnsDomain, cors }
+  return { hostname, port, mdns, cors }
 }
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -28,7 +28,6 @@ import { existsSync } from "fs"
 import { Bus } from "@/bus"
 import { GlobalBus } from "@/bus/global"
 import { Event } from "../server/event"
-import { PackageRegistry } from "@/bun/registry"

 export namespace Config {
  const log = Log.create({ service: "config" })
@@ -155,10 +154,9 @@ export namespace Config {
        }
      }

-      const shouldInstall = await needsInstall(dir)
-      if (shouldInstall) {
-        await installDependencies(dir)
-      }
+      const exists = existsSync(path.join(dir, "node_modules"))
+      const installing = installDependencies(dir)
+      if (!exists) await installing

      result.command = mergeDeep(result.command ?? {}, await loadCommand(dir))
      result.agent = mergeDeep(result.agent, await loadAgent(dir))
@@ -237,7 +235,6 @@ export namespace Config {

  export async function installDependencies(dir: string) {
    const pkg = path.join(dir, "package.json")
-    const targetVersion = Installation.isLocal() ? "latest" : Installation.VERSION

    if (!(await Bun.file(pkg).exists())) {
      await Bun.write(pkg, "{}")
@@ -247,43 +244,18 @@ export namespace Config {
    const hasGitIgnore = await Bun.file(gitignore).exists()
    if (!hasGitIgnore) await Bun.write(gitignore, ["node_modules", "package.json", "bun.lock", ".gitignore"].join("\n"))

-    await BunProc.run(["add", `@opencode-ai/plugin@${targetVersion}`, "--exact"], {
-      cwd: dir,
-    }).catch(() => {})
+    await BunProc.run(
+      ["add", "@opencode-ai/plugin@" + (Installation.isLocal() ? "latest" : Installation.VERSION), "--exact"],
+      {
+        cwd: dir,
+      },
+    ).catch(() => {})

    // Install any additional dependencies defined in the package.json
    // This allows local plugins and custom tools to use external packages
    await BunProc.run(["install"], { cwd: dir }).catch(() => {})
  }

-  async function needsInstall(dir: string) {
-    const nodeModules = path.join(dir, "node_modules")
-    if (!existsSync(nodeModules)) return true
-
-    const pkg = path.join(dir, "package.json")
-    const pkgFile = Bun.file(pkg)
-    const pkgExists = await pkgFile.exists()
-    if (!pkgExists) return true
-
-    const parsed = await pkgFile.json().catch(() => null)
-    const dependencies = parsed?.dependencies ?? {}
-    const depVersion = dependencies["@opencode-ai/plugin"]
-    if (!depVersion) return true
-
-    const targetVersion = Installation.isLocal() ? "latest" : Installation.VERSION
-    if (targetVersion === "latest") {
-      const isOutdated = await PackageRegistry.isOutdated("@opencode-ai/plugin", depVersion, dir)
-      if (!isOutdated) return false
-      log.info("Cached version is outdated, proceeding with install", {
-        pkg: "@opencode-ai/plugin",
-        cachedVersion: depVersion,
-      })
-      return true
-    }
-    if (depVersion === targetVersion) return false
-    return true
-  }
-
  function rel(item: string, patterns: string[]) {
    for (const pattern of patterns) {
      const index = item.indexOf(pattern)
@@ -645,12 +617,10 @@ export namespace Config {
        .describe("Hide this subagent from the @ autocomplete menu (default: false, only applies to mode: subagent)"),
      options: z.record(z.string(), z.any()).optional(),
      color: z
-        .union([
-          z.string().regex(/^#[0-9a-fA-F]{6}$/, "Invalid hex color format"),
-          z.enum(["primary", "secondary", "accent", "success", "warning", "error", "info"]),
-        ])
+        .string()
+        .regex(/^#[0-9a-fA-F]{6}$/, "Invalid hex color format")
        .optional()
-        .describe("Hex color code (e.g., #FF5733) or theme color (e.g., primary)"),
+        .describe("Hex color code for the agent (e.g., #FF5733)"),
      steps: z
        .number()
        .int()
@@ -890,7 +860,6 @@ export namespace Config {
      port: z.number().int().positive().optional().describe("Port to listen on"),
      hostname: z.string().optional().describe("Hostname to listen on"),
      mdns: z.boolean().optional().describe("Enable mDNS service discovery"),
-      mdnsDomain: z.string().optional().describe("Custom domain name for mDNS service (default: opencode.local)"),
      cors: z.array(z.string()).optional().describe("Additional domains to allow for CORS"),
    })
    .strict()
--- a/packages/opencode/src/flag/flag.ts
+++ b/packages/opencode/src/flag/flag.ts
@@ -23,8 +23,6 @@ export namespace Flag {
    OPENCODE_DISABLE_CLAUDE_CODE || truthy("OPENCODE_DISABLE_CLAUDE_CODE_PROMPT")
  export const OPENCODE_DISABLE_CLAUDE_CODE_SKILLS =
    OPENCODE_DISABLE_CLAUDE_CODE || truthy("OPENCODE_DISABLE_CLAUDE_CODE_SKILLS")
-  export const OPENCODE_DISABLE_EXTERNAL_SKILLS =
-    OPENCODE_DISABLE_CLAUDE_CODE_SKILLS || truthy("OPENCODE_DISABLE_EXTERNAL_SKILLS")
  export declare const OPENCODE_DISABLE_PROJECT_CONFIG: boolean
  export const OPENCODE_FAKE_VCS = process.env["OPENCODE_FAKE_VCS"]
  export declare const OPENCODE_CLIENT: string
@@ -46,7 +44,7 @@ export namespace Flag {
  export const OPENCODE_EXPERIMENTAL_LSP_TY = truthy("OPENCODE_EXPERIMENTAL_LSP_TY")
  export const OPENCODE_EXPERIMENTAL_LSP_TOOL = OPENCODE_EXPERIMENTAL || truthy("OPENCODE_EXPERIMENTAL_LSP_TOOL")
  export const OPENCODE_DISABLE_FILETIME_CHECK = truthy("OPENCODE_DISABLE_FILETIME_CHECK")
-  export const OPENCODE_EXPERIMENTAL_PLAN_MODE = OPENCODE_EXPERIMENTAL || truthy("OPENCODE_EXPERIMENTAL_PLAN_MODE")
+
  export const OPENCODE_EXPERIMENTAL_MARKDOWN = truthy("OPENCODE_EXPERIMENTAL_MARKDOWN")
  export const OPENCODE_MODELS_URL = process.env["OPENCODE_MODELS_URL"]
  export const OPENCODE_MODELS_PATH = process.env["OPENCODE_MODELS_PATH"]
--- a/packages/opencode/src/lsp/server.ts
+++ b/packages/opencode/src/lsp/server.ts
@@ -732,7 +732,7 @@ export namespace LSPServer {

  export const CSharp: Info = {
    id: "csharp",
-    root: NearestRoot([".slnx", ".sln", ".csproj", "global.json"]),
+    root: NearestRoot([".sln", ".csproj", "global.json"]),
    extensions: [".cs"],
    async spawn(root) {
      let bin = Bun.which("csharp-ls", {
@@ -772,7 +772,7 @@ export namespace LSPServer {

  export const FSharp: Info = {
    id: "fsharp",
-    root: NearestRoot([".slnx", ".sln", ".fsproj", "global.json"]),
+    root: NearestRoot([".sln", ".fsproj", "global.json"]),
    extensions: [".fs", ".fsi", ".fsx", ".fsscript"],
    async spawn(root) {
      let bin = Bun.which("fsautocomplete", {
--- a/packages/opencode/src/provider/provider.ts
+++ b/packages/opencode/src/provider/provider.ts
@@ -1,5 +1,4 @@
 import z from "zod"
-import os from "os"
 import fuzzysort from "fuzzysort"
 import { Config } from "../config/config"
 import { mapValues, mergeDeep, omit, pickBy, sortBy } from "remeda"
@@ -36,9 +35,8 @@ import { createGateway } from "@ai-sdk/gateway"
 import { createTogetherAI } from "@ai-sdk/togetherai"
 import { createPerplexity } from "@ai-sdk/perplexity"
 import { createVercel } from "@ai-sdk/vercel"
-import { createGitLab, VERSION as GITLAB_PROVIDER_VERSION } from "@gitlab/gitlab-ai-provider"
+import { createGitLab } from "@gitlab/gitlab-ai-provider"
 import { ProviderTransform } from "./transform"
-import { Installation } from "../installation"

 export namespace Provider {
  const log = Log.create({ service: "provider" })
@@ -239,9 +237,7 @@ export namespace Provider {
        options: providerOptions,
        async getModel(sdk: any, modelID: string, options?: Record<string, any>) {
          // Skip region prefixing if model already has a cross-region inference profile prefix
-          // Models from models.dev may already include prefixes like us., eu., global., etc.
-          const crossRegionPrefixes = ["global.", "us.", "eu.", "jp.", "apac.", "au."]
-          if (crossRegionPrefixes.some((prefix) => modelID.startsWith(prefix))) {
+          if (modelID.startsWith("global.") || modelID.startsWith("jp.")) {
            return sdk.languageModel(modelID)
          }

@@ -428,17 +424,11 @@ export namespace Provider {
      const config = await Config.get()
      const providerConfig = config.provider?.["gitlab"]

-      const aiGatewayHeaders = {
-        "User-Agent": `opencode/${Installation.VERSION} gitlab-ai-provider/${GITLAB_PROVIDER_VERSION} (${os.platform()} ${os.release()}; ${os.arch()})`,
-        ...(providerConfig?.options?.aiGatewayHeaders || {}),
-      }
-
      return {
        autoload: !!apiKey,
        options: {
          instanceUrl,
          apiKey,
-          aiGatewayHeaders,
          featureFlags: {
            duo_agent_platform_agentic_chat: true,
            duo_agent_platform: true,
@@ -447,7 +437,6 @@ export namespace Provider {
        },
        async getModel(sdk: ReturnType<typeof createGitLab>, modelID: string) {
          return sdk.agenticChat(modelID, {
-            aiGatewayHeaders,
            featureFlags: {
              duo_agent_platform_agentic_chat: true,
              duo_agent_platform: true,
@@ -463,36 +452,52 @@ export namespace Provider {

      if (!accountId || !gateway) return { autoload: false }

-      // Get API token from env or auth - required for authenticated gateways
+      // Get API token from env or auth prompt
      const apiToken = await (async () => {
-        const envToken = Env.get("CLOUDFLARE_API_TOKEN") || Env.get("CF_AIG_TOKEN")
+        const envToken = Env.get("CLOUDFLARE_API_TOKEN")
        if (envToken) return envToken
        const auth = await Auth.get(input.id)
        if (auth?.type === "api") return auth.key
        return undefined
      })()

-      if (!apiToken) {
-        throw new Error(
-          "CLOUDFLARE_API_TOKEN (or CF_AIG_TOKEN) is required for Cloudflare AI Gateway. " +
-            "Set it via environment variable or run `opencode auth cloudflare-ai-gateway`.",
-        )
-      }
-
-      // Use official ai-gateway-provider package (v2.x for AI SDK v5 compatibility)
-      const { createAiGateway } = await import("ai-gateway-provider")
-      const { createUnified } = await import("ai-gateway-provider/providers/unified")
-
-      const aigateway = createAiGateway({ accountId, gateway, apiKey: apiToken })
-      const unified = createUnified()
-
      return {
        autoload: true,
-        async getModel(_sdk: any, modelID: string, _options?: Record<string, any>) {
-          // Model IDs use Unified API format: provider/model (e.g., "anthropic/claude-sonnet-4-5")
-          return aigateway(unified(modelID))
+        async getModel(sdk: any, modelID: string, _options?: Record<string, any>) {
+          return sdk.languageModel(modelID)
+        },
+        options: {
+          baseURL: `https://gateway.ai.cloudflare.com/v1/${accountId}/${gateway}/compat`,
+          headers: {
+            // Cloudflare AI Gateway uses cf-aig-authorization for authenticated gateways
+            // This enables Unified Billing where Cloudflare handles upstream provider auth
+            ...(apiToken ? { "cf-aig-authorization": `Bearer ${apiToken}` } : {}),
+            "HTTP-Referer": "https://opencode.ai/",
+            "X-Title": "opencode",
+          },
+          // Custom fetch to handle parameter transformation and auth
+          fetch: async (input: RequestInfo | URL, init?: RequestInit) => {
+            const headers = new Headers(init?.headers)
+            // Strip Authorization header - AI Gateway uses cf-aig-authorization instead
+            headers.delete("Authorization")
+
+            // Transform max_tokens to max_completion_tokens for newer models
+            if (init?.body && init.method === "POST") {
+              try {
+                const body = JSON.parse(init.body as string)
+                if (body.max_tokens !== undefined && !body.max_completion_tokens) {
+                  body.max_completion_tokens = body.max_tokens
+                  delete body.max_tokens
+                  init = { ...init, body: JSON.stringify(body) }
+                }
+              } catch (e) {
+                // If body parsing fails, continue with original request
+              }
+            }
+
+            return fetch(input, { ...init, headers })
+          },
        },
-        options: {},
      }
    },
    cerebras: async () => {
--- a/packages/opencode/src/provider/transform.ts
+++ b/packages/opencode/src/provider/transform.ts
@@ -1,6 +1,5 @@
 import type { APICallError, ModelMessage } from "ai"
 import { mergeDeep, unique } from "remeda"
-import type { JSONSchema7 } from "@ai-sdk/provider"
 import type { JSONSchema } from "zod/v4/core"
 import type { Provider } from "./provider"
 import type { ModelsDev } from "./models"
@@ -334,9 +333,7 @@ export namespace ProviderTransform {
      id.includes("minimax") ||
      id.includes("glm") ||
      id.includes("mistral") ||
-      id.includes("kimi") ||
-      // TODO: Remove this after models.dev data is fixed to use "kimi-k2.5" instead of "k2p5"
-      id.includes("k2p5")
+      id.includes("kimi")
    )
      return {}

@@ -720,7 +717,7 @@ export namespace ProviderTransform {
    return standardLimit
  }

-  export function schema(model: Provider.Model, schema: JSONSchema.BaseSchema | JSONSchema7): JSONSchema7 {
+  export function schema(model: Provider.Model, schema: JSONSchema.BaseSchema) {
    /*
    if (["openai", "azure"].includes(providerID)) {
      if (schema.type === "object" && schema.properties) {
@@ -771,21 +768,8 @@ export namespace ProviderTransform {
          result.required = result.required.filter((field: any) => field in result.properties)
        }

-        if (result.type === "array") {
-          if (result.items == null) {
-            result.items = {}
-          }
-          // Ensure items has at least a type if it's an empty object
-          // This handles nested arrays like { type: "array", items: { type: "array", items: {} } }
-          if (typeof result.items === "object" && !Array.isArray(result.items) && !result.items.type) {
-            result.items.type = "string"
-          }
-        }
-
-        // Remove properties/required from non-object types (Gemini rejects these)
-        if (result.type && result.type !== "object") {
-          delete result.properties
-          delete result.required
+        if (result.type === "array" && result.items == null) {
+          result.items = {}
        }

        return result
@@ -794,7 +778,7 @@ export namespace ProviderTransform {
      schema = sanitizeGemini(schema)
    }

-    return schema as JSONSchema7
+    return schema
  }

  export function error(providerID: string, error: APICallError) {
--- a/packages/opencode/src/pty/index.ts
+++ b/packages/opencode/src/pty/index.ts
@@ -8,7 +8,6 @@ import type { WSContext } from "hono/ws"
 import { Instance } from "../project/instance"
 import { lazy } from "@opencode-ai/util/lazy"
 import { Shell } from "@/shell/shell"
-import { Plugin } from "@/plugin"

 export namespace Pty {
  const log = Log.create({ service: "pty" })
@@ -103,11 +102,9 @@ export namespace Pty {
    }

    const cwd = input.cwd || Instance.directory
-    const shellEnv = await Plugin.trigger("shell.env", { cwd }, { env: {} })
    const env = {
      ...process.env,
      ...input.env,
-      ...shellEnv.env,
      TERM: "xterm-256color",
      OPENCODE_TERMINAL: "1",
    } as Record<string, string>
--- a/packages/opencode/src/server/mdns.ts
+++ b/packages/opencode/src/server/mdns.ts
@@ -7,18 +7,17 @@ export namespace MDNS {
  let bonjour: Bonjour | undefined
  let currentPort: number | undefined

-  export function publish(port: number, domain?: string) {
+  export function publish(port: number) {
    if (currentPort === port) return
    if (bonjour) unpublish()

    try {
-      const host = domain ?? "opencode.local"
      const name = `opencode-${port}`
      bonjour = new Bonjour()
      const service = bonjour.publish({
        name,
        type: "http",
-        host,
+        host: "opencode.local",
        port,
        txt: { path: "/" },
      })
--- a/packages/opencode/src/server/server.ts
+++ b/packages/opencode/src/server/server.ts
@@ -563,13 +563,7 @@ export namespace Server {
    return result
  }

-  export function listen(opts: {
-    port: number
-    hostname: string
-    mdns?: boolean
-    mdnsDomain?: string
-    cors?: string[]
-  }) {
+  export function listen(opts: { port: number; hostname: string; mdns?: boolean; cors?: string[] }) {
    _corsWhitelist = opts.cors ?? []

    const args = {
@@ -597,7 +591,7 @@ export namespace Server {
      opts.hostname !== "localhost" &&
      opts.hostname !== "::1"
    if (shouldPublishMDNS) {
-      MDNS.publish(server.port!, opts.mdnsDomain)
+      MDNS.publish(server.port!)
    } else if (opts.mdns) {
      log.warn("mDNS enabled but hostname is loopback; skipping mDNS publish")
    }
--- a/packages/opencode/src/session/instruction.ts
+++ b/packages/opencode/src/session/instruction.ts
@@ -17,14 +17,13 @@ const FILES = [
 ]

 function globalFiles() {
-  const files = []
-  if (Flag.OPENCODE_CONFIG_DIR) {
-    files.push(path.join(Flag.OPENCODE_CONFIG_DIR, "AGENTS.md"))
-  }
-  files.push(path.join(Global.Path.config, "AGENTS.md"))
+  const files = [path.join(Global.Path.config, "AGENTS.md")]
  if (!Flag.OPENCODE_DISABLE_CLAUDE_CODE_PROMPT) {
    files.push(path.join(os.homedir(), ".claude", "CLAUDE.md"))
  }
+  if (Flag.OPENCODE_CONFIG_DIR) {
+    files.push(path.join(Flag.OPENCODE_CONFIG_DIR, "AGENTS.md"))
+  }
  return files
 }

--- a/packages/opencode/src/session/processor.ts
+++ b/packages/opencode/src/session/processor.ts
@@ -172,6 +172,14 @@ export namespace SessionProcessor {
                case "tool-result": {
                  const match = toolcalls[value.toolCallId]
                  if (match && match.state.status === "running") {
+                    const attachments = value.output.attachments?.map(
+                      (attachment: Omit<MessageV2.FilePart, "id" | "messageID" | "sessionID">) => ({
+                        ...attachment,
+                        id: Identifier.ascending("part"),
+                        messageID: match.messageID,
+                        sessionID: match.sessionID,
+                      }),
+                    )
                    await Session.updatePart({
                      ...match,
                      state: {
@@ -184,7 +192,7 @@ export namespace SessionProcessor {
                          start: match.state.time.start,
                          end: Date.now(),
                        },
-                        attachments: value.output.attachments,
+                        attachments,
                      },
                    })

--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -9,7 +9,7 @@ import { SessionRevert } from "./revert"
 import { Session } from "."
 import { Agent } from "../agent/agent"
 import { Provider } from "../provider/provider"
-import { type Tool as AITool, tool, jsonSchema, type ToolCallOptions, asSchema } from "ai"
+import { type Tool as AITool, tool, jsonSchema, type ToolCallOptions } from "ai"
 import { SessionCompaction } from "./compaction"
 import { Instance } from "../project/instance"
 import { Bus } from "../bus"
@@ -187,13 +187,17 @@ export namespace SessionPrompt {
        text: template,
      },
    ]
-    const files = ConfigMarkdown.files(template)
+    const matches = ConfigMarkdown.files(template)
    const seen = new Set<string>()
-    await Promise.all(
-      files.map(async (match) => {
-        const name = match[1]
-        if (seen.has(name)) return
+    const names = matches
+      .map((match) => match[1])
+      .filter((name) => {
+        if (seen.has(name)) return false
        seen.add(name)
+        return true
+      })
+    const resolved = await Promise.all(
+      names.map(async (name) => {
        const filepath = name.startsWith("~/")
          ? path.join(os.homedir(), name.slice(2))
          : path.resolve(Instance.worktree, name)
@@ -201,33 +205,34 @@ export namespace SessionPrompt {
        const stats = await fs.stat(filepath).catch(() => undefined)
        if (!stats) {
          const agent = await Agent.get(name)
-          if (agent) {
-            parts.push({
-              type: "agent",
-              name: agent.name,
-            })
-          }
-          return
+          if (!agent) return undefined
+          return {
+            type: "agent",
+            name: agent.name,
+          } satisfies PromptInput["parts"][number]
        }

        if (stats.isDirectory()) {
-          parts.push({
+          return {
            type: "file",
            url: `file://${filepath}`,
            filename: name,
            mime: "application/x-directory",
-          })
-          return
+          } satisfies PromptInput["parts"][number]
        }

-        parts.push({
+        return {
          type: "file",
          url: `file://${filepath}`,
          filename: name,
          mime: "text/plain",
-        })
+        } satisfies PromptInput["parts"][number]
      }),
    )
+    for (const item of resolved) {
+      if (!item) continue
+      parts.push(item)
+    }
    return parts
  }

@@ -427,6 +432,12 @@ export namespace SessionPrompt {
        assistantMessage.time.completed = Date.now()
        await Session.updateMessage(assistantMessage)
        if (result && part.state.status === "running") {
+          const attachments = result.attachments?.map((attachment) => ({
+            ...attachment,
+            id: Identifier.ascending("part"),
+            messageID: assistantMessage.id,
+            sessionID: assistantMessage.sessionID,
+          }))
          await Session.updatePart({
            ...part,
            state: {
@@ -435,7 +446,7 @@ export namespace SessionPrompt {
              title: result.title,
              metadata: result.metadata,
              output: result.output,
-              attachments: result.attachments,
+              attachments,
              time: {
                ...part.state.time,
                end: Date.now(),
@@ -738,8 +749,6 @@ export namespace SessionPrompt {
      const execute = item.execute
      if (!execute) continue

-      const transformed = ProviderTransform.schema(input.model, asSchema(item.inputSchema).jsonSchema)
-      item.inputSchema = jsonSchema(transformed)
      // Wrap execute to add plugin hooks and format output
      item.execute = async (args, opts) => {
        const ctx = context(args, opts)
@@ -776,16 +785,13 @@ export namespace SessionPrompt {
        )

        const textParts: string[] = []
-        const attachments: MessageV2.FilePart[] = []
+        const attachments: Omit<MessageV2.FilePart, "id" | "messageID" | "sessionID">[] = []

        for (const contentItem of result.content) {
          if (contentItem.type === "text") {
            textParts.push(contentItem.text)
          } else if (contentItem.type === "image") {
            attachments.push({
-              id: Identifier.ascending("part"),
-              sessionID: input.session.id,
-              messageID: input.processor.message.id,
              type: "file",
              mime: contentItem.mimeType,
              url: `data:${contentItem.mimeType};base64,${contentItem.data}`,
@@ -797,9 +803,6 @@ export namespace SessionPrompt {
            }
            if (resource.blob) {
              attachments.push({
-                id: Identifier.ascending("part"),
-                sessionID: input.session.id,
-                messageID: input.processor.message.id,
                type: "file",
                mime: resource.mimeType ?? "application/octet-stream",
                url: `data:${resource.mimeType ?? "application/octet-stream"};base64,${resource.blob}`,
@@ -1048,6 +1051,7 @@ export namespace SessionPrompt {
                      pieces.push(
                        ...result.attachments.map((attachment) => ({
                          ...attachment,
+                          id: Identifier.ascending("part"),
                          synthetic: true,
                          filename: attachment.filename ?? part.filename,
                          messageID: info.id,
@@ -1185,7 +1189,18 @@ export namespace SessionPrompt {
          },
        ]
      }),
-    ).then((x) => x.flat())
+    )
+      .then((x) => x.flat())
+      .then((drafts) =>
+        drafts.map(
+          (part): MessageV2.Part => ({
+            ...part,
+            id: Identifier.ascending("part"),
+            messageID: info.id,
+            sessionID: input.sessionID,
+          }),
+        ),
+      )

    await Plugin.trigger(
      "chat.message",
@@ -1217,33 +1232,7 @@ export namespace SessionPrompt {
    const userMessage = input.messages.findLast((msg) => msg.info.role === "user")
    if (!userMessage) return input.messages

-    // Original logic when experimental plan mode is disabled
-    if (!Flag.OPENCODE_EXPERIMENTAL_PLAN_MODE) {
-      if (input.agent.name === "plan") {
-        userMessage.parts.push({
-          id: Identifier.ascending("part"),
-          messageID: userMessage.info.id,
-          sessionID: userMessage.info.sessionID,
-          type: "text",
-          text: PROMPT_PLAN,
-          synthetic: true,
-        })
-      }
-      const wasPlan = input.messages.some((msg) => msg.info.role === "assistant" && msg.info.agent === "plan")
-      if (wasPlan && input.agent.name === "build") {
-        userMessage.parts.push({
-          id: Identifier.ascending("part"),
-          messageID: userMessage.info.id,
-          sessionID: userMessage.info.sessionID,
-          type: "text",
-          text: BUILD_SWITCH,
-          synthetic: true,
-        })
-      }
-      return input.messages
-    }
-
-    // New plan mode logic when flag is enabled
+    // Plan mode logic
    const assistantMessage = input.messages.findLast((msg) => msg.info.role === "assistant")

    // Switching from plan mode to build mode
@@ -1500,15 +1489,12 @@ NOTE: At any point in time through this workflow you should feel free to ask the
    const matchingInvocation = invocations[shellName] ?? invocations[""]
    const args = matchingInvocation?.args

-    const cwd = Instance.directory
-    const shellEnv = await Plugin.trigger("shell.env", { cwd }, { env: {} })
    const proc = spawn(shell, args, {
-      cwd,
+      cwd: Instance.directory,
      detached: process.platform !== "win32",
      stdio: ["ignore", "pipe", "pipe"],
      env: {
        ...process.env,
-        ...shellEnv.env,
        TERM: "dumb",
      },
    })
--- a/packages/opencode/src/skill/skill.ts
+++ b/packages/opencode/src/skill/skill.ts
@@ -40,17 +40,12 @@ export namespace Skill {
    }),
  )

-  // External skill directories to search for (project-level and global)
-  // These follow the directory layout used by Claude Code and other agents.
-  const EXTERNAL_DIRS = [".claude", ".agents"]
-  const EXTERNAL_SKILL_GLOB = new Bun.Glob("skills/**/SKILL.md")
-
  const OPENCODE_SKILL_GLOB = new Bun.Glob("{skill,skills}/**/SKILL.md")
+  const CLAUDE_SKILL_GLOB = new Bun.Glob("skills/**/SKILL.md")
  const SKILL_GLOB = new Bun.Glob("**/SKILL.md")

  export const state = Instance.state(async () => {
    const skills: Record<string, Info> = {}
-    const dirs = new Set<string>()

    const addSkill = async (match: string) => {
      const md = await ConfigMarkdown.parse(match).catch((err) => {
@@ -76,8 +71,6 @@ export namespace Skill {
        })
      }

-      dirs.add(path.dirname(match))
-
      skills[parsed.data.name] = {
        name: parsed.data.name,
        description: parsed.data.description,
@@ -86,37 +79,38 @@ export namespace Skill {
      }
    }

-    const scanExternal = async (root: string, scope: "global" | "project") => {
-      return Array.fromAsync(
-        EXTERNAL_SKILL_GLOB.scan({
-          cwd: root,
-          absolute: true,
-          onlyFiles: true,
-          followSymlinks: true,
-          dot: true,
-        }),
-      )
-        .then((matches) => Promise.all(matches.map(addSkill)))
-        .catch((error) => {
-          log.error(`failed to scan ${scope} skills`, { dir: root, error })
-        })
-    }
-
-    // Scan external skill directories (.claude/skills/, .agents/skills/, etc.)
-    // Load global (home) first, then project-level (so project-level overwrites)
-    if (!Flag.OPENCODE_DISABLE_EXTERNAL_SKILLS) {
-      for (const dir of EXTERNAL_DIRS) {
-        const root = path.join(Global.Path.home, dir)
-        if (!(await Filesystem.isDir(root))) continue
-        await scanExternal(root, "global")
-      }
-
-      for await (const root of Filesystem.up({
-        targets: EXTERNAL_DIRS,
+    // Scan .claude/skills/ directories (project-level)
+    const claudeDirs = await Array.fromAsync(
+      Filesystem.up({
+        targets: [".claude"],
        start: Instance.directory,
        stop: Instance.worktree,
-      })) {
-        await scanExternal(root, "project")
+      }),
+    )
+    // Also include global ~/.claude/skills/
+    const globalClaude = `${Global.Path.home}/.claude`
+    if (await Filesystem.isDir(globalClaude)) {
+      claudeDirs.push(globalClaude)
+    }
+
+    if (!Flag.OPENCODE_DISABLE_CLAUDE_CODE_SKILLS) {
+      for (const dir of claudeDirs) {
+        const matches = await Array.fromAsync(
+          CLAUDE_SKILL_GLOB.scan({
+            cwd: dir,
+            absolute: true,
+            onlyFiles: true,
+            followSymlinks: true,
+            dot: true,
+          }),
+        ).catch((error) => {
+          log.error("failed .claude directory scan for skills", { dir, error })
+          return []
+        })
+
+        for (const match of matches) {
+          await addSkill(match)
+        }
      }
    }

@@ -151,21 +145,14 @@ export namespace Skill {
      }
    }

-    return {
-      skills,
-      dirs: Array.from(dirs),
-    }
+    return skills
  })

  export async function get(name: string) {
-    return state().then((x) => x.skills[name])
+    return state().then((x) => x[name])
  }

  export async function all() {
-    return state().then((x) => Object.values(x.skills))
-  }
-
-  export async function dirs() {
-    return state().then((x) => x.dirs)
+    return state().then((x) => Object.values(x))
  }
 }
--- a/packages/opencode/src/snapshot/index.ts
+++ b/packages/opencode/src/snapshot/index.ts
@@ -188,7 +188,6 @@ export namespace Snapshot {
      after: z.string(),
      additions: z.number(),
      deletions: z.number(),
-      status: z.enum(["added", "deleted", "modified"]).optional(),
    })
    .meta({
      ref: "FileDiff",
@@ -197,23 +196,6 @@ export namespace Snapshot {
  export async function diffFull(from: string, to: string): Promise<FileDiff[]> {
    const git = gitdir()
    const result: FileDiff[] = []
-    const status = new Map<string, "added" | "deleted" | "modified">()
-
-    const statuses =
-      await $`git -c core.autocrlf=false -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff --name-status --no-renames ${from} ${to} -- .`
-        .quiet()
-        .cwd(Instance.directory)
-        .nothrow()
-        .text()
-
-    for (const line of statuses.trim().split("\n")) {
-      if (!line) continue
-      const [code, file] = line.split("\t")
-      if (!code || !file) continue
-      const kind = code.startsWith("A") ? "added" : code.startsWith("D") ? "deleted" : "modified"
-      status.set(file, kind)
-    }
-
    for await (const line of $`git -c core.autocrlf=false -c core.quotepath=false --git-dir ${git} --work-tree ${Instance.worktree} diff --no-ext-diff --no-renames --numstat ${from} ${to} -- .`
      .quiet()
      .cwd(Instance.directory)
@@ -242,7 +224,6 @@ export namespace Snapshot {
        after,
        additions: Number.isFinite(added) ? added : 0,
        deletions: Number.isFinite(deleted) ? deleted : 0,
-        status: status.get(file) ?? "modified",
      })
    }
    return result
--- a/packages/opencode/src/tool/bash.ts
+++ b/packages/opencode/src/tool/bash.ts
@@ -16,7 +16,6 @@ import { Shell } from "@/shell/shell"

 import { BashArity } from "@/permission/arity"
 import { Truncate } from "./truncation"
-import { Plugin } from "@/plugin"

 const MAX_METADATA_LENGTH = 30_000
 const DEFAULT_TIMEOUT = Flag.OPENCODE_EXPERIMENTAL_BASH_DEFAULT_TIMEOUT_MS || 2 * 60 * 1000
@@ -129,10 +128,7 @@ export const BashTool = Tool.define("bash", async () => {
                process.platform === "win32" && resolved.match(/^\/[a-z]\//)
                  ? resolved.replace(/^\/([a-z])\//, (_, drive) => `${drive.toUpperCase()}:\\`).replace(/\//g, "\\")
                  : resolved
-              if (!Instance.containsPath(normalized)) {
-                const dir = (await Filesystem.isDir(normalized)) ? normalized : path.dirname(normalized)
-                directories.add(dir)
-              }
+              if (!Instance.containsPath(normalized)) directories.add(normalized)
            }
          }
        }
@@ -145,11 +141,10 @@ export const BashTool = Tool.define("bash", async () => {
      }

      if (directories.size > 0) {
-        const globs = Array.from(directories).map((dir) => path.join(dir, "*"))
        await ctx.ask({
          permission: "external_directory",
-          patterns: globs,
-          always: globs,
+          patterns: Array.from(directories),
+          always: Array.from(directories).map((x) => path.dirname(x) + "*"),
          metadata: {},
        })
      }
@@ -163,13 +158,11 @@ export const BashTool = Tool.define("bash", async () => {
        })
      }

-      const shellEnv = await Plugin.trigger("shell.env", { cwd }, { env: {} })
      const proc = spawn(params.command, {
        shell,
        cwd,
        env: {
          ...process.env,
-          ...shellEnv.env,
        },
        stdio: ["ignore", "pipe", "pipe"],
        detached: process.platform !== "win32",
--- a/packages/opencode/src/tool/batch.ts
+++ b/packages/opencode/src/tool/batch.ts
@@ -77,6 +77,12 @@ export const BatchTool = Tool.define("batch", async () => {
          })

          const result = await tool.execute(validatedParams, { ...ctx, callID: partID })
+          const attachments = result.attachments?.map((attachment) => ({
+            ...attachment,
+            id: Identifier.ascending("part"),
+            messageID: ctx.messageID,
+            sessionID: ctx.sessionID,
+          }))

          await Session.updatePart({
            id: partID,
@@ -91,7 +97,7 @@ export const BatchTool = Tool.define("batch", async () => {
              output: result.output,
              title: result.title,
              metadata: result.metadata,
-              attachments: result.attachments,
+              attachments,
              time: {
                start: callStartTime,
                end: Date.now(),
--- a/packages/opencode/src/tool/codesearch.ts
+++ b/packages/opencode/src/tool/codesearch.ts
@@ -1,7 +1,6 @@
 import z from "zod"
 import { Tool } from "./tool"
 import DESCRIPTION from "./codesearch.txt"
-import { abortAfterAny } from "../util/abort"

 const API_CONFIG = {
  BASE_URL: "https://mcp.exa.ai",
@@ -74,7 +73,8 @@ export const CodeSearchTool = Tool.define("codesearch", {
      },
    }

-    const { signal, clearTimeout } = abortAfterAny(30000, ctx.abort)
+    const controller = new AbortController()
+    const timeoutId = setTimeout(() => controller.abort(), 30000)

    try {
      const headers: Record<string, string> = {
@@ -86,10 +86,10 @@ export const CodeSearchTool = Tool.define("codesearch", {
        method: "POST",
        headers,
        body: JSON.stringify(codeRequest),
-        signal,
+        signal: AbortSignal.any([controller.signal, ctx.abort]),
      })

-      clearTimeout()
+      clearTimeout(timeoutId)

      if (!response.ok) {
        const errorText = await response.text()
@@ -120,7 +120,7 @@ export const CodeSearchTool = Tool.define("codesearch", {
        metadata: {},
      }
    } catch (error) {
-      clearTimeout()
+      clearTimeout(timeoutId)

      if (error instanceof Error && error.name === "AbortError") {
        throw new Error("Code search request timed out")
--- a/packages/opencode/src/tool/read.ts
+++ b/packages/opencode/src/tool/read.ts
@@ -6,7 +6,6 @@ import { LSP } from "../lsp"
 import { FileTime } from "../file/time"
 import DESCRIPTION from "./read.txt"
 import { Instance } from "../project/instance"
-import { Identifier } from "../id/id"
 import { assertExternalDirectory } from "./external-directory"
 import { InstructionPrompt } from "../session/instruction"

@@ -79,9 +78,6 @@ export const ReadTool = Tool.define("read", {
        },
        attachments: [
          {
-            id: Identifier.ascending("part"),
-            sessionID: ctx.sessionID,
-            messageID: ctx.messageID,
            type: "file",
            mime,
            url: `data:${mime};base64,${Buffer.from(await file.bytes()).toString("base64")}`,
--- a/packages/opencode/src/tool/registry.ts
+++ b/packages/opencode/src/tool/registry.ts
@@ -110,14 +110,14 @@ export namespace ToolRegistry {
      TaskTool,
      WebFetchTool,
      TodoWriteTool,
-      // TodoReadTool,
+      TodoReadTool,
      WebSearchTool,
      CodeSearchTool,
      SkillTool,
      ApplyPatchTool,
      ...(Flag.OPENCODE_EXPERIMENTAL_LSP_TOOL ? [LspTool] : []),
      ...(config.experimental?.batch_tool === true ? [BatchTool] : []),
-      ...(Flag.OPENCODE_EXPERIMENTAL_PLAN_MODE && Flag.OPENCODE_CLIENT === "cli" ? [PlanExitTool, PlanEnterTool] : []),
+      ...(Flag.OPENCODE_CLIENT === "cli" ? [PlanExitTool, PlanEnterTool] : []),
      ...custom,
    ]
  }
--- a/packages/opencode/src/tool/skill.ts
+++ b/packages/opencode/src/tool/skill.ts
@@ -1,11 +1,8 @@
 import path from "path"
-import { pathToFileURL } from "url"
 import z from "zod"
 import { Tool } from "./tool"
 import { Skill } from "../skill"
 import { PermissionNext } from "../permission/next"
-import { Ripgrep } from "../file/ripgrep"
-import { iife } from "@/util/iife"

 export const SkillTool = Tool.define("skill", async (ctx) => {
  const skills = await Skill.all()
@@ -21,29 +18,21 @@ export const SkillTool = Tool.define("skill", async (ctx) => {

  const description =
    accessibleSkills.length === 0
-      ? "Load a specialized skill that provides domain-specific instructions and workflows. No skills are currently available."
+      ? "Load a skill to get detailed instructions for a specific task. No skills are currently available."
      : [
-          "Load a specialized skill that provides domain-specific instructions and workflows.",
-          "",
-          "When you recognize that a task matches one of the available skills listed below, use this tool to load the full skill instructions.",
-          "",
-          "The skill will inject detailed instructions, workflows, and access to bundled resources (scripts, references, templates) into the conversation context.",
-          "",
-          'Tool output includes a `<skill_content name="...">` block with the loaded content.',
-          "",
-          "The following skills provide specialized sets of instructions for particular tasks",
-          "Invoke this tool to load a skill when a task matches one of the available skills listed below:",
-          "",
+          "Load a skill to get detailed instructions for a specific task.",
+          "Skills provide specialized knowledge and step-by-step guidance.",
+          "Use this when a task matches an available skill's description.",
+          "Only the skills listed here are available:",
          "<available_skills>",
          ...accessibleSkills.flatMap((skill) => [
            `  <skill>`,
            `    <name>${skill.name}</name>`,
            `    <description>${skill.description}</description>`,
-            `    <location>${pathToFileURL(skill.location).href}</location>`,
            `  </skill>`,
          ]),
          "</available_skills>",
-        ].join("\n")
+        ].join(" ")

  const examples = accessibleSkills
    .map((skill) => `'${skill.name}'`)
@@ -52,7 +41,7 @@ export const SkillTool = Tool.define("skill", async (ctx) => {
  const hint = examples.length > 0 ? ` (e.g., ${examples}, ...)` : ""

  const parameters = z.object({
-    name: z.string().describe(`The name of the skill from available_skills${hint}`),
+    name: z.string().describe(`The skill identifier from available_skills${hint}`),
  })

  return {
@@ -72,47 +61,15 @@ export const SkillTool = Tool.define("skill", async (ctx) => {
        always: [params.name],
        metadata: {},
      })
-
+      const content = skill.content
      const dir = path.dirname(skill.location)
-      const base = pathToFileURL(dir).href

-      const limit = 10
-      const files = await iife(async () => {
-        const arr = []
-        for await (const file of Ripgrep.files({
-          cwd: dir,
-          follow: false,
-          hidden: true,
-          signal: ctx.abort,
-        })) {
-          if (file.includes("SKILL.md")) {
-            continue
-          }
-          arr.push(path.resolve(dir, file))
-          if (arr.length >= limit) {
-            break
-          }
-        }
-        return arr
-      }).then((f) => f.map((file) => `<file>${file}</file>`).join("\n"))
+      // Format output similar to plugin pattern
+      const output = [`## Skill: ${skill.name}`, "", `**Base directory**: ${dir}`, "", content.trim()].join("\n")

      return {
        title: `Loaded skill: ${skill.name}`,
-        output: [
-          `<skill_content name="${skill.name}">`,
-          `# Skill: ${skill.name}`,
-          "",
-          skill.content.trim(),
-          "",
-          `Base directory for this skill: ${base}`,
-          "Relative paths in this skill (e.g., scripts/, reference/) are relative to this base directory.",
-          "Note: file list is sampled.",
-          "",
-          "<skill_files>",
-          files,
-          "</skill_files>",
-          "</skill_content>",
-        ].join("\n"),
+        output,
        metadata: {
          name: skill.name,
          dir,
--- a/packages/opencode/src/tool/tool.ts
+++ b/packages/opencode/src/tool/tool.ts
@@ -36,7 +36,7 @@ export namespace Tool {
        title: string
        metadata: M
        output: string
-        attachments?: MessageV2.FilePart[]
+        attachments?: Omit<MessageV2.FilePart, "id" | "sessionID" | "messageID">[]
      }>
      formatValidationError?(error: z.ZodError): string
    }>
--- a/packages/opencode/src/tool/webfetch.ts
+++ b/packages/opencode/src/tool/webfetch.ts
@@ -2,7 +2,6 @@ import z from "zod"
 import { Tool } from "./tool"
 import TurndownService from "turndown"
 import DESCRIPTION from "./webfetch.txt"
-import { abortAfterAny } from "../util/abort"

 const MAX_RESPONSE_SIZE = 5 * 1024 * 1024 // 5MB
 const DEFAULT_TIMEOUT = 30 * 1000 // 30 seconds
@@ -37,7 +36,8 @@ export const WebFetchTool = Tool.define("webfetch", {

    const timeout = Math.min((params.timeout ?? DEFAULT_TIMEOUT / 1000) * 1000, MAX_TIMEOUT)

-    const { signal, clearTimeout } = abortAfterAny(timeout, ctx.abort)
+    const controller = new AbortController()
+    const timeoutId = setTimeout(() => controller.abort(), timeout)

    // Build Accept header based on requested format with q parameters for fallbacks
    let acceptHeader = "*/*"
@@ -55,6 +55,8 @@ export const WebFetchTool = Tool.define("webfetch", {
        acceptHeader =
          "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8"
    }
+
+    const signal = AbortSignal.any([controller.signal, ctx.abort])
    const headers = {
      "User-Agent":
        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36",
@@ -70,7 +72,7 @@ export const WebFetchTool = Tool.define("webfetch", {
        ? await fetch(params.url, { signal, headers: { ...headers, "User-Agent": "opencode" } })
        : initial

-    clearTimeout()
+    clearTimeout(timeoutId)

    if (!response.ok) {
      throw new Error(`Request failed with status code: ${response.status}`)
--- a/packages/opencode/src/tool/websearch.ts
+++ b/packages/opencode/src/tool/websearch.ts
@@ -1,7 +1,6 @@
 import z from "zod"
 import { Tool } from "./tool"
 import DESCRIPTION from "./websearch.txt"
-import { abortAfterAny } from "../util/abort"

 const API_CONFIG = {
  BASE_URL: "https://mcp.exa.ai",
@@ -92,7 +91,8 @@ export const WebSearchTool = Tool.define("websearch", async () => {
        },
      }

-      const { signal, clearTimeout } = abortAfterAny(25000, ctx.abort)
+      const controller = new AbortController()
+      const timeoutId = setTimeout(() => controller.abort(), 25000)

      try {
        const headers: Record<string, string> = {
@@ -104,10 +104,10 @@ export const WebSearchTool = Tool.define("websearch", async () => {
          method: "POST",
          headers,
          body: JSON.stringify(searchRequest),
-          signal,
+          signal: AbortSignal.any([controller.signal, ctx.abort]),
        })

-        clearTimeout()
+        clearTimeout(timeoutId)

        if (!response.ok) {
          const errorText = await response.text()
@@ -137,7 +137,7 @@ export const WebSearchTool = Tool.define("websearch", async () => {
          metadata: {},
        }
      } catch (error) {
-        clearTimeout()
+        clearTimeout(timeoutId)

        if (error instanceof Error && error.name === "AbortError") {
          throw new Error("Search request timed out")
--- a/packages/opencode/src/util/abort.ts
+++ b/packages/opencode/src/util/abort.ts
@@ -1,35 +0,0 @@
-/**
- * Creates an AbortController that automatically aborts after a timeout.
- *
- * Uses bind() instead of arrow functions to avoid capturing the surrounding
- * scope in closures. Arrow functions like `() => controller.abort()` capture
- * request bodies and other large objects, preventing GC for the timer lifetime.
- *
- * @param ms Timeout in milliseconds
- * @returns Object with controller, signal, and clearTimeout function
- */
-export function abortAfter(ms: number) {
-  const controller = new AbortController()
-  const id = setTimeout(controller.abort.bind(controller), ms)
-  return {
-    controller,
-    signal: controller.signal,
-    clearTimeout: () => globalThis.clearTimeout(id),
-  }
-}
-
-/**
- * Combines multiple AbortSignals with a timeout.
- *
- * @param ms Timeout in milliseconds
- * @param signals Additional signals to combine
- * @returns Combined signal that aborts on timeout or when any input signal aborts
- */
-export function abortAfterAny(ms: number, ...signals: AbortSignal[]) {
-  const timeout = abortAfter(ms)
-  const signal = AbortSignal.any([timeout.signal, ...signals])
-  return {
-    signal,
-    clearTimeout: timeout.clearTimeout,
-  }
-}
--- a/packages/opencode/test/agent/agent.test.ts
+++ b/packages/opencode/test/agent/agent.test.ts
@@ -1,5 +1,4 @@
 import { test, expect } from "bun:test"
-import path from "path"
 import { tmpdir } from "../fixture/fixture"
 import { Instance } from "../../src/project/instance"
 import { Agent } from "../../src/agent/agent"
@@ -448,7 +447,7 @@ test("legacy tools config maps write/edit/patch/multiedit to edit permission", a
  })
 })

-test("Truncate.GLOB is allowed even when user denies external_directory globally", async () => {
+test("Truncate.DIR is allowed even when user denies external_directory globally", async () => {
  const { Truncate } = await import("../../src/tool/truncation")
  await using tmp = await tmpdir({
    config: {
@@ -461,14 +460,14 @@ test("Truncate.GLOB is allowed even when user denies external_directory globally
    directory: tmp.path,
    fn: async () => {
      const build = await Agent.get("build")
+      expect(PermissionNext.evaluate("external_directory", Truncate.DIR, build!.permission).action).toBe("allow")
      expect(PermissionNext.evaluate("external_directory", Truncate.GLOB, build!.permission).action).toBe("allow")
-      expect(PermissionNext.evaluate("external_directory", Truncate.DIR, build!.permission).action).toBe("deny")
      expect(PermissionNext.evaluate("external_directory", "/some/other/path", build!.permission).action).toBe("deny")
    },
  })
 })

-test("Truncate.GLOB is allowed even when user denies external_directory per-agent", async () => {
+test("Truncate.DIR is allowed even when user denies external_directory per-agent", async () => {
  const { Truncate } = await import("../../src/tool/truncation")
  await using tmp = await tmpdir({
    config: {
@@ -485,21 +484,21 @@ test("Truncate.GLOB is allowed even when user denies external_directory per-agen
    directory: tmp.path,
    fn: async () => {
      const build = await Agent.get("build")
+      expect(PermissionNext.evaluate("external_directory", Truncate.DIR, build!.permission).action).toBe("allow")
      expect(PermissionNext.evaluate("external_directory", Truncate.GLOB, build!.permission).action).toBe("allow")
-      expect(PermissionNext.evaluate("external_directory", Truncate.DIR, build!.permission).action).toBe("deny")
      expect(PermissionNext.evaluate("external_directory", "/some/other/path", build!.permission).action).toBe("deny")
    },
  })
 })

-test("explicit Truncate.GLOB deny is respected", async () => {
+test("explicit Truncate.DIR deny is respected", async () => {
  const { Truncate } = await import("../../src/tool/truncation")
  await using tmp = await tmpdir({
    config: {
      permission: {
        external_directory: {
          "*": "deny",
-          [Truncate.GLOB]: "deny",
+          [Truncate.DIR]: "deny",
        },
      },
    },
@@ -508,48 +507,12 @@ test("explicit Truncate.GLOB deny is respected", async () => {
    directory: tmp.path,
    fn: async () => {
      const build = await Agent.get("build")
-      expect(PermissionNext.evaluate("external_directory", Truncate.GLOB, build!.permission).action).toBe("deny")
      expect(PermissionNext.evaluate("external_directory", Truncate.DIR, build!.permission).action).toBe("deny")
+      expect(PermissionNext.evaluate("external_directory", Truncate.GLOB, build!.permission).action).toBe("deny")
    },
  })
 })

-test("skill directories are allowed for external_directory", async () => {
-  await using tmp = await tmpdir({
-    git: true,
-    init: async (dir) => {
-      const skillDir = path.join(dir, ".opencode", "skill", "perm-skill")
-      await Bun.write(
-        path.join(skillDir, "SKILL.md"),
-        `---
-name: perm-skill
-description: Permission skill.
---
-
-# Permission Skill
-`,
-      )
-    },
-  })
-
-  const home = process.env.OPENCODE_TEST_HOME
-  process.env.OPENCODE_TEST_HOME = tmp.path
-
-  try {
-    await Instance.provide({
-      directory: tmp.path,
-      fn: async () => {
-        const build = await Agent.get("build")
-        const skillDir = path.join(tmp.path, ".opencode", "skill", "perm-skill")
-        const target = path.join(skillDir, "reference", "notes.md")
-        expect(PermissionNext.evaluate("external_directory", target, build!.permission).action).toBe("allow")
-      },
-    })
-  } finally {
-    process.env.OPENCODE_TEST_HOME = home
-  }
-})
-
 test("defaultAgent returns build when no default_agent config", async () => {
  await using tmp = await tmpdir()
  await Instance.provide({
--- a/packages/opencode/test/config/agent-color.test.ts
+++ b/packages/opencode/test/config/agent-color.test.ts
@@ -15,7 +15,6 @@ test("agent color parsed from project config", async () => {
          $schema: "https://opencode.ai/config.json",
          agent: {
            build: { color: "#FFA500" },
-            plan: { color: "primary" },
          },
        }),
      )
@@ -26,7 +25,6 @@ test("agent color parsed from project config", async () => {
    fn: async () => {
      const cfg = await Config.get()
      expect(cfg.agent?.["build"]?.color).toBe("#FFA500")
-      expect(cfg.agent?.["plan"]?.color).toBe("primary")
    },
  })
 })
@@ -40,7 +38,6 @@ test("Agent.get includes color from config", async () => {
          $schema: "https://opencode.ai/config.json",
          agent: {
            plan: { color: "#A855F7" },
-            build: { color: "accent" },
          },
        }),
      )
@@ -51,8 +48,6 @@ test("Agent.get includes color from config", async () => {
    fn: async () => {
      const plan = await AgentSvc.get("plan")
      expect(plan?.color).toBe("#A855F7")
-      const build = await AgentSvc.get("build")
-      expect(build?.color).toBe("accent")
    },
  })
 })
--- a/Show More
+++ b/Show More