fix(app): startup homepage flash

2026-03-13 09:50:37 -05:00
436 changed files with 8522 additions and 15301 deletions
@@ -10,7 +10,6 @@
 adamdotdevin
 -agusbasari29 AI PR slop
 ariane-emory
 -danieljoshuanazareth
 edemaine
 -florianleibert
 fwang
@@ -18,9 +17,7 @@ iamdavidhill
 jayair
 kitlangton
 kommander
 -opencode2026
 r44vc0rp
 rekram1-node
 -spider-yamet clawdbot/llm psychosis, spam pinging the team
 thdxr
 -danieljoshuanazareth
@@ -41,13 +41,5 @@ runs:
      shell: bash
    - name: Install dependencies
-      run: |
+      run: bun install
        # Workaround for patched peer variants
        # e.g. ./patches/ for standard-openapi
        # https://github.com/oven-sh/bun/issues/28147
        if [ "$RUNNER_OS" = "Windows" ]; then
          bun install --linker hoisted
        else
          bun install
        fi
      shell: bash
@@ -50,17 +50,20 @@ jobs:
  e2e:
    name: e2e (${{ matrix.settings.name }})
    needs: unit
    strategy:
      fail-fast: false
      matrix:
        settings:
          - name: linux
            host: blacksmith-4vcpu-ubuntu-2404
            playwright: bunx playwright install --with-deps
          - name: windows
            host: blacksmith-4vcpu-windows-2025
            playwright: bunx playwright install
    runs-on: ${{ matrix.settings.host }}
    env:
-      PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/.playwright-browsers
+      PLAYWRIGHT_BROWSERS_PATH: 0
    defaults:
      run:
        shell: bash
@@ -73,28 +76,9 @@ jobs:
      - name: Setup Bun
        uses: ./.github/actions/setup-bun
      - name: Read Playwright version
        id: playwright-version
        run: |
          version=$(node -e 'console.log(require("./packages/app/package.json").devDependencies["@playwright/test"])')
          echo "version=$version" >> "$GITHUB_OUTPUT"
      - name: Cache Playwright browsers
        id: playwright-cache
        uses: actions/cache@v4
        with:
          path: ${{ github.workspace }}/.playwright-browsers
          key: ${{ runner.os }}-${{ runner.arch }}-playwright-${{ steps.playwright-version.outputs.version }}-chromium
      - name: Install Playwright system dependencies
        if: runner.os == 'Linux'
        working-directory: packages/app
        run: bunx playwright install-deps chromium
      - name: Install Playwright browsers
        if: steps.playwright-cache.outputs.cache-hit != 'true'
        working-directory: packages/app
-        run: bunx playwright install chromium
+        run: ${{ matrix.settings.playwright }}
      - name: Run app e2e tests
        run: bun --cwd packages/app test:e2e:local
@@ -1,6 +1,4 @@
-node_modules
+plans/
 plans
 package.json
 bun.lock
-.gitignore
+package.json
-package-lock.json
+package-lock.json
@@ -1,7 +1,7 @@
 ---
 description: Translate content for a specified locale while preserving technical terms
 mode: subagent
-model: opencode/gpt-5.4
+model: opencode/gemini-3-pro
 ---
 You are a professional translator and localization specialist.
@@ -1,5 +1,7 @@
 /// <reference path="../env.d.ts" />
 import { tool } from "@opencode-ai/plugin"
 import DESCRIPTION from "./github-pr-search.txt"
 async function githubFetch(endpoint: string, options: RequestInit = {}) {
  const response = await fetch(`https://api.github.com${endpoint}`, {
    ...options,
@@ -22,16 +24,7 @@ interface PR {
 }
 export default tool({
-  description: `Use this tool to search GitHub pull requests by title and description.
+  description: DESCRIPTION,
 This tool searches PRs in the anomalyco/opencode repository and returns LLM-friendly results including:
 - PR number and title
 - Author
 - State (open/closed/merged)
 - Labels
 - Description snippet
 Use the query parameter to search for keywords that might appear in PR titles or descriptions.`,
  args: {
    query: tool.schema.string().describe("Search query for PR titles and descriptions"),
    limit: tool.schema.number().describe("Maximum number of results to return").default(10),
@@ -0,0 +1,10 @@
 Use this tool to search GitHub pull requests by title and description.
 This tool searches PRs in the anomalyco/opencode repository and returns LLM-friendly results including:
 - PR number and title
 - Author
 - State (open/closed/merged)
 - Labels
 - Description snippet
 Use the query parameter to search for keywords that might appear in PR titles or descriptions.
@@ -1,5 +1,7 @@
 /// <reference path="../env.d.ts" />
 import { tool } from "@opencode-ai/plugin"
 import DESCRIPTION from "./github-triage.txt"
 const TEAM = {
  desktop: ["adamdotdevin", "iamdavidhill", "Brendonovich", "nexxeln"],
  zen: ["fwang", "MrMushrooooom"],
@@ -38,12 +40,7 @@ async function githubFetch(endpoint: string, options: RequestInit = {}) {
 }
 export default tool({
-  description: `Use this tool to assign and/or label a GitHub issue.
+  description: DESCRIPTION,
 Choose labels and assignee using the current triage policy and ownership rules.
 Pick the most fitting labels for the issue and assign one owner.
 If unsure, choose the team/section with the most overlap with the issue and assign a member from that team at random.`,
  args: {
    assignee: tool.schema
      .enum(ASSIGNEES as [string, ...string[]])
@@ -0,0 +1,6 @@
 Use this tool to assign and/or label a GitHub issue.
 Choose labels and assignee using the current triage policy and ownership rules.
 Pick the most fitting labels for the issue and assign one owner.
 If unsure, choose the team/section with the most overlap with the issue and assign a member from that team at random.
@@ -26,7 +26,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -44,10 +44,9 @@
        "@solid-primitives/websocket": "1.3.1",
        "@solidjs/meta": "catalog:",
        "@solidjs/router": "catalog:",
        "@tanstack/solid-query": "5.91.4",
        "@thisbeyond/solid-dnd": "0.7.5",
        "diff": "catalog:",
-        "effect": "catalog:",
+        "effect": "4.0.0-beta.31",
        "fuzzysort": "catalog:",
        "ghostty-web": "github:anomalyco/ghostty-web#main",
        "luxon": "catalog:",
@@ -78,7 +77,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -112,7 +111,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -139,7 +138,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@ai-sdk/anthropic": "2.0.0",
        "@ai-sdk/openai": "2.0.2",
@@ -163,7 +162,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -187,7 +186,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -220,7 +219,7 @@
    },
    "packages/desktop-electron": {
      "name": "@opencode-ai/desktop-electron",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -228,7 +227,7 @@
        "@solid-primitives/storage": "catalog:",
        "@solidjs/meta": "catalog:",
        "@solidjs/router": "0.15.4",
-        "effect": "catalog:",
+        "effect": "4.0.0-beta.31",
        "electron-log": "^5",
        "electron-store": "^10",
        "electron-updater": "^6",
@@ -251,7 +250,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@opencode-ai/util": "workspace:*",
@@ -280,7 +279,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -296,7 +295,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -325,7 +324,8 @@
        "@ai-sdk/xai": "2.0.51",
        "@aws-sdk/credential-providers": "3.993.0",
        "@clack/prompts": "1.0.0-alpha.1",
-        "@effect/platform-node": "catalog:",
+        "@gitlab/gitlab-ai-provider": "3.6.0",
        "@gitlab/opencode-gitlab-auth": "1.3.3",
        "@hono/standard-validator": "0.1.5",
        "@hono/zod-validator": "catalog:",
        "@modelcontextprotocol/sdk": "1.25.2",
@@ -351,13 +351,11 @@
        "bun-pty": "0.4.8",
        "chokidar": "4.0.3",
        "clipboardy": "4.0.0",
        "cross-spawn": "^7.0.6",
        "decimal.js": "10.5.0",
        "diff": "catalog:",
-        "drizzle-orm": "catalog:",
+        "drizzle-orm": "1.0.0-beta.16-ea816b6",
        "effect": "catalog:",
        "fuzzysort": "3.1.0",
        "gitlab-ai-provider": "5.2.2",
        "glob": "13.0.5",
        "google-auth-library": "10.5.0",
        "gray-matter": "4.0.3",
@@ -368,7 +366,6 @@
        "mime-types": "3.0.2",
        "minimatch": "10.0.3",
        "open": "10.1.2",
        "opencode-gitlab-auth": "2.0.0",
        "opentui-spinner": "0.0.6",
        "partial-json": "0.1.7",
        "remeda": "catalog:",
@@ -403,15 +400,14 @@
        "@tsconfig/bun": "catalog:",
        "@types/babel__core": "7.20.5",
        "@types/bun": "catalog:",
        "@types/cross-spawn": "6.0.6",
        "@types/mime-types": "3.0.1",
        "@types/semver": "^7.5.8",
        "@types/turndown": "5.0.5",
        "@types/which": "3.0.4",
        "@types/yargs": "17.0.33",
        "@typescript/native-preview": "catalog:",
-        "drizzle-kit": "catalog:",
+        "drizzle-kit": "1.0.0-beta.16-ea816b6",
-        "drizzle-orm": "catalog:",
+        "drizzle-orm": "1.0.0-beta.16-ea816b6",
        "typescript": "catalog:",
        "vscode-languageserver-types": "3.17.5",
        "why-is-node-running": "3.2.2",
@@ -420,7 +416,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "zod": "catalog:",
@@ -444,7 +440,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "devDependencies": {
        "@hey-api/openapi-ts": "0.90.10",
        "@tsconfig/node22": "catalog:",
@@ -455,7 +451,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -490,7 +486,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -536,7 +532,7 @@
    },
    "packages/util": {
      "name": "@opencode-ai/util",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "zod": "catalog:",
      },
@@ -547,7 +543,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.2.27",
+      "version": "1.2.25",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -587,8 +583,6 @@
  ],
  "patchedDependencies": {
    "@openrouter/ai-sdk-provider@1.5.4": "patches/@openrouter%2Fai-sdk-provider@1.5.4.patch",
    "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
    "@ai-sdk/xai@2.0.51": "patches/@ai-sdk%2Fxai@2.0.51.patch",
    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
  },
  "overrides": {
@@ -597,7 +591,6 @@
  },
  "catalog": {
    "@cloudflare/workers-types": "4.20251008.0",
    "@effect/platform-node": "4.0.0-beta.35",
    "@hono/zod-validator": "0.4.2",
    "@kobalte/core": "0.13.11",
    "@octokit/rest": "22.0.0",
@@ -619,9 +612,9 @@
    "ai": "5.0.124",
    "diff": "8.0.2",
    "dompurify": "3.3.1",
-    "drizzle-kit": "1.0.0-beta.19-d95b7a4",
+    "drizzle-kit": "1.0.0-beta.16-ea816b6",
-    "drizzle-orm": "1.0.0-beta.19-d95b7a4",
+    "drizzle-orm": "1.0.0-beta.16-ea816b6",
-    "effect": "4.0.0-beta.35",
+    "effect": "4.0.0-beta.31",
    "fuzzysort": "3.1.0",
    "hono": "4.10.7",
    "hono-openapi": "1.1.2",
@@ -979,10 +972,6 @@
    "@effect/language-service": ["@effect/language-service@0.79.0", "", { "bin": { "effect-language-service": "cli.js" } }, "sha512-DEmIOsg1GjjP6s9HXH1oJrW+gDmzkhVv9WOZl6to5eNyyCrjz1S2PDqQ7aYrW/HuifhfwI5Bik1pK4pj7Z+lrg=="],
    "@effect/platform-node": ["@effect/platform-node@4.0.0-beta.35", "", { "dependencies": { "@effect/platform-node-shared": "^4.0.0-beta.35", "mime": "^4.1.0", "undici": "^7.24.0" }, "peerDependencies": { "effect": "^4.0.0-beta.35", "ioredis": "^5.7.0" } }, "sha512-HPc2xZASl9F9y/xJ01bQgFD6Jf9XP4Fcv/BlVTvG0Yr/uN63lwKZYr/VXor5K5krHfBDeCBD8y7/SICPYZoq3A=="],
    "@effect/platform-node-shared": ["@effect/platform-node-shared@4.0.0-beta.35", "", { "dependencies": { "@types/ws": "^8.18.1", "ws": "^8.19.0" }, "peerDependencies": { "effect": "^4.0.0-beta.35" } }, "sha512-9bPqNV988itKJ7MQoJuzmR014DB9EZRDOnhJt/+iJlb8qLoR9HnCzNJb9gfBdYhFmVYc8DMsQxG81rdJzpv9tg=="],
    "@electron/asar": ["@electron/asar@3.4.1", "", { "dependencies": { "commander": "^5.0.0", "glob": "^7.1.6", "minimatch": "^3.0.4" }, "bin": { "asar": "bin/asar.js" } }, "sha512-i4/rNPRS84t0vSRa2HorerGRXWyF4vThfHesw0dmcWHp+cspK743UanA0suA5Q5y8kzY2y6YKrvbIUn69BCAiA=="],
    "@electron/fuses": ["@electron/fuses@1.8.0", "", { "dependencies": { "chalk": "^4.1.1", "fs-extra": "^9.0.1", "minimist": "^1.2.5" }, "bin": { "electron-fuses": "dist/bin.js" } }, "sha512-zx0EIq78WlY/lBb1uXlziZmDZI4ubcCXIMJ4uGjXzZW0nS19TjSPeXPAjzzTmKQlJUZm0SbmZhPKP7tuQ1SsEw=="],
@@ -1111,6 +1100,10 @@
    "@fontsource/inter": ["@fontsource/inter@5.2.8", "", {}, "sha512-P6r5WnJoKiNVV+zvW2xM13gNdFhAEpQ9dQJHt3naLvfg+LkF2ldgSLiF4T41lf1SQCM9QmkqPTn4TH568IRagg=="],
    "@gitlab/gitlab-ai-provider": ["@gitlab/gitlab-ai-provider@3.6.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-8LmcIQ86xkMtC7L4P1/QYVEC+yKMTRerfPeniaaQGalnzXKtX6iMHLjLPOL9Rxp55lOXi6ed0WrFuJzZx+fNRg=="],
    "@gitlab/opencode-gitlab-auth": ["@gitlab/opencode-gitlab-auth@1.3.3", "", { "dependencies": { "@fastify/rate-limit": "^10.2.0", "@opencode-ai/plugin": "*", "fastify": "^5.2.0", "open": "^10.0.0" } }, "sha512-FT+KsCmAJjtqWr1YAq0MywGgL9kaLQ4apmsoowAXrPqHtoYf2i/nY10/A+L06kNj22EATeEDRpbB1NWXMto/SA=="],
    "@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=="],
    "@happy-dom/global-registrator": ["@happy-dom/global-registrator@20.0.11", "", { "dependencies": { "@types/node": "^20.0.0", "happy-dom": "^20.0.11" } }, "sha512-GqNqiShBT/lzkHTMC/slKBrvN0DsD4Di8ssBk4aDaVgEn+2WMzE6DXxq701ndSXj7/0cJ8mNT71pM7Bnrr6JRw=="],
@@ -1175,8 +1168,6 @@
    "@internationalized/number": ["@internationalized/number@3.6.5", "", { "dependencies": { "@swc/helpers": "^0.5.0" } }, "sha512-6hY4Kl4HPBvtfS62asS/R22JzNNy8vi/Ssev7x6EobfCp+9QIB2hKvI2EtbdJ0VSQacxVNtqhE/NmF/NZ0gm6g=="],
    "@ioredis/commands": ["@ioredis/commands@1.5.1", "", {}, "sha512-JH8ZL/ywcJyR9MmJ5BNqZllXNZQqQbnVZOqpPQqE1vHiFgAw4NHbvE0FOduNU8IX9babitBT46571OnPTT0Zcw=="],
    "@isaacs/balanced-match": ["@isaacs/balanced-match@4.0.1", "", {}, "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ=="],
    "@isaacs/brace-expansion": ["@isaacs/brace-expansion@5.0.1", "", { "dependencies": { "@isaacs/balanced-match": "^4.0.1" } }, "sha512-WMz71T1JS624nWj2n2fnYAuPovhv7EUhk69R6i9dsVyzxt5eM3bjwvgk9L+APE1TRscGysAVMANkB0jh0LQZrQ=="],
@@ -1967,14 +1958,10 @@
    "@tanstack/directive-functions-plugin": ["@tanstack/directive-functions-plugin@1.134.5", "", { "dependencies": { "@babel/code-frame": "7.27.1", "@babel/core": "^7.27.7", "@babel/traverse": "^7.27.7", "@babel/types": "^7.27.7", "@tanstack/router-utils": "1.133.19", "babel-dead-code-elimination": "^1.0.10", "pathe": "^2.0.3", "tiny-invariant": "^1.3.3" }, "peerDependencies": { "vite": ">=6.0.0 || >=7.0.0" } }, "sha512-J3oawV8uBRBbPoLgMdyHt+LxzTNuWRKNJJuCLWsm/yq6v0IQSvIVCgfD2+liIiSnDPxGZ8ExduPXy8IzS70eXw=="],
    "@tanstack/query-core": ["@tanstack/query-core@5.91.2", "", {}, "sha512-Uz2pTgPC1mhqrrSGg18RKCWT/pkduAYtxbcyIyKBhw7dTWjXZIzqmpzO2lBkyWr4hlImQgpu1m1pei3UnkFRWw=="],
    "@tanstack/router-utils": ["@tanstack/router-utils@1.133.19", "", { "dependencies": { "@babel/core": "^7.27.4", "@babel/generator": "^7.27.5", "@babel/parser": "^7.27.5", "@babel/preset-typescript": "^7.27.1", "ansis": "^4.1.0", "diff": "^8.0.2", "pathe": "^2.0.3", "tinyglobby": "^0.2.15" } }, "sha512-WEp5D2gPxvlLDRXwD/fV7RXjYtqaqJNXKB/L6OyZEbT+9BG/Ib2d7oG9GSUZNNMGPGYAlhBUOi3xutySsk6rxA=="],
    "@tanstack/server-functions-plugin": ["@tanstack/server-functions-plugin@1.134.5", "", { "dependencies": { "@babel/code-frame": "7.27.1", "@babel/core": "^7.27.7", "@babel/plugin-syntax-jsx": "^7.27.1", "@babel/plugin-syntax-typescript": "^7.27.1", "@babel/template": "^7.27.2", "@babel/traverse": "^7.27.7", "@babel/types": "^7.27.7", "@tanstack/directive-functions-plugin": "1.134.5", "babel-dead-code-elimination": "^1.0.9", "tiny-invariant": "^1.3.3" } }, "sha512-2sWxq70T+dOEUlE3sHlXjEPhaFZfdPYlWTSkHchWXrFGw2YOAa+hzD6L9wHMjGDQezYd03ue8tQlHG+9Jzbzgw=="],
    "@tanstack/solid-query": ["@tanstack/solid-query@5.91.4", "", { "dependencies": { "@tanstack/query-core": "5.91.2" }, "peerDependencies": { "solid-js": "^1.6.0" } }, "sha512-oCEgn8iT7WnF/7ISd7usBpUK1C9EdvQfg8ZUpKNKZ4edVClICZrCX6f3/Bp8ZlwQnL21KLc2rp+CejEuehlRxg=="],
    "@tauri-apps/api": ["@tauri-apps/api@2.10.1", "", {}, "sha512-hKL/jWf293UDSUN09rR69hrToyIXBb8CjGaWC7gfinvnQrBVvnLr08FeFi38gxtugAVyVcTa5/FD/Xnkb1siBw=="],
    "@tauri-apps/cli": ["@tauri-apps/cli@2.10.1", "", { "optionalDependencies": { "@tauri-apps/cli-darwin-arm64": "2.10.1", "@tauri-apps/cli-darwin-x64": "2.10.1", "@tauri-apps/cli-linux-arm-gnueabihf": "2.10.1", "@tauri-apps/cli-linux-arm64-gnu": "2.10.1", "@tauri-apps/cli-linux-arm64-musl": "2.10.1", "@tauri-apps/cli-linux-riscv64-gnu": "2.10.1", "@tauri-apps/cli-linux-x64-gnu": "2.10.1", "@tauri-apps/cli-linux-x64-musl": "2.10.1", "@tauri-apps/cli-win32-arm64-msvc": "2.10.1", "@tauri-apps/cli-win32-ia32-msvc": "2.10.1", "@tauri-apps/cli-win32-x64-msvc": "2.10.1" }, "bin": { "tauri": "tauri.js" } }, "sha512-jQNGF/5quwORdZSSLtTluyKQ+o6SMa/AUICfhf4egCGFdMHqWssApVgYSbg+jmrZoc8e1DscNvjTnXtlHLS11g=="],
@@ -2065,8 +2052,6 @@
    "@types/connect": ["@types/connect@3.4.38", "", { "dependencies": { "@types/node": "*" } }, "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="],
    "@types/cross-spawn": ["@types/cross-spawn@6.0.6", "", { "dependencies": { "@types/node": "*" } }, "sha512-fXRhhUkG4H3TQk5dBhQ7m/JDdSNHKwR2BBia62lhwEIq9xGiQKLxd6LymNhn47SjXhsUEPmxi+PKw2OkW4LLjA=="],
    "@types/debug": ["@types/debug@4.1.12", "", { "dependencies": { "@types/ms": "*" } }, "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ=="],
    "@types/deep-eql": ["@types/deep-eql@4.0.2", "", {}, "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw=="],
@@ -2551,8 +2536,6 @@
    "clsx": ["clsx@2.1.1", "", {}, "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA=="],
    "cluster-key-slot": ["cluster-key-slot@1.1.2", "", {}, "sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA=="],
    "collapse-white-space": ["collapse-white-space@2.1.0", "", {}, "sha512-loKTxY1zCOuG4j9f6EPnuyyYkf58RnhhWTvRoZEokgB+WbdXehfjFviyOVYkqzEWz1Q5kRiZdBYS5SwxbQYwzw=="],
    "color": ["color@4.2.3", "", { "dependencies": { "color-convert": "^2.0.1", "color-string": "^1.9.0" } }, "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A=="],
@@ -2739,9 +2722,9 @@
    "dotenv-expand": ["dotenv-expand@11.0.7", "", { "dependencies": { "dotenv": "^16.4.5" } }, "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA=="],
-    "drizzle-kit": ["drizzle-kit@1.0.0-beta.19-d95b7a4", "", { "dependencies": { "@drizzle-team/brocli": "^0.11.0", "@js-temporal/polyfill": "^0.5.1", "esbuild": "^0.25.10", "get-tsconfig": "^4.13.6", "jiti": "^2.6.1" }, "bin": { "drizzle-kit": "bin.cjs" } }, "sha512-M0sqc+42TYBod6kEZ3AsW6+JWe3+76gR1aDFbHH5DmuLKEwewmbzlhBG6qnvV6YA1cIIbkuam3dC7r6PREOCXw=="],
+    "drizzle-kit": ["drizzle-kit@1.0.0-beta.16-ea816b6", "", { "dependencies": { "@drizzle-team/brocli": "^0.11.0", "@js-temporal/polyfill": "^0.5.1", "esbuild": "^0.25.10", "jiti": "^2.6.1" }, "bin": { "drizzle-kit": "bin.cjs" } }, "sha512-GiJQqCNPZP8Kk+i7/sFa3rtXbq26tLDNi3LbMx9aoLuwF2ofk8CS7cySUGdI+r4J3q0a568quC8FZeaFTCw4IA=="],
-    "drizzle-orm": ["drizzle-orm@1.0.0-beta.19-d95b7a4", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@effect/sql": "^0.48.5", "@effect/sql-pg": "^0.49.7", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@sinclair/typebox": ">=0.34.8", "@sqlitecloud/drivers": ">=1.0.653", "@tidbcloud/serverless": "*", "@tursodatabase/database": ">=0.2.1", "@tursodatabase/database-common": ">=0.2.1", "@tursodatabase/database-wasm": ">=0.2.1", "@types/better-sqlite3": "*", "@types/mssql": "^9.1.4", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "arktype": ">=2.0.0", "better-sqlite3": ">=9.3.0", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "mssql": "^11.0.1", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5", "typebox": ">=1.0.0", "valibot": ">=1.0.0-beta.7", "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@effect/sql", "@effect/sql-pg", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@sinclair/typebox", "@sqlitecloud/drivers", "@tidbcloud/serverless", "@tursodatabase/database", "@tursodatabase/database-common", "@tursodatabase/database-wasm", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "arktype", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "mysql2", "pg", "postgres", "sql.js", "sqlite3", "typebox", "valibot", "zod"] }, "sha512-bZZKKeoRKrMVU6zKTscjrSH0+WNb1WEi3N0Jl4wEyQ7aQpTgHzdYY6IJQ1P0M74HuSJVeX4UpkFB/S6dtqLEJg=="],
+    "drizzle-orm": ["drizzle-orm@1.0.0-beta.16-ea816b6", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@effect/sql": "^0.48.5", "@effect/sql-pg": "^0.49.7", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@sinclair/typebox": ">=0.34.8", "@sqlitecloud/drivers": ">=1.0.653", "@tidbcloud/serverless": "*", "@tursodatabase/database": ">=0.2.1", "@tursodatabase/database-common": ">=0.2.1", "@tursodatabase/database-wasm": ">=0.2.1", "@types/better-sqlite3": "*", "@types/mssql": "^9.1.4", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "arktype": ">=2.0.0", "better-sqlite3": ">=9.3.0", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "mssql": "^11.0.1", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5", "typebox": ">=1.0.0", "valibot": ">=1.0.0-beta.7", "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@effect/sql", "@effect/sql-pg", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@sinclair/typebox", "@sqlitecloud/drivers", "@tidbcloud/serverless", "@tursodatabase/database", "@tursodatabase/database-common", "@tursodatabase/database-wasm", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "arktype", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "mysql2", "pg", "postgres", "sql.js", "sqlite3", "typebox", "valibot", "zod"] }, "sha512-k9gT4f0O9Qvah5YK/zL+FZonQ8TPyVxcG/ojN4dzO0fHP8hs8tBno8lqmJo53g0JLWv3Q2nsTUoyBRKM2TljFw=="],
    "dset": ["dset@3.1.4", "", {}, "sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA=="],
@@ -2755,7 +2738,7 @@
    "ee-first": ["ee-first@1.1.1", "", {}, "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="],
-    "effect": ["effect@4.0.0-beta.35", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-64j8dgJmoEMeq6Y3WLYcZIRqPZ5E/lqnULCf6QW5te3hQ/sa13UodWLGwBEviEqBoq72U8lArhVX+T7ntzhJGQ=="],
+    "effect": ["effect@4.0.0-beta.31", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "fast-check": "^4.5.3", "find-my-way-ts": "^0.1.6", "ini": "^6.0.0", "kubernetes-types": "^1.30.0", "msgpackr": "^1.11.8", "multipasta": "^0.2.7", "toml": "^3.0.0", "uuid": "^13.0.0", "yaml": "^2.8.2" } }, "sha512-w3QwJnlaLtWWiUSzhCXUTIisnULPsxLzpO6uqaBFjXybKx6FvCqsLJT6v4dV7G9eA9jeTtG6Gv7kF+jGe3HxzA=="],
    "ejs": ["ejs@3.1.10", "", { "dependencies": { "jake": "^10.8.5" }, "bin": { "ejs": "bin/cli.js" } }, "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA=="],
@@ -3023,8 +3006,6 @@
    "get-symbol-description": ["get-symbol-description@1.1.0", "", { "dependencies": { "call-bound": "^1.0.3", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6" } }, "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg=="],
    "get-tsconfig": ["get-tsconfig@4.13.6", "", { "dependencies": { "resolve-pkg-maps": "^1.0.0" } }, "sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw=="],
    "ghostty-web": ["ghostty-web@github:anomalyco/ghostty-web#4af877d", {}, "anomalyco-ghostty-web-4af877d", "sha512-fbEK8mtr7ar4ySsF+JUGjhaZrane7dKphanN+SxHt5XXI6yLMAh/Hpf6sNCOyyVa2UlGCd7YpXG/T2v2RUAX+A=="],
    "gifwrap": ["gifwrap@0.10.1", "", { "dependencies": { "image-q": "^4.0.0", "omggif": "^1.0.10" } }, "sha512-2760b1vpJHNmLzZ/ubTtNnEx5WApN/PYWJvXvgS+tL1egTTthayFYIQQNi136FLEDcN/IyEY2EcGpIITD6eYUw=="],
@@ -3033,8 +3014,6 @@
    "github-slugger": ["github-slugger@2.0.0", "", {}, "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw=="],
    "gitlab-ai-provider": ["gitlab-ai-provider@5.2.2", "", { "dependencies": { "@anthropic-ai/sdk": "^0.71.0", "@anycable/core": "^0.9.2", "graphql-request": "^6.1.0", "isomorphic-ws": "^5.0.0", "openai": "^6.16.0", "socket.io-client": "^4.8.1", "vscode-jsonrpc": "^8.2.1", "zod": "^3.25.76" }, "peerDependencies": { "@ai-sdk/provider": ">=2.0.0", "@ai-sdk/provider-utils": ">=3.0.0" } }, "sha512-ejwnie62rimfVHbjYZ2tsnqwLjF9YLgXD3OQA458gHz8hUvw7vEnhuyuMv5PmWQtyS3ISAghiX7r5SBhUWeCTA=="],
    "glob": ["glob@13.0.5", "", { "dependencies": { "minimatch": "^10.2.1", "minipass": "^7.1.2", "path-scurry": "^2.0.0" } }, "sha512-BzXxZg24Ibra1pbQ/zE7Kys4Ua1ks7Bn6pKLkVPZ9FZe4JQS6/Q7ef3LG1H+k7lUf5l4T3PLSyYyYJVYUvfgTw=="],
    "glob-parent": ["glob-parent@5.1.2", "", { "dependencies": { "is-glob": "^4.0.1" } }, "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="],
@@ -3197,8 +3176,6 @@
    "internal-slot": ["internal-slot@1.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "hasown": "^2.0.2", "side-channel": "^1.1.0" } }, "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw=="],
    "ioredis": ["ioredis@5.10.0", "", { "dependencies": { "@ioredis/commands": "1.5.1", "cluster-key-slot": "^1.1.0", "debug": "^4.3.4", "denque": "^2.1.0", "lodash.defaults": "^4.2.0", "lodash.isarguments": "^3.1.0", "redis-errors": "^1.2.0", "redis-parser": "^3.0.0", "standard-as-callback": "^2.1.0" } }, "sha512-HVBe9OFuqs+Z6n64q09PQvP1/R4Bm+30PAyyD4wIEqssh3v9L21QjCVk4kRLucMBcDokJTcLjsGeVRlq/nH6DA=="],
    "ip-address": ["ip-address@10.1.0", "", {}, "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q=="],
    "ipaddr.js": ["ipaddr.js@1.9.1", "", {}, "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="],
@@ -3431,14 +3408,10 @@
    "lodash": ["lodash@4.17.23", "", {}, "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w=="],
    "lodash.defaults": ["lodash.defaults@4.2.0", "", {}, "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ=="],
    "lodash.escaperegexp": ["lodash.escaperegexp@4.1.2", "", {}, "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="],
    "lodash.includes": ["lodash.includes@4.3.0", "", {}, "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="],
    "lodash.isarguments": ["lodash.isarguments@3.1.0", "", {}, "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="],
    "lodash.isboolean": ["lodash.isboolean@3.0.3", "", {}, "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="],
    "lodash.isequal": ["lodash.isequal@4.5.0", "", {}, "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="],
@@ -3625,7 +3598,7 @@
    "micromatch": ["micromatch@4.0.8", "", { "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" } }, "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA=="],
-    "mime": ["mime@4.1.0", "", { "bin": { "mime": "bin/cli.js" } }, "sha512-X5ju04+cAzsojXKes0B/S4tcYtFAJ6tTMuSPBEn9CPGlrWr8Fiw7qYeLT0XyH80HSoAoqWCaz+MWKh22P7G1cw=="],
+    "mime": ["mime@3.0.0", "", { "bin": { "mime": "cli.js" } }, "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="],
    "mime-db": ["mime-db@1.54.0", "", {}, "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ=="],
@@ -3787,8 +3760,6 @@
    "opencode": ["opencode@workspace:packages/opencode"],
    "opencode-gitlab-auth": ["opencode-gitlab-auth@2.0.0", "", { "dependencies": { "@fastify/rate-limit": "^10.2.0", "@opencode-ai/plugin": "*", "fastify": "^5.2.0", "open": "^10.0.0" } }, "sha512-jmZOOvYIurRScQCtdBqIW5HbP1JbmIiq7UtI7NGgn2vjke46g9d4NVPBg5/ZmFFVIBwZcgyFgJ7b8kGEOR9ujA=="],
    "opencontrol": ["opencontrol@0.0.6", "", { "dependencies": { "@modelcontextprotocol/sdk": "1.6.1", "@tsconfig/bun": "1.0.7", "hono": "4.7.4", "zod": "3.24.2", "zod-to-json-schema": "3.24.3" }, "bin": { "opencontrol": "bin/index.mjs" } }, "sha512-QeCrpOK5D15QV8kjnGVeD/BHFLwcVr+sn4T6KKmP0WAMs2pww56e4h+eOGHb5iPOufUQXbdbBKi6WV2kk7tefQ=="],
    "openid-client": ["openid-client@5.6.4", "", { "dependencies": { "jose": "^4.15.4", "lru-cache": "^6.0.0", "object-hash": "^2.2.0", "oidc-token-hash": "^5.0.3" } }, "sha512-T1h3B10BRPKfcObdBklX639tVz+xh34O7GjofqrqiAQdm7eHsQ00ih18x6wuJ/E6FxdtS2u3FmUGPDeEcMwzNA=="],
@@ -4051,10 +4022,6 @@
    "redent": ["redent@3.0.0", "", { "dependencies": { "indent-string": "^4.0.0", "strip-indent": "^3.0.0" } }, "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="],
    "redis-errors": ["redis-errors@1.2.0", "", {}, "sha512-1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w=="],
    "redis-parser": ["redis-parser@3.0.0", "", { "dependencies": { "redis-errors": "^1.0.0" } }, "sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A=="],
    "reflect.getprototypeof": ["reflect.getprototypeof@1.0.10", "", { "dependencies": { "call-bind": "^1.0.8", "define-properties": "^1.2.1", "es-abstract": "^1.23.9", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", "get-intrinsic": "^1.2.7", "get-proto": "^1.0.1", "which-builtin-type": "^1.2.1" } }, "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw=="],
    "regex": ["regex@6.1.0", "", { "dependencies": { "regex-utilities": "^2.3.0" } }, "sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg=="],
@@ -4117,8 +4084,6 @@
    "resolve-from": ["resolve-from@5.0.0", "", {}, "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="],
    "resolve-pkg-maps": ["resolve-pkg-maps@1.0.0", "", {}, "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw=="],
    "responselike": ["responselike@2.0.1", "", { "dependencies": { "lowercase-keys": "^2.0.0" } }, "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="],
    "restore-cursor": ["restore-cursor@3.1.0", "", { "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" } }, "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="],
@@ -4251,7 +4216,7 @@
    "socket.io-client": ["socket.io-client@4.8.3", "", { "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.4.1", "engine.io-client": "~6.6.1", "socket.io-parser": "~4.2.4" } }, "sha512-uP0bpjWrjQmUt5DTHq9RuoCBdFJF10cdX9X+a368j/Ft0wmaVgxlrjvK3kjvgCODOMMOz9lcaRzxmso0bTWZ/g=="],
-    "socket.io-parser": ["socket.io-parser@4.2.6", "", { "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.4.1" } }, "sha512-asJqbVBDsBCJx0pTqw3WfesSY0iRX+2xzWEWzrpcH7L6fLzrhyF8WPI8UaeM4YCuDfpwA/cgsdugMsmtz8EJeg=="],
+    "socket.io-parser": ["socket.io-parser@4.2.5", "", { "dependencies": { "@socket.io/component-emitter": "~3.1.0", "debug": "~4.4.1" } }, "sha512-bPMmpy/5WWKHea5Y/jYAP6k74A+hvmRCQaJuJB6I/ML5JZq/KfNieUVo/3Mh7SAqn7TyFdIo6wqYHInG1MU1bQ=="],
    "socks": ["socks@2.8.7", "", { "dependencies": { "ip-address": "^10.0.1", "smart-buffer": "^4.2.0" } }, "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A=="],
@@ -4315,8 +4280,6 @@
    "stage-js": ["stage-js@1.0.1", "", {}, "sha512-cz14aPp/wY0s3bkb/B93BPP5ZAEhgBbRmAT3CCDqert8eCAqIpQ0RB2zpK8Ksxf+Pisl5oTzvPHtL4CVzzeHcw=="],
    "standard-as-callback": ["standard-as-callback@2.1.0", "", {}, "sha512-qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="],
    "stat-mode": ["stat-mode@1.0.0", "", {}, "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="],
    "statuses": ["statuses@2.0.2", "", {}, "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw=="],
@@ -5023,18 +4986,12 @@
    "@bufbuild/protoplugin/typescript": ["typescript@5.4.5", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ=="],
    "@cloudflare/kv-asset-handler/mime": ["mime@3.0.0", "", { "bin": { "mime": "cli.js" } }, "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="],
    "@cspotcode/source-map-support/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.9", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="],
    "@develar/schema-utils/ajv": ["ajv@6.14.0", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw=="],
    "@dot/log/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
    "@effect/platform-node/undici": ["undici@7.24.4", "", {}, "sha512-BM/JzwwaRXxrLdElV2Uo6cTLEjhSb3WXboncJamZ15NgUURmvlXvxa6xkwIOILIjPNo9i8ku136ZvWV0Uly8+w=="],
    "@effect/platform-node-shared/ws": ["ws@8.19.0", "", { "peerDependencies": { "bufferutil": "^4.0.1", "utf-8-validate": ">=5.0.2" }, "optionalPeers": ["bufferutil", "utf-8-validate"] }, "sha512-blAT2mjOEIi0ZzruJfIhb3nps74PRWTCz1IjglWEEpQl5XS/UNama6u2/rjFkDDouqr4L67ry+1aGIALViWjDg=="],
    "@electron/asar/commander": ["commander@5.1.0", "", {}, "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="],
    "@electron/asar/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
@@ -5065,14 +5022,16 @@
    "@fastify/proxy-addr/ipaddr.js": ["ipaddr.js@2.3.0", "", {}, "sha512-Zv/pA+ciVFbCSBBjGfaKUya/CcGmUHzTydLMaTwrUUEM2DIEO3iZvueGxmacvmN50fGpGVKeTXpb2LcYQxeVdg=="],
    "@gitlab/gitlab-ai-provider/openai": ["openai@6.27.0", "", { "peerDependencies": { "ws": "^8.18.0", "zod": "^3.25 || ^4.0" }, "optionalPeers": ["ws", "zod"], "bin": { "openai": "bin/cli" } }, "sha512-osTKySlrdYrLYTt0zjhY8yp0JUBmWDCN+Q+QxsV4xMQnnoVFpylgKGgxwN8sSdTNw0G4y+WUXs4eCMWpyDNWZQ=="],
    "@gitlab/gitlab-ai-provider/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
    "@hey-api/openapi-ts/open": ["open@11.0.0", "", { "dependencies": { "default-browser": "^5.4.0", "define-lazy-prop": "^3.0.0", "is-in-ssh": "^1.0.0", "is-inside-container": "^1.0.0", "powershell-utils": "^0.1.0", "wsl-utils": "^0.3.0" } }, "sha512-smsWv2LzFjP03xmvFoJ331ss6h+jixfA4UUV/Bsiyuu4YJPfN+FIQGOIiv4w9/+MoHkfkJ22UIaQWRVFRfH6Vw=="],
    "@hey-api/openapi-ts/semver": ["semver@7.7.3", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q=="],
    "@hono/zod-validator/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
    "@jimp/core/mime": ["mime@3.0.0", "", { "bin": { "mime": "cli.js" } }, "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A=="],
    "@jimp/plugin-blit/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
    "@jimp/plugin-circle/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
@@ -5393,8 +5352,6 @@
    "cross-spawn/which": ["which@2.0.2", "", { "dependencies": { "isexe": "^2.0.0" }, "bin": { "node-which": "./bin/node-which" } }, "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="],
    "db0/drizzle-orm": ["drizzle-orm@1.0.0-beta.16-ea816b6", "", { "peerDependencies": { "@aws-sdk/client-rds-data": ">=3", "@cloudflare/workers-types": ">=4", "@effect/sql": "^0.48.5", "@effect/sql-pg": "^0.49.7", "@electric-sql/pglite": ">=0.2.0", "@libsql/client": ">=0.10.0", "@libsql/client-wasm": ">=0.10.0", "@neondatabase/serverless": ">=0.10.0", "@op-engineering/op-sqlite": ">=2", "@opentelemetry/api": "^1.4.1", "@planetscale/database": ">=1.13", "@prisma/client": "*", "@sinclair/typebox": ">=0.34.8", "@sqlitecloud/drivers": ">=1.0.653", "@tidbcloud/serverless": "*", "@tursodatabase/database": ">=0.2.1", "@tursodatabase/database-common": ">=0.2.1", "@tursodatabase/database-wasm": ">=0.2.1", "@types/better-sqlite3": "*", "@types/mssql": "^9.1.4", "@types/pg": "*", "@types/sql.js": "*", "@upstash/redis": ">=1.34.7", "@vercel/postgres": ">=0.8.0", "@xata.io/client": "*", "arktype": ">=2.0.0", "better-sqlite3": ">=9.3.0", "bun-types": "*", "expo-sqlite": ">=14.0.0", "gel": ">=2", "mssql": "^11.0.1", "mysql2": ">=2", "pg": ">=8", "postgres": ">=3", "sql.js": ">=1", "sqlite3": ">=5", "typebox": ">=1.0.0", "valibot": ">=1.0.0-beta.7", "zod": "^3.25.0 || ^4.0.0" }, "optionalPeers": ["@aws-sdk/client-rds-data", "@cloudflare/workers-types", "@effect/sql", "@effect/sql-pg", "@electric-sql/pglite", "@libsql/client", "@libsql/client-wasm", "@neondatabase/serverless", "@op-engineering/op-sqlite", "@opentelemetry/api", "@planetscale/database", "@prisma/client", "@sinclair/typebox", "@sqlitecloud/drivers", "@tidbcloud/serverless", "@tursodatabase/database", "@tursodatabase/database-common", "@tursodatabase/database-wasm", "@types/better-sqlite3", "@types/pg", "@types/sql.js", "@upstash/redis", "@vercel/postgres", "@xata.io/client", "arktype", "better-sqlite3", "bun-types", "expo-sqlite", "gel", "mysql2", "pg", "postgres", "sql.js", "sqlite3", "typebox", "valibot", "zod"] }, "sha512-k9gT4f0O9Qvah5YK/zL+FZonQ8TPyVxcG/ojN4dzO0fHP8hs8tBno8lqmJo53g0JLWv3Q2nsTUoyBRKM2TljFw=="],
    "defaults/clone": ["clone@1.0.4", "", {}, "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="],
    "dir-compare/minimatch": ["minimatch@3.1.5", "", { "dependencies": { "brace-expansion": "^1.1.7" } }, "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w=="],
@@ -5461,10 +5418,6 @@
    "gaxios/node-fetch": ["node-fetch@3.3.2", "", { "dependencies": { "data-uri-to-buffer": "^4.0.0", "fetch-blob": "^3.1.4", "formdata-polyfill": "^4.0.10" } }, "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA=="],
    "gitlab-ai-provider/openai": ["openai@6.32.0", "", { "peerDependencies": { "ws": "^8.18.0", "zod": "^3.25 || ^4.0" }, "optionalPeers": ["ws", "zod"], "bin": { "openai": "bin/cli" } }, "sha512-j3k+BjydAf8yQlcOI7WUQMQTbbF5GEIMAE2iZYCOzwwB3S2pCheaWYp+XZRNAch4jWVc52PMDGRRjutao3lLCg=="],
    "gitlab-ai-provider/zod": ["zod@3.25.76", "", {}, "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ=="],
    "glob/minimatch": ["minimatch@10.2.4", "", { "dependencies": { "brace-expansion": "^5.0.2" } }, "sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg=="],
    "globby/ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
@@ -5541,8 +5494,6 @@
    "opencode/@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=="],
    "opencode-gitlab-auth/open": ["open@10.2.0", "", { "dependencies": { "default-browser": "^5.2.1", "define-lazy-prop": "^3.0.0", "is-inside-container": "^1.0.0", "wsl-utils": "^0.1.0" } }, "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA=="],
    "opencontrol/@modelcontextprotocol/sdk": ["@modelcontextprotocol/sdk@1.6.1", "", { "dependencies": { "content-type": "^1.0.5", "cors": "^2.8.5", "eventsource": "^3.0.2", "express": "^5.0.1", "express-rate-limit": "^7.5.0", "pkce-challenge": "^4.1.0", "raw-body": "^3.0.0", "zod": "^3.23.8", "zod-to-json-schema": "^3.24.1" } }, "sha512-oxzMzYCkZHMntzuyerehK3fV6A2Kwh5BD6CGEJSVDU2QNEhfLOptf2X7esQgaHZXHZY0oHmMsOtIDLP71UJXgA=="],
    "opencontrol/@tsconfig/bun": ["@tsconfig/bun@1.0.7", "", {}, "sha512-udGrGJBNQdXGVulehc1aWT73wkR9wdaGBtB6yL70RJsqwW/yJhIg6ZbRlPOfIUiFNrnBuYLBi9CSmMKfDC7dvA=="],
@@ -6293,8 +6244,6 @@
    "node-gyp/which/isexe": ["isexe@3.1.5", "", {}, "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w=="],
    "opencode-gitlab-auth/open/wsl-utils": ["wsl-utils@0.1.0", "", { "dependencies": { "is-wsl": "^3.1.0" } }, "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw=="],
    "opencode/@ai-sdk/openai/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="],
    "opencode/@ai-sdk/openai-compatible/@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.20", "", { "dependencies": { "@ai-sdk/provider": "2.0.1", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.6" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-iXHVe0apM2zUEzauqJwqmpC37A5rihrStAih5Ks+JE32iTe4LZ58y17UGBjpQQTCRw9YxMeo2UFLxLpBluyvLQ=="],
@@ -122,7 +122,6 @@ const ZEN_LITE_PRICE = new sst.Linkable("ZEN_LITE_PRICE", {
  properties: {
    product: zenLiteProduct.id,
    price: zenLitePrice.id,
    priceInr: 92900,
    firstMonth50Coupon: zenLiteCouponFirstMonth50.id,
  },
 })
@@ -202,10 +201,6 @@ const bucketNew = new sst.cloudflare.Bucket("ZenDataNew")
 const AWS_SES_ACCESS_KEY_ID = new sst.Secret("AWS_SES_ACCESS_KEY_ID")
 const AWS_SES_SECRET_ACCESS_KEY = new sst.Secret("AWS_SES_SECRET_ACCESS_KEY")
 const SALESFORCE_CLIENT_ID = new sst.Secret("SALESFORCE_CLIENT_ID")
 const SALESFORCE_CLIENT_SECRET = new sst.Secret("SALESFORCE_CLIENT_SECRET")
 const SALESFORCE_INSTANCE_URL = new sst.Secret("SALESFORCE_INSTANCE_URL")
 const logProcessor = new sst.cloudflare.Worker("LogProcessor", {
  handler: "packages/console/function/src/log-processor.ts",
  link: [new sst.Secret("HONEYCOMB_API_KEY")],
@@ -224,9 +219,6 @@ new sst.cloudflare.x.SolidStart("Console", {
    EMAILOCTOPUS_API_KEY,
    AWS_SES_ACCESS_KEY_ID,
    AWS_SES_SECRET_ACCESS_KEY,
    SALESFORCE_CLIENT_ID,
    SALESFORCE_CLIENT_SECRET,
    SALESFORCE_INSTANCE_URL,
    ZEN_BLACK_PRICE,
    ZEN_LITE_PRICE,
    new sst.Secret("ZEN_LIMITS"),
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-WXQ4b1hHFk2vDWz41fJmj+z0twee6r0YR0JGH0iw0ZI=",
+    "x86_64-linux": "sha256-WJgo6UclmtQOEubnKMZybdIEhZ1uRTucF61yojjd+l0=",
-    "aarch64-linux": "sha256-YIdnfkHGLfUq3cZkycvL7DQ8BvC5X+VDia7UTLgJBx8=",
+    "aarch64-linux": "sha256-QfZ/g7EZFpe6ndR3dG8WvVfMj5Kyd/R/4kkTJfGJxL4=",
-    "aarch64-darwin": "sha256-bMUeI1LcBYgKBwG92WazTgxNryZF2Gv9iQgK46Pd+3A=",
+    "aarch64-darwin": "sha256-ezr/R70XJr9eN5l3mgb7HzLF6QsofNEKUOtuxbfli80=",
-    "x86_64-darwin": "sha256-fJbEd1j8ObZ2OMykYVU6v0uI1gy2eoCFIZ9ovuiNeLY="
+    "x86_64-darwin": "sha256-MbsBGS415uEU/n1RQ/5H5pqh+udLY3+oimJ+eS5uJVI="
  }
 }
@@ -9,7 +9,6 @@
    "dev": "bun run --cwd packages/opencode --conditions=browser src/index.ts",
    "dev:desktop": "bun --cwd packages/desktop tauri dev",
    "dev:web": "bun --cwd packages/app dev",
    "dev:console": "ulimit -n 10240 2>/dev/null; bun run --cwd packages/console/app dev",
    "dev:storybook": "bun --cwd packages/storybook storybook",
    "typecheck": "bun turbo typecheck",
    "prepare": "husky",
@@ -25,7 +24,6 @@
      "packages/slack"
    ],
    "catalog": {
      "@effect/platform-node": "4.0.0-beta.35",
      "@types/bun": "1.3.9",
      "@octokit/rest": "22.0.0",
      "@hono/zod-validator": "0.4.2",
@@ -43,9 +41,9 @@
      "@tailwindcss/vite": "4.1.11",
      "diff": "8.0.2",
      "dompurify": "3.3.1",
-      "drizzle-kit": "1.0.0-beta.19-d95b7a4",
+      "drizzle-kit": "1.0.0-beta.16-ea816b6",
-      "drizzle-orm": "1.0.0-beta.19-d95b7a4",
+      "drizzle-orm": "1.0.0-beta.16-ea816b6",
-      "effect": "4.0.0-beta.35",
+      "effect": "4.0.0-beta.31",
      "ai": "5.0.124",
      "hono": "4.10.7",
      "hono-openapi": "1.1.2",
@@ -112,8 +110,6 @@
  },
  "patchedDependencies": {
    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
-    "@openrouter/ai-sdk-provider@1.5.4": "patches/@openrouter%2Fai-sdk-provider@1.5.4.patch",
+    "@openrouter/ai-sdk-provider@1.5.4": "patches/@openrouter%2Fai-sdk-provider@1.5.4.patch"
    "@ai-sdk/xai@2.0.51": "patches/@ai-sdk%2Fxai@2.0.51.patch",
    "solid-js@1.9.10": "patches/solid-js@1.9.10.patch"
  }
 }
@@ -174,8 +174,6 @@ await page.keyboard.press(`${modKey}+Comma`) // Open settings
 - In terminal tests, type through the browser. Do not write to the PTY through the SDK.
 - Use `waitTerminalReady(page, { term? })` and `runTerminal(page, { cmd, token, term?, timeout? })` from `actions.ts`.
 - These helpers use the fixture-enabled test-only terminal driver and wait for output after the terminal writer settles.
 - After opening the terminal, use `waitTerminalFocusIdle(...)` before the next keyboard action when prompt focus or keyboard routing matters.
 - This avoids racing terminal mount, focus handoff, and prompt readiness when the next step types or sends shortcuts.
 - Avoid `waitForTimeout` and custom DOM or `data-*` readiness checks.
 ### Wait on state
@@ -184,9 +182,6 @@ await page.keyboard.press(`${modKey}+Comma`) // Open settings
 - Avoid race-prone flows that assume work is finished after an action
 - Wait or poll on observable state with `expect(...)`, `expect.poll(...)`, or existing helpers
 - Prefer locator assertions like `toBeVisible()`, `toHaveCount(0)`, and `toHaveAttribute(...)` for normal UI state, and reserve `expect.poll(...)` for probe, mock, or backend state
 - Prefer semantic app state over transient DOM visibility when behavior depends on active selection, focus ownership, or async retry loops
 - Do not treat a visible element as proof that the app will route the next action to it
 - When fixing a flake, validate with `--repeat-each` and multiple workers when practical
 ### Add hooks
@@ -194,16 +189,11 @@ await page.keyboard.press(`${modKey}+Comma`) // Open settings
 - Keep these hooks minimal and purpose-built, following the style of `packages/app/src/testing/terminal.ts`
 - Test-only hooks must be inert unless explicitly enabled; do not add normal-runtime listeners, reactive subscriptions, or per-update allocations for e2e ceremony
 - When mocking routes or APIs, expose explicit mock state and wait on that before asserting post-action UI
 - Add minimal test-only probes for semantic state like the active list item or selected command when DOM intermediates are unstable
 - Prefer probing committed app state over asserting on transient highlight, visibility, or animation states
 ### Prefer helpers
 - Prefer fluent helpers and drivers when they make intent obvious and reduce locator-heavy noise
 - Use direct locators when the interaction is simple and a helper would not add clarity
 - Prefer helpers that both perform an action and verify the app consumed it
 - Avoid composing helpers redundantly when one already includes the other or already waits for the resulting state
 - If a helper already covers the required wait or verification, use it directly instead of layering extra clicks, keypresses, or assertions
 ## Writing New Tests
@@ -1,4 +1,3 @@
 import { base64Decode, base64Encode } from "@opencode-ai/util/encode"
 import { expect, type Locator, type Page } from "@playwright/test"
 import fs from "node:fs/promises"
 import os from "node:os"
@@ -9,7 +8,6 @@ import { createSdk, modKey, resolveDirectory, serverUrl } from "./utils"
 import {
  dropdownMenuTriggerSelector,
  dropdownMenuContentSelector,
  projectSwitchSelector,
  projectMenuTriggerSelector,
  projectCloseMenuSelector,
  projectWorkspacesToggleSelector,
@@ -18,22 +16,11 @@ import {
  listItemSelector,
  listItemKeySelector,
  listItemKeyStartsWithSelector,
  promptSelector,
  terminalSelector,
  workspaceItemSelector,
  workspaceMenuTriggerSelector,
 } from "./selectors"
 const phase = new WeakMap<Page, "test" | "cleanup">()
 export function setHealthPhase(page: Page, value: "test" | "cleanup") {
  phase.set(page, value)
 }
 export function healthPhase(page: Page) {
  return phase.get(page) ?? "test"
 }
 export async function defocus(page: Page) {
  await page
    .evaluate(() => {
@@ -74,15 +61,6 @@ async function terminalReady(page: Page, term?: Locator) {
  }, id)
 }
 async function terminalFocusIdle(page: Page, term?: Locator) {
  const next = term ?? page.locator(terminalSelector).first()
  const id = await terminalID(next)
  return page.evaluate((id) => {
    const state = (window as E2EWindow).__opencode_e2e?.terminal?.terminals?.[id]
    return (state?.focusing ?? 0) === 0
  }, id)
 }
 async function terminalHas(page: Page, input: { term?: Locator; token: string }) {
  const next = input.term ?? page.locator(terminalSelector).first()
  const id = await terminalID(next)
@@ -95,29 +73,6 @@ async function terminalHas(page: Page, input: { term?: Locator; token: string })
  )
 }
 async function promptSlashActive(page: Page, id: string) {
  return page.evaluate((id) => {
    const state = (window as E2EWindow).__opencode_e2e?.prompt?.current
    if (state?.popover !== "slash") return false
    if (!state.slash.ids.includes(id)) return false
    return state.slash.active === id
  }, id)
 }
 async function promptSlashSelects(page: Page) {
  return page.evaluate(() => {
    return (window as E2EWindow).__opencode_e2e?.prompt?.current?.selects ?? 0
  })
 }
 async function promptSlashSelected(page: Page, input: { id: string; count: number }) {
  return page.evaluate((input) => {
    const state = (window as E2EWindow).__opencode_e2e?.prompt?.current
    if (!state) return false
    return state.selected === input.id && state.selects >= input.count
  }, input)
 }
 export async function waitTerminalReady(page: Page, input?: { term?: Locator; timeout?: number }) {
  const term = input?.term ?? page.locator(terminalSelector).first()
  const timeout = input?.timeout ?? 10_000
@@ -126,43 +81,6 @@ export async function waitTerminalReady(page: Page, input?: { term?: Locator; ti
  await expect.poll(() => terminalReady(page, term), { timeout }).toBe(true)
 }
 export async function waitTerminalFocusIdle(page: Page, input?: { term?: Locator; timeout?: number }) {
  const term = input?.term ?? page.locator(terminalSelector).first()
  const timeout = input?.timeout ?? 10_000
  await waitTerminalReady(page, { term, timeout })
  await expect.poll(() => terminalFocusIdle(page, term), { timeout }).toBe(true)
 }
 export async function showPromptSlash(
  page: Page,
  input: { id: string; text: string; prompt?: Locator; timeout?: number },
 ) {
  const prompt = input.prompt ?? page.locator(promptSelector)
  const timeout = input.timeout ?? 10_000
  await expect
    .poll(
      async () => {
        await prompt.click().catch(() => false)
        await prompt.fill(input.text).catch(() => false)
        return promptSlashActive(page, input.id).catch(() => false)
      },
      { timeout },
    )
    .toBe(true)
 }
 export async function runPromptSlash(
  page: Page,
  input: { id: string; text: string; prompt?: Locator; timeout?: number },
 ) {
  const prompt = input.prompt ?? page.locator(promptSelector)
  const timeout = input.timeout ?? 10_000
  const count = await promptSlashSelects(page)
  await showPromptSlash(page, input)
  await prompt.press("Enter")
  await expect.poll(() => promptSlashSelected(page, { id: input.id, count: count + 1 }), { timeout }).toBe(true)
 }
 export async function runTerminal(page: Page, input: { cmd: string; token: string; term?: Locator; timeout?: number }) {
  const term = input.term ?? page.locator(terminalSelector).first()
  const timeout = input.timeout ?? 10_000
@@ -207,49 +125,9 @@ export async function closeDialog(page: Page, dialog: Locator) {
 }
 export async function isSidebarClosed(page: Page) {
  const button = await waitSidebarButton(page, "isSidebarClosed")
  return (await button.getAttribute("aria-expanded")) !== "true"
 }
 async function errorBoundaryText(page: Page) {
  const title = page.getByRole("heading", { name: /something went wrong/i }).first()
  if (!(await title.isVisible().catch(() => false))) return
  const description = await page
    .getByText(/an error occurred while loading the application\./i)
    .first()
    .textContent()
    .catch(() => "")
  const detail = await page
    .getByRole("textbox", { name: /error details/i })
    .first()
    .inputValue()
    .catch(async () =>
      (
        (await page
          .getByRole("textbox", { name: /error details/i })
          .first()
          .textContent()
          .catch(() => "")) ?? ""
      ).trim(),
    )
  return [title ? "Error boundary" : "", description ?? "", detail ?? ""].filter(Boolean).join("\n")
 }
 export async function assertHealthy(page: Page, context: string) {
  const text = await errorBoundaryText(page)
  if (!text) return
  console.log(`[e2e:error-boundary][${context}]\n${text}`)
  throw new Error(`Error boundary during ${context}\n${text}`)
 }
 async function waitSidebarButton(page: Page, context: string) {
  const button = page.getByRole("button", { name: /toggle sidebar/i }).first()
-  const boundary = page.getByRole("heading", { name: /something went wrong/i }).first()
+  await expect(button).toBeVisible()
-  await button.or(boundary).first().waitFor({ state: "visible", timeout: 10_000 })
+  return (await button.getAttribute("aria-expanded")) !== "true"
  await assertHealthy(page, context)
  return button
 }
 export async function toggleSidebar(page: Page) {
@@ -260,7 +138,7 @@ export async function toggleSidebar(page: Page) {
 export async function openSidebar(page: Page) {
  if (!(await isSidebarClosed(page))) return
-  const button = await waitSidebarButton(page, "openSidebar")
+  const button = page.getByRole("button", { name: /toggle sidebar/i }).first()
  await button.click()
  const opened = await expect(button)
@@ -277,7 +155,7 @@ export async function openSidebar(page: Page) {
 export async function closeSidebar(page: Page) {
  if (await isSidebarClosed(page)) return
-  const button = await waitSidebarButton(page, "closeSidebar")
+  const button = page.getByRole("button", { name: /toggle sidebar/i }).first()
  await button.click()
  const closed = await expect(button)
@@ -292,7 +170,6 @@ export async function closeSidebar(page: Page) {
 }
 export async function openSettings(page: Page) {
  await assertHealthy(page, "openSettings")
  await defocus(page)
  const dialog = page.getByRole("dialog")
@@ -305,8 +182,6 @@ export async function openSettings(page: Page) {
  if (opened) return dialog
  await assertHealthy(page, "openSettings")
  await page.getByRole("button", { name: "Settings" }).first().click()
  await expect(dialog).toBeVisible()
  return dialog
@@ -368,12 +243,10 @@ export async function seedProjects(page: Page, input: { directory: string; extra
 export async function createTestProject() {
  const root = await fs.mkdtemp(path.join(os.tmpdir(), "opencode-e2e-project-"))
  const id = `e2e-${path.basename(root)}`
-  await fs.writeFile(path.join(root, "README.md"), `# e2e\n\n${id}\n`)
+  await fs.writeFile(path.join(root, "README.md"), "# e2e\n")
  execSync("git init", { cwd: root, stdio: "ignore" })
  await fs.writeFile(path.join(root, ".git", "opencode"), id)
  execSync("git config core.fsmonitor false", { cwd: root, stdio: "ignore" })
  execSync("git add -A", { cwd: root, stdio: "ignore" })
  execSync('git -c user.name="e2e" -c user.email="e2e@example.com" commit -m "init" --allow-empty', {
@@ -395,24 +268,12 @@ export function slugFromUrl(url: string) {
  return /\/([^/]+)\/session(?:[/?#]|$)/.exec(url)?.[1] ?? ""
 }
 async function probeSession(page: Page) {
  return page
    .evaluate(() => {
      const win = window as E2EWindow
      const current = win.__opencode_e2e?.model?.current
      if (!current) return null
      return { dir: current.dir, sessionID: current.sessionID }
    })
    .catch(() => null as { dir?: string; sessionID?: string } | null)
 }
 export async function waitSlug(page: Page, skip: string[] = []) {
  let prev = ""
  let next = ""
  await expect
    .poll(
-      async () => {
+      () => {
        await assertHealthy(page, "waitSlug")
        const slug = slugFromUrl(page.url())
        if (!slug) return ""
        if (skip.includes(slug)) return ""
@@ -430,94 +291,6 @@ export async function waitSlug(page: Page, skip: string[] = []) {
  return next
 }
 export async function resolveSlug(slug: string) {
  const directory = base64Decode(slug)
  if (!directory) throw new Error(`Failed to decode workspace slug: ${slug}`)
  const resolved = await resolveDirectory(directory)
  return { directory: resolved, slug: base64Encode(resolved), raw: slug }
 }
 export async function waitDir(page: Page, directory: string) {
  const target = await resolveDirectory(directory)
  await expect
    .poll(
      async () => {
        await assertHealthy(page, "waitDir")
        const slug = slugFromUrl(page.url())
        if (!slug) return ""
        return resolveSlug(slug)
          .then((item) => item.directory)
          .catch(() => "")
      },
      { timeout: 45_000 },
    )
    .toBe(target)
  return { directory: target, slug: base64Encode(target) }
 }
 export async function waitSession(page: Page, input: { directory: string; sessionID?: string }) {
  const target = await resolveDirectory(input.directory)
  await expect
    .poll(
      async () => {
        await assertHealthy(page, "waitSession")
        const slug = slugFromUrl(page.url())
        if (!slug) return false
        const resolved = await resolveSlug(slug).catch(() => undefined)
        if (!resolved || resolved.directory !== target) return false
        if (input.sessionID && sessionIDFromUrl(page.url()) !== input.sessionID) return false
        const state = await probeSession(page)
        if (input.sessionID && (!state || state.sessionID !== input.sessionID)) return false
        if (state?.dir) {
          const dir = await resolveDirectory(state.dir).catch(() => state.dir ?? "")
          if (dir !== target) return false
        }
        return page
          .locator(promptSelector)
          .first()
          .isVisible()
          .catch(() => false)
      },
      { timeout: 45_000 },
    )
    .toBe(true)
  return { directory: target, slug: base64Encode(target) }
 }
 export async function waitSessionSaved(directory: string, sessionID: string, timeout = 30_000) {
  const sdk = createSdk(directory)
  const target = await resolveDirectory(directory)
  await expect
    .poll(
      async () => {
        const data = await sdk.session
          .get({ sessionID })
          .then((x) => x.data)
          .catch(() => undefined)
        if (!data?.directory) return ""
        return resolveDirectory(data.directory).catch(() => data.directory)
      },
      { timeout },
    )
    .toBe(target)
  await expect
    .poll(
      async () => {
        const items = await sdk.session
          .messages({ sessionID, limit: 20 })
          .then((x) => x.data ?? [])
          .catch(() => [])
        return items.some((item) => item.info.role === "user")
      },
      { timeout },
    )
    .toBe(true)
 }
 export function sessionIDFromUrl(url: string) {
  const match = /\/session\/([^/?#]+)/.exec(url)
  return match?.[1]
@@ -929,14 +702,8 @@ export async function openStatusPopover(page: Page) {
 }
 export async function openProjectMenu(page: Page, projectSlug: string) {
  await openSidebar(page)
  const item = page.locator(projectSwitchSelector(projectSlug)).first()
  await expect(item).toBeVisible()
  await item.hover()
  const trigger = page.locator(projectMenuTriggerSelector(projectSlug)).first()
  await expect(trigger).toHaveCount(1)
  await expect(trigger).toBeVisible()
  const menu = page
    .locator(dropdownMenuContentSelector)
@@ -945,7 +712,7 @@ export async function openProjectMenu(page: Page, projectSlug: string) {
  const close = menu.locator(projectCloseMenuSelector(projectSlug)).first()
  const clicked = await trigger
-    .click({ force: true, timeout: 1500 })
+    .click({ timeout: 1500 })
    .then(() => true)
    .catch(() => false)
@@ -3,11 +3,8 @@ import { serverNamePattern } from "../utils"
 test("home renders and shows core entrypoints", async ({ page }) => {
  await page.goto("/")
  const nav = page.locator('[data-component="sidebar-nav-desktop"]')
  await expect(page.getByRole("button", { name: "Open project" }).first()).toBeVisible()
  await expect(nav.getByText("No projects open")).toBeVisible()
  await expect(nav.getByText("Open a project to get started")).toBeVisible()
  await expect(page.getByRole("button", { name: serverNamePattern })).toBeVisible()
 })
@@ -1,16 +1,7 @@
 import { test as base, expect, type Page } from "@playwright/test"
 import type { E2EWindow } from "../src/testing/terminal"
-import {
+import { cleanupSession, cleanupTestProject, createTestProject, seedProjects, sessionIDFromUrl } from "./actions"
-  healthPhase,
+import { promptSelector } from "./selectors"
  cleanupSession,
  cleanupTestProject,
  createTestProject,
  setHealthPhase,
  seedProjects,
  sessionIDFromUrl,
  waitSlug,
  waitSession,
 } from "./actions"
 import { createSdk, dirSlug, getWorktree, sessionPath } from "./utils"
 export const settingsKey = "settings.v3"
@@ -36,29 +27,6 @@ type WorkerFixtures = {
 }
 export const test = base.extend<TestFixtures, WorkerFixtures>({
  page: async ({ page }, use) => {
    let boundary: string | undefined
    setHealthPhase(page, "test")
    const consoleHandler = (msg: { text(): string }) => {
      const text = msg.text()
      if (!text.includes("[e2e:error-boundary]")) return
      if (healthPhase(page) === "cleanup") {
        console.warn(`[e2e:error-boundary][cleanup-warning]\n${text}`)
        return
      }
      boundary ||= text
      console.log(text)
    }
    const pageErrorHandler = (err: Error) => {
      console.log(`[e2e:pageerror] ${err.stack || err.message}`)
    }
    page.on("console", consoleHandler)
    page.on("pageerror", pageErrorHandler)
    await use(page)
    page.off("console", consoleHandler)
    page.off("pageerror", pageErrorHandler)
    if (boundary) throw new Error(boundary)
  },
  directory: [
    async ({}, use) => {
      const directory = await getWorktree()
@@ -80,20 +48,21 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({
    const gotoSession = async (sessionID?: string) => {
      await page.goto(sessionPath(directory, sessionID))
-      await waitSession(page, { directory, sessionID })
+      await expect(page.locator(promptSelector)).toBeVisible()
    }
    await use(gotoSession)
  },
  withProject: async ({ page }, use) => {
    await use(async (callback, options) => {
      const root = await createTestProject()
      const slug = dirSlug(root)
      const sessions = new Map<string, string>()
      const dirs = new Set<string>()
      await seedStorage(page, { directory: root, extra: options?.extra })
      const gotoSession = async (sessionID?: string) => {
        await page.goto(sessionPath(root, sessionID))
-        await waitSession(page, { directory: root, sessionID })
+        await expect(page.locator(promptSelector)).toBeVisible()
        const current = sessionIDFromUrl(page.url())
        if (current) trackSession(current)
      }
@@ -108,16 +77,13 @@ export const test = base.extend<TestFixtures, WorkerFixtures>({
      try {
        await gotoSession()
        const slug = await waitSlug(page)
        return await callback({ directory: root, slug, gotoSession, trackSession, trackDirectory })
      } finally {
        setHealthPhase(page, "cleanup")
        await Promise.allSettled(
          Array.from(sessions, ([sessionID, directory]) => cleanupSession({ sessionID, directory })),
        )
        await Promise.allSettled(Array.from(dirs, (directory) => cleanupTestProject(directory)))
        await cleanupTestProject(root)
        setHealthPhase(page, "test")
      }
    })
  },
@@ -129,12 +95,6 @@ async function seedStorage(page: Page, input: { directory: string; extra?: strin
    const win = window as E2EWindow
    win.__opencode_e2e = {
      ...win.__opencode_e2e,
      model: {
        enabled: true,
      },
      prompt: {
        enabled: true,
      },
      terminal: {
        enabled: true,
        terminals: {},
@@ -1,19 +1,41 @@
 import { base64Decode } from "@opencode-ai/util/encode"
 import type { Page } from "@playwright/test"
 import { test, expect } from "../fixtures"
-import {
+import { defocus, createTestProject, cleanupTestProject, openSidebar, sessionIDFromUrl, waitSlug } from "../actions"
  defocus,
  createTestProject,
  cleanupTestProject,
  openSidebar,
  sessionIDFromUrl,
  setWorkspacesEnabled,
  waitSession,
  waitSessionSaved,
  waitSlug,
 } from "../actions"
 import { projectSwitchSelector, promptSelector, workspaceItemSelector, workspaceNewSessionSelector } from "../selectors"
 import { dirSlug, resolveDirectory } from "../utils"
 async function workspaces(page: Page, directory: string, enabled: boolean) {
  await page.evaluate(
    ({ directory, enabled }: { directory: string; enabled: boolean }) => {
      const key = "opencode.global.dat:layout"
      const raw = localStorage.getItem(key)
      const data = raw ? JSON.parse(raw) : {}
      const sidebar = data.sidebar && typeof data.sidebar === "object" ? data.sidebar : {}
      const current =
        sidebar.workspaces && typeof sidebar.workspaces === "object" && !Array.isArray(sidebar.workspaces)
          ? sidebar.workspaces
          : {}
      const next = { ...current }
      if (enabled) next[directory] = true
      if (!enabled) delete next[directory]
      localStorage.setItem(
        key,
        JSON.stringify({
          ...data,
          sidebar: {
            ...sidebar,
            workspaces: next,
          },
        }),
      )
    },
    { directory, enabled },
  )
 }
 test("can switch between projects from sidebar", async ({ page, withProject }) => {
  await page.setViewportSize({ width: 1400, height: 800 })
@@ -54,7 +76,9 @@ test("switching back to a project opens the latest workspace session", async ({
    await withProject(
      async ({ directory, slug, trackSession, trackDirectory }) => {
        await defocus(page)
-        await setWorkspacesEnabled(page, slug, true)
+        await workspaces(page, directory, true)
        await page.reload()
        await expect(page.locator(promptSelector)).toBeVisible()
        await openSidebar(page)
        await expect(page.getByRole("button", { name: "New workspace" }).first()).toBeVisible()
@@ -76,7 +100,11 @@ test("switching back to a project opens the latest workspace session", async ({
        await expect(btn).toBeVisible()
        await btn.click({ force: true })
-        await waitSession(page, { directory: space })
+        // A new workspace can be discovered via a transient slug before the route and sidebar
        // settle to the canonical workspace path on Windows, so interact with either and assert
        // against the resolved workspace slug.
        await waitSlug(page)
        await expect(page).toHaveURL(new RegExp(`/${next}/session(?:[/?#]|$)`))
        // Create a session by sending a prompt
        const prompt = page.locator(promptSelector)
@@ -90,7 +118,6 @@ test("switching back to a project opens the latest workspace session", async ({
        const created = sessionIDFromUrl(page.url())
        if (!created) throw new Error(`Failed to get session ID from url: ${page.url()}`)
        trackSession(created, space)
        await waitSessionSaved(space, created)
        await expect(page).toHaveURL(new RegExp(`/${next}/session/${created}(?:[/?#]|$)`))
@@ -98,14 +125,14 @@ test("switching back to a project opens the latest workspace session", async ({
        const otherButton = page.locator(projectSwitchSelector(otherSlug)).first()
        await expect(otherButton).toBeVisible()
-        await otherButton.click({ force: true })
+        await otherButton.click()
-        await waitSession(page, { directory: other })
+        await expect(page).toHaveURL(new RegExp(`/${otherSlug}/session`))
        const rootButton = page.locator(projectSwitchSelector(slug)).first()
        await expect(rootButton).toBeVisible()
-        await rootButton.click({ force: true })
+        await rootButton.click()
-        await waitSession(page, { directory: space, sessionID: created })
+        await expect.poll(() => sessionIDFromUrl(page.url()) ?? "").toBe(created)
        await expect(page).toHaveURL(new RegExp(`/session/${created}(?:[/?#]|$)`))
      },
      { extra: [other] },
@@ -1,94 +1,109 @@
 import { base64Decode } from "@opencode-ai/util/encode"
 import type { Page } from "@playwright/test"
 import { test, expect } from "../fixtures"
-import {
+import { openSidebar, sessionIDFromUrl, setWorkspacesEnabled, slugFromUrl, waitSlug } from "../actions"
  openSidebar,
  resolveSlug,
  sessionIDFromUrl,
  setWorkspacesEnabled,
  waitDir,
  waitSession,
  waitSessionSaved,
  waitSlug,
 } from "../actions"
 import { promptSelector, workspaceItemSelector, workspaceNewSessionSelector } from "../selectors"
 import { createSdk } from "../utils"
-function item(space: { slug: string; raw: string }) {
+async function waitWorkspaceReady(page: Page, slug: string) {
  return `${workspaceItemSelector(space.slug)}, ${workspaceItemSelector(space.raw)}`
 }
 function button(space: { slug: string; raw: string }) {
  return `${workspaceNewSessionSelector(space.slug)}, ${workspaceNewSessionSelector(space.raw)}`
 }
 async function waitWorkspaceReady(page: Page, space: { slug: string; raw: string }) {
  await openSidebar(page)
-  await expect(page.locator(item(space)).first()).toBeVisible({ timeout: 60_000 })
+  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)
 }
 async function createWorkspace(page: Page, root: string, seen: string[]) {
  await openSidebar(page)
  await page.getByRole("button", { name: "New workspace" }).first().click()
-  const next = await resolveSlug(await waitSlug(page, [root, ...seen]))
+  const slug = await waitSlug(page, [root, ...seen])
-  await waitDir(page, next.directory)
+  const directory = base64Decode(slug)
  if (!directory) throw new Error(`Failed to decode workspace slug: ${slug}`)
  return { slug, directory }
 }
 async function openWorkspaceNewSession(page: Page, slug: string) {
  await waitWorkspaceReady(page, slug)
  const item = page.locator(workspaceItemSelector(slug)).first()
  await item.hover()
  const button = page.locator(workspaceNewSessionSelector(slug)).first()
  await expect(button).toBeVisible()
  await button.click({ force: true })
  const next = await waitSlug(page)
  await expect(page).toHaveURL(new RegExp(`/${next}/session(?:[/?#]|$)`))
  return next
 }
-async function openWorkspaceNewSession(page: Page, space: { slug: string; raw: string; directory: string }) {
+async function createSessionFromWorkspace(page: Page, slug: string, text: string) {
-  await waitWorkspaceReady(page, space)
+  const next = await openWorkspaceNewSession(page, slug)
  const row = page.locator(item(space)).first()
  await row.hover()
  const next = page.locator(button(space)).first()
  await expect(next).toBeVisible()
  await next.click({ force: true })
  await waitSession(page, { directory: space.directory })
  await expect.poll(() => sessionIDFromUrl(page.url()) ?? "").toBe("")
 }
 async function createSessionFromWorkspace(
  page: Page,
  space: { slug: string; raw: string; directory: string },
  text: string,
 ) {
  await openWorkspaceNewSession(page, space)
  const prompt = page.locator(promptSelector)
  await expect(prompt).toBeVisible()
  await expect(prompt).toBeEditable()
  await prompt.click()
  await expect(prompt).toBeFocused()
  await prompt.fill(text)
-  await page.keyboard.press("Enter")
+  await expect.poll(async () => ((await prompt.textContent()) ?? "").trim()).toContain(text)
  await prompt.press("Enter")
  await expect.poll(() => slugFromUrl(page.url())).toBe(next)
  await expect.poll(() => sessionIDFromUrl(page.url()) ?? "", { timeout: 30_000 }).not.toBe("")
  await expect.poll(() => sessionIDFromUrl(page.url()) ?? "", { timeout: 15_000 }).not.toBe("")
  const sessionID = sessionIDFromUrl(page.url())
  if (!sessionID) throw new Error(`Failed to parse session id from url: ${page.url()}`)
  await expect(page).toHaveURL(new RegExp(`/${next}/session/${sessionID}(?:[/?#]|$)`))
  return { sessionID, slug: next }
 }
-  await waitSessionSaved(space.directory, sessionID)
+async function sessionDirectory(directory: string, sessionID: string) {
-  await createSdk(space.directory)
+  const info = await createSdk(directory)
-    .session.abort({ sessionID })
+    .session.get({ sessionID })
    .then((x) => x.data)
    .catch(() => undefined)
-  return sessionID
+  if (!info) return ""
  return info.directory
 }
 test("new sessions from sidebar workspace actions stay in selected workspace", async ({ page, withProject }) => {
  await page.setViewportSize({ width: 1400, height: 800 })
-  await withProject(async ({ slug: root, trackDirectory, trackSession }) => {
+  await withProject(async ({ directory, slug: root, trackSession, trackDirectory }) => {
    await openSidebar(page)
    await setWorkspacesEnabled(page, root, true)
    const first = await createWorkspace(page, root, [])
    trackDirectory(first.directory)
-    await waitWorkspaceReady(page, first)
+    await waitWorkspaceReady(page, first.slug)
    const second = await createWorkspace(page, root, [first.slug])
    trackDirectory(second.directory)
-    await waitWorkspaceReady(page, second)
+    await waitWorkspaceReady(page, second.slug)
-    trackSession(await createSessionFromWorkspace(page, first, `workspace one ${Date.now()}`), first.directory)
+    const firstSession = await createSessionFromWorkspace(page, first.slug, `workspace one ${Date.now()}`)
-    trackSession(await createSessionFromWorkspace(page, second, `workspace two ${Date.now()}`), second.directory)
+    trackSession(firstSession.sessionID, first.directory)
-    trackSession(await createSessionFromWorkspace(page, first, `workspace one again ${Date.now()}`), first.directory)
+
    const secondSession = await createSessionFromWorkspace(page, second.slug, `workspace two ${Date.now()}`)
    trackSession(secondSession.sessionID, second.directory)
    const thirdSession = await createSessionFromWorkspace(page, first.slug, `workspace one again ${Date.now()}`)
    trackSession(thirdSession.sessionID, first.directory)
    await expect.poll(() => sessionDirectory(first.directory, firstSession.sessionID)).toBe(first.directory)
    await expect.poll(() => sessionDirectory(second.directory, secondSession.sessionID)).toBe(second.directory)
    await expect.poll(() => sessionDirectory(first.directory, thirdSession.sessionID)).toBe(first.directory)
  })
 })
@@ -1,7 +1,7 @@
 import { base64Decode } from "@opencode-ai/util/encode"
 import fs from "node:fs/promises"
 import os from "node:os"
 import path from "node:path"
 import { base64Decode } from "@opencode-ai/util/encode"
 import type { Page } from "@playwright/test"
 import { test, expect } from "../fixtures"
@@ -13,10 +13,8 @@ import {
  confirmDialog,
  openSidebar,
  openWorkspaceMenu,
  resolveSlug,
  setWorkspacesEnabled,
  slugFromUrl,
  waitDir,
  waitSlug,
 } from "../actions"
 import { dropdownMenuContentSelector, inlineInputSelector, workspaceItemSelector } from "../selectors"
@@ -29,15 +27,15 @@ async function setupWorkspaceTest(page: Page, project: { slug: string }) {
  await setWorkspacesEnabled(page, rootSlug, true)
  await page.getByRole("button", { name: "New workspace" }).first().click()
-  const next = await resolveSlug(await waitSlug(page, [rootSlug]))
+  const slug = await waitSlug(page, [rootSlug])
-  await waitDir(page, next.directory)
+  const dir = base64Decode(slug)
  await openSidebar(page)
  await expect
    .poll(
      async () => {
-        const item = page.locator(workspaceItemSelector(next.slug)).first()
+        const item = page.locator(workspaceItemSelector(slug)).first()
        try {
          await item.hover({ timeout: 500 })
          return true
@@ -49,7 +47,7 @@ async function setupWorkspaceTest(page: Page, project: { slug: string }) {
    )
    .toBe(true)
-  return { rootSlug, slug: next.slug, directory: next.directory }
+  return { rootSlug, slug, directory: dir }
 }
 test("can enable and disable workspaces from project menu", async ({ page, withProject }) => {
@@ -81,15 +79,15 @@ test("can create a workspace", async ({ page, withProject }) => {
    await expect(page.getByRole("button", { name: "New workspace" }).first()).toBeVisible()
    await page.getByRole("button", { name: "New workspace" }).first().click()
-    const next = await resolveSlug(await waitSlug(page, [slug]))
+    const workspaceSlug = await waitSlug(page, [slug])
-    await waitDir(page, next.directory)
+    const workspaceDir = base64Decode(workspaceSlug)
    await openSidebar(page)
    await expect
      .poll(
        async () => {
-          const item = page.locator(workspaceItemSelector(next.slug)).first()
+          const item = page.locator(workspaceItemSelector(workspaceSlug)).first()
          try {
            await item.hover({ timeout: 500 })
            return true
@@ -101,9 +99,9 @@ test("can create a workspace", async ({ page, withProject }) => {
      )
      .toBe(true)
-    await expect(page.locator(workspaceItemSelector(next.slug)).first()).toBeVisible()
+    await expect(page.locator(workspaceItemSelector(workspaceSlug)).first()).toBeVisible()
-    await cleanupTestProject(next.directory)
+    await cleanupTestProject(workspaceDir)
  })
 })
@@ -121,7 +119,7 @@ test("non-git projects keep workspace mode disabled", async ({ page, withProject
      await expect.poll(() => slugFromUrl(page.url()), { timeout: 30_000 }).not.toBe("")
-      const activeDir = await resolveSlug(slugFromUrl(page.url())).then((item) => item.directory)
+      const activeDir = base64Decode(slugFromUrl(page.url()))
      expect(path.basename(activeDir)).toContain("opencode-e2e-project-nongit-")
      await openSidebar(page)
@@ -333,9 +331,9 @@ test("can reorder workspaces by drag and drop", async ({ page, withProject }) =>
      for (const _ of [0, 1]) {
        const prev = slugFromUrl(page.url())
        await page.getByRole("button", { name: "New workspace" }).first().click()
-        const next = await resolveSlug(await waitSlug(page, [rootSlug, prev]))
+        const slug = await waitSlug(page, [rootSlug, prev])
-        await waitDir(page, next.directory)
+        const dir = base64Decode(slug)
-        workspaces.push(next)
+        workspaces.push({ slug, directory: dir })
        await openSidebar(page)
      }
@@ -7,18 +7,12 @@ test("shift+enter inserts a newline without submitting", async ({ page, gotoSess
  await expect(page).toHaveURL(/\/session\/?$/)
  const prompt = page.locator(promptSelector)
-  await prompt.focus()
+  await prompt.click()
-  await expect(prompt).toBeFocused()
+  await page.keyboard.type("line one")
-
+  await page.keyboard.press("Shift+Enter")
-  await prompt.pressSequentially("line one")
+  await page.keyboard.type("line two")
  await expect(prompt).toBeFocused()
  await prompt.press("Shift+Enter")
  await expect(page).toHaveURL(/\/session\/?$/)
  await expect(prompt).toBeFocused()
  await prompt.pressSequentially("line two")
  await expect(page).toHaveURL(/\/session\/?$/)
-  await expect.poll(() => prompt.evaluate((el) => el.innerText)).toBe("line one\nline two")
+  await expect(prompt).toContainText("line one")
  await expect(prompt).toContainText("line two")
 })
@@ -1,5 +1,5 @@
 import { test, expect } from "../fixtures"
-import { runPromptSlash, waitTerminalFocusIdle } from "../actions"
+import { waitTerminalReady } from "../actions"
 import { promptSelector, terminalSelector } from "../selectors"
 test("/terminal toggles the terminal panel", async ({ page, gotoSession }) => {
@@ -7,12 +7,29 @@ test("/terminal toggles the terminal panel", async ({ page, gotoSession }) => {
  const prompt = page.locator(promptSelector)
  const terminal = page.locator(terminalSelector)
  const slash = page.locator('[data-slash-id="terminal.toggle"]').first()
  await expect(terminal).not.toBeVisible()
-  await runPromptSlash(page, { prompt, text: "/terminal", id: "terminal.toggle" })
+  await prompt.fill("/terminal")
-  await waitTerminalFocusIdle(page, { term: terminal })
+  await expect(slash).toBeVisible()
  await page.keyboard.press("Enter")
  await waitTerminalReady(page, { term: terminal })
-  await runPromptSlash(page, { prompt, text: "/terminal", id: "terminal.toggle" })
+  // Terminal panel retries focus (immediate, RAF, 120ms, 240ms) after opening,
  // which can steal focus from the prompt and prevent fill() from triggering
  // the slash popover. Re-attempt click+fill until all retries are exhausted
  // and the popover appears.
  await expect
    .poll(
      async () => {
        await prompt.click().catch(() => false)
        await prompt.fill("/terminal").catch(() => false)
        return slash.isVisible().catch(() => false)
      },
      { timeout: 10_000 },
    )
    .toBe(true)
  await page.keyboard.press("Enter")
  await expect(terminal).not.toBeVisible()
 })
@@ -13,9 +13,6 @@ export const sessionTodoToggleButtonSelector = '[data-action="session-todo-toggl
 export const sessionTodoListSelector = '[data-slot="session-todo-list"]'
 export const modelVariantCycleSelector = '[data-action="model-variant-cycle"]'
 export const promptAgentSelector = '[data-component="prompt-agent-control"]'
 export const promptModelSelector = '[data-component="prompt-model-control"]'
 export const promptVariantSelector = '[data-component="prompt-variant-control"]'
 export const settingsLanguageSelectSelector = '[data-action="settings-language"]'
 export const settingsColorSchemeSelector = '[data-action="settings-color-scheme"]'
 export const settingsThemeSelector = '[data-action="settings-theme"]'
@@ -1,359 +0,0 @@
 import type { Locator, Page } from "@playwright/test"
 import { test, expect } from "../fixtures"
 import {
  openSidebar,
  resolveSlug,
  sessionIDFromUrl,
  setWorkspacesEnabled,
  waitSession,
  waitSessionIdle,
  waitSlug,
 } from "../actions"
 import {
  promptAgentSelector,
  promptModelSelector,
  promptSelector,
  promptVariantSelector,
  workspaceItemSelector,
  workspaceNewSessionSelector,
 } from "../selectors"
 import { createSdk, sessionPath } from "../utils"
 type Footer = {
  agent: string
  model: string
  variant: string
 }
 type Probe = {
  dir?: string
  sessionID?: string
  model?: { providerID: string; modelID: string }
 }
 const escape = (value: string) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")
 const text = async (locator: Locator) => ((await locator.textContent()) ?? "").trim()
 const modelKey = (state: Probe | null) => (state?.model ? `${state.model.providerID}:${state.model.modelID}` : null)
 async function probe(page: Page): Promise<Probe | null> {
  return page.evaluate(() => {
    const win = window as Window & {
      __opencode_e2e?: {
        model?: {
          current?: Probe
        }
      }
    }
    return win.__opencode_e2e?.model?.current ?? null
  })
 }
 async function read(page: Page): Promise<Footer> {
  return {
    agent: await text(page.locator(`${promptAgentSelector} [data-slot="select-select-trigger-value"]`).first()),
    model: await text(page.locator(`${promptModelSelector} [data-action="prompt-model"] span`).first()),
    variant: await text(page.locator(`${promptVariantSelector} [data-slot="select-select-trigger-value"]`).first()),
  }
 }
 async function waitFooter(page: Page, expected: Partial<Footer>) {
  let hit: Footer | null = null
  await expect
    .poll(
      async () => {
        const state = await read(page)
        const ok = Object.entries(expected).every(([key, value]) => state[key as keyof Footer] === value)
        if (ok) hit = state
        return ok
      },
      { timeout: 30_000 },
    )
    .toBe(true)
  if (!hit) throw new Error("Failed to resolve prompt footer state")
  return hit
 }
 async function waitModel(page: Page, value: string) {
  await expect.poll(() => probe(page).then(modelKey), { timeout: 30_000 }).toBe(value)
 }
 async function choose(page: Page, root: string, value: string) {
  const select = page.locator(root)
  await expect(select).toBeVisible()
  await select.locator('[data-action], [data-slot="select-select-trigger"]').first().click()
  const item = page
    .locator('[data-slot="select-select-item"]')
    .filter({ hasText: new RegExp(`^\\s*${escape(value)}\\s*$`) })
    .first()
  await expect(item).toBeVisible()
  await item.click()
 }
 async function variantCount(page: Page) {
  const select = page.locator(promptVariantSelector)
  await expect(select).toBeVisible()
  await select.locator('[data-slot="select-select-trigger"]').click()
  const count = await page.locator('[data-slot="select-select-item"]').count()
  await page.keyboard.press("Escape")
  return count
 }
 async function agents(page: Page) {
  const select = page.locator(promptAgentSelector)
  await expect(select).toBeVisible()
  await select.locator('[data-action], [data-slot="select-select-trigger"]').first().click()
  const labels = await page.locator('[data-slot="select-select-item-label"]').allTextContents()
  await page.keyboard.press("Escape")
  return labels.map((item) => item.trim()).filter(Boolean)
 }
 async function ensureVariant(page: Page, directory: string): Promise<Footer> {
  const current = await read(page)
  if ((await variantCount(page)) >= 2) return current
  const cfg = await createSdk(directory)
    .config.get()
    .then((x) => x.data)
  const visible = new Set(await agents(page))
  const entry = Object.entries(cfg?.agent ?? {}).find((item) => {
    const value = item[1]
    return !!value && typeof value === "object" && "variant" in value && "model" in value && visible.has(item[0])
  })
  const name = entry?.[0]
  test.skip(!name, "no agent with alternate variants available")
  if (!name) return current
  await choose(page, promptAgentSelector, name)
  await expect.poll(() => variantCount(page), { timeout: 30_000 }).toBeGreaterThanOrEqual(2)
  return waitFooter(page, { agent: name })
 }
 async function chooseDifferentVariant(page: Page): Promise<Footer> {
  const current = await read(page)
  const select = page.locator(promptVariantSelector)
  await expect(select).toBeVisible()
  await select.locator('[data-slot="select-select-trigger"]').click()
  const items = page.locator('[data-slot="select-select-item"]')
  const count = await items.count()
  if (count < 2) throw new Error("Current model has no alternate variant to select")
  for (let i = 0; i < count; i++) {
    const item = items.nth(i)
    const next = await text(item.locator('[data-slot="select-select-item-label"]').first())
    if (!next || next === current.variant) continue
    await item.click()
    return waitFooter(page, { agent: current.agent, model: current.model, variant: next })
  }
  throw new Error("Failed to choose a different variant")
 }
 async function chooseOtherModel(page: Page): Promise<Footer> {
  const current = await read(page)
  const button = page.locator(`${promptModelSelector} [data-action="prompt-model"]`)
  await expect(button).toBeVisible()
  await button.click()
  const dialog = page.getByRole("dialog")
  await expect(dialog).toBeVisible()
  const items = dialog.locator('[data-slot="list-item"]')
  const count = await items.count()
  expect(count).toBeGreaterThan(1)
  for (let i = 0; i < count; i++) {
    const item = items.nth(i)
    const selected = (await item.getAttribute("data-selected")) === "true"
    if (selected) continue
    await item.click()
    await expect(dialog).toHaveCount(0)
    await expect.poll(async () => (await read(page)).model !== current.model, { timeout: 30_000 }).toBe(true)
    return read(page)
  }
  throw new Error("Failed to choose a different model")
 }
 async function goto(page: Page, directory: string, sessionID?: string) {
  await page.goto(sessionPath(directory, sessionID))
  await waitSession(page, { directory, sessionID })
 }
 async function submit(page: Page, value: string) {
  const prompt = page.locator(promptSelector)
  await expect(prompt).toBeVisible()
  await prompt.click()
  await prompt.fill(value)
  await prompt.press("Enter")
  await expect.poll(() => sessionIDFromUrl(page.url()) ?? "", { timeout: 30_000 }).not.toBe("")
  const id = sessionIDFromUrl(page.url())
  if (!id) throw new Error(`Failed to resolve session id from ${page.url()}`)
  return id
 }
 async function waitUser(directory: string, sessionID: string) {
  const sdk = createSdk(directory)
  await expect
    .poll(
      async () => {
        const items = await sdk.session.messages({ sessionID, limit: 20 }).then((x) => x.data ?? [])
        return items.some((item) => item.info.role === "user")
      },
      { timeout: 30_000 },
    )
    .toBe(true)
  await sdk.session.abort({ sessionID }).catch(() => undefined)
  await waitSessionIdle(sdk, sessionID, 30_000).catch(() => undefined)
 }
 async function createWorkspace(page: Page, root: string, seen: string[]) {
  await openSidebar(page)
  await page.getByRole("button", { name: "New workspace" }).first().click()
  const next = await resolveSlug(await waitSlug(page, [root, ...seen]))
  await waitSession(page, { directory: next.directory })
  return next
 }
 async function waitWorkspace(page: Page, slug: string) {
  await openSidebar(page)
  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)
 }
 async function newWorkspaceSession(page: Page, slug: string) {
  await waitWorkspace(page, slug)
  const item = page.locator(workspaceItemSelector(slug)).first()
  await item.hover()
  const button = page.locator(workspaceNewSessionSelector(slug)).first()
  await expect(button).toBeVisible()
  await button.click({ force: true })
  const next = await resolveSlug(await waitSlug(page))
  return waitSession(page, { directory: next.directory }).then((item) => item.directory)
 }
 test("session model and variant restore per session without leaking into new sessions", async ({
  page,
  withProject,
 }) => {
  await page.setViewportSize({ width: 1440, height: 900 })
  await withProject(async ({ directory, gotoSession, trackSession }) => {
    await gotoSession()
    await ensureVariant(page, directory)
    const firstState = await chooseDifferentVariant(page)
    const first = await submit(page, `session variant ${Date.now()}`)
    trackSession(first)
    await waitUser(directory, first)
    await page.reload()
    await waitSession(page, { directory, sessionID: first })
    await waitFooter(page, firstState)
    await gotoSession()
    const fresh = await ensureVariant(page, directory)
    expect(fresh.variant).not.toBe(firstState.variant)
    const secondState = await chooseOtherModel(page)
    const second = await submit(page, `session model ${Date.now()}`)
    trackSession(second)
    await waitUser(directory, second)
    await goto(page, directory, first)
    await waitFooter(page, firstState)
    await goto(page, directory, second)
    await waitFooter(page, secondState)
    await gotoSession()
    await waitFooter(page, fresh)
  })
 })
 test("session model restore across workspaces", async ({ page, withProject }) => {
  await page.setViewportSize({ width: 1440, height: 900 })
  await withProject(async ({ directory: root, slug, gotoSession, trackDirectory, trackSession }) => {
    await gotoSession()
    await ensureVariant(page, root)
    const firstState = await chooseDifferentVariant(page)
    const first = await submit(page, `root session ${Date.now()}`)
    trackSession(first, root)
    await waitUser(root, first)
    await openSidebar(page)
    await setWorkspacesEnabled(page, slug, true)
    const one = await createWorkspace(page, slug, [])
    const oneDir = await newWorkspaceSession(page, one.slug)
    trackDirectory(oneDir)
    const secondState = await chooseOtherModel(page)
    const second = await submit(page, `workspace one ${Date.now()}`)
    trackSession(second, oneDir)
    await waitUser(oneDir, second)
    const two = await createWorkspace(page, slug, [one.slug])
    const twoDir = await newWorkspaceSession(page, two.slug)
    trackDirectory(twoDir)
    await ensureVariant(page, twoDir)
    const thirdState = await chooseDifferentVariant(page)
    const third = await submit(page, `workspace two ${Date.now()}`)
    trackSession(third, twoDir)
    await waitUser(twoDir, third)
    await goto(page, root, first)
    await waitFooter(page, firstState)
    await goto(page, oneDir, second)
    await waitFooter(page, secondState)
    await goto(page, twoDir, third)
    await waitFooter(page, thirdState)
    await goto(page, root, first)
    await waitFooter(page, firstState)
  })
 })
 test("variant preserved when switching agent modes", async ({ page, withProject }) => {
  await page.setViewportSize({ width: 1440, height: 900 })
  await withProject(async ({ directory, gotoSession }) => {
    await gotoSession()
    await ensureVariant(page, directory)
    const updated = await chooseDifferentVariant(page)
    const available = await agents(page)
    const other = available.find((name) => name !== updated.agent)
    test.skip(!other, "only one agent available")
    if (!other) return
    await choose(page, promptAgentSelector, other)
    await waitFooter(page, { agent: other, variant: updated.variant })
    await choose(page, promptAgentSelector, updated.agent)
    await waitFooter(page, { agent: updated.agent, variant: updated.variant })
  })
 })
@@ -123,215 +123,6 @@ async function spot(page: Parameters<typeof test>[0]["page"], file: string) {
  }, file)
 }
 async function comment(page: Parameters<typeof test>[0]["page"], file: string, note: string) {
  const row = page.locator(`[data-file="${file}"]`).first()
  await expect(row).toBeVisible()
  const line = row.locator('diffs-container [data-line="2"]').first()
  await expect(line).toBeVisible()
  await line.hover()
  const add = row.getByRole("button", { name: /^Comment$/ }).first()
  await expect(add).toBeVisible()
  await add.click()
  const area = row.locator('[data-slot="line-comment-textarea"]').first()
  await expect(area).toBeVisible()
  await area.fill(note)
  const submit = row.locator('[data-slot="line-comment-action"][data-variant="primary"]').first()
  await expect(submit).toBeEnabled()
  await submit.click()
  await expect(row.locator('[data-slot="line-comment-content"]').filter({ hasText: note }).first()).toBeVisible()
  await expect(row.locator('[data-slot="line-comment-tools"]').first()).toBeVisible()
 }
 async function overflow(page: Parameters<typeof test>[0]["page"], file: string) {
  const row = page.locator(`[data-file="${file}"]`).first()
  const view = page.locator('[data-slot="session-review-scroll"] .scroll-view__viewport').first()
  const pop = row.locator('[data-slot="line-comment-popover"][data-inline-body]').first()
  const tools = row.locator('[data-slot="line-comment-tools"]').first()
  const [width, viewBox, popBox, toolsBox] = await Promise.all([
    view.evaluate((el) => el.scrollWidth - el.clientWidth),
    view.boundingBox(),
    pop.boundingBox(),
    tools.boundingBox(),
  ])
  if (!viewBox || !popBox || !toolsBox) return null
  return {
    width,
    pop: popBox.x + popBox.width - (viewBox.x + viewBox.width),
    tools: toolsBox.x + toolsBox.width - (viewBox.x + viewBox.width),
  }
 }
 async function openReviewFile(page: Parameters<typeof test>[0]["page"], file: string) {
  const row = page.locator(`[data-file="${file}"]`).first()
  await expect(row).toBeVisible()
  await row.hover()
  const open = row.getByRole("button", { name: /^Open file$/i }).first()
  await expect(open).toBeVisible()
  await open.click()
  const tab = page.getByRole("tab", { name: file }).first()
  await expect(tab).toBeVisible()
  await tab.click()
  const viewer = page.locator('[data-component="file"][data-mode="text"]').first()
  await expect(viewer).toBeVisible()
  return viewer
 }
 async function fileComment(page: Parameters<typeof test>[0]["page"], note: string) {
  const viewer = page.locator('[data-component="file"][data-mode="text"]').first()
  await expect(viewer).toBeVisible()
  const line = viewer.locator('diffs-container [data-line="2"]').first()
  await expect(line).toBeVisible()
  await line.hover()
  const add = viewer.getByRole("button", { name: /^Comment$/ }).first()
  await expect(add).toBeVisible()
  await add.click()
  const area = viewer.locator('[data-slot="line-comment-textarea"]').first()
  await expect(area).toBeVisible()
  await area.fill(note)
  const submit = viewer.locator('[data-slot="line-comment-action"][data-variant="primary"]').first()
  await expect(submit).toBeEnabled()
  await submit.click()
  await expect(viewer.locator('[data-slot="line-comment-content"]').filter({ hasText: note }).first()).toBeVisible()
  await expect(viewer.locator('[data-slot="line-comment-tools"]').first()).toBeVisible()
 }
 async function fileOverflow(page: Parameters<typeof test>[0]["page"]) {
  const viewer = page.locator('[data-component="file"][data-mode="text"]').first()
  const view = page.locator('[role="tabpanel"] .scroll-view__viewport').first()
  const pop = viewer.locator('[data-slot="line-comment-popover"][data-inline-body]').first()
  const tools = viewer.locator('[data-slot="line-comment-tools"]').first()
  const [width, viewBox, popBox, toolsBox] = await Promise.all([
    view.evaluate((el) => el.scrollWidth - el.clientWidth),
    view.boundingBox(),
    pop.boundingBox(),
    tools.boundingBox(),
  ])
  if (!viewBox || !popBox || !toolsBox) return null
  return {
    width,
    pop: popBox.x + popBox.width - (viewBox.x + viewBox.width),
    tools: toolsBox.x + toolsBox.width - (viewBox.x + viewBox.width),
  }
 }
 test("review applies inline comment clicks without horizontal overflow", async ({ page, withProject }) => {
  test.setTimeout(180_000)
  const tag = `review-comment-${Date.now()}`
  const file = `review-comment-${tag}.txt`
  const note = `comment ${tag}`
  await page.setViewportSize({ width: 1280, height: 900 })
  await withProject(async (project) => {
    const sdk = createSdk(project.directory)
    await withSession(sdk, `e2e review comment ${tag}`, async (session) => {
      await patch(sdk, session.id, seed([{ file, mark: tag }]))
      await expect
        .poll(
          async () => {
            const diff = await sdk.session.diff({ sessionID: session.id }).then((res) => res.data ?? [])
            return diff.length
          },
          { timeout: 60_000 },
        )
        .toBe(1)
      await project.gotoSession(session.id)
      await show(page)
      const tab = page.getByRole("tab", { name: /Review/i }).first()
      await expect(tab).toBeVisible()
      await tab.click()
      await expand(page)
      await waitMark(page, file, tag)
      await comment(page, file, note)
      await expect
        .poll(async () => (await overflow(page, file))?.width ?? Number.POSITIVE_INFINITY, { timeout: 10_000 })
        .toBeLessThanOrEqual(1)
      await expect
        .poll(async () => (await overflow(page, file))?.pop ?? Number.POSITIVE_INFINITY, { timeout: 10_000 })
        .toBeLessThanOrEqual(1)
      await expect
        .poll(async () => (await overflow(page, file))?.tools ?? Number.POSITIVE_INFINITY, { timeout: 10_000 })
        .toBeLessThanOrEqual(1)
    })
  })
 })
 test("review file comments submit on click without clipping actions", async ({ page, withProject }) => {
  test.setTimeout(180_000)
  const tag = `review-file-comment-${Date.now()}`
  const file = `review-file-comment-${tag}.txt`
  const note = `comment ${tag}`
  await page.setViewportSize({ width: 1280, height: 900 })
  await withProject(async (project) => {
    const sdk = createSdk(project.directory)
    await withSession(sdk, `e2e review file comment ${tag}`, async (session) => {
      await patch(sdk, session.id, seed([{ file, mark: tag }]))
      await expect
        .poll(
          async () => {
            const diff = await sdk.session.diff({ sessionID: session.id }).then((res) => res.data ?? [])
            return diff.length
          },
          { timeout: 60_000 },
        )
        .toBe(1)
      await project.gotoSession(session.id)
      await show(page)
      const tab = page.getByRole("tab", { name: /Review/i }).first()
      await expect(tab).toBeVisible()
      await tab.click()
      await expand(page)
      await waitMark(page, file, tag)
      await openReviewFile(page, file)
      await fileComment(page, note)
      await expect
        .poll(async () => (await fileOverflow(page))?.width ?? Number.POSITIVE_INFINITY, { timeout: 10_000 })
        .toBeLessThanOrEqual(1)
      await expect
        .poll(async () => (await fileOverflow(page))?.pop ?? Number.POSITIVE_INFINITY, { timeout: 10_000 })
        .toBeLessThanOrEqual(1)
      await expect
        .poll(async () => (await fileOverflow(page))?.tools ?? Number.POSITIVE_INFINITY, { timeout: 10_000 })
        .toBeLessThanOrEqual(1)
    })
  })
 })
 test("review keeps scroll position after a live diff update", async ({ page, withProject }) => {
  test.skip(Boolean(process.env.CI), "Flaky in CI for now.")
  test.setTimeout(180_000)
@@ -1,5 +1,5 @@
 import { test, expect } from "../fixtures"
-import { openSettings, closeDialog, waitTerminalFocusIdle, withSession } from "../actions"
+import { openSettings, closeDialog, waitTerminalReady, withSession } from "../actions"
 import { keybindButtonSelector, terminalSelector } from "../selectors"
 import { modKey } from "../utils"
@@ -302,7 +302,7 @@ test("changing terminal toggle keybind works", async ({ page, gotoSession }) =>
  await expect(terminal).not.toBeVisible()
  await page.keyboard.press(`${modKey}+Y`)
-  await waitTerminalFocusIdle(page, { term: terminal })
+  await waitTerminalReady(page, { term: terminal })
  await page.keyboard.press(`${modKey}+Y`)
  await expect(terminal).not.toBeVisible()
@@ -1,5 +1,5 @@
 import { test, expect } from "../fixtures"
-import { waitTerminalFocusIdle, waitTerminalReady } from "../actions"
+import { waitTerminalReady } from "../actions"
 import { promptSelector, terminalSelector } from "../selectors"
 import { terminalToggleKey } from "../utils"
@@ -14,7 +14,7 @@ test("smoke terminal mounts and can create a second tab", async ({ page, gotoSes
    await page.keyboard.press(terminalToggleKey)
  }
-  await waitTerminalFocusIdle(page, { term: terminals.first() })
+  await waitTerminalReady(page, { term: terminals.first() })
  await expect(terminals).toHaveCount(1)
  // Ghostty captures a lot of keybinds when focused; move focus back
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.2.27",
+  "version": "1.2.25",
  "description": "",
  "type": "module",
  "exports": {
@@ -54,10 +54,9 @@
    "@solid-primitives/websocket": "1.3.1",
    "@solidjs/meta": "catalog:",
    "@solidjs/router": "catalog:",
    "@tanstack/solid-query": "5.91.4",
    "@thisbeyond/solid-dnd": "0.7.5",
    "diff": "catalog:",
-    "effect": "catalog:",
+    "effect": "4.0.0-beta.31",
    "fuzzysort": "catalog:",
    "ghostty-web": "github:anomalyco/ghostty-web#main",
    "luxon": "catalog:",
@@ -9,7 +9,6 @@ import { Splash } from "@opencode-ai/ui/logo"
 import { ThemeProvider } from "@opencode-ai/ui/theme"
 import { MetaProvider } from "@solidjs/meta"
 import { type BaseRouterProps, Navigate, Route, Router } from "@solidjs/router"
 import { QueryClient, QueryClientProvider } from "@tanstack/solid-query"
 import { type Duration, Effect } from "effect"
 import {
  type Component,
@@ -47,13 +46,21 @@ import Layout from "@/pages/layout"
 import { ErrorPage } from "./pages/error"
 import { useCheckServerHealth } from "./utils/server-health"
-const HomeRoute = lazy(() => import("@/pages/home"))
+const Home = lazy(() => import("@/pages/home"))
 const Session = lazy(() => import("@/pages/session"))
 const Loading = () => <div class="size-full" />
 const HomeRoute = () => (
  <Suspense fallback={<Loading />}>
    <Home />
  </Suspense>
 )
 const SessionRoute = () => (
  <SessionProviders>
-    <Session />
+    <Suspense fallback={<Loading />}>
      <Session />
    </Suspense>
  </SessionProviders>
 )
@@ -82,11 +89,6 @@ function MarkedProviderWithNativeParser(props: ParentProps) {
  return <MarkedProvider nativeParser={platform.parseMarkdown}>{props.children}</MarkedProvider>
 }
 function QueryProvider(props: ParentProps) {
  const client = new QueryClient()
  return <QueryClientProvider client={client}>{props.children}</QueryClientProvider>
 }
 function AppShellProviders(props: ParentProps) {
  return (
    <SettingsProvider>
@@ -122,10 +124,8 @@ function SessionProviders(props: ParentProps) {
 function RouterRoot(props: ParentProps<{ appChildren?: JSX.Element }>) {
  return (
    <AppShellProviders>
-      <Suspense fallback={<Loading />}>
+      {props.appChildren}
-        {props.appChildren}
+      {props.children}
        {props.children}
      </Suspense>
    </AppShellProviders>
  )
 }
@@ -142,13 +142,11 @@ export function AppBaseProviders(props: ParentProps) {
        <LanguageProvider>
          <UiI18nBridge>
            <ErrorBoundary fallback={(error) => <ErrorPage error={error} />}>
-              <QueryProvider>
+              <DialogProvider>
-                <DialogProvider>
+                <MarkedProviderWithNativeParser>
-                  <MarkedProviderWithNativeParser>
+                  <FileComponentProvider component={File}>{props.children}</FileComponentProvider>
-                    <FileComponentProvider component={File}>{props.children}</FileComponentProvider>
+                </MarkedProviderWithNativeParser>
-                  </MarkedProviderWithNativeParser>
+              </DialogProvider>
                </DialogProvider>
              </QueryProvider>
            </ErrorBoundary>
          </UiI18nBridge>
        </LanguageProvider>
@@ -267,15 +265,6 @@ function ConnectionError(props: { onRetry?: () => void; onServerSelected?: (key:
  )
 }
 function ServerKey(props: ParentProps) {
  const server = useServer()
  return (
    <Show when={server.key} keyed>
      {props.children}
    </Show>
  )
 }
 export function AppInterface(props: {
  children?: JSX.Element
  defaultServer: ServerConnection.Key
@@ -286,22 +275,20 @@ export function AppInterface(props: {
  return (
    <ServerProvider defaultServer={props.defaultServer} servers={props.servers}>
      <ConnectionGate disableHealthCheck={props.disableHealthCheck}>
-        <ServerKey>
+        <GlobalSDKProvider>
-          <GlobalSDKProvider>
+          <GlobalSyncProvider>
-            <GlobalSyncProvider>
+            <Dynamic
-              <Dynamic
+              component={props.router ?? Router}
-                component={props.router ?? Router}
+              root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>}
-                root={(routerProps) => <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>}
+            >
-              >
+              <Route path="/" component={HomeRoute} />
-                <Route path="/" component={HomeRoute} />
+              <Route path="/:dir" component={DirectoryLayout}>
-                <Route path="/:dir" component={DirectoryLayout}>
+                <Route path="/" component={SessionIndexRoute} />
-                  <Route path="/" component={SessionIndexRoute} />
+                <Route path="/session/:id?" component={SessionRoute} />
-                  <Route path="/session/:id?" component={SessionRoute} />
+              </Route>
-                </Route>
+            </Dynamic>
-              </Dynamic>
+          </GlobalSyncProvider>
-            </GlobalSyncProvider>
+        </GlobalSDKProvider>
          </GlobalSDKProvider>
        </ServerKey>
      </ConnectionGate>
    </ServerProvider>
  )
@@ -12,15 +12,18 @@ import { showToast } from "@opencode-ai/ui/toast"
 import { createMemo, Match, onCleanup, onMount, Switch } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { Link } from "@/components/link"
 import { useLanguage } from "@/context/language"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { useGlobalSync } from "@/context/global-sync"
-import { useLanguage } from "@/context/language"
+import { usePlatform } from "@/context/platform"
 import { DialogSelectModel } from "./dialog-select-model"
 import { DialogSelectProvider } from "./dialog-select-provider"
 export function DialogConnectProvider(props: { provider: string }) {
  const dialog = useDialog()
  const globalSync = useGlobalSync()
  const globalSDK = useGlobalSDK()
  const platform = usePlatform()
  const language = useLanguage()
  const alive = { value: true }
@@ -46,14 +49,13 @@ export function DialogConnectProvider(props: { provider: string }) {
  const [store, setStore] = createStore({
    methodIndex: undefined as undefined | number,
    authorization: undefined as undefined | ProviderAuthAuthorization,
-    state: "pending" as undefined | "pending" | "complete" | "error" | "prompt",
+    state: "pending" as undefined | "pending" | "complete" | "error",
    error: undefined as string | undefined,
  })
  type Action =
    | { type: "method.select"; index: number }
    | { type: "method.reset" }
    | { type: "auth.prompt" }
    | { type: "auth.pending" }
    | { type: "auth.complete"; authorization: ProviderAuthAuthorization }
    | { type: "auth.error"; error: string }
@@ -75,11 +77,6 @@ export function DialogConnectProvider(props: { provider: string }) {
          draft.error = undefined
          return
        }
        if (action.type === "auth.prompt") {
          draft.state = "prompt"
          draft.error = undefined
          return
        }
        if (action.type === "auth.pending") {
          draft.state = "pending"
          draft.error = undefined
@@ -123,7 +120,7 @@ export function DialogConnectProvider(props: { provider: string }) {
    return fallback
  }
-  async function selectMethod(index: number, inputs?: Record<string, string>) {
+  async function selectMethod(index: number) {
    if (timer.current !== undefined) {
      clearTimeout(timer.current)
      timer.current = undefined
@@ -133,10 +130,6 @@ export function DialogConnectProvider(props: { provider: string }) {
    dispatch({ type: "method.select", index })
    if (method.type === "oauth") {
      if (method.prompts?.length && !inputs) {
        dispatch({ type: "auth.prompt" })
        return
      }
      dispatch({ type: "auth.pending" })
      const start = Date.now()
      await globalSDK.client.provider.oauth
@@ -144,7 +137,6 @@ export function DialogConnectProvider(props: { provider: string }) {
          {
            providerID: props.provider,
            method: index,
            inputs,
          },
          { throwOnError: true },
        )
@@ -171,122 +163,6 @@ export function DialogConnectProvider(props: { provider: string }) {
    }
  }
  function OAuthPromptsView() {
    const [formStore, setFormStore] = createStore({
      value: {} as Record<string, string>,
      index: 0,
    })
    const prompts = createMemo(() => method()?.prompts ?? [])
    const matches = (prompt: NonNullable<ReturnType<typeof prompts>[number]>, value: Record<string, string>) => {
      if (!prompt.when) return true
      const actual = value[prompt.when.key]
      if (actual === undefined) return false
      return prompt.when.op === "eq" ? actual === prompt.when.value : actual !== prompt.when.value
    }
    const current = createMemo(() => {
      const all = prompts()
      const index = all.findIndex((prompt, index) => index >= formStore.index && matches(prompt, formStore.value))
      if (index === -1) return
      return {
        index,
        prompt: all[index],
      }
    })
    const valid = createMemo(() => {
      const item = current()
      if (!item || item.prompt.type !== "text") return false
      const value = formStore.value[item.prompt.key] ?? ""
      return value.trim().length > 0
    })
    async function next(index: number, value: Record<string, string>) {
      if (store.methodIndex === undefined) return
      const next = prompts().findIndex((prompt, i) => i > index && matches(prompt, value))
      if (next !== -1) {
        setFormStore("index", next)
        return
      }
      await selectMethod(store.methodIndex, value)
    }
    async function handleSubmit(e: SubmitEvent) {
      e.preventDefault()
      const item = current()
      if (!item || item.prompt.type !== "text") return
      if (!valid()) return
      await next(item.index, formStore.value)
    }
    const item = () => current()
    const text = createMemo(() => {
      const prompt = item()?.prompt
      if (!prompt || prompt.type !== "text") return
      return prompt
    })
    const select = createMemo(() => {
      const prompt = item()?.prompt
      if (!prompt || prompt.type !== "select") return
      return prompt
    })
    return (
      <form onSubmit={handleSubmit} class="flex flex-col items-start gap-4">
        <Switch>
          <Match when={item()?.prompt.type === "text"}>
            <TextField
              type="text"
              label={text()?.message ?? ""}
              placeholder={text()?.placeholder}
              value={text() ? (formStore.value[text()!.key] ?? "") : ""}
              onChange={(value) => {
                const prompt = text()
                if (!prompt) return
                setFormStore("value", prompt.key, value)
              }}
            />
            <Button class="w-auto" type="submit" size="large" variant="primary" disabled={!valid()}>
              {language.t("common.continue")}
            </Button>
          </Match>
          <Match when={item()?.prompt.type === "select"}>
            <div class="w-full flex flex-col gap-1.5">
              <div class="text-14-regular text-text-base">{select()?.message}</div>
              <div>
                <List
                  items={select()?.options ?? []}
                  key={(x) => x.value}
                  current={select()?.options.find((x) => x.value === formStore.value[select()!.key])}
                  onSelect={(value) => {
                    if (!value) return
                    const prompt = select()
                    if (!prompt) return
                    const nextValue = {
                      ...formStore.value,
                      [prompt.key]: value.value,
                    }
                    setFormStore("value", prompt.key, value.value)
                    void next(item()!.index, nextValue)
                  }}
                >
                  {(option) => (
                    <div class="w-full flex items-center gap-x-2">
                      <div class="w-4 h-2 rounded-[1px] bg-input-base shadow-xs-border-base flex items-center justify-center">
                        <div class="w-2.5 h-0.5 ml-0 bg-icon-strong-base hidden" data-slot="list-item-extra-icon" />
                      </div>
                      <span>{option.label}</span>
                      <span class="text-14-regular text-text-weak">{option.hint}</span>
                    </div>
                  )}
                </List>
              </div>
            </div>
          </Match>
        </Switch>
      </form>
    )
  }
  let listRef: ListRef | undefined
  function handleKey(e: KeyboardEvent) {
    if (e.key === "Enter" && e.target instanceof HTMLInputElement) {
@@ -425,7 +301,7 @@ export function DialogConnectProvider(props: { provider: string }) {
            error={formStore.error}
          />
          <Button class="w-auto" type="submit" size="large" variant="primary">
-            {language.t("common.continue")}
+            {language.t("common.submit")}
          </Button>
        </form>
      </div>
@@ -438,6 +314,12 @@ export function DialogConnectProvider(props: { provider: string }) {
      error: undefined as string | undefined,
    })
    onMount(() => {
      if (store.authorization?.method === "code" && store.authorization?.url) {
        platform.openLink(store.authorization.url)
      }
    })
    async function handleSubmit(e: SubmitEvent) {
      e.preventDefault()
@@ -486,7 +368,7 @@ export function DialogConnectProvider(props: { provider: string }) {
            error={formStore.error}
          />
          <Button class="w-auto" type="submit" size="large" variant="primary">
-            {language.t("common.continue")}
+            {language.t("common.submit")}
          </Button>
        </form>
      </div>
@@ -504,6 +386,10 @@ export function DialogConnectProvider(props: { provider: string }) {
    onMount(() => {
      void (async () => {
        if (store.authorization?.url) {
          platform.openLink(store.authorization.url)
        }
        const result = await globalSDK.client.provider.oauth
          .callback({
            providerID: props.provider,
@@ -584,9 +470,6 @@ export function DialogConnectProvider(props: { provider: string }) {
                  </div>
                </div>
              </Match>
              <Match when={store.state === "prompt"}>
                <OAuthPromptsView />
              </Match>
              <Match when={store.state === "error"}>
                <div class="text-14-regular text-text-base">
                  <div class="flex items-center gap-x-2">
@@ -34,6 +34,7 @@ export type FormState = {
  apiKey: string
  models: ModelRow[]
  headers: HeaderRow[]
  saving: boolean
  err: {
    providerID?: string
    name?: string
@@ -16,6 +16,7 @@ describe("validateCustomProvider", () => {
          { row: "h0", key: " X-Test ", value: " enabled ", err: {} },
          { row: "h1", key: "", value: "", err: {} },
        ],
        saving: false,
        err: {},
      },
      t,
@@ -59,6 +60,7 @@ describe("validateCustomProvider", () => {
          { row: "h0", key: "Authorization", value: "one", err: {} },
          { row: "h1", key: "authorization", value: "two", err: {} },
        ],
        saving: false,
        err: {},
      },
      t,
@@ -3,7 +3,6 @@ import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
 import { useMutation } from "@tanstack/solid-query"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { showToast } from "@opencode-ai/ui/toast"
 import { batch, For } from "solid-js"
@@ -32,6 +31,7 @@ export function DialogCustomProvider(props: Props) {
    apiKey: "",
    models: [modelRow()],
    headers: [headerRow()],
    saving: false,
    err: {},
  })
@@ -116,49 +116,48 @@ export function DialogCustomProvider(props: Props) {
    return output.result
  }
-  const saveMutation = useMutation(() => ({
+  const save = async (e: SubmitEvent) => {
-    mutationFn: async (result: NonNullable<ReturnType<typeof validate>>) => {
+    e.preventDefault()
-      const disabledProviders = globalSync.data.config.disabled_providers ?? []
+    if (form.saving) return
      const nextDisabled = disabledProviders.filter((id) => id !== result.providerID)
-      if (result.key) {
+    const result = validate()
-        await globalSDK.client.auth.set({
+    if (!result) return
    setForm("saving", true)
    const disabledProviders = globalSync.data.config.disabled_providers ?? []
    const nextDisabled = disabledProviders.filter((id) => id !== result.providerID)
    const auth = result.key
      ? globalSDK.client.auth.set({
          providerID: result.providerID,
          auth: {
            type: "api",
            key: result.key,
          },
        })
-      }
+      : Promise.resolve()
-      await globalSync.updateConfig({
+    auth
-        provider: { [result.providerID]: result.config },
+      .then(() =>
-        disabled_providers: nextDisabled,
+        globalSync.updateConfig({ provider: { [result.providerID]: result.config }, disabled_providers: nextDisabled }),
      )
      .then(() => {
        dialog.close()
        showToast({
          variant: "success",
          icon: "circle-check",
          title: language.t("provider.connect.toast.connected.title", { provider: result.name }),
          description: language.t("provider.connect.toast.connected.description", { provider: result.name }),
        })
      })
-      return result
+      .catch((err: unknown) => {
-    },
+        const message = err instanceof Error ? err.message : String(err)
-    onSuccess: (result) => {
+        showToast({ title: language.t("common.requestFailed"), description: message })
-      dialog.close()
+      })
-      showToast({
+      .finally(() => {
-        variant: "success",
+        setForm("saving", false)
        icon: "circle-check",
        title: language.t("provider.connect.toast.connected.title", { provider: result.name }),
        description: language.t("provider.connect.toast.connected.description", { provider: result.name }),
      })
    },
    onError: (err) => {
      const message = err instanceof Error ? err.message : String(err)
      showToast({ title: language.t("common.requestFailed"), description: message })
    },
  }))
  const save = (e: SubmitEvent) => {
    e.preventDefault()
    if (saveMutation.isPending) return
    const result = validate()
    if (!result) return
    saveMutation.mutate(result)
  }
  return (
@@ -313,14 +312,8 @@ export function DialogCustomProvider(props: Props) {
            </Button>
          </div>
-          <Button
+          <Button class="w-auto self-start" type="submit" size="large" variant="primary" disabled={form.saving}>
-            class="w-auto self-start"
+            {form.saving ? language.t("common.saving") : language.t("common.submit")}
            type="submit"
            size="large"
            variant="primary"
            disabled={saveMutation.isPending}
          >
            {saveMutation.isPending ? language.t("common.saving") : language.t("common.submit")}
          </Button>
        </form>
      </div>
@@ -2,7 +2,6 @@ import { Button } from "@opencode-ai/ui/button"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { useMutation } from "@tanstack/solid-query"
 import { Icon } from "@opencode-ai/ui/icon"
 import { createMemo, For, Show } from "solid-js"
 import { createStore } from "solid-js/store"
@@ -29,6 +28,7 @@ export function DialogEditProject(props: { project: LocalProject }) {
    color: props.project.icon?.color || "pink",
    iconUrl: props.project.icon?.override || "",
    startup: props.project.commands?.start ?? "",
    saving: false,
    dragOver: false,
    iconHover: false,
  })
@@ -71,37 +71,38 @@ export function DialogEditProject(props: { project: LocalProject }) {
    setStore("iconUrl", "")
  }
-  const saveMutation = useMutation(() => ({
+  async function handleSubmit(e: SubmitEvent) {
    mutationFn: async () => {
      const name = store.name.trim() === folderName() ? "" : store.name.trim()
      const start = store.startup.trim()
      if (props.project.id && props.project.id !== "global") {
        await globalSDK.client.project.update({
          projectID: props.project.id,
          directory: props.project.worktree,
          name,
          icon: { color: store.color, override: store.iconUrl },
          commands: { start },
        })
        globalSync.project.icon(props.project.worktree, store.iconUrl || undefined)
        dialog.close()
        return
      }
      globalSync.project.meta(props.project.worktree, {
        name,
        icon: { color: store.color, override: store.iconUrl || undefined },
        commands: { start: start || undefined },
      })
      dialog.close()
    },
  }))
  function handleSubmit(e: SubmitEvent) {
    e.preventDefault()
-    if (saveMutation.isPending) return
+
-    saveMutation.mutate()
+    await Promise.resolve()
      .then(async () => {
        setStore("saving", true)
        const name = store.name.trim() === folderName() ? "" : store.name.trim()
        const start = store.startup.trim()
        if (props.project.id && props.project.id !== "global") {
          await globalSDK.client.project.update({
            projectID: props.project.id,
            directory: props.project.worktree,
            name,
            icon: { color: store.color, override: store.iconUrl },
            commands: { start },
          })
          globalSync.project.icon(props.project.worktree, store.iconUrl || undefined)
          dialog.close()
          return
        }
        globalSync.project.meta(props.project.worktree, {
          name,
          icon: { color: store.color, override: store.iconUrl || undefined },
          commands: { start: start || undefined },
        })
        dialog.close()
      })
      .finally(() => {
        setStore("saving", false)
      })
  }
  return (
@@ -245,8 +246,8 @@ export function DialogEditProject(props: { project: LocalProject }) {
          <Button type="button" variant="ghost" size="large" onClick={() => dialog.close()}>
            {language.t("common.cancel")}
          </Button>
-          <Button type="submit" variant="primary" size="large" disabled={saveMutation.isPending}>
+          <Button type="submit" variant="primary" size="large" disabled={store.saving}>
-            {saveMutation.isPending ? language.t("common.saving") : language.t("common.save")}
+            {store.saving ? language.t("common.saving") : language.t("common.save")}
          </Button>
        </div>
      </form>
@@ -66,7 +66,6 @@ export const DialogFork: Component = () => {
      directory: sdk.directory,
      attachmentName: language.t("common.attachment"),
    })
    const dir = base64Encode(sdk.directory)
    sdk.client.session
      .fork({ sessionID, messageID: item.id })
@@ -76,8 +75,10 @@ export const DialogFork: Component = () => {
          return
        }
        dialog.close()
-        prompt.set(restored, undefined, { dir, id: forked.data.id })
+        navigate(`/${base64Encode(sdk.directory)}/session/${forked.data.id}`)
-        navigate(`/${dir}/session/${forked.data.id}`)
+        requestAnimationFrame(() => {
          prompt.set(restored)
        })
      })
      .catch((err: unknown) => {
        const message = err instanceof Error ? err.message : String(err)
@@ -1,5 +1,4 @@
-import { useMutation } from "@tanstack/solid-query"
+import { Component, createMemo, createSignal, Show } from "solid-js"
 import { Component, createMemo, Show } from "solid-js"
 import { useSync } from "@/context/sync"
 import { useSDK } from "@/context/sdk"
 import { Dialog } from "@opencode-ai/ui/dialog"
@@ -18,6 +17,7 @@ export const DialogSelectMcp: Component = () => {
  const sync = useSync()
  const sdk = useSDK()
  const language = useLanguage()
  const [loading, setLoading] = createSignal<string | null>(null)
  const items = createMemo(() =>
    Object.entries(sync.data.mcp ?? {})
@@ -25,8 +25,10 @@ export const DialogSelectMcp: Component = () => {
      .sort((a, b) => a.name.localeCompare(b.name)),
  )
-  const toggle = useMutation(() => ({
+  const toggle = async (name: string) => {
-    mutationFn: async (name: string) => {
+    if (loading()) return
    setLoading(name)
    try {
      const status = sync.data.mcp[name]
      if (status?.status === "connected") {
        await sdk.client.mcp.disconnect({ name })
@@ -36,8 +38,10 @@ export const DialogSelectMcp: Component = () => {
      const result = await sdk.client.mcp.status()
      if (result.data) sync.set("mcp", result.data)
-    },
+    } finally {
-  }))
+      setLoading(null)
    }
  }
  const enabledCount = createMemo(() => items().filter((i) => i.status === "connected").length)
  const totalCount = createMemo(() => items().length)
@@ -55,8 +59,7 @@ export const DialogSelectMcp: Component = () => {
        filterKeys={["name", "status"]}
        sortBy={(a, b) => a.name.localeCompare(b.name)}
        onSelect={(x) => {
-          if (!x || toggle.isPending) return
+          if (x) toggle(x.name)
          toggle.mutate(x.name)
        }}
      >
        {(i) => {
@@ -80,7 +83,7 @@ export const DialogSelectMcp: Component = () => {
                  <Show when={statusLabel()}>
                    <span class="text-11-regular text-text-weaker">{statusLabel()}</span>
                  </Show>
-                  <Show when={toggle.isPending && toggle.variables === i.name}>
+                  <Show when={loading() === i.name}>
                    <span class="text-11-regular text-text-weak">{language.t("common.loading.ellipsis")}</span>
                  </Show>
                </div>
@@ -89,14 +92,7 @@ export const DialogSelectMcp: Component = () => {
                </Show>
              </div>
              <div onClick={(e) => e.stopPropagation()}>
-                <Switch
+                <Switch checked={enabled()} disabled={loading() === i.name} onChange={() => toggle(i.name)} />
                  checked={enabled()}
                  disabled={toggle.isPending && toggle.variables === i.name}
                  onChange={() => {
                    if (toggle.isPending) return
                    toggle.mutate(i.name)
                  }}
                />
              </div>
            </div>
          )
@@ -13,10 +13,8 @@ import { DialogSelectProvider } from "./dialog-select-provider"
 import { ModelTooltip } from "./model-tooltip"
 import { useLanguage } from "@/context/language"
-type ModelState = ReturnType<typeof useLocal>["model"]
+export const DialogSelectModelUnpaid: Component = () => {
-
+  const local = useLocal()
 export const DialogSelectModelUnpaid: Component<{ model?: ModelState }> = (props) => {
  const model = props.model ?? useLocal().model
  const dialog = useDialog()
  const providers = useProviders()
  const language = useLanguage()
@@ -37,8 +35,8 @@ export const DialogSelectModelUnpaid: Component<{ model?: ModelState }> = (props
        <List
          class="[&_[data-slot=list-scroll]]:overflow-visible"
          ref={(ref) => (listRef = ref)}
-          items={model.list}
+          items={local.model.list}
-          current={model.current()}
+          current={local.model.current()}
          key={(x) => `${x.provider.id}:${x.id}`}
          itemWrapper={(item, node) => (
            <Tooltip
@@ -57,7 +55,7 @@ export const DialogSelectModelUnpaid: Component<{ model?: ModelState }> = (props
            </Tooltip>
          )}
          onSelect={(x) => {
-            model.set(x ? { modelID: x.id, providerID: x.provider.id } : undefined, {
+            local.model.set(x ? { modelID: x.id, providerID: x.provider.id } : undefined, {
              recent: true,
            })
            dialog.close()
@@ -18,22 +18,19 @@ import { useLanguage } from "@/context/language"
 const isFree = (provider: string, cost: { input: number } | undefined) =>
  provider === "opencode" && (!cost || cost.input === 0)
 type ModelState = ReturnType<typeof useLocal>["model"]
 const ModelList: Component<{
  provider?: string
  class?: string
  onSelect: () => void
  action?: JSX.Element
  model?: ModelState
 }> = (props) => {
-  const model = props.model ?? useLocal().model
+  const local = useLocal()
  const language = useLanguage()
  const models = createMemo(() =>
-    model
+    local.model
      .list()
-      .filter((m) => model.visible({ modelID: m.id, providerID: m.provider.id }))
+      .filter((m) => local.model.visible({ modelID: m.id, providerID: m.provider.id }))
      .filter((m) => (props.provider ? m.provider.id === props.provider : true)),
  )
@@ -44,7 +41,7 @@ const ModelList: Component<{
      emptyMessage={language.t("dialog.model.empty")}
      key={(x) => `${x.provider.id}:${x.id}`}
      items={models}
-      current={model.current()}
+      current={local.model.current()}
      filterKeys={["provider.name", "name", "id"]}
      sortBy={(a, b) => a.name.localeCompare(b.name)}
      groupBy={(x) => x.provider.name}
@@ -66,7 +63,7 @@ const ModelList: Component<{
        </Tooltip>
      )}
      onSelect={(x) => {
-        model.set(x ? { modelID: x.id, providerID: x.provider.id } : undefined, {
+        local.model.set(x ? { modelID: x.id, providerID: x.provider.id } : undefined, {
          recent: true,
        })
        props.onSelect()
@@ -91,7 +88,6 @@ type ModelSelectorTriggerProps = Omit<ComponentProps<typeof Kobalte.Trigger>, "a
 export function ModelSelectorPopover(props: {
  provider?: string
  model?: ModelState
  children?: JSX.Element
  triggerAs?: ValidComponent
  triggerProps?: ModelSelectorTriggerProps
@@ -155,7 +151,6 @@ export function ModelSelectorPopover(props: {
          <Kobalte.Title class="sr-only">{language.t("dialog.model.select.title")}</Kobalte.Title>
          <ModelList
            provider={props.provider}
            model={props.model}
            onSelect={() => setStore("open", false)}
            class="p-1"
            action={
@@ -189,7 +184,7 @@ export function ModelSelectorPopover(props: {
  )
 }
-export const DialogSelectModel: Component<{ provider?: string; model?: ModelState }> = (props) => {
+export const DialogSelectModel: Component<{ provider?: string }> = (props) => {
  const dialog = useDialog()
  const language = useLanguage()
@@ -207,7 +202,7 @@ export const DialogSelectModel: Component<{ provider?: string; model?: ModelStat
        </Button>
      }
    >
-      <ModelList provider={props.provider} model={props.model} onSelect={() => dialog.close()} />
+      <ModelList provider={props.provider} onSelect={() => dialog.close()} />
      <Button
        variant="ghost"
        class="ml-3 mt-5 mb-6 text-text-base self-start"
@@ -6,7 +6,6 @@ import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { List } from "@opencode-ai/ui/list"
 import { TextField } from "@opencode-ai/ui/text-field"
 import { useMutation } from "@tanstack/solid-query"
 import { showToast } from "@opencode-ai/ui/toast"
 import { useNavigate } from "@solidjs/router"
 import { createEffect, createMemo, createResource, onCleanup, Show } from "solid-js"
@@ -187,6 +186,7 @@ export function DialogSelectServer() {
      name: "",
      username: DEFAULT_USERNAME,
      password: "",
      adding: false,
      error: "",
      showForm: false,
      status: undefined as boolean | undefined,
@@ -198,6 +198,7 @@ export function DialogSelectServer() {
      username: "",
      password: "",
      error: "",
      busy: false,
      status: undefined as boolean | undefined,
    },
  })
@@ -208,6 +209,7 @@ export function DialogSelectServer() {
      name: "",
      username: DEFAULT_USERNAME,
      password: "",
      adding: false,
      error: "",
      showForm: false,
      status: undefined,
@@ -222,78 +224,10 @@ export function DialogSelectServer() {
      password: "",
      error: "",
      status: undefined,
      busy: false,
    })
  }
  const addMutation = useMutation(() => ({
    mutationFn: async (value: string) => {
      const normalized = normalizeServerUrl(value)
      if (!normalized) {
        resetAdd()
        return
      }
      const conn: ServerConnection.Http = {
        type: "http",
        http: { url: normalized },
      }
      if (store.addServer.name.trim()) conn.displayName = store.addServer.name.trim()
      if (store.addServer.password) conn.http.password = store.addServer.password
      if (store.addServer.password && store.addServer.username) conn.http.username = store.addServer.username
      const result = await checkServerHealth(conn.http)
      if (!result.healthy) {
        setStore("addServer", { error: language.t("dialog.server.add.error") })
        return
      }
      resetAdd()
      await select(conn, true)
    },
  }))
  const editMutation = useMutation(() => ({
    mutationFn: async (input: { original: ServerConnection.Any; value: string }) => {
      if (input.original.type !== "http") return
      const normalized = normalizeServerUrl(input.value)
      if (!normalized) {
        resetEdit()
        return
      }
      const name = store.editServer.name.trim() || undefined
      const username = store.editServer.username || undefined
      const password = store.editServer.password || undefined
      const existingName = input.original.displayName
      if (
        normalized === input.original.http.url &&
        name === existingName &&
        username === input.original.http.username &&
        password === input.original.http.password
      ) {
        resetEdit()
        return
      }
      const conn: ServerConnection.Http = {
        type: "http",
        displayName: name,
        http: { url: normalized, username, password },
      }
      const result = await checkServerHealth(conn.http)
      if (!result.healthy) {
        setStore("editServer", { error: language.t("dialog.server.add.error") })
        return
      }
      if (normalized === input.original.http.url) {
        server.add(conn)
      } else {
        replaceServer(input.original, conn)
      }
      resetEdit()
    },
  }))
  const replaceServer = (original: ServerConnection.Http, next: ServerConnection.Http) => {
    const active = server.key
    const newConn = server.add(next)
@@ -357,12 +291,12 @@ export function DialogSelectServer() {
      navigate("/")
      return
    }
    server.setActive(ServerConnection.key(conn))
    navigate("/")
    queueMicrotask(() => server.setActive(ServerConnection.key(conn)))
  }
  const handleAddChange = (value: string) => {
-    if (addMutation.isPending) return
+    if (store.addServer.adding) return
    setStore("addServer", { url: value, error: "" })
    void previewStatus(value, store.addServer.username, store.addServer.password, (next) =>
      setStore("addServer", { status: next }),
@@ -370,12 +304,12 @@ export function DialogSelectServer() {
  }
  const handleAddNameChange = (value: string) => {
-    if (addMutation.isPending) return
+    if (store.addServer.adding) return
    setStore("addServer", { name: value, error: "" })
  }
  const handleAddUsernameChange = (value: string) => {
-    if (addMutation.isPending) return
+    if (store.addServer.adding) return
    setStore("addServer", { username: value, error: "" })
    void previewStatus(store.addServer.url, value, store.addServer.password, (next) =>
      setStore("addServer", { status: next }),
@@ -383,7 +317,7 @@ export function DialogSelectServer() {
  }
  const handleAddPasswordChange = (value: string) => {
-    if (addMutation.isPending) return
+    if (store.addServer.adding) return
    setStore("addServer", { password: value, error: "" })
    void previewStatus(store.addServer.url, store.addServer.username, value, (next) =>
      setStore("addServer", { status: next }),
@@ -391,7 +325,7 @@ export function DialogSelectServer() {
  }
  const handleEditChange = (value: string) => {
-    if (editMutation.isPending) return
+    if (store.editServer.busy) return
    setStore("editServer", { value, error: "" })
    void previewStatus(value, store.editServer.username, store.editServer.password, (next) =>
      setStore("editServer", { status: next }),
@@ -399,12 +333,12 @@ export function DialogSelectServer() {
  }
  const handleEditNameChange = (value: string) => {
-    if (editMutation.isPending) return
+    if (store.editServer.busy) return
    setStore("editServer", { name: value, error: "" })
  }
  const handleEditUsernameChange = (value: string) => {
-    if (editMutation.isPending) return
+    if (store.editServer.busy) return
    setStore("editServer", { username: value, error: "" })
    void previewStatus(store.editServer.value, value, store.editServer.password, (next) =>
      setStore("editServer", { status: next }),
@@ -412,13 +346,85 @@ export function DialogSelectServer() {
  }
  const handleEditPasswordChange = (value: string) => {
-    if (editMutation.isPending) return
+    if (store.editServer.busy) return
    setStore("editServer", { password: value, error: "" })
    void previewStatus(store.editServer.value, store.editServer.username, value, (next) =>
      setStore("editServer", { status: next }),
    )
  }
  async function handleAdd(value: string) {
    if (store.addServer.adding) return
    const normalized = normalizeServerUrl(value)
    if (!normalized) {
      resetAdd()
      return
    }
    setStore("addServer", { adding: true, error: "" })
    const conn: ServerConnection.Http = {
      type: "http",
      http: { url: normalized },
    }
    if (store.addServer.name.trim()) conn.displayName = store.addServer.name.trim()
    if (store.addServer.password) conn.http.password = store.addServer.password
    if (store.addServer.password && store.addServer.username) conn.http.username = store.addServer.username
    const result = await checkServerHealth(conn.http)
    setStore("addServer", { adding: false })
    if (!result.healthy) {
      setStore("addServer", { error: language.t("dialog.server.add.error") })
      return
    }
    resetAdd()
    await select(conn, true)
  }
  async function handleEdit(original: ServerConnection.Any, value: string) {
    if (store.editServer.busy || original.type !== "http") return
    const normalized = normalizeServerUrl(value)
    if (!normalized) {
      resetEdit()
      return
    }
    const name = store.editServer.name.trim() || undefined
    const username = store.editServer.username || undefined
    const password = store.editServer.password || undefined
    const existingName = original.displayName
    if (
      normalized === original.http.url &&
      name === existingName &&
      username === original.http.username &&
      password === original.http.password
    ) {
      resetEdit()
      return
    }
    setStore("editServer", { busy: true, error: "" })
    const conn: ServerConnection.Http = {
      type: "http",
      displayName: name,
      http: { url: normalized, username, password },
    }
    const result = await checkServerHealth(conn.http)
    setStore("editServer", { busy: false })
    if (!result.healthy) {
      setStore("editServer", { error: language.t("dialog.server.add.error") })
      return
    }
    if (normalized === original.http.url) {
      server.add(conn)
    } else {
      replaceServer(original, conn)
    }
    resetEdit()
  }
  const mode = createMemo<"list" | "add" | "edit">(() => {
    if (store.editServer.id) return "edit"
    if (store.addServer.showForm) return "add"
@@ -458,26 +464,23 @@ export function DialogSelectServer() {
      password: conn.http.password ?? "",
      error: "",
      status: store.status[ServerConnection.key(conn)]?.healthy,
      busy: false,
    })
  }
  const submitForm = () => {
    if (mode() === "add") {
-      if (addMutation.isPending) return
+      void handleAdd(store.addServer.url)
      setStore("addServer", { error: "" })
      addMutation.mutate(store.addServer.url)
      return
    }
    const original = editing()
    if (!original) return
-    if (editMutation.isPending) return
+    void handleEdit(original, store.editServer.value)
    setStore("editServer", { error: "" })
    editMutation.mutate({ original, value: store.editServer.value })
  }
  const isFormMode = createMemo(() => mode() !== "list")
  const isAddMode = createMemo(() => mode() === "add")
-  const formBusy = createMemo(() => (isAddMode() ? addMutation.isPending : editMutation.isPending))
+  const formBusy = createMemo(() => (isAddMode() ? store.addServer.adding : store.editServer.busy))
  const formTitle = createMemo(() => {
    if (!isFormMode()) return language.t("dialog.server.title")
@@ -1,7 +1,8 @@
 import { useFilteredList } from "@opencode-ai/ui/hooks"
 import { useSpring } from "@opencode-ai/ui/motion-spring"
-import { createEffect, on, Component, Show, onCleanup, createMemo, createSignal } from "solid-js"
+import { createEffect, on, Component, Show, onCleanup, Switch, Match, createMemo, createSignal } from "solid-js"
 import { createStore } from "solid-js/store"
 import { createFocusSignal } from "@solid-primitives/active-element"
 import { useLocal } from "@/context/local"
 import { selectionFromLines, type SelectedLineRange, useFile } from "@/context/file"
 import {
@@ -36,7 +37,6 @@ import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { createSessionTabs } from "@/pages/session/helpers"
 import { promptEnabled, promptProbe } from "@/testing/prompt"
 import { createTextFragment, getCursorPosition, setCursorPosition, setRangeEdge } from "./prompt-input/editor-dom"
 import { createPromptAttachments } from "./prompt-input/attachments"
 import { ACCEPTED_FILE_TYPES } from "./prompt-input/files"
@@ -121,7 +121,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  let slashPopoverRef!: HTMLDivElement
  const mirror = { input: false }
-  const inset = 56
+  const inset = 52
  const space = `${inset}px`
  const scrollCursorIntoView = () => {
@@ -244,23 +244,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      },
  )
  const working = createMemo(() => status()?.type !== "idle")
  const tip = () => {
    if (working()) {
      return (
        <div class="flex items-center gap-2">
          <span>{language.t("prompt.action.stop")}</span>
          <span class="text-icon-base text-12-medium text-[10px]!">{language.t("common.key.esc")}</span>
        </div>
      )
    }
    return (
      <div class="flex items-center gap-2">
        <span>{language.t("prompt.action.send")}</span>
        <Icon name="enter" size="small" class="text-icon-base" />
      </div>
    )
  }
  const imageAttachments = createMemo(() =>
    prompt.current().filter((part): part is ImageAttachmentPart => part.type === "image"),
  )
@@ -428,6 +411,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    }
  }
  const isFocused = createFocusSignal(() => editorRef)
  const escBlur = () => platform.platform === "desktop" && platform.os === "macos"
  const pick = () => fileInputRef?.click()
@@ -622,7 +606,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  const handleSlashSelect = (cmd: SlashCommand | undefined) => {
    if (!cmd) return
    promptProbe.select(cmd.id)
    closePopover()
    if (cmd.type === "custom") {
@@ -711,20 +694,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    })
  })
  if (promptEnabled()) {
    createEffect(() => {
      promptProbe.set({
        popover: store.popover,
        slash: {
          active: slashActive() ?? null,
          ids: slashFlat().map((cmd) => cmd.id),
        },
      })
    })
    onCleanup(() => promptProbe.clear())
  }
  const selectPopoverActive = () => {
    if (store.popover === "at") {
      const items = atFlat()
@@ -1045,6 +1014,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  const { addAttachment, removeAttachment, handlePaste } = createPromptAttachments({
    editor: () => editorRef,
    isFocused,
    isDialogActive: () => !!dialog.active,
    setDraggingType: (type) => setStore("draggingType", type),
    focusEditor: () => {
@@ -1061,17 +1031,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    if (!id) return permission.isAutoAcceptingDirectory(sdk.directory)
    return permission.isAutoAccepting(id, sdk.directory)
  })
  const acceptLabel = createMemo(() =>
    language.t(accepting() ? "command.permissions.autoaccept.disable" : "command.permissions.autoaccept.enable"),
  )
  const toggleAccept = () => {
    if (!params.id) {
      permission.toggleAutoAcceptDirectory(sdk.directory)
      return
    }
    permission.toggleAutoAccept(params.id, sdk.directory)
  }
  const { abort, handleSubmit } = createPromptSubmit({
    info,
@@ -1241,20 +1200,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    // Note: Shift+Enter is handled earlier, before IME check
    if (event.key === "Enter" && !event.shiftKey) {
      event.preventDefault()
      if (event.repeat) return
      if (
        working() &&
        prompt
          .current()
          .map((part) => ("content" in part ? part.content : ""))
          .join("")
          .trim().length === 0 &&
        imageAttachments().length === 0 &&
        commentCount() === 0
      ) {
        return
      }
      handleSubmit(event)
    }
  }
@@ -1383,41 +1328,18 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
            <input
              ref={fileInputRef}
              type="file"
              multiple
              accept={ACCEPTED_FILE_TYPES.join(",")}
              class="hidden"
              onChange={(e) => {
-                const list = e.currentTarget.files
+                const file = e.currentTarget.files?.[0]
-                if (list) {
+                if (file) void addAttachment(file)
                  for (const file of Array.from(list)) {
                    void addAttachment(file)
                  }
                }
                e.currentTarget.value = ""
              }}
            />
            <div class="flex items-center gap-1 pointer-events-auto">
              <Tooltip placement="top" inactive={!prompt.dirty() && !working()} value={tip()}>
                <IconButton
                  data-action="prompt-submit"
                  type="submit"
                  disabled={store.mode !== "normal" || (!prompt.dirty() && !working() && commentCount() === 0)}
                  tabIndex={store.mode === "normal" ? undefined : -1}
                  icon={working() ? "stop" : "arrow-up"}
                  variant="primary"
                  class="size-8"
                  style={buttons()}
                  aria-label={working() ? language.t("prompt.action.stop") : language.t("prompt.action.send")}
                />
              </Tooltip>
            </div>
          </div>
          <div class="pointer-events-none absolute bottom-2 left-2">
            <div
              aria-hidden={store.mode !== "normal"}
-              class="pointer-events-auto"
+              class="flex items-center gap-1"
              style={{
                "pointer-events": buttonsSpring() > 0.5 ? "auto" : "none",
              }}
@@ -1441,6 +1363,81 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                  <Icon name="plus" class="size-4.5" />
                </Button>
              </TooltipKeybind>
              <Tooltip
                placement="top"
                inactive={!prompt.dirty() && !working()}
                value={
                  <Switch>
                    <Match when={working()}>
                      <div class="flex items-center gap-2">
                        <span>{language.t("prompt.action.stop")}</span>
                        <span class="text-icon-base text-12-medium text-[10px]!">{language.t("common.key.esc")}</span>
                      </div>
                    </Match>
                    <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" />
                      </div>
                    </Match>
                  </Switch>
                }
              >
                <IconButton
                  data-action="prompt-submit"
                  type="submit"
                  disabled={store.mode !== "normal" || (!prompt.dirty() && !working() && commentCount() === 0)}
                  tabIndex={store.mode === "normal" ? undefined : -1}
                  icon={working() ? "stop" : "arrow-up"}
                  variant="primary"
                  class="size-8"
                  style={buttons()}
                  aria-label={working() ? language.t("prompt.action.stop") : language.t("prompt.action.send")}
                />
              </Tooltip>
            </div>
          </div>
          <div class="pointer-events-none absolute bottom-2 left-2">
            <div class="pointer-events-auto">
              <TooltipKeybind
                placement="top"
                gutter={8}
                title={language.t(
                  accepting() ? "command.permissions.autoaccept.disable" : "command.permissions.autoaccept.enable",
                )}
                keybind={command.keybind("permissions.autoaccept")}
              >
                <Button
                  data-action="prompt-permissions"
                  variant="ghost"
                  onClick={() => {
                    if (!params.id) {
                      permission.toggleAutoAcceptDirectory(sdk.directory)
                      return
                    }
                    permission.toggleAutoAccept(params.id, sdk.directory)
                  }}
                  classList={{
                    "size-6 flex items-center justify-center": true,
                    "text-text-base": !accepting(),
                    "hover:bg-surface-success-base": accepting(),
                  }}
                  aria-label={
                    accepting()
                      ? language.t("command.permissions.autoaccept.disable")
                      : language.t("command.permissions.autoaccept.enable")
                  }
                  aria-pressed={accepting()}
                >
                  <Icon
                    name="chevron-double-right"
                    size="small"
                    classList={{ "text-icon-success-base": accepting() }}
                  />
                </Button>
              </TooltipKeybind>
            </div>
          </div>
        </div>
@@ -1460,76 +1457,39 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                <div class="size-4 shrink-0" />
              </div>
              <div class="flex items-center gap-1.5 min-w-0 flex-1">
-                <div data-component="prompt-agent-control">
+                <TooltipKeybind
-                  <TooltipKeybind
+                  placement="top"
-                    placement="top"
+                  gutter={4}
-                    gutter={4}
+                  title={language.t("command.agent.cycle")}
-                    title={language.t("command.agent.cycle")}
+                  keybind={command.keybind("agent.cycle")}
-                    keybind={command.keybind("agent.cycle")}
+                >
-                  >
+                  <Select
-                    <Select
+                    size="normal"
-                      size="normal"
+                    options={agentNames()}
-                      options={agentNames()}
+                    current={local.agent.current()?.name ?? ""}
-                      current={local.agent.current()?.name ?? ""}
+                    onSelect={local.agent.set}
-                      onSelect={local.agent.set}
+                    class="capitalize max-w-[160px]"
-                      class="capitalize max-w-[160px] text-text-base"
+                    valueClass="truncate text-13-regular"
-                      valueClass="truncate text-13-regular text-text-base"
+                    triggerStyle={control()}
-                      triggerStyle={control()}
+                    variant="ghost"
-                      triggerProps={{ "data-action": "prompt-agent" }}
+                  />
-                      variant="ghost"
+                </TooltipKeybind>
-                    />
+                <Show
-                  </TooltipKeybind>
+                  when={providers.paid().length > 0}
-                </div>
+                  fallback={
                <div data-component="prompt-model-control">
                  <Show
                    when={providers.paid().length > 0}
                    fallback={
                      <TooltipKeybind
                        placement="top"
                        gutter={4}
                        title={language.t("command.model.choose")}
                        keybind={command.keybind("model.choose")}
                      >
                        <Button
                          data-action="prompt-model"
                          as="div"
                          variant="ghost"
                          size="normal"
                          class="min-w-0 max-w-[320px] text-13-regular text-text-base group"
                          style={control()}
                          onClick={() => dialog.show(() => <DialogSelectModelUnpaid model={local.model} />)}
                        >
                          <Show when={local.model.current()?.provider?.id}>
                            <ProviderIcon
                              id={local.model.current()!.provider.id}
                              class="size-4 shrink-0 opacity-40 group-hover:opacity-100 transition-opacity duration-150"
                              style={{ "will-change": "opacity", transform: "translateZ(0)" }}
                            />
                          </Show>
                          <span class="truncate">
                            {local.model.current()?.name ?? language.t("dialog.model.select.title")}
                          </span>
                          <Icon name="chevron-down" size="small" class="shrink-0" />
                        </Button>
                      </TooltipKeybind>
                    }
                  >
                    <TooltipKeybind
                      placement="top"
                      gutter={4}
                      title={language.t("command.model.choose")}
                      keybind={command.keybind("model.choose")}
                    >
-                      <ModelSelectorPopover
+                      <Button
-                        model={local.model}
+                        as="div"
-                        triggerAs={Button}
+                        variant="ghost"
-                        triggerProps={{
+                        size="normal"
-                          variant: "ghost",
+                        class="min-w-0 max-w-[320px] text-13-regular group"
-                          size: "normal",
+                        style={control()}
-                          style: control(),
+                        onClick={() => dialog.show(() => <DialogSelectModelUnpaid />)}
                          class: "min-w-0 max-w-[320px] text-13-regular text-text-base group",
                          "data-action": "prompt-model",
                        }}
                      >
                        <Show when={local.model.current()?.provider?.id}>
                          <ProviderIcon
@@ -1542,52 +1502,56 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                          {local.model.current()?.name ?? language.t("dialog.model.select.title")}
                        </span>
                        <Icon name="chevron-down" size="small" class="shrink-0" />
-                      </ModelSelectorPopover>
+                      </Button>
                    </TooltipKeybind>
-                  </Show>
+                  }
-                </div>
+                >
                <div data-component="prompt-variant-control">
                  <TooltipKeybind
                    placement="top"
                    gutter={4}
-                    title={language.t("command.model.variant.cycle")}
+                    title={language.t("command.model.choose")}
-                    keybind={command.keybind("model.variant.cycle")}
+                    keybind={command.keybind("model.choose")}
                  >
-                    <Select
+                    <ModelSelectorPopover
-                      size="normal"
+                      triggerAs={Button}
-                      options={variants()}
+                      triggerProps={{
-                      current={local.model.variant.current() ?? "default"}
+                        variant: "ghost",
-                      label={(x) => (x === "default" ? language.t("common.default") : x)}
+                        size: "normal",
-                      onSelect={(x) => local.model.variant.set(x === "default" ? undefined : x)}
+                        style: control(),
-                      class="capitalize max-w-[160px] text-text-base"
+                        class: "min-w-0 max-w-[320px] text-13-regular group",
-                      valueClass="truncate text-13-regular text-text-base"
+                      }}
-                      triggerStyle={control()}
+                    >
-                      triggerProps={{ "data-action": "prompt-model-variant" }}
+                      <Show when={local.model.current()?.provider?.id}>
-                      variant="ghost"
+                        <ProviderIcon
-                    />
+                          id={local.model.current()!.provider.id}
                          class="size-4 shrink-0 opacity-40 group-hover:opacity-100 transition-opacity duration-150"
                          style={{ "will-change": "opacity", transform: "translateZ(0)" }}
                        />
                      </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>
                  </TooltipKeybind>
-                </div>
+                </Show>
                <TooltipKeybind
                  placement="top"
-                  gutter={8}
+                  gutter={4}
-                  title={acceptLabel()}
+                  title={language.t("command.model.variant.cycle")}
-                  keybind={command.keybind("permissions.autoaccept")}
+                  keybind={command.keybind("model.variant.cycle")}
                >
-                  <Button
+                  <Select
-                    data-action="prompt-permissions"
+                    size="normal"
                    options={variants()}
                    current={local.model.variant.current() ?? "default"}
                    label={(x) => (x === "default" ? language.t("common.default") : x)}
                    onSelect={(x) => local.model.variant.set(x === "default" ? undefined : x)}
                    class="capitalize max-w-[160px]"
                    valueClass="truncate text-13-regular"
                    triggerStyle={control()}
                    variant="ghost"
-                    onClick={toggleAccept}
+                  />
                    classList={{
                      "h-7 w-7 p-0 shrink-0 flex items-center justify-center": true,
                      "text-text-base": !accepting(),
                      "hover:bg-surface-success-base": accepting(),
                    }}
                    style={control()}
                    aria-label={acceptLabel()}
                    aria-pressed={accepting()}
                  >
                    <Icon name="shield" size="small" classList={{ "text-icon-success-base": accepting() }} />
                  </Button>
                </TooltipKeybind>
              </div>
            </div>
@@ -1,6 +1,5 @@
 import { describe, expect, test } from "bun:test"
 import { attachmentMime } from "./files"
 import { pasteMode } from "./paste"
 describe("attachmentMime", () => {
  test("keeps PDFs when the browser reports the mime", async () => {
@@ -23,22 +22,3 @@ describe("attachmentMime", () => {
    expect(await attachmentMime(file)).toBeUndefined()
  })
 })
 describe("pasteMode", () => {
  test("uses native paste for short single-line text", () => {
    expect(pasteMode("hello world")).toBe("native")
  })
  test("uses manual paste for multiline text", () => {
    expect(
      pasteMode(`{
  "ok": true
 }`),
    ).toBe("manual")
    expect(pasteMode("a\r\nb")).toBe("manual")
  })
  test("uses manual paste for large text", () => {
    expect(pasteMode("x".repeat(8000))).toBe("manual")
  })
 })
@@ -5,7 +5,8 @@ import { useLanguage } from "@/context/language"
 import { uuid } from "@/utils/uuid"
 import { getCursorPosition } from "./editor-dom"
 import { attachmentMime } from "./files"
-import { normalizePaste, pasteMode } from "./paste"
+const LARGE_PASTE_CHARS = 8000
 const LARGE_PASTE_BREAKS = 120
 function dataUrl(file: File, mime: string) {
  return new Promise<string>((resolve) => {
@@ -24,8 +25,20 @@ function dataUrl(file: File, mime: string) {
  })
 }
 function largePaste(text: string) {
  if (text.length >= LARGE_PASTE_CHARS) return true
  let breaks = 0
  for (const char of text) {
    if (char !== "\n") continue
    breaks += 1
    if (breaks >= LARGE_PASTE_BREAKS) return true
  }
  return false
 }
 type PromptAttachmentsInput = {
  editor: () => HTMLDivElement | undefined
  isFocused: () => boolean
  isDialogActive: () => boolean
  setDraggingType: (type: "image" | "@mention" | null) => void
  focusEditor: () => void
@@ -78,6 +91,7 @@ export function createPromptAttachments(input: PromptAttachmentsInput) {
  }
  const handlePaste = async (event: ClipboardEvent) => {
    if (!input.isFocused()) return
    const clipboardData = event.clipboardData
    if (!clipboardData) return
@@ -112,23 +126,16 @@ export function createPromptAttachments(input: PromptAttachmentsInput) {
    if (!plainText) return
-    const text = normalizePaste(plainText)
+    if (largePaste(plainText)) {
-
+      if (input.addPart({ type: "text", content: plainText, start: 0, end: 0 })) return
    const put = () => {
      if (input.addPart({ type: "text", content: text, start: 0, end: 0 })) return true
      input.focusEditor()
-      return input.addPart({ type: "text", content: text, start: 0, end: 0 })
+      if (input.addPart({ type: "text", content: plainText, start: 0, end: 0 })) return
    }
-    if (pasteMode(text) === "manual") {
+    const inserted = typeof document.execCommand === "function" && document.execCommand("insertText", false, plainText)
      put()
      return
    }
    const inserted = typeof document.execCommand === "function" && document.execCommand("insertText", false, text)
    if (inserted) return
-    put()
+    input.addPart({ type: "text", content: plainText, start: 0, end: 0 })
  }
  const handleGlobalDragOver = (event: DragEvent) => {
@@ -1,6 +1,4 @@
-import { ACCEPTED_FILE_TYPES, ACCEPTED_IMAGE_TYPES } from "@/constants/file-picker"
+export const ACCEPTED_IMAGE_TYPES = ["image/png", "image/jpeg", "image/gif", "image/webp"]
 export { ACCEPTED_FILE_TYPES }
 const IMAGE_MIMES = new Set(ACCEPTED_IMAGE_TYPES)
 const IMAGE_EXTS = new Map([
@@ -20,6 +18,61 @@ const TEXT_MIMES = new Set([
  "application/yaml",
 ])
 export const ACCEPTED_FILE_TYPES = [
  ...ACCEPTED_IMAGE_TYPES,
  "application/pdf",
  "text/*",
  "application/json",
  "application/ld+json",
  "application/toml",
  "application/x-toml",
  "application/x-yaml",
  "application/xml",
  "application/yaml",
  ".c",
  ".cc",
  ".cjs",
  ".conf",
  ".cpp",
  ".css",
  ".csv",
  ".cts",
  ".env",
  ".go",
  ".gql",
  ".graphql",
  ".h",
  ".hh",
  ".hpp",
  ".htm",
  ".html",
  ".ini",
  ".java",
  ".js",
  ".json",
  ".jsx",
  ".log",
  ".md",
  ".mdx",
  ".mjs",
  ".mts",
  ".py",
  ".rb",
  ".rs",
  ".sass",
  ".scss",
  ".sh",
  ".sql",
  ".toml",
  ".ts",
  ".tsx",
  ".txt",
  ".xml",
  ".yaml",
  ".yml",
  ".zsh",
 ]
 const SAMPLE = 4096
 function kind(type: string) {
@@ -1,24 +0,0 @@
 const LARGE_PASTE_CHARS = 8000
 const LARGE_PASTE_BREAKS = 120
 function largePaste(text: string) {
  if (text.length >= LARGE_PASTE_CHARS) return true
  let breaks = 0
  for (const char of text) {
    if (char !== "\n") continue
    breaks += 1
    if (breaks >= LARGE_PASTE_BREAKS) return true
  }
  return false
 }
 export function normalizePaste(text: string) {
  if (!text.includes("\r")) return text
  return text.replace(/\r\n?/g, "\n")
 }
 export function pasteMode(text: string) {
  if (largePaste(text)) return "manual"
  if (text.includes("\n") || text.includes("\r")) return "manual"
  return "native"
 }
@@ -17,7 +17,6 @@ const optimistic: Array<{
 }> = []
 const optimisticSeeded: boolean[] = []
 const storedSessions: Record<string, Array<{ id: string; title?: string }>> = {}
 const promoted: Array<{ directory: string; sessionID: string }> = []
 const sentShell: string[] = []
 const syncedDirectories: string[] = []
@@ -87,11 +86,6 @@ beforeAll(async () => {
      agent: {
        current: () => ({ name: "agent" }),
      },
      session: {
        promote(directory: string, sessionID: string) {
          promoted.push({ directory, sessionID })
        },
      },
    }),
  }))
@@ -207,7 +201,6 @@ beforeEach(() => {
  enabledAutoAccept.length = 0
  optimistic.length = 0
  optimisticSeeded.length = 0
  promoted.length = 0
  params = {}
  sentShell.length = 0
  syncedDirectories.length = 0
@@ -247,11 +240,6 @@ describe("prompt submit worktree selection", () => {
    expect(createdSessions).toEqual(["/repo/worktree-a", "/repo/worktree-b"])
    expect(sentShell).toEqual(["/repo/worktree-a", "/repo/worktree-b"])
    expect(syncedDirectories).toEqual(["/repo/worktree-a", "/repo/worktree-a", "/repo/worktree-b", "/repo/worktree-b"])
    expect(promoted).toEqual([
      { directory: "/repo/worktree-a", sessionID: "session-1" },
      { directory: "/repo/worktree-b", sessionID: "session-2" },
    ])
    expect(syncedDirectories).toEqual(["/repo/worktree-a", "/repo/worktree-a", "/repo/worktree-b", "/repo/worktree-b"])
  })
  test("applies auto-accept to newly created sessions", async () => {
@@ -296,7 +296,6 @@ export function createPromptSubmit(input: PromptSubmitInput) {
    const currentModel = local.model.current()
    const currentAgent = local.agent.current()
    const variant = local.model.variant.current()
    if (!currentModel || !currentAgent) {
      showToast({
        title: language.t("prompt.toast.modelAgentRequired.title"),
@@ -371,7 +370,6 @@ export function createPromptSubmit(input: PromptSubmitInput) {
        seed(sessionDirectory, created)
        session = created
        if (shouldAutoAccept) permission.enableAutoAccept(session.id, sessionDirectory)
        local.session.promote(sessionDirectory, session.id)
        layout.handoff.setTabs(base64Encode(sessionDirectory), session.id)
        navigate(`/${base64Encode(sessionDirectory)}/session/${session.id}`)
      }
@@ -389,6 +387,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      providerID: currentModel.provider.id,
    }
    const agent = currentAgent.name
    const variant = local.model.variant.current()
    const context = prompt.context.items().slice()
    const draft: FollowupDraft = {
      sessionID: session.id,
@@ -16,11 +16,9 @@ import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
 import { usePlatform } from "@/context/platform"
 import { useServer } from "@/context/server"
 import { useSync } from "@/context/sync"
 import { useTerminal } from "@/context/terminal"
 import { focusTerminalById } from "@/pages/session/helpers"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { messageAgentColor } from "@/utils/agent"
 import { decode64 } from "@/utils/base64"
 import { Persist, persisted } from "@/utils/persist"
 import { StatusPopover } from "../status-popover"
@@ -134,7 +132,6 @@ export function SessionHeader() {
  const server = useServer()
  const platform = usePlatform()
  const language = useLanguage()
  const sync = useSync()
  const terminal = useTerminal()
  const { params, view } = useSessionLayout()
@@ -221,9 +218,6 @@ export function SessionHeader() {
      ({ id: "finder", label: fileManager().label, icon: fileManager().icon } as const),
  )
  const opening = createMemo(() => openRequest.app !== undefined)
  const tint = createMemo(() =>
    messageAgentColor(params.id ? sync.data.message[params.id] : undefined, sync.data.agent),
  )
  const selectApp = (app: OpenApp) => {
    if (!options().some((item) => item.id === app)) return
@@ -274,11 +268,12 @@ export function SessionHeader() {
              type="button"
              variant="ghost"
              size="small"
-              class="hidden md:flex w-[240px] max-w-full min-w-0 items-center gap-2 justify-between rounded-md border border-border-weak-base bg-surface-panel shadow-none cursor-default"
+              class="hidden md:flex w-[240px] max-w-full min-w-0 pl-0.5 pr-2 items-center gap-2 justify-between rounded-md border border-border-weak-base bg-surface-panel shadow-none cursor-default"
              onClick={() => command.trigger("file.open")}
              aria-label={language.t("session.header.searchFiles")}
            >
-              <div class="flex min-w-0 flex-1 items-center overflow-visible">
+              <div class="flex min-w-0 flex-1 items-center gap-1.5 overflow-visible">
                <Icon name="magnifying-glass" size="small" class="icon-base shrink-0 size-4" />
                <span class="flex-1 min-w-0 text-12-regular text-text-weak truncate text-left">
                  {language.t("session.header.search.placeholder", {
                    project: name(),
@@ -325,7 +320,7 @@ export function SessionHeader() {
                      <div class="flex h-[24px] box-border items-center rounded-md border border-border-weak-base bg-surface-panel overflow-hidden">
                        <Button
                          variant="ghost"
-                          class="rounded-none h-full px-0.5 border-none shadow-none disabled:!cursor-default"
+                          class="rounded-none h-full py-0 pr-1.5 pl-px gap-1.5 border-none shadow-none disabled:!cursor-default"
                          classList={{
                            "bg-surface-raised-base-active": opening(),
                          }}
@@ -335,9 +330,10 @@ export function SessionHeader() {
                        >
                          <div class="flex size-5 shrink-0 items-center justify-center [&_[data-component=app-icon]]:size-5">
                            <Show when={opening()} fallback={<AppIcon id={current().icon} />}>
-                              <Spinner class="size-3.5" style={{ color: tint() ?? "var(--icon-base)" }} />
+                              <Spinner class="size-3.5 text-icon-base" />
                            </Show>
                          </div>
                          <span class="text-12-regular text-text-strong">{language.t("common.open")}</span>
                        </Button>
                        <DropdownMenu
                          gutter={4}
@@ -4,7 +4,6 @@ import { Icon } from "@opencode-ai/ui/icon"
 import { Popover } from "@opencode-ai/ui/popover"
 import { Switch } from "@opencode-ai/ui/switch"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { useMutation } from "@tanstack/solid-query"
 import { showToast } from "@opencode-ai/ui/toast"
 import { useNavigate } from "@solidjs/router"
 import { type Accessor, createEffect, createMemo, createSignal, For, type JSXElement, onCleanup, Show } from "solid-js"
@@ -131,30 +130,41 @@ const useDefaultServerKey = (
  }
 }
-const useMcpToggleMutation = () => {
+const useMcpToggle = (input: {
-  const sync = useSync()
+  sync: ReturnType<typeof useSync>
-  const sdk = useSDK()
+  sdk: ReturnType<typeof useSDK>
-  const language = useLanguage()
+  language: ReturnType<typeof useLanguage>
 }) => {
  const [loading, setLoading] = createSignal<string | null>(null)
-  return useMutation(() => ({
+  const toggle = async (name: string) => {
-    mutationFn: async (name: string) => {
+    if (loading()) return
-      const status = sync.data.mcp[name]
+    setLoading(name)
-      await (status?.status === "connected" ? sdk.client.mcp.disconnect({ name }) : sdk.client.mcp.connect({ name }))
+
-      const result = await sdk.client.mcp.status()
+    try {
-      if (result.data) sync.set("mcp", result.data)
+      const status = input.sync.data.mcp[name]
-    },
+      await (status?.status === "connected"
-    onError: (err) => {
+        ? input.sdk.client.mcp.disconnect({ name })
        : input.sdk.client.mcp.connect({ name }))
      const result = await input.sdk.client.mcp.status()
      if (result.data) input.sync.set("mcp", result.data)
    } catch (err) {
      showToast({
        variant: "error",
-        title: language.t("common.requestFailed"),
+        title: input.language.t("common.requestFailed"),
        description: err instanceof Error ? err.message : String(err),
      })
-    },
+    } finally {
-  }))
+      setLoading(null)
    }
  }
  return { loading, toggle }
 }
 export function StatusPopover() {
  const sync = useSync()
  const sdk = useSDK()
  const server = useServer()
  const platform = usePlatform()
  const dialog = useDialog()
@@ -171,7 +181,7 @@ export function StatusPopover() {
  })
  const health = useServerHealth(servers)
  const sortedServers = createMemo(() => listServersByHealth(servers(), server.key, health))
-  const toggleMcp = useMcpToggleMutation()
+  const mcp = useMcpToggle({ sync, sdk, language })
  const defaultServer = useDefaultServerKey(platform.getDefaultServer)
  const mcpNames = createMemo(() => Object.keys(sync.data.mcp ?? {}).sort((a, b) => a.localeCompare(b)))
  const mcpStatus = (name: string) => sync.data.mcp?.[name]?.status
@@ -267,8 +277,8 @@ export function StatusPopover() {
                        aria-disabled={isBlocked()}
                        onClick={() => {
                          if (isBlocked()) return
                          server.setActive(key)
                          navigate("/")
                          queueMicrotask(() => server.setActive(key))
                        }}
                      >
                        <ServerHealthIndicator health={health[key]} />
@@ -327,11 +337,8 @@ export function StatusPopover() {
                        <button
                          type="button"
                          class="flex items-center gap-2 w-full h-8 pl-3 pr-2 py-1 rounded-md hover:bg-surface-raised-base-hover transition-colors text-left"
-                          onClick={() => {
+                          onClick={() => mcp.toggle(name)}
-                            if (toggleMcp.isPending) return
+                          disabled={mcp.loading() === name}
                            toggleMcp.mutate(name)
                          }}
                          disabled={toggleMcp.isPending && toggleMcp.variables === name}
                        >
                          <div
                            classList={{
@@ -347,11 +354,8 @@ export function StatusPopover() {
                          <div onClick={(event) => event.stopPropagation()}>
                            <Switch
                              checked={enabled()}
-                              disabled={toggleMcp.isPending && toggleMcp.variables === name}
+                              disabled={mcp.loading() === name}
-                              onChange={() => {
+                              onChange={() => mcp.toggle(name)}
                                if (toggleMcp.isPending) return
                                toggleMcp.mutate(name)
                              }}
                            />
                          </div>
                        </button>
@@ -65,11 +65,14 @@ const debugTerminal = (...values: unknown[]) => {
  console.debug("[terminal]", ...values)
 }
-const errorName = (err: unknown) => {
+const errorStatus = (err: unknown) => {
  if (!err || typeof err !== "object") return
-  if (!("name" in err)) return
+  if (!("data" in err)) return
-  const errorName = err.name
+  const data = err.data
-  return typeof errorName === "string" ? errorName : undefined
+  if (!data || typeof data !== "object") return
  if (!("statusCode" in data)) return
  const status = data.statusCode
  return typeof status === "number" ? status : undefined
 }
 const useTerminalUiBindings = (input: {
@@ -165,12 +168,6 @@ export const Terminal = (props: TerminalProps) => {
  const theme = useTheme()
  const language = useLanguage()
  const server = useServer()
  const directory = sdk.directory
  const client = sdk.client
  const url = sdk.url
  const auth = server.current?.http
  const username = auth?.username ?? "opencode"
  const password = auth?.password ?? ""
  let container!: HTMLDivElement
  const [local, others] = splitProps(props, ["pty", "class", "classList", "autoFocus", "onConnect", "onConnectError"])
  const id = local.pty.id
@@ -221,7 +218,7 @@ export const Terminal = (props: TerminalProps) => {
  }
  const pushSize = (cols: number, rows: number) => {
-    return client.pty
+    return sdk.client.pty
      .update({
        ptyID: id,
        size: { cols, rows },
@@ -480,11 +477,11 @@ export const Terminal = (props: TerminalProps) => {
      }
      const gone = () =>
-        client.pty
+        sdk.client.pty
          .get({ ptyID: id })
          .then(() => false)
          .catch((err) => {
-            if (errorName(err) === "NotFoundError") return true
+            if (errorStatus(err) === 404) return true
            debugTerminal("failed to inspect terminal session", err)
            return false
          })
@@ -512,14 +509,14 @@ export const Terminal = (props: TerminalProps) => {
        if (disposed) return
        drop?.()
-        const next = new URL(url + `/pty/${id}/connect`)
+        const url = new URL(sdk.url + `/pty/${id}/connect`)
-        next.searchParams.set("directory", directory)
+        url.searchParams.set("directory", sdk.directory)
-        next.searchParams.set("cursor", String(seek))
+        url.searchParams.set("cursor", String(seek))
-        next.protocol = next.protocol === "https:" ? "wss:" : "ws:"
+        url.protocol = url.protocol === "https:" ? "wss:" : "ws:"
-        next.username = username
+        url.username = server.current?.http.username ?? "opencode"
-        next.password = password
+        url.password = server.current?.http.password ?? ""
-        const socket = new WebSocket(next)
+        const socket = new WebSocket(url)
        socket.binaryType = "arraybuffer"
        ws = socket
@@ -77,7 +77,6 @@ export function Titlebar() {
  const canBack = createMemo(() => history.index > 0)
  const canForward = createMemo(() => history.index < history.stack.length - 1)
  const hasProjects = createMemo(() => layout.projects.list().length > 0)
  const back = () => {
    const next = backPath(history)
@@ -218,72 +217,47 @@ export function Titlebar() {
          </TooltipKeybind>
          <div class="hidden xl:flex items-center shrink-0">
            <Show when={params.dir}>
-              <div
+              <TooltipKeybind
-                class="flex items-center shrink-0 w-8 mr-1"
+                placement="bottom"
-                aria-hidden={layout.sidebar.opened() ? "true" : undefined}
+                title={language.t("command.session.new")}
                keybind={command.keybind("session.new")}
                openDelay={2000}
              >
-                <div
+                <Button
-                  class="transition-opacity"
+                  variant="ghost"
-                  classList={{
+                  icon={creating() ? "new-session-active" : "new-session"}
-                    "opacity-100 duration-120 ease-out": !layout.sidebar.opened(),
+                  class="titlebar-icon w-8 h-6 p-0 box-border"
-                    "opacity-0 duration-120 ease-in delay-0 pointer-events-none": layout.sidebar.opened(),
+                  onClick={() => {
                    if (!params.dir) return
                    navigate(`/${params.dir}/session`)
                  }}
-                >
+                  aria-label={language.t("command.session.new")}
-                  <TooltipKeybind
+                  aria-current={creating() ? "page" : undefined}
-                    placement="bottom"
+                />
-                    title={language.t("command.session.new")}
+              </TooltipKeybind>
                    keybind={command.keybind("session.new")}
                    openDelay={2000}
                  >
                    <Button
                      variant="ghost"
                      icon={creating() ? "new-session-active" : "new-session"}
                      class="titlebar-icon w-8 h-6 p-0 box-border"
                      disabled={layout.sidebar.opened()}
                      tabIndex={layout.sidebar.opened() ? -1 : undefined}
                      onClick={() => {
                        if (!params.dir) return
                        navigate(`/${params.dir}/session`)
                      }}
                      aria-label={language.t("command.session.new")}
                      aria-current={creating() ? "page" : undefined}
                    />
                  </TooltipKeybind>
                </div>
              </div>
            </Show>
            <Show when={hasProjects()}>
              <div
                class="flex items-center gap-0 transition-transform"
                classList={{
                  "translate-x-0": !layout.sidebar.opened(),
                  "-translate-x-[36px]": layout.sidebar.opened(),
                  "duration-180 ease-out": !layout.sidebar.opened(),
                  "duration-180 ease-in": layout.sidebar.opened(),
                }}
              >
                <Tooltip placement="bottom" value={language.t("common.goBack")} openDelay={2000}>
                  <Button
                    variant="ghost"
                    icon="chevron-left"
                    class="titlebar-icon w-6 h-6 p-0 box-border"
                    disabled={!canBack()}
                    onClick={back}
                    aria-label={language.t("common.goBack")}
                  />
                </Tooltip>
                <Tooltip placement="bottom" value={language.t("common.goForward")} openDelay={2000}>
                  <Button
                    variant="ghost"
                    icon="chevron-right"
                    class="titlebar-icon w-6 h-6 p-0 box-border"
                    disabled={!canForward()}
                    onClick={forward}
                    aria-label={language.t("common.goForward")}
                  />
                </Tooltip>
              </div>
            </Show>
            <div class="flex items-center gap-0" classList={{ "ml-1": !!params.dir }}>
              <Tooltip placement="bottom" value={language.t("common.goBack")} openDelay={2000}>
                <Button
                  variant="ghost"
                  icon="chevron-left"
                  class="titlebar-icon w-6 h-6 p-0 box-border"
                  disabled={!canBack()}
                  onClick={back}
                  aria-label={language.t("common.goBack")}
                />
              </Tooltip>
              <Tooltip placement="bottom" value={language.t("common.goForward")} openDelay={2000}>
                <Button
                  variant="ghost"
                  icon="chevron-right"
                  class="titlebar-icon w-6 h-6 p-0 box-border"
                  disabled={!canForward()}
                  onClick={forward}
                  aria-label={language.t("common.goForward")}
                />
              </Tooltip>
            </div>
          </div>
        </div>
        <div id="opencode-titlebar-left" class="flex items-center gap-3 min-w-0 px-2" />
@@ -1,89 +0,0 @@
 export const ACCEPTED_IMAGE_TYPES = ["image/png", "image/jpeg", "image/gif", "image/webp"]
 export const ACCEPTED_FILE_TYPES = [
  ...ACCEPTED_IMAGE_TYPES,
  "application/pdf",
  "text/*",
  "application/json",
  "application/ld+json",
  "application/toml",
  "application/x-toml",
  "application/x-yaml",
  "application/xml",
  "application/yaml",
  ".c",
  ".cc",
  ".cjs",
  ".conf",
  ".cpp",
  ".css",
  ".csv",
  ".cts",
  ".env",
  ".go",
  ".gql",
  ".graphql",
  ".h",
  ".hh",
  ".hpp",
  ".htm",
  ".html",
  ".ini",
  ".java",
  ".js",
  ".json",
  ".jsx",
  ".log",
  ".md",
  ".mdx",
  ".mjs",
  ".mts",
  ".py",
  ".rb",
  ".rs",
  ".sass",
  ".scss",
  ".sh",
  ".sql",
  ".toml",
  ".ts",
  ".tsx",
  ".txt",
  ".xml",
  ".yaml",
  ".yml",
  ".zsh",
 ]
 const MIME_EXT = new Map([
  ["image/png", "png"],
  ["image/jpeg", "jpg"],
  ["image/gif", "gif"],
  ["image/webp", "webp"],
  ["application/pdf", "pdf"],
  ["application/json", "json"],
  ["application/ld+json", "jsonld"],
  ["application/toml", "toml"],
  ["application/x-toml", "toml"],
  ["application/x-yaml", "yaml"],
  ["application/xml", "xml"],
  ["application/yaml", "yaml"],
 ])
 const TEXT_EXT = ["txt", "text", "md", "markdown", "log", "csv"]
 export const ACCEPTED_FILE_EXTENSIONS = Array.from(
  new Set(
    ACCEPTED_FILE_TYPES.flatMap((item) => {
      if (item.startsWith(".")) return [item.slice(1)]
      if (item === "text/*") return TEXT_EXT
      const out = MIME_EXT.get(item)
      return out ? [out] : []
    }),
  ),
 ).sort()
 export function filePickerFilters(ext?: string[]) {
  if (!ext || ext.length === 0) return undefined
  return [{ name: "Files", extensions: ext }]
 }
@@ -1,10 +1,10 @@
 import { createEffect, createMemo, onCleanup, onMount, type Accessor } from "solid-js"
 import { createStore } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { type Accessor, createEffect, createMemo, onCleanup, onMount } from "solid-js"
+import { dict as en } from "@/i18n/en"
 import { createStore } from "solid-js/store"
 import { useLanguage } from "@/context/language"
 import { useSettings } from "@/context/settings"
 import { dict as en } from "@/i18n/en"
 import { Persist, persisted } from "@/utils/persist"
 const IS_MAC = typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform)
@@ -238,10 +238,9 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex
    })
    const warnedDuplicates = new Set<string>()
    type CommandCatalog = Record<string, CommandCatalogItem>
    const [catalog, setCatalog, _, catalogReady] = persisted(
      Persist.global("command.catalog.v1"),
-      createStore<CommandCatalog>({}),
+      createStore<Record<string, CommandCatalogItem>>({}),
    )
    const bind = (id: string, def: KeybindConfig | undefined) => {
@@ -260,7 +259,7 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex
          if (seen.has(opt.id)) {
            if (import.meta.env.DEV && !warnedDuplicates.has(opt.id)) {
              warnedDuplicates.add(opt.id)
-              console.warn(`[command] duplicate command id "${opt.id}" registered; keeping first entry`)
+              console.warn(`[command] duplicate command id \"${opt.id}\" registered; keeping first entry`)
            }
            continue
          }
@@ -275,19 +274,16 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex
    createEffect(() => {
      if (!catalogReady()) return
-      setCatalog(
+      for (const opt of registered()) {
-        registered().reduce((acc, opt) => {
+        const id = actionId(opt.id)
-          const id = actionId(opt.id)
+        setCatalog(id, {
-          acc[id] = {
+          title: opt.title,
-            title: opt.title,
+          description: opt.description,
-            description: opt.description,
+          category: opt.category,
-            category: opt.category,
+          keybind: opt.keybind,
-            keybind: opt.keybind,
+          slash: opt.slash,
-            slash: opt.slash,
+        })
-          }
+      }
          return acc
        }, {} as CommandCatalog),
      )
    })
    const catalogOptions = createMemo(() => Object.entries(catalog).map(([id, meta]) => ({ id, ...meta })))
@@ -378,7 +378,6 @@ function createGlobalSync() {
      return globalStore.error
    },
    child: children.child,
    peek: children.peek,
    bootstrap,
    updateConfig,
    project: projectApi,
@@ -226,15 +226,6 @@ export function createChildStoreManager(input: {
    return childStore
  }
  function peek(directory: string, options: ChildOptions = {}) {
    const childStore = ensureChild(directory)
    const shouldBootstrap = options.bootstrap ?? true
    if (shouldBootstrap && childStore[0].status === "loading") {
      input.onBootstrap(directory)
    }
    return childStore
  }
  function projectMeta(directory: string, patch: ProjectMeta) {
    const [store, setStore] = ensureChild(directory)
    const cached = metaCache.get(directory)
@@ -265,7 +256,6 @@ export function createChildStoreManager(input: {
    children,
    ensureChild,
    child,
    peek,
    projectMeta,
    projectIcon,
    mark,
@@ -1,422 +1,252 @@
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { base64Encode } from "@opencode-ai/util/encode"
 import { useParams } from "@solidjs/router"
 import { batch, createEffect, createMemo, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
-import { useModels } from "@/context/models"
+import { batch, createMemo } from "solid-js"
-import { useProviders } from "@/hooks/use-providers"
+import { createSimpleContext } from "@opencode-ai/ui/context"
 import { modelEnabled, modelProbe } from "@/testing/model-selection"
 import { Persist, persisted } from "@/utils/persist"
 import { cycleModelVariant, getConfiguredAgentVariant, resolveModelVariant } from "./model-variant"
 import { useSDK } from "./sdk"
 import { useSync } from "./sync"
 import { base64Encode } from "@opencode-ai/util/encode"
 import { useProviders } from "@/hooks/use-providers"
 import { useModels } from "@/context/models"
 import { cycleModelVariant, getConfiguredAgentVariant, resolveModelVariant } from "./model-variant"
 export type ModelKey = { providerID: string; modelID: string }
 type State = {
  agent?: string
  model?: ModelKey
  variant?: string | null
 }
 type Saved = {
  session: Record<string, State | undefined>
 }
 const WORKSPACE_KEY = "__workspace__"
 const handoff = new Map<string, State>()
 const handoffKey = (dir: string, id: string) => `${dir}\n${id}`
 const migrate = (value: unknown) => {
  if (!value || typeof value !== "object") return { session: {} }
  const item = value as {
    session?: Record<string, State | undefined>
    pick?: Record<string, State | undefined>
  }
  if (item.session && typeof item.session === "object") return { session: item.session }
  if (!item.pick || typeof item.pick !== "object") return { session: {} }
  return {
    session: Object.fromEntries(Object.entries(item.pick).filter(([key]) => key !== WORKSPACE_KEY)),
  }
 }
 const clone = (value: State | undefined) => {
  if (!value) return undefined
  return {
    ...value,
    model: value.model ? { ...value.model } : undefined,
  } satisfies State
 }
 export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
  name: "Local",
  init: () => {
    const params = useParams()
    const sdk = useSDK()
    const sync = useSync()
    const providers = useProviders()
-    const models = useModels()
+    const connected = createMemo(() => new Set(providers.connected().map((provider) => provider.id)))
-    const id = createMemo(() => params.id || undefined)
+    function isModelValid(model: ModelKey) {
-    const list = createMemo(() => sync.data.agent.filter((item) => item.mode !== "subagent" && !item.hidden))
+      const provider = providers.all().find((x) => x.id === model.providerID)
    const connected = createMemo(() => new Set(providers.connected().map((item) => item.id)))
    const [saved, setSaved] = persisted(
      {
        ...Persist.workspace(sdk.directory, "model-selection", ["model-selection.v1"]),
        migrate,
      },
      createStore<Saved>({
        session: {},
      }),
    )
    const [store, setStore] = createStore<{
      current?: string
      draft?: State
      last?: {
        type: "agent" | "model" | "variant"
        agent?: string
        model?: ModelKey | null
        variant?: string | null
      }
    }>({
      current: list()[0]?.name,
      draft: undefined,
      last: undefined,
    })
    const validModel = (model: ModelKey) => {
      const provider = providers.all().find((item) => item.id === model.providerID)
      return !!provider?.models[model.modelID] && connected().has(model.providerID)
    }
-    const firstModel = (...items: Array<() => ModelKey | undefined>) => {
+    function getFirstValidModel(...modelFns: (() => ModelKey | undefined)[]) {
-      for (const item of items) {
+      for (const modelFn of modelFns) {
-        const model = item()
+        const model = modelFn()
        if (!model) continue
-        if (validModel(model)) return model
+        if (isModelValid(model)) return model
      }
    }
-    const pickAgent = (name: string | undefined) => {
+    let setModel: (model: ModelKey | undefined, options?: { recent?: boolean }) => void = () => undefined
      const items = list()
      if (items.length === 0) return undefined
      return items.find((item) => item.name === name) ?? items[0]
    }
-    createEffect(() => {
+    const agent = (() => {
-      const items = list()
+      const list = createMemo(() => sync.data.agent.filter((x) => x.mode !== "subagent" && !x.hidden))
-      if (items.length === 0) {
+      const models = useModels()
        if (store.current !== undefined) setStore("current", undefined)
        return
      }
      if (items.some((item) => item.name === store.current)) return
      setStore("current", items[0]?.name)
    })
-    const scope = createMemo<State | undefined>(() => {
+      const [store, setStore] = createStore<{
-      const session = id()
+        current?: string
-      if (!session) return store.draft
+      }>({
-      return saved.session[session] ?? handoff.get(handoffKey(sdk.directory, session))
+        current: list()[0]?.name,
-    })
+      })
-
+      return {
-    createEffect(() => {
+        list,
-      const session = id()
+        current() {
-      if (!session) return
+          const available = list()
-
+          if (available.length === 0) return undefined
-      const key = handoffKey(sdk.directory, session)
+          return available.find((x) => x.name === store.current) ?? available[0]
-      const next = handoff.get(key)
+        },
-      if (!next) return
+        set(name: string | undefined) {
-      if (saved.session[session] !== undefined) {
+          const available = list()
-        handoff.delete(key)
+          if (available.length === 0) {
-        return
+            setStore("current", undefined)
      }
      setSaved("session", session, clone(next))
      handoff.delete(key)
    })
    const configuredModel = () => {
      if (!sync.data.config.model) return
      const [providerID, modelID] = sync.data.config.model.split("/")
      const model = { providerID, modelID }
      if (validModel(model)) return model
    }
    const recentModel = () => {
      for (const item of models.recent.list()) {
        if (validModel(item)) return item
      }
    }
    const defaultModel = () => {
      const defaults = providers.default()
      for (const provider of providers.connected()) {
        const configured = defaults[provider.id]
        if (configured) {
          const model = { providerID: provider.id, modelID: configured }
          if (validModel(model)) return model
        }
        const first = Object.values(provider.models)[0]
        if (!first) continue
        const model = { providerID: provider.id, modelID: first.id }
        if (validModel(model)) return model
      }
    }
    const fallback = createMemo<ModelKey | undefined>(() => configuredModel() ?? recentModel() ?? defaultModel())
    const agent = {
      list,
      current() {
        return pickAgent(scope()?.agent ?? store.current)
      },
      set(name: string | undefined) {
        const item = pickAgent(name)
        if (!item) {
          setStore("current", undefined)
          return
        }
        batch(() => {
          setStore("current", item.name)
          setStore("last", {
            type: "agent",
            agent: item.name,
            model: item.model,
            variant: item.variant ?? null,
          })
          const prev = scope()
          const next = {
            agent: item.name,
            model: item.model ?? prev?.model,
            variant: item.variant ?? prev?.variant,
          } satisfies State
          const session = id()
          if (session) {
            setSaved("session", session, next)
            return
          }
-          setStore("draft", next)
+          const match = name ? available.find((x) => x.name === name) : undefined
-        })
+          const value = match ?? available[0]
-      },
+          if (!value) return
-      move(direction: 1 | -1) {
+          setStore("current", value.name)
-        const items = list()
+          if (!value.model) return
-        if (items.length === 0) {
+          setModel({
-          setStore("current", undefined)
+            providerID: value.model.providerID,
-          return
+            modelID: value.model.modelID,
-        }
+          })
-
+          if (value.variant)
-        let next = items.findIndex((item) => item.name === agent.current()?.name) + direction
+            models.variant.set({ providerID: value.model.providerID, modelID: value.model.modelID }, value.variant)
-        if (next < 0) next = items.length - 1
+        },
-        if (next >= items.length) next = 0
+        move(direction: 1 | -1) {
-        const item = items[next]
+          const available = list()
-        if (!item) return
+          if (available.length === 0) {
-        agent.set(item.name)
+            setStore("current", undefined)
-      },
+            return
-    }
+          }
-
+          let next = available.findIndex((x) => x.name === store.current) + direction
-    const current = () => {
+          if (next < 0) next = available.length - 1
-      const item = firstModel(
+          if (next >= available.length) next = 0
-        () => scope()?.model,
+          const value = available[next]
-        () => agent.current()?.model,
+          if (!value) return
-        fallback,
+          setStore("current", value.name)
-      )
+          if (!value.model) return
-      if (!item) return undefined
+          setModel({
-      return models.find(item)
+            providerID: value.model.providerID,
-    }
+            modelID: value.model.modelID,
-
+          })
-    const configured = () => {
+          if (value.variant)
-      const item = agent.current()
+            models.variant.set({ providerID: value.model.providerID, modelID: value.model.modelID }, value.variant)
-      const model = current()
+        },
      if (!item || !model) return undefined
      return getConfiguredAgentVariant({
        agent: { model: item.model, variant: item.variant },
        model: { providerID: model.provider.id, modelID: model.id, variants: model.variants },
      })
    }
    const selected = () => scope()?.variant
    const snapshot = () => {
      const model = current()
      return {
        agent: agent.current()?.name,
        model: model ? { providerID: model.provider.id, modelID: model.id } : undefined,
        variant: selected(),
      } satisfies State
    }
    const write = (next: Partial<State>) => {
      const state = {
        ...(scope() ?? { agent: agent.current()?.name }),
        ...next,
      } satisfies State
      const session = id()
      if (session) {
        setSaved("session", session, state)
        return
      }
-      setStore("draft", state)
+    })()
    }
-    const recent = createMemo(() => models.recent.list().map(models.find).filter(Boolean))
+    const model = (() => {
      const models = useModels()
-    const model = {
+      const [ephemeral, setEphemeral] = createStore<{
-      ready: models.ready,
+        model: Record<string, ModelKey | undefined>
-      current,
+      }>({
-      recent,
+        model: {},
-      list: models.list,
+      })
      cycle(direction: 1 | -1) {
        const items = recent()
        const item = current()
        if (!item) return
-        const index = items.findIndex((entry) => entry?.provider.id === item.provider.id && entry?.id === item.id)
+      const resolveConfigured = () => {
        if (!sync.data.config.model) return
        const [providerID, modelID] = sync.data.config.model.split("/")
        const key = { providerID, modelID }
        if (isModelValid(key)) return key
      }
      const resolveRecent = () => {
        for (const item of models.recent.list()) {
          if (isModelValid(item)) return item
        }
      }
      const resolveDefault = () => {
        const defaults = providers.default()
        for (const provider of providers.connected()) {
          const configured = defaults[provider.id]
          if (configured) {
            const key = { providerID: provider.id, modelID: configured }
            if (isModelValid(key)) return key
          }
          const first = Object.values(provider.models)[0]
          if (!first) continue
          const key = { providerID: provider.id, modelID: first.id }
          if (isModelValid(key)) return key
        }
      }
      const fallbackModel = createMemo<ModelKey | undefined>(() => {
        return resolveConfigured() ?? resolveRecent() ?? resolveDefault()
      })
      const current = createMemo(() => {
        const a = agent.current()
        if (!a) return undefined
        const key = getFirstValidModel(
          () => ephemeral.model[a.name],
          () => a.model,
          fallbackModel,
        )
        if (!key) return undefined
        return models.find(key)
      })
      const recent = createMemo(() => models.recent.list().map(models.find).filter(Boolean))
      const cycle = (direction: 1 | -1) => {
        const recentList = recent()
        const currentModel = current()
        if (!currentModel) return
        const index = recentList.findIndex(
          (x) => x?.provider.id === currentModel.provider.id && x?.id === currentModel.id,
        )
        if (index === -1) return
        let next = index + direction
-        if (next < 0) next = items.length - 1
+        if (next < 0) next = recentList.length - 1
-        if (next >= items.length) next = 0
+        if (next >= recentList.length) next = 0
-        const entry = items[next]
+        const val = recentList[next]
-        if (!entry) return
+        if (!val) return
-        model.set({ providerID: entry.provider.id, modelID: entry.id })
+
-      },
+        model.set({
-      set(item: ModelKey | undefined, options?: { recent?: boolean }) {
+          providerID: val.provider.id,
-        batch(() => {
+          modelID: val.id,
          setStore("last", {
            type: "model",
            agent: agent.current()?.name,
            model: item ?? null,
            variant: selected(),
          })
          write({ model: item })
          if (!item) return
          models.setVisibility(item, true)
          if (!options?.recent) return
          models.recent.push(item)
        })
-      },
+      }
-      visible(item: ModelKey) {
+
-        return models.visible(item)
+      const set = (model: ModelKey | undefined, options?: { recent?: boolean }) => {
-      },
+        batch(() => {
-      setVisibility(item: ModelKey, visible: boolean) {
+          const currentAgent = agent.current()
-        models.setVisibility(item, visible)
+          const next = model ?? fallbackModel()
-      },
+          if (currentAgent) setEphemeral("model", currentAgent.name, next)
-      variant: {
+          if (model) models.setVisibility(model, true)
-        configured,
+          if (options?.recent && model) models.recent.push(model)
-        selected,
+        })
-        current() {
+      }
-          return resolveModelVariant({
+
-            variants: this.list(),
+      setModel = set
-            selected: this.selected(),
+
-            configured: this.configured(),
+      return {
-          })
+        ready: models.ready,
        current,
        recent,
        list: models.list,
        cycle,
        set,
        visible(model: ModelKey) {
          return models.visible(model)
        },
-        list() {
+        setVisibility(model: ModelKey, visible: boolean) {
-          const item = current()
+          models.setVisibility(model, visible)
          if (!item?.variants) return []
          return Object.keys(item.variants)
        },
-        set(value: string | undefined) {
+        variant: {
-          batch(() => {
+          configured() {
-            const model = current()
+            const a = agent.current()
-            setStore("last", {
+            const m = current()
-              type: "variant",
+            if (!a || !m) return undefined
-              agent: agent.current()?.name,
+            return getConfiguredAgentVariant({
-              model: model ? { providerID: model.provider.id, modelID: model.id } : null,
+              agent: { model: a.model, variant: a.variant },
-              variant: value ?? null,
+              model: { providerID: m.provider.id, modelID: m.id, variants: m.variants },
            })
-            write({ variant: value ?? null })
+          },
-          })
+          selected() {
-        },
+            const m = current()
-        cycle() {
+            if (!m) return undefined
-          const items = this.list()
+            return models.variant.get({ providerID: m.provider.id, modelID: m.id })
-          if (items.length === 0) return
+          },
-          this.set(
+          current() {
-            cycleModelVariant({
+            return resolveModelVariant({
-              variants: items,
+              variants: this.list(),
              selected: this.selected(),
              configured: this.configured(),
-            }),
+            })
-          )
+          },
          list() {
            const m = current()
            if (!m) return []
            if (!m.variants) return []
            return Object.keys(m.variants)
          },
          set(value: string | undefined) {
            const m = current()
            if (!m) return
            models.variant.set({ providerID: m.provider.id, modelID: m.id }, value)
          },
          cycle() {
            const variants = this.list()
            if (variants.length === 0) return
            this.set(
              cycleModelVariant({
                variants,
                selected: this.selected(),
                configured: this.configured(),
              }),
            )
          },
        },
-      },
+      }
-    }
+    })()
    const result = {
      slug: createMemo(() => base64Encode(sdk.directory)),
      model,
      agent,
      session: {
        reset() {
          setStore("draft", undefined)
        },
        promote(dir: string, session: string) {
          const next = clone(snapshot())
          if (!next) return
          if (dir === sdk.directory) {
            setSaved("session", session, next)
            setStore("draft", undefined)
            return
          }
          handoff.set(handoffKey(dir, session), next)
          setStore("draft", undefined)
        },
        restore(msg: { sessionID: string; agent: string; model: ModelKey; variant?: string }) {
          const session = id()
          if (!session) return
          if (msg.sessionID !== session) return
          if (saved.session[session] !== undefined) return
          if (handoff.has(handoffKey(sdk.directory, session))) return
          setSaved("session", session, {
            agent: msg.agent,
            model: msg.model,
            variant: msg.variant ?? null,
          })
        },
      },
    }
    if (modelEnabled()) {
      createEffect(() => {
        const agent = result.agent.current()
        const model = result.model.current()
        modelProbe.set({
          dir: sdk.directory,
          sessionID: id(),
          last: store.last,
          agent: agent?.name,
          model: model
            ? {
                providerID: model.provider.id,
                modelID: model.id,
                name: model.name,
              }
            : undefined,
          variant: result.model.variant.current() ?? null,
          selected: result.model.variant.selected(),
          configured: result.model.variant.configured(),
          pick: scope(),
          base: undefined,
          current: store.current,
        })
      })
      onCleanup(() => modelProbe.clear())
    }
    return result
  },
 })
@@ -44,16 +44,6 @@ describe("model variant", () => {
    expect(value).toBe("high")
  })
  test("lets an explicit default override the configured variant", () => {
    const value = resolveModelVariant({
      variants: ["low", "high", "xhigh"],
      selected: null,
      configured: "xhigh",
    })
    expect(value).toBeUndefined()
  })
  test("cycles from configured variant to next", () => {
    const value = cycleModelVariant({
      variants: ["low", "high", "xhigh"],
@@ -73,14 +63,4 @@ describe("model variant", () => {
    expect(value).toBe("low")
  })
  test("cycles from an explicit default to the first variant", () => {
    const value = cycleModelVariant({
      variants: ["low", "high", "xhigh"],
      selected: null,
      configured: "xhigh",
    })
    expect(value).toBe("low")
  })
 })
@@ -14,7 +14,7 @@ type Model = AgentModel & {
 type VariantInput = {
  variants: string[]
-  selected: string | null | undefined
+  selected: string | undefined
  configured: string | undefined
 }
@@ -29,7 +29,6 @@ export function getConfiguredAgentVariant(input: { agent: Agent | undefined; mod
 }
 export function resolveModelVariant(input: VariantInput) {
  if (input.selected === null) return undefined
  if (input.selected && input.variants.includes(input.selected)) return input.selected
  if (input.configured && input.variants.includes(input.configured)) return input.configured
  return undefined
@@ -37,7 +36,6 @@ export function resolveModelVariant(input: VariantInput) {
 export function cycleModelVariant(input: VariantInput) {
  if (input.variants.length === 0) return undefined
  if (input.selected === null) return input.variants[0]
  if (input.selected && input.variants.includes(input.selected)) {
    const index = input.variants.indexOf(input.selected)
    if (index === input.variants.length - 1) return undefined
@@ -5,7 +5,7 @@ import { ServerConnection } from "./server"
 type PickerPaths = string | string[] | null
 type OpenDirectoryPickerOptions = { title?: string; multiple?: boolean }
-type OpenFilePickerOptions = { title?: string; multiple?: boolean; accept?: string[]; extensions?: string[] }
+type OpenFilePickerOptions = { title?: string; multiple?: boolean }
 type SaveFilePickerOptions = { title?: string; defaultPath?: string }
 type UpdateInfo = { updateAvailable: boolean; version?: string }
@@ -1,10 +1,10 @@
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { checksum } from "@opencode-ai/util/encode"
 import { useParams } from "@solidjs/router"
 import { batch, createMemo, createRoot, getOwner, onCleanup } from "solid-js"
 import { createStore, type SetStoreFunction } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { batch, createMemo, createRoot, onCleanup } from "solid-js"
 import { useParams } from "@solidjs/router"
 import type { FileSelection } from "@/context/file"
 import { Persist, persisted } from "@/utils/persist"
 import { checksum } from "@opencode-ai/util/encode"
 interface PartBase {
  content: string
@@ -151,11 +151,6 @@ const MAX_PROMPT_SESSIONS = 20
 type PromptSession = ReturnType<typeof createPromptSession>
 type Scope = {
  dir: string
  id?: string
 }
 type PromptCacheEntry = {
  value: PromptSession
  dispose: VoidFunction
@@ -250,7 +245,6 @@ export const { use: usePrompt, provider: PromptProvider } = createSimpleContext(
      }
    }
    const owner = getOwner()
    const load = (dir: string, id: string | undefined) => {
      const key = `${dir}:${id ?? WORKSPACE_KEY}`
      const existing = cache.get(key)
@@ -260,13 +254,10 @@ export const { use: usePrompt, provider: PromptProvider } = createSimpleContext(
        return existing.value
      }
-      const entry = createRoot(
+      const entry = createRoot((dispose) => ({
-        (dispose) => ({
+        value: createPromptSession(dir, id),
-          value: createPromptSession(dir, id),
+        dispose,
-          dispose,
+      }))
        }),
        owner,
      )
      cache.set(key, entry)
      prune()
@@ -274,7 +265,6 @@ export const { use: usePrompt, provider: PromptProvider } = createSimpleContext(
    }
    const session = createMemo(() => load(params.dir!, params.id))
    const pick = (scope?: Scope) => (scope ? load(scope.dir, scope.id) : session())
    return {
      ready: () => session().ready(),
@@ -290,8 +280,8 @@ export const { use: usePrompt, provider: PromptProvider } = createSimpleContext(
          session().context.updateComment(path, commentID, next),
        replaceComments: (items: FileContextItem[]) => session().context.replaceComments(items),
      },
-      set: (prompt: Prompt, cursorPosition?: number, scope?: Scope) => pick(scope).set(prompt, cursorPosition),
+      set: (prompt: Prompt, cursorPosition?: number) => session().set(prompt, cursorPosition),
-      reset: (scope?: Scope) => pick(scope).reset(),
+      reset: () => session().reset(),
    }
  },
 })
@@ -185,60 +185,6 @@ function createWorkspaceTerminalSession(sdk: ReturnType<typeof useSDK>, dir: str
  })
  onCleanup(unsub)
  const update = (client: ReturnType<typeof useSDK>["client"], pty: Partial<LocalPTY> & { id: string }) => {
    const index = store.all.findIndex((x) => x.id === pty.id)
    const previous = index >= 0 ? store.all[index] : undefined
    if (index >= 0) {
      setStore("all", index, (item) => ({ ...item, ...pty }))
    }
    client.pty
      .update({
        ptyID: pty.id,
        title: pty.title,
        size: pty.cols && pty.rows ? { rows: pty.rows, cols: pty.cols } : undefined,
      })
      .catch((error: unknown) => {
        if (previous) {
          const currentIndex = store.all.findIndex((item) => item.id === pty.id)
          if (currentIndex >= 0) setStore("all", currentIndex, previous)
        }
        console.error("Failed to update terminal", error)
      })
  }
  const clone = async (client: ReturnType<typeof useSDK>["client"], id: string) => {
    const index = store.all.findIndex((x) => x.id === id)
    const pty = store.all[index]
    if (!pty) return
    const next = await client.pty
      .create({
        title: pty.title,
      })
      .catch((error: unknown) => {
        console.error("Failed to clone terminal", error)
        return undefined
      })
    if (!next?.data) return
    const active = store.active === pty.id
    batch(() => {
      setStore("all", index, {
        id: next.data.id,
        title: next.data.title ?? pty.title,
        titleNumber: pty.titleNumber,
        buffer: undefined,
        cursor: undefined,
        scrollY: undefined,
        rows: undefined,
        cols: undefined,
      })
      if (active) {
        setStore("active", next.data.id)
      }
    })
  }
  return {
    ready,
    all: createMemo(() => store.all),
@@ -270,7 +216,24 @@ function createWorkspaceTerminalSession(sdk: ReturnType<typeof useSDK>, dir: str
        })
    },
    update(pty: Partial<LocalPTY> & { id: string }) {
-      update(sdk.client, pty)
+      const index = store.all.findIndex((x) => x.id === pty.id)
      const previous = index >= 0 ? store.all[index] : undefined
      if (index >= 0) {
        setStore("all", index, (item) => ({ ...item, ...pty }))
      }
      sdk.client.pty
        .update({
          ptyID: pty.id,
          title: pty.title,
          size: pty.cols && pty.rows ? { rows: pty.rows, cols: pty.cols } : undefined,
        })
        .catch((error: unknown) => {
          if (previous) {
            const currentIndex = store.all.findIndex((item) => item.id === pty.id)
            if (currentIndex >= 0) setStore("all", currentIndex, previous)
          }
          console.error("Failed to update terminal", error)
        })
    },
    trim(id: string) {
      const index = store.all.findIndex((x) => x.id === id)
@@ -285,23 +248,37 @@ function createWorkspaceTerminalSession(sdk: ReturnType<typeof useSDK>, dir: str
      })
    },
    async clone(id: string) {
-      await clone(sdk.client, id)
+      const index = store.all.findIndex((x) => x.id === id)
-    },
+      const pty = store.all[index]
-    bind() {
+      if (!pty) return
-      const client = sdk.client
+      const clone = await sdk.client.pty
-      return {
+        .create({
-        trim(id: string) {
+          title: pty.title,
-          const index = store.all.findIndex((x) => x.id === id)
+        })
-          if (index === -1) return
+        .catch((error: unknown) => {
-          setStore("all", index, (pty) => trimTerminal(pty))
+          console.error("Failed to clone terminal", error)
-        },
+          return undefined
-        update(pty: Partial<LocalPTY> & { id: string }) {
+        })
-          update(client, pty)
+      if (!clone?.data) return
-        },
+
-        async clone(id: string) {
+      const active = store.active === pty.id
-          await clone(client, id)
+
-        },
+      batch(() => {
-      }
+        setStore("all", index, {
          id: clone.data.id,
          title: clone.data.title ?? pty.title,
          titleNumber: pty.titleNumber,
          // New PTY process, so start clean.
          buffer: undefined,
          cursor: undefined,
          scrollY: undefined,
          rows: undefined,
          cols: undefined,
        })
        if (active) {
          setStore("active", clone.data.id)
        }
      })
    },
    open(id: string) {
      setStore("active", id)
@@ -426,7 +403,6 @@ export const { use: useTerminal, provider: TerminalProvider } = createSimpleCont
      trim: (id: string) => workspace().trim(id),
      trimAll: () => workspace().trimAll(),
      clone: (id: string) => workspace().clone(id),
      bind: () => workspace(),
      open: (id: string) => workspace().open(id),
      close: (id: string) => workspace().close(id),
      move: (id: string, to: number) => workspace().move(id, to),
@@ -204,7 +204,6 @@ export const dict = {
  "common.cancel": "إلغاء",
  "common.connect": "اتصال",
  "common.disconnect": "قطع الاتصال",
  "common.continue": "إرسال",
  "common.submit": "إرسال",
  "common.save": "حفظ",
  "common.saving": "جارٍ الحفظ...",
@@ -204,7 +204,6 @@ export const dict = {
  "common.cancel": "Cancelar",
  "common.connect": "Conectar",
  "common.disconnect": "Desconectar",
  "common.continue": "Enviar",
  "common.submit": "Enviar",
  "common.save": "Salvar",
  "common.saving": "Salvando...",
@@ -221,7 +221,6 @@ export const dict = {
  "common.cancel": "Otkaži",
  "common.connect": "Poveži",
  "common.disconnect": "Prekini vezu",
  "common.continue": "Pošalji",
  "common.submit": "Pošalji",
  "common.save": "Sačuvaj",
  "common.saving": "Čuvanje...",
@@ -219,7 +219,6 @@ export const dict = {
  "common.cancel": "Annuller",
  "common.connect": "Forbind",
  "common.disconnect": "Frakobl",
  "common.continue": "Indsend",
  "common.submit": "Indsend",
  "common.save": "Gem",
  "common.saving": "Gemmer...",
@@ -209,7 +209,6 @@ export const dict = {
  "common.cancel": "Abbrechen",
  "common.connect": "Verbinden",
  "common.disconnect": "Trennen",
  "common.continue": "Absenden",
  "common.submit": "Absenden",
  "common.save": "Speichern",
  "common.saving": "Speichert...",
@@ -23,8 +23,6 @@ export const dict = {
  "command.sidebar.toggle": "Toggle sidebar",
  "command.project.open": "Open project",
  "command.project.previous": "Previous project",
  "command.project.next": "Next project",
  "command.provider.connect": "Connect provider",
  "command.server.switch": "Switch server",
  "command.settings.open": "Open settings",
@@ -223,7 +221,6 @@ export const dict = {
  "common.open": "Open",
  "common.connect": "Connect",
  "common.disconnect": "Disconnect",
  "common.continue": "Continue",
  "common.submit": "Submit",
  "common.save": "Save",
  "common.saving": "Saving...",
@@ -677,8 +674,6 @@ export const dict = {
  "sidebar.project.recentSessions": "Recent sessions",
  "sidebar.project.viewAllSessions": "View all sessions",
  "sidebar.project.clearNotifications": "Clear notifications",
  "sidebar.empty.title": "No projects open",
  "sidebar.empty.description": "Open a project to get started",
  "debugBar.ariaLabel": "Development performance diagnostics",
  "debugBar.na": "n/a",
@@ -220,7 +220,6 @@ export const dict = {
  "common.cancel": "Cancelar",
  "common.connect": "Conectar",
  "common.disconnect": "Desconectar",
  "common.continue": "Enviar",
  "common.submit": "Enviar",
  "common.save": "Guardar",
  "common.saving": "Guardando...",
@@ -204,7 +204,6 @@ export const dict = {
  "common.cancel": "Annuler",
  "common.connect": "Connecter",
  "common.disconnect": "Déconnecter",
  "common.continue": "Soumettre",
  "common.submit": "Soumettre",
  "common.save": "Enregistrer",
  "common.saving": "Enregistrement...",
@@ -203,7 +203,6 @@ export const dict = {
  "common.cancel": "キャンセル",
  "common.connect": "接続",
  "common.disconnect": "切断",
  "common.continue": "送信",
  "common.submit": "送信",
  "common.save": "保存",
  "common.saving": "保存中...",
@@ -207,7 +207,6 @@ export const dict = {
  "common.cancel": "취소",
  "common.connect": "연결",
  "common.disconnect": "연결 해제",
  "common.continue": "제출",
  "common.submit": "제출",
  "common.save": "저장",
  "common.saving": "저장 중...",
@@ -223,7 +223,6 @@ export const dict = {
  "common.cancel": "Avbryt",
  "common.connect": "Koble til",
  "common.disconnect": "Koble fra",
  "common.continue": "Send inn",
  "common.submit": "Send inn",
  "common.save": "Lagre",
  "common.saving": "Lagrer...",
@@ -205,7 +205,6 @@ export const dict = {
  "common.cancel": "Anuluj",
  "common.connect": "Połącz",
  "common.disconnect": "Rozłącz",
  "common.continue": "Prześlij",
  "common.submit": "Prześlij",
  "common.save": "Zapisz",
  "common.saving": "Zapisywanie...",
@@ -220,7 +220,6 @@ export const dict = {
  "common.cancel": "Отмена",
  "common.connect": "Подключить",
  "common.disconnect": "Отключить",
  "common.continue": "Отправить",
  "common.submit": "Отправить",
  "common.save": "Сохранить",
  "common.saving": "Сохранение...",
@@ -220,7 +220,6 @@ export const dict = {
  "common.cancel": "ยกเลิก",
  "common.connect": "เชื่อมต่อ",
  "common.disconnect": "ยกเลิกการเชื่อมต่อ",
  "common.continue": "ส่ง",
  "common.submit": "ส่ง",
  "common.save": "บันทึก",
  "common.saving": "กำลังบันทึก...",
@@ -225,7 +225,6 @@ export const dict = {
  "common.cancel": "İptal",
  "common.connect": "Bağlan",
  "common.disconnect": "Bağlantı Kes",
  "common.continue": "Gönder",
  "common.submit": "Gönder",
  "common.save": "Kaydet",
  "common.saving": "Kaydediliyor...",
@@ -242,7 +242,6 @@ export const dict = {
  "common.cancel": "取消",
  "common.connect": "连接",
  "common.disconnect": "断开连接",
  "common.continue": "提交",
  "common.submit": "提交",
  "common.save": "保存",
  "common.saving": "保存中...",
@@ -220,7 +220,6 @@ export const dict = {
  "common.cancel": "取消",
  "common.connect": "連線",
  "common.disconnect": "中斷連線",
  "common.continue": "提交",
  "common.submit": "提交",
  "common.save": "儲存",
  "common.saving": "儲存中...",
@@ -1,5 +1,4 @@
 export { AppBaseProviders, AppInterface } from "./app"
 export { ACCEPTED_FILE_EXTENSIONS, ACCEPTED_FILE_TYPES, filePickerFilters } from "./constants/file-picker"
 export { useCommand } from "./context/command"
 export { type DisplayBackend, type Platform, PlatformProvider } from "./context/platform"
 export { ServerConnection } from "./context/server"
@@ -1,15 +1,16 @@
-import { DataProvider } from "@opencode-ai/ui/context"
+import { batch, createEffect, createMemo, Show, type ParentProps } from "solid-js"
-import { showToast } from "@opencode-ai/ui/toast"
+import { createStore } from "solid-js/store"
 import { base64Encode } from "@opencode-ai/util/encode"
 import { useLocation, useNavigate, useParams } from "@solidjs/router"
 import { createMemo, createResource, type ParentProps, Show } from "solid-js"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { useLanguage } from "@/context/language"
 import { LocalProvider } from "@/context/local"
 import { SDKProvider } from "@/context/sdk"
 import { SyncProvider, useSync } from "@/context/sync"
-import { decode64 } from "@/utils/base64"
+import { LocalProvider } from "@/context/local"
 import { useGlobalSDK } from "@/context/global-sdk"
 import { DataProvider } from "@opencode-ai/ui/context"
 import { base64Encode } from "@opencode-ai/util/encode"
 import { decode64 } from "@/utils/base64"
 import { showToast } from "@opencode-ai/ui/toast"
 import { useLanguage } from "@/context/language"
 function DirectoryDataProvider(props: ParentProps<{ directory: string }>) {
  const navigate = useNavigate()
  const sync = useSync()
@@ -29,57 +30,61 @@ function DirectoryDataProvider(props: ParentProps<{ directory: string }>) {
 export default function Layout(props: ParentProps) {
  const params = useParams()
  const navigate = useNavigate()
  const location = useLocation()
  const language = useLanguage()
  const globalSDK = useGlobalSDK()
-  const navigate = useNavigate()
+  const directory = createMemo(() => decode64(params.dir) ?? "")
-  let invalid = ""
+  const [state, setState] = createStore({ invalid: "", resolved: "" })
-  const [resolved] = createResource(
+  createEffect(() => {
-    () => {
+    if (!params.dir) return
-      if (params.dir) return [location.pathname, params.dir] as const
+    const raw = directory()
-    },
+    if (!raw) {
-    async ([pathname, b64Dir]) => {
+      if (state.invalid === params.dir) return
-      const directory = decode64(b64Dir)
+      setState("invalid", params.dir)
      showToast({
        variant: "error",
        title: language.t("common.requestFailed"),
        description: language.t("directory.error.invalidUrl"),
      })
      navigate("/", { replace: true })
      return
    }
-      if (!directory) {
+    const current = params.dir
-        if (invalid === params.dir) return
+    globalSDK
-        invalid = b64Dir
+      .createClient({
-        showToast({
+        directory: raw,
-          variant: "error",
+        throwOnError: true,
-          title: language.t("common.requestFailed"),
+      })
-          description: language.t("directory.error.invalidUrl"),
+      .path.get()
      .then((x) => {
        if (params.dir !== current) return
        const next = x.data?.directory ?? raw
        batch(() => {
          setState("invalid", "")
          setState("resolved", next)
        })
-        navigate("/", { replace: true })
+        if (next === raw) return
-        return
+        const path = location.pathname.slice(current.length + 1)
-      }
+        navigate(`/${base64Encode(next)}${path}${location.search}${location.hash}`, { replace: true })
-
+      })
-      return await globalSDK
+      .catch(() => {
-        .createClient({
+        if (params.dir !== current) return
-          directory,
+        batch(() => {
-          throwOnError: true,
+          setState("invalid", "")
          setState("resolved", raw)
        })
-        .path.get()
+      })
-        .then((x) => {
+  })
          const next = x.data?.directory ?? directory
          invalid = ""
          if (next === directory) return next
          const path = pathname.slice(b64Dir.length + 1)
          navigate(`/${base64Encode(next)}${path}${location.search}${location.hash}`, { replace: true })
        })
        .catch(() => {
          invalid = ""
          return directory
        })
    },
  )
  return (
-    <Show when={resolved()} keyed>
+    <Show when={state.resolved}>
      {(resolved) => (
-        <SDKProvider directory={() => resolved}>
+        <SDKProvider directory={resolved}>
          <SyncProvider>
-            <DirectoryDataProvider directory={resolved}>{props.children}</DirectoryDataProvider>
+            <DirectoryDataProvider directory={resolved()}>{props.children}</DirectoryDataProvider>
          </SyncProvider>
        </SDKProvider>
      )}
@@ -1,12 +1,11 @@
 import { TextField } from "@opencode-ai/ui/text-field"
 import { Logo } from "@opencode-ai/ui/logo"
 import { Button } from "@opencode-ai/ui/button"
-import { Component, Show, onMount } from "solid-js"
+import { Component, Show } from "solid-js"
 import { createStore } from "solid-js/store"
 import { usePlatform } from "@/context/platform"
 import { useLanguage } from "@/context/language"
 import { Icon } from "@opencode-ai/ui/icon"
 import type { E2EWindow } from "@/testing/terminal"
 export type InitError = {
  name: string
@@ -227,13 +226,6 @@ export const ErrorPage: Component<ErrorPageProps> = (props) => {
    actionError: undefined as string | undefined,
  })
  onMount(() => {
    const win = window as E2EWindow
    if (!win.__opencode_e2e) return
    const detail = formatError(props.error, language.t)
    console.error(`[e2e:error-boundary] ${window.location.pathname}\n${detail}`)
  })
  async function checkForUpdates() {
    if (!platform.checkUpdate) return
    setStore("checking", true)
@@ -1,17 +1,4 @@
-import {
+import { batch, createEffect, createMemo, For, on, onCleanup, onMount, ParentProps, Show, untrack } from "solid-js"
  batch,
  createEffect,
  createMemo,
  createResource,
  For,
  on,
  onCleanup,
  onMount,
  ParentProps,
  Show,
  untrack,
  type Accessor,
 } from "solid-js"
 import { useNavigate, useParams } from "@solidjs/router"
 import { useLayout, LocalProject } from "@/context/layout"
 import { useGlobalSync } from "@/context/global-sync"
@@ -129,16 +116,6 @@ export default function Layout(props: ParentProps) {
  const theme = useTheme()
  const language = useLanguage()
  const initialDirectory = decode64(params.dir)
  const route = createMemo(() => {
    const slug = params.dir
    if (!slug) return { slug, dir: "" }
    const dir = decode64(slug)
    if (!dir) return { slug, dir: "" }
    return {
      slug,
      dir: globalSync.peek(dir, { bootstrap: false })[0].path.directory || 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"> = {
@@ -147,10 +124,11 @@ export default function Layout(props: ParentProps) {
    dark: "theme.scheme.dark",
  }
  const colorSchemeLabel = (scheme: ColorScheme) => language.t(colorSchemeKey[scheme])
-  const currentDir = createMemo(() => route().dir)
+  const currentDir = createMemo(() => decode64(params.dir) ?? "")
  const [state, setState] = createStore({
    autoselect: !initialDirectory,
    routing: false,
    busyWorkspaces: {} as Record<string, boolean>,
    hoverSession: undefined as string | undefined,
    hoverProject: undefined as string | undefined,
@@ -158,11 +136,12 @@ export default function Layout(props: ParentProps) {
    nav: undefined as HTMLElement | undefined,
    sortNow: Date.now(),
    sizing: false,
-    peek: undefined as string | undefined,
+    peek: undefined as LocalProject | undefined,
    peeked: false,
  })
  const editor = createInlineEditorController()
  let token = 0
  const setBusy = (directory: string, value: boolean) => {
    const key = workspaceKey(directory)
    if (value) {
@@ -256,12 +235,6 @@ export default function Layout(props: ParentProps) {
    return layout.projects.list().find((project) => project.worktree === id)
  })
  const peekProject = createMemo(() => {
    const id = state.peek
    if (!id) return
    return layout.projects.list().find((project) => project.worktree === id)
  })
  createEffect(() => {
    const p = hoverProjectData()
    if (p) {
@@ -269,7 +242,7 @@ export default function Layout(props: ParentProps) {
        clearTimeout(peekt)
        peekt = undefined
      }
-      setState("peek", p.worktree)
+      setState("peek", p)
      setState("peeked", true)
      return
    }
@@ -288,13 +261,28 @@ export default function Layout(props: ParentProps) {
    setHoverProject(undefined)
  })
  const autoselecting = createMemo(() => {
    if (params.dir) return false
    if (state.routing) return true
    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
+    if (!state.autoselect && !state.routing) return
    const dir = params.dir
    if (!dir) return
    const directory = decode64(dir)
    if (!directory) return
-    setState("autoselect", false)
+    token += 1
    batch(() => {
      setState("autoselect", false)
      setState("routing", false)
    })
  })
  const editorOpen = editor.editorOpen
@@ -494,8 +482,8 @@ export default function Layout(props: ParentProps) {
        }
        const currentSession = params.id
-        if (workspaceKey(directory) === workspaceKey(currentDir()) && props.sessionID === currentSession) return
+        if (directory === currentDir() && props.sessionID === currentSession) return
-        if (workspaceKey(directory) === workspaceKey(currentDir()) && session?.parentID === currentSession) return
+        if (directory === currentDir() && session?.parentID === currentSession) return
        dismissSessionAlert(sessionKey)
@@ -553,14 +541,13 @@ export default function Layout(props: ParentProps) {
  const currentProject = createMemo(() => {
    const directory = currentDir()
    if (!directory) return
    const key = workspaceKey(directory)
    const projects = layout.projects.list()
-    const sandbox = projects.find((p) => p.sandboxes?.some((item) => workspaceKey(item) === key))
+    const sandbox = projects.find((p) => p.sandboxes?.includes(directory))
    if (sandbox) return sandbox
-    const direct = projects.find((p) => workspaceKey(p.worktree) === key)
+    const direct = projects.find((p) => p.worktree === directory)
    if (direct) return direct
    const [child] = globalSync.child(directory, { bootstrap: false })
@@ -574,23 +561,42 @@ export default function Layout(props: ParentProps) {
    return projects.find((p) => p.worktree === root)
  })
-  const [autoselecting] = createResource(async () => {
+  createEffect(
-    await ready.promise
+    on(
-    await layout.ready.promise
+      () => ({ ready: pageReady(), layoutReady: layoutReady(), dir: params.dir, list: layout.projects.list() }),
-    if (!untrack(() => state.autoselect)) return
+      (value) => {
        if (!value.ready) return
        if (!value.layoutReady) return
        if (!state.autoselect) return
        if (state.routing) return
        if (value.dir) return
-    const list = layout.projects.list()
+        const last = server.projects.last()
-    const last = server.projects.last()
+        const next =
          value.list.length === 0
            ? last
            : (value.list.find((project) => project.worktree === last)?.worktree ?? value.list[0]?.worktree)
        if (!next) return
-    if (list.length === 0) {
+        const id = ++token
-      if (!last) return
+        batch(() => {
-      await openProject(last, true)
+          setState("autoselect", false)
-    } else {
+          setState("routing", true)
-      const next = list.find((project) => project.worktree === last) ?? list[0]
+        })
-      if (!next) return
+        void navigateToProject(next, () => id === token && !params.dir).then(
-      await openProject(next.worktree, true)
+          (navigated) => {
-    }
+            if (id !== token) return
-  })
+            if (navigated) return
            setState("routing", false)
          },
          () => {
            if (id !== token) return
            setState("routing", false)
          },
        )
      },
    ),
  )
  const workspaceName = (directory: string, projectId?: string, branch?: string) => {
    const key = workspaceKey(directory)
@@ -630,7 +636,7 @@ export default function Layout(props: ParentProps) {
    const activeDir = currentDir()
    return workspaceIds(project).filter((directory) => {
      const expanded = store.workspaceExpanded[directory] ?? directory === project.worktree
-      const active = workspaceKey(directory) === workspaceKey(activeDir)
+      const active = directory === activeDir
      return expanded || active
    })
  })
@@ -641,11 +647,7 @@ export default function Layout(props: ParentProps) {
    const projects = layout.projects.list()
    for (const [directory, expanded] of Object.entries(store.workspaceExpanded)) {
      if (!expanded) continue
-      const key = workspaceKey(directory)
+      const project = projects.find((item) => item.worktree === directory || item.sandboxes?.includes(directory))
      const project = projects.find(
        (item) =>
          workspaceKey(item.worktree) === key || item.sandboxes?.some((sandbox) => workspaceKey(sandbox) === key),
      )
      if (!project) continue
      if (project.vcs === "git" && layout.sidebar.workspaces(project.worktree)()) continue
      setStore("workspaceExpanded", directory, false)
@@ -697,7 +699,7 @@ export default function Layout(props: ParentProps) {
      seen: lru,
      keep: sessionID,
      limit: PREFETCH_MAX_SESSIONS_PER_DIR,
-      preserve: params.id && workspaceKey(directory) === workspaceKey(currentDir()) ? [params.id] : undefined,
+      preserve: directory === params.dir && params.id ? [params.id] : undefined,
    })
  }
@@ -710,7 +712,7 @@ export default function Layout(props: ParentProps) {
  })
  createEffect(() => {
-    route()
+    params.dir
    globalSDK.url
    prefetchToken.value += 1
@@ -936,26 +938,6 @@ export default function Layout(props: ParentProps) {
    navigateToSession(session)
  }
  function navigateProjectByOffset(offset: number) {
    const projects = layout.projects.list()
    if (projects.length === 0) return
    const current = currentProject()?.worktree
    const fallback = currentDir() ? projectRoot(currentDir()) : undefined
    const active = current ?? fallback
    const index = active ? projects.findIndex((project) => project.worktree === active) : -1
    const target =
      index === -1
        ? offset > 0
          ? projects[0]
          : projects[projects.length - 1]
        : projects[(index + offset + projects.length) % projects.length]
    if (!target) return
    openProject(target.worktree)
  }
  function navigateSessionByUnseen(offset: number) {
    const sessions = currentSessions()
    if (sessions.length === 0) return
@@ -1022,20 +1004,6 @@ export default function Layout(props: ParentProps) {
        keybind: "mod+o",
        onSelect: () => chooseProject(),
      },
      {
        id: "project.previous",
        title: language.t("command.project.previous"),
        category: language.t("command.category.project"),
        keybind: "mod+alt+arrowup",
        onSelect: () => navigateProjectByOffset(-1),
      },
      {
        id: "project.next",
        title: language.t("command.project.next"),
        category: language.t("command.category.project"),
        keybind: "mod+alt+arrowdown",
        onSelect: () => navigateProjectByOffset(1),
      },
      {
        id: "provider.connect",
        title: language.t("command.provider.connect"),
@@ -1204,17 +1172,13 @@ export default function Layout(props: ParentProps) {
  }
  function projectRoot(directory: string) {
    const key = workspaceKey(directory)
    const project = layout.projects
      .list()
-      .find(
+      .find((item) => item.worktree === directory || item.sandboxes?.includes(directory))
        (item) =>
          workspaceKey(item.worktree) === key || item.sandboxes?.some((sandbox) => workspaceKey(sandbox) === key),
      )
    if (project) return project.worktree
    const known = Object.entries(store.workspaceOrder).find(
-      ([root, dirs]) => workspaceKey(root) === key || dirs.some((item) => workspaceKey(item) === key),
+      ([root, dirs]) => root === directory || dirs.includes(directory),
    )
    if (known) return known[0]
@@ -1230,6 +1194,13 @@ export default function Layout(props: ParentProps) {
    return currentProject()?.worktree ?? projectRoot(directory)
  }
  function touchProjectRoute() {
    const root = currentProject()?.worktree
    if (!root) return
    if (server.projects.last() !== root) server.projects.touch(root)
    return root
  }
  function rememberSessionRoute(directory: string, id: string, root = activeProjectRoot(directory)) {
    setStore("lastProjectSession", root, { directory, id, at: Date.now() })
    return root
@@ -1256,14 +1227,19 @@ export default function Layout(props: ParentProps) {
    return root
  }
-  async function navigateToProject(directory: string | undefined) {
+  async function navigateToProject(directory: string | undefined, live = () => true) {
-    if (!directory) return
+    if (!directory || !live()) return false
    const root = projectRoot(directory)
-    server.projects.touch(root)
+    const touch = () => {
      if (!live()) return false
      layout.projects.open(root)
      server.projects.touch(root)
      return true
    }
    const project = layout.projects.list().find((item) => item.worktree === root)
-    let dirs = project
+    const sandboxes =
-      ? effectiveWorkspaceOrder(root, [root, ...(project.sandboxes ?? [])], store.workspaceOrder[root])
+      project?.sandboxes ?? globalSync.data.project.find((item) => item.worktree === root)?.sandboxes ?? []
-      : [root]
+    let dirs = effectiveWorkspaceOrder(root, [root, ...sandboxes], store.workspaceOrder[root])
    const canOpen = (value: string | undefined) => {
      if (!value) return false
      return dirs.some((item) => workspaceKey(item) === workspaceKey(value))
@@ -1274,13 +1250,16 @@ export default function Layout(props: ParentProps) {
        .list({ directory: root })
        .then((x) => x.data ?? [])
        .catch(() => [] as string[])
      if (!live()) return false
      dirs = effectiveWorkspaceOrder(root, [root, ...listed], store.workspaceOrder[root])
      return canOpen(target)
    }
    const openSession = async (target: { directory: string; id: string }) => {
      if (!live()) return false
      if (!canOpen(target.directory)) return false
      const [data] = globalSync.child(target.directory, { bootstrap: false })
      if (data.session.some((item) => item.id === target.id)) {
        if (!touch()) return false
        setStore("lastProjectSession", root, { directory: target.directory, id: target.id, at: Date.now() })
        navigateWithSidebarReset(`/${base64Encode(target.directory)}/session/${target.id}`)
        return true
@@ -1289,8 +1268,10 @@ export default function Layout(props: ParentProps) {
        .get({ sessionID: target.id })
        .then((x) => x.data)
        .catch(() => undefined)
      if (!live()) return false
      if (!resolved?.directory) return false
      if (!canOpen(resolved.directory)) return false
      if (!touch()) return false
      setStore("lastProjectSession", root, { directory: resolved.directory, id: resolved.id, at: Date.now() })
      navigateWithSidebarReset(`/${base64Encode(resolved.directory)}/session/${resolved.id}`)
      return true
@@ -1299,19 +1280,23 @@ export default function Layout(props: ParentProps) {
    const projectSession = store.lastProjectSession[root]
    if (projectSession?.id) {
      await refreshDirs(projectSession.directory)
      if (!live()) return false
      const opened = await openSession(projectSession)
-      if (opened) return
+      if (opened) return true
      if (!live()) return false
      clearLastProjectSession(root)
    }
    if (!live()) return false
    const latest = latestRootSession(
      dirs.map((item) => globalSync.child(item, { bootstrap: false })[0]),
      Date.now(),
    )
    if (latest && (await openSession(latest))) {
-      return
+      return true
    }
    if (!live()) return false
    const fetched = latestRootSession(
      await Promise.all(
        dirs.map(async (item) => ({
@@ -1324,11 +1309,14 @@ export default function Layout(props: ParentProps) {
      ),
      Date.now(),
    )
    if (!live()) return false
    if (fetched && (await openSession(fetched))) {
-      return
+      return true
    }
    if (!touch()) return false
    navigateWithSidebarReset(`/${base64Encode(root)}/session`)
    return true
  }
  function navigateToSession(session: Session | undefined) {
@@ -1338,7 +1326,7 @@ export default function Layout(props: ParentProps) {
  function openProject(directory: string, navigate = true) {
    layout.projects.open(directory)
-    if (navigate) return navigateToProject(directory)
+    if (navigate) navigateToProject(directory)
  }
  const handleDeepLinks = (urls: string[]) => {
@@ -1393,9 +1381,8 @@ export default function Layout(props: ParentProps) {
  function closeProject(directory: string) {
    const list = layout.projects.list()
-    const key = workspaceKey(directory)
+    const index = list.findIndex((x) => x.worktree === directory)
-    const index = list.findIndex((x) => workspaceKey(x.worktree) === key)
+    const active = currentProject()?.worktree === directory
    const active = workspaceKey(currentProject()?.worktree ?? "") === key
    if (index === -1) return
    const next = list[index + 1]
@@ -1730,51 +1717,38 @@ export default function Layout(props: ParentProps) {
  const activeRoute = {
    session: "",
    sessionProject: "",
    directory: "",
  }
  createEffect(
    on(
-      () => {
+      () => [pageReady(), params.dir, params.id, currentProject()?.worktree] as const,
-        return [pageReady(), route().slug, params.id, currentProject()?.worktree, currentDir()] as const
+      ([ready, dir, id]) => {
-      },
+        if (!ready || !dir) {
      ([ready, slug, id, root, dir]) => {
        if (!ready || !slug || !dir) {
          activeRoute.session = ""
          activeRoute.sessionProject = ""
          activeRoute.directory = ""
          return
        }
        const directory = decode64(dir)
        if (!directory) return
        const root = touchProjectRoute() ?? activeProjectRoot(directory)
        if (!id) {
          activeRoute.session = ""
          activeRoute.sessionProject = ""
          activeRoute.directory = ""
          return
        }
-        const session = `${slug}/${id}`
+        const session = `${dir}/${id}`
-
+        if (session !== activeRoute.session) {
        if (!root) {
          activeRoute.session = session
-          activeRoute.directory = dir
+          activeRoute.sessionProject = syncSessionRoute(directory, id, root)
          activeRoute.sessionProject = ""
          return
        }
        if (server.projects.last() !== root) server.projects.touch(root)
        const changed = session !== activeRoute.session || dir !== activeRoute.directory
        if (changed) {
          activeRoute.session = session
          activeRoute.directory = dir
          activeRoute.sessionProject = syncSessionRoute(dir, id, root)
          return
        }
        if (root === activeRoute.sessionProject) return
-        activeRoute.directory = dir
+        activeRoute.sessionProject = rememberSessionRoute(directory, id, root)
        activeRoute.sessionProject = rememberSessionRoute(dir, id, root)
      },
    ),
  )
@@ -1838,13 +1812,8 @@ export default function Layout(props: ParentProps) {
    const local = project.worktree
    const dirs = [local, ...(project.sandboxes ?? [])]
    const active = currentProject()
-    const directory = workspaceKey(active?.worktree ?? "") === workspaceKey(project.worktree) ? currentDir() : undefined
+    const directory = active?.worktree === project.worktree ? currentDir() : undefined
-    const extra =
+    const extra = directory && directory !== local && !dirs.includes(directory) ? directory : undefined
      directory &&
      workspaceKey(directory) !== workspaceKey(local) &&
      !dirs.some((item) => workspaceKey(item) === workspaceKey(directory))
        ? directory
        : undefined
    const pending = extra ? WorktreeState.get(extra)?.status === "pending" : false
    const ordered = effectiveWorkspaceOrder(local, dirs, store.workspaceOrder[project.worktree])
@@ -1967,7 +1936,6 @@ export default function Layout(props: ParentProps) {
  const projectSidebarCtx: ProjectSidebarContext = {
    currentDir,
    currentProject,
    sidebarOpened: () => layout.sidebar.opened(),
    sidebarHovering,
    hoverProject: () => state.hoverProject,
@@ -1997,33 +1965,17 @@ export default function Layout(props: ParentProps) {
    setHoverSession,
  }
-  const SidebarPanel = (panelProps: {
+  const SidebarPanel = (panelProps: { project: LocalProject | undefined; mobile?: boolean; merged?: boolean }) => {
    project: Accessor<LocalProject | undefined>
    mobile?: boolean
    merged?: boolean
  }) => {
    const project = panelProps.project
    const merged = createMemo(() => panelProps.mobile || (panelProps.merged ?? layout.sidebar.opened()))
    const hover = createMemo(() => !panelProps.mobile && panelProps.merged === false && !layout.sidebar.opened())
    const popover = createMemo(() => !!panelProps.mobile || panelProps.merged === false || layout.sidebar.opened())
    const empty = createMemo(() => !params.dir && layout.projects.list().length === 0)
    const projectName = createMemo(() => {
-      const item = project()
+      const project = panelProps.project
-      if (!item) return ""
+      if (!project) return ""
-      return item.name || getFilename(item.worktree)
+      return project.name || getFilename(project.worktree)
    })
    const projectId = createMemo(() => project()?.id ?? "")
    const worktree = createMemo(() => project()?.worktree ?? "")
    const slug = createMemo(() => {
      const dir = worktree()
      if (!dir) return ""
      return base64Encode(dir)
    })
    const workspaces = createMemo(() => {
      const item = project()
      if (!item) return [] as string[]
      return workspaceIds(item)
    })
    const projectId = createMemo(() => panelProps.project?.id ?? "")
    const workspaces = createMemo(() => workspaceIds(panelProps.project))
    const unseenCount = createMemo(() =>
      workspaces().reduce((total, directory) => total + notification.project.unseenCount(directory), 0),
    )
@@ -2032,15 +1984,10 @@ export default function Layout(props: ParentProps) {
        .filter((directory) => notification.project.unseenCount(directory) > 0)
        .forEach((directory) => notification.project.markViewed(directory))
    const workspacesEnabled = createMemo(() => {
-      const item = project()
+      const project = panelProps.project
-      if (!item) return false
+      if (!project) return false
-      if (item.vcs !== "git") return false
+      if (project.vcs !== "git") return false
-      return layout.sidebar.workspaces(item.worktree)()
+      return layout.sidebar.workspaces(project.worktree)()
    })
    const canToggle = createMemo(() => {
      const item = project()
      if (!item) return false
      return item.vcs === "git" || layout.sidebar.workspaces(item.worktree)()
    })
    const homedir = createMemo(() => globalSync.data.path.home)
@@ -2059,216 +2006,168 @@ export default function Layout(props: ParentProps) {
          width: panelProps.mobile ? undefined : `${Math.max(Math.max(layout.sidebar.width(), 244) - 64, 0)}px`,
        }}
      >
-        <Show
+        <Show when={panelProps.project}>
-          when={project()}
+          {(p) => (
-          fallback={
+            <>
-            <Show when={empty()}>
+              <div class="shrink-0 pl-1 py-1">
-              <div class="flex-1 min-h-0 -mt-4 flex items-center justify-center px-6 pb-64 text-center">
+                <div class="group/project flex items-start justify-between gap-2 py-2 pl-2 pr-0">
-                <div class="mt-8 flex max-w-60 flex-col items-center gap-6 text-center">
+                  <div class="flex flex-col min-w-0">
-                  <div class="flex flex-col gap-3">
+                    <InlineEditor
-                    <div class="text-14-medium text-text-strong">{language.t("sidebar.empty.title")}</div>
+                      id={`project:${projectId()}`}
-                    <div class="text-14-regular text-text-base" style={{ "line-height": "var(--line-height-normal)" }}>
+                      value={projectName}
-                      {language.t("sidebar.empty.description")}
+                      onSave={(next) => renameProject(p(), next)}
-                    </div>
+                      class="text-14-medium text-text-strong truncate"
-                  </div>
+                      displayClass="text-14-medium text-text-strong truncate"
-                  <Button size="large" icon="folder-add-left" onClick={chooseProject}>
+                      stopPropagation
-                    {language.t("command.project.open")}
+                    />
                  </Button>
                </div>
              </div>
            </Show>
          }
        >
          <>
            <div class="shrink-0 pl-1 py-1">
              <div class="group/project flex items-start justify-between gap-2 py-2 pl-2 pr-0">
                <div class="flex flex-col min-w-0">
                  <InlineEditor
                    id={`project:${projectId()}`}
                    value={projectName}
                    onSave={(next) => {
                      const item = project()
                      if (!item) return
                      renameProject(item, next)
                    }}
                    class="text-14-medium text-text-strong truncate"
                    displayClass="text-14-medium text-text-strong truncate"
                    stopPropagation
                  />
-                  <Tooltip
+                    <Tooltip
-                    placement="bottom"
+                      placement="bottom"
-                    gutter={2}
+                      gutter={2}
-                    value={worktree()}
+                      value={p().worktree}
-                    class="shrink-0"
+                      class="shrink-0"
-                    contentStyle={{
+                      contentStyle={{
-                      "max-width": "640px",
+                        "max-width": "640px",
-                      transform: "translate3d(52px, 0, 0)",
+                        transform: "translate3d(52px, 0, 0)",
                    }}
                  >
                    <span class="text-12-regular text-text-base truncate select-text">
                      {worktree().replace(homedir(), "~")}
                    </span>
                  </Tooltip>
                </div>
                <DropdownMenu modal={!sidebarHovering()}>
                  <DropdownMenu.Trigger
                    as={IconButton}
                    icon="dot-grid"
                    variant="ghost"
                    data-action="project-menu"
                    data-project={slug()}
                    class="shrink-0 size-6 rounded-md data-[expanded]:bg-surface-base-active"
                    classList={{
                      "opacity-0 group-hover/project:opacity-100 data-[expanded]:opacity-100": !panelProps.mobile,
                    }}
                    aria-label={language.t("common.moreOptions")}
                  />
                  <DropdownMenu.Portal>
                    <DropdownMenu.Content class="mt-1">
                      <DropdownMenu.Item
                        onSelect={() => {
                          const item = project()
                          if (!item) return
                          showEditProjectDialog(item)
                        }}
                      >
                        <DropdownMenu.ItemLabel>{language.t("common.edit")}</DropdownMenu.ItemLabel>
                      </DropdownMenu.Item>
                      <DropdownMenu.Item
                        data-action="project-workspaces-toggle"
                        data-project={slug()}
                        disabled={!canToggle()}
                        onSelect={() => {
                          const item = project()
                          if (!item) return
                          toggleProjectWorkspaces(item)
                        }}
                      >
                        <DropdownMenu.ItemLabel>
                          {workspacesEnabled()
                            ? language.t("sidebar.workspaces.disable")
                            : language.t("sidebar.workspaces.enable")}
                        </DropdownMenu.ItemLabel>
                      </DropdownMenu.Item>
                      <DropdownMenu.Item
                        data-action="project-clear-notifications"
                        data-project={slug()}
                        disabled={unseenCount() === 0}
                        onSelect={clearNotifications}
                      >
                        <DropdownMenu.ItemLabel>
                          {language.t("sidebar.project.clearNotifications")}
                        </DropdownMenu.ItemLabel>
                      </DropdownMenu.Item>
                      <DropdownMenu.Separator />
                      <DropdownMenu.Item
                        data-action="project-close-menu"
                        data-project={slug()}
                        onSelect={() => {
                          const dir = worktree()
                          if (!dir) return
                          closeProject(dir)
                        }}
                      >
                        <DropdownMenu.ItemLabel>{language.t("common.close")}</DropdownMenu.ItemLabel>
                      </DropdownMenu.Item>
                    </DropdownMenu.Content>
                  </DropdownMenu.Portal>
                </DropdownMenu>
              </div>
            </div>
            <div class="flex-1 min-h-0 flex flex-col">
              <Show
                when={workspacesEnabled()}
                fallback={
                  <>
                    <div class="shrink-0 py-4">
                      <Button
                        size="large"
                        icon="new-session"
                        class="w-full"
                        onClick={() => {
                          const dir = worktree()
                          if (!dir) return
                          navigateWithSidebarReset(`/${base64Encode(dir)}/session`)
                        }}
                      >
                        {language.t("command.session.new")}
                      </Button>
                    </div>
                    <div class="flex-1 min-h-0">
                      <LocalWorkspace
                        ctx={workspaceSidebarCtx}
                        project={project()!}
                        sortNow={sortNow}
                        mobile={panelProps.mobile}
                        popover={popover()}
                      />
                    </div>
                  </>
                }
              >
                <>
                  <div class="shrink-0 py-4">
                    <Button
                      size="large"
                      icon="plus-small"
                      class="w-full"
                      onClick={() => {
                        const item = project()
                        if (!item) return
                        createWorkspace(item)
                      }}
                    >
-                      {language.t("workspace.new")}
+                      <span class="text-12-regular text-text-base truncate select-text">
-                    </Button>
+                        {p().worktree.replace(homedir(), "~")}
                      </span>
                    </Tooltip>
                  </div>
-                  <div class="relative flex-1 min-h-0">
+
-                    <DragDropProvider
+                  <DropdownMenu modal={!sidebarHovering()}>
-                      onDragStart={handleWorkspaceDragStart}
+                    <DropdownMenu.Trigger
-                      onDragEnd={handleWorkspaceDragEnd}
+                      as={IconButton}
-                      onDragOver={handleWorkspaceDragOver}
+                      icon="dot-grid"
-                      collisionDetector={closestCenter}
+                      variant="ghost"
-                    >
+                      data-action="project-menu"
-                      <DragDropSensors />
+                      data-project={base64Encode(p().worktree)}
-                      <ConstrainDragXAxis />
+                      class="shrink-0 size-6 rounded-md data-[expanded]:bg-surface-base-active"
-                      <div
+                      classList={{
-                        ref={(el) => {
+                        "opacity-0 group-hover/project:opacity-100 data-[expanded]:opacity-100": !panelProps.mobile,
-                          if (!panelProps.mobile) scrollContainerRef = el
+                      }}
-                        }}
+                      aria-label={language.t("common.moreOptions")}
-                        class="size-full flex flex-col py-2 gap-4 overflow-y-auto no-scrollbar [overflow-anchor:none]"
+                    />
-                      >
+                    <DropdownMenu.Portal>
-                        <SortableProvider ids={workspaces()}>
+                      <DropdownMenu.Content class="mt-1">
-                          <For each={workspaces()}>
+                        <DropdownMenu.Item onSelect={() => showEditProjectDialog(p())}>
-                            {(directory) => (
+                          <DropdownMenu.ItemLabel>{language.t("common.edit")}</DropdownMenu.ItemLabel>
-                              <SortableWorkspace
+                        </DropdownMenu.Item>
-                                ctx={workspaceSidebarCtx}
+                        <DropdownMenu.Item
-                                directory={directory}
+                          data-action="project-workspaces-toggle"
-                                project={project()!}
+                          data-project={base64Encode(p().worktree)}
-                                sortNow={sortNow}
+                          disabled={p().vcs !== "git" && !layout.sidebar.workspaces(p().worktree)()}
-                                mobile={panelProps.mobile}
+                          onSelect={() => toggleProjectWorkspaces(p())}
-                                popover={popover()}
+                        >
-                              />
+                          <DropdownMenu.ItemLabel>
-                            )}
+                            {layout.sidebar.workspaces(p().worktree)()
-                          </For>
+                              ? language.t("sidebar.workspaces.disable")
-                        </SortableProvider>
+                              : language.t("sidebar.workspaces.enable")}
                          </DropdownMenu.ItemLabel>
                        </DropdownMenu.Item>
                        <DropdownMenu.Item
                          data-action="project-clear-notifications"
                          data-project={base64Encode(p().worktree)}
                          disabled={unseenCount() === 0}
                          onSelect={clearNotifications}
                        >
                          <DropdownMenu.ItemLabel>
                            {language.t("sidebar.project.clearNotifications")}
                          </DropdownMenu.ItemLabel>
                        </DropdownMenu.Item>
                        <DropdownMenu.Separator />
                        <DropdownMenu.Item
                          data-action="project-close-menu"
                          data-project={base64Encode(p().worktree)}
                          onSelect={() => closeProject(p().worktree)}
                        >
                          <DropdownMenu.ItemLabel>{language.t("common.close")}</DropdownMenu.ItemLabel>
                        </DropdownMenu.Item>
                      </DropdownMenu.Content>
                    </DropdownMenu.Portal>
                  </DropdownMenu>
                </div>
              </div>
              <div class="flex-1 min-h-0 flex flex-col">
                <Show
                  when={workspacesEnabled()}
                  fallback={
                    <>
                      <div class="shrink-0 py-4">
                        <Button
                          size="large"
                          icon="plus-small"
                          class="w-full"
                          onClick={() => navigateWithSidebarReset(`/${base64Encode(p().worktree)}/session`)}
                        >
                          {language.t("command.session.new")}
                        </Button>
                      </div>
-                      <DragOverlay>
+                      <div class="flex-1 min-h-0">
-                        <WorkspaceDragOverlay
+                        <LocalWorkspace
-                          sidebarProject={sidebarProject}
+                          ctx={workspaceSidebarCtx}
-                          activeWorkspace={() => store.activeWorkspace}
+                          project={p()}
-                          workspaceLabel={workspaceLabel}
+                          sortNow={sortNow}
                          mobile={panelProps.mobile}
                          popover={popover()}
                        />
-                      </DragOverlay>
+                      </div>
-                    </DragDropProvider>
+                    </>
-                  </div>
+                  }
-                </>
+                >
-              </Show>
+                  <>
-            </div>
+                    <div class="shrink-0 py-4">
-          </>
+                      <Button size="large" icon="plus-small" class="w-full" onClick={() => createWorkspace(p())}>
                        {language.t("workspace.new")}
                      </Button>
                    </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
                                  ctx={workspaceSidebarCtx}
                                  directory={directory}
                                  project={p()}
                                  sortNow={sortNow}
                                  mobile={panelProps.mobile}
                                  popover={popover()}
                                />
                              )}
                            </For>
                          </SortableProvider>
                        </div>
                        <DragOverlay>
                          <WorkspaceDragOverlay
                            sidebarProject={sidebarProject}
                            activeWorkspace={() => store.activeWorkspace}
                            workspaceLabel={workspaceLabel}
                          />
                        </DragOverlay>
                      </DragDropProvider>
                    </div>
                  </>
                </Show>
              </div>
            </>
          )}
        </Show>
        <div
@@ -2327,7 +2226,13 @@ export default function Layout(props: ParentProps) {
      helpLabel={() => language.t("sidebar.help")}
      onOpenHelp={() => platform.openLink("https://opencode.ai/desktop-feedback")}
      renderPanel={() =>
-        mobile ? <SidebarPanel project={currentProject} mobile /> : <SidebarPanel project={currentProject} merged />
+        mobile ? (
          <SidebarPanel project={currentProject()} mobile />
        ) : (
          <Show when={currentProject()}>
            <SidebarPanel project={currentProject()} merged />
          </Show>
        )
      }
    />
  )
@@ -2428,7 +2333,7 @@ export default function Layout(props: ParentProps) {
                  "size-full overflow-x-hidden flex flex-col items-start contain-strict border-t border-border-weak-base bg-background-base xl:border-l xl:rounded-tl-[12px]": true,
                }}
              >
-                <Show when={!autoselecting.loading} fallback={<div class="size-full" />}>
+                <Show when={!autoselecting()} fallback={<div class="size-full" />}>
                  {props.children}
                </Show>
              </main>
@@ -2453,8 +2358,8 @@ export default function Layout(props: ParentProps) {
                arm()
              }}
            >
-              <Show when={peekProject()}>
+              <Show when={state.peek}>
-                <SidebarPanel project={peekProject} merged={false} />
+                <SidebarPanel project={state.peek} merged={false} />
              </Show>
            </div>
@@ -104,14 +104,14 @@ describe("layout deep links", () => {
 describe("layout workspace helpers", () => {
  test("normalizes trailing slash in workspace key", () => {
    expect(workspaceKey("/tmp/demo///")).toBe("/tmp/demo")
-    expect(workspaceKey("C:\\tmp\\demo\\\\")).toBe("C:/tmp/demo")
+    expect(workspaceKey("C:\\tmp\\demo\\\\")).toBe("C:\\tmp\\demo")
  })
  test("preserves posix and drive roots in workspace key", () => {
    expect(workspaceKey("/")).toBe("/")
    expect(workspaceKey("///")).toBe("/")
-    expect(workspaceKey("C:\\")).toBe("C:/")
+    expect(workspaceKey("C:\\")).toBe("C:\\")
-    expect(workspaceKey("C://")).toBe("C:/")
+    expect(workspaceKey("C:\\\\\\")).toBe("C:\\")
    expect(workspaceKey("C:///")).toBe("C:/")
  })
@@ -1,17 +1,11 @@
 import { getFilename } from "@opencode-ai/util/path"
 import { type Session } from "@opencode-ai/sdk/v2/client"
 type SessionStore = {
  session?: Session[]
  path: { directory: string }
 }
 export const workspaceKey = (directory: string) => {
-  const value = directory.replaceAll("\\", "/")
+  const drive = directory.match(/^([A-Za-z]:)[\\/]+$/)
-  const drive = value.match(/^([A-Za-z]:)\/+$/)
+  if (drive) return `${drive[1]}${directory.includes("\\") ? "\\" : "/"}`
-  if (drive) return `${drive[1]}/`
+  if (/^[\\/]+$/.test(directory)) return directory.includes("\\") ? "\\" : "/"
-  if (/^\/+$/i.test(value)) return "/"
+  return directory.replace(/[\\/]+$/, "")
  return value.replace(/\/+$/, "")
 }
 function sortSessions(now: number) {
@@ -31,24 +25,24 @@ function sortSessions(now: number) {
 const isRootVisibleSession = (session: Session, directory: string) =>
  workspaceKey(session.directory) === workspaceKey(directory) && !session.parentID && !session.time?.archived
-const roots = (store: SessionStore) =>
+export const sortedRootSessions = (store: { session: Session[]; path: { directory: string } }, now: number) =>
-  (store.session ?? []).filter((session) => isRootVisibleSession(session, store.path.directory))
+  store.session.filter((session) => isRootVisibleSession(session, store.path.directory)).sort(sortSessions(now))
-export const sortedRootSessions = (store: SessionStore, now: number) => roots(store).sort(sortSessions(now))
+export const latestRootSession = (stores: { session: Session[]; path: { directory: string } }[], now: number) =>
-
+  stores
-export const latestRootSession = (stores: SessionStore[], now: number) =>
+    .flatMap((store) => store.session.filter((session) => isRootVisibleSession(session, store.path.directory)))
-  stores.flatMap(roots).sort(sortSessions(now))[0]
+    .sort(sortSessions(now))[0]
 export function hasProjectPermissions<T>(
-  request: Record<string, T[] | undefined> | undefined,
+  request: Record<string, T[] | undefined>,
  include: (item: T) => boolean = () => true,
 ) {
-  return Object.values(request ?? {}).some((list) => list?.some(include))
+  return Object.values(request).some((list) => list?.some(include))
 }
-export const childMapByParent = (sessions: Session[] | undefined) => {
+export const childMapByParent = (sessions: Session[]) => {
  const map = new Map<string, string[]>()
-  for (const session of sessions ?? []) {
+  for (const session of sessions) {
    if (!session.parentID) continue
    const existing = map.get(session.parentID)
    if (existing) {
@@ -9,13 +9,14 @@ import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { base64Encode } from "@opencode-ai/util/encode"
 import { getFilename } from "@opencode-ai/util/path"
 import { A, useNavigate, useParams } from "@solidjs/router"
-import { type Accessor, createMemo, For, type JSX, Match, onCleanup, Show, Switch } from "solid-js"
+import { type Accessor, createEffect, createMemo, For, type JSX, on, onCleanup, Show } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useGlobalSync } from "@/context/global-sync"
 import { useLanguage } from "@/context/language"
 import { getAvatarColors, type LocalProject, useLayout } from "@/context/layout"
 import { useNotification } from "@/context/notification"
 import { usePermission } from "@/context/permission"
-import { messageAgentColor } from "@/utils/agent"
+import { agentColor } from "@/utils/agent"
 import { sessionPermissionRequest } from "../session/composer/session-request-tree"
 import { hasProjectPermissions } from "./helpers"
@@ -101,46 +102,94 @@ const SessionRow = (props: {
  warmPress: () => void
  warmFocus: () => void
  cancelHoverPrefetch: () => void
-}): JSX.Element => (
+}): JSX.Element => {
-  <A
+  const [slot, setSlot] = createStore({
-    href={`/${props.slug}/session/${props.session.id}`}
+    open: false,
-    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"}`}
+    show: false,
-    onPointerDown={props.warmPress}
+    fade: false,
-    onPointerEnter={props.warmHover}
+  })
-    onPointerLeave={props.cancelHoverPrefetch}
+
-    onFocus={props.warmFocus}
+  let f: number | undefined
-    onClick={() => {
+  const clear = () => {
-      props.setHoverSession(undefined)
+    if (f !== undefined) window.clearTimeout(f)
-      if (props.sidebarOpened()) return
+    f = undefined
-      props.clearHoverProjectSoon()
+  }
-    }}
+
-  >
+  onCleanup(clear)
-    <div class="flex items-center gap-1 w-full">
+  createEffect(
-      <div
+    on(
-        class="shrink-0 size-6 flex items-center justify-center"
+      () => props.isWorking(),
-        style={{ color: props.tint() ?? "var(--icon-interactive-base)" }}
+      (on, prev) => {
-      >
+        clear()
-        <Switch fallback={<Icon name="dash" size="small" class="text-icon-weak" />}>
+        if (on) {
-          <Match when={props.isWorking()}>
+          setSlot({ open: true, show: true, fade: false })
-            <Spinner class="size-[15px]" />
+          return
-          </Match>
+        }
-          <Match when={props.hasPermissions()}>
+        if (prev) {
-            <div class="size-1.5 rounded-full bg-surface-warning-strong" />
+          setSlot({ open: false, show: true, fade: true })
-          </Match>
+          f = window.setTimeout(() => setSlot({ show: false, fade: false }), 260)
-          <Match when={props.hasError()}>
+          return
-            <div class="size-1.5 rounded-full bg-text-diff-delete-base" />
+        }
-          </Match>
+        setSlot({ open: false, show: false, fade: false })
-          <Match when={props.unseenCount() > 0}>
+      },
-            <div class="size-1.5 rounded-full bg-text-interactive-base" />
+      { defer: true },
-          </Match>
+    ),
-        </Switch>
+  )
  return (
    <A
      href={`/${props.slug}/session/${props.session.id}`}
      class={`relative flex items-center 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"}`}
      onPointerDown={props.warmPress}
      onPointerEnter={props.warmHover}
      onPointerLeave={props.cancelHoverPrefetch}
      onFocus={props.warmFocus}
      onClick={() => {
        props.setHoverSession(undefined)
        if (props.sidebarOpened()) return
        props.clearHoverProjectSoon()
      }}
    >
      <Show when={!props.isWorking() && (props.hasPermissions() || props.hasError() || props.unseenCount() > 0)}>
        <div
          classList={{
            "absolute left-0 top-1/2 -translate-y-1/2 size-1.5 rounded-full": true,
            "bg-surface-warning-strong": props.hasPermissions(),
            "bg-text-diff-delete-base": !props.hasPermissions() && props.hasError(),
            "bg-text-interactive-base": !props.hasPermissions() && !props.hasError() && props.unseenCount() > 0,
          }}
          aria-hidden="true"
        />
      </Show>
      <div class="flex items-center min-w-0 grow-1">
        <div
          class="shrink-0 flex items-center justify-center overflow-hidden transition-[width,margin] duration-300 ease-[cubic-bezier(0.22,1,0.36,1)]"
          style={{
            width: slot.open ? "16px" : "0px",
            "margin-right": slot.open ? "8px" : "0px",
          }}
          aria-hidden="true"
        >
          <Show when={slot.show}>
            <div
              class="transition-opacity duration-200 ease-out"
              classList={{
                "opacity-0": slot.fade,
              }}
            >
              <Spinner class="size-4" style={{ color: props.tint() ?? "var(--icon-interactive-base)" }} />
            </div>
          </Show>
        </div>
        <span class="text-14-regular text-text-strong grow-1 min-w-0 overflow-hidden text-ellipsis truncate">
          {props.session.title}
        </span>
      </div>
-      <span class="text-14-regular text-text-strong grow-1 min-w-0 overflow-hidden text-ellipsis truncate">
+    </A>
-        {props.session.title}
+  )
-      </span>
+}
    </div>
  </A>
 )
 const SessionHoverPreview = (props: {
  mobile?: boolean
@@ -219,7 +268,19 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
  })
  const tint = createMemo(() => {
-    return messageAgentColor(sessionStore.message[props.session.id], sessionStore.agent)
+    const messages = sessionStore.message[props.session.id]
    if (!messages) return undefined
    let user: Message | undefined
    for (let i = messages.length - 1; i >= 0; i--) {
      const message = messages[i]
      if (message.role !== "user") continue
      user = message
      break
    }
    if (!user?.agent) return undefined
    const agent = sessionStore.agent.find((a) => a.name === user.agent)
    return agentColor(user.agent, agent?.color)
  })
  const hoverMessages = createMemo(() =>
@@ -298,7 +359,7 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
  return (
    <div
      data-session-id={props.session.id}
-      class="group/session relative w-full rounded-md cursor-default pl-2 pr-3 transition-colors
+      class="group/session relative w-full rounded-md cursor-default pl-3 pr-3 transition-colors
             hover:bg-surface-raised-base-hover [&:has(:focus-visible)]:bg-surface-raised-base-hover has-[[data-expanded]]:bg-surface-raised-base-hover has-[.active]:bg-surface-base-active"
    >
      <Show
@@ -384,7 +445,7 @@ export const NewSessionItem = (props: {
    >
      <div class="flex items-center gap-1 w-full">
        <div class="shrink-0 size-6 flex items-center justify-center">
-          <Icon name="new-session" size="small" class="text-icon-weak" />
+          <Icon name="plus-small" size="small" class="text-icon-weak" />
        </div>
        <span class="text-14-regular text-text-strong grow-1 min-w-0 overflow-hidden text-ellipsis truncate">
          {label}
@@ -15,7 +15,6 @@ import { childMapByParent, displayName, sortedRootSessions } from "./helpers"
 export type ProjectSidebarContext = {
  currentDir: Accessor<string>
  currentProject: Accessor<LocalProject | undefined>
  sidebarOpened: Accessor<boolean>
  sidebarHovering: Accessor<boolean>
  hoverProject: Accessor<string | undefined>
@@ -279,7 +278,11 @@ export const SortableProject = (props: {
  const globalSync = useGlobalSync()
  const language = useLanguage()
  const sortable = createSortable(props.project.worktree)
-  const selected = createMemo(() => props.ctx.currentProject()?.worktree === props.project.worktree)
+  const selected = createMemo(
    () =>
      props.project.worktree === props.ctx.currentDir() ||
      props.project.sandboxes?.includes(props.ctx.currentDir()) === true,
  )
  const workspaces = createMemo(() => props.ctx.workspaceIds(props.project).slice(0, 2))
  const workspaceEnabled = createMemo(() => props.ctx.workspacesEnabled(props.project))
  const dirs = createMemo(() => props.ctx.workspaceIds(props.project))
@@ -17,7 +17,7 @@ import { type LocalProject } from "@/context/layout"
 import { useGlobalSync } from "@/context/global-sync"
 import { useLanguage } from "@/context/language"
 import { NewSessionItem, SessionItem, SessionSkeleton } from "./sidebar-items"
-import { childMapByParent, sortedRootSessions, workspaceKey } from "./helpers"
+import { childMapByParent, sortedRootSessions } from "./helpers"
 type InlineEditorComponent = (props: {
  id: string
@@ -217,7 +217,7 @@ const WorkspaceActions = (props: {
    <Show when={!props.touch()}>
      <Tooltip value={props.language.t("command.session.new")} placement="top">
        <IconButton
-          icon="new-session"
+          icon="plus-small"
          variant="ghost"
          class="size-6 rounded-md opacity-0 pointer-events-none group-hover/workspace:opacity-100 group-hover/workspace:pointer-events-auto group-focus-within/workspace:opacity-100 group-focus-within/workspace:pointer-events-auto"
          data-action="workspace-new-session"
@@ -323,7 +323,7 @@ export const SortableWorkspace = (props: {
  const sessions = createMemo(() => sortedRootSessions(workspaceStore, props.sortNow()))
  const children = createMemo(() => childMapByParent(workspaceStore.session))
  const local = createMemo(() => props.directory === props.project.worktree)
-  const active = createMemo(() => workspaceKey(props.ctx.currentDir()) === workspaceKey(props.directory))
+  const active = createMemo(() => props.ctx.currentDir() === props.directory)
  const workspaceValue = createMemo(() => {
    const branch = workspaceStore.vcs?.branch
    const name = branch ?? getFilename(props.directory)
@@ -332,13 +332,12 @@ export const SortableWorkspace = (props: {
  const open = createMemo(() => props.ctx.workspaceExpanded(props.directory, local()))
  const boot = createMemo(() => open() || active())
  const booted = createMemo((prev) => prev || workspaceStore.status === "complete", false)
-  const count = createMemo(() => sessions()?.length ?? 0)
+  const hasMore = createMemo(() => workspaceStore.sessionTotal > sessions().length)
  const hasMore = createMemo(() => workspaceStore.sessionTotal > count())
  const busy = createMemo(() => props.ctx.isBusy(props.directory))
  const wasBusy = createMemo((prev) => prev || busy(), false)
-  const loading = createMemo(() => open() && !booted() && count() === 0 && !wasBusy())
+  const loading = createMemo(() => open() && !booted() && sessions().length === 0 && !wasBusy())
  const touch = createMediaQuery("(hover: none)")
-  const showNew = createMemo(() => !loading() && (touch() || count() === 0 || (active() && !params.id)))
+  const showNew = createMemo(() => !loading() && (touch() || sessions().length === 0 || (active() && !params.id)))
  const loadMore = async () => {
    setWorkspaceStore("limit", (limit) => (limit ?? 0) + 5)
    await globalSync.project.loadSessions(props.directory)
@@ -473,9 +472,8 @@ export const LocalWorkspace = (props: {
  const sessions = createMemo(() => sortedRootSessions(workspace().store, props.sortNow()))
  const children = createMemo(() => childMapByParent(workspace().store.session))
  const booted = createMemo((prev) => prev || workspace().store.status === "complete", false)
-  const count = createMemo(() => sessions()?.length ?? 0)
+  const loading = createMemo(() => !booted() && sessions().length === 0)
-  const loading = createMemo(() => !booted() && count() === 0)
+  const hasMore = createMemo(() => workspace().store.sessionTotal > sessions().length)
  const hasMore = createMemo(() => workspace().store.sessionTotal > count())
  const loadMore = async () => {
    workspace().setStore("limit", (limit) => (limit ?? 0) + 5)
    await globalSync.project.loadSessions(props.project.worktree)
@@ -1,6 +1,5 @@
 import type { Project, UserMessage } from "@opencode-ai/sdk/v2"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useMutation } from "@tanstack/solid-query"
 import {
  batch,
  onCleanup,
@@ -45,7 +44,7 @@ import { createOpenReviewFile, createSessionTabs, createSizing, focusTerminalByI
 import { MessageTimeline } from "@/pages/session/message-timeline"
 import { type DiffStyle, SessionReviewTab, type SessionReviewTabProps } from "@/pages/session/review-tab"
 import { useSessionLayout } from "@/pages/session/session-layout"
-import { syncSessionModel } from "@/pages/session/session-model-helpers"
+import { resetSessionModel, syncSessionModel } from "@/pages/session/session-model-helpers"
 import { SessionSidePanel } from "@/pages/session/session-side-panel"
 import { TerminalPanel } from "@/pages/session/terminal-panel"
 import { useSessionCommands } from "@/pages/session/use-session-commands"
@@ -328,7 +327,10 @@ export default function Page() {
  })
  const [ui, setUi] = createStore({
    git: false,
    pendingMessage: undefined as string | undefined,
    restoring: undefined as string | undefined,
    reverting: false,
    reviewSnap: false,
    scrollGesture: 0,
    scroll: {
@@ -488,7 +490,7 @@ export default function Page() {
      (next, prev) => {
        if (!prev) return
        if (next.dir === prev.dir && next.id === prev.id) return
-        if (prev.id && !next.id) local.session.reset()
+        if (!next.id) resetSessionModel(local)
      },
      { defer: true },
    ),
@@ -504,6 +506,7 @@ export default function Page() {
  const [followup, setFollowup] = createStore({
    items: {} as Record<string, (FollowupDraft & { id: string })[] | undefined>,
    sending: {} as Record<string, string | undefined>,
    failed: {} as Record<string, string | undefined>,
    paused: {} as Record<string, boolean | undefined>,
    edit: {} as Record<
@@ -641,24 +644,25 @@ export default function Page() {
    globalSync.set("project", [...list, next])
  }
  const gitMutation = useMutation(() => ({
    mutationFn: () => sdk.client.project.initGit(),
    onSuccess: (x) => {
      if (!x.data) return
      upsert(x.data)
    },
    onError: (err) => {
      showToast({
        variant: "error",
        title: language.t("common.requestFailed"),
        description: formatServerError(err, language.t),
      })
    },
  }))
  function initGit() {
-    if (gitMutation.isPending) return
+    if (ui.git) return
-    gitMutation.mutate()
+    setUi("git", true)
    void sdk.client.project
      .initGit()
      .then((x) => {
        if (!x.data) return
        upsert(x.data)
      })
      .catch((err) => {
        showToast({
          variant: "error",
          title: language.t("common.requestFailed"),
          description: formatServerError(err, language.t),
        })
      })
      .finally(() => {
        setUi("git", false)
      })
  }
  let inputRef!: HTMLDivElement
@@ -957,8 +961,8 @@ export default function Page() {
              {language.t("session.review.noVcs.createGit.description")}
            </div>
          </div>
-          <Button size="large" disabled={gitMutation.isPending} onClick={initGit}>
+          <Button size="large" disabled={ui.git} onClick={initGit}>
-            {gitMutation.isPending
+            {ui.git
              ? language.t("session.review.noVcs.createGit.actionLoading")
              : language.t("session.review.noVcs.createGit.action")}
          </Button>
@@ -1375,40 +1379,10 @@ export default function Page() {
    return followup.edit[id]
  })
  const followupMutation = useMutation(() => ({
    mutationFn: async (input: { sessionID: string; id: string; manual?: boolean }) => {
      const item = (followup.items[input.sessionID] ?? []).find((entry) => entry.id === input.id)
      if (!item) return
      if (input.manual) setFollowup("paused", input.sessionID, undefined)
      setFollowup("failed", input.sessionID, undefined)
      const ok = await sendFollowupDraft({
        client: sdk.client,
        sync,
        globalSync,
        draft: item,
        optimisticBusy: item.sessionDirectory === sdk.directory,
      }).catch((err) => {
        setFollowup("failed", input.sessionID, input.id)
        fail(err)
        return false
      })
      if (!ok) return
      setFollowup("items", input.sessionID, (items) => (items ?? []).filter((entry) => entry.id !== input.id))
      if (input.manual) resumeScroll()
    },
  }))
  const followupBusy = (sessionID: string) =>
    followupMutation.isPending && followupMutation.variables?.sessionID === sessionID
  const sendingFollowup = createMemo(() => {
    const id = params.id
    if (!id) return
-    if (!followupBusy(id)) return
+    return followup.sending[id]
    return followupMutation.variables?.id
  })
  const queueEnabled = createMemo(() => {
@@ -1448,15 +1422,37 @@ export default function Page() {
  const sendFollowup = (sessionID: string, id: string, opts?: { manual?: boolean }) => {
    const item = (followup.items[sessionID] ?? []).find((entry) => entry.id === id)
    if (!item) return Promise.resolve()
-    if (followupBusy(sessionID)) return Promise.resolve()
+    if (followup.sending[sessionID]) return Promise.resolve()
-    return followupMutation.mutateAsync({ sessionID, id, manual: opts?.manual })
+    if (opts?.manual) setFollowup("paused", sessionID, undefined)
    setFollowup("sending", sessionID, id)
    setFollowup("failed", sessionID, undefined)
    return sendFollowupDraft({
      client: sdk.client,
      sync,
      globalSync,
      draft: item,
      optimisticBusy: item.sessionDirectory === sdk.directory,
    })
      .then((ok) => {
        if (ok === false) return
        setFollowup("items", sessionID, (items) => (items ?? []).filter((entry) => entry.id !== id))
        if (opts?.manual) resumeScroll()
      })
      .catch((err) => {
        setFollowup("failed", sessionID, id)
        fail(err)
      })
      .finally(() => {
        setFollowup("sending", sessionID, (value) => (value === id ? undefined : value))
      })
  }
  const editFollowup = (id: string) => {
    const sessionID = params.id
    if (!sessionID) return
-    if (followupBusy(sessionID)) return
+    if (followup.sending[sessionID]) return
    const item = queuedFollowups().find((entry) => entry.id === id)
    if (!item) return
@@ -1479,77 +1475,8 @@ export default function Page() {
  const halt = (sessionID: string) =>
    busy(sessionID) ? sdk.client.session.abort({ sessionID }).catch(() => {}) : Promise.resolve()
  const revertMutation = useMutation(() => ({
    mutationFn: async (input: { sessionID: string; messageID: string }) => {
      const prev = prompt.current().slice()
      const last = info()?.revert
      const value = draft(input.messageID)
      batch(() => {
        roll(input.sessionID, { messageID: input.messageID })
        prompt.set(value)
      })
      await halt(input.sessionID)
        .then(() => sdk.client.session.revert(input))
        .then((result) => {
          if (result.data) merge(result.data)
        })
        .catch((err) => {
          batch(() => {
            roll(input.sessionID, last)
            prompt.set(prev)
          })
          fail(err)
        })
    },
  }))
  const restoreMutation = useMutation(() => ({
    mutationFn: async (id: string) => {
      const sessionID = params.id
      if (!sessionID) return
      const next = userMessages().find((item) => item.id > id)
      const prev = prompt.current().slice()
      const last = info()?.revert
      batch(() => {
        roll(sessionID, next ? { messageID: next.id } : undefined)
        if (next) {
          prompt.set(draft(next.id))
          return
        }
        prompt.reset()
      })
      const task = !next
        ? halt(sessionID).then(() => sdk.client.session.unrevert({ sessionID }))
        : halt(sessionID).then(() =>
            sdk.client.session.revert({
              sessionID,
              messageID: next.id,
            }),
          )
      await task
        .then((result) => {
          if (result.data) merge(result.data)
        })
        .catch((err) => {
          batch(() => {
            roll(sessionID, last)
            prompt.set(prev)
          })
          fail(err)
        })
    },
  }))
  const reverting = createMemo(() => revertMutation.isPending || restoreMutation.isPending)
  const restoring = createMemo(() => (restoreMutation.isPending ? restoreMutation.variables : undefined))
  const fork = (input: { sessionID: string; messageID: string }) => {
    const value = draft(input.messageID)
    const dir = base64Encode(sdk.directory)
    return sdk.client.session
      .fork(input)
      .then((result) => {
@@ -1561,20 +1488,86 @@ export default function Page() {
          })
          return
        }
-        prompt.set(value, undefined, { dir, id: next.id })
+        navigate(`/${base64Encode(sdk.directory)}/session/${next.id}`)
-        navigate(`/${dir}/session/${next.id}`)
+        requestAnimationFrame(() => {
          prompt.set(value)
        })
      })
      .catch(fail)
  }
  const revert = (input: { sessionID: string; messageID: string }) => {
-    if (reverting()) return
+    if (ui.reverting || ui.restoring) return
-    return revertMutation.mutateAsync(input)
+    const prev = prompt.current().slice()
    const last = info()?.revert
    const value = draft(input.messageID)
    batch(() => {
      setUi("reverting", true)
      roll(input.sessionID, { messageID: input.messageID })
      prompt.set(value)
    })
    return halt(input.sessionID)
      .then(() => sdk.client.session.revert(input))
      .then((result) => {
        if (result.data) merge(result.data)
      })
      .catch((err) => {
        batch(() => {
          roll(input.sessionID, last)
          prompt.set(prev)
        })
        fail(err)
      })
      .finally(() => {
        setUi("reverting", false)
      })
  }
  const restore = (id: string) => {
-    if (!params.id || reverting()) return
+    const sessionID = params.id
-    return restoreMutation.mutateAsync(id)
+    if (!sessionID || ui.restoring || ui.reverting) return
    const next = userMessages().find((item) => item.id > id)
    const prev = prompt.current().slice()
    const last = info()?.revert
    batch(() => {
      setUi("restoring", id)
      setUi("reverting", true)
      roll(sessionID, next ? { messageID: next.id } : undefined)
      if (next) {
        prompt.set(draft(next.id))
        return
      }
      prompt.reset()
    })
    const task = !next
      ? halt(sessionID).then(() => sdk.client.session.unrevert({ sessionID }))
      : halt(sessionID).then(() =>
          sdk.client.session.revert({
            sessionID,
            messageID: next.id,
          }),
        )
    return task
      .then((result) => {
        if (result.data) merge(result.data)
      })
      .catch((err) => {
        batch(() => {
          roll(sessionID, last)
          prompt.set(prev)
        })
        fail(err)
      })
      .finally(() => {
        batch(() => {
          setUi("restoring", (value) => (value === id ? undefined : value))
          setUi("reverting", false)
        })
      })
  }
  const rolled = createMemo(() => {
@@ -1593,7 +1586,7 @@ export default function Page() {
    const item = queuedFollowups()[0]
    if (!item) return
-    if (followupBusy(sessionID)) return
+    if (followup.sending[sessionID]) return
    if (followup.failed[sessionID] === item.id) return
    if (followup.paused[sessionID]) return
    if (composer.blocked()) return
@@ -1788,8 +1781,8 @@ export default function Page() {
              rolled().length > 0
                ? {
                    items: rolled(),
-                    restoring: restoring(),
+                    restoring: ui.restoring,
-                    disabled: reverting(),
+                    disabled: ui.reverting,
                    onRestore: restore,
                  }
                : undefined
@@ -1,6 +1,5 @@
 import { For, Show, createMemo, onCleanup, onMount, type Component } from "solid-js"
 import { createStore } from "solid-js/store"
 import { useMutation } from "@tanstack/solid-query"
 import { Button } from "@opencode-ai/ui/button"
 import { DockPrompt } from "@opencode-ai/ui/dock-prompt"
 import { Icon } from "@opencode-ai/ui/icon"
@@ -25,6 +24,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    custom: cached?.custom ?? ([] as string[]),
    customOn: cached?.customOn ?? ([] as boolean[]),
    editing: false,
    sending: false,
  })
  let root: HTMLDivElement | undefined
@@ -126,40 +126,36 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    showToast({ title: language.t("common.requestFailed"), description: message })
  }
  const replyMutation = useMutation(() => ({
    mutationFn: (answers: QuestionAnswer[]) => sdk.client.question.reply({ requestID: props.request.id, answers }),
    onMutate: () => {
      props.onSubmit()
    },
    onSuccess: () => {
      replied = true
      cache.delete(props.request.id)
    },
    onError: fail,
  }))
  const rejectMutation = useMutation(() => ({
    mutationFn: () => sdk.client.question.reject({ requestID: props.request.id }),
    onMutate: () => {
      props.onSubmit()
    },
    onSuccess: () => {
      replied = true
      cache.delete(props.request.id)
    },
    onError: fail,
  }))
  const sending = createMemo(() => replyMutation.isPending || rejectMutation.isPending)
  const reply = async (answers: QuestionAnswer[]) => {
-    if (sending()) return
+    if (store.sending) return
-    await replyMutation.mutateAsync(answers)
+
    props.onSubmit()
    setStore("sending", true)
    try {
      await sdk.client.question.reply({ requestID: props.request.id, answers })
      replied = true
      cache.delete(props.request.id)
    } catch (err) {
      fail(err)
    } finally {
      setStore("sending", false)
    }
  }
  const reject = async () => {
-    if (sending()) return
+    if (store.sending) return
-    await rejectMutation.mutateAsync()
+
    props.onSubmit()
    setStore("sending", true)
    try {
      await sdk.client.question.reject({ requestID: props.request.id })
      replied = true
      cache.delete(props.request.id)
    } catch (err) {
      fail(err)
    } finally {
      setStore("sending", false)
    }
  }
  const submit = () => void reply(questions().map((_, i) => store.answers[i] ?? []))
@@ -179,7 +175,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
  }
  const customToggle = () => {
-    if (sending()) return
+    if (store.sending) return
    if (!multi()) {
      setStore("customOn", store.tab, true)
@@ -202,14 +198,14 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
  }
  const customOpen = () => {
-    if (sending()) return
+    if (store.sending) return
    if (!on()) setStore("customOn", store.tab, true)
    setStore("editing", true)
    customUpdate(input(), true)
  }
  const selectOption = (optIndex: number) => {
-    if (sending()) return
+    if (store.sending) return
    if (optIndex === options().length) {
      customOpen()
@@ -231,7 +227,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
  }
  const next = () => {
-    if (sending()) return
+    if (store.sending) return
    if (store.editing) commitCustom()
    if (store.tab >= total() - 1) {
@@ -244,14 +240,14 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
  }
  const back = () => {
-    if (sending()) return
+    if (store.sending) return
    if (store.tab <= 0) return
    setStore("tab", store.tab - 1)
    setStore("editing", false)
  }
  const jump = (tab: number) => {
-    if (sending()) return
+    if (store.sending) return
    setStore("tab", tab)
    setStore("editing", false)
  }
@@ -274,7 +270,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
                    (store.answers[i()]?.length ?? 0) > 0 ||
                    (store.customOn[i()] === true && (store.custom[i()] ?? "").trim().length > 0)
                  }
-                  disabled={sending()}
+                  disabled={store.sending}
                  onClick={() => jump(i())}
                  aria-label={`${language.t("ui.tool.questions")} ${i() + 1}`}
                />
@@ -285,16 +281,16 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
      }
      footer={
        <>
-          <Button variant="ghost" size="large" disabled={sending()} onClick={reject}>
+          <Button variant="ghost" size="large" disabled={store.sending} onClick={reject}>
            {language.t("ui.common.dismiss")}
          </Button>
          <div data-slot="question-footer-actions">
            <Show when={store.tab > 0}>
-              <Button variant="secondary" size="large" disabled={sending()} onClick={back}>
+              <Button variant="secondary" size="large" disabled={store.sending} onClick={back}>
                {language.t("ui.common.back")}
              </Button>
            </Show>
-            <Button variant={last() ? "primary" : "secondary"} size="large" disabled={sending()} onClick={next}>
+            <Button variant={last() ? "primary" : "secondary"} size="large" disabled={store.sending} onClick={next}>
              {last() ? language.t("ui.common.submit") : language.t("ui.common.next")}
            </Button>
          </div>
@@ -315,7 +311,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
                data-picked={picked()}
                role={multi() ? "checkbox" : "radio"}
                aria-checked={picked()}
-                disabled={sending()}
+                disabled={store.sending}
                onClick={() => selectOption(i())}
              >
                <span data-slot="question-option-check" aria-hidden="true">
@@ -349,7 +345,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
              data-picked={on()}
              role={multi() ? "checkbox" : "radio"}
              aria-checked={on()}
-              disabled={sending()}
+              disabled={store.sending}
              onClick={customOpen}
            >
              <span
@@ -381,7 +377,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
            role={multi() ? "checkbox" : "radio"}
            aria-checked={on()}
            onMouseDown={(e) => {
-              if (sending()) {
+              if (store.sending) {
                e.preventDefault()
                return
              }
@@ -423,7 +419,7 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
                placeholder={language.t("ui.question.custom.placeholder")}
                value={input()}
                rows={1}
-                disabled={sending()}
+                disabled={store.sending}
                onKeyDown={(e) => {
                  if (e.key === "Escape") {
                    e.preventDefault()
@@ -217,6 +217,17 @@ export function FileTabContent(props: { tab: string }) {
        onDelete={controls.remove}
      />
    ),
    onDraftPopoverFocusOut: (e: FocusEvent) => {
      const current = e.currentTarget as HTMLDivElement
      const target = e.relatedTarget
      if (target instanceof Node && current.contains(target)) return
      setTimeout(() => {
        if (!document.activeElement || !current.contains(document.activeElement)) {
          setNote("commenting", null)
        }
      }, 0)
    },
  })
  createEffect(() => {
@@ -415,6 +426,7 @@ export function FileTabContent(props: { tab: string }) {
          commentsUi.onLineSelectionEnd(range)
        }}
        search={search}
        overflow="scroll"
        class="select-text"
        media={{
          mode: "auto",
@@ -1,7 +1,6 @@
 import { For, createEffect, createMemo, on, onCleanup, Show, Index, type JSX } from "solid-js"
 import { createStore, produce } from "solid-js/store"
 import { useNavigate } from "@solidjs/router"
 import { useMutation } from "@tanstack/solid-query"
 import { Button } from "@opencode-ai/ui/button"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { Icon } from "@opencode-ai/ui/icon"
@@ -28,7 +27,6 @@ import { usePlatform } from "@/context/platform"
 import { useSettings } from "@/context/settings"
 import { useSDK } from "@/context/sdk"
 import { useSync } from "@/context/sync"
 import { messageAgentColor } from "@/utils/agent"
 import { parseCommentNote, readCommentMetadata } from "@/utils/comment-note"
 type MessageComment = {
@@ -248,7 +246,6 @@ export function MessageTimeline(props: {
    return sync.data.session_status[id] ?? idle
  })
  const working = createMemo(() => !!pending() || sessionStatus().type !== "idle")
  const tint = createMemo(() => messageAgentColor(sessionMessages(), sync.data.agent))
  const [slot, setSlot] = createStore({
    open: false,
@@ -322,6 +319,7 @@ export function MessageTimeline(props: {
  const [title, setTitle] = createStore({
    draft: "",
    editing: false,
    saving: false,
    menuOpen: false,
    pendingRename: false,
    pendingShare: false,
@@ -335,6 +333,38 @@ export function MessageTimeline(props: {
  let more: HTMLButtonElement | undefined
  const [req, setReq] = createStore({ share: false, unshare: false })
  const shareSession = () => {
    const id = sessionID()
    if (!id || req.share) return
    if (!shareEnabled()) return
    setReq("share", true)
    globalSDK.client.session
      .share({ sessionID: id, directory: sdk.directory })
      .catch((err: unknown) => {
        console.error("Failed to share session", err)
      })
      .finally(() => {
        setReq("share", false)
      })
  }
  const unshareSession = () => {
    const id = sessionID()
    if (!id || req.unshare) return
    if (!shareEnabled()) return
    setReq("unshare", true)
    globalSDK.client.session
      .unshare({ sessionID: id, directory: sdk.directory })
      .catch((err: unknown) => {
        console.error("Failed to unshare session", err)
      })
      .finally(() => {
        setReq("unshare", false)
      })
  }
  const viewShare = () => {
    const url = shareUrl()
    if (!url) return
@@ -350,54 +380,6 @@ export function MessageTimeline(props: {
    return language.t("common.requestFailed")
  }
  const shareMutation = useMutation(() => ({
    mutationFn: (id: string) => globalSDK.client.session.share({ sessionID: id, directory: sdk.directory }),
    onError: (err) => {
      console.error("Failed to share session", err)
    },
  }))
  const unshareMutation = useMutation(() => ({
    mutationFn: (id: string) => globalSDK.client.session.unshare({ sessionID: id, directory: sdk.directory }),
    onError: (err) => {
      console.error("Failed to unshare session", err)
    },
  }))
  const titleMutation = useMutation(() => ({
    mutationFn: (input: { id: string; title: string }) =>
      sdk.client.session.update({ sessionID: input.id, title: input.title }),
    onSuccess: (_, input) => {
      sync.set(
        produce((draft) => {
          const index = draft.session.findIndex((s) => s.id === input.id)
          if (index !== -1) draft.session[index].title = input.title
        }),
      )
      setTitle("editing", false)
    },
    onError: (err) => {
      showToast({
        title: language.t("common.requestFailed"),
        description: errorMessage(err),
      })
    },
  }))
  const shareSession = () => {
    const id = sessionID()
    if (!id || shareMutation.isPending) return
    if (!shareEnabled()) return
    shareMutation.mutate(id)
  }
  const unshareSession = () => {
    const id = sessionID()
    if (!id || unshareMutation.isPending) return
    if (!shareEnabled()) return
    unshareMutation.mutate(id)
  }
  createEffect(
    on(
      sessionKey,
@@ -405,6 +387,7 @@ export function MessageTimeline(props: {
        setTitle({
          draft: "",
          editing: false,
          saving: false,
          menuOpen: false,
          pendingRename: false,
          pendingShare: false,
@@ -423,22 +406,40 @@ export function MessageTimeline(props: {
  }
  const closeTitleEditor = () => {
-    if (titleMutation.isPending) return
+    if (title.saving) return
-    setTitle("editing", false)
+    setTitle({ editing: false, saving: false })
  }
-  const saveTitleEditor = () => {
+  const saveTitleEditor = async () => {
    const id = sessionID()
    if (!id) return
-    if (titleMutation.isPending) return
+    if (title.saving) return
    const next = title.draft.trim()
    if (!next || next === (titleValue() ?? "")) {
-      setTitle("editing", false)
+      setTitle({ editing: false, saving: false })
      return
    }
-    titleMutation.mutate({ id, title: next })
+    setTitle("saving", true)
    await sdk.client.session
      .update({ sessionID: id, title: next })
      .then(() => {
        sync.set(
          produce((draft) => {
            const index = draft.session.findIndex((s) => s.id === id)
            if (index !== -1) draft.session[index].title = next
          }),
        )
        setTitle({ editing: false, saving: false })
      })
      .catch((err) => {
        setTitle("saving", false)
        showToast({
          title: language.t("common.requestFailed"),
          description: errorMessage(err),
        })
      })
  }
  const navigateAfterSessionRemoval = (sessionID: string, parentID?: string, nextSessionID?: string) => {
@@ -688,7 +689,7 @@ export function MessageTimeline(props: {
                              "opacity-0": slot.fade,
                            }}
                          >
-                            <Spinner class="size-4" style={{ color: tint() ?? "var(--icon-interactive-base)" }} />
+                            <Spinner class="size-4" style={{ color: "var(--icon-interactive-base)" }} />
                          </div>
                        </Show>
                      </div>
@@ -709,7 +710,7 @@ export function MessageTimeline(props: {
                              titleRef = el
                            }}
                            value={title.draft}
-                            disabled={titleMutation.isPending}
+                            disabled={title.saving}
                            class="text-14-medium text-text-strong grow-1 min-w-0 rounded-[6px]"
                            style={{ "--inline-input-shadow": "var(--shadow-xs-border-select)" }}
                            onInput={(event) => setTitle("draft", event.currentTarget.value)}
@@ -860,9 +861,9 @@ export function MessageTimeline(props: {
                                        variant="primary"
                                        class="w-full"
                                        onClick={shareSession}
-                                        disabled={shareMutation.isPending}
+                                        disabled={req.share}
                                      >
-                                        {shareMutation.isPending
+                                        {req.share
                                          ? language.t("session.share.action.publishing")
                                          : language.t("session.share.action.publish")}
                                      </Button>
@@ -883,9 +884,9 @@ export function MessageTimeline(props: {
                                          variant="secondary"
                                          class="w-full shadow-none border border-border-weak-base"
                                          onClick={unshareSession}
-                                          disabled={unshareMutation.isPending}
+                                          disabled={req.unshare}
                                        >
-                                          {unshareMutation.isPending
+                                          {req.unshare
                                            ? language.t("session.share.action.unpublishing")
                                            : language.t("session.share.action.unpublish")}
                                        </Button>
@@ -894,7 +895,7 @@ export function MessageTimeline(props: {
                                          variant="primary"
                                          class="w-full"
                                          onClick={viewShare}
-                                          disabled={unshareMutation.isPending}
+                                          disabled={req.unshare}
                                        >
                                          {language.t("session.share.action.view")}
                                        </Button>
@@ -14,38 +14,145 @@ const message = (input?: Partial<Pick<UserMessage, "agent" | "model" | "variant"
  }) as UserMessage
 describe("syncSessionModel", () => {
-  test("restores the last message through session state", () => {
+  test("restores the last message model and variant", () => {
    const calls: unknown[] = []
    syncSessionModel(
      {
-        session: {
+        agent: {
-          restore(value) {
+          current() {
-            calls.push(value)
+            return undefined
          },
          set(value) {
            calls.push(["agent", value])
          },
        },
        model: {
          set(value) {
            calls.push(["model", value])
          },
          current() {
            return { id: "claude-sonnet-4", provider: { id: "anthropic" } }
          },
          variant: {
            set(value) {
              calls.push(["variant", value])
            },
          },
          reset() {},
        },
      },
      message({ variant: "high" }),
    )
-    expect(calls).toEqual([message({ variant: "high" })])
+    expect(calls).toEqual([
      ["agent", "build"],
      ["model", { providerID: "anthropic", modelID: "claude-sonnet-4" }],
      ["variant", "high"],
    ])
  })
  test("skips variant when the model falls back", () => {
    const calls: unknown[] = []
    syncSessionModel(
      {
        agent: {
          current() {
            return undefined
          },
          set(value) {
            calls.push(["agent", value])
          },
        },
        model: {
          set(value) {
            calls.push(["model", value])
          },
          current() {
            return { id: "gpt-5", provider: { id: "openai" } }
          },
          variant: {
            set(value) {
              calls.push(["variant", value])
            },
          },
        },
      },
      message({ variant: "high" }),
    )
    expect(calls).toEqual([
      ["agent", "build"],
      ["model", { providerID: "anthropic", modelID: "claude-sonnet-4" }],
    ])
  })
 })
 describe("resetSessionModel", () => {
-  test("clears draft session state", () => {
+  test("restores the current agent defaults", () => {
-    const calls: string[] = []
+    const calls: unknown[] = []
    resetSessionModel({
-      session: {
+      agent: {
-        reset() {
+        current() {
-          calls.push("reset")
+          return {
            model: { providerID: "anthropic", modelID: "claude-sonnet-4" },
            variant: "high",
          }
        },
        set() {},
      },
      model: {
        set(value) {
          calls.push(["model", value])
        },
        current() {
          return undefined
        },
        variant: {
          set(value) {
            calls.push(["variant", value])
          },
        },
        restore() {},
      },
    })
-    expect(calls).toEqual(["reset"])
+    expect(calls).toEqual([
      ["model", { providerID: "anthropic", modelID: "claude-sonnet-4" }],
      ["variant", "high"],
    ])
  })
  test("clears the variant when the agent has none", () => {
    const calls: unknown[] = []
    resetSessionModel({
      agent: {
        current() {
          return {
            model: { providerID: "anthropic", modelID: "claude-sonnet-4" },
          }
        },
        set() {},
      },
      model: {
        set(value) {
          calls.push(["model", value])
        },
        current() {
          return undefined
        },
        variant: {
          set(value) {
            calls.push(["variant", value])
          },
        },
      },
    })
    expect(calls).toEqual([
      ["model", { providerID: "anthropic", modelID: "claude-sonnet-4" }],
      ["variant", undefined],
    ])
  })
 })
@@ -1,16 +1,48 @@
 import type { UserMessage } from "@opencode-ai/sdk/v2"
 import { batch } from "solid-js"
 type Local = {
-  session: {
+  agent: {
-    reset(): void
+    current():
-    restore(msg: UserMessage): void
+      | {
          model?: UserMessage["model"]
          variant?: string
        }
      | undefined
    set(name: string | undefined): void
  }
  model: {
    set(model: UserMessage["model"] | undefined): void
    current():
      | {
          id: string
          provider: { id: string }
        }
      | undefined
    variant: {
      set(value: string | undefined): void
    }
  }
 }
 export const resetSessionModel = (local: Local) => {
-  local.session.reset()
+  const agent = local.agent.current()
  if (!agent) return
  batch(() => {
    local.model.set(agent.model)
    local.model.variant.set(agent.variant)
  })
 }
 export const syncSessionModel = (local: Local, msg: UserMessage) => {
-  local.session.restore(msg)
+  batch(() => {
    local.agent.set(msg.agent)
    local.model.set(msg.model)
  })
  const model = local.model.current()
  if (!model) return
  if (model.provider.id !== msg.model.providerID) return
  if (model.id !== msg.model.modelID) return
  local.model.variant.set(msg.variant)
 }
@@ -18,10 +18,8 @@ import { terminalTabLabel } from "@/pages/session/terminal-label"
 import { createSizing, focusTerminalById } from "@/pages/session/helpers"
 import { getTerminalHandoff, setTerminalHandoff } from "@/pages/session/handoff"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { terminalProbe } from "@/testing/terminal"
 export function TerminalPanel() {
  const delays = [120, 240]
  const layout = useLayout()
  const terminal = useTerminal()
  const language = useLanguage()
@@ -81,20 +79,16 @@ export function TerminalPanel() {
  )
  const focus = (id: string) => {
    const probe = terminalProbe(id)
    probe.focus(delays.length + 1)
    focusTerminalById(id)
    const frame = requestAnimationFrame(() => {
      probe.step()
      if (!opened()) return
      if (terminal.active() !== id) return
      focusTerminalById(id)
    })
-    const timers = delays.map((ms) =>
+    const timers = [120, 240].map((ms) =>
      window.setTimeout(() => {
        probe.step()
        if (!opened()) return
        if (terminal.active() !== id) return
        focusTerminalById(id)
@@ -102,7 +96,6 @@ export function TerminalPanel() {
    )
    return () => {
      probe.focus(0)
      cancelAnimationFrame(frame)
      for (const timer of timers) clearTimeout(timer)
    }
@@ -280,24 +273,21 @@ export function TerminalPanel() {
              </Tabs>
              <div class="flex-1 min-h-0 relative">
                <Show when={terminal.active()} keyed>
-                  {(id) => {
+                  {(id) => (
-                    const ops = terminal.bind()
+                    <Show when={all().find((pty) => pty.id === id)}>
-                    return (
+                      {(pty) => (
-                      <Show when={all().find((pty) => pty.id === id)}>
+                        <div id={`terminal-wrapper-${id}`} class="absolute inset-0">
-                        {(pty) => (
+                          <Terminal
-                          <div id={`terminal-wrapper-${id}`} class="absolute inset-0">
+                            pty={pty()}
-                            <Terminal
+                            autoFocus={opened()}
-                              pty={pty()}
+                            onConnect={() => terminal.trim(id)}
-                              autoFocus={opened()}
+                            onCleanup={terminal.update}
-                              onConnect={() => ops.trim(id)}
+                            onConnectError={() => terminal.clone(id)}
-                              onCleanup={ops.update}
+                          />
-                              onConnectError={() => ops.clone(id)}
+                        </div>
-                            />
+                      )}
-                          </div>
+                    </Show>
-                        )}
+                  )}
                      </Show>
                    )
                  }}
                </Show>
              </div>
            </div>
@@ -351,7 +351,7 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
        description: language.t("command.model.choose.description"),
        keybind: "mod+'",
        slash: "model",
-        onSelect: () => dialog.show(() => <DialogSelectModel model={local.model} />),
+        onSelect: () => dialog.show(() => <DialogSelectModel />),
      }),
      mcpCommand({
        id: "mcp.toggle",
@@ -1,80 +0,0 @@
 type ModelKey = {
  providerID: string
  modelID: string
 }
 type State = {
  agent?: string
  model?: ModelKey | null
  variant?: string | null
 }
 export type ModelProbeState = {
  dir?: string
  sessionID?: string
  last?: {
    type: "agent" | "model" | "variant"
    agent?: string
    model?: ModelKey | null
    variant?: string | null
  }
  agent?: string
  model?: (ModelKey & { name?: string }) | undefined
  variant?: string | null
  selected?: string | null
  configured?: string
  pick?: State
  base?: State
  current?: string
 }
 export type ModelWindow = Window & {
  __opencode_e2e?: {
    model?: {
      enabled?: boolean
      current?: ModelProbeState
    }
  }
 }
 const clone = (state?: State) => {
  if (!state) return undefined
  return {
    ...state,
    model: state.model ? { ...state.model } : state.model,
  }
 }
 export const modelEnabled = () => {
  if (typeof window === "undefined") return false
  return (window as ModelWindow).__opencode_e2e?.model?.enabled === true
 }
 const root = () => {
  if (!modelEnabled()) return
  return (window as ModelWindow).__opencode_e2e?.model
 }
 export const modelProbe = {
  set(input: ModelProbeState) {
    const state = root()
    if (!state) return
    state.current = {
      ...input,
      model: input.model ? { ...input.model } : undefined,
      last: input.last
        ? {
            ...input.last,
            model: input.last.model ? { ...input.last.model } : input.last.model,
          }
        : undefined,
      pick: clone(input.pick),
      base: clone(input.base),
    }
  },
  clear() {
    const state = root()
    if (!state) return
    state.current = undefined
  },
 }
@@ -1,56 +0,0 @@
 import type { E2EWindow } from "./terminal"
 export type PromptProbeState = {
  popover: "at" | "slash" | null
  slash: {
    active: string | null
    ids: string[]
  }
  selected: string | null
  selects: number
 }
 export const promptEnabled = () => {
  if (typeof window === "undefined") return false
  return (window as E2EWindow).__opencode_e2e?.prompt?.enabled === true
 }
 const root = () => {
  if (!promptEnabled()) return
  return (window as E2EWindow).__opencode_e2e?.prompt
 }
 export const promptProbe = {
  set(input: Omit<PromptProbeState, "selected" | "selects">) {
    const state = root()
    if (!state) return
    state.current = {
      popover: input.popover,
      slash: {
        active: input.slash.active,
        ids: [...input.slash.ids],
      },
      selected: state.current?.selected ?? null,
      selects: state.current?.selects ?? 0,
    }
  },
  select(id: string) {
    const state = root()
    if (!state) return
    const prev = state.current
    state.current = {
      popover: prev?.popover ?? null,
      slash: {
        active: prev?.slash.active ?? null,
        ids: [...(prev?.slash.ids ?? [])],
      },
      selected: id,
      selects: (prev?.selects ?? 0) + 1,
    }
  },
  clear() {
    const state = root()
    if (!state) return
    state.current = undefined
  },
 }
@@ -1,5 +1,3 @@
 import type { ModelProbeState } from "./model-selection"
 export const terminalAttr = "data-pty-id"
 export type TerminalProbeState = {
@@ -7,7 +5,6 @@ export type TerminalProbeState = {
  connects: number
  rendered: string
  settled: number
  focusing: number
 }
 type TerminalProbeControl = {
@@ -16,14 +13,6 @@ type TerminalProbeControl = {
 export type E2EWindow = Window & {
  __opencode_e2e?: {
    model?: {
      enabled?: boolean
      current?: ModelProbeState
    }
    prompt?: {
      enabled?: boolean
      current?: import("./prompt").PromptProbeState
    }
    terminal?: {
      enabled?: boolean
      terminals?: Record<string, TerminalProbeState>
@@ -37,7 +26,6 @@ const seed = (): TerminalProbeState => ({
  connects: 0,
  rendered: "",
  settled: 0,
  focusing: 0,
 })
 const root = () => {
@@ -94,15 +82,6 @@ export const terminalProbe = (id: string) => {
      const prev = state[id] ?? seed()
      state[id] = { ...prev, settled: prev.settled + 1 }
    },
    focus(count: number) {
      set({ focusing: Math.max(0, count) })
    },
    step() {
      const state = terms()
      if (!state) return
      const prev = state[id] ?? seed()
      state[id] = { ...prev, focusing: Math.max(0, prev.focusing - 1) }
    },
    control(next: Partial<TerminalProbeControl>) {
      const state = controls()
      if (!state) return
@@ -9,15 +9,3 @@ export function agentColor(name: string, custom?: string) {
  if (custom) return custom
  return defaults[name] ?? defaults[name.toLowerCase()]
 }
 export function messageAgentColor(
  list: readonly { role: string; agent?: string }[] | undefined,
  agents: readonly { name: string; color?: string }[],
 ) {
  if (!list) return undefined
  for (let i = list.length - 1; i >= 0; i--) {
    const item = list[i]
    if (item.role !== "user" || !item.agent) continue
    return agentColor(item.agent, agents.find((agent) => agent.name === item.agent)?.color)
  }
 }
@@ -5,12 +5,7 @@ import { createResource, type Accessor } from "solid-js"
 import type { SetStoreFunction, Store } from "solid-js/store"
 type InitType = Promise<string> | string | null
-type PersistedWithReady<T> = [
+type PersistedWithReady<T> = [Store<T>, SetStoreFunction<T>, InitType, Accessor<boolean>]
  Store<T>,
  SetStoreFunction<T>,
  InitType,
  Accessor<boolean> & { promise: undefined | Promise<any> },
 ]
 type PersistTarget = {
  storage?: string
@@ -465,12 +460,5 @@ export function persisted<T>(
    { initialValue: !isAsync },
  )
-  return [
+  return [state, setState, init, () => ready() === true]
    state,
    setState,
    init,
    Object.assign(() => ready() === true, {
      promise: init instanceof Promise ? init : undefined,
    }),
  ]
 }
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.2.27",
+  "version": "1.2.25",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/Show More
+++ b/Show More