tui: remove shell/normal mode toggle from prompt input

Users no longer need to manually switch between shell and normal modes as the agent now automatically determines the appropriate mode based on context.
2026-03-13 10:14:26 +00:00 · 2026-03-12 17:24:18 +00:00
194 changed files with 1448 additions and 6008 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,9 +8,7 @@ on:
  workflow_dispatch:

 concurrency:
-  # Keep every run on dev so cancelled checks do not pollute the default branch
-  # commit history. PRs and other branches still share a group and cancel stale runs.
-  group: ${{ case(github.ref == 'refs/heads/dev', format('{0}-{1}', github.workflow, github.run_id), format('{0}-{1}', github.workflow, github.event.pull_request.number || github.ref)) }}
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
  cancel-in-progress: true

 permissions:
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,7 @@ ts-dist
 /result
 refs
 Session.vim
-/opencode.json
+opencode.json
 a.out
 target
 .scripts
--- a/bun.lock
+++ b/bun.lock
@@ -26,7 +26,7 @@
    },
    "packages/app": {
      "name": "@opencode-ai/app",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -77,7 +77,7 @@
    },
    "packages/console/app": {
      "name": "@opencode-ai/console-app",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@cloudflare/vite-plugin": "1.15.2",
        "@ibm/plex": "6.4.1",
@@ -111,7 +111,7 @@
    },
    "packages/console/core": {
      "name": "@opencode-ai/console-core",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@aws-sdk/client-sts": "3.782.0",
        "@jsx-email/render": "1.1.1",
@@ -138,7 +138,7 @@
    },
    "packages/console/function": {
      "name": "@opencode-ai/console-function",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@ai-sdk/anthropic": "2.0.0",
        "@ai-sdk/openai": "2.0.2",
@@ -162,7 +162,7 @@
    },
    "packages/console/mail": {
      "name": "@opencode-ai/console-mail",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@jsx-email/all": "2.2.3",
        "@jsx-email/cli": "1.4.3",
@@ -186,7 +186,7 @@
    },
    "packages/desktop": {
      "name": "@opencode-ai/desktop",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -219,7 +219,7 @@
    },
    "packages/desktop-electron": {
      "name": "@opencode-ai/desktop-electron",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@opencode-ai/app": "workspace:*",
        "@opencode-ai/ui": "workspace:*",
@@ -250,7 +250,7 @@
    },
    "packages/enterprise": {
      "name": "@opencode-ai/enterprise",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@opencode-ai/ui": "workspace:*",
        "@opencode-ai/util": "workspace:*",
@@ -279,7 +279,7 @@
    },
    "packages/function": {
      "name": "@opencode-ai/function",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@octokit/auth-app": "8.0.1",
        "@octokit/rest": "catalog:",
@@ -295,7 +295,7 @@
    },
    "packages/opencode": {
      "name": "opencode",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "bin": {
        "opencode": "./bin/opencode",
      },
@@ -416,7 +416,7 @@
    },
    "packages/plugin": {
      "name": "@opencode-ai/plugin",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "zod": "catalog:",
@@ -440,7 +440,7 @@
    },
    "packages/sdk/js": {
      "name": "@opencode-ai/sdk",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "devDependencies": {
        "@hey-api/openapi-ts": "0.90.10",
        "@tsconfig/node22": "catalog:",
@@ -451,7 +451,7 @@
    },
    "packages/slack": {
      "name": "@opencode-ai/slack",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@opencode-ai/sdk": "workspace:*",
        "@slack/bolt": "^3.17.1",
@@ -486,7 +486,7 @@
    },
    "packages/ui": {
      "name": "@opencode-ai/ui",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@kobalte/core": "catalog:",
        "@opencode-ai/sdk": "workspace:*",
@@ -532,7 +532,7 @@
    },
    "packages/util": {
      "name": "@opencode-ai/util",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "zod": "catalog:",
      },
@@ -543,7 +543,7 @@
    },
    "packages/web": {
      "name": "@opencode-ai/web",
-      "version": "1.2.25",
+      "version": "1.2.24",
      "dependencies": {
        "@astrojs/cloudflare": "12.6.3",
        "@astrojs/markdown-remark": "6.3.1",
--- a/packages/app/e2e/AGENTS.md
+++ b/packages/app/e2e/AGENTS.md
@@ -176,25 +176,6 @@ await page.keyboard.press(`${modKey}+Comma`) // Open settings
 - These helpers use the fixture-enabled test-only terminal driver and wait for output after the terminal writer settles.
 - Avoid `waitForTimeout` and custom DOM or `data-*` readiness checks.

-### Wait on state
-
- Never use wall-clock waits like `page.waitForTimeout(...)` to make a test pass
- Avoid race-prone flows that assume work is finished after an action
- Wait or poll on observable state with `expect(...)`, `expect.poll(...)`, or existing helpers
- Prefer locator assertions like `toBeVisible()`, `toHaveCount(0)`, and `toHaveAttribute(...)` for normal UI state, and reserve `expect.poll(...)` for probe, mock, or backend state
-
-### Add hooks
-
- If required state is not observable from the UI, add a small test-only driver or probe in app code instead of sleeps or fragile DOM checks
- Keep these hooks minimal and purpose-built, following the style of `packages/app/src/testing/terminal.ts`
- Test-only hooks must be inert unless explicitly enabled; do not add normal-runtime listeners, reactive subscriptions, or per-update allocations for e2e ceremony
- When mocking routes or APIs, expose explicit mock state and wait on that before asserting post-action UI
-
-### Prefer helpers
-
- Prefer fluent helpers and drivers when they make intent obvious and reduce locator-heavy noise
- Use direct locators when the interaction is simple and a helper would not add clarity
-
 ## Writing New Tests

 1. Choose appropriate folder or create new one
--- a/packages/app/e2e/session/session-composer-dock.spec.ts
+++ b/packages/app/e2e/session/session-composer-dock.spec.ts
@@ -1,16 +1,12 @@
 import { test, expect } from "../fixtures"
-import {
-  composerEvent,
-  type ComposerDriverState,
-  type ComposerProbeState,
-  type ComposerWindow,
-} from "../../src/testing/session-composer"
-import { cleanupSession, clearSessionDockSeed, seedSessionQuestion } from "../actions"
+import { cleanupSession, clearSessionDockSeed, seedSessionQuestion, seedSessionTodos } from "../actions"
 import {
  permissionDockSelector,
  promptSelector,
  questionDockSelector,
  sessionComposerDockSelector,
+  sessionTodoDockSelector,
+  sessionTodoListSelector,
  sessionTodoToggleButtonSelector,
 } from "../selectors"

@@ -46,8 +42,12 @@ async function withDockSeed<T>(sdk: Sdk, sessionID: string, fn: () => Promise<T>

 async function clearPermissionDock(page: any, label: RegExp) {
  const dock = page.locator(permissionDockSelector)
-  await expect(dock).toBeVisible()
-  await dock.getByRole("button", { name: label }).click()
+  for (let i = 0; i < 3; i++) {
+    const count = await dock.count()
+    if (count === 0) return
+    await dock.getByRole("button", { name: label }).click()
+    await page.waitForTimeout(150)
+  }
 }

 async function setAutoAccept(page: any, enabled: boolean) {
@@ -59,120 +59,6 @@ async function setAutoAccept(page: any, enabled: boolean) {
  await expect(button).toHaveAttribute("aria-pressed", enabled ? "true" : "false")
 }

-async function expectQuestionBlocked(page: any) {
-  await expect(page.locator(questionDockSelector)).toBeVisible()
-  await expect(page.locator(promptSelector)).toHaveCount(0)
-}
-
-async function expectQuestionOpen(page: any) {
-  await expect(page.locator(questionDockSelector)).toHaveCount(0)
-  await expect(page.locator(promptSelector)).toBeVisible()
-}
-
-async function expectPermissionBlocked(page: any) {
-  await expect(page.locator(permissionDockSelector)).toBeVisible()
-  await expect(page.locator(promptSelector)).toHaveCount(0)
-}
-
-async function expectPermissionOpen(page: any) {
-  await expect(page.locator(permissionDockSelector)).toHaveCount(0)
-  await expect(page.locator(promptSelector)).toBeVisible()
-}
-
-async function todoDock(page: any, sessionID: string) {
-  await page.addInitScript(() => {
-    const win = window as ComposerWindow
-    win.__opencode_e2e = {
-      ...win.__opencode_e2e,
-      composer: {
-        enabled: true,
-        sessions: {},
-      },
-    }
-  })
-
-  const write = async (driver: ComposerDriverState | undefined) => {
-    await page.evaluate(
-      (input) => {
-        const win = window as ComposerWindow
-        const composer = win.__opencode_e2e?.composer
-        if (!composer?.enabled) throw new Error("Composer e2e driver is not enabled")
-        composer.sessions ??= {}
-        const prev = composer.sessions[input.sessionID] ?? {}
-        if (!input.driver) {
-          if (!prev.probe) {
-            delete composer.sessions[input.sessionID]
-          } else {
-            composer.sessions[input.sessionID] = { probe: prev.probe }
-          }
-        } else {
-          composer.sessions[input.sessionID] = {
-            ...prev,
-            driver: input.driver,
-          }
-        }
-        window.dispatchEvent(new CustomEvent(input.event, { detail: { sessionID: input.sessionID } }))
-      },
-      { event: composerEvent, sessionID, driver },
-    )
-  }
-
-  const read = () =>
-    page.evaluate((sessionID) => {
-      const win = window as ComposerWindow
-      return win.__opencode_e2e?.composer?.sessions?.[sessionID]?.probe ?? null
-    }, sessionID) as Promise<ComposerProbeState | null>
-
-  const api = {
-    async clear() {
-      await write(undefined)
-      return api
-    },
-    async open(todos: NonNullable<ComposerDriverState["todos"]>) {
-      await write({ live: true, todos })
-      return api
-    },
-    async finish(todos: NonNullable<ComposerDriverState["todos"]>) {
-      await write({ live: false, todos })
-      return api
-    },
-    async expectOpen(states: ComposerProbeState["states"]) {
-      await expect.poll(read, { timeout: 10_000 }).toMatchObject({
-        mounted: true,
-        collapsed: false,
-        hidden: false,
-        count: states.length,
-        states,
-      })
-      return api
-    },
-    async expectCollapsed(states: ComposerProbeState["states"]) {
-      await expect.poll(read, { timeout: 10_000 }).toMatchObject({
-        mounted: true,
-        collapsed: true,
-        hidden: true,
-        count: states.length,
-        states,
-      })
-      return api
-    },
-    async expectClosed() {
-      await expect.poll(read, { timeout: 10_000 }).toMatchObject({ mounted: false })
-      return api
-    },
-    async collapse() {
-      await page.locator(sessionTodoToggleButtonSelector).click()
-      return api
-    },
-    async expand() {
-      await page.locator(sessionTodoToggleButtonSelector).click()
-      return api
-    },
-  }
-
-  return api
-}
-
 async function withMockPermission<T>(
  page: any,
  request: {
@@ -184,7 +70,7 @@ async function withMockPermission<T>(
    always?: string[]
  },
  opts: { child?: any } | undefined,
-  fn: (state: { resolved: () => Promise<void> }) => Promise<T>,
+  fn: () => Promise<T>,
 ) {
  let pending = [
    {
@@ -233,14 +119,8 @@ async function withMockPermission<T>(

  if (sessionList) await page.route("**/session?*", sessionList)

-  const state = {
-    async resolved() {
-      await expect.poll(() => pending.length, { timeout: 10_000 }).toBe(0)
-    },
-  }
-
  try {
-    return await fn(state)
+    return await fn()
  } finally {
    await page.unroute("**/permission", list)
    await page.unroute("**/session/*/permissions/*", reply)
@@ -293,12 +173,14 @@ test("blocked question flow unblocks after submit", async ({ page, sdk, gotoSess
      })

      const dock = page.locator(questionDockSelector)
-      await expectQuestionBlocked(page)
+      await expect.poll(() => dock.count(), { timeout: 10_000 }).toBe(1)
+      await expect(page.locator(promptSelector)).toHaveCount(0)

      await dock.locator('[data-slot="question-option"]').first().click()
      await dock.getByRole("button", { name: /submit/i }).click()

-      await expectQuestionOpen(page)
+      await expect.poll(() => page.locator(questionDockSelector).count(), { timeout: 10_000 }).toBe(0)
+      await expect(page.locator(promptSelector)).toBeVisible()
    })
  })
 })
@@ -317,14 +199,15 @@ test("blocked permission flow supports allow once", async ({ page, sdk, gotoSess
        metadata: { description: "Need permission for command" },
      },
      undefined,
-      async (state) => {
+      async () => {
        await page.goto(page.url())
-        await expectPermissionBlocked(page)
+        await expect.poll(() => page.locator(permissionDockSelector).count(), { timeout: 10_000 }).toBe(1)
+        await expect(page.locator(promptSelector)).toHaveCount(0)

        await clearPermissionDock(page, /allow once/i)
-        await state.resolved()
        await page.goto(page.url())
-        await expectPermissionOpen(page)
+        await expect.poll(() => page.locator(permissionDockSelector).count(), { timeout: 10_000 }).toBe(0)
+        await expect(page.locator(promptSelector)).toBeVisible()
      },
    )
  })
@@ -343,14 +226,15 @@ test("blocked permission flow supports reject", async ({ page, sdk, gotoSession
        patterns: ["/tmp/opencode-e2e-perm-reject"],
      },
      undefined,
-      async (state) => {
+      async () => {
        await page.goto(page.url())
-        await expectPermissionBlocked(page)
+        await expect.poll(() => page.locator(permissionDockSelector).count(), { timeout: 10_000 }).toBe(1)
+        await expect(page.locator(promptSelector)).toHaveCount(0)

        await clearPermissionDock(page, /deny/i)
-        await state.resolved()
        await page.goto(page.url())
-        await expectPermissionOpen(page)
+        await expect.poll(() => page.locator(permissionDockSelector).count(), { timeout: 10_000 }).toBe(0)
+        await expect(page.locator(promptSelector)).toBeVisible()
      },
    )
  })
@@ -370,14 +254,15 @@ test("blocked permission flow supports allow always", async ({ page, sdk, gotoSe
        metadata: { description: "Need permission for command" },
      },
      undefined,
-      async (state) => {
+      async () => {
        await page.goto(page.url())
-        await expectPermissionBlocked(page)
+        await expect.poll(() => page.locator(permissionDockSelector).count(), { timeout: 10_000 }).toBe(1)
+        await expect(page.locator(promptSelector)).toHaveCount(0)

        await clearPermissionDock(page, /allow always/i)
-        await state.resolved()
        await page.goto(page.url())
-        await expectPermissionOpen(page)
+        await expect.poll(() => page.locator(permissionDockSelector).count(), { timeout: 10_000 }).toBe(0)
+        await expect(page.locator(promptSelector)).toBeVisible()
      },
    )
  })
@@ -416,12 +301,14 @@ test("child session question request blocks parent dock and unblocks after submi
        })

        const dock = page.locator(questionDockSelector)
-        await expectQuestionBlocked(page)
+        await expect.poll(() => dock.count(), { timeout: 10_000 }).toBe(1)
+        await expect(page.locator(promptSelector)).toHaveCount(0)

        await dock.locator('[data-slot="question-option"]').first().click()
        await dock.getByRole("button", { name: /submit/i }).click()

-        await expectQuestionOpen(page)
+        await expect.poll(() => page.locator(questionDockSelector).count(), { timeout: 10_000 }).toBe(0)
+        await expect(page.locator(promptSelector)).toBeVisible()
      })
    } finally {
      await cleanupSession({ sdk, sessionID: child.id })
@@ -457,15 +344,17 @@ test("child session permission request blocks parent dock and supports allow onc
          metadata: { description: "Need child permission" },
        },
        { child },
-        async (state) => {
+        async () => {
          await page.goto(page.url())
-          await expectPermissionBlocked(page)
+          const dock = page.locator(permissionDockSelector)
+          await expect.poll(() => dock.count(), { timeout: 10_000 }).toBe(1)
+          await expect(page.locator(promptSelector)).toHaveCount(0)

          await clearPermissionDock(page, /allow once/i)
-          await state.resolved()
          await page.goto(page.url())

-          await expectPermissionOpen(page)
+          await expect.poll(() => page.locator(permissionDockSelector).count(), { timeout: 10_000 }).toBe(0)
+          await expect(page.locator(promptSelector)).toBeVisible()
        },
      )
    } finally {
@@ -476,31 +365,36 @@ test("child session permission request blocks parent dock and supports allow onc

 test("todo dock transitions and collapse behavior", async ({ page, sdk, gotoSession }) => {
  await withDockSession(sdk, "e2e composer dock todo", async (session) => {
-    const dock = await todoDock(page, session.id)
-    await gotoSession(session.id)
-    await expect(page.locator(sessionComposerDockSelector)).toBeVisible()
+    await withDockSeed(sdk, session.id, async () => {
+      await gotoSession(session.id)

-    try {
-      await dock.open([
-        { content: "first task", status: "pending", priority: "high" },
-        { content: "second task", status: "in_progress", priority: "medium" },
-      ])
-      await dock.expectOpen(["pending", "in_progress"])
+      await seedSessionTodos(sdk, {
+        sessionID: session.id,
+        todos: [
+          { content: "first task", status: "pending", priority: "high" },
+          { content: "second task", status: "in_progress", priority: "medium" },
+        ],
+      })

-      await dock.collapse()
-      await dock.expectCollapsed(["pending", "in_progress"])
+      await expect.poll(() => page.locator(sessionTodoDockSelector).count(), { timeout: 10_000 }).toBe(1)
+      await expect(page.locator(sessionTodoListSelector)).toBeVisible()

-      await dock.expand()
-      await dock.expectOpen(["pending", "in_progress"])
+      await page.locator(sessionTodoToggleButtonSelector).click()
+      await expect(page.locator(sessionTodoListSelector)).toBeHidden()

-      await dock.finish([
-        { content: "first task", status: "completed", priority: "high" },
-        { content: "second task", status: "cancelled", priority: "medium" },
-      ])
-      await dock.expectClosed()
-    } finally {
-      await dock.clear()
-    }
+      await page.locator(sessionTodoToggleButtonSelector).click()
+      await expect(page.locator(sessionTodoListSelector)).toBeVisible()
+
+      await seedSessionTodos(sdk, {
+        sessionID: session.id,
+        todos: [
+          { content: "first task", status: "completed", priority: "high" },
+          { content: "second task", status: "cancelled", priority: "medium" },
+        ],
+      })
+
+      await expect.poll(() => page.locator(sessionTodoDockSelector).count(), { timeout: 10_000 }).toBe(0)
+    })
  })
 })

@@ -520,7 +414,8 @@ test("keyboard focus stays off prompt while blocked", async ({ page, sdk, gotoSe
        ],
      })

-      await expectQuestionBlocked(page)
+      await expect.poll(() => page.locator(questionDockSelector).count(), { timeout: 10_000 }).toBe(1)
+      await expect(page.locator(promptSelector)).toHaveCount(0)

      await page.locator("main").click({ position: { x: 5, y: 5 } })
      await page.keyboard.type("abc")
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/app",
-  "version": "1.2.25",
+  "version": "1.2.24",
  "description": "",
  "type": "module",
  "exports": {
--- a/packages/app/playwright.config.ts
+++ b/packages/app/playwright.config.ts
@@ -6,7 +6,6 @@ const serverHost = process.env.PLAYWRIGHT_SERVER_HOST ?? "127.0.0.1"
 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

 export default defineConfig({
  testDir: "./e2e",
@@ -18,7 +17,6 @@ export default defineConfig({
  fullyParallel: process.env.PLAYWRIGHT_FULLY_PARALLEL === "1",
  forbidOnly: !!process.env.CI,
  retries: process.env.CI ? 2 : 0,
-  workers,
  reporter: [["html", { outputFolder: "e2e/playwright-report", open: "never" }], ["line"]],
  webServer: {
    command,
--- a/packages/app/script/e2e-local.ts
+++ b/packages/app/script/e2e-local.ts
@@ -73,7 +73,6 @@ const serverEnv = {
  OPENCODE_E2E_MESSAGE: "Seeded for UI e2e",
  OPENCODE_E2E_MODEL: "opencode/gpt-5-nano",
  OPENCODE_CLIENT: "app",
-  OPENCODE_STRICT_CONFIG_DEPS: "true",
 } satisfies Record<string, string>

 const runnerEnv = {
--- a/packages/app/src/app.tsx
+++ b/packages/app/src/app.tsx
@@ -159,7 +159,7 @@ const effectMinDuration =
  <A, E, R>(e: Effect.Effect<A, E, R>) =>
    Effect.all([e, Effect.sleep(duration)], { concurrency: "unbounded" }).pipe(Effect.map((v) => v[0]))

-function ConnectionGate(props: ParentProps<{ disableHealthCheck?: boolean }>) {
+function ConnectionGate(props: ParentProps) {
  const server = useServer()
  const checkServerHealth = useCheckServerHealth()

@@ -168,23 +168,21 @@ function ConnectionGate(props: ParentProps<{ disableHealthCheck?: boolean }>) {
  // performs repeated health check with a grace period for
  // non-http connections, otherwise fails instantly
  const [startupHealthCheck, healthCheckActions] = createResource(() =>
-    props.disableHealthCheck
-      ? true
-      : Effect.gen(function* () {
-          if (!server.current) return true
-          const { http, type } = server.current
+    Effect.gen(function* () {
+      if (!server.current) return true
+      const { http, type } = server.current

-          while (true) {
-            const res = yield* Effect.promise(() => checkServerHealth(http))
-            if (res.healthy) return true
-            if (checkMode() === "background" || type === "http") return false
-          }
-        }).pipe(
-          effectMinDuration(checkMode() === "blocking" ? "1.2 seconds" : 0),
-          Effect.timeoutOrElse({ duration: "10 seconds", onTimeout: () => Effect.succeed(false) }),
-          Effect.ensuring(Effect.sync(() => setCheckMode("background"))),
-          Effect.runPromise,
-        ),
+      while (true) {
+        const res = yield* Effect.promise(() => checkServerHealth(http))
+        if (res.healthy) return true
+        if (checkMode() === "background" || type === "http") return false
+      }
+    }).pipe(
+      effectMinDuration(checkMode() === "blocking" ? "1.2 seconds" : 0),
+      Effect.timeoutOrElse({ duration: "10 seconds", onTimeout: () => Effect.succeed(false) }),
+      Effect.ensuring(Effect.sync(() => setCheckMode("background"))),
+      Effect.runPromise,
+    ),
  )

  return (
@@ -263,11 +261,10 @@ export function AppInterface(props: {
  defaultServer: ServerConnection.Key
  servers?: Array<ServerConnection.Any>
  router?: Component<BaseRouterProps>
-  disableHealthCheck?: boolean
 }) {
  return (
    <ServerProvider defaultServer={props.defaultServer} servers={props.servers}>
-      <ConnectionGate disableHealthCheck={props.disableHealthCheck}>
+      <ConnectionGate>
        <GlobalSDKProvider>
          <GlobalSyncProvider>
            <Dynamic
--- a/packages/app/src/components/dialog-select-server.tsx
+++ b/packages/app/src/components/dialog-select-server.tsx
@@ -121,7 +121,7 @@ function ServerForm(props: ServerFormProps) {

  return (
    <div class="px-5">
-      <div class="bg-surface-base rounded-md p-5 flex flex-col gap-3">
+      <div class="bg-surface-raised-base rounded-md p-5 flex flex-col gap-3">
        <div class="flex-1 min-w-0 [&_[data-slot=input-wrapper]]:relative">
          <TextField
            type="text"
@@ -542,7 +542,7 @@ export function DialogSelectServer() {
              if (x) select(x)
            }}
            divider={true}
-            class="px-5 [&_[data-slot=list-search-wrapper]]:w-full [&_[data-slot=list-scroll]]h-[300px] [&_[data-slot=list-scroll]]:overflow-y-auto [&_[data-slot=list-items]]:bg-surface-base [&_[data-slot=list-items]]:rounded-md [&_[data-slot=list-item]]:min-h-14 [&_[data-slot=list-item]]:p-3 [&_[data-slot=list-item]]:!bg-transparent"
+            class="px-5 [&_[data-slot=list-search-wrapper]]:w-full [&_[data-slot=list-scroll]]h-[300px] [&_[data-slot=list-scroll]]:overflow-y-auto [&_[data-slot=list-items]]:bg-surface-raised-base [&_[data-slot=list-items]]:rounded-md [&_[data-slot=list-item]]:min-h-14 [&_[data-slot=list-item]]:p-3 [&_[data-slot=list-item]]:!bg-transparent"
          >
            {(i) => {
              const key = ServerConnection.key(i)
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -48,7 +48,7 @@ import {
  type PromptHistoryStoredEntry,
  promptLength,
 } from "./prompt-input/history"
-import { createPromptSubmit, type FollowupDraft } from "./prompt-input/submit"
+import { createPromptSubmit } from "./prompt-input/submit"
 import { PromptPopover, type AtOption, type SlashCommand } from "./prompt-input/slash-popover"
 import { PromptContextItems } from "./prompt-input/context-items"
 import { PromptImageAttachments } from "./prompt-input/image-attachments"
@@ -61,11 +61,6 @@ interface PromptInputProps {
  ref?: (el: HTMLDivElement) => void
  newSessionWorktree?: string
  onNewSessionWorktreeReset?: () => void
-  edit?: { id: string; prompt: Prompt; context: FollowupDraft["context"] }
-  onEditLoaded?: () => void
-  shouldQueue?: () => boolean
-  onQueue?: (draft: FollowupDraft) => void
-  onAbort?: () => void
  onSubmit?: () => void
 }

@@ -952,45 +947,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    setCurrentHistory("entries", next)
  }

-  createEffect(
-    on(
-      () => props.edit?.id,
-      (id) => {
-        const edit = props.edit
-        if (!id || !edit) return
-
-        for (const item of prompt.context.items()) {
-          prompt.context.remove(item.key)
-        }
-
-        for (const item of edit.context) {
-          prompt.context.add({
-            type: item.type,
-            path: item.path,
-            selection: item.selection,
-            comment: item.comment,
-            commentID: item.commentID,
-            commentOrigin: item.commentOrigin,
-            preview: item.preview,
-          })
-        }
-
-        setStore("mode", "normal")
-        setStore("popover", null)
-        setStore("historyIndex", -1)
-        setStore("savedPrompt", null)
-        prompt.set(edit.prompt, promptLength(edit.prompt))
-        requestAnimationFrame(() => {
-          editorRef.focus()
-          setCursorPosition(editorRef, promptLength(edit.prompt))
-          queueScroll()
-        })
-        props.onEditLoaded?.()
-      },
-      { defer: true },
-    ),
-  )
-
  const navigateHistory = (direction: "up" | "down") => {
    const result = navigatePromptHistory({
      direction,
@@ -1045,9 +1001,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    setPopover: (popover) => setStore("popover", popover),
    newSessionWorktree: () => props.newSessionWorktree,
    onNewSessionWorktreeReset: props.onNewSessionWorktreeReset,
-    shouldQueue: props.shouldQueue,
-    onQueue: props.onQueue,
-    onAbort: props.onAbort,
    onSubmit: props.onSubmit,
  })

--- a/packages/app/src/components/prompt-input/submit.ts
+++ b/packages/app/src/components/prompt-input/submit.ts
@@ -9,7 +9,7 @@ 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, usePrompt } from "@/context/prompt"
+import { type ImageAttachmentPart, type Prompt, usePrompt } from "@/context/prompt"
 import { useSDK } from "@/context/sdk"
 import { useSync } from "@/context/sync"
 import { Identifier } from "@/utils/id"
@@ -25,145 +25,6 @@ type PendingPrompt = {

 const pending = new Map<string, PendingPrompt>()

-export type FollowupDraft = {
-  sessionID: string
-  sessionDirectory: string
-  prompt: Prompt
-  context: (ContextItem & { key: string })[]
-  agent: string
-  model: { providerID: string; modelID: string }
-  variant?: string
-}
-
-type FollowupSendInput = {
-  client: ReturnType<typeof useSDK>["client"]
-  globalSync: ReturnType<typeof useGlobalSync>
-  sync: ReturnType<typeof useSync>
-  draft: FollowupDraft
-  messageID?: string
-  optimisticBusy?: boolean
-  before?: () => Promise<boolean> | boolean
-}
-
-const draftText = (prompt: Prompt) => prompt.map((part) => ("content" in part ? part.content : "")).join("")
-
-const draftImages = (prompt: Prompt) => prompt.filter((part): part is ImageAttachmentPart => part.type === "image")
-
-export async function sendFollowupDraft(input: FollowupSendInput) {
-  const text = draftText(input.draft.prompt)
-  const images = draftImages(input.draft.prompt)
-  const [, setStore] = input.globalSync.child(input.draft.sessionDirectory)
-
-  const setBusy = () => {
-    if (!input.optimisticBusy) return
-    setStore("session_status", input.draft.sessionID, { type: "busy" })
-  }
-
-  const setIdle = () => {
-    if (!input.optimisticBusy) return
-    setStore("session_status", input.draft.sessionID, { type: "idle" })
-  }
-
-  const wait = async () => {
-    const ok = await input.before?.()
-    if (ok === false) return false
-    return true
-  }
-
-  const [head, ...tail] = text.split(" ")
-  const cmd = head?.startsWith("/") ? head.slice(1) : undefined
-  if (cmd && input.sync.data.command.find((item) => item.name === cmd)) {
-    setBusy()
-    try {
-      if (!(await wait())) {
-        setIdle()
-        return false
-      }
-
-      await input.client.session.command({
-        sessionID: input.draft.sessionID,
-        command: cmd,
-        arguments: tail.join(" "),
-        agent: input.draft.agent,
-        model: `${input.draft.model.providerID}/${input.draft.model.modelID}`,
-        variant: input.draft.variant,
-        parts: images.map((attachment) => ({
-          id: Identifier.ascending("part"),
-          type: "file" as const,
-          mime: attachment.mime,
-          url: attachment.dataUrl,
-          filename: attachment.filename,
-        })),
-      })
-      return true
-    } catch (err) {
-      setIdle()
-      throw err
-    }
-  }
-
-  const messageID = input.messageID ?? Identifier.ascending("message")
-  const { requestParts, optimisticParts } = buildRequestParts({
-    prompt: input.draft.prompt,
-    context: input.draft.context,
-    images,
-    text,
-    sessionID: input.draft.sessionID,
-    messageID,
-    sessionDirectory: input.draft.sessionDirectory,
-  })
-
-  const message: Message = {
-    id: messageID,
-    sessionID: input.draft.sessionID,
-    role: "user",
-    time: { created: Date.now() },
-    agent: input.draft.agent,
-    model: input.draft.model,
-    variant: input.draft.variant,
-  }
-
-  const add = () =>
-    input.sync.session.optimistic.add({
-      directory: input.draft.sessionDirectory,
-      sessionID: input.draft.sessionID,
-      message,
-      parts: optimisticParts,
-    })
-
-  const remove = () =>
-    input.sync.session.optimistic.remove({
-      directory: input.draft.sessionDirectory,
-      sessionID: input.draft.sessionID,
-      messageID,
-    })
-
-  setBusy()
-  add()
-
-  try {
-    if (!(await wait())) {
-      setIdle()
-      remove()
-      return false
-    }
-
-    await input.client.session.promptAsync({
-      sessionID: input.draft.sessionID,
-      agent: input.draft.agent,
-      model: input.draft.model,
-      messageID,
-      parts: requestParts,
-      variant: input.draft.variant,
-    })
-    return true
-  } catch (err) {
-    setIdle()
-    remove()
-    throw err
-  }
-}
-
 type PromptSubmitInput = {
  info: Accessor<{ id: string } | undefined>
  imageAttachments: Accessor<ImageAttachmentPart[]>
@@ -180,9 +41,6 @@ type PromptSubmitInput = {
  setPopover: (popover: "at" | "slash" | null) => void
  newSessionWorktree?: Accessor<string | undefined>
  onNewSessionWorktreeReset?: () => void
-  shouldQueue?: Accessor<boolean>
-  onQueue?: (draft: FollowupDraft) => void
-  onAbort?: () => void
  onSubmit?: () => void
 }

@@ -224,8 +82,6 @@ export function createPromptSubmit(input: PromptSubmitInput) {
    const [, setStore] = globalSync.child(sdk.directory)
    setStore("todo", sessionID, [])

-    input.onAbort?.()
-
    const queued = pending.get(sessionID)
    if (queued) {
      queued.abort.abort()
@@ -260,12 +116,6 @@ export function createPromptSubmit(input: PromptSubmitInput) {
    }
  }

-  const clearContext = () => {
-    for (const item of prompt.context.items()) {
-      prompt.context.remove(item.key)
-    }
-  }
-
  const handleSubmit = async (event: Event) => {
    event.preventDefault()

@@ -365,22 +215,14 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      return
    }

+    input.onSubmit?.()
+
    const model = {
      modelID: currentModel.id,
      providerID: currentModel.provider.id,
    }
    const agent = currentAgent.name
    const variant = local.model.variant.current()
-    const context = prompt.context.items().slice()
-    const draft: FollowupDraft = {
-      sessionID: session.id,
-      sessionDirectory,
-      prompt: currentPrompt,
-      context,
-      agent,
-      model,
-      variant,
-    }

    const clearInput = () => {
      prompt.reset()
@@ -401,15 +243,6 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      })
    }

-    if (!isNewSession && mode === "normal" && input.shouldQueue?.()) {
-      input.onQueue?.(draft)
-      clearContext()
-      clearInput()
-      return
-    }
-
-    input.onSubmit?.()
-
    if (mode === "shell") {
      clearInput()
      client.session
@@ -462,19 +295,48 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      }
    }

+    const context = prompt.context.items().slice()
    const commentItems = context.filter((item) => item.type === "file" && !!item.comment?.trim())
-    const messageID = Identifier.ascending("message")

-    const removeOptimisticMessage = () => {
+    const messageID = Identifier.ascending("message")
+    const { requestParts, optimisticParts } = buildRequestParts({
+      prompt: currentPrompt,
+      context,
+      images,
+      text,
+      sessionID: session.id,
+      messageID,
+      sessionDirectory,
+    })
+
+    const optimisticMessage: Message = {
+      id: messageID,
+      sessionID: session.id,
+      role: "user",
+      time: { created: Date.now() },
+      agent,
+      model,
+      variant,
+    }
+
+    const addOptimisticMessage = () =>
+      sync.session.optimistic.add({
+        directory: sessionDirectory,
+        sessionID: session.id,
+        message: optimisticMessage,
+        parts: optimisticParts,
+      })
+
+    const removeOptimisticMessage = () =>
      sync.session.optimistic.remove({
        directory: sessionDirectory,
        sessionID: session.id,
        messageID,
      })
-    }

    removeCommentItems(commentItems)
    clearInput()
+    addOptimisticMessage()

    const waitForWorktree = async () => {
      const worktree = WorktreeState.get(sessionDirectory)
@@ -531,15 +393,20 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      return true
    }

-    void sendFollowupDraft({
-      client,
-      sync,
-      globalSync,
-      draft,
-      messageID,
-      optimisticBusy: sessionDirectory === projectDirectory,
-      before: waitForWorktree,
-    }).catch((err) => {
+    const send = async () => {
+      const ok = await waitForWorktree()
+      if (!ok) return
+      await client.session.promptAsync({
+        sessionID: session.id,
+        agent,
+        model,
+        messageID,
+        parts: requestParts,
+        variant,
+      })
+    }
+
+    void send().catch((err) => {
      pending.delete(session.id)
      if (sessionDirectory === projectDirectory) {
        sync.set("session_status", session.id, { type: "idle" })
--- a/packages/app/src/components/server/server-row.tsx
+++ b/packages/app/src/components/server/server-row.tsx
@@ -65,26 +65,22 @@ export function ServerRow(props: ServerRowProps) {

  return (
    <Tooltip
-      class="flex-1 min-w-0"
+      class="flex-1"
      value={tooltipValue()}
-      contentStyle={{ "max-width": "none", "white-space": "nowrap" }}
      placement="top-start"
      inactive={!truncated() && !props.conn.displayName}
    >
      <div class={props.class} classList={{ "opacity-50": props.dimmed }}>
-        <div class="flex flex-col items-start min-w-0 w-full">
-          <div class="flex flex-row items-center gap-2 min-w-0 w-full">
-            <span ref={nameRef} class={`${props.nameClass ?? "truncate"} min-w-0`}>
+        <div class="flex flex-col items-start">
+          <div class="flex flex-row items-center gap-2">
+            <span ref={nameRef} class={props.nameClass ?? "truncate"}>
              {name()}
            </span>
            <Show
              when={badge()}
              fallback={
                <Show when={props.status?.version}>
-                  <span
-                    ref={versionRef}
-                    class={`${props.versionClass ?? "text-text-weak text-14-regular truncate"} min-w-0`}
-                  >
+                  <span ref={versionRef} class={props.versionClass ?? "text-text-weak text-14-regular truncate"}>
                    v{props.status?.version}
                  </span>
                </Show>
--- a/packages/app/src/components/session/session-header.tsx
+++ b/packages/app/src/components/session/session-header.tsx
@@ -4,7 +4,9 @@ import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
 import { Icon } from "@opencode-ai/ui/icon"
 import { IconButton } from "@opencode-ai/ui/icon-button"
 import { Keybind } from "@opencode-ai/ui/keybind"
+import { Popover } from "@opencode-ai/ui/popover"
 import { Spinner } from "@opencode-ai/ui/spinner"
+import { TextField } from "@opencode-ai/ui/text-field"
 import { showToast } from "@opencode-ai/ui/toast"
 import { Tooltip, TooltipKeybind } from "@opencode-ai/ui/tooltip"
 import { getFilename } from "@opencode-ai/util/path"
@@ -12,10 +14,12 @@ import { createEffect, createMemo, For, onCleanup, Show } from "solid-js"
 import { createStore } from "solid-js/store"
 import { Portal } from "solid-js/web"
 import { useCommand } from "@/context/command"
+import { useGlobalSDK } from "@/context/global-sdk"
 import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
 import { usePlatform } from "@/context/platform"
 import { useServer } from "@/context/server"
+import { useSync } from "@/context/sync"
 import { useTerminal } from "@/context/terminal"
 import { focusTerminalById } from "@/pages/session/helpers"
 import { useSessionLayout } from "@/pages/session/session-layout"
@@ -108,6 +112,12 @@ const LINUX_APPS = [
  },
 ] as const

+type OpenOption = (typeof MAC_APPS)[number] | (typeof WINDOWS_APPS)[number] | (typeof LINUX_APPS)[number]
+type OpenIcon = OpenApp | "file-explorer"
+const OPEN_ICON_BASE = new Set<OpenIcon>(["finder", "vscode", "cursor", "zed"])
+
+const openIconSize = (id: OpenIcon) => (OPEN_ICON_BASE.has(id) ? "size-4" : "size-[19px]")
+
 const detectOS = (platform: ReturnType<typeof usePlatform>): OS => {
  if (platform.platform === "desktop" && platform.os) return platform.os
  if (typeof navigator !== "object") return "unknown"
@@ -126,10 +136,98 @@ const showRequestError = (language: ReturnType<typeof useLanguage>, err: unknown
  })
 }

+function useSessionShare(args: {
+  globalSDK: ReturnType<typeof useGlobalSDK>
+  currentSession: () =>
+    | {
+        share?: {
+          url?: string
+        }
+      }
+    | undefined
+  sessionID: () => string | undefined
+  projectDirectory: () => string
+  platform: ReturnType<typeof usePlatform>
+}) {
+  const [state, setState] = createStore({
+    share: false,
+    unshare: false,
+    copied: false,
+    timer: undefined as number | undefined,
+  })
+  const shareUrl = createMemo(() => args.currentSession()?.share?.url)
+
+  createEffect(() => {
+    const url = shareUrl()
+    if (url) return
+    if (state.timer) window.clearTimeout(state.timer)
+    setState({ copied: false, timer: undefined })
+  })
+
+  onCleanup(() => {
+    if (state.timer) window.clearTimeout(state.timer)
+  })
+
+  const shareSession = () => {
+    const sessionID = args.sessionID()
+    if (!sessionID || state.share) return
+    setState("share", true)
+    args.globalSDK.client.session
+      .share({ sessionID, directory: args.projectDirectory() })
+      .catch((error) => {
+        console.error("Failed to share session", error)
+      })
+      .finally(() => {
+        setState("share", false)
+      })
+  }
+
+  const unshareSession = () => {
+    const sessionID = args.sessionID()
+    if (!sessionID || state.unshare) return
+    setState("unshare", true)
+    args.globalSDK.client.session
+      .unshare({ sessionID, directory: args.projectDirectory() })
+      .catch((error) => {
+        console.error("Failed to unshare session", error)
+      })
+      .finally(() => {
+        setState("unshare", false)
+      })
+  }
+
+  const copyLink = (onError: (error: unknown) => void) => {
+    const url = shareUrl()
+    if (!url) return
+    navigator.clipboard
+      .writeText(url)
+      .then(() => {
+        if (state.timer) window.clearTimeout(state.timer)
+        setState("copied", true)
+        const timer = window.setTimeout(() => {
+          setState("copied", false)
+          setState("timer", undefined)
+        }, 3000)
+        setState("timer", timer)
+      })
+      .catch(onError)
+  }
+
+  const viewShare = () => {
+    const url = shareUrl()
+    if (!url) return
+    args.platform.openLink(url)
+  }
+
+  return { state, shareUrl, shareSession, unshareSession, copyLink, viewShare }
+}
+
 export function SessionHeader() {
+  const globalSDK = useGlobalSDK()
  const layout = useLayout()
  const command = useCommand()
  const server = useServer()
+  const sync = useSync()
  const platform = usePlatform()
  const language = useLanguage()
  const terminal = useTerminal()
@@ -147,6 +245,10 @@ export function SessionHeader() {
    return getFilename(projectDirectory())
  })
  const hotkey = createMemo(() => command.keybind("file.open"))
+
+  const currentSession = createMemo(() => (params.id ? sync.session.get(params.id) : undefined))
+  const shareEnabled = createMemo(() => sync.data.config.share !== "disabled")
+  const showShare = createMemo(() => shareEnabled() && !!params.id)
  const os = createMemo(() => detectOS(platform))

  const [exists, setExists] = createStore<Partial<Record<OpenApp, boolean>>>({
@@ -254,6 +356,14 @@ export function SessionHeader() {
      .catch((err: unknown) => showRequestError(language, err))
  }

+  const share = useSessionShare({
+    globalSDK,
+    currentSession,
+    sessionID: () => params.id,
+    projectDirectory,
+    platform,
+  })
+
  const centerMount = createMemo(() => document.getElementById("opencode-titlebar-center"))
  const rightMount = createMemo(() => document.getElementById("opencode-titlebar-right"))

@@ -281,9 +391,7 @@ export function SessionHeader() {

              <Show when={hotkey()}>
                {(keybind) => (
-                  <Keybind class="shrink-0 !border-0 !bg-transparent !shadow-none px-0 text-text-weaker">
-                    {keybind()}
-                  </Keybind>
+                  <Keybind class="shrink-0 !border-0 !bg-transparent !shadow-none px-0">{keybind()}</Keybind>
                )}
              </Show>
            </Button>
@@ -294,6 +402,7 @@ export function SessionHeader() {
        {(mount) => (
          <Portal mount={mount()}>
            <div class="flex items-center gap-2">
+              <StatusPopover />
              <Show when={projectDirectory()}>
                <div class="hidden xl:flex items-center">
                  <Show
@@ -318,7 +427,7 @@ export function SessionHeader() {
                      <div class="flex h-[24px] box-border items-center rounded-md border border-border-weak-base bg-surface-panel overflow-hidden">
                        <Button
                          variant="ghost"
-                          class="rounded-none h-full py-0 pr-1.5 pl-px gap-1.5 border-none shadow-none disabled:!cursor-default"
+                          class="rounded-none h-full py-0 pr-3 pl-0.5 gap-1.5 border-none shadow-none disabled:!cursor-default"
                          classList={{
                            "bg-surface-raised-base-active": opening(),
                          }}
@@ -326,13 +435,17 @@ export function SessionHeader() {
                          disabled={opening()}
                          aria-label={language.t("session.header.open.ariaLabel", { app: current().label })}
                        >
-                          <div class="flex size-5 shrink-0 items-center justify-center [&_[data-component=app-icon]]:size-5">
-                            <Show when={opening()} fallback={<AppIcon id={current().icon} />}>
+                          <div class="flex size-5 shrink-0 items-center justify-center">
+                            <Show
+                              when={opening()}
+                              fallback={<AppIcon id={current().icon} class={openIconSize(current().icon)} />}
+                            >
                              <Spinner class="size-3.5 text-icon-base" />
                            </Show>
                          </div>
                          <span class="text-12-regular text-text-strong">{language.t("common.open")}</span>
                        </Button>
+                        <div class="self-stretch w-px bg-border-weak-base" />
                        <DropdownMenu
                          gutter={4}
                          placement="bottom-end"
@@ -344,20 +457,17 @@ export function SessionHeader() {
                            icon="chevron-down"
                            variant="ghost"
                            disabled={opening()}
-                            class="rounded-none h-full w-[20px] p-0 border-none shadow-none data-[expanded]:bg-surface-raised-base-active disabled:!cursor-default"
+                            class="rounded-none h-full w-[24px] p-0 border-none shadow-none data-[expanded]:bg-surface-raised-base-active disabled:!cursor-default"
                            classList={{
                              "bg-surface-raised-base-active": opening(),
                            }}
                            aria-label={language.t("session.header.open.menu")}
                          />
                          <DropdownMenu.Portal>
-                            <DropdownMenu.Content class="[&_[data-slot=dropdown-menu-item]]:pl-1 [&_[data-slot=dropdown-menu-radio-item]]:pl-1 [&_[data-slot=dropdown-menu-radio-item]+[data-slot=dropdown-menu-radio-item]]:mt-1">
+                            <DropdownMenu.Content>
                              <DropdownMenu.Group>
-                                <DropdownMenu.GroupLabel class="!px-1 !py-1">
-                                  {language.t("session.header.openIn")}
-                                </DropdownMenu.GroupLabel>
+                                <DropdownMenu.GroupLabel>{language.t("session.header.openIn")}</DropdownMenu.GroupLabel>
                                <DropdownMenu.RadioGroup
-                                  class="mt-1"
                                  value={current().id}
                                  onChange={(value) => {
                                    if (!OPEN_APPS.includes(value as OpenApp)) return
@@ -374,8 +484,8 @@ export function SessionHeader() {
                                          openDir(o.id)
                                        }}
                                      >
-                                        <div class="flex size-5 shrink-0 items-center justify-center [&_[data-component=app-icon]]:size-5">
-                                          <AppIcon id={o.icon} />
+                                        <div class="flex size-5 shrink-0 items-center justify-center">
+                                          <AppIcon id={o.icon} class={openIconSize(o.icon)} />
                                        </div>
                                        <DropdownMenu.ItemLabel>{o.label}</DropdownMenu.ItemLabel>
                                        <DropdownMenu.ItemIndicator>
@@ -408,10 +518,113 @@ export function SessionHeader() {
                  </Show>
                </div>
              </Show>
+              <Show when={showShare()}>
+                <div class="flex items-center">
+                  <Popover
+                    title={language.t("session.share.popover.title")}
+                    description={
+                      share.shareUrl()
+                        ? language.t("session.share.popover.description.shared")
+                        : language.t("session.share.popover.description.unshared")
+                    }
+                    gutter={4}
+                    placement="bottom-end"
+                    shift={-64}
+                    class="rounded-xl [&_[data-slot=popover-close-button]]:hidden"
+                    triggerAs={Button}
+                    triggerProps={{
+                      variant: "ghost",
+                      class:
+                        "rounded-md h-[24px] px-3 border border-border-weak-base bg-surface-panel shadow-none data-[expanded]:bg-surface-base-active",
+                      classList: {
+                        "rounded-r-none": share.shareUrl() !== undefined,
+                        "border-r-0": share.shareUrl() !== undefined,
+                      },
+                      style: { scale: 1 },
+                    }}
+                    trigger={<span class="text-12-regular">{language.t("session.share.action.share")}</span>}
+                  >
+                    <div class="flex flex-col gap-2">
+                      <Show
+                        when={share.shareUrl()}
+                        fallback={
+                          <div class="flex">
+                            <Button
+                              size="large"
+                              variant="primary"
+                              class="w-1/2"
+                              onClick={share.shareSession}
+                              disabled={share.state.share}
+                            >
+                              {share.state.share
+                                ? language.t("session.share.action.publishing")
+                                : language.t("session.share.action.publish")}
+                            </Button>
+                          </div>
+                        }
+                      >
+                        <div class="flex flex-col gap-2">
+                          <TextField
+                            value={share.shareUrl() ?? ""}
+                            readOnly
+                            copyable
+                            copyKind="link"
+                            tabIndex={-1}
+                            class="w-full"
+                          />
+                          <div class="grid grid-cols-2 gap-2">
+                            <Button
+                              size="large"
+                              variant="secondary"
+                              class="w-full shadow-none border border-border-weak-base"
+                              onClick={share.unshareSession}
+                              disabled={share.state.unshare}
+                            >
+                              {share.state.unshare
+                                ? language.t("session.share.action.unpublishing")
+                                : language.t("session.share.action.unpublish")}
+                            </Button>
+                            <Button
+                              size="large"
+                              variant="primary"
+                              class="w-full"
+                              onClick={share.viewShare}
+                              disabled={share.state.unshare}
+                            >
+                              {language.t("session.share.action.view")}
+                            </Button>
+                          </div>
+                        </div>
+                      </Show>
+                    </div>
+                  </Popover>
+                  <Show when={share.shareUrl()} fallback={<div aria-hidden="true" />}>
+                    <Tooltip
+                      value={
+                        share.state.copied
+                          ? language.t("session.share.copy.copied")
+                          : language.t("session.share.copy.copyLink")
+                      }
+                      placement="top"
+                      gutter={8}
+                    >
+                      <IconButton
+                        icon={share.state.copied ? "check" : "link"}
+                        variant="ghost"
+                        class="rounded-l-none h-[24px] border border-border-weak-base bg-surface-panel shadow-none"
+                        onClick={() => share.copyLink((error) => showRequestError(language, error))}
+                        disabled={share.state.unshare}
+                        aria-label={
+                          share.state.copied
+                            ? language.t("session.share.copy.copied")
+                            : language.t("session.share.copy.copyLink")
+                        }
+                      />
+                    </Tooltip>
+                  </Show>
+                </div>
+              </Show>
              <div class="flex items-center gap-1">
-                <Tooltip placement="bottom" value={language.t("status.popover.trigger")}>
-                  <StatusPopover />
-                </Tooltip>
                <TooltipKeybind
                  title={language.t("command.terminal.toggle")}
                  keybind={command.keybind("terminal.toggle")}
@@ -424,7 +637,23 @@ export function SessionHeader() {
                    aria-expanded={view().terminal.opened()}
                    aria-controls="terminal-panel"
                  >
-                    <Icon size="small" name={view().terminal.opened() ? "terminal-active" : "terminal"} />
+                    <div class="relative flex items-center justify-center size-4 [&>*]:absolute [&>*]:inset-0">
+                      <Icon
+                        size="small"
+                        name={view().terminal.opened() ? "layout-bottom-partial" : "layout-bottom"}
+                        class="group-hover/terminal-toggle:hidden"
+                      />
+                      <Icon
+                        size="small"
+                        name="layout-bottom-partial"
+                        class="hidden group-hover/terminal-toggle:inline-block"
+                      />
+                      <Icon
+                        size="small"
+                        name={view().terminal.opened() ? "layout-bottom" : "layout-bottom-partial"}
+                        class="hidden group-active/terminal-toggle:inline-block"
+                      />
+                    </div>
                  </Button>
                </TooltipKeybind>

@@ -441,7 +670,23 @@ export function SessionHeader() {
                      aria-expanded={view().reviewPanel.opened()}
                      aria-controls="review-panel"
                    >
-                      <Icon size="small" name={view().reviewPanel.opened() ? "review-active" : "review"} />
+                      <div class="relative flex items-center justify-center size-4 [&>*]:absolute [&>*]:inset-0">
+                        <Icon
+                          size="small"
+                          name={view().reviewPanel.opened() ? "layout-right-partial" : "layout-right"}
+                          class="group-hover/review-toggle:hidden"
+                        />
+                        <Icon
+                          size="small"
+                          name="layout-right-partial"
+                          class="hidden group-hover/review-toggle:inline-block"
+                        />
+                        <Icon
+                          size="small"
+                          name={view().reviewPanel.opened() ? "layout-right" : "layout-right-partial"}
+                          class="hidden group-active/review-toggle:inline-block"
+                        />
+                      </div>
                    </Button>
                  </TooltipKeybind>

--- a/packages/app/src/components/settings-general.tsx
+++ b/packages/app/src/components/settings-general.tsx
@@ -12,7 +12,6 @@ import { usePlatform } from "@/context/platform"
 import { useSettings, monoFontFamily } from "@/context/settings"
 import { playSound, SOUND_OPTIONS } from "@/utils/sound"
 import { Link } from "./link"
-import { SettingsList } from "./settings-list"

 let demoSoundState = {
  cleanup: undefined as (() => void) | undefined,
@@ -114,11 +113,6 @@ export const SettingsGeneral: Component = () => {
    { value: "dark", label: language.t("theme.scheme.dark") },
  ])

-  const followupOptions = createMemo((): { value: "queue" | "steer"; label: string }[] => [
-    { value: "queue", label: language.t("settings.general.row.followup.option.queue") },
-    { value: "steer", label: language.t("settings.general.row.followup.option.steer") },
-  ])
-
  const languageOptions = createMemo(() =>
    language.locales.map((locale) => ({
      value: locale,
@@ -176,9 +170,11 @@ export const SettingsGeneral: Component = () => {
    triggerVariant: "settings" as const,
  })

-  const GeneralSection = () => (
+  const AppearanceSection = () => (
    <div class="flex flex-col gap-1">
-      <SettingsList>
+      <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.general.section.appearance")}</h3>
+
+      <div class="bg-surface-raised-base px-4 rounded-lg">
        <SettingsRow
          title={language.t("settings.general.row.language.title")}
          description={language.t("settings.general.row.language.description")}
@@ -197,70 +193,8 @@ export const SettingsGeneral: Component = () => {
        </SettingsRow>

        <SettingsRow
-          title={language.t("settings.general.row.reasoningSummaries.title")}
-          description={language.t("settings.general.row.reasoningSummaries.description")}
-        >
-          <div data-action="settings-feed-reasoning-summaries">
-            <Switch
-              checked={settings.general.showReasoningSummaries()}
-              onChange={(checked) => settings.general.setShowReasoningSummaries(checked)}
-            />
-          </div>
-        </SettingsRow>
-
-        <SettingsRow
-          title={language.t("settings.general.row.shellToolPartsExpanded.title")}
-          description={language.t("settings.general.row.shellToolPartsExpanded.description")}
-        >
-          <div data-action="settings-feed-shell-tool-parts-expanded">
-            <Switch
-              checked={settings.general.shellToolPartsExpanded()}
-              onChange={(checked) => settings.general.setShellToolPartsExpanded(checked)}
-            />
-          </div>
-        </SettingsRow>
-
-        <SettingsRow
-          title={language.t("settings.general.row.editToolPartsExpanded.title")}
-          description={language.t("settings.general.row.editToolPartsExpanded.description")}
-        >
-          <div data-action="settings-feed-edit-tool-parts-expanded">
-            <Switch
-              checked={settings.general.editToolPartsExpanded()}
-              onChange={(checked) => settings.general.setEditToolPartsExpanded(checked)}
-            />
-          </div>
-        </SettingsRow>
-
-        <SettingsRow
-          title={language.t("settings.general.row.followup.title")}
-          description={language.t("settings.general.row.followup.description")}
-        >
-          <Select
-            data-action="settings-followup"
-            options={followupOptions()}
-            current={followupOptions().find((o) => o.value === settings.general.followup())}
-            value={(o) => o.value}
-            label={(o) => o.label}
-            onSelect={(option) => option && settings.general.setFollowup(option.value)}
-            variant="secondary"
-            size="small"
-            triggerVariant="settings"
-            triggerStyle={{ "min-width": "180px" }}
-          />
-        </SettingsRow>
-      </SettingsList>
-    </div>
-  )
-
-  const AppearanceSection = () => (
-    <div class="flex flex-col gap-1">
-      <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.general.section.appearance")}</h3>
-
-      <SettingsList>
-        <SettingsRow
-          title={language.t("settings.general.row.colorScheme.title")}
-          description={language.t("settings.general.row.colorScheme.description")}
+          title={language.t("settings.general.row.appearance.title")}
+          description={language.t("settings.general.row.appearance.description")}
        >
          <Select
            data-action="settings-color-scheme"
@@ -277,7 +211,6 @@ export const SettingsGeneral: Component = () => {
            variant="secondary"
            size="small"
            triggerVariant="settings"
-            triggerStyle={{ "min-width": "220px" }}
          />
        </SettingsRow>

@@ -334,7 +267,51 @@ export const SettingsGeneral: Component = () => {
            )}
          </Select>
        </SettingsRow>
-      </SettingsList>
+      </div>
+    </div>
+  )
+
+  const FeedSection = () => (
+    <div class="flex flex-col gap-1">
+      <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.general.section.feed")}</h3>
+
+      <div class="bg-surface-raised-base px-4 rounded-lg">
+        <SettingsRow
+          title={language.t("settings.general.row.reasoningSummaries.title")}
+          description={language.t("settings.general.row.reasoningSummaries.description")}
+        >
+          <div data-action="settings-feed-reasoning-summaries">
+            <Switch
+              checked={settings.general.showReasoningSummaries()}
+              onChange={(checked) => settings.general.setShowReasoningSummaries(checked)}
+            />
+          </div>
+        </SettingsRow>
+
+        <SettingsRow
+          title={language.t("settings.general.row.shellToolPartsExpanded.title")}
+          description={language.t("settings.general.row.shellToolPartsExpanded.description")}
+        >
+          <div data-action="settings-feed-shell-tool-parts-expanded">
+            <Switch
+              checked={settings.general.shellToolPartsExpanded()}
+              onChange={(checked) => settings.general.setShellToolPartsExpanded(checked)}
+            />
+          </div>
+        </SettingsRow>
+
+        <SettingsRow
+          title={language.t("settings.general.row.editToolPartsExpanded.title")}
+          description={language.t("settings.general.row.editToolPartsExpanded.description")}
+        >
+          <div data-action="settings-feed-edit-tool-parts-expanded">
+            <Switch
+              checked={settings.general.editToolPartsExpanded()}
+              onChange={(checked) => settings.general.setEditToolPartsExpanded(checked)}
+            />
+          </div>
+        </SettingsRow>
+      </div>
    </div>
  )

@@ -342,7 +319,7 @@ export const SettingsGeneral: Component = () => {
    <div class="flex flex-col gap-1">
      <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.general.section.notifications")}</h3>

-      <SettingsList>
+      <div class="bg-surface-raised-base px-4 rounded-lg">
        <SettingsRow
          title={language.t("settings.general.notifications.agent.title")}
          description={language.t("settings.general.notifications.agent.description")}
@@ -378,7 +355,7 @@ export const SettingsGeneral: Component = () => {
            />
          </div>
        </SettingsRow>
-      </SettingsList>
+      </div>
    </div>
  )

@@ -386,7 +363,7 @@ export const SettingsGeneral: Component = () => {
    <div class="flex flex-col gap-1">
      <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.general.section.sounds")}</h3>

-      <SettingsList>
+      <div class="bg-surface-raised-base px-4 rounded-lg">
        <SettingsRow
          title={language.t("settings.general.sounds.agent.title")}
          description={language.t("settings.general.sounds.agent.description")}
@@ -431,7 +408,7 @@ export const SettingsGeneral: Component = () => {
            )}
          />
        </SettingsRow>
-      </SettingsList>
+      </div>
    </div>
  )

@@ -439,7 +416,7 @@ export const SettingsGeneral: Component = () => {
    <div class="flex flex-col gap-1">
      <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.general.section.updates")}</h3>

-      <SettingsList>
+      <div class="bg-surface-raised-base px-4 rounded-lg">
        <SettingsRow
          title={language.t("settings.updates.row.startup.title")}
          description={language.t("settings.updates.row.startup.description")}
@@ -475,7 +452,7 @@ export const SettingsGeneral: Component = () => {
              : language.t("settings.updates.action.checkNow")}
          </Button>
        </SettingsRow>
-      </SettingsList>
+      </div>
    </div>
  )

@@ -488,10 +465,10 @@ export const SettingsGeneral: Component = () => {
      </div>

      <div class="flex flex-col gap-8 w-full">
-        <GeneralSection />
-
        <AppearanceSection />

+        <FeedSection />
+
        <NotificationsSection />

        <SoundsSection />
@@ -505,7 +482,7 @@ export const SettingsGeneral: Component = () => {
              <div class="flex flex-col gap-1">
                <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.desktop.section.wsl")}</h3>

-                <SettingsList>
+                <div class="bg-surface-raised-base px-4 rounded-lg">
                  <SettingsRow
                    title={language.t("settings.desktop.wsl.title")}
                    description={language.t("settings.desktop.wsl.description")}
@@ -518,7 +495,7 @@ export const SettingsGeneral: Component = () => {
                      />
                    </div>
                  </SettingsRow>
-                </SettingsList>
+                </div>
              </div>
            )
          }}
@@ -538,7 +515,7 @@ export const SettingsGeneral: Component = () => {
              <div class="flex flex-col gap-1">
                <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.general.section.display")}</h3>

-                <SettingsList>
+                <div class="bg-surface-raised-base px-4 rounded-lg">
                  <SettingsRow
                    title={
                      <div class="flex items-center gap-2">
@@ -556,7 +533,7 @@ export const SettingsGeneral: Component = () => {
                      <Switch checked={value() === "wayland"} onChange={onChange} />
                    </div>
                  </SettingsRow>
-                </SettingsList>
+                </div>
              </div>
            )
          }}
@@ -574,12 +551,12 @@ interface SettingsRowProps {

 const SettingsRow: Component<SettingsRowProps> = (props) => {
  return (
-    <div class="flex flex-wrap items-center gap-4 py-3 border-b border-border-weak-base last:border-none sm:flex-nowrap">
-      <div class="flex min-w-0 flex-1 flex-col gap-0.5">
+    <div class="flex flex-wrap items-center justify-between gap-4 py-3 border-b border-border-weak-base last:border-none">
+      <div class="flex flex-col gap-0.5 min-w-0">
        <span class="text-14-medium text-text-strong">{props.title}</span>
        <span class="text-12-regular text-text-weak">{props.description}</span>
      </div>
-      <div class="flex w-full justify-end sm:w-auto sm:shrink-0">{props.children}</div>
+      <div class="flex-shrink-0">{props.children}</div>
    </div>
  )
 }
--- a/packages/app/src/components/settings-keybinds.tsx
+++ b/packages/app/src/components/settings-keybinds.tsx
@@ -9,7 +9,6 @@ import fuzzysort from "fuzzysort"
 import { formatKeybind, parseKeybind, useCommand } from "@/context/command"
 import { useLanguage } from "@/context/language"
 import { useSettings } from "@/context/settings"
-import { SettingsList } from "./settings-list"

 const IS_MAC = typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform)
 const PALETTE_ID = "command.palette"
@@ -407,7 +406,7 @@ export const SettingsKeybinds: Component = () => {
            <Show when={(filtered().get(group) ?? []).length > 0}>
              <div class="flex flex-col gap-1">
                <h3 class="text-14-medium text-text-strong pb-2">{language.t(groupKey[group])}</h3>
-                <SettingsList>
+                <div class="bg-surface-raised-base px-4 rounded-lg">
                  <For each={filtered().get(group) ?? []}>
                    {(id) => (
                      <div class="flex items-center justify-between gap-4 py-3 border-b border-border-weak-base last:border-none">
@@ -433,7 +432,7 @@ export const SettingsKeybinds: Component = () => {
                      </div>
                    )}
                  </For>
-                </SettingsList>
+                </div>
              </div>
            </Show>
          )}
--- a/packages/app/src/components/settings-list.tsx
+++ b/packages/app/src/components/settings-list.tsx
@@ -1,5 +0,0 @@
-import { type Component, type JSX } from "solid-js"
-
-export const SettingsList: Component<{ children: JSX.Element }> = (props) => {
-  return <div class="bg-surface-base px-4 rounded-lg">{props.children}</div>
-}
--- a/packages/app/src/components/settings-models.tsx
+++ b/packages/app/src/components/settings-models.tsx
@@ -8,7 +8,6 @@ import { type Component, For, Show } from "solid-js"
 import { useLanguage } from "@/context/language"
 import { useModels } from "@/context/models"
 import { popularProviders } from "@/hooks/use-providers"
-import { SettingsList } from "./settings-list"

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

@@ -101,7 +100,7 @@ export const SettingsModels: Component = () => {
                    <ProviderIcon id={group.category} class="size-5 shrink-0 icon-strong-base" />
                    <span class="text-14-medium text-text-strong">{group.items[0].provider.name}</span>
                  </div>
-                  <SettingsList>
+                  <div class="bg-surface-raised-base px-4 rounded-lg">
                    <For each={group.items}>
                      {(item) => {
                        const key = { providerID: item.provider.id, modelID: item.id }
@@ -125,7 +124,7 @@ export const SettingsModels: Component = () => {
                        )
                      }}
                    </For>
-                  </SettingsList>
+                  </div>
                </div>
              )}
            </For>
--- a/packages/app/src/components/settings-providers.tsx
+++ b/packages/app/src/components/settings-providers.tsx
@@ -11,7 +11,6 @@ import { useGlobalSync } from "@/context/global-sync"
 import { DialogConnectProvider } from "./dialog-connect-provider"
 import { DialogSelectProvider } from "./dialog-select-provider"
 import { DialogCustomProvider } from "./dialog-custom-provider"
-import { SettingsList } from "./settings-list"

 type ProviderSource = "env" | "api" | "config" | "custom"
 type ProviderItem = ReturnType<ReturnType<typeof useProviders>["connected"]>[number]
@@ -137,7 +136,7 @@ export const SettingsProviders: Component = () => {
      <div class="flex flex-col gap-8 max-w-[720px]">
        <div class="flex flex-col gap-1" data-component="connected-providers-section">
          <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.providers.section.connected")}</h3>
-          <SettingsList>
+          <div class="bg-surface-raised-base px-4 rounded-lg">
            <Show
              when={connected().length > 0}
              fallback={
@@ -170,12 +169,12 @@ export const SettingsProviders: Component = () => {
                )}
              </For>
            </Show>
-          </SettingsList>
+          </div>
        </div>

        <div class="flex flex-col gap-1">
          <h3 class="text-14-medium text-text-strong pb-2">{language.t("settings.providers.section.popular")}</h3>
-          <SettingsList>
+          <div class="bg-surface-raised-base px-4 rounded-lg">
            <For each={popular()}>
              {(item) => (
                <div class="flex flex-wrap items-center justify-between gap-4 min-h-16 py-3 border-b border-border-weak-base last:border-none">
@@ -233,7 +232,7 @@ export const SettingsProviders: Component = () => {
                {language.t("common.connect")}
              </Button>
            </div>
-          </SettingsList>
+          </div>

          <Button
            variant="ghost"
--- a/packages/app/src/components/status-popover.tsx
+++ b/packages/app/src/components/status-popover.tsx
@@ -169,7 +169,6 @@ export function StatusPopover() {
  const language = useLanguage()
  const navigate = useNavigate()

-  const [shown, setShown] = createSignal(false)
  const servers = createMemo(() => {
    const current = server.current
    const list = server.list
@@ -200,23 +199,18 @@ export function StatusPopover() {

  return (
    <Popover
-      open={shown()}
-      onOpenChange={setShown}
      triggerAs={Button}
      triggerProps={{
        variant: "ghost",
-        class: "titlebar-icon w-8 h-6 p-0 box-border",
+        class: "titlebar-icon w-6 h-6 p-0 box-border",
        "aria-label": language.t("status.popover.trigger"),
        style: { scale: 1 },
      }}
      trigger={
-        <div class="relative size-4">
-          <div class="badge-mask-tight size-4 flex items-center justify-center">
-            <Icon name={shown() ? "status-active" : "status"} size="small" />
-          </div>
+        <div class="flex size-4 items-center justify-center">
          <div
            classList={{
-              "absolute -top-px -right-px size-1.5 rounded-full": true,
+              "size-1.5 rounded-full": true,
              "bg-icon-success-base": overallHealthy(),
              "bg-icon-critical-base": !overallHealthy() && server.healthy() !== undefined,
              "bg-border-weak-base": server.healthy() === undefined,
--- a/packages/app/src/components/titlebar.tsx
+++ b/packages/app/src/components/titlebar.tsx
@@ -58,12 +58,6 @@ export function Titlebar() {
  })

  const path = () => `${location.pathname}${location.search}${location.hash}`
-  const creating = createMemo(() => {
-    if (!params.dir) return false
-    if (params.id) return false
-    const parts = location.pathname.replace(/\/+$/, "").split("/")
-    return parts.at(-1) === "session"
-  })

  createEffect(() => {
    const current = path()
@@ -212,7 +206,19 @@ export function Titlebar() {
              aria-label={language.t("command.sidebar.toggle")}
              aria-expanded={layout.sidebar.opened()}
            >
-              <Icon size="small" name={layout.sidebar.opened() ? "sidebar-active" : "sidebar"} />
+              <div class="relative flex items-center justify-center size-4 [&>*]:absolute [&>*]:inset-0">
+                <Icon
+                  size="small"
+                  name={layout.sidebar.opened() ? "layout-left-partial" : "layout-left"}
+                  class="group-hover/sidebar-toggle:hidden"
+                />
+                <Icon size="small" name="layout-left-partial" class="hidden group-hover/sidebar-toggle:inline-block" />
+                <Icon
+                  size="small"
+                  name={layout.sidebar.opened() ? "layout-left" : "layout-left-partial"}
+                  class="hidden group-active/sidebar-toggle:inline-block"
+                />
+              </div>
            </Button>
          </TooltipKeybind>
          <div class="hidden xl:flex items-center shrink-0">
@@ -225,14 +231,13 @@ export function Titlebar() {
              >
                <Button
                  variant="ghost"
-                  icon={creating() ? "new-session-active" : "new-session"}
+                  icon="new-session"
                  class="titlebar-icon w-8 h-6 p-0 box-border"
                  onClick={() => {
                    if (!params.dir) return
                    navigate(`/${params.dir}/session`)
                  }}
                  aria-label={language.t("command.session.new")}
-                  aria-current={creating() ? "page" : undefined}
                />
              </TooltipKeybind>
            </Show>
--- a/packages/app/src/context/settings.tsx
+++ b/packages/app/src/context/settings.tsx
@@ -22,7 +22,6 @@ export interface Settings {
  general: {
    autoSave: boolean
    releaseNotes: boolean
-    followup: "queue" | "steer"
    showReasoningSummaries: boolean
    shellToolPartsExpanded: boolean
    editToolPartsExpanded: boolean
@@ -46,7 +45,6 @@ const defaultSettings: Settings = {
  general: {
    autoSave: true,
    releaseNotes: true,
-    followup: "steer",
    showReasoningSummaries: false,
    shellToolPartsExpanded: true,
    editToolPartsExpanded: false,
@@ -128,10 +126,6 @@ export const { use: useSettings, provider: SettingsProvider } = createSimpleCont
        setReleaseNotes(value: boolean) {
          setStore("general", "releaseNotes", value)
        },
-        followup: withFallback(() => store.general?.followup, defaultSettings.general.followup),
-        setFollowup(value: "queue" | "steer") {
-          setStore("general", "followup", value)
-        },
        showReasoningSummaries: withFallback(
          () => store.general?.showReasoningSummaries,
          defaultSettings.general.showReasoningSummaries,
--- a/packages/app/src/context/sync.tsx
+++ b/packages/app/src/context/sync.tsx
@@ -233,15 +233,8 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
          })
        })
        .finally(() => {
-          setMeta(
-            produce((draft) => {
-              if (!tracked(input.directory, input.sessionID)) {
-                delete draft.loading[key]
-                return
-              }
-              draft.loading[key] = false
-            }),
-          )
+          if (!tracked(input.directory, input.sessionID)) return
+          setMeta("loading", key, false)
        })
    }

--- a/packages/app/src/entry.tsx
+++ b/packages/app/src/entry.tsx
@@ -1,5 +1,6 @@
 // @refresh reload

+import { iife } from "@opencode-ai/util/iife"
 import { render } from "solid-js/web"
 import { AppBaseProviders, AppInterface } from "@/app"
 import { type Platform, PlatformProvider } from "@/context/platform"
@@ -131,11 +132,7 @@ if (root instanceof HTMLElement) {
    () => (
      <PlatformProvider value={platform}>
        <AppBaseProviders>
-          <AppInterface
-            defaultServer={ServerConnection.Key.make(getDefaultUrl())}
-            servers={[server]}
-            disableHealthCheck
-          />
+          <AppInterface defaultServer={ServerConnection.Key.make(getDefaultUrl())} servers={[server]} />
        </AppBaseProviders>
      </PlatformProvider>
    ),
--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -104,7 +104,6 @@ export const dict = {
  "dialog.model.empty": "لا توجد نتائج للنماذج",
  "dialog.model.manage": "إدارة النماذج",
  "dialog.model.manage.description": "تخصيص النماذج التي تظهر في محدد النماذج.",
-  "dialog.model.manage.provider.toggle": "تبديل جميع نماذج {{provider}}",
  "dialog.model.unpaid.freeModels.title": "نماذج مجانية مقدمة من OpenCode",
  "dialog.model.unpaid.addMore.title": "إضافة المزيد من النماذج من موفرين مشهورين",
  "dialog.provider.viewAll": "عرض المزيد من الموفرين",
@@ -289,11 +288,6 @@ export const dict = {
  "dialog.server.add.error": "تعذر الاتصال بالخادم",
  "dialog.server.add.checking": "جارٍ التحقق...",
  "dialog.server.add.button": "إضافة خادم",
-  "dialog.server.add.name": "اسم الخادم (اختياري)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "اسم المستخدم (اختياري)",
-  "dialog.server.add.password": "كلمة المرور (اختياري)",
-  "dialog.server.edit.title": "تحرير الخادم",
  "dialog.server.default.title": "الخادم الافتراضي",
  "dialog.server.default.description":
    "الاتصال بهذا الخادم عند بدء تشغيل التطبيق بدلاً من بدء خادم محلي. يتطلب إعادة التشغيل.",
@@ -364,7 +358,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",
  "toast.language.title": "لغة",
  "toast.language.description": "تم التبديل إلى {{language}}",
  "toast.theme.title": "تم تبديل السمة",
@@ -451,11 +444,8 @@ export const dict = {
  "session.review.loadingChanges": "جارٍ تحميل التغييرات...",
  "session.review.empty": "لا توجد تغييرات في هذه الجلسة بعد",
  "session.review.noChanges": "لا توجد تغييرات",
-  "session.review.noVcs": "لم يتم اكتشاف نظام التحكم في الإصدار Git، لن يتم عرض التغييرات",
-  "session.review.noSnapshot": "تم تعطيل تتبع اللقطات في التكوين، لذا فإن تغييرات الجلسة غير متوفرة",
  "session.files.selectToOpen": "اختر ملفًا لفتحه",
  "session.files.all": "كل الملفات",
-  "session.files.empty": "لا توجد ملفات",
  "session.files.binaryContent": "ملف ثنائي (لا يمكن عرض المحتوى)",
  "session.messages.renderEarlier": "عرض الرسائل السابقة",
  "session.messages.loadingEarlier": "جارٍ تحميل الرسائل السابقة...",
@@ -466,17 +456,6 @@ export const dict = {
  "session.todo.title": "المهام",
  "session.todo.collapse": "طي",
  "session.todo.expand": "توسيع",
-  "session.followupDock.summary.one": "{{count}} رسالة في الانتظار",
-  "session.followupDock.summary.other": "{{count}} رسائل في الانتظار",
-  "session.followupDock.sendNow": "إرسال الآن",
-  "session.followupDock.edit": "تحرير",
-  "session.followupDock.collapse": "طي الرسائل المنتظرة",
-  "session.followupDock.expand": "توسيع الرسائل المنتظرة",
-  "session.revertDock.summary.one": "{{count}} رسالة تم التراجع عنها",
-  "session.revertDock.summary.other": "{{count}} رسائل تم التراجع عنها",
-  "session.revertDock.collapse": "طي الرسائل التي تم التراجع عنها",
-  "session.revertDock.expand": "توسيع الرسائل التي تم التراجع عنها",
-  "session.revertDock.restore": "استعادة الرسالة",
  "session.new.title": "ابنِ أي شيء",
  "session.new.worktree.main": "الفرع الرئيسي",
  "session.new.worktree.mainWithBranch": "الفرع الرئيسي ({{branch}})",
@@ -559,18 +538,10 @@ export const dict = {
  "settings.general.row.language.description": "تغيير لغة العرض لـ OpenCode",
  "settings.general.row.appearance.title": "المظهر",
  "settings.general.row.appearance.description": "تخصيص كيفية ظهور OpenCode على جهازك",
-  "settings.general.row.colorScheme.title": "مخطط الألوان",
-  "settings.general.row.colorScheme.description": "اختر ما إذا كان OpenCode يتبع سمة النظام أو الفاتح أو الداكن",
  "settings.general.row.theme.title": "السمة",
  "settings.general.row.theme.description": "تخصيص سمة OpenCode.",
  "settings.general.row.font.title": "الخط",
  "settings.general.row.font.description": "تخصيص الخط الأحادي المستخدم في كتل التعليمات البرمجية",
-  "settings.general.row.followup.title": "سلوك المتابعة",
-  "settings.general.row.followup.description": "اختر ما إذا كانت طلبات المتابعة توجه فورًا أو تنتظر في قائمة انتظار",
-  "settings.general.row.followup.option.queue": "قائمة انتظار",
-  "settings.general.row.followup.option.steer": "توجيه",
-  "settings.general.row.reasoningSummaries.title": "إظهار ملخصات الاستنتاج",
-  "settings.general.row.reasoningSummaries.description": "عرض ملخصات استنتاج النموذج في الشريط الزمني",
  "settings.general.row.shellToolPartsExpanded.title": "توسيع أجزاء أداة shell",
  "settings.general.row.shellToolPartsExpanded.description":
    "إظهار أجزاء أداة shell موسعة بشكل افتراضي في الشريط الزمني",
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -104,7 +104,6 @@ export const dict = {
  "dialog.model.empty": "Nenhum resultado de modelo",
  "dialog.model.manage": "Gerenciar modelos",
  "dialog.model.manage.description": "Personalizar quais modelos aparecem no seletor de modelos.",
-  "dialog.model.manage.provider.toggle": "Alternar todos os modelos {{provider}}",
  "dialog.model.unpaid.freeModels.title": "Modelos gratuitos fornecidos pelo OpenCode",
  "dialog.model.unpaid.addMore.title": "Adicionar mais modelos de provedores populares",
  "dialog.provider.viewAll": "Ver mais provedores",
@@ -289,11 +288,6 @@ export const dict = {
  "dialog.server.add.error": "Não foi possível conectar ao servidor",
  "dialog.server.add.checking": "Verificando...",
  "dialog.server.add.button": "Adicionar",
-  "dialog.server.add.name": "Nome do servidor (opcional)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "Nome de usuário (opcional)",
-  "dialog.server.add.password": "Senha (opcional)",
-  "dialog.server.edit.title": "Editar servidor",
  "dialog.server.default.title": "Servidor padrão",
  "dialog.server.default.description":
    "Conectar a este servidor na inicialização do aplicativo ao invés de iniciar um servidor local. Requer reinicialização.",
@@ -365,7 +359,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",
  "toast.language.title": "Idioma",
  "toast.language.description": "Alterado para {{language}}",
  "toast.theme.title": "Tema alterado",
@@ -453,13 +446,9 @@ export const dict = {
  "session.review.change.other": "Alterações",
  "session.review.loadingChanges": "Carregando alterações...",
  "session.review.empty": "Nenhuma alteração nesta sessão ainda",
-  "session.review.noVcs": "Nenhum Sistema de Controle de Versão Git detectado, alterações não exibidas",
-  "session.review.noSnapshot":
-    "O rastreamento de snapshot está desabilitado na configuração, então as alterações da sessão estão indisponíveis",
  "session.review.noChanges": "Sem alterações",
  "session.files.selectToOpen": "Selecione um arquivo para abrir",
  "session.files.all": "Todos os arquivos",
-  "session.files.empty": "Nenhum arquivo",
  "session.files.binaryContent": "Arquivo binário (conteúdo não pode ser exibido)",
  "session.messages.renderEarlier": "Renderizar mensagens anteriores",
  "session.messages.loadingEarlier": "Carregando mensagens anteriores...",
@@ -470,17 +459,6 @@ export const dict = {
  "session.todo.title": "Tarefas",
  "session.todo.collapse": "Recolher",
  "session.todo.expand": "Expandir",
-  "session.followupDock.summary.one": "{{count}} mensagem na fila",
-  "session.followupDock.summary.other": "{{count}} mensagens na fila",
-  "session.followupDock.sendNow": "Enviar agora",
-  "session.followupDock.edit": "Editar",
-  "session.followupDock.collapse": "Recolher mensagens na fila",
-  "session.followupDock.expand": "Expandir mensagens na fila",
-  "session.revertDock.summary.one": "{{count}} mensagem revertida",
-  "session.revertDock.summary.other": "{{count}} mensagens revertidas",
-  "session.revertDock.collapse": "Recolher mensagens revertidas",
-  "session.revertDock.expand": "Expandir mensagens revertidas",
-  "session.revertDock.restore": "Restaurar mensagem",
  "session.new.title": "Crie qualquer coisa",
  "session.new.worktree.main": "Branch principal",
  "session.new.worktree.mainWithBranch": "Branch principal ({{branch}})",
@@ -566,19 +544,10 @@ export const dict = {
  "settings.general.row.language.description": "Alterar o idioma de exibição do OpenCode",
  "settings.general.row.appearance.title": "Aparência",
  "settings.general.row.appearance.description": "Personalize como o OpenCode aparece no seu dispositivo",
-  "settings.general.row.colorScheme.title": "Esquema de cores",
-  "settings.general.row.colorScheme.description": "Escolha se o OpenCode segue o tema do sistema, claro ou escuro",
  "settings.general.row.theme.title": "Tema",
  "settings.general.row.theme.description": "Personalize como o OpenCode é tematizado.",
  "settings.general.row.font.title": "Fonte",
  "settings.general.row.font.description": "Personalize a fonte monoespaçada usada em blocos de código",
-  "settings.general.row.followup.title": "Comportamento de acompanhamento",
-  "settings.general.row.followup.description":
-    "Escolha se os prompts de acompanhamento orientam imediatamente ou esperam na fila",
-  "settings.general.row.followup.option.queue": "Fila",
-  "settings.general.row.followup.option.steer": "Orientar",
-  "settings.general.row.reasoningSummaries.title": "Mostrar resumos de raciocínio",
-  "settings.general.row.reasoningSummaries.description": "Exibir resumos de raciocínio do modelo na linha do tempo",
  "settings.general.row.shellToolPartsExpanded.title": "Expandir partes da ferramenta shell",
  "settings.general.row.shellToolPartsExpanded.description":
    "Mostrar partes da ferramenta shell expandidas por padrão na linha do tempo",
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -113,7 +113,6 @@ export const dict = {
  "dialog.model.empty": "Nema rezultata za modele",
  "dialog.model.manage": "Upravljaj modelima",
  "dialog.model.manage.description": "Prilagodi koji se modeli prikazuju u izborniku modela.",
-  "dialog.model.manage.provider.toggle": "Uključi/isključi sve {{provider}} modele",

  "dialog.model.unpaid.freeModels.title": "Besplatni modeli koje obezbjeđuje OpenCode",
  "dialog.model.unpaid.addMore.title": "Dodaj još modela od popularnih provajdera",
@@ -316,11 +315,6 @@ export const dict = {
  "dialog.server.add.error": "Nije moguće povezati se na server",
  "dialog.server.add.checking": "Provjera...",
  "dialog.server.add.button": "Dodaj server",
-  "dialog.server.add.name": "Ime servera (opcionalno)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "Korisničko ime (opcionalno)",
-  "dialog.server.add.password": "Lozinka (opcionalno)",
-  "dialog.server.edit.title": "Uredi server",
  "dialog.server.default.title": "Podrazumijevani server",
  "dialog.server.default.description":
    "Poveži se na ovaj server pri pokretanju aplikacije umjesto pokretanja lokalnog servera. Potreban je restart.",
@@ -399,7 +393,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",

  "toast.language.title": "Jezik",
  "toast.language.description": "Prebačeno na {{language}}",
@@ -505,14 +498,10 @@ export const dict = {
  "session.review.change.other": "Izmjene",
  "session.review.loadingChanges": "Učitavanje izmjena...",
  "session.review.empty": "Još nema izmjena u ovoj sesiji",
-  "session.review.noVcs": "Nije detektovan Git sistem kontrole verzija, promjene se ne prikazuju",
-  "session.review.noSnapshot":
-    "Praćenje snimaka (snapshot) je onemogućeno u konfiguraciji, pa promjene sesije nisu dostupne",
  "session.review.noChanges": "Nema izmjena",

  "session.files.selectToOpen": "Odaberi datoteku za otvaranje",
  "session.files.all": "Sve datoteke",
-  "session.files.empty": "Nema datoteka",
  "session.files.binaryContent": "Binarna datoteka (sadržaj se ne može prikazati)",

  "session.messages.renderEarlier": "Prikaži ranije poruke",
@@ -525,17 +514,6 @@ export const dict = {
  "session.todo.title": "Zadaci",
  "session.todo.collapse": "Sažmi",
  "session.todo.expand": "Proširi",
-  "session.followupDock.summary.one": "{{count}} poruka na čekanju",
-  "session.followupDock.summary.other": "{{count}} poruka na čekanju",
-  "session.followupDock.sendNow": "Pošalji sada",
-  "session.followupDock.edit": "Uredi",
-  "session.followupDock.collapse": "Sažmi poruke na čekanju",
-  "session.followupDock.expand": "Proširi poruke na čekanju",
-  "session.revertDock.summary.one": "{{count}} vraćena poruka",
-  "session.revertDock.summary.other": "{{count}} vraćenih poruka",
-  "session.revertDock.collapse": "Sažmi vraćene poruke",
-  "session.revertDock.expand": "Proširi vraćene poruke",
-  "session.revertDock.restore": "Vrati poruku",

  "session.new.title": "Napravi bilo šta",
  "session.new.worktree.main": "Glavna grana",
@@ -631,18 +609,10 @@ export const dict = {
  "settings.general.row.language.description": "Promijeni jezik prikaza u OpenCode-u",
  "settings.general.row.appearance.title": "Izgled",
  "settings.general.row.appearance.description": "Prilagodi kako OpenCode izgleda na tvom uređaju",
-  "settings.general.row.colorScheme.title": "Šema boja",
-  "settings.general.row.colorScheme.description": "Odaberi da li OpenCode prati sistemsku, svijetlu ili tamnu temu",
  "settings.general.row.theme.title": "Tema",
  "settings.general.row.theme.description": "Prilagodi temu OpenCode-a.",
  "settings.general.row.font.title": "Font",
  "settings.general.row.font.description": "Prilagodi monospace font koji se koristi u blokovima koda",
-  "settings.general.row.followup.title": "Ponašanje nadovezivanja",
-  "settings.general.row.followup.description": "Odaberi da li upiti nadovezivanja usmjeravaju odmah ili čekaju u redu",
-  "settings.general.row.followup.option.queue": "Red čekanja",
-  "settings.general.row.followup.option.steer": "Usmjeri",
-  "settings.general.row.reasoningSummaries.title": "Prikaži sažetke rasuđivanja",
-  "settings.general.row.reasoningSummaries.description": "Prikaži sažetke rasuđivanja modela na vremenskoj traci",

  "settings.general.row.shellToolPartsExpanded.title": "Proširi dijelove shell alata",
  "settings.general.row.shellToolPartsExpanded.description":
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -113,7 +113,6 @@ export const dict = {
  "dialog.model.empty": "Ingen modeller fundet",
  "dialog.model.manage": "Administrer modeller",
  "dialog.model.manage.description": "Tilpas hvilke modeller der vises i modelvælgeren.",
-  "dialog.model.manage.provider.toggle": "Skift alle {{provider}}-modeller",

  "dialog.model.unpaid.freeModels.title": "Gratis modeller leveret af OpenCode",
  "dialog.model.unpaid.addMore.title": "Tilføj flere modeller fra populære udbydere",
@@ -314,11 +313,6 @@ export const dict = {
  "dialog.server.add.error": "Kunne ikke forbinde til server",
  "dialog.server.add.checking": "Tjekker...",
  "dialog.server.add.button": "Tilføj server",
-  "dialog.server.add.name": "Servernavn (valgfrit)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "Brugernavn (valgfrit)",
-  "dialog.server.add.password": "Adgangskode (valgfrit)",
-  "dialog.server.edit.title": "Rediger server",
  "dialog.server.default.title": "Standardserver",
  "dialog.server.default.description":
    "Forbind til denne server ved start af app i stedet for at starte en lokal server. Kræver genstart.",
@@ -397,7 +391,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",

  "toast.language.title": "Sprog",
  "toast.language.description": "Skiftede til {{language}}",
@@ -502,13 +495,9 @@ export const dict = {
  "session.review.change.other": "Ændringer",
  "session.review.loadingChanges": "Indlæser ændringer...",
  "session.review.empty": "Ingen ændringer i denne session endnu",
-  "session.review.noVcs": "Intet Git versionsstyringssystem fundet, ændringer vises ikke",
-  "session.review.noSnapshot":
-    "Snapshot-sporing er deaktiveret i konfigurationen, så sessionsændringer er ikke tilgængelige",
  "session.review.noChanges": "Ingen ændringer",
  "session.files.selectToOpen": "Vælg en fil at åbne",
  "session.files.all": "Alle filer",
-  "session.files.empty": "Ingen filer",
  "session.files.binaryContent": "Binær fil (indhold kan ikke vises)",
  "session.messages.renderEarlier": "Vis tidligere beskeder",
  "session.messages.loadingEarlier": "Indlæser tidligere beskeder...",
@@ -520,17 +509,6 @@ export const dict = {
  "session.todo.title": "Opgaver",
  "session.todo.collapse": "Skjul",
  "session.todo.expand": "Udvid",
-  "session.followupDock.summary.one": "{{count}} besked i kø",
-  "session.followupDock.summary.other": "{{count}} beskeder i kø",
-  "session.followupDock.sendNow": "Send nu",
-  "session.followupDock.edit": "Rediger",
-  "session.followupDock.collapse": "Skjul beskeder i kø",
-  "session.followupDock.expand": "Udvid beskeder i kø",
-  "session.revertDock.summary.one": "{{count}} tilbagerullet besked",
-  "session.revertDock.summary.other": "{{count}} tilbagerullede beskeder",
-  "session.revertDock.collapse": "Skjul tilbagerullede beskeder",
-  "session.revertDock.expand": "Udvid tilbagerullede beskeder",
-  "session.revertDock.restore": "Gendan besked",

  "session.new.title": "Byg hvad som helst",
  "session.new.worktree.main": "Hovedgren",
@@ -626,18 +604,10 @@ export const dict = {
  "settings.general.row.language.description": "Ændr visningssproget for OpenCode",
  "settings.general.row.appearance.title": "Udseende",
  "settings.general.row.appearance.description": "Tilpas hvordan OpenCode ser ud på din enhed",
-  "settings.general.row.colorScheme.title": "Farveskema",
-  "settings.general.row.colorScheme.description": "Vælg om OpenCode følger systemets, lyst eller mørkt tema",
  "settings.general.row.theme.title": "Tema",
  "settings.general.row.theme.description": "Tilpas hvordan OpenCode er temabestemt.",
  "settings.general.row.font.title": "Skrifttype",
  "settings.general.row.font.description": "Tilpas mono-skrifttypen brugt i kodeblokke",
-  "settings.general.row.followup.title": "Opfølgningsadfærd",
-  "settings.general.row.followup.description": "Vælg om opfølgende forespørgsler skal styre straks eller vente i kø",
-  "settings.general.row.followup.option.queue": "Kø",
-  "settings.general.row.followup.option.steer": "Styr",
-  "settings.general.row.reasoningSummaries.title": "Vis tænkeoversigter",
-  "settings.general.row.reasoningSummaries.description": "Vis model tænkeoversigter i tidslinjen",

  "settings.general.row.shellToolPartsExpanded.title": "Udvid shell-værktøjsdele",
  "settings.general.row.shellToolPartsExpanded.description": "Vis shell-værktøjsdele udvidet som standard i tidslinjen",
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -108,7 +108,6 @@ export const dict = {
  "dialog.model.empty": "Keine Modellergebnisse",
  "dialog.model.manage": "Modelle verwalten",
  "dialog.model.manage.description": "Anpassen, welche Modelle in der Modellauswahl erscheinen.",
-  "dialog.model.manage.provider.toggle": "Alle {{provider}}-Modelle umschalten",
  "dialog.model.unpaid.freeModels.title": "Kostenlose Modelle von OpenCode",
  "dialog.model.unpaid.addMore.title": "Weitere Modelle von beliebten Anbietern hinzufügen",
  "dialog.provider.viewAll": "Mehr Anbieter anzeigen",
@@ -295,11 +294,6 @@ export const dict = {
  "dialog.server.add.error": "Verbindung zum Server fehlgeschlagen",
  "dialog.server.add.checking": "Prüfen...",
  "dialog.server.add.button": "Server hinzufügen",
-  "dialog.server.add.name": "Servername (optional)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "Benutzername (optional)",
-  "dialog.server.add.password": "Passwort (optional)",
-  "dialog.server.edit.title": "Server bearbeiten",
  "dialog.server.default.title": "Standardserver",
  "dialog.server.default.description":
    "Beim App-Start mit diesem Server verbinden, anstatt einen lokalen Server zu starten. Erfordert Neustart.",
@@ -372,7 +366,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",
  "toast.language.title": "Sprache",
  "toast.language.description": "Zu {{language}} gewechselt",
  "toast.theme.title": "Thema gewechselt",
@@ -461,13 +454,9 @@ export const dict = {
  "session.review.change.other": "Änderungen",
  "session.review.loadingChanges": "Lade Änderungen...",
  "session.review.empty": "Noch keine Änderungen in dieser Sitzung",
-  "session.review.noVcs": "Kein Git-Versionskontrollsystem erkannt, Änderungen werden nicht angezeigt",
-  "session.review.noSnapshot":
-    "Snapshot-Tracking ist in der Konfiguration deaktiviert, daher sind Sitzungsänderungen nicht verfügbar",
  "session.review.noChanges": "Keine Änderungen",
  "session.files.selectToOpen": "Datei zum Öffnen auswählen",
  "session.files.all": "Alle Dateien",
-  "session.files.empty": "Keine Dateien",
  "session.files.binaryContent": "Binärdatei (Inhalt kann nicht angezeigt werden)",
  "session.messages.renderEarlier": "Frühere Nachrichten rendern",
  "session.messages.loadingEarlier": "Lade frühere Nachrichten...",
@@ -478,17 +467,6 @@ export const dict = {
  "session.todo.title": "Aufgaben",
  "session.todo.collapse": "Einklappen",
  "session.todo.expand": "Ausklappen",
-  "session.followupDock.summary.one": "{{count}} Nachricht in der Warteschlange",
-  "session.followupDock.summary.other": "{{count}} Nachrichten in der Warteschlange",
-  "session.followupDock.sendNow": "Jetzt senden",
-  "session.followupDock.edit": "Bearbeiten",
-  "session.followupDock.collapse": "Warteschlange einklappen",
-  "session.followupDock.expand": "Warteschlange ausklappen",
-  "session.revertDock.summary.one": "{{count}} zurückgesetzte Nachricht",
-  "session.revertDock.summary.other": "{{count}} zurückgesetzte Nachrichten",
-  "session.revertDock.collapse": "Zurückgesetzte Nachrichten einklappen",
-  "session.revertDock.expand": "Zurückgesetzte Nachrichten ausklappen",
-  "session.revertDock.restore": "Nachricht wiederherstellen",
  "session.new.title": "Baue, was du willst",
  "session.new.worktree.main": "Haupt-Branch",
  "session.new.worktree.mainWithBranch": "Haupt-Branch ({{branch}})",
@@ -575,21 +553,10 @@ export const dict = {
  "settings.general.row.language.description": "Die Anzeigesprache für OpenCode ändern",
  "settings.general.row.appearance.title": "Erscheinungsbild",
  "settings.general.row.appearance.description": "Anpassen, wie OpenCode auf Ihrem Gerät aussieht",
-  "settings.general.row.colorScheme.title": "Farbschema",
-  "settings.general.row.colorScheme.description":
-    "Wählen Sie, ob OpenCode dem System-, hellen oder dunklen Thema folgt",
  "settings.general.row.theme.title": "Thema",
  "settings.general.row.theme.description": "Das Thema von OpenCode anpassen.",
  "settings.general.row.font.title": "Schriftart",
  "settings.general.row.font.description": "Die in Codeblöcken verwendete Monospace-Schriftart anpassen",
-  "settings.general.row.followup.title": "Verhalten bei Folgefragen",
-  "settings.general.row.followup.description":
-    "Wählen Sie, ob Folgefragen sofort steuern oder in einer Warteschlange warten",
-  "settings.general.row.followup.option.queue": "Warteschlange",
-  "settings.general.row.followup.option.steer": "Steuern",
-  "settings.general.row.reasoningSummaries.title": "Reasoning-Zusammenfassungen anzeigen",
-  "settings.general.row.reasoningSummaries.description":
-    "Zusammenfassungen des Modell-Reasonings in der Timeline anzeigen",
  "settings.general.row.shellToolPartsExpanded.title": "Shell-Tool-Abschnitte ausklappen",
  "settings.general.row.shellToolPartsExpanded.description":
    "Shell-Tool-Abschnitte standardmäßig in der Timeline ausgeklappt anzeigen",
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -530,12 +530,6 @@ export const dict = {
  "session.todo.title": "Todos",
  "session.todo.collapse": "Collapse",
  "session.todo.expand": "Expand",
-  "session.followupDock.summary.one": "{{count}} queued message",
-  "session.followupDock.summary.other": "{{count}} queued messages",
-  "session.followupDock.sendNow": "Send now",
-  "session.followupDock.edit": "Edit",
-  "session.followupDock.collapse": "Collapse queued messages",
-  "session.followupDock.expand": "Expand queued messages",
  "session.revertDock.summary.one": "{{count}} rolled back message",
  "session.revertDock.summary.other": "{{count}} rolled back messages",
  "session.revertDock.collapse": "Collapse rolled back messages",
@@ -644,16 +638,10 @@ export const dict = {
  "settings.general.row.language.description": "Change the display language for OpenCode",
  "settings.general.row.appearance.title": "Appearance",
  "settings.general.row.appearance.description": "Customise how OpenCode looks on your device",
-  "settings.general.row.colorScheme.title": "Color scheme",
-  "settings.general.row.colorScheme.description": "Choose whether OpenCode follows the system, light, or dark theme",
  "settings.general.row.theme.title": "Theme",
  "settings.general.row.theme.description": "Customise how OpenCode is themed.",
  "settings.general.row.font.title": "Font",
  "settings.general.row.font.description": "Customise the mono font used in code blocks",
-  "settings.general.row.followup.title": "Follow-up behavior",
-  "settings.general.row.followup.description": "Choose whether follow-up prompts steer immediately or wait in a queue",
-  "settings.general.row.followup.option.queue": "Queue",
-  "settings.general.row.followup.option.steer": "Steer",
  "settings.general.row.reasoningSummaries.title": "Show reasoning summaries",
  "settings.general.row.reasoningSummaries.description": "Display model reasoning summaries in the timeline",
  "settings.general.row.shellToolPartsExpanded.title": "Expand shell tool parts",
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -113,7 +113,6 @@ export const dict = {
  "dialog.model.empty": "Sin resultados de modelos",
  "dialog.model.manage": "Gestionar modelos",
  "dialog.model.manage.description": "Personalizar qué modelos aparecen en el selector de modelos.",
-  "dialog.model.manage.provider.toggle": "Alternar todos los modelos de {{provider}}",

  "dialog.model.unpaid.freeModels.title": "Modelos gratuitos proporcionados por OpenCode",
  "dialog.model.unpaid.addMore.title": "Añadir más modelos de proveedores populares",
@@ -315,11 +314,6 @@ export const dict = {
  "dialog.server.add.error": "No se pudo conectar al servidor",
  "dialog.server.add.checking": "Comprobando...",
  "dialog.server.add.button": "Añadir servidor",
-  "dialog.server.add.name": "Nombre del servidor (opcional)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "Nombre de usuario (opcional)",
-  "dialog.server.add.password": "Contraseña (opcional)",
-  "dialog.server.edit.title": "Editar servidor",
  "dialog.server.default.title": "Servidor predeterminado",
  "dialog.server.default.description":
    "Conectar a este servidor al iniciar la app en lugar de iniciar un servidor local. Requiere reinicio.",
@@ -399,7 +393,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",

  "toast.language.title": "Idioma",
  "toast.language.description": "Cambiado a {{language}}",
@@ -506,14 +499,10 @@ export const dict = {
  "session.review.change.other": "Cambios",
  "session.review.loadingChanges": "Cargando cambios...",
  "session.review.empty": "No hay cambios en esta sesión aún",
-  "session.review.noVcs": "No se detectó Sistema de Control de Versiones Git, los cambios no se muestran",
-  "session.review.noSnapshot":
-    "El seguimiento de instantáneas está deshabilitado en la configuración, por lo que los cambios de sesión no están disponibles",
  "session.review.noChanges": "Sin cambios",

  "session.files.selectToOpen": "Selecciona un archivo para abrir",
  "session.files.all": "Todos los archivos",
-  "session.files.empty": "Sin archivos",
  "session.files.binaryContent": "Archivo binario (el contenido no puede ser mostrado)",

  "session.messages.renderEarlier": "Renderizar mensajes anteriores",
@@ -526,17 +515,6 @@ export const dict = {
  "session.todo.title": "Tareas",
  "session.todo.collapse": "Contraer",
  "session.todo.expand": "Expandir",
-  "session.followupDock.summary.one": "{{count}} mensaje en cola",
-  "session.followupDock.summary.other": "{{count}} mensajes en cola",
-  "session.followupDock.sendNow": "Enviar ahora",
-  "session.followupDock.edit": "Editar",
-  "session.followupDock.collapse": "Contraer mensajes en cola",
-  "session.followupDock.expand": "Expandir mensajes en cola",
-  "session.revertDock.summary.one": "{{count}} mensaje revertido",
-  "session.revertDock.summary.other": "{{count}} mensajes revertidos",
-  "session.revertDock.collapse": "Contraer mensajes revertidos",
-  "session.revertDock.expand": "Expandir mensajes revertidos",
-  "session.revertDock.restore": "Restaurar mensaje",

  "session.new.title": "Construye lo que quieras",
  "session.new.worktree.main": "Rama principal",
@@ -634,20 +612,11 @@ export const dict = {
  "settings.general.row.language.description": "Cambiar el idioma de visualización para OpenCode",
  "settings.general.row.appearance.title": "Apariencia",
  "settings.general.row.appearance.description": "Personaliza cómo se ve OpenCode en tu dispositivo",
-  "settings.general.row.colorScheme.title": "Esquema de color",
-  "settings.general.row.colorScheme.description": "Elige si OpenCode sigue el tema del sistema, claro u oscuro",
  "settings.general.row.theme.title": "Tema",
  "settings.general.row.theme.description": "Personaliza el tema de OpenCode.",
  "settings.general.row.font.title": "Fuente",
  "settings.general.row.font.description": "Personaliza la fuente monoespaciada usada en bloques de código",
-  "settings.general.row.followup.title": "Comportamiento de seguimiento",
-  "settings.general.row.followup.description":
-    "Elige si los prompts de seguimiento se dirigen inmediatamente o esperan en una cola",
-  "settings.general.row.followup.option.queue": "Cola",
-  "settings.general.row.followup.option.steer": "Dirigir",
-  "settings.general.row.reasoningSummaries.title": "Mostrar resúmenes de razonamiento",
-  "settings.general.row.reasoningSummaries.description":
-    "Mostrar resúmenes del razonamiento del modelo en la línea de tiempo",
+
  "settings.general.row.shellToolPartsExpanded.title": "Expandir partes de la herramienta shell",
  "settings.general.row.shellToolPartsExpanded.description":
    "Mostrar las partes de la herramienta shell expandidas por defecto en la línea de tiempo",
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -104,7 +104,6 @@ export const dict = {
  "dialog.model.empty": "Aucun résultat de modèle",
  "dialog.model.manage": "Gérer les modèles",
  "dialog.model.manage.description": "Personnalisez les modèles qui apparaissent dans le sélecteur.",
-  "dialog.model.manage.provider.toggle": "Basculer tous les modèles {{provider}}",
  "dialog.model.unpaid.freeModels.title": "Modèles gratuits fournis par OpenCode",
  "dialog.model.unpaid.addMore.title": "Ajouter plus de modèles de fournisseurs populaires",
  "dialog.provider.viewAll": "Voir plus de fournisseurs",
@@ -289,11 +288,6 @@ export const dict = {
  "dialog.server.add.error": "Impossible de se connecter au serveur",
  "dialog.server.add.checking": "Vérification...",
  "dialog.server.add.button": "Ajouter un serveur",
-  "dialog.server.add.name": "Nom du serveur (optionnel)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "Nom d'utilisateur (optionnel)",
-  "dialog.server.add.password": "Mot de passe (optionnel)",
-  "dialog.server.edit.title": "Modifier le serveur",
  "dialog.server.default.title": "Serveur par défaut",
  "dialog.server.default.description":
    "Se connecter à ce serveur au lancement de l'application au lieu de démarrer un serveur local. Nécessite un redémarrage.",
@@ -366,7 +360,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",
  "toast.language.title": "Langue",
  "toast.language.description": "Passé à {{language}}",
  "toast.theme.title": "Thème changé",
@@ -458,12 +451,8 @@ export const dict = {
  "session.review.loadingChanges": "Chargement des modifications...",
  "session.review.empty": "Aucune modification dans cette session pour l'instant",
  "session.review.noChanges": "Aucune modification",
-  "session.review.noVcs": "Aucun système de contrôle de version Git détecté, modifications non affichées",
-  "session.review.noSnapshot":
-    "Le suivi des instantanés est désactivé dans la configuration, les modifications de session sont donc indisponibles",
  "session.files.selectToOpen": "Sélectionnez un fichier à ouvrir",
  "session.files.all": "Tous les fichiers",
-  "session.files.empty": "Aucun fichier",
  "session.files.binaryContent": "Fichier binaire (le contenu ne peut pas être affiché)",
  "session.messages.renderEarlier": "Afficher les messages précédents",
  "session.messages.loadingEarlier": "Chargement des messages précédents...",
@@ -474,17 +463,6 @@ export const dict = {
  "session.todo.title": "Tâches",
  "session.todo.collapse": "Réduire",
  "session.todo.expand": "Développer",
-  "session.followupDock.summary.one": "{{count}} message en file d'attente",
-  "session.followupDock.summary.other": "{{count}} messages en file d'attente",
-  "session.followupDock.sendNow": "Envoyer maintenant",
-  "session.followupDock.edit": "Modifier",
-  "session.followupDock.collapse": "Réduire les messages en file d'attente",
-  "session.followupDock.expand": "Développer les messages en file d'attente",
-  "session.revertDock.summary.one": "{{count}} message annulé",
-  "session.revertDock.summary.other": "{{count}} messages annulés",
-  "session.revertDock.collapse": "Réduire les messages annulés",
-  "session.revertDock.expand": "Développer les messages annulés",
-  "session.revertDock.restore": "Restaurer le message",
  "session.new.title": "Créez ce que vous voulez",
  "session.new.worktree.main": "Branche principale",
  "session.new.worktree.mainWithBranch": "Branche principale ({{branch}})",
@@ -572,20 +550,10 @@ export const dict = {
  "settings.general.row.language.description": "Changer la langue d'affichage pour OpenCode",
  "settings.general.row.appearance.title": "Apparence",
  "settings.general.row.appearance.description": "Personnaliser l'apparence d'OpenCode sur votre appareil",
-  "settings.general.row.colorScheme.title": "Schéma de couleurs",
-  "settings.general.row.colorScheme.description": "Choisissez si OpenCode suit le thème système, clair ou sombre",
  "settings.general.row.theme.title": "Thème",
  "settings.general.row.theme.description": "Personnaliser le thème d'OpenCode.",
  "settings.general.row.font.title": "Police",
  "settings.general.row.font.description": "Personnaliser la police mono utilisée dans les blocs de code",
-  "settings.general.row.followup.title": "Comportement de suivi",
-  "settings.general.row.followup.description":
-    "Choisissez si les messages de suivi dirigent immédiatement ou attendent dans une file d'attente",
-  "settings.general.row.followup.option.queue": "File d'attente",
-  "settings.general.row.followup.option.steer": "Diriger",
-  "settings.general.row.reasoningSummaries.title": "Afficher les résumés de raisonnement",
-  "settings.general.row.reasoningSummaries.description":
-    "Afficher les résumés de raisonnement du modèle dans la chronologie",
  "settings.general.row.shellToolPartsExpanded.title": "Développer les parties de l'outil shell",
  "settings.general.row.shellToolPartsExpanded.description":
    "Afficher les parties de l'outil shell développées par défaut dans la chronologie",
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -104,7 +104,6 @@ export const dict = {
  "dialog.model.empty": "モデルが見つかりません",
  "dialog.model.manage": "モデルを管理",
  "dialog.model.manage.description": "モデルセレクターに表示するモデルをカスタマイズします。",
-  "dialog.model.manage.provider.toggle": "すべての{{provider}}モデルを切り替え",
  "dialog.model.unpaid.freeModels.title": "OpenCodeが提供する無料モデル",
  "dialog.model.unpaid.addMore.title": "人気のプロバイダーからモデルを追加",
  "dialog.provider.viewAll": "さらにプロバイダーを表示",
@@ -288,11 +287,6 @@ export const dict = {
  "dialog.server.add.error": "サーバーに接続できませんでした",
  "dialog.server.add.checking": "確認中...",
  "dialog.server.add.button": "サーバーを追加",
-  "dialog.server.add.name": "サーバー名 (オプション)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "ユーザー名 (オプション)",
-  "dialog.server.add.password": "パスワード (オプション)",
-  "dialog.server.edit.title": "サーバーを編集",
  "dialog.server.default.title": "デフォルトサーバー",
  "dialog.server.default.description":
    "ローカルサーバーを起動する代わりに、アプリ起動時にこのサーバーに接続します。再起動が必要です。",
@@ -364,7 +358,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",
  "toast.language.title": "言語",
  "toast.language.description": "{{language}}に切り替えました",
  "toast.theme.title": "テーマが切り替わりました",
@@ -451,12 +444,9 @@ export const dict = {
  "session.review.change.other": "変更",
  "session.review.loadingChanges": "変更を読み込み中...",
  "session.review.empty": "このセッションでの変更はまだありません",
-  "session.review.noVcs": "Gitバージョン管理システムが検出されないため、変更は表示されません",
-  "session.review.noSnapshot": "設定でスナップショット追跡が無効になっているため、セッションの変更は利用できません",
  "session.review.noChanges": "変更なし",
  "session.files.selectToOpen": "開くファイルを選択",
  "session.files.all": "すべてのファイル",
-  "session.files.empty": "ファイルなし",
  "session.files.binaryContent": "バイナリファイル（内容を表示できません）",
  "session.messages.renderEarlier": "以前のメッセージを表示",
  "session.messages.loadingEarlier": "以前のメッセージを読み込み中...",
@@ -467,17 +457,6 @@ export const dict = {
  "session.todo.title": "ToDo",
  "session.todo.collapse": "折りたたむ",
  "session.todo.expand": "展開",
-  "session.followupDock.summary.one": "{{count}} 件のメッセージが待機中",
-  "session.followupDock.summary.other": "{{count}} 件のメッセージが待機中",
-  "session.followupDock.sendNow": "今すぐ送信",
-  "session.followupDock.edit": "編集",
-  "session.followupDock.collapse": "待機中のメッセージを折りたたむ",
-  "session.followupDock.expand": "待機中のメッセージを展開",
-  "session.revertDock.summary.one": "{{count}} 件のロールバックされたメッセージ",
-  "session.revertDock.summary.other": "{{count}} 件のロールバックされたメッセージ",
-  "session.revertDock.collapse": "ロールバックされたメッセージを折りたたむ",
-  "session.revertDock.expand": "ロールバックされたメッセージを展開",
-  "session.revertDock.restore": "メッセージを復元",
  "session.new.title": "何でも作る",
  "session.new.worktree.main": "メインブランチ",
  "session.new.worktree.mainWithBranch": "メインブランチ ({{branch}})",
@@ -563,19 +542,10 @@ export const dict = {
  "settings.general.row.language.description": "OpenCodeの表示言語を変更します",
  "settings.general.row.appearance.title": "外観",
  "settings.general.row.appearance.description": "デバイスでのOpenCodeの表示をカスタマイズします",
-  "settings.general.row.colorScheme.title": "配色",
-  "settings.general.row.colorScheme.description": "OpenCodeがシステム、ライト、またはダークテーマに従うかを選択します",
  "settings.general.row.theme.title": "テーマ",
  "settings.general.row.theme.description": "OpenCodeのテーマをカスタマイズします。",
  "settings.general.row.font.title": "フォント",
  "settings.general.row.font.description": "コードブロックで使用する等幅フォントをカスタマイズします",
-  "settings.general.row.followup.title": "フォローアップの動作",
-  "settings.general.row.followup.description":
-    "フォローアッププロンプトを即座に実行するか、キューで待機させるかを選択します",
-  "settings.general.row.followup.option.queue": "キューに追加",
-  "settings.general.row.followup.option.steer": "即座に実行 (Steer)",
-  "settings.general.row.reasoningSummaries.title": "推論の要約を表示",
-  "settings.general.row.reasoningSummaries.description": "タイムラインにモデルの推論の要約を表示します",
  "settings.general.row.shellToolPartsExpanded.title": "shell ツールパーツを展開",
  "settings.general.row.shellToolPartsExpanded.description":
    "タイムラインで shell ツールパーツをデフォルトで展開して表示します",
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -108,7 +108,6 @@ export const dict = {
  "dialog.model.empty": "모델 결과 없음",
  "dialog.model.manage": "모델 관리",
  "dialog.model.manage.description": "모델 선택기에 표시할 모델 사용자 지정",
-  "dialog.model.manage.provider.toggle": "모든 {{provider}} 모델 토글",
  "dialog.model.unpaid.freeModels.title": "OpenCode에서 제공하는 무료 모델",
  "dialog.model.unpaid.addMore.title": "인기 공급자의 모델 추가",
  "dialog.provider.viewAll": "더 많은 공급자 보기",
@@ -292,11 +291,6 @@ export const dict = {
  "dialog.server.add.error": "서버에 연결할 수 없습니다",
  "dialog.server.add.checking": "확인 중...",
  "dialog.server.add.button": "서버 추가",
-  "dialog.server.add.name": "서버 이름 (선택 사항)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "사용자 이름 (선택 사항)",
-  "dialog.server.add.password": "비밀번호 (선택 사항)",
-  "dialog.server.edit.title": "서버 편집",
  "dialog.server.default.title": "기본 서버",
  "dialog.server.default.description":
    "로컬 서버를 시작하는 대신 앱 실행 시 이 서버에 연결합니다. 다시 시작해야 합니다.",
@@ -367,7 +361,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",
  "toast.language.title": "언어",
  "toast.language.description": "{{language}}(으)로 전환됨",
  "toast.theme.title": "테마 전환됨",
@@ -453,12 +446,9 @@ export const dict = {
  "session.review.change.other": "변경",
  "session.review.loadingChanges": "변경 사항 로드 중...",
  "session.review.empty": "이 세션에 변경 사항이 아직 없습니다",
-  "session.review.noVcs": "Git 버전 관리 시스템이 감지되지 않아 변경 사항이 표시되지 않습니다",
-  "session.review.noSnapshot": "구성에서 스냅샷 추적이 비활성화되어 있어 세션 변경 사항을 사용할 수 없습니다",
  "session.review.noChanges": "변경 없음",
  "session.files.selectToOpen": "열 파일을 선택하세요",
  "session.files.all": "모든 파일",
-  "session.files.empty": "파일 없음",
  "session.files.binaryContent": "바이너리 파일 (내용을 표시할 수 없음)",
  "session.messages.renderEarlier": "이전 메시지 렌더링",
  "session.messages.loadingEarlier": "이전 메시지 로드 중...",
@@ -469,17 +459,6 @@ export const dict = {
  "session.todo.title": "할 일",
  "session.todo.collapse": "접기",
  "session.todo.expand": "펼치기",
-  "session.followupDock.summary.one": "{{count}}개의 대기 중인 메시지",
-  "session.followupDock.summary.other": "{{count}}개의 대기 중인 메시지",
-  "session.followupDock.sendNow": "지금 전송",
-  "session.followupDock.edit": "편집",
-  "session.followupDock.collapse": "대기 중인 메시지 접기",
-  "session.followupDock.expand": "대기 중인 메시지 펼치기",
-  "session.revertDock.summary.one": "{{count}}개의 롤백된 메시지",
-  "session.revertDock.summary.other": "{{count}}개의 롤백된 메시지",
-  "session.revertDock.collapse": "롤백된 메시지 접기",
-  "session.revertDock.expand": "롤백된 메시지 펼치기",
-  "session.revertDock.restore": "메시지 복원",
  "session.new.title": "무엇이든 만들기",
  "session.new.worktree.main": "메인 브랜치",
  "session.new.worktree.mainWithBranch": "메인 브랜치 ({{branch}})",
@@ -564,18 +543,10 @@ export const dict = {
  "settings.general.row.language.description": "OpenCode 표시 언어 변경",
  "settings.general.row.appearance.title": "모양",
  "settings.general.row.appearance.description": "기기에서 OpenCode가 보이는 방식 사용자 지정",
-  "settings.general.row.colorScheme.title": "색상 테마",
-  "settings.general.row.colorScheme.description": "OpenCode가 시스템, 라이트 또는 다크 테마를 따를지 선택하세요",
  "settings.general.row.theme.title": "테마",
  "settings.general.row.theme.description": "OpenCode 테마 사용자 지정",
  "settings.general.row.font.title": "글꼴",
  "settings.general.row.font.description": "코드 블록에 사용되는 고정폭 글꼴 사용자 지정",
-  "settings.general.row.followup.title": "후속 조치 동작",
-  "settings.general.row.followup.description": "후속 프롬프트를 즉시 실행할지 대기열에 넣을지 선택하세요",
-  "settings.general.row.followup.option.queue": "대기열",
-  "settings.general.row.followup.option.steer": "조종",
-  "settings.general.row.reasoningSummaries.title": "추론 요약 표시",
-  "settings.general.row.reasoningSummaries.description": "타임라인에 모델 추론 요약 표시",
  "settings.general.row.shellToolPartsExpanded.title": "shell 도구 파트 펼치기",
  "settings.general.row.shellToolPartsExpanded.description":
    "타임라인에서 기본적으로 shell 도구 파트를 펼친 상태로 표시합니다",
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -116,7 +116,6 @@ export const dict = {
  "dialog.model.empty": "Ingen modellresultater",
  "dialog.model.manage": "Administrer modeller",
  "dialog.model.manage.description": "Tilpass hvilke modeller som vises i modellvelgeren.",
-  "dialog.model.manage.provider.toggle": "Veksle alle {{provider}}-modeller",

  "dialog.model.unpaid.freeModels.title": "Gratis modeller levert av OpenCode",
  "dialog.model.unpaid.addMore.title": "Legg til flere modeller fra populære leverandører",
@@ -217,7 +216,7 @@ export const dict = {

  "common.search.placeholder": "Søk",
  "common.goBack": "Gå tilbake",
-  "common.goForward": "Gå frem",
+  "common.goForward": "Navigate forward",
  "common.loading": "Laster",
  "common.loading.ellipsis": "...",
  "common.cancel": "Avbryt",
@@ -318,11 +317,6 @@ export const dict = {
  "dialog.server.add.error": "Kunne ikke koble til server",
  "dialog.server.add.checking": "Sjekker...",
  "dialog.server.add.button": "Legg til server",
-  "dialog.server.add.name": "Servernavn (valgfritt)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "Brukernavn (valgfritt)",
-  "dialog.server.add.password": "Passord (valgfritt)",
-  "dialog.server.edit.title": "Rediger server",
  "dialog.server.default.title": "Standardserver",
  "dialog.server.default.description":
    "Koble til denne serveren ved oppstart i stedet for å starte en lokal server. Krever omstart.",
@@ -400,7 +394,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",

  "toast.language.title": "Språk",
  "toast.language.description": "Byttet til {{language}}",
@@ -506,14 +499,10 @@ export const dict = {
  "session.review.change.other": "Endringer",
  "session.review.loadingChanges": "Laster endringer...",
  "session.review.empty": "Ingen endringer i denne sesjonen ennå",
-  "session.review.noVcs": "Ingen Git-versjonskontrollsystem oppdaget, endringer vises ikke",
-  "session.review.noSnapshot":
-    "Snapshot-sporing er deaktivert i konfigurasjonen, så sesjonsendringer er ikke tilgjengelige",
  "session.review.noChanges": "Ingen endringer",

  "session.files.selectToOpen": "Velg en fil å åpne",
  "session.files.all": "Alle filer",
-  "session.files.empty": "Ingen filer",
  "session.files.binaryContent": "Binær fil (innhold kan ikke vises)",

  "session.messages.renderEarlier": "Vis tidligere meldinger",
@@ -526,17 +515,6 @@ export const dict = {
  "session.todo.title": "Oppgaver",
  "session.todo.collapse": "Skjul",
  "session.todo.expand": "Utvid",
-  "session.followupDock.summary.one": "{{count}} melding i kø",
-  "session.followupDock.summary.other": "{{count}} meldinger i kø",
-  "session.followupDock.sendNow": "Send nå",
-  "session.followupDock.edit": "Rediger",
-  "session.followupDock.collapse": "Skjul meldinger i kø",
-  "session.followupDock.expand": "Utvid meldinger i kø",
-  "session.revertDock.summary.one": "{{count}} tilbakestilt melding",
-  "session.revertDock.summary.other": "{{count}} tilbakestilte meldinger",
-  "session.revertDock.collapse": "Skjul tilbakestilte meldinger",
-  "session.revertDock.expand": "Utvid tilbakestilte meldinger",
-  "session.revertDock.restore": "Gjenopprett melding",

  "session.new.title": "Bygg hva som helst",
  "session.new.worktree.main": "Hovedgren",
@@ -634,18 +612,11 @@ export const dict = {
  "settings.general.row.language.description": "Endre visningsspråket for OpenCode",
  "settings.general.row.appearance.title": "Utseende",
  "settings.general.row.appearance.description": "Tilpass hvordan OpenCode ser ut på enheten din",
-  "settings.general.row.colorScheme.title": "Fargevalg",
-  "settings.general.row.colorScheme.description": "Velg om OpenCode skal følge systemets, lyst eller mørkt tema",
  "settings.general.row.theme.title": "Tema",
  "settings.general.row.theme.description": "Tilpass hvordan OpenCode er tematisert.",
  "settings.general.row.font.title": "Skrift",
  "settings.general.row.font.description": "Tilpass mono-skriften som brukes i kodeblokker",
-  "settings.general.row.followup.title": "Oppfølgingsadferd",
-  "settings.general.row.followup.description": "Velg om oppfølgingsspørsmål skal kjøres umiddelbart eller vente i kø",
-  "settings.general.row.followup.option.queue": "Kø",
-  "settings.general.row.followup.option.steer": "Styr",
-  "settings.general.row.reasoningSummaries.title": "Vis resonneringssammendrag",
-  "settings.general.row.reasoningSummaries.description": "Vis sammendrag av modellresonnering i tidslinjen",
+
  "settings.general.row.shellToolPartsExpanded.title": "Utvid shell-verktøydeler",
  "settings.general.row.shellToolPartsExpanded.description": "Vis shell-verktøydeler utvidet som standard i tidslinjen",
  "settings.general.row.editToolPartsExpanded.title": "Utvid edit-verktøydeler",
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -104,7 +104,6 @@ export const dict = {
  "dialog.model.empty": "Brak wyników modelu",
  "dialog.model.manage": "Zarządzaj modelami",
  "dialog.model.manage.description": "Dostosuj, które modele pojawiają się w wyborze modelu.",
-  "dialog.model.manage.provider.toggle": "Przełącz wszystkie modele {{provider}}",
  "dialog.model.unpaid.freeModels.title": "Darmowe modele dostarczane przez OpenCode",
  "dialog.model.unpaid.addMore.title": "Dodaj więcej modeli od popularnych dostawców",
  "dialog.provider.viewAll": "Zobacz więcej dostawców",
@@ -290,11 +289,6 @@ export const dict = {
  "dialog.server.add.error": "Nie można połączyć się z serwerem",
  "dialog.server.add.checking": "Sprawdzanie...",
  "dialog.server.add.button": "Dodaj serwer",
-  "dialog.server.add.name": "Nazwa serwera (opcjonalnie)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "Nazwa użytkownika (opcjonalnie)",
-  "dialog.server.add.password": "Hasło (opcjonalnie)",
-  "dialog.server.edit.title": "Edytuj serwer",
  "dialog.server.default.title": "Domyślny serwer",
  "dialog.server.default.description":
    "Połącz z tym serwerem przy uruchomieniu aplikacji zamiast uruchamiać lokalny serwer. Wymaga restartu.",
@@ -365,7 +359,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",
  "toast.language.title": "Język",
  "toast.language.description": "Przełączono na {{language}}",
  "toast.theme.title": "Przełączono motyw",
@@ -452,12 +445,9 @@ export const dict = {
  "session.review.change.other": "Zmiany",
  "session.review.loadingChanges": "Ładowanie zmian...",
  "session.review.empty": "Brak zmian w tej sesji",
-  "session.review.noVcs": "Nie wykryto systemu kontroli wersji Git, zmiany nie są wyświetlane",
-  "session.review.noSnapshot": "Śledzenie migawek jest wyłączone w konfiguracji, więc zmiany w sesji są niedostępne",
  "session.review.noChanges": "Brak zmian",
  "session.files.selectToOpen": "Wybierz plik do otwarcia",
  "session.files.all": "Wszystkie pliki",
-  "session.files.empty": "Brak plików",
  "session.files.binaryContent": "Plik binarny (zawartość nie może być wyświetlona)",
  "session.messages.renderEarlier": "Renderuj wcześniejsze wiadomości",
  "session.messages.loadingEarlier": "Ładowanie wcześniejszych wiadomości...",
@@ -468,17 +458,6 @@ export const dict = {
  "session.todo.title": "Zadania",
  "session.todo.collapse": "Zwiń",
  "session.todo.expand": "Rozwiń",
-  "session.followupDock.summary.one": "{{count}} wiadomość w kolejce",
-  "session.followupDock.summary.other": "{{count}} wiadomości w kolejce",
-  "session.followupDock.sendNow": "Wyślij teraz",
-  "session.followupDock.edit": "Edytuj",
-  "session.followupDock.collapse": "Zwiń wiadomości w kolejce",
-  "session.followupDock.expand": "Rozwiń wiadomości w kolejce",
-  "session.revertDock.summary.one": "{{count}} cofnięta wiadomość",
-  "session.revertDock.summary.other": "{{count}} cofnięte wiadomości",
-  "session.revertDock.collapse": "Zwiń cofnięte wiadomości",
-  "session.revertDock.expand": "Rozwiń cofnięte wiadomości",
-  "session.revertDock.restore": "Przywróć wiadomość",
  "session.new.title": "Zbuduj cokolwiek",
  "session.new.worktree.main": "Główna gałąź",
  "session.new.worktree.mainWithBranch": "Główna gałąź ({{branch}})",
@@ -564,19 +543,10 @@ export const dict = {
  "settings.general.row.language.description": "Zmień język wyświetlania dla OpenCode",
  "settings.general.row.appearance.title": "Wygląd",
  "settings.general.row.appearance.description": "Dostosuj wygląd OpenCode na swoim urządzeniu",
-  "settings.general.row.colorScheme.title": "Schemat kolorów",
-  "settings.general.row.colorScheme.description":
-    "Wybierz, czy OpenCode ma używać motywu systemowego, jasnego czy ciemnego",
  "settings.general.row.theme.title": "Motyw",
  "settings.general.row.theme.description": "Dostosuj motyw OpenCode.",
  "settings.general.row.font.title": "Czcionka",
  "settings.general.row.font.description": "Dostosuj czcionkę mono używaną w blokach kodu",
-  "settings.general.row.followup.title": "Zachowanie kontynuacji",
-  "settings.general.row.followup.description": "Wybierz, czy kontynuacja ma być natychmiastowa, czy czekać w kolejce",
-  "settings.general.row.followup.option.queue": "Kolejka",
-  "settings.general.row.followup.option.steer": "Sterowanie",
-  "settings.general.row.reasoningSummaries.title": "Pokaż podsumowania wnioskowania",
-  "settings.general.row.reasoningSummaries.description": "Wyświetlaj podsumowania wnioskowania modelu na osi czasu",
  "settings.general.row.shellToolPartsExpanded.title": "Rozwijaj elementy narzędzia shell",
  "settings.general.row.shellToolPartsExpanded.description":
    "Domyślnie pokazuj rozwinięte elementy narzędzia shell na osi czasu",
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -113,7 +113,6 @@ export const dict = {
  "dialog.model.empty": "Модели не найдены",
  "dialog.model.manage": "Управление моделями",
  "dialog.model.manage.description": "Настройте какие модели появляются в выборе модели",
-  "dialog.model.manage.provider.toggle": "Переключить все модели {{provider}}",

  "dialog.model.unpaid.freeModels.title": "Бесплатные модели от OpenCode",
  "dialog.model.unpaid.addMore.title": "Добавьте больше моделей от популярных провайдеров",
@@ -315,11 +314,6 @@ export const dict = {
  "dialog.server.add.error": "Не удалось подключиться к серверу",
  "dialog.server.add.checking": "Проверка...",
  "dialog.server.add.button": "Добавить сервер",
-  "dialog.server.add.name": "Имя сервера (необязательно)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "Имя пользователя (необязательно)",
-  "dialog.server.add.password": "Пароль (необязательно)",
-  "dialog.server.edit.title": "Редактировать сервер",
  "dialog.server.default.title": "Сервер по умолчанию",
  "dialog.server.default.description":
    "Подключаться к этому серверу при запуске приложения вместо запуска локального сервера. Требуется перезапуск.",
@@ -399,7 +393,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",

  "toast.language.title": "Язык",
  "toast.language.description": "Переключено на {{language}}",
@@ -506,12 +499,9 @@ export const dict = {
  "session.review.change.other": "Изменения",
  "session.review.loadingChanges": "Загрузка изменений...",
  "session.review.empty": "Изменений в этой сессии пока нет",
-  "session.review.noVcs": "Система контроля версий Git не обнаружена, изменения не отображаются",
-  "session.review.noSnapshot": "Отслеживание снимков отключено в настройках, поэтому изменения сессии недоступны",
  "session.review.noChanges": "Нет изменений",
  "session.files.selectToOpen": "Выберите файл, чтобы открыть",
  "session.files.all": "Все файлы",
-  "session.files.empty": "Нет файлов",
  "session.files.binaryContent": "Двоичный файл (содержимое не может быть отображено)",
  "session.messages.renderEarlier": "Показать предыдущие сообщения",
  "session.messages.loadingEarlier": "Загрузка предыдущих сообщений...",
@@ -523,17 +513,6 @@ export const dict = {
  "session.todo.title": "Задачи",
  "session.todo.collapse": "Свернуть",
  "session.todo.expand": "Развернуть",
-  "session.followupDock.summary.one": "{{count}} сообщение в очереди",
-  "session.followupDock.summary.other": "{{count}} сообщений в очереди",
-  "session.followupDock.sendNow": "Отправить сейчас",
-  "session.followupDock.edit": "Редактировать",
-  "session.followupDock.collapse": "Свернуть сообщения в очереди",
-  "session.followupDock.expand": "Развернуть сообщения в очереди",
-  "session.revertDock.summary.one": "{{count}} сообщение возвращено",
-  "session.revertDock.summary.other": "{{count}} сообщений возвращено",
-  "session.revertDock.collapse": "Свернуть возвращённые сообщения",
-  "session.revertDock.expand": "Развернуть возвращённые сообщения",
-  "session.revertDock.restore": "Восстановить сообщение",

  "session.new.title": "Создавайте что угодно",
  "session.new.worktree.main": "Основная ветка",
@@ -631,19 +610,10 @@ export const dict = {
  "settings.general.row.language.description": "Изменить язык отображения OpenCode",
  "settings.general.row.appearance.title": "Внешний вид",
  "settings.general.row.appearance.description": "Настройте как OpenCode выглядит на вашем устройстве",
-  "settings.general.row.colorScheme.title": "Цветовая схема",
-  "settings.general.row.colorScheme.description": "Выберите, следует ли OpenCode системной, светлой или тёмной теме",
  "settings.general.row.theme.title": "Тема",
  "settings.general.row.theme.description": "Настройте оформление OpenCode.",
  "settings.general.row.font.title": "Шрифт",
  "settings.general.row.font.description": "Настройте моноширинный шрифт для блоков кода",
-  "settings.general.row.followup.title": "Поведение уточняющих вопросов",
-  "settings.general.row.followup.description":
-    "Выберите, отправлять ли уточняющие вопросы сразу или помещать их в очередь",
-  "settings.general.row.followup.option.queue": "Очередь",
-  "settings.general.row.followup.option.steer": "Направлять",
-  "settings.general.row.reasoningSummaries.title": "Показывать сводки рассуждений",
-  "settings.general.row.reasoningSummaries.description": "Отображать сводки рассуждений модели в ленте",

  "settings.general.row.shellToolPartsExpanded.title": "Разворачивать элементы инструмента shell",
  "settings.general.row.shellToolPartsExpanded.description":
@@ -797,31 +767,30 @@ export const dict = {
  "settings.permissions.tool.glob.description": "Сопоставление файлов по паттернам glob",
  "settings.permissions.tool.grep.title": "Grep",
  "settings.permissions.tool.grep.description": "Поиск по содержимому файлов с использованием регулярных выражений",
-  "settings.permissions.tool.list.title": "List",
+  "settings.permissions.tool.list.title": "Список",
  "settings.permissions.tool.list.description": "Список файлов в директории",
  "settings.permissions.tool.bash.title": "Bash",
-  "settings.permissions.tool.bash.description": "Запуск команд оболочки",
+  "settings.permissions.tool.bash.description": "Выполнение команд оболочки",
  "settings.permissions.tool.task.title": "Task",
-  "settings.permissions.tool.task.description": "Запуск подагентов",
+  "settings.permissions.tool.task.description": "Запуск под-агентов",
  "settings.permissions.tool.skill.title": "Skill",
-  "settings.permissions.tool.skill.description": "Загрузка навыка по имени",
+  "settings.permissions.tool.skill.description": "Загрузить навык по имени",
  "settings.permissions.tool.lsp.title": "LSP",
-  "settings.permissions.tool.lsp.description": "Запросы к языковому серверу",
-  "settings.permissions.tool.todoread.title": "Todo Read",
+  "settings.permissions.tool.lsp.description": "Выполнение запросов к языковому серверу",
+  "settings.permissions.tool.todoread.title": "Чтение списка задач",
  "settings.permissions.tool.todoread.description": "Чтение списка задач",
-  "settings.permissions.tool.todowrite.title": "Todo Write",
+  "settings.permissions.tool.todowrite.title": "Запись списка задач",
  "settings.permissions.tool.todowrite.description": "Обновление списка задач",
  "settings.permissions.tool.webfetch.title": "Web Fetch",
-  "settings.permissions.tool.webfetch.description": "Получение контента по URL",
+  "settings.permissions.tool.webfetch.description": "Получить содержимое по URL",
  "settings.permissions.tool.websearch.title": "Web Search",
  "settings.permissions.tool.websearch.description": "Поиск в интернете",
-  "settings.permissions.tool.codesearch.title": "Code Search",
+  "settings.permissions.tool.codesearch.title": "Поиск кода",
  "settings.permissions.tool.codesearch.description": "Поиск кода в интернете",
  "settings.permissions.tool.external_directory.title": "Внешняя директория",
  "settings.permissions.tool.external_directory.description": "Доступ к файлам вне директории проекта",
  "settings.permissions.tool.doom_loop.title": "Doom Loop",
-  "settings.permissions.tool.doom_loop.description":
-    "Обнаружение повторяющихся вызовов инструментов с одинаковыми входными данными",
+  "settings.permissions.tool.doom_loop.description": "Обнаружение повторных вызовов инструментов с одинаковым вводом",

  "session.delete.failed.title": "Не удалось удалить сессию",
  "session.delete.title": "Удалить сессию",
@@ -838,21 +807,21 @@ export const dict = {
  "workspace.reset.failed.title": "Не удалось сбросить рабочее пространство",
  "workspace.reset.success.title": "Рабочее пространство сброшено",
  "workspace.reset.success.description": "Рабочее пространство теперь соответствует ветке по умолчанию.",
-  "workspace.error.stillPreparing": "Рабочее пространство всё ещё подготавливается",
-  "workspace.status.checking": "Проверка незафиксированных изменений...",
+  "workspace.error.stillPreparing": "Рабочее пространство всё ещё готовится",
+  "workspace.status.checking": "Проверка наличия неслитых изменений...",
  "workspace.status.error": "Не удалось проверить статус git.",
-  "workspace.status.clean": "Незафиксированных изменений не обнаружено.",
-  "workspace.status.dirty": "В этом рабочем пространстве обнаружены незафиксированные изменения.",
+  "workspace.status.clean": "Неслитые изменения не обнаружены.",
+  "workspace.status.dirty": "Обнаружены неслитые изменения в этом рабочем пространстве.",
  "workspace.delete.title": "Удалить рабочее пространство",
  "workspace.delete.confirm": 'Удалить рабочее пространство "{{name}}"?',
  "workspace.delete.button": "Удалить рабочее пространство",
  "workspace.reset.title": "Сбросить рабочее пространство",
  "workspace.reset.confirm": 'Сбросить рабочее пространство "{{name}}"?',
  "workspace.reset.button": "Сбросить рабочее пространство",
-  "workspace.reset.archived.none": "Активные сессии не будут архивированы.",
+  "workspace.reset.archived.none": "Никакие активные сессии не будут архивированы.",
  "workspace.reset.archived.one": "1 сессия будет архивирована.",
  "workspace.reset.archived.many": "{{count}} сессий будет архивировано.",
-  "workspace.reset.note": "Это сбросит рабочее пространство до соответствия ветке по умолчанию.",
+  "workspace.reset.note": "Рабочее пространство будет сброшено в соответствие с веткой по умолчанию.",
  "common.open": "Открыть",
  "dialog.releaseNotes.action.getStarted": "Начать",
  "dialog.releaseNotes.action.next": "Далее",
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -113,7 +113,6 @@ export const dict = {
  "dialog.model.empty": "ไม่พบผลลัพธ์โมเดล",
  "dialog.model.manage": "จัดการโมเดล",
  "dialog.model.manage.description": "ปรับแต่งโมเดลที่จะปรากฏในตัวเลือกโมเดล",
-  "dialog.model.manage.provider.toggle": "สลับโมเดลทั้งหมดของ {{provider}}",

  "dialog.model.unpaid.freeModels.title": "โมเดลฟรีที่จัดหาให้โดย OpenCode",
  "dialog.model.unpaid.addMore.title": "เพิ่มโมเดลเพิ่มเติมจากผู้ให้บริการยอดนิยม",
@@ -315,11 +314,6 @@ export const dict = {
  "dialog.server.add.error": "ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์",
  "dialog.server.add.checking": "กำลังตรวจสอบ...",
  "dialog.server.add.button": "เพิ่มเซิร์ฟเวอร์",
-  "dialog.server.add.name": "ชื่อเซิร์ฟเวอร์ (ไม่บังคับ)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "ชื่อผู้ใช้ (ไม่บังคับ)",
-  "dialog.server.add.password": "รหัสผ่าน (ไม่บังคับ)",
-  "dialog.server.edit.title": "แก้ไขเซิร์ฟเวอร์",
  "dialog.server.default.title": "เซิร์ฟเวอร์เริ่มต้น",
  "dialog.server.default.description":
    "เชื่อมต่อกับเซิร์ฟเวอร์นี้เมื่อเปิดแอปแทนการเริ่มเซิร์ฟเวอร์ในเครื่อง ต้องรีสตาร์ท",
@@ -397,7 +391,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",

  "toast.language.title": "ภาษา",
  "toast.language.description": "สลับไปที่ {{language}}",
@@ -501,12 +494,9 @@ export const dict = {
  "session.review.change.other": "การเปลี่ยนแปลง",
  "session.review.loadingChanges": "กำลังโหลดการเปลี่ยนแปลง...",
  "session.review.empty": "ยังไม่มีการเปลี่ยนแปลงในเซสชันนี้",
-  "session.review.noVcs": "ไม่ตรวจพบระบบควบคุมเวอร์ชัน Git การเปลี่ยนแปลงจะไม่แสดง",
-  "session.review.noSnapshot": "การติดตามสแนปชอตถูกปิดใช้งานในการกำหนดค่า ดังนั้นการเปลี่ยนแปลงเซสชันจึงไม่พร้อมใช้งาน",
  "session.review.noChanges": "ไม่มีการเปลี่ยนแปลง",

  "session.files.selectToOpen": "เลือกไฟล์เพื่อเปิด",
-  "session.files.empty": "ไม่มีไฟล์",
  "session.files.all": "ไฟล์ทั้งหมด",
  "session.files.binaryContent": "ไฟล์ไบนารี (ไม่สามารถแสดงเนื้อหาได้)",

@@ -520,17 +510,6 @@ export const dict = {
  "session.todo.title": "สิ่งที่ต้องทำ",
  "session.todo.collapse": "ย่อ",
  "session.todo.expand": "ขยาย",
-  "session.followupDock.summary.one": "{{count}} ข้อความในคิว",
-  "session.followupDock.summary.other": "{{count}} ข้อความในคิว",
-  "session.followupDock.sendNow": "ส่งทันที",
-  "session.followupDock.edit": "แก้ไข",
-  "session.followupDock.collapse": "ย่อข้อความในคิว",
-  "session.followupDock.expand": "ขยายข้อความในคิว",
-  "session.revertDock.summary.one": "{{count}} ข้อความที่ถูกย้อนกลับ",
-  "session.revertDock.summary.other": "{{count}} ข้อความที่ถูกย้อนกลับ",
-  "session.revertDock.collapse": "ย่อข้อความที่ถูกย้อนกลับ",
-  "session.revertDock.expand": "ขยายข้อความที่ถูกย้อนกลับ",
-  "session.revertDock.restore": "กู้คืนข้อความ",

  "session.new.title": "สร้างอะไรก็ได้",
  "session.new.worktree.main": "สาขาหลัก",
@@ -625,18 +604,11 @@ export const dict = {
  "settings.general.row.language.description": "เปลี่ยนภาษาที่แสดงสำหรับ OpenCode",
  "settings.general.row.appearance.title": "รูปลักษณ์",
  "settings.general.row.appearance.description": "ปรับแต่งวิธีการที่ OpenCode มีลักษณะบนอุปกรณ์ของคุณ",
-  "settings.general.row.colorScheme.title": "โทนสี",
-  "settings.general.row.colorScheme.description": "เลือกว่าจะให้ OpenCode ใช้ธีมตามระบบ สว่าง หรือมืด",
  "settings.general.row.theme.title": "ธีม",
  "settings.general.row.theme.description": "ปรับแต่งวิธีการที่ OpenCode มีธีม",
  "settings.general.row.font.title": "ฟอนต์",
  "settings.general.row.font.description": "ปรับแต่งฟอนต์โมโนที่ใช้ในบล็อกโค้ด",
-  "settings.general.row.followup.title": "พฤติกรรมการติดตามผล",
-  "settings.general.row.followup.description": "เลือกว่าจะให้พร้อมท์ติดตามผลทำงานทันทีหรือรอในคิว",
-  "settings.general.row.followup.option.queue": "คิว",
-  "settings.general.row.followup.option.steer": "นำทาง",
-  "settings.general.row.reasoningSummaries.title": "แสดงสรุปการใช้เหตุผล",
-  "settings.general.row.reasoningSummaries.description": "แสดงสรุปการใช้เหตุผลของโมเดลในไทม์ไลน์",
+
  "settings.general.row.shellToolPartsExpanded.title": "ขยายส่วนเครื่องมือ shell",
  "settings.general.row.shellToolPartsExpanded.description": "แสดงส่วนเครื่องมือ shell แบบขยายตามค่าเริ่มต้นในไทม์ไลน์",
  "settings.general.row.editToolPartsExpanded.title": "ขยายส่วนเครื่องมือ edit",
--- a/packages/app/src/i18n/tr.ts
+++ b/packages/app/src/i18n/tr.ts
@@ -320,11 +320,6 @@ export const dict = {
  "dialog.server.add.error": "Sunucuya bağlanılamadı",
  "dialog.server.add.checking": "Kontrol ediliyor...",
  "dialog.server.add.button": "Sunucu ekle",
-  "dialog.server.add.name": "Sunucu adı (isteğe bağlı)",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "Kullanıcı adı (isteğe bağlı)",
-  "dialog.server.add.password": "Şifre (isteğe bağlı)",
-  "dialog.server.edit.title": "Sunucuyu düzenle",
  "dialog.server.default.title": "Varsayılan sunucu",
  "dialog.server.default.description":
    "Uygulama başlatıldığında yerel sunucu başlatmak yerine bu sunucuya bağlan. Yeniden başlatma gerektirir.",
@@ -511,13 +506,10 @@ export const dict = {
  "session.review.loadingChanges": "Değişiklikler yükleniyor...",
  "session.review.empty": "Bu oturumda henüz değişiklik yok",
  "session.review.noVcs": "Git VCS algılanamadı, oturum değişiklikleri tespit edilemeyecek",
-  "session.review.noSnapshot":
-    "Yapılandırmada anlık görüntü takibi devre dışı bırakıldı, bu nedenle oturum değişiklikleri kullanılamıyor",
  "session.review.noChanges": "Değişiklik yok",

  "session.files.selectToOpen": "Açmak için bir dosya seçin",
  "session.files.all": "Tüm dosyalar",
-  "session.files.empty": "Dosya yok",
  "session.files.binaryContent": "İkili dosya (içerik görüntülenemiyor)",

  "session.messages.renderEarlier": "Önceki mesajları göster",
@@ -530,17 +522,6 @@ export const dict = {
  "session.todo.title": "Görevler",
  "session.todo.collapse": "Daralt",
  "session.todo.expand": "Genişlet",
-  "session.followupDock.summary.one": "{{count}} sıradaki mesaj",
-  "session.followupDock.summary.other": "{{count}} sıradaki mesaj",
-  "session.followupDock.sendNow": "Şimdi gönder",
-  "session.followupDock.edit": "Düzenle",
-  "session.followupDock.collapse": "Sıradaki mesajları daralt",
-  "session.followupDock.expand": "Sıradaki mesajları genişlet",
-  "session.revertDock.summary.one": "{{count}} geri alınan mesaj",
-  "session.revertDock.summary.other": "{{count}} geri alınan mesaj",
-  "session.revertDock.collapse": "Geri alınan mesajları daralt",
-  "session.revertDock.expand": "Geri alınan mesajları genişlet",
-  "session.revertDock.restore": "Mesajı geri yükle",

  "session.new.title": "İstediğini yap",
  "session.new.worktree.main": "Ana dal",
@@ -637,18 +618,10 @@ export const dict = {
  "settings.general.row.language.description": "OpenCode'un görünüm dilini değiştirin",
  "settings.general.row.appearance.title": "Görünüm",
  "settings.general.row.appearance.description": "OpenCode'un cihazınızdaki görünümünü özelleştirin",
-  "settings.general.row.colorScheme.title": "Renk şeması",
-  "settings.general.row.colorScheme.description":
-    "OpenCode'un sistem, açık veya koyu temayı takip etip etmeyeceğini seçin",
  "settings.general.row.theme.title": "Tema",
  "settings.general.row.theme.description": "OpenCode'un temasını özelleştirin.",
  "settings.general.row.font.title": "Yazı Tipi",
  "settings.general.row.font.description": "Kod bloklarında kullanılan monospace yazı tipini özelleştirin",
-  "settings.general.row.followup.title": "Takip davranışı",
-  "settings.general.row.followup.description":
-    "Takip komutlarının hemen yönlendirilmesini mi yoksa sırada beklemesini mi istediğinizi seçin",
-  "settings.general.row.followup.option.queue": "Sıra",
-  "settings.general.row.followup.option.steer": "Yönlendir",
  "settings.general.row.reasoningSummaries.title": "Akıl yürütme özetlerini göster",
  "settings.general.row.reasoningSummaries.description": "Zaman çizelgesinde model akıl yürütme özetlerini görüntüle",
  "settings.general.row.shellToolPartsExpanded.title": "Kabuk araç bileşenlerini genişlet",
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -140,7 +140,6 @@ export const dict = {
  "dialog.model.empty": "未找到模型",
  "dialog.model.manage": "管理模型",
  "dialog.model.manage.description": "自定义模型选择器中显示的模型。",
-  "dialog.model.manage.provider.toggle": "切换所有 {{provider}} 模型",
  "dialog.model.unpaid.freeModels.title": "OpenCode 提供的免费模型",
  "dialog.model.unpaid.addMore.title": "从热门提供商添加更多模型",

@@ -335,11 +334,6 @@ export const dict = {
  "dialog.server.add.error": "无法连接到服务器",
  "dialog.server.add.checking": "检查中...",
  "dialog.server.add.button": "添加服务器",
-  "dialog.server.add.name": "服务器名称（可选）",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "用户名（可选）",
-  "dialog.server.add.password": "密码（可选）",
-  "dialog.server.edit.title": "编辑服务器",
  "dialog.server.default.title": "默认服务器",
  "dialog.server.default.description": "应用启动时连接此服务器，而不是启动本地服务器。需要重启。",
  "dialog.server.default.none": "未选择服务器",
@@ -412,7 +406,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",

  "toast.language.title": "语言",
  "toast.language.description": "已切换到{{language}}",
@@ -504,12 +497,9 @@ export const dict = {
  "session.review.change.other": "更改",
  "session.review.loadingChanges": "正在加载更改...",
  "session.review.empty": "此会话暂无更改",
-  "session.review.noVcs": "未检测到 Git 版本控制系统，无法显示更改",
-  "session.review.noSnapshot": "配置中已禁用快照跟踪，因此会话更改不可用",
  "session.review.noChanges": "无更改",
  "session.files.selectToOpen": "选择要打开的文件",
  "session.files.all": "所有文件",
-  "session.files.empty": "无文件",
  "session.files.binaryContent": "二进制文件（无法显示内容）",
  "session.messages.renderEarlier": "显示更早的消息",
  "session.messages.loadingEarlier": "正在加载更早的消息...",
@@ -520,17 +510,6 @@ export const dict = {
  "session.todo.title": "待办事项",
  "session.todo.collapse": "折叠",
  "session.todo.expand": "展开",
-  "session.followupDock.summary.one": "{{count}} 条排队消息",
-  "session.followupDock.summary.other": "{{count}} 条排队消息",
-  "session.followupDock.sendNow": "立即发送",
-  "session.followupDock.edit": "编辑",
-  "session.followupDock.collapse": "折叠排队消息",
-  "session.followupDock.expand": "展开排队消息",
-  "session.revertDock.summary.one": "{{count}} 条已回滚消息",
-  "session.revertDock.summary.other": "{{count}} 条已回滚消息",
-  "session.revertDock.collapse": "折叠已回滚消息",
-  "session.revertDock.expand": "展开已回滚消息",
-  "session.revertDock.restore": "恢复消息",
  "session.new.title": "构建任何东西",
  "session.new.worktree.main": "主分支",
  "session.new.worktree.mainWithBranch": "主分支（{{branch}}）",
@@ -625,18 +604,10 @@ export const dict = {
  "settings.general.row.language.description": "更改 OpenCode 的显示语言",
  "settings.general.row.appearance.title": "外观",
  "settings.general.row.appearance.description": "自定义 OpenCode 在你的设备上的外观",
-  "settings.general.row.colorScheme.title": "配色方案",
-  "settings.general.row.colorScheme.description": "选择 OpenCode 跟随系统、浅色或深色主题",
  "settings.general.row.theme.title": "主题",
  "settings.general.row.theme.description": "自定义 OpenCode 的主题。",
  "settings.general.row.font.title": "字体",
  "settings.general.row.font.description": "自定义代码块使用的等宽字体",
-  "settings.general.row.followup.title": "跟进消息行为",
-  "settings.general.row.followup.description": "选择跟进提示是立即引导还是在队列中等待",
-  "settings.general.row.followup.option.queue": "排队",
-  "settings.general.row.followup.option.steer": "引导",
-  "settings.general.row.reasoningSummaries.title": "显示推理摘要",
-  "settings.general.row.reasoningSummaries.description": "在时间线中显示模型推理摘要",
  "settings.general.row.shellToolPartsExpanded.title": "展开 shell 工具部分",
  "settings.general.row.shellToolPartsExpanded.description": "默认在时间线中展开 shell 工具部分",
  "settings.general.row.editToolPartsExpanded.title": "展开编辑工具部分",
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -117,7 +117,6 @@ export const dict = {
  "dialog.model.empty": "找不到模型",
  "dialog.model.manage": "管理模型",
  "dialog.model.manage.description": "自訂模型選擇器中顯示的模型。",
-  "dialog.model.manage.provider.toggle": "切換所有 {{provider}} 模型",

  "dialog.model.unpaid.freeModels.title": "OpenCode 提供的免費模型",
  "dialog.model.unpaid.addMore.title": "從熱門提供者新增更多模型",
@@ -315,11 +314,6 @@ export const dict = {
  "dialog.server.add.error": "無法連線到伺服器",
  "dialog.server.add.checking": "檢查中...",
  "dialog.server.add.button": "新增伺服器",
-  "dialog.server.add.name": "伺服器名稱（選填）",
-  "dialog.server.add.namePlaceholder": "Localhost",
-  "dialog.server.add.username": "使用者名稱（選填）",
-  "dialog.server.add.password": "密碼（選填）",
-  "dialog.server.edit.title": "編輯伺服器",
  "dialog.server.default.title": "預設伺服器",
  "dialog.server.default.description": "應用程式啟動時連線此伺服器，而不是啟動本地伺服器。需要重新啟動。",
  "dialog.server.default.none": "未選擇伺服器",
@@ -396,7 +390,6 @@ export const dict = {
  "language.br": "Português (Brasil)",
  "language.bs": "Bosanski",
  "language.th": "ไทย",
-  "language.tr": "Türkçe",

  "toast.language.title": "語言",
  "toast.language.description": "已切換到 {{language}}",
@@ -500,11 +493,8 @@ export const dict = {
  "session.review.loadingChanges": "正在載入變更...",
  "session.review.empty": "此工作階段暫無變更",
  "session.review.noChanges": "沒有變更",
-  "session.review.noVcs": "未偵測到 Git 版本控制系統，無法顯示變更",
-  "session.review.noSnapshot": "設定中已停用快照追蹤，因此無法使用工作階段變更",
  "session.files.selectToOpen": "選取要開啟的檔案",
  "session.files.all": "所有檔案",
-  "session.files.empty": "沒有檔案",
  "session.files.binaryContent": "二進位檔案（無法顯示內容）",
  "session.messages.renderEarlier": "顯示更早的訊息",
  "session.messages.loadingEarlier": "正在載入更早的訊息...",
@@ -516,17 +506,6 @@ export const dict = {
  "session.todo.title": "待辦事項",
  "session.todo.collapse": "折疊",
  "session.todo.expand": "展開",
-  "session.followupDock.summary.one": "{{count}} 則佇列訊息",
-  "session.followupDock.summary.other": "{{count}} 則佇列訊息",
-  "session.followupDock.sendNow": "立即傳送",
-  "session.followupDock.edit": "編輯",
-  "session.followupDock.collapse": "收合佇列訊息",
-  "session.followupDock.expand": "展開佇列訊息",
-  "session.revertDock.summary.one": "{{count}} 則已回復訊息",
-  "session.revertDock.summary.other": "{{count}} 則已回復訊息",
-  "session.revertDock.collapse": "收合已回復訊息",
-  "session.revertDock.expand": "展開已回復訊息",
-  "session.revertDock.restore": "還原訊息",

  "session.new.title": "建構任何東西",
  "session.new.worktree.main": "主分支",
@@ -606,8 +585,8 @@ export const dict = {
  "settings.tab.general": "一般",
  "settings.tab.shortcuts": "快速鍵",
  "settings.desktop.section.wsl": "WSL",
-  "settings.desktop.wsl.title": "WSL 整合",
-  "settings.desktop.wsl.description": "在 Windows 上的 WSL 中執行 OpenCode 伺服器。",
+  "settings.desktop.wsl.title": "WSL integration",
+  "settings.desktop.wsl.description": "Run the OpenCode server inside WSL on Windows.",

  "settings.general.section.appearance": "外觀",
  "settings.general.section.notifications": "系統通知",
@@ -620,18 +599,10 @@ export const dict = {
  "settings.general.row.language.description": "變更 OpenCode 的顯示語言",
  "settings.general.row.appearance.title": "外觀",
  "settings.general.row.appearance.description": "自訂 OpenCode 在你的裝置上的外觀",
-  "settings.general.row.colorScheme.title": "配色方案",
-  "settings.general.row.colorScheme.description": "選擇 OpenCode 要跟隨系統、淺色或深色主題",
  "settings.general.row.theme.title": "主題",
  "settings.general.row.theme.description": "自訂 OpenCode 的主題。",
  "settings.general.row.font.title": "字型",
  "settings.general.row.font.description": "自訂程式碼區塊使用的等寬字型",
-  "settings.general.row.followup.title": "後續追問行為",
-  "settings.general.row.followup.description": "選擇後續追問提示是立即引導還是進入佇列等待",
-  "settings.general.row.followup.option.queue": "佇列",
-  "settings.general.row.followup.option.steer": "引導",
-  "settings.general.row.reasoningSummaries.title": "顯示推理摘要",
-  "settings.general.row.reasoningSummaries.description": "在時間軸中顯示模型推理摘要",

  "settings.general.row.shellToolPartsExpanded.title": "展開 shell 工具區塊",
  "settings.general.row.shellToolPartsExpanded.description": "在時間軸中預設展開 shell 工具區塊",
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -2203,8 +2203,8 @@ export default function Layout(props: ParentProps) {
        mobile ? (
          <SidebarPanel project={currentProject()} mobile />
        ) : (
-          <Show when={currentProject()}>
-            <SidebarPanel project={currentProject()} merged />
+          <Show when={currentProject()} keyed>
+            {(project) => <SidebarPanel project={project} merged />}
          </Show>
        )
      }
@@ -2332,8 +2332,8 @@ export default function Layout(props: ParentProps) {
                arm()
              }}
            >
-              <Show when={peek()}>
-                <SidebarPanel project={peek()} merged={false} />
+              <Show when={peek()} keyed>
+                {(project) => <SidebarPanel project={project} merged={false} />}
              </Show>
            </div>

--- a/packages/app/src/pages/layout/sidebar-items.tsx
+++ b/packages/app/src/pages/layout/sidebar-items.tsx
@@ -10,6 +10,7 @@ import { base64Encode } from "@opencode-ai/util/encode"
 import { getFilename } from "@opencode-ai/util/path"
 import { A, useNavigate, useParams } from "@solidjs/router"
 import { type Accessor, createMemo, For, type JSX, Match, onCleanup, Show, Switch } from "solid-js"
+import { getSessionPrefetch, SESSION_PREFETCH_TTL } from "@/context/global-sync/session-prefetch"
 import { useGlobalSync } from "@/context/global-sync"
 import { useLanguage } from "@/context/language"
 import { getAvatarColors, type LocalProject, useLayout } from "@/context/layout"
@@ -227,7 +228,13 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
  const hoverMessages = createMemo(() =>
    sessionStore.message[props.session.id]?.filter((message): message is UserMessage => message.role === "user"),
  )
-  const hoverReady = createMemo(() => hoverMessages() !== undefined)
+  const hoverReady = createMemo(() => {
+    if (sessionStore.message[props.session.id] === undefined) return false
+    if (props.session.id === params.id) return true
+    const info = getSessionPrefetch(props.session.directory, props.session.id)
+    if (!info) return false
+    return Date.now() - info.at < SESSION_PREFETCH_TTL
+  })
  const hoverAllowed = createMemo(() => !props.mobile && props.sidebarExpanded())
  const hoverEnabled = createMemo(() => (props.popover ?? true) && hoverAllowed())
  const isActive = createMemo(() => props.session.id === params.id)
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -1,7 +1,6 @@
 import type { Project, UserMessage } from "@opencode-ai/sdk/v2"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import {
-  batch,
  onCleanup,
  Show,
  Match,
@@ -35,10 +34,8 @@ import { useLanguage } from "@/context/language"
 import { useLayout } from "@/context/layout"
 import { usePrompt } from "@/context/prompt"
 import { useSDK } from "@/context/sdk"
-import { useSettings } from "@/context/settings"
 import { useSync } from "@/context/sync"
 import { useTerminal } from "@/context/terminal"
-import { type FollowupDraft, sendFollowupDraft } from "@/components/prompt-input/submit"
 import { createSessionComposerState, SessionComposerRegion } from "@/pages/session/composer"
 import { createOpenReviewFile, createSessionTabs, createSizing, focusTerminalById } from "@/pages/session/helpers"
 import { MessageTimeline } from "@/pages/session/message-timeline"
@@ -49,18 +46,15 @@ import { SessionSidePanel } from "@/pages/session/session-side-panel"
 import { TerminalPanel } from "@/pages/session/terminal-panel"
 import { useSessionCommands } from "@/pages/session/use-session-commands"
 import { useSessionHashScroll } from "@/pages/session/use-session-hash-scroll"
-import { Identifier } from "@/utils/id"
 import { extractPromptFromParts } from "@/utils/prompt"
 import { same } from "@/utils/same"
 import { formatServerError } from "@/utils/server-errors"

 const emptyUserMessages: UserMessage[] = []
-const emptyFollowups: (FollowupDraft & { id: string })[] = []

 type SessionHistoryWindowInput = {
  sessionID: () => string | undefined
  messagesReady: () => boolean
-  loaded: () => number
  visibleUserMessages: () => UserMessage[]
  historyMore: () => boolean
  historyLoading: () => boolean
@@ -158,39 +152,23 @@ function createSessionHistoryWindow(input: SessionHistoryWindowInput) {

    const start = turnStart()
    const beforeVisible = input.visibleUserMessages().length
-    let loaded = input.loaded()

    if (start > 0) setTurnStart(0)

    if (!input.historyMore() || input.historyLoading()) return

-    let afterVisible = beforeVisible
-    let added = 0
-
-    while (true) {
-      await input.loadMore(id)
-      if (input.sessionID() !== id) return
-
-      afterVisible = input.visibleUserMessages().length
-      const nextLoaded = input.loaded()
-      const raw = nextLoaded - loaded
-      added += raw
-      loaded = nextLoaded
-
-      if (afterVisible > beforeVisible) break
-      if (raw <= 0) break
-      if (!input.historyMore()) break
-    }
-
-    if (added <= 0) return
-    if (state.prefetchNoGrowth) setState("prefetchNoGrowth", 0)
+    await input.loadMore(id)
+    if (input.sessionID() !== id) return

+    const afterVisible = input.visibleUserMessages().length
    const growth = afterVisible - beforeVisible
+    if (state.prefetchNoGrowth) setState("prefetchNoGrowth", 0)
    if (growth <= 0) return
    if (turnStart() !== 0) return

-    const target = Math.min(afterVisible, beforeVisible + turnBatch)
-    setTurnStart(Math.max(0, afterVisible - target))
+    const target = Math.min(afterVisible, Math.max(beforeVisible, renderedUserMessages().length) + turnBatch)
+    const nextStart = Math.max(0, afterVisible - target)
+    preserveScroll(() => setTurnStart(nextStart))
  }

  /** Scroll/prefetch path: fetch older history from server. */
@@ -209,35 +187,19 @@ function createSessionHistoryWindow(input: SessionHistoryWindowInput) {
    const start = turnStart()
    const beforeVisible = input.visibleUserMessages().length
    const beforeRendered = start <= 0 ? beforeVisible : renderedUserMessages().length
-    let loaded = input.loaded()
-    let added = 0
-    let growth = 0

-    while (true) {
-      await input.loadMore(id)
-      if (input.sessionID() !== id) return
-
-      const nextLoaded = input.loaded()
-      const raw = nextLoaded - loaded
-      added += raw
-      loaded = nextLoaded
-      growth = input.visibleUserMessages().length - beforeVisible
-
-      if (growth > 0) break
-      if (raw <= 0) break
-      if (opts?.prefetch) break
-      if (!input.historyMore()) break
-    }
+    await input.loadMore(id)
+    if (input.sessionID() !== id) return

    const afterVisible = input.visibleUserMessages().length
+    const growth = afterVisible - beforeVisible

    if (opts?.prefetch) {
-      setState("prefetchNoGrowth", added > 0 ? 0 : state.prefetchNoGrowth + 1)
-    } else if (added > 0 && state.prefetchNoGrowth) {
+      setState("prefetchNoGrowth", growth > 0 ? 0 : state.prefetchNoGrowth + 1)
+    } else if (growth > 0 && state.prefetchNoGrowth) {
      setState("prefetchNoGrowth", 0)
    }

-    if (added <= 0) return
    if (growth <= 0) return
    if (turnStart() !== start) return

@@ -307,7 +269,6 @@ export default function Page() {
  const language = useLanguage()
  const navigate = useNavigate()
  const sdk = useSDK()
-  const settings = useSettings()
  const prompt = usePrompt()
  const comments = useComments()
  const terminal = useTerminal()
@@ -330,7 +291,6 @@ export default function Page() {
    git: false,
    pendingMessage: undefined as string | undefined,
    restoring: undefined as string | undefined,
-    reverting: false,
    reviewSnap: false,
    scrollGesture: 0,
    scroll: {
@@ -504,17 +464,6 @@ export default function Page() {
    deferRender: false,
  })

-  const [followup, setFollowup] = createStore({
-    items: {} as Record<string, (FollowupDraft & { id: string })[] | undefined>,
-    sending: {} as Record<string, string | undefined>,
-    failed: {} as Record<string, string | undefined>,
-    paused: {} as Record<string, boolean | undefined>,
-    edit: {} as Record<
-      string,
-      { id: string; prompt: FollowupDraft["prompt"]; context: FollowupDraft["context"] } | undefined
-    >,
-  })
-
  createComputed((prev) => {
    const key = sessionKey()
    if (key !== prev) {
@@ -1194,7 +1143,6 @@ export default function Page() {

  let scrollStateFrame: number | undefined
  let scrollStateTarget: HTMLDivElement | undefined
-  let fillFrame: number | undefined

  const updateScrollState = (el: HTMLDivElement) => {
    const max = el.scrollHeight - el.clientHeight
@@ -1242,14 +1190,10 @@ export default function Page() {
    ),
  )

-  let fill = () => {}
-
  const setScrollRef = (el: HTMLDivElement | undefined) => {
    scroller = el
    autoScroll.scrollRef(el)
-    if (!el) return
-    scheduleScrollState(el)
-    fill()
+    if (el) scheduleScrollState(el)
  }

  const markUserScroll = () => {
@@ -1261,14 +1205,12 @@ export default function Page() {
    () => {
      const el = scroller
      if (el) scheduleScrollState(el)
-      fill()
    },
  )

  const historyWindow = createSessionHistoryWindow({
    sessionID: () => params.id,
    messagesReady,
-    loaded: () => messages().length,
    visibleUserMessages,
    historyMore,
    historyLoading,
@@ -1277,45 +1219,6 @@ export default function Page() {
    scroller: () => scroller,
  })

-  fill = () => {
-    if (fillFrame !== undefined) return
-
-    fillFrame = requestAnimationFrame(() => {
-      fillFrame = undefined
-
-      if (!params.id || !messagesReady()) return
-      if (autoScroll.userScrolled() || historyLoading()) return
-
-      const el = scroller
-      if (!el) return
-      if (el.scrollHeight > el.clientHeight + 1) return
-      if (historyWindow.turnStart() <= 0 && !historyMore()) return
-
-      void historyWindow.loadAndReveal()
-    })
-  }
-
-  createEffect(
-    on(
-      () =>
-        [
-          params.id,
-          messagesReady(),
-          historyWindow.turnStart(),
-          historyMore(),
-          historyLoading(),
-          autoScroll.userScrolled(),
-          visibleUserMessages().length,
-        ] as const,
-      ([id, ready, start, more, loading, scrolled]) => {
-        if (!id || !ready || loading || scrolled) return
-        if (start <= 0 && !more) return
-        fill()
-      },
-      { defer: true },
-    ),
-  )
-
  const draft = (id: string) =>
    extractPromptFromParts(sync.data.part[id] ?? [], {
      directory: sdk.directory,
@@ -1340,136 +1243,13 @@ export default function Page() {
    })
  }

-  const merge = (next: NonNullable<ReturnType<typeof info>>) =>
-    sync.set("session", (list) => {
-      const idx = list.findIndex((item) => item.id === next.id)
-      if (idx < 0) return list
-      const out = list.slice()
-      out[idx] = next
-      return out
-    })
-
-  const roll = (sessionID: string, next: NonNullable<ReturnType<typeof info>>["revert"]) =>
-    sync.set("session", (list) => {
-      const idx = list.findIndex((item) => item.id === sessionID)
-      if (idx < 0) return list
-      const out = list.slice()
-      out[idx] = { ...out[idx], revert: next }
-      return out
-    })
-
  const busy = (sessionID: string) => {
-    if ((sync.data.session_status[sessionID] ?? { type: "idle" as const }).type !== "idle") return true
+    if (sync.data.session_status[sessionID]?.type !== "idle") return true
    return (sync.data.message[sessionID] ?? []).some(
      (item) => item.role === "assistant" && typeof item.time.completed !== "number",
    )
  }

-  const queuedFollowups = createMemo(() => {
-    const id = params.id
-    if (!id) return emptyFollowups
-    return followup.items[id] ?? emptyFollowups
-  })
-
-  const editingFollowup = createMemo(() => {
-    const id = params.id
-    if (!id) return
-    return followup.edit[id]
-  })
-
-  const sendingFollowup = createMemo(() => {
-    const id = params.id
-    if (!id) return
-    return followup.sending[id]
-  })
-
-  const queueEnabled = createMemo(() => {
-    const id = params.id
-    if (!id) return false
-    return settings.general.followup() === "queue" && busy(id) && !composer.blocked()
-  })
-
-  const followupText = (item: FollowupDraft) => {
-    const text = item.prompt
-      .map((part) => {
-        if (part.type === "image") return `[image:${part.filename}]`
-        if (part.type === "file") return `[file:${part.path}]`
-        if (part.type === "agent") return `@${part.name}`
-        return part.content
-      })
-      .join("")
-      .split(/\r?\n/)
-      .map((line) => line.trim())
-      .find((line) => !!line)
-
-    if (text) return text
-    return `[${language.t("common.attachment")}]`
-  }
-
-  const queueFollowup = (draft: FollowupDraft) => {
-    setFollowup("items", draft.sessionID, (items) => [
-      ...(items ?? []),
-      { id: Identifier.ascending("message"), ...draft },
-    ])
-    setFollowup("failed", draft.sessionID, undefined)
-    setFollowup("paused", draft.sessionID, undefined)
-  }
-
-  const followupDock = createMemo(() => queuedFollowups().map((item) => ({ id: item.id, text: followupText(item) })))
-
-  const sendFollowup = (sessionID: string, id: string, opts?: { manual?: boolean }) => {
-    const item = (followup.items[sessionID] ?? []).find((entry) => entry.id === id)
-    if (!item) return Promise.resolve()
-    if (followup.sending[sessionID]) return Promise.resolve()
-
-    if (opts?.manual) setFollowup("paused", sessionID, undefined)
-    setFollowup("sending", sessionID, id)
-    setFollowup("failed", sessionID, undefined)
-
-    return sendFollowupDraft({
-      client: sdk.client,
-      sync,
-      globalSync,
-      draft: item,
-      optimisticBusy: item.sessionDirectory === sdk.directory,
-    })
-      .then((ok) => {
-        if (ok === false) return
-        setFollowup("items", sessionID, (items) => (items ?? []).filter((entry) => entry.id !== id))
-        if (opts?.manual) resumeScroll()
-      })
-      .catch((err) => {
-        setFollowup("failed", sessionID, id)
-        fail(err)
-      })
-      .finally(() => {
-        setFollowup("sending", sessionID, (value) => (value === id ? undefined : value))
-      })
-  }
-
-  const editFollowup = (id: string) => {
-    const sessionID = params.id
-    if (!sessionID) return
-    if (followup.sending[sessionID]) return
-
-    const item = queuedFollowups().find((entry) => entry.id === id)
-    if (!item) return
-
-    setFollowup("items", sessionID, (items) => (items ?? []).filter((entry) => entry.id !== id))
-    setFollowup("failed", sessionID, (value) => (value === id ? undefined : value))
-    setFollowup("edit", sessionID, {
-      id: item.id,
-      prompt: item.prompt,
-      context: item.context,
-    })
-  }
-
-  const clearFollowupEdit = () => {
-    const id = params.id
-    if (!id) return
-    setFollowup("edit", id, undefined)
-  }
-
  const halt = (sessionID: string) =>
    busy(sessionID) ? sdk.client.session.abort({ sessionID }).catch(() => {}) : Promise.resolve()

@@ -1495,77 +1275,42 @@ export default function Page() {
  }

  const revert = (input: { sessionID: string; messageID: string }) => {
-    if (ui.reverting || ui.restoring) return
-    const prev = prompt.current().slice()
-    const last = info()?.revert
    const value = draft(input.messageID)
-    batch(() => {
-      setUi("reverting", true)
-      roll(input.sessionID, { messageID: input.messageID })
-      prompt.set(value)
-    })
    return halt(input.sessionID)
      .then(() => sdk.client.session.revert(input))
-      .then((result) => {
-        if (result.data) merge(result.data)
-      })
-      .catch((err) => {
-        batch(() => {
-          roll(input.sessionID, last)
-          prompt.set(prev)
-        })
-        fail(err)
-      })
-      .finally(() => {
-        setUi("reverting", false)
+      .then(() => {
+        prompt.set(value)
      })
+      .catch(fail)
  }

  const restore = (id: string) => {
    const sessionID = params.id
-    if (!sessionID || ui.restoring || ui.reverting) return
+    if (!sessionID || ui.restoring) return

    const next = userMessages().find((item) => item.id > id)
-    const prev = prompt.current().slice()
-    const last = info()?.revert
-
-    batch(() => {
-      setUi("restoring", id)
-      setUi("reverting", true)
-      roll(sessionID, next ? { messageID: next.id } : undefined)
-      if (next) {
-        prompt.set(draft(next.id))
-        return
-      }
-      prompt.reset()
-    })
+    setUi("restoring", id)

    const task = !next
-      ? halt(sessionID).then(() => sdk.client.session.unrevert({ sessionID }))
-      : halt(sessionID).then(() =>
-          sdk.client.session.revert({
-            sessionID,
-            messageID: next.id,
-          }),
-        )
+      ? halt(sessionID)
+          .then(() => sdk.client.session.unrevert({ sessionID }))
+          .then(() => {
+            prompt.reset()
+          })
+      : halt(sessionID)
+          .then(() =>
+            sdk.client.session.revert({
+              sessionID,
+              messageID: next.id,
+            }),
+          )
+          .then(() => {
+            prompt.set(draft(next.id))
+          })

-    return task
-      .then((result) => {
-        if (result.data) merge(result.data)
-      })
-      .catch((err) => {
-        batch(() => {
-          roll(sessionID, last)
-          prompt.set(prev)
-        })
-        fail(err)
-      })
-      .finally(() => {
-        batch(() => {
-          setUi("restoring", (value) => (value === id ? undefined : value))
-          setUi("reverting", false)
-        })
-      })
+    return task.catch(fail).finally(() => {
+      setUi("restoring", (value) => (value === id ? undefined : value))
+    })
  }

  const rolled = createMemo(() => {
@@ -1578,21 +1323,6 @@ export default function Page() {

  const actions = { fork, revert }

-  createEffect(() => {
-    const sessionID = params.id
-    if (!sessionID) return
-
-    const item = queuedFollowups()[0]
-    if (!item) return
-    if (followup.sending[sessionID]) return
-    if (followup.failed[sessionID] === item.id) return
-    if (followup.paused[sessionID]) return
-    if (composer.blocked()) return
-    if (busy(sessionID)) return
-
-    void sendFollowup(sessionID, item.id)
-  })
-
  createResizeObserver(
    () => promptDock,
    ({ height }) => {
@@ -1611,7 +1341,6 @@ export default function Page() {
      if (stick) autoScroll.forceScrollToBottom()

      if (el) scheduleScrollState(el)
-      fill()
    },
  )

@@ -1645,7 +1374,6 @@ export default function Page() {
    if (diffFrame !== undefined) cancelAnimationFrame(diffFrame)
    if (diffTimer !== undefined) window.clearTimeout(diffTimer)
    if (scrollStateFrame !== undefined) cancelAnimationFrame(scrollStateFrame)
-    if (fillFrame !== undefined) cancelAnimationFrame(fillFrame)
  })

  return (
@@ -1754,33 +1482,11 @@ export default function Page() {
              resumeScroll()
            }}
            onResponseSubmit={resumeScroll}
-            followup={
-              params.id
-                ? {
-                    queue: queueEnabled,
-                    items: followupDock(),
-                    sending: sendingFollowup(),
-                    edit: editingFollowup(),
-                    onQueue: queueFollowup,
-                    onAbort: () => {
-                      const id = params.id
-                      if (!id) return
-                      setFollowup("paused", id, true)
-                    },
-                    onSend: (id) => {
-                      void sendFollowup(params.id!, id, { manual: true })
-                    },
-                    onEdit: editFollowup,
-                    onEditLoaded: clearFollowupEdit,
-                  }
-                : undefined
-            }
            revert={
              rolled().length > 0
                ? {
                    items: rolled(),
                    restoring: ui.restoring,
-                    disabled: ui.reverting,
                    onRestore: restore,
                  }
                : undefined
--- a/packages/app/src/pages/session/composer/session-composer-region.tsx
+++ b/packages/app/src/pages/session/composer/session-composer-region.tsx
@@ -8,11 +8,9 @@ import { getSessionHandoff, setSessionHandoff } from "@/pages/session/handoff"
 import { useSessionKey } from "@/pages/session/session-layout"
 import { SessionPermissionDock } from "@/pages/session/composer/session-permission-dock"
 import { SessionQuestionDock } from "@/pages/session/composer/session-question-dock"
-import { SessionFollowupDock } from "@/pages/session/composer/session-followup-dock"
 import { SessionRevertDock } from "@/pages/session/composer/session-revert-dock"
 import type { SessionComposerState } from "@/pages/session/composer/session-composer-state"
 import { SessionTodoDock } from "@/pages/session/composer/session-todo-dock"
-import type { FollowupDraft } from "@/components/prompt-input/submit"

 export function SessionComposerRegion(props: {
  state: SessionComposerState
@@ -23,30 +21,18 @@ export function SessionComposerRegion(props: {
  onNewSessionWorktreeReset: () => void
  onSubmit: () => void
  onResponseSubmit: () => void
-  followup?: {
-    queue: () => boolean
-    items: { id: string; text: string }[]
-    sending?: string
-    edit?: { id: string; prompt: FollowupDraft["prompt"]; context: FollowupDraft["context"] }
-    onQueue: (draft: FollowupDraft) => void
-    onAbort: () => void
-    onSend: (id: string) => void
-    onEdit: (id: string) => void
-    onEditLoaded: () => void
-  }
  revert?: {
    items: { id: string; text: string }[]
    restoring?: string
-    disabled?: boolean
    onRestore: (id: string) => void
  }
  setPromptDockRef: (el: HTMLDivElement) => void
 }) {
  const prompt = usePrompt()
  const language = useLanguage()
-  const route = useSessionKey()
+  const { sessionKey } = useSessionKey()

-  const handoffPrompt = createMemo(() => getSessionHandoff(route.sessionKey())?.prompt)
+  const handoffPrompt = createMemo(() => getSessionHandoff(sessionKey())?.prompt)

  const previewPrompt = () =>
    prompt
@@ -62,7 +48,7 @@ export function SessionComposerRegion(props: {

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

  const [store, setStore] = createStore({
@@ -85,7 +71,7 @@ export function SessionComposerRegion(props: {
  }

  createEffect(() => {
-    route.sessionKey()
+    sessionKey()
    const ready = props.ready
    const delay = 140

@@ -170,7 +156,6 @@ export function SessionComposerRegion(props: {
                      <SessionRevertDock
                        items={revert.items}
                        restoring={revert.restoring}
-                        disabled={revert.disabled}
                        onRestore={revert.onRestore}
                      />
                    </div>
@@ -194,7 +179,6 @@ export function SessionComposerRegion(props: {
              >
                <div ref={(el) => setStore("body", el)}>
                  <SessionTodoDock
-                    sessionID={route.params.id}
                    todos={props.state.todos()}
                    title={language.t("session.todo.title")}
                    collapseLabel={language.t("session.todo.collapse")}
@@ -211,12 +195,7 @@ export function SessionComposerRegion(props: {
                    "margin-top": `${-36 * value()}px`,
                  }}
                >
-                  <SessionRevertDock
-                    items={revert.items}
-                    restoring={revert.restoring}
-                    disabled={revert.disabled}
-                    onRestore={revert.onRestore}
-                  />
+                  <SessionRevertDock items={revert.items} restoring={revert.restoring} onRestore={revert.onRestore} />
                </div>
              )}
            </Show>
@@ -228,23 +207,10 @@ export function SessionComposerRegion(props: {
                "margin-top": `${-lift()}px`,
              }}
            >
-              <Show when={props.followup?.items.length}>
-                <SessionFollowupDock
-                  items={props.followup!.items}
-                  sending={props.followup!.sending}
-                  onSend={props.followup!.onSend}
-                  onEdit={props.followup!.onEdit}
-                />
-              </Show>
              <PromptInput
                ref={props.inputRef}
                newSessionWorktree={props.newSessionWorktree}
                onNewSessionWorktreeReset={props.onNewSessionWorktreeReset}
-                edit={props.followup?.edit}
-                onEditLoaded={props.followup?.onEditLoaded}
-                shouldQueue={props.followup?.queue}
-                onQueue={props.followup?.onQueue}
-                onAbort={props.followup?.onAbort}
                onSubmit={props.onSubmit}
              />
            </div>
--- a/packages/app/src/pages/session/composer/session-composer-state.ts
+++ b/packages/app/src/pages/session/composer/session-composer-state.ts
@@ -1,4 +1,4 @@
-import { createEffect, createMemo, on, onCleanup, onMount } from "solid-js"
+import { createEffect, createMemo, on, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
 import type { PermissionRequest, QuestionRequest, Todo } from "@opencode-ai/sdk/v2"
 import { useParams } from "@solidjs/router"
@@ -8,7 +8,6 @@ import { useLanguage } from "@/context/language"
 import { usePermission } from "@/context/permission"
 import { useSDK } from "@/context/sdk"
 import { useSync } from "@/context/sync"
-import { composerDriver, composerEnabled, composerEvent } from "@/testing/session-composer"
 import { sessionPermissionRequest, sessionQuestionRequest } from "./session-request-tree"

 export const todoState = (input: {
@@ -48,50 +47,7 @@ export function createSessionComposerState(options?: { closeMs?: number | (() =>
    return !!permissionRequest() || !!questionRequest()
  })

-  const [test, setTest] = createStore({
-    on: false,
-    live: undefined as boolean | undefined,
-    todos: undefined as Todo[] | undefined,
-  })
-
-  const pull = () => {
-    const id = params.id
-    if (!id) {
-      setTest({ on: false, live: undefined, todos: undefined })
-      return
-    }
-
-    const next = composerDriver(id)
-    if (!next) {
-      setTest({ on: false, live: undefined, todos: undefined })
-      return
-    }
-
-    setTest({
-      on: true,
-      live: next.live,
-      todos: next.todos?.map((todo) => ({ ...todo })),
-    })
-  }
-
-  onMount(() => {
-    if (!composerEnabled()) return
-
-    pull()
-    createEffect(on(() => params.id, pull, { defer: true }))
-
-    const onEvent = (event: Event) => {
-      const detail = (event as CustomEvent<{ sessionID?: string }>).detail
-      if (detail?.sessionID !== params.id) return
-      pull()
-    }
-
-    window.addEventListener(composerEvent, onEvent)
-    onCleanup(() => window.removeEventListener(composerEvent, onEvent))
-  })
-
  const todos = createMemo((): Todo[] => {
-    if (test.on && test.todos !== undefined) return test.todos
    const id = params.id
    if (!id) return []
    return globalSync.data.session_todo[id] ?? []
@@ -108,10 +64,7 @@ export function createSessionComposerState(options?: { closeMs?: number | (() =>
  })

  const busy = createMemo(() => status().type !== "idle")
-  const live = createMemo(() => {
-    if (test.on && test.live !== undefined) return test.live
-    return busy() || blocked()
-  })
+  const live = createMemo(() => busy() || blocked())

  const [store, setStore] = createStore({
    responding: undefined as string | undefined,
@@ -163,10 +116,6 @@ export function createSessionComposerState(options?: { closeMs?: number | (() =>

  // Keep stale turn todos from reopening if the model never clears them.
  const clear = () => {
-    if (test.on && test.todos !== undefined) {
-      setTest("todos", [])
-      return
-    }
    const id = params.id
    if (!id) return
    globalSync.todo.set(id, [])
--- a/packages/app/src/pages/session/composer/session-followup-dock.tsx
+++ b/packages/app/src/pages/session/composer/session-followup-dock.tsx
@@ -1,109 +0,0 @@
-import { For, Show, createMemo } from "solid-js"
-import { createStore } from "solid-js/store"
-import { Button } from "@opencode-ai/ui/button"
-import { DockTray } from "@opencode-ai/ui/dock-surface"
-import { IconButton } from "@opencode-ai/ui/icon-button"
-import { useLanguage } from "@/context/language"
-
-export function SessionFollowupDock(props: {
-  items: { id: string; text: string }[]
-  sending?: string
-  onSend: (id: string) => void
-  onEdit: (id: string) => void
-}) {
-  const language = useLanguage()
-  const [store, setStore] = createStore({
-    collapsed: false,
-  })
-
-  const toggle = () => setStore("collapsed", (value) => !value)
-  const total = createMemo(() => props.items.length)
-  const label = createMemo(() =>
-    language.t(total() === 1 ? "session.followupDock.summary.one" : "session.followupDock.summary.other", {
-      count: total(),
-    }),
-  )
-  const preview = createMemo(() => props.items[0]?.text ?? "")
-
-  return (
-    <DockTray
-      data-component="session-followup-dock"
-      style={{
-        "margin-bottom": "-0.875rem",
-        "border-bottom-left-radius": 0,
-        "border-bottom-right-radius": 0,
-      }}
-    >
-      <div
-        class="pl-3 pr-2 py-2 flex items-center gap-2"
-        role="button"
-        tabIndex={0}
-        onClick={toggle}
-        onKeyDown={(event) => {
-          if (event.key !== "Enter" && event.key !== " ") return
-          event.preventDefault()
-          toggle()
-        }}
-      >
-        <span class="shrink-0 text-13-medium text-text-strong cursor-default">{label()}</span>
-        <Show when={store.collapsed && preview()}>
-          <span class="min-w-0 flex-1 truncate text-13-regular text-text-base cursor-default">{preview()}</span>
-        </Show>
-        <div class="ml-auto shrink-0">
-          <IconButton
-            data-collapsed={store.collapsed ? "true" : "false"}
-            icon="chevron-down"
-            size="normal"
-            variant="ghost"
-            style={{ transform: `rotate(${store.collapsed ? 180 : 0}deg)` }}
-            onMouseDown={(event) => {
-              event.preventDefault()
-              event.stopPropagation()
-            }}
-            onClick={(event) => {
-              event.stopPropagation()
-              toggle()
-            }}
-            aria-label={
-              store.collapsed ? language.t("session.followupDock.expand") : language.t("session.followupDock.collapse")
-            }
-          />
-        </div>
-      </div>
-
-      <Show when={store.collapsed}>
-        <div class="h-5" aria-hidden="true" />
-      </Show>
-
-      <Show when={!store.collapsed}>
-        <div class="px-3 pb-7 flex flex-col gap-1.5 max-h-42 overflow-y-auto no-scrollbar">
-          <For each={props.items}>
-            {(item) => (
-              <div class="flex items-center gap-2 min-w-0 py-1">
-                <span class="min-w-0 flex-1 truncate text-13-regular text-text-strong">{item.text}</span>
-                <Button
-                  size="small"
-                  variant="secondary"
-                  class="shrink-0"
-                  disabled={!!props.sending}
-                  onClick={() => props.onSend(item.id)}
-                >
-                  {language.t("session.followupDock.sendNow")}
-                </Button>
-                <Button
-                  size="small"
-                  variant="ghost"
-                  class="shrink-0"
-                  disabled={!!props.sending}
-                  onClick={() => props.onEdit(item.id)}
-                >
-                  {language.t("session.followupDock.edit")}
-                </Button>
-              </div>
-            )}
-          </For>
-        </div>
-      </Show>
-    </DockTray>
-  )
-}
--- a/packages/app/src/pages/session/composer/session-revert-dock.tsx
+++ b/packages/app/src/pages/session/composer/session-revert-dock.tsx
@@ -1,4 +1,4 @@
-import { For, Show, createEffect, createMemo } from "solid-js"
+import { For, Show, createMemo } from "solid-js"
 import { createStore } from "solid-js/store"
 import { Button } from "@opencode-ai/ui/button"
 import { DockTray } from "@opencode-ai/ui/dock-surface"
@@ -8,18 +8,11 @@ import { useLanguage } from "@/context/language"
 export function SessionRevertDock(props: {
  items: { id: string; text: string }[]
  restoring?: string
-  disabled?: boolean
  onRestore: (id: string) => void
 }) {
  const language = useLanguage()
  const [store, setStore] = createStore({
-    collapsed: true,
-  })
-
-  createEffect(() => {
-    props.items.length
-    props.items[0]?.id
-    setStore("collapsed", true)
+    collapsed: false,
  })

  const toggle = () => setStore("collapsed", (value) => !value)
@@ -75,16 +68,16 @@ export function SessionRevertDock(props: {
      </Show>

      <Show when={!store.collapsed}>
-        <div class="px-3 pb-7 flex flex-col gap-1.5 max-h-42 overflow-y-auto no-scrollbar">
+        <div class="px-3 pb-11 flex flex-col gap-1.5 max-h-42 overflow-y-auto no-scrollbar">
          <For each={props.items}>
            {(item) => (
-              <div class="flex items-center gap-2 min-w-0 py-1">
+              <div class="flex items-center gap-2 min-w-0 rounded-[10px] border border-border-weak-base bg-background-stronger px-2.5 py-2">
                <span class="min-w-0 flex-1 truncate text-13-regular text-text-strong">{item.text}</span>
                <Button
                  size="small"
                  variant="secondary"
                  class="shrink-0"
-                  disabled={props.disabled || !!props.restoring}
+                  disabled={!!props.restoring}
                  onClick={() => props.onRestore(item.id)}
                >
                  {language.t("session.revertDock.restore")}
--- a/packages/app/src/pages/session/composer/session-todo-dock.tsx
+++ b/packages/app/src/pages/session/composer/session-todo-dock.tsx
@@ -8,7 +8,6 @@ import { TextReveal } from "@opencode-ai/ui/text-reveal"
 import { TextStrikethrough } from "@opencode-ai/ui/text-strikethrough"
 import { Index, createEffect, createMemo, on, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"
-import { composerEnabled, composerProbe } from "@/testing/session-composer"

 function dot(status: Todo["status"]) {
  if (status !== "in_progress") return undefined
@@ -36,7 +35,6 @@ function dot(status: Todo["status"]) {
 }

 export function SessionTodoDock(props: {
-  sessionID?: string
  todos: Todo[]
  title: string
  collapseLabel: string
@@ -71,8 +69,6 @@ export function SessionTodoDock(props: {
  const off = createMemo(() => hide() > 0.98)
  const turn = createMemo(() => Math.max(0, Math.min(1, value())))
  const full = createMemo(() => Math.max(78, store.height))
-  const e2e = composerEnabled()
-  const probe = composerProbe(props.sessionID)
  let contentRef: HTMLDivElement | undefined

  createEffect(() => {
@@ -87,23 +83,6 @@ export function SessionTodoDock(props: {
    onCleanup(() => observer.disconnect())
  })

-  createEffect(() => {
-    if (!e2e) return
-
-    probe.set({
-      mounted: true,
-      collapsed: store.collapsed,
-      hidden: store.collapsed || off(),
-      count: props.todos.length,
-      states: props.todos.map((todo) => todo.status),
-    })
-  })
-
-  onCleanup(() => {
-    if (!e2e) return
-    probe.drop()
-  })
-
  return (
    <DockTray
      data-component="session-todo-dock"
--- a/packages/app/src/pages/session/message-timeline.tsx
+++ b/packages/app/src/pages/session/message-timeline.tsx
@@ -11,19 +11,15 @@ import { InlineInput } from "@opencode-ai/ui/inline-input"
 import { Spinner } from "@opencode-ai/ui/spinner"
 import { SessionTurn } from "@opencode-ai/ui/session-turn"
 import { ScrollView } from "@opencode-ai/ui/scroll-view"
-import { TextField } from "@opencode-ai/ui/text-field"
 import type { AssistantMessage, Message as MessageType, Part, TextPart, UserMessage } from "@opencode-ai/sdk/v2"
 import { showToast } from "@opencode-ai/ui/toast"
 import { Binary } from "@opencode-ai/util/binary"
 import { getFilename } from "@opencode-ai/util/path"
-import { Popover as KobaltePopover } from "@kobalte/core/popover"
 import { shouldMarkBoundaryGesture, normalizeWheelDelta } from "@/pages/session/message-gesture"
 import { SessionContextUsage } from "@/components/session-context-usage"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useLanguage } from "@/context/language"
 import { useSessionKey } from "@/pages/session/session-layout"
-import { useGlobalSDK } from "@/context/global-sdk"
-import { usePlatform } from "@/context/platform"
 import { useSettings } from "@/context/settings"
 import { useSDK } from "@/context/sdk"
 import { useSync } from "@/context/sync"
@@ -219,14 +215,12 @@ export function MessageTimeline(props: {
  let touchGesture: number | undefined

  const navigate = useNavigate()
-  const globalSDK = useGlobalSDK()
  const sdk = useSDK()
  const sync = useSync()
  const settings = useSettings()
  const dialog = useDialog()
  const language = useLanguage()
  const { params, sessionKey } = useSessionKey()
-  const platform = usePlatform()

  const rendered = createMemo(() => props.renderedUserMessages.map((message) => message.id))
  const sessionID = createMemo(() => params.id)
@@ -304,8 +298,6 @@ export function MessageTimeline(props: {
    return sync.session.get(id)
  })
  const titleValue = createMemo(() => info()?.title)
-  const shareUrl = createMemo(() => info()?.share?.url)
-  const shareEnabled = createMemo(() => sync.data.config.share !== "disabled")
  const parentID = createMemo(() => info()?.parentID)
  const showHeader = createMemo(() => !!(titleValue() || parentID()))
  const stageCfg = { init: 1, batch: 3 }
@@ -322,55 +314,9 @@ export function MessageTimeline(props: {
    saving: false,
    menuOpen: false,
    pendingRename: false,
-    pendingShare: false,
  })
  let titleRef: HTMLInputElement | undefined

-  const [share, setShare] = createStore({
-    open: false,
-    dismiss: null as "escape" | "outside" | null,
-  })
-
-  let more: HTMLButtonElement | undefined
-
-  const [req, setReq] = createStore({ share: false, unshare: false })
-
-  const shareSession = () => {
-    const id = sessionID()
-    if (!id || req.share) return
-    if (!shareEnabled()) return
-    setReq("share", true)
-    globalSDK.client.session
-      .share({ sessionID: id, directory: sdk.directory })
-      .catch((err: unknown) => {
-        console.error("Failed to share session", err)
-      })
-      .finally(() => {
-        setReq("share", false)
-      })
-  }
-
-  const unshareSession = () => {
-    const id = sessionID()
-    if (!id || req.unshare) return
-    if (!shareEnabled()) return
-    setReq("unshare", true)
-    globalSDK.client.session
-      .unshare({ sessionID: id, directory: sdk.directory })
-      .catch((err: unknown) => {
-        console.error("Failed to unshare session", err)
-      })
-      .finally(() => {
-        setReq("unshare", false)
-      })
-  }
-
-  const viewShare = () => {
-    const url = shareUrl()
-    if (!url) return
-    platform.openLink(url)
-  }
-
  const errorMessage = (err: unknown) => {
    if (err && typeof err === "object" && "data" in err) {
      const data = (err as { data?: { message?: string } }).data
@@ -383,15 +329,7 @@ export function MessageTimeline(props: {
  createEffect(
    on(
      sessionKey,
-      () =>
-        setTitle({
-          draft: "",
-          editing: false,
-          saving: false,
-          menuOpen: false,
-          pendingRename: false,
-          pendingShare: false,
-        }),
+      () => setTitle({ draft: "", editing: false, saving: false, menuOpen: false, pendingRename: false }),
      { defer: true },
    ),
  )
@@ -740,42 +678,23 @@ export function MessageTimeline(props: {
                          gutter={4}
                          placement="bottom-end"
                          open={title.menuOpen}
-                          onOpenChange={(open) => {
-                            setTitle("menuOpen", open)
-                            if (open) return
-                          }}
+                          onOpenChange={(open) => setTitle("menuOpen", open)}
                        >
                          <DropdownMenu.Trigger
                            as={IconButton}
                            icon="dot-grid"
                            variant="ghost"
                            class="size-6 rounded-md data-[expanded]:bg-surface-base-active"
-                            classList={{
-                              "bg-surface-base-active": share.open || title.pendingShare,
-                            }}
                            aria-label={language.t("common.moreOptions")}
-                            aria-expanded={title.menuOpen || share.open || title.pendingShare}
-                            ref={(el: HTMLButtonElement) => {
-                              more = el
-                            }}
                          />
                          <DropdownMenu.Portal>
                            <DropdownMenu.Content
                              style={{ "min-width": "104px" }}
                              onCloseAutoFocus={(event) => {
-                                if (title.pendingRename) {
-                                  event.preventDefault()
-                                  setTitle("pendingRename", false)
-                                  openTitleEditor()
-                                  return
-                                }
-                                if (title.pendingShare) {
-                                  event.preventDefault()
-                                  requestAnimationFrame(() => {
-                                    setShare({ open: true, dismiss: null })
-                                    setTitle("pendingShare", false)
-                                  })
-                                }
+                                if (!title.pendingRename) return
+                                event.preventDefault()
+                                setTitle("pendingRename", false)
+                                openTitleEditor()
                              }}
                            >
                              <DropdownMenu.Item
@@ -786,17 +705,6 @@ export function MessageTimeline(props: {
                              >
                                <DropdownMenu.ItemLabel>{language.t("common.rename")}</DropdownMenu.ItemLabel>
                              </DropdownMenu.Item>
-                              <Show when={shareEnabled()}>
-                                <DropdownMenu.Item
-                                  onSelect={() => {
-                                    setTitle({ pendingShare: true, menuOpen: false })
-                                  }}
-                                >
-                                  <DropdownMenu.ItemLabel>
-                                    {language.t("session.share.action.share")}
-                                  </DropdownMenu.ItemLabel>
-                                </DropdownMenu.Item>
-                              </Show>
                              <DropdownMenu.Item onSelect={() => void archiveSession(id())}>
                                <DropdownMenu.ItemLabel>{language.t("common.archive")}</DropdownMenu.ItemLabel>
                              </DropdownMenu.Item>
@@ -809,104 +717,6 @@ export function MessageTimeline(props: {
                            </DropdownMenu.Content>
                          </DropdownMenu.Portal>
                        </DropdownMenu>
-
-                        <KobaltePopover
-                          open={share.open}
-                          anchorRef={() => more}
-                          placement="bottom-end"
-                          gutter={4}
-                          modal={false}
-                          onOpenChange={(open) => {
-                            if (open) setShare("dismiss", null)
-                            setShare("open", open)
-                          }}
-                        >
-                          <KobaltePopover.Portal>
-                            <KobaltePopover.Content
-                              data-component="popover-content"
-                              style={{ "min-width": "320px" }}
-                              onEscapeKeyDown={(event) => {
-                                setShare({ dismiss: "escape", open: false })
-                                event.preventDefault()
-                                event.stopPropagation()
-                              }}
-                              onPointerDownOutside={() => {
-                                setShare({ dismiss: "outside", open: false })
-                              }}
-                              onFocusOutside={() => {
-                                setShare({ dismiss: "outside", open: false })
-                              }}
-                              onCloseAutoFocus={(event) => {
-                                if (share.dismiss === "outside") event.preventDefault()
-                                setShare("dismiss", null)
-                              }}
-                            >
-                              <div class="flex flex-col p-3">
-                                <div class="flex flex-col gap-1">
-                                  <div class="text-13-medium text-text-strong">
-                                    {language.t("session.share.popover.title")}
-                                  </div>
-                                  <div class="text-12-regular text-text-weak">
-                                    {shareUrl()
-                                      ? language.t("session.share.popover.description.shared")
-                                      : language.t("session.share.popover.description.unshared")}
-                                  </div>
-                                </div>
-                                <div class="mt-3 flex flex-col gap-2">
-                                  <Show
-                                    when={shareUrl()}
-                                    fallback={
-                                      <Button
-                                        size="large"
-                                        variant="primary"
-                                        class="w-full"
-                                        onClick={shareSession}
-                                        disabled={req.share}
-                                      >
-                                        {req.share
-                                          ? language.t("session.share.action.publishing")
-                                          : language.t("session.share.action.publish")}
-                                      </Button>
-                                    }
-                                  >
-                                    <div class="flex flex-col gap-2">
-                                      <TextField
-                                        value={shareUrl() ?? ""}
-                                        readOnly
-                                        copyable
-                                        copyKind="link"
-                                        tabIndex={-1}
-                                        class="w-full"
-                                      />
-                                      <div class="grid grid-cols-2 gap-2">
-                                        <Button
-                                          size="large"
-                                          variant="secondary"
-                                          class="w-full shadow-none border border-border-weak-base"
-                                          onClick={unshareSession}
-                                          disabled={req.unshare}
-                                        >
-                                          {req.unshare
-                                            ? language.t("session.share.action.unpublishing")
-                                            : language.t("session.share.action.unpublish")}
-                                        </Button>
-                                        <Button
-                                          size="large"
-                                          variant="primary"
-                                          class="w-full"
-                                          onClick={viewShare}
-                                          disabled={req.unshare}
-                                        >
-                                          {language.t("session.share.action.view")}
-                                        </Button>
-                                      </div>
-                                    </div>
-                                  </Show>
-                                </div>
-                              </div>
-                            </KobaltePopover.Content>
-                          </KobaltePopover.Portal>
-                        </KobaltePopover>
                      </div>
                    )}
                  </Show>
@@ -942,6 +752,12 @@ export function MessageTimeline(props: {
              <For each={rendered()}>
                {(messageID) => {
                  const active = createMemo(() => activeMessageID() === messageID)
+                  const queued = createMemo(() => {
+                    if (active()) return false
+                    const activeID = activeMessageID()
+                    if (activeID) return messageID > activeID
+                    return false
+                  })
                  const comments = createMemo(() => messageComments(sync.data.part[messageID] ?? []), [], {
                    equals: (a, b) => JSON.stringify(a) === JSON.stringify(b),
                  })
@@ -1001,6 +817,7 @@ export function MessageTimeline(props: {
                        messageID={messageID}
                        actions={props.actions}
                        active={active()}
+                        queued={queued()}
                        status={active() ? sessionStatus() : undefined}
                        showReasoningSummaries={settings.general.showReasoningSummaries()}
                        shellToolDefaultOpen={settings.general.shellToolPartsExpanded()}
--- a/packages/app/src/testing/session-composer.ts
+++ b/packages/app/src/testing/session-composer.ts
@@ -1,84 +0,0 @@
-import type { Todo } from "@opencode-ai/sdk/v2"
-
-export const composerEvent = "opencode:e2e:composer"
-
-export type ComposerDriverState = {
-  live?: boolean
-  todos?: Array<Pick<Todo, "content" | "status" | "priority">>
-}
-
-export type ComposerProbeState = {
-  mounted: boolean
-  collapsed: boolean
-  hidden: boolean
-  count: number
-  states: Todo["status"][]
-}
-
-type ComposerState = {
-  driver?: ComposerDriverState
-  probe?: ComposerProbeState
-}
-
-export type ComposerWindow = Window & {
-  __opencode_e2e?: {
-    composer?: {
-      enabled?: boolean
-      sessions?: Record<string, ComposerState>
-    }
-  }
-}
-
-const clone = (driver: ComposerDriverState) => ({
-  live: driver.live,
-  todos: driver.todos?.map((todo) => ({ ...todo })),
-})
-
-export const composerEnabled = () => {
-  if (typeof window === "undefined") return false
-  return (window as ComposerWindow).__opencode_e2e?.composer?.enabled === true
-}
-
-const root = () => {
-  if (!composerEnabled()) return
-  const state = (window as ComposerWindow).__opencode_e2e?.composer
-  if (!state) return
-  state.sessions ??= {}
-  return state.sessions
-}
-
-export const composerDriver = (sessionID?: string) => {
-  if (!sessionID) return
-  const state = root()?.[sessionID]?.driver
-  if (!state) return
-  return clone(state)
-}
-
-export const composerProbe = (sessionID?: string) => {
-  const set = (next: ComposerProbeState) => {
-    if (!sessionID) return
-    const sessions = root()
-    if (!sessions) return
-    const prev = sessions[sessionID] ?? {}
-    sessions[sessionID] = {
-      ...prev,
-      probe: {
-        ...next,
-        states: [...next.states],
-      },
-    }
-  }
-
-  return {
-    set,
-    drop() {
-      set({
-        mounted: false,
-        collapsed: false,
-        hidden: true,
-        count: 0,
-        states: [],
-      })
-    },
-  }
-}
--- a/packages/console/app/package.json
+++ b/packages/console/app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-app",
-  "version": "1.2.25",
+  "version": "1.2.24",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/console/app/src/component/icon.tsx
+++ b/packages/console/app/src/component/icon.tsx
@@ -76,14 +76,6 @@ export function IconAlipay(props: JSX.SvgSVGAttributes<SVGSVGElement>) {
  )
 }

-export function IconWechat(props: JSX.SvgSVGAttributes<SVGSVGElement>) {
-  return (
-    <svg {...props} viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-      <path d="M9.27099 14.6689C8.9532 14.8312 8.56403 14.7122 8.39132 14.4L8.3477 14.3054L6.53019 10.3069C6.52269 10.2588 6.52269 10.2097 6.53019 10.1615C6.53017 10.0735 6.56564 9.98916 6.62857 9.9276C6.6915 9.86603 6.7766 9.83243 6.86462 9.83438C6.93567 9.83269 7.00508 9.85582 7.06091 9.89981L9.24191 11.4265C9.40329 11.5346 9.59293 11.5928 9.78716 11.5937C9.90424 11.5945 10.0203 11.5723 10.1289 11.5283L20.176 7.02816C18.091 4.72544 15.1103 3.43931 12.0045 3.5022C6.4793 3.5022 2.00098 7.23172 2.00098 11.87C2.06681 14.4052 3.35646 16.7515 5.4615 18.1658C5.6878 18.3326 5.78402 18.6241 5.70141 18.8928L5.25067 20.594C5.22336 20.6714 5.20625 20.7521 5.19978 20.8339C5.19777 20.9232 5.23236 21.0094 5.29552 21.0726C5.35868 21.1358 5.44491 21.1703 5.5342 21.1684C5.60098 21.1645 5.66583 21.1445 5.72322 21.1102L7.90423 19.8452C8.06383 19.7467 8.2474 19.6939 8.43494 19.6925C8.53352 19.6923 8.63157 19.707 8.72574 19.7361C9.78781 20.0363 10.8863 20.188 11.99 20.1869C17.5152 20.1869 22.001 16.4574 22.001 11.8554C22.0108 10.4834 21.6301 9.13687 20.903 7.97326L9.35096 14.6253L9.27099 14.6689Z" />
-    </svg>
-  )
-}
-
 export function IconChevron(props: JSX.SvgSVGAttributes<SVGSVGElement>) {
  return (
    <svg {...props} width="8" height="6" viewBox="0 0 8 6" fill="none" xmlns="http://www.w3.org/2000/svg">
--- a/packages/console/app/src/i18n/ar.ts
+++ b/packages/console/app/src/i18n/ar.ts
@@ -541,7 +541,6 @@ export const dict = {
  "workspace.billing.addAction": "إضافة",
  "workspace.billing.addBalance": "إضافة رصيد",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "مرتبط بـ Stripe",
  "workspace.billing.manage": "إدارة",
  "workspace.billing.enable": "تمكين الفوترة",
--- a/packages/console/app/src/i18n/br.ts
+++ b/packages/console/app/src/i18n/br.ts
@@ -550,7 +550,6 @@ export const dict = {
  "workspace.billing.addAction": "Adicionar",
  "workspace.billing.addBalance": "Adicionar Saldo",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Vinculado ao Stripe",
  "workspace.billing.manage": "Gerenciar",
  "workspace.billing.enable": "Ativar Faturamento",
--- a/packages/console/app/src/i18n/da.ts
+++ b/packages/console/app/src/i18n/da.ts
@@ -546,7 +546,6 @@ export const dict = {
  "workspace.billing.addAction": "Tilføj",
  "workspace.billing.addBalance": "Tilføj saldo",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Forbundet til Stripe",
  "workspace.billing.manage": "Administrer",
  "workspace.billing.enable": "Aktiver fakturering",
--- a/packages/console/app/src/i18n/de.ts
+++ b/packages/console/app/src/i18n/de.ts
@@ -549,7 +549,6 @@ export const dict = {
  "workspace.billing.addAction": "Hinzufügen",
  "workspace.billing.addBalance": "Guthaben aufladen",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Mit Stripe verbunden",
  "workspace.billing.manage": "Verwalten",
  "workspace.billing.enable": "Abrechnung aktivieren",
--- a/packages/console/app/src/i18n/en.ts
+++ b/packages/console/app/src/i18n/en.ts
@@ -541,7 +541,6 @@ export const dict = {
  "workspace.billing.addAction": "Add",
  "workspace.billing.addBalance": "Add Balance",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Linked to Stripe",
  "workspace.billing.manage": "Manage",
  "workspace.billing.enable": "Enable Billing",
--- a/packages/console/app/src/i18n/es.ts
+++ b/packages/console/app/src/i18n/es.ts
@@ -550,7 +550,6 @@ export const dict = {
  "workspace.billing.addAction": "Añadir",
  "workspace.billing.addBalance": "Añadir Saldo",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Vinculado con Stripe",
  "workspace.billing.manage": "Gestionar",
  "workspace.billing.enable": "Habilitar Facturación",
--- a/packages/console/app/src/i18n/fr.ts
+++ b/packages/console/app/src/i18n/fr.ts
@@ -552,7 +552,6 @@ export const dict = {
  "workspace.billing.addAction": "Ajouter",
  "workspace.billing.addBalance": "Ajouter un solde",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Lié à Stripe",
  "workspace.billing.manage": "Gérer",
  "workspace.billing.enable": "Activer la facturation",
--- a/packages/console/app/src/i18n/it.ts
+++ b/packages/console/app/src/i18n/it.ts
@@ -548,7 +548,6 @@ export const dict = {
  "workspace.billing.addAction": "Aggiungi",
  "workspace.billing.addBalance": "Aggiungi Saldo",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Collegato a Stripe",
  "workspace.billing.manage": "Gestisci",
  "workspace.billing.enable": "Abilita Fatturazione",
--- a/packages/console/app/src/i18n/ja.ts
+++ b/packages/console/app/src/i18n/ja.ts
@@ -547,7 +547,6 @@ export const dict = {
  "workspace.billing.addAction": "追加",
  "workspace.billing.addBalance": "残高を追加",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Stripeと連携済み",
  "workspace.billing.manage": "管理",
  "workspace.billing.enable": "課金を有効にする",
--- a/packages/console/app/src/i18n/ko.ts
+++ b/packages/console/app/src/i18n/ko.ts
@@ -541,7 +541,6 @@ export const dict = {
  "workspace.billing.addAction": "추가",
  "workspace.billing.addBalance": "잔액 추가",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Stripe에 연결됨",
  "workspace.billing.manage": "관리",
  "workspace.billing.enable": "결제 활성화",
--- a/packages/console/app/src/i18n/no.ts
+++ b/packages/console/app/src/i18n/no.ts
@@ -547,7 +547,6 @@ export const dict = {
  "workspace.billing.addAction": "Legg til",
  "workspace.billing.addBalance": "Legg til saldo",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Koblet til Stripe",
  "workspace.billing.manage": "Administrer",
  "workspace.billing.enable": "Aktiver fakturering",
--- a/packages/console/app/src/i18n/pl.ts
+++ b/packages/console/app/src/i18n/pl.ts
@@ -548,7 +548,6 @@ export const dict = {
  "workspace.billing.addAction": "Dodaj",
  "workspace.billing.addBalance": "Doładuj saldo",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Połączono ze Stripe",
  "workspace.billing.manage": "Zarządzaj",
  "workspace.billing.enable": "Włącz rozliczenia",
--- a/packages/console/app/src/i18n/ru.ts
+++ b/packages/console/app/src/i18n/ru.ts
@@ -554,7 +554,6 @@ export const dict = {
  "workspace.billing.addAction": "Пополнить",
  "workspace.billing.addBalance": "Пополнить баланс",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Привязано к Stripe",
  "workspace.billing.manage": "Управление",
  "workspace.billing.enable": "Включить оплату",
--- a/packages/console/app/src/i18n/th.ts
+++ b/packages/console/app/src/i18n/th.ts
@@ -543,7 +543,6 @@ export const dict = {
  "workspace.billing.addAction": "เพิ่ม",
  "workspace.billing.addBalance": "เพิ่มยอดคงเหลือ",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "เชื่อมโยงกับ Stripe",
  "workspace.billing.manage": "จัดการ",
  "workspace.billing.enable": "เปิดใช้งานการเรียกเก็บเงิน",
--- a/packages/console/app/src/i18n/tr.ts
+++ b/packages/console/app/src/i18n/tr.ts
@@ -550,7 +550,6 @@ export const dict = {
  "workspace.billing.addAction": "Ekle",
  "workspace.billing.addBalance": "Bakiye Ekle",
  "workspace.billing.alipay": "Alipay",
-  "workspace.billing.wechat": "WeChat Pay",
  "workspace.billing.linkedToStripe": "Stripe'a bağlı",
  "workspace.billing.manage": "Yönet",
  "workspace.billing.enable": "Faturalandırmayı Etkinleştir",
--- a/packages/console/app/src/i18n/zh.ts
+++ b/packages/console/app/src/i18n/zh.ts
@@ -524,7 +524,6 @@ export const dict = {
  "workspace.billing.addAction": "充值",
  "workspace.billing.addBalance": "充值余额",
  "workspace.billing.alipay": "支付宝",
-  "workspace.billing.wechat": "微信支付",
  "workspace.billing.linkedToStripe": "已关联 Stripe",
  "workspace.billing.manage": "管理",
  "workspace.billing.enable": "启用计费",
--- a/packages/console/app/src/i18n/zht.ts
+++ b/packages/console/app/src/i18n/zht.ts
@@ -524,7 +524,6 @@ export const dict = {
  "workspace.billing.addAction": "儲值",
  "workspace.billing.addBalance": "儲值餘額",
  "workspace.billing.alipay": "支付寶",
-  "workspace.billing.wechat": "微信支付",
  "workspace.billing.linkedToStripe": "已連結 Stripe",
  "workspace.billing.manage": "管理",
  "workspace.billing.enable": "啟用帳務",
--- a/packages/console/app/src/routes/workspace/[id]/billing/billing-section.tsx
+++ b/packages/console/app/src/routes/workspace/[id]/billing/billing-section.tsx
@@ -3,7 +3,7 @@ import { createMemo, Match, Show, Switch, createEffect } from "solid-js"
 import { createStore } from "solid-js/store"
 import { Billing } from "@opencode-ai/console-core/billing.js"
 import { withActor } from "~/context/auth.withActor"
-import { IconAlipay, IconCreditCard, IconStripe, IconWechat } from "~/component/icon"
+import { IconAlipay, IconCreditCard, IconStripe } from "~/component/icon"
 import styles from "./billing-section.module.css"
 import { createCheckoutUrl, formatBalance, queryBillingInfo } from "../../common"
 import { useI18n } from "~/context/i18n"
@@ -208,9 +208,6 @@ export function BillingSection() {
                    <Match when={billingInfo()?.paymentMethodType === "alipay"}>
                      <IconAlipay style={{ width: "24px", height: "24px" }} />
                    </Match>
-                    <Match when={billingInfo()?.paymentMethodType === "wechat_pay"}>
-                      <IconWechat style={{ width: "24px", height: "24px" }} />
-                    </Match>
                  </Switch>
                </div>
                <div data-slot="card-details">
@@ -227,9 +224,6 @@ export function BillingSection() {
                    <Match when={billingInfo()?.paymentMethodType === "alipay"}>
                      <span data-slot="type">{i18n.t("workspace.billing.alipay")}</span>
                    </Match>
-                    <Match when={billingInfo()?.paymentMethodType === "wechat_pay"}>
-                      <span data-slot="type">{i18n.t("workspace.billing.wechat")}</span>
-                    </Match>
                  </Switch>
                </div>
                <button
--- a/packages/console/app/src/routes/zen/util/handler.ts
+++ b/packages/console/app/src/routes/zen/util/handler.ts
@@ -136,11 +136,6 @@ export async function handler(
            ...createBodyConverter(opts.format, providerInfo.format)(body),
            model: providerInfo.model,
            ...(providerInfo.payloadModifier ?? {}),
-            ...Object.fromEntries(
-              Object.entries(providerInfo.payloadMappings ?? {})
-                .map(([k, v]) => [k, input.request.headers.get(v)])
-                .filter(([_k, v]) => !!v),
-            ),
          },
          authInfo?.workspaceID,
        ),
--- a/packages/console/core/package.json
+++ b/packages/console/core/package.json
@@ -1,7 +1,7 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
  "name": "@opencode-ai/console-core",
-  "version": "1.2.25",
+  "version": "1.2.24",
  "private": true,
  "type": "module",
  "license": "MIT",
--- a/packages/console/core/src/billing.ts
+++ b/packages/console/core/src/billing.ts
@@ -213,10 +213,12 @@ export namespace Billing {
          enabled: true,
        },
        payment_method_options: {
+          alipay: {},
          card: {
            setup_future_usage: "on_session",
          },
        },
+        payment_method_types: ["card", "alipay"],
        //payment_method_data: {
        //  allow_redisplay: "always",
        //},
@@ -267,6 +269,7 @@ export namespace Billing {
              customer_email: email!,
            }),
        currency: "usd",
+        payment_method_types: ["card", "alipay"],
        tax_id_collection: {
          enabled: true,
        },
--- a/packages/console/core/src/model.ts
+++ b/packages/console/core/src/model.ts
@@ -36,7 +36,6 @@ export namespace ZenData {
        weight: z.number().optional(),
        disabled: z.boolean().optional(),
        storeModel: z.string().optional(),
-        payloadModifier: z.record(z.string(), z.any()).optional(),
      }),
    ),
  })
@@ -47,7 +46,6 @@ export namespace ZenData {
    format: FormatSchema.optional(),
    headerMappings: z.record(z.string(), z.string()).optional(),
    payloadModifier: z.record(z.string(), z.any()).optional(),
-    payloadMappings: z.record(z.string(), z.string()).optional(),
  })

  const ModelsSchema = z.object({
--- a/packages/console/function/package.json
+++ b/packages/console/function/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-function",
-  "version": "1.2.25",
+  "version": "1.2.24",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
--- a/packages/console/mail/package.json
+++ b/packages/console/mail/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/console-mail",
-  "version": "1.2.25",
+  "version": "1.2.24",
  "dependencies": {
    "@jsx-email/all": "2.2.3",
    "@jsx-email/cli": "1.4.3",
--- a/packages/desktop-electron/package.json
+++ b/packages/desktop-electron/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop-electron",
  "private": true,
-  "version": "1.2.25",
+  "version": "1.2.24",
  "type": "module",
  "license": "MIT",
  "homepage": "https://opencode.ai",
--- a/packages/desktop-electron/src/main/index.ts
+++ b/packages/desktop-electron/src/main/index.ts
@@ -5,7 +5,7 @@ import { createServer } from "node:net"
 import { homedir } from "node:os"
 import { join } from "node:path"
 import type { Event } from "electron"
-import { app, BrowserWindow, dialog } from "electron"
+import { app, type BrowserWindow, dialog } from "electron"
 import pkg from "electron-updater"

 const APP_NAMES: Record<string, string> = {
@@ -32,7 +32,7 @@ import { initLogging } from "./logging"
 import { parseMarkdown } from "./markdown"
 import { createMenu } from "./menu"
 import { getDefaultServerUrl, getWslConfig, setDefaultServerUrl, setWslConfig, spawnLocalServer } from "./server"
-import { createLoadingWindow, createMainWindow, setBackgroundColor, setDockIcon } from "./windows"
+import { createLoadingWindow, createMainWindow, setDockIcon } from "./windows"

 const initEmitter = new EventEmitter()
 let initStep: InitStep = { phase: "server_waiting" }
@@ -156,9 +156,12 @@ async function initialize() {

  const globals = {
    updaterEnabled: UPDATER_ENABLED,
+    wsl: getWslConfig().enabled,
    deepLinks: pendingDeepLinks,
  }

+  wireMenu()
+
  if (needsMigration) {
    const show = await Promise.race([loadingTask.then(() => false), delay(1_000).then(() => true)])
    if (show) {
@@ -175,7 +178,6 @@ async function initialize() {
  }

  mainWindow = createMainWindow(globals)
-  wireMenu()

  overlay?.close()
 }
@@ -229,7 +231,6 @@ registerIpcHandlers({
  runUpdater: async (alertOnFail) => checkForUpdates(alertOnFail),
  checkUpdate: async () => checkUpdate(),
  installUpdate: async () => installUpdate(),
-  setBackgroundColor: (color) => setBackgroundColor(color),
 })

 function killSidecar() {
--- a/packages/desktop-electron/src/main/ipc.ts
+++ b/packages/desktop-electron/src/main/ipc.ts
@@ -24,7 +24,6 @@ type Deps = {
  runUpdater: (alertOnFail: boolean) => Promise<void> | void
  checkUpdate: () => Promise<{ updateAvailable: boolean; version?: string }>
  installUpdate: () => Promise<void> | void
-  setBackgroundColor: (color: string) => void
 }

 export function registerIpcHandlers(deps: Deps) {
@@ -54,7 +53,6 @@ export function registerIpcHandlers(deps: Deps) {
  ipcMain.handle("run-updater", (_event: IpcMainInvokeEvent, alertOnFail: boolean) => deps.runUpdater(alertOnFail))
  ipcMain.handle("check-update", () => deps.checkUpdate())
  ipcMain.handle("install-update", () => deps.installUpdate())
-  ipcMain.handle("set-background-color", (_event: IpcMainInvokeEvent, color: string) => deps.setBackgroundColor(color))
  ipcMain.handle("store-get", (_event: IpcMainInvokeEvent, name: string, key: string) => {
    const store = getStore(name)
    const value = store.get(key)
@@ -142,8 +140,6 @@ export function registerIpcHandlers(deps: Deps) {
    new Notification({ title, body }).show()
  })

-  ipcMain.handle("get-window-count", () => BrowserWindow.getAllWindows().length)
-
  ipcMain.handle("get-window-focused", (event: IpcMainInvokeEvent) => {
    const win = BrowserWindow.fromWebContents(event.sender)
    return win?.isFocused() ?? false
--- a/packages/desktop-electron/src/main/menu.ts
+++ b/packages/desktop-electron/src/main/menu.ts
@@ -1,7 +1,6 @@
 import { BrowserWindow, Menu, shell } from "electron"

 import { UPDATER_ENABLED } from "./constants"
-import { createMainWindow } from "./windows"

 type Deps = {
  trigger: (id: string) => void
@@ -49,11 +48,6 @@ export function createMenu(deps: Deps) {
      submenu: [
        { label: "New Session", accelerator: "Shift+Cmd+S", click: () => deps.trigger("session.new") },
        { label: "Open Project...", accelerator: "Cmd+O", click: () => deps.trigger("project.open") },
-        {
-          label: "New Window",
-          accelerator: "Cmd+Shift+N",
-          click: () => createMainWindow({ updaterEnabled: UPDATER_ENABLED }),
-        },
        { type: "separator" },
        { role: "close" },
      ],
--- a/packages/desktop-electron/src/main/windows.ts
+++ b/packages/desktop-electron/src/main/windows.ts
@@ -6,21 +6,12 @@ import type { TitlebarTheme } from "../preload/types"

 type Globals = {
  updaterEnabled: boolean
+  wsl: boolean
  deepLinks?: string[]
 }

 const root = dirname(fileURLToPath(import.meta.url))

-let backgroundColor: string | undefined
-
-export function setBackgroundColor(color: string) {
-  backgroundColor = color
-}
-
-export function getBackgroundColor(): string | undefined {
-  return backgroundColor
-}
-
 function iconsDir() {
  return app.isPackaged ? join(process.resourcesPath, "icons") : join(root, "../../resources/icons")
 }
@@ -68,7 +59,6 @@ export function createMainWindow(globals: Globals) {
    show: true,
    title: "OpenCode",
    icon: iconPath(),
-    backgroundColor,
    ...(process.platform === "darwin"
      ? {
          titleBarStyle: "hidden" as const,
@@ -105,7 +95,6 @@ export function createLoadingWindow(globals: Globals) {
    center: true,
    show: true,
    icon: iconPath(),
-    backgroundColor,
    ...(process.platform === "darwin" ? { titleBarStyle: "hidden" as const } : {}),
    ...(process.platform === "win32"
      ? {
@@ -142,6 +131,7 @@ function injectGlobals(win: BrowserWindow, globals: Globals) {
    const deepLinks = globals.deepLinks ?? []
    const data = {
      updaterEnabled: globals.updaterEnabled,
+      wsl: globals.wsl,
      deepLinks: Array.isArray(deepLinks) ? deepLinks.splice(0) : deepLinks,
    }
    void win.webContents.executeJavaScript(
--- a/packages/desktop-electron/src/preload/index.ts
+++ b/packages/desktop-electron/src/preload/index.ts
@@ -28,7 +28,6 @@ const api: ElectronAPI = {
  storeKeys: (name) => ipcRenderer.invoke("store-keys", name),
  storeLength: (name) => ipcRenderer.invoke("store-length", name),

-  getWindowCount: () => ipcRenderer.invoke("get-window-count"),
  onSqliteMigrationProgress: (cb) => {
    const handler = (_: unknown, progress: SqliteMigrationProgress) => cb(progress)
    ipcRenderer.on("sqlite-migration-progress", handler)
@@ -63,7 +62,6 @@ const api: ElectronAPI = {
  runUpdater: (alertOnFail) => ipcRenderer.invoke("run-updater", alertOnFail),
  checkUpdate: () => ipcRenderer.invoke("check-update"),
  installUpdate: () => ipcRenderer.invoke("install-update"),
-  setBackgroundColor: (color: string) => ipcRenderer.invoke("set-background-color", color),
 }

 contextBridge.exposeInMainWorld("api", api)
--- a/packages/desktop-electron/src/preload/types.ts
+++ b/packages/desktop-electron/src/preload/types.ts
@@ -36,7 +36,6 @@ export type ElectronAPI = {
  storeKeys: (name: string) => Promise<string[]>
  storeLength: (name: string) => Promise<number>

-  getWindowCount: () => Promise<number>
  onSqliteMigrationProgress: (cb: (progress: SqliteMigrationProgress) => void) => () => void
  onMenuCommand: (cb: (id: string) => void) => () => void
  onDeepLink: (cb: (urls: string[]) => void) => () => void
@@ -67,5 +66,4 @@ export type ElectronAPI = {
  runUpdater: (alertOnFail: boolean) => Promise<void>
  checkUpdate: () => Promise<{ updateAvailable: boolean; version?: string }>
  installUpdate: () => Promise<void>
-  setBackgroundColor: (color: string) => Promise<void>
 }
--- a/packages/desktop-electron/src/renderer/index.tsx
+++ b/packages/desktop-electron/src/renderer/index.tsx
@@ -10,15 +10,14 @@ import {
  useCommand,
 } from "@opencode-ai/app"
 import type { AsyncStorage } from "@solid-primitives/storage"
-import { MemoryRouter } from "@solidjs/router"
-import { createEffect, createResource, onCleanup, onMount, Show } from "solid-js"
+import { createResource, onCleanup, onMount, Show } from "solid-js"
 import { render } from "solid-js/web"
+import { MemoryRouter } from "@solidjs/router"
 import pkg from "../../package.json"
 import { initI18n, t } from "./i18n"
 import { UPDATER_ENABLED } from "./updater"
 import { webviewZoom } from "./webview-zoom"
 import "./styles.css"
-import { useTheme } from "@opencode-ai/ui/theme"

 const root = document.getElementById("root")
 if (import.meta.env.DEV && !(root instanceof HTMLElement)) {
@@ -227,9 +226,7 @@ const createPlatform = (): Platform => {
      const image = await window.api.readClipboardImage().catch(() => null)
      if (!image) return null
      const blob = new Blob([image.buffer], { type: "image/png" })
-      return new File([blob], `pasted-image-${Date.now()}.png`, {
-        type: "image/png",
-      })
+      return new File([blob], `pasted-image-${Date.now()}.png`, { type: "image/png" })
    },
  }
 }
@@ -243,8 +240,6 @@ listenForDeepLinks()
 render(() => {
  const platform = createPlatform()

-  const [windowCount] = createResource(() => window.api.getWindowCount())
-
  // Fetch sidecar credentials (available immediately, before health check)
  const [sidecar] = createResource(() => window.api.awaitInitialization(() => undefined))

@@ -281,18 +276,6 @@ render(() => {
  function Inner() {
    const cmd = useCommand()
    menuTrigger = (id) => cmd.trigger(id)
-
-    const theme = useTheme()
-
-    createEffect(() => {
-      theme.themeId()
-      theme.mode()
-      const bg = getComputedStyle(document.documentElement).getPropertyValue("--background-base").trim()
-      if (bg) {
-        void window.api.setBackgroundColor(bg)
-      }
-    })
-
    return null
  }

@@ -306,14 +289,13 @@ render(() => {
  return (
    <PlatformProvider value={platform}>
      <AppBaseProviders>
-        <Show when={!defaultServer.loading && !sidecar.loading && !windowCount.loading}>
+        <Show when={!defaultServer.loading && !sidecar.loading}>
          {(_) => {
            return (
              <AppInterface
                defaultServer={defaultServer.latest ?? ServerConnection.Key.make("sidecar")}
                servers={servers()}
                router={MemoryRouter}
-                disableHealthCheck={(windowCount() ?? 0) > 1}
              >
                <Inner />
              </AppInterface>
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@opencode-ai/desktop",
  "private": true,
-  "version": "1.2.25",
+  "version": "1.2.24",
  "type": "module",
  "license": "MIT",
  "scripts": {
--- a/packages/desktop/src/menu.ts
+++ b/packages/desktop/src/menu.ts
@@ -1,11 +1,12 @@
 import { Menu, MenuItem, PredefinedMenuItem, Submenu } from "@tauri-apps/api/menu"
-import { openUrl } from "@tauri-apps/plugin-opener"
 import { type as ostype } from "@tauri-apps/plugin-os"
 import { relaunch } from "@tauri-apps/plugin-process"
-import { commands } from "./bindings"
+import { openUrl } from "@tauri-apps/plugin-opener"
+
+import { runUpdater, UPDATER_ENABLED } from "./updater"
 import { installCli } from "./cli"
 import { initI18n, t } from "./i18n"
-import { runUpdater, UPDATER_ENABLED } from "./updater"
+import { commands } from "./bindings"

 export async function createMenu(trigger: (id: string) => void) {
  if (ostype() !== "macos") return
--- a/packages/enterprise/package.json
+++ b/packages/enterprise/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/enterprise",
-  "version": "1.2.25",
+  "version": "1.2.24",
  "private": true,
  "type": "module",
  "license": "MIT",
--- a/packages/extensions/zed/extension.toml
+++ b/packages/extensions/zed/extension.toml
@@ -1,7 +1,7 @@
 id = "opencode"
 name = "OpenCode"
 description = "The open source coding agent."
-version = "1.2.25"
+version = "1.2.24"
 schema_version = 1
 authors = ["Anomaly"]
 repository = "https://github.com/anomalyco/opencode"
@@ -11,26 +11,26 @@ name = "OpenCode"
 icon = "./icons/opencode.svg"

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

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

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

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

 [agent_servers.opencode.targets.windows-x86_64]
-archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.25/opencode-windows-x64.zip"
+archive = "https://github.com/anomalyco/opencode/releases/download/v1.2.24/opencode-windows-x64.zip"
 cmd = "./opencode.exe"
 args = ["acp"]
--- a/packages/function/package.json
+++ b/packages/function/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@opencode-ai/function",
-  "version": "1.2.25",
+  "version": "1.2.24",
  "$schema": "https://json.schemastore.org/package.json",
  "private": true,
  "type": "module",
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -1,6 +1,6 @@
 {
  "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.2.25",
+  "version": "1.2.24",
  "name": "opencode",
  "type": "module",
  "license": "MIT",
--- a/packages/opencode/script/seed-e2e.ts
+++ b/packages/opencode/script/seed-e2e.ts
@@ -10,20 +10,15 @@ const now = Date.now()
 const seed = async () => {
  const { Instance } = await import("../src/project/instance")
  const { InstanceBootstrap } = await import("../src/project/bootstrap")
-  const { Config } = await import("../src/config/config")
  const { Session } = await import("../src/session")
  const { MessageID, PartID } = await import("../src/session/schema")
  const { Project } = await import("../src/project/project")
  const { ModelID, ProviderID } = await import("../src/provider/schema")
-  const { ToolRegistry } = await import("../src/tool/registry")

  await Instance.provide({
    directory: dir,
    init: InstanceBootstrap,
    fn: async () => {
-      await Config.waitForDependencies()
-      await ToolRegistry.ids()
-
      const session = await Session.create({ title })
      const messageID = MessageID.ascending()
      const partID = PartID.ascending()
--- a/packages/opencode/src/auth/index.ts
+++ b/packages/opencode/src/auth/index.ts
@@ -1,13 +1,9 @@
-import { Effect } from "effect"
+import path from "path"
+import { Global } from "../global"
 import z from "zod"
-import { runtime } from "@/effect/runtime"
-import * as S from "./service"
+import { Filesystem } from "../util/filesystem"

-export { OAUTH_DUMMY_KEY } from "./service"
-
-function runPromise<A>(f: (service: S.AuthService.Service) => Effect.Effect<A, S.AuthServiceError>) {
-  return runtime.runPromise(S.AuthService.use(f))
-}
+export const OAUTH_DUMMY_KEY = "opencode-oauth-dummy-key"

 export namespace Auth {
  export const Oauth = z
@@ -39,19 +35,39 @@ export namespace Auth {
  export const Info = z.discriminatedUnion("type", [Oauth, Api, WellKnown]).meta({ ref: "Auth" })
  export type Info = z.infer<typeof Info>

+  const filepath = path.join(Global.Path.data, "auth.json")
+
  export async function get(providerID: string) {
-    return runPromise((service) => service.get(providerID))
+    const auth = await all()
+    return auth[providerID]
  }

  export async function all(): Promise<Record<string, Info>> {
-    return runPromise((service) => service.all())
+    const data = await Filesystem.readJson<Record<string, unknown>>(filepath).catch(() => ({}))
+    return Object.entries(data).reduce(
+      (acc, [key, value]) => {
+        const parsed = Info.safeParse(value)
+        if (!parsed.success) return acc
+        acc[key] = parsed.data
+        return acc
+      },
+      {} as Record<string, Info>,
+    )
  }

  export async function set(key: string, info: Info) {
-    return runPromise((service) => service.set(key, info))
+    const normalized = key.replace(/\/+$/, "")
+    const data = await all()
+    if (normalized !== key) delete data[key]
+    delete data[normalized + "/"]
+    await Filesystem.writeJson(filepath, { ...data, [normalized]: info }, 0o600)
  }

  export async function remove(key: string) {
-    return runPromise((service) => service.remove(key))
+    const normalized = key.replace(/\/+$/, "")
+    const data = await all()
+    delete data[key]
+    delete data[normalized]
+    await Filesystem.writeJson(filepath, data, 0o600)
  }
 }
--- a/packages/opencode/src/auth/service.ts
+++ b/packages/opencode/src/auth/service.ts
@@ -1,101 +0,0 @@
-import path from "path"
-import { Effect, Layer, Record, Result, Schema, ServiceMap } from "effect"
-import { Global } from "../global"
-import { Filesystem } from "../util/filesystem"
-
-export const OAUTH_DUMMY_KEY = "opencode-oauth-dummy-key"
-
-export class Oauth extends Schema.Class<Oauth>("OAuth")({
-  type: Schema.Literal("oauth"),
-  refresh: Schema.String,
-  access: Schema.String,
-  expires: Schema.Number,
-  accountId: Schema.optional(Schema.String),
-  enterpriseUrl: Schema.optional(Schema.String),
-}) {}
-
-export class Api extends Schema.Class<Api>("ApiAuth")({
-  type: Schema.Literal("api"),
-  key: Schema.String,
-}) {}
-
-export class WellKnown extends Schema.Class<WellKnown>("WellKnownAuth")({
-  type: Schema.Literal("wellknown"),
-  key: Schema.String,
-  token: Schema.String,
-}) {}
-
-export const Info = Schema.Union([Oauth, Api, WellKnown])
-export type Info = Schema.Schema.Type<typeof Info>
-
-export class AuthServiceError extends Schema.TaggedErrorClass<AuthServiceError>()("AuthServiceError", {
-  message: Schema.String,
-  cause: Schema.optional(Schema.Defect),
-}) {}
-
-const file = path.join(Global.Path.data, "auth.json")
-
-const fail = (message: string) => (cause: unknown) => new AuthServiceError({ message, cause })
-
-export namespace AuthService {
-  export interface Service {
-    readonly get: (providerID: string) => Effect.Effect<Info | undefined, AuthServiceError>
-    readonly all: () => Effect.Effect<Record<string, Info>, AuthServiceError>
-    readonly set: (key: string, info: Info) => Effect.Effect<void, AuthServiceError>
-    readonly remove: (key: string) => Effect.Effect<void, AuthServiceError>
-  }
-}
-
-export class AuthService extends ServiceMap.Service<AuthService, AuthService.Service>()("@opencode/Auth") {
-  static readonly layer = Layer.effect(
-    AuthService,
-    Effect.gen(function* () {
-      const decode = Schema.decodeUnknownOption(Info)
-
-      const all = Effect.fn("AuthService.all")(() =>
-        Effect.tryPromise({
-          try: async () => {
-            const data = await Filesystem.readJson<Record<string, unknown>>(file).catch(() => ({}))
-            return Record.filterMap(data, (value) => Result.fromOption(decode(value), () => undefined))
-          },
-          catch: fail("Failed to read auth data"),
-        }),
-      )
-
-      const get = Effect.fn("AuthService.get")(function* (providerID: string) {
-        return (yield* all())[providerID]
-      })
-
-      const set = Effect.fn("AuthService.set")(function* (key: string, info: Info) {
-        const norm = key.replace(/\/+$/, "")
-        const data = yield* all()
-        if (norm !== key) delete data[key]
-        delete data[norm + "/"]
-        yield* Effect.tryPromise({
-          try: () => Filesystem.writeJson(file, { ...data, [norm]: info }, 0o600),
-          catch: fail("Failed to write auth data"),
-        })
-      })
-
-      const remove = Effect.fn("AuthService.remove")(function* (key: string) {
-        const norm = key.replace(/\/+$/, "")
-        const data = yield* all()
-        delete data[key]
-        delete data[norm]
-        yield* Effect.tryPromise({
-          try: () => Filesystem.writeJson(file, data, 0o600),
-          catch: fail("Failed to write auth data"),
-        })
-      })
-
-      return AuthService.of({
-        get,
-        all,
-        set,
-        remove,
-      })
-    }),
-  )
-
-  static readonly defaultLayer = AuthService.layer
-}
--- a/packages/opencode/src/bun/index.ts
+++ b/packages/opencode/src/bun/index.ts
@@ -4,6 +4,7 @@ import { Log } from "../util/log"
 import path from "path"
 import { Filesystem } from "../util/filesystem"
 import { NamedError } from "@opencode-ai/util/error"
+import { text } from "node:stream/consumers"
 import { Lock } from "../util/lock"
 import { PackageRegistry } from "./registry"
 import { proxied } from "@/util/proxied"
@@ -12,29 +13,32 @@ import { Process } from "../util/process"
 export namespace BunProc {
  const log = Log.create({ service: "bun" })

-  export async function run(cmd: string[], options?: Process.RunOptions) {
-    const full = [which(), ...cmd]
+  export async function run(cmd: string[], options?: Process.Options) {
    log.info("running", {
-      cmd: full,
+      cmd: [which(), ...cmd],
      ...options,
    })
-    const result = await Process.run(full, {
-      cwd: options?.cwd,
-      abort: options?.abort,
-      kill: options?.kill,
-      timeout: options?.timeout,
-      nothrow: options?.nothrow,
+    const result = Process.spawn([which(), ...cmd], {
+      ...options,
+      stdout: "pipe",
+      stderr: "pipe",
      env: {
        ...process.env,
        ...options?.env,
        BUN_BE_BUN: "1",
      },
    })
+    const code = await result.exited
+    const stdout = result.stdout ? await text(result.stdout) : undefined
+    const stderr = result.stderr ? await text(result.stderr) : undefined
    log.info("done", {
-      code: result.code,
-      stdout: result.stdout.toString(),
-      stderr: result.stderr.toString(),
+      code,
+      stdout,
+      stderr,
    })
+    if (code !== 0) {
+      throw new Error(`Command failed with exit code ${code}`)
+    }
    return result
  }

--- a/packages/opencode/src/cli/cmd/account.ts
+++ b/packages/opencode/src/cli/cmd/account.ts
@@ -192,28 +192,3 @@ export const OrgsCommand = cmd({
    await runtime.runPromise(orgsEffect())
  },
 })
-
-export const ConsoleCommand = cmd({
-  command: "console",
-  describe: false,
-  builder: (yargs) =>
-    yargs
-      .command({
-        ...LoginCommand,
-        describe: "log in to console",
-      })
-      .command({
-        ...LogoutCommand,
-        describe: "log out from console",
-      })
-      .command({
-        ...SwitchCommand,
-        describe: "switch active org",
-      })
-      .command({
-        ...OrgsCommand,
-        describe: "list orgs",
-      })
-      .demandCommand(),
-  async handler() {},
-})
--- a/packages/opencode/src/cli/cmd/providers.ts
+++ b/packages/opencode/src/cli/cmd/providers.ts
@@ -318,10 +318,10 @@ export const ProvidersLoginCommand = cmd({

        const priority: Record<string, number> = {
          opencode: 0,
-          openai: 1,
+          anthropic: 1,
          "github-copilot": 2,
-          google: 3,
-          anthropic: 4,
+          openai: 3,
+          google: 4,
          openrouter: 5,
          vercel: 6,
        }
--- a/packages/opencode/src/cli/cmd/tui/app.tsx
+++ b/packages/opencode/src/cli/cmd/tui/app.tsx
@@ -677,6 +677,20 @@ function App() {
    },
  ])

+  createEffect(() => {
+    const currentModel = local.model.current()
+    if (!currentModel) return
+    if (currentModel.providerID === "openrouter" && !kv.get("openrouter_warning", false)) {
+      untrack(() => {
+        DialogAlert.show(
+          dialog,
+          "Warning",
+          "While openrouter is a convenient way to access LLMs your request will often be routed to subpar providers that do not work well in our testing.\n\nFor reliable access to models check out OpenCode Zen\nhttps://opencode.ai/zen",
+        ).then(() => kv.set("openrouter_warning", true))
+      })
+    }
+  })
+
  sdk.event.on(TuiEvent.CommandExecute.type, (evt) => {
    command.trigger(evt.properties.command)
  })
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -36,7 +36,6 @@ import { iife } from "@/util/iife"
 import { Account } from "@/account"
 import { ConfigPaths } from "./paths"
 import { Filesystem } from "@/util/filesystem"
-import { Process } from "@/util/process"

 export namespace Config {
  const ModelId = z.string().meta({ $ref: "https://models.dev/model-schema.json#/$defs/Model" })
@@ -297,26 +296,6 @@ export namespace Config {
      ],
      { cwd: dir },
    ).catch((err) => {
-      if (err instanceof Process.RunFailedError) {
-        const detail = {
-          dir,
-          cmd: err.cmd,
-          code: err.code,
-          stdout: err.stdout.toString(),
-          stderr: err.stderr.toString(),
-        }
-        if (Flag.OPENCODE_STRICT_CONFIG_DEPS) {
-          log.error("failed to install dependencies", detail)
-          throw err
-        }
-        log.warn("failed to install dependencies", detail)
-        return
-      }
-
-      if (Flag.OPENCODE_STRICT_CONFIG_DEPS) {
-        log.error("failed to install dependencies", { dir, error: err })
-        throw err
-      }
      log.warn("failed to install dependencies", { dir, error: err })
    })
  }
--- a/packages/opencode/src/effect/runtime.ts
+++ b/packages/opencode/src/effect/runtime.ts
@@ -1,5 +1,4 @@
-import { Layer, ManagedRuntime } from "effect"
+import { ManagedRuntime } from "effect"
 import { AccountService } from "@/account/service"
-import { AuthService } from "@/auth/service"

-export const runtime = ManagedRuntime.make(Layer.mergeAll(AccountService.defaultLayer, AuthService.defaultLayer))
+export const runtime = ManagedRuntime.make(AccountService.defaultLayer)
--- a/Show More
+++ b/Show More