Merge branch 'dev' into kit/remove-e2e-url-repro

test(opencode): remove temporary e2e url repro
fix(opencode): allow patch tools in e2e model routing
2026-08-03 00:36:20 -04:00 · 2026-04-02 14:32:47 -04:00 · 2026-04-02 14:30:06 -04:00 · 2026-04-02 14:10:26 -04:00 · 2026-04-02 13:27:10 -04:00 · 2026-04-02 13:11:56 -04:00
197 changed files with 64042 additions and 17207 deletions
@@ -15,7 +15,6 @@ concurrency:

 permissions:
  contents: read
-  checks: write

 jobs:
  unit:
@@ -46,40 +45,14 @@ jobs:
          git config --global user.email "bot@opencode.ai"
          git config --global user.name "opencode"

-      - name: Cache Turbo
-        uses: actions/cache@v4
-        with:
-          path: node_modules/.cache/turbo
-          key: turbo-${{ runner.os }}-${{ hashFiles('turbo.json', '**/package.json') }}-${{ github.sha }}
-          restore-keys: |
-            turbo-${{ runner.os }}-${{ hashFiles('turbo.json', '**/package.json') }}-
-            turbo-${{ runner.os }}-
-
      - name: Run unit tests
-        run: bun turbo test:ci
+        run: bun turbo test
        env:
+          # Bun 1.3.11 intermittently crashes on Windows during test teardown
+          # inside the native @parcel/watcher binding. Unit CI does not rely on
+          # the live watcher backend there, so disable it for that platform.
          OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER: ${{ runner.os == 'Windows' && 'true' || 'false' }}

-      - name: Publish unit reports
-        if: always()
-        uses: mikepenz/action-junit-report@v6
-        with:
-          report_paths: packages/*/.artifacts/unit/junit.xml
-          check_name: "unit results (${{ matrix.settings.name }})"
-          detailed_summary: true
-          include_time_in_summary: true
-          fail_on_failure: false
-
-      - name: Upload unit artifacts
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: unit-${{ matrix.settings.name }}-${{ github.run_attempt }}
-          include-hidden-files: true
-          if-no-files-found: ignore
-          retention-days: 7
-          path: packages/*/.artifacts/unit/junit.xml
-
  e2e:
    name: e2e (${{ matrix.settings.name }})
    strategy:
@@ -132,17 +105,15 @@ jobs:
        run: bun --cwd packages/app test:e2e:local
        env:
          CI: true
-          PLAYWRIGHT_JUNIT_OUTPUT: e2e/junit-${{ matrix.settings.name }}.xml
        timeout-minutes: 30

      - name: Upload Playwright artifacts
-        if: always()
+        if: failure()
        uses: actions/upload-artifact@v4
        with:
          name: playwright-${{ matrix.settings.name }}-${{ github.run_attempt }}
          if-no-files-found: ignore
          retention-days: 7
          path: |
-            packages/app/e2e/junit-*.xml
            packages/app/e2e/test-results
            packages/app/e2e/playwright-report
@@ -653,30 +653,23 @@ const home = (api: TuiPluginApi, input: Cfg) => ({
      const skin = look(ctx.theme.current)
      type Prompt = (props: {
        workspaceID?: string
-        visible?: boolean
-        disabled?: boolean
-        onSubmit?: () => void
        hint?: JSX.Element
-        right?: JSX.Element
-        showPlaceholder?: boolean
        placeholders?: {
          normal?: string[]
          shell?: string[]
        }
      }) => JSX.Element
-      type Slot = (
-        props: { name: string; mode?: unknown; children?: JSX.Element } & Record<string, unknown>,
-      ) => JSX.Element | null
-      const ui = api.ui as TuiPluginApi["ui"] & { Prompt: Prompt; Slot: Slot }
-      const Prompt = ui.Prompt
-      const Slot = ui.Slot
+      if (!("Prompt" in api.ui)) return null
+      const view = api.ui.Prompt
+      if (typeof view !== "function") return null
+      const Prompt = view as Prompt
      const normal = [
        `[SMOKE] route check for ${input.label}`,
        "[SMOKE] confirm home_prompt slot override",
-        "[SMOKE] verify prompt-right slot passthrough",
+        "[SMOKE] verify api.ui.Prompt rendering",
      ]
      const shell = ["printf '[SMOKE] home prompt\n'", "git status --short", "bun --version"]
-      const hint = (
+      const Hint = (
        <box flexShrink={0} flexDirection="row" gap={1}>
          <text fg={skin.muted}>
            <span style={{ fg: skin.accent }}>•</span> smoke home prompt
@@ -684,46 +677,7 @@ const home = (api: TuiPluginApi, input: Cfg) => ({
        </box>
      )

-      return (
-        <Prompt
-          workspaceID={value.workspace_id}
-          hint={hint}
-          right={
-            <box flexDirection="row" gap={1}>
-              <Slot name="home_prompt_right" workspace_id={value.workspace_id} />
-              <Slot name="smoke_prompt_right" workspace_id={value.workspace_id} label={input.label} />
-            </box>
-          }
-          placeholders={{ normal, shell }}
-        />
-      )
-    },
-    home_prompt_right(ctx, value) {
-      const skin = look(ctx.theme.current)
-      const id = value.workspace_id?.slice(0, 8) ?? "none"
-      return (
-        <text fg={skin.muted}>
-          <span style={{ fg: skin.accent }}>{input.label}</span> home:{id}
-        </text>
-      )
-    },
-    session_prompt_right(ctx, value) {
-      const skin = look(ctx.theme.current)
-      return (
-        <text fg={skin.muted}>
-          <span style={{ fg: skin.accent }}>{input.label}</span> session:{value.session_id.slice(0, 8)}
-        </text>
-      )
-    },
-    smoke_prompt_right(ctx, value) {
-      const skin = look(ctx.theme.current)
-      const id = typeof value.workspace_id === "string" ? value.workspace_id.slice(0, 8) : "none"
-      const label = typeof value.label === "string" ? value.label : input.label
-      return (
-        <text fg={skin.muted}>
-          <span style={{ fg: skin.accent }}>{label}</span> custom:{id}
-        </text>
-      )
+      return <Prompt workspaceID={value.workspace_id} hint={Hint} placeholders={{ normal, shell }} />
    },
    home_bottom(ctx) {
      const skin = look(ctx.theme.current)
@@ -26,7 +26,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -80,7 +80,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -114,7 +114,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -141,7 +141,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@ai-sdk/anthropic": "3.0.64",
        "@ai-sdk/openai": "3.0.48",
@@ -165,7 +165,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -189,7 +189,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -222,7 +222,7 @@
    },
    "packages/desktop-electron": {
      "name": "@opencode-ai/desktop-electron",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -254,7 +254,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@opencode-ai/util": "workspace:*",
@@ -283,7 +283,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -299,7 +299,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -341,8 +341,8 @@
        "@opencode-ai/sdk": "workspace:*",
        "@opencode-ai/util": "workspace:*",
        "@openrouter/ai-sdk-provider": "2.3.3",
-        "@opentui/core": "https://pkg.pr.new/anomalyco/opentui/@opentui/core@22d015f",
-        "@opentui/solid": "https://pkg.pr.new/@opentui/solid@22d015f",
+        "@opentui/core": "0.1.95",
+        "@opentui/solid": "0.1.95",
        "@parcel/watcher": "2.5.1",
        "@pierre/diffs": "catalog:",
        "@solid-primitives/event-bus": "1.1.2",
@@ -355,7 +355,7 @@
        "bun-pty": "0.4.8",
        "chokidar": "4.0.3",
        "clipboardy": "4.0.0",
-        "cross-spawn": "catalog:",
+        "cross-spawn": "^7.0.6",
        "decimal.js": "10.5.0",
        "diff": "catalog:",
        "drizzle-orm": "catalog:",
@@ -371,7 +371,6 @@
        "jsonc-parser": "3.3.1",
        "mime-types": "3.0.2",
        "minimatch": "10.0.3",
-        "npm-package-arg": "13.0.2",
        "open": "10.1.2",
        "opencode-gitlab-auth": "2.0.1",
        "opencode-poe-auth": "0.0.1",
@@ -411,9 +410,8 @@
        "@tsconfig/bun": "catalog:",
        "@types/babel__core": "7.20.5",
        "@types/bun": "catalog:",
-        "@types/cross-spawn": "catalog:",
+        "@types/cross-spawn": "6.0.6",
        "@types/mime-types": "3.0.1",
-        "@types/npm-package-arg": "6.1.4",
        "@types/npmcli__arborist": "6.3.3",
        "@types/semver": "^7.5.8",
        "@types/turndown": "5.0.5",
@@ -430,22 +428,22 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "zod": "catalog:",
      },
      "devDependencies": {
-        "@opentui/core": "https://pkg.pr.new/anomalyco/opentui/@opentui/core@22d015f",
-        "@opentui/solid": "https://pkg.pr.new/@opentui/solid@22d015f",
+        "@opentui/core": "0.1.95",
+        "@opentui/solid": "0.1.95",
        "@tsconfig/node22": "catalog:",
        "@types/node": "catalog:",
        "@typescript/native-preview": "catalog:",
        "typescript": "catalog:",
      },
      "peerDependencies": {
-        "@opentui/core": ">=0.1.96",
-        "@opentui/solid": ">=0.1.96",
+        "@opentui/core": ">=0.1.95",
+        "@opentui/solid": ">=0.1.95",
      },
      "optionalPeers": [
        "@opentui/core",
@@ -464,14 +462,10 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.3.17",
-      "dependencies": {
-        "cross-spawn": "catalog:",
-      },
+      "version": "1.3.13",
      "devDependencies": {
        "@hey-api/openapi-ts": "0.90.10",
        "@tsconfig/node22": "catalog:",
-        "@types/cross-spawn": "catalog:",
        "@types/node": "catalog:",
        "@typescript/native-preview": "catalog:",
        "typescript": "catalog:",
@@ -479,7 +473,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -514,7 +508,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -562,7 +556,7 @@
    },
    "packages/util": {
      "name": "@opencode-ai/util",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "zod": "catalog:",
      },
@@ -573,7 +567,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.3.17",
+      "version": "1.3.13",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
@@ -640,13 +634,11 @@
    "@tsconfig/bun": "1.0.9",
    "@tsconfig/node22": "22.0.2",
    "@types/bun": "1.3.11",
-    "@types/cross-spawn": "6.0.6",
    "@types/luxon": "3.7.1",
    "@types/node": "22.13.9",
    "@types/semver": "7.7.1",
    "@typescript/native-preview": "7.0.0-dev.20251207.1",
    "ai": "6.0.138",
-    "cross-spawn": "7.0.6",
    "diff": "8.0.2",
    "dompurify": "3.3.1",
    "drizzle-kit": "1.0.0-beta.19-d95b7a4",
@@ -1506,21 +1498,21 @@

    "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],

-    "@opentui/core": ["@opentui/core@https://pkg.pr.new/anomalyco/opentui/@opentui/core@22d015f", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "https://pkg.pr.new/anomalyco/opentui/@opentui/core-darwin-arm64@22d015f", "@opentui/core-darwin-x64": "https://pkg.pr.new/anomalyco/opentui/@opentui/core-darwin-x64@22d015f", "@opentui/core-linux-arm64": "https://pkg.pr.new/anomalyco/opentui/@opentui/core-linux-arm64@22d015f", "@opentui/core-linux-x64": "https://pkg.pr.new/anomalyco/opentui/@opentui/core-linux-x64@22d015f", "@opentui/core-win32-arm64": "https://pkg.pr.new/anomalyco/opentui/@opentui/core-win32-arm64@22d015f", "@opentui/core-win32-x64": "https://pkg.pr.new/anomalyco/opentui/@opentui/core-win32-x64@22d015f", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-wm81gV1yKsbZ61Ls9MwV1o8MeHe/bF0slyMx4cTG7xE+XNGTz85YVb6c2HdBVnx6y6xIBbyAU0RINs96NJBttA=="],
+    "@opentui/core": ["@opentui/core@0.1.95", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.95", "@opentui/core-darwin-x64": "0.1.95", "@opentui/core-linux-arm64": "0.1.95", "@opentui/core-linux-x64": "0.1.95", "@opentui/core-win32-arm64": "0.1.95", "@opentui/core-win32-x64": "0.1.95", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-Ha73I+PPSy6Jk8CTZgdGRHU+nnmrPAs7m6w0k6ge1/kWbcNcZB0lY67sWQMdoa6bSINQMNWg7SjbNCC9B/0exg=="],

-    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@https://pkg.pr.new/anomalyco/opentui/@opentui/core-darwin-arm64@22d015f", {}, "sha512-+1meom2zIi1YglSbdk1c+mUKFsUrkZuSIndUyGO5odSaUXPQwc6t+l1xNuB2aadFergQX/BJJmH+zzfMxO5RiA=="],
+    "@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.95", "", { "os": "darwin", "cpu": "arm64" }, "sha512-92joqr0ucGaIBCl9uYhe5DwAPbgGMTaCsCeY8Yf3VQ72wjGbOTwnC1TvU5wC6bUmiyqfijCqMyuUnj83teIVVQ=="],

-    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@https://pkg.pr.new/anomalyco/opentui/@opentui/core-darwin-x64@22d015f", {}, "sha512-FpQYVPP20A/tOu2suVOWQ+rFebnTgu6DC5VwnBAuJ+IYphl/IPvamoPJp9X998r8k3oszcG+ogM3w10cj/RUiA=="],
+    "@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.95", "", { "os": "darwin", "cpu": "x64" }, "sha512-+TLL3Kp3x7DTWEAkCAYe+RjRhl58QndoeXMstZNS8GQyrjSpUuivzwidzAz0HZK9SbZJfvaxZmXsToAIdI2fag=="],

-    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@https://pkg.pr.new/anomalyco/opentui/@opentui/core-linux-arm64@22d015f", {}, "sha512-l6D2Hp1+wwiz7o+taoyIubVHe5cR9uiXEcTE+NvxbIr/CNnn9GnAD79ue2YFbKYSqZvYn1sVFq/HZegJTzjWMA=="],
+    "@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.95", "", { "os": "linux", "cpu": "arm64" }, "sha512-dAYeRqh7P8o0xFZleDDR1Abt4gSvCISqw6syOrbH3dl7pMbVdGgzA5stM9jqMgdPUVE7Ngumo17C23ehkGv93A=="],

-    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@https://pkg.pr.new/anomalyco/opentui/@opentui/core-linux-x64@22d015f", {}, "sha512-ZcArJ32FIGt8bCUdmXIEs7G6OfKn82QQuk1s/z81XHFGnTziMunAKX2qWjIetvAA2b5xF37aRJt+zCtjfCy1Rw=="],
+    "@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.95", "", { "os": "linux", "cpu": "x64" }, "sha512-O54TCgK8E7j2NKrDXUOTZqO4sb8JjeAfnhrStxAMMEw4RFCGWx3p3wLesqR16uKfFFJFDyoh2OWZ698tO88EAA=="],

-    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@https://pkg.pr.new/anomalyco/opentui/@opentui/core-win32-arm64@22d015f", {}, "sha512-Xgh2kvONV8Z6vCY5wK+aEXsBYW5AsI2IaHviZxckCZy+ymh5zFJFRnoF0i3q1QEbQyjaM76fczj6yfbnJF6mzw=="],
+    "@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.95", "", { "os": "win32", "cpu": "arm64" }, "sha512-T1RlZ6U/95eYDN6rUm4SLOVA5LBR7iL3TcBroQhV/883bVczXIBPhriEXQayup5FsAemnQba1BzMNvy6128SUw=="],

-    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@https://pkg.pr.new/anomalyco/opentui/@opentui/core-win32-x64@22d015f", {}, "sha512-YL25sjPE93SwtdzzBAhWHdsvlFJfRpsRPqJydEPGtFdE15z9m2F633BhSkoL0FVIFbznLpZSUCURJbs8qm+QKg=="],
+    "@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.95", "", { "os": "win32", "cpu": "x64" }, "sha512-lH2FHO0HSP2xWT+ccoz0BkLYFsMm7e6OYOh63BUHHh5b7ispnzP4aTyxiaLWrfJwdL0M9rp5cLIY32bhBKF2oA=="],

-    "@opentui/solid": ["@opentui/solid@https://pkg.pr.new/@opentui/solid@22d015f", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "https://pkg.pr.new/anomalyco/opentui/@opentui/core@22d015f", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.10", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.11" } }, "sha512-gG+5MCpvaI07CfAQsFe8oVhoUwvM9VXznoPKU3XKwWiJruhyagscAB++ozlY6I4lFUfqjC4soQioswlKirUchw=="],
+    "@opentui/solid": ["@opentui/solid@0.1.95", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.95", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.10", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.11" } }, "sha512-iotYCvULgDurLXv3vgOzTLnEOySHFOa/6cEDex76jBt+gkniOEh2cjxxIVt6lkfTsk6UNTk6yCdwNK3nca/j+Q=="],

    "@oslojs/asn1": ["@oslojs/asn1@1.0.0", "", { "dependencies": { "@oslojs/binary": "1.0.0" } }, "sha512-zw/wn0sj0j0QKbIXfIlnEcTviaCzYOY3V5rAyjR6YtOByFtJiT574+8p9Wlach0lZH9fddD4yb9laEAIl4vXQA=="],

@@ -5676,10 +5668,6 @@

    "openid-client/lru-cache": ["lru-cache@6.0.0", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="],

-    "opentui-spinner/@opentui/core": ["@opentui/core@0.1.96", "", { "dependencies": { "bun-ffi-structs": "0.1.2", "diff": "8.0.2", "jimp": "1.6.0", "marked": "17.0.1", "yoga-layout": "3.2.1" }, "optionalDependencies": { "@dimforge/rapier2d-simd-compat": "^0.17.3", "@opentui/core-darwin-arm64": "0.1.96", "@opentui/core-darwin-x64": "0.1.96", "@opentui/core-linux-arm64": "0.1.96", "@opentui/core-linux-x64": "0.1.96", "@opentui/core-win32-arm64": "0.1.96", "@opentui/core-win32-x64": "0.1.96", "bun-webgpu": "0.1.5", "planck": "^1.4.2", "three": "0.177.0" }, "peerDependencies": { "web-tree-sitter": "0.25.10" } }, "sha512-VBO5zRiGM6fhibG3AwTMpf0JgbYWG0sXP5AsSJAYw8tQ18OCPj+EDLXGZ1DFmMnJWEi+glKYjmqnIp4yRCqi+Q=="],
-
-    "opentui-spinner/@opentui/solid": ["@opentui/solid@0.1.96", "", { "dependencies": { "@babel/core": "7.28.0", "@babel/preset-typescript": "7.27.1", "@opentui/core": "0.1.96", "babel-plugin-module-resolver": "5.0.2", "babel-preset-solid": "1.9.10", "entities": "7.0.1", "s-js": "^0.4.9" }, "peerDependencies": { "solid-js": "1.9.11" } }, "sha512-NGiVvG1ylswMjF9fzvpSaWLcZKQsPw67KRkIZgsdf4ZIKUZEZ94NktabCA92ti4WVGXhPvyM3SIX5S2+HvnJFg=="],
-
    "ora/bl": ["bl@4.1.0", "", { "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", "readable-stream": "^3.4.0" } }, "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="],

    "ora/chalk": ["chalk@4.1.2", "", { "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="],
@@ -6396,22 +6384,6 @@

    "opencontrol/@modelcontextprotocol/sdk/zod-to-json-schema": ["zod-to-json-schema@3.25.2", "", { "peerDependencies": { "zod": "^3.25.28 || ^4" } }, "sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA=="],

-    "opentui-spinner/@opentui/core/@opentui/core-darwin-arm64": ["@opentui/core-darwin-arm64@0.1.96", "", { "os": "darwin", "cpu": "arm64" }, "sha512-909i75uhLmlUFCK3LK4iICaymiA7QaB45X9IDX94KaDyHL3Y1PgYTzoRZLJlqeOfOBjVfEjMAh/zA5XexWDMpA=="],
-
-    "opentui-spinner/@opentui/core/@opentui/core-darwin-x64": ["@opentui/core-darwin-x64@0.1.96", "", { "os": "darwin", "cpu": "x64" }, "sha512-qukQjjScKldZAfgY9qVMPv4ZA6Ko7oXjNBUcSMGDgUiOitH6INT1cJQVUnAIu14DY15yEl08MEQ8soLDaSAHcg=="],
-
-    "opentui-spinner/@opentui/core/@opentui/core-linux-arm64": ["@opentui/core-linux-arm64@0.1.96", "", { "os": "linux", "cpu": "arm64" }, "sha512-9ktmyS24nfSmlFPX0GMWEaEYSjtEPbRn59y4KBhHVhzPsl+YKlzstyHomTBu51IAPu6oL3+t3Lu4gU+k1gFOQQ=="],
-
-    "opentui-spinner/@opentui/core/@opentui/core-linux-x64": ["@opentui/core-linux-x64@0.1.96", "", { "os": "linux", "cpu": "x64" }, "sha512-m2pVhIdtqFYO+QSMc2VZgSSCNxRGPL+U+aKYYbvJjPzqCnIkHB9eO0ePU4b3t+V7GaWCcCP3vDCy3g1J5/FreA=="],
-
-    "opentui-spinner/@opentui/core/@opentui/core-win32-arm64": ["@opentui/core-win32-arm64@0.1.96", "", { "os": "win32", "cpu": "arm64" }, "sha512-OybZ4jvX6H6RKYyGpZqzy3ZrwKaxaXKWwFsmG6pC2J+GRhf5oCIIEy3Y5573h7zy1cq3T9cb225KzBANq9j5BA=="],
-
-    "opentui-spinner/@opentui/core/@opentui/core-win32-x64": ["@opentui/core-win32-x64@0.1.96", "", { "os": "win32", "cpu": "x64" }, "sha512-3YKjg90j14I7dJ94yN0pAYcTf4ogCoohv6ptRdG96XUyzrYhQiDMP398vCIOMjaLBjtMtFmTxSf+W46zm96BCQ=="],
-
-    "opentui-spinner/@opentui/solid/@babel/core": ["@babel/core@7.28.0", "", { "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.0", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-module-transforms": "^7.27.3", "@babel/helpers": "^7.27.6", "@babel/parser": "^7.28.0", "@babel/template": "^7.27.2", "@babel/traverse": "^7.28.0", "@babel/types": "^7.28.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", "semver": "^6.3.1" } }, "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ=="],
-
-    "opentui-spinner/@opentui/solid/babel-preset-solid": ["babel-preset-solid@1.9.10", "", { "dependencies": { "babel-plugin-jsx-dom-expressions": "^0.40.3" }, "peerDependencies": { "@babel/core": "^7.0.0", "solid-js": "^1.9.10" }, "optionalPeers": ["solid-js"] }, "sha512-HCelrgua/Y+kqO8RyL04JBWS/cVdrtUv/h45GntgQY+cJl4eBcKkCDV3TdMjtKx1nXwRaR9QXslM/Npm1dxdZQ=="],
-
    "ora/bl/buffer": ["buffer@5.7.1", "", { "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" } }, "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="],

    "ora/bl/readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="],
@@ -6754,8 +6726,6 @@

    "opencontrol/@modelcontextprotocol/sdk/express/type-is": ["type-is@2.0.1", "", { "dependencies": { "content-type": "^1.0.5", "media-typer": "^1.1.0", "mime-types": "^3.0.0" } }, "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw=="],

-    "opentui-spinner/@opentui/solid/@babel/core/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],
-
    "ora/bl/buffer/ieee754": ["ieee754@1.2.1", "", {}, "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="],

    "pkg-up/find-up/locate-path/p-locate": ["p-locate@3.0.0", "", { "dependencies": { "p-limit": "^2.0.0" } }, "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="],
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-LRhPPrOKCGUSCEWTpAxPdWKTKVNkg82WrvD25cP3jts=",
-    "aarch64-linux": "sha256-sbNxkil47n+B7v6ds5EYFybLytXUyRlu0Cpka0ZmDx4=",
-    "aarch64-darwin": "sha256-5+99gtpIHGygMW3VBAexNhmaORgI8LCxPk/Gf1fW/ds=",
-    "x86_64-darwin": "sha256-LqnvZGGnQaRxIoowOr5gf6lFgDhbgQhVPiAcRTtU6fE="
+    "x86_64-linux": "sha256-cMIblNlBgq3fJonaFywzT/VrusmFhrHThOKa5p6vIlw=",
+    "aarch64-linux": "sha256-ougfUo4oqyyW2fBUK/i8U0//tqEvYnhNhnG2SR0s3B8=",
+    "aarch64-darwin": "sha256-3n0X0GfEydQgbRTmXnFpnQTKFFE9bOjmHXaJpHji4JE=",
+    "x86_64-darwin": "sha256-8KEV+Gy+UedqW25ene7O3M0aRPk8LdV8bAKrWCNfeLw="
  }
 }
@@ -27,7 +27,6 @@
    "catalog": {
      "@effect/platform-node": "4.0.0-beta.43",
      "@types/bun": "1.3.11",
-      "@types/cross-spawn": "6.0.6",
      "@octokit/rest": "22.0.0",
      "@hono/zod-validator": "0.4.2",
      "ulid": "3.0.1",
@@ -48,7 +47,6 @@
      "drizzle-orm": "1.0.0-beta.19-d95b7a4",
      "effect": "4.0.0-beta.43",
      "ai": "6.0.138",
-      "cross-spawn": "7.0.6",
      "hono": "4.10.7",
      "hono-openapi": "1.1.2",
      "fuzzysort": "3.1.0",
@@ -205,7 +205,7 @@ export async function closeDialog(page: Page, dialog: Locator) {
  await expect(dialog).toHaveCount(0)
 }

-async function isSidebarClosed(page: Page) {
+export async function isSidebarClosed(page: Page) {
  const button = await waitSidebarButton(page, "isSidebarClosed")
  return (await button.getAttribute("aria-expanded")) !== "true"
 }
@@ -236,7 +236,7 @@ async function errorBoundaryText(page: Page) {
  return [title ? "Error boundary" : "", description ?? "", detail ?? ""].filter(Boolean).join("\n")
 }

-async function assertHealthy(page: Page, context: string) {
+export async function assertHealthy(page: Page, context: string) {
  const text = await errorBoundaryText(page)
  if (!text) return
  console.log(`[e2e:error-boundary][${context}]\n${text}`)
@@ -1,88 +0,0 @@
-import type { Locator, Page } from "@playwright/test"
-import { test, expect } from "../fixtures"
-import { promptAgentSelector, promptModelSelector, promptSelector } from "../selectors"
-
-type Probe = {
-  agent?: string
-  model?: { providerID: string; modelID: string; name?: string }
-  models?: Array<{ providerID: string; modelID: string; name: string }>
-  agents?: Array<{ name: string }>
-}
-
-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 state(page: Page) {
-  const value = await probe(page)
-  if (!value) throw new Error("Failed to resolve model selection probe")
-  return value
-}
-
-async function ready(page: Page) {
-  const prompt = page.locator(promptSelector)
-  await prompt.click()
-  await expect(prompt).toBeFocused()
-  await prompt.pressSequentially("focus")
-  return prompt
-}
-
-async function body(prompt: Locator) {
-  return prompt.evaluate((el) => (el as HTMLElement).innerText)
-}
-
-test("agent select returns focus to the prompt", async ({ page, gotoSession }) => {
-  await gotoSession()
-
-  const prompt = await ready(page)
-
-  const info = await state(page)
-  const next = info.agents?.map((item) => item.name).find((name) => name !== info.agent)
-  test.skip(!next, "only one agent available")
-  if (!next) return
-
-  await page.locator(`${promptAgentSelector} [data-slot="select-select-trigger"]`).first().click()
-
-  const item = page.locator('[data-slot="select-select-item"]').filter({ hasText: next }).first()
-  await expect(item).toBeVisible()
-  await item.click({ force: true })
-
-  await expect(page.locator(`${promptAgentSelector} [data-slot="select-select-trigger-value"]`).first()).toHaveText(
-    next,
-  )
-  await expect(prompt).toBeFocused()
-  await prompt.pressSequentially(" agent")
-  await expect.poll(() => body(prompt)).toContain("focus agent")
-})
-
-test("model select returns focus to the prompt", async ({ page, gotoSession }) => {
-  await gotoSession()
-
-  const prompt = await ready(page)
-
-  const info = await state(page)
-  const key = info.model ? `${info.model.providerID}:${info.model.modelID}` : null
-  const next = info.models?.find((item) => `${item.providerID}:${item.modelID}` !== key)
-  test.skip(!next, "only one model available")
-  if (!next) return
-
-  await page.locator(`${promptModelSelector} [data-action="prompt-model"]`).first().click()
-
-  const item = page.locator(`[data-slot="list-item"][data-key="${next.providerID}:${next.modelID}"]`).first()
-  await expect(item).toBeVisible()
-  await item.click({ force: true })
-
-  await expect(page.locator(`${promptModelSelector} [data-action="prompt-model"] span`).first()).toHaveText(next.name)
-  await expect(prompt).toBeFocused()
-  await prompt.pressSequentially(" model")
-  await expect.poll(() => body(prompt)).toContain("focus model")
-})
@@ -1,7 +1,6 @@
 import type { ToolPart } from "@opencode-ai/sdk/v2/client"
 import { test, expect } from "../fixtures"
 import { withSession } from "../actions"
-import { promptModelSelector, promptSelector, promptVariantSelector } from "../selectors"

 const isBash = (part: unknown): part is ToolPart => {
  if (!part || typeof part !== "object") return false
@@ -10,6 +9,15 @@ const isBash = (part: unknown): part is ToolPart => {
  return "state" in part
 }

+async function setAutoAccept(page: Parameters<typeof test>[0]["page"], enabled: boolean) {
+  const button = page.locator('[data-action="prompt-permissions"]').first()
+  await expect(button).toBeVisible()
+  const pressed = (await button.getAttribute("aria-pressed")) === "true"
+  if (pressed === enabled) return
+  await button.click()
+  await expect(button).toHaveAttribute("aria-pressed", enabled ? "true" : "false")
+}
+
 test("shell mode runs a command in the project directory", async ({ page, project }) => {
  test.setTimeout(120_000)

@@ -19,12 +27,7 @@ test("shell mode runs a command in the project directory", async ({ page, projec
  await withSession(project.sdk, `e2e shell ${Date.now()}`, async (session) => {
    project.trackSession(session.id)
    await project.gotoSession(session.id)
-    const button = page.locator('[data-action="prompt-permissions"]').first()
-    await expect(button).toBeVisible()
-    if ((await button.getAttribute("aria-pressed")) !== "true") {
-      await button.click()
-      await expect(button).toHaveAttribute("aria-pressed", "true")
-    }
+    await setAutoAccept(page, true)
    await project.shell(cmd)

    await expect
@@ -54,18 +57,3 @@ test("shell mode runs a command in the project directory", async ({ page, projec
      .toEqual(expect.objectContaining({ cwd: project.directory, output: expect.stringContaining("README.md") }))
  })
 })
-
-test("shell mode unmounts model and variant controls", async ({ page, project }) => {
-  await project.open()
-
-  const prompt = page.locator(promptSelector).first()
-  await expect(page.locator(promptModelSelector)).toHaveCount(1)
-  await expect(page.locator(promptVariantSelector)).toHaveCount(1)
-
-  await prompt.click()
-  await page.keyboard.type("!")
-
-  await expect(prompt).toHaveAttribute("aria-label", /enter shell command/i)
-  await expect(page.locator(promptModelSelector)).toHaveCount(0)
-  await expect(page.locator(promptVariantSelector)).toHaveCount(0)
-})
@@ -1,5 +1,5 @@
 export const promptSelector = '[data-component="prompt-input"]'
-const terminalPanelSelector = '#terminal-panel[aria-hidden="false"]'
+export const terminalPanelSelector = '#terminal-panel[aria-hidden="false"]'
 export const terminalSelector = `${terminalPanelSelector} [data-component="terminal"]`
 export const sessionComposerDockSelector = '[data-component="session-prompt-dock"]'
 export const questionDockSelector = '[data-component="dock-prompt"][data-kind="question"]'
@@ -24,7 +24,7 @@ export const settingsSoundsErrorsSelector = '[data-action="settings-sounds-error
 export const settingsUpdatesStartupSelector = '[data-action="settings-updates-startup"]'
 export const settingsReleaseNotesSelector = '[data-action="settings-release-notes"]'

-const sidebarNavSelector = '[data-component="sidebar-nav-desktop"]'
+export const sidebarNavSelector = '[data-component="sidebar-nav-desktop"]'

 export const projectSwitchSelector = (slug: string) =>
  `${sidebarNavSelector} [data-action="project-switch"][data-project="${slug}"]`
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.3.17",
+  "version": "1.3.13",
  "description": "",
  "type": "module",
  "exports": {
@@ -15,7 +15,6 @@
    "build": "vite build",
    "serve": "vite preview",
    "test": "bun run test:unit",
-    "test:ci": "mkdir -p .artifacts/unit && bun test --preload ./happydom.ts ./src --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml",
    "test:unit": "bun test --preload ./happydom.ts ./src",
    "test:unit:watch": "bun test --watch --preload ./happydom.ts ./src",
    "test:e2e": "playwright test",
@@ -7,11 +7,6 @@ const serverPort = process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"
 const command = `bun run dev -- --host 0.0.0.0 --port ${port}`
 const reuse = !process.env.CI
 const workers = Number(process.env.PLAYWRIGHT_WORKERS ?? (process.env.CI ? 5 : 0)) || undefined
-const reporter = [["html", { outputFolder: "e2e/playwright-report", open: "never" }], ["line"]] as const
-
-if (process.env.PLAYWRIGHT_JUNIT_OUTPUT) {
-  reporter.push(["junit", { outputFile: process.env.PLAYWRIGHT_JUNIT_OUTPUT }])
-}

 export default defineConfig({
  testDir: "./e2e",
@@ -24,7 +19,7 @@ export default defineConfig({
  forbidOnly: !!process.env.CI,
  retries: process.env.CI ? 2 : 0,
  workers,
-  reporter,
+  reporter: [["html", { outputFolder: "e2e/playwright-report", open: "never" }], ["line"]],
  webServer: {
    command,
    url: baseURL,
@@ -86,7 +86,6 @@ const ModelList: Component<{
 }

 type ModelSelectorTriggerProps = Omit<ComponentProps<typeof Kobalte.Trigger>, "as" | "ref">
-type Dismiss = "escape" | "outside" | "select" | "manage" | "provider"

 export function ModelSelectorPopover(props: {
  provider?: string
@@ -94,31 +93,25 @@ export function ModelSelectorPopover(props: {
  children?: JSX.Element
  triggerAs?: ValidComponent
  triggerProps?: ModelSelectorTriggerProps
-  onClose?: (cause: "escape" | "select") => void
 }) {
  const [store, setStore] = createStore<{
    open: boolean
-    dismiss: Dismiss | null
+    dismiss: "escape" | "outside" | null
  }>({
    open: false,
    dismiss: null,
  })
  const dialog = useDialog()

-  const close = (dismiss: Dismiss) => {
-    setStore("dismiss", dismiss)
-    setStore("open", false)
-  }
-
  const handleManage = () => {
-    close("manage")
+    setStore("open", false)
    void import("./dialog-manage-models").then((x) => {
      dialog.show(() => <x.DialogManageModels />)
    })
  }

  const handleConnectProvider = () => {
-    close("provider")
+    setStore("open", false)
    void import("./dialog-select-provider").then((x) => {
      dialog.show(() => <x.DialogSelectProvider />)
    })
@@ -143,19 +136,21 @@ export function ModelSelectorPopover(props: {
        <Kobalte.Content
          class="w-72 h-80 flex flex-col p-2 rounded-md border border-border-base bg-surface-raised-stronger-non-alpha shadow-md z-50 outline-none overflow-hidden"
          onEscapeKeyDown={(event) => {
-            close("escape")
+            setStore("dismiss", "escape")
+            setStore("open", false)
            event.preventDefault()
            event.stopPropagation()
          }}
-          onPointerDownOutside={() => close("outside")}
-          onFocusOutside={() => close("outside")}
+          onPointerDownOutside={() => {
+            setStore("dismiss", "outside")
+            setStore("open", false)
+          }}
+          onFocusOutside={() => {
+            setStore("dismiss", "outside")
+            setStore("open", false)
+          }}
          onCloseAutoFocus={(event) => {
-            const dismiss = store.dismiss
-            if (dismiss === "outside") event.preventDefault()
-            if (dismiss === "escape" || dismiss === "select") {
-              event.preventDefault()
-              props.onClose?.(dismiss)
-            }
+            if (store.dismiss === "outside") event.preventDefault()
            setStore("dismiss", null)
          }}
        >
@@ -163,7 +158,7 @@ export function ModelSelectorPopover(props: {
          <ModelList
            provider={props.provider}
            model={props.model}
-            onSelect={() => close("select")}
+            onSelect={() => setStore("open", false)}
            class="p-1"
            action={
              <div class="flex items-center gap-1">
@@ -243,6 +243,23 @@ 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"),
  )
@@ -280,31 +297,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    if (store.mode === "shell") return 0
    return prompt.context.items().filter((item) => !!item.comment?.trim()).length
  })
-  const blank = createMemo(() => {
-    const text = prompt
-      .current()
-      .map((part) => ("content" in part ? part.content : ""))
-      .join("")
-    return text.trim().length === 0 && imageAttachments().length === 0 && commentCount() === 0
-  })
-  const stopping = createMemo(() => working() && blank())
-  const tip = () => {
-    if (stopping()) {
-      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 contextItems = createMemo(() => {
    const items = prompt.context.items()
@@ -510,15 +502,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    return getCursorPosition(editorRef)
  }

-  const restoreFocus = () => {
-    requestAnimationFrame(() => {
-      const cursor = prompt.cursor() ?? promptLength(prompt.current())
-      editorRef.focus()
-      setCursorPosition(editorRef, cursor)
-      queueScroll()
-    })
-  }
-
  const renderEditorWithCursor = (parts: Prompt) => {
    const cursor = currentCursor()
    renderEditor(parts)
@@ -1415,17 +1398,17 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
            />

            <div class="flex items-center gap-1 pointer-events-auto">
-              <Tooltip placement="top" inactive={!working() && blank()} value={tip()}>
+              <Tooltip placement="top" inactive={!prompt.dirty() && !working()} value={tip()}>
                <IconButton
                  data-action="prompt-submit"
                  type="submit"
-                  disabled={store.mode !== "normal" || (!working() && blank())}
+                  disabled={store.mode !== "normal" || (!prompt.dirty() && !working() && commentCount() === 0)}
                  tabIndex={store.mode === "normal" ? undefined : -1}
-                  icon={stopping() ? "stop" : "arrow-up"}
+                  icon={working() ? "stop" : "arrow-up"}
                  variant="primary"
                  class="size-8"
                  style={buttons()}
-                  aria-label={stopping() ? language.t("prompt.action.stop") : language.t("prompt.action.send")}
+                  aria-label={working() ? language.t("prompt.action.stop") : language.t("prompt.action.send")}
                />
              </Tooltip>
            </div>
@@ -1488,10 +1471,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                      size="normal"
                      options={agentNames()}
                      current={local.agent.current()?.name ?? ""}
-                      onSelect={(value) => {
-                        local.agent.set(value)
-                        restoreFocus()
-                      }}
+                      onSelect={local.agent.set}
                      class="capitalize max-w-[160px] text-text-base"
                      valueClass="truncate text-13-regular text-text-base"
                      triggerStyle={control()}
@@ -1500,62 +1480,28 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                    />
                  </TooltipKeybind>
                </div>
-                <Show when={store.mode !== "shell"}>
-                  <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={() => {
-                              void import("@/components/dialog-select-model-unpaid").then((x) => {
-                                dialog.show(() => <x.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>
-                      }
-                    >
+                <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")}
                      >
-                        <ModelSelectorPopover
-                          model={local.model}
-                          triggerAs={Button}
-                          triggerProps={{
-                            variant: "ghost",
-                            size: "normal",
-                            style: control(),
-                            class: "min-w-0 max-w-[320px] text-13-regular text-text-base group",
-                            "data-action": "prompt-model",
+                        <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={() => {
+                            void import("@/components/dialog-select-model-unpaid").then((x) => {
+                              dialog.show(() => <x.DialogSelectModelUnpaid model={local.model} />)
+                            })
                          }}
-                          onClose={restoreFocus}
                        >
                          <Show when={local.model.current()?.provider?.id}>
                            <ProviderIcon
@@ -1568,35 +1514,63 @@ 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")}
-                      keybind={command.keybind("model.variant.cycle")}
+                      title={language.t("command.model.choose")}
+                      keybind={command.keybind("model.choose")}
                    >
-                      <Select
-                        size="normal"
-                        options={variants()}
-                        current={local.model.variant.current() ?? "default"}
-                        label={(x) => (x === "default" ? language.t("common.default") : x)}
-                        onSelect={(value) => {
-                          local.model.variant.set(value === "default" ? undefined : value)
-                          restoreFocus()
+                      <ModelSelectorPopover
+                        model={local.model}
+                        triggerAs={Button}
+                        triggerProps={{
+                          variant: "ghost",
+                          size: "normal",
+                          style: control(),
+                          class: "min-w-0 max-w-[320px] text-13-regular text-text-base group",
+                          "data-action": "prompt-model",
                        }}
-                        class="capitalize max-w-[160px] text-text-base"
-                        valueClass="truncate text-13-regular text-text-base"
-                        triggerStyle={control()}
-                        triggerProps={{ "data-action": "prompt-model-variant" }}
-                        variant="ghost"
-                      />
+                      >
+                        <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" />
+                      </ModelSelectorPopover>
                    </TooltipKeybind>
-                  </div>
-                </Show>
+                  </Show>
+                </div>
+                <div data-component="prompt-variant-control">
+                  <TooltipKeybind
+                    placement="top"
+                    gutter={4}
+                    title={language.t("command.model.variant.cycle")}
+                    keybind={command.keybind("model.variant.cycle")}
+                  >
+                    <Select
+                      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] text-text-base"
+                      valueClass="truncate text-13-regular text-text-base"
+                      triggerStyle={control()}
+                      triggerProps={{ "data-action": "prompt-model-variant" }}
+                      variant="ghost"
+                    />
+                  </TooltipKeybind>
+                </div>
                <TooltipKeybind
                  placement="top"
                  gutter={8}
@@ -139,6 +139,11 @@ export const SettingsGeneral: Component = () => {
    { value: "dark", label: language.t("theme.scheme.dark") },
  ])

+  const followupOptions = createMemo((): { value: "queue" | "steer"; label: string }[] => [
+    { value: "queue", label: language.t("settings.general.row.followup.option.queue") },
+    { value: "steer", label: language.t("settings.general.row.followup.option.steer") },
+  ])
+
  const languageOptions = createMemo(() =>
    language.locales.map((locale) => ({
      value: locale,
@@ -236,6 +241,24 @@ export const SettingsGeneral: Component = () => {
            />
          </div>
        </SettingsRow>
+
+        <SettingsRow
+          title={language.t("settings.general.row.followup.title")}
+          description={language.t("settings.general.row.followup.description")}
+        >
+          <Select
+            data-action="settings-followup"
+            options={followupOptions()}
+            current={followupOptions().find((o) => o.value === settings.general.followup())}
+            value={(o) => o.value}
+            label={(o) => o.label}
+            onSelect={(option) => option && settings.general.setFollowup(option.value)}
+            variant="secondary"
+            size="small"
+            triggerVariant="settings"
+            triggerStyle={{ "min-width": "180px" }}
+          />
+        </SettingsRow>
      </SettingsList>
    </div>
  )
@@ -248,7 +248,7 @@ export async function bootstrapDirectory(input: {
        input.sdk.vcs.get().then((x) => {
          const next = x.data ?? input.store.vcs
          input.setStore("vcs", next)
-          if (next) input.vcsCache.setStore("value", next)
+          if (next?.branch) input.vcsCache.setStore("value", next)
        }),
      ),
    () => retry(() => input.sdk.command.list().then((x) => input.setStore("command", x.data ?? []))),
@@ -494,10 +494,8 @@ describe("applyDirectoryEvent", () => {
  })

  test("updates vcs branch in store and cache", () => {
-    const [store, setStore] = createStore(baseState({ vcs: { branch: "main", default_branch: "main" } }))
-    const [cacheStore, setCacheStore] = createStore({
-      value: { branch: "main", default_branch: "main" } as State["vcs"],
-    })
+    const [store, setStore] = createStore(baseState())
+    const [cacheStore, setCacheStore] = createStore({ value: undefined as State["vcs"] })

    applyDirectoryEvent({
      event: { type: "vcs.branch.updated", properties: { branch: "feature/test" } },
@@ -513,8 +511,8 @@ describe("applyDirectoryEvent", () => {
      },
    })

-    expect(store.vcs).toEqual({ branch: "feature/test", default_branch: "main" })
-    expect(cacheStore.value).toEqual({ branch: "feature/test", default_branch: "main" })
+    expect(store.vcs).toEqual({ branch: "feature/test" })
+    expect(cacheStore.value).toEqual({ branch: "feature/test" })
  })

  test("routes disposal and lsp events to side-effect handlers", () => {
@@ -271,9 +271,9 @@ export function applyDirectoryEvent(input: {
      break
    }
    case "vcs.branch.updated": {
-      const props = event.properties as { branch?: string }
+      const props = event.properties as { branch: string }
      if (input.store.vcs?.branch === props.branch) break
-      const next = { ...input.store.vcs, branch: props.branch }
+      const next = { branch: props.branch }
      input.setStore("vcs", next)
      if (input.vcsCache) input.vcsCache.setStore("value", next)
      break
@@ -136,11 +136,6 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
      root.style.setProperty("--font-family-sans", sansFontFamily(store.appearance?.sans))
    })

-    createEffect(() => {
-      if (store.general?.followup !== "queue") return
-      setStore("general", "followup", "steer")
-    })
-
    return {
      ready,
      get current() {
@@ -155,12 +150,9 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
        setReleaseNotes(value: boolean) {
          setStore("general", "releaseNotes", value)
        },
-        followup: withFallback(
-          () => (store.general?.followup === "queue" ? "steer" : store.general?.followup),
-          defaultSettings.general.followup,
-        ),
+        followup: withFallback(() => store.general?.followup, defaultSettings.general.followup),
        setFollowup(value: "queue" | "steer") {
-          setStore("general", "followup", value === "queue" ? "steer" : value)
+          setStore("general", "followup", value)
        },
        showReasoningSummaries: withFallback(
          () => store.general?.showReasoningSummaries,
@@ -535,8 +535,6 @@ export const dict = {
  "session.review.noVcs.createGit.action": "Create Git repository",
  "session.review.noSnapshot": "Snapshot tracking is disabled in config, so session changes are unavailable",
  "session.review.noChanges": "No changes",
-  "session.review.noUncommittedChanges": "No uncommitted changes yet",
-  "session.review.noBranchChanges": "No branch changes yet",

  "session.files.selectToOpen": "Select a file to open",
  "session.files.all": "All files",
@@ -16,7 +16,6 @@ import { getAvatarColors, type LocalProject, useLayout } from "@/context/layout"
 import { useNotification } from "@/context/notification"
 import { usePermission } from "@/context/permission"
 import { messageAgentColor } from "@/utils/agent"
-import { sessionTitle } from "@/utils/session-title"
 import { sessionPermissionRequest } from "../session/composer/session-request-tree"
 import { hasProjectPermissions } from "./helpers"

@@ -102,46 +101,42 @@ const SessionRow = (props: {
  warmPress: () => void
  warmFocus: () => void
  cancelHoverPrefetch: () => void
-}) => {
-  const title = () => sessionTitle(props.session.title)
-
-  return (
-    <A
-      href={`/${props.slug}/session/${props.session.id}`}
-      class={`flex items-center gap-1 min-w-0 w-full text-left focus:outline-none ${props.dense ? "py-0.5" : "py-1"}`}
-      onPointerDown={props.warmPress}
-      onPointerEnter={props.warmHover}
-      onPointerLeave={props.cancelHoverPrefetch}
-      onFocus={props.warmFocus}
-      onClick={() => {
-        props.setHoverSession(undefined)
-        if (props.sidebarOpened()) return
-        props.clearHoverProjectSoon()
-      }}
+}): JSX.Element => (
+  <A
+    href={`/${props.slug}/session/${props.session.id}`}
+    class={`flex items-center gap-1 min-w-0 w-full text-left focus:outline-none ${props.dense ? "py-0.5" : "py-1"}`}
+    onPointerDown={props.warmPress}
+    onPointerEnter={props.warmHover}
+    onPointerLeave={props.cancelHoverPrefetch}
+    onFocus={props.warmFocus}
+    onClick={() => {
+      props.setHoverSession(undefined)
+      if (props.sidebarOpened()) return
+      props.clearHoverProjectSoon()
+    }}
+  >
+    <div
+      class="shrink-0 size-6 flex items-center justify-center"
+      style={{ color: props.tint() ?? "var(--icon-interactive-base)" }}
    >
-      <div
-        class="shrink-0 size-6 flex items-center justify-center"
-        style={{ color: props.tint() ?? "var(--icon-interactive-base)" }}
-      >
-        <Switch fallback={<Icon name="dash" size="small" class="text-icon-weak" />}>
-          <Match when={props.isWorking()}>
-            <Spinner class="size-[15px]" />
-          </Match>
-          <Match when={props.hasPermissions()}>
-            <div class="size-1.5 rounded-full bg-surface-warning-strong" />
-          </Match>
-          <Match when={props.hasError()}>
-            <div class="size-1.5 rounded-full bg-text-diff-delete-base" />
-          </Match>
-          <Match when={props.unseenCount() > 0}>
-            <div class="size-1.5 rounded-full bg-text-interactive-base" />
-          </Match>
-        </Switch>
-      </div>
-      <span class="text-14-regular text-text-strong min-w-0 flex-1 truncate">{title()}</span>
-    </A>
-  )
-}
+      <Switch fallback={<Icon name="dash" size="small" class="text-icon-weak" />}>
+        <Match when={props.isWorking()}>
+          <Spinner class="size-[15px]" />
+        </Match>
+        <Match when={props.hasPermissions()}>
+          <div class="size-1.5 rounded-full bg-surface-warning-strong" />
+        </Match>
+        <Match when={props.hasError()}>
+          <div class="size-1.5 rounded-full bg-text-diff-delete-base" />
+        </Match>
+        <Match when={props.unseenCount() > 0}>
+          <div class="size-1.5 rounded-full bg-text-interactive-base" />
+        </Match>
+      </Switch>
+    </div>
+    <span class="text-14-regular text-text-strong min-w-0 flex-1 truncate">{props.session.title}</span>
+  </A>
+)

 const SessionHoverPreview = (props: {
  mobile?: boolean
@@ -324,7 +319,7 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
            fallback={
              <Tooltip
                placement={props.mobile ? "bottom" : "right"}
-                value={sessionTitle(props.session.title)}
+                value={props.session.title}
                gutter={10}
                class="min-w-0 w-full"
              >
@@ -1,4 +1,4 @@
-import type { FileDiff, Project, UserMessage } from "@opencode-ai/sdk/v2"
+import type { Project, UserMessage } from "@opencode-ai/sdk/v2"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useMutation } from "@tanstack/solid-query"
 import {
@@ -68,9 +68,6 @@ type FollowupItem = FollowupDraft & { id: string }
 type FollowupEdit = Pick<FollowupItem, "id" | "prompt" | "context">
 const emptyFollowups: FollowupItem[] = []

-type ChangeMode = "git" | "branch" | "session" | "turn"
-type VcsMode = "git" | "branch"
-
 type SessionHistoryWindowInput = {
  sessionID: () => string | undefined
  messagesReady: () => boolean
@@ -350,7 +347,6 @@ export default function Page() {
    scroll: {
      overflow: false,
      bottom: true,
-      jump: false,
    },
  })

@@ -430,16 +426,15 @@ export default function Page() {

  const info = createMemo(() => (params.id ? sync.session.get(params.id) : undefined))
  const diffs = createMemo(() => (params.id ? (sync.data.session_diff[params.id] ?? []) : []))
-  const sessionCount = createMemo(() => Math.max(info()?.summary?.files ?? 0, diffs().length))
-  const hasSessionReview = createMemo(() => sessionCount() > 0)
-  const canReview = createMemo(() => !!sync.project)
+  const reviewCount = createMemo(() => Math.max(info()?.summary?.files ?? 0, diffs().length))
+  const hasReview = createMemo(() => reviewCount() > 0)
  const reviewTab = createMemo(() => isDesktop())
  const tabState = createSessionTabs({
    tabs,
    pathFromTab: file.pathFromTab,
    normalizeTab,
    review: reviewTab,
-    hasReview: canReview,
+    hasReview,
  })
  const contextOpen = tabState.contextOpen
  const openedTabs = tabState.openedTabs
@@ -462,12 +457,6 @@ export default function Page() {
    if (!id) return false
    return sync.session.history.loading(id)
  })
-  const diffsReady = createMemo(() => {
-    const id = params.id
-    if (!id) return true
-    if (!hasSessionReview()) return true
-    return sync.data.session_diff[id] !== undefined
-  })

  const userMessages = createMemo(
    () => messages().filter((m) => m.role === "user") as UserMessage[],
@@ -521,22 +510,11 @@ export default function Page() {
  const [store, setStore] = createStore({
    messageId: undefined as string | undefined,
    mobileTab: "session" as "session" | "changes",
-    changes: "git" as ChangeMode,
+    changes: "session" as "session" | "turn",
    newSessionWorktree: "main",
    deferRender: false,
  })

-  const [vcs, setVcs] = createStore({
-    diff: {
-      git: [] as FileDiff[],
-      branch: [] as FileDiff[],
-    },
-    ready: {
-      git: false,
-      branch: false,
-    },
-  })
-
  const [followup, setFollowup] = persisted(
    Persist.workspace(sdk.directory, "followup", ["followup.v1"]),
    createStore<{
@@ -570,68 +548,6 @@ export default function Page() {
  let todoTimer: number | undefined
  let diffFrame: number | undefined
  let diffTimer: number | undefined
-  const vcsTask = new Map<VcsMode, Promise<void>>()
-  const vcsRun = new Map<VcsMode, number>()
-
-  const bumpVcs = (mode: VcsMode) => {
-    const next = (vcsRun.get(mode) ?? 0) + 1
-    vcsRun.set(mode, next)
-    return next
-  }
-
-  const resetVcs = (mode?: VcsMode) => {
-    const list = mode ? [mode] : (["git", "branch"] as const)
-    list.forEach((item) => {
-      bumpVcs(item)
-      vcsTask.delete(item)
-      setVcs("diff", item, [])
-      setVcs("ready", item, false)
-    })
-  }
-
-  const loadVcs = (mode: VcsMode, force = false) => {
-    if (sync.project?.vcs !== "git") return Promise.resolve()
-    if (!force && vcs.ready[mode]) return Promise.resolve()
-
-    if (force) {
-      if (vcsTask.has(mode)) bumpVcs(mode)
-      vcsTask.delete(mode)
-      setVcs("ready", mode, false)
-    }
-
-    const current = vcsTask.get(mode)
-    if (current) return current
-
-    const run = bumpVcs(mode)
-
-    const task = sdk.client.vcs
-      .diff({ mode })
-      .then((result) => {
-        if (vcsRun.get(mode) !== run) return
-        setVcs("diff", mode, result.data ?? [])
-        setVcs("ready", mode, true)
-      })
-      .catch((error) => {
-        if (vcsRun.get(mode) !== run) return
-        console.debug("[session-review] failed to load vcs diff", { mode, error })
-        setVcs("diff", mode, [])
-        setVcs("ready", mode, true)
-      })
-      .finally(() => {
-        if (vcsTask.get(mode) === task) vcsTask.delete(mode)
-      })
-
-    vcsTask.set(mode, task)
-    return task
-  }
-
-  const refreshVcs = () => {
-    resetVcs()
-    const mode = untrack(vcsMode)
-    if (!mode) return
-    if (!untrack(wantsReview)) return
-    void loadVcs(mode, true)
-  }

  createComputed((prev) => {
    const open = desktopReviewOpen()
@@ -647,42 +563,7 @@ export default function Page() {
  }, desktopReviewOpen())

  const turnDiffs = createMemo(() => lastUserMessage()?.summary?.diffs ?? [])
-  const changesOptions = createMemo<ChangeMode[]>(() => {
-    const list: ChangeMode[] = []
-    if (sync.project?.vcs === "git") list.push("git")
-    if (
-      sync.project?.vcs === "git" &&
-      sync.data.vcs?.branch &&
-      sync.data.vcs?.default_branch &&
-      sync.data.vcs.branch !== sync.data.vcs.default_branch
-    ) {
-      list.push("branch")
-    }
-    list.push("session", "turn")
-    return list
-  })
-  const vcsMode = createMemo<VcsMode | undefined>(() => {
-    if (store.changes === "git" || store.changes === "branch") return store.changes
-  })
-  const reviewDiffs = createMemo(() => {
-    if (store.changes === "git") return vcs.diff.git
-    if (store.changes === "branch") return vcs.diff.branch
-    if (store.changes === "session") return diffs()
-    return turnDiffs()
-  })
-  const reviewCount = createMemo(() => {
-    if (store.changes === "git") return vcs.diff.git.length
-    if (store.changes === "branch") return vcs.diff.branch.length
-    if (store.changes === "session") return sessionCount()
-    return turnDiffs().length
-  })
-  const hasReview = createMemo(() => reviewCount() > 0)
-  const reviewReady = createMemo(() => {
-    if (store.changes === "git") return vcs.ready.git
-    if (store.changes === "branch") return vcs.ready.branch
-    if (store.changes === "session") return !hasSessionReview() || diffsReady()
-    return true
-  })
+  const reviewDiffs = createMemo(() => (store.changes === "session" ? diffs() : turnDiffs()))

  const newSessionWorktree = createMemo(() => {
    if (store.newSessionWorktree === "create") return "create"
@@ -748,7 +629,13 @@ export default function Page() {
    scrollToMessage(msgs[targetIndex], "auto")
  }

-  const sessionEmptyKey = createMemo(() => {
+  const diffsReady = createMemo(() => {
+    const id = params.id
+    if (!id) return true
+    if (!hasReview()) return true
+    return sync.data.session_diff[id] !== undefined
+  })
+  const reviewEmptyKey = createMemo(() => {
    const project = sync.project
    if (project && !project.vcs) return "session.review.noVcs"
    if (sync.data.config.snapshot === false) return "session.review.noSnapshot"
@@ -902,46 +789,13 @@ export default function Page() {
      sessionKey,
      () => {
        setStore("messageId", undefined)
-        setStore("changes", "git")
+        setStore("changes", "session")
        setUi("pendingMessage", undefined)
      },
      { defer: true },
    ),
  )

-  createEffect(
-    on(
-      () => sdk.directory,
-      () => {
-        resetVcs()
-      },
-      { defer: true },
-    ),
-  )
-
-  createEffect(
-    on(
-      () => [sync.data.vcs?.branch, sync.data.vcs?.default_branch] as const,
-      (next, prev) => {
-        if (prev === undefined || same(next, prev)) return
-        refreshVcs()
-      },
-      { defer: true },
-    ),
-  )
-
-  const stopVcs = sdk.event.listen((evt) => {
-    if (evt.details.type !== "file.watcher.updated") return
-    const props =
-      typeof evt.details.properties === "object" && evt.details.properties
-        ? (evt.details.properties as Record<string, unknown>)
-        : undefined
-    const file = typeof props?.file === "string" ? props.file : undefined
-    if (!file || file.startsWith(".git/")) return
-    refreshVcs()
-  })
-  onCleanup(stopVcs)
-
  createEffect(
    on(
      () => params.dir,
@@ -1064,40 +918,6 @@ export default function Page() {
  }

  const mobileChanges = createMemo(() => !isDesktop() && store.mobileTab === "changes")
-  const wantsReview = createMemo(() =>
-    isDesktop()
-      ? desktopFileTreeOpen() || (desktopReviewOpen() && activeTab() === "review")
-      : store.mobileTab === "changes",
-  )
-
-  createEffect(() => {
-    const list = changesOptions()
-    if (list.includes(store.changes)) return
-    const next = list[0]
-    if (!next) return
-    setStore("changes", next)
-  })
-
-  createEffect(() => {
-    const mode = vcsMode()
-    if (!mode) return
-    if (!wantsReview()) return
-    void loadVcs(mode)
-  })
-
-  createEffect(
-    on(
-      () => sync.data.session_status[params.id ?? ""]?.type,
-      (next, prev) => {
-        const mode = vcsMode()
-        if (!mode) return
-        if (!wantsReview()) return
-        if (next !== "idle" || prev === undefined || prev === "idle") return
-        void loadVcs(mode, true)
-      },
-      { defer: true },
-    ),
-  )

  const fileTreeTab = () => layout.fileTree.tab()
  const setFileTreeTab = (value: "changes" | "all") => layout.fileTree.setTab(value)
@@ -1144,23 +964,21 @@ export default function Page() {
    loadFile: file.load,
  })

-  const changesTitle = () => {
-    if (!canReview()) {
-      return null
-    }
+  const changesOptions = ["session", "turn"] as const
+  const changesOptionsList = [...changesOptions]

-    const label = (option: ChangeMode) => {
-      if (option === "git") return language.t("ui.sessionReview.title.git")
-      if (option === "branch") return language.t("ui.sessionReview.title.branch")
-      if (option === "session") return language.t("ui.sessionReview.title")
-      return language.t("ui.sessionReview.title.lastTurn")
+  const changesTitle = () => {
+    if (!hasReview()) {
+      return null
    }

    return (
      <Select
-        options={changesOptions()}
+        options={changesOptionsList}
        current={store.changes}
-        label={label}
+        label={(option) =>
+          option === "session" ? language.t("ui.sessionReview.title") : language.t("ui.sessionReview.title.lastTurn")
+        }
        onSelect={(option) => option && setStore("changes", option)}
        variant="ghost"
        size="small"
@@ -1169,34 +987,20 @@ export default function Page() {
    )
  }

-  const empty = (text: string) => (
+  const emptyTurn = () => (
    <div class="h-full pb-64 -mt-4 flex flex-col items-center justify-center text-center gap-6">
-      <div class="text-14-regular text-text-weak max-w-56">{text}</div>
+      <div class="text-14-regular text-text-weak max-w-56">{language.t("session.review.noChanges")}</div>
    </div>
  )

-  const reviewEmptyText = createMemo(() => {
-    if (store.changes === "git") return language.t("session.review.noUncommittedChanges")
-    if (store.changes === "branch") return language.t("session.review.noBranchChanges")
-    if (store.changes === "turn") return language.t("session.review.noChanges")
-    return language.t(sessionEmptyKey())
-  })
-
  const reviewEmpty = (input: { loadingClass: string; emptyClass: string }) => {
-    if (store.changes === "git" || store.changes === "branch") {
-      if (!reviewReady()) return <div class={input.loadingClass}>{language.t("session.review.loadingChanges")}</div>
-      return empty(reviewEmptyText())
-    }
+    if (store.changes === "turn") return emptyTurn()

-    if (store.changes === "turn") {
-      return empty(reviewEmptyText())
-    }
-
-    if (hasSessionReview() && !diffsReady()) {
+    if (hasReview() && !diffsReady()) {
      return <div class={input.loadingClass}>{language.t("session.review.loadingChanges")}</div>
    }

-    if (sessionEmptyKey() === "session.review.noVcs") {
+    if (reviewEmptyKey() === "session.review.noVcs") {
      return (
        <div class={input.emptyClass}>
          <div class="flex flex-col gap-3">
@@ -1216,7 +1020,7 @@ export default function Page() {

    return (
      <div class={input.emptyClass}>
-        <div class="text-14-regular text-text-weak max-w-56">{reviewEmptyText()}</div>
+        <div class="text-14-regular text-text-weak max-w-56">{language.t(reviewEmptyKey())}</div>
      </div>
    )
  }
@@ -1323,7 +1127,7 @@ export default function Page() {
    const pending = tree.pendingDiff
    if (!pending) return
    if (!tree.reviewScroll) return
-    if (!reviewReady()) return
+    if (!diffsReady()) return

    const attempt = (count: number) => {
      if (tree.pendingDiff !== pending) return
@@ -1364,7 +1168,10 @@ export default function Page() {
    const id = params.id
    if (!id) return

-    if (!wantsReview()) return
+    const wants = isDesktop()
+      ? desktopFileTreeOpen() || (desktopReviewOpen() && activeTab() === "review")
+      : store.mobileTab === "changes"
+    if (!wants) return
    if (sync.data.session_diff[id] !== undefined) return
    if (sync.status === "loading") return

@@ -1373,7 +1180,13 @@ export default function Page() {

  createEffect(
    on(
-      () => [sessionKey(), wantsReview()] as const,
+      () =>
+        [
+          sessionKey(),
+          isDesktop()
+            ? desktopFileTreeOpen() || (desktopReviewOpen() && activeTab() === "review")
+            : store.mobileTab === "changes",
+        ] as const,
      ([key, wants]) => {
        if (diffFrame !== undefined) cancelAnimationFrame(diffFrame)
        if (diffTimer !== undefined) window.clearTimeout(diffTimer)
@@ -1434,17 +1247,13 @@ export default function Page() {
  let scrollStateTarget: HTMLDivElement | undefined
  let fillFrame: number | undefined

-  const jumpThreshold = (el: HTMLDivElement) => Math.max(400, el.clientHeight)
-
  const updateScrollState = (el: HTMLDivElement) => {
    const max = el.scrollHeight - el.clientHeight
-    const distance = max - el.scrollTop
    const overflow = max > 1
-    const bottom = !overflow || distance <= 2
-    const jump = overflow && distance > jumpThreshold(el)
+    const bottom = !overflow || el.scrollTop >= max - 2

-    if (ui.scroll.overflow === overflow && ui.scroll.bottom === bottom && ui.scroll.jump === jump) return
-    setUi("scroll", { overflow, bottom, jump })
+    if (ui.scroll.overflow === overflow && ui.scroll.bottom === bottom) return
+    setUi("scroll", { overflow, bottom })
  }

  const scheduleScrollState = (el: HTMLDivElement) => {
@@ -2053,12 +1862,6 @@ export default function Page() {
        </div>

        <SessionSidePanel
-          canReview={canReview}
-          diffs={reviewDiffs}
-          diffsReady={reviewReady}
-          empty={reviewEmptyText}
-          hasReview={hasReview}
-          reviewCount={reviewCount}
          reviewPanel={reviewPanel}
          activeDiff={tree.activeDiff}
          focusReviewDiff={focusReviewDiff}
@@ -7,7 +7,7 @@ import { useSpring } from "@opencode-ai/ui/motion-spring"
 import { TextReveal } from "@opencode-ai/ui/text-reveal"
 import { TextStrikethrough } from "@opencode-ai/ui/text-strikethrough"
 import { createResizeObserver } from "@solid-primitives/resize-observer"
-import { Index, createEffect, createMemo, onCleanup } from "solid-js"
+import { Index, createEffect, createMemo, on, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
 import { composerEnabled, composerProbe } from "@/testing/session-composer"
 import { useLanguage } from "@/context/language"
@@ -210,25 +210,76 @@ export function SessionTodoDock(props: {
            opacity: `${Math.max(0, Math.min(1, 1 - hide()))}`,
          }}
        >
-          <TodoList todos={props.todos} />
+          <TodoList todos={props.todos} open={!store.collapsed} />
        </div>
      </div>
    </DockTray>
  )
 }

-function TodoList(props: { todos: Todo[] }) {
+function TodoList(props: { todos: Todo[]; open: boolean }) {
  const [store, setStore] = createStore({
    stuck: false,
+    scrolling: false,
+  })
+  let scrollRef!: HTMLDivElement
+  let timer: number | undefined
+
+  const inProgress = createMemo(() => props.todos.findIndex((todo) => todo.status === "in_progress"))
+
+  const ensure = () => {
+    if (!props.open) return
+    if (store.scrolling) return
+    if (!scrollRef || scrollRef.offsetParent === null) return
+
+    const el = scrollRef.querySelector("[data-in-progress]")
+    if (!(el instanceof HTMLElement)) return
+
+    const topFade = 16
+    const bottomFade = 44
+    const container = scrollRef.getBoundingClientRect()
+    const rect = el.getBoundingClientRect()
+    const top = rect.top - container.top + scrollRef.scrollTop
+    const bottom = rect.bottom - container.top + scrollRef.scrollTop
+    const viewTop = scrollRef.scrollTop + topFade
+    const viewBottom = scrollRef.scrollTop + scrollRef.clientHeight - bottomFade
+
+    if (top < viewTop) {
+      scrollRef.scrollTop = Math.max(0, top - topFade)
+    } else if (bottom > viewBottom) {
+      scrollRef.scrollTop = bottom - (scrollRef.clientHeight - bottomFade)
+    }
+
+    setStore("stuck", scrollRef.scrollTop > 0)
+  }
+
+  createEffect(
+    on([() => props.open, inProgress], () => {
+      if (!props.open || inProgress() < 0) return
+      requestAnimationFrame(ensure)
+    }),
+  )
+
+  onCleanup(() => {
+    if (!timer) return
+    window.clearTimeout(timer)
  })

  return (
    <div class="relative">
      <div
        class="px-3 pb-11 flex flex-col gap-1.5 max-h-42 overflow-y-auto no-scrollbar"
+        ref={scrollRef}
        style={{ "overflow-anchor": "none" }}
        onScroll={(e) => {
          setStore("stuck", e.currentTarget.scrollTop > 0)
+          setStore("scrolling", true)
+          if (timer) window.clearTimeout(timer)
+          timer = window.setTimeout(() => {
+            setStore("scrolling", false)
+            if (inProgress() < 0) return
+            requestAnimationFrame(ensure)
+          }, 250)
        }}
      >
        <Index each={props.todos}>
@@ -29,7 +29,6 @@ import { useSettings } from "@/context/settings"
 import { useSDK } from "@/context/sdk"
 import { useSync } from "@/context/sync"
 import { messageAgentColor } from "@/utils/agent"
-import { sessionTitle } from "@/utils/session-title"
 import { parseCommentNote, readCommentMetadata } from "@/utils/comment-note"
 import { makeTimer } from "@solid-primitives/timer"

@@ -44,6 +43,7 @@ type MessageComment = {

 const emptyMessages: MessageType[] = []
 const idle = { type: "idle" as const }
+
 type UserActions = {
  fork?: (input: { sessionID: string; messageID: string }) => Promise<void> | void
  revert?: (input: { sessionID: string; messageID: string }) => Promise<void> | void
@@ -200,7 +200,7 @@ export function MessageTimeline(props: {
  mobileChanges: boolean
  mobileFallback: JSX.Element
  actions?: UserActions
-  scroll: { overflow: boolean; bottom: boolean; jump: boolean }
+  scroll: { overflow: boolean; bottom: boolean }
  onResumeScroll: () => void
  setScrollRef: (el: HTMLDivElement | undefined) => void
  onScheduleScrollState: (el: HTMLDivElement) => void
@@ -291,7 +291,6 @@ export function MessageTimeline(props: {
    return sync.session.get(id)
  })
  const titleValue = createMemo(() => info()?.title)
-  const titleLabel = createMemo(() => sessionTitle(titleValue()))
  const shareUrl = createMemo(() => info()?.share?.url)
  const shareEnabled = createMemo(() => sync.data.config.share !== "disabled")
  const parentID = createMemo(() => info()?.parentID)
@@ -400,7 +399,7 @@ export function MessageTimeline(props: {

  const openTitleEditor = () => {
    if (!sessionID()) return
-    setTitle({ editing: true, draft: titleLabel() ?? "" })
+    setTitle({ editing: true, draft: titleValue() ?? "" })
    requestAnimationFrame(() => {
      titleRef?.focus()
      titleRef?.select()
@@ -418,7 +417,7 @@ export function MessageTimeline(props: {
    if (titleMutation.isPending) return

    const next = title.draft.trim()
-    if (!next || next === (titleLabel() ?? "")) {
+    if (!next || next === (titleValue() ?? "")) {
      setTitle("editing", false)
      return
    }
@@ -533,9 +532,7 @@ export function MessageTimeline(props: {
  }

  function DialogDeleteSession(props: { sessionID: string }) {
-    const name = createMemo(
-      () => sessionTitle(sync.session.get(props.sessionID)?.title) ?? language.t("command.session.new"),
-    )
+    const name = createMemo(() => sync.session.get(props.sessionID)?.title ?? language.t("command.session.new"))
    const handleDelete = async () => {
      await deleteSession(props.sessionID)
      dialog.close()
@@ -571,9 +568,10 @@ export function MessageTimeline(props: {
        <div
          class="absolute left-1/2 -translate-x-1/2 bottom-6 z-[60] pointer-events-none transition-all duration-200 ease-out"
          classList={{
-            "opacity-100 translate-y-0 scale-100": props.scroll.overflow && props.scroll.jump && !staging.isStaging(),
+            "opacity-100 translate-y-0 scale-100":
+              props.scroll.overflow && !props.scroll.bottom && !staging.isStaging(),
            "opacity-0 translate-y-2 scale-95 pointer-events-none":
-              !props.scroll.overflow || !props.scroll.jump || staging.isStaging(),
+              !props.scroll.overflow || props.scroll.bottom || staging.isStaging(),
          }}
        >
          <button
@@ -676,7 +674,7 @@ export function MessageTimeline(props: {
                          </div>
                        </Show>
                      </div>
-                      <Show when={titleLabel() || title.editing}>
+                      <Show when={titleValue() || title.editing}>
                        <Show
                          when={title.editing}
                          fallback={
@@ -684,7 +682,7 @@ export function MessageTimeline(props: {
                              class="text-14-medium text-text-strong truncate grow-1 min-w-0"
                              onDblClick={openTitleEditor}
                            >
-                              {titleLabel()}
+                              {titleValue()}
                            </h1>
                          }
                        >
@@ -8,7 +8,6 @@ import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
 import { Mark } from "@opencode-ai/ui/logo"
 import { DragDropProvider, DragDropSensors, DragOverlay, SortableProvider, closestCenter } from "@thisbeyond/solid-dnd"
 import type { DragEvent } from "@thisbeyond/solid-dnd"
-import type { FileDiff } from "@opencode-ai/sdk/v2"
 import { ConstrainDragYAxis, getDraggableId } from "@/utils/solid-dnd"
 import { useDialog } from "@opencode-ai/ui/context/dialog"

@@ -19,6 +18,7 @@ import { useCommand } from "@/context/command"
 import { useFile, type SelectedLineRange } from "@/context/file"
 import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
+import { useSync } from "@/context/sync"
 import { createFileTabListSync } from "@/pages/session/file-tab-scroll"
 import { FileTabContent } from "@/pages/session/file-tabs"
 import { createOpenSessionFileTab, createSessionTabs, getTabReorderIndex, type Sizing } from "@/pages/session/helpers"
@@ -26,12 +26,6 @@ import { setSessionHandoff } from "@/pages/session/handoff"
 import { useSessionLayout } from "@/pages/session/session-layout"

 export function SessionSidePanel(props: {
-  canReview: () => boolean
-  diffs: () => FileDiff[]
-  diffsReady: () => boolean
-  empty: () => string
-  hasReview: () => boolean
-  reviewCount: () => number
  reviewPanel: () => JSX.Element
  activeDiff?: string
  focusReviewDiff: (path: string) => void
@@ -39,11 +33,12 @@ export function SessionSidePanel(props: {
  size: Sizing
 }) {
  const layout = useLayout()
+  const sync = useSync()
  const file = useFile()
  const language = useLanguage()
  const command = useCommand()
  const dialog = useDialog()
-  const { sessionKey, tabs, view } = useSessionLayout()
+  const { params, sessionKey, tabs, view } = useSessionLayout()

  const isDesktop = createMediaQuery("(min-width: 768px)")

@@ -58,7 +53,24 @@ export function SessionSidePanel(props: {
  })
  const treeWidth = createMemo(() => (fileOpen() ? `${layout.fileTree.width()}px` : "0px"))

-  const diffFiles = createMemo(() => props.diffs().map((d) => d.file))
+  const info = createMemo(() => (params.id ? sync.session.get(params.id) : undefined))
+  const diffs = createMemo(() => (params.id ? (sync.data.session_diff[params.id] ?? []) : []))
+  const reviewCount = createMemo(() => Math.max(info()?.summary?.files ?? 0, diffs().length))
+  const hasReview = createMemo(() => reviewCount() > 0)
+  const diffsReady = createMemo(() => {
+    const id = params.id
+    if (!id) return true
+    if (!hasReview()) return true
+    return sync.data.session_diff[id] !== undefined
+  })
+
+  const reviewEmptyKey = createMemo(() => {
+    if (sync.project && !sync.project.vcs) return "session.review.noVcs"
+    if (sync.data.config.snapshot === false) return "session.review.noSnapshot"
+    return "session.review.noChanges"
+  })
+
+  const diffFiles = createMemo(() => diffs().map((d) => d.file))
  const kinds = createMemo(() => {
    const merge = (a: "add" | "del" | "mix" | undefined, b: "add" | "del" | "mix") => {
      if (!a) return b
@@ -69,7 +81,7 @@ export function SessionSidePanel(props: {
    const normalize = (p: string) => p.replaceAll("\\\\", "/").replace(/\/+$/, "")

    const out = new Map<string, "add" | "del" | "mix">()
-    for (const diff of props.diffs()) {
+    for (const diff of diffs()) {
      const file = normalize(diff.file)
      const kind = diff.status === "added" ? "add" : diff.status === "deleted" ? "del" : "mix"

@@ -123,7 +135,7 @@ export function SessionSidePanel(props: {
    pathFromTab: file.pathFromTab,
    normalizeTab,
    review: reviewTab,
-    hasReview: props.canReview,
+    hasReview,
  })
  const contextOpen = tabState.contextOpen
  const openedTabs = tabState.openedTabs
@@ -228,12 +240,12 @@ export function SessionSidePanel(props: {
                        onCleanup(stop)
                      }}
                    >
-                      <Show when={reviewTab() && props.canReview()}>
+                      <Show when={reviewTab()}>
                        <Tabs.Trigger value="review">
                          <div class="flex items-center gap-1.5">
                            <div>{language.t("session.tab.review")}</div>
-                            <Show when={props.hasReview()}>
-                              <div>{props.reviewCount()}</div>
+                            <Show when={hasReview()}>
+                              <div>{reviewCount()}</div>
                            </Show>
                          </div>
                        </Tabs.Trigger>
@@ -292,7 +304,7 @@ export function SessionSidePanel(props: {
                    </Tabs.List>
                  </div>

-                  <Show when={reviewTab() && props.canReview()}>
+                  <Show when={reviewTab()}>
                    <Tabs.Content value="review" class="flex flex-col h-full overflow-hidden contain-strict">
                      <Show when={activeTab() === "review"}>{props.reviewPanel()}</Show>
                    </Tabs.Content>
@@ -366,10 +378,8 @@ export function SessionSidePanel(props: {
              >
                <Tabs.List>
                  <Tabs.Trigger value="changes" class="flex-1" classes={{ button: "w-full" }}>
-                    {props.reviewCount()}{" "}
-                    {language.t(
-                      props.reviewCount() === 1 ? "session.review.change.one" : "session.review.change.other",
-                    )}
+                    {reviewCount()}{" "}
+                    {language.t(reviewCount() === 1 ? "session.review.change.one" : "session.review.change.other")}
                  </Tabs.Trigger>
                  <Tabs.Trigger value="all" class="flex-1" classes={{ button: "w-full" }}>
                    {language.t("session.files.all")}
@@ -377,9 +387,9 @@ export function SessionSidePanel(props: {
                </Tabs.List>
                <Tabs.Content value="changes" class="bg-background-stronger px-3 py-0">
                  <Switch>
-                    <Match when={props.hasReview() || !props.diffsReady()}>
+                    <Match when={hasReview()}>
                      <Show
-                        when={props.diffsReady()}
+                        when={diffsReady()}
                        fallback={
                          <div class="px-2 py-2 text-12-regular text-text-weak">
                            {language.t("common.loading")}
@@ -398,7 +408,11 @@ export function SessionSidePanel(props: {
                        />
                      </Show>
                    </Match>
-                    <Match when={true}>{empty(props.empty())}</Match>
+                    <Match when={true}>
+                      {empty(
+                        language.t(sync.project && !sync.project.vcs ? "session.review.noChanges" : reviewEmptyKey()),
+                      )}
+                    </Match>
                  </Switch>
                </Tabs.Content>
                <Tabs.Content value="all" class="bg-background-stronger px-3 py-0">
@@ -52,7 +52,11 @@ export const useSessionCommands = (actions: SessionCommandContext) => {
    if (!id) return
    return sync.session.get(id)
  }
-  const hasReview = () => !!params.id
+  const hasReview = () => {
+    const id = params.id
+    if (!id) return false
+    return Math.max(info()?.summary?.files ?? 0, (sync.data.session_diff[id] ?? []).length) > 0
+  }
  const normalizeTab = (tab: string) => {
    if (!tab.startsWith("file://")) return tab
    return file.tab(tab)
@@ -1,7 +0,0 @@
-const pattern = /^(New session|Child session) - \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/
-
-export function sessionTitle(title?: string) {
-  if (!title) return title
-  const match = title.match(pattern)
-  return match?.[1] ?? title
-}
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.3.17",
+  "version": "1.3.13",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -90,8 +90,7 @@ export async function handler(
    const body = await input.request.json()
    const model = opts.parseModel(url, body)
    const isStream = opts.parseIsStream(url, body)
-    const rawIp = input.request.headers.get("x-real-ip") ?? ""
-    const ip = rawIp.includes(":") ? rawIp.split(":").slice(0, 4).join(":") : rawIp
+    const ip = input.request.headers.get("x-real-ip") ?? ""
    const sessionId = input.request.headers.get("x-opencode-session") ?? ""
    const requestId = input.request.headers.get("x-opencode-request") ?? ""
    const projectId = input.request.headers.get("x-opencode-project") ?? ""
@@ -17,8 +17,9 @@ export function createRateLimiter(
  const dict = i18n(localeFromRequest(request))

  const limits = Subscription.getFreeLimits()
-  const dailyLimit = rateLimit ?? limits.dailyRequests
-  const isDefaultModel = !rateLimit
+  const headerExists = request.headers.has(limits.checkHeader)
+  const dailyLimit = !headerExists ? limits.fallbackValue : (rateLimit ?? limits.dailyRequests)
+  const isDefaultModel = headerExists && !rateLimit

  const ip = !rawIp.length ? "unknown" : rawIp
  const now = Date.now()
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.3.17",
+  "version": "1.3.13",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -9,6 +9,8 @@ export namespace Subscription {
    free: z.object({
      promoTokens: z.number().int(),
      dailyRequests: z.number().int(),
+      checkHeader: z.string(),
+      fallbackValue: z.number().int(),
    }),
    lite: z.object({
      rollingLimit: z.number().int(),
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.3.17",
+  "version": "1.3.13",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.3.17",
+  "version": "1.3.13",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop-electron",
  "private": true,
-  "version": "1.3.17",
+  "version": "1.3.13",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
@@ -1,4 +1,4 @@
-import { Menu, shell } from "electron"
+import { BrowserWindow, Menu, shell } from "electron"

 import { UPDATER_ENABLED } from "./constants"
 import { createMainWindow } from "./windows"
@@ -77,46 +77,27 @@ export function createMenu(deps: Deps) {
        { label: "Toggle Terminal", accelerator: "Ctrl+`", click: () => deps.trigger("terminal.toggle") },
        { label: "Toggle File Tree", click: () => deps.trigger("fileTree.toggle") },
        { type: "separator" },
-        { role: "reload" },
-        { role: "toggleDevTools" },
-        { type: "separator" },
-        { role: "resetZoom" },
-        { role: "zoomIn" },
-        { role: "zoomOut" },
-        { type: "separator" },
-        { role: "togglefullscreen" },
-      ],
-    },
-    {
-      label: "Go",
-      submenu: [
-        { label: "Back", accelerator: "Cmd+[", click: () => deps.trigger("common.goBack") },
-        { label: "Forward", accelerator: "Cmd+]", click: () => deps.trigger("common.goForward") },
+        { label: "Back", click: () => deps.trigger("common.goBack") },
+        { label: "Forward", click: () => deps.trigger("common.goForward") },
        { type: "separator" },
        {
          label: "Previous Session",
-          accelerator: "Option+Up",
+          accelerator: "Option+ArrowUp",
          click: () => deps.trigger("session.previous"),
        },
        {
          label: "Next Session",
-          accelerator: "Option+Down",
+          accelerator: "Option+ArrowDown",
          click: () => deps.trigger("session.next"),
        },
        { type: "separator" },
        {
-          label: "Previous Project",
-          accelerator: "Cmd+Option+Up",
-          click: () => deps.trigger("project.previous"),
-        },
-        {
-          label: "Next Project",
-          accelerator: "Cmd+Option+Down",
-          click: () => deps.trigger("project.next"),
+          label: "Toggle Developer Tools",
+          accelerator: "Alt+Cmd+I",
+          click: () => BrowserWindow.getFocusedWindow()?.webContents.toggleDevTools(),
        },
      ],
    },
-    { role: "windowMenu" },
    {
      label: "Help",
      submenu: [
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.3.17",
+  "version": "1.3.13",
  "type": "module",
  "license": "MIT",
  "scripts": {
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.3.17",
+  "version": "1.3.13",
  "private": true,
  "type": "module",
  "license": "MIT",
@@ -1,7 +1,7 @@
 id = "opencode"
 name = "OpenCode"
 description = "The open source coding agent."
-version = "1.3.17"
+version = "1.3.13"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/anomalyco/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
 icon = "./icons/opencode.svg"

 [agent_servers.opencode.targets.darwin-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.17/opencode-darwin-arm64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.13/opencode-darwin-arm64.zip"
 cmd = "./opencode"
 args = ["acp"]

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

 [agent_servers.opencode.targets.linux-aarch64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.17/opencode-linux-arm64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.13/opencode-linux-arm64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.linux-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.17/opencode-linux-x64.tar.gz"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.13/opencode-linux-x64.tar.gz"
 cmd = "./opencode"
 args = ["acp"]

 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.17/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.3.13/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.3.17",
+  "version": "1.3.13",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.3.17",
+  "version": "1.3.13",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
@@ -9,7 +9,6 @@
    "prepare": "effect-language-service patch || true",
    "typecheck": "tsgo --noEmit",
    "test": "bun test --timeout 30000",
-    "test:ci": "mkdir -p .artifacts/unit && bun test --timeout 30000 --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml",
    "build": "bun run script/build.ts",
    "upgrade-opentui": "bun run script/upgrade-opentui.ts",
    "dev": "bun run --conditions=browser ./src/index.ts",
@@ -52,9 +51,8 @@
    "@tsconfig/bun": "catalog:",
    "@types/babel__core": "7.20.5",
    "@types/bun": "catalog:",
-    "@types/cross-spawn": "catalog:",
+    "@types/cross-spawn": "6.0.6",
    "@types/mime-types": "3.0.1",
-    "@types/npm-package-arg": "6.1.4",
    "@types/npmcli__arborist": "6.3.3",
    "@types/semver": "^7.5.8",
    "@types/turndown": "5.0.5",
@@ -106,8 +104,8 @@
    "@opencode-ai/sdk": "workspace:*",
    "@opencode-ai/util": "workspace:*",
    "@openrouter/ai-sdk-provider": "2.3.3",
-    "@opentui/core": "https://pkg.pr.new/anomalyco/opentui/@opentui/core@22d015f",
-    "@opentui/solid": "https://pkg.pr.new/@opentui/solid@22d015f",
+    "@opentui/core": "0.1.95",
+    "@opentui/solid": "0.1.95",
    "@parcel/watcher": "2.5.1",
    "@pierre/diffs": "catalog:",
    "@solid-primitives/event-bus": "1.1.2",
@@ -120,7 +118,7 @@
    "bun-pty": "0.4.8",
    "chokidar": "4.0.3",
    "clipboardy": "4.0.0",
-    "cross-spawn": "catalog:",
+    "cross-spawn": "^7.0.6",
    "decimal.js": "10.5.0",
    "diff": "catalog:",
    "drizzle-orm": "catalog:",
@@ -136,7 +134,6 @@
    "jsonc-parser": "3.3.1",
    "mime-types": "3.0.2",
    "minimatch": "10.0.3",
-    "npm-package-arg": "13.0.2",
    "open": "10.1.2",
    "opencode-gitlab-auth": "2.0.1",
    "opencode-poe-auth": "0.0.1",
@@ -209,7 +209,6 @@ for (const item of targets) {
    conditions: ["browser"],
    tsconfig: "./tsconfig.json",
    plugins: [plugin],
-    external: ["node-gyp"],
    compile: {
      autoloadBunfig: false,
      autoloadDotenv: false,
@@ -214,17 +214,17 @@ Fully migrated (single namespace, InstanceState where needed, flattened facade):
 - [x] `SessionProcessor` — `session/processor.ts`
 - [x] `SessionPrompt` — `session/prompt.ts`
 - [x] `SessionCompaction` — `session/compaction.ts`
- [x] `SessionSummary` — `session/summary.ts`
- [x] `SessionRevert` — `session/revert.ts`
- [x] `Instruction` — `session/instruction.ts`
 - [x] `Provider` — `provider/provider.ts`
- [x] `Storage` — `storage/storage.ts`

 Still open:

+- [ ] `SessionSummary` — `session/summary.ts`
 - [ ] `SessionTodo` — `session/todo.ts`
+- [ ] `SessionRevert` — `session/revert.ts`
+- [ ] `Instruction` — `session/instruction.ts`
 - [ ] `ShareNext` — `share/share-next.ts`
 - [ ] `SyncEvent` — `sync/index.ts`
+- [ ] `Storage` — `storage/storage.ts`
 - [ ] `Workspace` — `control-plane/workspace.ts`

 ## Tool interface → Effect
@@ -235,27 +235,10 @@ Once individual tools are effectified, change `Tool.Info` (`tool/tool.ts`) so `i
 2. Update `Tool.define()` factory to work with Effects
 3. Update `SessionPrompt` to `yield*` tool results instead of `await`ing

-### Tool migration details
-
-Until the tool interface itself returns `Effect`, use this transitional pattern for migrated tools:
-
- `Tool.defineEffect(...)` should `yield*` the services the tool depends on and close over them in the returned tool definition.
- Keep the bridge at the Promise boundary only. Prefer a single `Effect.runPromise(...)` in the temporary `async execute(...)` implementation, and move the inner logic into `Effect.fn(...)` helpers instead of scattering `runPromise` islands through the tool body.
- If a tool starts requiring new services, wire them into `ToolRegistry.defaultLayer` so production callers resolve the same dependencies as tests.
-
-Tool tests should use the existing Effect helpers in `packages/opencode/test/lib/effect.ts`:
-
- Use `testEffect(...)` / `it.live(...)` instead of creating fake local wrappers around effectful tools.
- Yield the real tool export, then initialize it: `const info = yield* ReadTool`, `const tool = yield* Effect.promise(() => info.init())`.
- Run tests inside a real instance with `provideTmpdirInstance(...)` or `provideInstance(tmpdirScoped(...))` so instance-scoped services resolve exactly as they do in production.
-
-This keeps migrated tool tests aligned with the production service graph today, and makes the eventual `Tool.Info` → `Effect` cleanup mostly mechanical later.
-
 Individual tools, ordered by value:

 - [ ] `apply_patch.ts` — HIGH: multi-step orchestration, error accumulation, Bus events
- [ ] `bash.ts` — HIGH: shell orchestration, quoting, timeout handling, output capture
- [x] `read.ts` — HIGH: streaming I/O, readline, binary detection → FileSystem + Stream
+- [ ] `read.ts` — HIGH: streaming I/O, readline, binary detection → FileSystem + Stream
 - [ ] `edit.ts` — HIGH: multi-step diff/format/publish pipeline, FileWatcher lock
 - [ ] `grep.ts` — MEDIUM: spawns ripgrep → ChildProcessSpawner, timeout handling
 - [ ] `write.ts` — MEDIUM: permission checks, diagnostics polling, Bus events
@@ -264,42 +247,40 @@ Individual tools, ordered by value:
 - [ ] `websearch.ts` — MEDIUM: MCP over HTTP → HttpClient
 - [ ] `batch.ts` — MEDIUM: parallel execution, per-call error recovery → Effect.all
 - [ ] `task.ts` — MEDIUM: task state management
- [ ] `ls.ts` — MEDIUM: bounded directory listing over ripgrep-backed traversal
- [ ] `multiedit.ts` — MEDIUM: sequential edit orchestration over `edit.ts`
 - [ ] `glob.ts` — LOW: simple async generator
 - [ ] `lsp.ts` — LOW: dispatch switch over LSP operations
- [ ] `question.ts` — LOW: prompt wrapper
 - [ ] `skill.ts` — LOW: skill tool adapter
- [ ] `todo.ts` — LOW: todo persistence wrapper
- [ ] `invalid.ts` — LOW: invalid-tool fallback
 - [ ] `plan.ts` — LOW: plan file operations

 ## Effect service adoption in already-migrated code

-Some already-effectified areas still use raw `Filesystem.*` or `Process.spawn` in their implementation or helper modules. These are low-hanging fruit — the layers already exist, they just need the dependency swap.
+Some services are effectified but still use raw `Filesystem.*` or `Process.spawn` instead of the Effect equivalents. These are low-hanging fruit — the layers already exist, they just need the dependency swap.

 ### `Filesystem.*` → `AppFileSystem.Service` (yield in layer)

- [ ] `file/index.ts` — 1 remaining `Filesystem.readText()` call in untracked diff handling
- [ ] `config/config.ts` — 5 remaining `Filesystem.*` calls in `installDependencies()`
- [ ] `provider/provider.ts` — 1 remaining `Filesystem.readJson()` call for recent model state
+- [ ] `file/index.ts` — 11 calls (the File service itself)
+- [ ] `config/config.ts` — 7 calls
+- [ ] `auth/index.ts` — 3 calls
+- [ ] `skill/index.ts` — 3 calls
+- [ ] `file/time.ts` — 1 call

 ### `Process.spawn` → `ChildProcessSpawner` (yield in layer)

- [ ] `format/formatter.ts` — 2 remaining `Process.spawn()` checks (`air`, `uv`)
- [ ] `lsp/server.ts` — multiple `Process.spawn()` installs/download helpers
+- [ ] `format/index.ts` — 1 call

 ## Filesystem consolidation

-`util/filesystem.ts` (raw fs wrapper) is currently imported by **34 files**. The effectified `AppFileSystem` service (`filesystem/index.ts`) is currently imported by **15 files**. As services and tools are effectified, they should switch from `Filesystem.*` to yielding `AppFileSystem.Service` — this happens naturally during each migration, not as a separate effort.
+`util/filesystem.ts` (raw fs wrapper) is used by **64 files**. The effectified `AppFileSystem` service (`filesystem/index.ts`) exists but only has **8 consumers**. As services and tools are effectified, they should switch from `Filesystem.*` to yielding `AppFileSystem.Service` — this happens naturally during each migration, not as a separate effort.

-Similarly, **21 files** still import raw `fs` or `fs/promises` directly. These should migrate to `AppFileSystem` or `Filesystem.*` as they're touched.
+Similarly, **28 files** still import raw `fs` or `fs/promises` directly. These should migrate to `AppFileSystem` or `Filesystem.*` as they're touched.

 Current raw fs users that will convert during tool migration:

 - `tool/read.ts` — fs.createReadStream, readline
 - `tool/apply_patch.ts` — fs/promises
+- `tool/bash.ts` — fs/promises
 - `file/ripgrep.ts` — fs/promises
+- `storage/storage.ts` — fs/promises
 - `patch/index.ts` — fs, fs/promises

 ## Primitives & utilities
@@ -194,9 +194,9 @@ That is what makes local config-scoped plugins able to import `@opencode-ai/plug
 Top-level API groups exposed to `tui(api, options, meta)`:

 - `api.app.version`
- `api.command.register(cb)` / `api.command.trigger(value)` / `api.command.show()`
+- `api.command.register(cb)` / `api.command.trigger(value)`
 - `api.route.register(routes)` / `api.route.navigate(name, params?)` / `api.route.current`
- `api.ui.Dialog`, `DialogAlert`, `DialogConfirm`, `DialogPrompt`, `DialogSelect`, `Slot`, `Prompt`, `ui.toast`, `ui.dialog`
+- `api.ui.Dialog`, `DialogAlert`, `DialogConfirm`, `DialogPrompt`, `DialogSelect`, `Prompt`, `ui.toast`, `ui.dialog`
 - `api.keybind.match`, `print`, `create`
 - `api.tuiConfig`
 - `api.kv.get`, `set`, `ready`
@@ -225,7 +225,6 @@ Command behavior:
 - Registrations are reactive.
 - Later registrations win for duplicate `value` and for keybind handling.
 - Hidden commands are removed from the command dialog and slash list, but still respond to keybinds and `command.trigger(value)` if `enabled !== false`.
- `api.command.show()` opens the host command dialog directly.

 ### Routes

@@ -243,8 +242,7 @@ Command behavior:

 - `ui.Dialog` is the base dialog wrapper.
 - `ui.DialogAlert`, `ui.DialogConfirm`, `ui.DialogPrompt`, `ui.DialogSelect` are built-in dialog components.
- `ui.Slot` renders host or plugin-defined slots by name from plugin JSX.
- `ui.Prompt` renders the same prompt component used by the host app and accepts `sessionID`, `workspaceID`, `ref`, and `right` for the prompt meta row's right side.
+- `ui.Prompt` renders the same prompt component used by the host app.
 - `ui.toast(...)` shows a toast.
 - `ui.dialog` exposes the host dialog stack:
  - `replace(render, onClose?)`
@@ -317,12 +315,8 @@ Current host slot names:

 - `app`
 - `home_logo`
- `home_prompt` with props `{ workspace_id?, ref? }`
- `home_prompt_right` with props `{ workspace_id? }`
- `session_prompt` with props `{ session_id, visible?, disabled?, on_submit?, ref? }`
- `session_prompt_right` with props `{ session_id }`
+- `home_prompt` with props `{ workspace_id? }`
 - `home_bottom`
- `home_footer`
 - `sidebar_title` with props `{ session_id, title, share_url? }`
 - `sidebar_content` with props `{ session_id }`
 - `sidebar_footer` with props `{ session_id }`
@@ -334,8 +328,8 @@ Slot notes:
 - `api.slots.register(plugin)` does not return an unregister function.
 - Returned ids are `pluginId`, `pluginId:1`, `pluginId:2`, and so on.
 - Plugin-provided `id` is not allowed.
- The current host renders `home_logo`, `home_prompt`, and `session_prompt` with `replace`, `home_footer`, `sidebar_title`, and `sidebar_footer` with `single_winner`, and `app`, `home_prompt_right`, `session_prompt_right`, `home_bottom`, and `sidebar_content` with the slot library default mode.
- Plugins can define custom slot names in `api.slots.register(...)` and render them from plugin UI with `ui.Slot`.
+- The current host renders `home_logo` and `home_prompt` with `replace`, `sidebar_title` and `sidebar_footer` with `single_winner`, and `app`, `home_bottom`, and `sidebar_content` with the slot library default mode.
+- Plugins cannot define new slot names in this branch.

 ### Plugin control and lifecycle

@@ -431,6 +425,5 @@ The plugin manager is exposed as a command with title `Plugins` and value `plugi
 ## Current in-repo examples

 - Local smoke plugin: `.opencode/plugins/tui-smoke.tsx`
- Local vim plugin: `.opencode/plugins/tui-vim.tsx`
 - Local smoke config: `.opencode/tui.json`
 - Local smoke theme: `.opencode/plugins/smoke-theme.json`
@@ -1,14 +0,0 @@
-# 2.0
-
-What we would change if we could
-
-## Keybindings vs. Keymappings
-
-Make it `keymappings`, closer to neovim. Can be layered like `<leader>abc`. Commands don't define their binding, but have an id that a key can be mapped to like
-
-```ts
-{ key: "ctrl+w", cmd: string | function, description }
-```
-
-_Why_
-Currently its keybindings that have an `id` like `message_redo` and then a command can use that or define it's own binding. While some keybindings are just used with `.match` in arbitrary key handlers and there is no info what the key is used for, except the binding id maybe. It also is unknown in which context/scope what binding is active, so a plugin like `which-key` is nearly impossible to get right.
@@ -52,11 +52,6 @@ export type AccountOrgs = {
  orgs: readonly Org[]
 }

-export type ActiveOrg = {
-  account: Info
-  org: Org
-}
-
 class RemoteConfig extends Schema.Class<RemoteConfig>("RemoteConfig")({
  config: Schema.Record(Schema.String, Schema.Json),
 }) {}
@@ -142,7 +137,6 @@ const mapAccountServiceError =
 export namespace Account {
  export interface Interface {
    readonly active: () => Effect.Effect<Option.Option<Info>, AccountError>
-    readonly activeOrg: () => Effect.Effect<Option.Option<ActiveOrg>, AccountError>
    readonly list: () => Effect.Effect<Info[], AccountError>
    readonly orgsByAccount: () => Effect.Effect<readonly AccountOrgs[], AccountError>
    readonly remove: (accountID: AccountID) => Effect.Effect<void, AccountError>
@@ -285,31 +279,19 @@ export namespace Account {
        resolveAccess(accountID).pipe(Effect.map(Option.map((r) => r.accessToken))),
      )

-      const activeOrg = Effect.fn("Account.activeOrg")(function* () {
-        const activeAccount = yield* repo.active()
-        if (Option.isNone(activeAccount)) return Option.none<ActiveOrg>()
-
-        const account = activeAccount.value
-        if (!account.active_org_id) return Option.none<ActiveOrg>()
-
-        const accountOrgs = yield* orgs(account.id)
-        const org = accountOrgs.find((item) => item.id === account.active_org_id)
-        if (!org) return Option.none<ActiveOrg>()
-
-        return Option.some({ account, org })
-      })
-
      const orgsByAccount = Effect.fn("Account.orgsByAccount")(function* () {
        const accounts = yield* repo.list()
-        return yield* Effect.forEach(
+        const [errors, results] = yield* Effect.partition(
          accounts,
-          (account) =>
-            orgs(account.id).pipe(
-              Effect.catch(() => Effect.succeed([] as readonly Org[])),
-              Effect.map((orgs) => ({ account, orgs })),
-            ),
+          (account) => orgs(account.id).pipe(Effect.map((orgs) => ({ account, orgs }))),
          { concurrency: 3 },
        )
+        for (const error of errors) {
+          yield* Effect.logWarning("failed to fetch orgs for account").pipe(
+            Effect.annotateLogs({ error: String(error) }),
+          )
+        }
+        return results
      })

      const orgs = Effect.fn("Account.orgs")(function* (accountID: AccountID) {
@@ -414,7 +396,6 @@ export namespace Account {

      return Service.of({
        active: repo.active,
-        activeOrg,
        list: repo.list,
        orgsByAccount,
        remove: repo.remove,
@@ -436,24 +417,9 @@ export namespace Account {
    return Option.getOrUndefined(await runPromise((service) => service.active()))
  }

-  export async function list(): Promise<Info[]> {
-    return runPromise((service) => service.list())
-  }
-
-  export async function activeOrg(): Promise<ActiveOrg | undefined> {
-    return Option.getOrUndefined(await runPromise((service) => service.activeOrg()))
-  }
-
-  export async function orgsByAccount(): Promise<readonly AccountOrgs[]> {
-    return runPromise((service) => service.orgsByAccount())
-  }
-
-  export async function orgs(accountID: AccountID): Promise<readonly Org[]> {
-    return runPromise((service) => service.orgs(accountID))
-  }
-
-  export async function switchOrg(accountID: AccountID, orgID: OrgID) {
-    return runPromise((service) => service.use(accountID, Option.some(orgID)))
+  export async function config(accountID: AccountID, orgID: OrgID): Promise<Record<string, unknown> | undefined> {
+    const cfg = await runPromise((service) => service.config(accountID, orgID))
+    return Option.getOrUndefined(cfg)
  }

  export async function token(accountID: AccountID): Promise<AccessToken | undefined> {
@@ -21,9 +21,6 @@ import {
  type Role,
  type SessionInfo,
  type SetSessionModelRequest,
-  type SessionConfigOption,
-  type SetSessionConfigOptionRequest,
-  type SetSessionConfigOptionResponse,
  type SetSessionModeRequest,
  type SetSessionModeResponse,
  type ToolCallContent,
@@ -604,7 +601,6 @@ export namespace ACP {

        return {
          sessionId,
-          configOptions: load.configOptions,
          models: load.models,
          modes: load.modes,
          _meta: load._meta,
@@ -664,11 +660,6 @@ export namespace ACP {
            result.modes.currentModeId = lastUser.agent
            this.sessionManager.setMode(sessionId, lastUser.agent)
          }
-          result.configOptions = buildConfigOptions({
-            currentModelId: result.models.currentModelId,
-            availableModels: result.models.availableModels,
-            modes: result.modes,
-          })
        }

        for (const msg of messages ?? []) {
@@ -1275,11 +1266,6 @@ export namespace ACP {
          availableModels,
        },
        modes,
-        configOptions: buildConfigOptions({
-          currentModelId: formatModelIdWithVariant(model, currentVariant, availableVariants, true),
-          availableModels,
-          modes,
-        }),
        _meta: buildVariantMeta({
          model,
          variant: this.sessionManager.getVariant(sessionId),
@@ -1319,44 +1305,6 @@ export namespace ACP {
      this.sessionManager.setMode(params.sessionId, params.modeId)
    }

-    async setSessionConfigOption(params: SetSessionConfigOptionRequest): Promise<SetSessionConfigOptionResponse> {
-      const session = this.sessionManager.get(params.sessionId)
-      const providers = await this.sdk.config
-        .providers({ directory: session.cwd }, { throwOnError: true })
-        .then((x) => x.data!.providers)
-      const entries = sortProvidersByName(providers)
-
-      if (params.configId === "model") {
-        if (typeof params.value !== "string") throw RequestError.invalidParams("model value must be a string")
-        const selection = parseModelSelection(params.value, providers)
-        this.sessionManager.setModel(session.id, selection.model)
-        this.sessionManager.setVariant(session.id, selection.variant)
-      } else if (params.configId === "mode") {
-        if (typeof params.value !== "string") throw RequestError.invalidParams("mode value must be a string")
-        const availableModes = await this.loadAvailableModes(session.cwd)
-        if (!availableModes.some((mode) => mode.id === params.value)) {
-          throw RequestError.invalidParams(JSON.stringify({ error: `Mode not found: ${params.value}` }))
-        }
-        this.sessionManager.setMode(session.id, params.value)
-      } else {
-        throw RequestError.invalidParams(JSON.stringify({ error: `Unknown config option: ${params.configId}` }))
-      }
-
-      const updatedSession = this.sessionManager.get(session.id)
-      const model = updatedSession.model ?? (await defaultModel(this.config, session.cwd))
-      const availableVariants = modelVariantsFromProviders(entries, model)
-      const currentModelId = formatModelIdWithVariant(model, updatedSession.variant, availableVariants, true)
-      const availableModels = buildAvailableModels(entries, { includeVariants: true })
-      const modeState = await this.resolveModeState(session.cwd, session.id)
-      const modes = modeState.currentModeId
-        ? { availableModes: modeState.availableModes, currentModeId: modeState.currentModeId }
-        : undefined
-
-      return {
-        configOptions: buildConfigOptions({ currentModelId, availableModels, modes }),
-      }
-    }
-
    async prompt(params: PromptRequest) {
      const sessionID = params.sessionId
      const session = this.sessionManager.get(sessionID)
@@ -1812,36 +1760,4 @@ export namespace ACP {

    return { model: parsed, variant: undefined }
  }
-
-  function buildConfigOptions(input: {
-    currentModelId: string
-    availableModels: ModelOption[]
-    modes?: { availableModes: ModeOption[]; currentModeId: string } | undefined
-  }): SessionConfigOption[] {
-    const options: SessionConfigOption[] = [
-      {
-        id: "model",
-        name: "Model",
-        category: "model",
-        type: "select",
-        currentValue: input.currentModelId,
-        options: input.availableModels.map((m) => ({ value: m.modelId, name: m.name })),
-      },
-    ]
-    if (input.modes) {
-      options.push({
-        id: "mode",
-        name: "Session Mode",
-        category: "mode",
-        type: "select",
-        currentValue: input.modes.currentModeId,
-        options: input.modes.availableModes.map((m) => ({
-          value: m.id,
-          name: m.name,
-          ...(m.description ? { description: m.description } : {}),
-        })),
-      })
-    }
-    return options
-  }
 }
@@ -24,7 +24,6 @@ export namespace Auth {
  export class Api extends Schema.Class<Api>("ApiAuth")({
    type: Schema.Literal("api"),
    key: Schema.String,
-    metadata: Schema.optional(Schema.Record(Schema.String, Schema.String)),
  }) {}

  export class WellKnown extends Schema.Class<WellKnown>("WellKnownAuth")({
@@ -28,9 +28,9 @@ import { Provider } from "../../provider/provider"
 import { Bus } from "../../bus"
 import { MessageV2 } from "../../session/message-v2"
 import { SessionPrompt } from "@/session/prompt"
-import { Git } from "@/git"
 import { setTimeout as sleep } from "node:timers/promises"
 import { Process } from "@/util/process"
+import { git } from "@/util/git"

 type GitHubAuthor = {
  login: string
@@ -257,7 +257,7 @@ export const GithubInstallCommand = cmd({
            }

            // Get repo info
-            const info = (await Git.run(["remote", "get-url", "origin"], { cwd: Instance.worktree })).text().trim()
+            const info = (await git(["remote", "get-url", "origin"], { cwd: Instance.worktree })).text().trim()
            const parsed = parseGitHubRemote(info)
            if (!parsed) {
              prompts.log.error(`Could not find git repository. Please run this command from a git repository.`)
@@ -496,20 +496,20 @@ export const GithubRunCommand = cmd({
          : "issue"
        : undefined
      const gitText = async (args: string[]) => {
-        const result = await Git.run(args, { cwd: Instance.worktree })
+        const result = await git(args, { cwd: Instance.worktree })
        if (result.exitCode !== 0) {
          throw new Process.RunFailedError(["git", ...args], result.exitCode, result.stdout, result.stderr)
        }
        return result.text().trim()
      }
      const gitRun = async (args: string[]) => {
-        const result = await Git.run(args, { cwd: Instance.worktree })
+        const result = await git(args, { cwd: Instance.worktree })
        if (result.exitCode !== 0) {
          throw new Process.RunFailedError(["git", ...args], result.exitCode, result.stdout, result.stderr)
        }
        return result
      }
-      const gitStatus = (args: string[]) => Git.run(args, { cwd: Instance.worktree })
+      const gitStatus = (args: string[]) => git(args, { cwd: Instance.worktree })
      const commitChanges = async (summary: string, actor?: string) => {
        const args = ["commit", "-m", summary]
        if (actor) args.push("-m", `Co-authored-by: ${actor} <${actor}@users.noreply.github.com>`)
@@ -28,7 +28,7 @@ export const ModelsCommand = cmd({
  },
  handler: async (args) => {
    if (args.refresh) {
-      await ModelsDev.refresh(true)
+      await ModelsDev.refresh()
      UI.println(UI.Style.TEXT_SUCCESS_BOLD + "Models cache refreshed" + UI.Style.TEXT_NORMAL)
    }

@@ -1,8 +1,8 @@
 import { UI } from "../ui"
 import { cmd } from "./cmd"
-import { Git } from "@/git"
 import { Instance } from "@/project/instance"
 import { Process } from "@/util/process"
+import { git } from "@/util/git"

 export const PrCommand = cmd({
  command: "pr <number>",
@@ -67,9 +67,9 @@ export const PrCommand = cmd({
              const remoteName = forkOwner

              // Check if remote already exists
-              const remotes = (await Git.run(["remote"], { cwd: Instance.worktree })).text().trim()
+              const remotes = (await git(["remote"], { cwd: Instance.worktree })).text().trim()
              if (!remotes.split("\n").includes(remoteName)) {
-                await Git.run(["remote", "add", remoteName, `https://github.com/${forkOwner}/${forkName}.git`], {
+                await git(["remote", "add", remoteName, `https://github.com/${forkOwner}/${forkName}.git`], {
                  cwd: Instance.worktree,
                })
                UI.println(`Added fork remote: ${remoteName}`)
@@ -77,7 +77,7 @@ export const PrCommand = cmd({

              // Set upstream to the fork so pushes go there
              const headRefName = prInfo.headRefName
-              await Git.run(["branch", `--set-upstream-to=${remoteName}/${headRefName}`, localBranchName], {
+              await git(["branch", `--set-upstream-to=${remoteName}/${headRefName}`, localBranchName], {
                cwd: Instance.worktree,
              })
            }
@@ -303,7 +303,7 @@ export const ProvidersLoginCommand = cmd({
          prompts.outro("Done")
          return
        }
-        await ModelsDev.refresh(true).catch(() => {})
+        await ModelsDev.refresh().catch(() => {})

        const config = await Config.get()

@@ -1,16 +1,3 @@
-// CLI entry point for `opencode run`.
-//
-// Handles three modes:
-//   1. Non-interactive (default): sends a single prompt, streams events to
-//      stdout, and exits when the session goes idle.
-//   2. Interactive local (`--interactive`): boots the split-footer direct mode
-//      with an in-process server (no external HTTP).
-//   3. Interactive attach (`--interactive --attach`): connects to a running
-//      opencode server and runs interactive mode against it.
-//
-// Also supports `--command` for slash-command execution, `--format json` for
-// raw event streaming, `--continue` / `--session` for session resumption,
-// and `--fork` for forking before continuing.
 import type { Argv } from "yargs"
 import path from "path"
 import { pathToFileURL } from "url"
@@ -20,27 +7,40 @@ import { Flag } from "../../flag/flag"
 import { bootstrap } from "../bootstrap"
 import { EOL } from "os"
 import { Filesystem } from "../../util/filesystem"
-import { createOpencodeClient, type OpencodeClient, type ToolPart } from "@opencode-ai/sdk/v2"
+import { createOpencodeClient, type Message, type OpencodeClient, type ToolPart } from "@opencode-ai/sdk/v2"
+import { Server } from "../../server/server"
+import { Provider } from "../../provider/provider"
+import { Agent } from "../../agent/agent"
 import { Permission } from "../../permission"
-import type { RunDemo } from "./run/types"
+import { Tool } from "../../tool/tool"
+import { GlobTool } from "../../tool/glob"
+import { GrepTool } from "../../tool/grep"
+import { ListTool } from "../../tool/ls"
+import { ReadTool } from "../../tool/read"
+import { WebFetchTool } from "../../tool/webfetch"
+import { EditTool } from "../../tool/edit"
+import { WriteTool } from "../../tool/write"
+import { CodeSearchTool } from "../../tool/codesearch"
+import { WebSearchTool } from "../../tool/websearch"
+import { TaskTool } from "../../tool/task"
+import { SkillTool } from "../../tool/skill"
+import { BashTool } from "../../tool/bash"
+import { TodoWriteTool } from "../../tool/todo"
+import { Locale } from "../../util/locale"

-const runtimeTask = import("./run/runtime")
-type ModelInput = Parameters<OpencodeClient["session"]["prompt"]>[0]["model"]
-
-function pick(value: string | undefined): ModelInput | undefined {
-  if (!value) return undefined
-  const [providerID, ...rest] = value.split("/")
-  return {
-    providerID,
-    modelID: rest.join("/"),
-  } as ModelInput
+type ToolProps<T extends Tool.Info> = {
+  input: Tool.InferParameters<T>
+  metadata: Tool.InferMetadata<T>
+  part: ToolPart
 }

-type FilePart = {
-  type: "file"
-  url: string
-  filename: string
-  mime: string
+function props<T extends Tool.Info>(part: ToolPart): ToolProps<T> {
+  const state = part.state
+  return {
+    input: state.input as Tool.InferParameters<T>,
+    metadata: ("metadata" in state ? state.metadata : {}) as Tool.InferMetadata<T>,
+    part,
+  }
 }

 type Inline = {
@@ -49,11 +49,6 @@ type Inline = {
  description?: string
 }

-type SessionInfo = {
-  id: string
-  title?: string
-}
-
 function inline(info: Inline) {
  const suffix = info.description ? UI.Style.TEXT_DIM + ` ${info.description}` + UI.Style.TEXT_NORMAL : ""
  UI.println(UI.Style.TEXT_NORMAL + info.icon, UI.Style.TEXT_NORMAL + info.title + suffix)
@@ -67,22 +62,160 @@ function block(info: Inline, output?: string) {
  UI.empty()
 }

-async function tool(part: ToolPart) {
-  try {
-    const { toolInlineInfo } = await import("./run/tool")
-    const next = toolInlineInfo(part)
-    if (next.mode === "block") {
-      block(next, next.body)
-      return
-    }
+function fallback(part: ToolPart) {
+  const state = part.state
+  const input = "input" in state ? state.input : undefined
+  const title =
+    ("title" in state && state.title ? state.title : undefined) ||
+    (input && typeof input === "object" && Object.keys(input).length > 0 ? JSON.stringify(input) : "Unknown")
+  inline({
+    icon: "⚙",
+    title: `${part.tool} ${title}`,
+  })
+}

-    inline(next)
-  } catch {
-    inline({
-      icon: "⚙",
-      title: part.tool,
-    })
-  }
+function glob(info: ToolProps<typeof GlobTool>) {
+  const root = info.input.path ?? ""
+  const title = `Glob "${info.input.pattern}"`
+  const suffix = root ? `in ${normalizePath(root)}` : ""
+  const num = info.metadata.count
+  const description =
+    num === undefined ? suffix : `${suffix}${suffix ? " · " : ""}${num} ${num === 1 ? "match" : "matches"}`
+  inline({
+    icon: "✱",
+    title,
+    ...(description && { description }),
+  })
+}
+
+function grep(info: ToolProps<typeof GrepTool>) {
+  const root = info.input.path ?? ""
+  const title = `Grep "${info.input.pattern}"`
+  const suffix = root ? `in ${normalizePath(root)}` : ""
+  const num = info.metadata.matches
+  const description =
+    num === undefined ? suffix : `${suffix}${suffix ? " · " : ""}${num} ${num === 1 ? "match" : "matches"}`
+  inline({
+    icon: "✱",
+    title,
+    ...(description && { description }),
+  })
+}
+
+function list(info: ToolProps<typeof ListTool>) {
+  const dir = info.input.path ? normalizePath(info.input.path) : ""
+  inline({
+    icon: "→",
+    title: dir ? `List ${dir}` : "List",
+  })
+}
+
+function read(info: ToolProps<typeof ReadTool>) {
+  const file = normalizePath(info.input.filePath)
+  const pairs = Object.entries(info.input).filter(([key, value]) => {
+    if (key === "filePath") return false
+    return typeof value === "string" || typeof value === "number" || typeof value === "boolean"
+  })
+  const description = pairs.length ? `[${pairs.map(([key, value]) => `${key}=${value}`).join(", ")}]` : undefined
+  inline({
+    icon: "→",
+    title: `Read ${file}`,
+    ...(description && { description }),
+  })
+}
+
+function write(info: ToolProps<typeof WriteTool>) {
+  block(
+    {
+      icon: "←",
+      title: `Write ${normalizePath(info.input.filePath)}`,
+    },
+    info.part.state.status === "completed" ? info.part.state.output : undefined,
+  )
+}
+
+function webfetch(info: ToolProps<typeof WebFetchTool>) {
+  inline({
+    icon: "%",
+    title: `WebFetch ${info.input.url}`,
+  })
+}
+
+function edit(info: ToolProps<typeof EditTool>) {
+  const title = normalizePath(info.input.filePath)
+  const diff = info.metadata.diff
+  block(
+    {
+      icon: "←",
+      title: `Edit ${title}`,
+    },
+    diff,
+  )
+}
+
+function codesearch(info: ToolProps<typeof CodeSearchTool>) {
+  inline({
+    icon: "◇",
+    title: `Exa Code Search "${info.input.query}"`,
+  })
+}
+
+function websearch(info: ToolProps<typeof WebSearchTool>) {
+  inline({
+    icon: "◈",
+    title: `Exa Web Search "${info.input.query}"`,
+  })
+}
+
+function task(info: ToolProps<typeof TaskTool>) {
+  const input = info.part.state.input
+  const status = info.part.state.status
+  const subagent =
+    typeof input.subagent_type === "string" && input.subagent_type.trim().length > 0 ? input.subagent_type : "unknown"
+  const agent = Locale.titlecase(subagent)
+  const desc =
+    typeof input.description === "string" && input.description.trim().length > 0 ? input.description : undefined
+  const icon = status === "error" ? "✗" : status === "running" ? "•" : "✓"
+  const name = desc ?? `${agent} Task`
+  inline({
+    icon,
+    title: name,
+    description: desc ? `${agent} Agent` : undefined,
+  })
+}
+
+function skill(info: ToolProps<typeof SkillTool>) {
+  inline({
+    icon: "→",
+    title: `Skill "${info.input.name}"`,
+  })
+}
+
+function bash(info: ToolProps<typeof BashTool>) {
+  const output = info.part.state.status === "completed" ? info.part.state.output?.trim() : undefined
+  block(
+    {
+      icon: "$",
+      title: `${info.input.command}`,
+    },
+    output,
+  )
+}
+
+function todo(info: ToolProps<typeof TodoWriteTool>) {
+  block(
+    {
+      icon: "#",
+      title: "Todos",
+    },
+    info.input.todos.map((item) => `${item.status === "completed" ? "[x]" : "[ ]"} ${item.content}`).join("\n"),
+  )
+}
+
+function normalizePath(input?: string) {
+  if (!input) return ""
+  if (path.isAbsolute(input)) return path.relative(process.cwd(), input) || "."
+  return input
 }

 export const RunCommand = cmd({
@@ -167,61 +300,14 @@ export const RunCommand = cmd({
      .option("thinking", {
        type: "boolean",
        describe: "show thinking blocks",
-      })
-      .option("interactive", {
-        alias: ["i"],
-        type: "boolean",
-        describe: "run in direct interactive split-footer mode",
        default: false,
      })
-      .option("demo", {
-        type: "string",
-        choices: ["on", "permission", "question", "mix", "text"],
-        describe: "enable direct interactive demo slash commands",
-      })
-      .option("demo-text", {
-        type: "string",
-        describe: "text used with --demo text",
-      })
  },
  handler: async (args) => {
-    const rawMessage = [...args.message, ...(args["--"] || [])].join(" ")
-    const thinking = args.interactive ? (args.thinking ?? true) : (args.thinking ?? false)
-
    let message = [...args.message, ...(args["--"] || [])]
      .map((arg) => (arg.includes(" ") ? `"${arg.replace(/"/g, '\\"')}"` : arg))
      .join(" ")

-    if (args.interactive && args.command) {
-      UI.error("--interactive cannot be used with --command")
-      process.exit(1)
-    }
-
-    if (args.demo && !args.interactive) {
-      UI.error("--demo requires --interactive")
-      process.exit(1)
-    }
-
-    if (args.demoText && args.demo !== "text") {
-      UI.error("--demo-text requires --demo text")
-      process.exit(1)
-    }
-
-    if (args.interactive && args.format === "json") {
-      UI.error("--interactive cannot be used with --format json")
-      process.exit(1)
-    }
-
-    if (args.interactive && !process.stdin.isTTY) {
-      UI.error("--interactive requires a TTY")
-      process.exit(1)
-    }
-
-    if (args.interactive && !process.stdout.isTTY) {
-      UI.error("--interactive requires a TTY stdout")
-      process.exit(1)
-    }
-
    const directory = (() => {
      if (!args.dir) return undefined
      if (args.attach) return args.dir
@@ -234,7 +320,7 @@ export const RunCommand = cmd({
      }
    })()

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

@@ -258,7 +344,7 @@ export const RunCommand = cmd({

    if (!process.stdin.isTTY) message += "\n" + (await Bun.stdin.text())

-    if (message.trim().length === 0 && !args.command && !args.interactive) {
+    if (message.trim().length === 0 && !args.command) {
      UI.error("You must provide a message or a command")
      process.exit(1)
    }
@@ -268,25 +354,23 @@ export const RunCommand = cmd({
      process.exit(1)
    }

-    const rules: Permission.Ruleset = args.interactive
-      ? []
-      : [
-          {
-            permission: "question",
-            action: "deny",
-            pattern: "*",
-          },
-          {
-            permission: "plan_enter",
-            action: "deny",
-            pattern: "*",
-          },
-          {
-            permission: "plan_exit",
-            action: "deny",
-            pattern: "*",
-          },
-        ]
+    const rules: Permission.Ruleset = [
+      {
+        permission: "question",
+        action: "deny",
+        pattern: "*",
+      },
+      {
+        permission: "plan_enter",
+        action: "deny",
+        pattern: "*",
+      },
+      {
+        permission: "plan_exit",
+        action: "deny",
+        pattern: "*",
+      },
+    ]

    function title() {
      if (args.title === undefined) return
@@ -294,78 +378,19 @@ export const RunCommand = cmd({
      return message.slice(0, 50) + (message.length > 50 ? "..." : "")
    }

-    async function session(sdk: OpencodeClient): Promise<SessionInfo | undefined> {
-      if (args.session) {
-        const current = await sdk.session
-          .get({
-            sessionID: args.session,
-          })
-          .catch(() => undefined)
+    async function session(sdk: OpencodeClient) {
+      const baseID = args.continue ? (await sdk.session.list()).data?.find((s) => !s.parentID)?.id : args.session

-        if (!current?.data) {
-          UI.error("Session not found")
-          process.exit(1)
-        }
-
-        if (args.fork) {
-          const forked = await sdk.session.fork({
-            sessionID: args.session,
-          })
-          const id = forked.data?.id
-          if (!id) {
-            return
-          }
-
-          return {
-            id,
-            title: forked.data?.title ?? current.data.title,
-          }
-        }
-
-        return {
-          id: current.data.id,
-          title: current.data.title,
-        }
+      if (baseID && args.fork) {
+        const forked = await sdk.session.fork({ sessionID: baseID })
+        return forked.data?.id
      }

-      const base = args.continue ? (await sdk.session.list()).data?.find((item) => !item.parentID) : undefined
-
-      if (base && args.fork) {
-        const forked = await sdk.session.fork({
-          sessionID: base.id,
-        })
-        const id = forked.data?.id
-        if (!id) {
-          return
-        }
-
-        return {
-          id,
-          title: forked.data?.title ?? base.title,
-        }
-      }
-
-      if (base) {
-        return {
-          id: base.id,
-          title: base.title,
-        }
-      }
+      if (baseID) return baseID

      const name = title()
-      const result = await sdk.session.create({
-        title: name,
-        permission: rules,
-      })
-      const id = result.data?.id
-      if (!id) {
-        return
-      }
-
-      return {
-        id,
-        title: result.data?.title ?? name,
-      }
+      const result = await sdk.session.create({ title: name, permission: rules })
+      return result.data?.id
    }

    async function share(sdk: OpencodeClient, sessionID: string) {
@@ -383,101 +408,45 @@ export const RunCommand = cmd({
      }
    }

-    async function localAgent() {
-      if (!args.agent) return undefined
-
-      const entry = await (await import("../../agent/agent")).Agent.get(args.agent)
-      if (!entry) {
-        UI.println(
-          UI.Style.TEXT_WARNING_BOLD + "!",
-          UI.Style.TEXT_NORMAL,
-          `agent "${args.agent}" not found. Falling back to default agent`,
-        )
-        return undefined
-      }
-      if (entry.mode === "subagent") {
-        UI.println(
-          UI.Style.TEXT_WARNING_BOLD + "!",
-          UI.Style.TEXT_NORMAL,
-          `agent "${args.agent}" is a subagent, not a primary agent. Falling back to default agent`,
-        )
-        return undefined
-      }
-      return args.agent
-    }
-
-    async function attachAgent(sdk: OpencodeClient) {
-      if (!args.agent) return undefined
-
-      const modes = await sdk.app
-        .agents(undefined, { throwOnError: true })
-        .then((x) => x.data ?? [])
-        .catch(() => undefined)
-
-      if (!modes) {
-        UI.println(
-          UI.Style.TEXT_WARNING_BOLD + "!",
-          UI.Style.TEXT_NORMAL,
-          `failed to list agents from ${args.attach}. Falling back to default agent`,
-        )
-        return undefined
-      }
-
-      const agent = modes.find((a) => a.name === args.agent)
-      if (!agent) {
-        UI.println(
-          UI.Style.TEXT_WARNING_BOLD + "!",
-          UI.Style.TEXT_NORMAL,
-          `agent "${args.agent}" not found. Falling back to default agent`,
-        )
-        return undefined
-      }
-
-      if (agent.mode === "subagent") {
-        UI.println(
-          UI.Style.TEXT_WARNING_BOLD + "!",
-          UI.Style.TEXT_NORMAL,
-          `agent "${args.agent}" is a subagent, not a primary agent. Falling back to default agent`,
-        )
-        return undefined
-      }
-
-      return args.agent
-    }
-
-    async function pickAgent(sdk: OpencodeClient) {
-      if (!args.agent) return undefined
-      if (args.attach) {
-        return attachAgent(sdk)
-      }
-
-      return localAgent()
-    }
-
    async function execute(sdk: OpencodeClient) {
+      function tool(part: ToolPart) {
+        try {
+          if (part.tool === "bash") return bash(props<typeof BashTool>(part))
+          if (part.tool === "glob") return glob(props<typeof GlobTool>(part))
+          if (part.tool === "grep") return grep(props<typeof GrepTool>(part))
+          if (part.tool === "list") return list(props<typeof ListTool>(part))
+          if (part.tool === "read") return read(props<typeof ReadTool>(part))
+          if (part.tool === "write") return write(props<typeof WriteTool>(part))
+          if (part.tool === "webfetch") return webfetch(props<typeof WebFetchTool>(part))
+          if (part.tool === "edit") return edit(props<typeof EditTool>(part))
+          if (part.tool === "codesearch") return codesearch(props<typeof CodeSearchTool>(part))
+          if (part.tool === "websearch") return websearch(props<typeof WebSearchTool>(part))
+          if (part.tool === "task") return task(props<typeof TaskTool>(part))
+          if (part.tool === "todowrite") return todo(props<typeof TodoWriteTool>(part))
+          if (part.tool === "skill") return skill(props<typeof SkillTool>(part))
+          return fallback(part)
+        } catch {
+          return fallback(part)
+        }
+      }
+
      function emit(type: string, data: Record<string, unknown>) {
        if (args.format === "json") {
-          process.stdout.write(
-            JSON.stringify({
-              type,
-              timestamp: Date.now(),
-              sessionID,
-              ...data,
-            }) + EOL,
-          )
+          process.stdout.write(JSON.stringify({ type, timestamp: Date.now(), sessionID, ...data }) + EOL)
          return true
        }
        return false
      }

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

        for await (const event of events.stream) {
          if (
            event.type === "message.updated" &&
-            event.properties.sessionID === sessionID &&
            event.properties.info.role === "assistant" &&
            args.format !== "json" &&
            toggles.get("start") !== true
@@ -495,7 +464,7 @@ export const RunCommand = cmd({
            if (part.type === "tool" && (part.state.status === "completed" || part.state.status === "error")) {
              if (emit("tool_use", { part })) continue
              if (part.state.status === "completed") {
-                await tool(part)
+                tool(part)
                continue
              }
              inline({
@@ -512,7 +481,7 @@ export const RunCommand = cmd({
              args.format !== "json"
            ) {
              if (toggles.get(part.id) === true) continue
-              await tool(part)
+              task(props<typeof TaskTool>(part))
              toggles.set(part.id, true)
            }

@@ -589,36 +558,90 @@ export const RunCommand = cmd({
      }

      // Validate agent if specified
-      const agent = await pickAgent(sdk)
+      const agent = await (async () => {
+        if (!args.agent) return undefined

-      const sess = await session(sdk)
-      if (!sess?.id) {
+        // When attaching, validate against the running server instead of local Instance state.
+        if (args.attach) {
+          const modes = await sdk.app
+            .agents(undefined, { throwOnError: true })
+            .then((x) => x.data ?? [])
+            .catch(() => undefined)
+
+          if (!modes) {
+            UI.println(
+              UI.Style.TEXT_WARNING_BOLD + "!",
+              UI.Style.TEXT_NORMAL,
+              `failed to list agents from ${args.attach}. Falling back to default agent`,
+            )
+            return undefined
+          }
+
+          const agent = modes.find((a) => a.name === args.agent)
+          if (!agent) {
+            UI.println(
+              UI.Style.TEXT_WARNING_BOLD + "!",
+              UI.Style.TEXT_NORMAL,
+              `agent "${args.agent}" not found. Falling back to default agent`,
+            )
+            return undefined
+          }
+
+          if (agent.mode === "subagent") {
+            UI.println(
+              UI.Style.TEXT_WARNING_BOLD + "!",
+              UI.Style.TEXT_NORMAL,
+              `agent "${args.agent}" is a subagent, not a primary agent. Falling back to default agent`,
+            )
+            return undefined
+          }
+
+          return args.agent
+        }
+
+        const entry = await Agent.get(args.agent)
+        if (!entry) {
+          UI.println(
+            UI.Style.TEXT_WARNING_BOLD + "!",
+            UI.Style.TEXT_NORMAL,
+            `agent "${args.agent}" not found. Falling back to default agent`,
+          )
+          return undefined
+        }
+        if (entry.mode === "subagent") {
+          UI.println(
+            UI.Style.TEXT_WARNING_BOLD + "!",
+            UI.Style.TEXT_NORMAL,
+            `agent "${args.agent}" is a subagent, not a primary agent. Falling back to default agent`,
+          )
+          return undefined
+        }
+        return args.agent
+      })()
+
+      const sessionID = await session(sdk)
+      if (!sessionID) {
        UI.error("Session not found")
        process.exit(1)
      }
-      const sessionID = sess.id
      await share(sdk, sessionID)

-      if (!args.interactive) {
-        const events = await sdk.event.subscribe()
-        loop(events).catch((e) => {
-          console.error(e)
-          process.exit(1)
+      loop().catch((e) => {
+        console.error(e)
+        process.exit(1)
+      })
+
+      if (args.command) {
+        await sdk.session.command({
+          sessionID,
+          agent,
+          model: args.model,
+          command: args.command,
+          arguments: message,
+          variant: args.variant,
        })
-
-        if (args.command) {
-          await sdk.session.command({
-            sessionID,
-            agent,
-            model: args.model,
-            command: args.command,
-            arguments: message,
-            variant: args.variant,
-          })
-          return
-        }
-
-        const model = pick(args.model)
+      } else {
+        const model = args.model ? Provider.parseModel(args.model) : undefined
        await sdk.session.prompt({
          sessionID,
          agent,
@@ -626,51 +649,7 @@ export const RunCommand = cmd({
          variant: args.variant,
          parts: [...files, { type: "text", text: message }],
        })
-        return
      }
-
-      const model = pick(args.model)
-      const { runInteractiveMode } = await runtimeTask
-      await runInteractiveMode({
-        sdk,
-        sessionID,
-        sessionTitle: sess.title,
-        resume: Boolean(args.session) && !args.fork,
-        agent,
-        model,
-        variant: args.variant,
-        files,
-        initialInput: rawMessage.trim().length > 0 ? rawMessage : undefined,
-        thinking,
-        demo: args.demo as RunDemo | undefined,
-        demoText: args.demoText,
-      })
-      return
-    }
-
-    if (args.interactive && !args.attach && !args.session && !args.continue) {
-      const model = pick(args.model)
-      const { runInteractiveLocalMode } = await runtimeTask
-      const fetchFn = (async (input: RequestInfo | URL, init?: RequestInit) => {
-        const { Server } = await import("../../server/server")
-        const request = new Request(input, init)
-        return Server.Default().fetch(request)
-      }) as typeof globalThis.fetch
-
-      return await runInteractiveLocalMode({
-        fetch: fetchFn,
-        resolveAgent: localAgent,
-        session,
-        share,
-        agent: args.agent,
-        model,
-        variant: args.variant,
-        files,
-        initialInput: rawMessage.trim().length > 0 ? rawMessage : undefined,
-        thinking,
-        demo: args.demo as RunDemo | undefined,
-        demoText: args.demoText,
-      })
    }

    if (args.attach) {
@@ -681,24 +660,16 @@ export const RunCommand = cmd({
        const auth = `Basic ${Buffer.from(`${username}:${password}`).toString("base64")}`
        return { Authorization: auth }
      })()
-      const sdk = createOpencodeClient({
-        baseUrl: args.attach,
-        directory,
-        headers,
-      })
+      const sdk = createOpencodeClient({ baseUrl: args.attach, directory, headers })
      return await execute(sdk)
    }

    await bootstrap(process.cwd(), async () => {
      const fetchFn = (async (input: RequestInfo | URL, init?: RequestInit) => {
-        const { Server } = await import("../../server/server")
        const request = new Request(input, init)
        return Server.Default().fetch(request)
      }) as typeof globalThis.fetch
-      const sdk = createOpencodeClient({
-        baseUrl: "http://opencode.internal",
-        fetch: fetchFn,
-      })
+      const sdk = createOpencodeClient({ baseUrl: "http://opencode.internal", fetch: fetchFn })
      await execute(sdk)
    })
  },
@@ -1,487 +0,0 @@
-// Permission UI body for the direct-mode footer.
-//
-// Renders inside the footer when the reducer pushes a FooterView of type
-// "permission". Uses a three-stage state machine (permission.shared.ts):
-//
-//   permission → shows the request with Allow once / Always / Reject buttons
-//   always     → confirmation step before granting permanent access
-//   reject     → text field for the rejection message
-//
-// Keyboard: left/right to select, enter to confirm, esc to reject.
-// The diff view (when available) uses the same diff component as scrollback
-// tool snapshots.
-/** @jsxImportSource @opentui/solid */
-import { useKeyboard, useTerminalDimensions } from "@opentui/solid"
-import { For, Match, Show, Switch, createEffect, createMemo, createSignal } from "solid-js"
-import type { PermissionRequest } from "@opencode-ai/sdk/v2"
-import {
-  createPermissionBodyState,
-  permissionAlwaysLines,
-  permissionCancel,
-  permissionEscape,
-  permissionHover,
-  permissionInfo,
-  permissionLabel,
-  permissionOptions,
-  permissionReject,
-  permissionRun,
-  permissionShift,
-  type PermissionOption,
-} from "./permission.shared"
-import { toolDiffView, toolFiletype } from "./tool"
-import { transparent, type RunBlockTheme, type RunFooterTheme } from "./theme"
-import type { PermissionReply, RunDiffStyle } from "./types"
-
-type RejectArea = {
-  isDestroyed: boolean
-  plainText: string
-  cursorOffset: number
-  setText(text: string): void
-  focus(): void
-}
-
-function buttons(
-  list: PermissionOption[],
-  selected: PermissionOption,
-  theme: RunFooterTheme,
-  disabled: boolean,
-  onHover: (option: PermissionOption) => void,
-  onSelect: (option: PermissionOption) => void,
-) {
-  return (
-    <box flexDirection="row" gap={1} flexShrink={0} paddingBottom={1}>
-      <For each={list}>
-        {(option) => (
-          <box
-            paddingLeft={1}
-            paddingRight={1}
-            backgroundColor={option === selected ? theme.highlight : transparent}
-            onMouseOver={() => {
-              if (!disabled) onHover(option)
-            }}
-            onMouseUp={() => {
-              if (!disabled) onSelect(option)
-            }}
-          >
-            <text fg={option === selected ? theme.surface : theme.muted}>{permissionLabel(option)}</text>
-          </box>
-        )}
-      </For>
-    </box>
-  )
-}
-
-function RejectField(props: {
-  theme: RunFooterTheme
-  text: string
-  disabled: boolean
-  onChange: (text: string) => void
-  onConfirm: () => void
-  onCancel: () => void
-}) {
-  let area: RejectArea | undefined
-
-  createEffect(() => {
-    if (!area || area.isDestroyed) {
-      return
-    }
-
-    if (area.plainText !== props.text) {
-      area.setText(props.text)
-      area.cursorOffset = props.text.length
-    }
-
-    queueMicrotask(() => {
-      if (!area || area.isDestroyed || props.disabled) {
-        return
-      }
-      area.focus()
-    })
-  })
-
-  return (
-    <textarea
-      id="run-direct-footer-permission-reject"
-      width="100%"
-      minHeight={1}
-      maxHeight={3}
-      paddingBottom={1}
-      wrapMode="word"
-      placeholder="Tell OpenCode what to do differently"
-      placeholderColor={props.theme.muted}
-      textColor={props.theme.text}
-      focusedTextColor={props.theme.text}
-      backgroundColor={props.theme.surface}
-      focusedBackgroundColor={props.theme.surface}
-      cursorColor={props.theme.text}
-      focused={!props.disabled}
-      onContentChange={() => {
-        if (!area || area.isDestroyed) {
-          return
-        }
-        props.onChange(area.plainText)
-      }}
-      onKeyDown={(event) => {
-        if (event.name === "escape") {
-          event.preventDefault()
-          props.onCancel()
-          return
-        }
-
-        if (event.name === "return" && !event.meta && !event.ctrl && !event.shift) {
-          event.preventDefault()
-          props.onConfirm()
-        }
-      }}
-      ref={(item) => {
-        area = item as RejectArea
-      }}
-    />
-  )
-}
-
-export function RunPermissionBody(props: {
-  request: PermissionRequest
-  theme: RunFooterTheme
-  block: RunBlockTheme
-  diffStyle?: RunDiffStyle
-  onReply: (input: PermissionReply) => void | Promise<void>
-}) {
-  const dims = useTerminalDimensions()
-  const [state, setState] = createSignal(createPermissionBodyState(props.request.id))
-  const info = createMemo(() => permissionInfo(props.request))
-  const ft = createMemo(() => toolFiletype(info().file))
-  const view = createMemo(() => toolDiffView(dims().width, props.diffStyle))
-  const narrow = createMemo(() => dims().width < 80)
-  const opts = createMemo(() => permissionOptions(state().stage))
-  const busy = createMemo(() => state().submitting)
-  const title = createMemo(() => {
-    if (state().stage === "always") {
-      return "Always allow"
-    }
-
-    if (state().stage === "reject") {
-      return "Reject permission"
-    }
-
-    return "Permission required"
-  })
-
-  createEffect(() => {
-    const id = props.request.id
-    if (state().requestID === id) {
-      return
-    }
-
-    setState(createPermissionBodyState(id))
-  })
-
-  const shift = (dir: -1 | 1) => {
-    setState((prev) => permissionShift(prev, dir))
-  }
-
-  const submit = async (next: PermissionReply) => {
-    setState((prev) => ({
-      ...prev,
-      submitting: true,
-    }))
-
-    try {
-      await props.onReply(next)
-    } catch {
-      setState((prev) => ({
-        ...prev,
-        submitting: false,
-      }))
-    }
-  }
-
-  const run = (option: PermissionOption) => {
-    const cur = state()
-    const next = permissionRun(cur, props.request.id, option)
-    if (next.state !== cur) {
-      setState(next.state)
-    }
-
-    if (!next.reply) {
-      return
-    }
-
-    void submit(next.reply)
-  }
-
-  const reject = () => {
-    const next = permissionReject(state(), props.request.id)
-    if (!next) {
-      return
-    }
-
-    void submit(next)
-  }
-
-  const cancelReject = () => {
-    setState((prev) => permissionCancel(prev))
-  }
-
-  useKeyboard((event) => {
-    const cur = state()
-    if (cur.stage === "reject") {
-      return
-    }
-
-    if (cur.submitting) {
-      if (["left", "right", "h", "l", "tab", "return", "escape"].includes(event.name)) {
-        event.preventDefault()
-      }
-      return
-    }
-
-    if (event.name === "tab") {
-      shift(event.shift ? -1 : 1)
-      event.preventDefault()
-      return
-    }
-
-    if (event.name === "left" || event.name === "h") {
-      shift(-1)
-      event.preventDefault()
-      return
-    }
-
-    if (event.name === "right" || event.name === "l") {
-      shift(1)
-      event.preventDefault()
-      return
-    }
-
-    if (event.name === "return") {
-      run(state().selected)
-      event.preventDefault()
-      return
-    }
-
-    if (event.name !== "escape") {
-      return
-    }
-
-    setState((prev) => permissionEscape(prev))
-    event.preventDefault()
-  })
-
-  return (
-    <box id="run-direct-footer-permission-body" width="100%" height="100%" flexDirection="column">
-      <box
-        id="run-direct-footer-permission-head"
-        flexDirection="column"
-        gap={1}
-        paddingLeft={1}
-        paddingRight={2}
-        paddingTop={1}
-        paddingBottom={1}
-        flexShrink={0}
-      >
-        <box flexDirection="row" gap={1} paddingLeft={1}>
-          <text fg={state().stage === "reject" ? props.theme.error : props.theme.warning}>△</text>
-          <text fg={props.theme.text}>{title()}</text>
-        </box>
-        <Switch>
-          <Match when={state().stage === "permission"}>
-            <box flexDirection="row" gap={1} paddingLeft={2}>
-              <text fg={props.theme.muted} flexShrink={0}>
-                {info().icon}
-              </text>
-              <text fg={props.theme.text} wrapMode="word">
-                {info().title}
-              </text>
-            </box>
-          </Match>
-          <Match when={state().stage === "reject"}>
-            <box paddingLeft={1}>
-              <text fg={props.theme.muted}>Tell OpenCode what to do differently</text>
-            </box>
-          </Match>
-        </Switch>
-      </box>
-
-      <Show
-        when={state().stage !== "reject"}
-        fallback={
-          <box width="100%" flexGrow={1} flexShrink={1} justifyContent="flex-end">
-            <box
-              id="run-direct-footer-permission-reject-bar"
-              flexDirection={narrow() ? "column" : "row"}
-              flexShrink={0}
-              backgroundColor={props.theme.line}
-              paddingTop={1}
-              paddingLeft={2}
-              paddingRight={3}
-              paddingBottom={1}
-              justifyContent={narrow() ? "flex-start" : "space-between"}
-              alignItems={narrow() ? "flex-start" : "center"}
-              gap={1}
-            >
-              <box width={narrow() ? "100%" : undefined} flexGrow={1} flexShrink={1}>
-                <RejectField
-                  theme={props.theme}
-                  text={state().message}
-                  disabled={busy()}
-                  onChange={(text) => {
-                    setState((prev) => ({
-                      ...prev,
-                      message: text,
-                    }))
-                  }}
-                  onConfirm={reject}
-                  onCancel={cancelReject}
-                />
-              </box>
-              <Show
-                when={!busy()}
-                fallback={
-                  <text fg={props.theme.muted} wrapMode="word" flexShrink={0}>
-                    Waiting for permission event...
-                  </text>
-                }
-              >
-                <box flexDirection="row" gap={2} flexShrink={0} paddingBottom={1}>
-                  <text fg={props.theme.text}>
-                    enter <span style={{ fg: props.theme.muted }}>confirm</span>
-                  </text>
-                  <text fg={props.theme.text}>
-                    esc <span style={{ fg: props.theme.muted }}>cancel</span>
-                  </text>
-                </box>
-              </Show>
-            </box>
-          </box>
-        }
-      >
-        <box width="100%" flexGrow={1} flexShrink={1} paddingLeft={1} paddingRight={3} paddingBottom={1}>
-          <Switch>
-            <Match when={state().stage === "permission"}>
-              <scrollbox
-                width="100%"
-                height="100%"
-                verticalScrollbarOptions={{
-                  trackOptions: {
-                    backgroundColor: props.theme.surface,
-                    foregroundColor: props.theme.line,
-                  },
-                }}
-              >
-                <box width="100%" flexDirection="column" gap={1}>
-                  <Show
-                    when={info().diff}
-                    fallback={
-                      <box width="100%" flexDirection="column" gap={1} paddingLeft={1}>
-                        <For each={info().lines}>
-                          {(line) => (
-                            <text fg={props.theme.text} wrapMode="word">
-                              {line}
-                            </text>
-                          )}
-                        </For>
-                      </box>
-                    }
-                  >
-                    <diff
-                      diff={info().diff!}
-                      view={view()}
-                      filetype={ft()}
-                      syntaxStyle={props.block.syntax}
-                      showLineNumbers={true}
-                      width="100%"
-                      wrapMode="word"
-                      fg={props.theme.text}
-                      addedBg={props.block.diffAddedBg}
-                      removedBg={props.block.diffRemovedBg}
-                      contextBg={props.block.diffContextBg}
-                      addedSignColor={props.block.diffHighlightAdded}
-                      removedSignColor={props.block.diffHighlightRemoved}
-                      lineNumberFg={props.block.diffLineNumber}
-                      lineNumberBg={props.block.diffContextBg}
-                      addedLineNumberBg={props.block.diffAddedLineNumberBg}
-                      removedLineNumberBg={props.block.diffRemovedLineNumberBg}
-                    />
-                  </Show>
-                  <Show when={!info().diff && info().lines.length === 0}>
-                    <box paddingLeft={1}>
-                      <text fg={props.theme.muted}>No diff provided</text>
-                    </box>
-                  </Show>
-                </box>
-              </scrollbox>
-            </Match>
-            <Match when={true}>
-              <scrollbox
-                width="100%"
-                height="100%"
-                verticalScrollbarOptions={{
-                  trackOptions: {
-                    backgroundColor: props.theme.surface,
-                    foregroundColor: props.theme.line,
-                  },
-                }}
-              >
-                <box width="100%" flexDirection="column" gap={1} paddingLeft={1}>
-                  <For each={permissionAlwaysLines(props.request)}>
-                    {(line) => (
-                      <text fg={props.theme.text} wrapMode="word">
-                        {line}
-                      </text>
-                    )}
-                  </For>
-                </box>
-              </scrollbox>
-            </Match>
-          </Switch>
-        </box>
-
-        <box
-          id="run-direct-footer-permission-actions"
-          flexDirection={narrow() ? "column" : "row"}
-          flexShrink={0}
-          backgroundColor={props.theme.pane}
-          gap={1}
-          paddingTop={1}
-          paddingLeft={2}
-          paddingRight={3}
-          paddingBottom={1}
-          justifyContent={narrow() ? "flex-start" : "space-between"}
-          alignItems={narrow() ? "flex-start" : "center"}
-        >
-          {buttons(
-            opts(),
-            state().selected,
-            props.theme,
-            busy(),
-            (option) => {
-              setState((prev) => permissionHover(prev, option))
-            },
-            run,
-          )}
-          <Show
-            when={!busy()}
-            fallback={
-              <text fg={props.theme.muted} wrapMode="word" flexShrink={0}>
-                Waiting for permission event...
-              </text>
-            }
-          >
-            <box flexDirection="row" gap={2} flexShrink={0} paddingBottom={1}>
-              <text fg={props.theme.text}>
-                {"⇆"} <span style={{ fg: props.theme.muted }}>select</span>
-              </text>
-              <text fg={props.theme.text}>
-                enter <span style={{ fg: props.theme.muted }}>confirm</span>
-              </text>
-              <text fg={props.theme.text}>
-                esc <span style={{ fg: props.theme.muted }}>{state().stage === "always" ? "cancel" : "reject"}</span>
-              </text>
-            </box>
-          </Show>
-        </box>
-      </Show>
-    </box>
-  )
-}
@@ -1,471 +0,0 @@
-// Prompt textarea component and its state machine for direct interactive mode.
-//
-// createPromptState() wires keybinds, history navigation, leader-key sequences
-// for variant cycling, and the submit/interrupt/exit flow. It produces a
-// PromptState that RunPromptBody renders as an OpenTUI textarea.
-//
-// The leader-key pattern: press the leader key (default ctrl+x), then press
-// "t" within 2 seconds to cycle the model variant. This mirrors vim-style
-// two-key sequences. The timer auto-clears if the second key doesn't arrive.
-//
-// History uses arrow keys at cursor boundaries: up at offset 0 scrolls back,
-// down at end-of-text scrolls forward, restoring the draft when you return
-// past the end of history.
-/** @jsxImportSource @opentui/solid */
-import { StyledText, bg, fg, type KeyBinding } from "@opentui/core"
-import { useKeyboard } from "@opentui/solid"
-import { createEffect, createMemo, createSignal, onCleanup, onMount, type Accessor } from "solid-js"
-import {
-  createPromptHistory,
-  isExitCommand,
-  movePromptHistory,
-  promptCycle,
-  promptHit,
-  promptInfo,
-  promptKeys,
-  pushPromptHistory,
-} from "./prompt.shared"
-import type { FooterKeybinds, FooterState } from "./types"
-import type { RunFooterTheme } from "./theme"
-
-const LEADER_TIMEOUT_MS = 2000
-
-export const TEXTAREA_MIN_ROWS = 1
-export const TEXTAREA_MAX_ROWS = 6
-
-export const HINT_BREAKPOINTS = {
-  send: 50,
-  newline: 66,
-  history: 80,
-  variant: 95,
-}
-
-type Area = {
-  isDestroyed: boolean
-  virtualLineCount: number
-  visualCursor: {
-    visualRow: number
-  }
-  plainText: string
-  cursorOffset: number
-  height?: number
-  setText(text: string): void
-  focus(): void
-  on(event: string, fn: () => void): void
-  off(event: string, fn: () => void): void
-}
-
-type Key = {
-  name: string
-  ctrl?: boolean
-  meta?: boolean
-  shift?: boolean
-  super?: boolean
-  hyper?: boolean
-  preventDefault(): void
-}
-
-type PromptInput = {
-  keybinds: FooterKeybinds
-  state: Accessor<FooterState>
-  view: Accessor<string>
-  prompt: Accessor<boolean>
-  width: Accessor<number>
-  theme: Accessor<RunFooterTheme>
-  history?: string[]
-  onSubmit: (text: string) => boolean
-  onCycle: () => void
-  onInterrupt: () => boolean
-  onExitRequest?: () => boolean
-  onExit: () => void
-  onRows: (rows: number) => void
-  onStatus: (text: string) => void
-}
-
-export type PromptState = {
-  placeholder: Accessor<StyledText | string>
-  bindings: Accessor<KeyBinding[]>
-  onSubmit: () => void
-  onKeyDown: (event: Key) => void
-  onContentChange: () => void
-  bind: (area?: Area) => void
-}
-
-function clamp(rows: number): number {
-  return Math.max(TEXTAREA_MIN_ROWS, Math.min(TEXTAREA_MAX_ROWS, rows))
-}
-
-export function hintFlags(width: number) {
-  return {
-    send: width >= HINT_BREAKPOINTS.send,
-    newline: width >= HINT_BREAKPOINTS.newline,
-    history: width >= HINT_BREAKPOINTS.history,
-    variant: width >= HINT_BREAKPOINTS.variant,
-  }
-}
-
-export function RunPromptBody(props: {
-  theme: () => RunFooterTheme
-  placeholder: () => StyledText | string
-  bindings: () => KeyBinding[]
-  onSubmit: () => void
-  onKeyDown: (event: Key) => void
-  onContentChange: () => void
-  bind: (area?: Area) => void
-}) {
-  let item: Area | undefined
-
-  onMount(() => {
-    props.bind(item)
-  })
-
-  onCleanup(() => {
-    props.bind(undefined)
-  })
-
-  return (
-    <box id="run-direct-footer-prompt"
-      paddingTop={1}
-      paddingLeft={2}
-      paddingRight={2}
-    >
-      <textarea
-        id="run-direct-footer-composer"
-        width="100%"
-        minHeight={TEXTAREA_MIN_ROWS}
-        maxHeight={TEXTAREA_MAX_ROWS}
-        wrapMode="word"
-        placeholder={props.placeholder()}
-        placeholderColor={props.theme().muted}
-        textColor={props.theme().text}
-        focusedTextColor={props.theme().text}
-
-        backgroundColor={props.theme().surface}
-        focusedBackgroundColor={props.theme().surface}
-        cursorColor={props.theme().text}
-        keyBindings={props.bindings()}
-        onSubmit={props.onSubmit}
-        onKeyDown={props.onKeyDown}
-        onContentChange={props.onContentChange}
-        ref={(next) => {
-          item = next as Area
-        }}
-      />
-    </box>
-  )
-}
-
-export function createPromptState(input: PromptInput): PromptState {
-  const keys = createMemo(() => promptKeys(input.keybinds))
-  const bindings = createMemo(() => keys().bindings)
-  const [draft, setDraft] = createSignal("")
-  const placeholder = createMemo(() => {
-    if (!input.state().first) {
-      return ""
-    }
-
-    return new StyledText([
-      bg(input.theme().surface)(fg(input.theme().muted)('Ask anything... "Fix a TODO in the codebase"')),
-    ])
-  })
-
-  let history = createPromptHistory(input.history)
-
-  let area: Area | undefined
-  let leader = false
-  let timeout: NodeJS.Timeout | undefined
-  let tick = false
-  let prev = input.view()
-
-  const clear = () => {
-    leader = false
-    if (!timeout) {
-      return
-    }
-
-    clearTimeout(timeout)
-    timeout = undefined
-  }
-
-  const arm = () => {
-    clear()
-    leader = true
-    timeout = setTimeout(() => {
-      clear()
-    }, LEADER_TIMEOUT_MS)
-  }
-
-  const syncRows = () => {
-    if (!area || area.isDestroyed) {
-      return
-    }
-
-    input.onRows(clamp(area.virtualLineCount || 1))
-  }
-
-  const scheduleRows = () => {
-    if (tick) {
-      return
-    }
-
-    tick = true
-    queueMicrotask(() => {
-      tick = false
-      syncRows()
-    })
-  }
-
-  const bind = (next?: Area) => {
-    if (area === next) {
-      return
-    }
-
-    if (area && !area.isDestroyed) {
-      area.off("line-info-change", scheduleRows)
-    }
-
-    area = next
-    if (!area || area.isDestroyed) {
-      return
-    }
-
-    area.on("line-info-change", scheduleRows)
-    queueMicrotask(() => {
-      if (!area || area.isDestroyed || !input.prompt()) {
-        return
-      }
-
-      if (area.plainText !== draft()) {
-        area.setText(draft())
-      }
-
-      area.cursorOffset = area.plainText.length
-      scheduleRows()
-      area.focus()
-    })
-  }
-
-  const syncDraft = () => {
-    if (!area || area.isDestroyed) {
-      return
-    }
-
-    setDraft(area.plainText)
-  }
-
-  const push = (text: string) => {
-    history = pushPromptHistory(history, text)
-  }
-
-  const move = (dir: -1 | 1, event: Key) => {
-    if (!area || area.isDestroyed) {
-      return
-    }
-
-    const next = movePromptHistory(history, dir, area.plainText, area.cursorOffset)
-    if (!next.apply || next.text === undefined || next.cursor === undefined) {
-      return
-    }
-
-    history = next.state
-    area.setText(next.text)
-    area.cursorOffset = next.cursor
-    event.preventDefault()
-    syncRows()
-  }
-
-  const cycle = (event: Key): boolean => {
-    const next = promptCycle(leader, promptInfo(event), keys().leaders, keys().cycles)
-    if (!next.consume) {
-      return false
-    }
-
-    if (next.clear) {
-      clear()
-    }
-
-    if (next.arm) {
-      arm()
-    }
-
-    if (next.cycle) {
-      input.onCycle()
-    }
-
-    event.preventDefault()
-    return true
-  }
-
-  const onKeyDown = (event: Key) => {
-    if (event.ctrl && event.name === "c") {
-      const handled = input.onExitRequest ? input.onExitRequest() : (input.onExit(), true)
-      if (handled) {
-        event.preventDefault()
-      }
-      return
-    }
-
-    const key = promptInfo(event)
-    if (promptHit(keys().interrupts, key)) {
-      if (input.onInterrupt()) {
-        event.preventDefault()
-        return
-      }
-    }
-
-    if (cycle(event)) {
-      return
-    }
-
-    const up = promptHit(keys().previous, key)
-    const down = promptHit(keys().next, key)
-    if (!up && !down) {
-      return
-    }
-
-    if (!area || area.isDestroyed) {
-      return
-    }
-
-    const dir = up ? -1 : 1
-    if ((dir === -1 && area.cursorOffset === 0) || (dir === 1 && area.cursorOffset === area.plainText.length)) {
-      move(dir, event)
-      return
-    }
-
-    if (dir === -1 && area.visualCursor.visualRow === 0) {
-      area.cursorOffset = 0
-    }
-
-    const end =
-      typeof area.height === "number" && Number.isFinite(area.height) && area.height > 0
-        ? area.height - 1
-        : Math.max(0, area.virtualLineCount - 1)
-    if (dir === 1 && area.visualCursor.visualRow === end) {
-      area.cursorOffset = area.plainText.length
-    }
-  }
-
-  useKeyboard((event) => {
-    if (input.prompt()) {
-      return
-    }
-
-    if (event.ctrl && event.name === "c") {
-      const handled = input.onExitRequest ? input.onExitRequest() : (input.onExit(), true)
-      if (handled) {
-        event.preventDefault()
-      }
-    }
-  })
-
-  const onSubmit = () => {
-    if (!area || area.isDestroyed) {
-      return
-    }
-
-    const text = area.plainText.trim()
-    if (!text) {
-      input.onStatus(input.state().phase === "running" ? "waiting for current response" : "empty prompt ignored")
-      return
-    }
-
-    if (isExitCommand(text)) {
-      input.onExit()
-      return
-    }
-
-    area.setText("")
-    setDraft("")
-    scheduleRows()
-    area.focus()
-    queueMicrotask(() => {
-      if (input.onSubmit(text)) {
-        push(text)
-        return
-      }
-
-      if (!area || area.isDestroyed) {
-        return
-      }
-
-      area.setText(text)
-      setDraft(text)
-      area.cursorOffset = area.plainText.length
-      syncRows()
-      area.focus()
-    })
-  }
-
-  onCleanup(() => {
-    clear()
-    if (area && !area.isDestroyed) {
-      area.off("line-info-change", scheduleRows)
-    }
-  })
-
-  createEffect(() => {
-    input.width()
-    if (input.prompt()) {
-      scheduleRows()
-    }
-  })
-
-  createEffect(() => {
-    input.state().phase
-    if (!input.prompt() || !area || area.isDestroyed || input.state().phase !== "idle") {
-      return
-    }
-
-    queueMicrotask(() => {
-      if (!area || area.isDestroyed) {
-        return
-      }
-
-      area.focus()
-    })
-  })
-
-  createEffect(() => {
-    const type = input.view()
-    if (type === prev) {
-      return
-    }
-
-    if (prev === "prompt") {
-      syncDraft()
-    }
-
-    clear()
-    prev = type
-    if (type !== "prompt") {
-      return
-    }
-
-    queueMicrotask(() => {
-      if (!area || area.isDestroyed) {
-        return
-      }
-
-      if (area.plainText !== draft()) {
-        area.setText(draft())
-      }
-
-      area.cursorOffset = area.plainText.length
-      scheduleRows()
-      area.focus()
-    })
-  })
-
-  return {
-    placeholder,
-    bindings,
-    onSubmit,
-    onKeyDown,
-    onContentChange: () => {
-      syncDraft()
-      scheduleRows()
-    },
-    bind,
-  }
-}
@@ -1,596 +0,0 @@
-// Question UI body for the direct-mode footer.
-//
-// Renders inside the footer when the reducer pushes a FooterView of type
-// "question". Supports single-question and multi-question flows:
-//
-//   Single question: options list with up/down selection, digit shortcuts,
-//   and optional custom text input.
-//
-//   Multi-question: tabbed interface where each question is a tab, plus a
-//   final "Confirm" tab that shows all answers for review. Tab/shift-tab
-//   or left/right to navigate between questions.
-//
-// All state logic lives in question.shared.ts as a pure state machine.
-// This component just renders it and dispatches keyboard events.
-/** @jsxImportSource @opentui/solid */
-import { useKeyboard, useTerminalDimensions } from "@opentui/solid"
-import { For, Show, createEffect, createMemo, createSignal } from "solid-js"
-import type { QuestionRequest } from "@opencode-ai/sdk/v2"
-import {
-  createQuestionBodyState,
-  questionConfirm,
-  questionCustom,
-  questionInfo,
-  questionInput,
-  questionMove,
-  questionOther,
-  questionPicked,
-  questionReject,
-  questionSave,
-  questionSelect,
-  questionSetEditing,
-  questionSetSelected,
-  questionSetSubmitting,
-  questionSetTab,
-  questionSingle,
-  questionStoreCustom,
-  questionSubmit,
-  questionSync,
-  questionTabs,
-  questionTotal,
-} from "./question.shared"
-import type { RunFooterTheme } from "./theme"
-import type { QuestionReject, QuestionReply } from "./types"
-
-type Area = {
-  isDestroyed: boolean
-  plainText: string
-  cursorOffset: number
-  setText(text: string): void
-  focus(): void
-}
-
-export function RunQuestionBody(props: {
-  request: QuestionRequest
-  theme: RunFooterTheme
-  onReply: (input: QuestionReply) => void | Promise<void>
-  onReject: (input: QuestionReject) => void | Promise<void>
-}) {
-  const dims = useTerminalDimensions()
-  const [state, setState] = createSignal(createQuestionBodyState(props.request.id))
-  const single = createMemo(() => questionSingle(props.request))
-  const confirm = createMemo(() => questionConfirm(props.request, state()))
-  const info = createMemo(() => questionInfo(props.request, state()))
-  const input = createMemo(() => questionInput(state()))
-  const other = createMemo(() => questionOther(props.request, state()))
-  const picked = createMemo(() => questionPicked(state()))
-  const disabled = createMemo(() => state().submitting)
-  const narrow = createMemo(() => dims().width < 80)
-  const verb = createMemo(() => {
-    if (confirm()) {
-      return "submit"
-    }
-
-    if (info()?.multiple) {
-      return "toggle"
-    }
-
-    if (single()) {
-      return "submit"
-    }
-
-    return "confirm"
-  })
-  let area: Area | undefined
-
-  createEffect(() => {
-    setState((prev) => questionSync(prev, props.request.id))
-  })
-
-  const setTab = (tab: number) => {
-    setState((prev) => questionSetTab(prev, tab))
-  }
-
-  const move = (dir: -1 | 1) => {
-    setState((prev) => questionMove(prev, props.request, dir))
-  }
-
-  const beginReply = async (input: QuestionReply) => {
-    setState((prev) => questionSetSubmitting(prev, true))
-
-    try {
-      await props.onReply(input)
-    } catch {
-      setState((prev) => questionSetSubmitting(prev, false))
-    }
-  }
-
-  const beginReject = async (input: QuestionReject) => {
-    setState((prev) => questionSetSubmitting(prev, true))
-
-    try {
-      await props.onReject(input)
-    } catch {
-      setState((prev) => questionSetSubmitting(prev, false))
-    }
-  }
-
-  const saveCustom = () => {
-    const cur = state()
-    const next = questionSave(cur, props.request)
-    if (next.state !== cur) {
-      setState(next.state)
-    }
-
-    if (!next.reply) {
-      return
-    }
-
-    void beginReply(next.reply)
-  }
-
-  const choose = (selected: number) => {
-    const base = state()
-    const cur = questionSetSelected(base, selected)
-    const next = questionSelect(cur, props.request)
-    if (next.state !== base) {
-      setState(next.state)
-    }
-
-    if (!next.reply) {
-      return
-    }
-
-    void beginReply(next.reply)
-  }
-
-  const mark = (selected: number) => {
-    setState((prev) => questionSetSelected(prev, selected))
-  }
-
-  const select = () => {
-    const cur = state()
-    const next = questionSelect(cur, props.request)
-    if (next.state !== cur) {
-      setState(next.state)
-    }
-
-    if (!next.reply) {
-      return
-    }
-
-    void beginReply(next.reply)
-  }
-
-  const submit = () => {
-    void beginReply(questionSubmit(props.request, state()))
-  }
-
-  const reject = () => {
-    void beginReject(questionReject(props.request))
-  }
-
-  useKeyboard((event) => {
-    const cur = state()
-    if (cur.submitting) {
-      event.preventDefault()
-      return
-    }
-
-    if (cur.editing) {
-      if (event.name === "escape") {
-        setState((prev) => questionSetEditing(prev, false))
-        event.preventDefault()
-        return
-      }
-
-      if (event.name === "return" && !event.shift && !event.ctrl && !event.meta) {
-        saveCustom()
-        event.preventDefault()
-      }
-      return
-    }
-
-    if (!single() && (event.name === "left" || event.name === "h")) {
-      setTab((cur.tab - 1 + questionTabs(props.request)) % questionTabs(props.request))
-      event.preventDefault()
-      return
-    }
-
-    if (!single() && (event.name === "right" || event.name === "l")) {
-      setTab((cur.tab + 1) % questionTabs(props.request))
-      event.preventDefault()
-      return
-    }
-
-    if (!single() && event.name === "tab") {
-      const dir = event.shift ? -1 : 1
-      setTab((cur.tab + dir + questionTabs(props.request)) % questionTabs(props.request))
-      event.preventDefault()
-      return
-    }
-
-    if (questionConfirm(props.request, cur)) {
-      if (event.name === "return") {
-        submit()
-        event.preventDefault()
-        return
-      }
-
-      if (event.name === "escape") {
-        reject()
-        event.preventDefault()
-      }
-      return
-    }
-
-    const total = questionTotal(props.request, cur)
-    const max = Math.min(total, 9)
-    const digit = Number(event.name)
-    if (!Number.isNaN(digit) && digit >= 1 && digit <= max) {
-      choose(digit - 1)
-      event.preventDefault()
-      return
-    }
-
-    if (event.name === "up" || event.name === "k") {
-      move(-1)
-      event.preventDefault()
-      return
-    }
-
-    if (event.name === "down" || event.name === "j") {
-      move(1)
-      event.preventDefault()
-      return
-    }
-
-    if (event.name === "return") {
-      select()
-      event.preventDefault()
-      return
-    }
-
-    if (event.name === "escape") {
-      reject()
-      event.preventDefault()
-    }
-  })
-
-  createEffect(() => {
-    if (!state().editing || !area || area.isDestroyed) {
-      return
-    }
-
-    if (area.plainText !== input()) {
-      area.setText(input())
-      area.cursorOffset = input().length
-    }
-
-    queueMicrotask(() => {
-      if (!area || area.isDestroyed || !state().editing) {
-        return
-      }
-
-      area.focus()
-      area.cursorOffset = area.plainText.length
-    })
-  })
-
-  return (
-    <box id="run-direct-footer-question-body" width="100%" height="100%" flexDirection="column">
-      <box
-        id="run-direct-footer-question-panel"
-        flexDirection="column"
-        gap={1}
-        paddingLeft={1}
-        paddingRight={3}
-        paddingTop={1}
-        marginBottom={1}
-        flexGrow={1}
-        flexShrink={1}
-        backgroundColor={props.theme.surface}
-      >
-        <Show when={!single()}>
-          <box id="run-direct-footer-question-tabs"
-            flexDirection="row"
-            gap={1}
-            paddingLeft={1}
-            flexShrink={0}
-          >
-            <For each={props.request.questions}>
-              {(item, index) => {
-                const active = () => state().tab === index()
-                const answered = () => (state().answers[index()]?.length ?? 0) > 0
-                return (
-                  <box
-                    id={`run-direct-footer-question-tab-${index()}`}
-                    paddingLeft={1}
-                    paddingRight={1}
-                    backgroundColor={active() ? props.theme.highlight : props.theme.surface}
-                    onMouseUp={() => {
-                      if (!disabled()) setTab(index())
-                    }}
-                  >
-                    <text fg={active() ? props.theme.surface : answered() ? props.theme.text : props.theme.muted}>
-                      {item.header}
-                    </text>
-                  </box>
-                )
-              }}
-            </For>
-            <box
-              id="run-direct-footer-question-tab-confirm"
-              paddingLeft={1}
-              paddingRight={1}
-              backgroundColor={confirm() ? props.theme.highlight : props.theme.surface}
-              onMouseUp={() => {
-                if (!disabled()) setTab(props.request.questions.length)
-              }}
-            >
-              <text fg={confirm() ? props.theme.surface : props.theme.muted}>Confirm</text>
-            </box>
-          </box>
-        </Show>
-
-        <Show
-          when={!confirm()}
-          fallback={
-            <box width="100%" flexGrow={1} flexShrink={1} paddingLeft={1}>
-              <scrollbox
-                width="100%"
-                height="100%"
-                verticalScrollbarOptions={{
-                  trackOptions: {
-                    backgroundColor: props.theme.surface,
-                    foregroundColor: props.theme.line,
-                  },
-                }}
-              >
-                <box width="100%" flexDirection="column" gap={1}>
-                  <box paddingLeft={1}>
-                    <text fg={props.theme.text}>Review</text>
-                  </box>
-                  <For each={props.request.questions}>
-                    {(item, index) => {
-                      const value = () => state().answers[index()]?.join(", ") ?? ""
-                      const answered = () => Boolean(value())
-                      return (
-                        <box paddingLeft={1}>
-                          <text wrapMode="word">
-                            <span style={{ fg: props.theme.muted }}>{item.header}:</span>{" "}
-                            <span style={{ fg: answered() ? props.theme.text : props.theme.error }}>
-                              {answered() ? value() : "(not answered)"}
-                            </span>
-                          </text>
-                        </box>
-                      )
-                    }}
-                  </For>
-                </box>
-              </scrollbox>
-            </box>
-          }
-        >
-          <box width="100%" flexGrow={1} flexShrink={1} paddingLeft={1} gap={1}>
-            <box>
-              <text fg={props.theme.text} wrapMode="word">
-                {info()?.question}
-                {info()?.multiple ? " (select all that apply)" : ""}
-              </text>
-            </box>
-
-            <box flexGrow={1} flexShrink={1}>
-              <scrollbox
-                width="100%"
-                height="100%"
-                verticalScrollbarOptions={{
-                  trackOptions: {
-                    backgroundColor: props.theme.surface,
-                    foregroundColor: props.theme.line,
-                  },
-                }}
-              >
-                <box width="100%" flexDirection="column">
-                  <For each={info()?.options ?? []}>
-                    {(item, index) => {
-                      const active = () => state().selected === index()
-                      const hit = () => state().answers[state().tab]?.includes(item.label) ?? false
-                      return (
-                        <box
-                          id={`run-direct-footer-question-option-${index()}`}
-                          flexDirection="column"
-                          gap={0}
-                          onMouseOver={() => {
-                            if (!disabled()) {
-                              mark(index())
-                            }
-                          }}
-                          onMouseDown={() => {
-                            if (!disabled()) {
-                              mark(index())
-                            }
-                          }}
-                          onMouseUp={() => {
-                            if (!disabled()) {
-                              choose(index())
-                            }
-                          }}
-                        >
-                          <box flexDirection="row">
-                            <box backgroundColor={active() ? props.theme.line : undefined} paddingRight={1}>
-                              <text fg={active() ? props.theme.highlight : props.theme.muted}>{`${index() + 1}.`}</text>
-                            </box>
-                            <box backgroundColor={active() ? props.theme.line : undefined}>
-                              <text
-                                fg={active() ? props.theme.highlight : hit() ? props.theme.success : props.theme.text}
-                              >
-                                {info()?.multiple ? `[${hit() ? "✓" : " "}] ${item.label}` : item.label}
-                              </text>
-                            </box>
-                            <Show when={!info()?.multiple}>
-                              <text fg={props.theme.success}>{hit() ? "✓" : ""}</text>
-                            </Show>
-                          </box>
-                          <box paddingLeft={3}>
-                            <text fg={props.theme.muted} wrapMode="word">
-                              {item.description}
-                            </text>
-                          </box>
-                        </box>
-                      )
-                    }}
-                  </For>
-
-                  <Show when={questionCustom(props.request, state())}>
-                    <box
-                      id="run-direct-footer-question-option-custom"
-                      flexDirection="column"
-                      gap={0}
-                      onMouseOver={() => {
-                        if (!disabled()) {
-                          mark(info()?.options.length ?? 0)
-                        }
-                      }}
-                      onMouseDown={() => {
-                        if (!disabled()) {
-                          mark(info()?.options.length ?? 0)
-                        }
-                      }}
-                      onMouseUp={() => {
-                        if (!disabled()) {
-                          choose(info()?.options.length ?? 0)
-                        }
-                      }}
-                    >
-                      <box flexDirection="row">
-                        <box backgroundColor={other() ? props.theme.line : undefined} paddingRight={1}>
-                          <text
-                            fg={other() ? props.theme.highlight : props.theme.muted}
-                          >{`${(info()?.options.length ?? 0) + 1}.`}</text>
-                        </box>
-                        <box backgroundColor={other() ? props.theme.line : undefined}>
-                          <text
-                            fg={other() ? props.theme.highlight : picked() ? props.theme.success : props.theme.text}
-                          >
-                            {info()?.multiple
-                              ? `[${picked() ? "✓" : " "}] Type your own answer`
-                              : "Type your own answer"}
-                          </text>
-                        </box>
-                        <Show when={!info()?.multiple}>
-                          <text fg={props.theme.success}>{picked() ? "✓" : ""}</text>
-                        </Show>
-                      </box>
-                      <Show
-                        when={state().editing}
-                        fallback={
-                          <Show when={input()}>
-                            <box paddingLeft={3}>
-                              <text fg={props.theme.muted} wrapMode="word">
-                                {input()}
-                              </text>
-                            </box>
-                          </Show>
-                        }
-                      >
-                        <box paddingLeft={3}>
-                          <textarea
-                            id="run-direct-footer-question-custom"
-                            width="100%"
-                            minHeight={1}
-                            maxHeight={4}
-                            wrapMode="word"
-                            placeholder="Type your own answer"
-                            placeholderColor={props.theme.muted}
-                            textColor={props.theme.text}
-                            focusedTextColor={props.theme.text}
-                            backgroundColor={props.theme.surface}
-                            focusedBackgroundColor={props.theme.surface}
-                            cursorColor={props.theme.text}
-                            focused={!disabled()}
-                            onContentChange={() => {
-                              if (!area || area.isDestroyed || disabled()) {
-                                return
-                              }
-
-                              const text = area.plainText
-                              setState((prev) => questionStoreCustom(prev, prev.tab, text))
-                            }}
-                            ref={(item) => {
-                              area = item as Area
-                            }}
-                          />
-                        </box>
-                      </Show>
-                    </box>
-                  </Show>
-                </box>
-              </scrollbox>
-            </box>
-          </box>
-        </Show>
-      </box>
-
-      <box
-        id="run-direct-footer-question-actions"
-        flexDirection={narrow() ? "column" : "row"}
-        flexShrink={0}
-        gap={1}
-        paddingLeft={2}
-        paddingRight={3}
-        paddingBottom={1}
-        justifyContent={narrow() ? "flex-start" : "space-between"}
-        alignItems={narrow() ? "flex-start" : "center"}
-      >
-        <Show
-          when={!disabled()}
-          fallback={
-            <text fg={props.theme.muted} wrapMode="word">
-              Waiting for question event...
-            </text>
-          }
-        >
-          <box
-            flexDirection={narrow() ? "column" : "row"}
-            gap={narrow() ? 1 : 2}
-            flexShrink={0}
-            paddingBottom={1}
-            width={narrow() ? "100%" : undefined}
-          >
-            <Show
-              when={!state().editing}
-              fallback={
-                <>
-                  <text fg={props.theme.text}>
-                    enter <span style={{ fg: props.theme.muted }}>save</span>
-                  </text>
-                  <text fg={props.theme.text}>
-                    esc <span style={{ fg: props.theme.muted }}>cancel</span>
-                  </text>
-                </>
-              }
-            >
-              <Show when={!single()}>
-                <text fg={props.theme.text}>
-                  {"⇆"} <span style={{ fg: props.theme.muted }}>tab</span>
-                </text>
-              </Show>
-              <Show when={!confirm()}>
-                <text fg={props.theme.text}>
-                  {"↑↓"} <span style={{ fg: props.theme.muted }}>select</span>
-                </text>
-              </Show>
-              <text fg={props.theme.text}>
-                enter <span style={{ fg: props.theme.muted }}>{verb()}</span>
-              </text>
-              <text fg={props.theme.text}>
-                esc <span style={{ fg: props.theme.muted }}>dismiss</span>
-              </text>
-            </Show>
-          </box>
-        </Show>
-      </box>
-    </box>
-  )
-}
@@ -1,626 +0,0 @@
-// RunFooter -- the mutable control surface for direct interactive mode.
-//
-// In the split-footer architecture, scrollback is immutable (append-only)
-// and the footer is the only region that can repaint. RunFooter owns both
-// sides of that boundary:
-//
-//   Scrollback: append() queues StreamCommit entries and flush() writes them
-//   to the renderer via writeToScrollback(). Commits coalesce in a microtask
-//   queue -- consecutive progress chunks for the same part merge into one
-//   write to avoid excessive scrollback snapshots.
-//
-//   Footer: event() updates the SolidJS signal-backed FooterState, which
-//   drives the reactive footer view (prompt, status, permission, question).
-//   present() swaps the active footer view and resizes the footer region.
-//
-// Lifecycle:
-//   - close() flushes pending commits and notifies listeners (the prompt
-//     queue uses this to know when to stop).
-//   - destroy() does the same plus tears down event listeners and clears
-//     internal state.
-//   - The renderer's DESTROY event triggers destroy() so the footer
-//     doesn't outlive the renderer.
-//
-// Interrupt and exit use a two-press pattern: first press shows a hint,
-// second press within 5 seconds actually fires the action.
-import { CliRenderEvents, type CliRenderer } from "@opentui/core"
-import { render } from "@opentui/solid"
-import { createComponent, createSignal, type Accessor, type Setter } from "solid-js"
-import { TEXTAREA_MAX_ROWS, TEXTAREA_MIN_ROWS } from "./footer.prompt"
-import { printableBinding } from "./prompt.shared"
-import { RunFooterView } from "./footer.view"
-import { normalizeEntry } from "./scrollback.format"
-import { entryWriter } from "./scrollback"
-import { spacerWriter } from "./scrollback.writer"
-import { toolView } from "./tool"
-import type { RunTheme } from "./theme"
-import type {
-  FooterApi,
-  FooterEvent,
-  FooterKeybinds,
-  FooterPatch,
-  FooterState,
-  FooterView,
-  PermissionReply,
-  QuestionReject,
-  QuestionReply,
-  RunDiffStyle,
-  StreamCommit,
-} from "./types"
-
-type CycleResult = {
-  modelLabel?: string
-  status?: string
-}
-
-type RunFooterOptions = {
-  agentLabel: string
-  modelLabel: string
-  first: boolean
-  history?: string[]
-  theme: RunTheme
-  keybinds: FooterKeybinds
-  diffStyle: RunDiffStyle
-  onPermissionReply: (input: PermissionReply) => void | Promise<void>
-  onQuestionReply: (input: QuestionReply) => void | Promise<void>
-  onQuestionReject: (input: QuestionReject) => void | Promise<void>
-  onCycleVariant?: () => CycleResult | void
-  onInterrupt?: () => void
-  onExit?: () => void
-}
-
-const PERMISSION_ROWS = 12
-const QUESTION_ROWS = 14
-
-
-export class RunFooter implements FooterApi {
-  private closed = false
-  private destroyed = false
-  private prompts = new Set<(text: string) => void>()
-  private closes = new Set<() => void>()
-  // Most recent visible scrollback commit.
-  private tail: StreamCommit | undefined
-  // The entry splash is already in scrollback before footer output starts.
-  private wrote = true
-  // Microtask-coalesced commit queue. Flushed on next microtask or on close/destroy.
-  private queue: StreamCommit[] = []
-  private pending = false
-  // Fixed portion of footer height above the textarea.
-  private base: number
-  private rows = TEXTAREA_MIN_ROWS
-  private state: Accessor<FooterState>
-  private setState: Setter<FooterState>
-  private view: Accessor<FooterView>
-  private setView: Setter<FooterView>
-  private interruptTimeout: NodeJS.Timeout | undefined
-  private exitTimeout: NodeJS.Timeout | undefined
-  private interruptHint: string
-
-  constructor(
-    private renderer: CliRenderer,
-    private options: RunFooterOptions,
-  ) {
-    const [state, setState] = createSignal<FooterState>({
-      phase: "idle",
-      status: "",
-      queue: 0,
-      model: options.modelLabel,
-      duration: "",
-      usage: "",
-      first: options.first,
-      interrupt: 0,
-      exit: 0,
-    })
-    this.state = state
-    this.setState = setState
-    const [view, setView] = createSignal<FooterView>({ type: "prompt" })
-    this.view = view
-    this.setView = setView
-    this.base = Math.max(1, renderer.footerHeight - TEXTAREA_MIN_ROWS)
-    this.interruptHint = printableBinding(options.keybinds.interrupt, options.keybinds.leader) || "esc"
-
-    this.renderer.on(CliRenderEvents.DESTROY, this.handleDestroy)
-
-    void render(
-      () =>
-        createComponent(RunFooterView, {
-          state: this.state,
-          view: this.view,
-          theme: options.theme.footer,
-          block: options.theme.block,
-          diffStyle: options.diffStyle,
-          keybinds: options.keybinds,
-          history: options.history,
-          agent: options.agentLabel,
-          onSubmit: this.handlePrompt,
-          onPermissionReply: this.handlePermissionReply,
-          onQuestionReply: this.handleQuestionReply,
-          onQuestionReject: this.handleQuestionReject,
-          onCycle: this.handleCycle,
-          onInterrupt: this.handleInterrupt,
-          onExitRequest: this.handleExit,
-          onExit: () => this.close(),
-          onRows: this.syncRows,
-          onStatus: this.setStatus,
-        }),
-      this.renderer as unknown as Parameters<typeof render>[1],
-    ).catch(() => {
-      if (!this.destroyed && !this.renderer.isDestroyed) {
-        this.close()
-      }
-    })
-  }
-
-  public get isClosed(): boolean {
-    return this.closed || this.destroyed || this.renderer.isDestroyed
-  }
-
-  public onPrompt(fn: (text: string) => void): () => void {
-    this.prompts.add(fn)
-    return () => {
-      this.prompts.delete(fn)
-    }
-  }
-
-  public onClose(fn: () => void): () => void {
-    if (this.isClosed) {
-      fn()
-      return () => { }
-    }
-
-    this.closes.add(fn)
-    return () => {
-      this.closes.delete(fn)
-    }
-  }
-
-  public event(next: FooterEvent): void {
-    if (next.type === "queue") {
-      this.patch({ queue: next.queue })
-      return
-    }
-
-    if (next.type === "first") {
-      this.patch({ first: next.first })
-      return
-    }
-
-    if (next.type === "model") {
-      this.patch({ model: next.model })
-      return
-    }
-
-    if (next.type === "turn.send") {
-      this.patch({
-        phase: "running",
-        status: "sending prompt",
-        queue: next.queue,
-      })
-      return
-    }
-
-    if (next.type === "turn.wait") {
-      this.patch({
-        phase: "running",
-        status: "waiting for assistant",
-      })
-      return
-    }
-
-    if (next.type === "turn.idle") {
-      this.patch({
-        phase: "idle",
-        status: "",
-        queue: next.queue,
-      })
-      return
-    }
-
-    if (next.type === "turn.duration") {
-      this.patch({ duration: next.duration })
-      return
-    }
-
-    if (next.type === "stream.patch") {
-      if (typeof next.patch.status === "string" && next.patch.phase === undefined) {
-        this.patch({ phase: "running", ...next.patch })
-        return
-      }
-
-      this.patch(next.patch)
-      return
-    }
-
-    this.present(next.view)
-  }
-
-  private patch(next: FooterPatch): void {
-    if (this.destroyed || this.renderer.isDestroyed) {
-      return
-    }
-
-    const prev = this.state()
-    const state = {
-      phase: next.phase ?? prev.phase,
-      status: typeof next.status === "string" ? next.status : prev.status,
-      queue: typeof next.queue === "number" ? Math.max(0, next.queue) : prev.queue,
-      model: typeof next.model === "string" ? next.model : prev.model,
-      duration: typeof next.duration === "string" ? next.duration : prev.duration,
-      usage: typeof next.usage === "string" ? next.usage : prev.usage,
-      first: typeof next.first === "boolean" ? next.first : prev.first,
-      interrupt:
-        typeof next.interrupt === "number" && Number.isFinite(next.interrupt)
-          ? Math.max(0, Math.floor(next.interrupt))
-          : prev.interrupt,
-      exit:
-        typeof next.exit === "number" && Number.isFinite(next.exit) ? Math.max(0, Math.floor(next.exit)) : prev.exit,
-    }
-
-    if (state.phase === "idle") {
-      state.interrupt = 0
-    }
-
-    this.setState(state)
-
-    if (prev.phase === "running" && state.phase === "idle") {
-      this.flush()
-    }
-  }
-
-  private present(view: FooterView): void {
-    if (this.destroyed || this.renderer.isDestroyed) {
-      return
-    }
-
-    this.setView(view)
-    this.applyHeight()
-  }
-
-  // Queues a scrollback commit. Consecutive progress chunks for the same
-  // part coalesce by appending text, reducing the number of renderer writes.
-  // Actual flush happens on the next microtask, so a burst of events from
-  // one reducer pass becomes a single scrollback write.
-  public append(commit: StreamCommit): void {
-    if (this.destroyed || this.renderer.isDestroyed) {
-      return
-    }
-
-    if (!normalizeEntry(commit)) {
-      return
-    }
-
-    const last = this.queue.at(-1)
-    if (
-      last &&
-      last.phase === "progress" &&
-      commit.phase === "progress" &&
-      last.kind === commit.kind &&
-      last.source === commit.source &&
-      last.partID === commit.partID &&
-      last.tool === commit.tool
-    ) {
-      last.text += commit.text
-    } else {
-      this.queue.push(commit)
-    }
-
-    if (this.pending) {
-      return
-    }
-
-    this.pending = true
-    queueMicrotask(() => {
-      this.pending = false
-      this.flush()
-    })
-  }
-
-  public idle(): Promise<void> {
-    if (this.destroyed || this.renderer.isDestroyed) {
-      return Promise.resolve()
-    }
-
-    return this.renderer.idle().catch(() => { })
-  }
-
-  public close(): void {
-    if (this.closed) {
-      return
-    }
-
-    this.flush()
-    this.notifyClose()
-  }
-
-  public requestExit(): boolean {
-    return this.handleExit()
-  }
-
-  public destroy(): void {
-    if (this.destroyed) {
-      return
-    }
-
-    this.flush()
-    this.destroyed = true
-    this.notifyClose()
-    this.clearInterruptTimer()
-    this.clearExitTimer()
-    this.renderer.off(CliRenderEvents.DESTROY, this.handleDestroy)
-    this.prompts.clear()
-    this.closes.clear()
-    this.tail = undefined
-    this.wrote = false
-  }
-
-  private notifyClose(): void {
-    if (this.closed) {
-      return
-    }
-
-    this.closed = true
-    for (const fn of [...this.closes]) {
-      fn()
-    }
-  }
-
-  private setStatus = (status: string): void => {
-    this.patch({ status })
-  }
-
-  // Resizes the footer to fit the current view. Permission and question views
-  // get fixed extra rows; the prompt view scales with textarea line count.
-  private applyHeight(): void {
-    const type = this.view().type
-    const height =
-      type === "permission"
-        ? this.base + PERMISSION_ROWS
-        : type === "question"
-          ? this.base + QUESTION_ROWS
-          : Math.max(this.base + TEXTAREA_MIN_ROWS, Math.min(this.base + TEXTAREA_MAX_ROWS, this.base + this.rows))
-
-    if (height !== this.renderer.footerHeight) {
-      this.renderer.footerHeight = height
-    }
-  }
-
-  private syncRows = (value: number): void => {
-    if (this.destroyed || this.renderer.isDestroyed) {
-      return
-    }
-
-    const rows = Math.max(TEXTAREA_MIN_ROWS, Math.min(TEXTAREA_MAX_ROWS, value))
-    if (rows === this.rows) {
-      return
-    }
-
-    this.rows = rows
-    if (this.view().type === "prompt") {
-      this.applyHeight()
-    }
-  }
-
-  private handlePrompt = (text: string): boolean => {
-    if (this.isClosed) {
-      return false
-    }
-
-    if (this.state().first) {
-      this.patch({ first: false })
-    }
-
-    if (this.prompts.size === 0) {
-      this.patch({ status: "input queue unavailable" })
-      return false
-    }
-
-    for (const fn of [...this.prompts]) {
-      fn(text)
-    }
-
-    return true
-  }
-
-  private handlePermissionReply = async (input: PermissionReply): Promise<void> => {
-    if (this.isClosed) {
-      return
-    }
-
-    await this.options.onPermissionReply(input)
-  }
-
-  private handleQuestionReply = async (input: QuestionReply): Promise<void> => {
-    if (this.isClosed) {
-      return
-    }
-
-    await this.options.onQuestionReply(input)
-  }
-
-  private handleQuestionReject = async (input: QuestionReject): Promise<void> => {
-    if (this.isClosed) {
-      return
-    }
-
-    await this.options.onQuestionReject(input)
-  }
-
-  private handleCycle = (): void => {
-    const result = this.options.onCycleVariant?.()
-    if (!result) {
-      this.patch({ status: "no variants available" })
-      return
-    }
-
-    const patch: FooterPatch = {
-      status: result.status ?? "variant updated",
-    }
-
-    if (result.modelLabel) {
-      patch.model = result.modelLabel
-    }
-
-    this.patch(patch)
-  }
-
-  private clearInterruptTimer(): void {
-    if (!this.interruptTimeout) {
-      return
-    }
-
-    clearTimeout(this.interruptTimeout)
-    this.interruptTimeout = undefined
-  }
-
-  private armInterruptTimer(): void {
-    this.clearInterruptTimer()
-    this.interruptTimeout = setTimeout(() => {
-      this.interruptTimeout = undefined
-      if (this.destroyed || this.renderer.isDestroyed || this.state().phase !== "running") {
-        return
-      }
-
-      this.patch({ interrupt: 0 })
-    }, 5000)
-  }
-
-  private clearExitTimer(): void {
-    if (!this.exitTimeout) {
-      return
-    }
-
-    clearTimeout(this.exitTimeout)
-    this.exitTimeout = undefined
-  }
-
-  private armExitTimer(): void {
-    this.clearExitTimer()
-    this.exitTimeout = setTimeout(() => {
-      this.exitTimeout = undefined
-      if (this.destroyed || this.renderer.isDestroyed || this.isClosed) {
-        return
-      }
-
-      this.patch({ exit: 0 })
-    }, 5000)
-  }
-
-  // Two-press interrupt: first press shows a hint ("esc again to interrupt"),
-  // second press within 5 seconds fires onInterrupt. The timer resets the
-  // counter if the user doesn't follow through.
-  private handleInterrupt = (): boolean => {
-    if (this.isClosed || this.state().phase !== "running") {
-      return false
-    }
-
-    const next = this.state().interrupt + 1
-    this.patch({ interrupt: next })
-
-    if (next < 2) {
-      this.armInterruptTimer()
-      this.patch({ status: `${this.interruptHint} again to interrupt` })
-      return true
-    }
-
-    this.clearInterruptTimer()
-    this.patch({ interrupt: 0, status: "interrupting" })
-    this.options.onInterrupt?.()
-    return true
-  }
-
-  private handleExit = (): boolean => {
-    if (this.isClosed) {
-      return true
-    }
-
-    this.clearInterruptTimer()
-    const next = this.state().exit + 1
-    this.patch({ exit: next, interrupt: 0 })
-
-    if (next < 2) {
-      this.armExitTimer()
-      this.patch({ status: "Press Ctrl-c again to exit" })
-      return true
-    }
-
-    this.clearExitTimer()
-    this.patch({ exit: 0, status: "exiting" })
-    this.close()
-    this.options.onExit?.()
-    return true
-  }
-
-  private handleDestroy = (): void => {
-    if (this.destroyed) {
-      return
-    }
-
-    this.flush()
-    this.destroyed = true
-    this.notifyClose()
-    this.clearInterruptTimer()
-    this.clearExitTimer()
-    this.renderer.off(CliRenderEvents.DESTROY, this.handleDestroy)
-    this.prompts.clear()
-    this.closes.clear()
-    this.tail = undefined
-    this.wrote = false
-  }
-
-  // Drains the commit queue to scrollback. Visible commits start a new block
-  // whenever their block key changes, and new blocks get a single spacer.
-  private flush(): void {
-    if (this.destroyed || this.renderer.isDestroyed || this.queue.length === 0) {
-      this.queue.length = 0
-      return
-    }
-
-    for (const item of this.queue.splice(0)) {
-      const same = sameGroup(this.tail, item)
-      if (this.wrote && !same) {
-        this.renderer.writeToScrollback(spacerWriter())
-      }
-
-      this.renderer.writeToScrollback(entryWriter(item, this.options.theme, { diffStyle: this.options.diffStyle }))
-      this.wrote = true
-      this.tail = item
-    }
-  }
-}
-
-function snap(commit: StreamCommit): boolean {
-  const tool = commit.tool ?? commit.part?.tool
-  return (
-    commit.kind === "tool" &&
-    commit.phase === "final" &&
-    (commit.toolState ?? commit.part?.state.status) === "completed" &&
-    typeof tool === "string" &&
-    Boolean(toolView(tool).snap)
-  )
-}
-
-function groupKey(commit: StreamCommit): string | undefined {
-  if (!commit.partID) {
-    return
-  }
-
-  if (snap(commit)) {
-    return `tool:${commit.partID}:final`
-  }
-
-  return `${commit.kind}:${commit.partID}`
-}
-
-function sameGroup(a: StreamCommit | undefined, b: StreamCommit): boolean {
-  if (!a) {
-    return false
-  }
-
-  const left = groupKey(a)
-  const right = groupKey(b)
-  if (left && right && left === right) {
-    return true
-  }
-
-  return a.kind === "tool" && a.phase === "start" && b.kind === "tool" && b.phase === "start"
-}
@@ -1,306 +0,0 @@
-// Top-level footer layout for direct interactive mode.
-//
-// Renders the footer region as a vertical stack:
-//   1. Spacer row (visual separation from scrollback)
-//   2. Composer frame with left-border accent -- swaps between prompt,
-//      permission, and question bodies via Switch/Match
-//   3. Meta row showing agent name and model label
-//   4. Bottom border + status row (spinner, interrupt hint, duration, usage)
-//
-// All state comes from the parent RunFooter through SolidJS signals.
-// The view itself is stateless except for derived memos.
-/** @jsxImportSource @opentui/solid */
-import { useTerminalDimensions } from "@opentui/solid"
-import { Match, Show, Switch, createMemo } from "solid-js"
-import "opentui-spinner/solid"
-import { createColors, createFrames } from "../tui/ui/spinner"
-import { RunPromptBody, createPromptState, hintFlags } from "./footer.prompt"
-import { RunPermissionBody } from "./footer.permission"
-import { RunQuestionBody } from "./footer.question"
-import { printableBinding } from "./prompt.shared"
-import type {
-  FooterKeybinds,
-  FooterState,
-  FooterView,
-  PermissionReply,
-  QuestionReject,
-  QuestionReply,
-  RunDiffStyle,
-} from "./types"
-import { RUN_THEME_FALLBACK, type RunBlockTheme, type RunFooterTheme } from "./theme"
-
-const EMPTY_BORDER = {
-  topLeft: "",
-  bottomLeft: "",
-  vertical: "",
-  topRight: "",
-  bottomRight: "",
-  horizontal: " ",
-  bottomT: "",
-  topT: "",
-  cross: "",
-  leftT: "",
-  rightT: "",
-}
-
-type RunFooterViewProps = {
-  state: () => FooterState
-  view?: () => FooterView
-  theme?: RunFooterTheme
-  block?: RunBlockTheme
-  diffStyle?: RunDiffStyle
-  keybinds: FooterKeybinds
-  history?: string[]
-  agent: string
-  onSubmit: (text: string) => boolean
-  onPermissionReply: (input: PermissionReply) => void | Promise<void>
-  onQuestionReply: (input: QuestionReply) => void | Promise<void>
-  onQuestionReject: (input: QuestionReject) => void | Promise<void>
-  onCycle: () => void
-  onInterrupt: () => boolean
-  onExitRequest?: () => boolean
-  onExit: () => void
-  onRows: (rows: number) => void
-  onStatus: (text: string) => void
-}
-
-export { TEXTAREA_MIN_ROWS, TEXTAREA_MAX_ROWS } from "./footer.prompt"
-
-export function RunFooterView(props: RunFooterViewProps) {
-  const term = useTerminalDimensions()
-  const active = createMemo<FooterView>(() => props.view?.() ?? { type: "prompt" })
-  const prompt = createMemo(() => active().type === "prompt")
-  const variant = createMemo(() => printableBinding(props.keybinds.variantCycle, props.keybinds.leader))
-  const interrupt = createMemo(() => printableBinding(props.keybinds.interrupt, props.keybinds.leader))
-  const hints = createMemo(() => hintFlags(term().width))
-  const busy = createMemo(() => props.state().phase === "running")
-  const armed = createMemo(() => props.state().interrupt > 0)
-  const exiting = createMemo(() => props.state().exit > 0)
-  const queue = createMemo(() => props.state().queue)
-  const duration = createMemo(() => props.state().duration)
-  const usage = createMemo(() => props.state().usage)
-  const interruptKey = createMemo(() => interrupt() || "/exit")
-  const theme = createMemo(() => props.theme ?? RUN_THEME_FALLBACK.footer)
-  const block = createMemo(() => props.block ?? RUN_THEME_FALLBACK.block)
-  const spin = createMemo(() => {
-    return {
-      frames: createFrames({
-        color: theme().highlight,
-        style: "blocks",
-        inactiveFactor: 0.6,
-        minAlpha: 0.3,
-      }),
-      color: createColors({
-        color: theme().highlight,
-        style: "blocks",
-        inactiveFactor: 0.6,
-        minAlpha: 0.3,
-      }),
-    }
-  })
-  const permission = createMemo<Extract<FooterView, { type: "permission" }> | undefined>(() => {
-    const view = active()
-    return view.type === "permission" ? view : undefined
-  })
-  const question = createMemo<Extract<FooterView, { type: "question" }> | undefined>(() => {
-    const view = active()
-    return view.type === "question" ? view : undefined
-  })
-  const composer = createPromptState({
-    keybinds: props.keybinds,
-    state: props.state,
-    view: () => active().type,
-    prompt,
-    width: () => term().width,
-    theme,
-    history: props.history,
-    onSubmit: props.onSubmit,
-    onCycle: props.onCycle,
-    onInterrupt: props.onInterrupt,
-    onExitRequest: props.onExitRequest,
-    onExit: props.onExit,
-    onRows: props.onRows,
-    onStatus: props.onStatus,
-  })
-
-  return (
-    <box
-      id="run-direct-footer-shell"
-      width="100%"
-      height="100%"
-      border={false}
-      backgroundColor="transparent"
-      flexDirection="column"
-      gap={0}
-      padding={0}
-    >
-      <box id="run-direct-footer-top-spacer" width="100%" height={1} flexShrink={0} backgroundColor="transparent" />
-
-      <box
-        id="run-direct-footer-composer-frame"
-        width="100%"
-        flexShrink={0}
-        border={["left"]}
-        borderColor={theme().highlight}
-        customBorderChars={{
-          ...EMPTY_BORDER,
-          vertical: "┃",
-          bottomLeft: "╹",
-        }}
-      >
-        <box
-          id="run-direct-footer-composer-area"
-          width="100%"
-          flexGrow={1}
-          paddingLeft={0}
-          paddingRight={0}
-          paddingTop={0}
-          flexDirection="column"
-          backgroundColor={theme().surface}
-          gap={0}
-        >
-          <box id="run-direct-footer-body" width="100%" flexGrow={1} flexShrink={1} flexDirection="column">
-            <Switch>
-              <Match when={active().type === "prompt"}>
-                <RunPromptBody
-                  theme={theme}
-                  placeholder={composer.placeholder}
-                  bindings={composer.bindings}
-                  onSubmit={composer.onSubmit}
-                  onKeyDown={composer.onKeyDown}
-                  onContentChange={composer.onContentChange}
-                  bind={composer.bind}
-                />
-              </Match>
-              <Match when={active().type === "permission"}>
-                <RunPermissionBody
-                  request={permission()!.request}
-                  theme={theme()}
-                  block={block()}
-                  diffStyle={props.diffStyle}
-                  onReply={props.onPermissionReply}
-                />
-              </Match>
-              <Match when={active().type === "question"}>
-                <RunQuestionBody
-                  request={question()!.request}
-                  theme={theme()}
-                  onReply={props.onQuestionReply}
-                  onReject={props.onQuestionReject}
-                />
-              </Match>
-            </Switch>
-          </box>
-
-          <box id="run-direct-footer-meta-row" width="100%" flexDirection="row" gap={1} paddingLeft={2} flexShrink={0} paddingTop={1}>
-            <text id="run-direct-footer-agent" fg={theme().highlight} wrapMode="none" truncate flexShrink={0}>
-              {props.agent}
-            </text>
-            <text id="run-direct-footer-model" fg={theme().text} wrapMode="none" truncate flexGrow={1} flexShrink={1}>
-              {props.state().model}
-            </text>
-          </box>
-        </box>
-      </box>
-
-      <box
-        id="run-direct-footer-line-6"
-        width="100%"
-        height={1}
-        border={["left"]}
-        borderColor={theme().highlight}
-        customBorderChars={{
-          ...EMPTY_BORDER,
-          vertical: "╹",
-        }}
-        flexShrink={0}
-      >
-        <box
-          id="run-direct-footer-line-6-fill"
-          width="100%"
-          height={1}
-          border={["bottom"]}
-          borderColor={theme().line}
-          customBorderChars={{
-            ...EMPTY_BORDER,
-            horizontal: "▀",
-          }}
-        />
-      </box>
-
-      <box
-        id="run-direct-footer-row"
-        width="100%"
-        height={1}
-        flexDirection="row"
-        justifyContent="space-between"
-        gap={1}
-        flexShrink={0}
-      >
-        <Show when={busy() || exiting()}>
-          <box id="run-direct-footer-hint-left" flexDirection="row" gap={1} flexShrink={0}>
-            <Show when={exiting()}>
-              <text id="run-direct-footer-hint-exit" fg={theme().highlight} wrapMode="none" truncate marginLeft={1}>
-                Press Ctrl-c again to exit
-              </text>
-            </Show>
-
-            <Show when={busy() && !exiting()}>
-              <box id="run-direct-footer-status-spinner" marginLeft={1} flexShrink={0}>
-                <spinner color={spin().color} frames={spin().frames} interval={40} />
-              </box>
-
-              <text
-                id="run-direct-footer-hint-interrupt"
-                fg={armed() ? theme().highlight : theme().text}
-                wrapMode="none"
-                truncate
-              >
-                {interruptKey()}{" "}
-                <span style={{ fg: armed() ? theme().highlight : theme().muted }}>
-                  {armed() ? "again to interrupt" : "interrupt"}
-                </span>
-              </text>
-            </Show>
-          </box>
-        </Show>
-
-        <Show when={!busy() && !exiting() && duration().length > 0}>
-          <box id="run-direct-footer-duration" flexDirection="row" gap={2} flexShrink={0} marginLeft={1}>
-            <text id="run-direct-footer-duration-mark" fg={theme().muted} wrapMode="none" truncate>
-              ▣
-            </text>
-            <box id="run-direct-footer-duration-tail" flexDirection="row" gap={1} flexShrink={0}>
-              <text id="run-direct-footer-duration-dot" fg={theme().muted} wrapMode="none" truncate>
-                ·
-              </text>
-              <text id="run-direct-footer-duration-value" fg={theme().muted} wrapMode="none" truncate>
-                {duration()}
-              </text>
-            </box>
-          </box>
-        </Show>
-
-        <box id="run-direct-footer-spacer" flexGrow={1} flexShrink={1} backgroundColor="transparent" />
-
-        <box id="run-direct-footer-hint-group" flexDirection="row" gap={2} flexShrink={0} justifyContent="flex-end">
-          <Show when={queue() > 0}>
-            <text id="run-direct-footer-queue" fg={theme().muted} wrapMode="none" truncate>
-              {queue()} queued
-            </text>
-          </Show>
-          <Show when={usage().length > 0}>
-            <text id="run-direct-footer-usage" fg={theme().muted} wrapMode="none" truncate>
-              {usage()}
-            </text>
-          </Show>
-          <Show when={variant().length > 0 && hints().variant}>
-            <text id="run-direct-footer-hint-variant" fg={theme().muted} wrapMode="none" truncate>
-              {variant()} variant
-            </text>
-          </Show>
-        </box>
-      </box>
-    </box>
-  )
-}
@@ -1,256 +0,0 @@
-// Pure state machine for the permission UI.
-//
-// Lives outside the JSX component so it can be tested independently. The
-// machine has three stages:
-//
-//   permission → initial view with Allow once / Always / Reject options
-//   always     → confirmation step (Confirm / Cancel)
-//   reject     → text input for rejection message
-//
-// permissionRun() is the main transition: given the current state and the
-// selected option, it returns a new state and optionally a PermissionReply
-// to send to the SDK. The component calls this on enter/click.
-//
-// permissionInfo() extracts display info (icon, title, lines, diff) from
-// the request, delegating to tool.ts for tool-specific formatting.
-import type { PermissionRequest } from "@opencode-ai/sdk/v2"
-import type { PermissionReply } from "./types"
-import { toolPath, toolPermissionInfo } from "./tool"
-
-type Dict = Record<string, unknown>
-
-export type PermissionStage = "permission" | "always" | "reject"
-export type PermissionOption = "once" | "always" | "reject" | "confirm" | "cancel"
-
-export type PermissionBodyState = {
-  requestID: string
-  stage: PermissionStage
-  selected: PermissionOption
-  message: string
-  submitting: boolean
-}
-
-export type PermissionInfo = {
-  icon: string
-  title: string
-  lines: string[]
-  diff?: string
-  file?: string
-}
-
-export type PermissionStep = {
-  state: PermissionBodyState
-  reply?: PermissionReply
-}
-
-function dict(v: unknown): Dict {
-  if (!v || typeof v !== "object" || Array.isArray(v)) {
-    return {}
-  }
-
-  return v as Dict
-}
-
-function text(v: unknown): string {
-  return typeof v === "string" ? v : ""
-}
-
-function data(request: PermissionRequest): Dict {
-  const meta = dict(request.metadata)
-  return {
-    ...meta,
-    ...dict(meta.input),
-  }
-}
-
-function patterns(request: PermissionRequest): string[] {
-  return request.patterns.filter((item): item is string => typeof item === "string")
-}
-
-export function createPermissionBodyState(requestID: string): PermissionBodyState {
-  return {
-    requestID,
-    stage: "permission",
-    selected: "once",
-    message: "",
-    submitting: false,
-  }
-}
-
-export function permissionOptions(stage: PermissionStage): PermissionOption[] {
-  if (stage === "permission") {
-    return ["once", "always", "reject"]
-  }
-
-  if (stage === "always") {
-    return ["confirm", "cancel"]
-  }
-
-  return []
-}
-
-export function permissionInfo(request: PermissionRequest): PermissionInfo {
-  const pats = patterns(request)
-  const input = data(request)
-  const info = toolPermissionInfo(request.permission, input, dict(request.metadata), pats)
-  if (info) {
-    return info
-  }
-
-  if (request.permission === "external_directory") {
-    const meta = dict(request.metadata)
-    const raw = text(meta.parentDir) || text(meta.filepath) || pats[0] || ""
-    const dir = raw.includes("*") ? raw.slice(0, raw.indexOf("*")).replace(/[\\/]+$/, "") : raw
-    return {
-      icon: "←",
-      title: `Access external directory ${toolPath(dir, { home: true })}`,
-      lines: pats.map((item) => `- ${item}`),
-    }
-  }
-
-  if (request.permission === "doom_loop") {
-    return {
-      icon: "⟳",
-      title: "Continue after repeated failures",
-      lines: ["This keeps the session running despite repeated failures."],
-    }
-  }
-
-  return {
-    icon: "⚙",
-    title: `Call tool ${request.permission}`,
-    lines: [`Tool: ${request.permission}`],
-  }
-}
-
-export function permissionAlwaysLines(request: PermissionRequest): string[] {
-  if (request.always.length === 1 && request.always[0] === "*") {
-    return [`This will allow ${request.permission} until OpenCode is restarted.`]
-  }
-
-  return [
-    "This will allow the following patterns until OpenCode is restarted.",
-    ...request.always.map((item) => `- ${item}`),
-  ]
-}
-
-export function permissionLabel(option: PermissionOption): string {
-  if (option === "once") return "Allow once"
-  if (option === "always") return "Allow always"
-  if (option === "reject") return "Reject"
-  if (option === "confirm") return "Confirm"
-  return "Cancel"
-}
-
-export function permissionReply(requestID: string, reply: PermissionReply["reply"], message?: string): PermissionReply {
-  return {
-    requestID,
-    reply,
-    ...(message && message.trim() ? { message: message.trim() } : {}),
-  }
-}
-
-export function permissionShift(state: PermissionBodyState, dir: -1 | 1): PermissionBodyState {
-  const list = permissionOptions(state.stage)
-  if (list.length === 0) {
-    return state
-  }
-
-  const idx = Math.max(0, list.indexOf(state.selected))
-  const selected = list[(idx + dir + list.length) % list.length]
-  return {
-    ...state,
-    selected,
-  }
-}
-
-export function permissionHover(state: PermissionBodyState, option: PermissionOption): PermissionBodyState {
-  return {
-    ...state,
-    selected: option,
-  }
-}
-
-export function permissionRun(state: PermissionBodyState, requestID: string, option: PermissionOption): PermissionStep {
-  if (state.submitting) {
-    return { state }
-  }
-
-  if (state.stage === "permission") {
-    if (option === "always") {
-      return {
-        state: {
-          ...state,
-          stage: "always",
-          selected: "confirm",
-        },
-      }
-    }
-
-    if (option === "reject") {
-      return {
-        state: {
-          ...state,
-          stage: "reject",
-          selected: "reject",
-        },
-      }
-    }
-
-    return {
-      state,
-      reply: permissionReply(requestID, "once"),
-    }
-  }
-
-  if (state.stage !== "always") {
-    return { state }
-  }
-
-  if (option === "cancel") {
-    return {
-      state: {
-        ...state,
-        stage: "permission",
-        selected: "always",
-      },
-    }
-  }
-
-  return {
-    state,
-    reply: permissionReply(requestID, "always"),
-  }
-}
-
-export function permissionReject(state: PermissionBodyState, requestID: string): PermissionReply | undefined {
-  if (state.submitting) {
-    return
-  }
-
-  return permissionReply(requestID, "reject", state.message)
-}
-
-export function permissionCancel(state: PermissionBodyState): PermissionBodyState {
-  return {
-    ...state,
-    stage: "permission",
-    selected: "reject",
-  }
-}
-
-export function permissionEscape(state: PermissionBodyState): PermissionBodyState {
-  if (state.stage === "always") {
-    return {
-      ...state,
-      stage: "permission",
-      selected: "always",
-    }
-  }
-
-  return {
-    ...state,
-    stage: "reject",
-    selected: "reject",
-  }
-}
@@ -1,253 +0,0 @@
-// Pure state machine for the prompt input.
-//
-// Handles keybind parsing, history ring navigation, and the leader-key
-// sequence for variant cycling. All functions are pure -- they take state
-// in and return new state out, with no side effects.
-//
-// The history ring (PromptHistoryState) stores past prompts and tracks
-// the current browse position. When the user arrows up at cursor offset 0,
-// the current draft is saved and history begins. Arrowing past the end
-// restores the draft.
-//
-// The leader-key cycle (promptCycle) uses a two-step pattern: first press
-// arms the leader, second press within the timeout fires the action.
-import type { KeyBinding } from "@opentui/core"
-import { Keybind } from "../../../util/keybind"
-import type { FooterKeybinds } from "./types"
-
-const HISTORY_LIMIT = 200
-
-export type PromptHistoryState = {
-  items: string[]
-  index: number | null
-  draft: string
-}
-
-export type PromptKeys = {
-  leaders: Keybind.Info[]
-  cycles: Keybind.Info[]
-  interrupts: Keybind.Info[]
-  previous: Keybind.Info[]
-  next: Keybind.Info[]
-  bindings: KeyBinding[]
-}
-
-export type PromptCycle = {
-  arm: boolean
-  clear: boolean
-  cycle: boolean
-  consume: boolean
-}
-
-export type PromptMove = {
-  state: PromptHistoryState
-  text?: string
-  cursor?: number
-  apply: boolean
-}
-
-function mapInputBindings(binding: string, action: "submit" | "newline"): KeyBinding[] {
-  return Keybind.parse(binding).map((item) => ({
-    name: item.name,
-    ctrl: item.ctrl || undefined,
-    meta: item.meta || undefined,
-    shift: item.shift || undefined,
-    super: item.super || undefined,
-    action,
-  }))
-}
-
-function textareaBindings(keybinds: FooterKeybinds): KeyBinding[] {
-  return [
-    { name: "return", action: "submit" },
-    { name: "return", meta: true, action: "newline" },
-    ...mapInputBindings(keybinds.inputSubmit, "submit"),
-    ...mapInputBindings(keybinds.inputNewline, "newline"),
-  ]
-}
-
-export function promptKeys(keybinds: FooterKeybinds): PromptKeys {
-  return {
-    leaders: Keybind.parse(keybinds.leader),
-    cycles: Keybind.parse(keybinds.variantCycle),
-    interrupts: Keybind.parse(keybinds.interrupt),
-    previous: Keybind.parse(keybinds.historyPrevious),
-    next: Keybind.parse(keybinds.historyNext),
-    bindings: textareaBindings(keybinds),
-  }
-}
-
-export function printableBinding(binding: string, leader: string): string {
-  const first = Keybind.parse(binding).at(0)
-  if (!first) {
-    return ""
-  }
-
-  let text = Keybind.toString(first)
-  const lead = Keybind.parse(leader).at(0)
-  if (lead) {
-    text = text.replace("<leader>", Keybind.toString(lead))
-  }
-
-  return text.replace(/escape/g, "esc")
-}
-
-export function isExitCommand(input: string): boolean {
-  const text = input.trim().toLowerCase()
-  return text === "/exit" || text === "/quit"
-}
-
-export function promptInfo(event: {
-  name: string
-  ctrl?: boolean
-  meta?: boolean
-  shift?: boolean
-  super?: boolean
-}): Keybind.Info {
-  return {
-    name: event.name === " " ? "space" : event.name,
-    ctrl: !!event.ctrl,
-    meta: !!event.meta,
-    shift: !!event.shift,
-    super: !!event.super,
-    leader: false,
-  }
-}
-
-export function promptHit(bindings: Keybind.Info[], event: Keybind.Info): boolean {
-  return bindings.some((item) => Keybind.match(item, event))
-}
-
-export function promptCycle(
-  armed: boolean,
-  event: Keybind.Info,
-  leaders: Keybind.Info[],
-  cycles: Keybind.Info[],
-): PromptCycle {
-  if (!armed && promptHit(leaders, event)) {
-    return {
-      arm: true,
-      clear: false,
-      cycle: false,
-      consume: true,
-    }
-  }
-
-  if (armed) {
-    return {
-      arm: false,
-      clear: true,
-      cycle: promptHit(cycles, { ...event, leader: true }),
-      consume: true,
-    }
-  }
-
-  if (!promptHit(cycles, event)) {
-    return {
-      arm: false,
-      clear: false,
-      cycle: false,
-      consume: false,
-    }
-  }
-
-  return {
-    arm: false,
-    clear: false,
-    cycle: true,
-    consume: true,
-  }
-}
-
-export function createPromptHistory(items?: string[]): PromptHistoryState {
-  return {
-    items: (items ?? [])
-      .map((item) => item.trim())
-      .filter((item) => item.length > 0)
-      .filter((item, idx, all) => idx === 0 || item !== all[idx - 1])
-      .slice(-HISTORY_LIMIT),
-    index: null,
-    draft: "",
-  }
-}
-
-export function pushPromptHistory(state: PromptHistoryState, text: string): PromptHistoryState {
-  if (!text) {
-    return state
-  }
-
-  if (state.items[state.items.length - 1] === text) {
-    return {
-      ...state,
-      index: null,
-      draft: "",
-    }
-  }
-
-  const items = [...state.items, text].slice(-HISTORY_LIMIT)
-  return {
-    ...state,
-    items,
-    index: null,
-    draft: "",
-  }
-}
-
-export function movePromptHistory(state: PromptHistoryState, dir: -1 | 1, text: string, cursor: number): PromptMove {
-  if (state.items.length === 0) {
-    return { state, apply: false }
-  }
-
-  if (dir === -1 && cursor !== 0) {
-    return { state, apply: false }
-  }
-
-  if (dir === 1 && cursor !== text.length) {
-    return { state, apply: false }
-  }
-
-  if (state.index === null) {
-    if (dir === 1) {
-      return { state, apply: false }
-    }
-
-    const idx = state.items.length - 1
-    return {
-      state: {
-        ...state,
-        index: idx,
-        draft: text,
-      },
-      text: state.items[idx],
-      cursor: 0,
-      apply: true,
-    }
-  }
-
-  const idx = state.index + dir
-  if (idx < 0) {
-    return { state, apply: false }
-  }
-
-  if (idx >= state.items.length) {
-    return {
-      state: {
-        ...state,
-        index: null,
-      },
-      text: state.draft,
-      cursor: state.draft.length,
-      apply: true,
-    }
-  }
-
-  return {
-    state: {
-      ...state,
-      index: idx,
-    },
-    text: state.items[idx],
-    cursor: dir === -1 ? 0 : state.items[idx].length,
-    apply: true,
-  }
-}
@@ -1,340 +0,0 @@
-// Pure state machine for the question UI.
-//
-// Supports both single-question and multi-question flows. Single questions
-// submit immediately on selection. Multi-question flows use tabs and a
-// final confirmation step.
-//
-// State transitions:
-//   questionSelect  → picks an option (single: submits, multi: toggles/advances)
-//   questionSave    → saves custom text input
-//   questionMove    → arrow key navigation through options
-//   questionSetTab  → tab navigation between questions
-//   questionSubmit  → builds the final QuestionReply with all answers
-//
-// Custom answers: if a question has custom=true, an extra "Type your own
-// answer" option appears. Selecting it enters editing mode with a text field.
-import type { QuestionInfo, QuestionRequest } from "@opencode-ai/sdk/v2"
-import type { QuestionReject, QuestionReply } from "./types"
-
-export type QuestionBodyState = {
-  requestID: string
-  tab: number
-  answers: string[][]
-  custom: string[]
-  selected: number
-  editing: boolean
-  submitting: boolean
-}
-
-export type QuestionStep = {
-  state: QuestionBodyState
-  reply?: QuestionReply
-}
-
-export function createQuestionBodyState(requestID: string): QuestionBodyState {
-  return {
-    requestID,
-    tab: 0,
-    answers: [],
-    custom: [],
-    selected: 0,
-    editing: false,
-    submitting: false,
-  }
-}
-
-export function questionSync(state: QuestionBodyState, requestID: string): QuestionBodyState {
-  if (state.requestID === requestID) {
-    return state
-  }
-
-  return createQuestionBodyState(requestID)
-}
-
-export function questionSingle(request: QuestionRequest): boolean {
-  return request.questions.length === 1 && request.questions[0]?.multiple !== true
-}
-
-export function questionTabs(request: QuestionRequest): number {
-  return questionSingle(request) ? 1 : request.questions.length + 1
-}
-
-export function questionConfirm(request: QuestionRequest, state: QuestionBodyState): boolean {
-  return !questionSingle(request) && state.tab === request.questions.length
-}
-
-export function questionInfo(request: QuestionRequest, state: QuestionBodyState): QuestionInfo | undefined {
-  return request.questions[state.tab]
-}
-
-export function questionCustom(request: QuestionRequest, state: QuestionBodyState): boolean {
-  return questionInfo(request, state)?.custom !== false
-}
-
-export function questionInput(state: QuestionBodyState): string {
-  return state.custom[state.tab] ?? ""
-}
-
-export function questionPicked(state: QuestionBodyState): boolean {
-  const value = questionInput(state)
-  if (!value) {
-    return false
-  }
-
-  return state.answers[state.tab]?.includes(value) ?? false
-}
-
-export function questionOther(request: QuestionRequest, state: QuestionBodyState): boolean {
-  const info = questionInfo(request, state)
-  if (!info || info.custom === false) {
-    return false
-  }
-
-  return state.selected === info.options.length
-}
-
-export function questionTotal(request: QuestionRequest, state: QuestionBodyState): number {
-  const info = questionInfo(request, state)
-  if (!info) {
-    return 0
-  }
-
-  return info.options.length + (questionCustom(request, state) ? 1 : 0)
-}
-
-export function questionAnswers(state: QuestionBodyState, count: number): string[][] {
-  return Array.from({ length: count }, (_, idx) => state.answers[idx] ?? [])
-}
-
-export function questionSetTab(state: QuestionBodyState, tab: number): QuestionBodyState {
-  return {
-    ...state,
-    tab,
-    selected: 0,
-    editing: false,
-  }
-}
-
-export function questionSetSelected(state: QuestionBodyState, selected: number): QuestionBodyState {
-  return {
-    ...state,
-    selected,
-  }
-}
-
-export function questionSetEditing(state: QuestionBodyState, editing: boolean): QuestionBodyState {
-  return {
-    ...state,
-    editing,
-  }
-}
-
-export function questionSetSubmitting(state: QuestionBodyState, submitting: boolean): QuestionBodyState {
-  return {
-    ...state,
-    submitting,
-  }
-}
-
-function storeAnswers(state: QuestionBodyState, tab: number, list: string[]): QuestionBodyState {
-  const answers = [...state.answers]
-  answers[tab] = list
-  return {
-    ...state,
-    answers,
-  }
-}
-
-export function questionStoreCustom(state: QuestionBodyState, tab: number, text: string): QuestionBodyState {
-  const custom = [...state.custom]
-  custom[tab] = text
-  return {
-    ...state,
-    custom,
-  }
-}
-
-function questionPick(
-  state: QuestionBodyState,
-  request: QuestionRequest,
-  answer: string,
-  custom = false,
-): QuestionStep {
-  const answers = [...state.answers]
-  answers[state.tab] = [answer]
-  let next: QuestionBodyState = {
-    ...state,
-    answers,
-    editing: false,
-  }
-
-  if (custom) {
-    const list = [...state.custom]
-    list[state.tab] = answer
-    next = {
-      ...next,
-      custom: list,
-    }
-  }
-
-  if (questionSingle(request)) {
-    return {
-      state: next,
-      reply: {
-        requestID: request.id,
-        answers: [[answer]],
-      },
-    }
-  }
-
-  return {
-    state: questionSetTab(next, state.tab + 1),
-  }
-}
-
-function questionToggle(state: QuestionBodyState, answer: string): QuestionBodyState {
-  const list = [...(state.answers[state.tab] ?? [])]
-  const idx = list.indexOf(answer)
-  if (idx === -1) {
-    list.push(answer)
-  } else {
-    list.splice(idx, 1)
-  }
-
-  return storeAnswers(state, state.tab, list)
-}
-
-export function questionMove(state: QuestionBodyState, request: QuestionRequest, dir: -1 | 1): QuestionBodyState {
-  const total = questionTotal(request, state)
-  if (total === 0) {
-    return state
-  }
-
-  return {
-    ...state,
-    selected: (state.selected + dir + total) % total,
-  }
-}
-
-export function questionSelect(state: QuestionBodyState, request: QuestionRequest): QuestionStep {
-  const info = questionInfo(request, state)
-  if (!info) {
-    return { state }
-  }
-
-  if (questionOther(request, state)) {
-    if (!info.multiple) {
-      return {
-        state: questionSetEditing(state, true),
-      }
-    }
-
-    const value = questionInput(state)
-    if (value && questionPicked(state)) {
-      return {
-        state: questionToggle(state, value),
-      }
-    }
-
-    return {
-      state: questionSetEditing(state, true),
-    }
-  }
-
-  const option = info.options[state.selected]
-  if (!option) {
-    return { state }
-  }
-
-  if (info.multiple) {
-    return {
-      state: questionToggle(state, option.label),
-    }
-  }
-
-  return questionPick(state, request, option.label)
-}
-
-export function questionSave(state: QuestionBodyState, request: QuestionRequest): QuestionStep {
-  const info = questionInfo(request, state)
-  if (!info) {
-    return { state }
-  }
-
-  const value = questionInput(state).trim()
-  const prev = state.custom[state.tab]
-  if (!value) {
-    if (!prev) {
-      return {
-        state: questionSetEditing(state, false),
-      }
-    }
-
-    const next = questionStoreCustom(state, state.tab, "")
-    return {
-      state: questionSetEditing(
-        storeAnswers(
-          next,
-          state.tab,
-          (state.answers[state.tab] ?? []).filter((item) => item !== prev),
-        ),
-        false,
-      ),
-    }
-  }
-
-  if (info.multiple) {
-    const answers = [...(state.answers[state.tab] ?? [])]
-    if (prev) {
-      const idx = answers.indexOf(prev)
-      if (idx !== -1) {
-        answers.splice(idx, 1)
-      }
-    }
-
-    if (!answers.includes(value)) {
-      answers.push(value)
-    }
-
-    const next = questionStoreCustom(state, state.tab, value)
-    return {
-      state: questionSetEditing(storeAnswers(next, state.tab, answers), false),
-    }
-  }
-
-  return questionPick(state, request, value, true)
-}
-
-export function questionSubmit(request: QuestionRequest, state: QuestionBodyState): QuestionReply {
-  return {
-    requestID: request.id,
-    answers: questionAnswers(state, request.questions.length),
-  }
-}
-
-export function questionReject(request: QuestionRequest): QuestionReject {
-  return {
-    requestID: request.id,
-  }
-}
-
-export function questionHint(request: QuestionRequest, state: QuestionBodyState): string {
-  if (state.submitting) {
-    return "Waiting for question event..."
-  }
-
-  if (questionConfirm(request, state)) {
-    return "enter submit   esc dismiss"
-  }
-
-  if (state.editing) {
-    return "enter save   esc cancel"
-  }
-
-  const info = questionInfo(request, state)
-  if (questionSingle(request)) {
-    return `↑↓ select   enter ${info?.multiple ? "toggle" : "submit"}   esc dismiss`
-  }
-
-  return `⇆ tab   ↑↓ select   enter ${info?.multiple ? "toggle" : "confirm"}   esc dismiss`
-}
@@ -1,140 +0,0 @@
-// Boot-time resolution for direct interactive mode.
-//
-// These functions run concurrently at startup to gather everything the runtime
-// needs before the first frame: keybinds from TUI config, diff display style,
-// model variant list with context limits, and session history for the prompt
-// history ring. All are async because they read config or hit the SDK, but
-// none block each other.
-import { TuiConfig } from "../../../config/tui"
-import { resolveSession, sessionHistory } from "./session.shared"
-import type { FooterKeybinds, RunDiffStyle, RunInput } from "./types"
-import { pickVariant } from "./variant.shared"
-
-const DEFAULT_KEYBINDS: FooterKeybinds = {
-  leader: "ctrl+x",
-  variantCycle: "ctrl+t,<leader>t",
-  interrupt: "escape",
-  historyPrevious: "up",
-  historyNext: "down",
-  inputSubmit: "return",
-  inputNewline: "shift+return,ctrl+return,alt+return,ctrl+j",
-}
-
-export type ModelInfo = {
-  variants: string[]
-  limits: Record<string, number>
-}
-
-export type SessionInfo = {
-  first: boolean
-  history: string[]
-  variant: string | undefined
-}
-
-function modelKey(provider: string, model: string): string {
-  return `${provider}/${model}`
-}
-
-// Fetches available variants and context limits for every provider/model pair.
-export async function resolveModelInfo(sdk: RunInput["sdk"], model: RunInput["model"]): Promise<ModelInfo> {
-  try {
-    const response = await sdk.provider.list()
-    const providers = response.data?.all ?? []
-    const limits: Record<string, number> = {}
-
-    for (const provider of providers) {
-      for (const [modelID, info] of Object.entries(provider.models ?? {})) {
-        const limit = info?.limit?.context
-        if (typeof limit === "number" && limit > 0) {
-          limits[modelKey(provider.id, modelID)] = limit
-        }
-      }
-    }
-
-    if (!model) {
-      return {
-        variants: [],
-        limits,
-      }
-    }
-
-    const provider = providers.find((item) => item.id === model.providerID)
-    const modelInfo = provider?.models?.[model.modelID]
-    return {
-      variants: Object.keys(modelInfo?.variants ?? {}),
-      limits,
-    }
-  } catch {
-    return {
-      variants: [],
-      limits: {},
-    }
-  }
-}
-
-// Fetches session messages to determine if this is the first turn and build prompt history.
-export async function resolveSessionInfo(
-  sdk: RunInput["sdk"],
-  sessionID: string,
-  model: RunInput["model"],
-): Promise<SessionInfo> {
-  try {
-    const session = await resolveSession(sdk, sessionID)
-    return {
-      first: session.first,
-      history: sessionHistory(session),
-      variant: pickVariant(model, session),
-    }
-  } catch {
-    return {
-      first: true,
-      history: [],
-      variant: undefined,
-    }
-  }
-}
-
-// Reads keybind overrides from TUI config and merges them with defaults.
-// Always ensures <leader>t is present in the variant cycle binding.
-export async function resolveFooterKeybinds(): Promise<FooterKeybinds> {
-  try {
-    const config = await TuiConfig.get()
-    const configuredLeader = config.keybinds?.leader?.trim() || DEFAULT_KEYBINDS.leader
-    const configuredVariantCycle = config.keybinds?.variant_cycle?.trim() || "ctrl+t"
-    const configuredInterrupt = config.keybinds?.session_interrupt?.trim() || DEFAULT_KEYBINDS.interrupt
-    const configuredHistoryPrevious = config.keybinds?.history_previous?.trim() || DEFAULT_KEYBINDS.historyPrevious
-    const configuredHistoryNext = config.keybinds?.history_next?.trim() || DEFAULT_KEYBINDS.historyNext
-    const configuredSubmit = config.keybinds?.input_submit?.trim() || DEFAULT_KEYBINDS.inputSubmit
-    const configuredNewline = config.keybinds?.input_newline?.trim() || DEFAULT_KEYBINDS.inputNewline
-
-    const variantBindings = configuredVariantCycle
-      .split(",")
-      .map((item) => item.trim())
-      .filter((item) => item.length > 0)
-
-    if (!variantBindings.some((binding) => binding.toLowerCase() === "<leader>t")) {
-      variantBindings.push("<leader>t")
-    }
-
-    return {
-      leader: configuredLeader,
-      variantCycle: variantBindings.join(","),
-      interrupt: configuredInterrupt,
-      historyPrevious: configuredHistoryPrevious,
-      historyNext: configuredHistoryNext,
-      inputSubmit: configuredSubmit,
-      inputNewline: configuredNewline,
-    }
-  } catch {
-    return DEFAULT_KEYBINDS
-  }
-}
-
-export async function resolveDiffStyle(): Promise<RunDiffStyle> {
-  try {
-    const config = await TuiConfig.get()
-    return config.diff_style ?? "auto"
-  } catch {
-    return "auto"
-  }
-}
@@ -1,248 +0,0 @@
-// Lifecycle management for the split-footer renderer.
-//
-// Creates the OpenTUI CliRenderer in split-footer mode, resolves the theme
-// from the terminal palette, writes the entry splash to scrollback, and
-// constructs the RunFooter. Returns a Lifecycle handle whose close() writes
-// the exit splash and tears everything down in the right order:
-// footer.close → footer.destroy → renderer shutdown.
-//
-// Also wires SIGINT so Ctrl-c during a turn triggers the two-press exit
-// sequence through RunFooter.requestExit().
-import { createCliRenderer, type CliRenderer, type ScrollbackWriter } from "@opentui/core"
-import { Locale } from "../../../util/locale"
-import { entrySplash, exitSplash, splashMeta } from "./splash"
-import { resolveRunTheme } from "./theme"
-import type {
-  FooterApi,
-  FooterKeybinds,
-  PermissionReply,
-  QuestionReject,
-  QuestionReply,
-  RunDiffStyle,
-  RunInput,
-} from "./types"
-import { formatModelLabel } from "./variant.shared"
-
-const FOOTER_HEIGHT = 7
-const DEFAULT_TITLE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/
-
-type SplashState = {
-  entry: boolean
-  exit: boolean
-}
-
-type CycleResult = {
-  modelLabel?: string
-  status?: string
-}
-
-type FooterLabels = {
-  agentLabel: string
-  modelLabel: string
-}
-
-export type LifecycleInput = {
-  sessionID: string
-  sessionTitle?: string
-  first: boolean
-  history: string[]
-  agent: string | undefined
-  model: RunInput["model"]
-  variant: string | undefined
-  keybinds: FooterKeybinds
-  diffStyle: RunDiffStyle
-  onPermissionReply: (input: PermissionReply) => void | Promise<void>
-  onQuestionReply: (input: QuestionReply) => void | Promise<void>
-  onQuestionReject: (input: QuestionReject) => void | Promise<void>
-  onCycleVariant?: () => CycleResult | void
-  onInterrupt?: () => void
-}
-
-export type Lifecycle = {
-  footer: FooterApi
-  close(input: { showExit: boolean; sessionTitle?: string }): Promise<void>
-}
-
-// Gracefully tears down the renderer. Order matters: switch external output
-// back to passthrough before leaving split-footer mode, so pending stdout
-// doesn't get captured into the now-dead scrollback pipeline.
-function shutdown(renderer: CliRenderer): void {
-  if (renderer.isDestroyed) {
-    return
-  }
-
-  if (renderer.externalOutputMode === "capture-stdout") {
-    renderer.externalOutputMode = "passthrough"
-  }
-
-  if (renderer.screenMode === "split-footer") {
-    renderer.screenMode = "main-screen"
-  }
-
-  if (!renderer.isDestroyed) {
-    renderer.destroy()
-  }
-}
-
-function splashTitle(title: string | undefined, history: string[]): string | undefined {
-  if (title && !DEFAULT_TITLE.test(title)) {
-    return title
-  }
-
-  const next = history.find((item) => item.trim().length > 0)
-  return next ?? title
-}
-
-function splashSession(title: string | undefined, history: string[]): boolean {
-  if (title && !DEFAULT_TITLE.test(title)) {
-    return true
-  }
-
-  return !!history.find((item) => item.trim().length > 0)
-}
-
-function footerLabels(input: Pick<RunInput, "agent" | "model" | "variant">): FooterLabels {
-  const agentLabel = Locale.titlecase(input.agent ?? "build")
-
-  if (!input.model) {
-    return {
-      agentLabel,
-      modelLabel: "Model default",
-    }
-  }
-
-  return {
-    agentLabel,
-    modelLabel: formatModelLabel(input.model, input.variant),
-  }
-}
-
-function queueSplash(
-  renderer: Pick<CliRenderer, "writeToScrollback" | "requestRender">,
-  state: SplashState,
-  phase: keyof SplashState,
-  write: ScrollbackWriter | undefined,
-): boolean {
-  if (state[phase]) {
-    return false
-  }
-
-  if (!write) {
-    return false
-  }
-
-  state[phase] = true
-  renderer.writeToScrollback(write)
-  renderer.requestRender()
-  return true
-}
-
-// Boots the split-footer renderer and constructs the RunFooter.
-//
-// The renderer starts in split-footer mode with captured stdout so that
-// scrollback commits and footer repaints happen in the same frame. After
-// the entry splash, RunFooter takes over the footer region.
-export async function createRuntimeLifecycle(input: LifecycleInput): Promise<Lifecycle> {
-  const renderer = await createCliRenderer({
-    targetFps: 30,
-    maxFps: 60,
-    useMouse: false,
-    autoFocus: false,
-    openConsoleOnError: false,
-    exitOnCtrlC: false,
-    useKittyKeyboard: { events: process.platform === "win32" },
-    screenMode: "split-footer",
-    footerHeight: FOOTER_HEIGHT,
-    externalOutputMode: "capture-stdout",
-    consoleMode: "disabled",
-    clearOnShutdown: false,
-  })
-  let theme = await resolveRunTheme(renderer)
-  renderer.setBackgroundColor(theme.background)
-  const state: SplashState = {
-    entry: false,
-    exit: false,
-  }
-  const showSession = splashSession(input.sessionTitle, input.history)
-  const meta = splashMeta({
-    title: splashTitle(input.sessionTitle, input.history),
-    session_id: input.sessionID,
-  })
-  queueSplash(
-    renderer,
-    state,
-    "entry",
-    entrySplash({
-      ...meta,
-      theme: theme.entry,
-      background: theme.background,
-      showSession,
-    }),
-  )
-  await renderer.idle().catch(() => {})
-
-  const { RunFooter } = await import("./footer")
-
-  const labels = footerLabels({
-    agent: input.agent,
-    model: input.model,
-    variant: input.variant,
-  })
-  const footer = new RunFooter(renderer, {
-    ...labels,
-    first: input.first,
-    history: input.history,
-    theme,
-    keybinds: input.keybinds,
-    diffStyle: input.diffStyle,
-    onPermissionReply: input.onPermissionReply,
-    onQuestionReply: input.onQuestionReply,
-    onQuestionReject: input.onQuestionReject,
-    onCycleVariant: input.onCycleVariant,
-    onInterrupt: input.onInterrupt,
-  })
-
-  const sigint = () => {
-    footer.requestExit()
-  }
-  process.on("SIGINT", sigint)
-
-  let closed = false
-  const close = async (next: { showExit: boolean; sessionTitle?: string }) => {
-    if (closed) {
-      return
-    }
-
-    closed = true
-    process.off("SIGINT", sigint)
-
-    try {
-      const show = renderer.isDestroyed ? false : next.showExit
-      if (!renderer.isDestroyed && show) {
-        queueSplash(
-          renderer,
-          state,
-          "exit",
-          exitSplash({
-            ...splashMeta({
-              title: splashTitle(next.sessionTitle ?? input.sessionTitle, input.history),
-              session_id: input.sessionID,
-            }),
-            theme: theme.entry,
-            background: theme.background,
-          }),
-        )
-        await renderer.idle().catch(() => {})
-      }
-    } finally {
-      footer.close()
-      footer.destroy()
-      shutdown(renderer)
-    }
-  }
-
-  return {
-    footer,
-    close,
-  }
-}
@@ -1,214 +0,0 @@
-// Serial prompt queue for direct interactive mode.
-//
-// Prompts arrive from the footer (user types and hits enter) and queue up
-// here. The queue drains one turn at a time: it appends the user row to
-// scrollback, calls input.run() to execute the turn through the stream
-// transport, and waits for completion before starting the next prompt.
-//
-// The queue also handles /exit and /quit commands, empty-prompt rejection,
-// and tracks per-turn wall-clock duration for the footer status line.
-//
-// Resolves when the footer closes and all in-flight work finishes.
-import { Locale } from "../../../util/locale"
-import { isExitCommand } from "./prompt.shared"
-import type { FooterApi, FooterEvent } from "./types"
-
-type Trace = {
-  write(type: string, data?: unknown): void
-}
-
-export type QueueInput = {
-  footer: FooterApi
-  initialInput?: string
-  trace?: Trace
-  onPrompt?: () => void
-  run: (prompt: string, signal: AbortSignal) => Promise<void>
-}
-
-// Runs the prompt queue until the footer closes.
-//
-// Subscribes to footer prompt events, queues them, and drains one at a
-// time through input.run(). If the user submits multiple prompts while
-// a turn is running, they queue up and execute in order. The footer shows
-// the queue depth so the user knows how many are pending.
-export async function runPromptQueue(input: QueueInput): Promise<void> {
-  const q: string[] = []
-  let busy = false
-  let closed = input.footer.isClosed
-  let ctrl: AbortController | undefined
-  let stop: (() => void) | undefined
-  let err: unknown
-  let hasErr = false
-  let done: (() => void) | undefined
-  const wait = new Promise<void>((resolve) => {
-    done = resolve
-  })
-  const until = new Promise<void>((resolve) => {
-    stop = resolve
-  })
-
-  const fail = (error: unknown) => {
-    err = error
-    hasErr = true
-    done?.()
-    done = undefined
-  }
-
-  const finish = () => {
-    if (!closed || busy) {
-      return
-    }
-
-    done?.()
-    done = undefined
-  }
-
-  const emit = (next: FooterEvent, row: Record<string, unknown>) => {
-    input.trace?.write("ui.patch", row)
-    input.footer.event(next)
-  }
-
-  const pump = async () => {
-    if (busy || closed) {
-      return
-    }
-
-    busy = true
-
-    try {
-      while (!closed && q.length > 0) {
-        const prompt = q.shift()
-        if (!prompt) {
-          continue
-        }
-
-        emit(
-          {
-            type: "turn.send",
-            queue: q.length,
-          },
-          {
-            phase: "running",
-            status: "sending prompt",
-            queue: q.length,
-          },
-        )
-        const start = Date.now()
-        const next = new AbortController()
-        ctrl = next
-        try {
-          const task = input.run(prompt, next.signal).then(
-            () => ({ type: "done" as const }),
-            (error) => ({ type: "error" as const, error }),
-          )
-          await input.footer.idle()
-          const commit = { kind: "user", text: prompt, phase: "start", source: "system" } as const
-          input.trace?.write("ui.commit", commit)
-          input.footer.append(commit)
-          const out = await Promise.race([task, until.then(() => ({ type: "closed" as const }))])
-          if (out.type === "closed") {
-            next.abort()
-            break
-          }
-
-          if (out.type === "error") {
-            throw out.error
-          }
-        } finally {
-          if (ctrl === next) {
-            ctrl = undefined
-          }
-          const duration = Locale.duration(Math.max(0, Date.now() - start))
-          emit(
-            {
-              type: "turn.duration",
-              duration,
-            },
-            {
-              duration,
-            },
-          )
-        }
-      }
-    } finally {
-      busy = false
-      emit(
-        {
-          type: "turn.idle",
-          queue: q.length,
-        },
-        {
-          phase: "idle",
-          status: "",
-          queue: q.length,
-        },
-      )
-      finish()
-    }
-  }
-
-  const push = (text: string) => {
-    const prompt = text
-    if (!prompt.trim() || closed) {
-      return
-    }
-
-    if (isExitCommand(prompt)) {
-      input.footer.close()
-      return
-    }
-
-    input.onPrompt?.()
-    q.push(prompt)
-    emit(
-      {
-        type: "queue",
-        queue: q.length,
-      },
-      {
-        queue: q.length,
-      },
-    )
-    emit(
-      {
-        type: "first",
-        first: false,
-      },
-      {
-        first: false,
-      },
-    )
-    void pump().catch(fail)
-  }
-
-  const offPrompt = input.footer.onPrompt((text) => {
-    push(text)
-  })
-  const offClose = input.footer.onClose(() => {
-    closed = true
-    q.length = 0
-    ctrl?.abort()
-    stop?.()
-    finish()
-  })
-
-  try {
-    if (closed) {
-      return
-    }
-
-    push(input.initialInput ?? "")
-    await pump()
-
-    if (!closed) {
-      await wait
-    }
-
-    if (hasErr) {
-      throw err
-    }
-  } finally {
-    offPrompt()
-    offClose()
-  }
-}
@@ -1,302 +0,0 @@
-// Top-level orchestrator for `run --interactive`.
-//
-// Wires the boot sequence, lifecycle (renderer + footer), stream transport,
-// and prompt queue together into a single session loop. Two entry points:
-//
-//   runInteractiveMode     -- used when an SDK client already exists (attach mode)
-//   runInteractiveLocalMode -- used for local in-process mode (no server)
-//
-// Both delegate to runInteractiveRuntime, which:
-//   1. resolves keybinds, diff style, model info, and session history,
-//   2. creates the split-footer lifecycle (renderer + RunFooter),
-//   3. starts the stream transport (SDK event subscription),
-//   4. runs the prompt queue until the footer closes.
-import { createOpencodeClient } from "@opencode-ai/sdk/v2"
-import { createRunDemo } from "./demo"
-import { resolveDiffStyle, resolveFooterKeybinds, resolveModelInfo, resolveSessionInfo } from "./runtime.boot"
-import { createRuntimeLifecycle } from "./runtime.lifecycle"
-import { trace } from "./trace"
-import { cycleVariant, formatModelLabel, resolveSavedVariant, resolveVariant, saveVariant } from "./variant.shared"
-import type { RunInput } from "./types"
-
-/** @internal Exported for testing */
-export { pickVariant, resolveVariant } from "./variant.shared"
-
-/** @internal Exported for testing */
-export { runPromptQueue } from "./runtime.queue"
-
-type BootContext = Pick<RunInput, "sdk" | "sessionID" | "sessionTitle" | "agent" | "model" | "variant">
-
-type RunRuntimeInput = {
-  boot: () => Promise<BootContext>
-  afterPaint?: (ctx: BootContext) => Promise<void> | void
-  files: RunInput["files"]
-  initialInput?: string
-  thinking: boolean
-  demo?: RunInput["demo"]
-  demoText?: RunInput["demoText"]
-}
-
-type RunLocalInput = {
-  fetch: typeof globalThis.fetch
-  resolveAgent: () => Promise<string | undefined>
-  session: (sdk: RunInput["sdk"]) => Promise<{ id: string; title?: string } | undefined>
-  share: (sdk: RunInput["sdk"], sessionID: string) => Promise<void>
-  agent: RunInput["agent"]
-  model: RunInput["model"]
-  variant: RunInput["variant"]
-  files: RunInput["files"]
-  initialInput?: string
-  thinking: boolean
-  demo?: RunInput["demo"]
-  demoText?: RunInput["demoText"]
-}
-
-// Core runtime loop. Boot resolves the SDK context, then we set up the
-// lifecycle (renderer + footer), wire the stream transport for SDK events,
-// and feed prompts through the queue until the user exits.
-//
-// Files only attach on the first prompt turn -- after that, includeFiles
-// flips to false so subsequent turns don't re-send attachments.
-async function runInteractiveRuntime(input: RunRuntimeInput): Promise<void> {
-  const log = trace()
-  const keybindTask = resolveFooterKeybinds()
-  const diffTask = resolveDiffStyle()
-  const ctx = await input.boot()
-  const modelTask = resolveModelInfo(ctx.sdk, ctx.model)
-  const sessionTask = resolveSessionInfo(ctx.sdk, ctx.sessionID, ctx.model)
-  const savedTask = resolveSavedVariant(ctx.model)
-  let variants: string[] = []
-  let limits: Record<string, number> = {}
-  let aborting = false
-  let shown = false
-  let demo: ReturnType<typeof createRunDemo> | undefined
-  const [keybinds, diffStyle, session, savedVariant] = await Promise.all([
-    keybindTask,
-    diffTask,
-    sessionTask,
-    savedTask,
-  ])
-  shown = !session.first
-  let activeVariant = resolveVariant(ctx.variant, session.variant, savedVariant, variants)
-
-  const shell = await createRuntimeLifecycle({
-    sessionID: ctx.sessionID,
-    sessionTitle: ctx.sessionTitle,
-    first: session.first,
-    history: session.history,
-    agent: ctx.agent,
-    model: ctx.model,
-    variant: activeVariant,
-    keybinds,
-    diffStyle,
-    onPermissionReply: async (next) => {
-      if (demo?.permission(next)) {
-        return
-      }
-
-      log?.write("send.permission.reply", next)
-      await ctx.sdk.permission.reply(next)
-    },
-    onQuestionReply: async (next) => {
-      if (demo?.questionReply(next)) {
-        return
-      }
-
-      await ctx.sdk.question.reply(next)
-    },
-    onQuestionReject: async (next) => {
-      if (demo?.questionReject(next)) {
-        return
-      }
-
-      await ctx.sdk.question.reject(next)
-    },
-    onCycleVariant: () => {
-      if (!ctx.model || variants.length === 0) {
-        return {
-          status: "no variants available",
-        }
-      }
-
-      activeVariant = cycleVariant(activeVariant, variants)
-      saveVariant(ctx.model, activeVariant)
-      return {
-        status: activeVariant ? `variant ${activeVariant}` : "variant default",
-        modelLabel: formatModelLabel(ctx.model, activeVariant),
-      }
-    },
-    onInterrupt: () => {
-      if (aborting) {
-        return
-      }
-
-      aborting = true
-      void ctx.sdk.session
-        .abort({
-          sessionID: ctx.sessionID,
-        })
-        .catch(() => {})
-        .finally(() => {
-          aborting = false
-        })
-    },
-  })
-  const footer = shell.footer
-
-  if (input.demo) {
-    demo = createRunDemo({
-      mode: input.demo,
-      text: input.demoText,
-      footer,
-      sessionID: ctx.sessionID,
-      thinking: input.thinking,
-      limits: () => limits,
-    })
-  }
-
-  if (input.afterPaint) {
-    void Promise.resolve(input.afterPaint(ctx)).catch(() => {})
-  }
-
-  void modelTask.then((info) => {
-    variants = info.variants
-    limits = info.limits
-
-    const next = resolveVariant(ctx.variant, session.variant, savedVariant, variants)
-    if (next === activeVariant) {
-      return
-    }
-
-    activeVariant = next
-    if (!ctx.model || footer.isClosed) {
-      return
-    }
-
-    footer.event({
-      type: "model",
-      model: formatModelLabel(ctx.model, activeVariant),
-    })
-  })
-
-  try {
-    const mod = await import("./stream.transport")
-    let includeFiles = true
-    const stream = await mod.createSessionTransport({
-      sdk: ctx.sdk,
-      sessionID: ctx.sessionID,
-      thinking: input.thinking,
-      limits: () => limits,
-      footer,
-      trace: log,
-    })
-
-    try {
-      if (demo) {
-        await demo.start()
-      }
-
-      const queue = await import("./runtime.queue")
-      await queue.runPromptQueue({
-        footer,
-        initialInput: input.initialInput,
-        trace: log,
-        onPrompt: () => {
-          shown = true
-        },
-        run: async (prompt, signal) => {
-          if (demo && (await demo.prompt(prompt, signal))) {
-            return
-          }
-
-          try {
-            await stream.runPromptTurn({
-              agent: ctx.agent,
-              model: ctx.model,
-              variant: activeVariant,
-              prompt,
-              files: input.files,
-              includeFiles,
-              signal,
-            })
-            includeFiles = false
-          } catch (error) {
-            if (signal.aborted || footer.isClosed) {
-              return
-            }
-            footer.append({ kind: "error", text: mod.formatUnknownError(error), phase: "start", source: "system" })
-          }
-        },
-      })
-    } finally {
-      await stream.close()
-    }
-  } finally {
-    const title = shown
-      ? await ctx.sdk.session
-          .get({
-            sessionID: ctx.sessionID,
-          })
-          .then((x) => x.data?.title)
-          .catch(() => undefined)
-      : undefined
-
-    await shell.close({
-      showExit: shown,
-      sessionTitle: title,
-    })
-  }
-}
-
-// Local in-process mode. Creates an SDK client backed by a direct fetch to
-// the in-process server, so no external HTTP server is needed.
-export async function runInteractiveLocalMode(input: RunLocalInput): Promise<void> {
-  const sdk = createOpencodeClient({
-    baseUrl: "http://opencode.internal",
-    fetch: input.fetch,
-  })
-
-  return runInteractiveRuntime({
-    files: input.files,
-    initialInput: input.initialInput,
-    thinking: input.thinking,
-    demo: input.demo,
-    demoText: input.demoText,
-    afterPaint: (ctx) => input.share(ctx.sdk, ctx.sessionID),
-    boot: async () => {
-      const agent = await input.resolveAgent()
-      const session = await input.session(sdk)
-      if (!session?.id) {
-        throw new Error("Session not found")
-      }
-
-      return {
-        sdk,
-        sessionID: session.id,
-        sessionTitle: session.title,
-        agent,
-        model: input.model,
-        variant: input.variant,
-      }
-    },
-  })
-}
-
-// Attach mode. Uses the caller-provided SDK client directly.
-export async function runInteractiveMode(input: RunInput): Promise<void> {
-  return runInteractiveRuntime({
-    files: input.files,
-    initialInput: input.initialInput,
-    thinking: input.thinking,
-    demo: input.demo,
-    demoText: input.demoText,
-    boot: async () => ({
-      sdk: input.sdk,
-      sessionID: input.sessionID,
-      sessionTitle: input.sessionTitle,
-      agent: input.agent,
-      model: input.model,
-      variant: input.variant,
-    }),
-  })
-}
@@ -1,92 +0,0 @@
-// Text normalization for scrollback entries.
-//
-// Transforms a StreamCommit into the final text that will be appended to
-// terminal scrollback. Each entry kind has its own formatting:
-//
-//   user       → prefixed with "› "
-//   assistant  → raw text (progress), empty (start/final unless interrupted)
-//   reasoning  → raw text with [REDACTED] stripped
-//   tool       → delegated to tool.ts for per-tool scrollback formatting
-//   error/system → raw trimmed text
-//
-// Returns an empty string when the commit should produce no visible output
-// (e.g., assistant start events, empty final events).
-import { toolFrame, toolScroll, toolView } from "./tool"
-import type { StreamCommit } from "./types"
-
-export function clean(text: string): string {
-  return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n")
-}
-
-function toolText(commit: StreamCommit, raw: string): string {
-  const ctx = toolFrame(commit, raw)
-  const view = toolView(ctx.name)
-
-  if (commit.phase === "progress" && !view.output) {
-    return ""
-  }
-
-  if (commit.phase === "final") {
-    if (ctx.status === "error") {
-      return toolScroll("final", ctx)
-    }
-
-    if (!view.final) {
-      return ""
-    }
-
-    if (ctx.status && ctx.status !== "completed") {
-      return ctx.raw.trim()
-    }
-  }
-
-  return toolScroll(commit.phase, ctx)
-}
-
-export function normalizeEntry(commit: StreamCommit): string {
-  const raw = clean(commit.text)
-
-  if (commit.kind === "user") {
-    if (!raw.trim()) {
-      return ""
-    }
-
-    const lead = raw.match(/^\n+/)?.[0] ?? ""
-    const body = lead ? raw.slice(lead.length) : raw
-    return `${lead}› ${body}`
-  }
-
-  if (commit.kind === "tool") {
-    return toolText(commit, raw)
-  }
-
-  if (commit.kind === "assistant") {
-    if (commit.phase === "start") {
-      return ""
-    }
-
-    if (commit.phase === "final") {
-      return commit.interrupted ? "assistant interrupted" : ""
-    }
-
-    return raw
-  }
-
-  if (commit.kind === "reasoning") {
-    if (commit.phase === "start") {
-      return ""
-    }
-
-    if (commit.phase === "final") {
-      return commit.interrupted ? "reasoning interrupted" : ""
-    }
-
-    return raw.replace(/\[REDACTED\]/g, "")
-  }
-
-  if (commit.phase === "start" || commit.phase === "final") {
-    return raw.trim()
-  }
-
-  return raw
-}
@@ -1,26 +0,0 @@
-// Entry writer routing for scrollback commits.
-//
-// Decides whether a commit should render as plain text or as a rich snapshot
-// (code block, diff view, task card, etc.). Completed tool parts whose tool
-// rule has a "snap" mode get routed to snapEntryWriter, which produces a
-// structured JSX snapshot. Everything else goes through textEntryWriter.
-import type { ScrollbackWriter } from "@opentui/core"
-import { toolView } from "./tool"
-import { snapEntryWriter, textEntryWriter } from "./scrollback.writer"
-import { RUN_THEME_FALLBACK, type RunTheme } from "./theme"
-import type { ScrollbackOptions, StreamCommit } from "./types"
-
-export function entryWriter(
-  commit: StreamCommit,
-  theme: RunTheme = RUN_THEME_FALLBACK,
-  opts: ScrollbackOptions = {},
-): ScrollbackWriter {
-  const state = commit.toolState ?? commit.part?.state.status
-  if (commit.kind === "tool" && commit.phase === "final" && state === "completed") {
-    if (toolView(commit.tool).snap) {
-      return snapEntryWriter(commit, theme, opts)
-    }
-  }
-
-  return textEntryWriter(commit, theme.entry)
-}
@@ -1,641 +0,0 @@
-// JSX-based scrollback snapshot writers for rich tool output.
-//
-// When a tool commit has a "snap" mode (code, diff, task, todo, question),
-// snapEntryWriter renders it as a structured JSX tree that OpenTUI converts
-// into a ScrollbackSnapshot. These snapshots support syntax highlighting,
-// unified/split diffs, line numbers, and LSP diagnostics.
-//
-// The writers use OpenTUI's createScrollbackWriter to produce snapshots.
-// OpenTUI measures and reflows them when the terminal resizes. The fit()
-// helper measures actual rendered width so narrow content doesn't claim
-// the full terminal width.
-//
-// Plain text entries (textEntryWriter) also go through here -- they just
-// produce a simple <text> element with the right color and attributes.
-/** @jsxImportSource @opentui/solid */
-
-import {
-  SyntaxStyle,
-  TextAttributes,
-  type ColorInput,
-  type ScrollbackRenderContext,
-  type ScrollbackSnapshot,
-  type ScrollbackWriter,
-} from "@opentui/core"
-import { createScrollbackWriter, type JSX } from "@opentui/solid"
-import { For, Show } from "solid-js"
-import { Filesystem } from "../../../util/filesystem"
-import { toolDiffView, toolFiletype, toolFrame, toolSnapshot } from "./tool"
-import { clean, normalizeEntry } from "./scrollback.format"
-import { RUN_THEME_FALLBACK, type RunEntryTheme, type RunTheme } from "./theme"
-import type { ScrollbackOptions, StreamCommit } from "./types"
-
-type ToolDict = Record<string, unknown>
-
-function dict(v: unknown): ToolDict {
-  if (!v || typeof v !== "object") {
-    return {}
-  }
-
-  return v as ToolDict
-}
-
-function text(v: unknown): string {
-  return typeof v === "string" ? v : ""
-}
-
-function arr(v: unknown): unknown[] {
-  return Array.isArray(v) ? v : []
-}
-
-function num(v: unknown): number | undefined {
-  if (typeof v !== "number" || !Number.isFinite(v)) {
-    return
-  }
-
-  return v
-}
-
-function diagnostics(meta: ToolDict, file: string): string[] {
-  const all = dict(meta.diagnostics)
-  const key = Filesystem.normalizePath(file)
-  const list = arr(all[key]).map(dict)
-  return list
-    .filter((item) => item.severity === 1)
-    .slice(0, 3)
-    .map((item) => {
-      const range = dict(item.range)
-      const start = dict(range.start)
-      const line = num(start.line)
-      const char = num(start.character)
-      const msg = text(item.message)
-      if (line === undefined || char === undefined) {
-        return `Error ${msg}`.trim()
-      }
-
-      return `Error [${line + 1}:${char + 1}] ${msg}`.trim()
-    })
-}
-
-type Flags = {
-  startOnNewLine: boolean
-  trailingNewline: boolean
-}
-
-type Paint = {
-  fg: ColorInput
-  attrs?: number
-}
-
-type CodeInput = {
-  title: string
-  content: string
-  filetype?: string
-  diagnostics: string[]
-}
-
-type DiffInput = {
-  title: string
-  diff?: string
-  filetype?: string
-  deletions?: number
-  diagnostics: string[]
-}
-
-type TaskInput = {
-  title: string
-  rows: string[]
-  tail: string
-}
-
-type TodoInput = {
-  items: Array<{
-    status: string
-    content: string
-  }>
-  tail: string
-}
-
-type QuestionInput = {
-  items: Array<{
-    question: string
-    answer: string
-  }>
-  tail: string
-}
-
-type Measure = {
-  widthColsMax: number
-}
-
-type MeasureNode = {
-  textBufferView?: {
-    measureForDimensions(width: number, height: number): Measure | null
-  }
-  getChildren?: () => unknown[]
-}
-
-let bare: SyntaxStyle | undefined
-
-function syntax(style?: SyntaxStyle): SyntaxStyle {
-  if (style) {
-    return style
-  }
-
-  bare ??= SyntaxStyle.fromTheme([])
-  return bare
-}
-
-function failed(commit: StreamCommit): boolean {
-  return commit.kind === "tool" && (commit.toolState === "error" || commit.part?.state.status === "error")
-}
-
-function look(commit: StreamCommit, theme: RunEntryTheme): Paint {
-  if (commit.kind === "user") {
-    return {
-      fg: theme.user.body,
-      attrs: TextAttributes.BOLD,
-    }
-  }
-
-  if (failed(commit)) {
-    return {
-      fg: theme.error.body,
-      attrs: TextAttributes.BOLD,
-    }
-  }
-
-  if (commit.phase === "final") {
-    return {
-      fg: theme.system.body,
-      attrs: TextAttributes.DIM,
-    }
-  }
-
-  if (commit.kind === "tool" && commit.phase === "start") {
-    return {
-      fg: theme.tool.start ?? theme.tool.body,
-    }
-  }
-
-  if (commit.kind === "assistant") {
-    return { fg: theme.assistant.body }
-  }
-
-  if (commit.kind === "reasoning") {
-    return {
-      fg: theme.reasoning.body,
-      attrs: TextAttributes.DIM,
-    }
-  }
-
-  if (commit.kind === "error") {
-    return {
-      fg: theme.error.body,
-      attrs: TextAttributes.BOLD,
-    }
-  }
-
-  if (commit.kind === "tool") {
-    return { fg: theme.tool.body }
-  }
-
-  return { fg: theme.system.body }
-}
-
-function cols(ctx: ScrollbackRenderContext): number {
-  return Math.max(1, Math.trunc(ctx.width))
-}
-
-function leaf(node: unknown): MeasureNode | undefined {
-  if (!node || typeof node !== "object") {
-    return
-  }
-
-  const next = node as MeasureNode
-  if (next.textBufferView) {
-    return next
-  }
-
-  const list = next.getChildren?.() ?? []
-  for (const child of list) {
-    const out = leaf(child)
-    if (out) {
-      return out
-    }
-  }
-}
-
-function fit(snapshot: ScrollbackSnapshot, ctx: ScrollbackRenderContext) {
-  const node = leaf(snapshot.root)
-  const width = cols(ctx)
-  const box = node?.textBufferView?.measureForDimensions(width, Math.max(1, snapshot.height ?? 1))
-  const rowColumns = Math.max(1, Math.min(width, box?.widthColsMax ?? 0))
-
-  snapshot.width = width
-  snapshot.rowColumns = rowColumns
-  return snapshot
-}
-
-function full(node: () => JSX.Element, ctx: ScrollbackRenderContext, flags: Flags) {
-  return createScrollbackWriter(node, {
-    width: cols(ctx),
-    rowColumns: cols(ctx),
-    startOnNewLine: flags.startOnNewLine,
-    trailingNewline: flags.trailingNewline,
-  })(ctx)
-}
-
-function TextEntry(props: { body: string; fg: ColorInput; attrs?: number }) {
-  return (
-    <text width="100%" wrapMode="word" fg={props.fg} attributes={props.attrs}>
-      {props.body}
-    </text>
-  )
-}
-
-function thinking(body: string) {
-  const mark = "Thinking: "
-  if (body.startsWith(mark)) {
-    return {
-      head: mark,
-      tail: body.slice(mark.length),
-    }
-  }
-
-  return {
-    tail: body,
-  }
-}
-
-function ReasoningEntry(props: { body: string; theme: RunEntryTheme }) {
-  const part = thinking(props.body)
-  return (
-    <text
-      width="100%"
-      wrapMode="word"
-      fg={props.theme.reasoning.body}
-      attributes={TextAttributes.DIM | TextAttributes.ITALIC}
-    >
-      <Show when={part.head}>{part.head}</Show>
-      {part.tail}
-    </text>
-  )
-}
-
-function Diagnostics(props: { theme: RunTheme; lines: string[] }) {
-  return (
-    <Show when={props.lines.length > 0}>
-      <box>
-        <For each={props.lines}>{(line) => <text fg={props.theme.entry.error.body}>{line}</text>}</For>
-      </box>
-    </Show>
-  )
-}
-
-function BlockTool(props: { theme: RunTheme; title: string; children: JSX.Element }) {
-  return (
-    <box flexDirection="column" gap={1}>
-      <text fg={props.theme.block.muted} attributes={TextAttributes.DIM}>
-        {props.title}
-      </text>
-      {props.children}
-    </box>
-  )
-}
-
-function CodeTool(props: { theme: RunTheme; data: CodeInput }) {
-  return (
-    <BlockTool theme={props.theme} title={props.data.title}>
-      <line_number fg={props.theme.block.muted} minWidth={3} paddingRight={1}>
-        <code
-          conceal={false}
-          fg={props.theme.block.text}
-          filetype={props.data.filetype}
-          syntaxStyle={syntax(props.theme.block.syntax)}
-          content={props.data.content}
-          drawUnstyledText={true}
-          wrapMode="word"
-        />
-      </line_number>
-      <Diagnostics theme={props.theme} lines={props.data.diagnostics} />
-    </BlockTool>
-  )
-}
-
-function DiffTool(props: { theme: RunTheme; data: DiffInput; view: "unified" | "split" }) {
-  return (
-    <BlockTool theme={props.theme} title={props.data.title}>
-      <Show
-        when={props.data.diff?.trim()}
-        fallback={
-          <text fg={props.theme.block.diffRemoved}>
-            -{props.data.deletions ?? 0} line{props.data.deletions === 1 ? "" : "s"}
-          </text>
-        }
-      >
-        <box>
-          <diff
-            diff={props.data.diff ?? ""}
-            view={props.view}
-            filetype={props.data.filetype}
-            syntaxStyle={syntax(props.theme.block.syntax)}
-            showLineNumbers={true}
-            width="100%"
-            wrapMode="word"
-            fg={props.theme.block.text}
-            addedBg={props.theme.block.diffAddedBg}
-            removedBg={props.theme.block.diffRemovedBg}
-            contextBg={props.theme.block.diffContextBg}
-            addedSignColor={props.theme.block.diffHighlightAdded}
-            removedSignColor={props.theme.block.diffHighlightRemoved}
-            lineNumberFg={props.theme.block.diffLineNumber}
-            lineNumberBg={props.theme.block.diffContextBg}
-            addedLineNumberBg={props.theme.block.diffAddedLineNumberBg}
-            removedLineNumberBg={props.theme.block.diffRemovedLineNumberBg}
-          />
-        </box>
-      </Show>
-      <Diagnostics theme={props.theme} lines={props.data.diagnostics} />
-    </BlockTool>
-  )
-}
-
-function TaskTool(props: { theme: RunTheme; data: TaskInput }) {
-  return (
-    <BlockTool theme={props.theme} title={props.data.title}>
-      <box>
-        <For each={props.data.rows}>{(line) => <text fg={props.theme.block.text}>{line}</text>}</For>
-      </box>
-      <text fg={props.theme.block.muted} attributes={TextAttributes.DIM}>
-        {props.data.tail}
-      </text>
-    </BlockTool>
-  )
-}
-
-function todoMark(status: string): string {
-  if (status === "completed") {
-    return "[x]"
-  }
-  if (status === "in_progress") {
-    return "[>]"
-  }
-  if (status === "cancelled") {
-    return "[-]"
-  }
-  return "[ ]"
-}
-
-function TodoTool(props: { theme: RunTheme; data: TodoInput }) {
-  return (
-    <BlockTool theme={props.theme} title="# Todos">
-      <box>
-        <For each={props.data.items}>
-          {(item) => (
-            <text fg={props.theme.block.text}>
-              {todoMark(item.status)} {item.content}
-            </text>
-          )}
-        </For>
-      </box>
-      <text fg={props.theme.block.muted} attributes={TextAttributes.DIM}>
-        {props.data.tail}
-      </text>
-    </BlockTool>
-  )
-}
-
-function QuestionTool(props: { theme: RunTheme; data: QuestionInput }) {
-  return (
-    <BlockTool theme={props.theme} title="# Questions">
-      <text fg={props.theme.block.muted} attributes={TextAttributes.DIM}>
-        {props.data.tail}
-      </text>
-      <box gap={1}>
-        <For each={props.data.items}>
-          {(item) => (
-            <box flexDirection="column">
-              <text fg={props.theme.block.muted}>{item.question}</text>
-              <text fg={props.theme.block.text}>{item.answer}</text>
-            </box>
-          )}
-        </For>
-      </box>
-    </BlockTool>
-  )
-}
-
-function textWriter(body: string, commit: StreamCommit, theme: RunEntryTheme, flags: Flags): ScrollbackWriter {
-  const style = look(commit, theme)
-  return (ctx) =>
-    fit(
-      createScrollbackWriter(() => <TextEntry body={body} fg={style.fg} attrs={style.attrs} />, {
-        width: cols(ctx),
-        startOnNewLine: flags.startOnNewLine,
-        trailingNewline: flags.trailingNewline,
-      })(ctx),
-      ctx,
-    )
-}
-
-function reasoningWriter(body: string, theme: RunEntryTheme, flags: Flags): ScrollbackWriter {
-  return (ctx) =>
-    fit(
-      createScrollbackWriter(() => <ReasoningEntry body={body} theme={theme} />, {
-        width: cols(ctx),
-        startOnNewLine: flags.startOnNewLine,
-        trailingNewline: flags.trailingNewline,
-      })(ctx),
-      ctx,
-    )
-}
-
-function blankWriter(): ScrollbackWriter {
-  return (ctx) =>
-    createScrollbackWriter(() => <text width="100%" />, {
-      width: cols(ctx),
-      startOnNewLine: true,
-      trailingNewline: true,
-    })(ctx)
-}
-
-function textBlockWriter(body: string, theme: RunEntryTheme): ScrollbackWriter {
-  return (ctx) =>
-    full(() => <TextEntry body={body.endsWith("\n") ? body : `${body}\n`} fg={theme.system.body} />, ctx, {
-      startOnNewLine: true,
-      trailingNewline: false,
-    })
-}
-
-function codeWriter(data: CodeInput, theme: RunTheme, flags: Flags): ScrollbackWriter {
-  return (ctx) => full(() => <CodeTool theme={theme} data={data} />, ctx, flags)
-}
-
-function diffWriter(list: DiffInput[], theme: RunTheme, flags: Flags, view: "unified" | "split"): ScrollbackWriter {
-  return (ctx) =>
-    full(
-      () => (
-        <box flexDirection="column" gap={1}>
-          <For each={list}>{(data) => <DiffTool theme={theme} data={data} view={view} />}</For>
-        </box>
-      ),
-      ctx,
-      flags,
-    )
-}
-
-function taskWriter(data: TaskInput, theme: RunTheme, flags: Flags): ScrollbackWriter {
-  return (ctx) => full(() => <TaskTool theme={theme} data={data} />, ctx, flags)
-}
-
-function todoWriter(data: TodoInput, theme: RunTheme, flags: Flags): ScrollbackWriter {
-  return (ctx) => full(() => <TodoTool theme={theme} data={data} />, ctx, flags)
-}
-
-function questionWriter(data: QuestionInput, theme: RunTheme, flags: Flags): ScrollbackWriter {
-  return (ctx) => full(() => <QuestionTool theme={theme} data={data} />, ctx, flags)
-}
-
-function flags(commit: StreamCommit): Flags {
-  if (commit.kind === "user") {
-    return {
-      startOnNewLine: true,
-      trailingNewline: false,
-    }
-  }
-
-  if (commit.kind === "tool") {
-    if (commit.phase === "progress") {
-      return {
-        startOnNewLine: false,
-        trailingNewline: false,
-      }
-    }
-
-    return {
-      startOnNewLine: true,
-      trailingNewline: true,
-    }
-  }
-
-  if (commit.kind === "assistant" || commit.kind === "reasoning") {
-    if (commit.phase === "progress") {
-      return {
-        startOnNewLine: false,
-        trailingNewline: false,
-      }
-    }
-
-    return {
-      startOnNewLine: true,
-      trailingNewline: true,
-    }
-  }
-
-  return {
-    startOnNewLine: true,
-    trailingNewline: true,
-  }
-}
-
-export function textEntryWriter(commit: StreamCommit, theme: RunEntryTheme): ScrollbackWriter {
-  const body = normalizeEntry(commit)
-  const snap = flags(commit)
-  if (commit.kind === "reasoning") {
-    return reasoningWriter(body, theme, snap)
-  }
-
-  return textWriter(body, commit, theme, snap)
-}
-
-export function snapEntryWriter(commit: StreamCommit, theme: RunTheme, opts: ScrollbackOptions): ScrollbackWriter {
-  const snap = toolSnapshot(commit, clean(commit.text))
-  if (!snap) {
-    return textEntryWriter(commit, theme.entry)
-  }
-
-  const info = toolFrame(commit, clean(commit.text))
-  const style = flags(commit)
-
-  if (snap.kind === "code") {
-    return codeWriter(
-      {
-        title: snap.title,
-        content: snap.content,
-        filetype: toolFiletype(snap.file),
-        diagnostics: diagnostics(info.meta, snap.file ?? ""),
-      },
-      theme,
-      style,
-    )
-  }
-
-  if (snap.kind === "diff") {
-    if (snap.items.length === 0) {
-      return textEntryWriter(commit, theme.entry)
-    }
-
-    const list = snap.items
-      .map((item) => {
-        if (!item.diff.trim()) {
-          return
-        }
-
-        return {
-          title: item.title,
-          diff: item.diff,
-          filetype: toolFiletype(item.file),
-          deletions: item.deletions,
-          diagnostics: diagnostics(info.meta, item.file ?? ""),
-        }
-      })
-      .filter((item): item is NonNullable<typeof item> => Boolean(item))
-
-    if (list.length === 0) {
-      return textEntryWriter(commit, theme.entry)
-    }
-
-    return (ctx) => diffWriter(list, theme, style, toolDiffView(ctx.width, opts.diffStyle))(ctx)
-  }
-
-  if (snap.kind === "task") {
-    return taskWriter(
-      {
-        title: snap.title,
-        rows: snap.rows,
-        tail: snap.tail,
-      },
-      theme,
-      style,
-    )
-  }
-
-  if (snap.kind === "todo") {
-    return todoWriter(
-      {
-        items: snap.items,
-        tail: snap.tail,
-      },
-      theme,
-      style,
-    )
-  }
-
-  return questionWriter(
-    {
-      items: snap.items,
-      tail: snap.tail,
-    },
-    theme,
-    style,
-  )
-}
-
-export function blockWriter(text: string, theme: RunEntryTheme = RUN_THEME_FALLBACK.entry): ScrollbackWriter {
-  return textBlockWriter(clean(text), theme)
-}
-
-export function spacerWriter(): ScrollbackWriter {
-  return blankWriter()
-}
@@ -1,881 +0,0 @@
-// Core reducer for direct interactive mode.
-//
-// Takes raw SDK events and produces two outputs:
-//   - StreamCommit[]: append-only scrollback entries (text, tool, error, etc.)
-//   - FooterOutput:   status bar patches and view transitions (permission, question)
-//
-// The reducer mutates SessionData in place for performance but has no
-// external side effects -- no IO, no footer calls. The caller
-// (stream.transport.ts) feeds events in and forwards output to the footer
-// through stream.ts.
-//
-// Key design decisions:
-//
-// - Text parts buffer in `data.text` until their message role is confirmed as
-//   "assistant". This prevents echoing user-role text parts. The `ready()`
-//   check gates output: if we see a text delta before the message.updated
-//   event that tells us the role, we stash it and flush later via `replay()`.
-//
-// - Tool echo stripping: bash tools may echo their own output in the next
-//   assistant text part. `stashEcho()` records completed bash output, and
-//   `stripEcho()` removes it from the start of the next assistant chunk.
-//
-// - Permission and question requests queue in `data.permissions` and
-//   `data.questions`. The footer shows whichever is first. When a reply
-//   event arrives, the queue entry is removed and the footer falls back
-//   to the next pending request or to the prompt view.
-import type { Event, PermissionRequest, QuestionRequest, ToolPart } from "@opencode-ai/sdk/v2"
-import { Locale } from "../../../util/locale"
-import { toolView } from "./tool"
-import type { FooterOutput, FooterPatch, FooterView, StreamCommit } from "./types"
-
-const money = new Intl.NumberFormat("en-US", {
-  style: "currency",
-  currency: "USD",
-})
-
-type Tokens = {
-  input?: number
-  output?: number
-  reasoning?: number
-  cache?: {
-    read?: number
-    write?: number
-  }
-}
-
-type PartKind = "assistant" | "reasoning"
-type MessageRole = "assistant" | "user"
-type Dict = Record<string, unknown>
-type SessionCommit = StreamCommit
-
-// Mutable accumulator for the reducer. Each field tracks a different aspect
-// of the stream so we can produce correct incremental output:
-//
-// - ids:    parts and error keys we've already committed (dedup guard)
-// - tools:  tool parts we've emitted a "start" for but not yet completed
-// - call:   tool call inputs, keyed by msg:call, for enriching permission views
-// - role:   message ID → "assistant" | "user", learned from message.updated
-// - msg:    part ID → message ID
-// - part:   part ID → "assistant" | "reasoning" (text parts only)
-// - text:   part ID → full accumulated text so far
-// - sent:   part ID → byte offset of last flushed text (for incremental output)
-// - end:    part IDs whose time.end has arrived (part is finished)
-// - echo:   message ID → bash outputs to strip from the next assistant chunk
-export type SessionData = {
-  announced: boolean
-  ids: Set<string>
-  tools: Set<string>
-  call: Map<string, Dict>
-  permissions: PermissionRequest[]
-  questions: QuestionRequest[]
-  role: Map<string, MessageRole>
-  msg: Map<string, string>
-  part: Map<string, PartKind>
-  text: Map<string, string>
-  sent: Map<string, number>
-  end: Set<string>
-  echo: Map<string, Set<string>>
-}
-
-export type SessionDataInput = {
-  data: SessionData
-  event: Event
-  sessionID: string
-  thinking: boolean
-  limits: Record<string, number>
-}
-
-export type SessionDataOutput = {
-  data: SessionData
-  commits: SessionCommit[]
-  footer?: FooterOutput
-}
-
-export function createSessionData(): SessionData {
-  return {
-    announced: false,
-    ids: new Set(),
-    tools: new Set(),
-    call: new Map(),
-    permissions: [],
-    questions: [],
-    role: new Map(),
-    msg: new Map(),
-    part: new Map(),
-    text: new Map(),
-    sent: new Map(),
-    end: new Set(),
-    echo: new Map(),
-  }
-}
-
-function modelKey(provider: string, model: string): string {
-  return `${provider}/${model}`
-}
-
-function formatUsage(
-  tokens: Tokens | undefined,
-  limit: number | undefined,
-  cost: number | undefined,
-): string | undefined {
-  const total =
-    (tokens?.input ?? 0) +
-    (tokens?.output ?? 0) +
-    (tokens?.reasoning ?? 0) +
-    (tokens?.cache?.read ?? 0) +
-    (tokens?.cache?.write ?? 0)
-
-  if (total <= 0) {
-    if (typeof cost === "number" && cost > 0) {
-      return money.format(cost)
-    }
-    return
-  }
-
-  const text =
-    limit && limit > 0 ? `${Locale.number(total)} (${Math.round((total / limit) * 100)}%)` : Locale.number(total)
-
-  if (typeof cost === "number" && cost > 0) {
-    return `${text} · ${money.format(cost)}`
-  }
-
-  return text
-}
-
-function formatError(error: {
-  name?: string
-  message?: string
-  data?: {
-    message?: string
-  }
-}): string {
-  if (error.data?.message) {
-    return String(error.data.message)
-  }
-
-  if (error.message) {
-    return String(error.message)
-  }
-
-  if (error.name) {
-    return String(error.name)
-  }
-
-  return "unknown error"
-}
-
-function isAbort(error: { name?: string } | undefined): boolean {
-  return error?.name === "MessageAbortedError"
-}
-
-function msgErr(id: string): string {
-  return `msg:${id}:error`
-}
-
-function patch(patch?: FooterPatch, view?: FooterView): FooterOutput | undefined {
-  if (!patch && !view) {
-    return
-  }
-
-  return {
-    patch,
-    view,
-  }
-}
-
-function out(data: SessionData, commits: SessionCommit[], footer?: FooterOutput): SessionDataOutput {
-  if (!footer) {
-    return {
-      data,
-      commits,
-    }
-  }
-
-  return {
-    data,
-    commits,
-    footer,
-  }
-}
-
-function pickView(data: SessionData): FooterView {
-  const permission = data.permissions[0]
-  if (permission) {
-    return { type: "permission", request: permission }
-  }
-
-  const question = data.questions[0]
-  if (question) {
-    return { type: "question", request: question }
-  }
-
-  return { type: "prompt" }
-}
-
-function queueFooter(data: SessionData): FooterOutput {
-  const view = pickView(data)
-  if (view.type === "permission") {
-    return {
-      view,
-      patch: { status: "awaiting permission" },
-    }
-  }
-
-  if (view.type === "question") {
-    return {
-      view,
-      patch: { status: "awaiting answer" },
-    }
-  }
-
-  return {
-    view,
-    patch: { status: "" },
-  }
-}
-
-function upsert<T extends { id: string }>(list: T[], item: T) {
-  const idx = list.findIndex((entry) => entry.id === item.id)
-  if (idx === -1) {
-    list.push(item)
-    return
-  }
-
-  list[idx] = item
-}
-
-function remove<T extends { id: string }>(list: T[], id: string): boolean {
-  const idx = list.findIndex((entry) => entry.id === id)
-  if (idx === -1) {
-    return false
-  }
-
-  list.splice(idx, 1)
-  return true
-}
-
-function key(msg: string, call: string): string {
-  return `${msg}:${call}`
-}
-
-function enrichPermission(data: SessionData, request: PermissionRequest): PermissionRequest {
-  if (!request.tool) {
-    return request
-  }
-
-  const input = data.call.get(key(request.tool.messageID, request.tool.callID))
-  if (!input) {
-    return request
-  }
-
-  const meta = request.metadata ?? {}
-  if (meta.input === input) {
-    return request
-  }
-
-  return {
-    ...request,
-    metadata: {
-      ...meta,
-      input,
-    },
-  }
-}
-
-// Updates the active permission request when the matching tool part gets
-// new input (e.g., a diff). This keeps the permission UI in sync with the
-// tool's evolving state. Only triggers a footer update if the currently
-// displayed permission was the one that changed.
-function syncPermission(data: SessionData, part: ToolPart): FooterOutput | undefined {
-  data.call.set(key(part.messageID, part.callID), part.state.input)
-  if (data.permissions.length === 0) {
-    return
-  }
-
-  let changed = false
-  let active = false
-  data.permissions = data.permissions.map((request, index) => {
-    if (!request.tool || request.tool.messageID !== part.messageID || request.tool.callID !== part.callID) {
-      return request
-    }
-
-    const next = enrichPermission(data, request)
-    if (next === request) {
-      return request
-    }
-
-    changed = true
-    active ||= index === 0
-    return next
-  })
-
-  if (!changed || !active) {
-    return
-  }
-
-  return {
-    view: pickView(data),
-  }
-}
-
-function toolStatus(part: ToolPart): string {
-  if (part.tool !== "task") {
-    return `running ${part.tool}`
-  }
-
-  const state = part.state as {
-    input?: {
-      description?: unknown
-      subagent_type?: unknown
-    }
-  }
-  const desc = state.input?.description
-  if (typeof desc === "string" && desc.trim()) {
-    return `running ${desc.trim()}`
-  }
-
-  const type = state.input?.subagent_type
-  if (typeof type === "string" && type.trim()) {
-    return `running ${type.trim()}`
-  }
-
-  return "running task"
-}
-
-// Returns true if we can flush this part's text to scrollback.
-//
-// We gate on the message role being "assistant" because user-role messages
-// also contain text parts (the user's own input) which we don't want to
-// echo. If we haven't received the message.updated event yet, we return
-// false and the text stays buffered until replay() flushes it.
-function ready(data: SessionData, partID: string): boolean {
-  const msg = data.msg.get(partID)
-  if (!msg) {
-    return true
-  }
-
-  const role = data.role.get(msg)
-  if (!role) {
-    return false
-  }
-
-  return role === "assistant"
-}
-
-function syncText(data: SessionData, partID: string, next: string) {
-  const prev = data.text.get(partID) ?? ""
-  if (!next) {
-    return prev
-  }
-
-  if (!prev || next.length >= prev.length) {
-    data.text.set(partID, next)
-    return next
-  }
-
-  return prev
-}
-
-// Records bash tool output for echo stripping. Some models echo bash output
-// verbatim at the start of their next text part. We save both the raw and
-// trimmed forms so stripEcho() can match either.
-function stashEcho(data: SessionData, part: ToolPart) {
-  if (part.tool !== "bash") {
-    return
-  }
-
-  if (typeof part.messageID !== "string" || !part.messageID) {
-    return
-  }
-
-  const output = (part.state as { output?: unknown }).output
-  if (typeof output !== "string") {
-    return
-  }
-
-  const text = output.replace(/^\n+/, "")
-  if (!text.trim()) {
-    return
-  }
-
-  const set = data.echo.get(part.messageID) ?? new Set<string>()
-  set.add(text)
-  const trim = text.replace(/\n+$/, "")
-  if (trim && trim !== text) {
-    set.add(trim)
-  }
-  data.echo.set(part.messageID, set)
-}
-
-function stripEcho(data: SessionData, msg: string | undefined, chunk: string): string {
-  if (!msg) {
-    return chunk
-  }
-
-  const set = data.echo.get(msg)
-  if (!set || set.size === 0) {
-    return chunk
-  }
-
-  data.echo.delete(msg)
-  const list = [...set].sort((a, b) => b.length - a.length)
-  for (const item of list) {
-    if (!item || !chunk.startsWith(item)) {
-      continue
-    }
-
-    return chunk.slice(item.length).replace(/^\n+/, "")
-  }
-
-  return chunk
-}
-
-function flushPart(data: SessionData, commits: SessionCommit[], partID: string, interrupted = false) {
-  const kind = data.part.get(partID)
-  if (!kind) {
-    return
-  }
-
-  const text = data.text.get(partID) ?? ""
-  const sent = data.sent.get(partID) ?? 0
-  let chunk = text.slice(sent)
-  const msg = data.msg.get(partID)
-
-  if (sent === 0) {
-    chunk = chunk.replace(/^\n+/, "")
-    if (kind === "reasoning" && chunk) {
-      chunk = `Thinking: ${chunk.replace(/\[REDACTED\]/g, "")}`
-    }
-    if (kind === "assistant" && chunk) {
-      chunk = stripEcho(data, msg, chunk)
-    }
-  }
-
-  if (chunk) {
-    data.sent.set(partID, text.length)
-    commits.push({
-      kind,
-      text: chunk,
-      phase: "progress",
-      source: kind,
-      messageID: msg,
-      partID,
-    })
-  }
-
-  if (!interrupted) {
-    return
-  }
-
-  commits.push({
-    kind,
-    text: "",
-    phase: "final",
-    source: kind,
-    messageID: msg,
-    partID,
-    interrupted: true,
-  })
-}
-
-function drop(data: SessionData, partID: string) {
-  data.part.delete(partID)
-  data.text.delete(partID)
-  data.sent.delete(partID)
-  data.msg.delete(partID)
-  data.end.delete(partID)
-}
-
-// Called when we learn a message's role (from message.updated). Flushes any
-// buffered text parts that were waiting on role confirmation. User-role
-// parts are silently dropped.
-function replay(data: SessionData, commits: SessionCommit[], messageID: string, role: MessageRole, thinking: boolean) {
-  for (const [partID, msg] of [...data.msg.entries()]) {
-    if (msg !== messageID || data.ids.has(partID)) {
-      continue
-    }
-
-    if (role === "user") {
-      data.ids.add(partID)
-      drop(data, partID)
-      continue
-    }
-
-    const kind = data.part.get(partID)
-    if (!kind) {
-      continue
-    }
-
-    if (kind === "reasoning" && !thinking) {
-      if (data.end.has(partID)) {
-        data.ids.add(partID)
-      }
-      drop(data, partID)
-      continue
-    }
-
-    flushPart(data, commits, partID)
-
-    if (!data.end.has(partID)) {
-      continue
-    }
-
-    data.ids.add(partID)
-    drop(data, partID)
-  }
-}
-
-function startTool(part: ToolPart): SessionCommit {
-  return {
-    kind: "tool",
-    text: toolStatus(part),
-    phase: "start",
-    source: "tool",
-    messageID: part.messageID,
-    partID: part.id,
-    tool: part.tool,
-    part,
-    toolState: "running",
-  }
-}
-
-function doneTool(part: ToolPart): SessionCommit {
-  return {
-    kind: "tool",
-    text: "",
-    phase: "final",
-    source: "tool",
-    messageID: part.messageID,
-    partID: part.id,
-    tool: part.tool,
-    part,
-    toolState: "completed",
-  }
-}
-
-function failTool(part: ToolPart, text: string): SessionCommit {
-  return {
-    kind: "tool",
-    text,
-    phase: "final",
-    source: "tool",
-    messageID: part.messageID,
-    partID: part.id,
-    tool: part.tool,
-    part,
-    toolState: "error",
-    toolError: text,
-  }
-}
-
-// Emits "interrupted" final entries for all in-flight parts. Called when a turn is aborted.
-export function flushInterrupted(data: SessionData, commits: SessionCommit[]) {
-  for (const partID of data.part.keys()) {
-    if (data.ids.has(partID)) {
-      continue
-    }
-
-    const msg = data.msg.get(partID)
-    if (msg && data.role.get(msg) === "user") {
-      continue
-    }
-
-    flushPart(data, commits, partID, true)
-  }
-}
-
-// The main reducer. Takes one SDK event and returns scrollback commits and
-// footer updates. Called once per event from the stream transport's watch loop.
-//
-// Event handling follows the SDK event types:
-//   message.updated      → learn role, flush buffered parts, track usage
-//   message.part.delta   → accumulate text, flush if ready
-//   message.part.updated → handle text/reasoning/tool state transitions
-//   permission.*         → manage the permission queue, drive footer view
-//   question.*           → manage the question queue, drive footer view
-//   session.error        → emit error scrollback entry
-export function reduceSessionData(input: SessionDataInput): SessionDataOutput {
-  const commits: SessionCommit[] = []
-  const data = input.data
-  const event = input.event
-
-  if (event.type === "message.updated") {
-    if (event.properties.sessionID !== input.sessionID) {
-      return out(data, commits)
-    }
-
-    const info = event.properties.info
-    if (typeof info.id === "string") {
-      data.role.set(info.id, info.role)
-      replay(data, commits, info.id, info.role, input.thinking)
-    }
-
-    if (info.role !== "assistant") {
-      return out(data, commits)
-    }
-
-    let next: FooterPatch | undefined
-    if (!data.announced) {
-      data.announced = true
-      next = { status: "assistant responding" }
-    }
-
-    const usage = formatUsage(
-      info.tokens,
-      input.limits[modelKey(info.providerID, info.modelID)],
-      typeof info.cost === "number" ? info.cost : undefined,
-    )
-    if (usage) {
-      next = {
-        ...(next ?? {}),
-        usage,
-      }
-    }
-
-    if (typeof info.id === "string" && info.error && !isAbort(info.error) && !data.ids.has(msgErr(info.id))) {
-      data.ids.add(msgErr(info.id))
-      commits.push({
-        kind: "error",
-        text: formatError(info.error),
-        phase: "start",
-        source: "system",
-        messageID: info.id,
-      })
-    }
-
-    return out(data, commits, patch(next))
-  }
-
-  if (event.type === "message.part.delta") {
-    if (event.properties.sessionID !== input.sessionID) {
-      return out(data, commits)
-    }
-
-    if (
-      typeof event.properties.partID !== "string" ||
-      typeof event.properties.field !== "string" ||
-      typeof event.properties.delta !== "string"
-    ) {
-      return out(data, commits)
-    }
-
-    if (event.properties.field !== "text") {
-      return out(data, commits)
-    }
-
-    const partID = event.properties.partID
-    if (data.ids.has(partID)) {
-      return out(data, commits)
-    }
-
-    if (typeof event.properties.messageID === "string") {
-      data.msg.set(partID, event.properties.messageID)
-    }
-
-    const text = data.text.get(partID) ?? ""
-    data.text.set(partID, text + event.properties.delta)
-
-    const kind = data.part.get(partID)
-    if (!kind) {
-      return out(data, commits)
-    }
-
-    if (kind === "reasoning" && !input.thinking) {
-      return out(data, commits)
-    }
-
-    if (!ready(data, partID)) {
-      return out(data, commits)
-    }
-
-    flushPart(data, commits, partID)
-    return out(data, commits)
-  }
-
-  if (event.type === "message.part.updated") {
-    const part = event.properties.part
-    if (part.sessionID !== input.sessionID) {
-      return out(data, commits)
-    }
-
-    if (part.type === "tool") {
-      const view = syncPermission(data, part)
-
-      if (part.state.status === "running") {
-        if (data.ids.has(part.id)) {
-          return out(data, commits, view)
-        }
-
-        if (!data.tools.has(part.id)) {
-          data.tools.add(part.id)
-          commits.push(startTool(part))
-        }
-
-        return out(data, commits, view ?? patch({ status: toolStatus(part) }))
-      }
-
-      if (part.state.status === "completed") {
-        const seen = data.tools.has(part.id)
-        const mode = toolView(part.tool)
-        data.tools.delete(part.id)
-        if (data.ids.has(part.id)) {
-          return out(data, commits, view)
-        }
-
-        if (!seen) {
-          commits.push(startTool(part))
-        }
-
-        data.ids.add(part.id)
-        stashEcho(data, part)
-
-        const output = part.state.output
-        if (mode.output && typeof output === "string" && output.trim()) {
-          commits.push({
-            kind: "tool",
-            text: output,
-            phase: "progress",
-            source: "tool",
-            messageID: part.messageID,
-            partID: part.id,
-            tool: part.tool,
-            part,
-            toolState: "completed",
-          })
-        }
-
-        if (mode.final) {
-          commits.push(doneTool(part))
-        }
-
-        return out(data, commits, view)
-      }
-
-      if (part.state.status === "error") {
-        data.tools.delete(part.id)
-        if (data.ids.has(part.id)) {
-          return out(data, commits, view)
-        }
-
-        data.ids.add(part.id)
-        const text =
-          typeof part.state.error === "string" && part.state.error.trim() ? part.state.error : "unknown error"
-        commits.push(failTool(part, text))
-        return out(data, commits, view)
-      }
-    }
-
-    if (part.type !== "text" && part.type !== "reasoning") {
-      return out(data, commits)
-    }
-
-    if (data.ids.has(part.id)) {
-      return out(data, commits)
-    }
-
-    const kind = part.type === "text" ? "assistant" : "reasoning"
-    if (typeof part.messageID === "string") {
-      data.msg.set(part.id, part.messageID)
-    }
-
-    const msg = part.messageID
-    const role = msg ? data.role.get(msg) : undefined
-    if (role === "user") {
-      data.ids.add(part.id)
-      drop(data, part.id)
-      return out(data, commits)
-    }
-
-    if (kind === "reasoning" && !input.thinking) {
-      if (part.time?.end) {
-        data.ids.add(part.id)
-      }
-      drop(data, part.id)
-      return out(data, commits)
-    }
-
-    data.part.set(part.id, kind)
-    syncText(data, part.id, part.text)
-
-    if (part.time?.end) {
-      data.end.add(part.id)
-    }
-
-    if (msg && !role) {
-      return out(data, commits)
-    }
-
-    if (!ready(data, part.id)) {
-      return out(data, commits)
-    }
-
-    flushPart(data, commits, part.id)
-
-    if (!part.time?.end) {
-      return out(data, commits)
-    }
-
-    data.ids.add(part.id)
-    drop(data, part.id)
-    return out(data, commits)
-  }
-
-  if (event.type === "permission.asked") {
-    if (event.properties.sessionID !== input.sessionID) {
-      return out(data, commits)
-    }
-
-    upsert(data.permissions, enrichPermission(data, event.properties))
-    return out(data, commits, queueFooter(data))
-  }
-
-  if (event.type === "permission.replied") {
-    if (event.properties.sessionID !== input.sessionID) {
-      return out(data, commits)
-    }
-
-    if (!remove(data.permissions, event.properties.requestID)) {
-      return out(data, commits)
-    }
-
-    return out(data, commits, queueFooter(data))
-  }
-
-  if (event.type === "question.asked") {
-    if (event.properties.sessionID !== input.sessionID) {
-      return out(data, commits)
-    }
-
-    upsert(data.questions, event.properties)
-    return out(data, commits, queueFooter(data))
-  }
-
-  if (event.type === "question.replied" || event.type === "question.rejected") {
-    if (event.properties.sessionID !== input.sessionID) {
-      return out(data, commits)
-    }
-
-    if (!remove(data.questions, event.properties.requestID)) {
-      return out(data, commits)
-    }
-
-    return out(data, commits, queueFooter(data))
-  }
-
-  if (event.type === "session.error") {
-    if (event.properties.sessionID !== input.sessionID || !event.properties.error) {
-      return out(data, commits)
-    }
-
-    commits.push({
-      kind: "error",
-      text: formatError(event.properties.error),
-      phase: "start",
-      source: "system",
-    })
-    return out(data, commits)
-  }
-
-  return out(data, commits)
-}
@@ -1,94 +0,0 @@
-// Session message extraction and prompt history.
-//
-// Fetches session messages from the SDK and extracts user turn text for
-// the prompt history ring. Also finds the most recently used variant for
-// the current model so the footer can pre-select it.
-import type { RunInput } from "./types"
-
-const LIMIT = 200
-
-export type SessionMessages = NonNullable<Awaited<ReturnType<RunInput["sdk"]["session"]["messages"]>>["data"]>
-
-type Turn = {
-  text: string
-  provider: string | undefined
-  model: string | undefined
-  variant: string | undefined
-}
-
-export type RunSession = {
-  first: boolean
-  turns: Turn[]
-}
-
-function text(msg: SessionMessages[number]): string {
-  return msg.parts
-    .filter((part) => part.type === "text")
-    .map((part) => part.text.trim())
-    .filter((part) => part.length > 0)
-    .join("\n")
-}
-
-function turn(msg: SessionMessages[number]): Turn | undefined {
-  if (msg.info.role !== "user") {
-    return
-  }
-
-  return {
-    text: text(msg),
-    provider: msg.info.model.providerID,
-    model: msg.info.model.modelID,
-    variant: msg.info.variant,
-  }
-}
-
-export function createSession(messages: SessionMessages): RunSession {
-  return {
-    first: messages.length === 0,
-    turns: messages.flatMap((msg) => {
-      const item = turn(msg)
-      return item ? [item] : []
-    }),
-  }
-}
-
-export async function resolveSession(sdk: RunInput["sdk"], sessionID: string, limit = LIMIT): Promise<RunSession> {
-  const response = await sdk.session.messages({
-    sessionID,
-    limit,
-  })
-  return createSession(response.data ?? [])
-}
-
-export function sessionHistory(session: RunSession, limit = LIMIT): string[] {
-  const out: string[] = []
-
-  for (const turn of session.turns) {
-    if (!turn.text) {
-      continue
-    }
-
-    if (out[out.length - 1] === turn.text) {
-      continue
-    }
-
-    out.push(turn.text)
-  }
-
-  return out.slice(-limit)
-}
-
-export function sessionVariant(session: RunSession, model: RunInput["model"]): string | undefined {
-  if (!model) {
-    return
-  }
-
-  for (let idx = session.turns.length - 1; idx >= 0; idx -= 1) {
-    const turn = session.turns[idx]
-    if (turn.provider !== model.providerID || turn.model !== model.modelID) {
-      continue
-    }
-
-    return turn.variant
-  }
-}
@@ -1,291 +0,0 @@
-// Entry and exit splash banners for direct interactive mode scrollback.
-//
-// Renders the opencode ASCII logo with half-block shadow characters, the
-// session title, and contextual hints (entry: "/exit to finish", exit:
-// "opencode -s <id>" to resume). These are scrollback snapshots, so they
-// become immutable terminal history once committed.
-//
-// The logo uses a cell-based renderer. cells() classifies each character
-// in the logo template as text, full-block, half-block-mix, or
-// half-block-top, and draw() renders it with foreground/background shadow
-// colors from the theme.
-import {
-  BoxRenderable,
-  type ColorInput,
-  RGBA,
-  TextAttributes,
-  TextRenderable,
-  type ScrollbackRenderContext,
-  type ScrollbackSnapshot,
-  type ScrollbackWriter,
-} from "@opentui/core"
-import { Locale } from "../../../util/locale"
-import { logo } from "../../logo"
-import type { RunEntryTheme } from "./theme"
-
-export const SPLASH_TITLE_LIMIT = 50
-export const SPLASH_TITLE_FALLBACK = "Untitled session"
-
-type SplashInput = {
-  title: string | undefined
-  session_id: string
-}
-
-type SplashWriterInput = SplashInput & {
-  theme: RunEntryTheme
-  background: ColorInput
-  showSession?: boolean
-}
-
-export type SplashMeta = {
-  title: string
-  session_id: string
-}
-
-type Cell = {
-  char: string
-  mark: "text" | "full" | "mix" | "top"
-}
-
-let id = 0
-
-function cells(line: string): Cell[] {
-  const list: Cell[] = []
-  for (const char of line) {
-    if (char === "_") {
-      list.push({ char: " ", mark: "full" })
-      continue
-    }
-
-    if (char === "^") {
-      list.push({ char: "▀", mark: "mix" })
-      continue
-    }
-
-    if (char === "~") {
-      list.push({ char: "▀", mark: "top" })
-      continue
-    }
-
-    list.push({ char, mark: "text" })
-  }
-
-  return list
-}
-
-function title(text: string | undefined): string {
-  if (!text) {
-    return SPLASH_TITLE_FALLBACK
-  }
-
-  if (!text.trim()) {
-    return SPLASH_TITLE_FALLBACK
-  }
-
-  return Locale.truncate(text.trim(), SPLASH_TITLE_LIMIT)
-}
-
-function write(
-  root: BoxRenderable,
-  ctx: ScrollbackRenderContext,
-  line: {
-    left: number
-    top: number
-    text: string
-    fg: ColorInput
-    bg?: ColorInput
-    attrs?: number
-  },
-): void {
-  if (line.left >= ctx.width) {
-    return
-  }
-
-  root.add(
-    new TextRenderable(ctx.renderContext, {
-      id: `run-direct-splash-line-${id++}`,
-      position: "absolute",
-      left: line.left,
-      top: line.top,
-      width: Math.max(1, ctx.width - line.left),
-      height: 1,
-      wrapMode: "none",
-      content: line.text,
-      fg: line.fg,
-      bg: line.bg,
-      attributes: line.attrs,
-    }),
-  )
-}
-
-function push(
-  lines: Array<{ left: number; top: number; text: string; fg: ColorInput; bg?: ColorInput; attrs?: number }>,
-  left: number,
-  top: number,
-  text: string,
-  fg: ColorInput,
-  bg?: ColorInput,
-  attrs?: number,
-): void {
-  lines.push({ left, top, text, fg, bg, attrs })
-}
-
-function color(input: ColorInput, fallback: RGBA): RGBA {
-  if (input instanceof RGBA) {
-    return input
-  }
-
-  if (typeof input === "string") {
-    if (input === "transparent" || input === "none") {
-      return RGBA.fromValues(0, 0, 0, 0)
-    }
-
-    if (input.startsWith("#")) {
-      return RGBA.fromHex(input)
-    }
-  }
-
-  return fallback
-}
-
-function shade(base: RGBA, overlay: RGBA, alpha: number): RGBA {
-  const r = base.r + (overlay.r - base.r) * alpha
-  const g = base.g + (overlay.g - base.g) * alpha
-  const b = base.b + (overlay.b - base.b) * alpha
-  return RGBA.fromInts(Math.round(r * 255), Math.round(g * 255), Math.round(b * 255))
-}
-
-function draw(
-  lines: Array<{ left: number; top: number; text: string; fg: ColorInput; bg?: ColorInput; attrs?: number }>,
-  row: string,
-  input: {
-    left: number
-    top: number
-    fg: ColorInput
-    shadow: ColorInput
-    attrs?: number
-  },
-) {
-  let x = input.left
-  for (const cell of cells(row)) {
-    if (cell.mark === "full") {
-      push(lines, x, input.top, cell.char, input.fg, input.shadow, input.attrs)
-      x += 1
-      continue
-    }
-
-    if (cell.mark === "mix") {
-      push(lines, x, input.top, cell.char, input.fg, input.shadow, input.attrs)
-      x += 1
-      continue
-    }
-
-    if (cell.mark === "top") {
-      push(lines, x, input.top, cell.char, input.shadow, undefined, input.attrs)
-      x += 1
-      continue
-    }
-
-    push(lines, x, input.top, cell.char, input.fg, undefined, input.attrs)
-    x += 1
-  }
-}
-
-function build(input: SplashWriterInput, kind: "entry" | "exit", ctx: ScrollbackRenderContext): ScrollbackSnapshot {
-  const width = Math.max(1, ctx.width)
-  const meta = splashMeta(input)
-  const lines: Array<{ left: number; top: number; text: string; fg: ColorInput; bg?: ColorInput; attrs?: number }> = []
-  const bg = color(input.background, RGBA.fromValues(0, 0, 0, 0))
-  const left = color(input.theme.system.body, RGBA.fromInts(100, 116, 139))
-  const right = color(input.theme.assistant.body, RGBA.fromInts(248, 250, 252))
-  const leftShadow = shade(bg, left, 0.25)
-  const rightShadow = shade(bg, right, 0.25)
-  let y = 0
-
-  for (let i = 0; i < logo.left.length; i += 1) {
-    const leftText = logo.left[i] ?? ""
-    const rightText = logo.right[i] ?? ""
-
-    draw(lines, leftText, {
-      left: 0,
-      top: y,
-      fg: left,
-      shadow: leftShadow,
-    })
-    draw(lines, rightText, {
-      left: leftText.length + 1,
-      top: y,
-      fg: right,
-      shadow: rightShadow,
-      attrs: TextAttributes.BOLD,
-    })
-    y += 1
-  }
-
-  y += 1
-
-  if (input.showSession !== false) {
-    const label = "Session".padEnd(10, " ")
-    push(lines, 0, y, label, input.theme.system.body, undefined, TextAttributes.DIM)
-    push(lines, label.length, y, meta.title, input.theme.assistant.body, undefined, TextAttributes.BOLD)
-    y += 1
-  }
-
-  if (kind === "entry") {
-    push(lines, 0, y, "Type /exit or /quit to finish.", input.theme.system.body, undefined, undefined)
-    y += 1
-  }
-
-  if (kind === "exit") {
-    const next = "Continue".padEnd(10, " ")
-    push(lines, 0, y, next, input.theme.system.body, undefined, TextAttributes.DIM)
-    push(
-      lines,
-      next.length,
-      y,
-      `opencode -s ${meta.session_id}`,
-      input.theme.assistant.body,
-      undefined,
-      TextAttributes.BOLD,
-    )
-    y += 1
-  }
-
-  const height = Math.max(1, y)
-  const root = new BoxRenderable(ctx.renderContext, {
-    id: `run-direct-splash-${kind}-${id++}`,
-    position: "absolute",
-    left: 0,
-    top: 0,
-    width,
-    height,
-  })
-
-  for (const line of lines) {
-    write(root, ctx, line)
-  }
-
-  return {
-    root,
-    width,
-    height,
-    rowColumns: width,
-    startOnNewLine: true,
-    trailingNewline: false,
-  }
-}
-
-export function splashMeta(input: SplashInput): SplashMeta {
-  return {
-    title: title(input.title),
-    session_id: input.session_id,
-  }
-}
-
-export function entrySplash(input: SplashWriterInput): ScrollbackWriter {
-  return (ctx) => build(input, "entry", ctx)
-}
-
-export function exitSplash(input: SplashWriterInput): ScrollbackWriter {
-  return (ctx) => build(input, "exit", ctx)
-}
@@ -1,376 +0,0 @@
-// SDK event subscription and prompt turn coordination.
-//
-// Creates a long-lived event stream subscription and feeds every event
-// through the session-data reducer. The reducer produces scrollback commits
-// and footer patches, which get forwarded to the footer through stream.ts.
-//
-// Prompt turns are one-at-a-time: runPromptTurn() sends the prompt to the
-// SDK, arms a deferred Wait, and resolves when a session.status idle event
-// arrives for this session. If the turn is aborted (user interrupt), it
-// flushes any in-progress parts as interrupted entries.
-//
-// The tick counter prevents stale idle events from resolving the wrong turn
-// -- each turn gets a monotonically increasing tick, and idle events only
-// resolve the wait if the tick matches.
-import type { Event, OpencodeClient } from "@opencode-ai/sdk/v2"
-import { createSessionData, flushInterrupted, reduceSessionData } from "./session-data"
-import { writeSessionOutput } from "./stream"
-import type { FooterApi, RunFilePart, RunInput, StreamCommit } from "./types"
-
-type Trace = {
-  write(type: string, data?: unknown): void
-}
-
-type StreamInput = {
-  sdk: OpencodeClient
-  sessionID: string
-  thinking: boolean
-  limits: () => Record<string, number>
-  footer: FooterApi
-  trace?: Trace
-  signal?: AbortSignal
-}
-
-type Wait = {
-  tick: number
-  armed: boolean
-  done: Promise<void>
-  resolve: () => void
-  reject: (error: unknown) => void
-}
-
-export type SessionTurnInput = {
-  agent: string | undefined
-  model: RunInput["model"]
-  variant: string | undefined
-  prompt: string
-  files: RunFilePart[]
-  includeFiles: boolean
-  signal?: AbortSignal
-}
-
-export type SessionTransport = {
-  runPromptTurn(input: SessionTurnInput): Promise<void>
-  close(): Promise<void>
-}
-
-// Creates a deferred promise tied to a specific turn tick.
-function defer(tick: number): Wait {
-  let resolve: () => void = () => {}
-  let reject: (error: unknown) => void = () => {}
-  const done = new Promise<void>((next, fail) => {
-    resolve = next
-    reject = fail
-  })
-
-  return {
-    tick,
-    armed: false,
-    done,
-    resolve,
-    reject,
-  }
-}
-
-// Races the turn's deferred promise against an abort signal.
-function waitTurn(done: Promise<void>, signal: AbortSignal): Promise<"idle" | "abort"> {
-  return new Promise((resolve, reject) => {
-    if (signal.aborted) {
-      resolve("abort")
-      return
-    }
-
-    const onAbort = () => {
-      signal.removeEventListener("abort", onAbort)
-      resolve("abort")
-    }
-
-    signal.addEventListener("abort", onAbort, { once: true })
-    done.then(
-      () => {
-        signal.removeEventListener("abort", onAbort)
-        resolve("idle")
-      },
-      (error) => {
-        signal.removeEventListener("abort", onAbort)
-        reject(error)
-      },
-    )
-  })
-}
-
-export function formatUnknownError(error: unknown): string {
-  if (typeof error === "string") {
-    return error
-  }
-
-  if (error instanceof Error) {
-    return error.message || error.name
-  }
-
-  if (error && typeof error === "object") {
-    const value = error as { message?: unknown; name?: unknown }
-    if (typeof value.message === "string" && value.message.trim()) {
-      return value.message
-    }
-
-    if (typeof value.name === "string" && value.name.trim()) {
-      return value.name
-    }
-  }
-
-  return "unknown error"
-}
-
-// Opens an SDK event subscription and returns a SessionTransport.
-//
-// The background `watch` loop consumes every SDK event, runs it through the
-// reducer, and writes output to the footer. When a session.status idle
-// event arrives, it resolves the current turn's Wait so runPromptTurn()
-// can return.
-//
-// The transport is single-turn: only one runPromptTurn() call can be active
-// at a time. The prompt queue enforces this from above.
-export async function createSessionTransport(input: StreamInput): Promise<SessionTransport> {
-  const abort = new AbortController()
-  const halt = () => {
-    abort.abort()
-  }
-  input.signal?.addEventListener("abort", halt, { once: true })
-
-  const events = await input.sdk.event.subscribe(undefined, {
-    signal: abort.signal,
-  })
-  input.trace?.write("recv.subscribe", {
-    sessionID: input.sessionID,
-  })
-
-  const closeStream = () => {
-    // Pass undefined explicitly so TS accepts AsyncGenerator.return().
-    void events.stream.return(undefined).catch(() => {})
-  }
-
-  let data = createSessionData()
-  let wait: Wait | undefined
-  let tick = 0
-  let fault: unknown
-  let closed = false
-
-  const fail = (error: unknown) => {
-    if (fault) {
-      return
-    }
-
-    fault = error
-    const next = wait
-    wait = undefined
-    next?.reject(error)
-  }
-
-  const mark = (event: Event) => {
-    if (
-      event.type !== "session.status" ||
-      event.properties.sessionID !== input.sessionID ||
-      event.properties.status.type !== "idle"
-    ) {
-      return
-    }
-
-    const next = wait
-    if (!next || !next.armed) {
-      return
-    }
-
-    tick = next.tick + 1
-    wait = undefined
-    next.resolve()
-  }
-
-  const flush = (type: "turn.abort" | "turn.cancel") => {
-    const commits: StreamCommit[] = []
-    flushInterrupted(data, commits)
-    writeSessionOutput(
-      {
-        footer: input.footer,
-        trace: input.trace,
-      },
-      {
-        data,
-        commits,
-      },
-    )
-    input.trace?.write(type, {
-      sessionID: input.sessionID,
-    })
-  }
-
-  const watch = (async () => {
-    try {
-      for await (const item of events.stream) {
-        if (input.footer.isClosed) {
-          break
-        }
-
-        const event = item as Event
-        input.trace?.write("recv.event", event)
-        const next = reduceSessionData({
-          data,
-          event,
-          sessionID: input.sessionID,
-          thinking: input.thinking,
-          limits: input.limits(),
-        })
-        data = next.data
-
-        if (next.commits.length > 0 || next.footer?.patch || next.footer?.view) {
-          input.trace?.write("reduce.output", {
-            commits: next.commits,
-            footer: next.footer,
-          })
-        }
-
-        writeSessionOutput(
-          {
-            footer: input.footer,
-            trace: input.trace,
-          },
-          next,
-        )
-
-        mark(event)
-      }
-    } catch (error) {
-      if (!abort.signal.aborted) {
-        fail(error)
-      }
-    } finally {
-      if (!abort.signal.aborted && !fault) {
-        fail(new Error("session event stream closed"))
-      }
-      closeStream()
-    }
-  })()
-
-  const runPromptTurn = async (next: SessionTurnInput): Promise<void> => {
-    if (next.signal?.aborted || input.footer.isClosed) {
-      return
-    }
-
-    if (fault) {
-      throw fault
-    }
-
-    if (wait) {
-      throw new Error("prompt already running")
-    }
-
-    const item = defer(tick)
-    wait = item
-    data.announced = false
-
-    const turn = new AbortController()
-    const stop = () => {
-      turn.abort()
-    }
-    next.signal?.addEventListener("abort", stop, { once: true })
-    abort.signal.addEventListener("abort", stop, { once: true })
-
-    try {
-      const req = {
-        sessionID: input.sessionID,
-        agent: next.agent,
-        model: next.model,
-        variant: next.variant,
-        parts: [...(next.includeFiles ? next.files : []), { type: "text" as const, text: next.prompt }],
-      }
-      input.trace?.write("send.prompt", req)
-      await input.sdk.session.prompt(req, {
-        signal: turn.signal,
-      })
-      input.trace?.write("send.prompt.ok", {
-        sessionID: input.sessionID,
-      })
-
-      item.armed = true
-
-      if (turn.signal.aborted || next.signal?.aborted || input.footer.isClosed) {
-        if (wait === item) {
-          wait = undefined
-        }
-        flush("turn.abort")
-        return
-      }
-
-      if (!input.footer.isClosed && !data.announced) {
-        input.trace?.write("ui.patch", {
-          phase: "running",
-          status: "waiting for assistant",
-        })
-        input.footer.event({
-          type: "turn.wait",
-        })
-      }
-
-      if (tick > item.tick) {
-        if (wait === item) {
-          wait = undefined
-        }
-        return
-      }
-
-      const state = await waitTurn(item.done, turn.signal)
-      if (wait === item) {
-        wait = undefined
-      }
-
-      if (state === "abort") {
-        flush("turn.abort")
-      }
-
-      return
-    } catch (error) {
-      if (wait === item) {
-        wait = undefined
-      }
-
-      const canceled = turn.signal.aborted || next.signal?.aborted === true || input.footer.isClosed
-      if (canceled) {
-        flush("turn.cancel")
-        return
-      }
-
-      if (error === fault) {
-        throw error
-      }
-
-      input.trace?.write("send.prompt.error", {
-        sessionID: input.sessionID,
-        error: formatUnknownError(error),
-      })
-      throw error
-    } finally {
-      input.trace?.write("turn.end", {
-        sessionID: input.sessionID,
-      })
-      next.signal?.removeEventListener("abort", stop)
-      abort.signal.removeEventListener("abort", stop)
-    }
-  }
-
-  const close = async () => {
-    if (closed) {
-      return
-    }
-
-    closed = true
-    input.signal?.removeEventListener("abort", halt)
-    abort.abort()
-    closeStream()
-    await watch.catch(() => {})
-  }
-
-  return {
-    runPromptTurn,
-    close,
-  }
-}
@@ -1,59 +0,0 @@
-// Thin bridge between the session-data reducer output and the footer API.
-//
-// The reducer produces StreamCommit[] and an optional FooterOutput (patch +
-// view change). This module forwards them to footer.append() and
-// footer.event() respectively, adding trace writes along the way. It also
-// defaults status updates to phase "running" if the caller didn't set a
-// phase -- a convenience so reducer code doesn't have to repeat that.
-import type { FooterApi, FooterPatch } from "./types"
-import type { SessionDataOutput } from "./session-data"
-
-type Trace = {
-  write(type: string, data?: unknown): void
-}
-
-type OutputInput = {
-  footer: FooterApi
-  trace?: Trace
-}
-
-// Default to "running" phase when a status string arrives without an explicit phase.
-function patch(next: FooterPatch): FooterPatch {
-  if (typeof next.status === "string" && next.phase === undefined) {
-    return {
-      phase: "running",
-      ...next,
-    }
-  }
-
-  return next
-}
-
-// Forwards reducer output to the footer: commits go to scrollback, patches update the status bar.
-export function writeSessionOutput(input: OutputInput, out: SessionDataOutput): void {
-  for (const commit of out.commits) {
-    input.trace?.write("ui.commit", commit)
-    input.footer.append(commit)
-  }
-
-  if (out.footer?.patch) {
-    const next = patch(out.footer.patch)
-    input.trace?.write("ui.patch", next)
-    input.footer.event({
-      type: "stream.patch",
-      patch: next,
-    })
-  }
-
-  if (!out.footer?.view) {
-    return
-  }
-
-  input.trace?.write("ui.patch", {
-    view: out.footer.view,
-  })
-  input.footer.event({
-    type: "stream.view",
-    view: out.footer.view,
-  })
-}
@@ -1,232 +0,0 @@
-// Theme resolution for direct interactive mode.
-//
-// Derives scrollback and footer colors from the terminal's actual palette.
-// resolveRunTheme() queries the renderer for the terminal's 16-color palette,
-// detects dark/light mode, and maps through the TUI's theme system to produce
-// a RunTheme. Falls back to a hardcoded dark-mode palette if detection fails.
-//
-// The theme has three parts:
-//   entry  → per-EntryKind colors for plain scrollback text
-//   footer → highlight, muted, text, surface, and line colors for the footer
-//   block  → richer text/syntax/diff colors for static tool snapshots
-import { RGBA, SyntaxStyle, type CliRenderer, type ColorInput } from "@opentui/core"
-import type { TuiThemeCurrent } from "@opencode-ai/plugin/tui"
-import type { EntryKind } from "./types"
-
-type Tone = {
-  body: ColorInput
-  start?: ColorInput
-}
-
-export type RunEntryTheme = Record<EntryKind, Tone>
-
-export type RunFooterTheme = {
-  highlight: ColorInput
-  warning: ColorInput
-  success: ColorInput
-  error: ColorInput
-  muted: ColorInput
-  text: ColorInput
-  surface: ColorInput
-  pane: ColorInput
-  line: ColorInput
-}
-
-export type RunBlockTheme = {
-  text: ColorInput
-  muted: ColorInput
-  syntax?: SyntaxStyle
-  diffAdded: ColorInput
-  diffRemoved: ColorInput
-  diffAddedBg: ColorInput
-  diffRemovedBg: ColorInput
-  diffContextBg: ColorInput
-  diffHighlightAdded: ColorInput
-  diffHighlightRemoved: ColorInput
-  diffLineNumber: ColorInput
-  diffAddedLineNumberBg: ColorInput
-  diffRemovedLineNumberBg: ColorInput
-}
-
-export type RunTheme = {
-  background: ColorInput
-  footer: RunFooterTheme
-  entry: RunEntryTheme
-  block: RunBlockTheme
-}
-
-export const transparent = RGBA.fromValues(0, 0, 0, 0)
-
-function alpha(color: RGBA, value: number): RGBA {
-  const a = Math.max(0, Math.min(1, value))
-  return RGBA.fromValues(color.r, color.g, color.b, a)
-}
-
-function rgba(hex: string, value?: number): RGBA {
-  const color = RGBA.fromHex(hex)
-  if (value === undefined) {
-    return color
-  }
-
-  return alpha(color, value)
-}
-
-function mode(bg: RGBA): "dark" | "light" {
-  const lum = 0.299 * bg.r + 0.587 * bg.g + 0.114 * bg.b
-  if (lum > 0.5) {
-    return "light"
-  }
-
-  return "dark"
-}
-
-function fade(color: RGBA, base: RGBA, fallback: number, scale: number, limit: number): RGBA {
-  if (color.a === 0) {
-    return alpha(color, fallback)
-  }
-
-  const target = Math.min(limit, color.a * scale)
-  const mix = Math.min(1, target / color.a)
-
-  return RGBA.fromValues(
-    base.r + (color.r - base.r) * mix,
-    base.g + (color.g - base.g) * mix,
-    base.b + (color.b - base.b) * mix,
-    color.a,
-  )
-}
-
-function map(theme: TuiThemeCurrent, syntax?: SyntaxStyle): RunTheme {
-  const bg = theme.background
-  const pane = theme.backgroundElement
-  const surface = fade(pane, bg, 0.18, 0.76, 0.9)
-  const line = fade(pane, bg, 0.24, 0.9, 0.98)
-
-  return {
-    background: theme.background,
-    footer: {
-      highlight: theme.primary,
-      warning: theme.warning,
-      success: theme.success,
-      error: theme.error,
-      muted: theme.textMuted,
-      text: theme.text,
-      surface,
-      pane,
-      line,
-    },
-    entry: {
-      system: {
-        body: theme.textMuted,
-      },
-      user: {
-        body: theme.primary,
-      },
-      assistant: {
-        body: theme.text,
-      },
-      reasoning: {
-        body: theme.textMuted,
-      },
-      tool: {
-        body: theme.text,
-        start: theme.textMuted,
-      },
-      error: {
-        body: theme.error,
-      },
-    },
-    block: {
-      text: theme.text,
-      muted: theme.textMuted,
-      syntax,
-      diffAdded: theme.diffAdded,
-      diffRemoved: theme.diffRemoved,
-      diffAddedBg: theme.diffAddedBg,
-      diffRemovedBg: theme.diffRemovedBg,
-      diffContextBg: theme.diffContextBg,
-      diffHighlightAdded: theme.diffHighlightAdded,
-      diffHighlightRemoved: theme.diffHighlightRemoved,
-      diffLineNumber: theme.diffLineNumber,
-      diffAddedLineNumberBg: theme.diffAddedLineNumberBg,
-      diffRemovedLineNumberBg: theme.diffRemovedLineNumberBg,
-    },
-  }
-}
-
-const seed = {
-  highlight: rgba("#38bdf8"),
-  muted: rgba("#64748b"),
-  text: rgba("#f8fafc"),
-  panel: rgba("#0f172a"),
-  success: rgba("#22c55e"),
-  warning: rgba("#f59e0b"),
-  error: rgba("#ef4444"),
-}
-
-function tone(body: ColorInput, start?: ColorInput): Tone {
-  return {
-    body,
-    start,
-  }
-}
-
-export const RUN_THEME_FALLBACK: RunTheme = {
-  background: RGBA.fromValues(0, 0, 0, 0),
-  footer: {
-    highlight: seed.highlight,
-    warning: seed.warning,
-    success: seed.success,
-    error: seed.error,
-    muted: seed.muted,
-    text: seed.text,
-    surface: alpha(seed.panel, 0.86),
-    pane: seed.panel,
-    line: alpha(seed.panel, 0.96),
-  },
-  entry: {
-    system: tone(seed.muted),
-    user: tone(seed.highlight),
-    assistant: tone(seed.text),
-    reasoning: tone(seed.muted),
-    tool: tone(seed.text, seed.muted),
-    error: tone(seed.error),
-  },
-  block: {
-    text: seed.text,
-    muted: seed.muted,
-    diffAdded: seed.success,
-    diffRemoved: seed.error,
-    diffAddedBg: alpha(seed.success, 0.18),
-    diffRemovedBg: alpha(seed.error, 0.18),
-    diffContextBg: alpha(seed.panel, 0.72),
-    diffHighlightAdded: seed.success,
-    diffHighlightRemoved: seed.error,
-    diffLineNumber: seed.muted,
-    diffAddedLineNumberBg: alpha(seed.success, 0.12),
-    diffRemovedLineNumberBg: alpha(seed.error, 0.12),
-  },
-}
-
-export async function resolveRunTheme(renderer: CliRenderer): Promise<RunTheme> {
-  try {
-    const colors = await renderer.getPalette({
-      size: 16,
-    })
-    const bg = colors.defaultBackground ?? colors.palette[0]
-    if (!bg) {
-      return RUN_THEME_FALLBACK
-    }
-
-    const pick = renderer.themeMode ?? mode(RGBA.fromHex(bg))
-    const mod = await import("../tui/context/theme")
-    const theme = mod.resolveTheme(mod.generateSystem(colors, pick), pick) as TuiThemeCurrent
-    try {
-      return map(theme, mod.generateSyntax(theme))
-    } catch {
-      return map(theme)
-    }
-  } catch {
-    return RUN_THEME_FALLBACK
-  }
-}
@@ -1,94 +0,0 @@
-// Dev-only JSONL event trace for direct interactive mode.
-//
-// Enable with OPENCODE_DIRECT_TRACE=1. Writes one JSON line per event to
-// ~/.local/share/opencode/log/direct/<timestamp>-<pid>.jsonl. Also writes
-// a latest.json pointer so you can quickly find the most recent trace.
-//
-// The trace captures the full closed loop: outbound prompts, inbound SDK
-// events, reducer output, footer commits, and turn lifecycle markers.
-// Useful for debugging stream ordering, permission behavior, and
-// footer/transcript mismatches.
-//
-// Lazy-initialized: the first call to trace() decides whether tracing is
-// active based on the env var, and subsequent calls return the cached result.
-import fs from "fs"
-import path from "path"
-import { Global } from "../../../global"
-
-export type Trace = {
-  write(type: string, data?: unknown): void
-}
-
-let state: Trace | false | undefined
-
-function stamp() {
-  return new Date()
-    .toISOString()
-    .replace(/[-:]/g, "")
-    .replace(/\.\d+Z$/, "Z")
-}
-
-function file() {
-  return path.join(Global.Path.log, "direct", `${stamp()}-${process.pid}.jsonl`)
-}
-
-function latest() {
-  return path.join(Global.Path.log, "direct", "latest.json")
-}
-
-function text(data: unknown) {
-  return JSON.stringify(
-    data,
-    (_key, value) => {
-      if (typeof value === "bigint") {
-        return String(value)
-      }
-
-      return value
-    },
-    0,
-  )
-}
-
-export function trace() {
-  if (state !== undefined) {
-    return state || undefined
-  }
-
-  if (!process.env.OPENCODE_DIRECT_TRACE) {
-    state = false
-    return
-  }
-
-  const target = file()
-  fs.mkdirSync(path.dirname(target), { recursive: true })
-  fs.writeFileSync(
-    latest(),
-    text({
-      time: new Date().toISOString(),
-      pid: process.pid,
-      cwd: process.cwd(),
-      argv: process.argv.slice(2),
-      path: target,
-    }) + "\n",
-  )
-  state = {
-    write(type: string, data?: unknown) {
-      fs.appendFileSync(
-        target,
-        text({
-          time: new Date().toISOString(),
-          pid: process.pid,
-          type,
-          data,
-        }) + "\n",
-      )
-    },
-  }
-  state.write("trace.start", {
-    argv: process.argv.slice(2),
-    cwd: process.cwd(),
-    path: target,
-  })
-  return state
-}
@@ -1,180 +0,0 @@
-// Shared type vocabulary for the direct interactive mode (`run --interactive`).
-//
-// Direct mode uses a split-footer terminal layout: immutable scrollback for the
-// session transcript, and a mutable footer for prompt input, status, and
-// permission/question UI. Every module in run/* shares these types to stay
-// aligned on that two-lane model.
-//
-// Data flow through the system:
-//
-//   SDK events → session-data reducer → StreamCommit[] + FooterOutput
-//     → stream.ts bridges to footer API
-//       → footer.ts queues commits and patches the footer view
-//         → OpenTUI split-footer renderer writes to terminal
-import type { OpencodeClient, PermissionRequest, QuestionRequest, ToolPart } from "@opencode-ai/sdk/v2"
-
-export type RunFilePart = {
-  type: "file"
-  url: string
-  filename: string
-  mime: string
-}
-
-type PromptModel = Parameters<OpencodeClient["session"]["prompt"]>[0]["model"]
-
-export type RunInput = {
-  sdk: OpencodeClient
-  sessionID: string
-  sessionTitle?: string
-  resume?: boolean
-  agent: string | undefined
-  model: PromptModel | undefined
-  variant: string | undefined
-  files: RunFilePart[]
-  initialInput?: string
-  thinking: boolean
-  demo?: RunDemo
-  demoText?: string
-}
-
-export type RunDemo = "on" | "permission" | "question" | "mix" | "text"
-
-// The semantic role of a scrollback entry. Maps 1:1 to theme colors.
-export type EntryKind = "system" | "user" | "assistant" | "reasoning" | "tool" | "error"
-
-// Whether the assistant is actively processing a turn.
-export type FooterPhase = "idle" | "running"
-
-// Full snapshot of footer status bar state. Every update replaces the whole
-// object in the SolidJS signal so the view re-renders atomically.
-export type FooterState = {
-  phase: FooterPhase
-  status: string
-  queue: number
-  model: string
-  duration: string
-  usage: string
-  first: boolean
-  interrupt: number
-  exit: number
-}
-
-// A partial update to FooterState. The footer merges this onto the current state.
-export type FooterPatch = Partial<FooterState>
-
-export type RunDiffStyle = "auto" | "stacked"
-
-export type ScrollbackOptions = {
-  diffStyle?: RunDiffStyle
-}
-
-// Which interactive surface the footer is showing. Only one view is active at
-// a time. The reducer drives transitions: when a permission arrives the view
-// switches to "permission", and when the permission resolves it falls back to
-// "prompt".
-export type FooterView =
-  | { type: "prompt" }
-  | { type: "permission"; request: PermissionRequest }
-  | { type: "question"; request: QuestionRequest }
-
-// The reducer emits this alongside scrollback commits so the footer can update in the same frame.
-export type FooterOutput = {
-  patch?: FooterPatch
-  view?: FooterView
-}
-
-// Typed messages sent to RunFooter.event(). The prompt queue and stream
-// transport both emit these to update footer state without reaching into
-// internal signals directly.
-export type FooterEvent =
-  | {
-      type: "queue"
-      queue: number
-    }
-  | {
-      type: "first"
-      first: boolean
-    }
-  | {
-      type: "model"
-      model: string
-    }
-  | {
-      type: "turn.send"
-      queue: number
-    }
-  | {
-      type: "turn.wait"
-    }
-  | {
-      type: "turn.idle"
-      queue: number
-    }
-  | {
-      type: "turn.duration"
-      duration: string
-    }
-  | {
-      type: "stream.patch"
-      patch: FooterPatch
-    }
-  | {
-      type: "stream.view"
-      view: FooterView
-    }
-
-export type PermissionReply = Parameters<OpencodeClient["permission"]["reply"]>[0]
-
-export type QuestionReply = Parameters<OpencodeClient["question"]["reply"]>[0]
-
-export type QuestionReject = Parameters<OpencodeClient["question"]["reject"]>[0]
-
-export type FooterKeybinds = {
-  leader: string
-  variantCycle: string
-  interrupt: string
-  historyPrevious: string
-  historyNext: string
-  inputSubmit: string
-  inputNewline: string
-}
-
-// Lifecycle phase of a scrollback entry. "start" opens the entry, "progress"
-// appends content (coalesced in the footer queue), "final" closes it.
-export type StreamPhase = "start" | "progress" | "final"
-
-export type StreamSource = "assistant" | "reasoning" | "tool" | "system"
-
-export type StreamToolState = "running" | "completed" | "error"
-
-// A single append-only commit to scrollback. The session-data reducer produces
-// these from SDK events, and RunFooter.append() queues them for the next
-// microtask flush. Once flushed, they become immutable terminal scrollback
-// rows -- they cannot be rewritten.
-export type StreamCommit = {
-  kind: EntryKind
-  text: string
-  phase: StreamPhase
-  source: StreamSource
-  messageID?: string
-  partID?: string
-  tool?: string
-  part?: ToolPart
-  interrupted?: boolean
-  toolState?: StreamToolState
-  toolError?: string
-}
-
-// The public contract between the stream transport / prompt queue and
-// the footer. RunFooter implements this. The transport and queue never
-// touch the renderer directly -- they go through this interface.
-export type FooterApi = {
-  readonly isClosed: boolean
-  onPrompt(fn: (text: string) => void): () => void
-  onClose(fn: () => void): () => void
-  event(next: FooterEvent): void
-  append(commit: StreamCommit): void
-  idle(): Promise<void>
-  close(): void
-  destroy(): void
-}
@@ -1,126 +0,0 @@
-// Model variant resolution and persistence.
-//
-// Variants are provider-specific reasoning effort levels (e.g., "high", "max").
-// Resolution priority: CLI --variant flag > saved preference > session history.
-//
-// The saved variant persists across sessions in ~/.local/state/opencode/model.json
-// so your last-used variant sticks. Cycling (ctrl+t) updates both the active
-// variant and the persisted file.
-import path from "path"
-import { Global } from "../../../global"
-import { Filesystem } from "../../../util/filesystem"
-import { createSession, sessionVariant, type RunSession, type SessionMessages } from "./session.shared"
-import type { RunInput } from "./types"
-
-const MODEL_FILE = path.join(Global.Path.state, "model.json")
-
-type ModelState = {
-  variant?: Record<string, string | undefined>
-}
-
-function modelKey(provider: string, model: string): string {
-  return `${provider}/${model}`
-}
-
-function variantKey(model: NonNullable<RunInput["model"]>): string {
-  return modelKey(model.providerID, model.modelID)
-}
-
-export function formatModelLabel(model: NonNullable<RunInput["model"]>, variant: string | undefined): string {
-  const label = variant ? ` · ${variant}` : ""
-  return `${model.modelID} · ${model.providerID}${label}`
-}
-
-export function cycleVariant(current: string | undefined, variants: string[]): string | undefined {
-  if (variants.length === 0) {
-    return undefined
-  }
-
-  if (!current) {
-    return variants[0]
-  }
-
-  const idx = variants.indexOf(current)
-  if (idx === -1 || idx === variants.length - 1) {
-    return undefined
-  }
-
-  return variants[idx + 1]
-}
-
-export function pickVariant(model: RunInput["model"], input: RunSession | SessionMessages): string | undefined {
-  return sessionVariant(Array.isArray(input) ? createSession(input) : input, model)
-}
-
-function fitVariant(value: string | undefined, variants: string[]): string | undefined {
-  if (!value) {
-    return undefined
-  }
-
-  if (variants.length === 0 || variants.includes(value)) {
-    return value
-  }
-
-  return undefined
-}
-
-// Picks the active variant. CLI flag wins, then saved preference, then session
-// history. fitVariant() checks saved and session values against the available
-// variants list -- if the provider doesn't offer a variant, it drops.
-export function resolveVariant(
-  input: string | undefined,
-  session: string | undefined,
-  saved: string | undefined,
-  variants: string[],
-): string | undefined {
-  if (input !== undefined) {
-    return input
-  }
-
-  const fallback = fitVariant(saved, variants)
-  const current = fitVariant(session, variants)
-  if (current !== undefined) {
-    return current
-  }
-
-  return fallback
-}
-
-export async function resolveSavedVariant(model: RunInput["model"]): Promise<string | undefined> {
-  if (!model) {
-    return undefined
-  }
-
-  try {
-    const state = await Filesystem.readJson<ModelState>(MODEL_FILE)
-    return state.variant?.[variantKey(model)]
-  } catch {
-    return undefined
-  }
-}
-
-export function saveVariant(model: RunInput["model"], variant: string | undefined): void {
-  if (!model) {
-    return
-  }
-
-  void (async () => {
-    const state = await Filesystem.readJson<ModelState>(MODEL_FILE).catch(() => ({}) as ModelState)
-    const map = {
-      ...(state.variant ?? {}),
-    }
-    const key = variantKey(model)
-    if (variant) {
-      map[key] = variant
-    }
-
-    if (!variant) {
-      delete map[key]
-    }
-
-    await Filesystem.writeJson(MODEL_FILE, {
-      ...state,
-      variant: map,
-    })
-  })().catch(() => {})
-}
@@ -36,7 +36,6 @@ import { CommandProvider, useCommandDialog } from "@tui/component/dialog-command
 import { DialogAgent } from "@tui/component/dialog-agent"
 import { DialogSessionList } from "@tui/component/dialog-session-list"
 import { DialogWorkspaceList } from "@tui/component/dialog-workspace-list"
-import { DialogConsoleOrg } from "@tui/component/dialog-console-org"
 import { KeybindProvider, useKeybind } from "@tui/context/keybind"
 import { ThemeProvider, useTheme } from "@tui/context/theme"
 import { Home } from "@tui/routes/home"
@@ -125,17 +124,14 @@ import type { EventSource } from "./context/sdk"
 import { DialogVariant } from "./component/dialog-variant"

 function rendererConfig(_config: TuiConfig.Info): CliRendererConfig {
-  const mouseEnabled = !Flag.OPENCODE_DISABLE_MOUSE && (_config.mouse ?? true)
-
  return {
    externalOutputMode: "passthrough",
    targetFps: 60,
    gatherStats: false,
    exitOnCtrlC: false,
-    useKittyKeyboard: {},
+    useKittyKeyboard: { events: process.platform === "win32" },
    autoFocus: false,
    openConsoleOnError: false,
-    useMouse: mouseEnabled,
    consoleOptions: {
      keyBindings: [{ name: "y", ctrl: true, action: "copy-selection" }],
      onCopySelection: (text) => {
@@ -255,7 +251,6 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
  const route = useRoute()
  const dimensions = useTerminalDimensions()
  const renderer = useRenderer()
-
  const dialog = useDialog()
  const local = useLocal()
  const kv = useKV()
@@ -634,23 +629,6 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
      },
      category: "Provider",
    },
-    ...(sync.data.console_state.switchableOrgCount > 1
-      ? [
-          {
-            title: "Switch org",
-            value: "console.org.switch",
-            suggested: Boolean(sync.data.console_state.activeOrgName),
-            slash: {
-              name: "org",
-              aliases: ["orgs", "switch-org"],
-            },
-            onSelect: () => {
-              dialog.replace(() => <DialogConsoleOrg />)
-            },
-            category: "Provider",
-          },
-        ]
-      : []),
    {
      title: "View status",
      keybind: "status_view",
@@ -762,7 +740,6 @@ function App(props: { onSnapshot?: () => Promise<string[]> }) {
      keybind: "terminal_suspend",
      category: "System",
      hidden: true,
-      enabled: tuiConfig.keybinds?.terminal_suspend !== "none",
      onSelect: () => {
        process.once("SIGCONT", () => {
          renderer.resume()
@@ -1,5 +1,6 @@
 import { cmd } from "../cmd"
 import { UI } from "@/cli/ui"
+import { tui } from "./app"
 import { win32DisableProcessedInput, win32InstallCtrlCGuard } from "./win32"
 import { TuiConfig } from "@/config/tui"
 import { Instance } from "@/project/instance"
@@ -69,8 +70,7 @@ export const AttachCommand = cmd({
        directory: directory && existsSync(directory) ? directory : process.cwd(),
        fn: () => TuiConfig.get(),
      })
-      const app = await import("./app")
-      await app.tui({
+      await tui({
        url: args.url,
        config,
        args: {
@@ -1,103 +0,0 @@
-import { createResource, createMemo } from "solid-js"
-import { DialogSelect } from "@tui/ui/dialog-select"
-import { useSDK } from "@tui/context/sdk"
-import { useDialog } from "@tui/ui/dialog"
-import { useToast } from "@tui/ui/toast"
-import { useTheme } from "@tui/context/theme"
-import type { ExperimentalConsoleListOrgsResponse } from "@opencode-ai/sdk/v2"
-
-type OrgOption = ExperimentalConsoleListOrgsResponse["orgs"][number]
-
-const accountHost = (url: string) => {
-  try {
-    return new URL(url).host
-  } catch {
-    return url
-  }
-}
-
-const accountLabel = (item: Pick<OrgOption, "accountEmail" | "accountUrl">) =>
-  `${item.accountEmail}  ${accountHost(item.accountUrl)}`
-
-export function DialogConsoleOrg() {
-  const sdk = useSDK()
-  const dialog = useDialog()
-  const toast = useToast()
-  const { theme } = useTheme()
-
-  const [orgs] = createResource(async () => {
-    const result = await sdk.client.experimental.console.listOrgs({}, { throwOnError: true })
-    return result.data?.orgs ?? []
-  })
-
-  const current = createMemo(() => orgs()?.find((item) => item.active))
-
-  const options = createMemo(() => {
-    const listed = orgs()
-    if (listed === undefined) {
-      return [
-        {
-          title: "Loading orgs...",
-          value: "loading",
-          onSelect: () => {},
-        },
-      ]
-    }
-
-    if (listed.length === 0) {
-      return [
-        {
-          title: "No orgs found",
-          value: "empty",
-          onSelect: () => {},
-        },
-      ]
-    }
-
-    return listed
-      .toSorted((a, b) => {
-        const activeAccountA = a.active ? 0 : 1
-        const activeAccountB = b.active ? 0 : 1
-        if (activeAccountA !== activeAccountB) return activeAccountA - activeAccountB
-
-        const accountCompare = accountLabel(a).localeCompare(accountLabel(b))
-        if (accountCompare !== 0) return accountCompare
-
-        return a.orgName.localeCompare(b.orgName)
-      })
-      .map((item) => ({
-        title: item.orgName,
-        value: item,
-        category: accountLabel(item),
-        categoryView: (
-          <box flexDirection="row" gap={2}>
-            <text fg={theme.accent}>{item.accountEmail}</text>
-            <text fg={theme.textMuted}>{accountHost(item.accountUrl)}</text>
-          </box>
-        ),
-        onSelect: async () => {
-          if (item.active) {
-            dialog.clear()
-            return
-          }
-
-          await sdk.client.experimental.console.switchOrg(
-            {
-              accountID: item.accountID,
-              orgID: item.orgID,
-            },
-            { throwOnError: true },
-          )
-
-          await sdk.client.instance.dispose()
-          toast.show({
-            message: `Switched to ${item.orgName}`,
-            variant: "info",
-          })
-          dialog.clear()
-        },
-      }))
-  })
-
-  return <DialogSelect<string | OrgOption> title="Switch org" options={options()} current={current()} />
-}
@@ -8,7 +8,6 @@ import { createDialogProviderOptions, DialogProvider } from "./dialog-provider"
 import { DialogVariant } from "./dialog-variant"
 import { useKeybind } from "../context/keybind"
 import * as fuzzysort from "fuzzysort"
-import { consoleManagedProviderLabel } from "@tui/util/provider-origin"

 export function useConnected() {
  const sync = useSync()
@@ -47,11 +46,7 @@ export function DialogModel(props: { providerID?: string }) {
            key: item,
            value: { providerID: provider.id, modelID: model.id },
            title: model.name ?? item.modelID,
-            description: consoleManagedProviderLabel(
-              sync.data.console_state.consoleManagedProviders,
-              provider.id,
-              provider.name,
-            ),
+            description: provider.name,
            category,
            disabled: provider.id === "opencode" && model.id.includes("-nano"),
            footer: model.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
@@ -89,9 +84,7 @@ export function DialogModel(props: { providerID?: string }) {
            description: favorites.some((item) => item.providerID === provider.id && item.modelID === model)
              ? "(Favorite)"
              : undefined,
-            category: connected()
-              ? consoleManagedProviderLabel(sync.data.console_state.consoleManagedProviders, provider.id, provider.name)
-              : undefined,
+            category: connected() ? provider.name : undefined,
            disabled: provider.id === "opencode" && model.includes("-nano"),
            footer: info.cost?.input === 0 && provider.id === "opencode" ? "Free" : undefined,
            onSelect() {
@@ -139,11 +132,7 @@ export function DialogModel(props: { providerID?: string }) {
    props.providerID ? sync.data.provider.find((x) => x.id === props.providerID) : null,
  )

-  const title = createMemo(() => {
-    const value = provider()
-    if (!value) return "Select model"
-    return consoleManagedProviderLabel(sync.data.console_state.consoleManagedProviders, value.id, value.name)
-  })
+  const title = createMemo(() => provider()?.name ?? "Select model")

  function onSelect(providerID: string, modelID: string) {
    local.model.set({ providerID, modelID }, { recent: true })
@@ -13,7 +13,6 @@ import { DialogModel } from "./dialog-model"
 import { useKeyboard } from "@opentui/solid"
 import { Clipboard } from "@tui/util/clipboard"
 import { useToast } from "../ui/toast"
-import { CONSOLE_MANAGED_ICON, isConsoleManagedProvider } from "@tui/util/provider-origin"

 const PROVIDER_PRIORITY: Record<string, number> = {
  opencode: 0,
@@ -29,119 +28,87 @@ export function createDialogProviderOptions() {
  const dialog = useDialog()
  const sdk = useSDK()
  const toast = useToast()
-  const { theme } = useTheme()
  const options = createMemo(() => {
    return pipe(
      sync.data.provider_next.all,
      sortBy((x) => PROVIDER_PRIORITY[x.id] ?? 99),
-      map((provider) => {
-        const consoleManaged = isConsoleManagedProvider(sync.data.console_state.consoleManagedProviders, provider.id)
-        const connected = sync.data.provider_next.connected.includes(provider.id)
-
-        return {
-          title: provider.name,
-          value: provider.id,
-          description: {
-            opencode: "(Recommended)",
-            anthropic: "(API key)",
-            openai: "(ChatGPT Plus/Pro or API key)",
-            "opencode-go": "Low cost subscription for everyone",
-          }[provider.id],
-          footer: consoleManaged ? sync.data.console_state.activeOrgName : undefined,
-          category: provider.id in PROVIDER_PRIORITY ? "Popular" : "Other",
-          gutter: consoleManaged ? (
-            <text fg={theme.textMuted}>{CONSOLE_MANAGED_ICON}</text>
-          ) : connected ? (
-            <text fg={theme.success}>✓</text>
-          ) : undefined,
-          async onSelect() {
-            if (consoleManaged) return
-
-            const methods = sync.data.provider_auth[provider.id] ?? [
-              {
-                type: "api",
-                label: "API key",
-              },
-            ]
-            let index: number | null = 0
-            if (methods.length > 1) {
-              index = await new Promise<number | null>((resolve) => {
-                dialog.replace(
-                  () => (
-                    <DialogSelect
-                      title="Select auth method"
-                      options={methods.map((x, index) => ({
-                        title: x.label,
-                        value: index,
-                      }))}
-                      onSelect={(option) => resolve(option.value)}
-                    />
-                  ),
-                  () => resolve(null),
-                )
-              })
-            }
-            if (index == null) return
-            const method = methods[index]
-            if (method.type === "oauth") {
-              let inputs: Record<string, string> | undefined
-              if (method.prompts?.length) {
-                const value = await PromptsMethod({
-                  dialog,
-                  prompts: method.prompts,
-                })
-                if (!value) return
-                inputs = value
-              }
-
-              const result = await sdk.client.provider.oauth.authorize({
-                providerID: provider.id,
-                method: index,
-                inputs,
-              })
-              if (result.error) {
-                toast.show({
-                  variant: "error",
-                  message: JSON.stringify(result.error),
-                })
-                dialog.clear()
-                return
-              }
-              if (result.data?.method === "code") {
-                dialog.replace(() => (
-                  <CodeMethod
-                    providerID={provider.id}
-                    title={method.label}
-                    index={index}
-                    authorization={result.data!}
+      map((provider) => ({
+        title: provider.name,
+        value: provider.id,
+        description: {
+          opencode: "(Recommended)",
+          anthropic: "(API key)",
+          openai: "(ChatGPT Plus/Pro or API key)",
+          "opencode-go": "Low cost subscription for everyone",
+        }[provider.id],
+        category: provider.id in PROVIDER_PRIORITY ? "Popular" : "Other",
+        async onSelect() {
+          const methods = sync.data.provider_auth[provider.id] ?? [
+            {
+              type: "api",
+              label: "API key",
+            },
+          ]
+          let index: number | null = 0
+          if (methods.length > 1) {
+            index = await new Promise<number | null>((resolve) => {
+              dialog.replace(
+                () => (
+                  <DialogSelect
+                    title="Select auth method"
+                    options={methods.map((x, index) => ({
+                      title: x.label,
+                      value: index,
+                    }))}
+                    onSelect={(option) => resolve(option.value)}
                  />
-                ))
-              }
-              if (result.data?.method === "auto") {
-                dialog.replace(() => (
-                  <AutoMethod
-                    providerID={provider.id}
-                    title={method.label}
-                    index={index}
-                    authorization={result.data!}
-                  />
-                ))
-              }
+                ),
+                () => resolve(null),
+              )
+            })
+          }
+          if (index == null) return
+          const method = methods[index]
+          if (method.type === "oauth") {
+            let inputs: Record<string, string> | undefined
+            if (method.prompts?.length) {
+              const value = await PromptsMethod({
+                dialog,
+                prompts: method.prompts,
+              })
+              if (!value) return
+              inputs = value
            }
-            if (method.type === "api") {
-              let metadata: Record<string, string> | undefined
-              if (method.prompts?.length) {
-                const value = await PromptsMethod({ dialog, prompts: method.prompts })
-                if (!value) return
-                metadata = value
-              }
-              return dialog.replace(() => (
-                <ApiMethod providerID={provider.id} title={method.label} metadata={metadata} />
+
+            const result = await sdk.client.provider.oauth.authorize({
+              providerID: provider.id,
+              method: index,
+              inputs,
+            })
+            if (result.error) {
+              toast.show({
+                variant: "error",
+                message: JSON.stringify(result.error),
+              })
+              dialog.clear()
+              return
+            }
+            if (result.data?.method === "code") {
+              dialog.replace(() => (
+                <CodeMethod providerID={provider.id} title={method.label} index={index} authorization={result.data!} />
              ))
            }
-          },
-        }
-      }),
+            if (result.data?.method === "auto") {
+              dialog.replace(() => (
+                <AutoMethod providerID={provider.id} title={method.label} index={index} authorization={result.data!} />
+              ))
+            }
+          }
+          if (method.type === "api") {
+            return dialog.replace(() => <ApiMethod providerID={provider.id} title={method.label} />)
+          }
+        },
+      })),
    )
  })
  return options
@@ -257,7 +224,6 @@ function CodeMethod(props: CodeMethodProps) {
 interface ApiMethodProps {
  providerID: string
  title: string
-  metadata?: Record<string, string>
 }
 function ApiMethod(props: ApiMethodProps) {
  const dialog = useDialog()
@@ -302,7 +268,6 @@ function ApiMethod(props: ApiMethodProps) {
          auth: {
            type: "api",
            key: value,
-            ...(props.metadata ? { metadata: props.metadata } : {}),
          },
        })
        await sdk.client.instance.dispose()
@@ -1,5 +1,5 @@
 import { BoxRenderable, TextareaRenderable, MouseEvent, PasteEvent, decodePasteBytes, t, dim, fg } from "@opentui/core"
-import { createEffect, createMemo, onMount, createSignal, onCleanup, on, Show, Switch, Match } from "solid-js"
+import { createEffect, createMemo, type JSX, onMount, createSignal, onCleanup, on, Show, Switch, Match } from "solid-js"
 import "opentui-spinner/solid"
 import path from "path"
 import { Filesystem } from "@/util/filesystem"
@@ -18,7 +18,7 @@ import { usePromptStash } from "./stash"
 import { DialogStash } from "../dialog-stash"
 import { type AutocompleteRef, Autocomplete } from "./autocomplete"
 import { useCommandDialog } from "../dialog-command"
-import { useRenderer, type JSX } from "@opentui/solid"
+import { useKeyboard, useRenderer } from "@opentui/solid"
 import { Editor } from "@tui/util/editor"
 import { useExit } from "../../context/exit"
 import { Clipboard } from "../../util/clipboard"
@@ -35,7 +35,6 @@ import { useToast } from "../../ui/toast"
 import { useKV } from "../../context/kv"
 import { useTextareaKeybindings } from "../textarea-keybindings"
 import { DialogSkill } from "../dialog-skill"
-import { CONSOLE_MANAGED_ICON, consoleManagedProviderLabel } from "@tui/util/provider-origin"

 export type PromptProps = {
  sessionID?: string
@@ -43,9 +42,8 @@ export type PromptProps = {
  visible?: boolean
  disabled?: boolean
  onSubmit?: () => void
-  ref?: (ref: PromptRef | undefined) => void
+  ref?: (ref: PromptRef) => void
  hint?: JSX.Element
-  right?: JSX.Element
  showPlaceholder?: boolean
  placeholders?: {
    normal?: string[]
@@ -94,16 +92,6 @@ export function Prompt(props: PromptProps) {
  const kv = useKV()
  const list = createMemo(() => props.placeholders?.normal ?? [])
  const shell = createMemo(() => props.placeholders?.shell ?? [])
-  const [auto, setAuto] = createSignal<AutocompleteRef>()
-  const activeOrgName = createMemo(() => sync.data.console_state.activeOrgName)
-  const canSwitchOrgs = createMemo(() => sync.data.console_state.switchableOrgCount > 1)
-  const currentProviderLabel = createMemo(() => {
-    const current = local.model.current()
-    const provider = local.model.parsed().provider
-    if (!current) return provider
-    return consoleManagedProviderLabel(sync.data.console_state.consoleManagedProviders, current.providerID, provider)
-  })
-  const hasRightContent = createMemo(() => Boolean(props.right || activeOrgName()))

  function promptModelWarning() {
    toast.show({
@@ -400,6 +388,20 @@ export function Prompt(props: PromptProps) {
    ]
  })

+  // Windows Terminal 1.25+ handles Ctrl+V on keydown when kitty events are
+  // enabled, but still reports the kitty key-release event. Probe on release.
+  if (process.platform === "win32") {
+    useKeyboard(
+      (evt) => {
+        if (!input.focused) return
+        if (evt.name === "v" && evt.ctrl && evt.eventType === "release") {
+          command.trigger("prompt.paste")
+        }
+      },
+      { release: true },
+    )
+  }
+
  const ref: PromptRef = {
    get focused() {
      return input.focused
@@ -433,29 +435,9 @@ export function Prompt(props: PromptProps) {
    },
  }

-  onCleanup(() => {
-    props.ref?.(undefined)
-  })
-
  createEffect(() => {
-    if (!input || input.isDestroyed) return
-    if (props.visible === false || dialog.stack.length > 0) {
-      input.blur()
-      return
-    }
-
-    // Slot/plugin updates can remount the background prompt while a dialog is open.
-    // Keep focus with the dialog and let the prompt reclaim it after the dialog closes.
-    input.focus()
-  })
-
-  createEffect(() => {
-    if (!input || input.isDestroyed) return
-    input.traits = {
-      capture: auto()?.visible ? ["escape", "navigate", "submit", "tab"] : undefined,
-      suspend: !!props.disabled || store.mode === "shell",
-      status: store.mode === "shell" ? "SHELL" : undefined,
-    }
+    if (props.visible !== false) input?.focus()
+    if (props.visible === false) input?.blur()
  })

  function restoreExtmarksFromParts(parts: PromptInfo["parts"]) {
@@ -862,10 +844,7 @@ export function Prompt(props: PromptProps) {
    <>
      <Autocomplete
        sessionID={props.sessionID}
-        ref={(r) => {
-          autocomplete = r
-          setAuto(() => r)
-        }}
+        ref={(r) => (autocomplete = r)}
        anchor={() => anchor}
        input={() => input}
        setPrompt={(cb) => {
@@ -1081,38 +1060,20 @@ export function Prompt(props: PromptProps) {
              cursorColor={theme.text}
              syntaxStyle={syntax()}
            />
-            <box flexDirection="row" flexShrink={0} paddingTop={1} gap={1} justifyContent="space-between">
-              <box flexDirection="row" gap={1}>
-                <text fg={highlight()}>
-                  {store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
-                </text>
-                <Show when={store.mode === "normal"}>
-                  <box flexDirection="row" gap={1}>
-                    <text flexShrink={0} fg={keybind.leader ? theme.textMuted : theme.text}>
-                      {local.model.parsed().model}
-                    </text>
-                    <text fg={theme.textMuted}>{currentProviderLabel()}</text>
-                    <Show when={showVariant()}>
-                      <text fg={theme.textMuted}>·</text>
-                      <text>
-                        <span style={{ fg: theme.warning, bold: true }}>{local.model.variant.current()}</span>
-                      </text>
-                    </Show>
-                  </box>
-                </Show>
-              </box>
-              <Show when={hasRightContent()}>
-                <box flexDirection="row" gap={1} alignItems="center">
-                  {props.right}
-                  <Show when={activeOrgName()}>
-                    <text
-                      fg={theme.textMuted}
-                      onMouseUp={() => {
-                        if (!canSwitchOrgs()) return
-                        command.trigger("console.org.switch")
-                      }}
-                    >
-                      {`${CONSOLE_MANAGED_ICON} ${activeOrgName()}`}
+            <box flexDirection="row" flexShrink={0} paddingTop={1} gap={1}>
+              <text fg={highlight()}>
+                {store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
+              </text>
+              <Show when={store.mode === "normal"}>
+                <box flexDirection="row" gap={1}>
+                  <text flexShrink={0} fg={keybind.leader ? theme.textMuted : theme.text}>
+                    {local.model.parsed().model}
+                  </text>
+                  <text fg={theme.textMuted}>{local.model.parsed().provider}</text>
+                  <Show when={showVariant()}>
+                    <text fg={theme.textMuted}>·</text>
+                    <text>
+                      <span style={{ fg: theme.warning, bold: true }}>{local.model.variant.current()}</span>
                    </text>
                  </Show>
                </box>
@@ -29,7 +29,6 @@ import { batch, onMount } from "solid-js"
 import { Log } from "@/util/log"
 import type { Path } from "@opencode-ai/sdk"
 import type { Workspace } from "@opencode-ai/sdk/v2"
-import { ConsoleState, emptyConsoleState, type ConsoleState as ConsoleStateType } from "@/config/console-state"

 export const { use: useSync, provider: SyncProvider } = createSimpleContext({
  name: "Sync",
@@ -39,7 +38,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
      provider: Provider[]
      provider_default: Record<string, string>
      provider_next: ProviderListResponse
-      console_state: ConsoleStateType
      provider_auth: Record<string, ProviderAuthMethod[]>
      agent: Agent[]
      command: Command[]
@@ -83,7 +81,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
        default: {},
        connected: [],
      },
-      console_state: emptyConsoleState,
      provider_auth: {},
      config: {},
      status: "loading",
@@ -368,10 +365,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
      // blocking - include session.list when continuing a session
      const providersPromise = sdk.client.config.providers({}, { throwOnError: true })
      const providerListPromise = sdk.client.provider.list({}, { throwOnError: true })
-      const consoleStatePromise = sdk.client.experimental.console
-        .get({}, { throwOnError: true })
-        .then((x) => ConsoleState.parse(x.data))
-        .catch(() => emptyConsoleState)
      const agentsPromise = sdk.client.app.agents({}, { throwOnError: true })
      const configPromise = sdk.client.config.get({}, { throwOnError: true })
      const blockingRequests: Promise<unknown>[] = [
@@ -386,7 +379,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
        .then(() => {
          const providersResponse = providersPromise.then((x) => x.data!)
          const providerListResponse = providerListPromise.then((x) => x.data!)
-          const consoleStateResponse = consoleStatePromise
          const agentsResponse = agentsPromise.then((x) => x.data ?? [])
          const configResponse = configPromise.then((x) => x.data!)
          const sessionListResponse = args.continue ? sessionListPromise : undefined
@@ -394,23 +386,20 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
          return Promise.all([
            providersResponse,
            providerListResponse,
-            consoleStateResponse,
            agentsResponse,
            configResponse,
            ...(sessionListResponse ? [sessionListResponse] : []),
          ]).then((responses) => {
            const providers = responses[0]
            const providerList = responses[1]
-            const consoleState = responses[2]
-            const agents = responses[3]
-            const config = responses[4]
-            const sessions = responses[5]
+            const agents = responses[2]
+            const config = responses[3]
+            const sessions = responses[4]

            batch(() => {
              setStore("provider", reconcile(providers.providers))
              setStore("provider_default", reconcile(providers.default))
              setStore("provider_next", reconcile(providerList))
-              setStore("console_state", reconcile(consoleState))
              setStore("agent", reconcile(agents))
              setStore("config", reconcile(config))
              if (sessions !== undefined) setStore("session", reconcile(sessions))
@@ -422,7 +411,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
          // non-blocking
          Promise.all([
            ...(args.continue ? [] : [sessionListPromise.then((sessions) => setStore("session", reconcile(sessions)))]),
-            consoleStatePromise.then((consoleState) => setStore("console_state", reconcile(consoleState))),
            sdk.client.command.list().then((x) => setStore("command", reconcile(x.data ?? []))),
            sdk.client.lsp.status().then((x) => setStore("lsp", reconcile(x.data!))),
            sdk.client.mcp.status().then((x) => setStore("mcp", reconcile(x.data!))),
@@ -509,9 +509,7 @@ export function tint(base: RGBA, overlay: RGBA, alpha: number): RGBA {
  return RGBA.fromInts(Math.round(r * 255), Math.round(g * 255), Math.round(b * 255))
 }

-// TODO: i exported this, just for keeping it simple for now, but this should
-// probably go into something shared if we decide to use this in opencode run
-export function generateSystem(colors: TerminalColors, mode: "dark" | "light"): ThemeJson {
+function generateSystem(colors: TerminalColors, mode: "dark" | "light"): ThemeJson {
  const bg = RGBA.fromHex(colors.defaultBackground ?? colors.palette[0]!)
  const fg = RGBA.fromHex(colors.defaultForeground ?? colors.palette[7]!)
  const transparent = RGBA.fromValues(bg.r, bg.g, bg.b, 0)
@@ -705,11 +703,11 @@ function generateMutedTextColor(bg: RGBA, isDark: boolean): RGBA {
  return RGBA.fromInts(grayValue, grayValue, grayValue)
 }

-export function generateSyntax(theme: TuiThemeCurrent) {
+function generateSyntax(theme: Theme) {
  return SyntaxStyle.fromTheme(getSyntaxRules(theme))
 }

-function generateSubtleSyntax(theme: TuiThemeCurrent) {
+function generateSubtleSyntax(theme: Theme) {
  const rules = getSyntaxRules(theme)
  return SyntaxStyle.fromTheme(
    rules.map((rule) => {
@@ -733,7 +731,7 @@ function generateSubtleSyntax(theme: TuiThemeCurrent) {
  )
 }

-function getSyntaxRules(theme: TuiThemeCurrent) {
+function getSyntaxRules(theme: Theme) {
  return [
    {
      scope: ["default"],
@@ -148,7 +148,5 @@ const TIPS = [
  "Use {highlight}/review{/highlight} to review uncommitted changes, branches, or PRs",
  "Run {highlight}/help{/highlight} or {highlight}Ctrl+X H{/highlight} to show the help dialog",
  "Use {highlight}/rename{/highlight} to rename the current session",
-  ...(process.platform === "win32"
-    ? ["Press {highlight}Ctrl+Z{/highlight} to undo changes in your prompt"]
-    : ["Press {highlight}Ctrl+Z{/highlight} to suspend the terminal and return to your shell"]),
+  "Press {highlight}Ctrl+Z{/highlight} to suspend the terminal and return to your shell",
 ]
@@ -1,5 +1,5 @@
 import type { ParsedKey } from "@opentui/core"
-import type { TuiDialogSelectOption, TuiPluginApi, TuiRouteDefinition, TuiSlotProps } from "@opencode-ai/plugin/tui"
+import type { TuiDialogSelectOption, TuiPluginApi, TuiRouteDefinition } from "@opencode-ai/plugin/tui"
 import type { useCommandDialog } from "@tui/component/dialog-command"
 import type { useKeybind } from "@tui/context/keybind"
 import type { useRoute } from "@tui/context/route"
@@ -15,7 +15,6 @@ import { DialogConfirm } from "../ui/dialog-confirm"
 import { DialogPrompt } from "../ui/dialog-prompt"
 import { DialogSelect, type DialogSelectOption as SelectOption } from "../ui/dialog-select"
 import { Prompt } from "../component/prompt"
-import { Slot as HostSlot } from "./slots"
 import type { useToast } from "../ui/toast"
 import { Installation } from "@/installation"
 import { createOpencodeClient, type OpencodeClient } from "@opencode-ai/sdk/v2"
@@ -245,9 +244,6 @@ export function createTuiApi(input: Input): TuiHostPluginApi {
      trigger(value) {
        input.command.trigger(value)
      },
-      show() {
-        input.command.show()
-      },
    },
    route: {
      register(list) {
@@ -292,20 +288,14 @@ export function createTuiApi(input: Input): TuiHostPluginApi {
          />
        )
      },
-      Slot<Name extends string>(props: TuiSlotProps<Name>) {
-        return <HostSlot {...props} />
-      },
      Prompt(props) {
        return (
          <Prompt
-            sessionID={props.sessionID}
            workspaceID={props.workspaceID}
            visible={props.visible}
            disabled={props.disabled}
            onSubmit={props.onSubmit}
-            ref={props.ref}
            hint={props.hint}
-            right={props.right}
            showPlaceholder={props.showPlaceholder}
            placeholders={props.placeholders}
          />
@@ -7,7 +7,6 @@ import {
  type TuiPluginModule,
  type TuiPluginMeta,
  type TuiPluginStatus,
-  type TuiSlotPlugin,
  type TuiTheme,
 } from "@opencode-ai/plugin/tui"
 import path from "path"
@@ -492,9 +491,6 @@ function pluginApi(runtime: RuntimeState, plugin: PluginEntry, scope: PluginScop
    trigger(value) {
      api.command.trigger(value)
    },
-    show() {
-      api.command.show()
-    },
  }

  const route: TuiPluginApi["route"] = {
@@ -522,7 +518,7 @@ function pluginApi(runtime: RuntimeState, plugin: PluginEntry, scope: PluginScop
  let count = 0

  const slots: TuiPluginApi["slots"] = {
-    register(plugin: TuiSlotPlugin) {
+    register(plugin) {
      const id = count ? `${base}:${count}` : base
      count += 1
      scope.track(host.register({ ...plugin, id }))
@@ -1,21 +1,22 @@
-import type { TuiPluginApi, TuiSlotContext, TuiSlotMap, TuiSlotProps } from "@opencode-ai/plugin/tui"
+import { type SlotMode, type TuiPluginApi, type TuiSlotContext, type TuiSlotMap } from "@opencode-ai/plugin/tui"
 import { createSlot, createSolidSlotRegistry, type JSX, type SolidPlugin } from "@opentui/solid"
 import { isRecord } from "@/util/record"

-type RuntimeSlotMap = TuiSlotMap<Record<string, object>>
+type SlotProps<K extends keyof TuiSlotMap> = {
+  name: K
+  mode?: SlotMode
+  children?: JSX.Element
+} & TuiSlotMap[K]

-type Slot = <Name extends string>(props: TuiSlotProps<Name>) => JSX.Element | null
-export type HostSlotPlugin<Slots extends Record<string, object> = {}> = SolidPlugin<TuiSlotMap<Slots>, TuiSlotContext>
+type Slot = <K extends keyof TuiSlotMap>(props: SlotProps<K>) => JSX.Element | null
+export type HostSlotPlugin = SolidPlugin<TuiSlotMap, TuiSlotContext>

 export type HostPluginApi = TuiPluginApi
 export type HostSlots = {
-  register: {
-    (plugin: HostSlotPlugin): () => void
-    <Slots extends Record<string, object>>(plugin: HostSlotPlugin<Slots>): () => void
-  }
+  register: (plugin: HostSlotPlugin) => () => void
 }

-function empty<Name extends string>(_props: TuiSlotProps<Name>) {
+function empty<K extends keyof TuiSlotMap>(_props: SlotProps<K>) {
  return null
 }

@@ -23,7 +24,7 @@ let view: Slot = empty

 export const Slot: Slot = (props) => view(props)

-function isHostSlotPlugin(value: unknown): value is HostSlotPlugin<Record<string, object>> {
+function isHostSlotPlugin(value: unknown): value is HostSlotPlugin {
  if (!isRecord(value)) return false
  if (typeof value.id !== "string") return false
  if (!isRecord(value.slots)) return false
@@ -31,7 +32,7 @@ function isHostSlotPlugin(value: unknown): value is HostSlotPlugin<Record<string
 }

 export function setupSlots(api: HostPluginApi): HostSlots {
-  const reg = createSolidSlotRegistry<RuntimeSlotMap, TuiSlotContext>(
+  const reg = createSolidSlotRegistry<TuiSlotMap, TuiSlotContext>(
    api.renderer,
    {
      theme: api.theme,
@@ -49,10 +50,10 @@ export function setupSlots(api: HostPluginApi): HostSlots {
    },
  )

-  const slot = createSlot<RuntimeSlotMap, TuiSlotContext>(reg)
+  const slot = createSlot<TuiSlotMap, TuiSlotContext>(reg)
  view = (props) => slot(props)
  return {
-    register(plugin: HostSlotPlugin) {
+    register(plugin) {
      if (!isHostSlotPlugin(plugin)) return () => {}
      return reg.register(plugin)
    },
@@ -1,5 +1,5 @@
 import { Prompt, type PromptRef } from "@tui/component/prompt"
-import { createEffect, createSignal } from "solid-js"
+import { createEffect, on, onMount } from "solid-js"
 import { Logo } from "../component/logo"
 import { useSync } from "../context/sync"
 import { Toast } from "../ui/toast"
@@ -20,36 +20,34 @@ export function Home() {
  const sync = useSync()
  const route = useRouteData("home")
  const promptRef = usePromptRef()
-  const [ref, setRef] = createSignal<PromptRef | undefined>()
+  let prompt: PromptRef | undefined
  const args = useArgs()
  const local = useLocal()
-  let sent = false
-
-  const bind = (r: PromptRef | undefined) => {
-    setRef(r)
-    promptRef.set(r)
-    if (once || !r) return
+  onMount(() => {
+    if (once) return
+    if (!prompt) return
    if (route.initialPrompt) {
-      r.set(route.initialPrompt)
+      prompt.set(route.initialPrompt)
+      once = true
+    } else if (args.prompt) {
+      prompt.set({ input: args.prompt, parts: [] })
      once = true
-      return
    }
-    if (!args.prompt) return
-    r.set({ input: args.prompt, parts: [] })
-    once = true
-  }
+  })

  // Wait for sync and model store to be ready before auto-submitting --prompt
-  createEffect(() => {
-    const r = ref()
-    if (sent) return
-    if (!r) return
-    if (!sync.ready || !local.model.ready) return
-    if (!args.prompt) return
-    if (r.current.input !== args.prompt) return
-    sent = true
-    r.submit()
-  })
+  createEffect(
+    on(
+      () => sync.ready && local.model.ready,
+      (ready) => {
+        if (!ready) return
+        if (!prompt) return
+        if (!args.prompt) return
+        if (prompt.current?.input !== args.prompt) return
+        prompt.submit()
+      },
+    ),
+  )

  return (
    <>
@@ -63,11 +61,13 @@ export function Home() {
        </box>
        <box height={1} minHeight={0} flexShrink={1} />
        <box width="100%" maxWidth={75} zIndex={1000} paddingTop={1} flexShrink={0}>
-          <TuiPluginRuntime.Slot name="home_prompt" mode="replace" workspace_id={route.workspaceID} ref={bind}>
+          <TuiPluginRuntime.Slot name="home_prompt" mode="replace" workspace_id={route.workspaceID}>
            <Prompt
-              ref={bind}
+              ref={(r) => {
+                prompt = r
+                promptRef.set(r)
+              }}
              workspaceID={route.workspaceID}
-              right={<TuiPluginRuntime.Slot name="home_prompt_right" workspace_id={route.workspaceID} />}
              placeholders={placeholder}
            />
          </TuiPluginRuntime.Slot>
@@ -82,7 +82,6 @@ import { formatTranscript } from "../../util/transcript"
 import { UI } from "@/cli/ui.ts"
 import { useTuiConfig } from "../../context/tui-config"
 import { getScrollAcceleration } from "../../util/scroll"
-import { TuiPluginRuntime } from "../../plugin"

 addDefaultParsers(parsers.parsers)

@@ -130,8 +129,6 @@ export function Session() {
    if (session()?.parentID) return []
    return children().flatMap((x) => sync.data.question[x.id] ?? [])
  })
-  const visible = createMemo(() => !session()?.parentID && permissions().length === 0 && questions().length === 0)
-  const disabled = createMemo(() => permissions().length > 0 || questions().length > 0)

  const pending = createMemo(() => {
    return messages().findLast((x) => x.role === "assistant" && !x.time.completed)?.id
@@ -193,7 +190,12 @@ export function Session() {
  const sdk = useSDK()

  // Handle initial prompt from fork
-  let seeded = false
+  createEffect(() => {
+    if (route.initialPrompt && prompt) {
+      prompt.set(route.initialPrompt)
+    }
+  })
+
  let lastSwitch: string | undefined = undefined
  sdk.event.on("message.part.updated", (evt) => {
    const part = evt.properties.part
@@ -212,14 +214,7 @@ export function Session() {
  })

  let scroll: ScrollBoxRenderable
-  let prompt: PromptRef | undefined
-  const bind = (r: PromptRef | undefined) => {
-    prompt = r
-    promptRef.set(r)
-    if (seeded || !route.initialPrompt || !r) return
-    seeded = true
-    r.set(route.initialPrompt)
-  }
+  let prompt: PromptRef
  const keybind = useKeybind()
  const dialog = useDialog()
  const renderer = useRenderer()
@@ -414,7 +409,7 @@ export function Session() {
              if (child) scroll.scrollBy(child.y - scroll.y - 1)
            }}
            sessionID={route.sessionID}
-            setPrompt={(promptInfo) => prompt?.set(promptInfo)}
+            setPrompt={(promptInfo) => prompt.set(promptInfo)}
          />
        ))
      },
@@ -515,7 +510,7 @@ export function Session() {
            toBottom()
          })
        const parts = sync.data.part[message.id]
-        prompt?.set(
+        prompt.set(
          parts.reduce(
            (agg, part) => {
              if (part.type === "text") {
@@ -548,7 +543,7 @@ export function Session() {
          sdk.client.session.unrevert({
            sessionID: route.sessionID,
          })
-          prompt?.set({ input: "", parts: [] })
+          prompt.set({ input: "", parts: [] })
          return
        }
        sdk.client.session.revert({
@@ -1129,7 +1124,7 @@ export function Session() {
                            <DialogMessage
                              messageID={message.id}
                              sessionID={route.sessionID}
-                              setPrompt={(promptInfo) => prompt?.set(promptInfo)}
+                              setPrompt={(promptInfo) => prompt.set(promptInfo)}
                            />
                          ))
                        }}
@@ -1159,28 +1154,22 @@ export function Session() {
              <Show when={session()?.parentID}>
                <SubagentFooter />
              </Show>
-              <Show when={visible()}>
-                <TuiPluginRuntime.Slot
-                  name="session_prompt"
-                  mode="replace"
-                  session_id={route.sessionID}
-                  visible={visible()}
-                  disabled={disabled()}
-                  on_submit={toBottom}
-                  ref={bind}
-                >
-                  <Prompt
-                    visible={visible()}
-                    ref={bind}
-                    disabled={disabled()}
-                    onSubmit={() => {
-                      toBottom()
-                    }}
-                    sessionID={route.sessionID}
-                    right={<TuiPluginRuntime.Slot name="session_prompt_right" session_id={route.sessionID} />}
-                  />
-                </TuiPluginRuntime.Slot>
-              </Show>
+              <Prompt
+                visible={!session()?.parentID && permissions().length === 0 && questions().length === 0}
+                ref={(r) => {
+                  prompt = r
+                  promptRef.set(r)
+                  // Apply initial prompt when prompt component mounts (e.g., from fork)
+                  if (route.initialPrompt) {
+                    r.set(route.initialPrompt)
+                  }
+                }}
+                disabled={permissions().length > 0 || questions().length > 0}
+                onSubmit={() => {
+                  toBottom()
+                }}
+                sessionID={route.sessionID}
+              />
            </box>
          </Show>
          <Toast />
@@ -1572,7 +1561,7 @@ function ToolPart(props: { last: boolean; part: ToolPart; message: AssistantMess
  )
 }

-type ToolProps<T> = {
+type ToolProps<T extends Tool.Info> = {
  input: Partial<Tool.InferParameters<T>>
  metadata: Partial<Tool.InferMetadata<T>>
  permission: Record<string, any>
@@ -520,10 +520,7 @@ function RejectPrompt(props: { onConfirm: (message: string) => void; onCancel: (
        gap={1}
      >
        <textarea
-          ref={(val: TextareaRenderable) => {
-            input = val
-            val.traits = { status: "REJECT" }
-          }}
+          ref={(val: TextareaRenderable) => (input = val)}
          focused
          textColor={theme.text}
          focusedTextColor={theme.text}
@@ -380,7 +380,6 @@ export function QuestionPrompt(props: { request: QuestionRequest }) {
                      <textarea
                        ref={(val: TextareaRenderable) => {
                          textarea = val
-                          val.traits = { status: "ANSWER" }
                          queueMicrotask(() => {
                            val.focus()
                            val.gotoLineEnd()
@@ -1,4 +1,5 @@
 import { cmd } from "@/cli/cmd/cmd"
+import { tui } from "./app"
 import { Rpc } from "@/util/rpc"
 import { type rpc } from "./worker"
 import path from "path"
@@ -200,8 +201,7 @@ export const TuiThreadCommand = cmd({
      }, 1000).unref?.()

      try {
-        const app = await import("./app")
-        await app.tui({
+        await tui({
          url: transport.url,
          async onSnapshot() {
            const tui = writeHeapSnapshot("tui.heapsnapshot")
@@ -100,10 +100,7 @@ export function DialogExportOptions(props: DialogExportOptionsProps) {
          }}
          height={3}
          keyBindings={[{ name: "return", action: "submit" }]}
-          ref={(val: TextareaRenderable) => {
-            textarea = val
-            val.traits = { status: "FILENAME" }
-          }}
+          ref={(val: TextareaRenderable) => (textarea = val)}
          initialValue={props.defaultFilename}
          placeholder="Enter filename"
          placeholderColor={theme.textMuted}
@@ -45,13 +45,6 @@ export function DialogPrompt(props: DialogPromptProps) {

  createEffect(() => {
    if (!textarea || textarea.isDestroyed) return
-    const traits = props.busy
-      ? {
-          suspend: true,
-          status: "BUSY",
-        }
-      : {}
-    textarea.traits = traits
    if (props.busy) {
      textarea.blur()
      return
@@ -78,9 +71,7 @@ export function DialogPrompt(props: DialogPromptProps) {
          }}
          height={3}
          keyBindings={props.busy ? [] : [{ name: "return", action: "submit" }]}
-          ref={(val: TextareaRenderable) => {
-            textarea = val
-          }}
+          ref={(val: TextareaRenderable) => (textarea = val)}
          initialValue={props.value}
          placeholder={props.placeholder ?? "Enter text"}
          placeholderColor={theme.textMuted}
@@ -38,7 +38,6 @@ export interface DialogSelectOption<T = any> {
  description?: string
  footer?: JSX.Element | string
  category?: string
-  categoryView?: JSX.Element
  disabled?: boolean
  bg?: RGBA
  gutter?: JSX.Element
@@ -259,7 +258,6 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
            focusedTextColor={theme.textMuted}
            ref={(r) => {
              input = r
-              input.traits = { status: "FILTER" }
              setTimeout(() => {
                if (!input) return
                if (input.isDestroyed) return
@@ -292,16 +290,9 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
              <>
                <Show when={category}>
                  <box paddingTop={index() > 0 ? 1 : 0} paddingLeft={3}>
-                    <Show
-                      when={options[0]?.categoryView}
-                      fallback={
-                        <text fg={theme.accent} attributes={TextAttributes.BOLD}>
-                          {category}
-                        </text>
-                      }
-                    >
-                      {options[0]?.categoryView}
-                    </Show>
+                    <text fg={theme.accent} attributes={TextAttributes.BOLD}>
+                      {category}
+                    </text>
                  </box>
                </Show>
                <For each={options}>
@@ -1,20 +0,0 @@
-export const CONSOLE_MANAGED_ICON = "⌂"
-
-const contains = (consoleManagedProviders: string[] | ReadonlySet<string>, providerID: string) =>
-  Array.isArray(consoleManagedProviders)
-    ? consoleManagedProviders.includes(providerID)
-    : consoleManagedProviders.has(providerID)
-
-export const isConsoleManagedProvider = (consoleManagedProviders: string[] | ReadonlySet<string>, providerID: string) =>
-  contains(consoleManagedProviders, providerID)
-
-export const consoleManagedProviderSuffix = (
-  consoleManagedProviders: string[] | ReadonlySet<string>,
-  providerID: string,
-) => (contains(consoleManagedProviders, providerID) ? ` ${CONSOLE_MANAGED_ICON}` : "")
-
-export const consoleManagedProviderLabel = (
-  consoleManagedProviders: string[] | ReadonlySet<string>,
-  providerID: string,
-  providerName: string,
-) => `${providerName}${consoleManagedProviderSuffix(consoleManagedProviders, providerID)}`
@@ -13,7 +13,6 @@ import { Flag } from "@/flag/flag"
 import { setTimeout as sleep } from "node:timers/promises"
 import { writeHeapSnapshot } from "node:v8"
 import { WorkspaceID } from "@/control-plane/schema"
-import { Heap } from "@/cli/heap"

 await Log.init({
  print: process.argv.includes("--print-logs"),
@@ -24,8 +23,6 @@ await Log.init({
  })(),
 })

-Heap.start()
-
 process.on("unhandledRejection", (e) => {
  Log.Default.error("rejection", {
    e: e instanceof Error ? e.message : e,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kit Langton	9037600d4c	Merge branch 'dev' into kit/remove-e2e-url-repro	2026-04-02 14:32:47 -04:00
Kit Langton	9bf227f81f	test(opencode): remove temporary e2e url repro	2026-04-02 14:30:06 -04:00
Kit Langton	8b6219d834	fix(opencode): allow patch tools in e2e model routing	2026-04-02 14:10:26 -04:00
Kit Langton	2666def933	fix(app): poll session.diff instead of summary.files, revert sanitizeProject summary.files is computed asynchronously and never resolves in CI. Poll session.diff() directly — matches the pattern used by the snapshot-tool-race integration test. Also revert the unrelated sanitizeProject changes to event-reducer and utils that were accidentally included in this PR.	2026-04-02 13:27:10 -04:00
Kit Langton	1401208cb5	fix(app): drop patchModel, let default model resolve for review seeds The dynamic GPT model search was fragile across CI environments. The e2eURL override routes any model to the mock server, so there's no need to pick a specific model.	2026-04-02 13:11:56 -04:00
Kit Langton	3f81434315	test(opencode): wait for stderr writes before exit	2026-04-02 13:01:27 -04:00
Kit Langton	d603d9da65	fix(opencode): use openai-compatible SDK for e2e LLM mock routing The e2eURL() path used createOpenAI().responses() which produces a Responses API format that the mock server's SSE stream can't correctly convey tool calls through. Switch to createOpenAICompatible().chatModel() which uses the chat completions format — matching what the mock was designed for and what the integration tests use. This only affects the OPENCODE_E2E_LLM_URL code path (e2e tests only).	2026-04-02 12:49:28 -04:00
Kit Langton	9a87b785e6	test(app): restore e2e fixtures and flaky waits	2026-04-02 12:32:11 -04:00
Kit Langton	fae97cc559	fix(app): restore assistant fixture, simplify route.fulfill - Re-add AssistantFixture type and assistant fixture (used by prompt specs) - Simplify route.fulfill to use response param directly	2026-04-02 12:20:56 -04:00
Kit Langton	4453ff26f6	refactor(app): remove dead e2e selectors, mock helpers, and unused imports - selectors: permissionReject/AllowAlways/AllowOnce, sessionTodoDock/Toggle/List, projectClearNotifications, dropdownMenuTrigger - mock: titleMatch, promptMatch, openaiModel, withMockOpenAI - actions: withNoReplyPrompt, unused dropdownMenuTriggerSelector/Route imports	2026-04-02 12:19:42 -04:00
Kit Langton	490fd31706	Merge branch 'dev' into kit/e2e-golden-path	2026-04-02 12:06:58 -04:00
Kit Langton	fd14f281d0	refactor(app): inline seedProjects into seedStorage, remove unused imports - Merge seedProjects into seedStorage as a single addInitScript call - Remove unused withNoReplyPrompt import from fixtures - Remove seedProjects export from actions	2026-04-02 12:06:42 -04:00
Kit Langton	a355898c74	test(app): drop unused e2e fixture imports	2026-04-02 12:03:22 -04:00
Kit Langton	042c594446	test(app): select review seed model from providers	2026-04-02 12:02:49 -04:00
Kit Langton	bcddb59c9c	refactor(app): remove dead e2e fixtures, helpers, and types Delete unused code from the e2e test infrastructure: - fixtures: withProject, withBackendProject, withMockProject, runProject, AssistantFixture type, assistant fixture - actions: clickPopoverButton, seedSessionPermission, seedSessionTodos - Update AGENTS.md to reflect the project fixture pattern	2026-04-02 12:00:17 -04:00
Kit Langton	bedd661fd4	Merge remote-tracking branch 'origin/dev' into kit/e2e-golden-path	2026-04-02 11:40:55 -04:00
Kit Langton	dff7ccc384	Merge branch 'dev' into kit/e2e-golden-path	2026-04-02 11:32:19 -04:00
Kit Langton	d33cf0145e	test(opencode): type fast patch repro model ids	2026-04-02 11:30:34 -04:00
Kit Langton	0022cba7c5	test: stabilize patch seeding across e2e backends	2026-04-02 11:29:47 -04:00
Kit Langton	1c0812fe01	test(app): stabilize review and workspace e2e	2026-04-02 10:51:30 -04:00
Kit Langton	cfcdd5c1dd	test(app): relax review patch mock matching	2026-04-02 09:55:26 -04:00
Kit Langton	99845597b5	test(app): stabilize session routing and workspace e2e	2026-04-02 09:37:19 -04:00
Kit Langton	598296fc22	test: align e2e fixtures with worker backends	2026-04-02 09:18:38 -04:00
Kit Langton	7b2b22d5a2	Merge branch 'dev' into kit/e2e-golden-path	2026-04-02 08:56:08 -04:00
Kit Langton	b782650dfe	test(app): stabilize migrated e2e suite	2026-04-02 01:09:08 -04:00
Kit Langton	7f5307ff30	test(app): migrate e2e to the golden project fixture	2026-04-02 00:37:14 -04:00
Kit Langton	2089e5e0d6	test(app): stabilize golden e2e prompt helper	2026-04-02 00:37:14 -04:00
Kit Langton	ca3ccbab8d	test(app): add golden-path e2e fixtures	2026-04-02 00:37:14 -04:00