fix(test): release Windows search handles

Merge branch 'dev' into fix/http-recorder-release
fix(storybook): mock keybind formatter
2026-08-03 16:56:33 -04:00 · 2026-06-06 21:03:39 -04:00 · 2026-06-06 20:10:04 -04:00 · 2026-06-06 18:50:27 -04:00 · 2026-06-06 18:38:15 -04:00 · 2026-06-06 18:32:26 -04:00
1258 changed files with 74472 additions and 45538 deletions
@@ -1,3 +1,5 @@
 # web + desktop packages
-packages/app/      @Hona @Brendonovich
-packages/desktop/  @Hona @Brendonovich
+packages/app/      @adamdotdevin
+packages/tauri/    @adamdotdevin
+packages/desktop/src-tauri/  @brendonovich
+packages/desktop/  @adamdotdevin
@@ -65,7 +65,7 @@ jobs:

      - name: Run unit tests
        timeout-minutes: 20
-        run: bun turbo test --output-logs=errors-only --log-order=grouped --log-prefix=task
+        run: bun turbo test:ci --log-order=stream --log-prefix=task
        env:
          OPENCODE_EXPERIMENTAL_DISABLE_FILEWATCHER: ${{ runner.os == 'Windows' && 'true' || 'false' }}

@@ -74,6 +74,26 @@ jobs:
        working-directory: packages/opencode
        run: bun run test:httpapi

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

      - name: Upload Playwright artifacts
@@ -141,5 +162,6 @@ jobs:
          if-no-files-found: ignore
          retention-days: 7
          path: |
+            packages/app/e2e/junit-*.xml
            packages/app/e2e/test-results
            packages/app/e2e/playwright-report
@@ -1,7 +1,7 @@
 ---
 mode: primary
 hidden: true
-model: opencode/gpt-5.4-mini
+model: opencode/gpt-5.4-nano
 color: "#44BA81"
 tools:
  "*": false
@@ -2,15 +2,8 @@
  "$schema": "https://opencode.ai/config.json",
  "provider": {},
  "permission": {},
-  "references": {
-    "effect": {
-      "repository": "github.com/Effect-TS/effect-smol",
-      "description": "Use for Effect v4 and effect-smol implementation details",
-    },
-    "opencode-local": {
-      "path": "~/.local/share/opencode",
-      "description": "Contains opencode logs and data",
-    },
+  "reference": {
+    "effect": "github.com/Effect-TS/effect-smol",
  },
  "mcp": {},
  "tools": {
@@ -2,12 +2,6 @@
 - The default branch in this repo is `dev`.
 - Local `main` ref may not exist; use `dev` or `origin/dev` for diffs.

-## Branch Names
-
-Use a short branch name of at most three words, separated by hyphens. Do not use slashes or type prefixes such as `feat/` or `fix/`.
-
-Examples: `session-recovery`, `fix-scroll-state`, `regenerate-sdk`.
-
 ## Commits and PR Titles

 Use conventional commit-style messages and PR titles: `type(scope): summary`.
@@ -52,9 +52,6 @@ _Avoid_: Request body, wire options
 **Generation Controls**:
 Provider-neutral sampling and output controls, partitioned from provider semantics and compatibility wire fields when model metadata enters the Catalog.

-**PTY Environment**:
-The host-supplied environment overlay applied by the server when creating a PTY, observed for the request Location and resolved PTY working directory.
-
 ## Relationships

 - A **System Context** is an opaque carrier composed from zero or more **Context Sources**.
@@ -102,8 +99,6 @@ The host-supplied environment overlay applied by the server when creating a PTY,
 - A model/provider switch always starts a new **Context Epoch** while preserving chronological conversation history.
 - **Model Request Options** remain provider-semantic through Catalog resolution. The Session runner maps them into the LLM package's provider-option namespace; the selected protocol adapter alone owns provider wire encoding.
 - **Generation Controls**, protocol-semantic **Model Request Options**, and compatibility request body fields are separate Catalog domains. A shared ingestion adapter partitions legacy and models.dev AI-SDK-shaped options before routing.
- The **PTY Environment** is a server concern rather than a Core PTY concern. PTY creation merges caller values, then the host overlay, then Core-forced terminal invariants such as `TERM` and `OPENCODE_TERMINAL`.
- A **PTY Environment** adapter observes plugins in the request Location while passing the resolved PTY working directory to the hook; standalone servers use an empty adapter.
 - A **Mid-Conversation System Message** lowers to the provider's native chronological instruction role when supported and to a wrapped chronological fallback otherwise.
 - When the effective aggregate instruction set changes, its **Mid-Conversation System Message** includes the complete current ordered set and supersedes the prior aggregate value; when no ambient instructions remain, the message states that previously loaded instructions no longer apply.
 - Ambient project instruction discovery honors `OPENCODE_DISABLE_PROJECT_CONFIG`; global instructions remain eligible.
@@ -2,7 +2,7 @@
 exact = true
 # Only install newly resolved package versions published at least 3 days ago.
 minimumReleaseAge = 259200
-minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@ai-sdk/anthropic", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "opentui-spinner", "gitlab-ai-provider", "opencode-gitlab-auth", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64", "@pierre/diffs", "@pierre/theming", "app-builder-lib", "dmg-builder", "electron-builder", "electron-publish"]
+minimumReleaseAgeExcludes = ["@ai-sdk/amazon-bedrock", "@opentui/core", "@opentui/core-darwin-arm64", "@opentui/core-darwin-x64", "@opentui/core-linux-arm64", "@opentui/core-linux-arm64-musl", "@opentui/core-linux-x64", "@opentui/core-linux-x64-musl", "@opentui/core-win32-arm64", "@opentui/core-win32-x64", "@opentui/keymap", "@opentui/solid", "gitlab-ai-provider", "@ff-labs/fff-node", "@ff-labs/fff-bun", "@ff-labs/fff-bin-darwin-arm64", "@ff-labs/fff-bin-darwin-x64", "@ff-labs/fff-bin-linux-arm64-gnu", "@ff-labs/fff-bin-linux-arm64-musl", "@ff-labs/fff-bin-linux-x64-gnu", "@ff-labs/fff-bin-linux-x64-musl", "@ff-labs/fff-bin-win32-arm64", "@ff-labs/fff-bin-win32-x64"]

 [test]
 root = "./do-not-run-tests-from-root"
@@ -165,7 +165,7 @@ export const app = new sst.cloudflare.x.SolidStart("Stats", {
  domain: `stats.${domain}`,
  link: [database, EMAILOCTOPUS_API_KEY],
  environment: {
-    PUBLIC_URL: `https://${domain}/data`,
+    PUBLIC_URL: `https://${domain}/stats`,
  },
 })

@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-LOxTad/iCquvJyonFOcz6/rDTPNDmwyBnykhWZJ5GC4=",
-    "aarch64-linux": "sha256-iO+0vYhp+2x6ACmh5lQJ/2Ac4uZTqRZE/KhG3u0o6D8=",
-    "aarch64-darwin": "sha256-tpBydRbrJ+4QxmkGUt/BhME8q6ysCW/CXrsNshYgqDU=",
-    "x86_64-darwin": "sha256-QQcI6SK7WJ7dSkX6xZuSQPoUdwfoCaimVgoHCnrO0wY="
+    "x86_64-linux": "sha256-5DhbOm/gs2mfjmNYdZHkr0ZopgSC2HcGN9/r1noGqhc=",
+    "aarch64-linux": "sha256-0dIKcqKmhrPhRpabnfM20wnqt/AkoCWDMgG9cQZ8P3o=",
+    "aarch64-darwin": "sha256-Sx3G63vORj69u2AOMDfpk6NU7fMgxsbYBh3jnGohNXI=",
+    "x86_64-darwin": "sha256-4g2ydNayqNqWlBeQt90rUI6bY5dMvXP4OmQ6QWaJbuI="
  }
 }
@@ -39,11 +39,9 @@
      "@octokit/rest": "22.0.0",
      "@hono/standard-validator": "0.2.0",
      "@hono/zod-validator": "0.4.2",
-      "@opentui/core": "0.3.4",
-      "@opentui/keymap": "0.3.4",
-      "@opentui/solid": "0.3.4",
-      "@tanstack/solid-virtual": "3.13.28",
-      "@shikijs/stream": "4.2.0",
+      "@opentui/core": "0.3.2",
+      "@opentui/keymap": "0.3.2",
+      "@opentui/solid": "0.3.2",
      "ulid": "3.0.1",
      "@kobalte/core": "0.13.11",
      "@types/luxon": "3.7.1",
@@ -53,8 +51,8 @@
      "@tsconfig/bun": "1.0.9",
      "@cloudflare/workers-types": "4.20251008.0",
      "@openauthjs/openauth": "0.0.0-20250322224806",
-      "@pierre/diffs": "1.2.10",
-      "opentui-spinner": "0.0.7",
+      "@pierre/diffs": "1.1.0-beta.18",
+      "opentui-spinner": "0.0.6",
      "@solid-primitives/storage": "4.3.3",
      "@tailwindcss/vite": "4.1.11",
      "diff": "8.0.2",
@@ -78,9 +76,10 @@
      "zod": "4.1.8",
      "remeda": "2.26.0",
      "sst": "4.13.1",
-      "shiki": "4.2.0",
+      "shiki": "3.20.0",
      "solid-list": "0.3.0",
      "tailwindcss": "4.1.11",
+      "virtua": "0.49.1",
      "vite": "7.1.4",
      "@solidjs/meta": "0.29.4",
      "@solidjs/router": "0.15.4",
@@ -141,18 +140,14 @@
    "@types/node": "catalog:"
  },
  "patchedDependencies": {
-    "@ff-labs/fff-bun@0.9.3": "patches/@ff-labs%2Ffff-bun@0.9.3.patch",
-    "@npmcli/agent@4.0.2": "patches/@npmcli%2Fagent@4.0.2.patch",
+    "@npmcli/agent@4.0.0": "patches/@npmcli%2Fagent@4.0.0.patch",
    "@silvia-odwyer/photon-node@0.3.4": "patches/@silvia-odwyer%2Fphoton-node@0.3.4.patch",
    "@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
    "solid-js@1.9.10": "patches/solid-js@1.9.10.patch",
+    "virtua@0.49.1": "patches/virtua@0.49.1.patch",
    "@ai-sdk/xai@3.0.82": "patches/@ai-sdk%2Fxai@3.0.82.patch",
    "gcp-metadata@8.1.2": "patches/gcp-metadata@8.1.2.patch",
    "pacote@21.5.0": "patches/pacote@21.5.0.patch",
-    "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch",
-    "@tanstack/solid-virtual@3.13.28": "patches/@tanstack%2Fsolid-virtual@3.13.28.patch",
-    "@pierre/trees@1.0.0-beta.4": "patches/@pierre%2Ftrees@1.0.0-beta.4.patch",
-    "@modelcontextprotocol/sdk@1.29.0": "patches/@modelcontextprotocol%2Fsdk@1.29.0.patch",
-    "@tanstack/virtual-core@3.17.0": "patches/@tanstack%2Fvirtual-core@3.17.0.patch"
+    "@ai-sdk/google@3.0.73": "patches/@ai-sdk%2Fgoogle@3.0.73.patch"
  }
 }
@@ -147,8 +147,7 @@ test.describe("regression: session timeline local row state", () => {

    const wrapper = page.locator(`[data-timeline-part-id="${editPartID}"]`).first()
    await expectAppVisible(wrapper)
-    const file = wrapper.locator('[data-component="file"][data-mode="diff"]').first()
-    await expectAppVisible(file)
+    await expectAppVisible(wrapper.locator('[data-component="file"][data-mode="diff"]').first())
    await markDiffProbe(page)

    events.push({
@@ -160,15 +159,7 @@ test.describe("regression: session timeline local row state", () => {
    })

    await expect(page.locator(`[data-timeline-part-id="${textPartID}"]`).first()).toBeVisible({ timeout: 10_000 })
-    const siblingProbe = await readDiffProbe(page)
-    expect(siblingProbe).toEqual({
-      fileMarker: "before",
-      frameMarker: "before",
-      rowKey: `assistant-part:${userMessageID}:part:${assistantMessageID}:${editPartID}`,
-      rowMarker: "before",
-      shadowRoots: 0,
-      toolMarker: "before",
-    })
+    expect(await readDiffProbe(page)).toEqual({ fileMarker: "before", shadowRoots: 0, toolMarker: "before" })

    await markDiffProbe(page)
    events.push({
@@ -182,73 +173,7 @@ test.describe("regression: session timeline local row state", () => {
    await expect(wrapper.locator('[data-slot="diff-changes-additions"]').filter({ hasText: "+2" }).first()).toBeVisible(
      { timeout: 10_000 },
    )
-    expect(await readDiffProbe(page)).toEqual({
-      fileMarker: "before",
-      frameMarker: "before",
-      rowKey: `assistant-part:${userMessageID}:part:${assistantMessageID}:${editPartID}`,
-      rowMarker: "before",
-      shadowRoots: 0,
-      toolMarker: "before",
-    })
-  })
-
-  test("keeps a sticky edit header aligned with a multi-hunk diff", async ({ page }) => {
-    const events: EventPayload[] = []
-    const lines = Array.from({ length: 1_000 }, (_, index) => `export const value${index} = ${index}\n`).join("")
-    const after = [100, 300, 500, 700, 900].reduce(
-      (result, index) =>
-        result.replace(`export const value${index} = ${index}`, `export const value${index} = compute(${index})`),
-      lines,
-    )
-    const part = {
-      ...editPart,
-      state: {
-        ...editPart.state,
-        metadata: {
-          ...editPart.state.metadata,
-          filediff: {
-            file: "src/regression.ts",
-            additions: 1,
-            deletions: 1,
-            before: lines,
-            after,
-          },
-        },
-      },
-    }
-    await mockServer(page, events, [userMessage, { ...assistantMessage, parts: [part] }])
-    await configurePage(page)
-
-    await page.goto(`/${base64Encode(directory)}/session/${sessionID}`)
-    await expectSessionTitle(page, title)
-
-    const wrapper = page.locator(`[data-timeline-part-id="${editPartID}"]`).first()
-    const trigger = wrapper.locator('[data-slot="collapsible-trigger"]').first()
-    const diff = wrapper.locator('[data-component="edit-content"]').first()
-    await expectAppVisible(diff)
-    await expect.poll(() => wrapper.evaluate((element) => element.getBoundingClientRect().height)).toBeGreaterThan(500)
-    const samples = await wrapper.evaluate(async (element) => {
-      const root = element.closest<HTMLElement>(".scroll-view__viewport")!
-      element.scrollIntoView({ block: "start" })
-      const result = []
-      for (const offset of [0, 120, 240, 360, 480]) {
-        root.scrollBy(0, offset - (result.at(-1)?.offset ?? 0))
-        await new Promise(requestAnimationFrame)
-        const trigger = element.querySelector<HTMLElement>('[data-slot="collapsible-trigger"]')!
-        const diff = element.querySelector<HTMLElement>('[data-component="edit-content"]')!
-        result.push({
-          offset,
-          trigger: trigger.getBoundingClientRect().y,
-          diff: diff.getBoundingClientRect().y,
-          bottom: element.getBoundingClientRect().bottom,
-        })
-      }
-      return result
-    })
-
-    expect(samples[0]!.trigger).toBeLessThan(samples[0]!.diff)
-    expect(samples.every((sample) => Math.abs(sample.trigger - samples[0]!.trigger) <= 1)).toBe(true)
-    expect(samples.every((sample) => sample.trigger < sample.bottom)).toBe(true)
+    expect(await readDiffProbe(page)).toEqual({ fileMarker: "before", shadowRoots: 0, toolMarker: "before" })
  })
 })

@@ -322,16 +247,10 @@ async function markDiffProbe(page: Page) {
    .evaluate((element) => {
      const tool = element as HTMLElement
      const file = tool.querySelector<HTMLElement>('[data-component="file"][data-mode="diff"]')
-      const row = tool.closest<HTMLElement>("[data-timeline-key]")
-      const frame = tool.closest<HTMLElement>("[data-timeline-row]")
      if (!file) throw new Error("missing edit diff file")
-      if (!row) throw new Error("missing virtual timeline row")
-      if (!frame) throw new Error("missing timeline row frame")

      tool.dataset.timelineProbe = "before"
      file.dataset.timelineProbe = "before"
-      row.dataset.timelineProbe = "before"
-      frame.dataset.timelineProbe = "before"
      window.__timelineDiffProbe.reset()
    })
 }
@@ -343,15 +262,10 @@ async function readDiffProbe(page: Page) {
    .evaluate((element) => {
      const tool = element as HTMLElement
      const file = tool.querySelector<HTMLElement>('[data-component="file"][data-mode="diff"]')
-      const row = tool.closest<HTMLElement>("[data-timeline-key]")
-      const frame = tool.closest<HTMLElement>("[data-timeline-row]")
      return {
        fileMarker: file?.dataset.timelineProbe,
        shadowRoots: window.__timelineDiffProbe.shadowRoots(),
        toolMarker: tool.dataset.timelineProbe,
-        rowMarker: row?.dataset.timelineProbe,
-        rowKey: row?.dataset.timelineKey,
-        frameMarker: frame?.dataset.timelineProbe,
      }
    })
 }
@@ -386,15 +300,14 @@ function readExpanded(element: Element) {
  return !!content && content.getBoundingClientRect().height > 0
 }

-async function mockServer(page: Page, events: EventPayload[], messages = [userMessage, assistantMessage]) {
+async function mockServer(page: Page, events: EventPayload[]) {
  await mockOpenCodeServer(page, {
    directory,
    project: project(),
    provider: provider(),
    sessions: [session()],
-    pageMessages: () => ({ items: messages }),
-    events: () => events.splice(0, 1),
-    eventRetry: 16,
+    pageMessages: () => ({ items: [userMessage, assistantMessage] }),
+    events: () => events.splice(0),
  })
 }

@@ -32,6 +32,8 @@ test.describe("regression: session timeline context group resize", () => {
    const samples = await sampleExpansion(page)
    const visibleOverlap = samples.filter((sample) => sample.frame >= 1 && sample.overlap > 0.5)

+    console.log("context resize samples", JSON.stringify(samples, null, 2))
+
    expect(samples[0]?.overlap).toBe(0)
    expect(visibleOverlap).toEqual([])
    expect(samples.at(-1)?.expanded).toBe("true")
@@ -113,15 +115,13 @@ async function sampleExpansion(page: Page) {

        let frame = 1
        const tick = () => {
-          setTimeout(() => {
-            capture(frame, "painted")
-            frame += 1
-            if (frame > 8) {
-              resolve(samples)
-              return
-            }
-            requestAnimationFrame(tick)
-          }, 0)
+          capture(frame, "raf")
+          frame += 1
+          if (frame > 8) {
+            resolve(samples)
+            return
+          }
+          requestAnimationFrame(tick)
        }
        requestAnimationFrame(tick)
      }),
@@ -30,284 +30,6 @@ type SmokeWindow = Window & {
 test.describe("smoke: session timeline", () => {
  test.setTimeout(240_000)

-  test("keeps the visible message fixed while prepending history", async ({ page }) => {
-    const requests: { before?: string; phase: "start" | "end"; at: number }[] = []
-    await mockOpenCodeServer(page, {
-      sessions: fixture.sessions,
-      provider: fixture.provider,
-      directory: fixture.directory,
-      project: fixture.project,
-      pageMessages,
-      messageDelay: 3_000,
-      onMessages: (input) => requests.push({ before: input.before, phase: input.phase, at: performance.now() }),
-    })
-    await configureSmokePage(page, fixture.directory)
-
-    await navigateToSession(page, fixture.directory, fixture.targetID, fixture.expected.targetTitle)
-    await waitForTimelineStable(page)
-    const scroller = timelineScroller(page)
-    await pointAtTimeline(page)
-    const deadline = Date.now() + 120_000
-    while (!requests.some((request) => request.before && request.phase === "start")) {
-      if (Date.now() >= deadline) throw new Error("Timed out scrolling to the history boundary")
-      await page.mouse.wheel(0, -240)
-      await page.waitForTimeout(20)
-    }
-    expect(requests.some((request) => request.before && request.phase === "end")).toBe(false)
-    for (let index = 0; index < 12; index++) {
-      await page.mouse.wheel(0, -120)
-      await page.waitForTimeout(20)
-    }
-    const keys = ["prt_user_text_smoke_0032", "prt_text_2_smoke_0032", "prt_tool_apply_patch_8_smoke_0032"]
-    const positions = () =>
-      scroller.evaluate((element, keys) => {
-        const top = element.getBoundingClientRect().top
-        return Object.fromEntries(
-          keys.map((key) => {
-            const row = element.querySelector<HTMLElement>(`[data-timeline-part-id="${key}"]`)
-            if (!row) throw new Error(`Missing stable timeline key: ${key}`)
-            return [key, Math.round((row.getBoundingClientRect().top - top) * devicePixelRatio) / devicePixelRatio]
-          }),
-        )
-      }, keys)
-    const before = await positions()
-    expect(requests.some((request) => request.before && request.phase === "end")).toBe(false)
-
-    await expect.poll(() => requests.some((request) => request.before && request.phase === "end")).toBe(true)
-    await waitForTimelineStable(page)
-    await expect.poll(positions).toEqual(before)
-  })
-
-  test("preserves the timeline gap above the composer", async ({ page }) => {
-    await mockOpenCodeServer(page, {
-      sessions: fixture.sessions,
-      provider: fixture.provider,
-      directory: fixture.directory,
-      project: fixture.project,
-      pageMessages,
-    })
-    await configureSmokePage(page, fixture.directory)
-
-    await navigateToSession(page, fixture.directory, fixture.targetID, fixture.expected.targetTitle)
-    await waitForTimelineStable(page)
-    const scroller = timelineScroller(page)
-    await scroller.evaluate((element) => {
-      element.scrollTop = element.scrollHeight
-    })
-    await waitForTimelineStable(page)
-
-    const spacer = scroller.locator('[data-timeline-row="bottom-spacer"]')
-    await expect(spacer).toBeVisible()
-    expect(await spacer.evaluate((element) => element.getBoundingClientRect().height)).toBe(64)
-    await expect
-      .poll(() => scroller.evaluate((element) => element.scrollHeight - element.clientHeight - element.scrollTop))
-      .toBeLessThanOrEqual(1)
-  })
-
-  test("paints cached session tabs at the latest message", async ({ page }) => {
-    await mockOpenCodeServer(page, {
-      sessions: fixture.sessions,
-      provider: fixture.provider,
-      directory: fixture.directory,
-      project: fixture.project,
-      pageMessages: (sessionID) => ({ items: fixture.messages[sessionID as keyof typeof fixture.messages] ?? [] }),
-    })
-    await configureSmokePage(page, fixture.directory)
-    await page.addInitScript(
-      ({ dirBase64, sourceID, targetID }) => {
-        localStorage.setItem(
-          "opencode.global.dat:tabs",
-          JSON.stringify(
-            [sourceID, targetID].map((sessionId) => ({
-              type: "session",
-              server: "http://127.0.0.1:4096",
-              dirBase64,
-              sessionId,
-            })),
-          ),
-        )
-      },
-      { dirBase64: base64Encode(fixture.directory), sourceID: fixture.sourceID, targetID: fixture.targetID },
-    )
-
-    await page.goto(`/${base64Encode(fixture.directory)}/session/${fixture.targetID}`)
-    await expectSessionTitle(page, fixture.expected.targetTitle)
-    await switchTitlebarSession(page, fixture.sourceID, fixture.expected.sourceTitle)
-
-    const destination = fixture.messages[fixture.targetID].map((message) => message.info.id)
-    const last = fixture.expected.targetMessageIDs.at(-1)!
-    await page.evaluate(
-      ({ destination, last }) => {
-        const ids = new Set(destination)
-        const samples: Array<{ ids: string[]; last: boolean; bottomError?: number }> = []
-        const firstPaintNodes = new WeakSet<Node>()
-        let firstPaint = false
-        let removedFirstPaintNodes = 0
-        let running = true
-        new MutationObserver((records) => {
-          if (!firstPaint || !running) return
-          records.forEach((record) =>
-            record.removedNodes.forEach((node) => {
-              if (firstPaintNodes.has(node)) removedFirstPaintNodes += 1
-              if (!(node instanceof Element)) return
-              node.querySelectorAll("*").forEach((element) => {
-                if (firstPaintNodes.has(element)) removedFirstPaintNodes += 1
-              })
-            }),
-          )
-        }).observe(document.documentElement, { childList: true, subtree: true })
-        const sample = () => {
-          if (!running) return
-          setTimeout(() => {
-            if (!running) return
-            const root = [...document.querySelectorAll<HTMLElement>(".scroll-view__viewport")].find((element) =>
-              element.querySelector("[data-timeline-row]"),
-            )
-            if (root) {
-              const view = root.getBoundingClientRect()
-              const visible = [...root.querySelectorAll<HTMLElement>("[data-message-id]")]
-                .filter((element) => {
-                  const rect = element.getBoundingClientRect()
-                  return rect.bottom > view.top && rect.top < view.bottom
-                })
-                .map((element) => element.dataset.messageId!)
-                .filter((id) => ids.has(id))
-              const bottom = root
-                .querySelector<HTMLElement>('[data-timeline-row="bottom-spacer"]')
-                ?.getBoundingClientRect()
-              samples.push({ ids: visible, last: visible.includes(last), bottomError: bottom?.bottom - view.bottom })
-              if (!firstPaint && visible.includes(last) && Math.abs((bottom?.bottom ?? Infinity) - view.bottom) <= 1) {
-                firstPaint = true
-                root.querySelectorAll<HTMLElement>("[data-timeline-key]").forEach((row) => {
-                  const rect = row.getBoundingClientRect()
-                  if (rect.bottom <= view.top || rect.top >= view.bottom) return
-                  firstPaintNodes.add(row)
-                  row.querySelectorAll("*").forEach((element) => firstPaintNodes.add(element))
-                })
-              }
-            }
-            requestAnimationFrame(sample)
-          }, 0)
-        }
-        ;(
-          window as Window & {
-            __sessionTabPaint?: { samples: typeof samples; removed: () => number; stop: () => void }
-          }
-        ).__sessionTabPaint = {
-          samples,
-          removed: () => removedFirstPaintNodes,
-          stop: () => {
-            running = false
-          },
-        }
-        requestAnimationFrame(sample)
-      },
-      { destination, last },
-    )
-
-    await switchTitlebarSession(page, fixture.targetID, fixture.expected.targetTitle)
-    await page.waitForFunction(() =>
-      (
-        window as Window & { __sessionTabPaint?: { samples: Array<{ ids: string[] }> } }
-      ).__sessionTabPaint?.samples.some((sample) => sample.ids.length > 0),
-    )
-    await page.waitForTimeout(200)
-    const first = await page.evaluate(() => {
-      const probe = (
-        window as Window & {
-          __sessionTabPaint?: {
-            samples: Array<{ ids: string[]; last: boolean; bottomError?: number }>
-            removed: () => number
-            stop: () => void
-          }
-        }
-      ).__sessionTabPaint!
-      probe.stop()
-      return { first: probe.samples.find((sample) => sample.ids.length > 0), removed: probe.removed() }
-    })
-    expect(first.first?.last).toBe(true)
-    expect(Math.abs(first.first?.bottomError ?? Infinity)).toBeLessThanOrEqual(1)
-    expect(first.removed).toBe(0)
-  })
-
-  test("paints a cold session tab at the latest message", async ({ page }) => {
-    await mockOpenCodeServer(page, {
-      sessions: fixture.sessions,
-      provider: fixture.provider,
-      directory: fixture.directory,
-      project: fixture.project,
-      pageMessages: (sessionID) => ({ items: fixture.messages[sessionID as keyof typeof fixture.messages] ?? [] }),
-    })
-    await configureSmokePage(page, fixture.directory)
-    await page.addInitScript(
-      ({ dirBase64, sourceID, targetID }) => {
-        localStorage.setItem(
-          "opencode.global.dat:tabs",
-          JSON.stringify(
-            [sourceID, targetID].map((sessionId) => ({
-              type: "session",
-              server: "http://127.0.0.1:4096",
-              dirBase64,
-              sessionId,
-            })),
-          ),
-        )
-      },
-      { dirBase64: base64Encode(fixture.directory), sourceID: fixture.sourceID, targetID: fixture.targetID },
-    )
-    await page.goto(`/${base64Encode(fixture.directory)}/session/${fixture.sourceID}`)
-    await expectSessionTitle(page, fixture.expected.sourceTitle)
-    const last = fixture.expected.targetMessageIDs.at(-1)!
-    const destination = fixture.messages[fixture.targetID].map((message) => message.info.id)
-    await page.evaluate(
-      ({ destination, last }) => {
-        const ids = new Set(destination)
-        const samples: Array<{ destination: boolean; last: boolean; bottomError?: number }> = []
-        const sample = () => {
-          const root = [...document.querySelectorAll<HTMLElement>(".scroll-view__viewport")].find((element) =>
-            element.querySelector("[data-timeline-row]"),
-          )
-          if (root) {
-            const view = root.getBoundingClientRect()
-            const spacer = root
-              .querySelector<HTMLElement>('[data-timeline-row="bottom-spacer"]')
-              ?.getBoundingClientRect()
-            const messages = [...root.querySelectorAll<HTMLElement>("[data-message-id]")].filter((element) => {
-              const rect = element.getBoundingClientRect()
-              return rect.bottom > view.top && rect.top < view.bottom
-            })
-            samples.push({
-              destination: messages.some((element) => ids.has(element.dataset.messageId!)),
-              last: messages.some((element) => element.dataset.messageId === last),
-              bottomError: spacer ? spacer.bottom - view.bottom : undefined,
-            })
-          }
-          requestAnimationFrame(() => setTimeout(sample, 0))
-        }
-        ;(window as Window & { __coldTabSamples?: typeof samples }).__coldTabSamples = samples
-        requestAnimationFrame(() => setTimeout(sample, 0))
-      },
-      { destination, last },
-    )
-
-    await switchTitlebarSession(page, fixture.targetID, fixture.expected.targetTitle)
-    await page.waitForFunction(() =>
-      (window as Window & { __coldTabSamples?: Array<{ destination: boolean }> }).__coldTabSamples?.some(
-        (sample) => sample.destination,
-      ),
-    )
-    const result = await page.evaluate(() => {
-      const samples = (
-        window as Window & {
-          __coldTabSamples?: Array<{ destination: boolean; last: boolean; bottomError?: number }>
-        }
-      ).__coldTabSamples!
-      return samples.find((sample) => sample.destination)!
-    })
-    expect(result.last).toBe(true)
-    expect(Math.abs(result.bottomError ?? Infinity)).toBeLessThanOrEqual(1)
-  })
-
  test("renders seeded timeline in order while paging through history", async ({ page }) => {
    const errors = trackPageErrors(page)
    await mockOpenCodeServer(page, {
@@ -705,14 +427,6 @@ async function navigateToSession(page: Page, directory: string, sessionId: strin
  await expectSessionTitle(page, expectedTitle)
 }

-async function switchTitlebarSession(page: Page, sessionID: string, title: string) {
-  const href = `/${base64Encode(fixture.directory)}/session/${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 expectSessionReady(page: Page) {
  await expectAppVisible(page.getByRole("textbox", { name: /Ask anything/i }))
 }
@@ -18,10 +18,7 @@ export interface MockServerConfig {
  project: unknown
  sessions: ({ id: string } & Record<string, unknown>)[]
  pageMessages: (sessionId: string, limit: number, before?: string) => { items: unknown[]; cursor?: string }
-  messageDelay?: number
-  onMessages?: (input: { sessionID: string; before?: string; phase: "start" | "end" }) => void
  events?: () => unknown[]
-  eventRetry?: number
 }

 export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
@@ -47,7 +44,7 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {
    if (url.port !== targetPort) return route.fallback()

    const path = url.pathname
-    if (path === "/global/event" || path === "/event") return sse(route, config.events?.(), config.eventRetry)
+    if (path === "/global/event" || path === "/event") return sse(route, config.events?.())
    if (path === "/global/health") return json(route, { healthy: true })
    if (emptyObject.has(path)) return json(route, {})
    if (emptyList.has(path)) return json(route, [])
@@ -63,12 +60,9 @@ export async function mockOpenCodeServer(page: Page, config: MockServerConfig) {

    const messagesMatch = path.match(/^\/session\/([^/]+)\/message$/)
    if (messagesMatch) {
-      const before = url.searchParams.get("before") ?? undefined
-      config.onMessages?.({ sessionID: messagesMatch[1], before, phase: "start" })
-      if (config.messageDelay) await new Promise((resolve) => setTimeout(resolve, config.messageDelay))
      const limit = Number(url.searchParams.get("limit") ?? 80)
+      const before = url.searchParams.get("before") ?? undefined
      const pageData = config.pageMessages(messagesMatch[1], limit, before)
-      config.onMessages?.({ sessionID: messagesMatch[1], before, phase: "end" })
      return json(route, pageData.items, pageData.cursor ? { "x-next-cursor": pageData.cursor } : undefined)
    }

@@ -89,10 +83,10 @@ function json(route: Route, body: unknown, headers?: Record<string, string>) {
  })
 }

-function sse(route: Route, events?: unknown[], retry?: number) {
+function sse(route: Route, events?: unknown[]) {
  return route.fulfill({
    status: 200,
    contentType: "text/event-stream",
-    body: `${retry === undefined ? "" : `retry: ${retry}\n\n`}${events?.map((event) => `data: ${JSON.stringify(event)}\n\n`).join("") || ": ok\n\n"}`,
+    body: events?.map((event) => `data: ${JSON.stringify(event)}\n\n`).join("") || ": ok\n\n",
  })
 }
@@ -1,12 +1,11 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.17.8",
+  "version": "1.16.2",
  "description": "",
  "type": "module",
  "exports": {
    ".": "./src/index.ts",
    "./desktop-menu": "./src/desktop-menu.ts",
-    "./updater": "./src/updater.ts",
    "./wsl/types": "./src/wsl/types.ts",
    "./vite": "./vite.js",
    "./index.css": "./src/index.css"
@@ -17,9 +16,9 @@
    "dev": "vite",
    "build": "vite build",
    "serve": "vite preview",
-    "test": "bun run test:unit && bun run test:virtualizer",
-    "test:unit": "bun test --only-failures --preload ./happydom.ts ./src",
-    "test:virtualizer": "bun test --conditions=browser --preload ./happydom.ts ./test-browser/solid-virtual.test.ts",
+    "test": "bun run test:unit",
+    "test:ci": "mkdir -p .artifacts/unit && bun test --preload ./happydom.ts ./src --reporter=junit --reporter-outfile=.artifacts/unit/junit.xml",
+    "test:unit": "bun test --preload ./happydom.ts ./src",
    "test:unit:watch": "bun test --watch --preload ./happydom.ts ./src",
    "test:e2e": "playwright test",
    "test:e2e:local": "playwright test",
@@ -47,7 +46,6 @@
    "@opencode-ai/core": "workspace:*",
    "@opencode-ai/sdk": "workspace:*",
    "@opencode-ai/ui": "workspace:*",
-    "@pierre/trees": "1.0.0-beta.4",
    "@sentry/solid": "catalog:",
    "@shikijs/transformers": "3.9.2",
    "@solid-primitives/active-element": "2.1.3",
@@ -65,7 +63,6 @@
    "@solidjs/meta": "catalog:",
    "@solidjs/router": "catalog:",
    "@tanstack/solid-query": "5.91.4",
-    "@tanstack/solid-virtual": "catalog:",
    "@thisbeyond/solid-dnd": "0.7.5",
    "diff": "catalog:",
    "effect": "catalog:",
@@ -78,6 +75,7 @@
    "shiki": "catalog:",
    "solid-js": "catalog:",
    "solid-list": "catalog:",
-    "tailwindcss": "catalog:"
+    "tailwindcss": "catalog:",
+    "virtua": "catalog:"
  }
 }
@@ -7,6 +7,12 @@ const serverPort = process.env.PLAYWRIGHT_SERVER_PORT ?? "4096"
 const command = `bun run dev -- --host 0.0.0.0 --port ${port}`
 const reuse = !process.env.CI
 const workers = Number(process.env.PLAYWRIGHT_WORKERS ?? (process.env.CI ? 5 : 0)) || undefined
+const reporter = [["html", { outputFolder: "e2e/playwright-report", open: "never" }], ["line"]] as const
+
+if (process.env.PLAYWRIGHT_JUNIT_OUTPUT) {
+  reporter.push(["junit", { outputFile: process.env.PLAYWRIGHT_JUNIT_OUTPUT }])
+}
+
 export default defineConfig({
  testDir: "./e2e",
  outputDir: "./e2e/test-results",
@@ -18,7 +24,7 @@ export default defineConfig({
  forbidOnly: !!process.env.CI,
  retries: process.env.CI ? 2 : 0,
  workers,
-  reporter: [["html", { outputFolder: "e2e/playwright-report", open: "never" }], ["line"]],
+  reporter,
  webServer: {
    command,
    url: baseURL,
@@ -9,7 +9,7 @@ import { Font } from "@opencode-ai/ui/font"
 import { Splash } from "@opencode-ai/ui/logo"
 import { ThemeProvider } from "@opencode-ai/ui/theme/context"
 import { MetaProvider } from "@solidjs/meta"
-import { type BaseRouterProps, Navigate, Route, Router, useParams, useSearchParams } from "@solidjs/router"
+import { type BaseRouterProps, Navigate, Route, Router } from "@solidjs/router"
 import { QueryClient, QueryClientProvider } from "@tanstack/solid-query"
 import { Effect } from "effect"
 import {
@@ -43,123 +43,25 @@ import { PromptProvider } from "@/context/prompt"
 import { ServerConnection, ServerProvider, serverName, useServer } from "@/context/server"
 import { SettingsProvider, useSettings } from "@/context/settings"
 import { TerminalProvider } from "@/context/terminal"
-import { TabsProvider, useTabs, type DraftTab } from "@/context/tabs"
-import { SDKProvider, useSDK } from "@/context/sdk"
+import { TabsProvider } from "@/context/tabs"
 import { WslServersProvider } from "@/wsl/context"
-import DirectoryLayout, { DirectoryDataProvider } from "@/pages/directory-layout"
+import DirectoryLayout from "@/pages/directory-layout"
 import Layout from "@/pages/layout"
 import { ErrorPage } from "./pages/error"
 import { useCheckServerHealth } from "./utils/server-health"

 const HomeRoute = lazy(() => import("@/pages/home"))
 const Session = lazy(() => import("@/pages/session"))
-const NewSession = lazy(() => import("@/pages/new-session"))

 const SessionRoute = Object.assign(
-  () => {
-    const settings = useSettings()
-    const params = useParams()
-    const [search] = useSearchParams<{ draftId?: string; prompt?: string }>()
-    const sdk = useSDK()
-    const server = useServer()
-    const tabs = useTabs()
-
-    // When the new layout is enabled, the legacy new-session route (/:dir/session with no id)
-    // is replaced by a draft at /new-session?draftId=…
-    createEffect(() => {
-      if (!settings.general.newLayoutDesigns()) return
-      if (params.id || search.draftId) return
-      if (!tabs.ready() || !sdk().directory) return
-      tabs.newDraft({ server: server.key, directory: sdk().directory }, search.prompt)
-    })
-
-    return (
-      <SessionProviders>
-        <Session />
-      </SessionProviders>
-    )
-  },
+  () => (
+    <SessionProviders>
+      <Session />
+    </SessionProviders>
+  ),
  { preload: Session.preload },
 )

-// Wraps the non-draft routes. They are gated on (and keyed to) the globally selected
-// server via ServerKey, then provide the server-scoped shell (Permission/Layout/
-// Notification/Models + the visual Layout) for that server.
-function SelectedServerLayout(props: ParentProps) {
-  return (
-    <ServerKey>
-      <ServerSDKProvider>
-        <ServerSyncProvider>
-          <ServerScopedShell>{props.children}</ServerScopedShell>
-        </ServerSyncProvider>
-      </ServerSDKProvider>
-    </ServerKey>
-  )
-}
-
-// Wraps /new-session. It resolves the draft's target server and provides the
-// server-scoped shell for that server — without ServerKey, so the page never depends
-// on the globally "selected" server.
-function DraftServerLayout(props: ParentProps) {
-  const server = useServer()
-  const tabs = useTabs()
-  const [search] = useSearchParams<{ draftId?: string }>()
-  const conn = createMemo(() => {
-    const id = search.draftId
-    if (!id) return undefined
-    const draft = tabs.store.find((tab): tab is DraftTab => tab.type === "draft" && tab.draftID === id)
-    if (!draft) return undefined
-    return server.list.find((c) => ServerConnection.key(c) === draft.server)
-  })
-
-  return (
-    <ServerSDKProvider server={conn}>
-      <ServerSyncProvider server={conn}>
-        <ServerScopedShell>{props.children}</ServerScopedShell>
-      </ServerSyncProvider>
-    </ServerSDKProvider>
-  )
-}
-
-function DraftRoute() {
-  const [search] = useSearchParams<{ draftId?: string }>()
-  const tabs = useTabs()
-  return (
-    <Show when={tabs.ready()}>
-      <Show when={search.draftId} keyed fallback={<Navigate href="/" />}>
-        {(draftID) => <ResolvedDraftRoute draftID={draftID} />}
-      </Show>
-    </Show>
-  )
-}
-
-function ResolvedDraftRoute(props: { draftID: string }) {
-  const tabs = useTabs()
-  const draft = createMemo(() =>
-    tabs.store.find((tab): tab is DraftTab => tab.type === "draft" && tab.draftID === props.draftID),
-  )
-
-  // Key on the directory so retargeting the draft's project re-instantiates the
-  // directory-scoped providers while keeping the same draft id. The draft's target
-  // server is provided by DraftServerLayout, so changing only the server updates the
-  // SDK/sync hooks without remounting the composer.
-  const directory = () => draft()?.directory
-
-  return (
-    <Show when={directory()} keyed>
-      {(dir) => (
-        <SDKProvider directory={dir}>
-          <DirectoryDataProvider directory={dir} draftID={props.draftID}>
-            <DraftProviders>
-              <NewSession />
-            </DraftProviders>
-          </DirectoryDataProvider>
-        </SDKProvider>
-      )}
-    </Show>
-  )
-}
-
 function UiI18nBridge(props: ParentProps) {
  const language = useLanguage()
  return <I18nProvider value={{ locale: language.intl, t: language.t }}>{props.children}</I18nProvider>
@@ -168,6 +70,7 @@ function UiI18nBridge(props: ParentProps) {
 declare global {
  interface Window {
    __OPENCODE__?: {
+      updaterEnabled?: boolean
      deepLinks?: string[]
    }
    api?: {
@@ -206,36 +109,27 @@ function BodyDesignClass() {
  return null
 }

-// Server-agnostic providers shared across every route. These live in the shared
-// shell (router root) so they stay mounted regardless of the active server/route.
-function SharedProviders(props: ParentProps) {
+function AppShellProviders(props: ParentProps) {
  return (
    <SettingsProvider>
      <BodyDesignClass />
-      <CommandProvider>
-        <HighlightsProvider>{props.children}</HighlightsProvider>
-      </CommandProvider>
+      <PermissionProvider>
+        <LayoutProvider>
+          <NotificationProvider>
+            <ModelsProvider>
+              <CommandProvider>
+                <HighlightsProvider>
+                  <Layout>{props.children}</Layout>
+                </HighlightsProvider>
+              </CommandProvider>
+            </ModelsProvider>
+          </NotificationProvider>
+        </LayoutProvider>
+      </PermissionProvider>
    </SettingsProvider>
  )
 }

-// Server-scoped providers plus the visual Layout (tabs/sidebar). These live inside
-// each per-route server layout so they resolve to that route's server (selected vs
-// draft). The Layout remounts when crossing between those groups.
-function ServerScopedShell(props: ParentProps) {
-  return (
-    <PermissionProvider>
-      <LayoutProvider>
-        <NotificationProvider>
-          <ModelsProvider>
-            <Layout>{props.children}</Layout>
-          </ModelsProvider>
-        </NotificationProvider>
-      </LayoutProvider>
-    </PermissionProvider>
-  )
-}
-
 function SessionProviders(props: ParentProps) {
  return (
    <TerminalProvider>
@@ -248,15 +142,14 @@ function SessionProviders(props: ParentProps) {
  )
 }

-// The draft page only renders the prompt composer, so it drops TerminalProvider.
-// FileProvider and CommentsProvider stay because PromptInput uses file search and comment context.
-function DraftProviders(props: ParentProps) {
+function RouterRoot(props: ParentProps<{ appChildren?: JSX.Element }>) {
  return (
-    <FileProvider>
-      <PromptProvider>
-        <CommentsProvider>{props.children}</CommentsProvider>
-      </PromptProvider>
-    </FileProvider>
+    <AppShellProviders>
+      {/*<Suspense fallback={<Loading />}>*/}
+      {props.appChildren}
+      {props.children}
+      {/*</Suspense>*/}
+    </AppShellProviders>
  )
 }

@@ -418,20 +311,6 @@ export function AppInterface(props: {
  router?: Component<BaseRouterProps>
  disableHealthCheck?: boolean
 }) {
-  // The shared shell holds only server-agnostic providers (QueryClient + Settings/
-  // Command/Highlights) and stays mounted across every route. The server-scoped
-  // providers and the visual Layout live in the per-route layouts below, so they
-  // resolve to that route's server (selected for most routes, the draft's server for
-  // /new-session). appChildren is server-agnostic, so it renders here once.
-  const ServerShell = (shellProps: ParentProps) => (
-    <QueryProvider>
-      <SharedProviders>
-        {props.children}
-        {shellProps.children}
-      </SharedProviders>
-    </QueryProvider>
-  )
-
  return (
    <ServerProvider
      defaultServer={props.defaultServer}
@@ -444,19 +323,22 @@ export function AppInterface(props: {
            component={props.router ?? Router}
            root={(routerProps) => (
              <TabsProvider>
-                <ServerShell>{routerProps.children}</ServerShell>
+                <ServerKey>
+                  <QueryProvider>
+                    <ServerSDKProvider>
+                      <ServerSyncProvider>
+                        <RouterRoot appChildren={props.children}>{routerProps.children}</RouterRoot>
+                      </ServerSyncProvider>
+                    </ServerSDKProvider>
+                  </QueryProvider>
+                </ServerKey>
              </TabsProvider>
            )}
          >
-            <Route component={SelectedServerLayout}>
-              <Route path="/" component={HomeRoute} />
-              <Route path="/:dir" component={DirectoryLayout}>
-                <Route path="/" component={() => <Navigate href="session" />} />
-                <Route path="/session/:id?" component={SessionRoute} />
-              </Route>
-            </Route>
-            <Route component={DraftServerLayout}>
-              <Route path="/new-session" component={DraftRoute} />
+            <Route path="/" component={HomeRoute} />
+            <Route path="/:dir" component={DirectoryLayout}>
+              <Route path="/" component={() => <Navigate href="session" />} />
+              <Route path="/session/:id?" component={SessionRoute} />
            </Route>
          </Dynamic>
        </ConnectionGate>
@@ -41,7 +41,7 @@ export function DialogConnectProvider(props: { provider: string }) {
  })

  const provider = createMemo(
-    () => providers.all().get(props.provider) ?? serverSync().data.provider.all.get(props.provider)!,
+    () => providers.all().get(props.provider) ?? serverSync.data.provider.all.get(props.provider)!,
  )
  const fallback = createMemo<ProviderAuthMethod[]>(() => [
    {
@@ -52,16 +52,16 @@ export function DialogConnectProvider(props: { provider: string }) {
  const [auth] = createResource(
    () => props.provider,
    async () => {
-      const cached = serverSync().data.provider_auth[props.provider]
+      const cached = serverSync.data.provider_auth[props.provider]
      if (cached) return cached
-      const res = await serverSDK().client.provider.auth()
+      const res = await serverSDK.client.provider.auth()
      if (!alive.value) return fallback()
-      serverSync().set("provider_auth", res.data ?? {})
+      serverSync.set("provider_auth", res.data ?? {})
      return res.data?.[props.provider] ?? fallback()
    },
  )
-  const loading = createMemo(() => auth.loading && !serverSync().data.provider_auth[props.provider])
-  const methods = createMemo(() => auth.latest ?? serverSync().data.provider_auth[props.provider] ?? fallback())
+  const loading = createMemo(() => auth.loading && !serverSync.data.provider_auth[props.provider])
+  const methods = createMemo(() => auth.latest ?? serverSync.data.provider_auth[props.provider] ?? fallback())
  const [store, setStore] = createStore({
    methodIndex: undefined as undefined | number,
    authorization: undefined as undefined | ProviderAuthAuthorization,
@@ -158,8 +158,8 @@ export function DialogConnectProvider(props: { provider: string }) {
      }
      dispatch({ type: "auth.pending" })
      const start = Date.now()
-      await serverSDK()
-        .client.provider.oauth.authorize(
+      await serverSDK.client.provider.oauth
+        .authorize(
          {
            providerID: props.provider,
            method: index,
@@ -331,7 +331,7 @@ export function DialogConnectProvider(props: { provider: string }) {
  })

  async function complete() {
-    await serverSDK().client.global.dispose()
+    await serverSDK.client.global.dispose()
    dialog.close()
    showToast({
      variant: "success",
@@ -409,7 +409,7 @@ export function DialogConnectProvider(props: { provider: string }) {
      }

      setFormStore("error", undefined)
-      await serverSDK().client.auth.set({
+      await serverSDK.client.auth.set({
        providerID: props.provider,
        auth: {
          type: "api",
@@ -480,8 +480,8 @@ export function DialogConnectProvider(props: { provider: string }) {
      }

      setFormStore("error", undefined)
-      const result = await serverSDK()
-        .client.provider.oauth.callback({
+      const result = await serverSDK.client.provider.oauth
+        .callback({
          providerID: props.provider,
          method: store.methodIndex,
          code,
@@ -533,8 +533,8 @@ export function DialogConnectProvider(props: { provider: string }) {

    onMount(() => {
      void (async () => {
-        const result = await serverSDK()
-          .client.provider.oauth.callback({
+        const result = await serverSDK.client.provider.oauth
+          .callback({
            providerID: props.provider,
            method: store.methodIndex,
          })
@@ -105,8 +105,8 @@ export function DialogCustomProvider(props: Props) {
    const output = validateCustomProvider({
      form,
      t: language.t,
-      disabledProviders: serverSync().data.config.disabled_providers ?? [],
-      existingProviderIDs: new Set(serverSync().data.provider.all.keys()),
+      disabledProviders: serverSync.data.config.disabled_providers ?? [],
+      existingProviderIDs: new Set(serverSync.data.provider.all.keys()),
    })
    batch(() => {
      setForm("err", output.err)
@@ -118,11 +118,11 @@ export function DialogCustomProvider(props: Props) {

  const saveMutation = useMutation(() => ({
    mutationFn: async (result: NonNullable<ReturnType<typeof validate>>) => {
-      const disabledProviders = serverSync().data.config.disabled_providers ?? []
+      const disabledProviders = serverSync.data.config.disabled_providers ?? []
      const nextDisabled = disabledProviders.filter((id) => id !== result.providerID)

      if (result.key) {
-        await serverSDK().client.auth.set({
+        await serverSDK.client.auth.set({
          providerID: result.providerID,
          auth: {
            type: "api",
@@ -131,7 +131,7 @@ export function DialogCustomProvider(props: Props) {
        })
      }

-      await serverSync().updateConfig({
+      await serverSync.updateConfig({
        provider: { [result.providerID]: result.config },
        disabled_providers: nextDisabled,
      })
@@ -35,13 +35,13 @@ export const DialogFork: Component = () => {
    const sessionID = params.id
    if (!sessionID) return []

-    const msgs = sync().data.message[sessionID] ?? []
+    const msgs = sync.data.message[sessionID] ?? []
    const result: ForkableMessage[] = []

    for (const message of msgs) {
      if (message.role !== "user") continue

-      const parts = sync().data.part[message.id] ?? []
+      const parts = sync.data.part[message.id] ?? []
      const textPart = parts.find((x): x is SDKTextPart => x.type === "text" && !x.synthetic && !x.ignored)
      if (!textPart) continue

@@ -61,15 +61,15 @@ export const DialogFork: Component = () => {
    const sessionID = params.id
    if (!sessionID) return

-    const parts = sync().data.part[item.id] ?? []
+    const parts = sync.data.part[item.id] ?? []
    const restored = extractPromptFromParts(parts, {
-      directory: sdk().directory,
+      directory: sdk.directory,
      attachmentName: language.t("common.attachment"),
    })
-    const dir = base64Encode(sdk().directory)
+    const dir = base64Encode(sdk.directory)

-    sdk()
-      .client.session.fork({ sessionID, messageID: item.id })
+    sdk.client.session
+      .fork({ sessionID, messageID: item.id })
      .then((forked) => {
        if (!forked.data) {
          showToast({ title: language.t("common.requestFailed") })
@@ -1,107 +0,0 @@
-.directory-picker-v2-body {
-  display: flex;
-  min-height: 0;
-  flex: 1;
-  flex-direction: column;
-  gap: 12px;
-  padding: 2px 16px 0;
-}
-
-.directory-picker-v2-path {
-  position: relative;
-  z-index: 10;
-  display: flex;
-  gap: 8px;
-}
-
-.directory-picker-v2-actions {
-  display: flex;
-  flex-shrink: 0;
-  gap: 2px;
-}
-
-.directory-picker-v2-suggestions {
-  position: absolute;
-  z-index: 20;
-  top: 36px;
-  right: 0;
-  left: 0;
-  display: flex;
-  flex-direction: column;
-  padding: 4px;
-  border: 1px solid var(--v2-border-border-base);
-  border-radius: 6px;
-  background: var(--v2-background-bg-layer-02);
-  box-shadow: var(--v2-elevation-overlay);
-}
-
-.directory-picker-v2-suggestions button {
-  overflow: hidden;
-  padding: 6px 8px;
-  border-radius: 4px;
-  color: var(--v2-text-text-muted);
-  font-size: 12px;
-  text-align: left;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.directory-picker-v2-suggestions button:hover,
-.directory-picker-v2-suggestions button[data-active] {
-  color: var(--v2-text-text-base);
-  background: var(--v2-overlay-simple-overlay-hover);
-}
-
-.directory-picker-v2-browser {
-  position: relative;
-  z-index: 0;
-  isolation: isolate;
-  min-height: 0;
-  flex: 1;
-  overflow: auto;
-  border: 1px solid var(--v2-border-border-base);
-  border-radius: 6px;
-  background: transparent;
-}
-
-.directory-picker-v2-tree {
-  display: block;
-  width: 100%;
-  height: 100%;
-  --trees-bg-override: transparent;
-  --trees-fg-override: var(--v2-text-text-base);
-  --trees-fg-muted-override: var(--v2-text-text-muted);
-  --trees-bg-muted-override: transparent;
-  --trees-selected-bg-override: transparent;
-  --trees-selected-fg-override: var(--v2-text-text-base);
-  --trees-selected-focused-border-color-override: transparent;
-  --trees-focus-ring-color-override: transparent;
-  --trees-focus-ring-width-override: 0px;
-  --trees-focus-ring-offset-override: 0px;
-  --trees-border-color-override: var(--v2-border-border-base);
-  --trees-font-family-override: var(--font-family-sans);
-  --trees-font-size-override: 12px;
-  --trees-item-height: 24px;
-  --trees-border-radius-override: 4px;
-}
-
-.directory-picker-v2-state {
-  position: absolute;
-  z-index: 1;
-  inset: 0;
-  display: grid;
-  place-items: center;
-  color: var(--v2-text-text-muted);
-  font-size: 12px;
-  pointer-events: none;
-}
-
-.directory-picker-v2-selection {
-  overflow: hidden;
-  flex-shrink: 0;
-  color: var(--v2-text-text-muted);
-  font-size: 12px;
-  line-height: 16px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
@@ -1,356 +0,0 @@
-import "@pierre/trees/web-components"
-import { FileTree } from "@pierre/trees"
-import { Dialog, DialogFooter } from "@opencode-ai/ui/v2/dialog-v2"
-import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
-import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
-import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { createEffect, createMemo, createResource, createSignal, For, onCleanup, onMount, Show } from "solid-js"
-import { useGlobal } from "@/context/global"
-import { useLanguage } from "@/context/language"
-import { ServerConnection } from "@/context/server"
-import {
-  absoluteTreePath,
-  activeTreeNavigation,
-  advanceTreePreload,
-  nextSuggestionIndex,
-  nextTreeScrollTop,
-  pickerFileSearchQuery,
-  pickerAbsoluteInput,
-  pickerMode,
-  preloadTreeDirectories,
-  cleanPickerInput,
-  createDirectorySearch,
-  currentPickerSuggestions,
-  displayPickerPath,
-  pickerParent,
-  pickerRoot,
-} from "./directory-picker-domain"
-import "./dialog-select-directory-v2.css"
-
-interface DialogSelectDirectoryV2Props {
-  title?: string
-  multiple?: boolean
-  onSelect: (result: string | string[] | null) => void
-  server: ServerConnection.Any
-  mode?: "directory" | "file"
-  start?: string
-}
-
-export function DialogSelectDirectoryV2(props: DialogSelectDirectoryV2Props) {
-  const global = useGlobal()
-  const { sync, sdk } = global.createServerCtx(props.server)
-  const dialog = useDialog()
-  const language = useLanguage()
-  const policy = pickerMode(props.mode ?? "directory", props.start)
-  const action = {
-    file: language.t("dialog.directory.action.selectFile"),
-    directory: language.t("dialog.directory.action.selectFolder"),
-  }
-  const [root, setRoot] = createSignal("")
-  const [input, setInput] = createSignal("")
-  const [selected, setSelected] = createSignal("")
-  const [suggestionsOpen, setSuggestionsOpen] = createSignal(false)
-  const [activeSuggestion, setActiveSuggestion] = createSignal(-1)
-  const [loading, setLoading] = createSignal(false)
-  const [error, setError] = createSignal(false)
-  const [rootValid, setRootValid] = createSignal(false)
-  const listings = new Map<string, Promise<Array<{ name: string; type: "file" | "directory" }> | undefined>>()
-  const advanced = new Set<string>()
-  let tree: FileTree | undefined
-  let container: HTMLDivElement | undefined
-  let pathArea: HTMLDivElement | undefined
-  let navigation = 0
-
-  const missingBase = createMemo(() => !(sync.data.path.home || sync.data.path.directory))
-  const [fallbackPath] = createResource(
-    () => (missingBase() ? true : undefined),
-    () =>
-      sdk.client.path
-        .get()
-        .then((result) => result.data)
-        .catch(() => undefined),
-    { initialValue: undefined },
-  )
-  const home = createMemo(() => sync.data.path.home || fallbackPath()?.home || "")
-  const start = createMemo(
-    () =>
-      props.start ||
-      sync.data.path.home ||
-      sync.data.path.directory ||
-      fallbackPath()?.home ||
-      fallbackPath()?.directory,
-  )
-  const search = createDirectorySearch({ sdk, home, base: () => root() || start() })
-  const [suggestions] = createResource(input, async (value) => {
-    const typed = cleanPickerInput(value).replace(/\/+$/, "")
-    const current = displayPickerPath(root(), value, home()).replace(/\/+$/, "")
-    if (!typed || typed === current) return { query: value, items: [] }
-    const directories = (await search(value)).map((absolute) => ({ absolute, type: "directory" as const }))
-    if (!policy.includeFiles) return { query: value, items: directories.slice(0, 5) }
-    const files = await sdk.client.find
-      .files({ directory: root(), query: pickerFileSearchQuery(root(), value, home()), type: "file", limit: 20 })
-      .then((result) => result.data ?? [])
-      .catch(() => [])
-    const results = [
-      ...directories,
-      ...files.map((path) => ({ absolute: absoluteTreePath(root(), path), type: "file" as const })),
-    ]
-    return {
-      query: value,
-      items: Array.from(new Map(results.map((result) => [result.absolute, result])).values()).slice(0, 8),
-    }
-  })
-  const currentSuggestions = createMemo(() => currentPickerSuggestions(suggestions(), input()))
-
-  async function load(path: string, generation: number, preload = true) {
-    const key = path.replace(/\/+$/, "")
-    setError(false)
-    const absolute = absoluteTreePath(root(), key)
-    const request =
-      listings.get(key) ??
-      sdk.client.file
-        .list({ directory: absolute, path: "" })
-        .then((result) => result.data ?? [])
-        .catch(() => undefined)
-    listings.set(key, request)
-    const nodes = await request
-    if (!activeTreeNavigation(generation, navigation)) return false
-    if (!nodes) {
-      listings.delete(key)
-      if (!key) setError(true)
-      return false
-    }
-    tree?.batch(policy.entries(key, nodes).map((item) => ({ type: "add", path: item })))
-    if (preload && advanceTreePreload(advanced, key)) {
-      void Promise.all(preloadTreeDirectories(key, nodes).map((directory) => load(directory, generation, false)))
-    }
-    return true
-  }
-
-  async function navigate(path: string) {
-    const value = policy.navigation(pickerAbsoluteInput(cleanPickerInput(path), home(), root() || start() || home()))
-    if (!value) return
-    const token = ++navigation
-    setLoading(true)
-    setRootValid(false)
-    setSelected("")
-    setSuggestionsOpen(false)
-    setActiveSuggestion(-1)
-    setRoot(value)
-    setInput(displayPickerPath(value, value, home()))
-    listings.clear()
-    advanced.clear()
-    tree?.resetPaths([])
-    const valid = await load("", token)
-    if (!activeTreeNavigation(token, navigation)) return
-    setRootValid(valid)
-    setLoading(false)
-  }
-
-  function complete() {
-    const items = currentSuggestions()
-    const match = items[activeSuggestion()] ?? items[0]
-    if (!match) return
-    const value = displayPickerPath(match.absolute, input(), home())
-    setInput(match.type === "directory" && !value.endsWith("/") ? value + "/" : value)
-    if (match.type === "file") {
-      setSelected(policy.selection(root(), pickerFileSearchQuery(root(), match.absolute, home())) ?? "")
-      setSuggestionsOpen(false)
-      setActiveSuggestion(-1)
-    }
-  }
-
-  function chooseSuggestion(suggestion: { absolute: string; type: "file" | "directory" }) {
-    if (suggestion.type === "directory") {
-      void navigate(suggestion.absolute)
-      return
-    }
-    setInput(displayPickerPath(suggestion.absolute, input(), home()))
-    setSelected(policy.selection(root(), pickerFileSearchQuery(root(), suggestion.absolute, home())) ?? "")
-    setSuggestionsOpen(false)
-    setActiveSuggestion(-1)
-  }
-
-  function moveSuggestion(delta: -1 | 1) {
-    setSuggestionsOpen(true)
-    setActiveSuggestion((current) => nextSuggestionIndex(current, delta, currentSuggestions().length))
-  }
-
-  function activeSuggestionValue() {
-    const items = currentSuggestions()
-    return items[activeSuggestion()] ?? items[0]
-  }
-
-  const keyActions: Partial<Record<string, () => void>> = {
-    ArrowDown: () => moveSuggestion(1),
-    ArrowUp: () => moveSuggestion(-1),
-    Enter: () => {
-      const suggestion = activeSuggestionValue()
-      if (suggestion) chooseSuggestion(suggestion)
-      if (!suggestion) void navigate(input())
-    },
-    Tab: complete,
-  }
-
-  function handleInputKey(event: KeyboardEvent) {
-    const action = keyActions[event.key]
-    if (!action) return
-    if (event.key === "Tab" && event.shiftKey) return
-    event.preventDefault()
-    action()
-  }
-
-  function resolve() {
-    const path = policy.result(root(), selected(), rootValid())
-    if (!path) return
-    props.onSelect(props.multiple ? [path] : path)
-    dialog.close()
-  }
-
-  onMount(() => {
-    const closeSuggestions = (event: PointerEvent) => {
-      if (pathArea?.contains(event.target as Node)) return
-      setSuggestionsOpen(false)
-      setActiveSuggestion(-1)
-    }
-    document.addEventListener("pointerdown", closeSuggestions)
-    onCleanup(() => document.removeEventListener("pointerdown", closeSuggestions))
-    tree = new FileTree({
-      paths: [],
-      flattenEmptyDirectories: false,
-      initialExpansion: "closed",
-      stickyFolders: true,
-      unsafeCSS: `
-        button[data-type="item"] {
-          background: transparent !important;
-          box-shadow: none !important;
-        }
-        button[data-type="item"]:hover {
-          background: var(--v2-overlay-simple-overlay-hover) !important;
-        }
-        button[data-type="item"]:focus-visible {
-          outline: none !important;
-          box-shadow: none !important;
-        }
-        [data-file-tree-virtualized-scroll] {
-          overscroll-behavior: contain;
-          scrollbar-width: thin;
-        }
-      `,
-      onExpansionChange(change) {
-        if (change.expanded) void load(change.path, navigation)
-      },
-      onSelectionChange(paths) {
-        const path = paths.at(-1)
-        setSelected(path ? (policy.selection(root(), path) ?? "") : "")
-      },
-    })
-    if (!container) return
-    tree.render({ containerWrapper: container })
-    tree.getFileTreeContainer()?.classList.add("directory-picker-v2-tree")
-  })
-
-  createEffect(() => {
-    const path = start()
-    if (!path || root()) return
-    void navigate(path)
-  })
-
-  onCleanup(() => tree?.cleanUp())
-
-  return (
-    <Dialog title={props.title ?? language.t("command.project.open")} size="large" class="directory-picker-v2">
-      <div class="directory-picker-v2-body">
-        <div class="directory-picker-v2-path" ref={pathArea}>
-          <TextInputV2
-            value={input()}
-            autofocus
-            autocomplete="off"
-            spellcheck={false}
-            class="!w-full"
-            onInput={(event) => {
-              setInput(cleanPickerInput(event.currentTarget.value))
-              setSelected("")
-              setSuggestionsOpen(true)
-              setActiveSuggestion(-1)
-            }}
-            role="combobox"
-            aria-autocomplete="list"
-            aria-expanded={suggestionsOpen()}
-            aria-controls="directory-picker-v2-suggestions"
-            aria-activedescendant={
-              activeSuggestion() >= 0 ? `directory-picker-v2-suggestion-${activeSuggestion()}` : undefined
-            }
-            onKeyDown={handleInputKey}
-          />
-          <div class="directory-picker-v2-actions">
-            <ButtonV2 size="small" variant="ghost" onClick={() => void navigate(home())}>
-              ~
-            </ButtonV2>
-            <ButtonV2 size="small" variant="ghost" onClick={() => void navigate(pickerRoot(root()) || root())}>
-              {language.t("dialog.directory.root")}
-            </ButtonV2>
-            <ButtonV2 size="small" variant="ghost" onClick={() => void navigate(pickerParent(root()))}>
-              {language.t("dialog.directory.parent")}
-            </ButtonV2>
-          </div>
-          <Show when={suggestionsOpen() && currentSuggestions().length > 0}>
-            <div id="directory-picker-v2-suggestions" role="listbox" class="directory-picker-v2-suggestions">
-              <For each={currentSuggestions()}>
-                {(suggestion, index) => (
-                  <button
-                    id={`directory-picker-v2-suggestion-${index()}`}
-                    role="option"
-                    aria-selected={index() === activeSuggestion()}
-                    data-active={index() === activeSuggestion() ? "" : undefined}
-                    onPointerMove={() => setActiveSuggestion(index())}
-                    onClick={() => chooseSuggestion(suggestion)}
-                  >
-                    {displayPickerPath(suggestion.absolute, input(), home())}
-                    {suggestion.type === "directory" ? "/" : ""}
-                  </button>
-                )}
-              </For>
-            </div>
-          </Show>
-        </div>
-        <div
-          class="directory-picker-v2-browser"
-          ref={container}
-          onWheel={(event) => {
-            const scroller = tree
-              ?.getFileTreeContainer()
-              ?.shadowRoot?.querySelector<HTMLElement>("[data-file-tree-virtualized-scroll]")
-            if (!scroller) return
-            const next = nextTreeScrollTop(
-              scroller.scrollTop,
-              event.deltaY,
-              scroller.scrollHeight,
-              scroller.clientHeight,
-            )
-            if (next === scroller.scrollTop) return
-            event.preventDefault()
-            scroller.scrollTop = next
-            scroller.dispatchEvent(new Event("scroll"))
-          }}
-        >
-          <Show when={loading()}>
-            <div class="directory-picker-v2-state">{language.t("common.loading")}</div>
-          </Show>
-          <Show when={!loading() && error()}>
-            <div class="directory-picker-v2-state">{language.t("dialog.directory.readError")}</div>
-          </Show>
-        </div>
-        <div class="directory-picker-v2-selection">{policy.result(root(), selected(), rootValid())}</div>
-      </div>
-      <DialogFooter>
-        <ButtonV2 variant="neutral" onClick={() => dialog.close()}>
-          {language.t("common.cancel")}
-        </ButtonV2>
-        <ButtonV2 variant="contrast" disabled={!policy.result(root(), selected(), rootValid())} onClick={resolve}>
-          {action[policy.action]}
-        </ButtonV2>
-      </DialogFooter>
-    </Dialog>
-  )
-}
@@ -4,11 +4,12 @@ import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { List } from "@opencode-ai/ui/list"
 import type { ListRef } from "@opencode-ai/ui/list"
 import { getDirectory, getFilename } from "@opencode-ai/core/util/path"
+import fuzzysort from "fuzzysort"
 import { createMemo, createResource, createSignal } from "solid-js"
+import { ServerSDK } from "@/context/server-sdk"
 import { useLanguage } from "@/context/language"
 import { ServerConnection } from "@/context/server"
 import { useGlobal } from "@/context/global"
-import { cleanPickerInput, createDirectorySearch, displayPickerPath } from "./directory-picker-domain"

 interface DialogSelectDirectoryProps {
  title?: string
@@ -23,9 +24,89 @@ type Row = {
  group: "recent" | "folders"
 }

+function cleanInput(value: string) {
+  const first = (value ?? "").split(/\r?\n/)[0] ?? ""
+  return first.replace(/[\u0000-\u001F\u007F]/g, "").trim()
+}
+
+function normalizePath(input: string) {
+  const v = input.replaceAll("\\", "/")
+  if (v.startsWith("//") && !v.startsWith("///")) return "//" + v.slice(2).replace(/\/+/g, "/")
+  return v.replace(/\/+/g, "/")
+}
+
+function normalizeDriveRoot(input: string) {
+  const v = normalizePath(input)
+  if (/^[A-Za-z]:$/.test(v)) return v + "/"
+  return v
+}
+
+function trimTrailing(input: string) {
+  const v = normalizeDriveRoot(input)
+  if (v === "/") return v
+  if (v === "//") return v
+  if (/^[A-Za-z]:\/$/.test(v)) return v
+  return v.replace(/\/+$/, "")
+}
+
+function joinPath(base: string | undefined, rel: string) {
+  const b = trimTrailing(base ?? "")
+  const r = trimTrailing(rel).replace(/^\/+/, "")
+  if (!b) return r
+  if (!r) return b
+  if (b.endsWith("/")) return b + r
+  return b + "/" + r
+}
+
+function rootOf(input: string) {
+  const v = normalizeDriveRoot(input)
+  if (v.startsWith("//")) return "//"
+  if (v.startsWith("/")) return "/"
+  if (/^[A-Za-z]:\//.test(v)) return v.slice(0, 3)
+  return ""
+}
+
+function parentOf(input: string) {
+  const v = trimTrailing(input)
+  if (v === "/") return v
+  if (v === "//") return v
+  if (/^[A-Za-z]:\/$/.test(v)) return v
+
+  const i = v.lastIndexOf("/")
+  if (i <= 0) return "/"
+  if (i === 2 && /^[A-Za-z]:/.test(v)) return v.slice(0, 3)
+  return v.slice(0, i)
+}
+
+function modeOf(input: string) {
+  const raw = normalizeDriveRoot(input.trim())
+  if (!raw) return "relative" as const
+  if (raw.startsWith("~")) return "tilde" as const
+  if (rootOf(raw)) return "absolute" as const
+  return "relative" as const
+}
+
+function tildeOf(absolute: string, home: string) {
+  const full = trimTrailing(absolute)
+  if (!home) return ""
+
+  const hn = trimTrailing(home)
+  const lc = full.toLowerCase()
+  const hc = hn.toLowerCase()
+  if (lc === hc) return "~"
+  if (lc.startsWith(hc + "/")) return "~" + full.slice(hn.length)
+  return ""
+}
+
+function displayPath(path: string, input: string, home: string) {
+  const full = trimTrailing(path)
+  if (modeOf(input) === "absolute") return full
+  return tildeOf(full, home) || full
+}
+
 function toRow(absolute: string, home: string, group: Row["group"]): Row {
-  const full = displayPickerPath(absolute, "", "")
-  const tilde = displayPickerPath(full, "~", home)
+  const full = trimTrailing(absolute)
+  const tilde = tildeOf(full, home)
  const withSlash = (value: string) => {
    if (!value) return ""
    if (value.endsWith("/")) return value
@@ -47,6 +128,120 @@ function uniqueRows(rows: Row[]) {
  })
 }

+function useDirectorySearch(args: { sdk: ServerSDK; start: () => string | undefined; home: () => string }) {
+  const cache = new Map<string, Promise<Array<{ name: string; absolute: string }>>>()
+  let current = 0
+
+  const scoped = (value: string) => {
+    const base = args.start()
+    if (!base) return
+
+    const raw = normalizeDriveRoot(value)
+    if (!raw) return { directory: trimTrailing(base), path: "" }
+
+    const h = args.home()
+    if (raw === "~") return { directory: trimTrailing(h || base), path: "" }
+    if (raw.startsWith("~/")) return { directory: trimTrailing(h || base), path: raw.slice(2) }
+
+    const root = rootOf(raw)
+    if (root) return { directory: trimTrailing(root), path: raw.slice(root.length) }
+    return { directory: trimTrailing(base), path: raw }
+  }
+
+  const dirs = async (dir: string) => {
+    const key = trimTrailing(dir)
+    const existing = cache.get(key)
+    if (existing) return existing
+
+    const request = args.sdk.client.file
+      .list({ directory: key, path: "" })
+      .then((x) => x.data ?? [])
+      .catch(() => [])
+      .then((nodes) =>
+        nodes
+          .filter((n) => n.type === "directory")
+          .map((n) => ({
+            name: n.name,
+            absolute: trimTrailing(normalizeDriveRoot(n.absolute)),
+          })),
+      )
+
+    cache.set(key, request)
+    return request
+  }
+
+  const match = async (dir: string, query: string, limit: number) => {
+    const items = await dirs(dir)
+    if (!query) return items.slice(0, limit).map((x) => x.absolute)
+    return fuzzysort.go(query, items, { key: "name", limit }).map((x) => x.obj.absolute)
+  }
+
+  return async (filter: string) => {
+    const token = ++current
+    const active = () => token === current
+
+    const value = cleanInput(filter)
+    const scopedInput = scoped(value)
+    if (!scopedInput) return [] as string[]
+
+    const raw = normalizeDriveRoot(value)
+    const isPath = raw.startsWith("~") || !!rootOf(raw) || raw.includes("/")
+    const query = normalizeDriveRoot(scopedInput.path)
+
+    const find = () =>
+      args.sdk.client.find
+        .files({ directory: scopedInput.directory, query, type: "directory", limit: 50 })
+        .then((x) => x.data ?? [])
+        .catch(() => [])
+
+    if (!isPath) {
+      const results = await find()
+      if (!active()) return []
+      return results.map((rel) => joinPath(scopedInput.directory, rel)).slice(0, 50)
+    }
+
+    const segments = query.replace(/^\/+/, "").split("/")
+    const head = segments.slice(0, segments.length - 1).filter((x) => x && x !== ".")
+    const tail = segments[segments.length - 1] ?? ""
+
+    const cap = 12
+    const branch = 4
+    let paths = [scopedInput.directory]
+    for (const part of head) {
+      if (!active()) return []
+      if (part === "..") {
+        paths = paths.map(parentOf)
+        continue
+      }
+
+      const next = (await Promise.all(paths.map((p) => match(p, part, branch)))).flat()
+      if (!active()) return []
+      paths = Array.from(new Set(next)).slice(0, cap)
+      if (paths.length === 0) return [] as string[]
+    }
+
+    const out = (await Promise.all(paths.map((p) => match(p, tail, 50)))).flat()
+    if (!active()) return []
+    const deduped = Array.from(new Set(out))
+    const base = raw.startsWith("~") ? trimTrailing(scopedInput.directory) : ""
+    const expand = !raw.endsWith("/")
+    if (!expand || !tail) {
+      const items = base ? Array.from(new Set([base, ...deduped])) : deduped
+      return items.slice(0, 50)
+    }
+
+    const needle = tail.toLowerCase()
+    const exact = deduped.filter((p) => getFilename(p).toLowerCase() === needle)
+    const target = exact[0]
+    if (!target) return deduped.slice(0, 50)
+
+    const children = await match(target, "", 30)
+    if (!active()) return []
+    const items = Array.from(new Set([...deduped, ...children]))
+    return (base ? Array.from(new Set([base, ...items])) : items).slice(0, 50)
+  }
+}
+
 export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
  const global = useGlobal()
  const { sync, sdk, ...serverCtx } = global.createServerCtx(props.server)
@@ -73,10 +268,10 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
    () => sync.data.path.home || sync.data.path.directory || fallbackPath()?.home || fallbackPath()?.directory,
  )

-  const directories = createDirectorySearch({
+  const directories = useDirectorySearch({
    sdk,
    home,
-    base: start,
+    start,
  })

  const recentProjects = createMemo(() => {
@@ -141,7 +336,7 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
          group.category === "recent" ? language.t("home.recentProjects") : language.t("command.project.open")
        }
        ref={(r) => (list = r)}
-        onFilter={(value) => setFilter(cleanPickerInput(value))}
+        onFilter={(value) => setFilter(cleanInput(value))}
        onKeyEvent={(e, item) => {
          if (e.key !== "Tab") return
          if (e.shiftKey) return
@@ -150,7 +345,7 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
          e.preventDefault()
          e.stopPropagation()

-          const value = displayPickerPath(item.absolute, filter(), home())
+          const value = displayPath(item.absolute, filter(), home())
          list?.setFilter(value.endsWith("/") ? value : value + "/")
        }}
        onSelect={(path) => {
@@ -159,7 +354,7 @@ export function DialogSelectDirectory(props: DialogSelectDirectoryProps) {
        }}
      >
        {(item) => {
-          const path = displayPickerPath(item.absolute, filter(), home())
+          const path = displayPath(item.absolute, filter(), home())
          if (path === "~") {
            return (
              <div class="w-full flex items-center justify-between rounded-md">
@@ -7,25 +7,18 @@ import { List } from "@opencode-ai/ui/list"
 import { base64Encode } from "@opencode-ai/core/util/encode"
 import { getDirectory, getFilename } from "@opencode-ai/core/util/path"
 import { useNavigate } from "@solidjs/router"
-import { createMemo, createSignal, lazy, Match, onCleanup, Show, Switch } from "solid-js"
+import { createMemo, createSignal, Match, onCleanup, Show, Switch } from "solid-js"
 import { formatKeybind, useCommand, type CommandOption } from "@/context/command"
-import { useServerSDK, type ServerSDK } from "@/context/server-sdk"
+import { useServerSDK } from "@/context/server-sdk"
 import { useServerSync } from "@/context/server-sync"
 import { useLayout } from "@/context/layout"
 import { useFile } from "@/context/file"
 import { useLanguage } from "@/context/language"
-import { usePlatform } from "@/context/platform"
-import { useServer } from "@/context/server"
-import { useSettings } from "@/context/settings"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { createSessionTabs } from "@/pages/session/helpers"
 import { decode64 } from "@/utils/base64"
 import { getRelativeTime } from "@/utils/time"

-const DialogSelectFileV2 = lazy(() =>
-  import("./dialog-select-directory-v2").then((module) => ({ default: module.DialogSelectDirectoryV2 })),
-)
-
 type EntryType = "command" | "file" | "session"

 type Entry = {
@@ -182,7 +175,7 @@ function createFileEntries(props: {
 function createSessionEntries(props: {
  workspaces: () => string[]
  label: (directory: string) => string
-  serverSDK: ServerSDK
+  serverSDK: ReturnType<typeof useServerSDK>
  language: ReturnType<typeof useLanguage>
 }) {
  const state: {
@@ -268,12 +261,13 @@ function createSessionEntries(props: {
  return { sessions }
 }

-export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFile?: (path: string) => void }) {
+export function DialogSelectFile(props: {
+  mode?: DialogSelectFileMode
+  onOpenFile?: (path: string) => void
+  onSelectFile?: (path: string) => void
+}) {
  const command = useCommand()
  const language = useLanguage()
-  const platform = usePlatform()
-  const server = useServer()
-  const settings = useSettings()
  const layout = useLayout()
  const file = useFile()
  const dialog = useDialog()
@@ -302,21 +296,21 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
    if (directory && !dirs.includes(directory)) return [...dirs, directory]
    return dirs
  })
-  const homedir = createMemo(() => serverSync().data.path.home)
+  const homedir = createMemo(() => serverSync.data.path.home)
  const label = (directory: string) => {
    const current = project()
    const kind =
      current && directory === current.worktree
        ? language.t("workspace.type.local")
        : language.t("workspace.type.sandbox")
-    const [store] = serverSync().child(directory, { bootstrap: false })
+    const [store] = serverSync.child(directory, { bootstrap: false })
    const home = homedir()
    const path = home ? directory.replace(home, "~") : directory
    const name = store.vcs?.branch ?? getFilename(directory)
    return `${kind} : ${name || path}`
  }

-  const { sessions } = createSessionEntries({ workspaces, label, serverSDK: serverSDK(), language })
+  const { sessions } = createSessionEntries({ workspaces, label, serverSDK, language })

  const items = async (text: string) => {
    const query = text.trim()
@@ -385,6 +379,10 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
    }

    if (!item.path) return
+    if (props.onSelectFile) {
+      props.onSelectFile(item.path)
+      return
+    }
    open(item.path)
  }

@@ -393,21 +391,6 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
    state.cleanup?.()
  })

-  if (filesOnly() && platform.platform === "desktop" && settings.general.newLayoutDesigns() && server.current) {
-    return (
-      <DialogSelectFileV2
-        server={server.current}
-        mode="file"
-        start={projectDirectory()}
-        title={language.t("session.header.searchFiles")}
-        onSelect={(result) => {
-          if (typeof result !== "string") return
-          open(result)
-        }}
-      />
-    )
-  }
-
  return (
    <Dialog class="pt-3 pb-0 !max-h-[480px]" transition>
      <List
@@ -424,7 +407,6 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
        items={items}
        key={(item) => item.id}
        filterKeys={["title", "description", "category"]}
-        skipFilter={(item) => item.type === "file"}
        groupBy={grouped() ? (item) => item.category : () => ""}
        onMove={handleMove}
        onSelect={handleSelect}
@@ -1,10 +1,13 @@
+import { useMutation, useQueryClient } from "@tanstack/solid-query"
 import { Component, createMemo, Show } from "solid-js"
 import { useSync } from "@/context/sync"
+import { useSDK } from "@/context/sdk"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { List } from "@opencode-ai/ui/list"
 import { Switch } from "@opencode-ai/ui/switch"
 import { useLanguage } from "@/context/language"
-import { useMcpToggle } from "@/context/mcp"
+import { useQueryOptions } from "@/context/server-sync"
+import { pathKey } from "@/utils/path-key"

 const statusLabels = {
  connected: "mcp.status.connected",
@@ -16,15 +19,32 @@ const statusLabels = {

 export const DialogSelectMcp: Component = () => {
  const sync = useSync()
+  const sdk = useSDK()
  const language = useLanguage()
+  const queryClient = useQueryClient()
+  const queryOptions = useQueryOptions()

  const items = createMemo(() =>
-    Object.entries(sync().data.mcp ?? {})
+    Object.entries(sync.data.mcp ?? {})
      .map(([name, status]) => ({ name, status: status.status }))
      .sort((a, b) => a.name.localeCompare(b.name)),
  )

-  const toggle = useMcpToggle()
+  const toggle = useMutation(() => ({
+    mutationFn: async (name: string) => {
+      const status = sync.data.mcp[name]
+      if (status?.status === "connected") {
+        await sdk.client.mcp.disconnect({ name })
+        return
+      }
+      if (status?.status === "needs_auth") {
+        await sdk.client.mcp.auth.authenticate({ name })
+        return
+      }
+      await sdk.client.mcp.connect({ name })
+    },
+    onSuccess: () => queryClient.refetchQueries(queryOptions.mcp(pathKey(sync.directory))),
+  }))

  const enabledCount = createMemo(() => items().filter((i) => i.status === "connected").length)
  const totalCount = createMemo(() => items().length)
@@ -48,7 +68,7 @@ export const DialogSelectMcp: Component = () => {
        }}
      >
        {(i) => {
-          const mcpStatus = () => sync().data.mcp[i.name]
+          const mcpStatus = () => sync.data.mcp[i.name]
          const status = () => mcpStatus()?.status
          const statusLabel = () => {
            const key = status() ? statusLabels[status() as keyof typeof statusLabels] : undefined
@@ -509,16 +509,11 @@ export function useServerManagementController(options: { onSelect?: () => void;
    resetEdit()
  })

-  async function handleRemove(key: ServerConnection.Key) {
-    try {
-      if (key.startsWith("wsl:")) await platform.wslServers?.removeServer(key)
-      tabs.removeServer(key)
-      server.remove(key)
-      if ((await platform.getDefaultServer?.()) === key) {
-        await setDefault(null)
-      }
-    } catch (err) {
-      showRequestError(language, err)
+  async function handleRemove(url: ServerConnection.Key) {
+    tabs.removeServer(url)
+    server.remove(url)
+    if ((await platform.getDefaultServer?.()) === url) {
+      void platform.setDefaultServer?.(null)
    }
  }

@@ -1,189 +0,0 @@
-import { expect, test } from "bun:test"
-import {
-  absoluteTreePath,
-  activeTreeNavigation,
-  advanceTreePreload,
-  nextSuggestionIndex,
-  nextTreeScrollTop,
-  pickerTreeEntries,
-  pickerSearchEntries,
-  pickerFileSearchQuery,
-  pickerMode,
-  preloadTreeDirectories,
-  selectedTreePath,
-  treeEntries,
-  treePathWithin,
-  currentPickerSuggestions,
-  createDirectorySearch,
-  displayPickerPath,
-  pickerParent,
-  pickerRoot,
-  pickerAbsoluteInput,
-} from "./directory-picker-domain"
-
-test("maps server directory entries into Pierre paths", () => {
-  expect(
-    treeEntries("src/", [
-      { name: "components", type: "directory" },
-      { name: "index.ts", type: "file" },
-    ]),
-  ).toEqual(["src/components/", "src/index.ts"])
-})
-
-test("maps Pierre paths back to the selected server root", () => {
-  expect(absoluteTreePath("C:/Users/luke", "src/components/")).toBe("C:/Users/luke/src/components")
-  expect(absoluteTreePath("C:/", "")).toBe("C:/")
-  expect(absoluteTreePath("C:/", "README.md")).toBe("C:/README.md")
-  expect(absoluteTreePath("/home/luke", "README.md")).toBe("/home/luke/README.md")
-})
-
-test("includes files only when the picker selects files", () => {
-  const nodes = [
-    { name: "components", type: "directory" as const },
-    { name: "index.ts", type: "file" as const },
-  ]
-  expect(pickerTreeEntries("", nodes, "directory")).toEqual(["components/"])
-  expect(pickerTreeEntries("", nodes, "file")).toEqual(["components/", "index.ts"])
-})
-
-test("includes files in file autocomplete while preserving directory navigation", () => {
-  const nodes = [
-    { name: "src", absolute: "/repo/src", type: "directory" as const },
-    { name: "README.md", absolute: "/repo/README.md", type: "file" as const },
-  ]
-  expect(pickerSearchEntries(nodes, "directory")).toEqual([nodes[0]])
-  expect(pickerSearchEntries(nodes, "file")).toEqual(nodes)
-})
-
-test("centralizes file and directory selection policy", () => {
-  const file = pickerMode("file", "/repo")
-  expect(file.includeFiles).toBeTrue()
-  expect(file.selection("/repo/src", "index.ts")).toBe("src/index.ts")
-  expect(file.selection("/repo", "src/")).toBeUndefined()
-  expect(file.result("/repo", "src/index.ts")).toBe("src/index.ts")
-  expect(file.selection("/tmp", "example.txt")).toBeUndefined()
-  expect(file.navigation("/repo/src")).toBe("/repo/src")
-  expect(file.navigation("/tmp")).toBeUndefined()
-
-  const directory = pickerMode("directory")
-  expect(directory.includeFiles).toBeFalse()
-  expect(directory.selection("/repo", "src/")).toBe("/repo/src")
-  expect(directory.selection("C:/Users/luke", "repos/")).toBe("C:\\Users\\luke\\repos")
-  expect(directory.selection("//Server/Share", "repo/")).toBe("\\\\Server\\Share\\repo")
-  expect(directory.navigation("/tmp")).toBe("/tmp")
-  expect(directory.result("/repo", "")).toBe("/repo")
-  expect(directory.result("C:/Users/luke", "")).toBe("C:\\Users\\luke")
-  expect(directory.result("//Server/Share/repo", "")).toBe("\\\\Server\\Share\\repo")
-  expect(directory.result("/repo", "", false)).toBeUndefined()
-})
-
-test("accepts mutations only from the active navigation", () => {
-  expect(activeTreeNavigation(3, 3)).toBeTrue()
-  expect(activeTreeNavigation(2, 3)).toBeFalse()
-})
-
-test("preserves POSIX case while matching Windows drives case-insensitively", () => {
-  expect(treePathWithin("/repo", "/Repo")).toBeFalse()
-  expect(treePathWithin("C:/Repo", "c:/repo/src")).toBeTrue()
-  expect(treePathWithin("//Server/Share/Repo", "//server/share/repo/src")).toBeTrue()
-  expect(pickerMode("file", "//Server/Share/Repo").selection("//server/share/repo/src", "file.ts")).toBe("src/file.ts")
-  expect(treePathWithin("/repo", "/repo/../tmp")).toBeFalse()
-  expect(treePathWithin("/", "/src")).toBeTrue()
-  expect(pickerMode("file", "C:/Repo").selection("c:/repo/src", "file.ts")).toBe("src/file.ts")
-  expect(pickerMode("file", "C:/").selection("C:/", "file.ts")).toBe("file.ts")
-})
-
-test("displays paths using the selected server path format", () => {
-  expect(displayPickerPath("C:/Users/luke/repos", "C:/Users/luke/repos", "C:/Users/luke")).toBe(
-    "C:\\Users\\luke\\repos",
-  )
-  expect(displayPickerPath("C:/Users/luke/repos", "C:\\Users\\luke\\repos", "C:/Users/luke")).toBe(
-    "C:\\Users\\luke\\repos",
-  )
-  expect(displayPickerPath("/home/luke/repos", "repos", "/home/luke")).toBe("~/repos")
-  expect(displayPickerPath("/home/luke/repos", "~/repos", "/home/luke")).toBe("~/repos")
-})
-
-test("treats the server share prefix as the UNC root", () => {
-  expect(pickerRoot("//Server/Share/repo/src")).toBe("//Server/Share")
-  expect(pickerRoot("\\\\Server\\Share\\repo\\src")).toBe("//Server/Share")
-  expect(pickerParent("//Server/Share")).toBe("//Server/Share")
-  expect(pickerParent("//Server/Share/repo")).toBe("//Server/Share")
-})
-
-test("resolves relative input against the current picker root", () => {
-  expect(pickerAbsoluteInput("src", "/home/luke", "/home/luke/repo")).toBe("/home/luke/repo/src")
-  expect(pickerAbsoluteInput("../other", "/home/luke", "/home/luke/repo")).toBe("/home/luke/other")
-  expect(pickerAbsoluteInput("~/.config", "/home/luke", "/home/luke/repo")).toBe("/home/luke/.config")
-  expect(pickerAbsoluteInput("src", "C:/Users/luke", "C:/Users/luke/repo")).toBe("C:/Users/luke/repo/src")
-})
-
-test("exposes autocomplete results only for their source query", () => {
-  const result = { query: "/repo/src", items: ["/repo/src/index.ts"] }
-  expect(currentPickerSuggestions(result, "/repo/src")).toEqual(result.items)
-  expect(currentPickerSuggestions(result, "/repo/test")).toEqual([])
-})
-
-test("scopes file autocomplete to the current browser root", () => {
-  expect(pickerFileSearchQuery("/home/luke/repos", "/home/luke/repos/src/in", "/home/luke")).toBe("src/in")
-  expect(pickerFileSearchQuery("/home/luke", "~/repos/op", "/home/luke")).toBe("repos/op")
-})
-
-test("resolves directory autocomplete from the current browser root", async () => {
-  const directories: string[] = []
-  const sdk = {
-    client: {
-      find: {
-        files: (input: { directory: string }) => {
-          directories.push(input.directory)
-          return Promise.resolve({ data: [] })
-        },
-      },
-    },
-  } as unknown as Parameters<typeof createDirectorySearch>[0]["sdk"]
-  let base = "/repo"
-  const search = createDirectorySearch({ sdk, home: () => "/home/luke", base: () => base })
-
-  await search("components")
-  base = "/repo/src"
-  await search("components")
-
-  expect(directories).toEqual(["/repo", "/repo/src"])
-})
-
-test("identifies the next directory level to preload", () => {
-  expect(
-    preloadTreeDirectories("src/", [
-      { name: "components", type: "directory" },
-      { name: "index.ts", type: "file" },
-      { name: "utils", type: "directory" },
-    ]),
-  ).toEqual(["src/components/", "src/utils/"])
-})
-
-test("advances preloading once for every expanded directory", () => {
-  const advanced = new Set<string>()
-  expect(advanceTreePreload(advanced, "")).toBeTrue()
-  expect(advanceTreePreload(advanced, "")).toBeFalse()
-  expect(advanceTreePreload(advanced, "repos/")).toBeTrue()
-})
-
-test("clamps bridged tree wheel scrolling", () => {
-  expect(nextTreeScrollTop(100, 40, 500, 200)).toBe(140)
-  expect(nextTreeScrollTop(10, -40, 500, 200)).toBe(0)
-  expect(nextTreeScrollTop(290, 40, 500, 200)).toBe(300)
-})
-
-test("wraps autocomplete keyboard navigation", () => {
-  expect(nextSuggestionIndex(-1, 1, 4)).toBe(0)
-  expect(nextSuggestionIndex(3, 1, 4)).toBe(0)
-  expect(nextSuggestionIndex(0, -1, 4)).toBe(3)
-  expect(nextSuggestionIndex(0, 1, 0)).toBe(-1)
-})
-
-test("returns absolute directories and relative files", () => {
-  expect(selectedTreePath("/home/luke/repo", "src/", "directory")).toBe("/home/luke/repo/src")
-  expect(selectedTreePath("/home/luke/repo", "src/index.ts", "file")).toBe("src/index.ts")
-  expect(selectedTreePath("/home/luke/repo/src", "index.ts", "file", "/home/luke/repo")).toBe("src/index.ts")
-  expect(selectedTreePath("/home/luke/repo", "src/", "file")).toBeUndefined()
-})
@@ -1,331 +0,0 @@
-export function treeEntries(parent: string, nodes: ReadonlyArray<{ name: string; type: "file" | "directory" }>) {
-  const prefix = parent.replace(/^\/+|\/+$/g, "")
-  return nodes.map((node) => {
-    const path = prefix ? `${prefix}/${node.name}` : node.name
-    return node.type === "directory" ? path + "/" : path
-  })
-}
-
-export function pickerTreeEntries(
-  parent: string,
-  nodes: ReadonlyArray<{ name: string; type: "file" | "directory" }>,
-  mode: "directory" | "file",
-) {
-  return treeEntries(parent, mode === "directory" ? nodes.filter((node) => node.type === "directory") : nodes)
-}
-
-export function pickerSearchEntries<T extends { type: "file" | "directory" }>(
-  nodes: readonly T[],
-  mode: "directory" | "file",
-) {
-  return mode === "directory" ? nodes.filter((node) => node.type === "directory") : [...nodes]
-}
-
-export function pickerMode(mode: "directory" | "file", base?: string) {
-  if (mode === "file") {
-    return {
-      includeFiles: true,
-      action: "file" as const,
-      entries(parent: string, nodes: ReadonlyArray<{ name: string; type: "file" | "directory" }>) {
-        return treeEntries(parent, nodes)
-      },
-      navigation(path: string) {
-        return treePathWithin(base, path) ? path : undefined
-      },
-      result(root: string, selected: string) {
-        return selected || undefined
-      },
-      selection(root: string, path: string) {
-        if (!treePathWithin(base, root)) return
-        return selectedTreePath(root, path, "file", base)
-      },
-    }
-  }
-  return {
-    includeFiles: false,
-    action: "directory" as const,
-    entries(parent: string, nodes: ReadonlyArray<{ name: string; type: "file" | "directory" }>) {
-      return treeEntries(
-        parent,
-        nodes.filter((node) => node.type === "directory"),
-      )
-    },
-    navigation(path: string) {
-      return path
-    },
-    result(root: string, selected: string, valid = true) {
-      if (!valid) return
-      return selected || (root ? nativePickerPath(root) : undefined)
-    },
-    selection(root: string, path: string) {
-      return selectedTreePath(root, path, "directory")
-    },
-  }
-}
-
-export function pickerFileSearchQuery(root: string, input: string, home: string) {
-  const value = input
-    .replace(/\\/g, "/")
-    .replace(/^~(?=\/|$)/, home)
-    .replace(/\/+$/, "")
-  const base = root.replace(/\\/g, "/").replace(/\/+$/, "")
-  if (value === base) return ""
-  if (value.startsWith(base + "/")) return value.slice(base.length + 1)
-  return value
-}
-
-export function pickerAbsoluteInput(input: string, home: string, current: string) {
-  const value = normalizePickerDrive(input).replace(/^~(?=\/|$)/, normalizePickerDrive(home))
-  const absolute = pickerRoot(value) ? value : joinPickerPath(current, value)
-  return canonicalPickerPath(absolute)
-}
-
-export function treePathWithin(base: string | undefined, path: string) {
-  return pickerRelativePath(base, path) !== undefined
-}
-
-export function canonicalPickerPath(path: string) {
-  const value = normalizePickerDrive(path)
-  const root = pickerRoot(value)
-  const parts = value.slice(root.length).split("/")
-  const resolved = parts.reduce<string[]>((output, part) => {
-    if (!part || part === ".") return output
-    if (part === "..") {
-      output.pop()
-      return output
-    }
-    output.push(part)
-    return output
-  }, [])
-  return joinPickerPath(root, resolved.join("/"))
-}
-
-export function pickerRelativePath(base: string | undefined, path: string) {
-  if (!base) return
-  const rootPath = canonicalPickerPath(base)
-  const targetPath = canonicalPickerPath(path)
-  const insensitive = /^[A-Za-z]:\//.test(rootPath) || rootPath.startsWith("//")
-  const root = insensitive ? rootPath.toLowerCase() : rootPath
-  const target = insensitive ? targetPath.toLowerCase() : targetPath
-  if (target === root) return ""
-  const prefix = root.endsWith("/") ? root : root + "/"
-  if (!target.startsWith(prefix)) return
-  return targetPath.slice(prefix.length)
-}
-
-export function currentPickerSuggestions<T>(result: { query: string; items: readonly T[] } | undefined, query: string) {
-  if (result?.query !== query) return []
-  return result.items
-}
-
-export function preloadTreeDirectories(
-  parent: string,
-  nodes: ReadonlyArray<{ name: string; type: "file" | "directory" }>,
-) {
-  return treeEntries(
-    parent,
-    nodes.filter((node) => node.type === "directory"),
-  )
-}
-
-export function advanceTreePreload(advanced: Set<string>, path: string) {
-  if (advanced.has(path)) return false
-  advanced.add(path)
-  return true
-}
-
-export function activeTreeNavigation(request: number, current: number) {
-  return request === current
-}
-
-export function nextTreeScrollTop(current: number, delta: number, scrollHeight: number, clientHeight: number) {
-  return Math.min(Math.max(0, scrollHeight - clientHeight), Math.max(0, current + delta))
-}
-
-export function nextSuggestionIndex(current: number, delta: -1 | 1, count: number) {
-  if (count === 0) return -1
-  return (current + delta + count) % count
-}
-
-export function absoluteTreePath(root: string, path: string) {
-  const base = trimPickerPath(root)
-  const relative = path.replace(/\\/g, "/").replace(/^\/+|\/+$/g, "")
-  if (!relative) return base || "/"
-  if (!base || base === "/") return "/" + relative
-  if (base.endsWith("/")) return base + relative
-  return `${base}/${relative}`
-}
-
-export function selectedTreePath(root: string, path: string, mode: "directory" | "file", base?: string) {
-  const directory = path.endsWith("/")
-  if (mode === "file") {
-    if (directory) return
-    if (!base) return path
-    const absolute = absoluteTreePath(root, path)
-    return pickerRelativePath(base, absolute)
-  }
-  return directory ? nativePickerPath(absoluteTreePath(root, path)) : undefined
-}
-
-export function nativePickerPath(path: string) {
-  const value = trimPickerPath(path)
-  if (/^[A-Za-z]:\//.test(value) || value.startsWith("//")) return value.replaceAll("/", "\\")
-  return value
-}
-import { getFilename } from "@opencode-ai/core/util/path"
-import fuzzysort from "fuzzysort"
-import { ServerSDK } from "@/context/server-sdk"
-
-export function cleanPickerInput(value: string) {
-  const first = (value ?? "").split(/\r?\n/)[0] ?? ""
-  return first.replace(/[\u0000-\u001F\u007F]/g, "").trim()
-}
-
-export function normalizePickerPath(input: string) {
-  const value = input.replaceAll("\\", "/")
-  if (value.startsWith("//") && !value.startsWith("///")) return "//" + value.slice(2).replace(/\/+/g, "/")
-  return value.replace(/\/+/g, "/")
-}
-
-export function normalizePickerDrive(input: string) {
-  const value = normalizePickerPath(input)
-  if (/^[A-Za-z]:$/.test(value)) return value + "/"
-  return value
-}
-
-export function trimPickerPath(input: string) {
-  const value = normalizePickerDrive(input)
-  if (value === "/" || value === "//" || /^[A-Za-z]:\/$/.test(value)) return value
-  return value.replace(/\/+$/, "")
-}
-
-export function joinPickerPath(base: string | undefined, relative: string) {
-  const root = trimPickerPath(base ?? "")
-  const path = trimPickerPath(relative).replace(/^\/+/, "")
-  if (!root) return path
-  if (!path) return root
-  if (root.endsWith("/")) return root + path
-  return root + "/" + path
-}
-
-export function pickerRoot(input: string) {
-  const value = normalizePickerDrive(input)
-  if (value.startsWith("//")) {
-    const [server, share] = value.slice(2).split("/")
-    if (server && share) return `//${server}/${share}`
-    return "//"
-  }
-  if (value.startsWith("/")) return "/"
-  if (/^[A-Za-z]:\//.test(value)) return value.slice(0, 3)
-  return ""
-}
-
-export function pickerParent(input: string) {
-  const value = trimPickerPath(input)
-  const root = pickerRoot(value)
-  if (value === root) return value
-  if (value === "/" || value === "//" || /^[A-Za-z]:\/$/.test(value)) return value
-  const index = value.lastIndexOf("/")
-  if (index < root.length) return root
-  if (index <= 0) return "/"
-  if (index === 2 && /^[A-Za-z]:/.test(value)) return value.slice(0, 3)
-  return value.slice(0, index)
-}
-
-function pickerTilde(absolute: string, home: string) {
-  const path = trimPickerPath(absolute)
-  if (!home) return ""
-  const root = trimPickerPath(home)
-  if (/^[A-Za-z]:\//.test(root)) return ""
-  if (path === root) return "~"
-  if (path.startsWith(root + "/")) return "~" + path.slice(root.length)
-  return ""
-}
-
-export function displayPickerPath(path: string, input: string, home: string) {
-  const value = trimPickerPath(path)
-  if (/^[A-Za-z]:\//.test(trimPickerPath(home)) || /^[A-Za-z]:\//.test(value)) return value.replaceAll("/", "\\")
-  return pickerTilde(value, home) || value
-}
-
-export function createDirectorySearch(args: { sdk: ServerSDK; base: () => string | undefined; home: () => string }) {
-  const cache = new Map<string, Promise<Array<{ name: string; absolute: string }>>>()
-  let current = 0
-
-  const scoped = (value: string) => {
-    const base = args.base()
-    if (!base) return
-    const raw = normalizePickerDrive(value)
-    if (!raw) return { directory: trimPickerPath(base), path: "" }
-    const home = args.home()
-    if (raw === "~") return { directory: trimPickerPath(home || base), path: "" }
-    if (raw.startsWith("~/")) return { directory: trimPickerPath(home || base), path: raw.slice(2) }
-    const root = pickerRoot(raw)
-    if (root) return { directory: trimPickerPath(root), path: raw.slice(root.length) }
-    return { directory: trimPickerPath(base), path: raw }
-  }
-
-  const directories = async (directory: string) => {
-    const key = trimPickerPath(directory)
-    const existing = cache.get(key)
-    if (existing) return existing
-    const request = args.sdk.client.file
-      .list({ directory: key, path: "" })
-      .then((result) => result.data ?? [])
-      .catch(() => [])
-      .then((nodes) =>
-        nodes
-          .filter((node) => node.type === "directory")
-          .map((node) => ({ name: node.name, absolute: trimPickerPath(normalizePickerDrive(node.absolute)) })),
-      )
-    cache.set(key, request)
-    return request
-  }
-
-  const match = async (directory: string, query: string, limit: number) => {
-    const items = await directories(directory)
-    if (!query) return items.slice(0, limit).map((item) => item.absolute)
-    return fuzzysort.go(query, items, { key: "name", limit }).map((item) => item.obj.absolute)
-  }
-
-  return async (filter: string) => {
-    const token = ++current
-    const active = () => token === current
-    const value = cleanPickerInput(filter)
-    const input = scoped(value)
-    if (!input) return [] as string[]
-    const raw = normalizePickerDrive(value)
-    const pathInput = raw.startsWith("~") || !!pickerRoot(raw) || raw.includes("/")
-    const query = normalizePickerDrive(input.path)
-    if (!pathInput) {
-      const results = await args.sdk.client.find
-        .files({ directory: input.directory, query, type: "directory", limit: 50 })
-        .then((result) => result.data ?? [])
-        .catch(() => [])
-      if (!active()) return []
-      return results.map((path) => joinPickerPath(input.directory, path)).slice(0, 50)
-    }
-    const segments = query.replace(/^\/+/, "").split("/")
-    const head = segments.slice(0, -1).filter((part) => part && part !== ".")
-    const tail = segments.at(-1) ?? ""
-    let paths = [input.directory]
-    for (const part of head) {
-      if (!active()) return []
-      if (part === "..") {
-        paths = paths.map(pickerParent)
-        continue
-      }
-      paths = Array.from(new Set((await Promise.all(paths.map((path) => match(path, part, 4)))).flat())).slice(0, 12)
-      if (!active() || paths.length === 0) return []
-    }
-    const matches = Array.from(new Set((await Promise.all(paths.map((path) => match(path, tail, 50)))).flat()))
-    if (!active()) return []
-    const base = raw.startsWith("~") ? trimPickerPath(input.directory) : ""
-    if (raw.endsWith("/") || !tail) return Array.from(new Set([base, ...matches].filter(Boolean))).slice(0, 50)
-    const target = matches.find((path) => getFilename(path).toLowerCase() === tail.toLowerCase())
-    if (!target) return matches.slice(0, 50)
-    const children = await match(target, "", 30)
-    if (!active()) return []
-    return Array.from(new Set([base, ...matches, ...children].filter(Boolean))).slice(0, 50)
-  }
-}
@@ -1,7 +0,0 @@
-import { ServerConnection } from "@/context/server"
-import type { Platform } from "@/context/platform"
-
-export function directoryPickerKind(platform: Platform["platform"], server: ServerConnection.Any) {
-  if (platform === "desktop" && ServerConnection.local(server)) return "native" as const
-  return "server" as const
-}
@@ -1,21 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { directoryPickerKind } from "./directory-picker-policy"
-
-const local = {
-  type: "sidecar",
-  variant: "base",
-  http: { url: "http://localhost:4096" },
-} as const
-const remote = {
-  type: "ssh",
-  host: "example.test",
-  http: { url: "http://localhost:4096" },
-} as const
-
-describe("directoryPickerKind", () => {
-  test("uses the native picker only for local desktop projects", () => {
-    expect(directoryPickerKind("desktop", local)).toBe("native")
-    expect(directoryPickerKind("desktop", remote)).toBe("server")
-    expect(directoryPickerKind("web", local)).toBe("server")
-  })
-})
@@ -1,45 +0,0 @@
-import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { ServerConnection } from "@/context/server"
-import { usePlatform } from "@/context/platform"
-import { useSettings } from "@/context/settings"
-import { lazy } from "solid-js"
-import { DialogSelectDirectory } from "./dialog-select-directory"
-import { directoryPickerKind } from "./directory-picker-policy"
-
-const DialogSelectDirectoryV2 = lazy(() =>
-  import("./dialog-select-directory-v2").then((module) => ({ default: module.DialogSelectDirectoryV2 })),
-)
-
-type DirectoryPickerInput = {
-  server: ServerConnection.Any
-  title?: string
-  multiple?: boolean
-  onSelect: (result: string | string[] | null) => void
-}
-
-export function useDirectoryPicker() {
-  const platform = usePlatform()
-  const settings = useSettings()
-  const dialog = useDialog()
-
-  return (input: DirectoryPickerInput) => {
-    if (directoryPickerKind(platform.platform, input.server) === "native" && platform.platform === "desktop") {
-      void platform.openDirectoryPickerDialog({ title: input.title, multiple: input.multiple }).then(input.onSelect)
-      return
-    }
-
-    let selected = false
-    const onSelect = (result: string | string[] | null) => {
-      selected = result !== null
-      input.onSelect(result)
-    }
-    const cancel = () => {
-      if (!selected) input.onSelect(null)
-    }
-    if (platform.platform === "desktop" && settings.general.newLayoutDesigns()) {
-      dialog.show(() => <DialogSelectDirectoryV2 {...input} onSelect={onSelect} />, cancel)
-      return
-    }
-    dialog.show(() => <DialogSelectDirectory {...input} onSelect={onSelect} />, cancel)
-  }
-}
@@ -8,8 +8,6 @@ beforeAll(async () => {
  mock.module("@solidjs/router", () => ({
    useNavigate: () => () => undefined,
    useParams: () => ({}),
-    useLocation: () => ({}),
-    useSearchParams: () => [{}, () => undefined],
  }))
  mock.module("@/context/file", () => ({
    useFile: () => ({
@@ -1,54 +0,0 @@
-import { Icon } from "@opencode-ai/ui/v2/icon"
-import { Popover } from "@opencode-ai/ui/popover"
-import { createSignal, Show } from "solid-js"
-import { createStore } from "solid-js/store"
-
-export function HelpButton() {
-  if (import.meta.env.VITE_OPENCODE_CHANNEL !== "dev") return null
-
-  const [state, setState] = /* persisted(Persist.global("help-button"), */ createStore({ dismissed: false }) /* ) */
-  const [shown, setShown] = createSignal(false)
-
-  return (
-    <Show when={!state.dismissed}>
-      <div class="fixed bottom-4 right-4 z-50">
-        <Popover
-          open={shown()}
-          onOpenChange={setShown}
-          triggerAs="button"
-          triggerProps={{
-            type: "button",
-            "aria-label": "Help",
-            class:
-              "size-7 rounded-full bg-background-base shadow-[var(--shadow-lg-border-base)] flex items-center justify-center text-text-base hover:text-text-strong transition-colors",
-          }}
-          trigger={<span aria-hidden="true">?</span>}
-          class="[&_[data-slot=popover-body]]:p-0 w-[320px] max-w-[calc(100vw-40px)] bg-transparent border-0 shadow-none rounded-xl"
-          gutter={8}
-          placement="top-end"
-        >
-          <Show when={shown()}>
-            <div class="relative flex flex-col gap-1 w-[320px] p-4 rounded-xl bg-background-strong shadow-[var(--shadow-lg-border-base)]">
-              <button
-                type="button"
-                aria-label="Close"
-                class="absolute top-3.5 right-3.5 size-6 rounded-md flex items-center justify-center text-text-base hover:text-text-strong hover:bg-surface-raised-base-hover transition-colors"
-                onClick={() => {
-                  setShown(false)
-                  setState("dismissed", true)
-                }}
-              >
-                <Icon name="xmark-small" />
-              </button>
-              <span class="text-14-regular text-text-strong">Lorem ipsum dolor sit amet</span>
-              <p class="text-12-regular text-text-weak">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et
-                dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation.
-              </p>
-            </div>
-          </Show>
-        </Popover>
-      </div>
-    </Show>
-  )
-}
@@ -1,23 +0,0 @@
-import { expect, test } from "bun:test"
-import { FileTree, type FileTreeDirectoryHandle } from "@pierre/trees"
-
-test("reports directory expansion changes", () => {
-  const changes: Array<{ path: string; expanded: boolean }> = []
-  const tree = new FileTree({
-    paths: ["src/"],
-    onExpansionChange: (change) => changes.push(change),
-  })
-
-  const src = tree.getItem("src/")
-  if (!src || !src.isDirectory()) throw new Error("Expected src to be a directory")
-  const directory = src as FileTreeDirectoryHandle
-
-  directory.expand()
-  directory.collapse()
-
-  expect(changes).toEqual([
-    { path: "src/", expanded: true },
-    { path: "src/", expanded: false },
-  ])
-  tree.cleanUp()
-})
@@ -1,117 +0,0 @@
-// @ts-nocheck
-import { createStore } from "solid-js/store"
-import { createPromptState } from "@/context/prompt"
-import { createPromptInputHistory, PromptInput } from "./prompt-input"
-
-function PromptInputExample() {
-  const state = createPromptState()
-  const history = createPromptInputHistory()
-  const [controls, setControls] = createStore({
-    agent: "build",
-    variant: undefined as string | undefined,
-    comments: 0,
-    tabs: [] as string[],
-    activeTab: undefined as string | undefined,
-    reviewOpen: false,
-  })
-  const model = {
-    current: () => ({ id: "claude-3-7-sonnet", name: "Claude 3.7 Sonnet", provider: { id: "anthropic" } }),
-    variant: {
-      list: () => ["fast", "thinking"],
-      current: () => controls.variant,
-      set: (variant?: string) => setControls("variant", variant),
-    },
-  }
-  const submission = {
-    abort() {},
-    handleSubmit(event: Event) {
-      event.preventDefault()
-      state.reset()
-    },
-  }
-  const inputControls = {
-    agents: {
-      available: [{ name: "review", hidden: false, mode: "subagent" }],
-      options: ["build", "review", "plan"],
-      get current() {
-        return controls.agent
-      },
-      loading: false,
-      visible: true,
-      select: (agent?: string) => setControls("agent", agent ?? "build"),
-    },
-    model: {
-      selection: model,
-      paid: true,
-      loading: false,
-    },
-    projects: {
-      available: [{ name: "Story project", worktree: "/tmp/story", sandboxes: [] }],
-      directory: "/tmp/story",
-      select() {},
-      add() {},
-    },
-    session: {
-      id: "story-session",
-      tabs: {
-        active: () => controls.activeTab,
-        all: () => controls.tabs,
-        open: (tab: string) => setControls("tabs", (tabs) => (tabs.includes(tab) ? tabs : [...tabs, tab])),
-        setActive: (tab: string) => setControls("activeTab", tab),
-      },
-      reviewPanel: {
-        opened: () => controls.reviewOpen,
-        open: () => setControls("reviewOpen", true),
-      },
-    },
-    newLayoutDesigns: true,
-  }
-  const addReviewComment = () => {
-    const comment = controls.comments + 1
-    setControls("comments", comment)
-    state.context.add({
-      type: "file",
-      path: "src/components/prompt-input.tsx",
-      selection: {
-        startLine: 84 + comment,
-        startChar: 0,
-        endLine: 84 + comment,
-        endChar: 0,
-      },
-      comment: `Review comment ${comment}`,
-      commentID: `review-comment-${comment}`,
-      commentOrigin: "review",
-      preview: "export const PromptInput = ...",
-    })
-  }
-
-  return (
-    <div class="flex flex-col gap-3">
-      <PromptInput controls={inputControls} state={state} history={history} submission={submission} />
-      <div>
-        <button
-          type="button"
-          class="rounded-md border border-border-weak-base bg-background-base px-2.5 py-1.5 text-12-medium text-text-base hover:bg-background-stronger"
-          onClick={addReviewComment}
-        >
-          Add review comment
-        </button>
-      </div>
-    </div>
-  )
-}
-
-export default {
-  title: "App/PromptInput",
-  id: "app-prompt-input",
-  component: PromptInput,
-}
-
-export const Basic = {
-  render: () => (
-    <div class="pt-10">
-      <h1 class="mb-4">Prompt Input</h1>
-      <PromptInputExample />
-    </div>
-  ),
-}
@@ -17,8 +17,8 @@ import {
  type JSX,
 } from "solid-js"
 import { Popover as KobaltePopover } from "@kobalte/core/popover"
-import { createStore, type SetStoreFunction, type Store } from "solid-js/store"
-import type { useLocal } from "@/context/local"
+import { createStore } from "solid-js/store"
+import { useLocal } from "@/context/local"
 import { selectionFromLines, type SelectedLineRange, useFile } from "@/context/file"
 import {
  ContentPart,
@@ -31,7 +31,9 @@ import {
  FileAttachmentPart,
 } from "@/context/prompt"
 import { useLayout } from "@/context/layout"
+import { useNavigate } from "@solidjs/router"
 import { useSDK } from "@/context/sdk"
+import { useServer } from "@/context/server"
 import { useSync } from "@/context/sync"
 import { useComments } from "@/context/comments"
 import { Button } from "@opencode-ai/ui/button"
@@ -43,15 +45,19 @@ import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Select } from "@opencode-ai/ui/select"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { ModelSelectorPopover } from "@/components/dialog-select-model"
+import { useProviders } from "@/hooks/use-providers"
 import { useCommand } from "@/context/command"
 import { Persist, persisted } from "@/utils/persist"
 import { usePermission } from "@/context/permission"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
+import { useSettings } from "@/context/settings"
+import { serverAttachmentFile } from "./prompt-input/server-attachment"
+import { useSessionLayout } from "@/pages/session/session-layout"
 import { createSessionTabs } from "@/pages/session/helpers"
 import { createTextFragment, getCursorPosition, setCursorPosition, setRangeEdge } from "./prompt-input/editor-dom"
 import { createPromptAttachments } from "./prompt-input/attachments"
-import { ACCEPTED_FILE_TYPES, pickAttachmentFiles } from "./prompt-input/files"
+import { ACCEPTED_FILE_TYPES } from "./prompt-input/files"
 import {
  canNavigateHistoryAtCursor,
  navigatePromptHistory,
@@ -67,104 +73,16 @@ import { PromptContextItems } from "./prompt-input/context-items"
 import { PromptImageAttachments } from "./prompt-input/image-attachments"
 import { PromptDragOverlay } from "./prompt-input/drag-overlay"
 import { promptPlaceholder } from "./prompt-input/placeholder"
-import { showToast } from "@/utils/toast"
 import { ImagePreview } from "@opencode-ai/ui/image-preview"
+import { useQueries } from "@tanstack/solid-query"
+import { useQueryOptions } from "@/context/server-sync"
 import { pathKey } from "@/utils/path-key"
+import { base64Encode } from "@opencode-ai/core/util/encode"
 import { displayName } from "@/pages/layout/helpers"

-export type PromptInputState = ReturnType<typeof usePrompt>
-
-export type PromptInputHistory = {
-  entries: (mode: "normal" | "shell") => PromptHistoryStoredEntry[]
-  add: (prompt: Prompt, mode: "normal" | "shell", comments: PromptHistoryComment[]) => void
-}
-
-export type PromptInputSubmission = {
-  abort: () => Promise<void> | void
-  handleSubmit: (event: Event) => Promise<void> | void
-}
-
-export type PromptInputControls = {
-  agents: {
-    available: { name: string; hidden?: boolean; mode: string }[]
-    options: string[]
-    current: string
-    loading: boolean
-    visible: boolean
-    select: (name: string | undefined) => void
-  }
-  model: {
-    selection: ReturnType<typeof useLocal>["model"]
-    paid: boolean
-    loading: boolean
-  }
-  projects: {
-    available: { name?: string; worktree: string; sandboxes?: string[] }[]
-    directory: string
-    select: (worktree: string) => void
-    add: (title: string) => void
-  }
-  session: {
-    id?: string
-    tabs: {
-      active: () => string | undefined
-      all: () => string[]
-      open: (tab: string) => void | Promise<void>
-      setActive: (tab: string) => void
-    }
-    reviewPanel: {
-      opened: () => boolean
-      open: () => void
-    }
-  }
-  newLayoutDesigns: boolean
-}
-
-export function createPromptInputHistory(): PromptInputHistory {
-  const [normal, setNormal] = createStore<PromptHistoryState>({ entries: [] })
-  const [shell, setShell] = createStore<PromptHistoryState>({ entries: [] })
-  return createPromptInputHistoryStore(normal, setNormal, shell, setShell)
-}
-
-type PromptHistoryState = { entries: PromptHistoryStoredEntry[] }
-
-function createPromptInputHistoryStore(
-  normal: Store<PromptHistoryState>,
-  setNormal: SetStoreFunction<PromptHistoryState>,
-  shell: Store<PromptHistoryState>,
-  setShell: SetStoreFunction<PromptHistoryState>,
-): PromptInputHistory {
-  return {
-    entries: (mode) => (mode === "shell" ? shell.entries : normal.entries),
-    add(prompt, mode, comments) {
-      const current = mode === "shell" ? shell : normal
-      const setCurrent = mode === "shell" ? setShell : setNormal
-      const next = prependHistoryEntry(current.entries, prompt, comments)
-      if (next === current.entries) return
-      setCurrent("entries", next)
-    },
-  }
-}
-
-function createPersistedPromptInputHistory() {
-  const [normal, setNormal] = persisted(
-    Persist.global("prompt-history", ["prompt-history.v1"]),
-    createStore<PromptHistoryState>({ entries: [] }),
-  )
-  const [shell, setShell] = persisted(
-    Persist.global("prompt-history-shell", ["prompt-history-shell.v1"]),
-    createStore<PromptHistoryState>({ entries: [] }),
-  )
-  return createPromptInputHistoryStore(normal, setNormal, shell, setShell)
-}
-
-export interface PromptInputProps {
+interface PromptInputProps {
  class?: string
  variant?: "dock" | "new-session"
-  state?: PromptInputState
-  history?: PromptInputHistory
-  submission?: PromptInputSubmission
-  controls: PromptInputControls
  ref?: (el: HTMLDivElement) => void
  newSessionWorktree?: string
  onNewSessionWorktreeReset?: () => void
@@ -206,18 +124,24 @@ const EXAMPLES = [

 export const PromptInput: Component<PromptInputProps> = (props) => {
  const sdk = useSDK()
+  const navigate = useNavigate()
+  const queryOptions = useQueryOptions()

  const sync = useSync()
+  const local = useLocal()
  const files = useFile()
-  const prompt = props.state ?? usePrompt()
+  const prompt = usePrompt()
  const layout = useLayout()
+  const server = useServer()
  const comments = useComments()
  const dialog = useDialog()
+  const providers = useProviders()
  const command = useCommand()
  const permission = usePermission()
  const language = useLanguage()
  const platform = usePlatform()
-  const tabs = () => props.controls.session.tabs
+  const settings = useSettings()
+  const { params, tabs, view } = useSessionLayout()
  let editorRef!: HTMLDivElement
  let fileInputRef: HTMLInputElement | undefined
  let scrollRef!: HTMLDivElement
@@ -275,10 +199,10 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  }).activeFileTab

  const commentInReview = (path: string) => {
-    const sessionID = props.controls.session.id
+    const sessionID = params.id
    if (!sessionID) return false

-    const diffs = sync().data.session_diff[sessionID]
+    const diffs = sync.data.session_diff[sessionID]
    if (!diffs) return false
    return diffs.some((diff) => diff.file === path)
  }
@@ -308,14 +232,14 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

    const wantsReview = item.commentOrigin === "review" || (item.commentOrigin !== "file" && commentInReview(item.path))
    if (wantsReview) {
-      if (!props.controls.session.reviewPanel.opened()) props.controls.session.reviewPanel.open()
+      if (!view().reviewPanel.opened()) view().reviewPanel.open()
      layout.fileTree.setTab("changes")
      tabs().setActive("review")
      queueCommentFocus()
      return
    }

-    if (!props.controls.session.reviewPanel.opened()) props.controls.session.reviewPanel.open()
+    if (!view().reviewPanel.opened()) view().reviewPanel.open()
    layout.fileTree.setTab("all")
    const tab = files.tab(item.path)
    void tabs().open(tab)
@@ -340,8 +264,8 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

    return paths
  })
-  const info = createMemo(() => (props.controls.session.id ? sync().session.get(props.controls.session.id) : undefined))
-  const working = createMemo(() => sync().data.session_working(props.controls.session.id ?? ""))
+  const info = createMemo(() => (params.id ? sync.session.get(params.id) : undefined))
+  const working = createMemo(() => sync.data.session_working(params.id ?? ""))
  const imageAttachments = createMemo(() =>
    prompt.current().filter((part): part is ImageAttachmentPart => part.type === "image"),
  )
@@ -418,14 +342,29 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  })

  const hasUserPrompt = createMemo(() => {
-    const sessionID = props.controls.session.id
+    const sessionID = params.id
    if (!sessionID) return false
-    const messages = sync().data.message[sessionID]
+    const messages = sync.data.message[sessionID]
    if (!messages) return false
    return messages.some((m) => m.role === "user")
  })

-  const history = props.history ?? createPersistedPromptInputHistory()
+  const [history, setHistory] = persisted(
+    Persist.global("prompt-history", ["prompt-history.v1"]),
+    createStore<{
+      entries: PromptHistoryStoredEntry[]
+    }>({
+      entries: [],
+    }),
+  )
+  const [shellHistory, setShellHistory] = persisted(
+    Persist.global("prompt-history-shell", ["prompt-history-shell.v1"]),
+    createStore<{
+      entries: PromptHistoryStoredEntry[]
+    }>({
+      entries: [],
+    }),
+  )

  const suggest = createMemo(() => !hasUserPrompt())

@@ -528,18 +467,23 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  const escBlur = () => platform.platform === "desktop" && platform.os === "macos"

  const pick = () => {
-    pickAttachmentFiles({
-      picker: platform.openAttachmentPickerDialog,
-      directory: () => sdk().directory,
-      fallback: () => fileInputRef?.click(),
-      onFile: addAttachment,
-      onError: (error) =>
-        showToast({
-          variant: "error",
-          title: language.t("common.requestFailed"),
-          description: error instanceof Error ? error.message : String(error),
-        }),
-    })
+    if (server.isLocal()) {
+      fileInputRef?.click()
+      return
+    }
+    void import("@/components/dialog-select-file").then((module) =>
+      dialog.show(() => (
+        <module.DialogSelectFile
+          mode="files"
+          onSelectFile={(path) => {
+            void sdk.client.v2.fs
+              .read({ path })
+              .then((response) => response.data?.data)
+              .then((data) => data && addAttachments([serverAttachmentFile(path, data)]))
+          }}
+        />
+      )),
+    )
  }

  const setMode = (mode: "normal" | "shell") => {
@@ -629,8 +573,8 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  }

  createEffect(() => {
-    props.controls.session.id
-    if (props.controls.session.id) return
+    params.id
+    if (params.id) return
    if (!suggest()) return
    const interval = setInterval(() => {
      setStore("placeholder", (prev) => (prev + 1) % EXAMPLES.length)
@@ -659,10 +603,11 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  }

  const agentList = createMemo(() =>
-    props.controls.agents.available
+    sync.data.agent
      .filter((agent) => !agent.hidden && agent.mode !== "primary")
      .map((agent): AtOption => ({ type: "agent", name: agent.name, display: agent.name })),
  )
+  const agentNames = createMemo(() => local.agent.list().map((agent) => agent.name))

  const handleAtSelect = (option: AtOption | undefined) => {
    if (!option) return
@@ -699,7 +644,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    },
    key: atKey,
    filterKeys: ["display"],
-    skipFilter: (item) => item.type === "file" && !item.recent,
    groupBy: (item) => {
      if (item.type === "agent") return "agent"
      if (item.recent) return "recent"
@@ -728,7 +672,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
        type: "builtin" as const,
      }))

-    const custom = sync().data.command.map((cmd) => ({
+    const custom = sync.data.command.map((cmd) => ({
      id: `custom.${cmd.name}`,
      trigger: cmd.name,
      title: cmd.name,
@@ -1088,7 +1032,11 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  }

  const addToHistory = (prompt: Prompt, mode: "normal" | "shell") => {
-    history.add(prompt, mode, mode === "shell" ? [] : historyComments())
+    const currentHistory = mode === "shell" ? shellHistory : history
+    const setCurrentHistory = mode === "shell" ? setShellHistory : setHistory
+    const next = prependHistoryEntry(currentHistory.entries, prompt, mode === "shell" ? [] : historyComments())
+    if (next === currentHistory.entries) return
+    setCurrentHistory("entries", next)
  }

  createEffect(
@@ -1133,7 +1081,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  const navigateHistory = (direction: "up" | "down") => {
    const result = navigatePromptHistory({
      direction,
-      entries: history.entries(store.mode),
+      entries: store.mode === "shell" ? shellHistory.entries : history.entries,
      historyIndex: store.historyIndex,
      currentPrompt: prompt.current(),
      currentComments: historyComments(),
@@ -1146,8 +1094,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    return true
  }

-  const { addAttachment, addAttachments, removeAttachment, handlePaste } = createPromptAttachments({
-    prompt,
+  const { addAttachments, removeAttachment, handlePaste } = createPromptAttachments({
    editor: () => editorRef,
    isDialogActive: () => !!dialog.active,
    setDraggingType: (type) => setStore("draggingType", type),
@@ -1157,7 +1104,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    },
    addPart,
    readClipboardImage: platform.readClipboardImage,
-    getPathForFile: platform.getPathForFile,
  })

  const fileAttachmentInput = () => (
@@ -1175,41 +1121,38 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    />
  )

-  const variants = createMemo(() => ["default", ...props.controls.model.selection.variant.list()])
+  const variants = createMemo(() => ["default", ...local.model.variant.list()])
  // Check provider variants directly: `variants` also includes the UI-only default option.
-  const showVariantControl = createMemo(() => props.controls.model.selection.variant.list().length > 0)
+  const showVariantControl = createMemo(() => local.model.variant.list().length > 0)
  const accepting = createMemo(() => {
-    const id = props.controls.session.id
-    if (!id) return permission.isAutoAcceptingDirectory(sdk().directory)
-    return permission.isAutoAccepting(id, sdk().directory)
+    const id = params.id
+    if (!id) return permission.isAutoAcceptingDirectory(sdk.directory)
+    return permission.isAutoAccepting(id, sdk.directory)
  })

-  const { abort, handleSubmit } =
-    props.submission ??
-    createPromptSubmit({
-      prompt,
-      info,
-      imageAttachments,
-      commentCount,
-      autoAccept: () => accepting(),
-      mode: () => store.mode,
-      working,
-      editor: () => editorRef,
-      queueScroll,
-      promptLength,
-      addToHistory,
-      resetHistoryNavigation: () => {
-        resetHistoryNavigation(true)
-      },
-      setMode: (mode) => setStore("mode", mode),
-      setPopover: (popover) => setStore("popover", popover),
-      newSessionWorktree: () => props.newSessionWorktree,
-      onNewSessionWorktreeReset: props.onNewSessionWorktreeReset,
-      shouldQueue: props.shouldQueue,
-      onQueue: props.onQueue,
-      onAbort: props.onAbort,
-      onSubmit: props.onSubmit,
-    })
+  const { abort, handleSubmit } = createPromptSubmit({
+    info,
+    imageAttachments,
+    commentCount,
+    autoAccept: () => accepting(),
+    mode: () => store.mode,
+    working,
+    editor: () => editorRef,
+    queueScroll,
+    promptLength,
+    addToHistory,
+    resetHistoryNavigation: () => {
+      resetHistoryNavigation(true)
+    },
+    setMode: (mode) => setStore("mode", mode),
+    setPopover: (popover) => setStore("popover", popover),
+    newSessionWorktree: () => props.newSessionWorktree,
+    onNewSessionWorktreeReset: props.onNewSessionWorktreeReset,
+    shouldQueue: props.shouldQueue,
+    onQueue: props.onQueue,
+    onAbort: props.onAbort,
+    onSubmit: props.onSubmit,
+  })

  const handleKeyDown = (event: KeyboardEvent) => {
    if ((event.metaKey || event.ctrlKey) && !event.altKey && !event.shiftKey && event.key.toLowerCase() === "u") {
@@ -1373,9 +1316,17 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    }
  }

-  const agentsLoading = () => props.controls.agents.loading
+  const [agentsQuery, globalProvidersQuery, providersQuery] = useQueries(() => ({
+    queries: [
+      queryOptions.agents(pathKey(sdk.directory)),
+      queryOptions.providers(null),
+      queryOptions.providers(pathKey(sdk.directory)),
+    ],
+  }))
+
+  const agentsLoading = () => agentsQuery.isLoading
  const agentsShouldFadeIn = createMemo((prev) => prev ?? agentsLoading())
-  const providersLoading = () => props.controls.model.loading
+  const providersLoading = () => agentsLoading() || providersQuery.isLoading || globalProvidersQuery.isLoading
  const providersShouldFadeIn = createMemo((prev) => prev ?? providersLoading())

  const [promptReady] = createResource(
@@ -1390,23 +1341,23 @@ export const PromptInput: Component<PromptInputProps> = (props) => {

  const modelControlState = createMemo<ComposerModelControlState>(() => ({
    loading: providersLoading(),
-    paid: props.controls.model.paid,
+    paid: providers.paid().length > 0,
    title: language.t("command.model.choose"),
    keybind: command.keybind("model.choose"),
-    model: props.controls.model.selection,
-    providerID: props.controls.model.selection.current()?.provider?.id,
-    modelName: props.controls.model.selection.current()?.name ?? language.t("dialog.model.select.title"),
+    model: local.model,
+    providerID: local.model.current()?.provider?.id,
+    modelName: local.model.current()?.name ?? language.t("dialog.model.select.title"),
    style: control(),
    onClose: restoreFocus,
    onUnpaidClick: () => {
      void import("@/components/dialog-select-model-unpaid").then((x) => {
-        dialog.show(() => <x.DialogSelectModelUnpaid model={props.controls.model.selection} />)
+        dialog.show(() => <x.DialogSelectModelUnpaid model={local.model} />)
      })
    },
  }))

  const newSession = () => props.variant === "new-session"
-  const projects = createMemo(() => props.controls.projects.available)
+  const projects = createMemo(() => layout.projects.list())
  const projectForDirectory = (directory: string | undefined) => {
    if (!directory) return
    const key = pathKey(directory)
@@ -1414,13 +1365,13 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      (project) => pathKey(project.worktree) === key || project.sandboxes?.some((sandbox) => pathKey(sandbox) === key),
    )
  }
-  const selectedProject = createMemo(() => projectForDirectory(props.controls.projects.directory))
+  const selectedProject = createMemo(() => projectForDirectory(sdk.directory))
  const projectResults = createMemo(() => {
    const search = picker.projectSearch.trim().toLowerCase()
    if (!search) return projects()
    return projects().filter((project) => displayName(project).toLowerCase().includes(search))
  })
-  const showAgentControl = createMemo(() => props.controls.agents.visible && props.controls.agents.options.length > 0)
+  const showAgentControl = createMemo(() => settings.general.showCustomAgents() && agentNames().length > 0)
  const selectProject = (worktree: string) => {
    setPicker({
      projectOpen: false,
@@ -1430,11 +1381,28 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
      restoreFocus()
      return
    }
-    props.controls.projects.select(worktree)
-    restoreFocus()
+    layout.projects.open(worktree)
+    server.projects.touch(worktree)
+    navigate(`/${base64Encode(worktree)}/session`)
  }
-  const addProject = () => {
-    props.controls.projects.add(language.t("command.project.open"))
+  const addProject = async () => {
+    const conn = server.current
+    if (!conn) return
+    const select = (result: string | string[] | null) => {
+      const directory = Array.isArray(result) ? result[0] : result
+      if (!directory) return
+      selectProject(directory)
+    }
+    if (platform.openDirectoryPickerDialog && server.isLocal()) {
+      select(await platform.openDirectoryPickerDialog({ title: language.t("command.project.open") }))
+      return
+    }
+    void import("@/components/dialog-select-directory").then((x) => {
+      dialog.show(
+        () => <x.DialogSelectDirectory onSelect={select} server={conn} />,
+        () => select(null),
+      )
+    })
  }

  const projectPickerState = createMemo<ComposerPickerState>(() => ({
@@ -1475,11 +1443,11 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
  const agentControlState = createMemo<ComposerAgentControlState>(() => ({
    title: language.t("command.agent.cycle"),
    keybind: command.keybind("agent.cycle"),
-    options: props.controls.agents.options,
-    current: props.controls.agents.current,
+    options: agentNames(),
+    current: local.agent.current()?.name ?? "",
    style: control(),
    onSelect: (value) => {
-      props.controls.agents.select(value)
+      local.agent.set(value)
      restoreFocus()
    },
  }))
@@ -1511,7 +1479,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
        t={(key) => language.t(key as Parameters<typeof language.t>[0])}
      />
      <Switch>
-        <Match when={props.controls.newLayoutDesigns}>
+        <Match when={settings.general.newLayoutDesigns()}>
          <div class="flex flex-col gap-3">
            <DockShellForm
              data-component={newSession() ? "session-new-composer" : "session-composer"}
@@ -1631,7 +1599,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                      data-component="prompt-variant-control"
                      classList={{
                        "hidden group-hover/prompt-input:block group-focus-within/prompt-input:block":
-                          !props.controls.model.selection.variant.current() && !store.variantOpen,
+                          !local.model.variant.current() && !store.variantOpen,
                      }}
                    >
                      <TooltipKeybind
@@ -1643,11 +1611,11 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                        <Select
                          size="normal"
                          options={variants()}
-                          current={props.controls.model.selection.variant.current() ?? "default"}
+                          current={local.model.variant.current() ?? "default"}
                          label={(x) => (x === "default" ? language.t("common.default") : x)}
                          onOpenChange={(open) => setStore("variantOpen", open)}
                          onSelect={(value) => {
-                            props.controls.model.selection.variant.set(value === "default" ? undefined : value)
+                            local.model.variant.set(value === "default" ? undefined : value)
                            restoreFocus()
                          }}
                          class="capitalize max-w-[160px] justify-start text-v2-text-text-faint"
@@ -1887,10 +1855,10 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                        >
                          <Select
                            size="normal"
-                            options={props.controls.agents.options}
-                            current={props.controls.agents.current}
+                            options={agentNames()}
+                            current={local.agent.current()?.name ?? ""}
                            onSelect={(value) => {
-                              props.controls.agents.select(value)
+                              local.agent.set(value)
                              restoreFocus()
                            }}
                            class="capitalize max-w-[160px] text-text-base"
@@ -1909,7 +1877,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                          style={providersShouldFadeIn() ? { animation: "fade-in 0.3s" } : undefined}
                        >
                          <Show
-                            when={props.controls.model.paid}
+                            when={providers.paid().length > 0}
                            fallback={
                              <TooltipKeybind
                                placement="top"
@@ -1926,22 +1894,19 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                                  style={control()}
                                  onClick={() => {
                                    void import("@/components/dialog-select-model-unpaid").then((x) => {
-                                      dialog.show(() => (
-                                        <x.DialogSelectModelUnpaid model={props.controls.model.selection} />
-                                      ))
+                                      dialog.show(() => <x.DialogSelectModelUnpaid model={local.model} />)
                                    })
                                  }}
                                >
-                                  <Show when={props.controls.model.selection.current()?.provider?.id}>
+                                  <Show when={local.model.current()?.provider?.id}>
                                    <ProviderIcon
-                                      id={props.controls.model.selection.current()?.provider?.id ?? ""}
+                                      id={local.model.current()?.provider?.id ?? ""}
                                      class="size-4 shrink-0 opacity-40 group-hover:opacity-100 transition-opacity duration-150"
                                      style={{ "will-change": "opacity", transform: "translateZ(0)" }}
                                    />
                                  </Show>
                                  <span class="truncate">
-                                    {props.controls.model.selection.current()?.name ??
-                                      language.t("dialog.model.select.title")}
+                                    {local.model.current()?.name ?? language.t("dialog.model.select.title")}
                                  </span>
                                  <Icon name="chevron-down" size="small" class="shrink-0" />
                                </Button>
@@ -1955,7 +1920,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                              keybind={command.keybind("model.choose")}
                            >
                              <ModelSelectorPopover
-                                model={props.controls.model.selection}
+                                model={local.model}
                                triggerAs={Button}
                                triggerProps={{
                                  variant: "ghost",
@@ -1966,16 +1931,15 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                                }}
                                onClose={restoreFocus}
                              >
-                                <Show when={props.controls.model.selection.current()?.provider?.id}>
+                                <Show when={local.model.current()?.provider?.id}>
                                  <ProviderIcon
-                                    id={props.controls.model.selection.current()?.provider?.id ?? ""}
+                                    id={local.model.current()?.provider?.id ?? ""}
                                    class="size-4 shrink-0 opacity-40 group-hover:opacity-100 transition-opacity duration-150"
                                    style={{ "will-change": "opacity", transform: "translateZ(0)" }}
                                  />
                                </Show>
                                <span class="truncate">
-                                  {props.controls.model.selection.current()?.name ??
-                                    language.t("dialog.model.select.title")}
+                                  {local.model.current()?.name ?? language.t("dialog.model.select.title")}
                                </span>
                                <Icon name="chevron-down" size="small" class="shrink-0" />
                              </ModelSelectorPopover>
@@ -1996,10 +1960,10 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                              <Select
                                size="normal"
                                options={variants()}
-                                current={props.controls.model.selection.variant.current() ?? "default"}
+                                current={local.model.variant.current() ?? "default"}
                                label={(x) => (x === "default" ? language.t("common.default") : x)}
                                onSelect={(value) => {
-                                  props.controls.model.selection.variant.set(value === "default" ? undefined : value)
+                                  local.model.variant.set(value === "default" ? undefined : value)
                                  restoreFocus()
                                }}
                                class="capitalize max-w-[160px] text-text-base"
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { attachmentMime, pickAttachmentFiles } from "./files"
+import { attachmentMime } from "./files"
 import { pasteMode } from "./paste"

 describe("attachmentMime", () => {
@@ -24,70 +24,6 @@ describe("attachmentMime", () => {
  })
 })

-describe("pickAttachmentFiles", () => {
-  test("reads the current project directory for every native picker invocation", async () => {
-    const paths: string[] = []
-    const files: File[] = []
-    const file = new File(["hello"], "hello.txt", { type: "text/plain" })
-    let directory = "C:\\Projects\\LoremIpsum"
-    const picker = async (options?: { defaultPath?: string }, onFile?: (file: File) => Promise<unknown>) => {
-      paths.push(options?.defaultPath ?? "")
-      await onFile?.(file)
-    }
-
-    pickAttachmentFiles({
-      picker,
-      directory: () => directory,
-      fallback: () => undefined,
-      onFile: async (selected) => files.push(selected),
-      onError: () => undefined,
-    })
-    await Promise.resolve()
-    directory = "C:\\Projects\\DolorSit"
-    pickAttachmentFiles({
-      picker,
-      directory: () => directory,
-      fallback: () => undefined,
-      onFile: async (selected) => files.push(selected),
-      onError: () => undefined,
-    })
-    await Promise.resolve()
-    expect(files).toEqual([file, file])
-    expect(paths).toEqual(["C:\\Projects\\LoremIpsum", "C:\\Projects\\DolorSit"])
-  })
-
-  test("uses the browser file input when no native picker exists", async () => {
-    let fallback = 0
-    pickAttachmentFiles({
-      directory: () => "/projects/consectetur-adipiscing",
-      fallback: () => {
-        fallback += 1
-      },
-      onFile: async () => undefined,
-      onError: () => undefined,
-    })
-    expect(fallback).toBe(1)
-  })
-
-  test("reports native picker failures without rejecting", async () => {
-    const error = new Error("picker unavailable")
-    const errors: unknown[] = []
-    const handled = Promise.withResolvers<void>()
-    pickAttachmentFiles({
-      picker: async () => Promise.reject(error),
-      directory: () => "C:\\Projects\\LoremIpsum",
-      fallback: () => undefined,
-      onFile: async () => undefined,
-      onError: (cause) => {
-        errors.push(cause)
-        handled.resolve()
-      },
-    })
-    await handled.promise
-    expect(errors).toEqual([error])
-  })
-})
-
 describe("pasteMode", () => {
  test("uses native paste for short single-line text", () => {
    expect(pasteMode("hello world")).toBe("native")
@@ -1,7 +1,7 @@
 import { onMount } from "solid-js"
 import { makeEventListener } from "@solid-primitives/event-listener"
 import { showToast } from "@/utils/toast"
-import { type ContentPart, type ImageAttachmentPart, type usePrompt } from "@/context/prompt"
+import { usePrompt, type ContentPart, type ImageAttachmentPart } from "@/context/prompt"
 import { useLanguage } from "@/context/language"
 import { uuid } from "@/utils/uuid"
 import { getCursorPosition } from "./editor-dom"
@@ -26,18 +26,16 @@ function dataUrl(file: File, mime: string) {
 }

 type PromptAttachmentsInput = {
-  prompt: ReturnType<typeof usePrompt>
  editor: () => HTMLDivElement | undefined
  isDialogActive: () => boolean
  setDraggingType: (type: "image" | "@mention" | null) => void
  focusEditor: () => void
  addPart: (part: ContentPart) => boolean
  readClipboardImage?: () => Promise<File | null>
-  getPathForFile?: (file: File) => string
 }

 export function createPromptAttachments(input: PromptAttachmentsInput) {
-  const prompt = input.prompt
+  const prompt = usePrompt()
  const language = useLanguage()

  const warn = () => {
@@ -64,7 +62,6 @@ export function createPromptAttachments(input: PromptAttachmentsInput) {
      type: "image",
      id: uuid(),
      filename: file.name,
-      sourcePath: input.getPathForFile?.(file) || undefined,
      mime,
      dataUrl: url,
    }
@@ -75,31 +75,6 @@ describe("buildRequestParts", () => {
    expect(files.map((part) => (part.type === "file" ? part.filename : ""))).toEqual(["a.png", "b.pdf"])
  })

-  test("preserves an external attachment source path for the model", () => {
-    const result = buildRequestParts({
-      prompt: [],
-      context: [],
-      images: [
-        {
-          type: "image",
-          id: "img_external",
-          filename: "opencode.global.dat",
-          sourcePath: "C:\\Users\\Luke\\AppData\\Roaming\\ai.opencode.desktop.beta\\opencode.global.dat",
-          mime: "text/plain",
-          dataUrl: "data:text/plain;base64,AAA",
-        },
-      ],
-      text: "inspect this",
-      messageID: "msg_external",
-      sessionID: "ses_external",
-      sessionDirectory: "C:\\Repos\\sst\\opencode",
-    })
-
-    expect(result.requestParts.find((part) => part.type === "file")?.filename).toBe(
-      "C:\\Users\\Luke\\AppData\\Roaming\\ai.opencode.desktop.beta\\opencode.global.dat",
-    )
-  })
-
  test("deduplicates context files when prompt already includes same path", () => {
    const prompt: Prompt = [{ type: "file", path: "src/foo.ts", content: "@src/foo.ts", start: 0, end: 11 }]

@@ -188,7 +188,7 @@ export function buildRequestParts(input: BuildRequestPartsInput) {
      type: "file",
      mime: attachment.mime,
      url: attachment.dataUrl,
-      filename: attachment.sourcePath ?? attachment.filename,
+      filename: attachment.filename,
    } satisfies PromptRequestPart
  })

@@ -50,7 +50,7 @@ export const PromptContextItems: Component<ContextItemsProps> = (props) => {
                >
                  <div class="flex items-center gap-1.5">
                    <FileIcon node={{ path: item.path, type: "file" }} class="shrink-0 size-3.5" />
-                    <div class="flex items-center text-[12px] min-w-0 font-medium leading-5">
+                    <div class="flex items-center text-11-regular min-w-0 font-medium">
                      <span class="text-text-strong whitespace-nowrap">{label}</span>
                      <Show when={item.selection}>
                        {(sel) => (
@@ -2,38 +2,6 @@ import { ACCEPTED_FILE_TYPES, ACCEPTED_IMAGE_TYPES } from "@/constants/file-pick

 export { ACCEPTED_FILE_TYPES }

-type AttachmentPicker = (
-  options: {
-    defaultPath?: string
-    multiple?: boolean
-    accept?: string[]
-  },
-  onFile: (file: File) => Promise<unknown>,
-) => Promise<void>
-
-export function pickAttachmentFiles(input: {
-  picker?: AttachmentPicker
-  directory: () => string
-  fallback: () => void
-  onFile: (file: File) => Promise<unknown>
-  onError: (error: unknown) => void
-}) {
-  if (!input.picker) {
-    input.fallback()
-    return
-  }
-  void input
-    .picker(
-      {
-        defaultPath: input.directory(),
-        multiple: true,
-        accept: ACCEPTED_FILE_TYPES,
-      },
-      input.onFile,
-    )
-    .catch(input.onError)
-}
-
 const IMAGE_MIMES = new Set(ACCEPTED_IMAGE_TYPES)
 const IMAGE_EXTS = new Map([
  ["gif", "image/gif"],
@@ -0,0 +1,25 @@
+import { describe, expect, test } from "bun:test"
+import { serverAttachmentFile } from "./server-attachment"
+
+describe("serverAttachmentFile", () => {
+  test("creates a file from server text content", async () => {
+    const file = serverAttachmentFile("docs/readme.txt", { type: "text", content: "hello", mime: "text/plain" })
+
+    expect(file.name).toBe("readme.txt")
+    expect(file.type).toBe("text/plain")
+    expect(await file.text()).toBe("hello")
+  })
+
+  test("creates a file from server base64 content", async () => {
+    const file = serverAttachmentFile("images/pixel.png", {
+      type: "binary",
+      content: "aGVsbG8=",
+      encoding: "base64",
+      mime: "image/png",
+    })
+
+    expect(file.name).toBe("pixel.png")
+    expect(file.type).toBe("image/png")
+    expect(await file.text()).toBe("hello")
+  })
+})
@@ -0,0 +1,8 @@
+import { getFilename } from "@opencode-ai/core/util/path"
+import type { FileSystemBinaryContent, FileSystemTextContent } from "@opencode-ai/sdk/v2"
+
+export function serverAttachmentFile(path: string, data: FileSystemTextContent | FileSystemBinaryContent) {
+  const content =
+    data.type === "text" ? data.content : Uint8Array.from(atob(data.content), (char) => char.charCodeAt(0))
+  return new File([content], getFilename(path), { type: data.mime })
+}
@@ -26,22 +26,6 @@ let selected = "/repo/worktree-a"
 let variant: string | undefined

 const promptValue: Prompt = [{ type: "text", content: "ls", start: 0, end: 2 }]
-const prompt = {
-  ready: () => Object.assign(() => true, { promise: Promise.resolve(true) }),
-  current: () => promptValue,
-  cursor: () => 0,
-  dirty: () => true,
-  reset: () => undefined,
-  set: () => undefined,
-  context: {
-    add: () => undefined,
-    remove: () => undefined,
-    removeComment: () => undefined,
-    updateComment: () => undefined,
-    replaceComments: () => undefined,
-    items: () => [],
-  },
-}

 const clientFor = (directory: string) => {
  createdClients.push(directory)
@@ -77,8 +61,6 @@ beforeAll(async () => {
  mock.module("@solidjs/router", () => ({
    useNavigate: () => () => undefined,
    useParams: () => params,
-    useLocation: () => ({}),
-    useSearchParams: () => [{}, () => undefined],
  }))

  mock.module("@opencode-ai/sdk/v2/client", () => ({
@@ -89,7 +71,6 @@ beforeAll(async () => {
  }))

  mock.module("@opencode-ai/ui/toast", () => ({
-    Toast: { Region: () => null },
    showToast: () => 0,
  }))

@@ -122,18 +103,17 @@ beforeAll(async () => {
    }),
  }))

-  mock.module("@/context/server", () => ({
-    useServer: () => ({ key: "server-key" }),
-  }))
-
-  mock.module("@/context/tabs", () => ({
-    useTabs: () => ({
-      promoteDraft: () => undefined,
-    }),
-  }))
-
  mock.module("@/context/prompt", () => ({
-    usePrompt: () => prompt,
+    usePrompt: () => ({
+      current: () => promptValue,
+      reset: () => undefined,
+      set: () => undefined,
+      context: {
+        add: () => undefined,
+        remove: () => undefined,
+        items: () => [],
+      },
+    }),
  }))

  mock.module("@/context/layout", () => ({
@@ -155,12 +135,12 @@ beforeAll(async () => {
          return clientFor(opts.directory)
        },
      }
-      return () => sdk
+      return sdk
    },
  }))

  mock.module("@/context/sync", () => ({
-    useSync: () => () => ({
+    useSync: () => ({
      data: { command: [] },
      session: {
        optimistic: {
@@ -184,7 +164,7 @@ beforeAll(async () => {
  }))

  mock.module("@/context/server-sync", () => ({
-    useServerSync: () => () => ({
+    useServerSync: () => ({
      child: (directory: string) => {
        syncedDirectories.push(directory)
        storedSessions[directory] ??= []
@@ -240,7 +220,6 @@ beforeEach(() => {
 describe("prompt submit worktree selection", () => {
  test("reads the latest worktree accessor value per submit", async () => {
    const submit = createPromptSubmit({
-      prompt,
      info: () => undefined,
      imageAttachments: () => [],
      commentCount: () => 0,
@@ -278,7 +257,6 @@ describe("prompt submit worktree selection", () => {

  test("applies auto-accept to newly created sessions", async () => {
    const submit = createPromptSubmit({
-      prompt,
      info: () => undefined,
      imageAttachments: () => [],
      commentCount: () => 0,
@@ -309,7 +287,6 @@ describe("prompt submit worktree selection", () => {
    variant = "high"

    const submit = createPromptSubmit({
-      prompt,
      info: () => ({ id: "session-1" }),
      imageAttachments: () => [],
      commentCount: () => 0,
@@ -341,7 +318,6 @@ describe("prompt submit worktree selection", () => {

  test("seeds new sessions before optimistic prompts are added", async () => {
    const submit = createPromptSubmit({
-      prompt,
      info: () => undefined,
      imageAttachments: () => [],
      commentCount: () => 0,
@@ -2,19 +2,17 @@ import type { Message, Session } from "@opencode-ai/sdk/v2/client"
 import { showToast } from "@/utils/toast"
 import { base64Encode } from "@opencode-ai/core/util/encode"
 import { Binary } from "@opencode-ai/core/util/binary"
-import { useNavigate, useParams, useSearchParams } from "@solidjs/router"
+import { useNavigate, useParams } from "@solidjs/router"
 import { batch, type Accessor } from "solid-js"
 import type { FileSelection } from "@/context/file"
-import { useServer } from "@/context/server"
-import { useTabs } from "@/context/tabs"
-import { useServerSync, type ServerSync } from "@/context/server-sync"
+import { useServerSync } from "@/context/server-sync"
 import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
 import { useLocal } from "@/context/local"
 import { usePermission } from "@/context/permission"
-import { type ContextItem, type ImageAttachmentPart, type Prompt, type usePrompt } from "@/context/prompt"
-import { useSDK, type DirectorySDK } from "@/context/sdk"
-import { useSync, type DirectorySync } from "@/context/sync"
+import { type ContextItem, type ImageAttachmentPart, type Prompt, usePrompt } from "@/context/prompt"
+import { useSDK } from "@/context/sdk"
+import { useSync } from "@/context/sync"
 import { Identifier } from "@/utils/id"
 import { Worktree as WorktreeState } from "@/utils/worktree"
 import { buildRequestParts } from "./build-request-parts"
@@ -40,9 +38,9 @@ export type FollowupDraft = {
 }

 type FollowupSendInput = {
-  client: DirectorySDK["client"]
-  serverSync: ServerSync
-  sync: DirectorySync
+  client: ReturnType<typeof useSDK>["client"]
+  serverSync: ReturnType<typeof useServerSync>
+  sync: ReturnType<typeof useSync>
  draft: FollowupDraft
  messageID?: string
  optimisticBusy?: boolean
@@ -174,7 +172,6 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
 }

 type PromptSubmitInput = {
-  prompt: ReturnType<typeof usePrompt>
  info: Accessor<{ id: string } | undefined>
  imageAttachments: Accessor<ImageAttachmentPart[]>
  commentCount: Accessor<number>
@@ -212,14 +209,11 @@ export function createPromptSubmit(input: PromptSubmitInput) {
  const serverSync = useServerSync()
  const local = useLocal()
  const permission = usePermission()
-  const prompt = input.prompt
+  const prompt = usePrompt()
  const layout = useLayout()
  const language = useLanguage()
  const params = useParams()
-  const [search] = useSearchParams<{ draftId?: string }>()
-  const server = useServer()
-  const tabs = useTabs()
-  const pendingKey = (sessionID: string) => ScopedKey.from(sdk().scope, sessionID)
+  const pendingKey = (sessionID: string) => ScopedKey.from(sdk.scope, sessionID)

  const errorMessage = (err: unknown) => {
    if (err && typeof err === "object" && "data" in err) {
@@ -234,8 +228,8 @@ export function createPromptSubmit(input: PromptSubmitInput) {
    const sessionID = params.id
    if (!sessionID) return Promise.resolve()

-    serverSync().todo.set(sessionID, [])
-    const [, setStore] = serverSync().child(sdk().directory)
+    serverSync.todo.set(sessionID, [])
+    const [, setStore] = serverSync.child(sdk.directory)
    setStore("todo", sessionID, [])

    input.onAbort?.()
@@ -248,8 +242,8 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      pending.delete(key)
      return Promise.resolve()
    }
-    return sdk()
-      .client.session.abort({
+    return sdk.client.session
+      .abort({
        sessionID,
      })
      .catch(() => {})
@@ -282,7 +276,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
  }

  const seed = (dir: string, info: Session) => {
-    const [, setStore] = serverSync().child(dir)
+    const [, setStore] = serverSync.child(dir)
    setStore("session", (list: Session[]) => {
      const result = Binary.search(list, info.id, (item) => item.id)
      const next = [...list]
@@ -322,13 +316,13 @@ export function createPromptSubmit(input: PromptSubmitInput) {
    input.addToHistory(currentPrompt, mode)
    input.resetHistoryNavigation()

-    const projectDirectory = sdk().directory
+    const projectDirectory = sdk.directory
    const isNewSession = !params.id
    const shouldAutoAccept = isNewSession && input.autoAccept()
    const worktreeSelection = input.newSessionWorktree?.() || "main"

    let sessionDirectory = projectDirectory
-    let client = sdk().client
+    let client = sdk.client

    if (isNewSession) {
      if (worktreeSelection === "create") {
@@ -350,7 +344,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
          })
          return
        }
-        WorktreeState.pending(sdk().scope, createdWorktree.directory)
+        WorktreeState.pending(sdk.scope, createdWorktree.directory)
        sessionDirectory = createdWorktree.directory
      }

@@ -359,11 +353,11 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      }

      if (sessionDirectory !== projectDirectory) {
-        client = sdk().createClient({
+        client = sdk.createClient({
          directory: sessionDirectory,
          throwOnError: true,
        })
-        serverSync().child(sessionDirectory)
+        serverSync.child(sessionDirectory)
      }

      input.onNewSessionWorktreeReset?.()
@@ -387,14 +381,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
        if (shouldAutoAccept) permission.enableAutoAccept(session.id, sessionDirectory)
        local.session.promote(sessionDirectory, session.id)
        layout.handoff.setTabs(base64Encode(sessionDirectory), session.id)
-        const draftID = search.draftId
-        if (draftID)
-          tabs.promoteDraft(draftID, {
-            server: server.key,
-            dirBase64: base64Encode(sessionDirectory),
-            sessionId: session.id,
-          })
-        else navigate(`/${base64Encode(sessionDirectory)}/session/${session.id}`)
+        navigate(`/${base64Encode(sessionDirectory)}/session/${session.id}`)
      }
    }
    if (!session) {
@@ -471,7 +458,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
    if (text.startsWith("/")) {
      const [cmdName, ...args] = text.split(" ")
      const commandName = cmdName.slice(1)
-      const customCommand = sync().data.command.find((c) => c.name === commandName)
+      const customCommand = sync.data.command.find((c) => c.name === commandName)
      if (customCommand) {
        clearInput()
        client.session
@@ -505,7 +492,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
    const messageID = Identifier.ascending("message")

    const removeOptimisticMessage = () => {
-      sync().session.optimistic.remove({
+      sync.session.optimistic.remove({
        directory: sessionDirectory,
        sessionID: session.id,
        messageID,
@@ -516,17 +503,17 @@ export function createPromptSubmit(input: PromptSubmitInput) {
    clearInput()

    const waitForWorktree = async () => {
-      const worktree = WorktreeState.get(sdk().scope, sessionDirectory)
+      const worktree = WorktreeState.get(sdk.scope, sessionDirectory)
      if (!worktree || worktree.status !== "pending") return true

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

      const controller = new AbortController()
      const cleanup = () => {
        if (sessionDirectory === projectDirectory) {
-          sync().set("session_status", session.id, { type: "idle" })
+          sync.set("session_status", session.id, { type: "idle" })
        }
        removeOptimisticMessage()
        restoreCommentItems(commentItems)
@@ -560,14 +547,12 @@ export function createPromptSubmit(input: PromptSubmitInput) {
        }, timeoutMs)
      })

-      const result = await Promise.race([
-        WorktreeState.wait(sdk().scope, sessionDirectory),
-        abortWait,
-        timeout,
-      ]).finally(() => {
-        if (timer.id === undefined) return
-        clearTimeout(timer.id)
-      })
+      const result = await Promise.race([WorktreeState.wait(sdk.scope, sessionDirectory), abortWait, timeout]).finally(
+        () => {
+          if (timer.id === undefined) return
+          clearTimeout(timer.id)
+        },
+      )
      pending.delete(pendingKey(session.id))
      if (controller.signal.aborted) return false
      if (result.status === "failed") throw new Error(result.message)
@@ -576,8 +561,8 @@ export function createPromptSubmit(input: PromptSubmitInput) {

    void sendFollowupDraft({
      client,
-      sync: sync(),
-      serverSync: serverSync(),
+      sync,
+      serverSync,
      draft,
      messageID,
      optimisticBusy: sessionDirectory === projectDirectory,
@@ -585,7 +570,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
    }).catch((err) => {
      pending.delete(pendingKey(session.id))
      if (sessionDirectory === projectDirectory) {
-        sync().set("session_status", session.id, { type: "idle" })
+        sync.set("session_status", session.id, { type: "idle" })
      }
      showToast({
        title: language.t("prompt.toast.promptSendFailed.title"),
@@ -42,7 +42,7 @@ export function SessionContextUsage(props: SessionContextUsageProps) {
    pathFromTab: file.pathFromTab,
    normalizeTab: (tab) => (tab.startsWith("file://") ? file.tab(tab) : tab),
  })
-  const messages = createMemo(() => (params.id ? (sync().data.message[params.id] ?? []) : []))
+  const messages = createMemo(() => (params.id ? (sync.data.message[params.id] ?? []) : []))

  const usd = createMemo(
    () =>
@@ -96,13 +96,13 @@ export function SessionContextTab() {
  const providers = useProviders()
  const { params, view } = useSessionLayout()

-  const info = createMemo(() => (params.id ? sync().session.get(params.id) : undefined))
+  const info = createMemo(() => (params.id ? sync.session.get(params.id) : undefined))

  const messages = createMemo(
    () => {
      const id = params.id
      if (!id) return emptyMessages
-      return (sync().data.message[id] ?? []) as Message[]
+      return (sync.data.message[id] ?? []) as Message[]
    },
    emptyMessages,
    { equals: same },
@@ -180,7 +180,7 @@ export function SessionContextTab() {
        if (!c?.input) return []
        return estimateSessionContextBreakdown({
          messages: messages(),
-          parts: sync().data.part as Record<string, Part[] | undefined>,
+          parts: sync.data.part as Record<string, Part[] | undefined>,
          input: c.input,
          systemPrompt: systemPrompt(),
        })
@@ -221,7 +221,7 @@ export function SessionContextTab() {
  let scroll: HTMLDivElement | undefined
  let frame: number | undefined
  let pending: { x: number; y: number } | undefined
-  const getParts = (id: string) => (sync().data.part[id] ?? []) as Part[]
+  const getParts = (id: string) => (sync.data.part[id] ?? []) as Part[]

  const restoreScroll = () => {
    const el = scroll
@@ -155,9 +155,11 @@ export function SessionHeader() {
  })
  const hotkey = createMemo(() => command.keybind("file.open"))
  const os = createMemo(() => detectOS(platform))
-  const isV2 = settings.general.newLayoutDesigns
-  const search = settings.visibility.search
-  const status = settings.visibility.status
+  const isDesktopV2 = createMemo(() => platform.platform === "desktop" && settings.general.newLayoutDesigns())
+  const search = createMemo(() => (isDesktopV2() ? settings.general.showSearch() : true))
+  const tree = createMemo(() => (isDesktopV2() ? settings.general.showFileTree() : true))
+  const term = createMemo(() => (isDesktopV2() ? settings.general.showTerminal() : true))
+  const status = createMemo(() => (isDesktopV2() ? settings.general.showStatus() : true))

  const [exists, setExists] = createStore<Partial<Record<OpenApp, boolean>>>({
    finder: true,
@@ -229,7 +231,7 @@ export function SessionHeader() {
  )
  const opening = createMemo(() => openRequest.app !== undefined)
  const tint = createMemo(() =>
-    messageAgentColor(params.id ? sync().data.message[params.id] : undefined, sync().data.agent),
+    messageAgentColor(params.id ? sync.data.message[params.id] : undefined, sync.data.agent),
  )
  const v2ActionsState = createMemo<SessionHeaderV2ActionsState>(() => ({
    statusVisible: status(),
@@ -320,7 +322,7 @@ export function SessionHeader() {
        {(mount) => (
          <Portal mount={mount()}>
            <Show
-              when={isV2}
+              when={isDesktopV2}
              fallback={
                <div class="flex items-center gap-2">
                  <Show when={projectDirectory()}>
@@ -442,21 +444,23 @@ export function SessionHeader() {
                        <StatusPopover />
                      </Tooltip>
                    </Show>
-                    <TooltipKeybind
-                      title={language.t("command.terminal.toggle")}
-                      keybind={command.keybind("terminal.toggle")}
-                    >
-                      <Button
-                        variant="ghost"
-                        class="group/terminal-toggle titlebar-icon w-8 h-6 p-0 box-border shrink-0"
-                        onClick={toggleTerminal}
-                        aria-label={language.t("command.terminal.toggle")}
-                        aria-expanded={view().terminal.opened()}
-                        aria-controls="terminal-panel"
+                    <Show when={term()}>
+                      <TooltipKeybind
+                        title={language.t("command.terminal.toggle")}
+                        keybind={command.keybind("terminal.toggle")}
                      >
-                        <Icon size="small" name={view().terminal.opened() ? "terminal-active" : "terminal"} />
-                      </Button>
-                    </TooltipKeybind>
+                        <Button
+                          variant="ghost"
+                          class="group/terminal-toggle titlebar-icon w-8 h-6 p-0 box-border shrink-0"
+                          onClick={toggleTerminal}
+                          aria-label={language.t("command.terminal.toggle")}
+                          aria-expanded={view().terminal.opened()}
+                          aria-controls="terminal-panel"
+                        >
+                          <Icon size="small" name={view().terminal.opened() ? "terminal-active" : "terminal"} />
+                        </Button>
+                      </TooltipKeybind>
+                    </Show>

                    <div class="hidden md:flex items-center gap-1 shrink-0">
                      <TooltipKeybind
@@ -475,30 +479,32 @@ export function SessionHeader() {
                        </Button>
                      </TooltipKeybind>

-                      <TooltipKeybind
-                        title={language.t("command.fileTree.toggle")}
-                        keybind={command.keybind("fileTree.toggle")}
-                      >
-                        <Button
-                          variant="ghost"
-                          class="titlebar-icon w-8 h-6 p-0 box-border"
-                          onClick={() => layout.fileTree.toggle()}
-                          aria-label={language.t("command.fileTree.toggle")}
-                          aria-expanded={layout.fileTree.opened()}
-                          aria-controls="file-tree-panel"
+                      <Show when={tree()}>
+                        <TooltipKeybind
+                          title={language.t("command.fileTree.toggle")}
+                          keybind={command.keybind("fileTree.toggle")}
                        >
-                          <div class="relative flex items-center justify-center size-4">
-                            <Icon
-                              size="small"
-                              name={layout.fileTree.opened() ? "file-tree-active" : "file-tree"}
-                              classList={{
-                                "text-icon-strong": layout.fileTree.opened(),
-                                "text-icon-weak": !layout.fileTree.opened(),
-                              }}
-                            />
-                          </div>
-                        </Button>
-                      </TooltipKeybind>
+                          <Button
+                            variant="ghost"
+                            class="titlebar-icon w-8 h-6 p-0 box-border"
+                            onClick={() => layout.fileTree.toggle()}
+                            aria-label={language.t("command.fileTree.toggle")}
+                            aria-expanded={layout.fileTree.opened()}
+                            aria-controls="file-tree-panel"
+                          >
+                            <div class="relative flex items-center justify-center size-4">
+                              <Icon
+                                size="small"
+                                name={layout.fileTree.opened() ? "file-tree-active" : "file-tree"}
+                                classList={{
+                                  "text-icon-strong": layout.fileTree.opened(),
+                                  "text-icon-weak": !layout.fileTree.opened(),
+                                }}
+                              />
+                            </div>
+                          </Button>
+                        </TooltipKeybind>
+                      </Show>
                    </div>
                  </div>
                </div>
@@ -20,24 +20,24 @@ export function NewSessionView(props: NewSessionViewProps) {
  const sdk = useSDK()
  const language = useLanguage()

-  const sandboxes = createMemo(() => sync().project?.sandboxes ?? [])
+  const sandboxes = createMemo(() => sync.project?.sandboxes ?? [])
  const options = createMemo(() => [MAIN_WORKTREE, ...sandboxes(), CREATE_WORKTREE])
  const current = createMemo(() => {
    const selection = props.worktree
    if (options().includes(selection)) return selection
    return MAIN_WORKTREE
  })
-  const projectRoot = createMemo(() => sync().project?.worktree ?? sdk().directory)
+  const projectRoot = createMemo(() => sync.project?.worktree ?? sdk.directory)
  const isWorktree = createMemo(() => {
-    const project = sync().project
+    const project = sync.project
    if (!project) return false
-    return sdk().directory !== project.worktree
+    return sdk.directory !== project.worktree
  })

  const label = (value: string) => {
    if (value === MAIN_WORKTREE) {
      if (isWorktree()) return language.t("session.new.worktree.main")
-      const branch = sync().data.vcs?.branch
+      const branch = sync.data.vcs?.branch
      if (branch) return language.t("session.new.worktree.mainWithBranch", { branch })
      return language.t("session.new.worktree.main")
    }
@@ -69,7 +69,7 @@ export function NewSessionView(props: NewSessionViewProps) {
                {label(current())}
              </div>
            </div>
-            <Show when={sync().project}>
+            <Show when={sync.project}>
              {(project) => (
                <div class="flex items-start justify-center gap-3 min-h-5">
                  <div class="text-12-medium text-text-weak leading-5 min-w-0 max-w-160 break-words text-center">
@@ -1,4 +1,5 @@
 import { Component, Show, createMemo, createResource, onMount, type JSX } from "solid-js"
+import { createStore } from "solid-js/store"
 import { Button } from "@opencode-ai/ui/button"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Select } from "@opencode-ai/ui/select"
@@ -7,13 +8,13 @@ import { TextField } from "@opencode-ai/ui/text-field"
 import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { useTheme, type ColorScheme } from "@opencode-ai/ui/theme/context"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
+import { showToast } from "@/utils/toast"
 import { useParams } from "@solidjs/router"
 import { useLanguage } from "@/context/language"
 import { usePermission } from "@/context/permission"
 import { usePlatform, type DisplayBackend } from "@/context/platform"
 import { useServerSync } from "@/context/server-sync"
 import { useServerSDK } from "@/context/server-sdk"
-import { useUpdaterAction } from "./updater-action"
 import {
  monoDefault,
  monoFontFamily,
@@ -90,7 +91,9 @@ export const SettingsGeneral: Component = () => {
  const params = useParams()
  const settings = useSettings()

-  const updater = useUpdaterAction()
+  const [store, setStore] = createStore({
+    checking: false,
+  })

  const linux = createMemo(() => platform.platform === "desktop" && platform.os === "linux")
  const dir = createMemo(() => decode64(params.dir))
@@ -120,6 +123,58 @@ export const SettingsGeneral: Component = () => {
  }
  const desktop = createMemo(() => platform.platform === "desktop")

+  const check = () => {
+    if (!platform.checkUpdate) return
+    setStore("checking", true)
+
+    void platform
+      .checkUpdate()
+      .then((result) => {
+        if (!result.updateAvailable) {
+          showToast({
+            variant: "success",
+            icon: "circle-check",
+            title: language.t("settings.updates.toast.latest.title"),
+            description: language.t("settings.updates.toast.latest.description", { version: platform.version ?? "" }),
+          })
+          return
+        }
+
+        const actions = platform.updateAndRestart
+          ? [
+              {
+                label: language.t("toast.update.action.installRestart"),
+                onClick: async () => {
+                  await platform.updateAndRestart!()
+                },
+              },
+              {
+                label: language.t("toast.update.action.notYet"),
+                onClick: "dismiss" as const,
+              },
+            ]
+          : [
+              {
+                label: language.t("toast.update.action.notYet"),
+                onClick: "dismiss" as const,
+              },
+            ]
+
+        showToast({
+          persistent: true,
+          icon: "download",
+          title: language.t("toast.update.title"),
+          description: language.t("toast.update.description", { version: result.version ?? "" }),
+          actions,
+        })
+      })
+      .catch((err: unknown) => {
+        const message = err instanceof Error ? err.message : String(err)
+        showToast({ title: language.t("common.requestFailed"), description: message })
+      })
+      .finally(() => setStore("checking", false))
+  }
+
  const themeOptions = createMemo<ThemeOption[]>(() => theme.ids().map((id) => ({ id, name: theme.name(id) })))

  const serverSync = useServerSync()
@@ -127,8 +182,8 @@ export const SettingsGeneral: Component = () => {

  const [shells] = createResource(
    () =>
-      serverSdk()
-        .client.pty.shells()
+      serverSdk.client.pty
+        .shells()
        .then((res) => res.data ?? [])
        .catch(() => [] as ShellOption[]),
    { initialValue: [] as ShellOption[] },
@@ -151,11 +206,11 @@ export const SettingsGeneral: Component = () => {
  })

  const autoOption = { id: "auto", value: "", label: language.t("settings.general.row.shell.autoDefault") }
-  const currentShell = createMemo(() => serverSync().data.config.shell ?? "")
+  const currentShell = createMemo(() => serverSync.data.config.shell ?? "")

  const shellOptions = createMemo<ShellSelectOption[]>(() => {
    const list = shells.latest
-    const current = serverSync().data.config.shell
+    const current = serverSync.data.config.shell

    const nameCounts = new Map<string, number>()
    for (const s of list) {
@@ -290,7 +345,7 @@ export const SettingsGeneral: Component = () => {
            onSelect={(option) => {
              if (!option) return
              if (option.value === currentShell()) return
-              serverSync().updateConfig({ shell: option.value })
+              serverSync.updateConfig({ shell: option.value })
            }}
            variant="secondary"
            size="small"
@@ -668,6 +723,19 @@ export const SettingsGeneral: Component = () => {
      <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.general.section.updates")}</h3>

      <SettingsList>
+        <SettingsRow
+          title={language.t("settings.updates.row.startup.title")}
+          description={language.t("settings.updates.row.startup.description")}
+        >
+          <div data-action="settings-updates-startup">
+            <Switch
+              checked={settings.updates.startup()}
+              disabled={!platform.checkUpdate}
+              onChange={(checked) => settings.updates.setStartup(checked)}
+            />
+          </div>
+        </SettingsRow>
+
        <SettingsRow
          title={language.t("settings.general.row.releaseNotes.title")}
          description={language.t("settings.general.row.releaseNotes.description")}
@@ -684,8 +752,10 @@ export const SettingsGeneral: Component = () => {
          title={language.t("settings.updates.row.check.title")}
          description={language.t("settings.updates.row.check.description")}
        >
-          <Button size="small" variant="secondary" disabled={!updater.action().run} onClick={updater.run}>
-            {language.t(updater.action().label)}
+          <Button size="small" variant="secondary" disabled={store.checking || !platform.checkUpdate} onClick={check}>
+            {store.checking
+              ? language.t("settings.updates.action.checking")
+              : language.t("settings.updates.action.checkNow")}
          </Button>
        </SettingsRow>
      </SettingsList>
@@ -83,7 +83,7 @@ const SettingsProvidersContent: Component = () => {
  const note = (id: string) => PROVIDER_NOTES.find((item) => item.match(id))?.key

  const isConfigCustom = (providerID: string) => {
-    const provider = serverSync().data.config.provider?.[providerID]
+    const provider = serverSync.data.config.provider?.[providerID]
    if (!provider) return false
    if (provider.npm !== "@ai-sdk/openai-compatible") return false
    if (!provider.models || Object.keys(provider.models).length === 0) return false
@@ -91,11 +91,11 @@ const SettingsProvidersContent: Component = () => {
  }

  const disableProvider = async (providerID: string, name: string) => {
-    const before = serverSync().data.config.disabled_providers ?? []
+    const before = serverSync.data.config.disabled_providers ?? []
    const next = before.includes(providerID) ? before : [...before, providerID]
-    serverSync().set("config", "disabled_providers", next)
+    serverSync.set("config", "disabled_providers", next)

-    await serverSync()
+    await serverSync
      .updateConfig({ disabled_providers: next })
      .then(() => {
        showToast({
@@ -106,7 +106,7 @@ const SettingsProvidersContent: Component = () => {
        })
      })
      .catch((err: unknown) => {
-        serverSync().set("config", "disabled_providers", before)
+        serverSync.set("config", "disabled_providers", before)
        const message = err instanceof Error ? err.message : String(err)
        showToast({ title: language.t("common.requestFailed"), description: message })
      })
@@ -114,16 +114,14 @@ const SettingsProvidersContent: Component = () => {

  const disconnect = async (providerID: string, name: string) => {
    if (isConfigCustom(providerID)) {
-      await serverSDK()
-        .client.auth.remove({ providerID })
-        .catch(() => undefined)
+      await serverSDK.client.auth.remove({ providerID }).catch(() => undefined)
      await disableProvider(providerID, name)
      return
    }
-    await serverSDK()
-      .client.auth.remove({ providerID })
+    await serverSDK.client.auth
+      .remove({ providerID })
      .then(async () => {
-        await serverSDK().client.global.dispose()
+        await serverSDK.client.global.dispose()
        showToast({
          variant: "success",
          icon: "circle-check",
@@ -30,7 +30,7 @@ function SettingsServerDataProviders(props: ParentProps<{ server: ServerConnecti

  return (
    <QueryClientProvider client={serverCtx().queryClient}>
-      <ServerSDKProvider server={() => props.server}>
+      <ServerSDKProvider server={props.server}>
        <ServerSyncProvider>
          <ModelsProvider>{props.children}</ModelsProvider>
        </ServerSyncProvider>
@@ -1,17 +1,20 @@
 import { Component, Show, createMemo, createResource, onMount } from "solid-js"
+import { createStore } from "solid-js/store"
 import { ButtonV2 } from "@opencode-ai/ui/v2/button-v2"
+import { Icon } from "@opencode-ai/ui/icon"
 import { SelectV2 } from "@opencode-ai/ui/v2/select-v2"
 import { Switch } from "@opencode-ai/ui/v2/switch-v2"
 import { TextInputV2 } from "@opencode-ai/ui/v2/text-input-v2"
+import { Tooltip } from "@opencode-ai/ui/tooltip"
 import { useTheme, type ColorScheme } from "@opencode-ai/ui/theme/context"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
+import { showToast } from "@/utils/toast"
 import { useParams } from "@solidjs/router"
 import { useLanguage } from "@/context/language"
 import { usePermission } from "@/context/permission"
-import { usePlatform } from "@/context/platform"
+import { usePlatform, type DisplayBackend } from "@/context/platform"
 import { useServerSync } from "@/context/server-sync"
 import { useServerSDK } from "@/context/server-sdk"
-import { useUpdaterAction } from "../updater-action"
 import {
  monoDefault,
  monoFontFamily,
@@ -90,8 +93,11 @@ export const SettingsGeneralV2: Component = () => {
  const params = useParams()
  const settings = useSettings()

-  const updater = useUpdaterAction()
+  const [store, setStore] = createStore({
+    checking: false,
+  })

+  const linux = createMemo(() => platform.platform === "desktop" && platform.os === "linux")
  const dir = createMemo(() => decode64(params.dir))
  const accepting = createMemo(() => {
    const value = dir()
@@ -119,6 +125,58 @@ export const SettingsGeneralV2: Component = () => {
  }
  const desktop = createMemo(() => platform.platform === "desktop")

+  const check = () => {
+    if (!platform.checkUpdate) return
+    setStore("checking", true)
+
+    void platform
+      .checkUpdate()
+      .then((result) => {
+        if (!result.updateAvailable) {
+          showToast({
+            variant: "success",
+            icon: "circle-check",
+            title: language.t("settings.updates.toast.latest.title"),
+            description: language.t("settings.updates.toast.latest.description", { version: platform.version ?? "" }),
+          })
+          return
+        }
+
+        const actions = platform.updateAndRestart
+          ? [
+              {
+                label: language.t("toast.update.action.installRestart"),
+                onClick: async () => {
+                  await platform.updateAndRestart!()
+                },
+              },
+              {
+                label: language.t("toast.update.action.notYet"),
+                onClick: "dismiss" as const,
+              },
+            ]
+          : [
+              {
+                label: language.t("toast.update.action.notYet"),
+                onClick: "dismiss" as const,
+              },
+            ]
+
+        showToast({
+          persistent: true,
+          icon: "download",
+          title: language.t("toast.update.title"),
+          description: language.t("toast.update.description", { version: result.version ?? "" }),
+          actions,
+        })
+      })
+      .catch((err: unknown) => {
+        const message = err instanceof Error ? err.message : String(err)
+        showToast({ title: language.t("common.requestFailed"), description: message })
+      })
+      .finally(() => setStore("checking", false))
+  }
+
  const themeOptions = createMemo<ThemeOption[]>(() => theme.ids().map((id) => ({ id, name: theme.name(id) })))

  const serverSync = useServerSync()
@@ -126,13 +184,19 @@ export const SettingsGeneralV2: Component = () => {

  const [shells] = createResource(
    () =>
-      serverSdk()
-        .client.pty.shells()
+      serverSdk.client.pty
+        .shells()
        .then((res) => res.data ?? [])
        .catch(() => [] as ShellOption[]),
    { initialValue: [] as ShellOption[] },
  )

+  const [displayBackend, { refetch: refetchDisplayBackend }] = createResource(
+    () => (linux() && platform.getDisplayBackend ? true : false),
+    () => Promise.resolve(platform.getDisplayBackend?.() ?? null).catch(() => null as DisplayBackend | null),
+    { initialValue: null as DisplayBackend | null },
+  )
+
  const [pinchZoom, { mutate: setPinchZoom }] = createResource(
    () => (desktop() && platform.getPinchZoomEnabled ? true : false),
    () => Promise.resolve(platform.getPinchZoomEnabled?.() ?? false).catch(() => false),
@@ -144,11 +208,11 @@ export const SettingsGeneralV2: Component = () => {
  })

  const autoOption = { id: "auto", value: "", label: language.t("settings.general.row.shell.autoDefault") }
-  const currentShell = createMemo(() => serverSync().data.config.shell ?? "")
+  const currentShell = createMemo(() => serverSync.data.config.shell ?? "")

  const shellOptions = createMemo<ShellSelectOption[]>(() => {
    const list = shells.latest
-    const current = serverSync().data.config.shell
+    const current = serverSync.data.config.shell

    const nameCounts = new Map<string, number>()
    for (const s of list) {
@@ -177,6 +241,14 @@ export const SettingsGeneralV2: Component = () => {
    return options
  })

+  const onDisplayBackendChange = (checked: boolean) => {
+    const update = platform.setDisplayBackend?.(checked ? "wayland" : "auto")
+    if (!update) return
+    void update.finally(() => {
+      void refetchDisplayBackend()
+    })
+  }
+
  const onPinchZoomChange = (checked: boolean) => {
    setPinchZoom(checked)
    const update = platform.setPinchZoomEnabled?.(checked)
@@ -275,7 +347,7 @@ export const SettingsGeneralV2: Component = () => {
            onSelect={(option) => {
              if (!option) return
              if (option.value === currentShell()) return
-              serverSync().updateConfig({ shell: option.value })
+              serverSync.updateConfig({ shell: option.value })
            }}
          />
        </SettingsRowV2>
@@ -366,6 +438,18 @@ export const SettingsGeneralV2: Component = () => {
          </div>
        </SettingsRowV2>

+        <SettingsRowV2
+          title={language.t("settings.general.row.showNavigation.title")}
+          description={language.t("settings.general.row.showNavigation.description")}
+        >
+          <div data-action="settings-show-navigation">
+            <Switch
+              checked={settings.general.showNavigation()}
+              onChange={(checked) => settings.general.setShowNavigation(checked)}
+            />
+          </div>
+        </SettingsRowV2>
+
        <SettingsRowV2
          title={language.t("settings.general.row.showSearch.title")}
          description={language.t("settings.general.row.showSearch.description")}
@@ -378,6 +462,18 @@ export const SettingsGeneralV2: Component = () => {
          </div>
        </SettingsRowV2>

+        <SettingsRowV2
+          title={language.t("settings.general.row.showTerminal.title")}
+          description={language.t("settings.general.row.showTerminal.description")}
+        >
+          <div data-action="settings-show-terminal">
+            <Switch
+              checked={settings.general.showTerminal()}
+              onChange={(checked) => settings.general.setShowTerminal(checked)}
+            />
+          </div>
+        </SettingsRowV2>
+
        <SettingsRowV2
          title={language.t("settings.general.row.showStatus.title")}
          description={language.t("settings.general.row.showStatus.description")}
@@ -644,6 +740,19 @@ export const SettingsGeneralV2: Component = () => {
      <h3 class="settings-v2-section-title">{language.t("settings.general.section.updates")}</h3>

      <SettingsListV2>
+        <SettingsRowV2
+          title={language.t("settings.updates.row.startup.title")}
+          description={language.t("settings.updates.row.startup.description")}
+        >
+          <div data-action="settings-updates-startup">
+            <Switch
+              checked={settings.updates.startup()}
+              disabled={!platform.checkUpdate}
+              onChange={(checked) => settings.updates.setStartup(checked)}
+            />
+          </div>
+        </SettingsRowV2>
+
        <SettingsRowV2
          title={language.t("settings.general.row.releaseNotes.title")}
          description={language.t("settings.general.row.releaseNotes.description")}
@@ -660,15 +769,16 @@ export const SettingsGeneralV2: Component = () => {
          title={language.t("settings.updates.row.check.title")}
          description={language.t("settings.updates.row.check.description")}
        >
-          <ButtonV2 size="normal" variant="neutral" disabled={!updater.action().run} onClick={updater.run}>
-            {language.t(updater.action().label)}
+          <ButtonV2 size="normal" variant="neutral" disabled={store.checking || !platform.checkUpdate} onClick={check}>
+            {store.checking
+              ? language.t("settings.updates.action.checking")
+              : language.t("settings.updates.action.checkNow")}
          </ButtonV2>
        </SettingsRowV2>
      </SettingsListV2>
    </div>
  )

-  // We can probably remove this, right?
  const DisplaySection = () => (
    <Show when={desktop()}>
      <div class="settings-v2-section">
@@ -683,6 +793,26 @@ export const SettingsGeneralV2: Component = () => {
              <Switch checked={pinchZoom.latest} onChange={onPinchZoomChange} />
            </div>
          </SettingsRowV2>
+
+          <Show when={linux()}>
+            <SettingsRowV2
+              title={
+                <div class="flex items-center gap-2">
+                  <span>{language.t("settings.general.row.wayland.title")}</span>
+                  <Tooltip value={language.t("settings.general.row.wayland.tooltip")} placement="top">
+                    <span class="text-text-weak">
+                      <Icon name="help" size="small" />
+                    </span>
+                  </Tooltip>
+                </div>
+              }
+              description={language.t("settings.general.row.wayland.description")}
+            >
+              <div data-action="settings-wayland">
+                <Switch checked={displayBackend.latest === "wayland"} onChange={onDisplayBackendChange} />
+              </div>
+            </SettingsRowV2>
+          </Show>
        </SettingsListV2>
      </div>
    </Show>
@@ -703,13 +833,13 @@ export const SettingsGeneralV2: Component = () => {

        <SoundsSection />

-        <Show when={desktop()}>
-          <UpdatesSection />
-        </Show>
+        <UpdatesSection />

        <DisplaySection />

-        <AdvancedSection />
+        <Show when={desktop()}>
+          <AdvancedSection />
+        </Show>
      </div>
    </>
  )
@@ -77,7 +77,7 @@ export const SettingsProvidersV2: Component = () => {
  const note = (id: string) => PROVIDER_NOTES.find((item) => item.match(id))?.key

  const isConfigCustom = (providerID: string) => {
-    const provider = serverSync().data.config.provider?.[providerID]
+    const provider = serverSync.data.config.provider?.[providerID]
    if (!provider) return false
    if (provider.npm !== "@ai-sdk/openai-compatible") return false
    if (!provider.models || Object.keys(provider.models).length === 0) return false
@@ -85,11 +85,11 @@ export const SettingsProvidersV2: Component = () => {
  }

  const disableProvider = async (providerID: string, name: string) => {
-    const before = serverSync().data.config.disabled_providers ?? []
+    const before = serverSync.data.config.disabled_providers ?? []
    const next = before.includes(providerID) ? before : [...before, providerID]
-    serverSync().set("config", "disabled_providers", next)
+    serverSync.set("config", "disabled_providers", next)

-    await serverSync()
+    await serverSync
      .updateConfig({ disabled_providers: next })
      .then(() => {
        showToast({
@@ -100,7 +100,7 @@ export const SettingsProvidersV2: Component = () => {
        })
      })
      .catch((err: unknown) => {
-        serverSync().set("config", "disabled_providers", before)
+        serverSync.set("config", "disabled_providers", before)
        const message = err instanceof Error ? err.message : String(err)
        showToast({ title: language.t("common.requestFailed"), description: message })
      })
@@ -108,16 +108,14 @@ export const SettingsProvidersV2: Component = () => {

  const disconnect = async (providerID: string, name: string) => {
    if (isConfigCustom(providerID)) {
-      await serverSdk()
-        .client.auth.remove({ providerID })
-        .catch(() => undefined)
+      await serverSdk.client.auth.remove({ providerID }).catch(() => undefined)
      await disableProvider(providerID, name)
      return
    }
-    await serverSdk()
-      .client.auth.remove({ providerID })
+    await serverSdk.client.auth
+      .remove({ providerID })
      .then(async () => {
-        await serverSdk().client.global.dispose()
+        await serverSdk.client.global.dispose()
        showToast({
          variant: "success",
          icon: "circle-check",
@@ -3,6 +3,7 @@ import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Switch } from "@opencode-ai/ui/switch"
 import { Tabs } from "@opencode-ai/ui/tabs"
+import { useMutation, useQueryClient } from "@tanstack/solid-query"
 import { showToast } from "@/utils/toast"
 import { useNavigate } from "@solidjs/router"
 import { type Accessor, createEffect, createMemo, For, type JSXElement, onCleanup, Show } from "solid-js"
@@ -10,12 +11,14 @@ import { createStore } from "solid-js/store"
 import { ServerHealthIndicator, ServerRow } from "@/components/server/server-row"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
+import { useSDK } from "@/context/sdk"
 import { ServerConnection, useServer } from "@/context/server"
 import { useSync } from "@/context/sync"
 import { type ServerHealth } from "@/utils/server-health"
+import { useQueryOptions } from "@/context/server-sync"
+import { pathKey } from "@/utils/path-key"
 import { useGlobal } from "@/context/global"
 import { useSettings } from "@/context/settings"
-import { useMcpToggle } from "@/context/mcp"

 const pluginEmptyMessage = (value: string, file: string): JSXElement => {
  const parts = value.split(file)
@@ -96,6 +99,37 @@ const useDefaultServerKey = (
  }
 }

+const useMcpToggleMutation = () => {
+  const sync = useSync()
+  const sdk = useSDK()
+  const language = useLanguage()
+  const queryClient = useQueryClient()
+  const queryOptions = useQueryOptions()
+
+  return useMutation(() => ({
+    mutationFn: async (name: string) => {
+      const status = sync.data.mcp[name]
+      if (status?.status === "connected") {
+        await sdk.client.mcp.disconnect({ name })
+        return
+      }
+      if (status?.status === "needs_auth") {
+        await sdk.client.mcp.auth.authenticate({ name })
+        return
+      }
+      await sdk.client.mcp.connect({ name })
+    },
+    onSuccess: () => queryClient.refetchQueries(queryOptions.mcp(pathKey(sync.directory))),
+    onError: (err) => {
+      showToast({
+        variant: "error",
+        title: language.t("common.requestFailed"),
+        description: err instanceof Error ? err.message : String(err),
+      })
+    },
+  }))
+}
+
 type ServerStatusState = {
  servers: () => ServerStatusItem[]
  defaultKey: () => ServerConnection.Key | undefined
@@ -277,15 +311,15 @@ export function StatusPopoverBody(props: { shown: Accessor<boolean> }) {
    dialogRun += 1
  })
  const sortedServers = createMemo(() => listServersByHealth(global.servers.list(), server.key, global.servers.health))
-  const toggleMcp = useMcpToggle()
+  const toggleMcp = useMcpToggleMutation()
  const defaultServer = useDefaultServerKey(platform.getDefaultServer)
-  const mcpNames = createMemo(() => Object.keys(sync().data.mcp ?? {}).sort((a, b) => a.localeCompare(b)))
-  const mcpStatus = (name: string) => sync().data.mcp?.[name]?.status
+  const mcpNames = createMemo(() => Object.keys(sync.data.mcp ?? {}).sort((a, b) => a.localeCompare(b)))
+  const mcpStatus = (name: string) => sync.data.mcp?.[name]?.status
  const mcpConnected = createMemo(() => mcpNames().filter((name) => mcpStatus(name) === "connected").length)
-  const lspItems = createMemo(() => sync().data.lsp ?? [])
+  const lspItems = createMemo(() => sync.data.lsp ?? [])
  const lspCount = createMemo(() => lspItems().length)
  const plugins = createMemo(() =>
-    (sync().data.config.plugin ?? []).map((item) => (typeof item === "string" ? item : item[0])),
+    (sync.data.config.plugin ?? []).map((item) => (typeof item === "string" ? item : item[0])),
  )
  const pluginCount = createMemo(() => plugins().length)
  const pluginEmpty = createMemo(() => pluginEmptyMessage(language.t("dialog.plugins.empty"), "opencode.json"))
@@ -18,9 +18,9 @@ export function StatusPopover() {
  const global = useGlobal()
  const sync = useSync()
  const [shown, setShown] = createSignal(false)
-  const ready = createMemo(() => global.servers.health[server.key]?.healthy === false || sync().data.mcp_ready)
+  const ready = createMemo(() => global.servers.health[server.key]?.healthy === false || sync.data.mcp_ready)
  const mcpIssue = createMemo(() => {
-    const mcp = Object.values(sync().data.mcp ?? {})
+    const mcp = Object.values(sync.data.mcp ?? {})
    const failed = mcp.some((item) => item.status === "failed" || item.status === "needs_client_registration")
    const warn = mcp.some((item) => item.status === "needs_auth")
    if (failed) return "critical" as const
@@ -86,9 +86,9 @@ function DirectoryStatusPopover() {
  const sync = useSync()
  const [shown, setShown] = createSignal(false)
  const serverHealth = () => global.servers.health[server.key]?.healthy
-  const ready = createMemo(() => serverHealth() === false || sync().data.mcp_ready)
+  const ready = createMemo(() => serverHealth() === false || sync.data.mcp_ready)
  const mcpIssue = createMemo(() => {
-    const mcp = Object.values(sync().data.mcp ?? {})
+    const mcp = Object.values(sync.data.mcp ?? {})
    const failed = mcp.some((item) => item.status === "failed" || item.status === "needs_client_registration")
    const warn = mcp.some((item) => item.status === "needs_auth")
    if (failed) return "critical" as const
@@ -161,9 +161,9 @@ export const Terminal = (props: TerminalProps) => {
  const theme = useTheme()
  const language = useLanguage()
  const server = useServer()
-  const directory = sdk().directory
-  const client = sdk().client
-  const url = sdk().url
+  const directory = sdk.directory
+  const client = sdk.client
+  const url = sdk.url
  const auth = server.current?.http
  const username = auth?.username ?? "opencode"
  const password = auth?.password ?? ""
@@ -1,46 +0,0 @@
-@keyframes titlebar-tab-fade-left {
-  from {
-    visibility: hidden;
-  }
-  to {
-    visibility: visible;
-  }
-}
-
-@keyframes titlebar-tab-fade-right {
-  from {
-    visibility: visible;
-  }
-  to {
-    visibility: hidden;
-  }
-}
-
-/* The narrow ranges preserve the binary thresholds of scrollLeft > 0 and
-   remaining scroll distance > 1px. Hidden defaults make an inactive timeline
-   (no overflow) a no-op. Unsupported browsers also degrade to no fades. */
-[data-slot="titlebar-tabs"] {
-  timeline-scope: --titlebar-tabs-scroll;
-
-  [data-slot^="titlebar-tabs-fade-"] {
-    visibility: hidden;
-  }
-}
-
-@supports (animation-timeline: --titlebar-tabs-scroll) and (timeline-scope: --titlebar-tabs-scroll) {
-  [data-slot="titlebar-tabs-scroll"] {
-    scroll-timeline: --titlebar-tabs-scroll x;
-  }
-
-  [data-slot="titlebar-tabs-fade-left"] {
-    animation: titlebar-tab-fade-left linear both;
-    animation-timeline: --titlebar-tabs-scroll;
-    animation-range: 0 0.1px;
-  }
-
-  [data-slot="titlebar-tabs-fade-right"] {
-    animation: titlebar-tab-fade-right linear both;
-    animation-timeline: --titlebar-tabs-scroll;
-    animation-range: calc(100% - 1.1px) calc(100% - 1px);
-  }
-}
@@ -7,11 +7,12 @@ import {
  Match,
  onMount,
  Show,
+  startTransition,
  Switch,
  untrack,
 } from "solid-js"
 import { createStore } from "solid-js/store"
-import { useLocation, useNavigate, useParams } from "@solidjs/router"
+import { useLocation, useMatch, useNavigate, useParams } from "@solidjs/router"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Button } from "@opencode-ai/ui/button"
@@ -19,8 +20,6 @@ import { Tooltip, TooltipKeybind } from "@opencode-ai/ui/tooltip"
 import { useTheme } from "@opencode-ai/ui/theme/context"
 import { IconButtonV2 } from "@opencode-ai/ui/v2/icon-button-v2"
 import { Icon as IconV2 } from "@opencode-ai/ui/v2/icon"
-import { KeybindV2 } from "@opencode-ai/ui/v2/keybind-v2"
-import { TooltipV2 } from "@opencode-ai/ui/v2/tooltip-v2"

 import { getProjectAvatarVariant, LayoutRoute, useLayout, type LocalProject } from "@/context/layout"
 import { usePlatform } from "@/context/platform"
@@ -35,13 +34,11 @@ import { ProjectAvatar } from "@opencode-ai/ui/v2/project-avatar-v2"
 import { displayName, getProjectAvatarSource, projectForSession } from "@/pages/layout/helpers"
 import { useSessionTabAvatarState } from "@/pages/layout/project-avatar-state"
 import { makeEventListener } from "@solid-primitives/event-listener"
-import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { readSessionTabsRemovedDetail, SESSION_TABS_REMOVED_EVENT } from "@/components/titlebar-session-events"
 import { useGlobal } from "@/context/global"
 import { decode64 } from "@/utils/base64"
 import { ServerConnection, useServer } from "@/context/server"
 import { tabHref, useTabs, type Tab } from "@/context/tabs"
-import "./titlebar.css"

 type TauriDesktopWindow = {
  startDragging?: () => Promise<void>
@@ -254,6 +251,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
          {(_) => {
            const serverSync = useServerSync()
            const navigate = useNavigate()
+            const homeMatch = useMatch(() => "/")
            const layout = useLayout()

            const newSessionHref = () => {
@@ -268,11 +266,21 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
            const tabs = useTabs()
            const tabsStore = tabs.store
            const tabsStoreActions = tabs
+            const navigateTab = (tab: Tab) => {
+              const href = tabHref(tab)
+              if (tab.server === server.key) {
+                navigate(href)
+                return
+              }
+              void startTransition(() => {
+                server.setActive(tab.server)
+                navigate(href)
+              })
+            }

            const matchRoute = (route: LayoutRoute) => {
              if (route.type === "home") return
-              if (route.type === "draft") {
-                return tabsStore.find((item) => item.type === "draft" && item.draftID === route.draftID)
+              if (route.type === "dir-new-sesssion") {
              }
              if (route.type === "session") {
                const main = tabsStore.find(
@@ -280,7 +288,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                    item.type === "session" && item.server === route.server && item.sessionId === route.sessionId,
                )
                if (main) return main
-                const sync = serverSync().createDirSyncContext(route.dir)
+                const sync = serverSync.createDirSyncContext(route.dir)
                const session = sync.session.get(route.sessionId)
                if (session?.parentID) {
                  const parentID = session.parentID
@@ -298,13 +306,10 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
              const route = layout.route()
              if (!tabs.ready()) return
              const tab = currentTab()
-              if (tab) {
-                tabs.remember(tab)
-                return
-              }
+              if (tab) return

              if (route.type === "session") {
-                const sync = serverSync().createDirSyncContext(route.dir)
+                const sync = serverSync.createDirSyncContext(route.dir)
                const session = sync.session.get(route.sessionId)
                if (!session) return
                const sessionId = session.parentID ?? session.id
@@ -324,18 +329,6 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
            })

            const openNewTab = () => navigate(newSessionHref())
-            const toggleHome = () => tabs.toggleHome({ home: layout.route().type === "home", current: currentTab() })
-
-            command.register("titlebar-home", () => [
-              {
-                id: "home.toggle",
-                title: language.t("home.title"),
-                category: language.t("command.category.view"),
-                keybind: "mod+b",
-                hidden: true,
-                onSelect: toggleHome,
-              },
-            ])

            command.register("tabs", () => {
              const current = currentTab()
@@ -373,7 +366,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                    if (index === -1) index = tabsStore.length - 1

                    const next = tabsStore[index]
-                    if (next) tabs.select(next)
+                    if (next) navigateTab(next)
                  },
                },
                {
@@ -390,7 +383,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                    if (index === tabsStore.length) index = 0

                    const next = tabsStore[index]
-                    if (next) tabs.select(next)
+                    if (next) navigateTab(next)
                  },
                },
                ...Array.from({ length: 9 }, (_, i) => {
@@ -405,7 +398,7 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                    hidden: true,
                    onSelect: () => {
                      const tab = tabsStore[index]
-                      if (tab) tabs.select(tab)
+                      if (tab) navigateTab(tab)
                    },
                  }
                }),
@@ -431,130 +424,80 @@ export function Titlebar(props: { update?: TitlebarUpdate }) {
                <Show when={windows() || linux()}>
                  <WindowsAppMenu command={command} platform={platform} variant="v2" />
                </Show>
-                <TooltipV2
-                  placement="bottom"
-                  value={
-                    <>
-                      {language.t("home.title")}
-                      <KeybindV2 keys={command.keybindParts("home.toggle")} variant="neutral" />
-                    </>
-                  }
-                  class="shrink-0"
+                <IconButtonV2
+                  variant="ghost-muted"
+                  size="large"
+                  as="a"
+                  href="/"
+                  class="!w-9 shrink-0"
+                  icon={<IconV2 name="grid-plus" />}
+                  state={!!homeMatch() ? "pressed" : undefined}
+                />
+
+                <div
+                  class="flex min-w-0 flex-row items-center gap-1.5 overflow-x-auto no-scrollbar [app-region:no-drag]"
+                  ref={tabScrollRef}
                >
-                  <IconButtonV2
-                    type="button"
-                    variant="ghost-muted"
-                    size="large"
-                    class="!w-9 shrink-0"
-                    icon={<IconV2 name="grid-plus" />}
-                    state={layout.route().type === "home" ? "pressed" : undefined}
-                    onClick={toggleHome}
-                    aria-label={language.t("home.title")}
-                    aria-pressed={layout.route().type === "home"}
-                  />
-                </TooltipV2>
+                  <div class="flex min-w-0 flex-row items-center gap-1.5">
+                    <For each={tabsStore}>
+                      {(tab, i) => {
+                        let ref!: HTMLDivElement

-                <div data-slot="titlebar-tabs" class="relative min-w-0">
-                  <div
-                    data-slot="titlebar-tabs-scroll"
-                    class="flex min-w-0 flex-row items-center gap-1.5 overflow-x-auto no-scrollbar [app-region:no-drag]"
-                    ref={(el) => {
-                      tabScrollRef = el
-                      createResizeObserver(el, refreshTabsAreOverflowing)
-                    }}
-                  >
-                    <div
-                      class="flex min-w-0 flex-row items-center gap-1.5"
-                      ref={(el) => createResizeObserver(el, refreshTabsAreOverflowing)}
-                    >
-                      <For each={tabsStore}>
-                        {(tab, i) => {
-                          let ref!: HTMLDivElement
+                        onMount(() => {
+                          refreshTabsAreOverflowing()
+                        })

-                          const divider = () =>
-                            i() !== 0 && (
+                        return (
+                          <>
+                            {i() !== 0 && (
                              <div class="w-[1.5px] h-3 shrink-0 rounded-full bg-[var(--v2-background-bg-layer-02)]" />
-                            )
+                            )}
+                            <TabNavItem
+                              ref={ref}
+                              href={tabHref(tab)}
+                              server={tab.server}
+                              directory={decode64(tab.dirBase64)!}
+                              sessionId={tab.sessionId}
+                              onNavigate={() => {
+                                navigateTab(tab)

-                          if (tab.type === "draft") {
-                            return (
-                              <>
-                                {divider()}
-                                <DraftTabItem
-                                  ref={ref}
-                                  href={tabHref(tab)}
-                                  title={language.t("command.session.new")}
-                                  active={currentTab() === tab}
-                                  onNavigate={() => {
-                                    tabs.select(tab)
-                                    ref.scrollIntoView({ behavior: "instant" })
-                                  }}
-                                  onClose={() => tabsStoreActions.removeTab(i())}
-                                />
-                              </>
-                            )
-                          }
+                                ref.scrollIntoView({ behavior: "instant" })
+                              }}
+                              onClose={() => tabsStoreActions.removeTab(i())}
+                              active={currentTab() === tab}
+                              activeServer={tab.server === server.key}
+                              forceTruncate={tabsAreOverflowing()}
+                            />
+                          </>
+                        )
+                      }}
+                    </For>
+                    <Show when={creating() && params.dir}>
+                      {(_) => {
+                        let ref!: HTMLDivElement

-                          return (
-                            <>
-                              {divider()}
-                              <TabNavItem
-                                ref={ref}
-                                href={tabHref(tab)}
-                                server={tab.server}
-                                directory={decode64(tab.dirBase64)!}
-                                sessionId={tab.sessionId}
-                                onNavigate={() => {
-                                  tabs.select(tab)
+                        onMount(() => {
+                          ref.scrollIntoView({ behavior: "instant" })
+                        })

-                                  ref.scrollIntoView({ behavior: "instant" })
-                                }}
-                                onClose={() => tabsStoreActions.removeTab(i())}
-                                active={currentTab() === tab}
-                                activeServer={tab.server === server.key}
-                                forceTruncate={tabsAreOverflowing()}
-                              />
-                            </>
-                          )
-                        }}
-                      </For>
-                      <Show when={creating() && params.dir}>
-                        {(_) => {
-                          let ref!: HTMLDivElement
-
-                          onMount(() => {
-                            ref.scrollIntoView({ behavior: "instant" })
-                          })
-
-                          return (
-                            <>
-                              <div class="w-[1.5px] h-3 shrink-0 rounded-full bg-[var(--v2-background-bg-layer-02)]" />
-                              <NewSessionTabItem
-                                ref={ref}
-                                href={`/${params.dir}/session`}
-                                title={language.t("command.session.new")}
-                                onClose={() => {
-                                  const tab = tabsStore.at(-1)
-                                  if (tab) tabs.select(tab)
-                                  else navigate("/")
-                                }}
-                              />
-                            </>
-                          )
-                        }}
-                      </Show>
-                    </div>
+                        return (
+                          <>
+                            <div class="w-[1.5px] h-3 shrink-0 rounded-full bg-[var(--v2-background-bg-layer-02)]" />
+                            <NewSessionTabItem
+                              ref={ref}
+                              href={`/${params.dir}/session`}
+                              title={language.t("command.session.new")}
+                              onClose={() => {
+                                const tab = tabsStore.at(-1)
+                                if (tab) navigateTab(tab)
+                                else navigate("/")
+                              }}
+                            />
+                          </>
+                        )
+                      }}
+                    </Show>
                  </div>
-                  <div
-                    data-slot="titlebar-tabs-fade-left"
-                    aria-hidden="true"
-                    class="pointer-events-none absolute inset-y-0 left-0 z-10 w-6 bg-[linear-gradient(to_right,var(--v2-background-bg-deep),transparent)]"
-                  />
-                  <div
-                    data-slot="titlebar-tabs-fade-right"
-                    aria-hidden="true"
-                    class="pointer-events-none absolute inset-y-0 right-0 z-10 w-6 bg-[linear-gradient(to_left,var(--v2-background-bg-deep),transparent)]"
-                  />
                </div>
                <Show when={!(creating() && params.dir)}>
                  <IconButtonV2
@@ -839,6 +782,7 @@ function TabNavItem(props: {
    >
      <Show when={session.latest}>
        {(session) => {
+          console.log({ session: session() })
          const project = createMemo(() => projectForSession(session(), serverCtx()?.projects.list() ?? []))

          return (
@@ -907,59 +851,6 @@ function ProjectTabAvatar(props: {
  )
 }

-function DraftTabItem(props: {
-  ref?: HTMLDivElement
-  href: string
-  title: string
-  active?: boolean
-  onNavigate: () => void
-  onClose: () => void
-}) {
-  const closeTab = (event: MouseEvent) => {
-    event.preventDefault()
-    event.stopPropagation()
-    props.onClose()
-  }
-  return (
-    <div
-      ref={props.ref}
-      data-active={props.active}
-      class="group relative shrink-0 flex h-7 max-w-60 flex-row items-center gap-1.5 overflow-hidden rounded-[6px] bg-[var(--tab-bg)] pl-1.5 pr-8 whitespace-nowrap [--tab-bg:var(--v2-background-bg-deep)] hover:[--tab-bg:var(--v2-background-bg-layer-02)] data-[active='true']:[--tab-bg:var(--v2-overlay-simple-overlay-pressed)] focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-[var(--v2-border-border-focus)]"
-      onMouseDown={(event) => {
-        if (event.button !== 1) return
-        closeTab(event)
-      }}
-    >
-      <a
-        href={props.href}
-        onClick={(event) => {
-          event.preventDefault()
-          props.onNavigate()
-        }}
-        class="flex h-full min-w-0 flex-1 flex-row items-center gap-1.5 overflow-hidden text-[13px] font-medium leading-5 text-v2-text-text-faint group-data-[active='true']:text-[var(--v2-text-text-base)]"
-      >
-        <span class="flex size-4 shrink-0 rotate-90 items-center justify-center">
-          <IconV2 name="edit" />
-        </span>
-        <span class="truncate leading-5">{props.title}</span>
-      </a>
-      <div class="absolute right-0 inset-y-0 flex w-7 items-center justify-center">
-        <IconButtonV2
-          size="small"
-          variant="ghost-muted"
-          onMouseDown={(event) => {
-            event.preventDefault()
-            event.stopPropagation()
-          }}
-          onClick={closeTab}
-          icon={<IconV2 name="xmark-small" />}
-          aria-label="Close tab"
-        />
-      </div>
-    </div>
-  )
-}
-
 function NewSessionTabItem(props: { ref?: HTMLDivElement; href: string; title: string; onClose: () => void }) {
  const closeTab = (event: MouseEvent) => {
    event.preventDefault()
@@ -1,26 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { updaterAction } from "./updater-action"
-
-describe("updaterAction", () => {
-  test("disables update actions when the platform has no updater", () => {
-    expect(updaterAction(undefined)).toEqual({ label: "settings.updates.action.checkNow" })
-  })
-
-  test("projects updater transitions into one settings action", () => {
-    expect(updaterAction({ status: "idle" })).toEqual({
-      label: "settings.updates.action.checkNow",
-      run: "check",
-    })
-    expect(updaterAction({ status: "checking" })).toEqual({ label: "settings.updates.action.checking" })
-    expect(updaterAction({ status: "downloading", version: "2.0.0" })).toEqual({
-      label: "settings.updates.action.downloading",
-    })
-    expect(updaterAction({ status: "ready", version: "2.0.0" })).toEqual({
-      label: "toast.update.action.installRestart",
-      run: "install",
-    })
-    expect(updaterAction({ status: "installing", version: "2.0.0" })).toEqual({
-      label: "settings.updates.action.installing",
-    })
-  })
-})
@@ -1,51 +0,0 @@
-import { createMemo } from "solid-js"
-import type { UpdaterState } from "@/updater"
-import { usePlatform } from "@/context/platform"
-import { useLanguage } from "@/context/language"
-import { showToast } from "@/utils/toast"
-
-export function updaterAction(state: UpdaterState | undefined) {
-  if (!state) return { label: "settings.updates.action.checkNow" as const }
-  switch (state.status) {
-    case "checking":
-      return { label: "settings.updates.action.checking" as const }
-    case "downloading":
-      return { label: "settings.updates.action.downloading" as const }
-    case "ready":
-      return { label: "toast.update.action.installRestart" as const, run: "install" as const }
-    case "installing":
-      return { label: "settings.updates.action.installing" as const }
-    case "disabled":
-      return { label: "settings.updates.action.checkNow" as const }
-    default:
-      return { label: "settings.updates.action.checkNow" as const, run: "check" as const }
-  }
-}
-
-export function useUpdaterAction() {
-  const platform = usePlatform()
-  const language = useLanguage()
-  const action = createMemo(() => updaterAction(platform.updater?.state()))
-
-  return {
-    action,
-    async run() {
-      const run = action().run
-      if (run === "install") return platform.updater?.install()
-      if (run !== "check") return
-
-      const state = await platform.updater?.check()
-      if (state?.status === "up-to-date") {
-        showToast({
-          variant: "success",
-          icon: "circle-check",
-          title: language.t("settings.updates.toast.latest.title"),
-          description: language.t("settings.updates.toast.latest.description", { version: platform.version ?? "" }),
-        })
-      }
-      if (state?.status === "error") {
-        showToast({ title: language.t("common.requestFailed"), description: state.message })
-      }
-    },
-  }
-}
@@ -170,7 +170,13 @@ export function matchKeybind(keybinds: Keybind[], event: KeyboardEvent): boolean
  return false
 }

-function displayKeybindParts(kb: Keybind, t?: (key: KeyLabel) => string) {
+export function formatKeybind(config: string, t?: (key: KeyLabel) => string): string {
+  if (!config || config === "none") return ""
+
+  const keybinds = parseKeybind(config)
+  if (keybinds.length === 0) return ""
+
+  const kb = keybinds[0]
  const parts: string[] = []

  if (kb.ctrl) parts.push(IS_MAC ? "⌃" : keyText("common.key.ctrl", t))
@@ -178,52 +184,40 @@ function displayKeybindParts(kb: Keybind, t?: (key: KeyLabel) => string) {
  if (kb.shift) parts.push(IS_MAC ? "⇧" : keyText("common.key.shift", t))
  if (kb.meta) parts.push(IS_MAC ? "⌘" : keyText("common.key.meta", t))

-  if (!kb.key) return parts
-
-  const keys: Record<string, string> = {
-    arrowup: "↑",
-    arrowdown: "↓",
-    arrowleft: "←",
-    arrowright: "→",
-    comma: ",",
-    plus: "+",
+  if (kb.key) {
+    const keys: Record<string, string> = {
+      arrowup: "↑",
+      arrowdown: "↓",
+      arrowleft: "←",
+      arrowright: "→",
+      comma: ",",
+      plus: "+",
+    }
+    const named: Record<string, KeyLabel> = {
+      backspace: "common.key.backspace",
+      delete: "common.key.delete",
+      end: "common.key.end",
+      enter: "common.key.enter",
+      esc: "common.key.esc",
+      escape: "common.key.esc",
+      home: "common.key.home",
+      insert: "common.key.insert",
+      pagedown: "common.key.pageDown",
+      pageup: "common.key.pageUp",
+      space: "common.key.space",
+      tab: "common.key.tab",
+    }
+    const key = kb.key.toLowerCase()
+    const displayKey =
+      keys[key] ??
+      (named[key]
+        ? keyText(named[key], t)
+        : key.length === 1
+          ? key.toUpperCase()
+          : key.charAt(0).toUpperCase() + key.slice(1))
+    parts.push(displayKey)
  }
-  const named: Record<string, KeyLabel> = {
-    backspace: "common.key.backspace",
-    delete: "common.key.delete",
-    end: "common.key.end",
-    enter: "common.key.enter",
-    esc: "common.key.esc",
-    escape: "common.key.esc",
-    home: "common.key.home",
-    insert: "common.key.insert",
-    pagedown: "common.key.pageDown",
-    pageup: "common.key.pageUp",
-    space: "common.key.space",
-    tab: "common.key.tab",
-  }
-  const key = kb.key.toLowerCase()
-  const displayKey =
-    keys[key] ??
-    (named[key]
-      ? keyText(named[key], t)
-      : key.length === 1
-        ? key.toUpperCase()
-        : key.charAt(0).toUpperCase() + key.slice(1))
-  parts.push(displayKey)

-  return parts
-}
-
-export function formatKeybindParts(config: string, t?: (key: KeyLabel) => string): string[] {
-  if (!config || config === "none") return []
-  const keybind = parseKeybind(config)[0]
-  return keybind ? displayKeybindParts(keybind, t) : []
-}
-
-export function formatKeybind(config: string, t?: (key: KeyLabel) => string): string {
-  const parts = formatKeybindParts(config, t)
-  if (parts.length === 0) return ""
  return IS_MAC ? parts.join("") : parts.join("+")
 }

@@ -408,26 +402,25 @@ export const { use: useCommand, provider: CommandProvider } = createSimpleContex
      })
    }

-    const keybindConfig = (id: string) => {
-      if (id === PALETTE_ID) return settings.keybinds.get(PALETTE_ID) ?? DEFAULT_PALETTE_KEYBIND
-      const base = actionId(id)
-      return options().find((x) => actionId(x.id) === base)?.keybind ?? bind(base, catalog[base]?.keybind)
-    }
-
    return {
      register,
      trigger(id: string, source?: CommandSource) {
        run(id, source)
      },
      keybind(id: string) {
-        const config = keybindConfig(id)
+        if (id === PALETTE_ID) {
+          return formatKeybind(settings.keybinds.get(PALETTE_ID) ?? DEFAULT_PALETTE_KEYBIND, language.t)
+        }
+
+        const base = actionId(id)
+        const option = options().find((x) => actionId(x.id) === base)
+        if (option?.keybind) return formatKeybind(option.keybind, language.t)
+
+        const meta = catalog[base]
+        const config = bind(base, meta?.keybind)
        if (!config) return ""
        return formatKeybind(config, language.t)
      },
-      keybindParts(id: string) {
-        const config = keybindConfig(id)
-        return config ? formatKeybindParts(config, language.t) : []
-      },
      show: showPalette,
      keybinds(enabled: boolean) {
        setStore("suspendCount", (count) => Math.max(0, count + (enabled ? -1 : 1)))
@@ -8,8 +8,6 @@ beforeAll(async () => {
  mock.module("@solidjs/router", () => ({
    useNavigate: () => () => undefined,
    useParams: () => ({}),
-    useLocation: () => ({}),
-    useSearchParams: () => [{}, () => undefined],
  }))
  mock.module("@opencode-ai/ui/context", () => ({
    createSimpleContext: () => ({
@@ -208,7 +208,7 @@ export const { use: useComments, provider: CommentsProvider } = createSimpleCont
        const decoded = decodeSessionKey(key)
        return createRoot((dispose) => ({
          value: createCommentSession(
-            serverSDK().scope,
+            serverSDK.scope,
            decoded.dir,
            decoded.id === WORKSPACE_KEY ? undefined : decoded.id,
          ),
@@ -11,7 +11,7 @@ import {
 import type { Message, Part } from "@opencode-ai/sdk/v2/client"
 import { SESSION_CACHE_LIMIT, dropSessionCaches, pickSessionCacheEvictions } from "./global-sync/session-cache"
 import { diffs as list, message as clean } from "@/utils/diffs"
-import { type createServerSdkContext } from "./server-sdk"
+import { createServerSdkContext, useServerSDK } from "./server-sdk"
 import { type createServerSyncContextInner } from "./server-sync"

 const SKIP_PARTS = new Set(["patch", "step-start", "step-finish"])
@@ -174,7 +174,7 @@ function setOptimisticRemove(setStore: (...args: unknown[]) => void, input: Opti
 export const createDirSyncContext = (
  directory: string,
  serverSync: ReturnType<typeof createServerSyncContextInner>,
-  serverSDK: ReturnType<typeof createServerSdkContext>,
+  serverSDK: ReturnType<typeof createServerSdkContext> = useServerSDK(),
 ) => {
  const client = serverSDK.createClient({ directory, throwOnError: true })

@@ -609,9 +609,6 @@ export const createDirSyncContext = (
        )
      },
    },
-    mcp: {
-      toggle: (name: string) => serverSync.mcp.toggle(directory, name),
-    },
    absolute,
    get directory() {
      return current()[0].path.directory
@@ -62,10 +62,10 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
    const language = useLanguage()
    const layout = useLayout()

-    const scope = createMemo(() => sdk().directory)
+    const scope = createMemo(() => sdk.directory)
    const path = createPathHelpers(scope)
    const tabs = layout.tabs(() =>
-      SessionStateKey.from(serverSDK().scope, SessionRouteKey.fromRoute(params.dir, params.id)),
+      SessionStateKey.from(serverSDK.scope, SessionRouteKey.fromRoute(params.dir, params.id)),
    )

    const inflight = new Map<string, Promise<void>>()
@@ -78,10 +78,7 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
    const tree = createFileTreeStore({
      scope,
      normalizeDir: path.normalizeDir,
-      list: (dir) =>
-        sdk()
-          .client.file.list({ path: dir })
-          .then((x) => x.data ?? []),
+      list: (dir) => sdk.client.file.list({ path: dir }).then((x) => x.data ?? []),
      onError: (message) => {
        showToast({
          variant: "error",
@@ -115,7 +112,7 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
      })
    })

-    const viewCache = createFileViewCache(serverSDK().scope)
+    const viewCache = createFileViewCache(serverSDK.scope)
    const view = createMemo(() => viewCache.load(scope(), params.id))

    const ensure = (file: string) => {
@@ -179,8 +176,8 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({

      setLoading(file)

-      const promise = sdk()
-        .client.file.read({ path: file })
+      const promise = sdk.client.file
+        .read({ path: file })
        .then((x) => {
          if (scope() !== directory) return
          const content = x.data
@@ -203,14 +200,12 @@ export const { use: useFile, provider: FileProvider } = createSimpleContext({
    }

    const search = (query: string, dirs: "true" | "false") =>
-      sdk()
-        .client.find.files({ query, dirs })
-        .then(
-          (x) => (x.data ?? []).map(path.normalize),
-          () => [],
-        )
+      sdk.client.find.files({ query, dirs }).then(
+        (x) => (x.data ?? []).map(path.normalize),
+        () => [],
+      )

-    const stop = sdk().event.listen((e) => {
+    const stop = sdk.event.listen((e) => {
      invalidateFromWatcher(e.details, {
        normalize: path.normalize,
        hasFile: (file) => Boolean(store.file[file]),
@@ -134,26 +134,6 @@ describe("applyGlobalEvent", () => {
 })

 describe("applyDirectoryEvent", () => {
-  test("initializes text delta accumulation from the current part text", () => {
-    const part = { ...textPart("part", "session", "message"), text: "existing" }
-    const [store, setStore] = createStore(baseState({ part: { message: [part] } }))
-
-    applyDirectoryEvent({
-      event: {
-        type: "message.part.delta",
-        properties: { messageID: "message", partID: "part", field: "text", delta: " appended" },
-      },
-      store,
-      setStore,
-      push() {},
-      directory: "/tmp",
-      loadLsp() {},
-    })
-
-    expect(store.part_text_accum_delta.part).toBe("existing appended")
-    expect((store.part.message?.[0] as { text: string }).text).toBe("existing appended")
-  })
-
  test("preserves a Home-specific retained session limit", () => {
    const [store, setStore] = createStore(
      baseState({
@@ -282,13 +282,7 @@ export function applyDirectoryEvent(input: {
      if (!parts) break
      const result = Binary.search(parts, props.partID, (p) => p.id)
      if (!result.found) break
-      const field = props.field as keyof (typeof parts)[number]
-      const current = parts[result.index]?.[field]
-      input.setStore(
-        "part_text_accum_delta",
-        props.partID,
-        (existing) => (existing ?? (typeof current === "string" ? current : "")) + props.delta,
-      )
+      input.setStore("part_text_accum_delta", props.partID, (existing) => (existing ?? "") + props.delta)
      input.setStore(
        "part",
        props.messageID,
@@ -1,34 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import { toggleMcp } from "./mcp"
-
-describe("toggleMcp", () => {
-  test("runs the status action before refreshing the owning query", async () => {
-    const calls: string[] = []
-    const input = (status: "connected" | "needs_auth" | "disabled") => ({
-      status,
-      connect: async () => {
-        calls.push("connect")
-      },
-      disconnect: async () => {
-        calls.push("disconnect")
-      },
-      authenticate: async () => {
-        calls.push("authenticate")
-      },
-      refresh: async () => {
-        calls.push("refresh")
-      },
-    })
-
-    await toggleMcp(input("connected"))
-    expect(calls).toEqual(["disconnect", "refresh"])
-
-    calls.length = 0
-    await toggleMcp(input("needs_auth"))
-    expect(calls).toEqual(["authenticate", "refresh"])
-
-    calls.length = 0
-    await toggleMcp(input("disabled"))
-    expect(calls).toEqual(["connect", "refresh"])
-  })
-})
@@ -1,18 +0,0 @@
-import type { McpStatus } from "@opencode-ai/sdk/v2/client"
-
-export async function toggleMcp(input: {
-  status: McpStatus["status"]
-  connect: () => Promise<void>
-  disconnect: () => Promise<void>
-  authenticate: () => Promise<void>
-  refresh: () => Promise<void>
-}) {
-  await {
-    connected: input.disconnect,
-    needs_auth: input.authenticate,
-    disabled: input.connect,
-    failed: input.connect,
-    needs_client_registration: input.connect,
-  }[input.status]()
-  await input.refresh()
-}
@@ -77,7 +77,6 @@ export type ReviewDiffStyle = "unified" | "split"

 export type LayoutRoute =
  | { type: "home" }
-  | { type: "draft"; draftID: string; server?: ServerConnection.Key }
  | { type: "dir-new-sesssion"; dir: string; dirBase64: string; server?: ServerConnection.Key }
  | { type: "session"; dir: string; dirBase64: string; sessionId: string; server?: ServerConnection.Key }

@@ -121,16 +120,10 @@ const normalizeStoredSessionTabs = (key: string, tabs: SessionTabs) => {
  }
 }

-const currentRoute = (pathname: string, search: string): LayoutRoute => {
+const currentRoute = (pathname: string): LayoutRoute => {
  const parts = pathname.split("/").filter(Boolean)
  if (parts.length === 0) return { type: "home" }

-  if (parts[0] === "new-session") {
-    const draftID = new URLSearchParams(search).get("draftId")
-    if (!draftID) return { type: "home" }
-    return { type: "draft", draftID }
-  }
-
  const dirBase64 = parts[0]
  const dir = decode64(dirBase64)
  if (!dir) return { type: "home" }
@@ -152,7 +145,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
    const platform = usePlatform()
    const location = useLocation()
    const route = createMemo(() => {
-      const value = currentRoute(location.pathname, location.search)
+      const value = currentRoute(location.pathname)
      if (value.type === "home") return value
      return { ...value, server: server.key }
    })
@@ -246,7 +239,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
      }
    }

-    const target = Persist.serverGlobal(serverSdk().scope, "layout", ["layout.v6"])
+    const target = Persist.serverGlobal(serverSdk.scope, "layout", ["layout.v6"])
    const [store, setStore, _, ready] = persisted(
      { ...target, migrate },
      createStore({
@@ -409,11 +402,11 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
    }

    function enrich(project: { worktree: string; expanded: boolean }) {
-      const [childStore] = serverSync().child(project.worktree, { bootstrap: false })
+      const [childStore] = serverSync.child(project.worktree, { bootstrap: false })
      const projectID = childStore.project
      const metadata = projectID
-        ? serverSync().data.project.find((x) => x.id === projectID)
-        : serverSync().data.project.find((x) => x.worktree === project.worktree)
+        ? serverSync.data.project.find((x) => x.id === projectID)
+        : serverSync.data.project.find((x) => x.worktree === project.worktree)

      // Preserve local icon override from per-workspace localStorage cache (childStore.icon).
      // Without this, different subdirectories of the same git repo would share the same
@@ -427,7 +420,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(

    const roots = createMemo(() => {
      const map = new Map<string, string>()
-      for (const project of serverSync().data.project) {
+      for (const project of serverSync.data.project) {
        const sandboxes = project.sandboxes ?? []
        for (const sandbox of sandboxes) {
          map.set(sandbox, project.worktree)
@@ -493,12 +486,12 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
    createEffect(() => {
      const projects = enriched()
      if (projects.length === 0) return
-      if (!serverSync().ready) return
+      if (!serverSync.ready) return

      for (const project of projects) {
        if (!project.id) continue
        if (project.id === "global") continue
-        serverSync().project.icon(project.worktree, project.icon?.override)
+        serverSync.project.icon(project.worktree, project.icon?.override)
      }
    })

@@ -532,12 +525,12 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        colorRequested.set(worktree, color)

        if (project.id === "global") {
-          serverSync().project.meta(worktree, { icon: { color } })
+          serverSync.project.meta(worktree, { icon: { color } })
          continue
        }

-        void serverSdk()
-          .client.project.update({ projectID: project.id, directory: worktree, icon: { color } })
+        void serverSdk.client.project
+          .update({ projectID: project.id, directory: worktree, icon: { color } })
          .catch(() => {
            if (colorRequested.get(worktree) === color) colorRequested.delete(worktree)
          })
@@ -554,7 +547,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
          sessionTimer = undefined
          void Promise.all(
            server.projects.list().map((project) => {
-              return serverSync().project.loadSessions(project.worktree)
+              return serverSync.project.loadSessions(project.worktree)
            }),
          )
        }, 0)
@@ -584,7 +577,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext(
        open(directory: string) {
          const root = rootFor(directory)
          if (server.projects.list().find((x) => x.worktree === root)) return
-          void serverSync().project.loadSessions(root)
+          void serverSync.project.loadSessions(root)
          server.projects.open(root)
        },
        close(directory: string) {
@@ -64,12 +64,12 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
    const models = useModels()

    const id = createMemo(() => params.id || undefined)
-    const list = createMemo(() => sync().data.agent.filter((item) => item.mode !== "subagent" && !item.hidden))
+    const list = createMemo(() => sync.data.agent.filter((item) => item.mode !== "subagent" && !item.hidden))
    const connected = createMemo(() => new Set(providers.connected().map((item) => item.id)))

    const [saved, setSaved] = persisted(
      {
-        ...Persist.serverWorkspace(serverSDK().scope, sdk().directory, "model-selection", ["model-selection.v1"]),
+        ...Persist.serverWorkspace(serverSDK.scope, sdk.directory, "model-selection", ["model-selection.v1"]),
        migrate,
      },
      createStore<Saved>({
@@ -124,14 +124,14 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
    const scope = createMemo<State | undefined>(() => {
      const session = id()
      if (!session) return store.draft
-      return saved.session[session] ?? handoff.get(handoffKey(serverSDK().scope, sdk().directory, session))
+      return saved.session[session] ?? handoff.get(handoffKey(serverSDK.scope, sdk.directory, session))
    })

    createEffect(() => {
      const session = id()
      if (!session) return

-      const key = handoffKey(serverSDK().scope, sdk().directory, session)
+      const key = handoffKey(serverSDK.scope, sdk.directory, session)
      const next = handoff.get(key)
      if (!next) return
      if (saved.session[session] !== undefined) {
@@ -144,9 +144,8 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
    })

    const configuredModel = () => {
-      const configured = sync().data.config.model
-      if (!configured) return
-      const [providerID, modelID] = configured.split("/")
+      if (!sync.data.config.model) return
+      const [providerID, modelID] = sync.data.config.model.split("/")
      const model = { providerID, modelID }
      if (validModel(model)) return model
    }
@@ -364,7 +363,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
    }

    const result = {
-      slug: createMemo(() => base64Encode(sdk().directory)),
+      slug: createMemo(() => base64Encode(sdk.directory)),
      model,
      agent,
      session: {
@@ -375,13 +374,13 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
          const next = clone(snapshot())
          if (!next) return

-          if (dir === sdk().directory) {
+          if (dir === sdk.directory) {
            setSaved("session", session, next)
            setStore("draft", undefined)
            return
          }

-          handoff.set(handoffKey(serverSDK().scope, dir, session), next)
+          handoff.set(handoffKey(serverSDK.scope, dir, session), next)
          setStore("draft", undefined)
        },
        restore(msg: { sessionID: string; agent: string; model: ModelKey }) {
@@ -389,7 +388,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
          if (!session) return
          if (msg.sessionID !== session) return
          if (saved.session[session] !== undefined) return
-          if (handoff.has(handoffKey(serverSDK().scope, sdk().directory, session))) return
+          if (handoff.has(handoffKey(serverSDK.scope, sdk.directory, session))) return

          setSaved("session", session, {
            agent: msg.agent,
@@ -1,19 +0,0 @@
-import { useMutation } from "@tanstack/solid-query"
-import { useLanguage } from "@/context/language"
-import { useSync } from "@/context/sync"
-import { showToast } from "@/utils/toast"
-
-export function useMcpToggle() {
-  const sync = useSync()
-  const language = useLanguage()
-
-  return useMutation(() => ({
-    mutationFn: sync().mcp.toggle,
-    onError: (error) =>
-      showToast({
-        variant: "error",
-        title: language.t("common.requestFailed"),
-        description: error instanceof Error ? error.message : String(error),
-      }),
-  }))
-}
@@ -125,7 +125,7 @@ export const { use: useNotification, provider: NotificationProvider } = createSi
    const currentSession = createMemo(() => params.id)

    const [store, setStore, _, ready] = persisted(
-      Persist.serverGlobal(serverSDK().scope, "notification", ["notification.v1"]),
+      Persist.serverGlobal(serverSDK.scope, "notification", ["notification.v1"]),
      createStore({
        list: [] as Notification[],
      }),
@@ -208,11 +208,11 @@ export const { use: useNotification, provider: NotificationProvider } = createSi

    const lookup = async (directory: string, sessionID?: string) => {
      if (!sessionID) return undefined
-      const [syncStore] = serverSync().child(directory, { bootstrap: false })
+      const [syncStore] = serverSync.child(directory, { bootstrap: false })
      const match = Binary.search(syncStore.session, sessionID, (s) => s.id)
      if (match.found) return syncStore.session[match.index]
-      return serverSDK()
-        .client.session.get({ directory, sessionID })
+      return serverSDK.client.session
+        .get({ directory, sessionID })
        .then((x) => x.data)
        .catch(() => undefined)
    }
@@ -286,7 +286,7 @@ export const { use: useNotification, provider: NotificationProvider } = createSi
      })
    }

-    const unsub = serverSDK().event.listen((e) => {
+    const unsub = serverSDK.event.listen((e) => {
      const event = e.details
      if (event.type !== "session.idle" && event.type !== "session.error") return

@@ -55,13 +55,13 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
    const permissionsEnabled = createMemo(() => {
      const directory = decode64(params.dir)
      if (!directory) return false
-      const [store] = serverSync().child(directory)
+      const [store] = serverSync.child(directory)
      return hasPermissionPromptRules(store.config.permission)
    })

    const [store, setStore, _, ready] = persisted(
      {
-        ...Persist.serverGlobal(serverSDK().scope, "permission", ["permission.v3"]),
+        ...Persist.serverGlobal(serverSDK.scope, "permission", ["permission.v3"]),
        migrate(value) {
          if (!value || typeof value !== "object" || Array.isArray(value)) return value

@@ -87,7 +87,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
      if (!ready()) return
      const directory = decode64(params.dir)
      if (!directory) return
-      const [childStore] = serverSync().child(directory)
+      const [childStore] = serverSync.child(directory)
      const perm = childStore.config.permission
      if (typeof perm === "string" && perm === "allow") {
        const key = directoryAcceptKey(directory)
@@ -119,11 +119,9 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
    }

    const respond: PermissionRespondFn = (input) => {
-      serverSDK()
-        .client.permission.respond(input)
-        .catch(() => {
-          responded.delete(input.permissionID)
-        })
+      serverSDK.client.permission.respond(input).catch(() => {
+        responded.delete(input.permissionID)
+      })
    }

    function respondOnce(permission: PermissionRequest, directory?: string) {
@@ -142,7 +140,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
    }

    function isAutoAccepting(sessionID: string, directory?: string) {
-      const session = directory ? serverSync().child(directory, { bootstrap: false })[0].session : []
+      const session = directory ? serverSync.child(directory, { bootstrap: false })[0].session : []
      return autoRespondsPermission(store.autoAccept, session, { sessionID }, directory)
    }

@@ -151,7 +149,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
    }

    function shouldAutoRespond(permission: PermissionRequest, directory?: string) {
-      const session = directory ? serverSync().child(directory, { bootstrap: false })[0].session : []
+      const session = directory ? serverSync.child(directory, { bootstrap: false })[0].session : []
      return autoRespondsPermission(store.autoAccept, session, permission, directory)
    }

@@ -162,7 +160,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
      return next
    }

-    const unsubscribe = serverSDK().event.listen((e) => {
+    const unsubscribe = serverSDK.event.listen((e) => {
      const event = e.details
      if (event?.type !== "permission.asked") return

@@ -181,8 +179,8 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
        }),
      )

-      serverSDK()
-        .client.permission.list({ directory })
+      serverSDK.client.permission
+        .list({ directory })
        .then((x) => {
          if (!isAutoAcceptingDirectory(directory)) return
          for (const perm of x.data ?? []) {
@@ -213,8 +211,8 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
        }),
      )

-      serverSDK()
-        .client.permission.list({ directory })
+      serverSDK.client.permission
+        .list({ directory })
        .then((x) => {
          if (enableVersion.get(key) !== version) return
          if (!isAutoAccepting(sessionID, directory)) return
@@ -271,7 +269,7 @@ export const { use: usePermission, provider: PermissionProvider } = createSimple
      },
      permissionsEnabled,
      isPermissionAllowAll(directory: string) {
-        const [childStore] = serverSync().child(directory)
+        const [childStore] = serverSync.child(directory)
        const perm = childStore.config.permission
        return typeof perm === "string" && perm === "allow"
      },
@@ -4,18 +4,12 @@ import type { Accessor } from "solid-js"
 import type { DesktopMenuAction } from "../desktop-menu"
 import { ServerConnection } from "./server"
 import type { WslServersPlatform } from "../wsl/types"
-import type { UpdaterPlatform } from "../updater"

 type PickerPaths = string | string[] | null
 type OpenDirectoryPickerOptions = { title?: string; multiple?: boolean }
-type OpenAttachmentPickerOptions = {
-  title?: string
-  multiple?: boolean
-  accept?: string[]
-  extensions?: string[]
-  defaultPath?: string
-}
+type OpenFilePickerOptions = { title?: string; multiple?: boolean; accept?: string[]; extensions?: string[] }
 type SaveFilePickerOptions = { title?: string; defaultPath?: string }
+type UpdateInfo = { updateAvailable: boolean; version?: string }
 type PlatformName = "web" | "desktop"
 type DesktopOS = "macos" | "windows" | "linux"

@@ -27,7 +21,13 @@ export type FatalRendererErrorLog = {
  os?: DesktopOS
 }

-type PlatformBase = {
+export type Platform = {
+  /** Platform discriminator */
+  platform: PlatformName
+
+  /** Desktop OS (Tauri only) */
+  os?: DesktopOS
+
  /** App version */
  version?: string

@@ -49,23 +49,23 @@ type PlatformBase = {
  /** Send a system notification (optional deep link) */
  notify(title: string, description?: string, href?: string): Promise<void>

-  /** Open a native attachment picker and read selected files sequentially (desktop only) */
-  openAttachmentPickerDialog?(
-    opts: OpenAttachmentPickerOptions,
-    onFile: (file: File) => Promise<unknown>,
-  ): Promise<void>
+  /** Open directory picker dialog (native on Tauri, server-backed on web) */
+  openDirectoryPickerDialog?(opts?: OpenDirectoryPickerOptions): Promise<PickerPaths>

-  /** Resolve the native source path for a desktop File. */
-  getPathForFile?(file: File): string
+  /** Open native file picker dialog (Tauri only) */
+  openFilePickerDialog?(opts?: OpenFilePickerOptions): Promise<PickerPaths>

-  /** Open a native save file picker dialog (desktop only) */
+  /** Save file picker dialog (Tauri only) */
  saveFilePickerDialog?(opts?: SaveFilePickerOptions): Promise<string | null>

  /** Storage mechanism, defaults to localStorage */
  storage?: (name?: string) => SyncStorage | AsyncStorage

-  /** Application-global desktop updater */
-  updater?: UpdaterPlatform
+  /** Check for a downloadable desktop update */
+  checkUpdate?(): Promise<UpdateInfo>
+
+  /** Install the downloaded update using the platform restart flow */
+  updateAndRestart?(): Promise<void>

  /** Fetch override */
  fetch?: typeof fetch
@@ -113,16 +113,6 @@ type PlatformBase = {
  recordFatalRendererError?(error: FatalRendererErrorLog): Promise<void>
 }

-export type Platform = PlatformBase &
-  (
-    | { platform: "web"; os?: never }
-    | {
-        platform: "desktop"
-        os?: DesktopOS
-        openDirectoryPickerDialog(opts?: OpenDirectoryPickerOptions): Promise<PickerPaths>
-      }
-  )
-
 export type DisplayBackend = "auto" | "wayland"

 export const { use: usePlatform, provider: PlatformProvider } = createSimpleContext({
@@ -1,6 +1,6 @@
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { checksum } from "@opencode-ai/core/util/encode"
-import { useParams, useSearchParams } from "@solidjs/router"
+import { useParams } from "@solidjs/router"
 import { batch, createMemo, createRoot, getOwner, onCleanup } from "solid-js"
 import { createStore, type SetStoreFunction } from "solid-js/store"
 import type { FileSelection } from "@/context/file"
@@ -33,7 +33,6 @@ export interface ImageAttachmentPart {
  type: "image"
  id: string
  filename: string
-  sourcePath?: string
  mime: string
  dataUrl: string
 }
@@ -154,19 +153,9 @@ const MAX_PROMPT_SESSIONS = 20

 type PromptSession = ReturnType<typeof createPromptSession>

-type PromptStore = {
-  prompt: Prompt
-  cursor?: number
-  context: {
-    items: (ContextItem & { key: string })[]
-  }
-}
-
-type Scope = { draftID: string } | { dir: string; id?: string }
-
-function scopeKey(scope: Scope) {
-  if ("draftID" in scope) return `draft:${scope.draftID}`
-  return `${scope.dir}:${scope.id ?? WORKSPACE_KEY}`
+type Scope = {
+  dir: string
+  id?: string
 }

 type PromptCacheEntry = {
@@ -174,35 +163,30 @@ type PromptCacheEntry = {
  dispose: VoidFunction
 }

-function promptTarget(serverScope: ServerScope, scope: Scope) {
-  if ("draftID" in scope) return Persist.draft(scope.draftID, "prompt")
-  const legacy = `${scope.dir}/prompt${scope.id ? "/" + scope.id : ""}.v2`
-  return Persist.serverScoped(serverScope, scope.dir, scope.id, "prompt", [legacy])
-}
+function createPromptSession(scope: ServerScope, dir: string, id: string | undefined) {
+  const legacy = `${dir}/prompt${id ? "/" + id : ""}.v2`

-function createPromptSession(serverScope: ServerScope, scope: Scope) {
  const [store, setStore, _, ready] = persisted(
-    promptTarget(serverScope, scope),
-    createStore<PromptStore>(promptStore()),
+    Persist.serverScoped(scope, dir, id, "prompt", [legacy]),
+    createStore<{
+      prompt: Prompt
+      cursor?: number
+      context: {
+        items: (ContextItem & { key: string })[]
+      }
+    }>({
+      prompt: clonePrompt(DEFAULT_PROMPT),
+      cursor: undefined,
+      context: {
+        items: [],
+      },
+    }),
  )

-  return { ready, ...createPromptStateValue(store, setStore) }
-}
-
-function promptStore(): PromptStore {
-  return {
-    prompt: clonePrompt(DEFAULT_PROMPT),
-    cursor: undefined,
-    context: {
-      items: [],
-    },
-  }
-}
-
-function createPromptStateValue(store: PromptStore, setStore: SetStoreFunction<PromptStore>) {
  const actions = createPromptActions(setStore)

  return {
+    ready,
    current: () => store.prompt,
    cursor: createMemo(() => store.cursor),
    dirty: () => !isPromptEqual(store.prompt, DEFAULT_PROMPT),
@@ -242,21 +226,11 @@ function createPromptStateValue(store: PromptStore, setStore: SetStoreFunction<P
  }
 }

-export function createPromptState() {
-  const [store, setStore] = createStore<PromptStore>(promptStore())
-  const ready = Object.assign(() => true, { promise: Promise.resolve(true) })
-  return {
-    ready: () => ready,
-    ...createPromptStateValue(store, setStore),
-  }
-}
-
 export const { use: usePrompt, provider: PromptProvider } = createSimpleContext({
  name: "Prompt",
  gate: false,
  init: () => {
    const params = useParams()
-    const [search] = useSearchParams<{ draftId?: string }>()
    const serverSDK = useServerSDK()
    const cache = new Map<string, PromptCacheEntry>()

@@ -280,8 +254,8 @@ export const { use: usePrompt, provider: PromptProvider } = createSimpleContext(
    }

    const owner = getOwner()
-    const load = (scope: Scope) => {
-      const key = scopeKey(scope)
+    const load = (dir: string, id: string | undefined) => {
+      const key = `${dir}:${id ?? WORKSPACE_KEY}`
      const existing = cache.get(key)
      if (existing) {
        cache.delete(key)
@@ -291,7 +265,7 @@ export const { use: usePrompt, provider: PromptProvider } = createSimpleContext(

      const entry = createRoot(
        (dispose) => ({
-          value: createPromptSession(serverSDK().scope, scope),
+          value: createPromptSession(serverSDK.scope, dir, id),
          dispose,
        }),
        owner,
@@ -302,10 +276,8 @@ export const { use: usePrompt, provider: PromptProvider } = createSimpleContext(
      return entry.value
    }

-    const session = createMemo(() =>
-      load(search.draftId ? { draftID: search.draftId } : { dir: params.dir!, id: params.id }),
-    )
-    const pick = (scope?: Scope) => (scope ? load(scope) : session())
+    const session = createMemo(() => load(params.dir!, params.id))
+    const pick = (scope?: Scope) => (scope ? load(scope.dir, scope.id) : session())

    return {
      ready: () => session().ready,
@@ -1,17 +1,11 @@
 import { createSimpleContext } from "@opencode-ai/ui/context"
-import { type Accessor, createMemo } from "solid-js"
-import { type ServerSDK, useServerSDK } from "./server-sdk"
-
-export type DirectorySDK = ReturnType<ServerSDK["createDirSdkContext"]>
+import { useServerSDK } from "./server-sdk"

 export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
  name: "SDK",
-  // Resolves the directory-scoped SDK reactively from the (possibly changing) server.
-  init: (props: { directory: string | Accessor<string> }) => {
+  init: (props: { directory: string }) => {
    const serverSDK = useServerSDK()
-    return createMemo(() => {
-      const directory = typeof props.directory === "function" ? props.directory() : props.directory
-      return serverSDK().createDirSdkContext(directory)
-    })
+
+    return serverSDK.createDirSdkContext(props.directory)
  },
 })
@@ -1,6 +1,5 @@
 import { describe, expect, test } from "bun:test"
-import { coalesceServerEvents, resumeStreamAfterPageShow } from "./server-sdk"
-import type { Event } from "@opencode-ai/sdk/v2/client"
+import { resumeStreamAfterPageShow } from "./server-sdk"

 describe("resumeStreamAfterPageShow", () => {
  test("restarts a stream only after a back-forward cache restore", () => {
@@ -13,41 +12,3 @@ describe("resumeStreamAfterPageShow", () => {
    expect(starts).toBe(1)
  })
 })
-
-describe("coalesceServerEvents", () => {
-  const delta = (value: string, field = "text") => ({
-    directory: "/repo",
-    payload: {
-      type: "message.part.delta",
-      properties: { messageID: "msg", partID: "part", field, delta: value },
-    } as Event,
-  })
-
-  test("merges adjacent deltas for the same field", () => {
-    const result = coalesceServerEvents([delta("hello "), delta("world")])
-
-    expect(result).toHaveLength(1)
-    expect(result[0]?.payload).toMatchObject({ properties: { delta: "hello world" } })
-  })
-
-  test("preserves event boundaries and distinct fields", () => {
-    const status = {
-      directory: "/repo",
-      payload: { type: "session.status", properties: { sessionID: "ses", status: { type: "idle" } } } as Event,
-    }
-    const result = coalesceServerEvents([delta("a"), delta("b", "metadata"), status, delta("c")])
-
-    expect(result.map((event) => event.payload.type)).toEqual([
-      "message.part.delta",
-      "message.part.delta",
-      "session.status",
-      "message.part.delta",
-    ])
-  })
-
-  test("drops stale deltas", () => {
-    const result = coalesceServerEvents([delta("stale")], new Set(["/repo:msg:part"]))
-
-    expect(result).toEqual([])
-  })
-})
@@ -2,7 +2,7 @@ import type { Event } from "@opencode-ai/sdk/v2/client"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { createGlobalEmitter } from "@solid-primitives/event-bus"
 import { makeEventListener } from "@solid-primitives/event-listener"
-import { type Accessor, batch, createMemo, onCleanup, onMount } from "solid-js"
+import { batch, onCleanup, onMount } from "solid-js"
 import { createSdkForServer } from "@/utils/server"
 import { useLanguage } from "./language"
 import { usePlatform } from "./platform"
@@ -15,46 +15,13 @@ const isAbortError = (error: unknown) =>
  error !== null && typeof error === "object" && "name" in error && error.name === "AbortError"

 const isStreamClosed = (error: unknown, signal?: AbortSignal) => isAbortError(error) || signal?.aborted === true
-type QueuedServerEvent = { directory: string; payload: Event }
-
-const deltaKey = (directory: string, messageID: string, partID: string) => `${directory}:${messageID}:${partID}`
-
-export function coalesceServerEvents(events: QueuedServerEvent[], stale?: Set<string>) {
-  const output: QueuedServerEvent[] = []
-  const deltas = new Map<string, number>()
-  events.forEach((event) => {
-    if (stale && event.payload.type === "message.part.delta") {
-      const props = event.payload.properties
-      if (stale.has(deltaKey(event.directory, props.messageID, props.partID))) return
-    }
-    if (event.payload.type !== "message.part.delta") {
-      deltas.clear()
-      output.push(event)
-      return
-    }
-    const props = event.payload.properties
-    const id = `${deltaKey(event.directory, props.messageID, props.partID)}:${props.field}`
-    const index = deltas.get(id)
-    const existing = index === undefined ? undefined : output[index]
-    if (!existing || existing.payload.type !== "message.part.delta") {
-      deltas.set(id, output.length)
-      output.push({
-        directory: event.directory,
-        payload: { ...event.payload, properties: { ...props } },
-      })
-      return
-    }
-    existing.payload.properties.delta += props.delta
-  })
-  return output
-}

 export function resumeStreamAfterPageShow(event: PageTransitionEvent, start: () => unknown) {
  if (!event.persisted) return
  start()
 }

-function createServerSdkContextBase(server: ServerConnection.Any, scope: ServerScope) {
+export function createServerSdkContext(server: ServerConnection.Any, scope: ServerScope) {
  const platform = usePlatform()
  const abort = new AbortController()

@@ -78,7 +45,7 @@ function createServerSdkContextBase(server: ServerConnection.Any, scope: ServerS
    [key: string]: Event
  }>()

-  type Queued = QueuedServerEvent
+  type Queued = { directory: string; payload: Event }
  const FLUSH_FRAME_MS = 16
  const STREAM_YIELD_MS = 8
  const RECONNECT_DELAY_MS = 250
@@ -90,6 +57,8 @@ function createServerSdkContextBase(server: ServerConnection.Any, scope: ServerS
  let timer: ReturnType<typeof setTimeout> | undefined
  let last = 0

+  const deltaKey = (directory: string, messageID: string, partID: string) => `${directory}:${messageID}:${partID}`
+
  const key = (directory: string, payload: Event) => {
    if (payload.type === "session.status") return `session.status:${directory}:${payload.properties.sessionID}`
    if (payload.type === "lsp.updated") return `lsp.updated:${directory}`
@@ -114,9 +83,14 @@ function createServerSdkContextBase(server: ServerConnection.Any, scope: ServerS
    staleDeltas.clear()

    last = Date.now()
-    const output = coalesceServerEvents(events, skip)
    batch(() => {
-      output.forEach((event) => emitter.emit(event.directory, event.payload))
+      for (const event of events) {
+        if (skip && event.payload.type === "message.part.delta") {
+          const props = event.payload.properties
+          if (skip.has(deltaKey(event.directory, props.messageID, props.partID))) continue
+        }
+        emitter.emit(event.directory, event.payload)
+      }
    })

    buffer.length = 0
@@ -287,31 +261,21 @@ function createServerSdkContextBase(server: ServerConnection.Any, scope: ServerS
  }
 }

-type ServerSDKBase = ReturnType<typeof createServerSdkContextBase>
-export type ServerSDK = ServerSDKBase & {
-  createDirSdkContext: (directory: string) => ReturnType<typeof createDirSdkContext>
-}
-
-export function createServerSdkContext(server: ServerConnection.Any, scope: ServerScope): ServerSDK {
-  const sdk = createServerSdkContextBase(server, scope)
-  return Object.assign(sdk, {
-    createDirSdkContext: createRefCountMap((dir) => createDirSdkContext(dir, sdk)),
-  })
-}
+export type ServerSDK = ReturnType<typeof createServerSdkContext>

 export const { use: useServerSDK, provider: ServerSDKProvider } = createSimpleContext({
  name: "ServerSDK",
-  // Returns an accessor so the resolved server can change reactively (e.g. a
-  // /new-session draft retargeting its server) without re-instantiating the subtree.
-  init: (props: { server?: Accessor<ServerConnection.Any | undefined> }) => {
+  init: (props: { server?: ServerConnection.Any }) => {
    const global = useGlobal()
    const language = useLanguage()
    const server = useServer()

-    return createMemo<ServerSDK>(() => {
-      const conn = props.server?.() ?? server.current
-      if (!conn) throw new Error(language.t("error.serverSDK.noServerAvailable"))
-      return global.createServerCtx(conn).sdk
+    const conn = props.server ?? server.current
+    if (!conn) throw new Error(language.t("error.serverSDK.noServerAvailable"))
+
+    const ctx = global.createServerCtx(conn)
+    return Object.assign(ctx.sdk, {
+      createDirSdkContext: createRefCountMap((dir) => createDirSdkContext(dir, ctx.sdk)),
    })
  },
 })
@@ -320,7 +284,7 @@ type SDKEventMap = {
  [key in Event["type"]]: Extract<Event, { type: key }>
 }

-function createDirSdkContext(directory: string, serverSDK: ServerSDKBase) {
+function createDirSdkContext(directory: string, serverSDK: ServerSDK) {
  const client = serverSDK.createClient({
    directory,
    throwOnError: true,
@@ -1,11 +1,11 @@
 import type { Config, OpencodeClient, Path, Project, ProviderAuthResponse, Todo } from "@opencode-ai/sdk/v2/client"
 import { showToast } from "@/utils/toast"
 import { getFilename } from "@opencode-ai/core/util/path"
-import { type Accessor, batch, createMemo, getOwner, onCleanup, onMount, untrack } from "solid-js"
+import { batch, getOwner, onCleanup, onMount, untrack } from "solid-js"
 import { createStore, produce, reconcile } from "solid-js/store"
 import { useLanguage } from "@/context/language"
 import type { InitError } from "../pages/error"
-import { ServerSDK } from "./server-sdk"
+import { ServerSDK, useServerSDK } from "./server-sdk"
 import {
  bootstrapDirectory,
  bootstrapGlobal,
@@ -36,7 +36,6 @@ import { ServerConnection, useServer } from "./server"
 import { retry } from "@opencode-ai/core/util/retry"
 import type { ServerScope } from "@/utils/server-scope"
 import { persisted } from "@/utils/persist"
-import { toggleMcp } from "./global-sync/mcp"

 type GlobalStore = {
  ready: boolean
@@ -84,7 +83,8 @@ function makeQueryOptionsApi(
 }
 export type QueryOptionsApi = ReturnType<typeof makeQueryOptionsApi>

-export function createServerSyncContextInner(serverSDK: ServerSDK) {
+export function createServerSyncContextInner(_serverSDK?: ServerSDK) {
+  const serverSDK: ServerSDK = _serverSDK ?? useServerSDK()
  const language = useLanguage()
  const owner = getOwner()
  if (!owner) throw new Error("ServerSync must be created within owner")
@@ -481,62 +481,36 @@ export function createServerSyncContextInner(serverSDK: ServerSDK) {
    todo: {
      set: setSessionTodo,
    },
-    mcp: {
-      toggle: async (directory: string, name: string) => {
-        const key = directoryKey(directory)
-        const sdk = sdkFor(key)
-        const status = children.child(key, { bootstrap: false })[0].mcp[name].status
-        await toggleMcp({
-          status,
-          connect: async () => {
-            await sdk.mcp.connect({ name })
-          },
-          disconnect: async () => {
-            await sdk.mcp.disconnect({ name })
-          },
-          authenticate: async () => {
-            await sdk.mcp.auth.authenticate({ name })
-          },
-          refresh: async () => {
-            await queryClient.refetchQueries(queryOptionsApi.mcp(key))
-          },
-        })
-      },
-    },
  }
 }

-export function createServerSyncContext(serverSDK: ServerSDK) {
-  const inner = createServerSyncContextInner(serverSDK)
+export function createServerSyncContext(_serverSDK?: ServerSDK) {
+  const inner = createServerSyncContextInner(_serverSDK)
  return Object.assign(inner, {
    createDirSyncContext: createRefCountMap(
-      (dir) => createDirSyncContext(dir, inner, serverSDK),
+      (dir) => createDirSyncContext(dir, inner, _serverSDK),
      (dir) => inner.disableMcp(dir),
      directoryKey,
    ),
  })
 }

-export type ServerSync = ReturnType<typeof createServerSyncContext>
-
 export const { use: useServerSync, provider: ServerSyncProvider } = createSimpleContext({
  name: "ServerSync",
-  // Returns an accessor so the resolved server can change reactively without
-  // re-instantiating the subtree (mirrors useServerSDK).
-  init: (props: { server?: Accessor<ServerConnection.Any | undefined> }) => {
+  gate: false,
+  init: (props: { server?: ServerConnection.Any }) => {
    const global = useGlobal()
    const language = useLanguage()
    const server = useServer()

-    return createMemo<ServerSync>(() => {
-      const conn = props.server?.() ?? server.current
-      if (!conn) throw new Error(language.t("error.serverSDK.noServerAvailable"))
-      return global.createServerCtx(conn).sync
-    })
+    const conn = props.server ?? server.current
+    if (!conn) throw new Error(language.t("error.serverSDK.noServerAvailable"))
+    const ctx = global.createServerCtx(conn)
+
+    return ctx.sync
  },
 })

 export function useQueryOptions() {
-  const sync = useServerSync()
-  return createMemo(() => sync().queryOptions)
+  return useServerSync().queryOptions
 }
@@ -35,6 +35,9 @@ export interface Settings {
    showCustomAgents: boolean
    newLayoutDesigns?: boolean
  }
+  updates: {
+    startup: boolean
+  }
  appearance: {
    fontSize: number
    mono: string
@@ -119,6 +122,9 @@ const defaultSettings: Settings = {
    showSessionProgressBar: true,
    showCustomAgents: false,
  },
+  updates: {
+    startup: true,
+  },
  appearance: {
    fontSize: 14,
    mono: "",
@@ -153,15 +159,6 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
  gate: false,
  init: () => {
    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)
-    const showCustomAgents = withFallback(
-      () => store.general?.showCustomAgents,
-      defaultSettings.general.showCustomAgents,
-    )
-    const newLayoutDesigns = withFallback(() => store.general?.newLayoutDesigns, newLayoutDesignsDefault)
-    const visible = (preference: () => boolean) => createMemo(() => !newLayoutDesigns() || preference())

    createEffect(() => {
      if (typeof document === "undefined") return
@@ -196,7 +193,7 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
        setFollowup(value: "queue" | "steer") {
          setStore("general", "followup", value === "queue" ? "steer" : value)
        },
-        showFileTree,
+        showFileTree: withFallback(() => store.general?.showFileTree, defaultSettings.general.showFileTree),
        setShowFileTree(value: boolean) {
          setStore("general", "showFileTree", value)
        },
@@ -204,11 +201,11 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
        setShowNavigation(value: boolean) {
          setStore("general", "showNavigation", value)
        },
-        showSearch,
+        showSearch: withFallback(() => store.general?.showSearch, defaultSettings.general.showSearch),
        setShowSearch(value: boolean) {
          setStore("general", "showSearch", value)
        },
-        showStatus,
+        showStatus: withFallback(() => store.general?.showStatus, defaultSettings.general.showStatus),
        setShowStatus(value: boolean) {
          setStore("general", "showStatus", value)
        },
@@ -244,20 +241,20 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
        setShowSessionProgressBar(value: boolean) {
          setStore("general", "showSessionProgressBar", value)
        },
-        showCustomAgents,
+        showCustomAgents: withFallback(() => store.general?.showCustomAgents, defaultSettings.general.showCustomAgents),
        setShowCustomAgents(value: boolean) {
          setStore("general", "showCustomAgents", value)
        },
-        newLayoutDesigns,
+        newLayoutDesigns: withFallback(() => store.general?.newLayoutDesigns, newLayoutDesignsDefault),
        setNewLayoutDesigns(value: boolean) {
          setStore("general", "newLayoutDesigns", value)
        },
      },
-      visibility: {
-        fileTree: visible(showFileTree),
-        search: visible(showSearch),
-        status: visible(showStatus),
-        customAgents: visible(showCustomAgents),
+      updates: {
+        startup: withFallback(() => store.updates?.startup, defaultSettings.updates.startup),
+        setStartup(value: boolean) {
+          setStore("updates", "startup", value)
+        },
      },
      appearance: {
        fontSize: withFallback(() => store.appearance?.fontSize, defaultSettings.appearance.fontSize),
@@ -1,5 +1,4 @@
 import { Binary } from "@opencode-ai/core/util/binary"
-import { createMemo } from "solid-js"
 import { useServerSync } from "./server-sync"
 import { useSDK } from "./sdk"
 import type { Message, Part } from "@opencode-ai/sdk/v2/client"
@@ -113,7 +112,5 @@ export const useSync = () => {
  const serverSync = useServerSync()
  const sdk = useSDK()

-  return createMemo(() => serverSync().createDirSyncContext(sdk().directory))
+  return serverSync.createDirSyncContext(sdk.directory)
 }
-
-export type DirectorySync = ReturnType<ReturnType<typeof useSync>>
@@ -2,12 +2,10 @@ import type { Session } from "@opencode-ai/sdk/v2/client"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { base64Encode } from "@opencode-ai/core/util/encode"
 import { createStore, produce } from "solid-js/store"
-import { Persist, persisted, removePersisted, draftPersistedKeys } from "@/utils/persist"
+import { Persist, persisted } from "@/utils/persist"
 import { ServerConnection, useServer } from "./server"
 import { createEffect, startTransition } from "solid-js"
-import { useLocation, useNavigate, useParams } from "@solidjs/router"
-import { usePlatform } from "./platform"
-import { uuid } from "@/utils/uuid"
+import { useNavigate, useParams } from "@solidjs/router"
 import { SessionTabsRemovedDetail } from "@/components/titlebar-session-events"

 export type SessionTab = {
@@ -17,26 +15,10 @@ export type SessionTab = {
  sessionId: string
 }

-export type DraftTab = {
-  type: "draft"
-  draftID: string
-  server: ServerConnection.Key
-  directory: string
-  worktree?: string
-}
+export type Tab = SessionTab

-export type Tab = SessionTab | DraftTab
-
-type RecentTab = {
-  key?: string
-}
-
-export const draftHref = (draftID: string) => `/new-session?draftId=${encodeURIComponent(draftID)}`
-
-export const tabHref = (tab: Tab) =>
-  tab.type === "draft" ? draftHref(tab.draftID) : `/${tab.dirBase64}/session/${tab.sessionId}`
-
-export const tabKey = (tab: Tab) => (tab.type === "draft" ? `draft:${tab.draftID}` : `${tab.server}\n${tabHref(tab)}`)
+export const tabHref = (tab: Tab) => `/${tab.dirBase64}/session/${tab.sessionId}`
+export const tabKey = (tab: Tab) => `${tab.server}\n${tabHref(tab)}`

 export function sessionHasOpenTab(tabs: Tab[], server: ServerConnection.Key, session: Session) {
  const dirBase64 = base64Encode(session.directory)
@@ -51,7 +33,6 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
  gate: false,
  init: () => {
    const server = useServer()
-    const platform = usePlatform()
    const fallback = server.key
    const [store, setStore, _, ready] = persisted(
      {
@@ -66,45 +47,21 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
      },
      createStore<Tab[]>([]),
    )
-    const [recent, setRecent, , recentReady] = persisted(Persist.global("tabs.recent"), createStore<RecentTab>({}))

    const params = useParams()
    const navigate = useNavigate()
-    const location = useLocation()

    const closing = new Set<string>()
-    let recentWrite = 0
-    let recentValue: string | undefined
-
-    const recentKey = () => (recentWrite ? recentValue : recent.key)
-
-    const setRecentKey = (key: string | undefined) => {
-      const write = ++recentWrite
-      recentValue = key
-      if (recentReady()) {
-        setRecent("key", key)
-        return
-      }
-      void recentReady.promise?.then(() => {
-        if (write === recentWrite) setRecent("key", key)
-      })
-    }
-
-    const removeDraftPersisted = (draftID: string) => {
-      for (const key of draftPersistedKeys()) removePersisted(Persist.draft(draftID, key), platform)
-    }

    createEffect(() => {
-      if (!ready() || !recentReady()) return
+      if (!ready()) return
      const servers = new Set(server.list.map(ServerConnection.key))
-      const next = store.filter((tab) => servers.has(tab.server))
-      if (next.length !== store.length) setStore(() => next)
-      if (recent.key && !next.some((tab) => tabKey(tab) === recent.key)) setRecentKey(undefined)
+      if (store.every((tab) => servers.has(tab.server))) return
+      setStore((tabs) => tabs.filter((tab) => servers.has(tab.server)))
    })

    const navigateTab = (tab: Tab) => {
      const href = tabHref(tab)
-      setRecentKey(tabKey(tab))
      if (tab.server === server.key) {
        navigate(href)
        return
@@ -126,50 +83,10 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
          }),
        )
      },
-      draft(draftID: string) {
-        const tab = store.find((item) => item.type === "draft" && item.draftID === draftID)
-        if (!tab || tab.type !== "draft") throw new Error(`Draft not found: ${draftID}`)
-        return tab
-      },
-      newDraft(draft: Omit<DraftTab, "type" | "draftID">, prompt?: string) {
-        const draftID = uuid()
-        setStore(
-          produce((tabs) => {
-            tabs.push({ type: "draft", draftID, ...draft })
-          }),
-        )
-        navigate(prompt ? `${draftHref(draftID)}&prompt=${encodeURIComponent(prompt)}` : draftHref(draftID))
-      },
-      updateDraft(draftID: string, draft: Partial<Omit<DraftTab, "type" | "draftID">>) {
-        setStore(
-          (tab) => tab.type === "draft" && tab.draftID === draftID,
-          produce((tab) => Object.assign(tab, draft)),
-        )
-      },
-      promoteDraft(draftID: string, session: Omit<SessionTab, "type">) {
-        // We're viewing this draft when /new-session?draftId=… points at it. Promoting
-        // replaces the draft tab with a session tab, so the draft route would stop resolving
-        // and fall back home. Navigate to the new session first so we leave /new-session
-        // before the draft is removed from the store.
-        const active = location.pathname === "/new-session" && location.query.draftId === draftID
-        const next = { type: "session" as const, ...session }
-        startTransition(() => {
-          setStore(
-            produce((tabs) => {
-              const index = tabs.findIndex((tab) => tab.type === "draft" && tab.draftID === draftID)
-              if (index !== -1) tabs[index] = next
-            }),
-          )
-          if (recent.key === `draft:${draftID}`) setRecentKey(tabKey(next))
-          if (active) navigateTab(next)
-        })
-        removeDraftPersisted(draftID)
-      },
      removeTab: (index: number) => {
        const tab = store[index]
        if (!tab) return
        const key = tabKey(tab)
-        const draftID = tab.type === "draft" ? tab.draftID : undefined
        const nextTab = store[index + 1] ?? store[index - 1]
        closing.add(key)
        void startTransition(() => {
@@ -178,42 +95,22 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
              tabs.splice(index, 1)
            }),
          )
-          if (recent.key === key) setRecentKey(nextTab && tabKey(nextTab))
          if (nextTab) navigateTab(nextTab)
          else navigate("/")
        }).finally(() => closing.delete(key))
-        if (draftID) removeDraftPersisted(draftID)
      },
      removeServer(key: ServerConnection.Key) {
-        const drafts = store.flatMap((tab) => (tab.type === "draft" && tab.server === key ? [tab.draftID] : []))
-        const removed = store.filter((tab) => tab.server === key).map(tabKey)
        setStore((tabs) => tabs.filter((tab) => tab.server !== key))
-        if (recent.key && removed.includes(recent.key)) setRecentKey(undefined)
-        for (const draftID of drafts) removeDraftPersisted(draftID)
        if (server.key === key) navigate("/")
      },
      removeSessions: (input: SessionTabsRemovedDetail) => {
-        const removed = store
-          .filter(
-            (tab) =>
-              tab.type === "session" &&
-              tab.server === server.key &&
-              atob(tab.dirBase64) === input.directory &&
-              input.sessionIDs.includes(tab.sessionId),
-          )
-          .map(tabKey)
        void startTransition(() => {
          setStore(
            produce((tabs) => {
              const sessionIDs = new Set(input.sessionIDs)
              const currentHref =
                params.dir && params.id
-                  ? tabHref({
-                      type: "session",
-                      server: server.key,
-                      dirBase64: params.dir,
-                      sessionId: params.id,
-                    })
+                  ? tabHref({ type: "session", server: server.key, dirBase64: params.dir, sessionId: params.id })
                  : undefined
              const currentIndex = currentHref
                ? tabs.findIndex(
@@ -244,29 +141,10 @@ export const { use: useTabs, provider: TabsProvider } = createSimpleContext({
              else navigate("/")
            }),
          )
-          if (recent.key && removed.includes(recent.key)) setRecentKey(undefined)
        })
      },
-      select: navigateTab,
-      remember(tab: Tab) {
-        const key = tabKey(tab)
-        if (recentKey() !== key) setRecentKey(key)
-      },
-      toggleHome(input: { home: boolean; current?: Tab }) {
-        if (input.home) {
-          const tab = store.find((tab) => tabKey(tab) === recentKey())
-          if (tab) navigateTab(tab)
-          return
-        }
-        if (input.current) {
-          setRecentKey(tabKey(input.current))
-          navigate("/")
-          return
-        }
-        navigate("/")
-      },
    }

-    return { ...actions, store, ready, recentReady }
+    return { ...actions, store, ready }
  },
 })
@@ -9,8 +9,6 @@ beforeAll(async () => {
  mock.module("@solidjs/router", () => ({
    useNavigate: () => () => undefined,
    useParams: () => ({}),
-    useLocation: () => ({}),
-    useSearchParams: () => [{}, () => undefined],
  }))
  mock.module("@opencode-ai/ui/context", () => ({
    createSimpleContext: () => ({
@@ -2,7 +2,7 @@ import { createStore, produce } from "solid-js/store"
 import { createSimpleContext } from "@opencode-ai/ui/context"
 import { batch, createEffect, createMemo, createRoot, on, onCleanup } from "solid-js"
 import { useParams } from "@solidjs/router"
-import { useSDK, type DirectorySDK } from "./sdk"
+import { useSDK } from "./sdk"
 import type { Platform } from "./platform"
 import { useServer } from "./server"
 import { defaultTitle, titleNumber } from "./terminal-title"
@@ -143,7 +143,7 @@ export function clearWorkspaceTerminals(
 }

 function createWorkspaceTerminalSession(
-  sdk: DirectorySDK,
+  sdk: ReturnType<typeof useSDK>,
  dir: string,
  scope: ServerScopeValue,
  legacySessionID?: string,
@@ -202,7 +202,7 @@ function createWorkspaceTerminalSession(
  })
  onCleanup(unsub)

-  const update = (client: DirectorySDK["client"], pty: Partial<LocalPTY> & { id: string }) => {
+  const update = (client: ReturnType<typeof useSDK>["client"], pty: Partial<LocalPTY> & { id: string }) => {
    const index = store.all.findIndex((x) => x.id === pty.id)
    const previous = index >= 0 ? store.all[index] : undefined
    if (index >= 0) {
@@ -223,7 +223,7 @@ function createWorkspaceTerminalSession(
      })
  }

-  const clone = async (client: DirectorySDK["client"], id: string) => {
+  const clone = async (client: ReturnType<typeof useSDK>["client"], id: string) => {
    const index = store.all.findIndex((x) => x.id === id)
    const pty = store.all[index]
    if (!pty) return
@@ -412,7 +412,7 @@ export const { use: useTerminal, provider: TerminalProvider } = createSimpleCont
      }

      const entry = createRoot((dispose) => ({
-        value: createWorkspaceTerminalSession(sdk(), dir, serverScope, legacySessionID),
+        value: createWorkspaceTerminalSession(sdk, dir, serverScope, legacySessionID),
        dispose,
      }))

@@ -141,7 +141,7 @@ export const DESKTOP_MENU: DesktopMenu[] = [
    id: "view",
    label: "View",
    items: [
-      { type: "item", label: "Toggle Sidebar", command: "sidebar.toggle" },
+      { type: "item", label: "Toggle Sidebar", command: "sidebar.toggle", accelerator: { macos: "Cmd+B" } },
      { type: "item", label: "Toggle Terminal", command: "terminal.toggle", accelerator: { macos: "Ctrl+`" } },
      { type: "item", label: "Toggle File Tree", command: "fileTree.toggle" },
      { type: "separator" },
@@ -22,10 +22,10 @@ export function useProviders() {
  const dir = createMemo(() => decode64(params.dir) ?? "")
  const providers = () => {
    if (dir()) {
-      const [projectStore] = serverSync().child(dir())
+      const [projectStore] = serverSync.child(dir())
      if (projectStore.provider_ready) return projectStore.provider
    }
-    return serverSync().data.provider
+    return serverSync.data.provider
  }
  return {
    all: () => providers().all,
@@ -281,11 +281,6 @@ export const dict = {
  "dialog.fork.empty": "لا توجد رسائل للتفرع منها",
  "dialog.directory.search.placeholder": "البحث في المجلدات",
  "dialog.directory.empty": "لم يتم العثور على مجلدات",
-  "dialog.directory.action.selectFile": "اختيار ملف",
-  "dialog.directory.action.selectFolder": "اختيار مجلد",
-  "dialog.directory.root": "الجذر",
-  "dialog.directory.parent": "المجلد الأصل",
-  "dialog.directory.readError": "تعذرت قراءة هذا المجلد",
  "dialog.server.title": "الخوادم",
  "dialog.server.description": "تبديل خادم OpenCode الذي يتصل به هذا التطبيق.",
  "dialog.server.search.placeholder": "البحث في الخوادم",
@@ -281,11 +281,6 @@ export const dict = {
  "dialog.fork.empty": "Nenhuma mensagem para bifurcar",
  "dialog.directory.search.placeholder": "Buscar pastas",
  "dialog.directory.empty": "Nenhuma pasta encontrada",
-  "dialog.directory.action.selectFile": "Selecionar arquivo",
-  "dialog.directory.action.selectFolder": "Selecionar pasta",
-  "dialog.directory.root": "Raiz",
-  "dialog.directory.parent": "Pasta superior",
-  "dialog.directory.readError": "Não foi possível ler esta pasta",
  "dialog.server.title": "Servidores",
  "dialog.server.description": "Trocar para qual servidor OpenCode este aplicativo se conecta.",
  "dialog.server.search.placeholder": "Buscar servidores",
@@ -307,11 +307,6 @@ export const dict = {

  "dialog.directory.search.placeholder": "Pretraži foldere",
  "dialog.directory.empty": "Nema pronađenih foldera",
-  "dialog.directory.action.selectFile": "Odaberi datoteku",
-  "dialog.directory.action.selectFolder": "Odaberi folder",
-  "dialog.directory.root": "Korijen",
-  "dialog.directory.parent": "Nadređeni folder",
-  "dialog.directory.readError": "Nije moguće pročitati ovaj folder",

  "dialog.server.title": "Serveri",
  "dialog.server.description": "Promijeni na koji se OpenCode server ova aplikacija povezuje.",
@@ -305,11 +305,6 @@ export const dict = {

  "dialog.directory.search.placeholder": "Søg mapper",
  "dialog.directory.empty": "Ingen mapper fundet",
-  "dialog.directory.action.selectFile": "Vælg fil",
-  "dialog.directory.action.selectFolder": "Vælg mappe",
-  "dialog.directory.root": "Rod",
-  "dialog.directory.parent": "Overordnet",
-  "dialog.directory.readError": "Denne mappe kan ikke læses",

  "dialog.server.title": "Servere",
  "dialog.server.description": "Skift hvilken OpenCode-server denne app forbinder til.",
@@ -287,11 +287,6 @@ export const dict = {
  "dialog.fork.empty": "Keine Nachrichten zum Abzweigen vorhanden",
  "dialog.directory.search.placeholder": "Ordner durchsuchen",
  "dialog.directory.empty": "Keine Ordner gefunden",
-  "dialog.directory.action.selectFile": "Datei auswählen",
-  "dialog.directory.action.selectFolder": "Ordner auswählen",
-  "dialog.directory.root": "Stammverzeichnis",
-  "dialog.directory.parent": "Übergeordnet",
-  "dialog.directory.readError": "Dieser Ordner kann nicht gelesen werden",
  "dialog.server.title": "Server",
  "dialog.server.description": "Wechseln Sie den OpenCode-Server, mit dem sich diese App verbindet.",
  "dialog.server.search.placeholder": "Server durchsuchen",
@@ -313,11 +313,6 @@ export const dict = {

  "dialog.directory.search.placeholder": "Search folders",
  "dialog.directory.empty": "No folders found",
-  "dialog.directory.action.selectFile": "Select file",
-  "dialog.directory.action.selectFolder": "Select folder",
-  "dialog.directory.root": "Root",
-  "dialog.directory.parent": "Parent",
-  "dialog.directory.readError": "Unable to read this folder",

  "app.server.unreachable": "Could not reach {{server}}",
  "app.server.retrying": "Retrying automatically...",
@@ -830,17 +825,17 @@ export const dict = {
  "settings.general.row.followup.option.queue": "Queue",
  "settings.general.row.followup.option.steer": "Steer",
  "settings.general.row.showFileTree.title": "File tree",
-  "settings.general.row.showFileTree.description": "Show the file tree panel in sessions",
+  "settings.general.row.showFileTree.description": "Show the file tree panel in desktop sessions",
  "settings.general.row.showNavigation.title": "Navigation controls",
  "settings.general.row.showNavigation.description": "Show the back and forward buttons in the desktop title bar",
  "settings.general.row.showSearch.title": "Command palette",
-  "settings.general.row.showSearch.description": "Show the search and command palette button in the title bar",
+  "settings.general.row.showSearch.description": "Show the search and command palette button in the desktop title bar",
  "settings.general.row.showTerminal.title": "Terminal",
  "settings.general.row.showTerminal.description": "Show the terminal button in the desktop title bar",
  "settings.general.row.showStatus.title": "Server status",
-  "settings.general.row.showStatus.description": "Show the server status button in the title bar",
+  "settings.general.row.showStatus.description": "Show the server status button in the desktop title bar",
  "settings.general.row.showCustomAgents.title": "Custom agents",
-  "settings.general.row.showCustomAgents.description": "Show the agent picker in the composer",
+  "settings.general.row.showCustomAgents.description": "Show the agent picker in the v2 desktop composer",
  "settings.general.row.reasoningSummaries.title": "Show reasoning summaries",
  "settings.general.row.reasoningSummaries.description": "Display model reasoning summaries in the timeline",
  "settings.general.row.shellToolPartsExpanded.title": "Expand shell tool parts",
@@ -871,8 +866,6 @@ export const dict = {
  "settings.updates.row.check.description": "Manually check for updates and install if available",
  "settings.updates.action.checkNow": "Check now",
  "settings.updates.action.checking": "Checking...",
-  "settings.updates.action.downloading": "Downloading...",
-  "settings.updates.action.installing": "Installing...",
  "settings.updates.toast.latest.title": "You're up to date",
  "settings.updates.toast.latest.description": "You're running the latest version of OpenCode.",
  "sound.option.none": "None",
@@ -306,11 +306,6 @@ export const dict = {

  "dialog.directory.search.placeholder": "Buscar carpetas",
  "dialog.directory.empty": "No se encontraron carpetas",
-  "dialog.directory.action.selectFile": "Seleccionar archivo",
-  "dialog.directory.action.selectFolder": "Seleccionar carpeta",
-  "dialog.directory.root": "Raíz",
-  "dialog.directory.parent": "Superior",
-  "dialog.directory.readError": "No se puede leer esta carpeta",

  "dialog.server.title": "Servidores",
  "dialog.server.description": "Cambiar a qué servidor de OpenCode se conecta esta app.",
@@ -282,11 +282,6 @@ export const dict = {
  "dialog.fork.empty": "Aucun message à partir duquel bifurquer",
  "dialog.directory.search.placeholder": "Rechercher des dossiers",
  "dialog.directory.empty": "Aucun dossier trouvé",
-  "dialog.directory.action.selectFile": "Sélectionner le fichier",
-  "dialog.directory.action.selectFolder": "Sélectionner le dossier",
-  "dialog.directory.root": "Racine",
-  "dialog.directory.parent": "Parent",
-  "dialog.directory.readError": "Impossible de lire ce dossier",
  "dialog.server.title": "Serveurs",
  "dialog.server.description": "Changez le serveur OpenCode auquel cette application se connecte.",
  "dialog.server.search.placeholder": "Rechercher des serveurs",
@@ -280,11 +280,6 @@ export const dict = {
  "dialog.fork.empty": "フォーク元のメッセージがありません",
  "dialog.directory.search.placeholder": "フォルダを検索",
  "dialog.directory.empty": "フォルダが見つかりません",
-  "dialog.directory.action.selectFile": "ファイルを選択",
-  "dialog.directory.action.selectFolder": "フォルダを選択",
-  "dialog.directory.root": "ルート",
-  "dialog.directory.parent": "親フォルダ",
-  "dialog.directory.readError": "このフォルダを読み取れません",
  "dialog.server.title": "サーバー",
  "dialog.server.description": "このアプリが接続するOpenCodeサーバーを切り替えます。",
  "dialog.server.search.placeholder": "サーバーを検索",
@@ -280,11 +280,6 @@ export const dict = {
  "dialog.fork.empty": "분기할 메시지 없음",
  "dialog.directory.search.placeholder": "폴더 검색",
  "dialog.directory.empty": "폴더 없음",
-  "dialog.directory.action.selectFile": "파일 선택",
-  "dialog.directory.action.selectFolder": "폴더 선택",
-  "dialog.directory.root": "루트",
-  "dialog.directory.parent": "상위 폴더",
-  "dialog.directory.readError": "이 폴더를 읽을 수 없습니다",
  "dialog.server.title": "서버",
  "dialog.server.description": "이 앱이 연결할 OpenCode 서버를 전환합니다.",
  "dialog.server.search.placeholder": "서버 검색",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kit Langton	3d03b49a11	fix(test): release Windows search handles	2026-06-06 21:03:39 -04:00
Kit Langton	ac07fe16a0	Merge branch 'dev' into fix/http-recorder-release	2026-06-06 20:10:04 -04:00
Kit Langton	8a1f4e7727	fix(storybook): mock keybind formatter	2026-06-06 18:50:27 -04:00
Kit Langton	4511d05c61	chore(http-recorder): disable release automation	2026-06-06 18:38:15 -04:00
Kit Langton	f63469f04e	fix(http-recorder): isolate changeset versioning	2026-06-06 18:32:26 -04:00