refactor(core): use shared tool transform lifecycle

feat(plugin): add tool draft reads and updates
2026-08-27 12:06:22 +00:00 · 2026-08-26 17:42:54 -05:00 · 2026-08-26 17:05:23 -05:00
166 changed files with 1781 additions and 7116 deletions
@@ -1,5 +0,0 @@
---
-"@opencode-ai/core": patch
---
-
-Include both paths of renamed files in new snapshot change lists so undo restores the original file instead of only deleting the renamed file.
@@ -237,19 +237,13 @@ jobs:
        working-directory: packages/app
        run: bunx playwright install chromium

-      - name: Run app e2e tests against production build
+      - name: Run app e2e tests
        if: env.E2E_ENABLED == 'true'
-        run: bun --cwd packages/app test:e2e:built
+        run: bun --cwd packages/app test:e2e:local
        env:
          CI: true
        timeout-minutes: 30

-      - name: Verify service worker precaching and upgrades
-        if: env.E2E_ENABLED == 'true'
-        working-directory: packages/app
-        run: bunx playwright test --config e2e/service-worker/playwright.config.ts
-        timeout-minutes: 5
-
      - name: Upload Playwright artifacts
        if: always() && env.E2E_ENABLED == 'true'
        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
@@ -125,7 +125,7 @@
        "@effect/platform-node": "catalog:",
        "@opencode-ai/client": "workspace:*",
        "@opencode-ai/plugin": "workspace:*",
-        "@opencode-ai/pty": "0.1.12",
+        "@opencode-ai/pty": "0.1.11",
        "@opencode-ai/schema": "workspace:*",
        "@opencode-ai/server": "workspace:*",
        "@opencode-ai/tui": "workspace:*",
@@ -364,7 +364,7 @@
        "@opencode-ai/ai": "workspace:*",
        "@opencode-ai/codemode": "workspace:*",
        "@opencode-ai/plugin": "workspace:*",
-        "@opencode-ai/pty": "0.1.12",
+        "@opencode-ai/pty": "0.1.11",
        "@opencode-ai/schema": "workspace:*",
        "@opencode-ai/util": "workspace:*",
        "@parcel/watcher": "2.5.1",
@@ -2175,19 +2175,19 @@

    "@opencode-ai/protocol": ["@opencode-ai/protocol@workspace:packages/protocol"],

-    "@opencode-ai/pty": ["@opencode-ai/pty@0.1.12", "", { "optionalDependencies": { "@opencode-ai/pty-darwin-arm64": "0.1.12", "@opencode-ai/pty-darwin-x64": "0.1.12", "@opencode-ai/pty-linux-arm64-gnu": "0.1.12", "@opencode-ai/pty-linux-arm64-musl": "0.1.12", "@opencode-ai/pty-linux-x64-gnu": "0.1.12", "@opencode-ai/pty-linux-x64-musl": "0.1.12" }, "bin": { "opencode-pty": "bin/opencode-pty.js" } }, "sha512-dl4FyJUhTXThsWYY8txG/8/nwN7dE0M5Sic9r4L9f2pvtJnbR5zrCrPoiPIBIxZle1wVks1dhz4z/CfqLf5sCg=="],
+    "@opencode-ai/pty": ["@opencode-ai/pty@0.1.11", "", { "optionalDependencies": { "@opencode-ai/pty-darwin-arm64": "0.1.11", "@opencode-ai/pty-darwin-x64": "0.1.11", "@opencode-ai/pty-linux-arm64-gnu": "0.1.11", "@opencode-ai/pty-linux-arm64-musl": "0.1.11", "@opencode-ai/pty-linux-x64-gnu": "0.1.11", "@opencode-ai/pty-linux-x64-musl": "0.1.11" }, "bin": { "opencode-pty": "bin/opencode-pty.js" } }, "sha512-Q4p0XXZWbc8FnpEJaaLqVbCdodxR9lVzaQjMH18KvjX/4m6tYfuspz03mvkN9MdmtDJ2GOZS7QgGQ7Q+RE9aWw=="],

-    "@opencode-ai/pty-darwin-arm64": ["@opencode-ai/pty-darwin-arm64@0.1.12", "", { "os": "darwin", "cpu": "arm64" }, "sha512-tMvoriq3VegVlj1uEglc6qE0M7VXy61nyf9Si7tTO7xa8JiyxuFJSXOZ1pGeErDu+pe24hvTyVOR+gkdew8w9g=="],
+    "@opencode-ai/pty-darwin-arm64": ["@opencode-ai/pty-darwin-arm64@0.1.11", "", { "os": "darwin", "cpu": "arm64" }, "sha512-Hz59ImecqeBdLQ40TknPDc9k4xWjQPaTgZ7cXzF3vclAvZiFYSM1rRdbBF6rOaOB0DBp0OFYsiaPP1ykszLsfw=="],

-    "@opencode-ai/pty-darwin-x64": ["@opencode-ai/pty-darwin-x64@0.1.12", "", { "os": "darwin", "cpu": "x64" }, "sha512-Sn5vMLL5giHOhx7J5H6zwDp4YjjXorY+QV0IEYY+SCT4wQfRBliokIyj23pRl6P2RK3u9bDLXJHDNMfDVZ2Rxg=="],
+    "@opencode-ai/pty-darwin-x64": ["@opencode-ai/pty-darwin-x64@0.1.11", "", { "os": "darwin", "cpu": "x64" }, "sha512-TPpA+FZ08BXtTcOeqe0FEJitqLld6Nl46UizcSmQCTRM22xOKPar6OoxHGYtqdFCaFk43a+hk/0GWpV7mcEQEg=="],

-    "@opencode-ai/pty-linux-arm64-gnu": ["@opencode-ai/pty-linux-arm64-gnu@0.1.12", "", { "os": "linux", "cpu": "arm64" }, "sha512-HbnlKZy052l7G527wK0+05EXaUpZ4ykVAmNBEzqWCoi4TeQj2+Nr9kJ9trx9o1KrVcT4Ki58CCvN5QOls6Z0yQ=="],
+    "@opencode-ai/pty-linux-arm64-gnu": ["@opencode-ai/pty-linux-arm64-gnu@0.1.11", "", { "os": "linux", "cpu": "arm64" }, "sha512-PTU9Ss5a5pApw6IeVvjjbFPuui2oKMoTQ/nY+K1+idLpgMeQHXk2URJbQqetqJxH4OLL5eSutDeWvpkweW0tTw=="],

-    "@opencode-ai/pty-linux-arm64-musl": ["@opencode-ai/pty-linux-arm64-musl@0.1.12", "", { "os": "linux", "cpu": "arm64" }, "sha512-2nTN7ggu1h9XgjNcoQMYjP5sirfYnAskpdFCOqjokLqhytX/IMMmkRTQs+foaEaPz0dAIQD3DQplR2jZIgxp1w=="],
+    "@opencode-ai/pty-linux-arm64-musl": ["@opencode-ai/pty-linux-arm64-musl@0.1.11", "", { "os": "linux", "cpu": "arm64" }, "sha512-NFZ2LLfEaO6858cYtEwfQKda/HnCrPR0WflnWoDllHmdY12umeHkeE8DnZQK48tziXxvEACspItXmleiAMAg3g=="],

-    "@opencode-ai/pty-linux-x64-gnu": ["@opencode-ai/pty-linux-x64-gnu@0.1.12", "", { "os": "linux", "cpu": "x64" }, "sha512-FnD5ndnObTQKAoaVvxLKi5W+r3/+dsaMsobz6uK0B9hlmffXxY5CQ6HQyUU/h3aIKLWXxho5XYkA2b9yrp8/gA=="],
+    "@opencode-ai/pty-linux-x64-gnu": ["@opencode-ai/pty-linux-x64-gnu@0.1.11", "", { "os": "linux", "cpu": "x64" }, "sha512-2Wbko2tFkgTmY6ceB+QMA3E+omaRd5IBBFjJoikMxkc7n75TXYQVz09tCC0pPW+flGvApFQ2YcIkSotdLwit+A=="],

-    "@opencode-ai/pty-linux-x64-musl": ["@opencode-ai/pty-linux-x64-musl@0.1.12", "", { "os": "linux", "cpu": "x64" }, "sha512-prkrNu6uvjqoffxdGiDHSU5C0Y+kCSfv+lslu7dfRPgPKenVELNpRTAbOduyrWPac2vGt8j5NM61icJyodbJmA=="],
+    "@opencode-ai/pty-linux-x64-musl": ["@opencode-ai/pty-linux-x64-musl@0.1.11", "", { "os": "linux", "cpu": "x64" }, "sha512-PF7vbOsSOVbRSo11pOOmJq/Vp34Ww7Xoo8rUeMSAoG1tJSIp2SXFHCRKEGH9H4KxGUfpRHQlDBV1HLz8onnyJQ=="],

    "@opencode-ai/schema": ["@opencode-ai/schema@workspace:packages/schema"],

@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-iYdVrLtyKmjlyypisF9SqzgyriWT90kSCh3crxw9AKU=",
-    "aarch64-linux": "sha256-BV2t4w5ujArbtSC/Qfm3gLzevQW9A6hMgOyPVp94g/o=",
-    "aarch64-darwin": "sha256-EwMq7zaxzzcsmH0Pjqu4ftGdcM8Lna8mvHgKzRcVI8g=",
-    "x86_64-darwin": "sha256-PokzxlkQy6JvHADF2ZMIIDI1u9ZjSNNedpmR9gvHS5c="
+    "x86_64-linux": "sha256-NV1PD2fCgWEKsr9kR0pV9jgkC400dzoF7/DnI/fY5yI=",
+    "aarch64-linux": "sha256-TDTdwE0mcHLrrKPDwPPBk3qIDl/PXJrLX6Zbwp7EH3I=",
+    "aarch64-darwin": "sha256-6MEoiV1UKAWgC7C6PR4USCP/LLZXROfBfPg6sb2VVWg=",
+    "x86_64-darwin": "sha256-8JV6YVZFq1BC++zpARxBWhQ+wuNJrWgTZJ6jfQhDybs="
  }
 }
@@ -31,7 +31,7 @@ Your app is ready to be deployed!

 ## E2E Testing

-Locally, Playwright starts the Vite dev server automatically via `webServer`, or reuses one already running at the configured address. The browser suite uses isolated API fixtures rather than a live opencode backend.
+Playwright starts the Vite dev server automatically via `webServer`, and UI tests expect an opencode backend at `localhost:4096` by default.

 ```bash
 bunx playwright install chromium
@@ -39,35 +39,11 @@ bun run test:e2e:local
 bun run test:e2e:local -- --grep "settings"
 ```

-CI builds the app once and runs the same suite against Vite preview, serving production assets from `dist`. Managed built runs never reuse an existing server, so a running dev server cannot silently replace the production build. To run this mode locally:
-
-```bash
-bun run test:e2e:built
-bun run test:e2e:built -- --grep "settings"
-```
-
-To test an already-running dev server without starting or building a server:
-
-```bash
-PLAYWRIGHT_BASE_URL=http://127.0.0.1:4444 bun run test:e2e
-```
-
-For an already-running production build, also set `PLAYWRIGHT_BUILD=1` so the fixture API uses the app's origin:
-
-```bash
-PLAYWRIGHT_BUILD=1 PLAYWRIGHT_BASE_URL=http://127.0.0.1:4444 bun run test:e2e
-```
-
-External targets must use HTTP because fixture URLs use HTTP. `PLAYWRIGHT_BASE_URL` skips server startup and building in either mode.
-
-Compiled CLI startup and service lifecycle coverage runs separately in CI via `packages/cli/script/service-smoke.ts`.
-
 Environment options:

- `PLAYWRIGHT_BUILD=1` (build and preview locally; always enabled when `CI` is set)
- `PLAYWRIGHT_SERVER_HOST` / `PLAYWRIGHT_SERVER_PORT` (dev fixture API address, default: `127.0.0.1:4096`; built runs use the app's origin, matching production)
- `PLAYWRIGHT_PORT` (managed dev or preview server port, default: `3000`)
- `PLAYWRIGHT_BASE_URL` (use an externally managed app instead of starting a server; otherwise defaults to `http://127.0.0.1:<PLAYWRIGHT_PORT>`)
+- `PLAYWRIGHT_SERVER_HOST` / `PLAYWRIGHT_SERVER_PORT` (backend address, default: `localhost:4096`)
+- `PLAYWRIGHT_PORT` (Vite dev server port, default: `3000`)
+- `PLAYWRIGHT_BASE_URL` (override base URL, default: `http://localhost:<PLAYWRIGHT_PORT>`)

 ## Deployment

@@ -44,7 +44,6 @@ The suite contains:
 - single-session tab close timing through stable home restoration
 - cached session repaint and mutation tracing
 - streaming timeline throughput, RAF-gap, long-task, geometry, and remount diagnostics
- retained renderer heap with a large model catalog across repeated session navigation

 All benchmarks import the shared `benchmark` fixture. Pages created through Playwright's `page` fixture automatically capture main-frame navigation history and emit a Chrome trace when `OPENCODE_PERFORMANCE_TRACE_DIR` is set. Benchmarks that need isolated browser contexts use `withBenchmarkPage`, which owns the context and the same diagnostics lifecycle.

@@ -79,26 +78,6 @@ Benchmarks do not assert machine-dependent performance budgets. Streaming proces

 Committed smoke and regression tests continue to own correctness coverage for pagination, tab paint, context resize, collapse state, and composer spacing.

-Tab-switch timing starts at `mousedown`, when mouse-selected tabs actually navigate, with a `click` fallback for keyboard activation. The probe excludes hidden/transparent content and intersects answers with their virtual-row clip and viewport. The tab workload requires the destination's final answer to be visible with Markdown ready. These results are not directly comparable to older click-start, geometry-only measurements. `stableObservedMs` includes confirmation across three correct samples; `firstCorrectObservedMs` is the first sample meeting all content and geometry checks. Neither is a compositor presentation timestamp.
-
-Each tab scenario reports one sample, including its raw observations. Use Playwright's `--repeat-each=5` for repeated measurements. Cached scenarios warm the destination at the same panel width before leaving it; a separate resized scenario validates reuse after opening the review pane changes that width.
-
-```sh
-bunx playwright test --config e2e/performance/playwright.config.ts \
-  timeline/session-tab-switch-benchmark.spec.ts --repeat-each=5
-```
-
-## Retained renderer memory
-
-Run the catalog workload against the production app bundle:
-
-```sh
-bunx playwright test --config e2e/performance/playwright.config.ts \
-  timeline/provider-memory-benchmark.spec.ts --repeat-each=3
-```
-
-`PROVIDER_MEMORY_MODELS` defaults to 1,200 and `PROVIDER_MEMORY_SWITCHES` defaults to 10. Each sample records Chromium's `Runtime.getHeapUsage` and `Memory.getDOMCounters` after an explicit garbage collection. This measures retained state, not allocation peaks or normal GC timing. It does not include worker heaps, the Electron main/GPU processes, or the OpenCode server, and must not be reported as total desktop RAM. Use identical model counts and navigation sequences for before/after comparisons.
-
 ## Chrome traces

 Set `OPENCODE_PERFORMANCE_TRACE_DIR` to emit a standard Chrome DevTools trace for every benchmark page automatically:
@@ -1,7 +1,7 @@
 import config from "../../playwright.config"

 const port = Number(process.env.PLAYWRIGHT_PORT ?? 3000)
-process.env.PLAYWRIGHT_SERVER_PORT = new URL(process.env.PLAYWRIGHT_BASE_URL ?? `http://127.0.0.1:${port}`).port || "80"
+process.env.PLAYWRIGHT_SERVER_PORT = String(port)
 process.env.OPENCODE_PERFORMANCE_RUN_ID ??= `${new Date().toISOString().replace(/[:.]/g, "-")}-${process.pid}`

 export default {
@@ -12,11 +12,9 @@ export default {
  fullyParallel: false,
  workers: 1,
  reporter: [["html", { outputFolder: "../playwright-report/performance", open: "never" }], ["line"]],
-  webServer: config.webServer
-    ? {
-        ...config.webServer,
-        command: `bun run build && bun run serve -- --host 0.0.0.0 --port ${port} --strictPort`,
-        reuseExistingServer: false,
-      }
-    : undefined,
+  webServer: {
+    ...config.webServer,
+    command: `bun run build && bun run serve -- --host 0.0.0.0 --port ${port} --strictPort`,
+    reuseExistingServer: false,
+  },
 }
@@ -126,19 +126,13 @@ test("keeps moving upward while drag-selecting above the timeline", async ({ pag
      )
    })
  })
-  const textBox = await text.evaluate((element) => {
-    const range = document.createRange()
-    range.selectNodeContents(element)
-    const rect = range.getClientRects()[0]
-    return rect ? { x: rect.x, y: rect.y, width: rect.width, height: rect.height } : null
-  })
+  const textBox = await text.boundingBox()
  const scrollBox = await scroller.boundingBox()
  expect(textBox).not.toBeNull()
  expect(scrollBox).not.toBeNull()
  if (!textBox || !scrollBox) return

-  // Start on a text line, not the empty right edge or gap between wrapped lines.
-  await page.mouse.move(textBox.x + Math.min(20, textBox.width / 2), textBox.y + textBox.height / 2)
+  await page.mouse.move(textBox.x + textBox.width - 10, textBox.y + textBox.height / 2)
  await page.mouse.down()
  await page.mouse.move(textBox.x + 20, scrollBox.y - 120, { steps: 30 })

@@ -201,45 +195,6 @@ test("does not pull a keyboard-scrolled user during shell remeasurement", async
  await reportVisualStability(testInfo, "keyboard-during-resize", trace, anchorPlan(regions))
 })

-test("keeps an older answer selected while scrolling within the interaction buffer", async ({ page }) => {
-  await setupTimeline(page, {
-    messages: history(80),
-    viewport: { width: 1400, height: 700 },
-    reducedMotion: true,
-  })
-  const scroller = page.locator(".scroll-view__viewport", { has: page.locator("[data-timeline-row]") })
-  const answer = page.getByText("History 78.", { exact: false })
-  await expect(answer).toBeVisible()
-  await expect
-    .poll(() =>
-      answer.evaluate((element) => element.closest('[data-component="markdown"]')?.hasAttribute("data-markdown-ready")),
-    )
-    .toBe(true)
-  const textBox = await answer.evaluate((element) => {
-    const range = document.createRange()
-    range.selectNodeContents(element)
-    const rect = range.getClientRects()[0]
-    return { x: rect.x, y: rect.y, width: rect.width, height: rect.height }
-  })
-  const scrollBox = await scroller.boundingBox()
-  expect(scrollBox).not.toBeNull()
-  if (!scrollBox) return
-  await page.mouse.move(textBox.x + Math.min(180, textBox.width - 2), textBox.y + textBox.height / 2)
-  await page.mouse.down()
-  await page.mouse.move(textBox.x + 2, textBox.y + textBox.height / 2, { steps: 30 })
-  await page.mouse.up()
-  await expect.poll(() => page.evaluate(() => window.getSelection()?.toString())).toContain("History 78.")
-  await page.mouse.move(scrollBox.x + scrollBox.width / 2, scrollBox.y + scrollBox.height / 2)
-  await page.mouse.wheel(0, -450)
-  await expect
-    .poll(() => scroller.evaluate((element) => element.scrollHeight - element.clientHeight - element.scrollTop))
-    .toBeGreaterThan(400)
-  await expect(answer).toHaveCount(1)
-  await expect.poll(() => page.evaluate(() => window.getSelection()?.toString())).toContain("History 78.")
-  await page.getByRole("heading", { name: "Timeline visual stability" }).click()
-  await expect.poll(() => page.evaluate(() => window.getSelection()?.isCollapsed)).toBe(true)
-})
-
 test("tracks keyboard scrolling from a focused timeline descendant", async ({ page }, testInfo) => {
  const shellID = "prt_descendant_keyboard_01_shell"
  const timeline = await setupTimeline(page, {
@@ -304,16 +259,12 @@ test("does not claim keyboard scrolling owned by a nested scrollable", async ({
  const before = await scroller.evaluate((element) => element.scrollTop)
  const nestedBefore = await nested.evaluate((element) => element.scrollTop)
  await nested.press("PageUp")
-  await expect.poll(() => nested.evaluate((element) => element.scrollTop)).toBeLessThan(nestedBefore)
+  await page.waitForTimeout(300)
  expect(await scroller.evaluate((element) => element.scrollTop)).toBe(before)
+  expect(await nested.evaluate((element) => element.scrollTop)).toBeLessThan(nestedBefore)

-  await nested.evaluate((element) => element.scrollTo({ top: 0, behavior: "instant" }))
-  await expect.poll(() => nested.evaluate((element) => element.scrollTop)).toBe(0)
-  await scroller.evaluate((element) => {
-    element.dispatchEvent(new WheelEvent("wheel", { bubbles: true, cancelable: true, deltaY: -1 }))
-    element.scrollTo({ top: Math.min(300, element.scrollHeight - element.clientHeight), behavior: "instant" })
-  })
-  await expect.poll(() => scroller.evaluate((element) => element.scrollTop)).toBeLessThan(500)
+  await nested.evaluate((element) => (element.scrollTop = 0))
+  await scroller.evaluate((element) => (element.scrollTop = Math.min(300, element.scrollHeight - element.clientHeight)))
  const boundaryBefore = await scroller.evaluate((element) => element.scrollTop)
  expect(boundaryBefore).toBeGreaterThan(0)
  await nested.press("PageUp")
@@ -1,98 +0,0 @@
-import { benchmark, expect } from "../benchmark"
-import { mockOpenCodeServer } from "../../utils/mock-server"
-import { expectSessionTitle } from "../../utils/waits"
-import { fixture, pageMessages } from "./session-timeline-stress.fixture"
-import { installStressSessionTabs, installTimelineSettings, stressSessionHref } from "./timeline-test-helpers"
-import { waitForStableTimeline } from "./session-tab-switch-probe"
-import type { CatalogUpdated } from "@opencode-ai/client/promise"
-
-benchmark("measures retained renderer memory with a large model catalog", async ({ page, report }) => {
-  benchmark.setTimeout(120_000)
-  const count = Number(process.env.PROVIDER_MEMORY_MODELS ?? 1200)
-  const switches = Number(process.env.PROVIDER_MEMORY_SWITCHES ?? 10)
-  const provider = fixture.provider.all[0]
-  const selected = { ...provider.models["claude-opus-4-6"] }
-  await mockOpenCodeServer(page, {
-    directory: fixture.directory,
-    project: fixture.project,
-    sessions: fixture.sessions,
-    pageMessages,
-    provider: {
-      ...fixture.provider,
-      all: [
-        {
-          ...provider,
-          models: {
-            [selected.id]: selected,
-            ...Object.fromEntries(
-              Array.from({ length: count - 1 }, (_, index) => {
-                const id = `catalog-model-${index}`
-                return [
-                  id,
-                  {
-                    id,
-                    name: `Catalog model ${index}`,
-                    cost: { input: 1, output: 2 },
-                    limit: { context: 200_000, output: 8192 },
-                    variants: { high: { reasoningEffort: "high" } },
-                  },
-                ]
-              }),
-            ),
-          },
-        },
-      ],
-    },
-  })
-  await installTimelineSettings(page)
-  await installStressSessionTabs(page)
-  await page.goto(stressSessionHref(fixture.sourceID))
-  await expectSessionTitle(page, fixture.expected.sourceTitle)
-  await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
-  await expect(page.locator('[data-action="composer-model"]')).toContainText("Claude Opus 4.6")
-  const cdp = await page.context().newCDPSession(page)
-  const samples = []
-  for (let index = 0; index <= switches; index++) {
-    if (index > 0) {
-      const target = index % 2 === 1
-      const id = target ? fixture.targetID : fixture.sourceID
-      await page.locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(id)}"]`).click()
-      await expectSessionTitle(page, target ? fixture.expected.targetTitle : fixture.expected.sourceTitle)
-      await waitForStableTimeline(
-        page,
-        (target ? fixture.expected.targetMessageIDs : fixture.expected.sourceMessageIDs).at(-1)!,
-      )
-      await expect(page.locator('[data-action="composer-model"]')).toContainText("Claude Opus 4.6")
-    }
-    // GC is an explicit retained-heap measurement, not an application optimization or readiness wait.
-    await cdp.send("HeapProfiler.collectGarbage")
-    samples.push({
-      switches: index,
-      heap: await cdp.send("Runtime.getHeapUsage"),
-      dom: await cdp.send("Memory.getDOMCounters"),
-    })
-  }
-  expect(samples).toHaveLength(switches + 1)
-  expect(samples.every((sample) => sample.heap.usedSize > 0)).toBe(true)
-  selected.name = "Updated catalog model"
-  await page.evaluate(
-    (event) => {
-      const host = window as Window & { __mockServerStream?: { push: (events: CatalogUpdated[]) => void } }
-      if (!host.__mockServerStream) throw new Error("Missing fixture event stream")
-      host.__mockServerStream.push([event])
-    },
-    {
-      id: "evt_catalog_refresh",
-      created: Date.now(),
-      type: "catalog.updated",
-      location: { directory: fixture.directory },
-      data: {},
-    } satisfies CatalogUpdated,
-  )
-  await expect(page.locator('[data-action="composer-model"]')).toContainText(selected.name)
-  report(
-    { samples },
-    { models: count, switches, gc: "explicit", scope: "renderer main isolate; not total desktop RAM" },
-  )
-  await cdp.detach()
-})
@@ -11,73 +11,115 @@ import {
 } from "./timeline-test-helpers"
 import { measureSessionSwitch, waitForStableTimeline } from "./session-tab-switch-probe"

-const scenarios = [
-  { cached: false, review: false, resized: false },
-  { cached: false, review: true, resized: false },
-  { cached: true, review: false, resized: false },
-  { cached: true, review: true, resized: false },
-  { cached: true, review: true, resized: true },
-]
+type Result = Awaited<ReturnType<typeof measureSessionSwitch>>

-scenarios.forEach((scenario) => {
-  const name = `tab switch: ${scenario.cached ? "cached" : "unmounted"}, review ${scenario.review ? "open" : "closed"}${scenario.resized ? ", resized" : ""}`
-  benchmark(name, async ({ browser, report }, testInfo) => {
-    const result = await withBenchmarkPage(
-      browser,
-      name,
-      async (page) => {
-        await mockStressTimeline(page, { vcsDiff: createReviewDiffs() })
-        await installTimelineSettings(page)
-        await installStressSessionTabs(page)
-        await page.goto(stressSessionHref(fixture.sourceID))
-        await expectSessionTitle(page, fixture.expected.sourceTitle)
-        await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
-        if (scenario.review && !scenario.resized) await openReviewPane(page)
-        if (scenario.cached) {
-          await switchSession(page, fixture.targetID, fixture.expected.targetTitle)
-          const answer = page.locator(`[data-timeline-part-id="${fixture.expected.targetPartIDs.at(-1)}"]`)
-          await expect(answer.locator('[data-component="markdown"]')).toHaveAttribute("data-markdown-ready", "")
-          await expect
-            .poll(() =>
-              answer.evaluate((element) => element.checkVisibility({ checkOpacity: true, checkVisibilityCSS: true })),
-            )
-            .toBe(true)
-          await waitForStableTimeline(page, fixture.expected.targetMessageIDs.at(-1)!)
-          await switchSession(page, fixture.sourceID, fixture.expected.sourceTitle)
+benchmark(
+  "benchmarks session tab switching with and without the review pane",
+  async ({ browser, report }, testInfo) => {
+    benchmark.setTimeout(360_000)
+    const runs = Number(process.env.SESSION_TAB_SWITCH_RUNS ?? 5)
+    const results = {
+      closed: { cold: [] as Result[], hot: [] as Result[] },
+      open: { cold: [] as Result[], hot: [] as Result[] },
+    }
+    for (const reviewPane of ["closed", "open"] as const) {
+      for (const mode of ["cold", "hot"] as const) {
+        for (let run = 0; run < runs; run++) {
+          results[reviewPane][mode].push(
+            await withBenchmarkPage(
+              browser,
+              `session-tab-switch-${reviewPane}-${mode}-${run}`,
+              (page) => trial(page, mode, reviewPane),
+              testInfo,
+            ),
+          )
        }
-        if (scenario.resized) await openReviewPane(page)
-        await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
+      }
+    }
+    report({ results, summary: summarizeReviewPane(results) }, { runs, reviewDiffs: createReviewDiffs().length })
+  },
+)

-        return measureSessionSwitch(page, {
-          destinationIDs: fixture.messages[fixture.targetID].map((message) => message.id),
-          sourceIDs: fixture.messages[fixture.sourceID].map((message) => message.id),
-          lastID: fixture.expected.targetMessageIDs.at(-1)!,
-          requiredPartID: fixture.expected.targetPartIDs.at(-1),
-          href: stressSessionHref(fixture.targetID),
-          switch: () => switchSession(page, fixture.targetID, fixture.expected.targetTitle),
-        })
-      },
-      testInfo,
-    )
-    expect(result.unknownSamples).toBe(0)
-    expect(result.wrongDestinationSamples).toBe(0)
-    if (scenario.cached) expect(result.blankSamples).toBe(0)
-    report(result, { ...scenario, inputEvent: "mousedown", requireReadyAnswer: true })
+async function trial(page: Page, mode: "cold" | "hot", reviewPane: "closed" | "open") {
+  const reviewDiffs = createReviewDiffs()
+  await mockStressTimeline(page, { vcsDiff: reviewDiffs })
+  await installTimelineSettings(page)
+  await installStressSessionTabs(page)
+  if (mode === "hot") {
+    await page.goto(stressSessionHref(fixture.targetID))
+    await expectSessionTitle(page, fixture.expected.targetTitle)
+    await waitForStableTimeline(page, fixture.expected.targetMessageIDs.at(-1)!)
+    await switchSession(page, fixture.sourceID, fixture.expected.sourceTitle)
+  } else {
+    await page.goto(stressSessionHref(fixture.sourceID))
+    await expectSessionTitle(page, fixture.expected.sourceTitle)
+  }
+  await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
+  if (reviewPane === "open") {
+    await openReviewPane(page)
+    await waitForStableTimeline(page, fixture.expected.sourceMessageIDs.at(-1)!)
+  }
+
+  const destinationIDs = fixture.messages[fixture.targetID].map((message) => message.id)
+  const sourceIDs = fixture.messages[fixture.sourceID].map((message) => message.id)
+  const lastID = fixture.expected.targetMessageIDs.at(-1)!
+  const href = stressSessionHref(fixture.targetID)
+  const result = await measureSessionSwitch(page, {
+    destinationIDs,
+    sourceIDs,
+    lastID,
+    href,
+    switch: () => switchSession(page, fixture.targetID, fixture.expected.targetTitle),
  })
-})
+  return result
+}
+
+function summarize(results: Record<"cold" | "hot", Result[]>) {
+  const stats = (values: (number | null)[]) => {
+    const sorted = values.filter((value): value is number => value !== null).sort((a, b) => a - b)
+    return {
+      min: sorted[0] ?? null,
+      median: sorted[Math.floor(sorted.length / 2)] ?? null,
+      max: sorted.at(-1) ?? null,
+      missing: values.length - sorted.length,
+    }
+  }
+  return Object.fromEntries(
+    Object.entries(results).map(([mode, values]) => [
+      mode,
+      {
+        firstDestinationObservedMs: stats(values.map((value) => value.firstDestinationObservedMs)),
+        firstCorrectObservedMs: stats(values.map((value) => value.firstCorrectObservedMs)),
+        stableObservedMs: stats(values.map((value) => value.stableObservedMs)),
+      },
+    ]),
+  )
+}
+
+function summarizeReviewPane(results: Record<"closed" | "open", Record<"cold" | "hot", Result[]>>) {
+  return Object.fromEntries(
+    Object.entries(results).map(([reviewPane, values]) => [
+      reviewPane,
+      summarize(values as Record<"cold" | "hot", Result[]>),
+    ]),
+  )
+}

 async function switchSession(page: Page, sessionID: string, title: string) {
-  const tab = page.locator(`[data-slot="titlebar-tabs"] a[href="${stressSessionHref(sessionID)}"]`)
-  await expect(tab).toHaveCount(1)
+  const href = stressSessionHref(sessionID)
+  const tab = page.locator(`[data-slot="titlebar-tabs"] a[href="${href}"]`).first()
+  await expect(tab).toBeVisible()
  await tab.click()
  await expectSessionTitle(page, title)
 }

 async function openReviewPane(page: Page) {
  await page.getByRole("button", { name: "Toggle review" }).click()
-  await expect(page.locator("#review-panel")).toBeVisible()
+  const panel = page.locator("#review-panel")
+  await expect(panel).toBeVisible()
  await page.waitForFunction(() => {
-    const text = document.querySelector("#review-panel")?.textContent ?? ""
+    const panel = document.querySelector<HTMLElement>("#review-panel")
+    const text = panel?.textContent ?? ""
    return text.includes("generated-000.ts") && text.includes("+3")
  })
 }
@@ -20,10 +20,9 @@ export function classifySessionSwitch(samples: SessionSwitchSample[]) {
  const firstCorrect = samples.findIndex(isCorrectDestination)
  const stable = samples.findIndex((_, index) => isStableSessionSwitch(samples.slice(index, index + 3)))
  return {
-    samples,
    firstDestinationObservedMs: samples[firstDestination]?.observedAtMs ?? null,
    firstCorrectObservedMs: samples[firstCorrect]?.observedAtMs ?? null,
-    stableObservedMs: stable < 0 ? null : samples[stable + 2].observedAtMs,
+    stableObservedMs: samples[stable + 2]?.observedAtMs ?? null,
    wrongDestinationSamples: samples
      .slice(firstDestination)
      .filter((sample) => sample.destination.length > 0 && !sample.last).length,
@@ -1,67 +0,0 @@
-import { benchmark, expect } from "../benchmark"
-import { measureSessionSwitch } from "./session-tab-switch-probe"
-import type { SessionSwitchSample } from "./session-tab-switch-metrics"
-
-benchmark("starts at mousedown and excludes hidden or unfinished destination content", async ({ page, report }) => {
-  await page.setContent(`
-    <a href="/session/destination">Destination</a>
-    <div class="scroll-view__viewport" style="height:200px;overflow:auto">
-      <div data-timeline-row="message" data-timeline-key="row" data-message-id="source">
-        <div data-timeline-part-id="answer"><div data-component="markdown">Destination answer</div></div>
-      </div>
-    </div>
-  `)
-  await page.evaluate(() => {
-    document.querySelector("a")!.addEventListener("mousedown", () => {
-      const row = document.querySelector<HTMLElement>("[data-message-id]")!
-      row.dataset.messageId = "destination"
-      row.style.visibility = "hidden"
-    })
-  })
-  const result = await measureSessionSwitch(page, {
-    destinationIDs: ["destination"],
-    sourceIDs: ["source"],
-    lastID: "destination",
-    requiredPartID: "answer",
-    requireBottomAnchor: false,
-    href: "/session/destination",
-    switch: async () => {
-      // No click is dispatched: the probe must observe the event that activates tabs.
-      await page.getByRole("link", { name: "Destination" }).dispatchEvent("mousedown", { button: 0 })
-      await page.waitForFunction(() => {
-        const host = window as Window & { __sessionSwitchProbe?: { samples: SessionSwitchSample[] } }
-        return host.__sessionSwitchProbe?.samples.some((sample) => !sample.hasVisibleRows)
-      })
-      await page.locator("[data-message-id]").evaluate((row) => row.style.removeProperty("visibility"))
-      await page.waitForFunction(() => {
-        const host = window as Window & { __sessionSwitchProbe?: { samples: SessionSwitchSample[] } }
-        return host.__sessionSwitchProbe?.samples.some(
-          (sample) => sample.destination.length > 0 && sample.requiredPartVisible === false,
-        )
-      })
-      const beforeClip = await page.evaluate(() => {
-        const row = document.querySelector<HTMLElement>("[data-timeline-key]")!
-        row.style.cssText = "height:10px;position:relative;overflow:clip"
-        const answer = row.querySelector<HTMLElement>("[data-timeline-part-id]")!
-        answer.style.cssText = "position:absolute;top:30px;width:150px"
-        answer.querySelector('[data-component="markdown"]')!.setAttribute("data-markdown-ready", "")
-        return (
-          (window as Window & { __sessionSwitchProbe?: { samples: SessionSwitchSample[] } }).__sessionSwitchProbe
-            ?.samples.length ?? 0
-        )
-      })
-      await page.waitForFunction((count) => {
-        const host = window as Window & { __sessionSwitchProbe?: { samples: SessionSwitchSample[] } }
-        return host.__sessionSwitchProbe?.samples.slice(count).some((sample) => sample.requiredPartVisible === false)
-      }, beforeClip)
-      await page.locator("[data-timeline-key]").evaluate((row) => {
-        row.style.height = "100px"
-      })
-    },
-  })
-  expect(result.blankSamples).toBeGreaterThan(0)
-  expect(result.firstCorrectObservedMs).not.toBeNull()
-  expect(result.stableObservedMs).not.toBeNull()
-  expect(result.firstCorrectObservedMs).toBeGreaterThan(result.firstDestinationObservedMs!)
-  report(result)
-})
@@ -25,7 +25,7 @@ async function installSessionSwitchProbe(
    let running = true
    const reviewLevels: Record<string, string> = {
      panel: "#review-panel",
-      tabs: '#review-panel [data-component="tabs"]',
+    tabs: '#review-panel [data-component="tabs"]',
      body: '#review-panel [data-slot="session-review-v2-body"]',
      review: '#review-panel [data-component="session-review-v2"]',
      preview: '#review-panel [data-slot="session-review-v2-preview"]',
@@ -37,6 +37,7 @@ async function installSessionSwitchProbe(
      if (!running || started === undefined) return
      setTimeout(() => {
        if (!running || started === undefined) return
+        const observedAtMs = performance.now() - started
        const reviewPanel = document.querySelector<HTMLElement>("#review-panel")
        const reviewFile = reviewPanel?.querySelector('[data-component="file"][data-mode="diff"]')
        const initialReviewFile = initialReviewNodes.file
@@ -62,30 +63,26 @@ async function installSessionSwitchProbe(
        )
        if (root) {
          const view = root.getBoundingClientRect()
-          const inViewport = (element: HTMLElement) => {
-            if (!element.checkVisibility({ checkOpacity: true, checkVisibilityCSS: true })) return false
-            const rect = element.getBoundingClientRect()
-            const clip = element.closest<HTMLElement>("[data-timeline-key]")?.getBoundingClientRect() ?? view
-            return (
-              Math.min(rect.bottom, clip.bottom, view.bottom) > Math.max(rect.top, clip.top, view.top) &&
-              Math.min(rect.right, clip.right, view.right) > Math.max(rect.left, clip.left, view.left)
-            )
-          }
          const visible = [...root.querySelectorAll<HTMLElement>("[data-message-id]")]
-            .filter(inViewport)
+            .filter((element) => {
+              const rect = element.getBoundingClientRect()
+              return rect.bottom > view.top && rect.top < view.bottom
+            })
            .map((element) => element.dataset.messageId!)
-          const hasVisibleRows = [...root.querySelectorAll<HTMLElement>("[data-timeline-key]")].some(inViewport)
+          const hasVisibleRows = [...root.querySelectorAll<HTMLElement>("[data-timeline-key]")].some((element) => {
+            const rect = element.getBoundingClientRect()
+            return rect.bottom > view.top && rect.top < view.bottom
+          })
          const requiredPartVisible = requiredPartID
            ? [...root.querySelectorAll<HTMLElement>("[data-timeline-part-id]")].some((element) => {
                if (element.dataset.timelinePartId !== requiredPartID) return false
-                if (!element.textContent?.trim()) return false
-                if (element.querySelector('[data-component="markdown"]:not([data-markdown-ready])')) return false
-                return inViewport(element)
+                const rect = element.getBoundingClientRect()
+                return rect.width > 0 && rect.height > 0 && rect.bottom > view.top && rect.top < view.bottom
              })
            : undefined
          const spacer = root.querySelector<HTMLElement>('[data-timeline-row="bottom-spacer"]')?.getBoundingClientRect()
          samples.push({
-            observedAtMs: performance.now() - started,
+            observedAtMs,
            destination: visible.filter((id) => destination.has(id)),
            source: visible.filter((id) => source.has(id)),
            hasVisibleRows,
@@ -97,7 +94,7 @@ async function installSessionSwitchProbe(
          })
        } else {
          samples.push({
-            observedAtMs: performance.now() - started,
+            observedAtMs,
            destination: [],
            source: [],
            hasVisibleRows: false,
@@ -110,25 +107,23 @@ async function installSessionSwitchProbe(
        requestAnimationFrame(sample)
      }, 0)
    }
-    const start = (event: MouseEvent) => {
-      if (started !== undefined || event.button !== 0) return
-      const link = event.target instanceof Element ? event.target.closest("a") : undefined
-      if (link?.getAttribute("href") !== href) return
-      started = performance.now()
-      for (const [name, selector] of Object.entries(reviewLevels)) {
-        initialReviewNodes[name] = document.querySelector(selector)
-      }
-      requestAnimationFrame(sample)
-    }
-    // Tabs activate on mousedown; click alone misses the synchronous navigation work.
-    document.addEventListener("mousedown", start, true)
-    document.addEventListener("click", start, true)
+    document.addEventListener(
+      "click",
+      (event) => {
+        const link = event.target instanceof Element ? event.target.closest("a") : undefined
+        if (link?.getAttribute("href") !== href) return
+        started = performance.now()
+        for (const [name, selector] of Object.entries(reviewLevels)) {
+          initialReviewNodes[name] = document.querySelector(selector)
+        }
+        requestAnimationFrame(sample)
+      },
+      { capture: true, once: true },
+    )
    ;(window as Window & { __sessionSwitchProbe?: SessionSwitchProbe }).__sessionSwitchProbe = {
      samples,
      stop: () => {
        running = false
-        document.removeEventListener("mousedown", start, true)
-        document.removeEventListener("click", start, true)
      },
    }
  }, input)
@@ -53,15 +53,6 @@ test("reports missing correctness without throwing", () => {
  expect(result.stableObservedMs).toBeNull()
 })

-test("does not report stability for only two correct samples", () => {
-  const result = classifySessionSwitch([
-    { observedAtMs: 16, destination: ["destination"], source: [], hasVisibleRows: true, last: true, bottomErrorPx: 0 },
-    { observedAtMs: 32, destination: ["destination"], source: [], hasVisibleRows: true, last: true, bottomErrorPx: 0 },
-  ])
-  expect(result.firstCorrectObservedMs).toBe(16)
-  expect(result.stableObservedMs).toBeNull()
-})
-
 test("requires an explicitly tracked part to be visible", () => {
  const result = classifySessionSwitch([
    {
@@ -1,120 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectAppVisible } from "../utils/waits"
-
-const draftID = "draft_large_paste"
-const directory = "/repo/large-paste"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-test.use({ permissions: ["clipboard-read", "clipboard-write"] })
-
-test.beforeEach(async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: "proj_large_paste",
-      worktree: directory,
-      vcs: "git",
-      name: "large-paste",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: { all: [], connected: [], default: {} },
-    sessions: [],
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.addInitScript(
-    ({ directory, draftID, server }) => {
-      localStorage.setItem("opencode-theme-id", "oc-2")
-      localStorage.setItem("opencode-color-scheme", "dark")
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({
-          projects: { local: [{ worktree: directory, expanded: true }] },
-          lastProject: { local: directory },
-        }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "draft", draftID, server, directory }]),
-      )
-    },
-    { directory, draftID, server },
-  )
-  await page.goto(`/new-session?draftId=${draftID}`)
-  const input = page.locator('[data-component="composer-editor"]')
-  await expectAppVisible(input)
-  await expect(input).toBeEditable()
-  await expect
-    .poll(() => input.evaluate((element) => getComputedStyle(element, "::before").content))
-    .toBe(`"${String.fromCodePoint(0x200b)}"`)
-  await input.click()
-})
-
-for (const lines of [6000, 25000]) {
-  test(`keeps a ${lines}-line crash report editable in a new session`, async ({ page }) => {
-    const input = page.getByRole("textbox", { name: "Prompt", exact: true })
-    const text = "Thread 0 Crashed:\n" + "0   Example  0x0000000100000000 frame + 32\n".repeat(lines) + "End of report"
-    await page.evaluate((text) => navigator.clipboard.writeText(text), text)
-    const events = await input.evaluateHandle((element) => {
-      const events = { count: 0 }
-      element.addEventListener("input", () => events.count++)
-      return events
-    })
-    await page.keyboard.press("ControlOrMeta+V")
-    await expect.poll(async () => (await input.innerText()) === text).toBe(true)
-    expect(await events.evaluate((events) => events.count)).toBe(1)
-    await expect(input).toBeFocused()
-    await page.keyboard.type("!")
-    await expect.poll(async () => (await input.innerText()) === text + "!").toBe(true)
-  })
-}
-
-for (const text of [
-  "single line <b> &amp;",
-  "first\nsecond",
-  "\n\n  indented\ttext  \n\nlast\n\n",
-  'literal <b>bold</b> &amp; & < > "quotes"\n<script>not code</script>\n<img src="example">',
-  "first\r\nsecond\rthird",
-]) {
-  test(`preserves text and native undo: ${JSON.stringify(text)}`, async ({ page }) => {
-    const input = page.getByRole("textbox", { name: "Prompt", exact: true })
-    await page.evaluate((text) => navigator.clipboard.writeText(text), text)
-    await page.keyboard.press("ControlOrMeta+V")
-    const expected = text.replace(/\r\n?/g, "\n")
-    await expect.poll(() => input.innerText()).toBe(expected)
-    await expect(input.locator("b, script, img")).toHaveCount(0)
-    await page.keyboard.press("ControlOrMeta+Z")
-    await expect(input).toBeEmpty()
-    await page.keyboard.press("ControlOrMeta+Shift+Z")
-    await expect.poll(() => input.innerText()).toBe(expected)
-  })
-}
-
-test("replaces only the selected text and leaves the caret after the paste", async ({ page }) => {
-  const input = page.getByRole("textbox", { name: "Prompt", exact: true })
-  await page.evaluate(() => navigator.clipboard.writeText("one\ntwo"))
-  await page.keyboard.type("before replace after")
-  await expect(input).toHaveText("before replace after")
-  await page.evaluate(() => document.fonts.ready)
-  const word = await input.evaluate((element) => {
-    const range = document.createRange()
-    range.setStart(element.firstChild!, 7)
-    range.setEnd(element.firstChild!, 14)
-    const rect = range.getBoundingClientRect()
-    return { x: rect.x, y: rect.y + rect.height / 2, width: rect.width }
-  })
-  await page.mouse.move(word.x, word.y)
-  await page.mouse.down()
-  await page.mouse.move(word.x + word.width, word.y, { steps: 5 })
-  await page.mouse.up()
-  await expect.poll(() => page.evaluate(() => window.getSelection()?.toString())).toBe("replace")
-  await page.keyboard.press("ControlOrMeta+V")
-  await expect.poll(() => input.innerText()).toBe("before one\ntwo after")
-  await page.keyboard.press("ControlOrMeta+Z")
-  await expect(input).toHaveText("before replace after")
-  await page.keyboard.press("ControlOrMeta+Shift+Z")
-  await expect.poll(() => input.innerText()).toBe("before one\ntwo after")
-  await page.keyboard.type("!")
-  await expect.poll(() => input.innerText()).toBe("before one\ntwo! after")
-})
@@ -3,7 +3,7 @@ import { base64Encode } from "@opencode-ai/util/encode"
 import { currentSession } from "../utils/mock-server"
 import { installSseTransport } from "../utils/sse-transport"

-const serverA = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+const serverA = "http://127.0.0.1:4096"
 const serverB = "http://127.0.0.1:4097"
 const sessionA = session("ses_server_a", "C:/server-a", "Server A session")
 const sessionB = session("ses_server_b", "/home/server-b", "Server B session")
@@ -12,17 +12,17 @@ test("closing the active server's last tab opens the remaining server tab", asyn
  const requests: string[] = []
  await mockServers(page, requests)
  await page.addInitScript(
-    ({ serverA, serverB, sessionA, sessionB }) => {
+    ({ serverB, sessionA, sessionB }) => {
      localStorage.setItem("opencode.global.dat:server", JSON.stringify({ list: [serverB] }))
      localStorage.setItem(
        "opencode.window.browser.dat:tabs",
        JSON.stringify([
-          { type: "session", server: serverA, sessionId: sessionA },
+          { type: "session", server: "http://127.0.0.1:4096", sessionId: sessionA },
          { type: "session", server: serverB, sessionId: sessionB },
        ]),
      )
    },
-    { serverA, serverB, sessionA: sessionA.id, sessionB: sessionB.id },
+    { serverB, sessionA: sessionA.id, sessionB: sessionB.id },
  )

  const hrefA = `/server/${base64Encode(serverA)}/session/${sessionA.id}`
@@ -55,7 +55,7 @@ function session(id: string, directory: string, title: string) {
 async function mockServers(page: Page, requests: string[]) {
  await installSseTransport(page, { server: serverA })
  await installSseTransport(page, { server: serverB })
-  await page.route("**/api/**", async (route) => {
+  await page.route("**/*", async (route) => {
    const url = new URL(route.request().url())
    if (url.origin !== serverA && url.origin !== serverB) return route.fallback()
    requests.push(url.toString())
@@ -1,178 +0,0 @@
-import { base64Encode } from "@opencode-ai/util/encode"
-import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectSessionTitle } from "../utils/waits"
-
-const directory = "C:\\OpenCode\\main"
-const workspace = "C:\\OpenCode\\worktree"
-const projectID = "proj_mcp_workspace"
-const sessionID = "ses_mcp_workspace"
-const title = "Workspace MCP routing"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-
-for (const shared of [true, false]) {
-  test(`toggles the workspace MCP when the default location ${shared ? "has" : "does not have"} the server`, async ({
-    page,
-  }, testInfo) => {
-    const connected = new Set<string>()
-    const requests: { path: string; directory: string }[] = []
-    await mockOpenCodeServer(page, {
-      directory,
-      project: {
-        id: projectID,
-        worktree: directory,
-        vcs: "git",
-        name: "mcp-workspace",
-        time: { created: 1700000000000, updated: 1700000000000 },
-        sandboxes: [workspace],
-      },
-      provider: { all: [], connected: [], default: {} },
-      sessions: [{ id: sessionID, projectID, directory: workspace, title }],
-      pageMessages: () => ({ items: [] }),
-    })
-    await page.route("**/api/mcp**", async (route) => {
-      if (route.request().method() === "OPTIONS") return route.fallback()
-      const url = new URL(route.request().url())
-      const target = url.searchParams.get("location[directory]") ?? directory
-      requests.push({ path: url.pathname, directory: target })
-      if (url.pathname === "/api/mcp/figma-desktop/connect") {
-        connected.add(target)
-        return route.fulfill({ status: 204 })
-      }
-      if (url.pathname === "/api/mcp/figma-desktop/disconnect") {
-        connected.delete(target)
-        return route.fulfill({ status: 204 })
-      }
-      return route.fulfill({
-        json: {
-          location: { directory: target },
-          data:
-            url.pathname === "/api/mcp/resource"
-              ? { resources: [], templates: [] }
-              : !shared && target !== workspace
-                ? []
-                : [{ name: "figma-desktop", status: { status: connected.has(target) ? "connected" : "disabled" } }],
-        },
-      })
-    })
-
-    await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-    await expectSessionTitle(page, title)
-    await expect(page.getByRole("textbox", { name: "Prompt", exact: true })).toBeEditable()
-    await page.keyboard.press("ControlOrMeta+;")
-    const dialog = page.getByRole("dialog", { name: "MCPs", exact: true })
-    await expect(dialog.getByText("figma-desktop", { exact: true })).toBeVisible()
-    const toggle = dialog.getByRole("switch")
-    await expect(toggle).not.toBeChecked()
-    await expect(toggle).toBeEnabled()
-    requests.length = 0
-
-    await dialog.locator('[data-slot="switch-control"]').click()
-    await expect(toggle).toBeChecked()
-    await expect(toggle).toBeEnabled()
-    expect(connected).toEqual(new Set([workspace]))
-    expect(requests).toContainEqual({ path: "/api/mcp/figma-desktop/connect", directory: workspace })
-    expect(requests).toContainEqual({ path: "/api/mcp/resource", directory: workspace })
-    expect(requests.every((request) => request.directory === workspace)).toBe(true)
-    await testInfo.attach("workspace-connected", { body: await page.screenshot(), contentType: "image/png" })
-
-    requests.length = 0
-    await dialog.getByText("figma-desktop", { exact: true }).click()
-    await expect(toggle).not.toBeChecked()
-    await expect(toggle).toBeEnabled()
-    expect(connected.size).toBe(0)
-    expect(requests).toContainEqual({ path: "/api/mcp/figma-desktop/disconnect", directory: workspace })
-    expect(requests.every((request) => request.directory === workspace)).toBe(true)
-  })
-}
-
-for (const surface of ["popover", "dialog"] as const) {
-  test(`shows connection failures from the MCP ${surface} and allows reconnecting`, async ({ page }, testInfo) => {
-    const error = "Streamable HTTP error: Error POSTing to endpoint: 404 Not Found"
-    const state = { fail: true, status: surface === "popover" ? "failed" : "disabled" }
-    const requests: { path: string; directory: string }[] = []
-    await page.addInitScript(() => {
-      localStorage.setItem("settings.v3", JSON.stringify({ general: { showStatus: true } }))
-    })
-    await mockOpenCodeServer(page, {
-      directory,
-      project: {
-        id: projectID,
-        worktree: directory,
-        vcs: "git",
-        name: "mcp-workspace",
-        time: { created: 1700000000000, updated: 1700000000000 },
-        sandboxes: [workspace],
-      },
-      provider: { all: [], connected: [], default: {} },
-      sessions: [{ id: sessionID, projectID, directory: workspace, title }],
-      pageMessages: () => ({ items: [] }),
-    })
-    await page.route("**/api/mcp**", async (route) => {
-      if (route.request().method() === "OPTIONS") return route.fallback()
-      const url = new URL(route.request().url())
-      const target = url.searchParams.get("location[directory]") ?? directory
-      requests.push({ path: url.pathname, directory: target })
-      if (url.pathname === "/api/mcp/figma-desktop/connect") {
-        state.status = state.fail ? "failed" : "connected"
-        // Connection failures are reported by the refreshed status, not the HTTP response.
-        return route.fulfill({ status: 204 })
-      }
-      return route.fulfill({
-        json: {
-          location: { directory: target },
-          data:
-            url.pathname === "/api/mcp/resource"
-              ? { resources: [], templates: [] }
-              : [
-                  {
-                    name: "figma-desktop",
-                    status: { status: target === workspace ? state.status : "connected", error },
-                  },
-                ],
-        },
-      })
-    })
-
-    await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-    await expectSessionTitle(page, title)
-    await expect(page.getByRole("textbox", { name: "Prompt", exact: true })).toBeEditable()
-    if (surface === "popover") await page.getByRole("button", { name: "Status", exact: true }).click()
-    if (surface === "dialog") await page.keyboard.press("ControlOrMeta+;")
-    const panel =
-      surface === "popover" ? page.getByRole("tabpanel") : page.getByRole("dialog", { name: "MCPs", exact: true })
-    const toggle = panel.getByRole("switch")
-    await expect(panel.getByText("figma-desktop", { exact: true })).toBeVisible()
-    await expect(toggle).not.toBeChecked()
-    await expect(toggle).toBeEnabled()
-    requests.length = 0
-
-    await panel.locator('[data-slot="switch-control"]').click()
-    const toast = page
-      .getByRole("listitem", { includeHidden: true })
-      .filter({ has: page.getByText("Request failed", { exact: true }) })
-    await expect(toast.getByText(`figma-desktop: ${error}`, { exact: true })).toBeVisible()
-    await expect(toggle).not.toBeChecked()
-    await expect(toggle).toBeEnabled()
-    expect(requests.filter((request) => request.path.endsWith("/connect"))).toEqual([
-      { path: "/api/mcp/figma-desktop/connect", directory: workspace },
-    ])
-    expect(requests.every((request) => request.directory === workspace)).toBe(true)
-    await expect(toast).toHaveCSS("opacity", "1")
-    await testInfo.attach("mcp-connection-error", { body: await page.screenshot(), contentType: "image/png" })
-
-    if (surface === "popover") await page.keyboard.press("Escape")
-    if (surface === "dialog") await panel.getByRole("button", { name: "Close", exact: true }).click()
-    await expect(panel).toBeHidden()
-    await toast.getByRole("button", { name: "Dismiss", exact: true }).click()
-    await expect(toast).toBeHidden()
-    state.fail = false
-    if (surface === "popover") await page.getByRole("button", { name: "Status", exact: true }).click()
-    if (surface === "dialog") await page.keyboard.press("ControlOrMeta+;")
-    await expect(toggle).toBeEnabled()
-    await panel.locator('[data-slot="switch-control"]').click()
-    await expect(toggle).toBeChecked()
-    await expect(toggle).toBeEnabled()
-    await expect(toast).toBeHidden()
-  })
-}
@@ -1,103 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { base64Encode } from "@opencode-ai/util/encode"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-const directory = "C:/Projects/extensions-demo"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-const session = {
-  id: "ses_project_extensions",
-  title: "Existing session",
-  directory,
-  projectID: "proj_extensions_demo",
-  time: { created: 1700000000000, updated: 1700000000000 },
-}
-
-test.use({ viewport: { width: 1440, height: 1000 }, colorScheme: "dark" })
-
-test("project Extensions stays inside settings while plugins load", async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: session.projectID,
-      canonical: directory,
-      name: "Extensions demo",
-      vcs: "git",
-      time: session.time,
-      sandboxes: [],
-    },
-    provider: { all: [], connected: [], default: {} },
-    sessions: [session],
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.addInitScript(
-    ({ server, sessionID, directory }) => {
-      localStorage.setItem(
-        "opencode.global.dat:server",
-        JSON.stringify({ projects: { local: [{ worktree: directory, expanded: true }] } }),
-      )
-      localStorage.setItem(
-        "opencode.window.browser.dat:tabs",
-        JSON.stringify([{ type: "session", server, sessionId: sessionID }]),
-      )
-    },
-    { server, sessionID: session.id, directory },
-  )
-  const href = `/server/${base64Encode(server)}/session/${session.id}`
-  await page.goto(href)
-  await expect(page.getByRole("heading", { name: session.title, exact: true })).toBeVisible()
-  await page.keyboard.press("Control+,")
-  const settings = page.getByTestId("settings-screen")
-  await settings.getByRole("tab", { name: "Projects", exact: true }).click()
-  await settings.getByText("Extensions demo", { exact: true }).click()
-  const dialog = page.getByRole("dialog")
-  await expect(dialog.getByRole("textbox", { name: "Name", exact: true })).toBeFocused()
-
-  const globalPlugins = Promise.withResolvers<void>()
-  const projectPlugins = Promise.withResolvers<void>()
-  await page.route(
-    (url) => url.pathname === "/api/plugin",
-    async (route) => {
-      const project = new URL(route.request().url()).searchParams.get("location[directory]")
-      await (project ? projectPlugins : globalPlugins).promise
-      await route.fulfill({
-        json: {
-          location: project ? { directory: project } : {},
-          data: (project ? ["shared-plugin", "project-plugin"] : ["shared-plugin"]).map((id) => ({
-            id,
-            source: { type: "package", package: id },
-            status: "active",
-            tui: false,
-          })),
-        },
-      })
-    },
-  )
-  const requested = page.waitForRequest((request) => {
-    const url = new URL(request.url())
-    return url.pathname === "/api/plugin" && url.searchParams.get("location[directory]") === directory
-  })
-  await dialog.getByRole("tab", { name: "Extensions", exact: true }).click()
-  await requested
-  await expect(page).toHaveURL(href)
-  await expect(dialog.getByRole("heading", { name: "Extensions", exact: true })).toBeVisible()
-  await expect(settings).toBeVisible()
-  await expect(page.getByRole("heading", { name: session.title, exact: true, includeHidden: true })).toBeHidden()
-  await dialog.getByRole("tab", { name: "Plugins", exact: true }).click()
-  await expect(dialog.getByRole("tab", { name: "Plugins", exact: true })).toHaveAttribute("aria-selected", "true")
-
-  globalPlugins.resolve()
-  await dialog.getByRole("tab", { name: "Scripts", exact: true }).click()
-  await expect(dialog.getByRole("heading", { name: "Scripts", exact: true })).toBeVisible()
-  await dialog.getByRole("tab", { name: "Extensions", exact: true }).click()
-  projectPlugins.resolve()
-  await dialog.getByRole("tab", { name: "Plugins", exact: true }).click()
-  await expect(dialog.getByText("project-plugin", { exact: true })).toBeVisible()
-  await dialog.getByRole("button", { name: "Shared with all projects 1", exact: true }).click()
-  await expect(dialog.getByText("shared-plugin", { exact: true })).toBeVisible()
-  await expect(page).toHaveURL(href)
-
-  await page.keyboard.press("Escape")
-  await expect(dialog).toBeHidden()
-  await expect(settings.getByRole("tab", { name: "Projects", exact: true })).toHaveAttribute("aria-selected", "true")
-  await expect(page.getByRole("heading", { name: session.title, exact: true, includeHidden: true })).toBeHidden()
-})
@@ -3,7 +3,7 @@ import { expect, test, type Page, type Route } from "@playwright/test"
 import { installSseTransport } from "../utils/sse-transport"
 import { currentSession } from "../utils/mock-server"

-const serverA = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+const serverA = `http://127.0.0.1:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
 const serverB = "http://127.0.0.1:4097"
 const directoryA = "C:/server-a"
 const directoryB = "/home/server-b"
@@ -308,7 +308,7 @@ async function mockServers(
  permissionResponses: PermissionResponse[] = [],
  options: MockServerOptions = {},
 ) {
-  await page.route("**/api/**", async (route) => {
+  await page.route("**/*", async (route) => {
    const url = new URL(route.request().url())
    if (url.origin !== serverA && url.origin !== serverB) return route.fallback()
    const remote = url.origin === serverB
@@ -2,7 +2,7 @@ import { expect, test, type Page, type Route } from "@playwright/test"
 import { base64Encode } from "@opencode-ai/util/encode"
 import { currentSession } from "../utils/mock-server"

-const serverA = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+const serverA = "http://127.0.0.1:4096"
 const serverB = "http://127.0.0.1:4097"
 const sessionA = session("ses_server_a", "C:/server-a", "Server A session")
 const sessionB = session("ses_server_b", "/home/server-b", "Server B session")
@@ -51,7 +51,7 @@ function session(id: string, directory: string, title: string) {
 }

 async function mockServers(page: Page) {
-  await page.route("**/api/**", async (route) => {
+  await page.route("**/*", async (route) => {
    const url = new URL(route.request().url())
    if (url.origin !== serverA && url.origin !== serverB) return route.fallback()
    const current = url.origin === serverA ? sessionA : sessionB
@@ -1,89 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { setupTimeline } from "../performance/timeline-stability/fixture"
-
-for (const width of [1400, 390]) {
-  for (const profile of [
-    { locale: "en", direction: "ltr" },
-    { locale: "en", direction: "rtl" },
-    { locale: "ar", direction: "rtl" },
-  ]) {
-    test(`keeps notices on one line: ${profile.locale} ${profile.direction} ${width}`, async ({ page }, info) => {
-      const command =
-        "bun run inspect --target src/renderer/session-timeline.ts --output artifacts/inspection-report.json ".repeat(5)
-      const descriptions = [
-        `${command}--finished`,
-        `Instructions changed\n${command}--updated`,
-        `\u0645\u0631\u0627\u062c\u0639\u0629 ${command}--reviewed`,
-      ]
-      await setupTimeline(page, {
-        locale: profile.locale,
-        viewport: { width, height: 900 },
-        sessionMessages: [
-          {
-            id: "msg_notice_user",
-            type: "user",
-            text: "Inspect the project and report completion.",
-            time: { created: 1 },
-          },
-          {
-            id: "msg_notice_shell",
-            type: "synthetic",
-            text: "Complete",
-            description: descriptions[0],
-            metadata: { source: "shell", state: "completed" },
-            time: { created: 2 },
-          },
-          { id: "msg_notice_system", type: "system", text: descriptions[1], time: { created: 3 } },
-          {
-            id: "msg_notice_agent",
-            type: "synthetic",
-            text: "Complete",
-            description: descriptions[2],
-            metadata: { source: "subagent", state: "completed", agent: "general" },
-            time: { created: 4 },
-          },
-        ],
-      })
-      await page
-        .locator("html")
-        .evaluate((element, direction) => element.setAttribute("dir", direction), profile.direction)
-      const notices = page.locator('[data-slot="session-timeline-notice"]')
-      await expect(notices).toHaveCount(3)
-      await expect(notices).toContainText(descriptions)
-      await page.locator("[data-timeline-virtual-content]").screenshot({ path: info.outputPath("notices.png") })
-      await expect
-        .poll(() =>
-          notices.evaluateAll((nodes) =>
-            nodes.map((node) => {
-              const style = getComputedStyle(node)
-              const element = node as HTMLElement
-              return {
-                direction: style.direction,
-                whiteSpace: style.whiteSpace,
-                textOverflow: style.textOverflow,
-                overflow: style.overflowX,
-                singleLine:
-                  Math.abs(
-                    element.clientHeight -
-                      parseFloat(style.paddingTop) -
-                      parseFloat(style.paddingBottom) -
-                      parseFloat(style.lineHeight),
-                  ) <= 1,
-                clipped: element.scrollWidth > element.clientWidth,
-              }
-            }),
-          ),
-        )
-        .toEqual(
-          Array.from({ length: 3 }, () => ({
-            direction: profile.direction,
-            whiteSpace: "nowrap",
-            textOverflow: "ellipsis",
-            overflow: "hidden",
-            singleLine: true,
-            clipped: true,
-          })),
-        )
-    })
-  }
-}
@@ -1,5 +1,5 @@
 import { expect, test, type Page } from "@playwright/test"
-import type { OpenCodeEvent, SessionMessageInfo } from "@opencode-ai/client/promise"
+import type { OpenCodeEvent } from "@opencode-ai/client/promise"
 import { base64Encode } from "@opencode-ai/util/encode"
 import { mockOpenCodeServer } from "../utils/mock-server"
 import { expectAppVisible } from "../utils/waits"
@@ -18,7 +18,7 @@ type InboxRow = {
  delivery: "steer" | "queue"
 }

-function createQueueMock(seed: string[], messages: SessionMessageInfo[] = []) {
+function createQueueMock(seed: string[]) {
  const rows: InboxRow[] = seed.map((text, index) => ({
    id: `inb_seed_${index + 1}`,
    sessionID,
@@ -32,16 +32,13 @@ function createQueueMock(seed: string[], messages: SessionMessageInfo[] = []) {
  const changes: { inboxID: string; action: "cancel" | "steer" }[] = []
  const log: string[] = []
  let sequence = 0
-  const emit = <Type extends OpenCodeEvent["type"]>(
-    type: Type,
-    data: Extract<OpenCodeEvent, { type: Type }>["data"],
-  ) => {
+  const emit = (type: OpenCodeEvent["type"], data: OpenCodeEvent["data"]) => {
    sequence += 1
    events.push({
      id: `evt_queue_${sequence}`,
      type,
      created: Date.now(),
-      durable: { aggregateID: sessionID, seq: sequence, version: type === "session.tool.success" ? 2 : 1 },
+      durable: { aggregateID: sessionID, seq: sequence, version: 1 },
      data,
    } as OpenCodeEvent)
  }
@@ -50,8 +47,6 @@ function createQueueMock(seed: string[], messages: SessionMessageInfo[] = []) {
    prompts,
    changes,
    log,
-    messages,
-    emit,
    events: () => events.splice(0),
    onPrompt: (input: { sessionID: string; body: Record<string, unknown> }) => {
      prompts.push(input.body)
@@ -131,11 +126,10 @@ async function openSession(page: Page, mock: ReturnType<typeof createQueueMock>,
        directory,
        title: "Session queue regression",
        version: "dev",
-        model: { id: "queue-model", providerID: "opencode" },
        time: { created: 1700000000000, updated: 1700000000000 },
      },
    ],
-    pageMessages: () => ({ items: mock.messages }),
+    pageMessages: () => ({ items: [] }),
    sessionStatus: () => ({ [sessionID]: { type: "running" } }),
    inbox: () => mock.rows.map((row) => ({ ...row, payload: { ...row.payload } })),
    onPrompt: mock.onPrompt,
@@ -233,126 +227,3 @@ test("editing restores the existing draft and replaces only the original queue p
  expect(mock.changes.map((change) => change.action)).toEqual(["cancel", "cancel", "cancel"])
  expect(mock.log[0]).toBe("prompt:queue")
 })
-
-for (const delivery of ["steer", "queue"] as const) {
-  test(`keeps finished tools above a pending ${delivery === "queue" ? "queue-to-steer" : "steer"} follow-up`, async ({
-    page,
-  }, testInfo) => {
-    const model = { id: "queue-model", providerID: "opencode" }
-    const userID = "msg_queue_initial_user"
-    const assistantID = "msg_queue_continued_assistant"
-    const followUp = "U2: Also check the retry path."
-    const mock = createQueueMock(
-      [],
-      [
-        { id: userID, type: "user", text: "U1: Inspect the queue ordering.", time: { created: 1700000000000 } },
-        {
-          id: "msg_queue_initial_assistant",
-          type: "assistant",
-          agent: "build",
-          model,
-          content: [{ type: "text", text: "A1: I will inspect the current implementation." }],
-          finish: "tool-calls",
-          time: { created: 1700000000001, completed: 1700000000002 },
-        },
-      ],
-    )
-    const view = await openSession(page, mock, delivery)
-    const transcript = page.locator("[data-timeline-virtual-content]")
-    const thinking = transcript.locator('[data-timeline-row="Thinking"]')
-    await expect(transcript.getByText("A1: I will inspect the current implementation.", { exact: true })).toBeVisible()
-    await expect(thinking).toHaveCount(0)
-    await expect(view.input).toBeEditable()
-    await view.input.fill(followUp)
-    await view.input.press("Enter")
-    await expect.poll(() => mock.rows.map((row) => row.delivery)).toEqual([delivery])
-    await expect(view.input).toHaveText("")
-
-    const inboxID = mock.rows[0].id
-    const pending = transcript.locator(`[data-timeline-row="UserMessage"][data-message-id="${inboxID}"]`)
-    if (delivery === "queue") {
-      const queued = view.rows.filter({ hasText: followUp })
-      await expect(queued).toBeVisible()
-      await expect(pending).toHaveCount(0)
-      await expect(thinking).toHaveCount(0)
-      await queued.hover()
-      await queued.getByRole("button", { name: "Steer", exact: true }).click()
-      await expect.poll(() => mock.changes).toEqual([{ inboxID, action: "steer" }])
-    }
-    await expect(view.rows).toHaveCount(0)
-    await expect(pending).toContainText(followUp)
-    await expect(thinking).toHaveCount(0)
-
-    // The next assistant step still belongs to U1: U2 has been admitted, not delivered.
-    mock.emit("session.step.started", { sessionID, assistantMessageID: assistantID, agent: "build", model })
-    for (const tool of [
-      { id: "tool_queue_read", name: "read", input: { path: "src/queue.ts" } },
-      { id: "tool_queue_grep", name: "grep", input: { pattern: "retry", path: "src" } },
-    ]) {
-      const ref = { sessionID, assistantMessageID: assistantID, id: tool.id }
-      mock.emit("session.tool.input.started", { ...ref, name: tool.name })
-      mock.emit("session.tool.input.ended", { ...ref, text: JSON.stringify(tool.input) })
-      mock.emit("session.tool.called", { ...ref, input: tool.input, executed: true })
-      mock.emit("session.tool.success", {
-        ...ref,
-        content: [{ type: "text", text: "Inspection complete." }],
-        executed: true,
-      })
-    }
-    mock.emit("session.step.ended", {
-      sessionID,
-      assistantMessageID: assistantID,
-      finish: "tool-calls",
-      cost: 0,
-      tokens: { input: 100, output: 20, reasoning: 0, cache: { read: 0, write: 0 } },
-    })
-    const tools = page.locator('[data-timeline-part-ids="tool_queue_read,tool_queue_grep"]')
-    await expect(tools).toBeVisible()
-    await expect(tools).toContainText(/Used\s*Read, Grep/)
-    await expect(tools.locator('[data-component="tag"]')).toHaveText("2")
-    await expect(thinking).toHaveCount(0)
-    await expect(pending).toBeVisible()
-    expect(mock.rows.map((row) => ({ id: row.id, delivery: row.delivery }))).toEqual([
-      { id: inboxID, delivery: "steer" },
-    ])
-    await transcript.screenshot({ path: testInfo.outputPath("pending-steer.png") })
-
-    // Soft assertions let delivery run too, even when the pending ordering regresses.
-    await expect.soft(tools.or(pending)).toHaveText([/Used\s*Read, Grep/, /U2: Also check the retry path\./])
-    await expect
-      .soft(transcript.locator('[data-timeline-row="AssistantPart"]').filter({ has: tools }))
-      .toHaveAttribute("data-message-id", userID)
-    await expect
-      .configure({ soft: true })
-      .poll(async () => {
-        const boxes = await Promise.all([tools.boundingBox(), pending.boundingBox()])
-        return boxes.every((box) => box !== null) && boxes[0]!.y + boxes[0]!.height <= boxes[1]!.y
-      })
-      .toBe(true)
-
-    mock.rows.splice(0, 1)
-    mock.emit("session.inbox.delivered", { sessionID, inboxID })
-    await expect(thinking).toHaveCount(0)
-    await expect(pending).toHaveCount(1)
-    await expect(transcript.locator('[data-timeline-row="UserMessage"]')).toHaveCount(2)
-    await expect(transcript.locator('[data-timeline-row="AssistantPart"]').filter({ has: tools })).toHaveAttribute(
-      "data-message-id",
-      userID,
-    )
-
-    const later = { sessionID, assistantMessageID: "msg_queue_follow_up_assistant" }
-    mock.emit("session.step.started", { ...later, agent: "build", model })
-    mock.emit("session.text.started", { ...later, ordinal: 0 })
-    mock.emit("session.text.ended", { ...later, ordinal: 0, text: "A3: Now checking the retry path for U2." })
-    const response = transcript
-      .locator('[data-timeline-row="AssistantPart"]')
-      .filter({ hasText: "A3: Now checking the retry path for U2." })
-    await expect(response).toHaveAttribute("data-message-id", inboxID)
-    await expect(thinking).toHaveCount(0)
-    await expect(tools.or(pending).or(response)).toHaveText([
-      /Used\s*Read, Grep/,
-      /U2: Also check the retry path\./,
-      /A3: Now checking the retry path for U2\./,
-    ])
-  })
-}
@@ -1,191 +0,0 @@
-import { expect, test } from "@playwright/test"
-import type { SessionMessageAssistant, ShellInfo } from "@opencode-ai/client/promise"
-import { directory, sessionID, setupTimeline } from "../performance/timeline-stability/fixture"
-
-const shell = {
-  id: "sh_background",
-  status: "running",
-  command: "bun run check",
-  cwd: directory,
-  shell: "bash",
-  file: "/tmp/check.out",
-  metadata: { sessionID },
-  time: { started: 2 },
-} satisfies ShellInfo
-
-for (const grouped of [false, true]) {
-  for (const status of ["exited", "killed", "timeout"] as const) {
-    test(`stops ${grouped ? "grouped" : "standalone"} background shell shimmer when ${status}`, async ({
-      page,
-    }, info) => {
-      const message: SessionMessageAssistant = {
-        id: "msg_background",
-        type: "assistant",
-        agent: "build",
-        model: { id: "model", providerID: "provider" },
-        content: [shell.id, "sh_other"].map((id) => ({
-          type: "tool",
-          id: `call_${id}`,
-          name: "shell",
-          state: {
-            status: "completed",
-            input: { command: shell.command },
-            content: [{ type: "text", text: "Command moved to the background." }],
-            metadata: { shellID: id, status: "running" },
-          },
-          time: { created: 2, completed: 3 },
-        })),
-        time: { created: 2, completed: 3 },
-      }
-      if (grouped)
-        message.content.unshift({
-          type: "tool",
-          id: "call_read",
-          name: "read",
-          state: {
-            status: "completed",
-            input: { path: "package.json" },
-            content: [{ type: "text", text: "{}" }],
-            metadata: {},
-          },
-          time: { created: 1, completed: 2 },
-        })
-      const timeline = await setupTimeline(page, {
-        viewport: { width: grouped ? 390 : 1400, height: 900 },
-        settings: { shellToolPartsExpanded: !grouped },
-        sessionStatus: { [sessionID]: { type: "busy" } },
-        sessionMessages: [
-          { id: "msg_user", type: "user", text: "Run two independent checks.", time: { created: 1 } },
-          message,
-        ],
-      })
-      const state = { finished: false, requests: 0 }
-      await page.route("**/api/shell?*", (route) =>
-        route.fulfill({
-          json: { location: { directory }, data: [...(state.finished ? [] : [shell]), { ...shell, id: "sh_other" }] },
-        }),
-      )
-      await page.route("**/api/shell/*/output?*", (route) => {
-        const url = new URL(route.request().url())
-        const target = url.pathname.includes(`/${shell.id}/`)
-        if (target) state.requests++
-        const output = target && state.finished ? "Checking project\nCheck finished\n" : "Checking project\n"
-        const cursor = Number(url.searchParams.get("cursor") ?? 0)
-        const end = Math.min(output.length, cursor + 17)
-        return route.fulfill({
-          json: {
-            location: { directory },
-            data: {
-              output: output.slice(cursor, end),
-              cursor: end,
-              size: output.length,
-              truncated: false,
-            },
-          },
-        })
-      })
-      await page.clock.install()
-      await page.reload()
-      await timeline.transport.waitForConnection()
-      const group = page.locator('[data-component="collapsed-tool-group"]')
-      const groupTrigger = group.locator(':scope > [data-component="collapsible"] > [data-slot="collapsible-trigger"]')
-      if (grouped) {
-        await expect(group).toHaveAttribute("data-timeline-part-ids", "call_read,call_sh_background,call_sh_other")
-        await expect(groupTrigger).toHaveAttribute("aria-expanded", "false")
-        await groupTrigger.click()
-      }
-      const card = page.locator(`[data-timeline-part-id="call_${shell.id}"]`)
-      const shimmer = card.locator('[data-component="text-shimmer"]')
-      const other = page.locator('[data-timeline-part-id="call_sh_other"] [data-component="text-shimmer"]')
-      await expect(shimmer).toHaveAttribute("data-active", "true")
-      await expect(other).toHaveAttribute("data-active", "true")
-      if (grouped) await card.locator('[data-slot="collapsible-trigger"]').click()
-      await expect(card.locator('[data-slot="bash-result"]')).toHaveText("Checking project")
-
-      state.finished = true
-      await timeline.transport.send({
-        id: "evt_shell_exited",
-        created: 4,
-        type: "shell.exited",
-        location: { directory },
-        data: { id: shell.id, status, exit: status === "exited" ? 0 : 1 },
-      })
-      await expect(shimmer).toHaveAttribute("data-active", "false")
-      await expect(other).toHaveAttribute("data-active", "true")
-      await expect(card.locator('[data-slot="bash-result"]')).toHaveText("Checking project\nCheck finished")
-      await expect(card.locator('[data-slot="collapsible-trigger"]')).toHaveAttribute("aria-expanded", "true")
-      await page.locator("[data-timeline-virtual-content]").screenshot({ path: info.outputPath("shell-finished.png") })
-
-      const requests = state.requests
-      await page.clock.fastForward(5_000)
-      expect(state.requests).toBe(requests)
-
-      await page.reload()
-      if (grouped) await groupTrigger.click()
-      await expect(shimmer).toHaveAttribute("data-active", "false")
-      await expect(other).toHaveAttribute("data-active", "true")
-    })
-  }
-}
-
-test("shows the authoritative foreground result after streaming shell output", async ({ page }) => {
-  const timeline = await setupTimeline(page, {
-    settings: { shellToolPartsExpanded: true },
-    sessionMessages: [
-      { id: "msg_user", type: "user", text: "Run the check.", time: { created: 1 } },
-      {
-        id: "msg_foreground",
-        type: "assistant",
-        agent: "build",
-        model: { id: "model", providerID: "provider" },
-        content: [
-          {
-            type: "tool",
-            id: "call_foreground",
-            name: "shell",
-            state: { status: "running", input: { command: shell.command }, metadata: { shellID: shell.id } },
-            time: { created: 2 },
-          },
-        ],
-        time: { created: 2 },
-      },
-    ],
-  })
-  await page.route("**/api/shell/*/output?*", (route) =>
-    route.fulfill({
-      json: {
-        location: { directory },
-        data: {
-          output: Number(new URL(route.request().url()).searchParams.get("cursor")) === 0 ? "Checking project\n" : "",
-          cursor: 17,
-          size: 17,
-          truncated: false,
-        },
-      },
-    }),
-  )
-  await page.reload()
-  await timeline.transport.waitForConnection()
-  const card = page.locator('[data-timeline-part-id="call_foreground"]')
-  const shimmer = card.locator('[data-component="text-shimmer"]')
-  await expect(shimmer).toHaveAttribute("data-active", "true")
-  await expect(card.locator('[data-slot="bash-result"]')).toHaveText("Checking project")
-  await timeline.transport.send({
-    id: "evt_foreground_complete",
-    created: 3,
-    type: "session.tool.success",
-    durable: { aggregateID: sessionID, seq: 0, version: 2 },
-    data: {
-      sessionID,
-      assistantMessageID: "msg_foreground",
-      id: "call_foreground",
-      executed: true,
-      content: [{ type: "text", text: "Checking project\nCheck finished\nCommand exited with code 0." }],
-      metadata: { status: "completed", exit: 0 },
-    },
-  })
-  await expect(shimmer).toHaveAttribute("data-active", "false")
-  await expect(card.locator('[data-slot="bash-result"]')).toHaveText(
-    "Checking project\nCheck finished\nCommand exited with code 0.",
-  )
-})
@@ -84,39 +84,6 @@ const assistantMessage = {
 } satisfies SessionMessageInfo

 test.describe("regression: session timeline local row state", () => {
-  test("preserves a patch file choice as new calls join its Used group", async ({ page }) => {
-    const events: EventPayload[] = []
-    const part = { ...editPart, tool: "patch" }
-    await mockServer(page, events, [userMessage, { ...assistantMessage, content: [toolContent(part)] }])
-    await configurePage(page, false)
-    await page.goto(sessionHref())
-    await expectSessionTitle(page, title)
-
-    const group = page.locator('[data-component="collapsed-tool-group"]')
-    const summary = group.getByRole("button", { name: "Used Patch", exact: true })
-    await summary.click()
-    await group.locator(`[data-timeline-part-id="${editPartID}"]`).evaluate((element) => {
-      element.setAttribute("data-disclosure-probe", "existing")
-    })
-    const wrapper = group.locator('[data-disclosure-probe="existing"]')
-    const trigger = wrapper.locator('[data-scope="apply-patch"] button')
-    await expect(trigger).toHaveAttribute("aria-expanded", "false")
-    await trigger.click()
-    await expect(trigger).toHaveAttribute("aria-expanded", "true")
-    const original = await wrapper.elementHandle()
-
-    for (const count of [2, 3]) {
-      if (count === 3) await trigger.click()
-      const id = `prt_patch_${count}`
-      events.push(...toolEvents({ ...part, id, callID: id }))
-      await expect(group.locator('[data-component="tag"]')).toHaveText(String(count))
-      await expect(group).toHaveAttribute("data-timeline-part-ids", new RegExp(`${id}$`))
-      await expect(trigger).toHaveAttribute("aria-expanded", String(count === 2))
-      await expect(summary).toHaveAttribute("aria-expanded", "true")
-      expect(await original!.evaluate((node) => node.isConnected)).toBe(true)
-    }
-  })
-
  test("keeps a manually collapsed tool collapsed when later assistant content streams", async ({ page }) => {
    const events: EventPayload[] = []
    await mockServer(page, events)
@@ -241,19 +208,19 @@ test.describe("regression: session timeline local row state", () => {
  })
 })

-async function configurePage(page: Page, expanded = true) {
-  await page.addInitScript((expanded) => {
+async function configurePage(page: Page) {
+  await page.addInitScript(() => {
    localStorage.setItem(
      "settings.v3",
      JSON.stringify({
        general: {
-          editToolPartsExpanded: expanded,
-          shellToolPartsExpanded: expanded,
+          editToolPartsExpanded: true,
+          shellToolPartsExpanded: true,
          showReasoningSummaries: true,
        },
      }),
    )
-  }, expanded)
+  })
 }

 async function expectExpanded(locator: Locator, expected: boolean) {
@@ -109,85 +109,31 @@ test("shimmers and expands a running shell command", async ({ page }) => {
  await expect(tool.locator('[data-slot="bash-pre"]')).toContainText("still running")
 })

-for (const open of [false, true]) {
-  test(`keeps ${open ? "expanded" : "collapsed"} reasoning intent from Thinking through standalone shell into Used`, async ({
-    page,
-  }) => {
-    const reasoningID = `prt_reasoning_hidden_${open}`
-    const shellID = `prt_reasoning_shell_${open}`
-    const assistant = assistantMessage([reasoningPart(reasoningID, "## Inspecting stability")], { completed: false })
-    const timeline = await setupTimeline(page, {
-      messages: [userMessage(), assistant],
-      settings: { showReasoningSummaries: false },
-      cpuRate: 4,
-    })
-    const reasoning = page.locator(`[data-timeline-part-id="${renderedPartID(reasoningID)}"]`)
-    await expect(page.locator('[data-timeline-row="Thinking"]')).toBeVisible()
-    await expect(page.getByText("Inspecting stability", { exact: true })).toBeVisible()
-    const thought = reasoning.locator('[data-slot="collapsible-trigger"]')
-    await expect(thought).toHaveAttribute("aria-expanded", "false")
-    await thought.click()
-    await expect(thought).toHaveAttribute("aria-expanded", "true")
-    if (!open) await thought.click()
-    await expect(thought).toHaveAttribute("aria-expanded", String(open))
-    await timeline.send(partUpdated(shell(shellID, "running")))
-    const group = page.locator('[data-component="collapsed-tool-group"]')
-    await expect(page.locator(`[data-timeline-part-id="${shellID}"]`)).toBeVisible()
-    await expect(group).toHaveCount(0)
-    await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
-    await expect(thought).toContainText("Thought")
-    await expect(thought).not.toContainText("Inspecting stability")
-    await expect(thought).toHaveAttribute("aria-expanded", String(open))
-    await timeline.send(partUpdated(shell(shellID, "completed", "done")))
-    await timeline.send(messageUpdated(completedAssistantInfo(assistant)))
-    await timeline.send(status("idle"))
-    const used = group.getByRole("button", { name: "Used Shell", exact: true })
-    await expect(used).toHaveAttribute("aria-expanded", "false")
-    await used.click()
-    await expect(used).toHaveAttribute("aria-expanded", "true")
-    await expect(group.locator(`[data-timeline-part-id="${shellID}"]`)).toBeVisible()
-    await expect(group.getByRole("button", { name: "Thought", exact: true })).toHaveAttribute(
-      "aria-expanded",
-      String(open),
-    )
-    await expect(group.locator('[data-component="tag"]')).toHaveText("1")
-    await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
-    await expect(used).toHaveAttribute("aria-expanded", "true")
-    if (!open) await thought.click()
-    await expect(reasoning.getByRole("heading", { name: "Inspecting stability", exact: true })).toBeVisible()
-    await used.click()
-    await expect(used).toHaveAttribute("aria-expanded", "false")
-    await used.click()
-    await expect(reasoning.getByRole("button", { name: "Thought", exact: true })).toHaveAttribute(
-      "aria-expanded",
-      "true",
-    )
-    await expect(reasoning.getByRole("heading", { name: "Inspecting stability", exact: true })).toBeVisible()
+test("transitions thinking and hidden reasoning through busy to idle", async ({ page }) => {
+  const reasoningID = "prt_reasoning_hidden"
+  const assistant = assistantMessage([reasoningPart(reasoningID, "## Inspecting stability")], { completed: false })
+  const timeline = await setupTimeline(page, {
+    messages: [userMessage(), assistant],
+    settings: { showReasoningSummaries: false },
+    cpuRate: 4,
  })
-}
+  await timeline.send(status("busy"), 150)

-for (const transition of ["reasoning-end", "idle", "retry"] as const) {
-  test(`stops active Thinking on ${transition} without a following tool`, async ({ page }) => {
-    const id = `prt_reasoning_stop_${transition}`
-    const text = "## Inspecting stability\n\nThe timeline is ready for the next step."
-    const timeline = await setupTimeline(page, {
-      messages: [userMessage(), assistantMessage([reasoningPart(id, text)], { completed: false })],
-    })
-    const part = page.locator(`[data-timeline-part-id="${renderedPartID(id)}"]`)
-    const trigger = part.locator('[data-slot="collapsible-trigger"]')
-    await expect(page.locator('[data-timeline-row="Thinking"]')).toBeVisible()
-    await expect(trigger).toHaveAttribute("aria-expanded", "false")
-    await timeline.send(transition === "reasoning-end" ? partUpdated(reasoningPart(id, text)) : status(transition))
-    await expect(trigger).toContainText("Thought")
-    await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
-    await expect(page.locator('[data-timeline-row="Retry"]')).toHaveCount(transition === "retry" ? 1 : 0)
-    await trigger.click()
-    await expect(trigger).toHaveAttribute("aria-expanded", "true")
-    await expect(part.getByText("The timeline is ready for the next step.", { exact: true })).toBeVisible()
-  })
-}
+  await expect(page.locator('[data-timeline-row="Thinking"]')).toBeVisible()
+  await expect(page.getByText("Inspecting stability", { exact: true })).toBeVisible()
+  await expect(page.locator(`[data-timeline-part-id="${reasoningID}"]`)).toHaveCount(0)
+  await expect(page.locator(`[data-timeline-part-id="${renderedPartID(reasoningID)}"]`)).toHaveCount(0)
+  await timeline.send(partUpdated(shell("prt_reasoning_shell", "running")), 160)
+  await expect(page.locator('[data-timeline-row="Thinking"]')).toBeVisible()
+  await timeline.send(partUpdated(shell("prt_reasoning_shell", "completed", "done")), 180)
+  await timeline.send(messageUpdated(completedAssistantInfo(assistant)), 100)
+  await timeline.send(status("idle"), 300)
+  await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
+  await expect(page.locator(`[data-timeline-part-id="${reasoningID}"]`)).toHaveCount(0)
+  await expect(page.locator(`[data-timeline-part-id="${renderedPartID(reasoningID)}"]`)).toHaveCount(0)
+})

-test("does not infer Thinking from busy, retry, or recovery without reasoning", async ({ page }) => {
+test("moves busy through retry and recovery to final idle content", async ({ page }) => {
  const assistant = assistantMessage([], { completed: false })
  const timeline = await setupTimeline(page, {
    messages: [
@@ -207,17 +153,18 @@ test("does not infer Thinking from busy, retry, or recovery without reasoning",
      assistant,
    ],
  })
-  await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
+  await timeline.send(status("busy"), 140)
+  await expect(page.locator('[data-timeline-row="Thinking"]')).toBeVisible()
  await expect(page.locator('[data-timeline-row="DiffSummary"]')).toHaveCount(0)
-  await timeline.send(status("retry"))
+  await timeline.send(status("retry"), 180)
  await expect(page.locator('[data-timeline-row="Retry"]')).toBeVisible()
  await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
-  await timeline.send(stepStarted(assistant))
+  await timeline.send(stepStarted(assistant), 180)
  await expect(page.locator('[data-timeline-row="Retry"]')).toHaveCount(0)
-  await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
-  await timeline.send(partUpdated(textPart("prt_recovered", "Recovered response")))
-  await timeline.send(messageUpdated(completedAssistantInfo(assistant)))
-  await timeline.send(status("idle"))
+  await expect(page.locator('[data-timeline-row="Thinking"]')).toBeVisible()
+  await timeline.send(partUpdated(textPart("prt_recovered", "Recovered response")), 140)
+  await timeline.send(messageUpdated(completedAssistantInfo(assistant)), 100)
+  await timeline.send(status("idle"), 350)
  await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
  await expect(page.locator(`[data-timeline-part-id="${renderedPartID("prt_recovered")}"]`)).toContainText(
    "Recovered response",
@@ -5,7 +5,6 @@ import {
  compactionEnded,
  compactionFailed,
  compactionStarted,
-  directory,
  event,
  session,
  sessionID,
@@ -209,56 +208,6 @@ test("navigates from a running subagent card and hides background controls in th
  await expect(page.getByText(/move running work to the background/i)).toHaveCount(0)
 })

-for (const name of ["shell", "subagent"] as const) {
-  test(`keeps the background shortcut available for a grouped running ${name}`, async ({ page }) => {
-    const message = assistant(false, true)
-    await setupTimeline(page, {
-      sessionMessages: [
-        user,
-        {
-          ...message,
-          content: [
-            {
-              type: "tool",
-              id: "call_read",
-              name: "read",
-              state: {
-                status: "completed",
-                input: { path: "src/example.ts" },
-                content: [{ type: "text", text: "export const example = true" }],
-                metadata: {},
-              },
-              time: { created: 1, completed: 2 },
-            },
-            {
-              type: "tool",
-              id: "call_running",
-              name,
-              state: {
-                status: "running",
-                input:
-                  name === "shell" ? { command: "echo checking" } : { agent: "general", description: "Inspect code" },
-                metadata: {},
-              },
-              time: { created: 3 },
-            },
-          ],
-        },
-      ],
-    })
-    const group = page.locator('[data-timeline-part-ids="call_read,call_running"]')
-    await expect(group).toBeVisible()
-    await expect(group.locator('[data-slot="collapsible-trigger"]')).toHaveAttribute("aria-expanded", "false")
-    await expect(page.locator('[data-component="session-background-hint"]')).toBeVisible()
-    const request = page.waitForRequest(
-      (request) =>
-        request.method() === "POST" && new URL(request.url()).pathname === `/api/session/${sessionID}/background`,
-    )
-    await page.keyboard.press("Control+b")
-    await request
-  })
-}
-
 test("shows a badge for active background work", async ({ page }) => {
  const childID = "ses_background_child"
  await setupTimeline(page, {
@@ -349,24 +298,6 @@ test("separates blocking and already-backgrounded work into two rows", async ({
    },
  })

-  await timeline.transport.send({
-    id: "evt_background_shell_created",
-    created: 3,
-    type: "shell.created",
-    location: { directory },
-    data: {
-      info: {
-        id: "shell_backgrounded",
-        status: "running",
-        command: "sleep 120",
-        cwd: directory,
-        shell: "bash",
-        file: "/tmp/background.out",
-        metadata: { sessionID },
-        time: { started: 2 },
-      },
-    },
-  })
  const backgroundCard = page.locator('[data-timeline-part-id="call_backgrounded"]')
  await expect(page.getByText(/move running work to the background/i)).toBeVisible()
  await page.getByRole("button", { name: "Session details" }).click()
@@ -4,144 +4,89 @@ import {
  assistantMessage,
  reasoningPart,
  setupTimeline,
+  status,
  textPart,
  toolPart,
  userMessage,
 } from "../performance/timeline-stability/fixture"

-test("changes live reasoning through Settings and persists Hidden, Compact, and Full", async ({ page }) => {
-  await setupTimeline(page, {
-    messages: [
-      userMessage(),
-      assistantMessage(
-        [
-          reasoningPart(
-            "prt_reasoning_settings",
-            "## Inspecting stability\n\nThe selected mode controls these details.",
-          ),
-        ],
-        { completed: false },
-      ),
-    ],
-  })
-  const part = page.locator(`[data-timeline-part-id="${assistantID}:reasoning:0"]`)
-  await expect(part.getByRole("button")).toHaveAttribute("aria-expanded", "false")
-  const settings = page.getByTestId("settings-screen")
-  const select = settings.locator('[data-action="settings-reasoning-mode"] [data-component="select-v2"]')
-  for (const label of ["Full", "Hidden", "Compact"] as const) {
-    await page.keyboard.press("Control+,")
-    await expect(settings.getByText("Model reasoning", { exact: true })).toBeVisible()
-    await expect(select).toHaveAttribute("aria-expanded", "false")
-    await select.click()
-    await expect(page.getByRole("listbox").getByRole("option")).toHaveText(["Hidden", "Compact", "Full"])
-    await page.getByRole("option", { name: label, exact: true }).click()
-    await expect(select).toHaveText(label)
-    await expect(select).toHaveAttribute("aria-expanded", "false")
-    await expect
-      .poll(() => page.evaluate(() => JSON.parse(localStorage.getItem("settings.v3") ?? "{}").general?.reasoningMode))
-      .toBe(label.toLowerCase())
-    await settings.getByRole("button", { name: "Back to app", exact: true }).click()
-    await expect(settings).toBeHidden()
-    await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(label === "Hidden" ? 0 : 1)
-    await expect(part).toHaveCount(label === "Hidden" ? 0 : 1)
-    if (label === "Hidden") {
-      await expect(page.getByText("The selected mode controls these details.", { exact: true })).toBeHidden()
-      continue
-    }
-    await expect(part.getByRole("button")).toHaveAttribute("aria-expanded", String(label === "Full"))
-    if (label === "Full")
-      await expect(part.getByText("The selected mode controls these details.", { exact: true })).toBeVisible()
-    if (label === "Compact") {
-      await expect(part.getByRole("button")).toContainText("Inspecting stability")
-      await expect(part.getByText("The selected mode controls these details.", { exact: true })).toBeHidden()
-    }
-  }
-  await page.keyboard.press("Control+,")
-  await expect(select).toHaveText("Compact")
-})
+const profiles = [
+  { name: "summaries off no reasoning", summaries: false, reasoning: "", other: false, thinking: true, body: false },
+  {
+    name: "summaries off reasoning heading",
+    summaries: false,
+    reasoning: "## Inspecting stability",
+    other: false,
+    thinking: true,
+    body: false,
+  },
+  {
+    name: "summaries off with visible tool",
+    summaries: false,
+    reasoning: "## Inspecting stability",
+    other: true,
+    thinking: true,
+    body: false,
+  },
+  { name: "summaries on no content", summaries: true, reasoning: "", other: false, thinking: true, body: false },
+  {
+    name: "summaries on blank reasoning",
+    summaries: true,
+    reasoning: "   ",
+    other: false,
+    thinking: true,
+    body: false,
+  },
+  {
+    name: "summaries on visible reasoning",
+    summaries: true,
+    reasoning: "## Inspecting stability",
+    other: false,
+    thinking: false,
+    body: true,
+  },
+  {
+    name: "summaries on visible tool no reasoning",
+    summaries: true,
+    reasoning: "",
+    other: true,
+    thinking: false,
+    body: false,
+  },
+] as const

-// The persisted boolean migrates to compact (false) or full (true).
-for (const summaries of [false, true]) {
-  for (const profile of ["none", "blank", "heading", "tool", "text"] as const) {
-    test(`projects legacy ${summaries ? "full" : "compact"} reasoning with ${profile}`, async ({ page }) => {
-      await setupTimeline(page, {
-        messages: [
-          userMessage(),
-          assistantMessage(
-            [
-              ...(profile === "none"
-                ? []
-                : [
-                    reasoningPart(
-                      `prt_reasoning_${summaries}_${profile}`,
-                      profile === "blank"
-                        ? "   "
-                        : "## Inspecting stability\n\nI will inspect the timeline before changing its state.",
-                    ),
-                  ]),
-              ...(profile === "tool"
-                ? [toolPart(`prt_reasoning_tool_${summaries}`, "skill", "running", { name: "inspect" })]
-                : []),
-              ...(profile === "text" ? [textPart(`prt_reasoning_text_${summaries}`, "The timeline is stable.")] : []),
-            ],
-            { completed: false },
-          ),
-        ],
-        settings: { showReasoningSummaries: summaries },
-      })
-      const part = page.locator(`[data-timeline-part-id="${assistantID}:reasoning:0"]`)
-      await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(
-        profile === "blank" || profile === "heading" ? 1 : 0,
-      )
-      if (profile === "none") {
-        await expect(part).toHaveCount(0)
-        return
-      }
-      if (profile === "blank") {
-        await expect(part).toContainText("Thinking")
-        await expect(part.getByRole("heading")).toHaveCount(0)
-        return
-      }
-      if (profile === "tool") {
-        const group = page.locator('[data-component="collapsed-tool-group"]')
-        const used = group.locator(':scope > [data-component="collapsible"] > [data-slot="collapsible-trigger"]')
-        await expect(used).toContainText("UsedSkill")
-        await expect(used).toHaveAttribute("aria-expanded", "false")
-        await expect(page.getByText("Inspecting stability", { exact: true })).toBeHidden()
-        await expect(group.locator('[data-component="tag"]')).toHaveText("1")
-        await used.click()
-        await expect(used).toHaveAttribute("aria-expanded", "true")
-        await expect(group.locator(`[data-timeline-part-id="prt_reasoning_tool_${summaries}"]`)).toBeVisible()
-        await expect(group.locator('[data-component="reasoning-part"]')).toHaveCount(1)
-      }
-      if (profile === "text") await expect(page.getByText("The timeline is stable.", { exact: true })).toBeVisible()
-      const trigger = part.locator('[data-slot="collapsible-trigger"]')
-      const body = part.getByText("I will inspect the timeline before changing its state.", { exact: true })
-      await expect(trigger).toContainText(profile === "heading" ? "Thinking" : "Thought")
-      await expect(trigger).toHaveAttribute("aria-expanded", String(summaries))
-      if (!summaries) {
-        await expect(body).toBeHidden()
-        if (profile === "heading") await expect(trigger).toContainText("Inspecting stability")
-        await trigger.click()
-        await expect(trigger).toHaveAttribute("aria-expanded", "true")
-      }
-      await expect(body).toBeVisible()
-      await trigger.click()
-      await expect(trigger).toHaveAttribute("aria-expanded", "false")
-      await expect(body).toBeHidden()
-      if (profile !== "heading") await expect(trigger).not.toContainText("Inspecting stability")
+for (const profile of profiles) {
+  test(`projects busy reasoning profile ${profile.name}`, async ({ page }) => {
+    const reasoningID = `prt_reasoning_matrix_${profiles.indexOf(profile)}`
+    const parts = [
+      ...(profile.reasoning ? [reasoningPart(reasoningID, profile.reasoning)] : []),
+      ...(profile.other
+        ? [toolPart(`prt_reasoning_tool_${profiles.indexOf(profile)}`, "skill", "running", { name: "inspect" })]
+        : []),
+    ]
+    const timeline = await setupTimeline(page, {
+      messages: [userMessage(), assistantMessage(parts, { completed: false })],
+      settings: { showReasoningSummaries: profile.summaries },
    })
-  }
+    await timeline.send(status("busy"), 150)
+
+    await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(profile.thinking ? 1 : 0)
+    await expect(page.locator(`[data-timeline-part-id="${assistantID}:reasoning:0"]`)).toHaveCount(profile.body ? 1 : 0)
+    if (!profile.summaries && profile.reasoning.trim()) {
+      await expect(page.getByText("Inspecting stability", { exact: true })).toBeVisible()
+    }
+  })
 }

 test("does not infer reasoning visibility from provider identity", async ({ page }) => {
-  await setupTimeline(page, {
+  const timeline = await setupTimeline(page, {
    messages: [
      userMessage(),
      assistantMessage([textPart("prt_provider_text", "No reasoning payload")], { completed: false }),
    ],
    settings: { showReasoningSummaries: true },
  })
+  await timeline.send(status("busy"), 150)

  await expect(page.locator('[data-timeline-row="Thinking"]')).toHaveCount(0)
  await expect(page.locator('[data-timeline-part-id*="reasoning"]')).toHaveCount(0)
@@ -1,5 +1,4 @@
 import { expect, test } from "@playwright/test"
-import { createTwoFilesPatch } from "diff"
 import {
  assistantMessage,
  completedAssistantInfo,
@@ -45,7 +44,7 @@ test("expands a mixed collapsed tool stack without expanding its individual call
  const group = page.locator(
    '[data-timeline-part-ids="prt_stack_shell_1,prt_stack_explore,prt_stack_patch,prt_stack_shell_2"]',
  )
-  const summary = group.getByRole("button", { name: "Used Shell, Agent, Patch" })
+  const summary = group.getByRole("button", { name: "Used Shell, Explore, Patch" })
  await expect(summary).toHaveAttribute("aria-expanded", "false")
  await expect(summary).toHaveCSS("height", "28px")
  await expect(group.locator('[data-component="tag"]')).toHaveText("4")
@@ -79,61 +78,6 @@ test("leaves tools expanded by settings outside the collapsed stack", async ({ p
  await expect(page.locator('[data-timeline-spacing="tool"]')).toHaveCSS("padding-top", "8px")
 })

-test("combines follow-up patches into one three-file stack inside Used", async ({ page }) => {
-  const file = (path: string, before: number, after: number) => ({
-    file: path,
-    status: "modified",
-    additions: 1,
-    deletions: 1,
-    patch: createTwoFilesPatch(
-      path,
-      path,
-      `export const value = ${before}\n`,
-      `export const value = ${after}\n`,
-      "",
-      "",
-      { context: Infinity },
-    ),
-  })
-  const timeline = await setupTimeline(page, {
-    messages: [
-      userMessage(),
-      assistantMessage([
-        shell("patch_shell", "completed"),
-        toolPart(
-          "patch_first",
-          "patch",
-          "completed",
-          {},
-          {
-            metadata: { files: [file("src/a.ts", 0, 1), file("src/b.ts", 0, 1)] },
-          },
-        ),
-      ]),
-    ],
-  })
-  const group = page.locator('[data-component="collapsed-tool-group"]')
-  await group.getByRole("button", { name: "Used Shell, Patch", exact: true }).click()
-  await expect(group.getByText("2 files", { exact: true })).toBeVisible()
-  await timeline.send(
-    partUpdated(
-      toolPart(
-        "patch_next",
-        "patch",
-        "completed",
-        {},
-        {
-          metadata: { files: [file("src/a.ts", 1, 2), file("src/c.ts", 0, 1)] },
-        },
-      ),
-    ),
-  )
-  await expect(group.locator('[data-component="tag"]')).toHaveText("3")
-  await expect(group.locator('[data-component="apply-patch-tool"]')).toHaveCount(1)
-  await expect(group.getByText("3 files", { exact: true })).toBeVisible()
-  await expect(group.locator('[data-slot="apply-patch-filename"]')).toHaveText(["a.ts", "b.ts", "c.ts"])
-})
-
 test("keeps failed search calls and their error cards inside the collapsed stack", async ({ page }) => {
  const parts = [
    toolPart(
@@ -1,121 +0,0 @@
-import { expect, test } from "@playwright/test"
-import { mockOpenCodeServer } from "../utils/mock-server"
-
-const directory = "C:/Projects/settings-demo"
-const sandboxes = Array.from({ length: 12 }, (_, index) => `${directory}/workspace-${index + 1}`)
-
-test.use({ viewport: { width: 1440, height: 1000 }, colorScheme: "dark" })
-
-test.beforeEach(async ({ page }) => {
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: "proj_settings_demo",
-      canonical: directory,
-      name: "Settings demo",
-      vcs: "git",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes,
-    },
-    provider: { all: [], connected: [], default: {} },
-    sessions: sandboxes.map((directory, index) => ({
-      id: `ses_settings_${index + 1}`,
-      title: `Workspace ${index + 1} session`,
-      directory,
-      projectID: "proj_settings_demo",
-      time: { created: 1700000000000, updated: 1700000000000 },
-    })),
-    pageMessages: () => ({ items: [] }),
-  })
-  await page.goto("/")
-  await page.getByRole("button", { name: "Settings", exact: true }).click()
-  await expect(page.getByTestId("settings-screen").getByRole("tab", { name: "Preferences" })).toBeVisible()
-})
-
-test("workspaces opens without waiting for inventory or sessions", async ({ page }) => {
-  const inventory = Promise.withResolvers<void>()
-  const sessions = Promise.withResolvers<void>()
-  await page.route("**/api/worktree/*", async (route) => {
-    await inventory.promise
-    await route.fallback()
-  })
-  await page.route("**/api/session?*", async (route) => {
-    if (new URL(route.request().url()).searchParams.has("directory")) await sessions.promise
-    await route.fallback()
-  })
-  const settings = page.getByTestId("settings-screen")
-  const requested = page.waitForRequest((request) => new URL(request.url()).pathname.startsWith("/api/worktree/"))
-  await settings.getByRole("tab", { name: "Workspaces", exact: true }).click()
-  await requested
-  await expect(settings.getByRole("heading", { name: "Workspaces", exact: true })).toBeVisible()
-  await expect(settings.getByRole("button", { name: "Back to app" })).toBeVisible()
-  await expect(settings.getByText("No workspaces", { exact: true })).toHaveCount(0)
-
-  inventory.resolve()
-  await expect(settings.getByText(sandboxes[0], { exact: true })).toBeVisible()
-  await expect(settings.getByText("12 workspaces", { exact: true })).toBeVisible()
-  sessions.resolve()
-  await expect(settings.getByText("Workspace 1 session", { exact: true })).toBeVisible()
-
-  const refresh = Promise.withResolvers<void>()
-  await page.route("**/api/worktree/*", async (route) => {
-    await refresh.promise
-    await route.fallback()
-  })
-  await settings.getByRole("tab", { name: "Preferences", exact: true }).click()
-  await settings.getByRole("tab", { name: "Workspaces", exact: true }).click()
-  await expect(settings.getByText("Workspace 1 session", { exact: true })).toBeVisible()
-  refresh.resolve()
-})
-
-test("extensions opens without waiting for MCPs or plugins", async ({ page }) => {
-  const mcps = Promise.withResolvers<void>()
-  const plugins = Promise.withResolvers<void>()
-  await page.route("**/api/mcp", async (route) => {
-    await mcps.promise
-    await route.fulfill({
-      json: { location: { directory }, data: [{ name: "demo-mcp", status: { status: "connected" } }] },
-    })
-  })
-  await page.route("**/api/plugin", async (route) => {
-    await plugins.promise
-    await route.fulfill({
-      json: {
-        location: { directory },
-        data: [
-          { id: "demo-plugin", source: { type: "package", package: "demo-plugin" }, status: "active", tui: false },
-        ],
-      },
-    })
-  })
-  const settings = page.getByTestId("settings-screen")
-  const requested = page.waitForRequest((request) => new URL(request.url()).pathname === "/api/mcp")
-  await settings.getByRole("tab", { name: "Extensions", exact: true }).click()
-  await requested
-  await expect(settings.getByRole("heading", { name: "Extensions", exact: true })).toBeVisible()
-  await expect(settings.getByRole("button", { name: "Back to app" })).toBeVisible()
-  await settings.getByRole("tab", { name: "Plugins", exact: true }).click()
-  await expect(settings.getByRole("tab", { name: "Plugins", exact: true })).toHaveAttribute("aria-selected", "true")
-  plugins.resolve()
-  await expect(settings.getByText("demo-plugin", { exact: true })).toBeVisible()
-  mcps.resolve()
-  await settings.getByRole("tab", { name: "MCPs", exact: true }).click()
-  await expect(settings.getByRole("switch", { name: "demo-mcp" })).toBeChecked()
-})
-
-test("workspace inventory uses the settings panel scroll area", async ({ page }) => {
-  const settings = page.getByTestId("settings-screen")
-  await settings.getByRole("tab", { name: "Workspaces", exact: true }).click()
-  await expect(settings.getByText("Workspace 1 session", { exact: true })).toBeVisible()
-  const list = settings.locator('[data-component="settings-list"]')
-  await expect(list).toHaveCSS("max-height", "none")
-  await expect(list).toHaveCSS("overflow-y", "visible")
-  await settings.getByText("Workspace 12 session", { exact: true }).scrollIntoViewIfNeeded()
-  await expect(settings.getByText("Workspace 12 session", { exact: true })).toBeInViewport()
-  await expect(settings.getByRole("button", { name: "Back to app" })).toBeInViewport()
-  await page.setViewportSize({ width: 390, height: 844 })
-  await expect(list).toHaveCSS("max-height", "none")
-  await expect(list).toHaveCSS("overflow-y", "visible")
-  await settings.getByText("Workspace 12 session", { exact: true }).scrollIntoViewIfNeeded()
-  await expect(settings.getByText("Workspace 12 session", { exact: true })).toBeInViewport()
-})
@@ -52,7 +52,7 @@ test("shows parent lineage while the child timeline loads", async ({ page }) =>

  await page.goto(sessionHref(parentID))
  await expectSessionTitle(page, parentTitle)
-  await page.getByRole("button", { name: "Used Agent" }).click()
+  await page.getByRole("button", { name: "Used Explore" }).click()
  await page.locator(`a[href="${sessionHref(childID)}"]`).click()
  await Promise.all([requested.promise, expect(page).toHaveURL(sessionHref(childID))])
  await Promise.all([
@@ -77,7 +77,7 @@ test("keeps the parent visible while the child session resolves", async ({ page
  await page.goto(sessionHref(parentID))
  await expectSessionTitle(page, parentTitle)

-  await page.getByRole("button", { name: "Used Agent" }).click()
+  await page.getByRole("button", { name: "Used Explore" }).click()
  await page.locator(`a[href="${sessionHref(childID)}"]`).click()
  await requested.promise
  await Promise.all([expect(page).toHaveURL(sessionHref(parentID)), expectSessionTitle(page, parentTitle)]).finally(
@@ -195,7 +195,7 @@ async function setup(page: Page, events?: () => OpenCodeEvent[]) {
 async function openChildFromParent(page: Page) {
  await page.goto(sessionHref(parentID))
  await expectSessionTitle(page, parentTitle)
-  await page.getByRole("button", { name: "Used Agent" }).click()
+  await page.getByRole("button", { name: "Used Explore" }).click()

  const card = page.locator(`a[href="${sessionHref(childID)}"]`)
  await expect(card).toBeVisible()
@@ -1,9 +1,8 @@
 import { expect, test, type Page, type Route } from "@playwright/test"
 import { base64Encode } from "@opencode-ai/util/encode"
 import { currentSession } from "../utils/mock-server"
-import pkg from "../../package.json" with { type: "json" }

-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
+const server = "http://127.0.0.1:4096"
 const sessionA = session("ses_tab_a", "Tab A session")
 const sessionB = session("ses_tab_b", "Tab B session")
 const sessionC = session("ses_tab_c", "Tab C session")
@@ -176,9 +175,6 @@ test("appearance experimental setting switches tab orientation", async ({ page }

  const settings = page.getByTestId("settings-screen")
  await expect(settings).toBeVisible()
-  const version = settings.getByRole("tablist").getByText(`v${pkg.version}`, { exact: true })
-  await expect(settings.getByRole("tablist").getByText("OpenCode Desktop", { exact: true })).toBeInViewport()
-  await expect(version).toBeInViewport()
  await settings.getByRole("tab", { name: "Appearance" }).click()
  await expect(settings.getByRole("heading", { name: "Experimental" })).toBeVisible()

@@ -198,17 +194,6 @@ test("appearance experimental setting switches tab orientation", async ({ page }

  await page.setViewportSize({ width: 800, height: 720 })
  await expect(settings.getByRole("tablist")).toHaveCSS("width", "160px")
-  await expect(version).toBeInViewport()
-
-  await page.setViewportSize({ width: 390, height: 720 })
-  await expect(version).toBeInViewport()
-  await settings.evaluate((element) => element.setAttribute("dir", "rtl"))
-  await expect(version).toBeInViewport()
-  await expect(version).toHaveCSS("direction", "ltr")
-
-  await page.setViewportSize({ width: 390, height: 360 })
-  await version.scrollIntoViewIfNeeded()
-  await expect(version).toBeInViewport()
 })

 test("vertical tab preference falls back to horizontal on mobile", async ({ page }) => {
@@ -253,7 +238,7 @@ function session(id: string, title: string) {

 async function mockServer(page: Page) {
  const sessions = [sessionA, sessionB, sessionC]
-  await page.route("**/api/**", async (route) => {
+  await page.route("**/*", async (route) => {
    const url = new URL(route.request().url())
    if (url.origin !== server) return route.fallback()
    if (url.pathname === `/api/session/${unresolvedSessionID}`) return new Promise(() => {})
@@ -1,194 +0,0 @@
-import { expect, test, type Locator, type Page } from "@playwright/test"
-import type { OpenCodeEvent, WorktreeDirectory } from "@opencode-ai/client/promise"
-import { base64Encode } from "@opencode-ai/util/encode"
-import { mockOpenCodeServer } from "../utils/mock-server"
-import { expectAppVisible, expectSessionReady } from "../utils/waits"
-
-const root = "C:/OpenCode/WorkspaceAccent"
-const workspace = `${root}/.worktrees/feature`
-const projectID = "proj_workspace_accent"
-const sessionID = "ses_workspace_accent"
-const title = "Workspace accent regression"
-const server = `http://${process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"}:${process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"}`
-const inventory: WorktreeDirectory[] = [
-  { directory: root },
-  { directory: workspace, strategy: "git" },
-  { directory: "C:/OpenCode/LinkedWorkspace", strategy: "git" },
-  { directory: "C:/OpenCode/WorkspaceCopy", strategy: "copy" },
-  { directory: "C:/OpenCode/RegisteredDirectory" },
-]
-
-test.use({ serviceWorkers: "block" })
-
-for (const scenario of [
-  { name: "managed Git worktree", directory: workspace, accent: true },
-  { name: "linked Git worktree outside main", directory: "C:/OpenCode/LinkedWorkspace", accent: true },
-  {
-    name: "linked Git worktree on a narrow screen",
-    directory: "C:/OpenCode/LinkedWorkspace",
-    accent: true,
-    viewport: { width: 390, height: 844 },
-  },
-  { name: "main root with Windows case and separators", directory: "c:\\OPENCODE\\workspaceaccent\\", accent: false },
-  { name: "nested main directory", directory: `${root}/packages/app`, accent: false },
-  { name: "nested workspace inside main", directory: `${workspace}/packages/app`, accent: true },
-  {
-    name: "workspace with Windows case and separators",
-    directory: "c:\\opencode\\WORKSPACEACCENT\\.worktrees\\FEATURE\\src\\",
-    accent: true,
-  },
-  { name: "unregistered sibling with the same prefix", directory: `${workspace}-unregistered`, accent: false },
-  { name: "workspace using another strategy", directory: "C:/OpenCode/WorkspaceCopy", accent: true },
-  { name: "registered directory without a strategy", directory: "C:/OpenCode/RegisteredDirectory", accent: true },
-]) {
-  test(`existing session send button: ${scenario.name}`, async ({ page }, testInfo) => {
-    if (scenario.viewport) await page.setViewportSize(scenario.viewport)
-    const view = await openSession(page, scenario.directory)
-    await view.input.fill("Inspect this fixture workspace.")
-    await expect(view.send).toBeEnabled()
-
-    if (scenario.name === "managed Git worktree") {
-      // Capture before the color assertion so both red and green runs have evidence.
-      const path = testInfo.outputPath("workspace-accent.png")
-      await view.composer.screenshot({ path })
-      await testInfo.attach("workspace-accent", { path, contentType: "image/png" })
-    }
-
-    await expectBackground(view.send, scenario.accent ? "accent" : "contrast")
-    const message = page.locator('[data-slot="user-message-text"]')
-    await expect(message).toHaveText("Check this fixture workspace.")
-    await expectBackground(message, scenario.accent ? "accent" : "layer-02", "background-color")
-  })
-}
-
-test("inventory updates recolor the send button without navigation; disabled and stop stay neutral", async ({
-  page,
-}) => {
-  const view = await openSession(page, workspace, [{ directory: root }])
-  await view.input.fill("Keep this draft while the inventory changes.")
-  await expect(view.send).toBeEnabled()
-  await expectBackground(view.send, "contrast")
-  const url = page.url()
-
-  const refreshed = page.waitForResponse(
-    (response) =>
-      new URL(response.url()).pathname === `/api/worktree/${projectID}` && response.request().method() === "GET",
-  )
-  view.worktrees.push({ directory: workspace, strategy: "git" })
-  view.events.push({
-    id: "evt_workspace_accent_inventory",
-    created: 1700000001000,
-    type: "worktree.updated",
-    data: { projectID },
-  })
-  expect((await refreshed).ok()).toBe(true)
-  await expectBackground(view.send, "accent")
-  await expect(page).toHaveURL(url)
-  await expect(view.input).toHaveText("Keep this draft while the inventory changes.")
-  await expect(view.send).toBeEnabled()
-
-  await view.input.fill("")
-  await expect(view.send).toBeDisabled()
-  await expectBackground(view.send, "contrast")
-
-  view.events.push({
-    id: "evt_workspace_accent_running",
-    created: 1700000002000,
-    type: "session.execution.started",
-    durable: { aggregateID: sessionID, seq: 1, version: 1 },
-    data: { sessionID },
-  })
-  const stop = view.composer.getByRole("button", { name: "Stop", exact: true })
-  await expect(stop).toBeEnabled()
-  await expectBackground(stop, "contrast")
-
-  await view.input.fill("Send a follow-up instead of stopping.")
-  await expect(view.send).toBeEnabled()
-  await expectBackground(view.send, "accent")
-  await expect(page).toHaveURL(url)
-})
-
-async function openSession(page: Page, directory: string, worktrees = [...inventory]) {
-  const events: OpenCodeEvent[] = []
-  await mockOpenCodeServer(page, {
-    directory,
-    project: {
-      id: projectID,
-      canonical: root,
-      worktree: root,
-      vcs: "git",
-      name: "workspace-accent",
-      time: { created: 1700000000000, updated: 1700000000000 },
-      sandboxes: [],
-    },
-    provider: {
-      all: [
-        {
-          id: "opencode",
-          name: "OpenCode",
-          models: { "accent-model": { id: "accent-model", name: "Accent Model", limit: { context: 200_000 } } },
-        },
-      ],
-      connected: ["opencode"],
-      default: { providerID: "opencode", modelID: "accent-model" },
-    },
-    sessions: [
-      {
-        id: sessionID,
-        projectID,
-        directory,
-        title,
-        model: { id: "accent-model", providerID: "opencode" },
-        time: { created: 1700000000000, updated: 1700000000000 },
-      },
-    ],
-    pageMessages: () => ({
-      items: [
-        {
-          id: "msg_workspace_accent",
-          type: "user",
-          text: "Check this fixture workspace.",
-          time: { created: 1700000000000 },
-        },
-      ],
-    }),
-    events: () => events.splice(0),
-  })
-  // Keep authoritative inventory independent of the raw project's empty sandboxes.
-  await page.route(`**/api/worktree/${projectID}`, (route) => {
-    if (route.request().method() !== "GET") return route.fallback()
-    return route.fulfill({ json: worktrees, headers: { "access-control-allow-origin": "*" } })
-  })
-  await page.addInitScript(() => {
-    localStorage.setItem("opencode-theme-id", "oc-2")
-    localStorage.setItem("opencode-color-scheme", "light")
-  })
-  const loaded = page.waitForResponse(
-    (response) =>
-      new URL(response.url()).pathname === `/api/worktree/${projectID}` && response.request().method() === "GET",
-  )
-  await page.goto(`/server/${base64Encode(server)}/session/${sessionID}`)
-  expect((await loaded).ok()).toBe(true)
-  await expectSessionReady(page, { server, sessionID, title })
-  await expect(page.locator("html")).toHaveAttribute("data-color-scheme", "light")
-  const composer = page.locator('[data-component="composer"]')
-  await expectAppVisible(composer)
-  const input = composer.getByRole("textbox", { name: "Prompt", exact: true })
-  await expect(input).toBeEditable()
-  await expect(composer.locator('[data-action="composer-model"]')).toHaveText("Accent Model")
-  return { composer, input, send: composer.getByRole("button", { name: "Send", exact: true }), events, worktrees }
-}
-
-async function expectBackground(element: Locator, token: string, property = "background-image") {
-  const color = await element.evaluate((element, token) => {
-    // Resolve semantic colors through the browser, without reproducing the button's gradient.
-    const probe = document.createElement("span")
-    probe.hidden = true
-    probe.style.backgroundColor = `var(--v2-background-bg-${token})`
-    element.append(probe)
-    const color = getComputedStyle(probe).backgroundColor
-    probe.remove()
-    return color
-  }, token)
-  await expect(element).toHaveCSS(property, new RegExp(color.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")))
-}
@@ -1,124 +1,60 @@
-import { expect, test, type Page } from "@playwright/test"
-import { mkdir, mkdtemp, readFile, readdir, rm, writeFile } from "node:fs/promises"
-import { createServer, type ServerResponse } from "node:http"
+import { expect, test } from "@playwright/test"
+import { readFile } from "node:fs/promises"
+import { createServer } from "node:http"
 import { once } from "node:events"
-import { createHash } from "node:crypto"
-import { join, extname, relative, sep } from "node:path"
-import { tmpdir } from "node:os"
-import { fileURLToPath } from "node:url"
-import { build } from "vite"
-import { serviceWorker } from "../../vite.pwa"

-type Site = {
-  url: string
-  deploy: (fault?: "failed" | "html" | "corrupt" | "mixed-html" | "blocked") => void
-  legacy: () => void
-  requests: string[]
-  release: () => void
-}
+const legacy = `
+self.addEventListener("install", event => event.waitUntil(
+  caches.open("workbox-precache-v2-" + self.registration.scope).then(cache =>
+    cache.addAll(["/index.html", "/assets/app-old.js", "/assets/lazy-old.js"])
+  )
+))
+self.addEventListener("fetch", event => {
+  if (event.request.mode === "navigate") {
+    event.respondWith(caches.match("/index.html"))
+    return
+  }
+  event.respondWith(caches.match(event.request).then(response => response || fetch(event.request)))
+})
+`

-const fixture = test.extend<{ site: Site }, { builds: Record<string, Record<string, Buffer>> }>({
-  builds: [
-    async ({}, use) => {
-      const directory = await mkdtemp(join(tmpdir(), "opencode-precache-"))
-      const builds: Record<string, Record<string, Buffer>> = {}
-      try {
-        for (const version of ["old", "new"]) {
-          const root = join(directory, version)
-          const outDir = join(root, "dist")
-          await mkdir(join(root, "public", "nested"), { recursive: true })
-          await Promise.all(
-            Object.entries({
-              "index.html": `<html><head></head><body><h1>Loading</h1><label>Draft<textarea></textarea></label><button>Load lazy</button><output></output><script type="module" src="/main.js"></script></body></html>`,
-              "main.js": `document.querySelector("h1").textContent = "${version}";
-            document.querySelector("button").onclick = async () => {
-              document.querySelector("output").textContent = await (await import("./lazy.js")).load()
-            };`,
-              "lazy.js": `export async function load() { return (await import("./nested.js")).value }`,
-              "nested.js": `export const value = "${version} nested lazy loaded"`,
-              "public/nested/data.json": JSON.stringify({ version }),
-              "public/nested/font.woff2": `font-${version}`,
-              "public/nested/module.wasm": Buffer.from([0, 97, 115, 109, 1, 0, 0, 0]),
-              "public/large.bin": Buffer.alloc(2 * 1024 * 1024 + 1, version === "old" ? 1 : 2),
-              "public/_headers": "/*\n  Cache-Control: no-cache",
-              "public/_redirects": "/* /index.html 200",
-            }).map(([path, contents]) => writeFile(join(root, path), contents)),
-          )
-          await build({
-            configFile: false,
-            root,
-            logLevel: "silent",
-            build: { outDir, assetsDir: "_assets", sourcemap: true },
-            plugins: serviceWorker(outDir),
-          })
-          builds[version] = Object.fromEntries(
-            await Promise.all(
-              (await readdir(outDir, { recursive: true, withFileTypes: true }))
-                .filter((entry) => entry.isFile())
-                .map(async (entry) => {
-                  const path = join(entry.parentPath, entry.name)
-                  return ["/" + relative(outDir, path).split(sep).join("/"), await readFile(path)]
-                }),
-            ),
-          )
-        }
-        await use(builds)
-      } finally {
-        await rm(directory, { recursive: true, force: true })
-      }
-    },
-    { scope: "worker" },
-  ],
-  site: async ({ builds }, use) => {
-    const state = { version: "old", fault: "", legacy: false }
-    const requests: string[] = []
-    const blocked: ServerResponse[] = []
-    const release = () => blocked.splice(0).forEach((response) => response.end(builds.new["/large.bin"]))
+const fixture = test.extend<{ site: { url: string; upgrade: () => void; repair: () => void } }>({
+  site: async ({}, use) => {
+    const worker = await readFile(new URL("../../dist/sw.js", import.meta.url), "utf8")
+    const state = { version: "old", repaired: false }
    const server = createServer((request, response) => {
-      const path = new URL(request.url ?? "/", "http://localhost").pathname
-      requests.push(path)
+      const pathname = new URL(request.url ?? "/", "http://localhost").pathname
+      const prefix = state.version === "old" ? "/assets" : "/_assets"
      response.setHeader("cache-control", "no-store")
-      if (path === "/observer.html")
-        return void response.writeHead(200, { "content-type": "text/html" }).end("<title>Worker observer</title>")
-      if (path === "/api/health")
-        return void response.writeHead(200, { "content-type": "application/json" }).end('{"healthy":true}')
-      if (path === "/sw.js" && state.legacy && state.version === "old") {
-        // Model the shipped worker's shared precache name and cache-first navigation behavior.
-        const urls = Object.keys(builds.old).filter(
-          (path) => path === "/index.html" || (path.startsWith("/_assets/") && path.endsWith(".js")),
-        )
+      if (pathname === "/sw.js") {
        response.setHeader("content-type", "text/javascript")
-        return void response.end(`
-          self.addEventListener("install", event => event.waitUntil(
-            caches.open("workbox-precache-v2-" + self.registration.scope).then(cache => cache.addAll(${JSON.stringify(urls)}))
-          ));
-          self.addEventListener("fetch", event => event.respondWith(
-            caches.match(event.request.mode === "navigate" ? "/index.html" : event.request)
-              .then(response => response || fetch(event.request))
-          ));
+        response.end(state.version === "old" ? legacy : worker)
+        return
+      }
+      if (pathname === `${prefix}/app-${state.version}.js`) {
+        response.setHeader("content-type", "text/javascript")
+        response.end(`import "${prefix}/startup-${state.version}.js"`)
+        return
+      }
+      if (pathname === `${prefix}/startup-${state.version}.js`) {
+        response.setHeader("content-type", "text/javascript")
+        response.end(`
+          document.getElementById("root").innerHTML = '<h1>${state.version}</h1><label>Draft<input></label><button>Load older chunk</button><output></output>'
+          document.querySelector("button").onclick = () => import("/assets/lazy-old.js")
        `)
+        return
      }
-      if (path === "/index.html" && state.fault === "mixed-html")
-        return void response.writeHead(200, { "content-type": "text/html" }).end(builds.old["/index.html"])
-      if (path === "/large.bin" && state.fault && state.fault !== "mixed-html") {
-        if (state.fault === "blocked") return void blocked.push(response)
-        if (state.fault === "failed") return void response.writeHead(503).end("Unavailable")
-        if (state.fault === "html")
-          return void response.writeHead(200, { "content-type": "text/html" }).end("<html>Wrong fallback</html>")
-        return void response.end("Incorrect bytes with a successful status")
+      if (
+        (pathname === "/assets/lazy-old.js" && state.version === "old") ||
+        (pathname === "/_assets/retry.js" && state.repaired)
+      ) {
+        response.setHeader("content-type", "text/javascript")
+        response.end('document.querySelector("output").textContent = "Older chunk loaded"')
+        return
      }
-      const file = builds[state.version][path]
-      const types: Record<string, string> = {
-        ".js": "text/javascript",
-        ".html": "text/html",
-        ".json": "application/json",
-        ".wasm": "application/wasm",
-      }
-      response.setHeader("content-type", types[extname(path)] ?? "application/octet-stream")
-      if (file) return void response.end(file)
-      if (extname(path)) return void response.writeHead(404).end("Not found")
+      // Deliberately retain the old server's fallback so the worker must reject HTML asset responses itself.
      response.setHeader("content-type", "text/html")
-      response.end(builds[state.version]["/index.html"])
+      response.end(`<div id="root"></div><script type="module" src="${prefix}/app-${state.version}.js"></script>`)
    })
    server.listen(0, "127.0.0.1")
    await once(server, "listening")
@@ -127,265 +63,75 @@ const fixture = test.extend<{ site: Site }, { builds: Record<string, Record<stri
    try {
      await use({
        url: `http://127.0.0.1:${address.port}`,
-        deploy: (fault = undefined) => {
-          state.version = "new"
-          state.fault = fault ?? ""
-        },
-        legacy: () => {
-          state.legacy = true
-        },
-        requests,
-        release,
+        upgrade: () => (state.version = "new"),
+        repair: () => (state.repaired = true),
      })
    } finally {
-      release()
      server.closeAllConnections()
      await new Promise<void>((resolve, reject) => server.close((error) => (error ? reject(error) : resolve())))
    }
  },
 })

-async function install(page: Page, url: string) {
-  await page.goto(url)
+fixture("updates a legacy worker without reloading drafts or deleting old chunks", async ({ page, site }) => {
+  await page.goto(site.url)
  await expect(page.getByRole("heading")).toHaveText("old")
  await page.evaluate(async () => {
    await navigator.serviceWorker.register("/sw.js")
    await navigator.serviceWorker.ready
  })
-  await page.reload()
-  await expect.poll(() => page.evaluate(() => navigator.serviceWorker.controller?.state)).toBe("activated")
+  await page.goto(site.url)
  await expect(page.getByRole("heading")).toHaveText("old")
-}
+  await page.getByLabel("Draft").fill("Keep this unsent prompt")

-async function update(page: Page) {
-  return page.evaluateHandle(async () => {
+  site.upgrade()
+  await page.evaluate(async () => {
+    const cache = await caches.open("opencode-assets")
+    await cache.put(
+      "/_assets/startup-new.js",
+      new Response("<html>stale fallback</html>", {
+        headers: { "content-type": "text/html" },
+      }),
+    )
+    const changed = new Promise<void>((resolve) =>
+      navigator.serviceWorker.addEventListener("controllerchange", () => resolve(), { once: true }),
+    )
    const registration = await navigator.serviceWorker.getRegistration()
-    if (!registration) throw new Error("Missing installed worker")
-    const found = new Promise<ServiceWorker>((resolve) =>
-      registration.addEventListener(
-        "updatefound",
-        () => {
-          if (!registration.installing) throw new Error("Missing installing worker")
-          resolve(registration.installing)
-        },
-        { once: true },
+    if (!registration) throw new Error("Missing legacy worker")
+    await registration.update()
+    await changed
+  })
+
+  await expect(page.getByLabel("Draft")).toHaveValue("Keep this unsent prompt")
+  await page.getByRole("button", { name: "Load older chunk" }).click()
+  await expect(page.getByRole("status")).toHaveText("Older chunk loaded")
+
+  await page.goto(`${site.url}/workspace/example`)
+  await expect(page.getByRole("heading")).toHaveText("new")
+  await expect
+    .poll(() =>
+      page.evaluate(async () =>
+        (await (await caches.open("opencode-assets")).match("/_assets/startup-new.js"))?.headers.get("content-type"),
      ),
    )
-    await registration.update()
-    return found
+    .toBe("text/javascript")
+})
+
+fixture("does not cache HTML responses under asset URLs", async ({ page, site }) => {
+  site.upgrade()
+  await page.goto(site.url)
+  await expect(page.getByRole("heading")).toHaveText("new")
+  await page.evaluate(async () => {
+    await navigator.serviceWorker.register("/sw.js")
+    await navigator.serviceWorker.ready
  })
-}
-
-async function waiting(page: Page) {
-  await expect
-    .poll(() => page.evaluate(async () => (await navigator.serviceWorker.getRegistration())?.waiting?.state))
-    .toBe("installed")
-}
-
-fixture(
-  "opens an uncached route offline and executes never-used nested lazy chunks",
-  async ({ page, context, site }) => {
-    await install(page, site.url)
-    await expect(page.getByRole("status")).toBeEmpty()
-    await context.setOffline(true)
-    await page.goto(`${site.url}/workspace/never-visited`)
-    await expect(page.getByRole("heading")).toHaveText("old")
-    await page.getByRole("button", { name: "Load lazy" }).click()
-    await expect(page.getByRole("status")).toHaveText("old nested lazy loaded")
-  },
-)
-
-fixture(
-  "precaches public files of every type and size, excluding deployment metadata and source maps",
-  async ({ page, site, builds, context }) => {
-    await install(page, site.url)
-    const files = ["/nested/data.json", "/nested/font.woff2", "/nested/module.wasm", "/large.bin"]
-    await context.setOffline(true)
-    for (const path of files) {
-      const digest = await page.evaluate(
-        async (path) =>
-          Array.from(new Uint8Array(await crypto.subtle.digest("SHA-256", await (await fetch(path)).arrayBuffer()))),
-        path,
-      )
-      expect(Buffer.from(digest)).toEqual(createHash("sha256").update(builds.old[path]).digest())
-    }
-    expect(site.requests).not.toContain("/_headers")
-    expect(site.requests).not.toContain("/_redirects")
-    expect(site.requests.filter((path) => path.endsWith(".map"))).toEqual([])
-  },
-)
-
-fixture(
-  "keeps drafts and removed old lazy chunks until every controlled tab closes",
-  async ({ page, context, site, builds }) => {
-    await install(page, site.url)
-    const second = await context.newPage()
-    await second.goto(site.url)
-    await expect(second.getByRole("heading")).toHaveText("old")
-    await second.getByLabel("Draft").fill("Keep this unsent prompt")
-
-    site.deploy()
-    const created = context.waitForEvent("serviceworker")
-    const worker = await update(page)
-    const replacement = await created
-    await waiting(page)
-    expect(await worker.evaluate((worker) => worker.state)).toBe("installed")
-    await expect(second.getByLabel("Draft")).toHaveValue("Keep this unsent prompt")
-    await page.close()
-    await waiting(second)
-    await expect(second.getByRole("heading")).toHaveText("old")
-    await expect(second.getByLabel("Draft")).toHaveValue("Keep this unsent prompt")
-
-    const removed = Object.keys(builds.old).find((path) => path.includes("/nested-") && path.endsWith(".js"))
-    expect(removed).toBeDefined()
-    expect((await second.request.get(`${site.url}${removed}`)).status()).toBe(404)
-    await second.getByRole("button", { name: "Load lazy" }).click()
-    await expect(second.getByRole("status")).toHaveText("old nested lazy loaded")
-    await expect(second.getByLabel("Draft")).toHaveValue("Keep this unsent prompt")
-    await second.close()
-
-    await expect
-      .poll(() =>
-        replacement.evaluate(() => {
-          const registration = (self as unknown as { registration: ServiceWorkerRegistration }).registration
-          return { waiting: !!registration.waiting, active: registration.active?.state }
-        }),
-      )
-      .toEqual({ waiting: false, active: "activated" })
-    await context.setOffline(true)
-    const observer = await context.newPage()
-    await observer.goto(`${site.url}/workspace/reopened`)
-    await expect(observer.getByRole("heading")).toHaveText("new")
-    await observer.getByRole("button", { name: "Load lazy" }).click()
-    await expect(observer.getByRole("status")).toHaveText("new nested lazy loaded")
-  },
-)
-
-for (const fault of ["failed", "html", "corrupt", "mixed-html"] as const) {
-  fixture(`retains the old complete build when a precache download is ${fault}`, async ({ page, context, site }) => {
-    await install(page, site.url)
-    await page.getByLabel("Draft").fill("Still editing")
-    site.deploy(fault)
-    const worker = await update(page)
-    await expect.poll(() => worker.evaluate((worker) => worker.state)).toBe("redundant")
-    expect(await page.evaluate(async () => (await navigator.serviceWorker.getRegistration())?.waiting)).toBeNull()
-    await expect(page.getByLabel("Draft")).toHaveValue("Still editing")
-    await context.setOffline(true)
-    await page.goto(`${site.url}/workspace/after-failure`)
-    await expect(page.getByRole("heading")).toHaveText("old")
-    await page.getByRole("button", { name: "Load lazy" }).click()
-    await expect(page.getByRole("status")).toHaveText("old nested lazy loaded")
-  })
-}
-
-fixture("does not expose new HTML while a precache download is blocked", async ({ page, context, site }) => {
-  await install(page, site.url)
-  site.requests.length = 0
-  site.deploy("blocked")
-  const worker = await update(page)
-  await expect.poll(() => site.requests.includes("/large.bin")).toBe(true)
-  expect(await worker.evaluate((worker) => worker.state)).toBe("installing")
-  const second = await context.newPage()
-  await second.goto(`${site.url}/workspace/during-install`)
-  await expect(second.getByRole("heading")).toHaveText("old")
-  site.release()
-  await waiting(page)
-  await second.reload()
-  await expect(second.getByRole("heading")).toHaveText("old")
-})
-
-fixture("upgrades the legacy shared precache only after old tabs close", async ({ page, context, site, builds }) => {
-  site.legacy()
-  const observer = await context.newPage()
-  await observer.goto(`${site.url}/observer.html`)
-  await install(page, site.url)
-  await page.getByLabel("Draft").fill("Legacy unsent prompt")
-  // A stale runtime-cache HTML response must not contaminate the new generated precache.
-  const entry = Object.keys(builds.new).find((path) => path.includes("/index-") && path.endsWith(".js"))
-  expect(entry).toBeDefined()
-  await page.evaluate(async (entry) => {
-    await (
-      await caches.open("opencode-assets")
-    ).put(entry!, new Response("<html>stale fallback</html>", { headers: { "content-type": "text/html" } }))
-  }, entry)
-  site.deploy()
-  await update(page)
-  await waiting(page)
-  await expect(page.getByLabel("Draft")).toHaveValue("Legacy unsent prompt")
-  await page.getByRole("button", { name: "Load lazy" }).click()
-  await expect(page.getByRole("status")).toHaveText("old nested lazy loaded")
-  await page.close()
-  await expect
-    .poll(() => observer.evaluate(async () => !!(await navigator.serviceWorker.getRegistration())?.waiting))
-    .toBe(false)
-  await context.setOffline(true)
-  await observer.goto(`${site.url}/workspace/legacy-upgraded`)
-  await expect(observer.getByRole("heading")).toHaveText("new")
-  await observer.getByRole("button", { name: "Load lazy" }).click()
-  await expect(observer.getByRole("status")).toHaveText("new nested lazy loaded")
-})
-
-fixture("does not substitute cached HTML for API or missing asset navigations", async ({ page, site }) => {
-  await install(page, site.url)
-  const api = await page.goto(`${site.url}/api/health`)
-  expect(await api?.json()).toEqual({ healthy: true })
-  expect(api?.fromServiceWorker()).toBe(false)
-  const asset = await page.goto(`${site.url}/_assets/missing.js`)
-  expect(asset?.status()).toBe(404)
-  expect(await asset?.text()).toBe("Not found")
-})
-
-test("the production build precaches every deployable file", async ({ page, context }) => {
-  const directory = new URL("../../dist/", import.meta.url)
-  const files = (await readdir(directory, { recursive: true, withFileTypes: true }))
-    .filter((entry) => entry.isFile())
-    .map((entry) => "/" + relative(fileURLToPath(directory), join(entry.parentPath, entry.name)).split(sep).join("/"))
-    .filter((path) => !path.endsWith(".map") && !["/_headers", "/_redirects", "/sw.js"].includes(path))
-  expect(files.length).toBeGreaterThan(1)
-  const server = createServer(async (request, response) => {
-    const path = new URL(request.url ?? "/", "http://localhost").pathname
-    response.setHeader("cache-control", "no-store")
-    if (path === "/probe.html")
-      return void response.writeHead(200, { "content-type": "text/html" }).end("<title>Precache probe</title>")
-    const bytes = await readFile(new URL(`.${path}`, directory)).catch(() => undefined)
-    if (!bytes) return void response.writeHead(404).end("Not found")
-    if (path.endsWith(".js")) response.setHeader("content-type", "text/javascript")
-    if (path.endsWith(".html")) {
-      response.setHeader("content-type", "text/html")
-      // Inspect the real cached HTML without executing the app or contacting a backend.
-      response.setHeader("content-security-policy", "default-src 'none'")
-    }
-    response.end(bytes)
-  })
-  server.listen(0, "127.0.0.1")
-  await once(server, "listening")
-  const address = server.address()
-  if (!address || typeof address === "string") throw new Error("Expected a TCP address")
-  const url = `http://127.0.0.1:${address.port}`
-  try {
-    await page.goto(`${url}/probe.html`)
-    await page.evaluate(async () => {
-      await navigator.serviceWorker.register("/sw.js")
-      await navigator.serviceWorker.ready
-    })
-    const cached = await page.evaluate(async () =>
-      (
-        await Promise.all(
-          (await caches.keys()).map(async (name) =>
-            (await (await caches.open(name)).keys()).map((request) => new URL(request.url).pathname),
-          ),
-        )
-      )
-        .flat()
-        .sort(),
-    )
-    expect(cached).toEqual(files.sort())
-    await context.setOffline(true)
-    const response = await page.goto(`${url}/workspace/offline-probe`)
-    expect(response?.fromServiceWorker()).toBe(true)
-    expect(await response?.text()).toBe(await readFile(new URL("index.html", directory), "utf8"))
-  } finally {
-    server.closeAllConnections()
-    await new Promise<void>((resolve, reject) => server.close((error) => (error ? reject(error) : resolve())))
-  }
+  await page.goto(site.url)
+  await expect(page.getByRole("heading")).toHaveText("new")
+  expect(await page.evaluate(async () => (await fetch("/_assets/retry.js")).headers.get("content-type"))).toBe(
+    "text/html",
+  )
+  site.repair()
+  expect(await page.evaluate(async () => (await fetch("/_assets/retry.js")).headers.get("content-type"))).toBe(
+    "text/javascript",
+  )
 })
@@ -1,14 +1,9 @@
 import { defineConfig } from "@playwright/test"

-// Tiny fixture builds do not need a Rolldown thread for every host CPU.
-process.env.RAYON_NUM_THREADS ??= "2"
-
 export default defineConfig({
  testDir: ".",
  testMatch: "*.spec.ts",
  outputDir: "../test-results/service-worker",
-  timeout: 60_000,
-  workers: 1,
-  expect: { timeout: 15_000 },
+  timeout: 30_000,
  use: { browserName: "chromium" },
 })
@@ -144,14 +144,12 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
  )
  page.on("close", () => void transport.dispose())

-  await page.route("**/api/**", async (route) => {
+  await page.route("**/*", async (route) => {
    const url = new URL(route.request().url())
    const appPort = new URL(
      process.env.PLAYWRIGHT_BASE_URL ?? `http://127.0.0.1:${process.env.PLAYWRIGHT_PORT ?? "3000"}`,
    ).port
    if (url.origin !== server && url.port !== appPort) return route.fallback()
-    // Production serves the UI and API from one origin; leave app assets to Vite.
-    if (!url.pathname.startsWith("/api/")) return route.fallback()
    if (route.request().method() === "OPTIONS") {
      return route.fulfill({ status: 204, headers: corsHeaders })
    }
@@ -25,7 +25,6 @@
    "test:browser": "bun test --conditions=browser --preload ./happydom.ts ./test-browser",
    "test:unit:watch": "bun test --conditions=solid --watch --preload ./happydom.ts ./src",
    "test:e2e": "playwright test",
-    "test:e2e:built": "PLAYWRIGHT_BUILD=1 playwright test",
    "test:e2e:local": "playwright test",
    "test:components": "playwright test --config playwright.components.config.ts",
    "test:components:ui": "playwright test --config playwright.components.config.ts --ui",
@@ -2,19 +2,10 @@ import { defineConfig, devices } from "@playwright/test"

 const port = Number(process.env.PLAYWRIGHT_PORT ?? 3000)
 const baseURL = process.env.PLAYWRIGHT_BASE_URL ?? `http://127.0.0.1:${port}`
-const url = new URL(baseURL)
-if (url.protocol !== "http:") throw new Error("E2E fixtures require an http:// app URL")
-const built = !!process.env.CI || process.env.PLAYWRIGHT_BUILD === "1"
-// Production connects to its own origin, so fixture URLs must match the preview server.
-if (built) {
-  process.env.PLAYWRIGHT_SERVER_HOST = url.hostname
-  process.env.PLAYWRIGHT_SERVER_PORT = url.port || "80"
-}
 const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"
 const serverPort = process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"
-const command = built
-  ? `bun run build && bun run serve -- --host 127.0.0.1 --port ${port} --strictPort`
-  : `bun run dev -- --host 127.0.0.1 --port ${port} --strictPort`
+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
 export default defineConfig({
  testDir: "./e2e",
@@ -32,18 +23,16 @@ export default defineConfig({
  retries: process.env.CI ? 2 : 0,
  workers,
  reporter: [["html", { outputFolder: "e2e/playwright-report", open: "never" }], ["line"]],
-  webServer: process.env.PLAYWRIGHT_BASE_URL
-    ? undefined
-    : {
-        command,
-        url: baseURL,
-        reuseExistingServer: !built,
-        timeout: 120_000,
-        env: {
-          VITE_OPENCODE_SERVER_HOST: serverHost,
-          VITE_OPENCODE_SERVER_PORT: serverPort,
-        },
-      },
+  webServer: {
+    command,
+    url: baseURL,
+    reuseExistingServer: reuse,
+    timeout: 120_000,
+    env: {
+      VITE_OPENCODE_SERVER_HOST: serverHost,
+      VITE_OPENCODE_SERVER_PORT: serverPort,
+    },
+  },
  use: {
    baseURL,
    trace: "on-first-retry",
@@ -384,18 +384,10 @@ export function createComposerEditor(input: {
        void attachments.handlePaste(event)
        return
      }
-      const text = clipboard?.getData("text/plain").replace(/\r\n?/g, "\n")
+      const text = clipboard?.getData("text/plain")
      if (!text) return
      event.preventDefault()
-      // insertText emits input events per line, repeatedly parsing and saving the draft.
-      // Escaped HTML inserts multiline text once and preserves native selection and undo.
-      const multiline = text.includes("\n")
-      const value = multiline ? text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;") : text
-      if (
-        typeof document.execCommand === "function" &&
-        document.execCommand(multiline ? "insertHTML" : "insertText", false, value)
-      )
-        return
+      if (typeof document.execCommand === "function" && document.execCommand("insertText", false, text)) return
      const target = event.currentTarget
      const selection = window.getSelection()
      if (!(target instanceof HTMLElement) || !selection?.rangeCount || !target.contains(selection.anchorNode)) return
@@ -17,7 +17,7 @@ export function Home() {
  return (
    <div
      class={`
-        mx-2 mb-2 mt-[var(--shell-top-inset,8px)] min-h-0 flex-1 self-stretch overflow-hidden rounded-[10px]
+        m-2 min-h-0 flex-1 self-stretch overflow-hidden rounded-[10px]
        bg-v2-background-bg-base shadow-[var(--v2-elevation-raised)]
      `}
    >
@@ -73,7 +73,7 @@ export default function NewSessionPage(props: { draftId: string }) {
    <div class="relative size-full overflow-hidden flex flex-col">
      {suspendUntilPromptReady()}
      <NewSessionStatus visible={settings.visibility.status()} />
-      <div class="flex-1 min-h-0 flex flex-col gap-2 px-2 pb-2 pt-[var(--shell-top-inset,8px)]">
+      <div class="flex-1 min-h-0 flex flex-col gap-2 p-2">
        <NewSessionView composer={model} project={project} workspace={workspace} />
      </div>
    </div>
@@ -25,7 +25,7 @@ export const DialogSelectMcp: Component = () => {
      .sort((a, b) => a.name.localeCompare(b.name)),
  )

-  const toggle = useMcpToggle(() => sdk().directory)
+  const toggle = useMcpToggle()

  const enabledCount = createMemo(() => items().filter((i) => i.status === "connected").length)
  const totalCount = createMemo(() => items().length)
@@ -40,9 +40,6 @@ export function useMcpToggle(directory?: Accessor<string | undefined>, onSuccess
      data.location.mcp.server.invalidate(ref)
      data.location.mcp.resource.invalidate(ref)
      await Promise.all([data.location.mcp.server.sync(ref), data.location.mcp.resource.sync(ref), onSuccess?.()])
-      // A successful HTTP response can still leave the MCP connection in a failed state.
-      const status = data.location.mcp.server.list(ref)?.find((item) => item.name === name)?.status
-      if (status?.status === "failed") throw new Error(`${name}: ${status.error}`)
    },
    onError: (error) =>
      showToast({
@@ -983,11 +983,6 @@ export const dict = {
  "settings.general.row.followUpBehavior.steer": "Steer",
  "settings.general.row.reasoningSummaries.title": "Show reasoning summaries",
  "settings.general.row.reasoningSummaries.description": "Display model reasoning summaries in the timeline",
-  "settings.general.row.reasoningMode.title": "Model reasoning",
-  "settings.general.row.reasoningMode.description": "Choose how model reasoning is displayed in the timeline",
-  "settings.general.row.reasoningMode.hidden": "Hidden",
-  "settings.general.row.reasoningMode.compact": "Compact",
-  "settings.general.row.reasoningMode.full": "Full",
  "settings.general.row.shellToolPartsExpanded.title": "Expand shell tool parts",
  "settings.general.row.shellToolPartsExpanded.description":
    "Show shell tool parts expanded by default in the timeline",
@@ -1,16 +1,10 @@
 import type { AgentListOutput, ModelListOutput, ProviderListOutput } from "@opencode-ai/client/promise"
 import type { Agent, Project, Provider, ProviderListResponse } from "@/runtime/server/types"
 import type { Project as CurrentProject } from "@opencode-ai/client/promise"
-import { unwrap } from "solid-js/store"
 export { pathKey as directoryKey, type PathKey as DirectoryKey } from "@/workspaces/path-key"

 export const cmp = (a: string, b: string) => (a < b ? -1 : a > b ? 1 : 0)

-const providerCatalogs = new WeakMap<
-  ProviderListOutput["data"],
-  WeakMap<ModelListOutput["data"], ProviderListResponse>
->()
-
 export function normalizeAgentList(input: AgentListOutput["data"] | Agent[]): Agent[] {
  if (input.every((agent) => !("request" in agent))) return input as Agent[]
  return (input as AgentListOutput["data"]).map((agent) => ({
@@ -36,16 +30,12 @@ export function normalizeAgentList(input: AgentListOutput["data"] | Agent[]): Ag
 }

 export function normalizeProviderList(
-  input: ProviderListOutput["data"] | ProviderListResponse,
-  catalog?: ModelListOutput["data"],
+  providers: ProviderListOutput["data"] | ProviderListResponse,
+  models?: ModelListOutput["data"],
 ): ProviderListResponse {
-  if (!Array.isArray(input)) return input
-  // Client sync replaces whole catalog lists. Track those reads at the caller,
-  // not every model field, and share conversions without retaining old lists.
-  const providers = unwrap(input)
-  const models = unwrap(catalog)
-  const cached = models && providerCatalogs.get(providers)?.get(models)
-  if (cached) return cached
+  if (!Array.isArray(providers)) {
+    return providers
+  }
  const all = new Map<string, Provider>()

  for (const provider of providers) {
@@ -111,7 +101,7 @@ export function normalizeProviderList(
    }
  }

-  const result = {
+  return {
    all,
    connected: providers.map((provider) => provider.id),
    default: Object.fromEntries(
@@ -121,12 +111,6 @@ export function normalizeProviderList(
      }),
    ),
  }
-  if (models) {
-    const cache = providerCatalogs.get(providers) ?? new WeakMap<ModelListOutput["data"], ProviderListResponse>()
-    cache.set(models, result)
-    providerCatalogs.set(providers, cache)
-  }
-  return result
 }

 export function normalizeProjectInfo(project: Project | CurrentProject): Project {
@@ -5,8 +5,7 @@ import { useFile } from "@/workspaces/files/model"
 import { useWorkspaceLocation } from "@/workspaces/location"
 import { useData } from "@/runtime/server/current"
 import { same } from "@/runtime/persistence/equality"
-import { containsDirectory, isProjectDirectory, isWorkspaceDirectory } from "@/workspaces/paths"
-import { projectForSession } from "@/shell/layout/helpers"
+import { containsDirectory, isWorkspaceDirectory } from "@/workspaces/paths"
 import { createSessionTabs } from "./helpers"
 import {
  normalizeSessionTab,
@@ -91,16 +90,7 @@ export function useSessionModel() {
    isDesktop,
    workspace: {
      directory: createMemo(() => info()?.location.directory ?? location().directory),
-      current: createMemo(() => {
-        const current = info()
-        const directory = current?.location.directory ?? location().directory
-        // Global sync enriches projects with discovered worktrees; raw project metadata does not.
-        const projects = server.ctx.sync.data.project
-        const value = current
-          ? projectForSession(current, projects)
-          : projects.find((item) => isProjectDirectory(item, directory))
-        return isWorkspaceDirectory(value, directory)
-      }),
+      current: createMemo(() => isWorkspaceDirectory(project(), info()?.location.directory ?? location().directory)),
    },
    identity: {
      params: layout.params,
@@ -44,7 +44,9 @@ function TargetSessionSettingsCommand() {
  return null
 }

-function SessionRouteErrorBoundary(props: ParentProps<{ sessionID?: string; serverKey?: ServerConnection.Key }>) {
+function SessionRouteErrorBoundary(
+  props: ParentProps<{ sessionID?: string; serverKey?: ServerConnection.Key }>,
+) {
  return (
    <ErrorBoundary
      fallback={(error) => (
@@ -104,7 +106,7 @@ function PendingSessionState(props: { sessionID: string }) {

 function SessionStatePanel(props: ParentProps) {
  return (
-    <div class="flex min-h-0 flex-1 px-2 pb-2 pt-[var(--shell-top-inset,8px)]">
+    <div class="flex min-h-0 flex-1 p-2">
      <SessionPanelFrame raised>{props.children}</SessionPanelFrame>
    </div>
  )
@@ -8,7 +8,7 @@ import type { SessionModel } from "./model"
 import { sessionPanelLayout } from "./session-panel-layout"
 import { clampSessionPanelWidth, sessionPanelWidthMax } from "./session-panel-width"

-export function createSessionScreenLayout(session: SessionModel) {
+export function createSessionScreenLayout(session: SessionModel, serverScope: string) {
  const layout = useLayout()
  const settings = useSettings()
  const size = createSizing()
@@ -92,6 +92,7 @@ export function createSessionScreenLayout(session: SessionModel) {
    centered: createMemo(() => session.isDesktop()),
    files: { open: fileTreeOpen },
    panel: {
+      key: createMemo(() => (session.identity.params.id ? `${serverScope}\0${session.identity.params.id}` : undefined)),
      max: panelMax,
      ref: (element: HTMLDivElement) => {
        row = element
@@ -4,6 +4,7 @@ import createPresence from "solid-presence"
 import { ResizeHandle } from "@opencode-ai/ui/resize-handle"
 import { SessionHeader } from "@/session/header/session-header"
 import { useLayout } from "@/shell/state/layout"
+import { useServerSDK } from "@/runtime/server/client"
 import { useSettings } from "@/settings/model"
 import { MessageTimeline } from "@/session/timeline/message-timeline"
 import type { SessionModel } from "@/session/model"
@@ -22,9 +23,10 @@ import { SessionIdentityHeader } from "./session-identity-header"
 export function SessionScreen(props: { session: SessionModel }) {
  const session = props.session
  const layout = useLayout()
+  const serverSDK = useServerSDK()
  const settings = useSettings()
  const isDesktop = session.isDesktop
-  const screen = createSessionScreenLayout(session)
+  const screen = createSessionScreenLayout(session, serverSDK.scope)
  const timeline = createSessionTimelineInteraction(session)
  const messagesReady = timeline.ready
  const [store, setStore] = createStore({
@@ -162,7 +164,7 @@ export function SessionScreen(props: { session: SessionModel }) {
  return (
    <>
      <SessionHeader />
-      <div class="flex-1 min-h-0 flex flex-col gap-2 px-2 pb-2 pt-[var(--shell-top-inset,8px)]">
+      <div class="flex-1 min-h-0 flex flex-col gap-2 p-2">
        <div ref={screen.panel.ref} class="relative flex-1 min-h-0 flex flex-col md:flex-row gap-2">
          <div
            classList={{
@@ -175,10 +177,12 @@ export function SessionScreen(props: { session: SessionModel }) {
              width: screen.panel.width(),
            }}
          >
-            <Show when={!!session.identity.params.id}>
-              <SessionPanelFrame raised>
-                <ErrorBoundary fallback={sessionErrorFallback}>{sessionPanelContent()}</ErrorBoundary>
-              </SessionPanelFrame>
+            <Show when={screen.panel.key()} keyed>
+              {(_) => (
+                <SessionPanelFrame raised={!!session.identity.params.id}>
+                  <ErrorBoundary fallback={sessionErrorFallback}>{sessionPanelContent()}</ErrorBoundary>
+                </SessionPanelFrame>
+              )}
            </Show>

            <Show when={screen.panel.resizable()}>
@@ -2,10 +2,7 @@ import type { ParentProps } from "solid-js"

 export function SessionRouteFrame(props: ParentProps<{ padded?: boolean }>) {
  return (
-    <div
-      class="relative flex size-full flex-col overflow-hidden"
-      classList={{ "px-2 pb-2 pt-[var(--shell-top-inset,8px)]": props.padded }}
-    >
+    <div class="relative flex size-full flex-col overflow-hidden" classList={{ "p-2": props.padded }}>
      {props.children}
    </div>
  )
@@ -1,8 +1,6 @@
 import { describe, expect, test } from "bun:test"
 import type { SessionInboxInfo, SessionMessageInfo } from "@opencode-ai/client/promise"
-import { createRoot } from "solid-js"
 import { applyTimelineMessageHandoff, visibleTimelineMessages } from "./controller-projection"
-import { createTimelineProjection } from "./projection"

 const messages = [
  { id: "msg_1", type: "user", text: "first", time: { created: 1 } },
@@ -19,104 +17,6 @@ const messages = [
 ] satisfies SessionMessageInfo[]

 describe("visibleTimelineMessages", () => {
-  const steer = {
-    id: "msg_3",
-    sessionID: "ses_1",
-    timeCreated: 3,
-    type: "user",
-    delivery: "steer",
-    payload: { text: "queued" },
-  } satisfies SessionInboxInfo
-  const work = {
-    id: "msg_5",
-    type: "assistant",
-    agent: "build",
-    model: { id: "model", providerID: "provider" },
-    content: [
-      {
-        type: "tool",
-        id: "tool_read",
-        name: "read",
-        state: {
-          status: "completed",
-          input: { filePath: "src/example.ts" },
-          content: [{ type: "text", text: "export const example = true" }],
-          metadata: {},
-        },
-        time: { created: 5, completed: 6 },
-      },
-    ],
-    time: { created: 5, completed: 6 },
-  } satisfies SessionMessageInfo
-
-  test("keeps work above an undelivered steer without adding a thinking row", () => {
-    const source = [...messages.slice(0, 3), work]
-    const visible = visibleTimelineMessages(source, [steer])
-    expect(visible.map((message) => message.id)).toEqual(["msg_1", "msg_2", "msg_5", "msg_3"])
-    expect(source.map((message) => message.id)).toEqual(["msg_1", "msg_2", "msg_3", "msg_5"])
-    expect(visible[2]).toBe(work)
-
-    createRoot((dispose) => {
-      const projection = createTimelineProjection({
-        sessionMessages: () => visible,
-        status: () => ({ type: "busy" }),
-        reasoningMode: () => "compact",
-        shellToolDefaultOpen: () => false,
-        editToolDefaultOpen: () => false,
-        pendingUserMessageIDs: () => new Set([steer.id]),
-      })
-      expect(projection.activeMessageID()).toBe("msg_1")
-      expect(projection.rows().map((row) => [row._tag, row.userMessageID])).toEqual([
-        ["UserMessage", "msg_1"],
-        ["AssistantPart", "msg_1"],
-        ["TurnGap", "msg_3"],
-        ["UserMessage", "msg_3"],
-      ])
-      expect(
-        projection
-          .assistantMessagesByParent()
-          .get("msg_1")
-          ?.map((message) => message.id),
-      ).toEqual(["msg_2", "msg_5"])
-      expect(projection.assistantMessagesByParent().has(steer.id)).toBe(false)
-      dispose()
-    })
-  })
-
-  test("moves a queued input after existing work when changed to steer", () => {
-    const source = [...messages.slice(0, 3), work]
-    expect(visibleTimelineMessages(source, [{ ...steer, delivery: "queue" }]).map((message) => message.id)).toEqual([
-      "msg_1",
-      "msg_2",
-      "msg_5",
-    ])
-    expect(visibleTimelineMessages(source, [steer]).map((message) => message.id)).toEqual([
-      "msg_1",
-      "msg_2",
-      "msg_5",
-      "msg_3",
-    ])
-    const delivered = [messages[0], messages[1], work, messages[2]]
-    expect(visibleTimelineMessages(delivered, [])).toBe(delivered)
-  })
-
-  test("preserves steer order and excludes reverted steers", () => {
-    const source = [...messages, work]
-    const pending = [steer, { ...steer, id: "msg_4" }]
-    expect(visibleTimelineMessages(source, pending).map((message) => message.id)).toEqual([
-      "msg_1",
-      "msg_2",
-      "msg_5",
-      "msg_3",
-      "msg_4",
-    ])
-    expect(visibleTimelineMessages(source, pending, "msg_4").map((message) => message.id)).toEqual([
-      "msg_1",
-      "msg_2",
-      "msg_3",
-    ])
-  })
-
  test("hides queued inputs until delivery", () => {
    const pending = [
      {
@@ -17,19 +17,8 @@ export function visibleTimelineMessages(
  const queued = new Set(
    pending.flatMap((item) => (item.type === "user" && item.delivery === "queue" ? [item.id] : [])),
  )
-  const steers = new Set(
-    pending.flatMap((item) => (item.type === "user" && item.delivery === "steer" ? [item.id] : [])),
-  )
-  if (queued.size === 0 && steers.size === 0 && !revertMessageID) return messages
-  const visible = messages.filter(
-    (message) => !queued.has(message.id) && (!revertMessageID || message.id < revertMessageID),
-  )
-  if (steers.size === 0) return visible
-  // Pending steers do not own assistant work until they are delivered.
-  return [
-    ...visible.filter((message) => !steers.has(message.id)),
-    ...visible.filter((message) => steers.has(message.id)),
-  ]
+  if (queued.size === 0 && !revertMessageID) return messages
+  return messages.filter((message) => !queued.has(message.id) && (!revertMessageID || message.id < revertMessageID))
 }

 export function timelineChildTitle(input: {
@@ -104,7 +104,7 @@ export function createTimelineController(input: { session: TimelineSessionSource
  const projection = createTimelineProjection({
    sessionMessages: projectedMessages,
    status: input.session.data.status,
-    reasoningMode: settings.general.reasoningMode,
+    showReasoningSummaries: settings.general.showReasoningSummaries,
    shellToolDefaultOpen: settings.general.shellToolPartsExpanded,
    editToolDefaultOpen: settings.general.editToolPartsExpanded,
    pendingUserMessageIDs,
@@ -235,7 +235,7 @@ export function createTimelineController(input: { session: TimelineSessionSource
      childTitle,
      showHeader,
      projection,
-      reasoningMode: settings.general.reasoningMode,
+      showReasoningSummaries: settings.general.showReasoningSummaries,
      shellToolPartsExpanded: settings.general.shellToolPartsExpanded,
      editToolPartsExpanded: settings.general.editToolPartsExpanded,
    },
@@ -349,7 +349,8 @@ function MessageTimelineView(
      : projects.find((item) => containsDirectory(item.worktree, sessionDirectory()))
  })
  const workspaceSession = createMemo(() => isWorkspaceDirectory(project(), sessionDirectory()))
-  const showProjectIcon = () => import.meta.env.VITE_OPENCODE_CHANNEL !== "prod" && settings.general.showProjectIcon()
+  const showProjectIcon = () =>
+    import.meta.env.VITE_OPENCODE_CHANNEL !== "prod" && settings.general.showProjectIcon()
  const avatarProject = createMemo(() => {
    if (!showProjectIcon()) return
    const session = props.session.data.info()
@@ -458,7 +459,7 @@ function MessageTimelineView(
      }
    },
    actions: props.actions,
-    reasoningMode: props.data.reasoningMode,
+    showReasoningSummaries: props.data.showReasoningSummaries,
    shellToolDefaultOpen: props.data.shellToolPartsExpanded,
    editToolDefaultOpen: props.data.editToolPartsExpanded,
    disclosure: virtualized.disclosure,
@@ -468,13 +469,13 @@ function MessageTimelineView(
  })
  const backgroundHintPartID = createMemo(() => {
    const blocking = new Set(props.background.blocking().map((task) => task.partID))
-    if (blocking.size === 0) return
-    return projection
+    const row = projection
      .rows()
-      .flatMap((row) =>
-        row._tag === "AssistantPart" ? (row.group.type === "part" ? [row.group.ref] : row.group.refs) : [],
+      .findLast(
+        (row) => row._tag === "AssistantPart" && row.group.type === "part" && blocking.has(row.group.ref.partID),
      )
-      .findLast((ref) => blocking.has(ref.partID))?.partID
+    if (row?._tag !== "AssistantPart" || row.group.type !== "part") return
+    return row.group.ref.partID
  })
  const [backgroundHintRef, setBackgroundHintRef] = createSignal<HTMLDivElement>()
  const backgroundHintPresence = createAnimatedPresence(backgroundHintPartID, () => backgroundHintRef() ?? null)
@@ -1,10 +1,5 @@
 import type { ModelRef, SessionMessageInfo, SessionStatus } from "@opencode-ai/client/promise"
-import {
-  reuseTimelineRows,
-  Timeline,
-  TimelineRow,
-  type ReasoningMode,
-} from "@opencode-ai/session-ui/timeline/projection"
+import { reuseTimelineRows, Timeline, TimelineRow } from "@opencode-ai/session-ui/timeline/projection"
 import { createMemo, type Accessor } from "solid-js"

 export { reuseTimelineRows } from "@opencode-ai/session-ui/timeline/projection"
@@ -12,7 +7,7 @@ export { reuseTimelineRows } from "@opencode-ai/session-ui/timeline/projection"
 export function createTimelineProjection(input: {
  sessionMessages: Accessor<SessionMessageInfo[]>
  status: Accessor<SessionStatus>
-  reasoningMode: Accessor<ReasoningMode>
+  showReasoningSummaries: Accessor<boolean>
  shellToolDefaultOpen: Accessor<boolean>
  editToolDefaultOpen: Accessor<boolean>
  pendingUserMessageIDs: Accessor<ReadonlySet<string>>
@@ -85,7 +80,7 @@ export function createTimelineProjection(input: {
  const projection = createMemo(() =>
    Timeline.constructSessionMessageRows(
      input.sessionMessages(),
-      input.reasoningMode() !== "hidden",
+      input.showReasoningSummaries(),
      input.status(),
      input.pendingUserMessageIDs(),
      input.shellToolDefaultOpen(),
@@ -1,15 +1,8 @@
-import {
-  createVirtualizer,
-  defaultRangeExtractor,
-  elementScroll,
-  type Range,
-  type VirtualItem,
-} from "@tanstack/solid-virtual"
+import { createVirtualizer, defaultRangeExtractor, elementScroll, type VirtualItem } from "@tanstack/solid-virtual"
 import { isScrollKeyTarget, scrollKey, scrollKeyOwner, ScrollView } from "@opencode-ai/ui/scroll-view"
 import { TimelineRow } from "@opencode-ai/session-ui/timeline/projection"
 import { useLanguage } from "@/runtime/i18n/language"
 import {
-  batch,
  createEffect,
  createMemo,
  createSignal,
@@ -75,12 +68,11 @@ export function createTimelineVirtualizer(input: Input) {
  const coldBottomMount = !initialMeasurements?.length && input.pinned()
  const [listRoot, setListRoot] = createSignal<HTMLDivElement>()
  const [toolOpen, setToolOpen] = createStore<Record<string, boolean | undefined>>(cached?.toolOpen ?? {})
-  const [overscan, setOverscan] = createSignal(2)
+  const [renderOverscan, setRenderOverscan] = createSignal(initialMeasurements?.length || coldBottomMount ? 6 : 20)
  const rows = input.projection.rows
  const rowByKey = input.projection.rowByKey
  const knownKeys = new Set(rows().map(TimelineRow.key))
  const addedKeys = new Set<string>()
-  const measuredElements = new WeakSet<Element>()
  let touchStart: number | undefined
  let pointerHeld = false
  let maxScroll = 0
@@ -100,19 +92,14 @@ export function createTimelineVirtualizer(input: Input) {
    initialOffset: () => (input.pinned() ? Number.MAX_SAFE_INTEGER : 0),
    initialMeasurementsCache: initialMeasurements,
    estimateSize: () => fallbackItemSize,
-    // A newly observed element gets a real ResizeObserver box before paint. Reuse
-    // its snapshot on attachment, but later explicit measurements must read layout
-    // so deferred/rewrapped content cannot keep stale, clipped heights (TanStack/virtual#1183).
-    measureElement: (element, entry, instance) => {
-      const initial = !measuredElements.has(element)
-      measuredElements.add(element)
+    // Do not replace this with TanStack's default measurer: without a ResizeObserver entry,
+    // it returns the cached height instead of reading the element (TanStack/virtual#1183).
+    // Restored sessions, deferred tools, and rewrapped content can then keep stale heights;
+    // our fixed-height, overflow-clipped rows will hide their content. Keep observer entries
+    // on the cheap precomputed path, but make explicit measurements read the real height.
+    measureElement: (element, entry) => {
      const box = entry?.borderBoxSize[0]
-      if (box) return Math.round(box.blockSize)
-      if (initial) {
-        const size = instance.itemSizeCache.get(instance.options.getItemKey(instance.indexFromElement(element)))
-        if (size !== undefined) return size
-      }
-      return element.offsetHeight
+      return box ? Math.round(box.blockSize) : element.offsetHeight
    },
    scrollToFn: (offset, options, instance) => {
      if (virtualContent) virtualContent.style.height = `${instance.getTotalSize()}px`
@@ -144,59 +131,41 @@ export function createTimelineVirtualizer(input: Input) {
      return input.showHeader() ? 64 : 0
    },
    paddingEnd: 64,
-    get rangeExtractor() {
+    rangeExtractor: (range) => {
      const id = input.projection.activeMessageID()
      const active = id ? (input.projection.messageLastRowIndex().get(id) ?? -1) : -1
-      const buffer = overscan()
-      return (range: Range) => {
-        const indexes = defaultRangeExtractor({ ...range, overscan: buffer })
-        return filterVirtualIndexes(
-          [...new Set([...indexes, ...(active < 0 ? [] : [active])])].sort((a, b) => a - b),
-          range.count,
-        )
-      }
+      const indexes = defaultRangeExtractor({ ...range, overscan: renderOverscan() })
+      return filterVirtualIndexes(
+        [...new Set([...indexes, ...(active < 0 ? [] : [active])])].sort((a, b) => a - b),
+        range.count,
+      )
    },
  })
  const resizeItem = virtualizer.resizeItem
-  const pendingSizes = new Map<number, { key: string; size: number }>()
-  let resizeScheduled = false
-  // Read the whole measurement delivery before committing reactive row sizes.
-  // Otherwise each row can render and force layout before the next is measured.
-  virtualizer.resizeItem = (index, size) => {
-    const row = rows()[index]
-    if (!row) return
-    const key = TimelineRow.key(row)
-    if (virtualizer.itemSizeCache.get(key) === size) {
-      pendingSizes.delete(index)
-      return
-    }
-    pendingSizes.set(index, { key, size })
-    if (resizeScheduled) return
-    resizeScheduled = true
+  let resizeAnchorScheduled = false
+  // Rows measure asynchronously, so the last row can still hold its estimate when TanStack
+  // reconciles the end. Coalesce one correction per measurement batch, before paint.
+  const anchorResizedBottom = () => {
+    if (resizeAnchorScheduled) return
+    resizeAnchorScheduled = true
    queueMicrotask(() => {
-      resizeScheduled = false
-      if (!pendingSizes.size) return
-      const sizes = [...pendingSizes]
-      pendingSizes.clear()
-      batch(() => {
-        sizes.forEach(([index, value]) => {
-          const row = rows()[index]
-          if (row && TimelineRow.key(row) === value.key) resizeItem(index, value.size)
-        })
-      })
+      resizeAnchorScheduled = false
      if (!input.pinned()) return
-      const root = listRoot()
-      // Reopening a settled scroll-to-end operation can fight subsequent keyboard scrolling.
-      if (root && Math.abs(root.scrollHeight - root.clientHeight - root.scrollTop) > endEpsilon)
-        virtualizer.scrollToEnd()
+      virtualizer.scrollToEnd()
    })
  }
-  onCleanup(() => pendingSizes.clear())
+  virtualizer.resizeItem = (index, size) => {
+    resizeItem(index, size)
+    if (listRoot() && input.pinned()) anchorResizedBottom()
+  }
  virtualizer.shouldAdjustScrollPositionOnItemSizeChange = (item, _delta, instance) => {
    // Prepended rows can resize more than once as deferred content mounts. Keep
    // compensating while they remain entirely above the visible content fold.
    if (addedKeys.has(String(item.key)))
-      return item.end <= (instance.scrollOffset ?? 0) + instance.scrollAdjustments + instance.options.scrollMargin
+      return (
+        item.end <=
+        (instance.scrollOffset ?? 0) + instance.scrollAdjustments + instance.options.scrollMargin
+      )
    const first = instance.range?.startIndex
    return first !== undefined && item.index < first
  }
@@ -217,41 +186,50 @@ export function createTimelineVirtualizer(input: Input) {
    })
  })

-  let settleFrame: number | undefined
  let overscanFrame: number | undefined
-  let overscanTimer: number | undefined
-  const expandOverscan = () => {
-    overscanFrame = requestAnimationFrame(() => {
-      overscanFrame = undefined
-      // Let the visible rows paint before building the normal interaction buffer.
-      overscanTimer = window.setTimeout(() => {
-        overscanTimer = undefined
-        setOverscan(20)
-      }, 0)
-    })
-  }
  const pendingMeasurements = () =>
    virtualizer.getVirtualItems().some((item) => !virtualizer.itemSizeCache.has(item.key))
  const settleColdBottom = () => {
    if (input.pinned()) virtualizer.scrollToEnd()
    if (virtualContent?.querySelector(pendingMarkdown) || pendingMeasurements()) {
-      settleFrame = requestAnimationFrame(settleColdBottom)
+      overscanFrame = requestAnimationFrame(settleColdBottom)
      return
    }
-    settleFrame = requestAnimationFrame(() => {
+    overscanFrame = requestAnimationFrame(() => {
      if (input.pinned()) virtualizer.scrollToEnd()
      if (virtualContent?.querySelector(pendingMarkdown) || pendingMeasurements()) {
        settleColdBottom()
        return
      }
-      settleFrame = undefined
-      virtualContent?.style.removeProperty("visibility")
-      expandOverscan()
+      overscanFrame = undefined
+      const content = virtualContent
+      if (!content) return
+      if (window.matchMedia("(prefers-reduced-motion: reduce)").matches) {
+        content.style.removeProperty("visibility")
+        return
+      }
+      const animation = ["animate-in", "fade-in", "duration-150"]
+      const clearAnimation = (event: AnimationEvent) => {
+        if (event.target !== content) return
+        content.removeEventListener("animationend", clearAnimation)
+        content.removeEventListener("animationcancel", clearAnimation)
+        content.classList.remove(...animation)
+      }
+      content.addEventListener("animationend", clearAnimation)
+      content.addEventListener("animationcancel", clearAnimation)
+      content.classList.add(...animation)
+      content.style.removeProperty("visibility")
    })
  }
  onMount(() => {
-    if (coldBottomMount) settleFrame = requestAnimationFrame(settleColdBottom)
-    if (!coldBottomMount) expandOverscan()
+    overscanFrame = requestAnimationFrame(() => {
+      if (renderOverscan() < 20) setRenderOverscan(20)
+      if (!coldBottomMount) {
+        overscanFrame = undefined
+        return
+      }
+      settleColdBottom()
+    })
  })

  let measuredSessionKey = input.sessionKey()
@@ -278,13 +256,11 @@ export function createTimelineVirtualizer(input: Input) {
  const handleListWheel = (event: WheelEvent & { currentTarget: HTMLDivElement }) => {
    input.onUserScroll(event.target)
    if (event.deltaY < 0) input.onUnpin()
-    setOverscan(20)
  }

  const handleListTouchStart = (event: TouchEvent) => {
    input.onUserScroll(event.target)
    touchStart = event.touches[0]?.clientY
-    setOverscan(20)
  }

  const handleListTouchMove = (event: TouchEvent & { currentTarget: HTMLDivElement }) => {
@@ -301,19 +277,14 @@ export function createTimelineVirtualizer(input: Input) {
  const handleListPointerDown = (event: PointerEvent & { currentTarget: HTMLDivElement }) => {
    input.onUserScroll(event.target)
    pointerHeld = true
-    setOverscan(20)
+    const release = () => {
+      pointerHeld = false
+      window.removeEventListener("pointerup", release)
+      window.removeEventListener("pointercancel", release)
+    }
+    window.addEventListener("pointerup", release)
+    window.addEventListener("pointercancel", release)
  }
-  const releasePointer = () => {
-    pointerHeld = false
-  }
-  onMount(() => {
-    window.addEventListener("pointerup", releasePointer)
-    window.addEventListener("pointercancel", releasePointer)
-  })
-  onCleanup(() => {
-    window.removeEventListener("pointerup", releasePointer)
-    window.removeEventListener("pointercancel", releasePointer)
-  })

  const handleListKeyDown = (event: KeyboardEvent & { currentTarget: HTMLDivElement }) => {
    const key = scrollKey(event)
@@ -322,7 +293,6 @@ export function createTimelineVirtualizer(input: Input) {
    if (scrollKeyOwner(event.currentTarget, event.target, key) !== event.currentTarget) return
    input.onUserScroll(event.currentTarget)
    if (upwardKeys.has(key)) input.onUnpin()
-    setOverscan(20)
  }

  // Following resumes by arriving at the end, either by scrolling there or by content shrinking
@@ -445,6 +415,7 @@ export function createTimelineVirtualizer(input: Input) {
          <Show when={input.showHeader()}>{props.header}</Show>
          <div
            data-timeline-virtual-content
+            class="motion-reduce:animate-none"
            ref={(element) => {
              virtualContent = element
              input.setContentRef(element)
@@ -476,9 +447,7 @@ export function createTimelineVirtualizer(input: Input) {
    cache.delete(ownerSessionKey)
    cache.set(ownerSessionKey, { measurements: virtualizer.takeSnapshot(), toolOpen: { ...toolOpen } })
    while (cache.size > 16) cache.delete(cache.keys().next().value!)
-    if (settleFrame !== undefined) cancelAnimationFrame(settleFrame)
    if (overscanFrame !== undefined) cancelAnimationFrame(overscanFrame)
-    if (overscanTimer !== undefined) window.clearTimeout(overscanTimer)
    input.setScrollRef(undefined)
    input.setRevealMessage?.(() => {})
    input.setScrollToEnd?.(() => {})
@@ -4,7 +4,6 @@ import { Button } from "@opencode-ai/ui/button"
 import { Select } from "@opencode-ai/ui/select"
 import { Switch } from "@opencode-ai/ui/switch"
 import { TextInput } from "@opencode-ai/ui/text-input"
-import type { ReasoningMode } from "@opencode-ai/session-ui/timeline/projection"
 import { useLanguage } from "@/runtime/i18n/language"
 import { usePlatform } from "@/runtime/platform/platform"
 import { useUpdaterAction } from "@/shell/updates/action"
@@ -184,34 +183,6 @@ const FollowUpBehaviorSetting: Component = () => {
  )
 }

-const ReasoningModeSetting: Component = () => {
-  const language = useLanguage()
-  const settings = useSettings()
-  const options = createMemo((): { value: ReasoningMode; label: string }[] => [
-    { value: "hidden", label: language.t("settings.general.row.reasoningMode.hidden") },
-    { value: "compact", label: language.t("settings.general.row.reasoningMode.compact") },
-    { value: "full", label: language.t("settings.general.row.reasoningMode.full") },
-  ])
-
-  return (
-    <SettingsRow
-      title={language.t("settings.general.row.reasoningMode.title")}
-      description={language.t("settings.general.row.reasoningMode.description")}
-    >
-      <Select
-        data-action="settings-reasoning-mode"
-        options={options()}
-        current={options().find((option) => option.value === settings.general.reasoningMode())}
-        value={(option) => option.value}
-        label={(option) => option.label}
-        placement="bottom-end"
-        gutter={6}
-        onSelect={(option) => option && settings.general.setReasoningMode(option.value)}
-      />
-    </SettingsRow>
-  )
-}
-
 const AppearanceSection: Component<{ controller: AppearanceSettingsController }> = (props) => {
  const language = useLanguage()
  return (
@@ -360,7 +331,17 @@ export const SettingsGeneral: Component<{
        <TerminalPlacementSetting />
        <FollowUpBehaviorSetting />

-        <ReasoningModeSetting />
+        <SettingsRow
+          title={language.t("settings.general.row.reasoningSummaries.title")}
+          description={language.t("settings.general.row.reasoningSummaries.description")}
+        >
+          <div data-action="settings-feed-reasoning-summaries">
+            <Switch
+              checked={settings.general.showReasoningSummaries()}
+              onChange={(checked) => settings.general.setShowReasoningSummaries(checked)}
+            />
+          </div>
+        </SettingsRow>

        <SettingsRow
          title={language.t("settings.general.row.shellToolPartsExpanded.title")}
@@ -1,33 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { migrateSettings, monoDefault, monoFontFamily, sansDefault, sansFontFamily, terminalFontFamily } from "./model"
-
-describe("settings reasoning mode migration", () => {
-  test.each([
-    [true, "full"],
-    [false, "compact"],
-  ])("maps persisted reasoning summaries %s to %s", (showReasoningSummaries, reasoningMode) => {
-    const value = { general: { showReasoningSummaries, showTerminal: true }, appearance: { fontSize: 16 } }
-    expect(migrateSettings(value)).toEqual({
-      ...value,
-      general: { ...value.general, reasoningMode },
-    })
-    expect(value.general).not.toHaveProperty("reasoningMode")
-  })
-
-  test.each(["hidden", "compact", "full"])(
-    "preserves an explicit %s mode over either legacy value",
-    (reasoningMode) => {
-      ;[true, false].forEach((showReasoningSummaries) => {
-        const value = { general: { reasoningMode, showReasoningSummaries } }
-        expect(migrateSettings(value)).toBe(value)
-      })
-    },
-  )
-
-  test.each([undefined, null, {}, { general: {} }])("leaves missing legacy settings to the defaults: %j", (value) => {
-    expect(migrateSettings(value)).toBe(value)
-  })
-})
+import { monoDefault, monoFontFamily, sansDefault, sansFontFamily, terminalFontFamily } from "./model"

 describe("settings font families", () => {
  test("defaults normal text to Inter", () => {
@@ -1,7 +1,6 @@
 import { createStore, reconcile } from "solid-js/store"
 import { createEffect, createMemo } from "solid-js"
 import { createSimpleContext } from "@opencode-ai/ui/context"
-import type { ReasoningMode } from "@opencode-ai/session-ui/timeline/projection"
 import { persisted } from "@/runtime/persistence/storage"
 import { ScopedKey, type ServerScope } from "@/runtime/server/scope"

@@ -36,7 +35,7 @@ export interface Settings {
    showStatus: boolean
    showProjectIcon: boolean
    showTerminal: boolean
-    reasoningMode: ReasoningMode
+    showReasoningSummaries: boolean
    shellToolPartsExpanded: boolean
    editToolPartsExpanded: boolean
    showCustomAgents: boolean
@@ -125,7 +124,7 @@ const defaultSettings: Settings = {
    showStatus: false,
    showProjectIcon: false,
    showTerminal: false,
-    reasoningMode: "compact",
+    showReasoningSummaries: false,
    shellToolPartsExpanded: false,
    editToolPartsExpanded: false,
    showCustomAgents: false,
@@ -167,26 +166,11 @@ function withFallback<T>(read: () => T | undefined, fallback: T) {
  return createMemo(() => read() ?? fallback)
 }

-export function migrateSettings(value: unknown) {
-  if (!value || typeof value !== "object" || !("general" in value)) return value
-  const general = value.general
-  if (!general || typeof general !== "object") return value
-  if ("reasoningMode" in general && general.reasoningMode !== undefined) return value
-  if (!("showReasoningSummaries" in general) || typeof general.showReasoningSummaries !== "boolean") return value
-  return {
-    ...value,
-    general: { ...general, reasoningMode: general.showReasoningSummaries ? "full" : "compact" },
-  }
-}
-
 export const { use: useSettings, provider: SettingsProvider } = createSimpleContext({
  name: "Settings",
  gate: false,
  init: () => {
-    const [store, setStore, , ready] = persisted(
-      { key: "settings.v3", migrate: migrateSettings },
-      createStore<Settings>(defaultSettings),
-    )
+    const [store, setStore, , ready] = persisted("settings.v3", createStore<Settings>(defaultSettings))
    const showFileTree = withFallback(() => store.general?.showFileTree, defaultSettings.general.showFileTree)
    const showSearch = withFallback(() => store.general?.showSearch, defaultSettings.general.showSearch)
    const showStatus = withFallback(() => store.general?.showStatus, defaultSettings.general.showStatus)
@@ -239,9 +223,12 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
        setShowTerminal(value: boolean) {
          setStore("general", "showTerminal", value)
        },
-        reasoningMode: withFallback(() => store.general?.reasoningMode, defaultSettings.general.reasoningMode),
-        setReasoningMode(value: ReasoningMode) {
-          setStore("general", "reasoningMode", value)
+        showReasoningSummaries: withFallback(
+          () => store.general?.showReasoningSummaries,
+          defaultSettings.general.showReasoningSummaries,
+        ),
+        setShowReasoningSummaries(value: boolean) {
+          setStore("general", "showReasoningSummaries", value)
        },
        shellToolPartsExpanded: withFallback(
          () => store.general?.shellToolPartsExpanded,
@@ -27,7 +27,6 @@ export const SettingsExtensions: Component = () => {
  const [mcpList, { refetch: refetchMcp }] = createResource(
    () => serverSdk.connection.status() === "connected",
    () => serverSdk.api.mcp.list().then((result) => result.data),
-    { initialValue: [] },
  )
  const toggleMcp = useMcpToggle(() => undefined, refetchMcp)
  const mcps = createMemo<McpRowItem[]>(() => {
@@ -45,7 +44,6 @@ export const SettingsExtensions: Component = () => {
  const [pluginList] = createResource(
    () => serverSdk.connection.status() === "connected",
    () => serverSdk.api.plugin.list().then((result) => result.data),
-    { initialValue: [] },
  )
  const plugins = createMemo<PluginRowItem[]>(() => pluginLabels(pluginList.latest ?? []).map((name) => ({ name })))

@@ -54,26 +54,10 @@
 .settings-nav {
  display: flex;
  width: 200px;
-  flex-shrink: 0;
  flex-direction: column;
  gap: 16px;
 }

-.settings-nav-footer {
-  display: flex;
-  flex-shrink: 0;
-  flex-direction: column;
-  gap: 8px;
-  margin-top: auto;
-  padding-block: 20px 4px;
-  padding-inline-start: 4px;
-  font-size: 11px;
-  font-weight: 440;
-  line-height: var(--line-height-tight);
-  color: var(--v2-text-text-faint);
-  user-select: none;
-}
-
 .settings-back {
  display: flex;
  height: 28px;
@@ -901,6 +885,8 @@
  display: flex;
  flex-direction: column;
  gap: 0;
+  max-height: 480px;
+  overflow-y: auto;
  padding: 20px;
  border-radius: 6px;
  background-color: var(--v2-background-bg-base);
@@ -1062,6 +1048,8 @@
  }

  .settings-workspaces-inventory [data-component="settings-list"] {
+    max-height: none;
+    overflow-y: visible;
    padding: 14px;
  }

@@ -1094,6 +1082,8 @@
  }

  .settings-workspaces-inventory [data-component="settings-list"] {
+    max-height: none;
+    overflow-y: visible;
    padding: 14px;
  }

@@ -2,7 +2,6 @@ import { Component, createEffect, createMemo, createSignal, onCleanup, onMount,
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { Icon } from "@opencode-ai/ui/icon"
 import { useLanguage } from "@/runtime/i18n/language"
-import { usePlatform } from "@/runtime/platform/platform"
 import { SettingsGeneral } from "./general/general"
 import { SettingsAppearance } from "./appearance/appearance"
 import { SettingsKeybinds } from "./keybinds/keybinds"
@@ -27,7 +26,6 @@ export const SettingsScreen: Component<{
  defaultValue?: string
 }> = (props) => {
  const language = useLanguage()
-  const platform = usePlatform()
  const dialog = useDialog()
  const command = useCommand()
  const surface = useSettingsSurface()
@@ -163,12 +161,6 @@ export const SettingsScreen: Component<{
              </div>
            </div>
          </div>
-          <div class="settings-nav-footer">
-            <span>{language.t("app.name.desktop")}</span>
-            <span>
-              <bdi dir="ltr">v{platform.version}</bdi>
-            </span>
-          </div>
        </Tabs.List>

        <Tabs.Content value="general" class="settings-panel">
@@ -97,12 +97,10 @@ export const ProjectSettingsExtensions: Component = () => {
  const [globalPluginList] = createResource(
    () => serverSDK.connection.status() === "connected",
    () => serverSDK.api.plugin.list().then((result) => result.data),
-    { initialValue: [] },
  )
  const [projectPluginList] = createResource(
    () => (serverSDK.connection.status() === "connected" ? directorySDK().directory : undefined),
    (directory) => serverSDK.api.plugin.list({ location: { directory } }).then((result) => result.data),
-    { initialValue: [] },
  )
  const globalPlugins = createMemo(() => pluginLabels(globalPluginList.latest ?? []))
  const projectPlugins = createMemo(() => {
@@ -60,7 +60,6 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop

  const projectQuery = useQuery(() => ({
    queryKey: [serverSDK.scope, "settings-workspace-projects"] as const,
-    enabled: serverSDK.connection.status() === "connected",
    queryFn: async () =>
      Promise.all(
        (await serverSDK.api.project.list()).map(async (project) => {
@@ -72,9 +71,10 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop
      ),
    refetchOnMount: "always",
  }))
-  const inventory = createMemo(() => (projectQuery.isPending ? [] : (projectQuery.data ?? [])))
-  const workspaces = createMemo(() => workspaceInventory(inventory()))
-  const projects = createMemo(() => inventory().filter((project) => managedWorkspaceDirectories(project).length > 0))
+  const workspaces = createMemo(() => workspaceInventory(projectQuery.data ?? []))
+  const projects = createMemo(() =>
+    (projectQuery.data ?? []).filter((project) => managedWorkspaceDirectories(project).length > 0),
+  )
  const projectName = (project: Project) => project.name || getFilename(project.worktree)
  const projectOptions = createMemo(() => [
    { id: "all", label: language.t("settings.workspaces.filter.all") },
@@ -110,18 +110,18 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop
      workspaceDirectories().map((directory) => String(pathKey(directory))),
    ] as const,
    queryFn: () => loadSessions(workspaceDirectories()),
-    enabled: serverSDK.connection.status() === "connected" && workspaceDirectories().length > 0,
+    enabled: workspaceDirectories().length > 0,
    refetchOnMount: "always",
  }))
-  const sessionsByWorkspace = createMemo(() => {
-    const sessions = sessionQuery.isPending ? [] : (sessionQuery.data ?? [])
-    return new Map(
-      workspaces().map((workspace) => [
-        pathKey(workspace.directory),
-        sessionsForWorkspace(sessions, workspace.directory),
-      ]),
-    )
-  })
+  const sessionsByWorkspace = createMemo(
+    () =>
+      new Map(
+        workspaces().map((workspace) => [
+          pathKey(workspace.directory),
+          sessionQuery.data ? sessionsForWorkspace(sessionQuery.data, workspace.directory) : [],
+        ]),
+      ),
+  )
  const workspaceSessions = (workspace: Workspace) => sessionsByWorkspace().get(pathKey(workspace.directory)) ?? []
  const sessionCount = (workspace: Workspace) => {
    if (sessionQuery.isPending) return language.t("session.messages.loading")
@@ -279,9 +279,7 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop
      <div class="settings-tab-body settings-workspaces">
        <div class="settings-workspaces-toolbar">
          <span class="settings-workspaces-count">
-            <Show when={!projectQuery.isPending && !projectQuery.isError}>
-              {language.plural("settings.workspaces.count", filtered().length)}
-            </Show>
+            {language.plural("settings.workspaces.count", filtered().length)}
          </span>
          <div class="settings-workspaces-toolbar-actions">
            <Show when={projects().length > 1}>
@@ -334,17 +332,7 @@ export const SettingsWorkspaces: Component<{ activeDirectory?: string }> = (prop
        <div class="settings-workspaces-inventory">
          <Show
            when={filtered().length > 0}
-            fallback={
-              <div class="settings-workspaces-empty">
-                {language.t(
-                  projectQuery.isPending
-                    ? "common.loading"
-                    : projectQuery.isError
-                      ? "common.requestFailed"
-                      : "settings.workspaces.empty",
-                )}
-              </div>
-            }
+            fallback={<div class="settings-workspaces-empty">{language.t("settings.workspaces.empty")}</div>}
          >
            <SettingsList>
              <For each={filtered()}>
@@ -36,7 +36,7 @@ export function AppRoutes() {
          <SessionRouteFrame>
            <Suspense
              fallback={
-                <div class="flex min-h-0 flex-1 px-2 pb-2 pt-[var(--shell-top-inset,8px)]">
+                <div class="flex min-h-0 flex-1 p-2">
                  <SessionPanelFrame raised />
                </div>
              }
@@ -55,7 +55,6 @@ export function SessionUIProvider(
      data={sessionUIData()}
      directory={directory()}
      sessionID={params.id}
-      shellRunning={(id) => !!data.shell.get(id)}
      shellOutput={(input) => serverSDK.api.shell.output(input)}
      onNavigateToSession={navigateToSession}
      onSessionHref={href}
@@ -43,13 +43,6 @@ export default function Layout(props: ParentProps) {
        style={{
          "padding-top": "env(safe-area-inset-top, 0px)",
          "padding-bottom": "env(safe-area-inset-bottom, 0px)",
-          // The native Windows titlebar already includes the gap above the content panels.
-          "--shell-top-inset":
-            platform.platform === "desktop" &&
-            platform.os === "windows" &&
-            !(mobile() && preferences.general.mobileTitlebarPosition() === "bottom")
-              ? "0px"
-              : "8px",
        }}
      >
        <Titlebar
@@ -66,7 +59,7 @@ export default function Layout(props: ParentProps) {
            <aside
              ref={(element) => setState("tabsMount", element)}
              data-slot="vertical-tabs-sidebar"
-              class="relative flex min-h-0 shrink-0 flex-col bg-v2-background-bg-deep px-2.5 pb-2 pt-[var(--shell-top-inset,8px)]"
+              class="relative flex min-h-0 shrink-0 flex-col bg-v2-background-bg-deep px-2.5 py-2"
              style={{ width: `${state.tabsWidth}px` }}
            >
              <ResizeHandle
@@ -79,8 +72,7 @@ export default function Layout(props: ParentProps) {
              />
            </aside>
          </Show>
-          {/* Size containment collapses percentage-height descendants in WebKit. */}
-          <main class="flex-1 min-h-0 min-w-0 overflow-x-hidden flex flex-col items-start contain-content">
+          <main class="flex-1 min-h-0 min-w-0 overflow-x-hidden flex flex-col items-start contain-strict">
            <div
              class="flex size-full min-h-0 min-w-0 flex-col"
              hidden={settings.store.open}
@@ -27,7 +27,6 @@ import { newTabTooltipKeybind } from "@/shell/commands/tooltip-keybind"
 import { TitlebarRightMount } from "@/shell/titlebar/right-slot"

 const titlebarHeight = 36
-const windowsTitlebarHeight = 44 // Includes the content inset; matches the native Windows overlay.
 const minTitlebarZoom = 0.25
 const windowsControlsBaseWidth = 138 // 3 native Windows caption buttons at 46px each.
 const macTrafficLightsBaseWidth = 84
@@ -60,7 +59,7 @@ export function Titlebar(props: {
  const titlebarZoom = () => (windows() ? Math.max(zoom(), minTitlebarZoom) : zoom())
  const minHeight = () => {
    if (mac()) return `${titlebarHeight / zoom()}px`
-    if (windows()) return `env(titlebar-area-height, ${windowsTitlebarHeight / Math.min(titlebarZoom(), 1)}px)`
+    if (windows()) return `env(titlebar-area-height, ${titlebarHeight / Math.min(titlebarZoom(), 1)}px)`
    return undefined
  }
  const windowsControlsWidth = () => `${windowsControlsBaseWidth / Math.max(titlebarZoom(), 1)}px`
@@ -1,70 +0,0 @@
-import { expect, test } from "bun:test"
-import path from "node:path"
-
-test.each([
-  { name: "local development", ci: "", build: "", built: false },
-  { name: "local production build", ci: "", build: "1", built: true },
-  { name: "CI production build", ci: "true", build: "", built: true },
-  { name: "CI cannot opt into development", ci: "true", build: "0", built: true },
-])("Playwright uses $name", ({ ci, build, built }) => {
-  const result = Bun.spawnSync({
-    cmd: [process.execPath, "-e", 'import config from "./playwright.config.ts"; console.log(JSON.stringify(config))'],
-    cwd: path.resolve(import.meta.dirname, ".."),
-    env: {
-      ...process.env,
-      CI: ci,
-      PLAYWRIGHT_BUILD: build,
-      PLAYWRIGHT_BASE_URL: undefined,
-      PLAYWRIGHT_PORT: "4321",
-      PLAYWRIGHT_SERVER_HOST: "127.0.0.2",
-      PLAYWRIGHT_SERVER_PORT: "4322",
-    },
-  })
-  expect(result.exitCode).toBe(0)
-  const config = JSON.parse(result.stdout.toString())
-  expect(config.use.baseURL).toBe("http://127.0.0.1:4321")
-  expect(config.webServer.url).toBe(config.use.baseURL)
-  expect(config.webServer.command).toBe(
-    built
-      ? "bun run build && bun run serve -- --host 127.0.0.1 --port 4321 --strictPort"
-      : "bun run dev -- --host 127.0.0.1 --port 4321 --strictPort",
-  )
-  expect(config.webServer.reuseExistingServer).toBe(!built)
-  expect(config.webServer.env).toEqual({
-    VITE_OPENCODE_SERVER_HOST: built ? "127.0.0.1" : "127.0.0.2",
-    VITE_OPENCODE_SERVER_PORT: built ? "4321" : "4322",
-  })
-})
-
-test.each([
-  "./playwright.config.ts",
-  "./e2e/performance/playwright.config.ts",
-  "./e2e/performance/playwright.uncapped.config.ts",
-  "./e2e/performance/timeline-stability/playwright.config.ts",
-])("%s leaves an explicit external app unmanaged", (file) => {
-  const result = Bun.spawnSync({
-    cmd: [
-      process.execPath,
-      "-e",
-      `import config from ${JSON.stringify(file)}; console.log(JSON.stringify({ ...config, fixtureHost: process.env.PLAYWRIGHT_SERVER_HOST, fixturePort: process.env.PLAYWRIGHT_SERVER_PORT }))`,
-    ],
-    cwd: path.resolve(import.meta.dirname, ".."),
-    env: { ...process.env, CI: "true", PLAYWRIGHT_BASE_URL: "http://127.0.0.1:4444" },
-  })
-  expect(result.exitCode).toBe(0)
-  const config = JSON.parse(result.stdout.toString())
-  expect(config.webServer).toBeUndefined()
-  expect(config.use.baseURL).toBe("http://127.0.0.1:4444")
-  expect(config.fixtureHost).toBe("127.0.0.1")
-  expect(config.fixturePort).toBe("4444")
-})
-
-test("Playwright rejects HTTPS targets unsupported by the API fixtures", () => {
-  const result = Bun.spawnSync({
-    cmd: [process.execPath, "-e", 'import "./playwright.config.ts"'],
-    cwd: path.resolve(import.meta.dirname, ".."),
-    env: { ...process.env, CI: "true", PLAYWRIGHT_BASE_URL: "https://e2e.example.com" },
-  })
-  expect(result.exitCode).not.toBe(0)
-  expect(result.stderr.toString()).toContain("E2E fixtures require an http:// app URL")
-})
@@ -1,52 +0,0 @@
-import { expect, test } from "bun:test"
-import { createMemo, createRoot } from "solid-js"
-import { createStore } from "solid-js/store"
-import { normalizeProviderList } from "@/runtime/server/global-sync/utils"
-
-test("preserves an already normalized reactive catalog", () => {
-  const [store] = createStore({ catalog: { all: new Map<string, never>(), connected: [], default: {} } })
-  expect(normalizeProviderList(store.catalog)).toBe(store.catalog)
-})
-
-test("shares catalog snapshots and reacts to replacement lists", () => {
-  createRoot((dispose) => {
-    const provider = { id: "openai", name: "OpenAI", package: "@ai-sdk/openai", activation: "enabled" as const }
-    const model = {
-      id: "gpt-5",
-      modelID: "gpt-5",
-      providerID: "openai",
-      name: "GPT-5",
-      settings: {},
-      headers: {},
-      capabilities: { tools: true, input: ["text" as const], output: ["text" as const] },
-      variants: [],
-      time: { released: 1 },
-      cost: [],
-      status: "active" as const,
-      enabled: true,
-      limit: { context: 128_000, output: 8192 },
-    }
-    const [store, setStore] = createStore({ providers: [provider], models: [model] })
-    const first = createMemo(() => normalizeProviderList(store.providers, store.models))
-    const second = createMemo(() => normalizeProviderList(store.providers, store.models))
-    expect(first()).toBe(second())
-    const initial = first()
-    setStore("models", [{ ...model, name: "Renamed", limit: { context: 256_000, output: 16384 } }])
-    expect(first()).not.toBe(initial)
-    expect(first()).toBe(second())
-    expect(first().all.get("openai")?.models[model.id]).toMatchObject({
-      name: "Renamed",
-      limit: { context: 256_000, output: 16384 },
-    })
-    const renamed = first()
-    setStore("providers", [{ ...provider, name: "Custom OpenAI" }])
-    expect(first()).not.toBe(renamed)
-    expect(first()).toBe(second())
-    expect(first().all.get("openai")?.name).toBe("Custom OpenAI")
-    expect(normalizeProviderList(store.providers).all.get("openai")?.models).toEqual({})
-    setStore("models", [])
-    expect(first().all.get("openai")?.models).toEqual({})
-    expect(first().default).toEqual({})
-    dispose()
-  })
-})
@@ -1,8 +1,7 @@
 import { sentryVitePlugin } from "@sentry/vite-plugin"
-import { fileURLToPath } from "node:url"
 import { defineConfig } from "vite"
+import { VitePWA } from "vite-plugin-pwa"
 import desktopPlugin from "./vite.js"
-import { serviceWorker } from "./vite.pwa"

 const sentry =
  process.env.SENTRY_AUTH_TOKEN && process.env.SENTRY_ORG && process.env.SENTRY_PROJECT
@@ -22,7 +21,62 @@ const sentry =
    : false

 export default defineConfig({
-  plugins: [desktopPlugin, serviceWorker(fileURLToPath(new URL("./dist", import.meta.url))), sentry] as any,
+  plugins: [
+    desktopPlugin,
+    VitePWA({
+      strategies: "generateSW",
+      registerType: "prompt",
+      injectRegister: false,
+      manifest: false,
+      workbox: {
+        clientsClaim: false,
+        skipWaiting: true,
+        inlineWorkboxRuntime: true,
+        // Always fetch the current HTML. Precaching a partial build can strand it without its chunks after an upgrade.
+        navigateFallback: null,
+        globPatterns: [],
+        runtimeCaching: [
+          {
+            urlPattern: ({ url }) =>
+              url.origin === self.location.origin &&
+              (url.pathname.startsWith("/_assets/") || url.pathname.startsWith("/assets/")),
+            handler: "CacheFirst",
+            options: {
+              cacheName: "opencode-assets",
+              plugins: [
+                {
+                  cachedResponseWillBeUsed: async ({ request, cachedResponse }) => {
+                    if (
+                      cachedResponse?.status === 200 &&
+                      !/^(text\/html|application\/xhtml\+xml)\b/i.test(cachedResponse.headers.get("content-type") ?? "")
+                    )
+                      return cachedResponse
+                    // Keep old tabs' precached chunks usable without retaining their stale HTML navigation handler.
+                    const response = await caches.match(request, {
+                      cacheName: `workbox-precache-v2-${self.location.origin}/`,
+                    })
+                    return response?.status === 200 &&
+                      !/^(text\/html|application\/xhtml\+xml)\b/i.test(response.headers.get("content-type") ?? "")
+                      ? response
+                      : null
+                  },
+                  cacheWillUpdate: async ({ response }) =>
+                    response.status === 200 &&
+                    !/^(text\/html|application\/xhtml\+xml)\b/i.test(response.headers.get("content-type") ?? "")
+                      ? response
+                      : null,
+                },
+              ],
+              expiration: {
+                maxEntries: 1000,
+              },
+            },
+          },
+        ],
+      },
+    }),
+    sentry,
+  ] as any,
  server: {
    host: "0.0.0.0",
    allowedHosts: true,
@@ -1,41 +0,0 @@
-import { createHash } from "node:crypto"
-import { readFile } from "node:fs/promises"
-import { resolve } from "node:path"
-import { VitePWA } from "vite-plugin-pwa"
-
-export function serviceWorker(directory: string) {
-  return VitePWA({
-    strategies: "generateSW",
-    registerType: "prompt",
-    injectRegister: false,
-    manifest: false,
-    workbox: {
-      globDirectory: directory,
-      clientsClaim: false,
-      // Keep each open tab on its complete build until all old clients close.
-      skipWaiting: false,
-      inlineWorkboxRuntime: true,
-      navigateFallback: "/index.html",
-      navigateFallbackDenylist: [/^\/api(?:\/|$)/, /^\/(?:_assets|assets)(?:\/|$)/],
-      // Include lazy chunks and non-JS dependencies, not just the startup bundle.
-      globPatterns: ["**/*"],
-      globIgnores: ["**/*.map", "_headers", "_redirects"],
-      maximumFileSizeToCacheInBytes: Number.MAX_SAFE_INTEGER,
-      manifestTransforms: [
-        async (entries) => ({
-          manifest: await Promise.all(
-            entries.map(async (entry) => ({
-              ...entry,
-              // A revision labels a cache entry; integrity rejects mixed deployments
-              // and HTML fallback responses instead of installing a broken build.
-              integrity: `sha256-${createHash("sha256")
-                .update(await readFile(resolve(directory, entry.url)))
-                .digest("base64")}`,
-            })),
-          ),
-          warnings: [],
-        }),
-      ],
-    },
-  })
-}
@@ -27,7 +27,7 @@
    "@effect/platform-node": "catalog:",
    "@opencode-ai/client": "workspace:*",
    "@opencode-ai/plugin": "workspace:*",
-    "@opencode-ai/pty": "0.1.12",
+    "@opencode-ai/pty": "0.1.11",
    "@opencode-ai/schema": "workspace:*",
    "@opencode-ai/server": "workspace:*",
    "@opencode-ai/tui": "workspace:*",
@@ -118,7 +118,7 @@
    "@ff-labs/fff-node": "0.10.5",
    "@opencode-ai/codemode": "workspace:*",
    "@opencode-ai/ai": "workspace:*",
-    "@opencode-ai/pty": "0.1.12",
+    "@opencode-ai/pty": "0.1.11",
    "@opencode-ai/schema": "workspace:*",
    "@opencode-ai/plugin": "workspace:*",
    "@opencode-ai/util": "workspace:*",
@@ -11,9 +11,6 @@ import { KeyedMutex } from "./effect/keyed-mutex.js"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { isDeepStrictEqual } from "node:util"
 import { Durable } from "@opencode-ai/schema/durable-event-manifest"
-import { SessionEvent } from "@opencode-ai/schema/session-event"
-import type { SessionID } from "@opencode-ai/schema/session-id"
-import { AbsolutePath } from "@opencode-ai/schema/schema"

 export type Subscriber<D extends Event.Definition = Event.Definition> = (event: Event.Payload<D>) => Effect.Effect<void>
 export type Unsubscribe = Effect.Effect<void>
@@ -122,9 +119,6 @@ export interface Subscribe {
  /**
   * Volatile live channel: every event published from now on, nothing before or
   * across a disconnect. Consumers that need reliability combine it with `log`.
-   * With an ambient Location, delivery is restricted to that Location and global
-   * events. Unlocated Session events use the Session's owner at publication time.
-   * Session moves reach both the old and new Location, without changing the event.
   */
  (): Stream.Stream<Event.Payload>
  <D extends Event.Definition>(definition: D): Stream.Stream<Event.Payload<D>>
@@ -189,7 +183,6 @@ export function configured(options?: Options) {
        // Deferred import: a static one would close the module cycle
        // bus → location → project → bus and hit the node bindings in TDZ.
        const { Location } = yield* Effect.promise(() => import("./location.js"))
-        const { SessionTable } = yield* Effect.promise(() => import("./session/sql.js"))
        const pubsub = {
          live: yield* PubSub.unbounded<Event.Payload>(),
          durable: new Map<string, Set<PubSub.PubSub<void>>>(),
@@ -201,64 +194,6 @@ export function configured(options?: Options) {
        const { db } = yield* Database.Service
        const logReadPageSize = options?.logReadPageSize ?? 512
        const persist = options?.persist ?? false
-        const sessions = new Map<SessionID, Location.Ref>()
-        // Keep routing separate from the public event, and retain its snapshot
-        // while a slow subscriber drains events queued before a move or deletion.
-        const routes = new WeakMap<Event.Payload, readonly Location.Ref[]>()
-
-        const isSessionEvent = (event: Event.Payload): event is SessionEvent.Event =>
-          Object.hasOwn(SessionEvent.All.cases, event.type)
-
-        const prepareRoutes = Effect.fnUntraced(function* (events: readonly Event.Payload[]) {
-          const updates = new Map<SessionID, Location.Ref | undefined>()
-          const resolved = new Map<Event.Payload, readonly Location.Ref[]>()
-          for (const event of events) {
-            if (!isSessionEvent(event)) continue
-            const id = event.data.sessionID
-            if (event.type === "session.created") {
-              updates.set(id, event.data.location)
-              resolved.set(event, [event.location ?? event.data.location])
-              continue
-            }
-            if (event.location && event.type !== "session.forked" && event.type !== "session.moved") {
-              if (event.type === "session.deleted") updates.set(id, undefined)
-              continue
-            }
-            const owner = event.type === "session.forked" ? event.data.parentID : id
-            let ref = updates.has(owner) ? updates.get(owner) : sessions.get(owner)
-            if (!ref && !updates.has(owner)) {
-              const row = yield* db
-                .select({ directory: SessionTable.directory, workspaceID: SessionTable.workspace_id })
-                .from(SessionTable)
-                .where(eq(SessionTable.id, owner))
-                .get()
-                .pipe(Effect.orDie)
-              ref = row
-                ? { directory: AbsolutePath.make(row.directory), workspaceID: row.workspaceID ?? undefined }
-                : undefined
-              updates.set(owner, ref)
-            }
-            if (event.type === "session.moved") {
-              // Both owners need the transition, even if the producer supplied
-              // an envelope location. Later events use only the destination.
-              updates.set(id, event.data.location)
-              resolved.set(event, ref ? [ref, event.data.location] : [event.data.location])
-              continue
-            }
-            if (event.type === "session.forked") updates.set(id, ref)
-            resolved.set(event, event.location ? [event.location] : ref ? [ref] : [])
-            if (event.type === "session.deleted") updates.set(id, undefined)
-          }
-          // Apply only after the projection transaction commits. A failed move
-          // must not redirect events away from the Session's actual location.
-          return () => {
-            for (const [id, ref] of updates) {
-              if (ref) sessions.set(id, ref)
-              else sessions.delete(id)
-            }
-            for (const [event, ref] of resolved) routes.set(event, ref)
-          }
-        })

        const getOrCreate = (definition: Event.Definition) =>
          Effect.gen(function* () {
@@ -400,7 +335,6 @@ export function configured(options?: Options) {
                              ...event,
                              durable: { aggregateID, seq, version: durable.version },
                            } as Event.Payload
-                            const route = yield* prepareRoutes([committed])
                            for (const projector of list) {
                              yield* projector(committed)
                            }
@@ -432,13 +366,12 @@ export function configured(options?: Options) {
                                ])
                                .run()
                                .pipe(Effect.orDie)
-                            return { aggregateID, seq, event: committed, route }
+                            return { aggregateID, seq }
                          }),
                        { behavior: "immediate" },
                      )
                      .pipe(Effect.orDie)
                    if (committed) {
-                      committed.route()
                      yield* Effect.forEach(
                        pubsub.durable.get(committed.aggregateID) ?? [],
                        (wake) => PubSub.publish(wake, undefined),
@@ -476,14 +409,15 @@ export function configured(options?: Options) {
                Effect.gen(function* () {
                  const committed = yield* commitDurableEvent(definition, event as Event.Payload, undefined, commit)
                  if (!committed) return event
-                  event = committed.event as Event.Payload<D>
+                  event = {
+                    ...event,
+                    durable: envelope(committed.aggregateID, committed.seq, definition.durable.version),
+                  }
                  yield* notify(event as Event.Payload, true)
                  return event
                }),
              )
            }
-            const route = yield* prepareRoutes([event as Event.Payload])
-            route()
            yield* notify(event as Event.Payload, false)
            return event
          })
@@ -593,11 +527,7 @@ export function configured(options?: Options) {
                            .pipe(Effect.orDie)
                          const firstSeq = (row?.seq ?? -1) + 1
                          const finalSeq = firstSeq + payloads.length - 1
-                          const queued = payloads.map((item, index) => ({
-                            ...item.event,
-                            durable: envelope(aggregateID, firstSeq + index, item.definition.durable.version),
-                          }))
-                          const route = yield* prepareRoutes(queued)
+                          const result = new Array<Event.Payload>()
                          const rows = new Array<typeof EventTable.$inferInsert>()
                          const ids = new Set<Event.ID>()
                          for (const [index, item] of payloads.entries()) {
@@ -629,7 +559,10 @@ export function configured(options?: Options) {
                                  }),
                                )
                            }
-                            const event = queued[index]
+                            const event = {
+                              ...item.event,
+                              durable: envelope(aggregateID, seq, item.definition.durable.version),
+                            } as Event.Payload
                            for (const projector of projectors.get(
                              versionedType(item.definition.type, item.definition.durable.version),
                            ) ?? []) {
@@ -645,6 +578,7 @@ export function configured(options?: Options) {
                                type: versionedType(item.definition.type, item.definition.durable.version),
                                data: encoded,
                              })
+                            result.push(event)
                          }
                          yield* db
                            .insert(EventSequenceTable)
@@ -653,12 +587,11 @@ export function configured(options?: Options) {
                            .run()
                            .pipe(Effect.orDie)
                          if (persist) yield* db.insert(EventTable).values(rows).run().pipe(Effect.orDie)
-                          return { events: queued, route }
+                          return result
                        }),
                      { behavior: "immediate" },
                    )
                    .pipe(Effect.orDie)
-                  committed.route()
                  yield* Effect.forEach(
                    pubsub.durable.get(aggregateID) ?? [],
                    (wake) => PubSub.publish(wake, undefined),
@@ -666,8 +599,8 @@ export function configured(options?: Options) {
                      discard: true,
                    },
                  )
-                  yield* Effect.forEach(committed.events, (event) => notify(event, true), { discard: true })
-                  return committed.events as PublishResult<I>
+                  yield* Effect.forEach(committed, (event) => notify(event, true), { discard: true })
+                  return committed as PublishResult<I>
                }),
              ),
            )
@@ -699,7 +632,13 @@ export function configured(options?: Options) {
                  strictOwner: options?.strictOwner,
                })
                if (committed && options?.publish) {
-                  yield* notify(committed.event, true)
+                  yield* notify(
+                    {
+                      ...payload,
+                      durable: envelope(committed.aggregateID, committed.seq, definition.durable.version),
+                    },
+                    true,
+                  )
                }
              }),
            )
@@ -714,10 +653,7 @@ export function configured(options?: Options) {
                yield* db.delete(EventTable).where(eq(EventTable.aggregate_id, aggregateID)).run()
              }),
            )
-            .pipe(
-              Effect.tap(() => Effect.sync(() => sessions.delete(aggregateID as SessionID))),
-              Effect.orDie,
-            )
+            .pipe(Effect.orDie)
        }

        function claim(aggregateID: string, ownerID: string) {
@@ -735,17 +671,15 @@ export function configured(options?: Options) {
              Effect.map((location) =>
                Option.match(location, {
                  onNone: () => stream,
-                  onSome: (location) => {
-                    const matches = (ref: Location.Ref) =>
-                      ref.directory === location.directory && ref.workspaceID === location.workspaceID
-                    return stream.pipe(
-                      Stream.filter((event) => {
-                        const refs = routes.get(event)
-                        if (refs) return refs.some(matches)
-                        return !event.location || matches(event.location)
-                      }),
-                    )
-                  },
+                  onSome: (location) =>
+                    stream.pipe(
+                      Stream.filter(
+                        (event) =>
+                          !event.location ||
+                          (event.location.directory === location.directory &&
+                            event.location.workspaceID === location.workspaceID),
+                      ),
+                    ),
                }),
              ),
            ),
@@ -507,11 +507,9 @@ const layer = Layer.effect(
      from: TreeID
      to: TreeID
    }) {
-      // Undo needs both paths of a rename, not only its destination.
      return (yield* repositoryOperation("list_files", input.repository, [
        "diff",
        "--name-only",
-        "--no-renames",
        "-z",
        input.from,
        input.to,
@@ -73,7 +73,6 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: Interface, p

  return {
    app,
-    location: locationInfo(),
    options: {},
    agent: {
      get: (input) => {
@@ -289,6 +288,26 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: Interface, p
        if (ref && !isCurrentLocation(ref)) return runtime.location.mcp.list(ref)
        return response(mcp.servers())
      },
+      add: (input) => {
+        const ref = locationRef(input)
+        if (ref && !isCurrentLocation(ref)) return runtime.location.mcp.add(ref, input.server, input.config)
+        return mcp.add(input.server, input.config)
+      },
+      remove: (input) => {
+        const ref = locationRef(input)
+        if (ref && !isCurrentLocation(ref)) return runtime.location.mcp.remove(ref, input.server)
+        return mcp.remove(input.server)
+      },
+      connect: (input) => {
+        const ref = locationRef(input)
+        if (ref && !isCurrentLocation(ref)) return runtime.location.mcp.connect(ref, input.server)
+        return mcp.connect(input.server)
+      },
+      disconnect: (input) => {
+        const ref = locationRef(input)
+        if (ref && !isCurrentLocation(ref)) return runtime.location.mcp.disconnect(ref, input.server)
+        return mcp.disconnect(input.server)
+      },
      reload: mcp.reload,
      transform: (callback) =>
        mcp.transform((draft) => {
@@ -2,6 +2,7 @@ export * as PluginRuntime from "./runtime.js"

 import { Context, Effect, Layer } from "effect"
 import { Agent } from "../agent.js"
+import { Mcp } from "@opencode-ai/schema/mcp"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
 import { Job } from "../job.js"
 import { Location } from "../location.js"
@@ -39,6 +40,10 @@ export interface Interface {
      readonly list: (
        ref: Location.Ref,
      ) => Effect.Effect<{ readonly location: Location.Info; readonly data: MCP.ServerInfo[] }, unknown>
+      readonly add: (ref: Location.Ref, server: string, config: Mcp.ServerConfig) => Effect.Effect<void, unknown>
+      readonly remove: (ref: Location.Ref, server: string) => Effect.Effect<void, unknown>
+      readonly connect: (ref: Location.Ref, server: string) => Effect.Effect<void, unknown>
+      readonly disconnect: (ref: Location.Ref, server: string) => Effect.Effect<void, unknown>
    }
  }
 }
@@ -96,6 +101,10 @@ export const layerWithCell = (cell: Cell) =>
        },
        mcp: {
          list: (ref) => require(cell, (runtime) => runtime.location.mcp.list(ref)),
+          add: (ref, server, config) => require(cell, (runtime) => runtime.location.mcp.add(ref, server, config)),
+          remove: (ref, server) => require(cell, (runtime) => runtime.location.mcp.remove(ref, server)),
+          connect: (ref, server) => require(cell, (runtime) => runtime.location.mcp.connect(ref, server)),
+          disconnect: (ref, server) => require(cell, (runtime) => runtime.location.mcp.disconnect(ref, server)),
        },
      },
    }),
@@ -140,6 +149,14 @@ export const providerLayerWithCell = (cell: Cell) =>
                  data: yield* mcp.servers(),
                }
              }).pipe(Effect.provide(locations.get(ref))),
+            add: (ref, server, config) =>
+              MCP.Service.use((mcp) => mcp.add(server, config)).pipe(Effect.provide(locations.get(ref))),
+            remove: (ref, server) =>
+              MCP.Service.use((mcp) => mcp.remove(server)).pipe(Effect.provide(locations.get(ref))),
+            connect: (ref, server) =>
+              MCP.Service.use((mcp) => mcp.connect(server)).pipe(Effect.provide(locations.get(ref))),
+            disconnect: (ref, server) =>
+              MCP.Service.use((mcp) => mcp.disconnect(server)).pipe(Effect.provide(locations.get(ref))),
          },
        },
      }
@@ -8,10 +8,9 @@ import { Bus } from "../bus.js"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { llmClient } from "../effect/app-node-platform.js"
 import { SessionEvent } from "./event.js"
-import type { SessionContext } from "./context.js"
 import type { SessionMessage } from "./message.js"
-import type { SessionModelRequest } from "./model-request.js"
-import type { SessionRunnerModel } from "./runner/model.js"
+import { SessionModelRequest } from "./model-request.js"
+import { SessionRunnerModel } from "./runner/model.js"
 import { SessionSchema } from "./schema.js"
 import { toSessionError } from "./to-session-error.js"
 import { Token } from "../util/token.js"
@@ -70,13 +69,14 @@ type Dependencies = {
  readonly llm: {
    readonly stream: (request: LLMRequest, options?: StreamOptions) => Stream.Stream<LLMEvent, AIError>
  }
+  readonly models: SessionRunnerModel.Interface
+  readonly modelRequests: SessionModelRequest.Interface
 }

 export type AutoInput = {
  readonly session: SessionSchema.Info
  readonly messages: readonly SessionMessage.Info[]
  readonly resolved: SessionRunnerModel.Resolved
-  readonly prepare: SessionModelRequest.Interface["prepare"]
 }

 type RequiredInput = Pick<AutoInput, "messages" | "resolved">
@@ -86,9 +86,6 @@ export type ManualInput = {
  readonly messages: readonly SessionMessage.Info[]
  readonly inputID: SessionMessage.ID
  readonly started?: boolean
-  /** Invoked after content planning, not when the caller captures the operation. */
-  readonly resolveModel: SessionContext.Interface["resolveModel"]
-  readonly prepare: SessionModelRequest.Interface["prepare"]
 }

 type Plan = {
@@ -99,7 +96,6 @@ type Plan = {
  readonly recent: string
  readonly inputID?: SessionMessage.ID
  readonly started?: boolean
-  readonly prepare: SessionModelRequest.Interface["prepare"]
 }

 export type Outcome =
@@ -282,7 +278,7 @@ const make = (dependencies: Dependencies) => {
          })
        : Effect.void,
    )
-    const prepared = yield* plan.prepare({
+    const prepared = yield* dependencies.modelRequests.prepare({
      scope: { session: plan.session, agentID: Agent.ID.make("compaction"), model: plan.resolved },
      transcript: { system: [], messages: [Message.user(plan.prompt)] },
      contextHooks: false,
@@ -352,7 +348,6 @@ const make = (dependencies: Dependencies) => {
      return yield* execute({
        session: input.session,
        resolved: input.resolved,
-        prepare: input.prepare,
        reason: "auto",
        ...content,
      })
@@ -392,7 +387,7 @@ const make = (dependencies: Dependencies) => {
        error: { type: "compaction.unavailable", message: "Nothing to compact yet" },
        inputID: input.inputID,
      })
-    const resolved = yield* input.resolveModel(input.session).pipe(
+    const resolved = yield* dependencies.models.resolve(input.session).pipe(
      Effect.catch((cause) =>
        failed({
          sessionID: input.session.id,
@@ -406,7 +401,6 @@ const make = (dependencies: Dependencies) => {
    return yield* execute({
      session: input.session,
      resolved,
-      prepare: input.prepare,
      reason: "manual",
      inputID: input.inputID,
      started: input.started,
@@ -428,12 +422,14 @@ export const layer = Layer.effect(
  Effect.gen(function* () {
    const bus = yield* Bus.Service
    const llm = yield* LLMClient.Service
-    return make({ bus, llm })
+    const models = yield* SessionRunnerModel.Service
+    const modelRequests = yield* SessionModelRequest.Service
+    return make({ bus, llm, models, modelRequests })
  }),
 )

 export const node = makeLocationNode({
  service: Service,
  layer,
-  deps: [Bus.node, llmClient],
+  deps: [Bus.node, llmClient, SessionRunnerModel.node, SessionModelRequest.node],
 })
@@ -2,7 +2,6 @@ export * as SessionContext from "./context.js"

 import { Context, Effect, Layer } from "effect"
 import { Agent } from "../agent.js"
-import { Catalog } from "../catalog.js"
 import { CodeModeInstructions } from "../codemode/instructions.js"
 import { Database } from "../database/database.js"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
@@ -12,7 +11,6 @@ import { InstructionBuiltIns } from "../instructions/builtins.js"
 import { Location } from "../location.js"
 import { McpInstructions } from "../mcp/instructions.js"
 import { McpTool } from "../tool/mcp.js"
-import { Model } from "../model.js"
 import { PluginSupervisor } from "../plugin/supervisor.js"
 import { ReferenceInstructions } from "../reference/instructions.js"
 import { SkillInstructions } from "../skill/instructions.js"
@@ -21,7 +19,6 @@ import { AgentNotFoundError } from "./error.js"
 import { SessionHistory } from "./history.js"
 import { InstructionEntry } from "./instruction-entry.js"
 import { SessionMessage } from "./message.js"
-import { SessionModelRequest } from "./model-request.js"
 import { SessionRunnerModel } from "./runner/model.js"
 import { SessionSchema } from "./schema.js"
 import { SessionStore } from "./store.js"
@@ -45,27 +42,14 @@ export interface Loaded {
 /**
 * Resolves model-request state in two phases: `select` fixes the Session,
 * agent, instruction sources, and tool snapshot; `load` adds the model and
- * active history for that selection. Auxiliary operations resolve only the
- * capabilities they need; request preparation stays separate from selection.
+ * active history for that selection. This module does not build or execute the
+ * model request.
 */
 export interface Interface {
  /** Selects the Session, agent, instructions, and tools used by subsequent work. */
  readonly select: (sessionID: SessionSchema.ID) => Effect.Effect<Selection, AgentNotFoundError>
  /** Resolves the model and active history for that selection. */
  readonly load: (selection: Selection) => Effect.Effect<Loaded, SessionRunnerModel.Error>
-  readonly resolveModel: (
-    session: SessionSchema.Info,
-  ) => Effect.Effect<SessionRunnerModel.Resolved, SessionRunnerModel.Error>
-  /** Selects auxiliary title capabilities without instruction or tool preflight. */
-  readonly selectTitle: (session: SessionSchema.Info) => Effect.Effect<
-    | {
-        readonly agent: Agent.Info
-        readonly primary: SessionRunnerModel.Resolved | undefined
-        readonly selected: SessionRunnerModel.Resolved
-      }
-    | undefined
-  >
-  readonly prepare: SessionModelRequest.Interface["prepare"]
 }

 /** Location-scoped model-context loader for durable Session Steps. */
@@ -76,7 +60,6 @@ const layer = Layer.effect(
  Effect.gen(function* () {
    const agents = yield* Agent.Service
    const builtins = yield* InstructionBuiltIns.Service
-    const catalog = yield* Catalog.Service
    const db = (yield* Database.Service).db
    const discovery = yield* InstructionDiscovery.Service
    const entries = yield* InstructionEntry.Service
@@ -84,41 +67,12 @@ const layer = Layer.effect(
    const mcpInstructions = yield* McpInstructions.Service
    const mcpTools = yield* McpTool.Service
    const models = yield* SessionRunnerModel.Service
-    const modelRequests = yield* SessionModelRequest.Service
    const plugins = yield* PluginSupervisor.Service
    const referenceInstructions = yield* ReferenceInstructions.Service
    const skillInstructions = yield* SkillInstructions.Service
    const store = yield* SessionStore.Service
    const registry = yield* Tool.Service

-    const resolveModel = (session: SessionSchema.Info) => models.resolve(session, catalog.model.available)
-
-    const selectTitle = Effect.fn("SessionContext.selectTitle")(function* (session: SessionSchema.Info) {
-      const agent = yield* agents.get(Agent.ID.make("title"))
-      if (!agent) return
-      const primary = yield* resolveModel(session).pipe(Effect.orElseSucceed(() => undefined))
-      const info = yield* Effect.gen(function* () {
-        if (agent.model) return yield* catalog.model.get(agent.model.providerID, agent.model.id)
-        if (!primary) return
-        return yield* catalog.model.small(primary.ref.providerID)
-      })
-      const variant =
-        agent.model?.variant ?? MINIMAL_REASONING_VARIANTS.find((id) => info?.variants.some((item) => item.id === id))
-      const preferred =
-        info &&
-        (yield* resolveModel({
-          ...session,
-          model: Model.Ref.make({
-            providerID: info.providerID,
-            id: info.id,
-            ...(variant ? { variant } : {}),
-          }),
-        }).pipe(Effect.orElseSucceed(() => undefined)))
-      const selected = preferred ?? primary
-      if (!selected) return
-      return { agent, primary, selected }
-    })
-
    const select = Effect.fn("SessionContext.select")(function* (sessionID: SessionSchema.ID) {
      const session = yield* store.get(sessionID)
      if (!session) return yield* Effect.die(new Error(`Session not found: ${sessionID}`))
@@ -158,7 +112,7 @@ const layer = Layer.effect(
    })

    const load = Effect.fn("SessionContext.load")(function* (selection: Selection) {
-      const model = yield* resolveModel(selection.session)
+      const model = yield* models.resolve(selection.session)
      const history = yield* SessionHistory.entriesForRunner(db, selection.session.id, selection.instructions)
      return {
        session: selection.session,
@@ -170,19 +124,15 @@ const layer = Layer.effect(
      }
    })

-    return Service.of({ select, load, resolveModel, selectTitle, prepare: modelRequests.prepare })
+    return Service.of({ select, load })
  }),
 )

-/** Variant IDs that minimize reasoning output, in preference order. */
-const MINIMAL_REASONING_VARIANTS = ["none", "minimal", "low"].map((id) => Model.VariantID.make(id))
-
 export const node = makeLocationNode({
  service: Service,
  layer,
  deps: [
    Agent.node,
-    Catalog.node,
    Database.node,
    InstructionBuiltIns.node,
    InstructionDiscovery.node,
@@ -193,7 +143,6 @@ export const node = makeLocationNode({
    PluginSupervisor.node,
    ReferenceInstructions.node,
    SessionRunnerModel.node,
-    SessionModelRequest.node,
    SessionStore.node,
    SkillInstructions.node,
    Tool.node,
@@ -9,6 +9,7 @@ import { SessionContext } from "./context.js"
 import { SessionGenerate } from "./generate.js"
 import { SessionHistory } from "./history.js"
 import { SessionModelRequest } from "./model-request.js"
+import { SessionRunnerModel } from "./runner/model.js"

 export const layer = Layer.effect(
  SessionGenerate.Service,
@@ -16,11 +17,13 @@ export const layer = Layer.effect(
    const context = yield* SessionContext.Service
    const database = yield* Database.Service
    const llm = yield* LLMClient.Service
+    const models = yield* SessionRunnerModel.Service
+    const modelRequests = yield* SessionModelRequest.Service

    return SessionGenerate.Service.of({
      generate: Effect.fn("SessionGenerate.generate")(function* (input) {
        const selection = yield* context.select(input.sessionID)
-        const model = yield* context.resolveModel(selection.session)
+        const model = yield* models.resolve(selection.session)
        const history = yield* SessionHistory.preview(database.db, selection.session.id, selection.instructions)
        const transcript = SessionModelRequest.baseTranscript({
          agent: selection.agent.info,
@@ -29,7 +32,7 @@ export const layer = Layer.effect(
          initial: history.initial,
          messages: history.messages,
        })
-        const prepared = yield* context.prepare({
+        const prepared = yield* modelRequests.prepare({
          scope: { session: selection.session, agentID: selection.agent.id, model, tools: selection.tools },
          transcript: {
            system: transcript.system,
@@ -56,5 +59,5 @@ export const layer = Layer.effect(
 export const node = makeLocationNode({
  service: SessionGenerate.Service,
  layer,
-  deps: [SessionContext.node, Database.node, llmClient],
+  deps: [SessionContext.node, Database.node, SessionModelRequest.node, SessionRunnerModel.node, llmClient],
 })
@@ -358,10 +358,15 @@ export const layer = Layer.effect(
          ? { webSocket: transport.bind(session.id) }
          : {}),
      }
-      const executeTool: Prepared["executeTool"] = (input) =>
-        tools
-          .execute({ ...input, definitions: hooked })
+      const executeTool: Prepared["executeTool"] = (input) => {
+        const tool = hooked.get(input.call.name)
+        // A registered tool absent from the hooked set was removed or renamed by a hook.
+        if (!tool && registry.has(input.call.name))
+          return new Tool.Error({ message: `Tool is not available for this request: ${input.call.name}` })
+        return tools
+          .execute(tool ? { ...input, call: { ...input.call, name: tool.name } } : input)
          .pipe(Effect.catchCauseFilter(declineDefect, (decline) => Effect.fail(decline)))
+      }
      return {
        request,
        options,
@@ -36,6 +36,7 @@ const layer = Layer.effect(
    const bus = yield* Bus.Service
    const store = yield* SessionStore.Service
    const context = yield* SessionContext.Service
+    const modelRequests = yield* SessionModelRequest.Service
    const modelTransport = yield* SessionModelTransport.Service
    const db = (yield* Database.Service).db
    const compaction = yield* SessionCompaction.Service
@@ -141,8 +142,6 @@ const layer = Layer.effect(
                  Effect.gen(function* () {
                    return yield* compaction.compactManual({
                      session,
-                      resolveModel: context.resolveModel,
-                      prepare: context.prepare,
                      messages: yield* store.context(sessionID),
                      inputID: pending.id,
                      started: true,
@@ -216,12 +215,7 @@ const layer = Layer.effect(
        // Reuse boundary preparation once; retries refresh context without delivering more input.
        const loaded = initial ?? (yield* prepareContext(sessionID).pipe(Effect.flatMap(context.load)))
        initial = undefined
-        const compactionInput = {
-          session: loaded.session,
-          messages: loaded.messages,
-          resolved: loaded.model,
-          prepare: context.prepare,
-        }
+        const compactionInput = { session: loaded.session, messages: loaded.messages, resolved: loaded.model }
        if (compaction.required(compactionInput)) {
          const compacted = yield* compaction.compact(compactionInput)
          if (compacted.status !== "completed") return yield* new StepFailedError({ error: compacted.error })
@@ -236,7 +230,7 @@ const layer = Layer.effect(
          initial: loaded.initial,
          messages: loaded.messages,
        })
-        const prepared = yield* context.prepare({
+        const prepared = yield* modelRequests.prepare({
          scope: { session: loaded.session, agentID: loaded.agent.id, model: loaded.model, tools: loaded.tools },
          transcript: {
            system: transcript.system,
@@ -325,6 +319,7 @@ export const node = makeLocationNode({
    Bus.node,
    llmClient,
    SessionContext.node,
+    SessionModelRequest.node,
    SessionModelTransport.node,
    SessionStore.node,
    SessionCompaction.node,
@@ -3,6 +3,7 @@ export * as SessionRunnerModel from "./model.js"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { LanguageModel } from "@opencode-ai/ai"
 import { Context, Effect, Layer, Schema } from "effect"
+import { Catalog } from "../../catalog.js"
 import { ModelResolver } from "../../model-resolver.js"
 import { Capabilities, ID, Info, Ref, VariantID } from "../../model.js"
 import { Provider } from "../../provider.js"
@@ -40,11 +41,7 @@ export type Error = ModelNotSelectedError | ModelUnavailableError | ModelResolve
 export type Resolved = ModelResolver.Resolved

 export interface Interface {
-  /** Availability is sampled lazily for each explicitly selected model resolution. */
-  readonly resolve: (
-    session: SessionSchema.Info,
-    available: () => Effect.Effect<ReadonlyArray<Info>>,
-  ) => Effect.Effect<Resolved, Error>
+  readonly resolve: (session: SessionSchema.Info) => Effect.Effect<Resolved, Error>
 }

 export class Service extends Context.Service<Service, Interface>()("@opencode/SessionRunnerModel") {}
@@ -73,16 +70,17 @@ export const resolved = (
 const layer = Layer.effect(
  Service,
  Effect.gen(function* () {
+    const catalog = yield* Catalog.Service
    const resolver = yield* ModelResolver.Service
    return Service.of({
-      resolve: Effect.fn("SessionRunnerModel.resolve")(function* (session, available) {
+      resolve: Effect.fn("SessionRunnerModel.resolve")(function* (session) {
        // Location plugins populate and filter the catalog asynchronously during layer startup.
        if (!session.model) {
          const resolved = yield* resolver.resolve()
          if (resolved) return resolved
          return yield* new ModelNotSelectedError({ sessionID: session.id })
        }
-        const selected = (yield* available()).find(
+        const selected = (yield* catalog.model.available()).find(
          (model) => model.providerID === session.model?.providerID && model.id === session.model.id,
        )
        if (!selected)
@@ -96,4 +94,4 @@ const layer = Layer.effect(
  }),
 )

-export const node = makeLocationNode({ service: Service, layer, deps: [ModelResolver.node] })
+export const node = makeLocationNode({ service: Service, layer, deps: [Catalog.node, ModelResolver.node] })
@@ -157,7 +157,6 @@ const assistant = (message: SessionMessage.Assistant, model: Model.Ref, provider
          providerMetadata: reuseProviderMetadata ? providerMetadata(providerMetadataKey, item.state) : undefined,
        },
      ]
-    // Let the destination adapter handle readable reasoning after a model/provider switch.
    if (item.type === "reasoning")
      return reuseProviderMetadata
        ? [
@@ -168,7 +167,7 @@ const assistant = (message: SessionMessage.Assistant, model: Model.Ref, provider
            },
          ]
        : item.text.length > 0
-          ? [{ type: message.error === undefined ? "reasoning" : "text", text: item.text }]
+          ? [{ type: "text", text: item.text }]
          : []
    // Call-side metadata is model-scoped proof of generation (Gemini thought
    // signatures, OpenAI encrypted reasoning): only the producing model may
@@ -4,16 +4,18 @@ import { isDeepStrictEqual } from "node:util"
 import { LLMClient, AIError, LLMEvent, Message, SystemPart, type LLMRequest } from "@opencode-ai/ai"
 import type { StreamOptions } from "@opencode-ai/ai/route"
 import { Context, DateTime, Effect, Layer, Stream } from "effect"
-import type { Agent } from "../agent.js"
+import { Agent } from "../agent.js"
+import { Catalog } from "../catalog.js"
 import { Database } from "../database/database.js"
 import { Bus } from "../bus.js"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { isExactRootFallback } from "@opencode-ai/util/session-title-fallback"
 import { llmClient } from "../effect/app-node-platform.js"
-import { SessionContext } from "./context.js"
+import { Model } from "../model.js"
 import { SessionEvent } from "./event.js"
 import { SessionHistory } from "./history.js"
-import type { SessionRunnerModel } from "./runner/model.js"
+import { SessionModelRequest } from "./model-request.js"
+import { SessionRunnerModel } from "./runner/model.js"
 import { SessionSchema } from "./schema.js"
 import { SessionUsage } from "./usage.js"
 import { SessionStore } from "./store.js"
@@ -28,7 +30,10 @@ type Dependencies = {
  readonly llm: {
    readonly stream: (request: LLMRequest, options?: StreamOptions) => Stream.Stream<LLMEvent, AIError>
  }
-  readonly context: SessionContext.Interface
+  readonly agents: Agent.Interface
+  readonly catalog: Catalog.Interface
+  readonly models: SessionRunnerModel.Interface
+  readonly modelRequests: SessionModelRequest.Interface
  readonly store: SessionStore.Interface
 }

@@ -67,7 +72,7 @@ const attempt = Effect.fn("SessionTitle.attempt")(function* (
        })
      : Effect.void,
  )
-  const prepared = yield* dependencies.context.prepare({
+  const prepared = yield* dependencies.modelRequests.prepare({
    scope: { session: input.session, agentID: input.agent.id, model: input.model },
    transcript: {
      system: input.agent.system ? [SystemPart.make(input.agent.system)] : [],
@@ -101,6 +106,9 @@ const attempt = Effect.fn("SessionTitle.attempt")(function* (
    .find((line) => line.length > 0)
 })

+/** Variant IDs that minimize reasoning output, in preference order. */
+const MINIMAL_REASONING_VARIANTS = ["none", "minimal", "low"].map((id) => Model.VariantID.make(id))
+
 const make = (dependencies: Dependencies) => {
  const generate = Effect.fn("SessionTitle.generate")(function* (
    db: Database.Interface["db"],
@@ -132,12 +140,34 @@ const make = (dependencies: Dependencies) => {
          Effect.orElseSucceed(() => firstUser.text),
        )
      : firstUser.text
-    const selection = yield* dependencies.context.selectTitle(session)
-    if (!selection) return
+    const agent = yield* dependencies.agents.get(Agent.ID.make("title"))
+    if (!agent) return
+    const primary = yield* dependencies.models.resolve(session).pipe(Effect.orElseSucceed(() => undefined))
+    const info = yield* Effect.gen(function* () {
+      if (agent.model) return yield* dependencies.catalog.model.get(agent.model.providerID, agent.model.id)
+      if (!primary) return
+      return yield* dependencies.catalog.model.small(primary.ref.providerID)
+    })
+    const variant =
+      agent.model?.variant ?? MINIMAL_REASONING_VARIANTS.find((id) => info?.variants.some((item) => item.id === id))
+    const preferred =
+      info &&
+      (yield* dependencies.models
+        .resolve({
+          ...session,
+          model: Model.Ref.make({
+            providerID: info.providerID,
+            id: info.id,
+            ...(variant ? { variant } : {}),
+          }),
+        })
+        .pipe(Effect.orElseSucceed(() => undefined)))
+    const selected = preferred ?? primary
+    if (!selected) return
    const title =
-      (yield* attempt(dependencies, { session, agent: selection.agent, text, model: selection.selected })) ??
-      (selection.primary && !isDeepStrictEqual(selection.selected.ref, selection.primary.ref)
-        ? yield* attempt(dependencies, { session, agent: selection.agent, text, model: selection.primary })
+      (yield* attempt(dependencies, { session, agent, text, model: selected })) ??
+      (primary && !isDeepStrictEqual(selected.ref, primary.ref)
+        ? yield* attempt(dependencies, { session, agent, text, model: primary })
        : undefined)
    if (!title) return
    const expectedSequence = (yield* Bus.latestSequence(db, sessionID)) + 1
@@ -162,10 +192,13 @@ export const layer = Layer.effect(
  Effect.gen(function* () {
    const bus = yield* Bus.Service
    const llm = yield* LLMClient.Service
-    const context = yield* SessionContext.Service
+    const agents = yield* Agent.Service
+    const catalog = yield* Catalog.Service
+    const models = yield* SessionRunnerModel.Service
+    const modelRequests = yield* SessionModelRequest.Service
    const store = yield* SessionStore.Service
    const database = yield* Database.Service
-    const title = make({ bus, llm, context, store })
+    const title = make({ bus, llm, agents, catalog, models, modelRequests, store })
    return Service.of({
      generate: (sessionID) => title.generate(database.db, sessionID),
    })
@@ -175,5 +208,14 @@ export const layer = Layer.effect(
 export const node = makeLocationNode({
  service: Service,
  layer,
-  deps: [Bus.node, llmClient, SessionContext.node, SessionStore.node, Database.node],
+  deps: [
+    Bus.node,
+    llmClient,
+    Agent.node,
+    Catalog.node,
+    SessionRunnerModel.node,
+    SessionModelRequest.node,
+    SessionStore.node,
+    Database.node,
+  ],
 })
@@ -4,6 +4,7 @@ export type { Context, Metadata, Options, Result } from "@opencode-ai/schema/too

 import { ToolDefinition, type ToolCall } from "@opencode-ai/ai"
 import { Tool } from "@opencode-ai/schema/tool"
+import type { ToolDraft } from "@opencode-ai/plugin/effect/tool"
 import { Context, Effect, Layer, Result, Schema, SchemaIssue, Types } from "effect"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import type { Agent } from "./agent.js"
@@ -23,20 +24,7 @@ export class RegistrationError extends Schema.TaggedError<RegistrationError>()("
  message: Schema.String,
 }) {}

-export interface Draft {
-  readonly list: () => readonly (Tool.Info & { readonly id: string })[]
-  readonly get: (id: string) => (Tool.Info & { readonly id: string }) | undefined
-  readonly add: (tool: Tool.Info) => void
-  readonly update: (id: string, update: (tool: Types.Mutable<Tool.Info>) => void) => void
-  readonly remove: (id: string) => void
-}
-
-type Data = {
-  tools: Map<string, Tool.Info & { readonly id: string }>
-  errors: { tool: Tool.Info; error: RegistrationError }[]
-}
-
-export interface Interface extends State.Transformable<Draft> {
+export interface Interface extends State.Transformable<ToolDraft> {
  readonly snapshot: (permissions?: Permission.Ruleset) => Effect.Effect<Snapshot>
 }

@@ -49,8 +37,6 @@ export interface Snapshot {
    readonly messageID: SessionMessage.ID
    readonly call: ToolCall
    readonly progress?: (update: Tool.Metadata) => Effect.Effect<void>
-    /** Surviving request definitions, keyed by the names advertised after session context hooks. */
-    readonly definitions?: ReadonlyMap<string, ToolDefinition>
  }) => Effect.Effect<Tool.Result & { readonly content: ReadonlyArray<Tool.Content> }, Tool.Error>
 }

@@ -92,23 +78,23 @@ const layer = Layer.effect(
      ]
    })

-    const beforeExecute = (name: string, input: unknown, context: Tool.Context) =>
-      hooks.trigger("tool", "execute.before", {
-        tool: name,
-        sessionID: context.sessionID,
-        agent: context.agent,
-        messageID: context.messageID,
-        id: context.id,
-        input,
-      })
-
    const executeTool = Effect.fn("Tool.execute")(function* (
      tool: Tool.Info,
      name: string,
      input: unknown,
      context: Tool.Context,
    ) {
-      const execution = yield* execute(tool, input, context).pipe(
+      const beforeEvent: PluginHooks.Domains["tool"]["execute.before"] = {
+        tool: name,
+        inputSchema: definition(tool).inputSchema,
+        sessionID: context.sessionID,
+        agent: context.agent,
+        messageID: context.messageID,
+        id: context.id,
+        input,
+      }
+      yield* hooks.trigger("tool", "execute.before", beforeEvent)
+      const execution = yield* execute(tool, beforeEvent.input, context).pipe(
        Effect.map((value) => ({ value })),
        Effect.catchTag("Tool.Error", (failure) => Effect.succeed({ failure })),
      )
@@ -118,7 +104,7 @@ const layer = Layer.effect(
        agent: context.agent,
        messageID: context.messageID,
        id: context.id,
-        input,
+        input: beforeEvent.input,
      }
      if ("failure" in execution) {
        const afterEvent: PluginHooks.Domains["tool"]["execute.after"] = {
@@ -147,59 +133,76 @@ const layer = Layer.effect(
      }
    })

-    const state: State.Interface<Data, Draft> = State.create<Data, Draft>({
+    const state = State.create({
      name: "tool",
      initial: () => ({
-        tools: new Map(),
-        errors: [],
+        tools: new Map<string, Types.Mutable<Tool.Info>>(),
+        errors: new Array<{ tool: Tool.Info; error: RegistrationError }>(),
      }),
-      draft: (draft) => ({
-        list: () => Array.from(draft.tools.values()),
-        get: (id) => draft.tools.get(id),
-        add: (tool) => {
-          const error = registrationError(tool)
-          if (error) {
-            draft.errors.push({ tool, error })
-            return
-          }
-          const id = effectiveName(tool)
-          draft.tools.set(id, { ...tool, id, options: tool.options && { ...tool.options } })
-        },
-        update: (id, update) => {
-          const current = draft.tools.get(id)
-          if (!current) return
-          const tool = { ...current, options: current.options && { ...current.options } }
-          update(tool)
-          tool.name = current.name
-          tool.id = id
-          if (tool.options?.namespace !== current.options?.namespace)
-            tool.options = { ...tool.options, namespace: current.options?.namespace }
-          const error = registrationError(tool)
-          if (error) {
-            draft.errors.push({ tool, error })
-            return
-          }
-          draft.tools.set(id, tool)
-        },
-        remove: (id) => {
-          draft.tools.delete(id)
-        },
-      }),
-      finalize: () =>
+      draft: (data) => data,
+      finalize: (draft) =>
        Effect.forEach(
-          state.get().errors,
-          ({ tool, error }) =>
+          draft.errors,
+          (entry) =>
            Effect.logError("Skipping invalid tool registration", {
-              name: tool.name,
-              namespace: tool.options?.namespace,
-              error: error.message,
+              name: entry.tool.name,
+              namespace: entry.tool.options?.namespace,
+              error: entry.error.message,
            }),
          { discard: true },
        ),
    })

    return Service.of({
-      transform: state.transform,
+      transform: (callback) =>
+        state.transform((draft) => {
+          // Preserve rejection of ambiguous adds within one transform, without rejecting later overrides.
+          const added = new Map<string, Tool.Info | undefined>()
+          callback({
+            add: (tool) => {
+              const error = registrationError(tool)
+              if (error) {
+                draft.errors.push({ tool, error })
+                return
+              }
+              const id = effectiveName(tool)
+              if (added.has(id)) {
+                draft.errors.push({
+                  tool,
+                  error: new RegistrationError({ name: id, message: `Duplicate normalized tool name: ${id}` }),
+                })
+                const previous = added.get(id)
+                if (previous) {
+                  draft.tools.set(id, previous)
+                  return
+                }
+                draft.tools.delete(id)
+                return
+              }
+              added.set(id, draft.tools.get(id))
+              draft.tools.set(id, { ...tool })
+            },
+            update: (id, update) => {
+              const current = draft.tools.get(id)
+              if (!current) return
+              const tool = { ...current }
+              update(tool)
+              tool.name = current.name
+              if (tool.options?.namespace !== current.options?.namespace)
+                tool.options = { ...tool.options, namespace: current.options?.namespace }
+              const error = registrationError(tool)
+              if (error) {
+                draft.errors.push({ tool, error })
+                return
+              }
+              draft.tools.set(id, tool)
+            },
+            remove: (id) => {
+              draft.tools.delete(id)
+              added.delete(id)
+            },
+          })
+        }),
      reload: state.reload,
      snapshot: Effect.fn("Tool.snapshot")((permissions) =>
        Effect.sync(() => {
@@ -214,11 +217,7 @@ const layer = Layer.effect(
          const executeRule = rules.findLast((rule) => Wildcard.match("execute", rule.action))
          const codemodeEnabled = executeRule?.resource !== "*" || executeRule.effect !== "deny"
          const codemodeTool = codemodeEnabled
-            ? CodeModeTool.create(codemode, (name, tool, input, context) =>
-                beforeExecute(name, input, context).pipe(
-                  Effect.flatMap((event) => executeTool(tool, name, event.input, context)),
-                ),
-              )
+            ? CodeModeTool.create(codemode, (name, tool, input, context) => executeTool(tool, name, input, context))
            : undefined
          const codeModeCatalog = codemodeEnabled ? CodeModeTool.catalog(codemode) : undefined
          return {
@@ -229,7 +228,13 @@ const layer = Layer.effect(
                .map(([, tool]) => definition(tool)),
              ...(codemodeTool ? [definition(codemodeTool)] : []),
            ],
-            execute: Effect.fnUntraced(function* (input: Parameters<Snapshot["execute"]>[0]) {
+            execute: (input: {
+              readonly sessionID: SessionSchema.ID
+              readonly agent: Agent.ID
+              readonly messageID: SessionMessage.ID
+              readonly call: ToolCall
+              readonly progress?: (update: Tool.Metadata) => Effect.Effect<void>
+            }) => {
              const context: Tool.Context = {
                sessionID: input.sessionID,
                agent: input.agent,
@@ -237,18 +242,12 @@ const layer = Layer.effect(
                id: Tool.CallID.make(input.call.id),
                progress: input.progress ?? (() => Effect.void),
              }
-              const event = yield* beforeExecute(input.call.name, input.call.input, context)
-              const requested = input.definitions?.get(event.tool)
-              // Preserve session context removal and alias resolution, now after the repair hook.
-              if (!requested && input.definitions && (direct.has(event.tool) || codemodeTool?.name === event.tool))
-                return yield* new Tool.Error({ message: `Tool is not available for this request: ${event.tool}` })
-              const name = requested?.name ?? event.tool
-              if (name === "execute" && codemodeTool)
-                return yield* executeTool(codemodeTool, name, event.input, context)
-              const tool = direct.get(name)
-              if (tool) return yield* executeTool(tool, name, event.input, context)
-              return yield* new Tool.Error({ message: `Unknown tool: ${name}` })
-            }),
+              if (input.call.name === "execute" && codemodeTool)
+                return executeTool(codemodeTool, input.call.name, input.call.input, context)
+              const tool = direct.get(input.call.name)
+              if (tool) return executeTool(tool, input.call.name, input.call.input, context)
+              return new Tool.Error({ message: `Unknown tool: ${input.call.name}` })
+            },
          }
        }),
      ),
@@ -32,14 +32,12 @@ Leaves own resolution, permission, and side-effect ordering. Translate only expe

 Built-ins, plugins, and MCP install tools through `Tool.Service.transform`, adding complete tool objects to the draft. A tool may provide a namespace, which flattens direct model names to `<namespace>_<tool>`, and defaults into CodeMode (`codemode` defaults true; `codemode: false` keeps the tool on the provider's native tool list).

-The service uses shared `State` to replay synchronous transforms in registration order against a fresh draft. `Tool.Service.reload()` rebuilds from captured source data without changing registration precedence. Registrations are scoped and return a real, idempotent `dispose` Effect:
+Registrations are scoped:

- The latest valid active registration for the same effective name wins.
- `update` and `remove` target effective names and do nothing for missing tools. Updates preserve the name and namespace; invalid updates leave the previous definition intact. Creating a tool requires `add`.
- Disposing a registration or closing its scope removes only its transform and rebuilds from the remaining transforms, revealing any earlier definition it overrode.
- Each model request captures the effective definitions and executors it advertises; later reloads and disposal affect later snapshots. Captured executors may still reference mutable producer-owned state.
-
-MCP owns one stable tool transform that reads its latest discovered tools. Tool-list changes update that source and reload the tool state instead of re-registering at the end of the transform order. MCP refresh therefore preserves the precedence of later plugin overrides.
+- Tool transforms use the shared `State.create` lifecycle, like agents and skills: `add`, `update`, and `remove` replay in registration order when state is rebuilt.
+- `update` and `remove` do nothing for missing tools. `add` requires a complete tool definition.
+- Disposing a registration or closing its scope removes its transform and rebuilds the remaining state. `reload` replays transforms after their external inputs change.
+- Each model request captures the effective tools it advertises; later registration changes affect later requests.

 Type safety ends at registration. The registry validates model input and declared output at runtime and should not carry producer schema generics through storage or execution.

@@ -33,88 +33,81 @@ export const layer = Layer.effect(
    const lock = Semaphore.makeUnsafe(1)
    let discovered: MCP.Tool[] = []

-    // Register once after initial discovery; only subsequent updates need a debounced reload.
-    const initial = yield* lock
-      .withPermit(
-        Effect.gen(function* () {
-          discovered = yield* mcp.tools()
-          yield* tools.transform((draft) => {
-            for (const tool of discovered) {
-              const schema = (tool.inputSchema ?? {}) as JsonSchema.JsonSchema
-              draft.add({
-                name: tool.name,
-                options: { namespace: namespace(tool.server), codemode: tool.codemode !== false },
-                description: tool.description ?? "",
-                input: {
-                  ...schema,
-                  type: "object",
-                  properties: schema.properties ?? {},
-                  additionalProperties: false,
+    // Keep the source's position so later plugin transforms also apply after MCP refreshes.
+    yield* tools.transform((draft) => {
+      for (const tool of discovered) {
+        const schema = (tool.inputSchema ?? {}) as JsonSchema.JsonSchema
+        draft.add({
+          name: tool.name,
+          options: { namespace: namespace(tool.server), codemode: tool.codemode !== false },
+          description: tool.description ?? "",
+          input: {
+            ...schema,
+            type: "object",
+            properties: schema.properties ?? {},
+            additionalProperties: false,
+          },
+          output: (tool.outputSchema ?? {}) as JsonSchema.JsonSchema,
+          execute: (input, context) =>
+            Effect.gen(function* () {
+              yield* permission.assert({
+                action: name(tool.server, tool.name),
+                resources: ["*"],
+                save: ["*"],
+                metadata: {},
+                sessionID: context.sessionID,
+                agent: context.agent,
+                source: {
+                  type: "tool",
+                  messageID: context.messageID,
+                  id: context.id,
                },
-                output: (tool.outputSchema ?? {}) as JsonSchema.JsonSchema,
-                execute: (input, context) =>
-                  Effect.gen(function* () {
-                    yield* permission.assert({
-                      action: name(tool.server, tool.name),
-                      resources: ["*"],
-                      save: ["*"],
-                      metadata: {},
-                      sessionID: context.sessionID,
-                      agent: context.agent,
-                      source: {
-                        type: "tool",
-                        messageID: context.messageID,
-                        id: context.id,
-                      },
-                    })
-                    const result = yield* mcp
-                      .callTool({
-                        server: tool.server,
-                        name: tool.name,
-                        args: (input ?? {}) as Record<string, unknown>,
-                      })
-                      .pipe(
-                        Effect.catchTags({
-                          "MCP.NotFoundError": (error) =>
-                            new ToolFailure({ message: `MCP server "${error.server}" is not available` }),
-                          "MCP.ToolCallError": (error) => new ToolFailure({ message: error.message }),
-                        }),
-                      )
-                    if (result.isError)
-                      return yield* new ToolFailure({
-                        message:
-                          result.content
-                            .flatMap((part) => (part.type === "text" ? [part.text] : []))
-                            .join("\n")
-                            .trim() || "MCP tool returned an error",
-                      })
-                    const content = result.content.map((part) =>
-                      part.type === "text"
-                        ? { type: "text" as const, text: part.text }
-                        : {
-                            type: "file" as const,
-                            uri: `data:${part.mimeType};base64,${part.data}`,
-                            mime: part.mimeType,
-                          },
-                    )
-                    const text = content.flatMap((part) => (part.type === "text" ? [part.text] : [])).join("\n")
-                    return {
-                      output: result.structured ?? (text === "" ? null : text),
-                      ...(content.length === 0 ? {} : { content }),
-                    }
-                  }).pipe(
-                    Effect.mapError((error) =>
-                      error instanceof ToolFailure
-                        ? error
-                        : new ToolFailure({ message: `Unable to execute ${name(tool.server, tool.name)}` }),
-                    ),
-                  ),
              })
-            }
-          })
-        }),
-      )
-      .pipe(Effect.forkScoped)
+              const result = yield* mcp
+                .callTool({
+                  server: tool.server,
+                  name: tool.name,
+                  args: (input ?? {}) as Record<string, unknown>,
+                })
+                .pipe(
+                  Effect.catchTags({
+                    "MCP.NotFoundError": (error) =>
+                      new ToolFailure({ message: `MCP server "${error.server}" is not available` }),
+                    "MCP.ToolCallError": (error) => new ToolFailure({ message: error.message }),
+                  }),
+                )
+              if (result.isError)
+                return yield* new ToolFailure({
+                  message:
+                    result.content
+                      .flatMap((part) => (part.type === "text" ? [part.text] : []))
+                      .join("\n")
+                      .trim() || "MCP tool returned an error",
+                })
+              const content = result.content.map((part) =>
+                part.type === "text"
+                  ? { type: "text" as const, text: part.text }
+                  : {
+                      type: "file" as const,
+                      uri: `data:${part.mimeType};base64,${part.data}`,
+                      mime: part.mimeType,
+                    },
+              )
+              const text = content.flatMap((part) => (part.type === "text" ? [part.text] : [])).join("\n")
+              return {
+                output: result.structured ?? (text === "" ? null : text),
+                ...(content.length === 0 ? {} : { content }),
+              }
+            }).pipe(
+              Effect.mapError((error) =>
+                error instanceof ToolFailure
+                  ? error
+                  : new ToolFailure({ message: `Unable to execute ${name(tool.server, tool.name)}` }),
+              ),
+            ),
+        })
+      }
+    })
    const reconcile = lock.withPermit(
      Effect.gen(function* () {
        discovered = yield* mcp.tools()
@@ -122,9 +115,9 @@ export const layer = Layer.effect(
      }),
    )

+    const initial = yield* reconcile.pipe(Effect.forkScoped)
    yield* bus.subscribe(McpEvent.ToolsChanged).pipe(
-      // Each read loads the whole catalog, so queued notifications need only one refresh.
-      Stream.runForEachArray(() => reconcile),
+      Stream.runForEach(() => reconcile),
      Effect.forkScoped({ startImmediately: true }),
    )
    return Service.of({ flush: Effect.asVoid(Fiber.await(initial)) })
@@ -19,8 +19,9 @@ import { ToolOutput } from "../../tool-output.js"
 export const name = "shell"
 export const DEFAULT_TIMEOUT_MS = 2 * 60 * 1_000

+const BACKGROUND_STARTED = "The command was moved to the background."
 const BACKGROUND_INSTRUCTION =
-  "You will be notified automatically when the command finishes. Avoid sleep commands or polling for completion; if you need the output before then, read the file directly."
+  "You will be notified automatically when the command finishes. DO NOT sleep, poll, or proactively check on its progress."
 const OS =
  process.platform === "darwin"
    ? "macOS"
@@ -94,8 +95,8 @@ const toolResult = (output: Output) => {
  }
 }

-const backgroundResult = (shellID: string, file: string) => ({
-  output: `Command moved to the background (shell ID: ${shellID}).\nOutput is streaming to: ${file}`,
+const backgroundResult = (shellID: string) => ({
+  output: BACKGROUND_STARTED,
  shellID,
  truncated: false,
  status: "running" as const,
@@ -294,7 +295,7 @@ export const Plugin = {
              if (input.background === true) {
                yield* runtime.job.background(job.id)
                yield* notifyWhenDone(context.sessionID, context.id, info.id, info.command, settled)
-                return backgroundResult(info.id, info.file)
+                return backgroundResult(info.id)
              }

              const result = yield* runtime.job
@@ -303,7 +304,7 @@ export const Plugin = {
              if (result?.type === "backgrounded") {
                yield* shell.timeout(info.id, 0)
                yield* notifyWhenDone(context.sessionID, context.id, info.id, info.command, settled)
-                return backgroundResult(info.id, info.file)
+                return backgroundResult(info.id)
              }
              if (result?.info.status === "error")
                return yield* Effect.fail(new Error(result.info.error ?? "Command failed"))
@@ -1,336 +0,0 @@
-import { describe, expect } from "bun:test"
-import { Deferred, Effect, Exit, Fiber, Stream } from "effect"
-import { eq } from "drizzle-orm"
-import { Bus } from "@opencode-ai/core/bus"
-import { Database } from "@opencode-ai/core/database/database"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { Location } from "@opencode-ai/core/location"
-import { ProjectTable } from "@opencode-ai/core/project/sql"
-import { SessionProjector } from "@opencode-ai/core/session/projector"
-import { SessionMessageTable, SessionTable } from "@opencode-ai/core/session/sql"
-import { Event } from "@opencode-ai/schema/event"
-import { Project } from "@opencode-ai/schema/project"
-import { AbsolutePath } from "@opencode-ai/schema/schema"
-import { SessionID } from "@opencode-ai/schema/session-id"
-import { SessionEvent } from "@opencode-ai/schema/session-event"
-import { SessionMessage } from "@opencode-ai/schema/session-message"
-import { WorkspaceID } from "@opencode-ai/schema/workspace-id"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { location } from "./fixture/location"
-import { testEffect } from "./lib/effect"
-
-const it = testEffect(
-  AppNodeBuilder.build(LayerNode.group([Database.node, Bus.node, SessionProjector.node]), [
-    [Bus.node, Bus.configured({ persist: true })],
-  ]),
-)
-const a = Location.Ref.make({ directory: AbsolutePath.make("/a") })
-const b = Location.Ref.make({ directory: AbsolutePath.make("/b") })
-const otherWorkspace = Location.Ref.make({ directory: a.directory, workspaceID: WorkspaceID.make("wrk_other") })
-const id = SessionID.make("ses_routing")
-const Done = Bus.ephemeral({ type: "test.routing.done", schema: {} })
-const Global = Bus.ephemeral({ type: "test.routing.global", schema: { sessionID: SessionID } })
-
-const seed = Effect.fn(function* (ref: Location.Ref = a) {
-  const database = yield* Database.Service
-  yield* database.db.insert(ProjectTable).values({ id: Project.ID.global, worktree: a.directory, sandboxes: [] }).run()
-  yield* database.db
-    .insert(SessionTable)
-    .values({
-      id,
-      project_id: Project.ID.global,
-      directory: ref.directory,
-      workspace_id: ref.workspaceID,
-      slug: "routing",
-      version: "test",
-    })
-    .run()
-})
-
-const watch = (bus: Bus.Interface, ref?: Location.Ref, gate?: Deferred.Deferred<void>) => {
-  const collect = bus.subscribe().pipe(
-    Stream.takeUntil((event) => event.type === Done.type),
-    Stream.mapEffect((event) => (gate ? Deferred.await(gate).pipe(Effect.as(event)) : Effect.succeed(event))),
-    Stream.runCollect,
-  )
-  return (ref ? collect.pipe(Effect.provideService(Location.Service, location(ref))) : collect).pipe(
-    Effect.forkScoped({ startImmediately: true }),
-  )
-}
-
-const delta = (bus: Bus.Interface) =>
-  bus.publish(SessionEvent.Text.Delta, {
-    sessionID: id,
-    assistantMessageID: SessionMessage.ID.make("msg_routing"),
-    ordinal: 0,
-    delta: "text",
-  })
-
-describe("Bus Session routing", () => {
-  it.effect("delivers workspace-only moves to both owners without duplicating same-location moves", () =>
-    Effect.gen(function* () {
-      yield* seed()
-      const bus = yield* Bus.Service
-      const first = yield* watch(bus, a)
-      const second = yield* watch(bus, otherWorkspace)
-      const moved = yield* bus.publish(
-        SessionEvent.Moved,
-        { sessionID: id, location: otherWorkspace, projectID: Project.ID.global },
-        { location: a },
-      )
-      const after = yield* delta(bus)
-      const same = yield* bus.publish(SessionEvent.Moved, {
-        sessionID: id,
-        location: otherWorkspace,
-        projectID: Project.ID.global,
-      })
-      const done = yield* bus.publish(Done, {})
-      expect(Array.from(yield* Fiber.join(first))).toEqual([moved, done])
-      expect(Array.from(yield* Fiber.join(second))).toEqual([moved, after, same, done])
-      expect(moved.location).toEqual(a)
-    }),
-  )
-
-  it.effect("routes forks through their parent before the child exists", () =>
-    Effect.gen(function* () {
-      yield* seed()
-      const bus = yield* Bus.Service
-      const database = yield* Database.Service
-      yield* bus.publish(SessionEvent.Synthetic, { sessionID: id, text: "Fork boundary" })
-      const boundary = yield* database.db
-        .select({ id: SessionMessageTable.id })
-        .from(SessionMessageTable)
-        .where(eq(SessionMessageTable.session_id, id))
-        .get()
-      if (!boundary) return yield* Effect.die("Missing fork boundary")
-
-      yield* Effect.forEach(["publish", "batch", "replay"] as const, (mode) =>
-        Effect.gen(function* () {
-          const child = SessionID.create()
-          const first = yield* watch(bus, a)
-          const second = yield* watch(bus, b)
-          const payload = {
-            sessionID: child,
-            parentID: id,
-            boundary: { type: "before" as const, messageID: boundary.id },
-          }
-          const eventID = Event.ID.create()
-          if (mode === "publish") yield* bus.publish(SessionEvent.Forked, payload, { id: eventID })
-          if (mode === "batch") yield* bus.publishAll([[SessionEvent.Forked, payload, { id: eventID }]])
-          if (mode === "replay")
-            yield* bus.replay(
-              {
-                id: eventID,
-                type: Bus.versionedType(SessionEvent.Forked.type, 2),
-                seq: 0,
-                aggregateID: child,
-                data: payload,
-              },
-              { publish: true },
-            )
-          const after = yield* bus.publish(SessionEvent.Execution.Succeeded, { sessionID: child })
-          const done = yield* bus.publish(Done, {})
-          expect(Array.from(yield* Fiber.join(first)).map((event) => event.id)).toEqual([eventID, after.id, done.id])
-          expect(Array.from(yield* Fiber.join(second))).toEqual([done])
-        }),
-      )
-    }),
-  )
-
-  it.effect("routes existing Sessions without changing public events or global delivery", () =>
-    Effect.gen(function* () {
-      yield* seed()
-      const bus = yield* Bus.Service
-      const first = yield* watch(bus, a)
-      const second = yield* watch(bus, b)
-      const workspace = yield* watch(bus, otherWorkspace)
-      const global = yield* watch(bus)
-      const listened: Event.Payload[] = []
-      yield* bus.listen((event) =>
-        Effect.sync(() => {
-          listened.push(event)
-        }),
-      )
-
-      const renamed = yield* bus.publish(SessionEvent.Renamed, { sessionID: id, title: "first" })
-      const text = yield* delta(bus)
-      const broadcast = yield* bus.publish(Global, { sessionID: id })
-      const explicit = yield* bus.publish(SessionEvent.Execution.Succeeded, { sessionID: id }, { location: b })
-      const done = yield* bus.publish(Done, {})
-
-      expect(Array.from(yield* Fiber.join(first))).toEqual([renamed, text, broadcast, done])
-      expect(Array.from(yield* Fiber.join(second))).toEqual([broadcast, explicit, done])
-      expect(Array.from(yield* Fiber.join(workspace))).toEqual([broadcast, done])
-      expect(Array.from(yield* Fiber.join(global))).toEqual([renamed, text, broadcast, explicit, done])
-      expect(listened).toEqual([renamed, text, broadcast, explicit, done])
-      expect(renamed).not.toHaveProperty("location")
-      expect(text).not.toHaveProperty("location")
-      expect(JSON.parse(JSON.stringify(renamed))).not.toHaveProperty("location")
-      const history = yield* bus.log({ aggregateID: id }).pipe(Stream.runCollect)
-      expect(
-        Array.from(history)
-          .filter((event): event is Event.Payload => !Bus.isSynced(event))
-          .every((event) => !event.location),
-      ).toBe(true)
-    }),
-  )
-
-  it.effect("applies the same routing to typed and multi-type subscriptions", () =>
-    Effect.gen(function* () {
-      yield* seed()
-      const bus = yield* Bus.Service
-      const typed = yield* bus
-        .subscribe(SessionEvent.Renamed)
-        .pipe(
-          Stream.take(1),
-          Stream.runCollect,
-          Effect.provideService(Location.Service, location(b)),
-          Effect.forkScoped({ startImmediately: true }),
-        )
-      const multiple = yield* bus.subscribe([SessionEvent.Renamed, Done]).pipe(
-        Stream.takeUntil((event) => event.type === Done.type),
-        Stream.runCollect,
-        Effect.provideService(Location.Service, location(b)),
-        Effect.forkScoped({ startImmediately: true }),
-      )
-      yield* bus.publish(SessionEvent.Renamed, { sessionID: id, title: "wrong location" })
-      yield* bus.publish(SessionEvent.Moved, { sessionID: id, location: b, projectID: Project.ID.global })
-      const expected = yield* bus.publish(SessionEvent.Renamed, { sessionID: id, title: "destination" })
-      const done = yield* bus.publish(Done, {})
-      expect(Array.from(yield* Fiber.join(typed))).toEqual([expected])
-      expect(Array.from(yield* Fiber.join(multiple))).toEqual([expected, done])
-    }),
-  )
-
-  it.effect("snapshots routing across creation and moves for slow subscribers", () =>
-    Effect.gen(function* () {
-      const database = yield* Database.Service
-      yield* database.db
-        .insert(ProjectTable)
-        .values({ id: Project.ID.global, worktree: a.directory, sandboxes: [] })
-        .run()
-      const bus = yield* Bus.Service
-      const gate = yield* Deferred.make<void>()
-      const first = yield* watch(bus, a, gate)
-      const second = yield* watch(bus, b, gate)
-      const created = yield* bus.publish(SessionEvent.Created, {
-        sessionID: id,
-        location: a,
-        projectID: Project.ID.global,
-        slug: "routing",
-        version: "test",
-      })
-      const before = yield* bus.publish(SessionEvent.Renamed, { sessionID: id, title: "before" })
-      const moved = yield* bus.publish(SessionEvent.Moved, { sessionID: id, location: b, projectID: Project.ID.global })
-      const after = yield* delta(bus)
-      const done = yield* bus.publish(Done, {})
-      yield* Deferred.succeed(gate, undefined)
-
-      expect(Array.from(yield* Fiber.join(first))).toEqual([created, before, moved, done])
-      expect(Array.from(yield* Fiber.join(second))).toEqual([moved, after, done])
-      expect(moved).not.toHaveProperty("location")
-    }),
-  )
-
-  it.effect("routes a cold Session deletion before its projector removes ownership", () =>
-    Effect.gen(function* () {
-      yield* seed()
-      const bus = yield* Bus.Service
-      const first = yield* watch(bus, a)
-      const second = yield* watch(bus, b)
-      const global = yield* watch(bus)
-      const deleted = yield* bus.publish(SessionEvent.Deleted, { sessionID: id })
-      const missing = yield* delta(bus)
-      const done = yield* bus.publish(Done, {})
-
-      const database = yield* Database.Service
-      expect(yield* database.db.select().from(SessionTable).where(eq(SessionTable.id, id)).get()).toBeUndefined()
-      expect(Array.from(yield* Fiber.join(first))).toEqual([deleted, done])
-      expect(Array.from(yield* Fiber.join(second))).toEqual([done])
-      expect(Array.from(yield* Fiber.join(global))).toEqual([deleted, missing, done])
-    }),
-  )
-
-  it.effect("preserves routing through a batch that moves and deletes a Session", () =>
-    Effect.gen(function* () {
-      yield* seed()
-      const bus = yield* Bus.Service
-      const gate = yield* Deferred.make<void>()
-      const first = yield* watch(bus, a, gate)
-      const second = yield* watch(bus, b, gate)
-      const events = yield* bus.publishAll([
-        [SessionEvent.Renamed, { sessionID: id, title: "before" }],
-        [SessionEvent.Moved, { sessionID: id, location: b, projectID: Project.ID.global }],
-        [SessionEvent.Renamed, { sessionID: id, title: "after" }],
-        [SessionEvent.Deleted, { sessionID: id }],
-      ])
-      const done = yield* bus.publish(Done, {})
-      yield* Deferred.succeed(gate, undefined)
-      expect(Array.from(yield* Fiber.join(first))).toEqual([events[0], events[1], done])
-      expect(Array.from(yield* Fiber.join(second))).toEqual([events[1], events[2], events[3], done])
-    }),
-  )
-
-  it.effect("does not change ownership when single or batched moves roll back", () =>
-    Effect.gen(function* () {
-      yield* seed()
-      const bus = yield* Bus.Service
-      const first = yield* watch(bus, a)
-      const second = yield* watch(bus, b)
-      const before = yield* delta(bus)
-      const single = yield* bus
-        .publish(
-          SessionEvent.Moved,
-          { sessionID: id, location: b, projectID: Project.ID.global },
-          { commit: () => Effect.die("rollback") },
-        )
-        .pipe(Effect.exit)
-      const batch = yield* bus
-        .publishAll([
-          [SessionEvent.Moved, { sessionID: id, location: b, projectID: Project.ID.global }],
-          [SessionEvent.Renamed, { sessionID: id, title: "rollback" }, { commit: () => Effect.die("rollback") }],
-        ])
-        .pipe(Effect.exit)
-      const after = yield* delta(bus)
-      const done = yield* bus.publish(Done, {})
-      expect(Exit.isFailure(single)).toBe(true)
-      expect(Exit.isFailure(batch)).toBe(true)
-      expect(Array.from(yield* Fiber.join(first))).toEqual([before, after, done])
-      expect(Array.from(yield* Fiber.join(second))).toEqual([done])
-    }),
-  )
-
-  it.effect("updates cached ownership on silent replay and filters published replay", () =>
-    Effect.gen(function* () {
-      yield* seed()
-      const bus = yield* Bus.Service
-      yield* delta(bus)
-      const first = yield* watch(bus, a)
-      const second = yield* watch(bus, b)
-      yield* bus.replay({
-        id: Event.ID.create(),
-        type: Bus.versionedType(SessionEvent.Moved.type, 1),
-        seq: 0,
-        aggregateID: id,
-        data: { sessionID: id, location: b, projectID: Project.ID.global },
-      })
-      const after = yield* delta(bus)
-      const replayID = Event.ID.create()
-      yield* bus.replay(
-        {
-          id: replayID,
-          type: Bus.versionedType(SessionEvent.Renamed.type, 1),
-          seq: 1,
-          aggregateID: id,
-          data: { sessionID: id, title: "replayed" },
-        },
-        { publish: true },
-      )
-      const done = yield* bus.publish(Done, {})
-      expect(Array.from(yield* Fiber.join(first))).toEqual([done])
-      const received = Array.from(yield* Fiber.join(second))
-      expect(received.map((event) => event.id)).toEqual([after.id, replayID, done.id])
-      expect(received[1]).not.toHaveProperty("location")
-    }),
-  )
-})
@@ -9,7 +9,6 @@ import { llmClient } from "@opencode-ai/core/effect/app-node-platform"
 import { SessionCompaction } from "@opencode-ai/core/session/compaction"
 import { SessionEvent } from "@opencode-ai/core/session/event"
 import { SessionMessage } from "@opencode-ai/core/session/message"
-import { SessionModelRequest } from "@opencode-ai/core/session/model-request"
 import { SessionRunnerModel } from "@opencode-ai/core/session/runner/model"
 import { Session } from "@opencode-ai/core/session"
 import { Agent } from "@opencode-ai/core/agent"
@@ -39,13 +38,19 @@ const config = Config.testLayer()
 const it = testEffect(
  Layer.merge(
    config,
-    AppNodeBuilder.build(LayerNode.group([SessionCompaction.node, SessionModelRequest.node, Config.node, Bus.node]), [
+    AppNodeBuilder.build(LayerNode.group([SessionCompaction.node, Config.node, Bus.node]), [
      [
        llmClient,
        Layer.mock(LLMClient.Service)({
          stream: () => Stream.make(LLMEvent.textDelta({ id: "summary", text: "summary" })),
        }),
      ],
+      [
+        SessionRunnerModel.node,
+        Layer.mock(SessionRunnerModel.Service)({
+          resolve: () => Effect.succeed(resolved),
+        }),
+      ],
      [Config.node, config],
    ]),
  ),
@@ -54,7 +59,6 @@ describe("ConfigCompactionPlugin.Plugin", () => {
  it.live("merges settings and reloads changed config", () =>
    Effect.gen(function* () {
      const compaction = yield* SessionCompaction.Service
-      const modelRequests = yield* SessionModelRequest.Service
      const config = yield* Config.Test
      const bus = yield* Bus.Service
      yield* config.setEntries([
@@ -81,8 +85,6 @@ describe("ConfigCompactionPlugin.Plugin", () => {
      expect(
        yield* compaction.compactManual({
          session,
-          resolveModel: () => Effect.succeed(resolved),
-          prepare: modelRequests.prepare,
          messages: [
            {
              id: SessionMessage.ID.create(),
@@ -131,37 +131,6 @@ describe("Git worktrees", () => {
 })

 describe("Git trees", () => {
-  it.live("lists both sides of a rename as separate file changes", () =>
-    Effect.gen(function* () {
-      const root = yield* Effect.acquireRelease(
-        Effect.promise(() => tmpdir()),
-        (dir) => Effect.promise(() => dir[Symbol.asyncDispose]()),
-      )
-      yield* Effect.promise(async () => {
-        await initRepo(root.path)
-        await $`git config diff.renames true`.cwd(root.path).quiet()
-        await Bun.write(path.join(root.path, "old name.txt"), "Preserve this content.\n")
-      })
-      const git = yield* Git.Service
-      const repository = yield* git.repo.discover(AbsolutePath.make(root.path))
-      if (!repository) throw new Error("Repository not found")
-      const before = yield* git.tree.capture({ repository, scopes: [RelativePath.make(".")] })
-      yield* Effect.promise(() => fs.rename(path.join(root.path, "old name.txt"), path.join(root.path, "new name.txt")))
-      const after = yield* git.tree.capture({ repository, scopes: [RelativePath.make(".")] })
-
-      expect(yield* git.tree.files({ repository, from: before, to: after })).toEqual([
-        RelativePath.make("new name.txt"),
-        RelativePath.make("old name.txt"),
-      ])
-      expect(
-        (yield* git.tree.diff({ repository, from: before, to: after })).map((file) => [file.file, file.status]),
-      ).toEqual([
-        ["new name.txt", "added"],
-        ["old name.txt", "deleted"],
-      ])
-    }),
-  )
-
  it.live("captures, compares, previews, and restores scoped trees", () =>
    Effect.gen(function* () {
      const root = yield* Effect.acquireRelease(
@@ -81,28 +81,6 @@ const itWithActivity = testEffect(
 )

 describe("LocationServiceMap", () => {
-  itWithActivity.effect("does not refresh lifetime from inferred Session routing", () =>
-    Effect.gen(function* () {
-      const locations = yield* LocationServiceMap.Service
-      const bus = yield* Bus.Service
-      const ref = Location.Ref.make({ directory: AbsolutePath.make("/project") })
-      const sessionID = Session.ID.make("ses_routing_activity")
-      yield* Location.Service.pipe(Effect.provide(locations.get(ref)), Effect.scoped)
-      yield* bus.publish(SessionEvent.Created, {
-        sessionID,
-        location: ref,
-        projectID: Project.ID.global,
-        slug: "routing",
-        version: "test",
-      })
-      yield* TestClock.adjust("59 minutes")
-      const event = yield* bus.publish(SessionEvent.Execution.Succeeded, { sessionID })
-      expect(event).not.toHaveProperty("location")
-      yield* TestClock.adjust("2 minutes")
-      expect(Array.from(yield* RcMap.keys(locations.rcMap))).toEqual([])
-    }),
-  )
-
  itWithActivity.effect("refreshes lifetime from Session events only", () =>
    Effect.gen(function* () {
      const locations = yield* LocationServiceMap.Service
@@ -797,10 +775,8 @@ describe("LocationServiceMap", () => {
              }),
            ),
          )
-          const failure = yield* Effect.gen(function* () {
-            const catalog = yield* Catalog.Service
-            const models = yield* SessionRunnerModel.Service
-            return yield* models.resolve(
+          const failure = yield* SessionRunnerModel.Service.use((models) =>
+            models.resolve(
              Session.Info.make({
                id: Session.ID.make("ses_unavailable_model"),
                projectID: Project.ID.global,
@@ -814,9 +790,8 @@ describe("LocationServiceMap", () => {
                time: { created: DateTime.makeUnsafe(0), updated: DateTime.makeUnsafe(0) },
                location,
              }),
-              catalog.model.available,
-            )
-          }).pipe(Effect.provide(LocationServiceMap.Service.get(location)), Effect.flip)
+            ),
+          ).pipe(Effect.provide(LocationServiceMap.Service.get(location)), Effect.flip)

          expect(failure).toMatchObject({
            _tag: "SessionRunnerModel.ModelUnavailableError",
@@ -840,10 +815,8 @@ describe("LocationServiceMap", () => {
            ["azure-cognitive-services", "azure"],
            ["google-vertex-anthropic", "google-vertex"],
          ] as const) {
-            const failure = yield* Effect.gen(function* () {
-              const catalog = yield* Catalog.Service
-              const models = yield* SessionRunnerModel.Service
-              return yield* models.resolve(
+            const failure = yield* SessionRunnerModel.Service.use((models) =>
+              models.resolve(
                Session.Info.make({
                  id: Session.ID.make(`ses_removed_${providerID}`),
                  projectID: Project.ID.global,
@@ -857,9 +830,8 @@ describe("LocationServiceMap", () => {
                  time: { created: DateTime.makeUnsafe(0), updated: DateTime.makeUnsafe(0) },
                  location,
                }),
-                catalog.model.available,
-              )
-            }).pipe(Effect.provide(LocationServiceMap.Service.get(location)), Effect.flip)
+              ),
+            ).pipe(Effect.provide(LocationServiceMap.Service.get(location)), Effect.flip)

            expect(failure).toMatchObject({
              _tag: "SessionRunnerModel.ModelUnavailableError",
@@ -911,7 +883,6 @@ describe("LocationServiceMap", () => {
                time: { created: DateTime.makeUnsafe(0), updated: DateTime.makeUnsafe(0) },
                location,
              }),
-              catalog.model.available,
            )
          }).pipe(Effect.provide(LocationServiceMap.Service.get(location)))

@@ -36,7 +36,6 @@ import { Session } from "@opencode-ai/core/session"
 import { McpTool } from "@opencode-ai/core/tool/mcp"
 import { Tool } from "@opencode-ai/core/tool"
 import { DateTime, Deferred, Effect, Exit, Fiber, Layer, PubSub, Ref, Schedule, Schema, Sink, Stream } from "effect"
-import { TestClock } from "effect/testing"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import { ExitCode, makeHandle, ProcessId } from "effect/unstable/process/ChildProcessSpawner"
 import { Image } from "@opencode-ai/core/image"
@@ -1033,58 +1032,6 @@ test("adds, disconnects, and reconnects MCP servers at runtime", async () => {
  )
 })

-testEffect(resourceMcpLayer(new ConfigMCP.Local({ type: "local", command: ["unused"], disabled: true }))).live(
-  "manages live MCP servers entirely through scoped transforms",
-  () =>
-    Effect.gen(function* () {
-      const service = yield* MCP.Service
-
-      yield* Effect.scoped(
-        Effect.gen(function* () {
-          yield* service.transform((draft) => {
-            draft.set("dynamic", {
-              type: "local",
-              command: [process.execPath, path.join(import.meta.dir, "fixture/mcp-output-schema.ts")],
-            })
-          })
-          expect((yield* service.servers()).find((server) => server.name === "dynamic")?.status.status).toBe(
-            "connected",
-          )
-          expect(yield* service.tools()).toHaveLength(2)
-
-          const settings = { disabled: true }
-          yield* service.transform((draft) => {
-            draft.update("dynamic", (server) => {
-              server.disabled = settings.disabled
-            })
-          })
-          expect((yield* service.servers()).find((server) => server.name === "dynamic")?.status.status).toBe("disabled")
-          expect(yield* service.tools()).toEqual([])
-
-          settings.disabled = false
-          yield* service.reload()
-          expect((yield* service.servers()).find((server) => server.name === "dynamic")?.status.status).toBe(
-            "connected",
-          )
-          expect(yield* service.tools()).toHaveLength(2)
-
-          const removed = yield* service.transform((draft) => draft.remove("dynamic"))
-          expect((yield* service.servers()).some((server) => server.name === "dynamic")).toBe(false)
-          expect(yield* service.tools()).toEqual([])
-
-          yield* removed.dispose
-          expect((yield* service.servers()).find((server) => server.name === "dynamic")?.status.status).toBe(
-            "connected",
-          )
-          expect(yield* service.tools()).toHaveLength(2)
-        }),
-      )
-
-      expect((yield* service.servers()).map((server) => server.name)).toEqual([MCP.ServerName.make("resources")])
-      expect(yield* service.tools()).toEqual([])
-    }),
-)
-
 test("restores runtime MCP config when a transform is disposed", async () => {
  await Effect.runPromise(
    Effect.scoped(
@@ -1282,13 +1229,12 @@ test("serializes concurrent MCP lifecycle operations", async () => {
  )
 })

-testEffect(Layer.empty).live("isolates invalid MCP tools and preserves plugin transforms through catalog updates", () =>
+testEffect(Layer.empty).live("isolates invalid MCP tools and reapplies plugin mutations on catalog updates", () =>
  Effect.gen(function* () {
-    const tool = (server: string, name: string, description = name) =>
+    const tool = (server: string, name: string) =>
      new MCP.Tool({
        server: MCP.ServerName.make(server),
        name,
-        description,
        codemode: false,
        inputSchema: { type: "object", properties: {} },
      })
@@ -1300,28 +1246,14 @@ testEffect(Layer.empty).live("isolates invalid MCP tools and preserves plugin tr
      const registry = yield* Tool.Service
      const registration = yield* McpTool.Service
      const bus = yield* Bus.Service
+      const policy = yield* registry.transform((draft) => {
+        draft.update("demo_search", (tool) => {
+          tool.description = "Updated search"
+        })
+        draft.remove("other_lookup")
+      })
      yield* registration.flush
-      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual([
-        "demo_search",
-        "other_lookup",
-        "execute",
-      ])
-      const override = yield* registry.transform((draft) => {
-        draft.add({
-          name: "search",
-          options: { namespace: "demo", codemode: false },
-          description: "Override search",
-          input: Schema.Struct({}),
-          output: Schema.String,
-          execute: () => Effect.succeed({ output: "override" }),
-        })
-      })
-      const mutation = yield* registry.transform((draft) => {
-        draft.update("other_lookup", (tool) => {
-          tool.description += " updated"
-        })
-        draft.remove("repaired_lookup")
-      })
+      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual(["demo_search", "execute"])

      yield* Ref.set(catalog, [tool("demo", "y".repeat(65)), ...healthy, tool("demo", "added"), namespace])
      yield* bus.publish(McpEvent.ToolsChanged, { server: "demo" })
@@ -1329,31 +1261,18 @@ testEffect(Layer.empty).live("isolates invalid MCP tools and preserves plugin tr
      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual([
        "demo_added",
        "demo_search",
-        "other_lookup",
        "execute",
      ])
      expect((yield* toolDefinitions(registry)).find((tool) => tool.name === "demo_search")?.description).toBe(
-        "Override search",
+        "Updated search",
      )
-      expect((yield* toolDefinitions(registry)).find((tool) => tool.name === "other_lookup")?.description).toBe(
-        "lookup updated",
-      )
-      yield* Effect.forEach(["demo_search", "other_lookup"], (name) =>
-        executeTool(registry, {
+      expect(
+        yield* executeTool(registry, {
          sessionID: Session.ID.make("ses_mcp_invalid_catalog"),
          ...toolIdentity,
-          call: { type: "tool-call", id: `call_${name}`, name, input: {} },
-        }).pipe(
-          Effect.tap((result) =>
-            Effect.sync(() =>
-              expect(result).toMatchObject({
-                status: "completed",
-                output: name === "demo_search" ? "override" : "healthy",
-              }),
-            ),
-          ),
-        ),
-      )
+          call: { type: "tool-call", id: "call_demo_search", name: "demo_search", input: {} },
+        }),
+      ).toMatchObject({ status: "completed" })

      yield* Ref.set(catalog, [
        tool("demo", "status"),
@@ -1365,46 +1284,18 @@ testEffect(Layer.empty).live("isolates invalid MCP tools and preserves plugin tr
      yield* waitForTool(registry, "demo_status")
      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual([
        "demo_added",
-        "demo_search",
+        "demo_status",
+        "repaired_lookup",
+        "execute",
+      ])
+      yield* policy.dispose
+      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual([
+        "demo_added",
        "demo_status",
        "other_lookup",
+        "repaired_lookup",
        "execute",
      ])
-      expect((yield* toolDefinitions(registry)).find((tool) => tool.name === "demo_search")?.description).toBe(
-        "Override search",
-      )
-      expect((yield* toolDefinitions(registry)).find((tool) => tool.name === "other_lookup")?.description).toBe(
-        "lookup updated",
-      )
-      yield* mutation.dispose
-      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toContain("repaired_lookup")
-      expect((yield* toolDefinitions(registry)).find((tool) => tool.name === "other_lookup")?.description).toBe(
-        "lookup",
-      )
-
-      yield* Ref.set(catalog, [tool("demo", "search", "Latest search"), tool("demo", "refreshed")])
-      yield* bus.publish(McpEvent.ToolsChanged, { server: "demo" })
-      yield* waitForTool(registry, "demo_refreshed")
-      expect((yield* toolDefinitions(registry)).find((tool) => tool.name === "demo_search")?.description).toBe(
-        "Override search",
-      )
-
-      yield* override.dispose
-      expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual([
-        "demo_refreshed",
-        "demo_search",
-        "execute",
-      ])
-      expect((yield* toolDefinitions(registry)).find((tool) => tool.name === "demo_search")?.description).toBe(
-        "Latest search",
-      )
-      expect(
-        yield* executeTool(registry, {
-          sessionID: Session.ID.make("ses_mcp_invalid_catalog"),
-          ...toolIdentity,
-          call: { type: "tool-call", id: "call_restored_search", name: "demo_search", input: {} },
-        }),
-      ).toMatchObject({ status: "completed", output: "healthy" })
    }).pipe(
      Effect.provide(
        Layer.fresh(
@@ -1433,47 +1324,7 @@ testEffect(Layer.empty).live("isolates invalid MCP tools and preserves plugin tr
  }),
 )

-testEffect(Layer.empty).effect("coalesces queued MCP tool notifications after initial registration", () => {
-  let reads = 0
-  return Effect.gen(function* () {
-    const registry = yield* Tool.Service
-    const registration = yield* McpTool.Service
-    const bus = yield* Bus.Service
-    yield* registration.flush
-    expect(reads).toBe(1)
-    expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual(["demo_read_1", "execute"])
-
-    yield* bus.publish(McpEvent.ToolsChanged, { server: "demo" })
-    yield* TestClock.adjust("250 millis")
-    yield* Effect.forEach(Array.from({ length: 20 }), () => bus.publish(McpEvent.ToolsChanged, { server: "demo" }))
-    yield* TestClock.adjust("2 seconds")
-    expect(reads).toBe(3)
-    expect((yield* toolDefinitions(registry)).map((tool) => tool.name)).toEqual(["demo_read_3", "execute"])
-  }).pipe(
-    Effect.provide(
-      AppNodeBuilder.build(LayerNode.group([Tool.node, McpTool.node, Bus.node]), [
-        [
-          MCP.node,
-          Layer.mock(MCP.Service, {
-            tools: () =>
-              Effect.sync(() => [
-                new MCP.Tool({
-                  server: MCP.ServerName.make("demo"),
-                  name: `read_${++reads}`,
-                  codemode: false,
-                  inputSchema: { type: "object", properties: {} },
-                }),
-              ]),
-          }),
-        ],
-        [Permission.node, Layer.mock(Permission.Service, { assert: () => Effect.void })],
-        [Image.node, imagePassthrough],
-      ]),
-    ),
-  )
-})
-
-it.effect("advertises MCP output schemas to Code Mode", () =>
+it.live("advertises MCP output schemas to Code Mode", () =>
  Effect.gen(function* () {
    const registry = yield* Tool.Service
    const toolSet = yield* waitForCodeModeTool(registry, "demo.search")
@@ -1490,7 +1341,7 @@ it.effect("advertises MCP output schemas to Code Mode", () =>
  }),
 )

-it.effect("returns content-only MCP results through Code Mode", () =>
+it.live("returns content-only MCP results through Code Mode", () =>
  Effect.gen(function* () {
    assertion = yield* Deferred.make<Permission.AssertInput>()
    decision = Effect.void
@@ -1515,7 +1366,7 @@ it.effect("returns content-only MCP results through Code Mode", () =>
  }),
 )

-it.effect("advertises MCP tools directly when Code Mode is disabled for the server", () =>
+it.live("advertises MCP tools directly when Code Mode is disabled for the server", () =>
  Effect.gen(function* () {
    const registry = yield* Tool.Service
    yield* waitForTool(registry, "direct_lookup")
@@ -1529,7 +1380,7 @@ it.effect("advertises MCP tools directly when Code Mode is disabled for the serv

 // Baseline (PLAN.md step 1): MCP isError must become one failed tool call, not a
 // success whose text happens to describe an error.
-it.effect("fails the call when MCP reports isError", () =>
+it.live("fails the call when MCP reports isError", () =>
  Effect.gen(function* () {
    assertion = yield* Deferred.make<Permission.AssertInput>()
    decision = Effect.void
@@ -1547,7 +1398,7 @@ it.effect("fails the call when MCP reports isError", () =>
 )

 // Baseline (PLAN.md step 1): mixed MCP text and media content must reach the model intact.
-it.effect("preserves MCP text and media content for the model", () =>
+it.live("preserves MCP text and media content for the model", () =>
  Effect.gen(function* () {
    assertion = yield* Deferred.make<Permission.AssertInput>()
    decision = Effect.void
@@ -1568,7 +1419,7 @@ it.effect("preserves MCP text and media content for the model", () =>
  }),
 )

-it.effect("waits for permission before calling an MCP tool", () =>
+it.live("waits for permission before calling an MCP tool", () =>
  Effect.gen(function* () {
    calls = 0
    assertion = yield* Deferred.make<Permission.AssertInput>()
@@ -1610,7 +1461,7 @@ it.effect("waits for permission before calling an MCP tool", () =>
  }),
 )

-it.effect("does not call MCP when permission is blocked", () =>
+it.live("does not call MCP when permission is blocked", () =>
  Effect.gen(function* () {
    calls = 0
    assertion = yield* Deferred.make<Permission.AssertInput>()
@@ -25,34 +25,6 @@ class Secret extends Context.Service<Secret, string>()("@opencode/test/PluginSec
 const versioned = <R>(plugin: EffectPlugin.Plugin<R>, version = "1") => ({ ...plugin, version })

 describe("Plugin", () => {
-  it.effect("exposes the current location to activated plugins", () =>
-    Effect.gen(function* () {
-      const plugins = yield* Plugin.Service
-      const location = yield* Location.Service
-      const seen: Location.Info[] = []
-      yield* plugins.activate([
-        versioned(
-          EffectPlugin.define({
-            id: "location-context",
-            effect: (ctx) =>
-              Effect.sync(() => {
-                seen.push(ctx.location)
-              }),
-          }),
-          "1",
-        ),
-      ])
-
-      expect(seen).toEqual([
-        new Location.Info({
-          directory: location.directory,
-          workspaceID: location.workspaceID,
-          project: location.project,
-        }),
-      ])
-    }),
-  )
-
  it.live("exposes public events through the plugin context", () =>
    Effect.gen(function* () {
      const plugins = yield* Plugin.Service
@@ -71,7 +43,7 @@ describe("Plugin", () => {
    }),
  )

-  it.effect("exposes MCP reads and transforms and routes explicit read locations", () =>
+  it.effect("routes explicit MCP locations through the plugin runtime", () =>
    Effect.gen(function* () {
      const plugins = yield* Plugin.Service
      const runtime = yield* PluginRuntime.Service
@@ -100,6 +72,10 @@ describe("Plugin", () => {
                      data: [],
                    }
                  }),
+                add: (ref) => Effect.sync(() => routed.push(`add:${ref.directory}`)),
+                remove: (ref) => Effect.sync(() => routed.push(`remove:${ref.directory}`)),
+                connect: (ref) => Effect.sync(() => routed.push(`connect:${ref.directory}`)),
+                disconnect: (ref) => Effect.sync(() => routed.push(`disconnect:${ref.directory}`)),
              },
            },
          }),
@@ -107,9 +83,14 @@ describe("Plugin", () => {
      )
      const location = { directory: target }

-      expect(Object.keys(host.mcp).sort()).toEqual(["list", "reload", "transform"])
+      yield* host.mcp
+        .add({ location, server: "routed", config: { type: "local", command: ["unused"], disabled: true } })
+        .pipe(Effect.orDie)
+      yield* host.mcp.remove({ location, server: "routed" }).pipe(Effect.orDie)
+      yield* host.mcp.connect({ location, server: "routed" }).pipe(Effect.orDie)
+      yield* host.mcp.disconnect({ location, server: "routed" }).pipe(Effect.orDie)
      expect((yield* host.mcp.list({ location }).pipe(Effect.orDie)).location.directory).toBe(target)
-      expect(routed).toEqual(["list:/target"])
+      expect(routed).toEqual(["add:/target", "remove:/target", "connect:/target", "disconnect:/target", "list:/target"])
    }),
  )

@@ -580,7 +561,7 @@ describe("Plugin", () => {
      const registry = yield* Tool.Service
      const executed: unknown[] = []
      const seen: {
-        before?: { input: unknown; tool: string }
+        before?: { input: unknown; inputSchema: unknown }
        after?: { input: unknown; status: string; content: unknown; metadata: unknown }
      } = {}

@@ -605,9 +586,7 @@ describe("Plugin", () => {
            yield* ctx.tool
              .hook("execute.before", (event) =>
                Effect.sync(() => {
-                  expect(event).not.toHaveProperty("inputSchema")
-                  seen.before = { input: event.input, tool: event.tool }
-                  event.tool = "echo"
+                  seen.before = { input: event.input, inputSchema: event.inputSchema }
                  event.input = { text: "before-mutated" }
                }),
              )
@@ -650,12 +629,17 @@ describe("Plugin", () => {
        sessionID: Session.ID.make("ses_hooks"),
        agent: Agent.ID.make("build"),
        messageID: SessionMessage.ID.make("msg_hooks"),
-        call: { type: "tool-call", id: "call-hooks", name: "misspelled", input: { text: "original" } },
+        call: { type: "tool-call", id: "call-hooks", name: "echo", input: { text: "original" } },
      })

      expect(seen.before).toEqual({
        input: { text: "original" },
-        tool: "misspelled",
+        inputSchema: {
+          type: "object",
+          properties: { text: { type: "string" } },
+          required: ["text"],
+          additionalProperties: false,
+        },
      })
      expect(executed).toEqual([{ text: "before-mutated" }])
      expect(seen.after).toEqual({
@@ -709,7 +693,7 @@ describe("Plugin", () => {
          sessionID: Session.ID.make("ses_hook_reject"),
          agent: Agent.ID.make("build"),
          messageID: SessionMessage.ID.make("msg_hook_reject"),
-          call: { type: "tool-call", id: "call-hook-reject", name: "missing", input: { text: "original" } },
+          call: { type: "tool-call", id: "call-hook-reject", name: "echo", input: { text: "original" } },
        })
        .pipe(Effect.flip)

@@ -18,16 +18,6 @@ type Overrides = Partial<Omit<Plugin.Context, "options" | "session">> & {
 export function host(overrides: Overrides = {}): Plugin.Context {
  return {
    app: overrides.app ?? { name: "test", version: "test", channel: "test" },
-    location:
-      overrides.location ??
-      new Location.Info({
-        directory: AbsolutePath.make("/workspace"),
-        project: {
-          id: Project.ID.global,
-          directory: AbsolutePath.make("/workspace"),
-          canonical: AbsolutePath.make("/workspace"),
-        },
-      }),
    options: {},
    agent: overrides.agent ?? {
      get: () => Effect.die("unused agent.get"),
@@ -87,6 +77,10 @@ export function host(overrides: Overrides = {}): Plugin.Context {
    },
    mcp: overrides.mcp ?? {
      list: () => Effect.die("unused mcp.list"),
+      add: () => Effect.die("unused mcp.add"),
+      remove: () => Effect.die("unused mcp.remove"),
+      connect: () => Effect.die("unused mcp.connect"),
+      disconnect: () => Effect.die("unused mcp.disconnect"),
      transform: () => Effect.die("unused mcp.transform"),
      reload: () => Effect.die("unused mcp.reload"),
    },
@@ -17,7 +17,6 @@ import { SessionInbox } from "@opencode-ai/core/session/inbox"
 import { Tool } from "@opencode-ai/core/tool"
 import { Provider } from "@opencode-ai/core/provider"
 import { Project } from "@opencode-ai/core/project"
-import { Workspace } from "@opencode-ai/core/workspace"
 import { AbsolutePath } from "@opencode-ai/core/schema"
 import { define } from "@opencode-ai/plugin/promise/plugin"
 import { Money } from "@opencode-ai/schema/money"
@@ -29,41 +28,6 @@ import { host as testHost } from "./host"
 const it = testEffect(PluginTestLayer)

 describe("fromPromise", () => {
-  it.effect("exposes the host location including workspace and project metadata", () =>
-    Effect.gen(function* () {
-      const plugins = yield* Plugin.Service
-      const location = yield* Location.Service
-      const expected = new Location.Info({
-        directory: AbsolutePath.make("/worktree/packages/app"),
-        workspaceID: Workspace.ID.make("wrk_plugin_location"),
-        project: {
-          id: Project.ID.global,
-          directory: AbsolutePath.make("/worktree"),
-          canonical: AbsolutePath.make("/project"),
-        },
-      })
-      const host = yield* PluginHost.make(plugins).pipe(
-        Effect.provideService(Location.Service, {
-          ...location,
-          directory: expected.directory,
-          workspaceID: expected.workspaceID,
-          project: expected.project,
-        }),
-      )
-      const seen: Location.Info[] = []
-      yield* PluginPromise.fromPromise(
-        define({
-          id: "promise-location",
-          setup: (ctx) => {
-            seen.push(ctx.location)
-          },
-        }),
-      ).effect(host)
-
-      expect(seen).toEqual([expected])
-    }),
-  )
-
  it.effect("adapts plugin storage methods", () =>
    Effect.gen(function* () {
      const plugins = yield* Plugin.Service
@@ -278,14 +242,12 @@ describe("fromPromise", () => {
      const promisePlugin = define({
        id: "promise-client-reads",
        setup: async (ctx) => {
-          expect(Object.keys(ctx.mcp).sort()).toEqual(["list", "reload", "transform"])
          const results = await Promise.all([
            ctx.agent.list(),
            ctx.catalog.provider.list(),
            ctx.catalog.model.list(),
            ctx.command.list(),
            ctx.integration.list(),
-            ctx.mcp.list(),
            ctx.plugin.list(),
            ctx.reference.list(),
            ctx.skill.list(),
@@ -297,7 +259,7 @@ describe("fromPromise", () => {

      yield* PluginPromise.fromPromise(promisePlugin).effect(host)

-      expect(seen).toHaveLength(9)
+      expect(seen).toHaveLength(8)
      expect(new Set(seen).size).toBe(1)
    }),
  )
@@ -611,11 +573,6 @@ describe("fromPromise", () => {
              },
            })
          })
-          await ctx.tool.hook("execute.before", (event) => {
-            expect(event.tool).toBe("helllo")
-            expect(event).not.toHaveProperty("inputSchema")
-            event.tool = "hello"
-          })
        },
      })

@@ -629,7 +586,7 @@ describe("fromPromise", () => {
          agent: Agent.ID.make("build"),
          messageID: SessionMessage.ID.make("msg_promise_tool"),
          progress: (update) => Effect.sync(() => progress.push(update)),
-          call: { type: "tool-call", id: "call_promise_tool", name: "helllo", input: { name: "world" } },
+          call: { type: "tool-call", id: "call_promise_tool", name: "hello", input: { name: "world" } },
        }),
      ).toMatchObject({
        output: "Hello, world!",
@@ -639,150 +596,6 @@ describe("fromPromise", () => {
    }),
  )

-  it.live("reloads and disposes Promise tools while preserving older snapshots", () =>
-    Effect.gen(function* () {
-      const plugins = yield* Plugin.Service
-      const registry = yield* Tool.Service
-      const host = yield* PluginHost.make(plugins)
-      const source = { description: "Original", replays: 0 }
-      const registrations: Array<{ reload: () => Promise<void>; dispose: () => Promise<void> }> = []
-      yield* PluginPromise.fromPromise(
-        define({
-          id: "promise-tool-lifecycle",
-          setup: async (ctx) => {
-            expect(Object.keys(ctx.tool).sort()).toEqual(["hook", "reload", "transform"])
-            const registration = await ctx.tool.transform((draft) => {
-              source.replays++
-              const description = source.description
-              draft.add({
-                name: "reloadable",
-                description,
-                input: Schema.Struct({}),
-                output: Schema.String,
-                options: { codemode: false },
-                execute: async () => ({ output: description }),
-              })
-              expect(draft.list().map((tool) => tool.id)).toEqual(["reloadable"])
-              expect(draft.get("reloadable")?.id).toBe("reloadable")
-              expect(draft.get("reloadable")?.name).toBe("reloadable")
-              expect(draft.get("missing")).toBeUndefined()
-            })
-            registrations.push({ reload: ctx.tool.reload, dispose: registration.dispose })
-          },
-        }),
-      ).effect(host)
-      const registration = registrations[0]
-      if (!registration) return yield* Effect.die("Promise tool registration was not captured")
-      const original = yield* registry.snapshot()
-      const execute = (snapshot: Tool.Snapshot) =>
-        snapshot.execute({
-          sessionID: Session.ID.make("ses_promise_tool_reload"),
-          agent: Agent.ID.make("build"),
-          messageID: SessionMessage.ID.make("msg_promise_tool_reload"),
-          call: { type: "tool-call", id: "call_promise_tool_reload", name: "reloadable", input: {} },
-        })
-
-      source.description = "Reloaded"
-      yield* Effect.promise(() => registration.reload())
-      const reloaded = yield* registry.snapshot()
-      expect(source.replays).toBe(2)
-      expect(reloaded.definitions).toContainEqual(
-        expect.objectContaining({ name: "reloadable", description: "Reloaded" }),
-      )
-      expect(yield* execute(reloaded)).toMatchObject({ output: "Reloaded" })
-      expect(yield* execute(original)).toMatchObject({ output: "Original" })
-
-      yield* Effect.promise(() => registration.dispose())
-      yield* Effect.promise(() => registration.dispose())
-      expect((yield* registry.snapshot()).definitions.some((tool) => tool.name === "reloadable")).toBe(false)
-      expect(yield* execute(original)).toMatchObject({ output: "Original" })
-      expect(yield* execute(reloaded)).toMatchObject({ output: "Reloaded" })
-      yield* Effect.promise(() => registration.reload())
-      expect(source.replays).toBe(2)
-      expect((yield* registry.snapshot()).definitions.some((tool) => tool.name === "reloadable")).toBe(false)
-    }),
-  )
-
-  it.live("adapts tool updates, executor wrapping, and removal across replay and disposal", () =>
-    Effect.gen(function* () {
-      const plugins = yield* Plugin.Service
-      const registry = yield* Tool.Service
-      const host = yield* PluginHost.make(plugins)
-      const progress: Tool.Metadata[] = []
-      let greeting = "Hello"
-      const registrations: Array<{ dispose: () => Promise<void> }> = []
-      yield* host.tool.transform((draft) => {
-        const text = greeting
-        draft.add({
-          name: "hello",
-          description: "Hello",
-          options: { namespace: "acme", codemode: false },
-          input: Schema.Struct({ name: Schema.String }),
-          output: Schema.String,
-          execute: ({ name }, context) =>
-            context.progress({ phase: "original" }).pipe(Effect.as({ output: `${text}, ${name}!` })),
-        })
-        draft.add({
-          name: "temporary",
-          description: "Temporary",
-          input: Schema.Struct({}),
-          options: { codemode: false },
-          execute: () => Effect.succeed({ content: "temporary" }),
-        })
-      })
-      yield* PluginPromise.fromPromise(
-        define({
-          id: "promise-tool-mutations",
-          setup: async (ctx) => {
-            registrations.push(
-              await ctx.tool.transform((draft) => {
-                draft.update("missing", () => {
-                  throw new Error("must not create a tool")
-                })
-                draft.update("acme_hello", (tool) => {
-                  const execute = tool.execute
-                  tool.description = "Wrapped"
-                  delete tool.output
-                  tool.execute = async (input, context) => {
-                    const result = await execute(input, context)
-                    return { content: `${result.output} Wrapped.` }
-                  }
-                })
-                draft.remove("temporary")
-              }),
-            )
-            greeting = "Hi"
-            await ctx.tool.reload()
-          },
-        }),
-      ).effect(host)
-      const snapshot = yield* registry.snapshot()
-      expect(snapshot.definitions.map((tool) => tool.name)).toEqual(["acme_hello", "execute"])
-      expect(snapshot.definitions[0]?.description).toBe("Wrapped")
-      expect(snapshot.definitions[0]?.outputSchema).toBeUndefined()
-      expect(
-        yield* snapshot.execute({
-          sessionID: Session.ID.make("ses_promise_tool_update"),
-          agent: Agent.ID.make("build"),
-          messageID: SessionMessage.ID.make("msg_promise_tool_update"),
-          call: { type: "tool-call", id: "call_update", name: "acme_hello", input: { name: "world" } },
-          progress: (update) =>
-            Effect.sync(() => {
-              progress.push(update)
-            }),
-        }),
-      ).toMatchObject({ content: [{ type: "text", text: "Hi, world! Wrapped." }] })
-      expect(progress).toEqual([{ phase: "original" }])
-      const registration = registrations[0]
-      if (!registration) return yield* Effect.die("Promise tool registration was not captured")
-      yield* Effect.promise(() => registration.dispose())
-      yield* Effect.promise(() => registration.dispose())
-      const restored = yield* registry.snapshot()
-      expect(restored.definitions.map((tool) => tool.name)).toEqual(["acme_hello", "temporary", "execute"])
-      expect(restored.definitions[0]?.description).toBe("Hello")
-    }),
-  )
-
  it.effect("returns content-only plugin results through Code Mode", () =>
    Effect.gen(function* () {
      const plugins = yield* Plugin.Service
@@ -823,4 +636,77 @@ describe("fromPromise", () => {
      })
    }),
  )
+
+  it.live("adapts tool mutation, replay, and disposal through the Promise API", () =>
+    Effect.gen(function* () {
+      const plugins = yield* Plugin.Service
+      const registry = yield* Tool.Service
+      const host = yield* PluginHost.make(plugins)
+      const progress: Tool.Metadata[] = []
+      let greeting = "Hello"
+      let registration: { dispose(): Promise<void> } | undefined
+      yield* host.tool.transform((draft) => {
+        const text = greeting
+        draft.add({
+          name: "hello",
+          description: "Hello",
+          options: { namespace: "acme", codemode: false },
+          input: Schema.Struct({ name: Schema.String }),
+          output: Schema.String,
+          execute: ({ name }, context) =>
+            context.progress({ phase: "original" }).pipe(Effect.as({ output: `${text}, ${name}!` })),
+        })
+        draft.add({
+          name: "temporary",
+          description: "Temporary",
+          input: Schema.Struct({}),
+          options: { codemode: false },
+          execute: () => Effect.succeed({ content: "temporary" }),
+        })
+      })
+      yield* PluginPromise.fromPromise(
+        define({
+          id: "promise-update",
+          setup: async (ctx) => {
+            registration = await ctx.tool.transform((draft) => {
+              draft.update("missing", () => {
+                throw new Error("must not create a tool")
+              })
+              draft.update("acme_hello", (tool) => {
+                const execute = tool.execute
+                tool.description = "Wrapped"
+                tool.execute = async (input, context) => {
+                  const result = await execute(input, context)
+                  return { ...result, output: `${result.output} Wrapped.` }
+                }
+              })
+              draft.remove("temporary")
+            })
+            greeting = "Hi"
+            await ctx.tool.reload()
+          },
+        }),
+      ).effect(host)
+      const snapshot = yield* registry.snapshot()
+      expect(snapshot.definitions.map((tool) => tool.name)).toEqual(["acme_hello", "execute"])
+      expect(snapshot.definitions[0]?.description).toBe("Wrapped")
+      expect(
+        yield* snapshot.execute({
+          sessionID: Session.ID.make("ses_promise_update"),
+          agent: Agent.ID.make("build"),
+          messageID: SessionMessage.ID.make("msg_promise_update"),
+          progress: (value) => Effect.sync(() => progress.push(value)),
+          call: { type: "tool-call", id: "call_promise_update", name: "acme_hello", input: { name: "world" } },
+        }),
+      ).toMatchObject({ output: "Hi, world! Wrapped." })
+      expect(progress).toEqual([{ phase: "original" }])
+      const registered = registration
+      if (!registered) throw new Error("Expected registration")
+      yield* Effect.promise(() => registered.dispose())
+      yield* Effect.promise(() => registered.dispose())
+      const restored = yield* registry.snapshot()
+      expect(restored.definitions.map((tool) => tool.name)).toEqual(["acme_hello", "temporary", "execute"])
+      expect(restored.definitions[0]?.description).toBe("Hello")
+    }),
+  )
 })
@@ -10,7 +10,6 @@ import { EventTable } from "@opencode-ai/core/event/sql"
 import { SessionCompaction } from "@opencode-ai/core/session/compaction"
 import { SessionEvent } from "@opencode-ai/core/session/event"
 import { SessionMessage } from "@opencode-ai/core/session/message"
-import { SessionModelRequest } from "@opencode-ai/core/session/model-request"
 import { SessionProjector } from "@opencode-ai/core/session/projector"
 import { SessionRunnerModel } from "@opencode-ai/core/session/runner/model"
 import { SessionTable } from "@opencode-ai/core/session/sql"
@@ -74,6 +73,9 @@ const resolved = SessionRunnerModel.resolved(model, {
  cost,
  limit: { context: 200_000, output: 32_000 },
 })
+const models = Layer.mock(SessionRunnerModel.Service)({
+  resolve: () => Effect.succeed(resolved),
+})
 const it = testEffect(
  AppNodeBuilder.build(
    LayerNode.group([
@@ -83,11 +85,11 @@ const it = testEffect(
      SessionStore.node,
      PluginHooks.node,
      SessionCompaction.node,
-      SessionModelRequest.node,
    ]),
    [
      [Bus.node, Bus.configured({ persist: true })],
      [llmClient, client],
+      [SessionRunnerModel.node, models],
    ],
  ),
 )
@@ -240,7 +242,6 @@ it.effect("manual compaction summarizes short context instead of no-op", () =>
      time: { created: DateTime.makeUnsafe(0) },
    }
    const session = yield* insertSession(sessionID, { parent_id: parentID })
-    const modelRequests = yield* SessionModelRequest.Service

    const delta = yield* bus
      .subscribe(SessionEvent.Compaction.Delta)
@@ -249,8 +250,6 @@ it.effect("manual compaction summarizes short context instead of no-op", () =>
    expect(
      yield* compaction.compactManual({
        session,
-        resolveModel: () => Effect.succeed(resolved),
-        prepare: modelRequests.prepare,
        messages: [userMessage],
        inputID: SessionMessage.ID.make("msg_manual_compaction"),
      }),
@@ -304,12 +303,9 @@ it.effect("forked session compaction reuses the fork root prompt cache key", ()
      fork_session_id: rootID,
      fork_boundary: { type: "before", messageID: SessionMessage.ID.create() },
    })
-    const modelRequests = yield* SessionModelRequest.Service
    expect(
      yield* compaction.compactManual({
        session,
-        resolveModel: () => Effect.succeed(resolved),
-        prepare: modelRequests.prepare,
        messages: [
          {
            id: SessionMessage.ID.create(),
@@ -340,12 +336,9 @@ it.effect("keeps session context hooks away from compaction requests", () =>
      }),
    )
    const session = yield* insertSession(Session.ID.make("ses_hook_compaction"))
-    const modelRequests = yield* SessionModelRequest.Service
    expect(
      yield* compaction.compactManual({
        session,
-        resolveModel: () => Effect.succeed(resolved),
-        prepare: modelRequests.prepare,
        messages: [
          {
            id: SessionMessage.ID.create(),
@@ -1,117 +0,0 @@
-import { $ } from "bun"
-import { describe, expect } from "bun:test"
-import fs from "fs/promises"
-import path from "path"
-import { Effect } from "effect"
-import { Agent } from "@opencode-ai/core/agent"
-import { Bus } from "@opencode-ai/core/bus"
-import { Database } from "@opencode-ai/core/database/database"
-import { AppNodeBuilder } from "@opencode-ai/core/effect/app-node-builder"
-import { LocationServiceMap } from "@opencode-ai/core/location-service-map"
-import { Model } from "@opencode-ai/core/model"
-import { PluginSupervisor } from "@opencode-ai/core/plugin/supervisor"
-import { Provider } from "@opencode-ai/core/provider"
-import { AbsolutePath } from "@opencode-ai/core/schema"
-import { Session } from "@opencode-ai/core/session"
-import { SessionEvent } from "@opencode-ai/core/session/event"
-import { SessionExecution } from "@opencode-ai/core/session/execution"
-import { SessionInbox } from "@opencode-ai/core/session/inbox"
-import { SessionMessage } from "@opencode-ai/core/session/message"
-import { SessionProjector } from "@opencode-ai/core/session/projector"
-import { Snapshot } from "@opencode-ai/core/snapshot"
-import { Money } from "@opencode-ai/schema/money"
-import { LayerNode } from "@opencode-ai/util/effect/layer-node"
-import { Global } from "@opencode-ai/util/global"
-import { tempGlobalLayer } from "./fixture/global"
-import { tmpdir } from "./fixture/tmpdir"
-import { testEffect } from "./lib/effect"
-
-const it = testEffect(
-  AppNodeBuilder.build(
-    LayerNode.group([Database.node, Bus.node, SessionProjector.node, Session.node, LocationServiceMap.node]),
-    [
-      [Bus.node, Bus.configured({ persist: true })],
-      [Global.node, tempGlobalLayer],
-      [SessionExecution.node, SessionExecution.noopLayer],
-    ],
-  ),
-)
-
-describe("Session.revert files", () => {
-  it.live("undoes and restores a file rename without losing either path", () =>
-    Effect.gen(function* () {
-      const tmp = yield* Effect.acquireRelease(
-        Effect.promise(() => tmpdir()),
-        (tmp) => Effect.promise(() => tmp[Symbol.asyncDispose]()),
-      )
-      const directory = path.join(tmp.path, "project")
-      const original = path.join(directory, "old name.txt")
-      const renamed = path.join(directory, "new name.txt")
-      yield* Effect.promise(async () => {
-        await fs.mkdir(directory)
-        await Bun.write(original, "Preserve this content.\n")
-        await Bun.write(path.join(directory, "unrelated.txt"), "Unrelated content.\n")
-        await $`git init -q`.cwd(directory).quiet()
-        await $`git -c core.fsmonitor=false add .`.cwd(directory).quiet()
-      })
-
-      const session = yield* Session.Service
-      const database = yield* Database.Service
-      const bus = yield* Bus.Service
-      const created = yield* session.create({ location: { directory: AbsolutePath.make(directory) } })
-      const prompt = yield* session.prompt({ sessionID: created.id, text: "Rename the file", resume: false })
-      yield* SessionInbox.promote(database.db, bus, created.id, "steer")
-
-      yield* Effect.gen(function* () {
-        const plugins = yield* PluginSupervisor.Service
-        yield* plugins.flush
-        const snapshot = yield* Snapshot.Service
-        const before = yield* snapshot.capture()
-        if (!before) throw new Error("Initial snapshot missing")
-        const assistantMessageID = SessionMessage.ID.create()
-        yield* bus.publish(SessionEvent.Step.Started, {
-          sessionID: created.id,
-          assistantMessageID,
-          agent: Agent.defaultID,
-          model: { id: Model.ID.make("test-model"), providerID: Provider.ID.make("test-provider") },
-          snapshot: before,
-        })
-        yield* Effect.promise(() => fs.rename(original, renamed))
-        const after = yield* snapshot.capture()
-        if (!after) throw new Error("Renamed snapshot missing")
-        yield* bus.publish(SessionEvent.Step.Ended, {
-          sessionID: created.id,
-          assistantMessageID,
-          finish: "stop",
-          cost: Money.USD.zero,
-          tokens: { input: 0, output: 0, reasoning: 0, cache: { read: 0, write: 0 } },
-          snapshot: after,
-          files: yield* snapshot.files({ from: before, to: after }),
-        })
-
-        yield* Effect.promise(() => Bun.write(path.join(directory, "unrelated.txt"), "Keep this later edit.\n"))
-        const reverted = yield* session.revert.stage({ sessionID: created.id, messageID: prompt.id })
-        expect({
-          original: yield* Effect.promise(() => Bun.file(original).exists()),
-          renamed: yield* Effect.promise(() => Bun.file(renamed).exists()),
-        }).toEqual({ original: true, renamed: false })
-        expect(yield* Effect.promise(() => Bun.file(original).text())).toBe("Preserve this content.\n")
-        expect(reverted.files?.map((file) => [file.file, file.status])).toEqual([
-          ["new name.txt", "deleted"],
-          ["old name.txt", "added"],
-        ])
-        expect(yield* Effect.promise(() => Bun.file(path.join(directory, "unrelated.txt")).text())).toBe(
-          "Keep this later edit.\n",
-        )
-
-        yield* session.revert.clear(created.id)
-        expect(yield* Effect.promise(() => Bun.file(original).exists())).toBe(false)
-        expect(yield* Effect.promise(() => Bun.file(renamed).text())).toBe("Preserve this content.\n")
-        expect(yield* Effect.promise(() => Bun.file(path.join(directory, "unrelated.txt")).text())).toBe(
-          "Keep this later edit.\n",
-        )
-        expect((yield* session.get(created.id)).revert).toBeUndefined()
-      }).pipe(Effect.provide(LocationServiceMap.Service.get(created.location)))
-    }),
-  )
-})
@@ -984,7 +984,7 @@ Recent work
    )

    expect(messages[0]?.content).toEqual([
-      { type: "reasoning", text: "Visible thought" },
+      { type: "text", text: "Visible thought" },
      {
        type: "tool-call",
        id: "hosted-old-model",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aiden Cline	54fea4b111	refactor(core): use shared tool transform lifecycle	2026-08-26 17:42:54 -05:00
Aiden Cline	4a5fa79461	feat(plugin): add tool draft reads and updates	2026-08-26 17:05:23 -05:00