highlight clickable inline tools

Merge branch 'dev' into fix/subagent-navigation-inline-click
fix(app): preserve question dock state across session switches (#16173 )
2026-03-05 14:14:03 +00:00 · 2026-03-05 19:07:49 +05:30 · 2026-03-05 19:05:30 +05:30 · 2026-03-05 19:05:16 +05:30 · 2026-03-04 17:39:44 +05:30 · 2026-03-04 17:06:10 +05:30
191 changed files with 4214 additions and 14772 deletions
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -122,7 +122,3 @@ const table = sqliteTable("session", {
 - Avoid mocks as much as possible
 - Test actual implementation, do not duplicate logic into tests
 - Tests cannot run from repo root (guard: `do-not-run-tests-from-root`); run from package dirs like `packages/opencode`.
-
-## Type Checking
-
- Always run `bun typecheck` from package directories (e.g., `packages/opencode`), never `tsc` directly.
--- a/bun.lock
+++ b/bun.lock
--- a/github/index.ts
+++ b/github/index.ts
@@ -8,7 +8,6 @@ import type { Context as GitHubContext } from "@actions/github/lib/context"
 import type { IssueCommentEvent, PullRequestReviewCommentEvent } from "@octokit/webhooks-types"
 import { createOpencodeClient } from "@opencode-ai/sdk"
 import { spawn } from "node:child_process"
-import { setTimeout as sleep } from "node:timers/promises"

 type GitHubAuthor = {
  login: string
@@ -282,7 +281,7 @@ async function assertOpencodeConnected() {
      connected = true
      break
    } catch (e) {}
-    await sleep(300)
+    await Bun.sleep(300)
  } while (retry++ < 30)

  if (!connected) {
--- a/nix/hashes.json
+++ b/nix/hashes.json
@@ -1,8 +1,8 @@
 {
  "nodeModules": {
-    "x86_64-linux": "sha256-TnrYykX8Mf/Ugtkix6V",
-    "aarch64-linux": "sha256-TnrYykX8Mf/Ugtkix6V",
-    "aarch64-darwin": "sha256-TnrYykX8Mf/Ugtkix6V",
-    "x86_64-darwin": "sha256-TnrYykX8Mf/Ugtkix6V"
+    "x86_64-linux": "sha256-ZmxeRNy2chc9py4m1iW6B+c/NSccMnVZ0lfni/EMdHw=",
+    "aarch64-linux": "sha256-R+1mxsmAQicerN8ixVy0ff6V8bZ4GH18MHpihvWnaTg=",
+    "aarch64-darwin": "sha256-m+QT20ohlqo9e86qXu67eKthZm6VDRLwlqJ9CNlEV+0=",
+    "x86_64-darwin": "sha256-4GeNPyTT2Hq4rxHGSON23ul5Ud3yFGE0QUVsB03Gidc="
  }
 }
--- a/packages/app/e2e/actions.ts
+++ b/packages/app/e2e/actions.ts
@@ -8,7 +8,6 @@ import {
  sessionItemSelector,
  dropdownMenuTriggerSelector,
  dropdownMenuContentSelector,
-  sessionHeaderSelector,
  projectMenuTriggerSelector,
  projectWorkspacesToggleSelector,
  titlebarRightSelector,
@@ -226,9 +225,9 @@ export async function hoverSessionItem(page: Page, sessionID: string) {
 export async function openSessionMoreMenu(page: Page, sessionID: string) {
  await expect(page).toHaveURL(new RegExp(`/session/${sessionID}(?:[/?#]|$)`))

-  const header = page.locator(sessionHeaderSelector).first()
-  await expect(header).toBeVisible()
-  await expect(header.getByRole("heading", { level: 1 }).first()).toBeVisible({ timeout: 30_000 })
+  const scroller = page.locator(".scroll-view__viewport").first()
+  await expect(scroller).toBeVisible()
+  await expect(scroller.getByRole("heading", { level: 1 }).first()).toBeVisible({ timeout: 30_000 })

  const menu = page
    .locator(dropdownMenuContentSelector)
@@ -244,7 +243,7 @@ export async function openSessionMoreMenu(page: Page, sessionID: string) {

  if (opened) return menu

-  const menuTrigger = header.getByRole("button", { name: /more options/i }).first()
+  const menuTrigger = scroller.getByRole("button", { name: /more options/i }).first()
  await expect(menuTrigger).toBeVisible()
  await menuTrigger.click()

--- a/packages/app/e2e/selectors.ts
+++ b/packages/app/e2e/selectors.ts
@@ -53,8 +53,6 @@ export const dropdownMenuContentSelector = '[data-component="dropdown-menu-conte

 export const inlineInputSelector = '[data-component="inline-input"]'

-export const sessionHeaderSelector = "[data-session-title]"
-
 export const sessionItemSelector = (sessionID: string) => `${sidebarNavSelector} [data-session-id="${sessionID}"]`

 export const workspaceItemSelector = (slug: string) =>
--- a/packages/app/e2e/session/session.spec.ts
+++ b/packages/app/e2e/session/session.spec.ts
@@ -7,7 +7,7 @@ import {
  openSharePopover,
  withSession,
 } from "../actions"
-import { sessionHeaderSelector, sessionItemSelector, inlineInputSelector } from "../selectors"
+import { sessionItemSelector, inlineInputSelector } from "../selectors"

 const shareDisabled = process.env.OPENCODE_DISABLE_SHARE === "true" || process.env.OPENCODE_DISABLE_SHARE === "1"

@@ -44,7 +44,7 @@ test("session can be renamed via header menu", async ({ page, sdk, gotoSession }
    const menu = await openSessionMoreMenu(page, session.id)
    await clickMenuItem(menu, /rename/i)

-    const input = page.locator(sessionHeaderSelector).locator(inlineInputSelector).first()
+    const input = page.locator(".scroll-view__viewport").locator(inlineInputSelector).first()
    await expect(input).toBeVisible()
    await expect(input).toBeFocused()
    await input.fill(renamedTitle)
--- a/packages/app/src/api/releases.ts
+++ b/packages/app/src/api/releases.ts
@@ -1,50 +0,0 @@
-import type { Platform } from "@/context/platform"
-
-const REPO = "anomalyco/opencode"
-const GITHUB_API_URL = `https://api.github.com/repos/${REPO}/releases`
-const PER_PAGE = 30
-const CACHE_TTL = 1000 * 60 * 30
-const CACHE_KEY = "opencode.releases"
-
-type Release = {
-  tag: string
-  body: string
-  date: string
-}
-
-function loadCache() {
-  const raw = localStorage.getItem(CACHE_KEY)
-  return raw ? JSON.parse(raw) : null
-}
-
-function saveCache(data: { releases: Release[]; timestamp: number }) {
-  localStorage.setItem(CACHE_KEY, JSON.stringify(data))
-}
-
-export async function fetchReleases(platform: Platform): Promise<{ releases: Release[] }> {
-  const now = Date.now()
-  const cached = loadCache()
-
-  if (cached && now - cached.timestamp < CACHE_TTL) {
-    return { releases: cached.releases }
-  }
-
-  const fetcher = platform.fetch ?? fetch
-  const res = await fetcher(`${GITHUB_API_URL}?per_page=${PER_PAGE}`, {
-    headers: { Accept: "application/vnd.github.v3+json" },
-  }).then((r) => (r.ok ? r.json() : Promise.reject(new Error("Failed to load"))))
-
-  const releases = (Array.isArray(res) ? res : []).map((r) => ({
-    tag: r.tag_name ?? "Unknown",
-    body: (r.body ?? "")
-      .replace(/#(\d+)/g, (_: string, id: string) => `[#${id}](https://github.com/anomalyco/opencode/pull/${id})`)
-      .replace(/@([a-zA-Z0-9_-]+)/g, (_: string, u: string) => `[@${u}](https://github.com/${u})`),
-    date: r.published_at ?? "",
-  }))
-
-  saveCache({ releases, timestamp: now })
-
-  return { releases }
-}
-
-export type { Release }
--- a/packages/app/src/components/dialog-changelog.css
+++ b/packages/app/src/components/dialog-changelog.css
@@ -1,150 +0,0 @@
-.dialog-changelog {
-  min-height: 500px;
-  display: flex;
-  flex-direction: column;
-}
-
-.dialog-changelog [data-slot="dialog-body"] {
-  flex: 1;
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
-  min-height: 0;
-}
-
-.dialog-changelog-list {
-  flex: 1;
-  overflow: hidden;
-  display: flex;
-  flex-direction: column;
-  min-height: 0;
-}
-
-.dialog-changelog-list [data-slot="list-scroll"] {
-  flex: 1;
-  overflow-y: auto;
-  scrollbar-width: thin;
-  scrollbar-color: var(--border-weak-base) transparent;
-}
-
-.dialog-changelog-list [data-slot="list-scroll"]::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-}
-
-.dialog-changelog-list [data-slot="list-scroll"]::-webkit-scrollbar-track {
-  background: transparent;
-  border-radius: 5px;
-}
-
-.dialog-changelog-list [data-slot="list-scroll"]::-webkit-scrollbar-thumb {
-  background: var(--border-weak-base);
-  border-radius: 5px;
-  border: 3px solid transparent;
-  background-clip: padding-box;
-}
-
-.dialog-changelog-list [data-slot="list-scroll"]::-webkit-scrollbar-thumb:hover {
-  background: var(--border-weak-base);
-}
-
-.dialog-changelog-header {
-  padding: 8px 12px 8px 8px;
-  display: flex;
-  align-items: baseline;
-  gap: 8px;
-  position: sticky;
-  top: 0;
-  z-index: 10;
-  background: var(--surface-raised-stronger-non-alpha);
-}
-
-.dialog-changelog-header::after {
-  content: "";
-  position: absolute;
-  top: 100%;
-  left: 0;
-  right: 0;
-  height: 16px;
-  background: linear-gradient(to bottom, var(--surface-raised-stronger-non-alpha), transparent);
-  pointer-events: none;
-  opacity: 0;
-  transition: opacity 0.15s ease;
-}
-
-.dialog-changelog-header[data-stuck="true"]::after {
-  opacity: 1;
-}
-
-
-
-.dialog-changelog-version {
-  font-size: 20px;
-  font-weight: 600;
-}
-
-.dialog-changelog-date {
-  font-size: 12px;
-  font-weight: 400;
-  color: var(--text-weak);
-}
-
-.dialog-changelog-list [data-slot="list-item"] {
-  margin-bottom: 32px;
-  padding: 0;
-  border: none;
-  background: transparent;
-  cursor: default;
-  display: block;
-  text-align: left;
-}
-
-.dialog-changelog-list [data-slot="list-item"]:hover {
-  background: transparent;
-}
-
-.dialog-changelog-list [data-slot="list-item"]:focus {
-  outline: none;
-}
-
-.dialog-changelog-list [data-slot="list-item"]:focus-visible {
-  outline: 2px solid var(--focus-base);
-  outline-offset: 2px;
-}
-
-.dialog-changelog-content {
-  padding: 0 8px 24px;
-}
-
-.dialog-changelog-markdown h2 {
-  border-bottom: 1px solid var(--border-weak-base);
-  padding-bottom: 4px;
-  margin: 32px 0 12px 0;
-  font-size: 14px;
-  font-weight: 500;
-  text-transform: capitalize;
-}
-
-.dialog-changelog-markdown h2:first-child {
-  margin-top: 16px;
-}
-
-.dialog-changelog-markdown a.external-link {
-  color: var(--text-interactive-base);
-  font-weight: 500;
-}
-
-.dialog-changelog-markdown a.external-link[href^="https://github.com/anomalyco/opencode/pull/"],
-.dialog-changelog-markdown a.external-link[href^="https://github.com/anomalyco/opencode/issues/"],
-.dialog-changelog-markdown a.external-link[href^="https://github.com/"]
-{
-  border-radius: 3px;
-  padding: 0 2px;
-}
-
-.dialog-changelog-markdown a.external-link[href^="https://github.com/anomalyco/opencode/pull/"]:hover,
-.dialog-changelog-markdown a.external-link[href^="https://github.com/anomalyco/opencode/issues/"]:hover,
-.dialog-changelog-markdown a.external-link[href^="https://github.com/"]:hover
-{
-  background: var(--surface-weak-base);
-}
--- a/packages/app/src/components/dialog-changelog.tsx
+++ b/packages/app/src/components/dialog-changelog.tsx
@@ -1,43 +0,0 @@
-import { createResource, Suspense, ErrorBoundary, Show } from "solid-js"
-import { Dialog } from "@opencode-ai/ui/dialog"
-import { DataProvider } from "@opencode-ai/ui/context"
-import { useLanguage } from "@/context/language"
-import { usePlatform } from "@/context/platform"
-import { fetchReleases } from "@/api/releases"
-import { ReleaseList } from "@/components/release-list"
-
-export function DialogChangelog() {
-  const language = useLanguage()
-  const platform = usePlatform()
-  const [data] = createResource(() => fetchReleases(platform))
-
-  return (
-    <Dialog size="x-large" transition title="Changelog">
-      <DataProvider data={{ session: [], session_status: {}, session_diff: {}, message: {}, part: {} }} directory="">
-        <div class="flex-1 min-h-0 flex flex-col">
-          <ErrorBoundary
-            fallback={(e) => (
-              <p class="text-text-weak p-6">
-                {e instanceof Error ? e.message : "Failed to load changelog"}
-              </p>
-            )}
-          >
-            <Suspense fallback={<p class="text-text-weak p-6">{language.t("common.loading")}...</p>}>
-              <Show
-                when={(data()?.releases.length ?? 0) > 0}
-                fallback={<p class="text-text-weak p-6">{language.t("common.noReleasesFound")}</p>}
-              >
-                <ReleaseList
-                  releases={data()!.releases}
-                  hasMore={false}
-                  loadingMore={false}
-                  onLoadMore={() => {}}
-                />
-              </Show>
-            </Suspense>
-          </ErrorBoundary>
-        </div>
-      </DataProvider>
-    </Dialog>
-  )
-}
--- a/packages/app/src/components/dialog-select-file.tsx
+++ b/packages/app/src/components/dialog-select-file.tsx
@@ -459,4 +459,4 @@ export function DialogSelectFile(props: { mode?: DialogSelectFileMode; onOpenFil
      </List>
    </Dialog>
  )
-}
+}
--- a/packages/app/src/components/dialog-settings.tsx
+++ b/packages/app/src/components/dialog-settings.tsx
@@ -2,25 +2,16 @@ import { Component } from "solid-js"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { Tabs } from "@opencode-ai/ui/tabs"
 import { Icon } from "@opencode-ai/ui/icon"
-import { Button } from "@opencode-ai/ui/button"
 import { useLanguage } from "@/context/language"
 import { usePlatform } from "@/context/platform"
-import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { SettingsGeneral } from "./settings-general"
 import { SettingsKeybinds } from "./settings-keybinds"
 import { SettingsProviders } from "./settings-providers"
 import { SettingsModels } from "./settings-models"
-import { SettingsArchive } from "./settings-archive"
-import { DialogChangelog } from "@/components/dialog-changelog"

 export const DialogSettings: Component = () => {
  const language = useLanguage()
  const platform = usePlatform()
-  const dialog = useDialog()
-
-  function handleShowChangelog() {
-    dialog.show(() => <DialogChangelog />)
-  }

  return (
    <Dialog size="x-large" transition>
@@ -56,27 +47,11 @@ export const DialogSettings: Component = () => {
                    </Tabs.Trigger>
                  </div>
                </div>
-
-                <div class="flex flex-col gap-1.5">
-                  <Tabs.SectionTitle>{language.t("settings.section.data")}</Tabs.SectionTitle>
-                  <div class="flex flex-col gap-1.5 w-full">
-                    <Tabs.Trigger value="archive">
-                      <Icon name="archive" />
-                      {language.t("settings.archive.title")}
-                    </Tabs.Trigger>
-                  </div>
-                </div>
              </div>
            </div>
            <div class="flex flex-col gap-1 pl-1 py-1 text-12-medium text-text-weak">
              <span>{language.t("app.name.desktop")}</span>
              <span class="text-11-regular">v{platform.version}</span>
-              <button
-                class="text-11-regular text-text-weak hover:text-text-base self-start"
-                onClick={handleShowChangelog}
-              >
-                Changelog
-              </button>
            </div>
          </div>
        </Tabs.List>
@@ -92,9 +67,6 @@ export const DialogSettings: Component = () => {
        <Tabs.Content value="models" class="no-scrollbar">
          <SettingsModels />
        </Tabs.Content>
-        <Tabs.Content value="archive" class="no-scrollbar">
-          <SettingsArchive />
-        </Tabs.Content>
      </Tabs>
    </Dialog>
  )
--- a/packages/app/src/components/prompt-input.tsx
+++ b/packages/app/src/components/prompt-input.tsx
@@ -256,17 +256,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
    pendingAutoAccept: false,
  })

-  const buttonsSpring = useSpring(
-    () => (store.mode === "normal" ? 1 : 0),
-    { visualDuration: 0.2, bounce: 0 },
-  )
-
-  const springFade = (t: number): Record<string, string> => ({
-    opacity: `${t}`,
-    transform: `scale(${0.95 + t * 0.05})`,
-    filter: `blur(${(1 - t) * 2}px)`,
-    "pointer-events": t > 0.5 ? "auto" : "none",
-  })
+  const buttonsSpring = useSpring(() => (store.mode === "normal" ? 1 : 0), { visualDuration: 0.2, bounce: 0 })

  const commentCount = createMemo(() => {
    if (store.mode === "shell") return 0
@@ -1264,7 +1254,9 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
            <div
              aria-hidden={store.mode !== "normal"}
              class="flex items-center gap-1"
-              style={{ "pointer-events": buttonsSpring() > 0.5 ? "auto" : "none" }}
+              style={{
+                "pointer-events": buttonsSpring() > 0.5 ? "auto" : "none",
+              }}
            >
              <TooltipKeybind
                placement="top"
@@ -1276,7 +1268,11 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                  type="button"
                  variant="ghost"
                  class="size-8 p-0"
-                  style={springFade(buttonsSpring())}
+                  style={{
+                    opacity: buttonsSpring(),
+                    transform: `scale(${0.95 + buttonsSpring() * 0.05})`,
+                    filter: `blur(${(1 - buttonsSpring()) * 2}px)`,
+                  }}
                  onClick={pick}
                  disabled={store.mode !== "normal"}
                  tabIndex={store.mode === "normal" ? undefined : -1}
@@ -1314,7 +1310,11 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                  icon={working() ? "stop" : "arrow-up"}
                  variant="primary"
                  class="size-8"
-                  style={springFade(buttonsSpring())}
+                  style={{
+                    opacity: buttonsSpring(),
+                    transform: `scale(${0.95 + buttonsSpring() * 0.05})`,
+                    filter: `blur(${(1 - buttonsSpring()) * 2}px)`,
+                  }}
                  aria-label={working() ? language.t("prompt.action.stop") : language.t("prompt.action.send")}
                />
              </Tooltip>
@@ -1370,7 +1370,13 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
            <div class="flex items-center gap-1.5 min-w-0 flex-1 relative">
              <div
                class="h-7 flex items-center gap-1.5 max-w-[160px] min-w-0 absolute inset-y-0 left-0"
-                style={{ padding: "0 4px 0 8px", ...springFade(1 - buttonsSpring()) }}
+                style={{
+                  padding: "0 4px 0 8px",
+                  opacity: 1 - buttonsSpring(),
+                  transform: `scale(${0.95 + (1 - buttonsSpring()) * 0.05})`,
+                  filter: `blur(${buttonsSpring() * 2}px)`,
+                  "pointer-events": buttonsSpring() < 0.5 ? "auto" : "none",
+                }}
              >
                <span class="truncate text-13-medium text-text-strong">{language.t("prompt.mode.shell")}</span>
                <div class="size-4 shrink-0" />
@@ -1389,7 +1395,13 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                    onSelect={local.agent.set}
                    class="capitalize max-w-[160px]"
                    valueClass="truncate text-13-regular"
-                    triggerStyle={{ height: "28px", ...springFade(buttonsSpring()) }}
+                    triggerStyle={{
+                      height: "28px",
+                      opacity: buttonsSpring(),
+                      transform: `scale(${0.95 + buttonsSpring() * 0.05})`,
+                      filter: `blur(${(1 - buttonsSpring()) * 2}px)`,
+                      "pointer-events": buttonsSpring() > 0.5 ? "auto" : "none",
+                    }}
                    variant="ghost"
                  />
                </TooltipKeybind>
@@ -1407,7 +1419,13 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                        variant="ghost"
                        size="normal"
                        class="min-w-0 max-w-[320px] text-13-regular group"
-                        style={{ height: "28px", ...springFade(buttonsSpring()) }}
+                        style={{
+                          height: "28px",
+                          opacity: buttonsSpring(),
+                          transform: `scale(${0.95 + buttonsSpring() * 0.05})`,
+                          filter: `blur(${(1 - buttonsSpring()) * 2}px)`,
+                          "pointer-events": buttonsSpring() > 0.5 ? "auto" : "none",
+                        }}
                        onClick={() => dialog.show(() => <DialogSelectModelUnpaid />)}
                      >
                        <Show when={local.model.current()?.provider?.id}>
@@ -1436,7 +1454,13 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                      triggerProps={{
                        variant: "ghost",
                        size: "normal",
-                        style: { height: "28px", ...springFade(buttonsSpring()) },
+                        style: {
+                          height: "28px",
+                          opacity: buttonsSpring(),
+                          transform: `scale(${0.95 + buttonsSpring() * 0.05})`,
+                          filter: `blur(${(1 - buttonsSpring()) * 2}px)`,
+                          "pointer-events": buttonsSpring() > 0.5 ? "auto" : "none",
+                        },
                        class: "min-w-0 max-w-[320px] text-13-regular group",
                      }}
                    >
@@ -1468,7 +1492,13 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
                    onSelect={(x) => local.model.variant.set(x === "default" ? undefined : x)}
                    class="capitalize max-w-[160px]"
                    valueClass="truncate text-13-regular"
-                    triggerStyle={{ height: "28px", ...springFade(buttonsSpring()) }}
+                    triggerStyle={{
+                      height: "28px",
+                      opacity: buttonsSpring(),
+                      transform: `scale(${0.95 + buttonsSpring() * 0.05})`,
+                      filter: `blur(${(1 - buttonsSpring()) * 2}px)`,
+                      "pointer-events": buttonsSpring() > 0.5 ? "auto" : "none",
+                    }}
                    variant="ghost"
                  />
                </TooltipKeybind>
--- a/packages/app/src/components/prompt-input/submit.ts
+++ b/packages/app/src/components/prompt-input/submit.ts
@@ -1,9 +1,8 @@
 import type { Message } from "@opencode-ai/sdk/v2/client"
 import { showToast } from "@opencode-ai/ui/toast"
 import { base64Encode } from "@opencode-ai/util/encode"
-import { errorMessage } from "@/pages/layout/helpers"
 import { useNavigate, useParams } from "@solidjs/router"
-import { batch, type Accessor } from "solid-js"
+import type { Accessor } from "solid-js"
 import type { FileSelection } from "@/context/file"
 import { useGlobalSync } from "@/context/global-sync"
 import { useLanguage } from "@/context/language"
@@ -66,7 +65,14 @@ export function createPromptSubmit(input: PromptSubmitInput) {
  const language = useLanguage()
  const params = useParams()

-  const toastError = (err: unknown) => errorMessage(err, language.t("common.requestFailed"))
+  const errorMessage = (err: unknown) => {
+    if (err && typeof err === "object" && "data" in err) {
+      const data = (err as { data?: { message?: string } }).data
+      if (data?.message) return data.message
+    }
+    if (err instanceof Error) return err.message
+    return language.t("common.requestFailed")
+  }

  const abort = async () => {
    const sessionID = params.id
@@ -152,7 +158,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
          .catch((err) => {
            showToast({
              title: language.t("prompt.toast.worktreeCreateFailed.title"),
-              description: toastError(err),
+              description: errorMessage(err),
            })
            return undefined
          })
@@ -191,7 +197,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
        .catch((err) => {
          showToast({
            title: language.t("prompt.toast.sessionCreateFailed.title"),
-            description: toastError(err),
+            description: errorMessage(err),
          })
          return undefined
        })
@@ -249,7 +255,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
        .catch((err) => {
          showToast({
            title: language.t("prompt.toast.shellSendFailed.title"),
-            description: toastError(err),
+            description: errorMessage(err),
          })
          restoreInput()
        })
@@ -327,14 +333,9 @@ export function createPromptSubmit(input: PromptSubmitInput) {
        messageID,
      })

-    batch(() => {
-      removeCommentItems(commentItems)
-      clearInput()
-      if (sessionDirectory === projectDirectory) {
-        sync.set("session_status", session.id, { type: "busy" })
-      }
-      addOptimisticMessage()
-    })
+    removeCommentItems(commentItems)
+    clearInput()
+    addOptimisticMessage()

    const waitForWorktree = async () => {
      const worktree = WorktreeState.get(sessionDirectory)
@@ -411,7 +412,7 @@ export function createPromptSubmit(input: PromptSubmitInput) {
      }
      showToast({
        title: language.t("prompt.toast.promptSendFailed.title"),
-        description: toastError(err),
+        description: errorMessage(err),
      })
      removeOptimisticMessage()
      restoreCommentItems(commentItems)
--- a/packages/app/src/components/release-list.tsx
+++ b/packages/app/src/components/release-list.tsx
@@ -1,61 +0,0 @@
-import { Component } from "solid-js"
-import { List } from "@opencode-ai/ui/list"
-import { Markdown } from "@opencode-ai/ui/markdown"
-import { Button } from "@opencode-ai/ui/button"
-import { Tag } from "@opencode-ai/ui/tag"
-import { useLanguage } from "@/context/language"
-import { getRelativeTime } from "@/utils/time"
-
-type Release = {
-  tag: string
-  body: string
-  date: string
-}
-
-interface ReleaseListProps {
-  releases: Release[]
-  hasMore: boolean
-  loadingMore: boolean
-  onLoadMore: () => void
-}
-
-export const ReleaseList: Component<ReleaseListProps> = (props) => {
-  const language = useLanguage()
-
-  return (
-    <List
-      items={props.releases}
-      key={(x) => x.tag}
-      search={false}
-      emptyMessage="No releases found"
-      loadingMessage={language.t("common.loading")}
-      class="flex-1 min-h-0 overflow-hidden flex flex-col [&_[data-slot=list-scroll]]:session-scroller [&_[data-slot=list-item]]:block [&_[data-slot=list-item]]:p-0 [&_[data-slot=list-item]]:border-0 [&_[data-slot=list-item]]:bg-transparent [&_[data-slot=list-item]]:text-left [&_[data-slot=list-item]]:cursor-default [&_[data-slot=list-item]]:hover:bg-transparent [&_[data-slot=list-item]]:focus:outline-none"
-      add={{
-        render: () =>
-          props.hasMore ? (
-            <div class="p-4 flex justify-center">
-              <Button variant="secondary" size="small" onClick={props.onLoadMore} loading={props.loadingMore}>
-                {language.t("common.loadMore")}
-              </Button>
-            </div>
-          ) : null,
-      }}
-    >
-      {(item) => (
-        <div class="mb-8">
-          <div class="py-2 pr-3 pl-2 flex items-baseline gap-2 sticky top-0 z-10 bg-surface-raised-stronger-non-alpha">
-            <span class="text-[20px] font-semibold">{item.tag}</span>
-            <span class="text-xs text-text-weak">{item.date ? getRelativeTime(item.date, language.t) : ""}</span>
-            {item.tag === props.releases[0]?.tag && <Tag>{language.t("changelog.tag.latest")}</Tag>}
-          </div>
-          <div class="px-2 pb-2">
-            <Markdown
-              text={item.body}
-              class="prose prose-sm max-w-none text-text-base [&_h2]:border-b [&_h2]:border-border-weak-base [&_h2]:pb-1 [&_h2]:mt-8 [&_h2]:mb-3 [&_h2]:text-sm [&_h2]:font-medium [&_h2]:capitalize [&_h2:first-child]:mt-4 [&_a.external-link]:text-text-interactive-base [&_a.external-link]:font-medium"
-            />
-          </div>
-        </div>
-      )}
-    </List>
-  )
-}
--- a/packages/app/src/components/session/find-assistant-messages.test.ts
+++ b/packages/app/src/components/session/find-assistant-messages.test.ts
@@ -1,81 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import type { Message } from "@opencode-ai/sdk/v2/client"
-import { findAssistantMessages } from "@opencode-ai/ui/find-assistant-messages"
-
-function user(id: string): Message {
-  return {
-    id,
-    role: "user",
-    sessionID: "session-1",
-    time: { created: 1 },
-  } as unknown as Message
-}
-
-function assistant(id: string, parentID: string): Message {
-  return {
-    id,
-    role: "assistant",
-    sessionID: "session-1",
-    parentID,
-    time: { created: 1 },
-  } as unknown as Message
-}
-
-describe("findAssistantMessages", () => {
-  test("normal ordering: assistant after user in array → found via forward scan", () => {
-    const messages = [user("u1"), assistant("a1", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("clock skew: assistant before user in array → found via backward scan", () => {
-    // When client clock is ahead, user ID sorts after assistant ID,
-    // so assistant appears earlier in the ID-sorted message array
-    const messages = [assistant("a1", "u1"), user("u1")]
-    const result = findAssistantMessages(messages, 1, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("no assistant messages → returns empty array", () => {
-    const messages = [user("u1"), user("u2")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(0)
-  })
-
-  test("multiple assistant messages with matching parentID → all found", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), assistant("a2", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(2)
-    expect(result[0].id).toBe("a1")
-    expect(result[1].id).toBe("a2")
-  })
-
-  test("does not return assistant messages with different parentID", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), assistant("a2", "other")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("stops forward scan at next user message", () => {
-    const messages = [user("u1"), assistant("a1", "u1"), user("u2"), assistant("a2", "u1")]
-    const result = findAssistantMessages(messages, 0, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("stops backward scan at previous user message", () => {
-    const messages = [assistant("a0", "u1"), user("u0"), assistant("a1", "u1"), user("u1")]
-    const result = findAssistantMessages(messages, 3, "u1")
-    expect(result).toHaveLength(1)
-    expect(result[0].id).toBe("a1")
-  })
-
-  test("invalid index returns empty array", () => {
-    const messages = [user("u1")]
-    expect(findAssistantMessages(messages, -1, "u1")).toHaveLength(0)
-    expect(findAssistantMessages(messages, 5, "u1")).toHaveLength(0)
-  })
-})
--- a/packages/app/src/components/session/session-context-tab.tsx
+++ b/packages/app/src/components/session/session-context-tab.tsx
@@ -4,7 +4,8 @@ import { useParams } from "@solidjs/router"
 import { useSync } from "@/context/sync"
 import { useLayout } from "@/context/layout"
 import { checksum } from "@opencode-ai/util/encode"
-import { findLast, same } from "@opencode-ai/util/array"
+import { findLast } from "@opencode-ai/util/array"
+import { same } from "@/utils/same"
 import { Icon } from "@opencode-ai/ui/icon"
 import { Accordion } from "@opencode-ai/ui/accordion"
 import { StickyAccordionHeader } from "@opencode-ai/ui/sticky-accordion-header"
--- a/packages/app/src/components/settings-archive.tsx
+++ b/packages/app/src/components/settings-archive.tsx
@@ -1,188 +0,0 @@
-import { Button } from "@opencode-ai/ui/button"
-import { Icon } from "@opencode-ai/ui/icon"
-import { RadioGroup } from "@opencode-ai/ui/radio-group"
-import { getFilename } from "@opencode-ai/util/path"
-import { Component, For, Show, createMemo, createResource, createSignal } from "solid-js"
-import { useParams } from "@solidjs/router"
-import { useGlobalSDK } from "@/context/global-sdk"
-import { useGlobalSync } from "@/context/global-sync"
-import { useLanguage } from "@/context/language"
-import { useLayout } from "@/context/layout"
-import { getRelativeTime } from "@/utils/time"
-import { decode64 } from "@/utils/base64"
-import type { Session } from "@opencode-ai/sdk/v2/client"
-import { SessionSkeleton } from "@/pages/layout/sidebar-items"
-
-type FilterScope = "all" | "current"
-
-type ScopeOption = { value: FilterScope; label: "settings.archive.scope.all" | "settings.archive.scope.current" }
-
-const scopeOptions: ScopeOption[] = [
-  { value: "all", label: "settings.archive.scope.all" },
-  { value: "current", label: "settings.archive.scope.current" },
-]
-
-export const SettingsArchive: Component = () => {
-  const language = useLanguage()
-  const globalSDK = useGlobalSDK()
-  const globalSync = useGlobalSync()
-  const layout = useLayout()
-  const params = useParams()
-  const [removedIds, setRemovedIds] = createSignal<Set<string>>(new Set())
-
-  const projects = createMemo(() => globalSync.data.project)
-  const layoutProjects = createMemo(() => layout.projects.list())
-  const hasMultipleProjects = createMemo(() => projects().length > 1)
-  const homedir = createMemo(() => globalSync.data.path.home)
-
-  const defaultScope = () => (hasMultipleProjects() ? "current" : "all")
-  const [filterScope, setFilterScope] = createSignal<FilterScope>(defaultScope())
-
-  const currentDirectory = createMemo(() => decode64(params.dir) ?? "")
-
-  const currentProject = createMemo(() => {
-    const dir = currentDirectory()
-    if (!dir) return null
-    return layoutProjects().find((p) => p.worktree === dir || p.sandboxes?.includes(dir)) ?? null
-  })
-
-  const filteredProjects = createMemo(() => {
-    if (filterScope() === "current" && currentProject()) {
-      return [currentProject()!]
-    }
-    return layoutProjects()
-  })
-
-  const getSessionLabel = (session: Session) => {
-    const directory = session.directory
-    const home = homedir()
-    const path = home ? directory.replace(home, "~") : directory
-
-    if (filterScope() === "current" && currentProject()) {
-      const current = currentProject()
-      const kind =
-        current && directory === current.worktree
-          ? language.t("workspace.type.local")
-          : language.t("workspace.type.sandbox")
-      const [store] = globalSync.child(directory, { bootstrap: false })
-      const name = store.vcs?.branch ?? getFilename(directory)
-      return `${kind} : ${name || path}`
-    }
-
-    return path
-  }
-
-  const [archivedSessions] = createResource(
-    () => ({ scope: filterScope(), projects: filteredProjects() }),
-    async ({ projects }) => {
-      const allSessions: Session[] = []
-      for (const project of projects) {
-        const directories = [project.worktree, ...(project.sandboxes ?? [])]
-        for (const directory of directories) {
-          const result = await globalSDK.client.experimental.session.list({ directory, archived: true })
-          const sessions = result.data ?? []
-          for (const session of sessions) {
-            allSessions.push(session)
-          }
-        }
-      }
-      return allSessions.sort((a, b) => (b.time?.updated ?? 0) - (a.time?.updated ?? 0))
-    },
-    { initialValue: [] },
-  )
-
-  const displayedSessions = () => {
-    const sessions = archivedSessions() ?? []
-    const removed = removedIds()
-    return sessions.filter((s) => !removed.has(s.id))
-  }
-
-  const currentScopeOption = () => scopeOptions.find((o) => o.value === filterScope())
-
-  const unarchiveSession = async (session: Session) => {
-    setRemovedIds((prev) => new Set(prev).add(session.id))
-    await globalSDK.client.session.update({
-      directory: session.directory,
-      sessionID: session.id,
-      time: { archived: null as any },
-    })
-  }
-
-  const handleScopeChange = (option: ScopeOption | undefined) => {
-    if (!option) return
-    setRemovedIds(new Set<string>())
-    setFilterScope(option.value)
-  }
-
-  return (
-    <div class="flex flex-col h-full overflow-y-auto no-scrollbar px-4 pb-10 sm:px-10 sm:pb-10">
-      <div class="sticky top-0 z-10 bg-[linear-gradient(to_bottom,var(--surface-stronger-non-alpha)_calc(100%_-_24px),transparent)]">
-        <div class="flex flex-col gap-1 pt-6 pb-8 max-w-[720px]">
-          <h2 class="text-16-medium text-text-strong">{language.t("settings.archive.title")}</h2>
-          <p class="text-14-regular text-text-weak">{language.t("settings.archive.description")}</p>
-        </div>
-      </div>
-
-      <div class="flex flex-col gap-4 max-w-[720px]">
-        <Show when={hasMultipleProjects()}>
-          <RadioGroup
-            options={scopeOptions}
-            current={currentScopeOption() ?? undefined}
-            value={(o) => o.value}
-            size="small"
-            label={(o) => language.t(o.label)}
-            onSelect={handleScopeChange}
-          />
-        </Show>
-        <Show
-          when={!archivedSessions.loading}
-          fallback={
-            <div class="min-h-[700px]">
-              <SessionSkeleton count={4} />
-            </div>
-          }
-        >
-          <Show
-            when={displayedSessions().length}
-            fallback={
-              <div class="min-h-[700px]">
-                <div class="text-14-regular text-text-weak">{language.t("settings.archive.none")}</div>
-              </div>
-            }
-          >
-            <div class="min-h-[700px] flex flex-col gap-2">
-              <For each={displayedSessions()}>
-                {(session) => (
-                  <div class="flex items-center justify-between gap-4 px-3 py-1 rounded-md hover:bg-surface-raised-base-hover">
-                    <div class="flex items-center gap-x-3 grow min-w-0">
-                      <div class="flex items-center gap-2 min-w-0">
-                        <span class="text-14-regular text-text-strong truncate">{session.title}</span>
-                        <span class="text-14-regular text-text-weak truncate">{getSessionLabel(session)}</span>
-                      </div>
-                    </div>
-                    <div class="flex items-center gap-4 shrink-0">
-                      <Show when={session.time?.updated}>
-                        {(updated) => (
-                          <span class="text-12-regular text-text-weak whitespace-nowrap">
-                            {getRelativeTime(new Date(updated()).toISOString(), language.t)}
-                          </span>
-                        )}
-                      </Show>
-                      <Button
-                        size="normal"
-                        variant="secondary"
-                        onClick={() => unarchiveSession(session)}
-                      >
-                        {language.t("common.unarchive")}
-                      </Button>
-                    </div>
-                  </div>
-                )}
-              </For>
-            </div>
-          </Show>
-        </Show>
-      </div>
-    </div>
-  )
-}
--- a/packages/app/src/components/titlebar.tsx
+++ b/packages/app/src/components/titlebar.tsx
@@ -266,9 +266,6 @@ export function Titlebar() {
          </div>
        </div>
        <div id="opencode-titlebar-left" class="flex items-center gap-3 min-w-0 px-2" />
-        <div class="bg-icon-interactive-base text-background-base font-medium px-2 rounded-sm uppercase font-mono">
-          BETA
-        </div>
      </div>

      <div class="min-w-0 flex items-center justify-center pointer-events-none">
--- a/packages/app/src/context/command.tsx
+++ b/packages/app/src/context/command.tsx
@@ -4,7 +4,6 @@ import { createSimpleContext } from "@opencode-ai/ui/context"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
 import { useLanguage } from "@/context/language"
 import { useSettings } from "@/context/settings"
-import { isEditableTarget } from "@/utils/dom"
 import { Persist, persisted } from "@/utils/persist"

 const IS_MAC = typeof navigator === "object" && /(Mac|iPod|iPhone|iPad)/.test(navigator.platform)
@@ -178,6 +177,14 @@ export function formatKeybind(config: string): string {
  return IS_MAC ? parts.join("") : parts.join("+")
 }

+function isEditableTarget(target: EventTarget | null) {
+  if (!(target instanceof HTMLElement)) return false
+  if (target.isContentEditable) return true
+  if (target.closest("[contenteditable='true']")) return true
+  if (target.closest("input, textarea, select")) return true
+  return false
+}
+
 export const { use: useCommand, provider: CommandProvider } = createSimpleContext({
  name: "Command",
  init: () => {
--- a/packages/app/src/context/global-sync.tsx
+++ b/packages/app/src/context/global-sync.tsx
@@ -353,6 +353,7 @@ function createGlobalSync() {
      .update({ config })
      .then(bootstrap)
      .then(() => {
+        queue.refresh()
        setGlobalStore("reload", undefined)
        queue.refresh()
      })
--- a/packages/app/src/context/layout.tsx
+++ b/packages/app/src/context/layout.tsx
@@ -8,7 +8,7 @@ import { usePlatform } from "./platform"
 import { Project } from "@opencode-ai/sdk/v2"
 import { Persist, persisted, removePersisted } from "@/utils/persist"
 import { decode64 } from "@/utils/base64"
-import { same } from "@opencode-ai/util/array"
+import { same } from "@/utils/same"
 import { createScrollPersistence, type SessionScroll } from "./layout-scroll"
 import { createPathHelpers } from "./file/path"

--- a/packages/app/src/i18n/ar.ts
+++ b/packages/app/src/i18n/ar.ts
@@ -506,10 +506,6 @@ export const dict = {
  "common.close": "إغلاق",
  "common.edit": "تحرير",
  "common.loadMore": "تحميل المزيد",
-  "common.changelog": "التغييرات",
-  "common.noReleasesFound": "لم يتم العثور على إصدارات",
-  "changelog.tag.latest": "الأحدث",
-
  "common.key.esc": "ESC",
  "sidebar.menu.toggle": "تبديل القائمة",
  "sidebar.nav.projectsAndSessions": "المشاريع والجلسات",
@@ -738,11 +734,6 @@ export const dict = {
  "workspace.reset.archived.one": "ستتم أرشفة جلسة واحدة.",
  "workspace.reset.archived.many": "ستتم أرشفة {{count}} جلسات.",
  "workspace.reset.note": "سيؤدي هذا إلى إعادة تعيين مساحة العمل لتتطابق مع الفرع الافتراضي.",
-  "settings.archive.title": "الجلسات المؤرشفة",
-  "settings.archive.description": "استعادة الجلسات المؤرشفة لجعلها مرئية في الشريط الجانبي.",
-  "settings.archive.none": "لا توجد جلسات مؤرشفة.",
-  "settings.archive.scope.all": "جميع المشاريع",
-  "settings.archive.scope.current": "المشروع الحالي",
  "common.open": "فتح",
  "dialog.releaseNotes.action.getStarted": "البدء",
  "dialog.releaseNotes.action.next": "التالي",
@@ -757,4 +748,4 @@ export const dict = {
  "common.time.daysAgo.short": "قبل {{count}} ي",
  "settings.providers.connected.environmentDescription": "متصل من متغيرات البيئة الخاصة بك",
  "settings.providers.custom.description": "أضف مزود متوافق مع OpenAI بواسطة عنوان URL الأساسي.",
-}
+}
--- a/packages/app/src/i18n/br.ts
+++ b/packages/app/src/i18n/br.ts
@@ -512,9 +512,6 @@ export const dict = {
  "common.close": "Fechar",
  "common.edit": "Editar",
  "common.loadMore": "Carregar mais",
-  "common.changelog": "Novidades",
-  "common.noReleasesFound": "Nenhuma release encontrada",
-  "changelog.tag.latest": "Mais recente",
  "common.key.esc": "ESC",
  "sidebar.menu.toggle": "Alternar menu",
  "sidebar.nav.projectsAndSessions": "Projetos e sessões",
@@ -745,11 +742,6 @@ export const dict = {
  "workspace.reset.archived.one": "1 sessão será arquivada.",
  "workspace.reset.archived.many": "{{count}} sessões serão arquivadas.",
  "workspace.reset.note": "Isso redefinirá o espaço de trabalho para corresponder ao branch padrão.",
-  "settings.archive.title": "Sessões arquivadas",
-  "settings.archive.description": "Restaure sessões arquivadas para torná-las visíveis na barra lateral.",
-  "settings.archive.none": "Nenhuma sessão arquivada.",
-  "settings.archive.scope.all": "Todos os projetos",
-  "settings.archive.scope.current": "Projeto atual",
  "common.open": "Abrir",
  "dialog.releaseNotes.action.getStarted": "Começar",
  "dialog.releaseNotes.action.next": "Próximo",
--- a/packages/app/src/i18n/bs.ts
+++ b/packages/app/src/i18n/bs.ts
@@ -572,9 +572,6 @@ export const dict = {
  "common.close": "Zatvori",
  "common.edit": "Uredi",
  "common.loadMore": "Učitaj još",
-  "common.changelog": "Novosti",
-  "common.noReleasesFound": "Nema pronađenih verzija",
-  "changelog.tag.latest": "Najnovije",
  "common.key.esc": "ESC",

  "sidebar.menu.toggle": "Prikaži/sakrij meni",
@@ -822,11 +819,6 @@ export const dict = {
  "workspace.reset.archived.one": "1 sesija će biti arhivirana.",
  "workspace.reset.archived.many": "Biće arhivirano {{count}} sesija.",
  "workspace.reset.note": "Ovo će resetovati radni prostor da odgovara podrazumijevanoj grani.",
-  "settings.archive.title": "Arhivirane sesije",
-  "settings.archive.description": "Vrati arhivirane sesije da bi bile vidljive u bočnoj traci.",
-  "settings.archive.none": "Nema arhiviranih sesija.",
-  "settings.archive.scope.all": "Svi projekti",
-  "settings.archive.scope.current": "Trenutni projekt",
  "common.open": "Otvori",
  "dialog.releaseNotes.action.getStarted": "Započni",
  "dialog.releaseNotes.action.next": "Sljedeće",
--- a/packages/app/src/i18n/da.ts
+++ b/packages/app/src/i18n/da.ts
@@ -568,9 +568,6 @@ export const dict = {
  "common.close": "Luk",
  "common.edit": "Rediger",
  "common.loadMore": "Indlæs flere",
-  "common.changelog": "Nyheder",
-  "common.noReleasesFound": "Ingen versioner fundet",
-  "changelog.tag.latest": "Seneste",

  "common.key.esc": "ESC",
  "sidebar.menu.toggle": "Skift menu",
@@ -816,11 +813,6 @@ export const dict = {
  "workspace.reset.archived.one": "1 session vil blive arkiveret.",
  "workspace.reset.archived.many": "{{count}} sessioner vil blive arkiveret.",
  "workspace.reset.note": "Dette vil nulstille arbejdsområdet til at matche hovedgrenen.",
-  "settings.archive.title": "Arkiverede sessioner",
-  "settings.archive.description": "Gendan arkiverede sessioner for at gøre dem synlige i sidebjælken.",
-  "settings.archive.none": "Ingen arkiverede sessioner.",
-  "settings.archive.scope.all": "Alle projekter",
-  "settings.archive.scope.current": "Nuværende projekt",
  "common.open": "Åbn",
  "dialog.releaseNotes.action.getStarted": "Kom i gang",
  "dialog.releaseNotes.action.next": "Næste",
--- a/packages/app/src/i18n/de.ts
+++ b/packages/app/src/i18n/de.ts
@@ -520,10 +520,6 @@ export const dict = {
  "common.close": "Schließen",
  "common.edit": "Bearbeiten",
  "common.loadMore": "Mehr laden",
-  "common.changelog": "Neuerungen",
-  "common.noReleasesFound": "Keine Versionen gefunden",
-  "changelog.tag.latest": "Neueste",
-
  "common.key.esc": "ESC",
  "sidebar.menu.toggle": "Menü umschalten",
  "sidebar.nav.projectsAndSessions": "Projekte und Sitzungen",
@@ -755,12 +751,6 @@ export const dict = {
  "workspace.reset.archived.one": "1 Sitzung wird archiviert.",
  "workspace.reset.archived.many": "{{count}} Sitzungen werden archiviert.",
  "workspace.reset.note": "Dadurch wird der Arbeitsbereich auf den Standard-Branch zurückgesetzt.",
-
-  "settings.archive.title": "Archivierte Sitzungen",
-  "settings.archive.description": "Archivierte Sitzungen wiederherstellen, um sie in der Seitenleiste anzuzeigen.",
-  "settings.archive.none": "Keine archivierten Sitzungen.",
-  "settings.archive.scope.all": "Alle Projekte",
-  "settings.archive.scope.current": "Aktuelles Projekt",
  "common.open": "Öffnen",
  "dialog.releaseNotes.action.getStarted": "Loslegen",
  "dialog.releaseNotes.action.next": "Weiter",
--- a/packages/app/src/i18n/en.ts
+++ b/packages/app/src/i18n/en.ts
@@ -585,19 +585,16 @@ export const dict = {
  "common.rename": "Rename",
  "common.reset": "Reset",
  "common.archive": "Archive",
-  "common.unarchive": "Unarchive",
  "common.delete": "Delete",
  "common.close": "Close",
  "common.edit": "Edit",
  "common.loadMore": "Load more",
-  "common.changelog": "Changelog",
-  "common.noReleasesFound": "No releases found",
+  "common.key.esc": "ESC",
+
  "common.time.justNow": "Just now",
  "common.time.minutesAgo.short": "{{count}}m ago",
  "common.time.hoursAgo.short": "{{count}}h ago",
  "common.time.daysAgo.short": "{{count}}d ago",
-  "changelog.tag.latest": "Latest",
-  "common.key.esc": "ESC",

  "sidebar.menu.toggle": "Toggle menu",
  "sidebar.nav.projectsAndSessions": "Projects and sessions",
@@ -616,7 +613,6 @@ export const dict = {

  "settings.section.desktop": "Desktop",
  "settings.section.server": "Server",
-  "settings.section.data": "Data",
  "settings.tab.general": "General",
  "settings.tab.shortcuts": "Shortcuts",
  "settings.desktop.section.wsl": "WSL",
@@ -848,10 +844,4 @@ export const dict = {
  "workspace.reset.archived.one": "1 session will be archived.",
  "workspace.reset.archived.many": "{{count}} sessions will be archived.",
  "workspace.reset.note": "This will reset the workspace to match the default branch.",
-
-  "settings.archive.title": "Archived Sessions",
-  "settings.archive.description": "Restore archived sessions to make them visible in the sidebar.",
-  "settings.archive.none": "No archived sessions.",
-  "settings.archive.scope.all": "All projects",
-  "settings.archive.scope.current": "Current project",
 }
--- a/packages/app/src/i18n/es.ts
+++ b/packages/app/src/i18n/es.ts
@@ -575,10 +575,6 @@ export const dict = {
  "common.close": "Cerrar",
  "common.edit": "Editar",
  "common.loadMore": "Cargar más",
-  "common.changelog": "Novedades",
-  "common.noReleasesFound": "No se encontraron versiones",
-  "changelog.tag.latest": "Último",
-
  "common.key.esc": "ESC",

  "sidebar.menu.toggle": "Alternar menú",
@@ -829,12 +825,6 @@ export const dict = {
  "workspace.reset.archived.one": "1 sesión será archivada.",
  "workspace.reset.archived.many": "{{count}} sesiones serán archivadas.",
  "workspace.reset.note": "Esto restablecerá el espacio de trabajo para coincidir con la rama predeterminada.",
-
-  "settings.archive.title": "Sesiones archivadas",
-  "settings.archive.description": "Restaura las sesiones archivadas para hacerlas visibles en la barra lateral.",
-  "settings.archive.none": "No hay sesiones archivadas.",
-  "settings.archive.scope.all": "Todos los proyectos",
-  "settings.archive.scope.current": "Proyecto actual",
  "common.open": "Abrir",
  "dialog.releaseNotes.action.getStarted": "Comenzar",
  "dialog.releaseNotes.action.next": "Siguiente",
--- a/packages/app/src/i18n/fr.ts
+++ b/packages/app/src/i18n/fr.ts
@@ -516,10 +516,6 @@ export const dict = {
  "common.close": "Fermer",
  "common.edit": "Modifier",
  "common.loadMore": "Charger plus",
-  "common.changelog": "Nouveautés",
-  "common.noReleasesFound": "Aucune version trouvée",
-  "changelog.tag.latest": "Dernier",
-
  "common.key.esc": "ESC",
  "sidebar.menu.toggle": "Basculer le menu",
  "sidebar.nav.projectsAndSessions": "Projets et sessions",
@@ -753,11 +749,6 @@ export const dict = {
  "workspace.reset.archived.one": "1 session sera archivée.",
  "workspace.reset.archived.many": "{{count}} sessions seront archivées.",
  "workspace.reset.note": "Cela réinitialisera l'espace de travail pour correspondre à la branche par défaut.",
-  "settings.archive.title": "Sessions archivées",
-  "settings.archive.description": "Restaurez les sessions archivées pour les rendre visibles dans la barre latérale.",
-  "settings.archive.none": "Aucune session archivée.",
-  "settings.archive.scope.all": "Tous les Projets",
-  "settings.archive.scope.current": "Projet actuel",
  "common.open": "Ouvrir",
  "dialog.releaseNotes.action.getStarted": "Commencer",
  "dialog.releaseNotes.action.next": "Suivant",
--- a/packages/app/src/i18n/ja.ts
+++ b/packages/app/src/i18n/ja.ts
@@ -510,10 +510,6 @@ export const dict = {
  "common.close": "閉じる",
  "common.edit": "編集",
  "common.loadMore": "さらに読み込む",
-  "common.changelog": "更新履歴",
-  "common.noReleasesFound": "バージョンが見つかりません",
-  "changelog.tag.latest": "最新",
-
  "common.key.esc": "ESC",
  "sidebar.menu.toggle": "メニューを切り替え",
  "sidebar.nav.projectsAndSessions": "プロジェクトとセッション",
@@ -742,12 +738,6 @@ export const dict = {
  "workspace.reset.archived.one": "1つのセッションがアーカイブされます。",
  "workspace.reset.archived.many": "{{count}}個のセッションがアーカイブされます。",
  "workspace.reset.note": "これにより、ワークスペースはデフォルトブランチと一致するようにリセットされます。",
-
-  "settings.archive.title": "アーカイブされたセッション",
-  "settings.archive.description": "アーカイブされたセッションを復元してサイドバーに表示します。",
-  "settings.archive.none": "アーカイブされたセッションはありません。",
-  "settings.archive.scope.all": "すべてのプロジェクト",
-  "settings.archive.scope.current": "現在のプロジェクト",
  "common.open": "開く",
  "dialog.releaseNotes.action.getStarted": "始める",
  "dialog.releaseNotes.action.next": "次へ",
--- a/packages/app/src/i18n/ko.ts
+++ b/packages/app/src/i18n/ko.ts
@@ -511,10 +511,6 @@ export const dict = {
  "common.close": "닫기",
  "common.edit": "편집",
  "common.loadMore": "더 불러오기",
-  "common.changelog": "새로운 기능",
-  "common.noReleasesFound": "버전을 찾을 수 없음",
-  "changelog.tag.latest": "최신",
-
  "common.key.esc": "ESC",
  "sidebar.menu.toggle": "메뉴 토글",
  "sidebar.nav.projectsAndSessions": "프로젝트 및 세션",
@@ -742,12 +738,6 @@ export const dict = {
  "workspace.reset.archived.one": "1개의 세션이 보관됩니다.",
  "workspace.reset.archived.many": "{{count}}개의 세션이 보관됩니다.",
  "workspace.reset.note": "이 작업은 작업 공간을 기본 브랜치와 일치하도록 재설정합니다.",
-
-  "settings.archive.title": "보관된 세션",
-  "settings.archive.description": "보관된 세션을 복원하여 사이드바에 표시합니다.",
-  "settings.archive.none": "보관된 세션이 없습니다.",
-  "settings.archive.scope.all": "모든 프로젝트",
-  "settings.archive.scope.current": "현재 프로젝트",
  "common.open": "열기",
  "dialog.releaseNotes.action.getStarted": "시작하기",
  "dialog.releaseNotes.action.next": "다음",
--- a/packages/app/src/i18n/no.ts
+++ b/packages/app/src/i18n/no.ts
@@ -575,9 +575,6 @@ export const dict = {
  "common.close": "Lukk",
  "common.edit": "Rediger",
  "common.loadMore": "Last flere",
-  "common.changelog": "Nyheter",
-  "common.noReleasesFound": "Ingen versjoner funnet",
-  "changelog.tag.latest": "Siste",
  "common.key.esc": "ESC",

  "sidebar.menu.toggle": "Veksle meny",
@@ -824,12 +821,6 @@ export const dict = {
  "workspace.reset.archived.one": "1 sesjon vil bli arkivert.",
  "workspace.reset.archived.many": "{{count}} sesjoner vil bli arkivert.",
  "workspace.reset.note": "Dette vil tilbakestille arbeidsområdet til å samsvare med standardgrenen.",
-
-  "settings.archive.title": "Arkiverte økter",
-  "settings.archive.description": "Gjenopprett arkiverte økter for å gjøre dem synlige i sidefeltet.",
-  "settings.archive.none": "Ingen arkiverte økter.",
-  "settings.archive.scope.all": "Alle prosjekter",
-  "settings.archive.scope.current": "Nåværende prosjekt",
  "common.open": "Åpne",
  "dialog.releaseNotes.action.getStarted": "Kom i gang",
  "dialog.releaseNotes.action.next": "Neste",
--- a/packages/app/src/i18n/pl.ts
+++ b/packages/app/src/i18n/pl.ts
@@ -511,9 +511,6 @@ export const dict = {
  "common.close": "Zamknij",
  "common.edit": "Edytuj",
  "common.loadMore": "Załaduj więcej",
-  "common.changelog": "Nowości",
-  "common.noReleasesFound": "Nie znaleziono wersji",
-  "changelog.tag.latest": "Najnowszy",
  "common.key.esc": "ESC",
  "sidebar.menu.toggle": "Przełącz menu",
  "sidebar.nav.projectsAndSessions": "Projekty i sesje",
@@ -743,11 +740,6 @@ export const dict = {
  "workspace.reset.archived.one": "1 sesja zostanie zarchiwizowana.",
  "workspace.reset.archived.many": "{{count}} sesji zostanie zarchiwizowanych.",
  "workspace.reset.note": "To zresetuje przestrzeń roboczą, aby odpowiadała domyślnej gałęzi.",
-  "settings.archive.title": "Zarchiwizowane sesje",
-  "settings.archive.description": "Przywróć zarchiwizowane sesje, aby były widoczne na pasku bocznym.",
-  "settings.archive.none": "Brak zarchiwizowanych sesji.",
-  "settings.archive.scope.all": "Wszystkie projekty",
-  "settings.archive.scope.current": "Bieżący projekt",
  "common.open": "Otwórz",
  "dialog.releaseNotes.action.getStarted": "Rozpocznij",
  "dialog.releaseNotes.action.next": "Dalej",
--- a/packages/app/src/i18n/ru.ts
+++ b/packages/app/src/i18n/ru.ts
@@ -573,9 +573,6 @@ export const dict = {
  "common.close": "Закрыть",
  "common.edit": "Редактировать",
  "common.loadMore": "Загрузить ещё",
-  "common.changelog": "Что нового",
-  "common.noReleasesFound": "Версии не найдены",
-  "changelog.tag.latest": "Последний",
  "common.key.esc": "ESC",

  "sidebar.menu.toggle": "Переключить меню",
@@ -824,11 +821,6 @@ export const dict = {
  "workspace.reset.archived.one": "1 сессия будет архивирована.",
  "workspace.reset.archived.many": "{{count}} сессий будет архивировано.",
  "workspace.reset.note": "Рабочее пространство будет сброшено в соответствие с веткой по умолчанию.",
-  "settings.archive.title": "Архивированные сессии",
-  "settings.archive.description": "Восстановите архивированные сессии, чтобы они отображались на боковой панели.",
-  "settings.archive.none": "Нет архивированных сессий.",
-  "settings.archive.scope.all": "Все проекты",
-  "settings.archive.scope.current": "Текущий проект",
  "common.open": "Открыть",
  "dialog.releaseNotes.action.getStarted": "Начать",
  "dialog.releaseNotes.action.next": "Далее",
--- a/packages/app/src/i18n/th.ts
+++ b/packages/app/src/i18n/th.ts
@@ -567,9 +567,6 @@ export const dict = {
  "common.close": "ปิด",
  "common.edit": "แก้ไข",
  "common.loadMore": "โหลดเพิ่มเติม",
-  "common.changelog": "อัปเดต",
-  "common.noReleasesFound": "ไม่พบเวอร์ชัน",
-  "changelog.tag.latest": "ล่าสุด",
  "common.key.esc": "ESC",

  "sidebar.menu.toggle": "สลับเมนู",
@@ -814,12 +811,6 @@ export const dict = {
  "workspace.reset.archived.one": "1 เซสชันจะถูกจัดเก็บ",
  "workspace.reset.archived.many": "{{count}} เซสชันจะถูกจัดเก็บ",
  "workspace.reset.note": "สิ่งนี้จะรีเซ็ตพื้นที่ทำงานให้ตรงกับสาขาเริ่มต้น",
-
-  "settings.archive.title": "เซสชันที่จัดเก็บ",
-  "settings.archive.description": "กู้คืนเซสชันที่จัดเก็บเพื่อให้แสดงในแถบด้านข้าง",
-  "settings.archive.none": "ไม่มีเซสชันที่จัดเก็บ",
-  "settings.archive.scope.all": "โปรเจกต์ทั้งหมด",
-  "settings.archive.scope.current": "โปรเจกต์ปัจจุบัน",
  "common.open": "เปิด",
  "dialog.releaseNotes.action.getStarted": "เริ่มต้น",
  "dialog.releaseNotes.action.next": "ถัดไป",
--- a/packages/app/src/i18n/zh.ts
+++ b/packages/app/src/i18n/zh.ts
@@ -566,10 +566,6 @@ export const dict = {
  "common.close": "关闭",
  "common.edit": "编辑",
  "common.loadMore": "加载更多",
-  "common.changelog": "更新日志",
-  "common.noReleasesFound": "未找到版本",
-  "changelog.tag.latest": "最新",
-
  "common.key.esc": "ESC",

  "sidebar.menu.toggle": "切换菜单",
@@ -813,12 +809,6 @@ export const dict = {
  "workspace.reset.archived.one": "将归档 1 个会话。",
  "workspace.reset.archived.many": "将归档 {{count}} 个会话。",
  "workspace.reset.note": "这将把工作区重置为与默认分支一致。",
-
-  "settings.archive.title": "归档会话",
-  "settings.archive.description": "恢复归档会话以使其在侧边栏中可见。",
-  "settings.archive.none": "没有归档会话。",
-  "settings.archive.scope.all": "所有项目",
-  "settings.archive.scope.current": "当前项目",
  "common.open": "打开",
  "dialog.releaseNotes.action.getStarted": "开始",
  "dialog.releaseNotes.action.next": "下一步",
--- a/packages/app/src/i18n/zht.ts
+++ b/packages/app/src/i18n/zht.ts
@@ -563,9 +563,6 @@ export const dict = {
  "common.close": "關閉",
  "common.edit": "編輯",
  "common.loadMore": "載入更多",
-  "common.changelog": "更新日誌",
-  "common.noReleasesFound": "未找到版本",
-  "changelog.tag.latest": "最新",

  "common.key.esc": "ESC",
  "sidebar.menu.toggle": "切換選單",
@@ -807,12 +804,6 @@ export const dict = {
  "workspace.reset.archived.one": "將封存 1 個工作階段。",
  "workspace.reset.archived.many": "將封存 {{count}} 個工作階段。",
  "workspace.reset.note": "這將把工作區重設為與預設分支一致。",
-
-  "settings.archive.title": "封存工作階段",
-  "settings.archive.description": "恢復封存的工作階段以使其在側邊欄中可見。",
-  "settings.archive.none": "沒有封存的工作階段。",
-  "settings.archive.scope.all": "所有專案",
-  "settings.archive.scope.current": "目前專案",
  "common.open": "打開",
  "dialog.releaseNotes.action.getStarted": "開始",
  "dialog.releaseNotes.action.next": "下一步",
--- a/packages/app/src/pages/directory-layout.tsx
+++ b/packages/app/src/pages/directory-layout.tsx
@@ -9,13 +9,11 @@ import { DataProvider } from "@opencode-ai/ui/context"
 import { decode64 } from "@/utils/base64"
 import { showToast } from "@opencode-ai/ui/toast"
 import { useLanguage } from "@/context/language"
-import { usePlatform } from "@/context/platform"

 function DirectoryDataProvider(props: ParentProps<{ directory: string }>) {
  const params = useParams()
  const navigate = useNavigate()
  const sync = useSync()
-  const platform = usePlatform()

  return (
    <DataProvider
@@ -23,34 +21,6 @@ function DirectoryDataProvider(props: ParentProps<{ directory: string }>) {
      directory={props.directory}
      onNavigateToSession={(sessionID: string) => navigate(`/${params.dir}/session/${sessionID}`)}
      onSessionHref={(sessionID: string) => `/${params.dir}/session/${sessionID}`}
-      onOpenFilePath={async (input) => {
-        const file = input.path.replace(/^[\\/]+/, "")
-        const separator = props.directory.includes("\\") ? "\\" : "/"
-        const path = props.directory.endsWith(separator) ? props.directory + file : props.directory + separator + file
-
-        if (platform.platform === "desktop" && platform.openPath) {
-          await platform.openPath(path).catch((error) => {
-            const description = error instanceof Error ? error.message : String(error)
-            showToast({
-              variant: "error",
-              title: "Open failed",
-              description,
-            })
-            window.dispatchEvent(
-              new CustomEvent("opencode:open-file-path", {
-                detail: input,
-              }),
-            )
-          })
-          return
-        }
-
-        window.dispatchEvent(
-          new CustomEvent("opencode:open-file-path", {
-            detail: input,
-          }),
-        )
-      }}
    >
      <LocalProvider>{props.children}</LocalProvider>
    </DataProvider>
--- a/packages/app/src/pages/layout.tsx
+++ b/packages/app/src/pages/layout.tsx
@@ -1936,34 +1936,45 @@ export default function Layout(props: ParentProps) {
                  when={workspacesEnabled()}
                  fallback={
                    <>
+                      <div class="shrink-0 py-4 px-3">
+                        <TooltipKeybind
+                          title={language.t("command.session.new")}
+                          keybind={command.keybind("session.new")}
+                          placement="top"
+                        >
+                          <Button
+                            size="large"
+                            icon="plus-small"
+                            class="w-full"
+                            onClick={() => navigateWithSidebarReset(`/${base64Encode(p().worktree)}/session`)}
+                          >
+                            {language.t("command.session.new")}
+                          </Button>
+                        </TooltipKeybind>
+                      </div>
                      <div class="flex-1 min-h-0">
                        <LocalWorkspace
                          ctx={workspaceSidebarCtx}
                          project={p()}
                          sortNow={sortNow}
                          mobile={panelProps.mobile}
-                          header={
-                            <TooltipKeybind
-                              title={language.t("command.session.new")}
-                              keybind={command.keybind("session.new")}
-                              placement="top"
-                            >
-                              <Button
-                                size="large"
-                                icon="plus-small"
-                                class="w-full"
-                                onClick={() => navigateWithSidebarReset(`/${base64Encode(p().worktree)}/session`)}
-                              >
-                                {language.t("command.session.new")}
-                              </Button>
-                            </TooltipKeybind>
-                          }
                        />
                      </div>
                    </>
                  }
                >
                  <>
+                    <div class="shrink-0 py-4 px-3">
+                      <TooltipKeybind
+                        title={language.t("workspace.new")}
+                        keybind={command.keybind("workspace.new")}
+                        placement="top"
+                      >
+                        <Button size="large" icon="plus-small" class="w-full" onClick={() => createWorkspace(p())}>
+                          {language.t("workspace.new")}
+                        </Button>
+                      </TooltipKeybind>
+                    </div>
                    <div class="relative flex-1 min-h-0">
                      <DragDropProvider
                        onDragStart={handleWorkspaceDragStart}
@@ -1977,41 +1988,21 @@ export default function Layout(props: ParentProps) {
                          ref={(el) => {
                            if (!panelProps.mobile) scrollContainerRef = el
                          }}
-                          class="size-full flex flex-col overflow-y-auto no-scrollbar [overflow-anchor:none]"
+                          class="size-full flex flex-col py-2 gap-4 overflow-y-auto no-scrollbar [overflow-anchor:none]"
                        >
-                          <div class="sticky top-0 z-20 pointer-events-none bg-[linear-gradient(to_bottom,var(--background-stronger)_calc(100%_-_24px),transparent)] pt-4 pb-6 px-3">
-                            <div class="pointer-events-auto">
-                              <TooltipKeybind
-                                title={language.t("workspace.new")}
-                                keybind={command.keybind("workspace.new")}
-                                placement="top"
-                              >
-                                <Button
-                                  size="large"
-                                  icon="plus-small"
-                                  class="w-full"
-                                  onClick={() => createWorkspace(p())}
-                                >
-                                  {language.t("workspace.new")}
-                                </Button>
-                              </TooltipKeybind>
-                            </div>
-                          </div>
-                          <div class="flex flex-col gap-4 py-2">
-                            <SortableProvider ids={workspaces()}>
-                              <For each={workspaces()}>
-                                {(directory) => (
-                                  <SortableWorkspace
-                                    ctx={workspaceSidebarCtx}
-                                    directory={directory}
-                                    project={p()}
-                                    sortNow={sortNow}
-                                    mobile={panelProps.mobile}
-                                  />
-                                )}
-                              </For>
-                            </SortableProvider>
-                          </div>
+                          <SortableProvider ids={workspaces()}>
+                            <For each={workspaces()}>
+                              {(directory) => (
+                                <SortableWorkspace
+                                  ctx={workspaceSidebarCtx}
+                                  directory={directory}
+                                  project={p()}
+                                  sortNow={sortNow}
+                                  mobile={panelProps.mobile}
+                                />
+                              )}
+                            </For>
+                          </SortableProvider>
                        </div>
                        <DragOverlay>
                          <WorkspaceDragOverlay
--- a/packages/app/src/pages/layout/sidebar-items.tsx
+++ b/packages/app/src/pages/layout/sidebar-items.tsx
@@ -277,7 +277,7 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
  return (
    <div
      data-session-id={props.session.id}
-      class="group/session relative w-full rounded-md cursor-default transition-colors pl-2 pr-3 scroll-mt-24
+      class="group/session relative w-full rounded-md cursor-default transition-colors pl-2 pr-3
             hover:bg-surface-raised-base-hover [&:has(:focus-visible)]:bg-surface-raised-base-hover has-[[data-expanded]]:bg-surface-raised-base-hover has-[.active]:bg-surface-base-active"
    >
      <Show
--- a/packages/app/src/pages/layout/sidebar-workspace.tsx
+++ b/packages/app/src/pages/layout/sidebar-workspace.tsx
@@ -467,7 +467,6 @@ export const LocalWorkspace = (props: {
  project: LocalProject
  sortNow: Accessor<number>
  mobile?: boolean
-  header?: JSX.Element
 }): JSX.Element => {
  const globalSync = useGlobalSync()
  const language = useLanguage()
@@ -489,14 +488,9 @@ export const LocalWorkspace = (props: {
  return (
    <div
      ref={(el) => props.ctx.setScrollContainerRef(el, props.mobile)}
-      class="size-full flex flex-col overflow-y-auto no-scrollbar [overflow-anchor:none]"
+      class="size-full flex flex-col py-2 overflow-y-auto no-scrollbar [overflow-anchor:none]"
    >
-      <Show when={props.header}>
-        <div class="sticky top-0 z-20 pointer-events-none bg-[linear-gradient(to_bottom,var(--background-stronger)_calc(100%_-_24px),transparent)] pt-4 pb-6 px-3">
-          <div class="pointer-events-auto">{props.header}</div>
-        </div>
-      </Show>
-      <nav class="flex flex-col gap-1 px-2 pb-2" classList={{ "pt-2": !props.header }}>
+      <nav class="flex flex-col gap-1 px-2">
        <Show when={loading()}>
          <SessionSkeleton />
        </Show>
--- a/packages/app/src/pages/session.tsx
+++ b/packages/app/src/pages/session.tsx
@@ -1,6 +1,17 @@
 import type { UserMessage } from "@opencode-ai/sdk/v2"
 import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { onCleanup, Show, Match, Switch, createMemo, createEffect, on, onMount, untrack } from "solid-js"
+import {
+  onCleanup,
+  Show,
+  Match,
+  Switch,
+  createMemo,
+  createEffect,
+  createComputed,
+  on,
+  onMount,
+  untrack,
+} from "solid-js"
 import { createMediaQuery } from "@solid-primitives/media"
 import { createResizeObserver } from "@solid-primitives/resize-observer"
 import { useLocal } from "@/context/local"
@@ -19,28 +30,20 @@ import { useLayout } from "@/context/layout"
 import { usePrompt } from "@/context/prompt"
 import { useSDK } from "@/context/sdk"
 import { useSync } from "@/context/sync"
-import { isEditableTarget } from "@/utils/dom"
+import { createSessionComposerState, SessionComposerRegion } from "@/pages/session/composer"
 import { createOpenReviewFile } from "@/pages/session/helpers"
 import { MessageTimeline } from "@/pages/session/message-timeline"
 import { type DiffStyle, SessionReviewTab, type SessionReviewTabProps } from "@/pages/session/review-tab"
 import { createScrollSpy } from "@/pages/session/scroll-spy"
-import { AnimationDebugPanel } from "@opencode-ai/ui/animation-debug-panel"
-import { useSessionCommands } from "@/pages/session/use-session-commands"
-import { SessionComposerRegion, createSessionComposerState } from "@/pages/session/composer"
 import { SessionMobileTabs } from "@/pages/session/session-mobile-tabs"
 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 { same } from "@/utils/same"

 const emptyUserMessages: UserMessage[] = []

-const same = <T,>(a: readonly T[] | undefined, b: readonly T[] | undefined) => {
-  if (a === b) return true
-  if (!a || !b) return false
-  if (a.length !== b.length) return false
-  return a.every((x, i) => x === b[i])
-}
-
 type SessionHistoryWindowInput = {
  sessionID: () => string | undefined
  messagesReady: () => boolean
@@ -115,13 +118,13 @@ function createSessionHistoryWindow(input: SessionHistoryWindowInput) {
      return
    }
    const beforeTop = el.scrollTop
+    const beforeHeight = el.scrollHeight
    fn()
-    // SolidJS updates the DOM synchronously. Force reflow so the browser
-    // processes the new layout, then restore scrollTop before paint.
-    // With column-reverse + overflow-anchor:none the same scrollTop value
-    // keeps the same distance from the bottom — no delta math needed.
-    void el.scrollHeight
-    el.scrollTop = beforeTop
+    requestAnimationFrame(() => {
+      const delta = el.scrollHeight - beforeHeight
+      if (!delta) return
+      el.scrollTop = beforeTop + delta
+    })
  }

  const backfillTurns = () => {
@@ -204,8 +207,7 @@ function createSessionHistoryWindow(input: SessionHistoryWindowInput) {
    if (!input.userScrolled()) return
    const el = input.scroller()
    if (!el) return
-    // With column-reverse, distance from top = scrollHeight - clientHeight + scrollTop
-    if (el.scrollHeight - el.clientHeight + el.scrollTop >= turnScrollThreshold) return
+    if (el.scrollTop >= turnScrollThreshold) return

    const start = turnStart()
    if (start > 0) {
@@ -283,6 +285,7 @@ export default function Page() {
      bottom: true,
    },
  })
+
  const composer = createSessionComposerState()

  const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
@@ -427,8 +430,20 @@ export default function Page() {
    mobileTab: "session" as "session" | "changes",
    changes: "session" as "session" | "turn",
    newSessionWorktree: "main",
+    deferRender: false,
  })

+  createComputed((prev) => {
+    const key = sessionKey()
+    if (key !== prev) {
+      setStore("deferRender", true)
+      requestAnimationFrame(() => {
+        setTimeout(() => setStore("deferRender", false), 0)
+      })
+    }
+    return key
+  }, sessionKey())
+
  const turnDiffs = createMemo(() => lastUserMessage()?.summary?.diffs ?? [])
  const reviewDiffs = createMemo(() => (store.changes === "session" ? diffs() : turnDiffs()))

@@ -439,6 +454,11 @@ export default function Page() {
    return "main"
  })

+  const activeMessage = createMemo(() => {
+    if (!store.messageId) return lastUserMessage()
+    const found = visibleUserMessages()?.find((m) => m.id === store.messageId)
+    return found ?? lastUserMessage()
+  })
  const setActiveMessage = (message: UserMessage | undefined) => {
    setStore("messageId", message?.id)
  }
@@ -600,6 +620,11 @@ export default function Page() {
    saveLabel: language.t("common.save"),
  }))

+  const isEditableTarget = (target: EventTarget | null | undefined) => {
+    if (!(target instanceof HTMLElement)) return false
+    return /^(INPUT|TEXTAREA|SELECT|BUTTON)$/.test(target.tagName) || target.isContentEditable
+  }
+
  const deepActiveElement = () => {
    let current: Element | null = document.activeElement
    while (current instanceof HTMLElement && current.shadowRoot?.activeElement) {
@@ -693,26 +718,11 @@ export default function Page() {

  const openReviewFile = createOpenReviewFile({
    showAllFiles,
-    openReviewPanel,
    tabForPath: file.tab,
    openTab: tabs().open,
-    setActive: tabs().setActive,
-    setSelectedLines: file.setSelectedLines,
    loadFile: file.load,
  })

-  onMount(() => {
-    const open = (event: Event) => {
-      const detail = (event as CustomEvent<{ path?: string; line?: number }>).detail
-      const path = detail?.path
-      if (!path) return
-      openReviewFile(path, detail?.line)
-    }
-
-    window.addEventListener("opencode:open-file-path", open)
-    onCleanup(() => window.removeEventListener("opencode:open-file-path", open))
-  })
-
  const changesOptions = ["session", "turn"] as const
  const changesOptionsList = [...changesOptions]

@@ -744,35 +754,12 @@ export default function Page() {
    loadingClass: string
    emptyClass: string
  }) => (
-    <Switch>
-      <Match when={store.changes === "turn" && !!params.id}>
-        <SessionReviewTab
-          title={changesTitle()}
-          empty={emptyTurn()}
-          diffs={reviewDiffs}
-          view={view}
-          diffStyle={input.diffStyle}
-          onDiffStyleChange={input.onDiffStyleChange}
-          onScrollRef={(el) => setTree("reviewScroll", el)}
-          focusedFile={tree.activeDiff}
-          onLineComment={(comment) => addCommentToContext({ ...comment, origin: "review" })}
-          onLineCommentUpdate={updateCommentInContext}
-          onLineCommentDelete={removeCommentFromContext}
-          lineCommentActions={reviewCommentActions()}
-          comments={comments.all()}
-          focusedComment={comments.focus()}
-          onFocusedCommentChange={comments.setFocus}
-          onViewFile={openReviewFile}
-          classes={input.classes}
-        />
-      </Match>
-      <Match when={hasReview()}>
-        <Show
-          when={diffsReady()}
-          fallback={<div class={input.loadingClass}>{language.t("session.review.loadingChanges")}</div>}
-        >
+    <Show when={!store.deferRender}>
+      <Switch>
+        <Match when={store.changes === "turn" && !!params.id}>
          <SessionReviewTab
            title={changesTitle()}
+            empty={emptyTurn()}
            diffs={reviewDiffs}
            view={view}
            diffStyle={input.diffStyle}
@@ -789,39 +776,64 @@ export default function Page() {
            onViewFile={openReviewFile}
            classes={input.classes}
          />
-        </Show>
-      </Match>
-      <Match when={true}>
-        <SessionReviewTab
-          title={changesTitle()}
-          empty={
-            store.changes === "turn" ? (
-              emptyTurn()
-            ) : (
-              <div class={input.emptyClass}>
-                <Mark class="w-14 opacity-10" />
-                <div class="text-14-regular text-text-weak max-w-56">{language.t(reviewEmptyKey())}</div>
-              </div>
-            )
-          }
-          diffs={reviewDiffs}
-          view={view}
-          diffStyle={input.diffStyle}
-          onDiffStyleChange={input.onDiffStyleChange}
-          onScrollRef={(el) => setTree("reviewScroll", el)}
-          focusedFile={tree.activeDiff}
-          onLineComment={(comment) => addCommentToContext({ ...comment, origin: "review" })}
-          onLineCommentUpdate={updateCommentInContext}
-          onLineCommentDelete={removeCommentFromContext}
-          lineCommentActions={reviewCommentActions()}
-          comments={comments.all()}
-          focusedComment={comments.focus()}
-          onFocusedCommentChange={comments.setFocus}
-          onViewFile={openReviewFile}
-          classes={input.classes}
-        />
-      </Match>
-    </Switch>
+        </Match>
+        <Match when={hasReview()}>
+          <Show
+            when={diffsReady()}
+            fallback={<div class={input.loadingClass}>{language.t("session.review.loadingChanges")}</div>}
+          >
+            <SessionReviewTab
+              title={changesTitle()}
+              diffs={reviewDiffs}
+              view={view}
+              diffStyle={input.diffStyle}
+              onDiffStyleChange={input.onDiffStyleChange}
+              onScrollRef={(el) => setTree("reviewScroll", el)}
+              focusedFile={tree.activeDiff}
+              onLineComment={(comment) => addCommentToContext({ ...comment, origin: "review" })}
+              onLineCommentUpdate={updateCommentInContext}
+              onLineCommentDelete={removeCommentFromContext}
+              lineCommentActions={reviewCommentActions()}
+              comments={comments.all()}
+              focusedComment={comments.focus()}
+              onFocusedCommentChange={comments.setFocus}
+              onViewFile={openReviewFile}
+              classes={input.classes}
+            />
+          </Show>
+        </Match>
+        <Match when={true}>
+          <SessionReviewTab
+            title={changesTitle()}
+            empty={
+              store.changes === "turn" ? (
+                emptyTurn()
+              ) : (
+                <div class={input.emptyClass}>
+                  <Mark class="w-14 opacity-10" />
+                  <div class="text-14-regular text-text-weak max-w-56">{language.t(reviewEmptyKey())}</div>
+                </div>
+              )
+            }
+            diffs={reviewDiffs}
+            view={view}
+            diffStyle={input.diffStyle}
+            onDiffStyleChange={input.onDiffStyleChange}
+            onScrollRef={(el) => setTree("reviewScroll", el)}
+            focusedFile={tree.activeDiff}
+            onLineComment={(comment) => addCommentToContext({ ...comment, origin: "review" })}
+            onLineCommentUpdate={updateCommentInContext}
+            onLineCommentDelete={removeCommentFromContext}
+            lineCommentActions={reviewCommentActions()}
+            comments={comments.all()}
+            focusedComment={comments.focus()}
+            onFocusedCommentChange={comments.setFocus}
+            onViewFile={openReviewFile}
+            classes={input.classes}
+          />
+        </Match>
+      </Switch>
+    </Show>
  )

  const reviewPanel = () => (
@@ -1032,10 +1044,7 @@ export default function Page() {
  const updateScrollState = (el: HTMLDivElement) => {
    const max = el.scrollHeight - el.clientHeight
    const overflow = max > 1
-    // If auto-scroll is tracking the bottom, always report bottom: true
-    // to prevent the scroll-down arrow from flashing during height animations
-    // With column-reverse, scrollTop=0 is at the bottom
-    const bottom = !overflow || Math.abs(el.scrollTop) <= 2 || !autoScroll.userScrolled()
+    const bottom = !overflow || el.scrollTop >= max - 2

    if (ui.scroll.overflow === overflow && ui.scroll.bottom === bottom) return
    setUi("scroll", { overflow, bottom })
@@ -1058,7 +1067,7 @@ export default function Page() {

  const resumeScroll = () => {
    setStore("messageId", undefined)
-    autoScroll.smoothScrollToBottom()
+    autoScroll.forceScrollToBottom()
    clearMessageHash()

    const el = scroller
@@ -1126,8 +1135,9 @@ export default function Page() {

      const el = scroller
      const delta = next - dockHeight
-      // With column-reverse, near bottom = scrollTop near 0
-      const stick = el ? Math.abs(el.scrollTop) < 10 + Math.max(0, delta) : false
+      const stick = el
+        ? !autoScroll.userScrolled() || el.scrollHeight - el.clientHeight - el.scrollTop < 10 + Math.max(0, delta)
+        : false

      dockHeight = next

@@ -1168,7 +1178,6 @@ export default function Page() {

  return (
    <div class="relative bg-background-base size-full overflow-hidden flex flex-col">
-      {import.meta.env.DEV && <AnimationDebugPanel />}
      <SessionHeader />
      <div class="flex-1 min-h-0 flex flex-col md:flex-row">
        <SessionMobileTabs
@@ -1194,49 +1203,50 @@ export default function Page() {
          <div class="flex-1 min-h-0 overflow-hidden">
            <Switch>
              <Match when={params.id}>
-                <MessageTimeline
-                  mobileChanges={mobileChanges()}
-                  mobileFallback={reviewContent({
-                    diffStyle: "unified",
-                    classes: {
-                      root: "pb-8",
-                      header: "px-4",
-                      container: "px-4",
-                    },
-                    loadingClass: "px-4 py-4 text-text-weak",
-                    emptyClass: "h-full pb-30 flex flex-col items-center justify-center text-center gap-6",
-                  })}
-                  scroll={ui.scroll}
-                  onResumeScroll={resumeScroll}
-                  setScrollRef={setScrollRef}
-                  onScheduleScrollState={scheduleScrollState}
-                  onAutoScrollHandleScroll={autoScroll.handleScroll}
-                  onMarkScrollGesture={markScrollGesture}
-                  hasScrollGesture={hasScrollGesture}
-                  isDesktop={isDesktop()}
-                  onScrollSpyScroll={scrollSpy.onScroll}
-                  onTurnBackfillScroll={historyWindow.onScrollerScroll}
-                  onAutoScrollInteraction={autoScroll.handleInteraction}
-                  onPreserveScrollAnchor={autoScroll.preserve}
-                  centered={centered()}
-                  setContentRef={(el) => {
-                    content = el
-                    autoScroll.contentRef(el)
+                <Show when={activeMessage()}>
+                  <MessageTimeline
+                    mobileChanges={mobileChanges()}
+                    mobileFallback={reviewContent({
+                      diffStyle: "unified",
+                      classes: {
+                        root: "pb-8",
+                        header: "px-4",
+                        container: "px-4",
+                      },
+                      loadingClass: "px-4 py-4 text-text-weak",
+                      emptyClass: "h-full pb-30 flex flex-col items-center justify-center text-center gap-6",
+                    })}
+                    scroll={ui.scroll}
+                    onResumeScroll={resumeScroll}
+                    setScrollRef={setScrollRef}
+                    onScheduleScrollState={scheduleScrollState}
+                    onAutoScrollHandleScroll={autoScroll.handleScroll}
+                    onMarkScrollGesture={markScrollGesture}
+                    hasScrollGesture={hasScrollGesture}
+                    isDesktop={isDesktop()}
+                    onScrollSpyScroll={scrollSpy.onScroll}
+                    onTurnBackfillScroll={historyWindow.onScrollerScroll}
+                    onAutoScrollInteraction={autoScroll.handleInteraction}
+                    centered={centered()}
+                    setContentRef={(el) => {
+                      content = el
+                      autoScroll.contentRef(el)

-                    const root = scroller
-                    if (root) scheduleScrollState(root)
-                  }}
-                  turnStart={historyWindow.turnStart()}
-                  historyMore={historyMore()}
-                  historyLoading={historyLoading()}
-                  onLoadEarlier={() => {
-                    void historyWindow.loadAndReveal()
-                  }}
-                  renderedUserMessages={historyWindow.renderedUserMessages()}
-                  anchor={anchor}
-                  onRegisterMessage={scrollSpy.register}
-                  onUnregisterMessage={scrollSpy.unregister}
-                />
+                      const root = scroller
+                      if (root) scheduleScrollState(root)
+                    }}
+                    turnStart={historyWindow.turnStart()}
+                    historyMore={historyMore()}
+                    historyLoading={historyLoading()}
+                    onLoadEarlier={() => {
+                      void historyWindow.loadAndReveal()
+                    }}
+                    renderedUserMessages={historyWindow.renderedUserMessages()}
+                    anchor={anchor}
+                    onRegisterMessage={scrollSpy.register}
+                    onUnregisterMessage={scrollSpy.unregister}
+                  />
+                </Show>
              </Match>
              <Match when={true}>
                <NewSessionView
@@ -1262,6 +1272,7 @@ export default function Page() {

          <SessionComposerRegion
            state={composer}
+            ready={!store.deferRender && messagesReady()}
            centered={centered()}
            inputRef={(el) => {
              inputRef = el
--- a/packages/app/src/pages/session/composer/session-composer-region.tsx
+++ b/packages/app/src/pages/session/composer/session-composer-region.tsx
@@ -1,7 +1,7 @@
-import { Show, createMemo, createSignal, createEffect } from "solid-js"
+import { Show, createEffect, createMemo, createSignal, onCleanup } from "solid-js"
+import { createStore } from "solid-js/store"
 import { useParams } from "@solidjs/router"
 import { useSpring } from "@opencode-ai/ui/motion-spring"
-import { useElementHeight } from "@opencode-ai/ui/hooks"
 import { PromptInput } from "@/components/prompt-input"
 import { useLanguage } from "@/context/language"
 import { usePrompt } from "@/context/prompt"
@@ -9,12 +9,11 @@ import { getSessionHandoff, setSessionHandoff } from "@/pages/session/handoff"
 import { SessionPermissionDock } from "@/pages/session/composer/session-permission-dock"
 import { SessionQuestionDock } from "@/pages/session/composer/session-question-dock"
 import type { SessionComposerState } from "@/pages/session/composer/session-composer-state"
-import { SessionTodoDock, COLLAPSED_HEIGHT } from "@/pages/session/composer/session-todo-dock"
-
-const DOCK_SPRING = { visualDuration: 0.3, bounce: 0 }
+import { SessionTodoDock } from "@/pages/session/composer/session-todo-dock"

 export function SessionComposerRegion(props: {
  state: SessionComposerState
+  ready: boolean
  centered: boolean
  inputRef: (el: HTMLDivElement) => void
  newSessionWorktree: string
@@ -22,6 +21,23 @@ export function SessionComposerRegion(props: {
  onSubmit: () => void
  onResponseSubmit: () => void
  setPromptDockRef: (el: HTMLDivElement) => void
+  visualDuration?: number
+  bounce?: number
+  dockOpenVisualDuration?: number
+  dockOpenBounce?: number
+  dockCloseVisualDuration?: number
+  dockCloseBounce?: number
+  drawerExpandVisualDuration?: number
+  drawerExpandBounce?: number
+  drawerCollapseVisualDuration?: number
+  drawerCollapseBounce?: number
+  subtitleDuration?: number
+  subtitleTravel?: number
+  subtitleEdge?: number
+  countDuration?: number
+  countMask?: number
+  countMaskHeight?: number
+  countWidthDuration?: number
 }) {
  const params = useParams()
  const prompt = usePrompt()
@@ -47,15 +63,73 @@ export function SessionComposerRegion(props: {
    setSessionHandoff(sessionKey(), { prompt: previewPrompt() })
  })

-  const open = createMemo(() => props.state.dock() && !props.state.closing())
-  const progress = useSpring(
-    () => (open() ? 1 : 0),
-    DOCK_SPRING,
+  const [gate, setGate] = createStore({
+    ready: false,
+  })
+  let timer: number | undefined
+  let frame: number | undefined
+
+  const clear = () => {
+    if (timer !== undefined) {
+      window.clearTimeout(timer)
+      timer = undefined
+    }
+    if (frame !== undefined) {
+      cancelAnimationFrame(frame)
+      frame = undefined
+    }
+  }
+
+  createEffect(() => {
+    sessionKey()
+    const ready = props.ready
+    const delay = 140
+
+    clear()
+    setGate("ready", false)
+    if (!ready) return
+
+    frame = requestAnimationFrame(() => {
+      frame = undefined
+      timer = window.setTimeout(() => {
+        setGate("ready", true)
+        timer = undefined
+      }, delay)
+    })
+  })
+
+  onCleanup(clear)
+
+  const open = createMemo(() => gate.ready && props.state.dock() && !props.state.closing())
+  const config = createMemo(() =>
+    open()
+      ? {
+          visualDuration: props.dockOpenVisualDuration ?? props.visualDuration ?? 0.3,
+          bounce: props.dockOpenBounce ?? props.bounce ?? 0,
+        }
+      : {
+          visualDuration: props.dockCloseVisualDuration ?? props.visualDuration ?? 0.3,
+          bounce: props.dockCloseBounce ?? props.bounce ?? 0,
+        },
  )
-  const dock = createMemo(() => props.state.dock() || progress() > 0.001)
+  const progress = useSpring(() => (open() ? 1 : 0), config)
+  const value = createMemo(() => Math.max(0, Math.min(1, progress())))
+  const [height, setHeight] = createSignal(320)
+  const dock = createMemo(() => (gate.ready && props.state.dock()) || value() > 0.001)
+  const full = createMemo(() => Math.max(78, height()))
  const [contentRef, setContentRef] = createSignal<HTMLDivElement>()
-  const height = useElementHeight(contentRef, 320)
-  const full = createMemo(() => Math.max(COLLAPSED_HEIGHT, height()))
+
+  createEffect(() => {
+    const el = contentRef()
+    if (!el) return
+    const update = () => {
+      setHeight(el.getBoundingClientRect().height)
+    }
+    update()
+    const observer = new ResizeObserver(update)
+    observer.observe(el)
+    onCleanup(() => observer.disconnect())
+  })

  return (
    <div
@@ -105,10 +179,10 @@ export function SessionComposerRegion(props: {
              <div
                classList={{
                  "overflow-hidden": true,
-                  "pointer-events-none": progress() < 0.98,
+                  "pointer-events-none": value() < 0.98,
                }}
                style={{
-                  "max-height": `${full() * progress()}px`,
+                  "max-height": `${full() * value()}px`,
                }}
              >
                <div ref={setContentRef}>
@@ -117,7 +191,20 @@ export function SessionComposerRegion(props: {
                    title={language.t("session.todo.title")}
                    collapseLabel={language.t("session.todo.collapse")}
                    expandLabel={language.t("session.todo.expand")}
-                    dockProgress={progress()}
+                    dockProgress={value()}
+                    visualDuration={props.visualDuration}
+                    bounce={props.bounce}
+                    expandVisualDuration={props.drawerExpandVisualDuration}
+                    expandBounce={props.drawerExpandBounce}
+                    collapseVisualDuration={props.drawerCollapseVisualDuration}
+                    collapseBounce={props.drawerCollapseBounce}
+                    subtitleDuration={props.subtitleDuration}
+                    subtitleTravel={props.subtitleTravel}
+                    subtitleEdge={props.subtitleEdge}
+                    countDuration={props.countDuration}
+                    countMask={props.countMask}
+                    countMaskHeight={props.countMaskHeight}
+                    countWidthDuration={props.countWidthDuration}
                  />
                </div>
              </div>
@@ -127,7 +214,7 @@ export function SessionComposerRegion(props: {
                "relative z-10": true,
              }}
              style={{
-                "margin-top": `${-36 * progress()}px`,
+                "margin-top": `${-36 * value()}px`,
              }}
            >
              <PromptInput
--- a/packages/app/src/pages/session/composer/session-composer-state.ts
+++ b/packages/app/src/pages/session/composer/session-composer-state.ts
@@ -29,11 +29,7 @@ export function createSessionComposerBlocked() {
  })
 }

-export function createSessionComposerState(
-  options?: {
-    closeMs?: number | (() => number)
-  },
-) {
+export function createSessionComposerState(options?: { closeMs?: number | (() => number) }) {
  const params = useParams()
  const sdk = useSDK()
  const sync = useSync()
--- a/packages/app/src/pages/session/composer/session-question-dock.tsx
+++ b/packages/app/src/pages/session/composer/session-question-dock.tsx
@@ -3,12 +3,13 @@ import { createStore } from "solid-js/store"
 import { Button } from "@opencode-ai/ui/button"
 import { DockPrompt } from "@opencode-ai/ui/dock-prompt"
 import { Icon } from "@opencode-ai/ui/icon"
-import { IconButton } from "@opencode-ai/ui/icon-button"
 import { showToast } from "@opencode-ai/ui/toast"
 import type { QuestionAnswer, QuestionRequest } from "@opencode-ai/sdk/v2"
 import { useLanguage } from "@/context/language"
 import { useSDK } from "@/context/sdk"

+const cache = new Map<string, { tab: number; answers: QuestionAnswer[]; custom: string[]; customOn: boolean[] }>()
+
 export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit: () => void }> = (props) => {
  const sdk = useSDK()
  const language = useLanguage()
@@ -16,24 +17,24 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
  const questions = createMemo(() => props.request.questions)
  const total = createMemo(() => questions().length)

+  const cached = cache.get(props.request.id)
  const [store, setStore] = createStore({
-    tab: 0,
-    answers: [] as QuestionAnswer[],
-    custom: [] as string[],
-    customOn: [] as boolean[],
+    tab: cached?.tab ?? 0,
+    answers: cached?.answers ?? ([] as QuestionAnswer[]),
+    custom: cached?.custom ?? ([] as string[]),
+    customOn: cached?.customOn ?? ([] as boolean[]),
    editing: false,
    sending: false,
-    collapsed: false,
  })

  let root: HTMLDivElement | undefined
+  let replied = false

  const question = createMemo(() => questions()[store.tab])
  const options = createMemo(() => question()?.options ?? [])
  const input = createMemo(() => store.custom[store.tab] ?? "")
  const on = createMemo(() => store.customOn[store.tab] === true)
  const multi = createMemo(() => question()?.multiple === true)
-  const picked = createMemo(() => store.answers[store.tab]?.length ?? 0)

  const summary = createMemo(() => {
    const n = Math.min(store.tab + 1, total())
@@ -42,8 +43,6 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit

  const last = createMemo(() => store.tab >= total() - 1)

-  const fold = () => setStore("collapsed", (value) => !value)
-
  const customUpdate = (value: string, selected: boolean = on()) => {
    const prev = input().trim()
    const next = value.trim()
@@ -112,6 +111,16 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    })
  })

+  onCleanup(() => {
+    if (replied) return
+    cache.set(props.request.id, {
+      tab: store.tab,
+      answers: store.answers.map((a) => (a ? [...a] : [])),
+      custom: store.custom.map((s) => s ?? ""),
+      customOn: store.customOn.map((b) => b ?? false),
+    })
+  })
+
  const fail = (err: unknown) => {
    const message = err instanceof Error ? err.message : String(err)
    showToast({ title: language.t("common.requestFailed"), description: message })
@@ -124,6 +133,8 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    setStore("sending", true)
    try {
      await sdk.client.question.reply({ requestID: props.request.id, answers })
+      replied = true
+      cache.delete(props.request.id)
    } catch (err) {
      fail(err)
    } finally {
@@ -138,6 +149,8 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
    setStore("sending", true)
    try {
      await sdk.client.question.reject({ requestID: props.request.id })
+      replied = true
+      cache.delete(props.request.id)
    } catch (err) {
      fail(err)
    } finally {
@@ -244,21 +257,9 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
      kind="question"
      ref={(el) => (root = el)}
      header={
-        <div
-          data-action="session-question-toggle"
-          class="flex flex-1 min-w-0 items-center gap-2 cursor-default select-none"
-          role="button"
-          tabIndex={0}
-          style={{ margin: "0 -10px", padding: "0 0 0 10px" }}
-          onClick={fold}
-          onKeyDown={(event) => {
-            if (event.key !== "Enter" && event.key !== " ") return
-            event.preventDefault()
-            fold()
-          }}
-        >
+        <>
          <div data-slot="question-header-title">{summary()}</div>
-          <div data-slot="question-progress" class="ml-auto mr-1">
+          <div data-slot="question-progress">
            <For each={questions()}>
              {(_, i) => (
                <button
@@ -270,38 +271,13 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
                    (store.customOn[i()] === true && (store.custom[i()] ?? "").trim().length > 0)
                  }
                  disabled={store.sending}
-                  onMouseDown={(event) => {
-                    event.preventDefault()
-                    event.stopPropagation()
-                  }}
-                  onClick={(event) => {
-                    event.stopPropagation()
-                    jump(i())
-                  }}
+                  onClick={() => jump(i())}
                  aria-label={`${language.t("ui.tool.questions")} ${i() + 1}`}
                />
              )}
            </For>
          </div>
-          <div>
-            <IconButton
-              data-action="session-question-toggle-button"
-              icon="chevron-down"
-              size="normal"
-              variant="ghost"
-              classList={{ "rotate-180": store.collapsed }}
-              onMouseDown={(event) => {
-                event.preventDefault()
-                event.stopPropagation()
-              }}
-              onClick={(event) => {
-                event.stopPropagation()
-                fold()
-              }}
-              aria-label={store.collapsed ? language.t("session.todo.expand") : language.t("session.todo.collapse")}
-            />
-          </div>
-        </div>
+        </>
      }
      footer={
        <>
@@ -321,121 +297,56 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
        </>
      }
    >
-      <div
-        data-slot="question-text"
-        class="cursor-default"
-        classList={{
-          "mb-6": store.collapsed && picked() === 0,
-        }}
-        role={store.collapsed ? "button" : undefined}
-        tabIndex={store.collapsed ? 0 : undefined}
-        onClick={fold}
-        onKeyDown={(event) => {
-          if (!store.collapsed) return
-          if (event.key !== "Enter" && event.key !== " ") return
-          event.preventDefault()
-          fold()
-        }}
-      >
-        {question()?.question}
-      </div>
-      <Show when={store.collapsed && picked() > 0}>
-        <div data-slot="question-hint" class="cursor-default mb-6">
-          {picked()} answer{picked() === 1 ? "" : "s"} selected
-        </div>
+      <div data-slot="question-text">{question()?.question}</div>
+      <Show when={multi()} fallback={<div data-slot="question-hint">{language.t("ui.question.singleHint")}</div>}>
+        <div data-slot="question-hint">{language.t("ui.question.multiHint")}</div>
      </Show>
-      <div data-slot="question-answers" hidden={store.collapsed} aria-hidden={store.collapsed}>
-        <Show when={multi()} fallback={<div data-slot="question-hint">{language.t("ui.question.singleHint")}</div>}>
-          <div data-slot="question-hint">{language.t("ui.question.multiHint")}</div>
-        </Show>
-        <div data-slot="question-options">
-          <For each={options()}>
-            {(opt, i) => {
-              const picked = () => store.answers[store.tab]?.includes(opt.label) ?? false
-              return (
-                <button
-                  data-slot="question-option"
-                  data-picked={picked()}
-                  role={multi() ? "checkbox" : "radio"}
-                  aria-checked={picked()}
-                  disabled={store.sending}
-                  onClick={() => selectOption(i())}
-                >
-                  <span data-slot="question-option-check" aria-hidden="true">
-                    <span
-                      data-slot="question-option-box"
-                      data-type={multi() ? "checkbox" : "radio"}
-                      data-picked={picked()}
-                    >
-                      <Show when={multi()} fallback={<span data-slot="question-option-radio-dot" />}>
-                        <Icon name="check-small" size="small" />
-                      </Show>
-                    </span>
-                  </span>
-                  <span data-slot="question-option-main">
-                    <span data-slot="option-label">{opt.label}</span>
-                    <Show when={opt.description}>
-                      <span data-slot="option-description">{opt.description}</span>
-                    </Show>
-                  </span>
-                </button>
-              )
-            }}
-          </For>
-
-          <Show
-            when={store.editing}
-            fallback={
+      <div data-slot="question-options">
+        <For each={options()}>
+          {(opt, i) => {
+            const picked = () => store.answers[store.tab]?.includes(opt.label) ?? false
+            return (
              <button
                data-slot="question-option"
-                data-custom="true"
-                data-picked={on()}
+                data-picked={picked()}
                role={multi() ? "checkbox" : "radio"}
-                aria-checked={on()}
+                aria-checked={picked()}
                disabled={store.sending}
-                onClick={customOpen}
+                onClick={() => selectOption(i())}
              >
-                <span
-                  data-slot="question-option-check"
-                  aria-hidden="true"
-                  onClick={(e) => {
-                    e.preventDefault()
-                    e.stopPropagation()
-                    customToggle()
-                  }}
-                >
-                  <span data-slot="question-option-box" data-type={multi() ? "checkbox" : "radio"} data-picked={on()}>
+                <span data-slot="question-option-check" aria-hidden="true">
+                  <span
+                    data-slot="question-option-box"
+                    data-type={multi() ? "checkbox" : "radio"}
+                    data-picked={picked()}
+                  >
                    <Show when={multi()} fallback={<span data-slot="question-option-radio-dot" />}>
                      <Icon name="check-small" size="small" />
                    </Show>
                  </span>
                </span>
                <span data-slot="question-option-main">
-                  <span data-slot="option-label">{language.t("ui.messagePart.option.typeOwnAnswer")}</span>
-                  <span data-slot="option-description">{input() || language.t("ui.question.custom.placeholder")}</span>
+                  <span data-slot="option-label">{opt.label}</span>
+                  <Show when={opt.description}>
+                    <span data-slot="option-description">{opt.description}</span>
+                  </Show>
                </span>
              </button>
-            }
-          >
-            <form
+            )
+          }}
+        </For>
+
+        <Show
+          when={store.editing}
+          fallback={
+            <button
              data-slot="question-option"
              data-custom="true"
              data-picked={on()}
              role={multi() ? "checkbox" : "radio"}
              aria-checked={on()}
-              onMouseDown={(e) => {
-                if (store.sending) {
-                  e.preventDefault()
-                  return
-                }
-                if (e.target instanceof HTMLTextAreaElement) return
-                const input = e.currentTarget.querySelector('[data-slot="question-custom-input"]')
-                if (input instanceof HTMLTextAreaElement) input.focus()
-              }}
-              onSubmit={(e) => {
-                e.preventDefault()
-                commitCustom()
-              }}
+              disabled={store.sending}
+              onClick={customOpen}
            >
              <span
                data-slot="question-option-check"
@@ -454,39 +365,80 @@ export const SessionQuestionDock: Component<{ request: QuestionRequest; onSubmit
              </span>
              <span data-slot="question-option-main">
                <span data-slot="option-label">{language.t("ui.messagePart.option.typeOwnAnswer")}</span>
-                <textarea
-                  ref={(el) =>
-                    setTimeout(() => {
-                      el.focus()
-                      el.style.height = "0px"
-                      el.style.height = `${el.scrollHeight}px`
-                    }, 0)
-                  }
-                  data-slot="question-custom-input"
-                  placeholder={language.t("ui.question.custom.placeholder")}
-                  value={input()}
-                  rows={1}
-                  disabled={store.sending}
-                  onKeyDown={(e) => {
-                    if (e.key === "Escape") {
-                      e.preventDefault()
-                      setStore("editing", false)
-                      return
-                    }
-                    if (e.key !== "Enter" || e.shiftKey) return
-                    e.preventDefault()
-                    commitCustom()
-                  }}
-                  onInput={(e) => {
-                    customUpdate(e.currentTarget.value)
-                    e.currentTarget.style.height = "0px"
-                    e.currentTarget.style.height = `${e.currentTarget.scrollHeight}px`
-                  }}
-                />
+                <span data-slot="option-description">{input() || language.t("ui.question.custom.placeholder")}</span>
              </span>
-            </form>
-          </Show>
-        </div>
+            </button>
+          }
+        >
+          <form
+            data-slot="question-option"
+            data-custom="true"
+            data-picked={on()}
+            role={multi() ? "checkbox" : "radio"}
+            aria-checked={on()}
+            onMouseDown={(e) => {
+              if (store.sending) {
+                e.preventDefault()
+                return
+              }
+              if (e.target instanceof HTMLTextAreaElement) return
+              const input = e.currentTarget.querySelector('[data-slot="question-custom-input"]')
+              if (input instanceof HTMLTextAreaElement) input.focus()
+            }}
+            onSubmit={(e) => {
+              e.preventDefault()
+              commitCustom()
+            }}
+          >
+            <span
+              data-slot="question-option-check"
+              aria-hidden="true"
+              onClick={(e) => {
+                e.preventDefault()
+                e.stopPropagation()
+                customToggle()
+              }}
+            >
+              <span data-slot="question-option-box" data-type={multi() ? "checkbox" : "radio"} data-picked={on()}>
+                <Show when={multi()} fallback={<span data-slot="question-option-radio-dot" />}>
+                  <Icon name="check-small" size="small" />
+                </Show>
+              </span>
+            </span>
+            <span data-slot="question-option-main">
+              <span data-slot="option-label">{language.t("ui.messagePart.option.typeOwnAnswer")}</span>
+              <textarea
+                ref={(el) =>
+                  setTimeout(() => {
+                    el.focus()
+                    el.style.height = "0px"
+                    el.style.height = `${el.scrollHeight}px`
+                  }, 0)
+                }
+                data-slot="question-custom-input"
+                placeholder={language.t("ui.question.custom.placeholder")}
+                value={input()}
+                rows={1}
+                disabled={store.sending}
+                onKeyDown={(e) => {
+                  if (e.key === "Escape") {
+                    e.preventDefault()
+                    setStore("editing", false)
+                    return
+                  }
+                  if (e.key !== "Enter" || e.shiftKey) return
+                  e.preventDefault()
+                  commitCustom()
+                }}
+                onInput={(e) => {
+                  customUpdate(e.currentTarget.value)
+                  e.currentTarget.style.height = "0px"
+                  e.currentTarget.style.height = `${e.currentTarget.scrollHeight}px`
+                }}
+              />
+            </span>
+          </form>
+        </Show>
      </div>
    </DockPrompt>
  )
--- a/packages/app/src/pages/session/composer/session-todo-dock.tsx
+++ b/packages/app/src/pages/session/composer/session-todo-dock.tsx
@@ -6,15 +6,9 @@ import { IconButton } from "@opencode-ai/ui/icon-button"
 import { useSpring } from "@opencode-ai/ui/motion-spring"
 import { TextReveal } from "@opencode-ai/ui/text-reveal"
 import { TextStrikethrough } from "@opencode-ai/ui/text-strikethrough"
-import { useElementHeight } from "@opencode-ai/ui/hooks"
 import { Index, createEffect, createMemo, createSignal, on, onCleanup } from "solid-js"
 import { createStore } from "solid-js/store"

-const COLLAPSE_SPRING = { visualDuration: 0.3, bounce: 0 }
-export const COLLAPSED_HEIGHT = 78
-const SUBTITLE = { duration: 600, travel: 25, edge: 17 }
-const COUNT = { duration: 600, mask: 18, maskHeight: 0, widthDuration: 560 }
-
 function dot(status: Todo["status"]) {
  if (status !== "in_progress") return undefined
  return (
@@ -46,6 +40,19 @@ export function SessionTodoDock(props: {
  collapseLabel: string
  expandLabel: string
  dockProgress?: number
+  visualDuration?: number
+  bounce?: number
+  expandVisualDuration?: number
+  expandBounce?: number
+  collapseVisualDuration?: number
+  collapseBounce?: number
+  subtitleDuration?: number
+  subtitleTravel?: number
+  subtitleEdge?: number
+  countDuration?: number
+  countMask?: number
+  countMaskHeight?: number
+  countWidthDuration?: number
 }) {
  const [store, setStore] = createStore({
    collapsed: false,
@@ -66,12 +73,39 @@ export function SessionTodoDock(props: {
  )

  const preview = createMemo(() => active()?.content ?? "")
-  const collapse = useSpring(() => (store.collapsed ? 1 : 0), COLLAPSE_SPRING)
-  const shut = createMemo(() => 1 - (props.dockProgress ?? 1))
-  const hide = createMemo(() => Math.max(collapse(), shut()))
+  const config = createMemo(() =>
+    store.collapsed
+      ? {
+          visualDuration: props.collapseVisualDuration ?? props.visualDuration ?? 0.3,
+          bounce: props.collapseBounce ?? props.bounce ?? 0,
+        }
+      : {
+          visualDuration: props.expandVisualDuration ?? props.visualDuration ?? 0.3,
+          bounce: props.expandBounce ?? props.bounce ?? 0,
+        },
+  )
+  const collapse = useSpring(() => (store.collapsed ? 1 : 0), config)
+  const dock = createMemo(() => Math.max(0, Math.min(1, props.dockProgress ?? 1)))
+  const shut = createMemo(() => 1 - dock())
+  const value = createMemo(() => Math.max(0, Math.min(1, collapse())))
+  const hide = createMemo(() => Math.max(value(), shut()))
+  const off = createMemo(() => hide() > 0.98)
+  const turn = createMemo(() => Math.max(0, Math.min(1, value())))
+  const [height, setHeight] = createSignal(320)
+  const full = createMemo(() => Math.max(78, height()))
  let contentRef: HTMLDivElement | undefined
-  const height = useElementHeight(() => contentRef, 320)
-  const full = createMemo(() => Math.max(COLLAPSED_HEIGHT, height()))
+
+  createEffect(() => {
+    const el = contentRef
+    if (!el) return
+    const update = () => {
+      setHeight(el.getBoundingClientRect().height)
+    }
+    update()
+    const observer = new ResizeObserver(update)
+    observer.observe(el)
+    onCleanup(() => observer.disconnect())
+  })

  return (
    <DockTray
@@ -79,7 +113,7 @@ export function SessionTodoDock(props: {
      style={{
        "overflow-x": "visible",
        "overflow-y": "hidden",
-        "max-height": `${Math.max(COLLAPSED_HEIGHT, full() - collapse() * (full() - COLLAPSED_HEIGHT))}px`,
+        "max-height": `${Math.max(78, full() - value() * (full() - 78))}px`,
      }}
    >
      <div ref={contentRef}>
@@ -99,12 +133,12 @@ export function SessionTodoDock(props: {
            class="text-14-regular text-text-strong cursor-default inline-flex items-baseline shrink-0 whitespace-nowrap overflow-visible"
            aria-label={label()}
            style={{
-              "--tool-motion-odometer-ms": `${COUNT.duration}ms`,
-              "--tool-motion-mask": `${COUNT.mask}%`,
-              "--tool-motion-mask-height": `${COUNT.maskHeight}px`,
-              "--tool-motion-spring-ms": `${COUNT.widthDuration}ms`,
-              opacity: `${1 - shut()}`,
-              filter: shut() > 0.01 ? `blur(${shut() * 2}px)` : "none",
+              "--tool-motion-odometer-ms": `${props.countDuration ?? 600}ms`,
+              "--tool-motion-mask": `${props.countMask ?? 18}%`,
+              "--tool-motion-mask-height": `${props.countMaskHeight ?? 0}px`,
+              "--tool-motion-spring-ms": `${props.countWidthDuration ?? 560}ms`,
+              opacity: `${Math.max(0, Math.min(1, 1 - shut()))}`,
+              filter: `blur(${Math.max(0, Math.min(1, shut())) * 2}px)`,
            }}
          >
            <AnimatedNumber value={done()} />
@@ -123,9 +157,9 @@ export function SessionTodoDock(props: {
            <TextReveal
              class="text-14-regular text-text-base cursor-default"
              text={store.collapsed ? preview() : undefined}
-              duration={SUBTITLE.duration}
-              travel={SUBTITLE.travel}
-              edge={SUBTITLE.edge}
+              duration={props.subtitleDuration ?? 600}
+              travel={props.subtitleTravel ?? 25}
+              edge={props.subtitleEdge ?? 17}
              spring="cubic-bezier(0.34, 1, 0.64, 1)"
              springSoft="cubic-bezier(0.34, 1, 0.64, 1)"
              growOnly
@@ -139,7 +173,7 @@ export function SessionTodoDock(props: {
              icon="chevron-down"
              size="normal"
              variant="ghost"
-              style={{ transform: `rotate(${collapse() * 180}deg)` }}
+              style={{ transform: `rotate(${turn() * 180}deg)` }}
              onMouseDown={(event) => {
                event.preventDefault()
                event.stopPropagation()
@@ -155,15 +189,14 @@ export function SessionTodoDock(props: {

        <div
          data-slot="session-todo-list"
-          class="pb-2"
-          aria-hidden={store.collapsed}
+          aria-hidden={store.collapsed || off()}
          classList={{
            "pointer-events-none": hide() > 0.1,
          }}
          style={{
-            opacity: `${1 - hide()}`,
-            filter: hide() > 0.01 ? `blur(${hide() * 2}px)` : "none",
-            visibility: hide() > 0.98 ? "hidden" : "visible",
+            visibility: off() ? "hidden" : "visible",
+            opacity: `${Math.max(0, Math.min(1, 1 - hide()))}`,
+            filter: `blur(${Math.max(0, Math.min(1, hide())) * 2}px)`,
          }}
        >
          <TodoList todos={props.todos} open={!store.collapsed} />
@@ -249,7 +282,7 @@ function TodoList(props: { todos: Todo[]; open: boolean }) {
                "--checkbox-align": "flex-start",
                "--checkbox-offset": "1px",
                transition: "opacity 220ms var(--tool-motion-ease, cubic-bezier(0.22, 1, 0.36, 1))",
-                opacity: todo().status === "pending" ? "0.5" : "1",
+                opacity: todo().status === "pending" ? "0.94" : "1",
              }}
            >
              <TextStrikethrough
@@ -259,11 +292,12 @@ function TodoList(props: { todos: Todo[]; open: boolean }) {
                style={{
                  "line-height": "var(--line-height-normal)",
                  transition:
-                    "color 220ms var(--tool-motion-ease, cubic-bezier(0.22, 1, 0.36, 1))",
+                    "color 220ms var(--tool-motion-ease, cubic-bezier(0.22, 1, 0.36, 1)), opacity 220ms var(--tool-motion-ease, cubic-bezier(0.22, 1, 0.36, 1))",
                  color:
                    todo().status === "completed" || todo().status === "cancelled"
                      ? "var(--text-weak)"
                      : "var(--text-strong)",
+                  opacity: todo().status === "pending" ? "0.92" : "1",
                }}
              />
            </Checkbox>
--- a/packages/app/src/pages/session/helpers.test.ts
+++ b/packages/app/src/pages/session/helpers.test.ts
@@ -6,45 +6,17 @@ describe("createOpenReviewFile", () => {
    const calls: string[] = []
    const openReviewFile = createOpenReviewFile({
      showAllFiles: () => calls.push("show"),
-      openReviewPanel: () => calls.push("review"),
      tabForPath: (path) => {
        calls.push(`tab:${path}`)
        return `file://${path}`
      },
      openTab: (tab) => calls.push(`open:${tab}`),
-      setActive: (tab) => calls.push(`active:${tab}`),
-      setSelectedLines: (path, range) => calls.push(`select:${path}:${range ? `${range.start}-${range.end}` : "none"}`),
      loadFile: (path) => calls.push(`load:${path}`),
    })

    openReviewFile("src/a.ts")

-    expect(calls).toEqual([
-      "tab:src/a.ts",
-      "show",
-      "review",
-      "load:src/a.ts",
-      "open:file://src/a.ts",
-      "active:file://src/a.ts",
-      "select:src/a.ts:none",
-    ])
-  })
-
-  test("selects the requested line when provided", () => {
-    const calls: string[] = []
-    const openReviewFile = createOpenReviewFile({
-      showAllFiles: () => calls.push("show"),
-      openReviewPanel: () => calls.push("review"),
-      tabForPath: (path) => `file://${path}`,
-      openTab: () => calls.push("open"),
-      setActive: () => calls.push("active"),
-      setSelectedLines: (_path, range) => calls.push(`select:${range?.start}-${range?.end}`),
-      loadFile: () => calls.push("load"),
-    })
-
-    openReviewFile("src/a.ts", 12)
-
-    expect(calls).toContain("select:12-12")
+    expect(calls).toEqual(["show", "load:src/a.ts", "tab:src/a.ts", "open:file://src/a.ts"])
  })
 })

--- a/packages/app/src/pages/session/helpers.ts
+++ b/packages/app/src/pages/session/helpers.ts
@@ -24,22 +24,13 @@ export const createOpenReviewFile = (input: {
  showAllFiles: () => void
  tabForPath: (path: string) => string
  openTab: (tab: string) => void
-  setActive: (tab: string) => void
-  openReviewPanel: () => void
-  setSelectedLines: (path: string, range: { start: number; end: number } | null) => void
  loadFile: (path: string) => any | Promise<void>
 }) => {
-  return (path: string, line?: number) => {
-    const tab = input.tabForPath(path)
+  return (path: string) => {
    batch(() => {
      input.showAllFiles()
-      input.openReviewPanel()
      const maybePromise = input.loadFile(path)
-      const openTab = () => {
-        input.openTab(tab)
-        input.setActive(tab)
-        input.setSelectedLines(path, line ? { start: line, end: line } : null)
-      }
+      const openTab = () => input.openTab(input.tabForPath(path))
      if (maybePromise instanceof Promise) maybePromise.then(openTab)
      else openTab()
    })
--- a/packages/app/src/pages/session/message-gesture.test.ts
+++ b/packages/app/src/pages/session/message-gesture.test.ts
@@ -49,11 +49,11 @@ describe("shouldMarkBoundaryGesture", () => {
    ).toBe(true)
  })

-  test("does not mark when scroller can consume movement", () => {
+  test("does not mark when nested scroller can consume movement", () => {
    expect(
      shouldMarkBoundaryGesture({
        delta: 20,
-        scrollTop: 300,
+        scrollTop: 200,
        scrollHeight: 1000,
        clientHeight: 400,
      }),
--- a/packages/app/src/pages/session/message-gesture.ts
+++ b/packages/app/src/pages/session/message-gesture.ts
@@ -14,8 +14,8 @@ export const shouldMarkBoundaryGesture = (input: {
  if (max <= 1) return true
  if (!input.delta) return false

-  const top = Math.max(0, Math.min(max, input.scrollTop))
-  if (input.delta < 0) return -input.delta > top
-  const bottom = max - top
-  return input.delta > bottom
+  if (input.delta < 0) return input.scrollTop + input.delta <= 0
+
+  const remaining = max - input.scrollTop
+  return input.delta > remaining
 }
--- a/packages/app/src/pages/session/message-timeline.tsx
+++ b/packages/app/src/pages/session/message-timeline.tsx
@@ -1,31 +1,27 @@
-import {
-  For,
-  Index,
-  createEffect,
-  createMemo,
-  createSignal,
-  on,
-  onCleanup,
-  Show,
-  startTransition,
-  type JSX,
-} from "solid-js"
-import { createStore } from "solid-js/store"
-import { useParams } from "@solidjs/router"
+import { For, createEffect, createMemo, on, onCleanup, Show, startTransition, Index, type JSX } from "solid-js"
+import { createStore, produce } from "solid-js/store"
+import { useNavigate, useParams } from "@solidjs/router"
 import { Button } from "@opencode-ai/ui/button"
 import { FileIcon } from "@opencode-ai/ui/file-icon"
 import { Icon } from "@opencode-ai/ui/icon"
+import { IconButton } from "@opencode-ai/ui/icon-button"
+import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
+import { Dialog } from "@opencode-ai/ui/dialog"
+import { InlineInput } from "@opencode-ai/ui/inline-input"
 import { SessionTurn } from "@opencode-ai/ui/session-turn"
 import { ScrollView } from "@opencode-ai/ui/scroll-view"
 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 { 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 { useSettings } from "@/context/settings"
+import { useSDK } from "@/context/sdk"
 import { useSync } from "@/context/sync"
 import { parseCommentNote, readCommentMetadata } from "@/utils/comment-note"
-import { SessionTimelineHeader } from "@/pages/session/session-timeline-header"

 type MessageComment = {
  path: string
@@ -37,9 +33,7 @@ type MessageComment = {
 }

 const emptyMessages: MessageType[] = []
-
-const isDefaultSessionTitle = (title?: string) =>
-  !!title && /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(title)
+const idle = { type: "idle" as const }

 const messageComments = (parts: Part[]): MessageComment[] =>
  parts.flatMap((part) => {
@@ -116,8 +110,6 @@ function createTimelineStaging(input: TimelineStageInput) {
    completedSession: "",
    count: 0,
  })
-  const [readySession, setReadySession] = createSignal("")
-  let active = ""

  const stagedCount = createMemo(() => {
    const total = input.messages().length
@@ -142,46 +134,23 @@ function createTimelineStaging(input: TimelineStageInput) {
    cancelAnimationFrame(frame)
    frame = undefined
  }
-  const scheduleReady = (sessionKey: string) => {
-    if (input.sessionKey() !== sessionKey) return
-    if (readySession() === sessionKey) return
-    setReadySession(sessionKey)
-  }

  createEffect(
    on(
      () => [input.sessionKey(), input.turnStart() > 0, input.messages().length] as const,
      ([sessionKey, isWindowed, total]) => {
-        const switched = active !== sessionKey
-        if (switched) {
-          active = sessionKey
-          setReadySession("")
-        }
-
-        const staging = state.activeSession === sessionKey && state.completedSession !== sessionKey
-        const shouldStage = isWindowed && total > input.config.init && state.completedSession !== sessionKey
-
-        if (staging && !switched && shouldStage && frame !== undefined) return
-
        cancel()
-
-        if (shouldStage) setReadySession("")
+        const shouldStage =
+          isWindowed &&
+          total > input.config.init &&
+          state.completedSession !== sessionKey &&
+          state.activeSession !== sessionKey
        if (!shouldStage) {
-          setState({
-            activeSession: "",
-            completedSession: isWindowed ? sessionKey : state.completedSession,
-            count: total,
-          })
-          if (total <= 0) {
-            setReadySession("")
-            return
-          }
-          if (readySession() !== sessionKey) scheduleReady(sessionKey)
+          setState({ activeSession: "", count: total })
          return
        }

        let count = Math.min(total, input.config.init)
-        if (staging) count = Math.min(total, Math.max(count, state.count))
        setState({ activeSession: sessionKey, count })

        const step = () => {
@@ -195,7 +164,6 @@ function createTimelineStaging(input: TimelineStageInput) {
          if (count >= currentTotal) {
            setState({ completedSession: sessionKey, activeSession: "" })
            frame = undefined
-            scheduleReady(sessionKey)
            return
          }
          frame = requestAnimationFrame(step)
@@ -209,12 +177,9 @@ function createTimelineStaging(input: TimelineStageInput) {
    const key = input.sessionKey()
    return state.activeSession === key && state.completedSession !== key
  })
-  const ready = createMemo(() => readySession() === input.sessionKey())

-  onCleanup(() => {
-    cancel()
-  })
-  return { messages: stagedUserMessages, isStaging, ready }
+  onCleanup(cancel)
+  return { messages: stagedUserMessages, isStaging }
 }

 export function MessageTimeline(props: {
@@ -231,7 +196,6 @@ export function MessageTimeline(props: {
  onScrollSpyScroll: () => void
  onTurnBackfillScroll: () => void
  onAutoScrollInteraction: (event: MouseEvent) => void
-  onPreserveScrollAnchor: (target: HTMLElement) => void
  centered: boolean
  setContentRef: (el: HTMLDivElement) => void
  turnStart: number
@@ -246,19 +210,14 @@ export function MessageTimeline(props: {
  let touchGesture: number | undefined

  const params = useParams()
+  const navigate = useNavigate()
+  const sdk = useSDK()
  const sync = useSync()
  const settings = useSettings()
+  const dialog = useDialog()
  const language = useLanguage()

-  const trigger = (target: EventTarget | null) => {
-    const next =
-      target instanceof Element
-        ? target.closest('[data-slot="collapsible-trigger"], [data-slot="accordion-trigger"]')
-        : undefined
-    if (!(next instanceof HTMLElement)) return
-    return next
-  }
-
+  const rendered = createMemo(() => props.renderedUserMessages.map((message) => message.id))
  const sessionKey = createMemo(() => `${params.dir}${params.id ? "/" + params.id : ""}`)
  const sessionID = createMemo(() => params.id)
  const sessionMessages = createMemo(() => {
@@ -271,20 +230,28 @@ export function MessageTimeline(props: {
      (item): item is AssistantMessage => item.role === "assistant" && typeof item.time.completed !== "number",
    ),
  )
-  const sessionStatus = createMemo(() => sync.data.session_status[sessionID() ?? ""]?.type ?? "idle")
+  const sessionStatus = createMemo(() => {
+    const id = sessionID()
+    if (!id) return idle
+    return sync.data.session_status[id] ?? idle
+  })
  const activeMessageID = createMemo(() => {
-    const messages = sessionMessages()
-    const message = pending()
-    if (message?.parentID) {
-      const result = Binary.search(messages, message.parentID, (item) => item.id)
-      const parent = result.found ? messages[result.index] : messages.find((item) => item.id === message.parentID)
-      if (parent?.role === "user") return parent.id
+    const parentID = pending()?.parentID
+    if (parentID) {
+      const messages = sessionMessages()
+      const result = Binary.search(messages, parentID, (message) => message.id)
+      const message = result.found ? messages[result.index] : messages.find((item) => item.id === parentID)
+      if (message && message.role === "user") return message.id
    }

-    if (sessionStatus() === "idle") return undefined
-    for (let i = messages.length - 1; i >= 0; i--) {
-      if (messages[i].role === "user") return messages[i].id
+    const status = sessionStatus()
+    if (status.type !== "idle") {
+      const messages = sessionMessages()
+      for (let i = messages.length - 1; i >= 0; i--) {
+        if (messages[i].role === "user") return messages[i].id
+      }
    }
+
    return undefined
  })
  const info = createMemo(() => {
@@ -292,19 +259,9 @@ export function MessageTimeline(props: {
    if (!id) return
    return sync.session.get(id)
  })
-  const titleValue = createMemo(() => {
-    const title = info()?.title
-    if (!title) return
-    if (isDefaultSessionTitle(title)) return language.t("command.session.new")
-    return title
-  })
-  const defaultTitle = createMemo(() => isDefaultSessionTitle(info()?.title))
-  const headerTitle = createMemo(
-    () => titleValue() ?? (props.renderedUserMessages.length ? language.t("command.session.new") : undefined),
-  )
-  const placeholderTitle = createMemo(() => defaultTitle() || (!info()?.title && props.renderedUserMessages.length > 0))
+  const titleValue = createMemo(() => info()?.title)
  const parentID = createMemo(() => info()?.parentID)
-  const showHeader = createMemo(() => !!(headerTitle() || parentID()))
+  const showHeader = createMemo(() => !!(titleValue() || parentID()))
  const stageCfg = { init: 1, batch: 3 }
  const staging = createTimelineStaging({
    sessionKey,
@@ -312,7 +269,212 @@ export function MessageTimeline(props: {
    messages: () => props.renderedUserMessages,
    config: stageCfg,
  })
-  const rendered = createMemo(() => staging.messages().map((message) => message.id))
+
+  const [title, setTitle] = createStore({
+    draft: "",
+    editing: false,
+    saving: false,
+    menuOpen: false,
+    pendingRename: false,
+  })
+  let titleRef: HTMLInputElement | undefined
+
+  const errorMessage = (err: unknown) => {
+    if (err && typeof err === "object" && "data" in err) {
+      const data = (err as { data?: { message?: string } }).data
+      if (data?.message) return data.message
+    }
+    if (err instanceof Error) return err.message
+    return language.t("common.requestFailed")
+  }
+
+  createEffect(
+    on(
+      sessionKey,
+      () => setTitle({ draft: "", editing: false, saving: false, menuOpen: false, pendingRename: false }),
+      { defer: true },
+    ),
+  )
+
+  const openTitleEditor = () => {
+    if (!sessionID()) return
+    setTitle({ editing: true, draft: titleValue() ?? "" })
+    requestAnimationFrame(() => {
+      titleRef?.focus()
+      titleRef?.select()
+    })
+  }
+
+  const closeTitleEditor = () => {
+    if (title.saving) return
+    setTitle({ editing: false, saving: false })
+  }
+
+  const saveTitleEditor = async () => {
+    const id = sessionID()
+    if (!id) return
+    if (title.saving) return
+
+    const next = title.draft.trim()
+    if (!next || next === (titleValue() ?? "")) {
+      setTitle({ editing: false, saving: false })
+      return
+    }
+
+    setTitle("saving", true)
+    await sdk.client.session
+      .update({ sessionID: id, title: next })
+      .then(() => {
+        sync.set(
+          produce((draft) => {
+            const index = draft.session.findIndex((s) => s.id === id)
+            if (index !== -1) draft.session[index].title = next
+          }),
+        )
+        setTitle({ editing: false, saving: false })
+      })
+      .catch((err) => {
+        setTitle("saving", false)
+        showToast({
+          title: language.t("common.requestFailed"),
+          description: errorMessage(err),
+        })
+      })
+  }
+
+  const navigateAfterSessionRemoval = (sessionID: string, parentID?: string, nextSessionID?: string) => {
+    if (params.id !== sessionID) return
+    if (parentID) {
+      navigate(`/${params.dir}/session/${parentID}`)
+      return
+    }
+    if (nextSessionID) {
+      navigate(`/${params.dir}/session/${nextSessionID}`)
+      return
+    }
+    navigate(`/${params.dir}/session`)
+  }
+
+  const archiveSession = async (sessionID: string) => {
+    const session = sync.session.get(sessionID)
+    if (!session) return
+
+    const sessions = sync.data.session ?? []
+    const index = sessions.findIndex((s) => s.id === sessionID)
+    const nextSession = index === -1 ? undefined : (sessions[index + 1] ?? sessions[index - 1])
+
+    await sdk.client.session
+      .update({ sessionID, time: { archived: Date.now() } })
+      .then(() => {
+        sync.set(
+          produce((draft) => {
+            const index = draft.session.findIndex((s) => s.id === sessionID)
+            if (index !== -1) draft.session.splice(index, 1)
+          }),
+        )
+        navigateAfterSessionRemoval(sessionID, session.parentID, nextSession?.id)
+      })
+      .catch((err) => {
+        showToast({
+          title: language.t("common.requestFailed"),
+          description: errorMessage(err),
+        })
+      })
+  }
+
+  const deleteSession = async (sessionID: string) => {
+    const session = sync.session.get(sessionID)
+    if (!session) return false
+
+    const sessions = (sync.data.session ?? []).filter((s) => !s.parentID && !s.time?.archived)
+    const index = sessions.findIndex((s) => s.id === sessionID)
+    const nextSession = index === -1 ? undefined : (sessions[index + 1] ?? sessions[index - 1])
+
+    const result = await sdk.client.session
+      .delete({ sessionID })
+      .then((x) => x.data)
+      .catch((err) => {
+        showToast({
+          title: language.t("session.delete.failed.title"),
+          description: errorMessage(err),
+        })
+        return false
+      })
+
+    if (!result) return false
+
+    sync.set(
+      produce((draft) => {
+        const removed = new Set<string>([sessionID])
+
+        const byParent = new Map<string, string[]>()
+        for (const item of draft.session) {
+          const parentID = item.parentID
+          if (!parentID) continue
+          const existing = byParent.get(parentID)
+          if (existing) {
+            existing.push(item.id)
+            continue
+          }
+          byParent.set(parentID, [item.id])
+        }
+
+        const stack = [sessionID]
+        while (stack.length) {
+          const parentID = stack.pop()
+          if (!parentID) continue
+
+          const children = byParent.get(parentID)
+          if (!children) continue
+
+          for (const child of children) {
+            if (removed.has(child)) continue
+            removed.add(child)
+            stack.push(child)
+          }
+        }
+
+        draft.session = draft.session.filter((s) => !removed.has(s.id))
+      }),
+    )
+
+    navigateAfterSessionRemoval(sessionID, session.parentID, nextSession?.id)
+    return true
+  }
+
+  const navigateParent = () => {
+    const id = parentID()
+    if (!id) return
+    navigate(`/${params.dir}/session/${id}`)
+  }
+
+  function DialogDeleteSession(props: { sessionID: string }) {
+    const name = createMemo(() => sync.session.get(props.sessionID)?.title ?? language.t("command.session.new"))
+    const handleDelete = async () => {
+      await deleteSession(props.sessionID)
+      dialog.close()
+    }
+
+    return (
+      <Dialog title={language.t("session.delete.title")} fit>
+        <div class="flex flex-col gap-4 pl-6 pr-2.5 pb-3">
+          <div class="flex flex-col gap-1">
+            <span class="text-14-regular text-text-strong">
+              {language.t("session.delete.confirm", { name: name() })}
+            </span>
+          </div>
+          <div class="flex justify-end gap-2">
+            <Button variant="ghost" size="large" onClick={() => dialog.close()}>
+              {language.t("common.cancel")}
+            </Button>
+            <Button variant="primary" size="large" onClick={handleDelete}>
+              {language.t("session.delete.button")}
+            </Button>
+          </div>
+        </div>
+      </Dialog>
+    )
+  }

  return (
    <Show
@@ -336,16 +498,6 @@ export function MessageTimeline(props: {
            <Icon name="arrow-down-to-line" />
          </button>
        </div>
-        <SessionTimelineHeader
-          centered={props.centered}
-          showHeader={showHeader}
-          sessionKey={sessionKey}
-          sessionID={sessionID}
-          parentID={parentID}
-          titleValue={titleValue}
-          headerTitle={headerTitle}
-          placeholderTitle={placeholderTitle}
-        />
        <ScrollView
          viewportRef={props.setScrollRef}
          onWheel={(e) => {
@@ -380,18 +532,9 @@ export function MessageTimeline(props: {
            touchGesture = undefined
          }}
          onPointerDown={(e) => {
-            const next = trigger(e.target)
-            if (next) props.onPreserveScrollAnchor(next)
-
            if (e.target !== e.currentTarget) return
            props.onMarkScrollGesture(e.currentTarget)
          }}
-          onKeyDown={(e) => {
-            if (e.key !== "Enter" && e.key !== " ") return
-            const next = trigger(e.target)
-            if (!next) return
-            props.onPreserveScrollAnchor(next)
-          }}
          onScroll={(e) => {
            props.onScheduleScrollState(e.currentTarget)
            props.onTurnBackfillScroll()
@@ -400,22 +543,131 @@ export function MessageTimeline(props: {
            props.onMarkScrollGesture(e.currentTarget)
            if (props.isDesktop) props.onScrollSpyScroll()
          }}
-          onClick={(e) => {
-            const next = trigger(e.target)
-            if (next) props.onPreserveScrollAnchor(next)
-            props.onAutoScrollInteraction(e)
-          }}
+          onClick={props.onAutoScrollInteraction}
          class="relative min-w-0 w-full h-full"
          style={{
            "--session-title-height": showHeader() ? "40px" : "0px",
            "--sticky-accordion-top": showHeader() ? "48px" : "0px",
          }}
        >
-          <div>
+          <div ref={props.setContentRef} class="min-w-0 w-full">
+            <Show when={showHeader()}>
+              <div
+                data-session-title
+                classList={{
+                  "sticky top-0 z-30 bg-[linear-gradient(to_bottom,var(--background-stronger)_48px,transparent)]": true,
+                  "w-full": true,
+                  "pb-4": true,
+                  "pl-2 pr-3 md:pl-4 md:pr-3": true,
+                  "md:max-w-200 md:mx-auto 2xl:max-w-[1000px]": props.centered,
+                }}
+              >
+                <div class="h-12 w-full flex items-center justify-between gap-2">
+                  <div class="flex items-center gap-1 min-w-0 flex-1 pr-3">
+                    <Show when={parentID()}>
+                      <IconButton
+                        tabIndex={-1}
+                        icon="arrow-left"
+                        variant="ghost"
+                        onClick={navigateParent}
+                        aria-label={language.t("common.goBack")}
+                      />
+                    </Show>
+                    <Show when={titleValue() || title.editing}>
+                      <Show
+                        when={title.editing}
+                        fallback={
+                          <h1
+                            class="text-14-medium text-text-strong truncate grow-1 min-w-0 pl-2"
+                            onDblClick={openTitleEditor}
+                          >
+                            {titleValue()}
+                          </h1>
+                        }
+                      >
+                        <InlineInput
+                          ref={(el) => {
+                            titleRef = el
+                          }}
+                          value={title.draft}
+                          disabled={title.saving}
+                          class="text-14-medium text-text-strong grow-1 min-w-0 pl-2 rounded-[6px]"
+                          style={{ "--inline-input-shadow": "var(--shadow-xs-border-select)" }}
+                          onInput={(event) => setTitle("draft", event.currentTarget.value)}
+                          onKeyDown={(event) => {
+                            event.stopPropagation()
+                            if (event.key === "Enter") {
+                              event.preventDefault()
+                              void saveTitleEditor()
+                              return
+                            }
+                            if (event.key === "Escape") {
+                              event.preventDefault()
+                              closeTitleEditor()
+                            }
+                          }}
+                          onBlur={closeTitleEditor}
+                        />
+                      </Show>
+                    </Show>
+                  </div>
+                  <Show when={sessionID()}>
+                    {(id) => (
+                      <div class="shrink-0 flex items-center gap-3">
+                        <SessionContextUsage placement="bottom" />
+                        <DropdownMenu
+                          gutter={4}
+                          placement="bottom-end"
+                          open={title.menuOpen}
+                          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"
+                            aria-label={language.t("common.moreOptions")}
+                          />
+                          <DropdownMenu.Portal>
+                            <DropdownMenu.Content
+                              style={{ "min-width": "104px" }}
+                              onCloseAutoFocus={(event) => {
+                                if (!title.pendingRename) return
+                                event.preventDefault()
+                                setTitle("pendingRename", false)
+                                openTitleEditor()
+                              }}
+                            >
+                              <DropdownMenu.Item
+                                onSelect={() => {
+                                  setTitle("pendingRename", true)
+                                  setTitle("menuOpen", false)
+                                }}
+                              >
+                                <DropdownMenu.ItemLabel>{language.t("common.rename")}</DropdownMenu.ItemLabel>
+                              </DropdownMenu.Item>
+                              <DropdownMenu.Item onSelect={() => void archiveSession(id())}>
+                                <DropdownMenu.ItemLabel>{language.t("common.archive")}</DropdownMenu.ItemLabel>
+                              </DropdownMenu.Item>
+                              <DropdownMenu.Separator />
+                              <DropdownMenu.Item
+                                onSelect={() => dialog.show(() => <DialogDeleteSession sessionID={id()} />)}
+                              >
+                                <DropdownMenu.ItemLabel>{language.t("common.delete")}</DropdownMenu.ItemLabel>
+                              </DropdownMenu.Item>
+                            </DropdownMenu.Content>
+                          </DropdownMenu.Portal>
+                        </DropdownMenu>
+                      </div>
+                    )}
+                  </Show>
+                </div>
+              </div>
+            </Show>
+
            <div
-              ref={props.setContentRef}
              role="log"
-              class="flex flex-col gap-0 items-start justify-start pb-16 transition-[margin]"
+              class="flex flex-col gap-12 items-start justify-start pb-16 transition-[margin]"
              classList={{
                "w-full": true,
                "md:max-w-200 md:mx-auto 2xl:max-w-[1000px]": props.centered,
@@ -440,15 +692,6 @@ export function MessageTimeline(props: {
              </Show>
              <For each={rendered()}>
                {(messageID) => {
-                  // Capture at creation time: animate only messages added after the
-                  // timeline finishes its initial backfill staging, plus the first
-                  // turn while a brand new session is still using its default title.
-                  const isNew =
-                    staging.ready() ||
-                    (defaultTitle() &&
-                      sessionStatus() !== "idle" &&
-                      props.renderedUserMessages.length === 1 &&
-                      messageID === props.renderedUserMessages[0]?.id)
                  const active = createMemo(() => activeMessageID() === messageID)
                  const queued = createMemo(() => {
                    if (active()) return false
@@ -457,10 +700,7 @@ export function MessageTimeline(props: {
                    return false
                  })
                  const comments = createMemo(() => messageComments(sync.data.part[messageID] ?? []), [], {
-                    equals: (a, b) => {
-                      if (a.length !== b.length) return false
-                      return a.every((x, i) => x.path === b[i].path && x.comment === b[i].comment)
-                    },
+                    equals: (a, b) => JSON.stringify(a) === JSON.stringify(b),
                  })
                  const commentCount = createMemo(() => comments().length)
                  return (
@@ -517,7 +757,7 @@ export function MessageTimeline(props: {
                        messageID={messageID}
                        active={active()}
                        queued={queued()}
-                        animate={isNew || active()}
+                        status={active() ? sessionStatus() : undefined}
                        showReasoningSummaries={settings.general.showReasoningSummaries()}
                        shellToolDefaultOpen={settings.general.shellToolPartsExpanded()}
                        editToolDefaultOpen={settings.general.editToolPartsExpanded()}
--- a/packages/app/src/pages/session/session-timeline-header.tsx
+++ b/packages/app/src/pages/session/session-timeline-header.tsx
@@ -1,509 +0,0 @@
-import { createEffect, createMemo, on, onCleanup, Show } from "solid-js"
-import { createStore, produce } from "solid-js/store"
-import { useNavigate, useParams } from "@solidjs/router"
-import { Button } from "@opencode-ai/ui/button"
-import { IconButton } from "@opencode-ai/ui/icon-button"
-import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu"
-import { Dialog } from "@opencode-ai/ui/dialog"
-import { InlineInput } from "@opencode-ai/ui/inline-input"
-import { animate, type AnimationPlaybackControls, clearFadeStyles, FAST_SPRING } from "@opencode-ai/ui/motion"
-import { showToast } from "@opencode-ai/ui/toast"
-import { errorMessage } from "@/pages/layout/helpers"
-import { SessionContextUsage } from "@/components/session-context-usage"
-import { useDialog } from "@opencode-ai/ui/context/dialog"
-import { useLanguage } from "@/context/language"
-import { useSDK } from "@/context/sdk"
-import { useSync } from "@/context/sync"
-
-export function SessionTimelineHeader(props: {
-  centered: boolean
-  showHeader: () => boolean
-  sessionKey: () => string
-  sessionID: () => string | undefined
-  parentID: () => string | undefined
-  titleValue: () => string | undefined
-  headerTitle: () => string | undefined
-  placeholderTitle: () => boolean
-}) {
-  const navigate = useNavigate()
-  const params = useParams()
-  const sdk = useSDK()
-  const sync = useSync()
-  const dialog = useDialog()
-  const language = useLanguage()
-
-  const [title, setTitle] = createStore({
-    draft: "",
-    editing: false,
-    saving: false,
-    menuOpen: false,
-    pendingRename: false,
-  })
-  const [headerText, setHeaderText] = createStore({
-    session: props.sessionKey(),
-    value: props.headerTitle(),
-    prev: undefined as string | undefined,
-    muted: props.placeholderTitle(),
-    prevMuted: false,
-  })
-  let headerAnim: AnimationPlaybackControls | undefined
-  let enterAnim: AnimationPlaybackControls | undefined
-  let leaveAnim: AnimationPlaybackControls | undefined
-  let titleRef: HTMLInputElement | undefined
-  let headerRef: HTMLDivElement | undefined
-  let enterRef: HTMLSpanElement | undefined
-  let leaveRef: HTMLSpanElement | undefined
-
-  const clearHeaderAnim = () => {
-    headerAnim?.stop()
-    headerAnim = undefined
-  }
-
-  const animateHeader = () => {
-    const el = headerRef
-    if (!el) return
-
-    clearHeaderAnim()
-    if (!headerText.muted) {
-      el.style.opacity = "1"
-      return
-    }
-
-    headerAnim = animate(el, { opacity: [0, 1] }, { type: "spring", visualDuration: 1.0, bounce: 0 })
-    headerAnim.finished.then(() => {
-      if (headerRef !== el) return
-      clearFadeStyles(el)
-    })
-  }
-
-  const clearTitleAnims = () => {
-    enterAnim?.stop()
-    enterAnim = undefined
-    leaveAnim?.stop()
-    leaveAnim = undefined
-  }
-
-  const settleTitleEnter = () => {
-    if (enterRef) clearFadeStyles(enterRef)
-  }
-
-  const hideLeave = () => {
-    if (!leaveRef) return
-    leaveRef.style.opacity = "0"
-    leaveRef.style.filter = ""
-    leaveRef.style.transform = ""
-  }
-
-  const animateEnterSpan = () => {
-    if (!enterRef) return
-    enterAnim = animate(
-      enterRef,
-      { opacity: [0, 1], filter: ["blur(2px)", "blur(0px)"], transform: ["translateY(-2px)", "translateY(0)"] },
-      FAST_SPRING,
-    )
-    enterAnim.finished.then(() => settleTitleEnter())
-  }
-
-  const crossfadeTitle = (nextTitle: string, nextMuted: boolean) => {
-    clearTitleAnims()
-    setHeaderText({ prev: headerText.value, prevMuted: headerText.muted })
-    setHeaderText({ value: nextTitle, muted: nextMuted })
-
-    if (leaveRef) {
-      leaveAnim = animate(
-        leaveRef,
-        { opacity: [1, 0], filter: ["blur(0px)", "blur(2px)"], transform: ["translateY(0)", "translateY(2px)"] },
-        FAST_SPRING,
-      )
-      leaveAnim.finished.then(() => {
-        setHeaderText({ prev: undefined, prevMuted: false })
-        hideLeave()
-      })
-    }
-
-    animateEnterSpan()
-  }
-
-  const fadeInTitle = (nextTitle: string, nextMuted: boolean) => {
-    clearTitleAnims()
-    setHeaderText({ value: nextTitle, muted: nextMuted, prev: undefined, prevMuted: false })
-    animateEnterSpan()
-  }
-
-  const snapTitle = (nextTitle: string | undefined, nextMuted: boolean) => {
-    clearTitleAnims()
-    setHeaderText({ value: nextTitle, muted: nextMuted, prev: undefined, prevMuted: false })
-    settleTitleEnter()
-  }
-
-  createEffect(
-    on(props.showHeader, (show, prev) => {
-      if (!show) {
-        clearHeaderAnim()
-        return
-      }
-      if (show === prev) return
-      animateHeader()
-    }),
-  )
-
-  createEffect(
-    on(
-      () => [props.sessionKey(), props.headerTitle(), props.placeholderTitle()] as const,
-      ([nextSession, nextTitle, nextMuted]) => {
-        if (nextSession !== headerText.session) {
-          setHeaderText("session", nextSession)
-          if (nextTitle && nextMuted) {
-            fadeInTitle(nextTitle, nextMuted)
-            return
-          }
-          snapTitle(nextTitle, nextMuted)
-          return
-        }
-        if (nextTitle === headerText.value && nextMuted === headerText.muted) return
-        if (!nextTitle) {
-          snapTitle(undefined, false)
-          return
-        }
-        if (!headerText.value) {
-          fadeInTitle(nextTitle, nextMuted)
-          return
-        }
-        if (title.saving || title.editing) {
-          snapTitle(nextTitle, nextMuted)
-          return
-        }
-        crossfadeTitle(nextTitle, nextMuted)
-      },
-    ),
-  )
-
-  onCleanup(() => {
-    clearHeaderAnim()
-    clearTitleAnims()
-  })
-
-  const toastError = (err: unknown) => errorMessage(err, language.t("common.requestFailed"))
-
-  createEffect(
-    on(
-      props.sessionKey,
-      () => setTitle({ draft: "", editing: false, saving: false, menuOpen: false, pendingRename: false }),
-      { defer: true },
-    ),
-  )
-
-  const openTitleEditor = () => {
-    if (!props.sessionID()) return
-    setTitle({ editing: true, draft: props.titleValue() ?? "" })
-    requestAnimationFrame(() => {
-      titleRef?.focus()
-      titleRef?.select()
-    })
-  }
-
-  const closeTitleEditor = () => {
-    if (title.saving) return
-    setTitle({ editing: false, saving: false })
-  }
-
-  const saveTitleEditor = async () => {
-    const id = props.sessionID()
-    if (!id) return
-    if (title.saving) return
-
-    const next = title.draft.trim()
-    if (!next || next === (props.titleValue() ?? "")) {
-      setTitle({ editing: false, saving: false })
-      return
-    }
-
-    setTitle("saving", true)
-    await sdk.client.session
-      .update({ sessionID: id, title: next })
-      .then(() => {
-        sync.set(
-          produce((draft) => {
-            const index = draft.session.findIndex((session) => session.id === id)
-            if (index !== -1) draft.session[index].title = next
-          }),
-        )
-        setTitle({ editing: false, saving: false })
-      })
-      .catch((err) => {
-        setTitle("saving", false)
-        showToast({
-          title: language.t("common.requestFailed"),
-          description: toastError(err),
-        })
-      })
-  }
-
-  const navigateAfterSessionRemoval = (sessionID: string, parentID?: string, nextSessionID?: string) => {
-    if (params.id !== sessionID) return
-    if (parentID) {
-      navigate(`/${params.dir}/session/${parentID}`)
-      return
-    }
-    if (nextSessionID) {
-      navigate(`/${params.dir}/session/${nextSessionID}`)
-      return
-    }
-    navigate(`/${params.dir}/session`)
-  }
-
-  const archiveSession = async (sessionID: string) => {
-    const session = sync.session.get(sessionID)
-    if (!session) return
-
-    const sessions = sync.data.session ?? []
-    const index = sessions.findIndex((item) => item.id === sessionID)
-    const nextSession = index === -1 ? undefined : (sessions[index + 1] ?? sessions[index - 1])
-
-    await sdk.client.session
-      .update({ sessionID, time: { archived: Date.now() } })
-      .then(() => {
-        sync.set(
-          produce((draft) => {
-            const index = draft.session.findIndex((item) => item.id === sessionID)
-            if (index !== -1) draft.session.splice(index, 1)
-          }),
-        )
-        navigateAfterSessionRemoval(sessionID, session.parentID, nextSession?.id)
-      })
-      .catch((err) => {
-        showToast({
-          title: language.t("common.requestFailed"),
-          description: toastError(err),
-        })
-      })
-  }
-
-  const deleteSession = async (sessionID: string) => {
-    const session = sync.session.get(sessionID)
-    if (!session) return false
-
-    const sessions = (sync.data.session ?? []).filter((item) => !item.parentID && !item.time?.archived)
-    const index = sessions.findIndex((item) => item.id === sessionID)
-    const nextSession = index === -1 ? undefined : (sessions[index + 1] ?? sessions[index - 1])
-
-    const result = await sdk.client.session
-      .delete({ sessionID })
-      .then((x) => x.data)
-      .catch((err) => {
-        showToast({
-          title: language.t("session.delete.failed.title"),
-          description: toastError(err),
-        })
-        return false
-      })
-
-    if (!result) return false
-
-    sync.set(
-      produce((draft) => {
-        const removed = new Set<string>([sessionID])
-        const byParent = new Map<string, string[]>()
-
-        for (const item of draft.session) {
-          const parentID = item.parentID
-          if (!parentID) continue
-
-          const existing = byParent.get(parentID)
-          if (existing) {
-            existing.push(item.id)
-            continue
-          }
-          byParent.set(parentID, [item.id])
-        }
-
-        const stack = [sessionID]
-        while (stack.length) {
-          const parentID = stack.pop()
-          if (!parentID) continue
-
-          const children = byParent.get(parentID)
-          if (!children) continue
-
-          for (const child of children) {
-            if (removed.has(child)) continue
-            removed.add(child)
-            stack.push(child)
-          }
-        }
-
-        draft.session = draft.session.filter((item) => !removed.has(item.id))
-      }),
-    )
-
-    navigateAfterSessionRemoval(sessionID, session.parentID, nextSession?.id)
-    return true
-  }
-
-  const navigateParent = () => {
-    const id = props.parentID()
-    if (!id) return
-    navigate(`/${params.dir}/session/${id}`)
-  }
-
-  function DialogDeleteSession(input: { sessionID: string }) {
-    const name = createMemo(() => sync.session.get(input.sessionID)?.title ?? language.t("command.session.new"))
-
-    const handleDelete = async () => {
-      await deleteSession(input.sessionID)
-      dialog.close()
-    }
-
-    return (
-      <Dialog title={language.t("session.delete.title")} fit>
-        <div class="flex flex-col gap-4 pl-6 pr-2.5 pb-3">
-          <div class="flex flex-col gap-1">
-            <span class="text-14-regular text-text-strong">
-              {language.t("session.delete.confirm", { name: name() })}
-            </span>
-          </div>
-          <div class="flex justify-end gap-2">
-            <Button variant="ghost" size="large" onClick={() => dialog.close()}>
-              {language.t("common.cancel")}
-            </Button>
-            <Button variant="primary" size="large" onClick={handleDelete}>
-              {language.t("session.delete.button")}
-            </Button>
-          </div>
-        </div>
-      </Dialog>
-    )
-  }
-
-  return (
-    <Show when={props.showHeader()}>
-      <div
-        data-session-title
-        ref={(el) => {
-          headerRef = el
-          el.style.opacity = "0"
-        }}
-        class="pointer-events-none absolute inset-x-0 top-0 z-30"
-      >
-        <div
-          classList={{
-            "bg-[linear-gradient(to_bottom,var(--background-stronger)_38px,transparent)]": true,
-            "w-full": true,
-            "pb-10": true,
-            "pl-2 pr-3 md:pl-4 md:pr-3": true,
-            "md:max-w-200 md:mx-auto 2xl:max-w-[1000px]": props.centered,
-          }}
-        >
-          <div class="pointer-events-auto h-12 w-full flex items-center justify-between gap-2">
-            <div class="flex items-center gap-1 min-w-0 flex-1 pr-3">
-              <Show when={props.parentID()}>
-                <div>
-                  <IconButton
-                    tabIndex={-1}
-                    icon="arrow-left"
-                    variant="ghost"
-                    onClick={navigateParent}
-                    aria-label={language.t("common.goBack")}
-                  />
-                </div>
-              </Show>
-              <Show when={!!headerText.value || title.editing}>
-                <Show
-                  when={title.editing}
-                  fallback={
-                    <h1 class="text-14-medium text-text-strong grow-1 min-w-0 pl-2" onDblClick={openTitleEditor}>
-                      <span class="grid min-w-0" style={{ overflow: "clip" }}>
-                        <span ref={enterRef} class="col-start-1 row-start-1 min-w-0 truncate">
-                          <span classList={{ "opacity-60": headerText.muted }}>{headerText.value}</span>
-                        </span>
-                        <span
-                          ref={leaveRef}
-                          class="col-start-1 row-start-1 min-w-0 truncate pointer-events-none"
-                          style={{ opacity: "0" }}
-                        >
-                          <span classList={{ "opacity-60": headerText.prevMuted }}>{headerText.prev}</span>
-                        </span>
-                      </span>
-                    </h1>
-                  }
-                >
-                  <InlineInput
-                    ref={(el) => {
-                      titleRef = el
-                    }}
-                    value={title.draft}
-                    disabled={title.saving}
-                    class="text-14-medium text-text-strong grow-1 min-w-0 pl-2 rounded-[6px]"
-                    style={{ "--inline-input-shadow": "var(--shadow-xs-border-select)" }}
-                    onInput={(event) => setTitle("draft", event.currentTarget.value)}
-                    onKeyDown={(event) => {
-                      event.stopPropagation()
-                      if (event.key === "Enter") {
-                        event.preventDefault()
-                        void saveTitleEditor()
-                        return
-                      }
-                      if (event.key === "Escape") {
-                        event.preventDefault()
-                        closeTitleEditor()
-                      }
-                    }}
-                    onBlur={closeTitleEditor}
-                  />
-                </Show>
-              </Show>
-            </div>
-            <Show when={props.sessionID()}>
-              {(id) => (
-                <div class="shrink-0 flex items-center gap-3">
-                  <SessionContextUsage placement="bottom" />
-                  <DropdownMenu
-                    gutter={4}
-                    placement="bottom-end"
-                    open={title.menuOpen}
-                    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"
-                      aria-label={language.t("common.moreOptions")}
-                    />
-                    <DropdownMenu.Portal>
-                      <DropdownMenu.Content
-                        style={{ "min-width": "104px" }}
-                        onCloseAutoFocus={(event) => {
-                          if (!title.pendingRename) return
-                          event.preventDefault()
-                          setTitle("pendingRename", false)
-                          openTitleEditor()
-                        }}
-                      >
-                        <DropdownMenu.Item
-                          onSelect={() => {
-                            setTitle("pendingRename", true)
-                            setTitle("menuOpen", false)
-                          }}
-                        >
-                          <DropdownMenu.ItemLabel>{language.t("common.rename")}</DropdownMenu.ItemLabel>
-                        </DropdownMenu.Item>
-                        <DropdownMenu.Item onSelect={() => void archiveSession(id())}>
-                          <DropdownMenu.ItemLabel>{language.t("common.archive")}</DropdownMenu.ItemLabel>
-                        </DropdownMenu.Item>
-                        <DropdownMenu.Separator />
-                        <DropdownMenu.Item onSelect={() => dialog.show(() => <DialogDeleteSession sessionID={id()} />)}>
-                          <DropdownMenu.ItemLabel>{language.t("common.delete")}</DropdownMenu.ItemLabel>
-                        </DropdownMenu.Item>
-                      </DropdownMenu.Content>
-                    </DropdownMenu.Portal>
-                  </DropdownMenu>
-                </div>
-              )}
-            </Show>
-          </div>
-        </div>
-      </div>
-    </Show>
-  )
-}
--- a/packages/app/src/pages/session/use-session-hash-scroll.ts
+++ b/packages/app/src/pages/session/use-session-hash-scroll.ts
@@ -16,7 +16,7 @@ export const useSessionHashScroll = (input: {
  setPendingMessage: (value: string | undefined) => void
  setActiveMessage: (message: UserMessage | undefined) => void
  setTurnStart: (value: number) => void
-  autoScroll: { pause: () => void; snapToBottom: () => void }
+  autoScroll: { pause: () => void; forceScrollToBottom: () => void }
  scroller: () => HTMLDivElement | undefined
  anchor: (id: string) => string
  scheduleScrollState: (el: HTMLDivElement) => void
@@ -47,10 +47,9 @@ export const useSessionHashScroll = (input: {

    const a = el.getBoundingClientRect()
    const b = root.getBoundingClientRect()
-    const title = parseFloat(getComputedStyle(root).getPropertyValue("--session-title-height"))
-    const inset = Number.isNaN(title) ? 0 : title
-    // With column-reverse, scrollTop is negative — don't clamp to 0
-    const top = a.top - b.top + root.scrollTop - inset
+    const sticky = root.querySelector("[data-session-title]")
+    const inset = sticky instanceof HTMLElement ? sticky.offsetHeight : 0
+    const top = Math.max(0, a.top - b.top + root.scrollTop - inset)
    root.scrollTo({ top, behavior })
    return true
  }
@@ -106,7 +105,7 @@ export const useSessionHashScroll = (input: {
  const applyHash = (behavior: ScrollBehavior) => {
    const hash = location.hash.slice(1)
    if (!hash) {
-      input.autoScroll.snapToBottom()
+      input.autoScroll.forceScrollToBottom()
      const el = input.scroller()
      if (el) input.scheduleScrollState(el)
      return
@@ -130,7 +129,7 @@ export const useSessionHashScroll = (input: {
      return
    }

-    input.autoScroll.snapToBottom()
+    input.autoScroll.forceScrollToBottom()
    const el = input.scroller()
    if (el) input.scheduleScrollState(el)
  }
--- a/packages/app/src/utils/dom.ts
+++ b/packages/app/src/utils/dom.ts
@@ -1,12 +1,3 @@
-export function isEditableTarget(target: EventTarget | null | undefined) {
-  if (!(target instanceof HTMLElement)) return false
-  if (/^(INPUT|TEXTAREA|SELECT|BUTTON)$/.test(target.tagName)) return true
-  if (target.isContentEditable) return true
-  if (target.closest("[contenteditable='true']")) return true
-  if (target.closest("input, textarea, select")) return true
-  return false
-}
-
 export function getCharacterOffsetInLine(lineElement: Element, targetNode: Node, offset: number): number {
  const r = document.createRange()
  r.selectNodeContents(lineElement)
--- a/packages/app/src/utils/same.ts
+++ b/packages/app/src/utils/same.ts
@@ -0,0 +1,6 @@
+export function same<T>(a: readonly T[] | undefined, b: readonly T[] | undefined) {
+  if (a === b) return true
+  if (!a || !b) return false
+  if (a.length !== b.length) return false
+  return a.every((x, i) => x === b[i])
+}
--- a/packages/app/src/utils/time.ts
+++ b/packages/app/src/utils/time.ts
@@ -19,4 +19,4 @@ export function getRelativeTime(dateString: string, t: Translate): string {
  if (diffMinutes < 60) return t("common.time.minutesAgo.short", { count: diffMinutes })
  if (diffHours < 24) return t("common.time.hoursAgo.short", { count: diffHours })
  return t("common.time.daysAgo.short", { count: diffDays })
-}
+}
--- a/packages/opencode/migration/20260228203230_blue_harpoon/migration.sql
+++ b/packages/opencode/migration/20260228203230_blue_harpoon/migration.sql
@@ -1,11 +0,0 @@
-CREATE TABLE `account` (
-	`id` text PRIMARY KEY,
-	`email` text NOT NULL,
-	`url` text NOT NULL,
-	`access_token` text NOT NULL,
-	`refresh_token` text NOT NULL,
-	`token_expiry` integer,
-	`workspace_id` text,
-	`time_created` integer NOT NULL,
-	`time_updated` integer NOT NULL
-);
--- a/packages/opencode/migration/20260228203230_blue_harpoon/snapshot.json
+++ b/packages/opencode/migration/20260228203230_blue_harpoon/snapshot.json
--- a/packages/opencode/package.json
+++ b/packages/opencode/package.json
@@ -43,7 +43,6 @@
    "@types/mime-types": "3.0.1",
    "@types/turndown": "5.0.5",
    "@types/yargs": "17.0.33",
-    "@types/which": "3.0.4",
    "@typescript/native-preview": "catalog:",
    "drizzle-kit": "1.0.0-beta.12-a5629fb",
    "drizzle-orm": "1.0.0-beta.12-a5629fb",
@@ -128,7 +127,6 @@
    "ulid": "catalog:",
    "vscode-jsonrpc": "8.2.1",
    "web-tree-sitter": "0.25.10",
-    "which": "6.0.1",
    "xdg-basedir": "5.1.0",
    "yargs": "18.0.0",
    "zod": "catalog:",
--- a/packages/opencode/src/account/index.ts
+++ b/packages/opencode/src/account/index.ts
@@ -1,247 +0,0 @@
-import { eq, sql, isNotNull } from "drizzle-orm"
-import { Database } from "@/storage/db"
-import { AccountTable } from "./account.sql"
-import z from "zod"
-
-export namespace Account {
-  export const Account = z.object({
-    id: z.string(),
-    email: z.string(),
-    url: z.string(),
-    workspace_id: z.string().nullable(),
-  })
-  export type Account = z.infer<typeof Account>
-
-  function fromRow(row: (typeof AccountTable)["$inferSelect"]): Account {
-    return {
-      id: row.id,
-      email: row.email,
-      url: row.url,
-      workspace_id: row.workspace_id,
-    }
-  }
-
-  export function active(): Account | undefined {
-    const row = Database.use((db) => db.select().from(AccountTable).where(isNotNull(AccountTable.workspace_id)).get())
-    return row ? fromRow(row) : undefined
-  }
-
-  export function list(): Account[] {
-    return Database.use((db) => db.select().from(AccountTable).all().map(fromRow))
-  }
-
-  export function remove(accountID: string) {
-    Database.use((db) => db.delete(AccountTable).where(eq(AccountTable.id, accountID)).run())
-  }
-
-  export function use(accountID: string, workspaceID: string | null) {
-    Database.use((db) =>
-      db.update(AccountTable).set({ workspace_id: workspaceID }).where(eq(AccountTable.id, accountID)).run(),
-    )
-  }
-
-  export async function workspaces(accountID: string): Promise<{ id: string; name: string }[]> {
-    const row = Database.use((db) => db.select().from(AccountTable).where(eq(AccountTable.id, accountID)).get())
-    if (!row) return []
-
-    const access = await token(accountID)
-    if (!access) return []
-
-    const res = await fetch(`${row.url}/api/orgs`, {
-      headers: { authorization: `Bearer ${access}` },
-    })
-
-    if (!res.ok) return []
-
-    const json = (await res.json()) as Array<{ id?: string; name?: string }>
-    return json.map((x) => ({ id: x.id ?? "", name: x.name ?? "" }))
-  }
-
-  export async function config(accountID: string, workspaceID: string): Promise<Record<string, unknown> | undefined> {
-    const row = Database.use((db) => db.select().from(AccountTable).where(eq(AccountTable.id, accountID)).get())
-    if (!row) return undefined
-
-    const access = await token(accountID)
-    if (!access) return undefined
-
-    const res = await fetch(`${row.url}/api/config`, {
-      headers: { authorization: `Bearer ${access}`, "x-org-id": workspaceID },
-    })
-
-    if (!res.ok) return undefined
-    const result = (await res.json()) as Record<string, any>
-    return result.config
-  }
-
-  export async function token(accountID: string): Promise<string | undefined> {
-    const row = Database.use((db) => db.select().from(AccountTable).where(eq(AccountTable.id, accountID)).get())
-    if (!row) return undefined
-    if (row.token_expiry && row.token_expiry > Date.now()) return row.access_token
-
-    const res = await fetch(`${row.url}/oauth/token`, {
-      method: "POST",
-      headers: { "Content-Type": "application/x-www-form-urlencoded" },
-      body: new URLSearchParams({
-        grant_type: "refresh_token",
-        refresh_token: row.refresh_token,
-      }).toString(),
-    })
-
-    if (!res.ok) return
-
-    const json = (await res.json()) as {
-      access_token: string
-      refresh_token?: string
-      expires_in?: number
-    }
-
-    Database.use((db) =>
-      db
-        .update(AccountTable)
-        .set({
-          access_token: json.access_token,
-          refresh_token: json.refresh_token ?? row.refresh_token,
-          token_expiry: json.expires_in ? Date.now() + json.expires_in * 1000 : undefined,
-        })
-        .where(eq(AccountTable.id, row.id))
-        .run(),
-    )
-
-    return json.access_token
-  }
-
-  export type Login = {
-    code: string
-    user: string
-    url: string
-    server: string
-    expiry: number
-    interval: number
-  }
-
-  export async function login(url?: string): Promise<Login> {
-    const server = url ?? "https://web-14275-d60e67f5-pyqs0590.onporter.run"
-    const res = await fetch(`${server}/auth/device/code`, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({ client_id: "opencode-cli" }),
-    })
-
-    if (!res.ok) throw new Error(`Failed to initiate device flow: ${await res.text()}`)
-
-    const json = (await res.json()) as {
-      device_code: string
-      user_code: string
-      verification_uri_complete: string
-      expires_in: number
-      interval: number
-    }
-
-    const full = `${server}${json.verification_uri_complete}`
-
-    return {
-      code: json.device_code,
-      user: json.user_code,
-      url: full,
-      server,
-      expiry: json.expires_in,
-      interval: json.interval,
-    }
-  }
-
-  export async function poll(
-    input: Login,
-  ): Promise<
-    | { type: "success"; email: string }
-    | { type: "pending" }
-    | { type: "slow" }
-    | { type: "expired" }
-    | { type: "denied" }
-    | { type: "error"; msg: string }
-  > {
-    const res = await fetch(`${input.server}/auth/device/token`, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({
-        grant_type: "urn:ietf:params:oauth:grant-type:device_code",
-        device_code: input.code,
-        client_id: "opencode-cli",
-      }),
-    })
-
-    const json = (await res.json()) as {
-      access_token?: string
-      refresh_token?: string
-      expires_in?: number
-      error?: string
-      error_description?: string
-    }
-
-    if (json.access_token) {
-      const me = await fetch(`${input.server}/api/user`, {
-        headers: { authorization: `Bearer ${json.access_token}` },
-      })
-      const user = (await me.json()) as { id?: string; email?: string }
-      if (!user.id || !user.email) {
-        return { type: "error", msg: "No id or email in response" }
-      }
-      const id = user.id
-      const email = user.email
-
-      const access = json.access_token
-      const expiry = Date.now() + json.expires_in! * 1000
-      const refresh = json.refresh_token ?? ""
-
-      // Fetch workspaces and get first one
-      const orgsRes = await fetch(`${input.server}/api/orgs`, {
-        headers: { authorization: `Bearer ${access}` },
-      })
-      const orgs = (await orgsRes.json()) as Array<{ id?: string; name?: string }>
-      const firstWorkspaceId = orgs.length > 0 ? orgs[0].id : null
-
-      Database.use((db) => {
-        db.update(AccountTable).set({ workspace_id: null }).run()
-        db.insert(AccountTable)
-          .values({
-            id,
-            email,
-            url: input.server,
-            access_token: access,
-            refresh_token: refresh,
-            token_expiry: expiry,
-            workspace_id: firstWorkspaceId,
-          })
-          .onConflictDoUpdate({
-            target: AccountTable.id,
-            set: {
-              access_token: access,
-              refresh_token: refresh,
-              token_expiry: expiry,
-              workspace_id: firstWorkspaceId,
-            },
-          })
-          .run()
-      })
-
-      return { type: "success", email }
-    }
-
-    if (json.error === "authorization_pending") {
-      return { type: "pending" }
-    }
-
-    if (json.error === "slow_down") {
-      return { type: "slow" }
-    }
-
-    if (json.error === "expired_token") {
-      return { type: "expired" }
-    }
-
-    if (json.error === "access_denied") {
-      return { type: "denied" }
-    }
-
-    return { type: "error", msg: json.error || JSON.stringify(json) }
-  }
-}
--- a/packages/opencode/src/agent/agent.ts
+++ b/packages/opencode/src/agent/agent.ts
@@ -63,7 +63,6 @@ export namespace Agent {
      question: "deny",
      plan_enter: "deny",
      plan_exit: "deny",
-      edit: "ask",
      // mirrors github.com/github/gitignore Node.gitignore pattern for .env files
      read: {
        "*": "allow",
--- a/packages/opencode/src/cli/cmd/account.ts
+++ b/packages/opencode/src/cli/cmd/account.ts
@@ -1,161 +0,0 @@
-import { cmd } from "./cmd"
-import * as prompts from "@clack/prompts"
-import { UI } from "../ui"
-import { Account } from "@/account"
-
-export const LoginCommand = cmd({
-  command: "login [url]",
-  describe: "log in to an opencode account",
-  builder: (yargs) =>
-    yargs.positional("url", {
-      describe: "server URL",
-      type: "string",
-    }),
-  async handler(args) {
-    UI.empty()
-    prompts.intro("Log in")
-
-    const url = args.url as string | undefined
-    const login = await Account.login(url)
-
-    prompts.log.info("Go to: " + login.url)
-    prompts.log.info("Enter code: " + login.user)
-
-    try {
-      const open =
-        process.platform === "darwin"
-          ? ["open", login.url]
-          : process.platform === "win32"
-            ? ["cmd", "/c", "start", login.url]
-            : ["xdg-open", login.url]
-      Bun.spawn(open, { stdout: "ignore", stderr: "ignore" })
-    } catch {}
-
-    const spinner = prompts.spinner()
-    spinner.start("Waiting for authorization...")
-
-    let wait = login.interval * 1000
-    while (true) {
-      await Bun.sleep(wait)
-
-      const result = await Account.poll(login)
-
-      if (result.type === "success") {
-        spinner.stop("Logged in as " + result.email)
-        prompts.outro("Done")
-        return
-      }
-
-      if (result.type === "pending") continue
-
-      if (result.type === "slow") {
-        wait += 5000
-        continue
-      }
-
-      if (result.type === "expired") {
-        spinner.stop("Device code expired", 1)
-        return
-      }
-
-      if (result.type === "denied") {
-        spinner.stop("Authorization denied", 1)
-        return
-      }
-
-      spinner.stop("Error: " + result.msg, 1)
-      return
-    }
-  },
-})
-
-export const LogoutCommand = cmd({
-  command: "logout [email]",
-  describe: "log out from an account",
-  builder: (yargs) =>
-    yargs.positional("email", {
-      describe: "account email to log out from",
-      type: "string",
-    }),
-  async handler(args) {
-    const email = args.email as string | undefined
-
-    if (email) {
-      const accounts = Account.list()
-      const match = accounts.find((a) => a.email === email)
-      if (!match) {
-        UI.println("Account not found: " + email)
-        return
-      }
-      Account.remove(match.id)
-      UI.println("Logged out from " + email)
-      return
-    }
-
-    const active = Account.active()
-    if (!active) {
-      UI.println("Not logged in")
-      return
-    }
-    Account.remove(active.id)
-    UI.println("Logged out from " + active.email)
-  },
-})
-
-export const SwitchCommand = cmd({
-  command: "switch",
-  describe: "switch active workspace",
-  async handler() {
-    UI.empty()
-
-    const active = Account.active()
-    if (!active) {
-      UI.println("Not logged in")
-      return
-    }
-
-    const workspaces = await Account.workspaces(active.id)
-    if (workspaces.length === 0) {
-      UI.println("No workspaces found")
-      return
-    }
-
-    prompts.intro("Switch workspace")
-
-    const opts = workspaces.map((w) => ({
-      value: w.id,
-      label: w.id === active.workspace_id ? w.name + UI.Style.TEXT_DIM + " (active)" : w.name,
-    }))
-
-    const selected = await prompts.select({
-      message: "Select workspace",
-      options: opts,
-    })
-
-    if (prompts.isCancel(selected)) return
-
-    Account.use(active.id, selected as string)
-    prompts.outro("Switched to " + workspaces.find((w) => w.id === selected)?.name)
-  },
-})
-
-export const WorkspacesCommand = cmd({
-  command: "workspaces",
-  aliases: ["workspace"],
-  describe: "list all workspaces",
-  async handler() {
-    const accounts = Account.list()
-
-    if (accounts.length === 0) {
-      UI.println("No accounts found")
-      return
-    }
-
-    for (const account of accounts) {
-      const workspaces = await Account.workspaces(account.id)
-      for (const space of workspaces) {
-        UI.println([space.name, account.email, space.id].join("\t"))
-      }
-    }
-  },
-})
--- a/packages/opencode/src/cli/cmd/auth.ts
+++ b/packages/opencode/src/cli/cmd/auth.ts
@@ -13,7 +13,6 @@ import { Instance } from "../../project/instance"
 import type { Hooks } from "@opencode-ai/plugin"
 import { Process } from "../../util/process"
 import { text } from "node:stream/consumers"
-import { setTimeout as sleep } from "node:timers/promises"

 type PluginAuth = NonNullable<Hooks["auth"]>

@@ -48,7 +47,7 @@ async function handlePluginAuth(plugin: { auth: PluginAuth }, provider: string,
  const method = plugin.auth.methods[index]

  // Handle prompts for all auth types
-  await sleep(10)
+  await Bun.sleep(10)
  const inputs: Record<string, string> = {}
  if (method.prompts) {
    for (const prompt of method.prompts) {
--- a/packages/opencode/src/cli/cmd/debug/lsp.ts
+++ b/packages/opencode/src/cli/cmd/debug/lsp.ts
@@ -3,7 +3,6 @@ import { bootstrap } from "../../bootstrap"
 import { cmd } from "../cmd"
 import { Log } from "../../../util/log"
 import { EOL } from "os"
-import { setTimeout as sleep } from "node:timers/promises"

 export const LSPCommand = cmd({
  command: "lsp",
@@ -20,7 +19,7 @@ const DiagnosticsCommand = cmd({
  async handler(args) {
    await bootstrap(process.cwd(), async () => {
      await LSP.touchFile(args.file, true)
-      await sleep(1000)
+      await Bun.sleep(1000)
      process.stdout.write(JSON.stringify(await LSP.diagnostics(), null, 2) + EOL)
    })
  },
--- a/packages/opencode/src/cli/cmd/github.ts
+++ b/packages/opencode/src/cli/cmd/github.ts
@@ -28,7 +28,6 @@ import { Bus } from "../../bus"
 import { MessageV2 } from "../../session/message-v2"
 import { SessionPrompt } from "@/session/prompt"
 import { $ } from "bun"
-import { setTimeout as sleep } from "node:timers/promises"

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

              retries++
-              await sleep(1000)
+              await Bun.sleep(1000)
            } while (true)

            s.stop("Installed GitHub app")
@@ -1373,7 +1372,7 @@ Co-authored-by: ${actor} <${actor}@users.noreply.github.com>"`
        } catch (e) {
          if (retries > 0) {
            console.log(`Retrying after ${delayMs}ms...`)
-            await sleep(delayMs)
+            await Bun.sleep(delayMs)
            return withRetry(fn, retries - 1, delayMs)
          }
          throw e
--- a/packages/opencode/src/cli/cmd/providers.ts
+++ b/packages/opencode/src/cli/cmd/providers.ts
@@ -1,438 +0,0 @@
-import { Auth } from "../../auth"
-import { cmd } from "./cmd"
-import * as prompts from "@clack/prompts"
-import { UI } from "../ui"
-import { ModelsDev } from "../../provider/models"
-import { map, pipe, sortBy, values } from "remeda"
-import path from "path"
-import os from "os"
-import { Config } from "../../config/config"
-import { Global } from "../../global"
-import { Plugin } from "../../plugin"
-import { Instance } from "../../project/instance"
-import type { Hooks } from "@opencode-ai/plugin"
-import { Process } from "../../util/process"
-import { text } from "node:stream/consumers"
-
-type PluginAuth = NonNullable<Hooks["auth"]>
-
-async function handlePluginAuth(plugin: { auth: PluginAuth }, provider: string): Promise<boolean> {
-  let index = 0
-  if (plugin.auth.methods.length > 1) {
-    const method = await prompts.select({
-      message: "Login method",
-      options: [
-        ...plugin.auth.methods.map((x, index) => ({
-          label: x.label,
-          value: index.toString(),
-        })),
-      ],
-    })
-    if (prompts.isCancel(method)) throw new UI.CancelledError()
-    index = parseInt(method)
-  }
-  const method = plugin.auth.methods[index]
-
-  await Bun.sleep(10)
-  const inputs: Record<string, string> = {}
-  if (method.prompts) {
-    for (const prompt of method.prompts) {
-      if (prompt.condition && !prompt.condition(inputs)) {
-        continue
-      }
-      if (prompt.type === "select") {
-        const value = await prompts.select({
-          message: prompt.message,
-          options: prompt.options,
-        })
-        if (prompts.isCancel(value)) throw new UI.CancelledError()
-        inputs[prompt.key] = value
-      } else {
-        const value = await prompts.text({
-          message: prompt.message,
-          placeholder: prompt.placeholder,
-          validate: prompt.validate ? (v) => prompt.validate!(v ?? "") : undefined,
-        })
-        if (prompts.isCancel(value)) throw new UI.CancelledError()
-        inputs[prompt.key] = value
-      }
-    }
-  }
-
-  if (method.type === "oauth") {
-    const authorize = await method.authorize(inputs)
-
-    if (authorize.url) {
-      prompts.log.info("Go to: " + authorize.url)
-    }
-
-    if (authorize.method === "auto") {
-      if (authorize.instructions) {
-        prompts.log.info(authorize.instructions)
-      }
-      const spinner = prompts.spinner()
-      spinner.start("Waiting for authorization...")
-      const result = await authorize.callback()
-      if (result.type === "failed") {
-        spinner.stop("Failed to authorize", 1)
-      }
-      if (result.type === "success") {
-        const saveProvider = result.provider ?? provider
-        if ("refresh" in result) {
-          const { type: _, provider: __, refresh, access, expires, ...extraFields } = result
-          await Auth.set(saveProvider, {
-            type: "oauth",
-            refresh,
-            access,
-            expires,
-            ...extraFields,
-          })
-        }
-        if ("key" in result) {
-          await Auth.set(saveProvider, {
-            type: "api",
-            key: result.key,
-          })
-        }
-        spinner.stop("Login successful")
-      }
-    }
-
-    if (authorize.method === "code") {
-      const code = await prompts.text({
-        message: "Paste the authorization code here: ",
-        validate: (x) => (x && x.length > 0 ? undefined : "Required"),
-      })
-      if (prompts.isCancel(code)) throw new UI.CancelledError()
-      const result = await authorize.callback(code)
-      if (result.type === "failed") {
-        prompts.log.error("Failed to authorize")
-      }
-      if (result.type === "success") {
-        const saveProvider = result.provider ?? provider
-        if ("refresh" in result) {
-          const { type: _, provider: __, refresh, access, expires, ...extraFields } = result
-          await Auth.set(saveProvider, {
-            type: "oauth",
-            refresh,
-            access,
-            expires,
-            ...extraFields,
-          })
-        }
-        if ("key" in result) {
-          await Auth.set(saveProvider, {
-            type: "api",
-            key: result.key,
-          })
-        }
-        prompts.log.success("Login successful")
-      }
-    }
-
-    prompts.outro("Done")
-    return true
-  }
-
-  if (method.type === "api") {
-    if (method.authorize) {
-      const result = await method.authorize(inputs)
-      if (result.type === "failed") {
-        prompts.log.error("Failed to authorize")
-      }
-      if (result.type === "success") {
-        const saveProvider = result.provider ?? provider
-        await Auth.set(saveProvider, {
-          type: "api",
-          key: result.key,
-        })
-        prompts.log.success("Login successful")
-      }
-      prompts.outro("Done")
-      return true
-    }
-  }
-
-  return false
-}
-
-export function resolvePluginProviders(input: {
-  hooks: Hooks[]
-  existingProviders: Record<string, unknown>
-  disabled: Set<string>
-  enabled?: Set<string>
-  providerNames: Record<string, string | undefined>
-}): Array<{ id: string; name: string }> {
-  const seen = new Set<string>()
-  const result: Array<{ id: string; name: string }> = []
-
-  for (const hook of input.hooks) {
-    if (!hook.auth) continue
-    const id = hook.auth.provider
-    if (seen.has(id)) continue
-    seen.add(id)
-    if (Object.hasOwn(input.existingProviders, id)) continue
-    if (input.disabled.has(id)) continue
-    if (input.enabled && !input.enabled.has(id)) continue
-    result.push({
-      id,
-      name: input.providerNames[id] ?? id,
-    })
-  }
-
-  return result
-}
-
-export const ProvidersCommand = cmd({
-  command: "providers",
-  aliases: ["auth"],
-  describe: "manage AI providers and credentials",
-  builder: (yargs) =>
-    yargs.command(ProvidersListCommand).command(ProvidersLoginCommand).command(ProvidersLogoutCommand).demandCommand(),
-  async handler() {},
-})
-
-export const ProvidersListCommand = cmd({
-  command: "list",
-  aliases: ["ls"],
-  describe: "list providers and credentials",
-  async handler(_args) {
-    UI.empty()
-    const authPath = path.join(Global.Path.data, "auth.json")
-    const homedir = os.homedir()
-    const displayPath = authPath.startsWith(homedir) ? authPath.replace(homedir, "~") : authPath
-    prompts.intro(`Credentials ${UI.Style.TEXT_DIM}${displayPath}`)
-    const results = Object.entries(await Auth.all())
-    const database = await ModelsDev.get()
-
-    for (const [providerID, result] of results) {
-      const name = database[providerID]?.name || providerID
-      prompts.log.info(`${name} ${UI.Style.TEXT_DIM}${result.type}`)
-    }
-
-    prompts.outro(`${results.length} credentials`)
-
-    const activeEnvVars: Array<{ provider: string; envVar: string }> = []
-
-    for (const [providerID, provider] of Object.entries(database)) {
-      for (const envVar of provider.env) {
-        if (process.env[envVar]) {
-          activeEnvVars.push({
-            provider: provider.name || providerID,
-            envVar,
-          })
-        }
-      }
-    }
-
-    if (activeEnvVars.length > 0) {
-      UI.empty()
-      prompts.intro("Environment")
-
-      for (const { provider, envVar } of activeEnvVars) {
-        prompts.log.info(`${provider} ${UI.Style.TEXT_DIM}${envVar}`)
-      }
-
-      prompts.outro(`${activeEnvVars.length} environment variable` + (activeEnvVars.length === 1 ? "" : "s"))
-    }
-  },
-})
-
-export const ProvidersLoginCommand = cmd({
-  command: "login [url]",
-  describe: "log in to a provider",
-  builder: (yargs) =>
-    yargs.positional("url", {
-      describe: "opencode auth provider",
-      type: "string",
-    }),
-  async handler(args) {
-    await Instance.provide({
-      directory: process.cwd(),
-      async fn() {
-        UI.empty()
-        prompts.intro("Add credential")
-        if (args.url) {
-          const wellknown = await fetch(`${args.url}/.well-known/opencode`).then((x) => x.json() as any)
-          prompts.log.info(`Running \`${wellknown.auth.command.join(" ")}\``)
-          const proc = Process.spawn(wellknown.auth.command, {
-            stdout: "pipe",
-          })
-          if (!proc.stdout) {
-            prompts.log.error("Failed")
-            prompts.outro("Done")
-            return
-          }
-          const [exit, token] = await Promise.all([proc.exited, text(proc.stdout)])
-          if (exit !== 0) {
-            prompts.log.error("Failed")
-            prompts.outro("Done")
-            return
-          }
-          await Auth.set(args.url, {
-            type: "wellknown",
-            key: wellknown.auth.env,
-            token: token.trim(),
-          })
-          prompts.log.success("Logged into " + args.url)
-          prompts.outro("Done")
-          return
-        }
-        await ModelsDev.refresh().catch(() => {})
-
-        const config = await Config.get()
-
-        const disabled = new Set(config.disabled_providers ?? [])
-        const enabled = config.enabled_providers ? new Set(config.enabled_providers) : undefined
-
-        const providers = await ModelsDev.get().then((x) => {
-          const filtered: Record<string, (typeof x)[string]> = {}
-          for (const [key, value] of Object.entries(x)) {
-            if ((enabled ? enabled.has(key) : true) && !disabled.has(key)) {
-              filtered[key] = value
-            }
-          }
-          return filtered
-        })
-
-        const priority: Record<string, number> = {
-          opencode: 0,
-          anthropic: 1,
-          "github-copilot": 2,
-          openai: 3,
-          google: 4,
-          openrouter: 5,
-          vercel: 6,
-        }
-        const pluginProviders = resolvePluginProviders({
-          hooks: await Plugin.list(),
-          existingProviders: providers,
-          disabled,
-          enabled,
-          providerNames: Object.fromEntries(Object.entries(config.provider ?? {}).map(([id, p]) => [id, p.name])),
-        })
-        let provider = await prompts.autocomplete({
-          message: "Select provider",
-          maxItems: 8,
-          options: [
-            ...pipe(
-              providers,
-              values(),
-              sortBy(
-                (x) => priority[x.id] ?? 99,
-                (x) => x.name ?? x.id,
-              ),
-              map((x) => ({
-                label: x.name,
-                value: x.id,
-                hint: {
-                  opencode: "recommended",
-                  anthropic: "Claude Max or API key",
-                  openai: "ChatGPT Plus/Pro or API key",
-                }[x.id],
-              })),
-            ),
-            ...pluginProviders.map((x) => ({
-              label: x.name,
-              value: x.id,
-              hint: "plugin",
-            })),
-            {
-              value: "other",
-              label: "Other",
-            },
-          ],
-        })
-
-        if (prompts.isCancel(provider)) throw new UI.CancelledError()
-
-        const plugin = await Plugin.list().then((x) => x.findLast((x) => x.auth?.provider === provider))
-        if (plugin && plugin.auth) {
-          const handled = await handlePluginAuth({ auth: plugin.auth }, provider)
-          if (handled) return
-        }
-
-        if (provider === "other") {
-          provider = await prompts.text({
-            message: "Enter provider id",
-            validate: (x) => (x && x.match(/^[0-9a-z-]+$/) ? undefined : "a-z, 0-9 and hyphens only"),
-          })
-          if (prompts.isCancel(provider)) throw new UI.CancelledError()
-          provider = provider.replace(/^@ai-sdk\//, "")
-          if (prompts.isCancel(provider)) throw new UI.CancelledError()
-
-          const customPlugin = await Plugin.list().then((x) => x.findLast((x) => x.auth?.provider === provider))
-          if (customPlugin && customPlugin.auth) {
-            const handled = await handlePluginAuth({ auth: customPlugin.auth }, provider)
-            if (handled) return
-          }
-
-          prompts.log.warn(
-            `This only stores a credential for ${provider} - you will need configure it in opencode.json, check the docs for examples.`,
-          )
-        }
-
-        if (provider === "amazon-bedrock") {
-          prompts.log.info(
-            "Amazon Bedrock authentication priority:\n" +
-              "  1. Bearer token (AWS_BEARER_TOKEN_BEDROCK or /connect)\n" +
-              "  2. AWS credential chain (profile, access keys, IAM roles, EKS IRSA)\n\n" +
-              "Configure via opencode.json options (profile, region, endpoint) or\n" +
-              "AWS environment variables (AWS_PROFILE, AWS_REGION, AWS_ACCESS_KEY_ID, AWS_WEB_IDENTITY_TOKEN_FILE).",
-          )
-        }
-
-        if (provider === "opencode") {
-          prompts.log.info("Create an api key at https://opencode.ai/auth")
-        }
-
-        if (provider === "vercel") {
-          prompts.log.info("You can create an api key at https://vercel.link/ai-gateway-token")
-        }
-
-        if (["cloudflare", "cloudflare-ai-gateway"].includes(provider)) {
-          prompts.log.info(
-            "Cloudflare AI Gateway can be configured with CLOUDFLARE_GATEWAY_ID, CLOUDFLARE_ACCOUNT_ID, and CLOUDFLARE_API_TOKEN environment variables. Read more: https://opencode.ai/docs/providers/#cloudflare-ai-gateway",
-          )
-        }
-
-        const key = await prompts.password({
-          message: "Enter your API key",
-          validate: (x) => (x && x.length > 0 ? undefined : "Required"),
-        })
-        if (prompts.isCancel(key)) throw new UI.CancelledError()
-        await Auth.set(provider, {
-          type: "api",
-          key,
-        })
-
-        prompts.outro("Done")
-      },
-    })
-  },
-})
-
-export const ProvidersLogoutCommand = cmd({
-  command: "logout",
-  describe: "log out from a configured provider",
-  async handler(_args) {
-    UI.empty()
-    const credentials = await Auth.all().then((x) => Object.entries(x))
-    prompts.intro("Remove credential")
-    if (credentials.length === 0) {
-      prompts.log.error("No credentials found")
-      return
-    }
-    const database = await ModelsDev.get()
-    const providerID = await prompts.select({
-      message: "Select provider",
-      options: credentials.map(([key, value]) => ({
-        label: (database[key]?.name || key) + UI.Style.TEXT_DIM + " (" + value.type + ")",
-        value: key,
-      })),
-    })
-    if (prompts.isCancel(providerID)) throw new UI.CancelledError()
-    await Auth.remove(providerID)
-    prompts.outro("Logout successful")
-  },
-})
--- a/packages/opencode/src/cli/cmd/run.ts
+++ b/packages/opencode/src/cli/cmd/run.ts
@@ -365,11 +365,6 @@ export const RunCommand = cmd({
        action: "deny",
        pattern: "*",
      },
-      {
-        permission: "edit",
-        action: "allow",
-        pattern: "*",
-      },
    ]

    function title() {
--- a/packages/opencode/src/cli/cmd/session.ts
+++ b/packages/opencode/src/cli/cmd/session.ts
@@ -9,7 +9,6 @@ import { Filesystem } from "../../util/filesystem"
 import { Process } from "../../util/process"
 import { EOL } from "os"
 import path from "path"
-import { which } from "../../util/which"

 function pagerCmd(): string[] {
  const lessOptions = ["-R", "-S"]
@@ -18,7 +17,7 @@ function pagerCmd(): string[] {
  }

  // user could have less installed via other options
-  const lessOnPath = which("less")
+  const lessOnPath = Bun.which("less")
  if (lessOnPath) {
    if (Filesystem.stat(lessOnPath)?.size) return [lessOnPath, ...lessOptions]
  }
@@ -28,7 +27,7 @@ function pagerCmd(): string[] {
    if (Filesystem.stat(less)?.size) return [less, ...lessOptions]
  }

-  const git = which("git")
+  const git = Bun.which("git")
  if (git) {
    const less = path.join(git, "..", "..", "usr", "bin", "less.exe")
    if (Filesystem.stat(less)?.size) return [less, ...lessOptions]
--- a/packages/opencode/src/cli/cmd/tui/app.tsx
+++ b/packages/opencode/src/cli/cmd/tui/app.tsx
@@ -462,7 +462,6 @@ function App() {
    {
      title: "Toggle MCPs",
      value: "mcp.list",
-      search: "toggle mcps",
      category: "Agent",
      slash: {
        name: "mcps",
@@ -538,9 +537,8 @@ function App() {
      category: "System",
    },
    {
-      title: mode() === "dark" ? "Light mode" : "Dark mode",
+      title: "Toggle appearance",
      value: "theme.switch_mode",
-      search: "toggle appearance",
      onSelect: (dialog) => {
        setMode(mode() === "dark" ? "light" : "dark")
        dialog.clear()
@@ -579,7 +577,6 @@ function App() {
    },
    {
      title: "Toggle debug panel",
-      search: "toggle debug",
      category: "System",
      value: "app.debug",
      onSelect: (dialog) => {
@@ -589,7 +586,6 @@ function App() {
    },
    {
      title: "Toggle console",
-      search: "toggle console",
      category: "System",
      value: "app.console",
      onSelect: (dialog) => {
@@ -630,7 +626,6 @@ function App() {
    {
      title: terminalTitleEnabled() ? "Disable terminal title" : "Enable terminal title",
      value: "terminal.title.toggle",
-      search: "toggle terminal title",
      keybind: "terminal_title_toggle",
      category: "System",
      onSelect: (dialog) => {
@@ -646,7 +641,6 @@ function App() {
    {
      title: kv.get("animations_enabled", true) ? "Disable animations" : "Enable animations",
      value: "app.toggle.animations",
-      search: "toggle animations",
      category: "System",
      onSelect: (dialog) => {
        kv.set("animations_enabled", !kv.get("animations_enabled", true))
@@ -656,7 +650,6 @@ function App() {
    {
      title: kv.get("diff_wrap_mode", "word") === "word" ? "Disable diff wrapping" : "Enable diff wrapping",
      value: "app.toggle.diffwrap",
-      search: "toggle diff wrapping",
      category: "System",
      onSelect: (dialog) => {
        const current = kv.get("diff_wrap_mode", "word")
--- a/packages/opencode/src/cli/cmd/tui/component/dialog-model.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/dialog-model.tsx
@@ -7,27 +7,6 @@ import { useDialog } from "@tui/ui/dialog"
 import { createDialogProviderOptions, DialogProvider } from "./dialog-provider"
 import { useKeybind } from "../context/keybind"
 import * as fuzzysort from "fuzzysort"
-import type { Provider } from "@opencode-ai/sdk/v2"
-
-function pickLatest(models: [string, Provider["models"][string]][]) {
-  const picks: Record<string, [string, Provider["models"][string]]> = {}
-  for (const item of models) {
-    const model = item[0]
-    const info = item[1]
-    const key = info.family ?? model
-    const prev = picks[key]
-    if (!prev) {
-      picks[key] = item
-      continue
-    }
-    if (info.release_date !== prev[1].release_date) {
-      if (info.release_date > prev[1].release_date) picks[key] = item
-      continue
-    }
-    if (model > prev[0]) picks[key] = item
-  }
-  return Object.values(picks)
-}

 export function useConnected() {
  const sync = useSync()
@@ -42,7 +21,6 @@ export function DialogModel(props: { providerID?: string }) {
  const dialog = useDialog()
  const keybind = useKeybind()
  const [query, setQuery] = createSignal("")
-  const [all, setAll] = createSignal(false)

  const connected = useConnected()
  const providers = createDialogProviderOptions()
@@ -94,8 +72,8 @@ export function DialogModel(props: { providerID?: string }) {
        (provider) => provider.id !== "opencode",
        (provider) => provider.name,
      ),
-      flatMap((provider) => {
-        const items = pipe(
+      flatMap((provider) =>
+        pipe(
          provider.models,
          entries(),
          filter(([_, info]) => info.status !== "deprecated"),
@@ -126,9 +104,8 @@ export function DialogModel(props: { providerID?: string }) {
            (x) => x.footer !== "Free",
            (x) => x.title,
          ),
-        )
-        return items
-      }),
+        ),
+      ),
    )

    const popularProviders = !connected()
@@ -177,13 +154,6 @@ export function DialogModel(props: { providerID?: string }) {
            local.model.toggleFavorite(option.value as { providerID: string; modelID: string })
          },
        },
-        {
-          keybind: keybind.all.model_show_all_toggle?.[0],
-          title: all() ? "Show latest only" : "Show all models",
-          onTrigger: () => {
-            setAll((value) => !value)
-          },
-        },
      ]}
      onFilter={setQuery}
      flat={true}
--- a/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx
@@ -77,7 +77,6 @@ export function Prompt(props: PromptProps) {
  const renderer = useRenderer()
  const { theme, syntax } = useTheme()
  const kv = useKV()
-  const [autoaccept, setAutoaccept] = kv.signal<"none" | "edit">("permission_auto_accept", "edit")

  function promptModelWarning() {
    toast.show({
@@ -171,17 +170,6 @@ export function Prompt(props: PromptProps) {

  command.register(() => {
    return [
-      {
-        title: autoaccept() === "none" ? "Enable autoedit" : "Disable autoedit",
-        value: "permission.auto_accept.toggle",
-        search: "toggle permissions",
-        keybind: "permission_auto_accept_toggle",
-        category: "Agent",
-        onSelect: (dialog) => {
-          setAutoaccept(() => (autoaccept() === "none" ? "edit" : "none"))
-          dialog.clear()
-        },
-      },
      {
        title: "Clear prompt",
        value: "prompt.clear",
@@ -1008,30 +996,23 @@ export function Prompt(props: PromptProps) {
              cursorColor={theme.text}
              syntaxStyle={syntax()}
            />
-            <box flexDirection="row" flexShrink={0} paddingTop={1} gap={1} justifyContent="space-between">
-              <box flexDirection="row" gap={1}>
-                <text fg={highlight()}>
-                  {store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
-                </text>
-                <Show when={store.mode === "normal"}>
-                  <box flexDirection="row" gap={1}>
-                    <text flexShrink={0} fg={keybind.leader ? theme.textMuted : theme.text}>
-                      {local.model.parsed().model}
+            <box flexDirection="row" flexShrink={0} paddingTop={1} gap={1}>
+              <text fg={highlight()}>
+                {store.mode === "shell" ? "Shell" : Locale.titlecase(local.agent.current().name)}{" "}
+              </text>
+              <Show when={store.mode === "normal"}>
+                <box flexDirection="row" gap={1}>
+                  <text flexShrink={0} fg={keybind.leader ? theme.textMuted : theme.text}>
+                    {local.model.parsed().model}
+                  </text>
+                  <text fg={theme.textMuted}>{local.model.parsed().provider}</text>
+                  <Show when={showVariant()}>
+                    <text fg={theme.textMuted}>·</text>
+                    <text>
+                      <span style={{ fg: theme.warning, bold: true }}>{local.model.variant.current()}</span>
                    </text>
-                    <text fg={theme.textMuted}>{local.model.parsed().provider}</text>
-                    <Show when={showVariant()}>
-                      <text fg={theme.textMuted}>·</text>
-                      <text>
-                        <span style={{ fg: theme.warning, bold: true }}>{local.model.variant.current()}</span>
-                      </text>
-                    </Show>
-                  </box>
-                </Show>
-              </box>
-              <Show when={autoaccept() === "edit"}>
-                <text>
-                  <span style={{ fg: theme.warning }}>autoedit</span>
-                </text>
+                  </Show>
+                </box>
              </Show>
            </box>
          </box>
--- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx
+++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx
@@ -25,7 +25,6 @@ import { createSimpleContext } from "./helper"
 import type { Snapshot } from "@/snapshot"
 import { useExit } from "./exit"
 import { useArgs } from "./args"
-import { useKV } from "./kv"
 import { batch, onMount } from "solid-js"
 import { Log } from "@/util/log"
 import type { Path } from "@opencode-ai/sdk"
@@ -104,8 +103,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
    })

    const sdk = useSDK()
-    const kv = useKV()
-    const [autoaccept] = kv.signal<"none" | "edit">("permission_auto_accept", "edit")

    sdk.event.listen((e) => {
      const event = e.details
@@ -130,13 +127,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({

        case "permission.asked": {
          const request = event.properties
-          if (autoaccept() === "edit" && request.permission === "edit") {
-            sdk.client.permission.reply({
-              reply: "once",
-              requestID: request.id,
-            })
-            break
-          }
          const requests = store.permission[request.sessionID]
          if (!requests) {
            setStore("permission", request.sessionID, [request])
@@ -451,7 +441,6 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
      get ready() {
        return store.status !== "loading"
      },
-
      session: {
        get(sessionID: string) {
          const match = Binary.search(store.session, sessionID, (s) => s.id)
--- a/packages/opencode/src/cli/cmd/tui/routes/home.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/home.tsx
@@ -46,7 +46,6 @@ export function Home() {
    {
      title: tipsHidden() ? "Show tips" : "Hide tips",
      value: "tips.toggle",
-      search: "toggle tips",
      keybind: "tips_toggle",
      category: "System",
      onSelect: (dialog) => {
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -128,6 +128,11 @@ export function Session() {
      .filter((x) => x.parentID === parentID || x.id === parentID)
      .toSorted((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))
  })
+  const subagents = createMemo(() => {
+    return sync.data.session
+      .filter((x) => x.parentID === route.sessionID)
+      .toSorted((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))
+  })
  const messages = createMemo(() => sync.data.message[route.sessionID] ?? [])
  const permissions = createMemo(() => {
    if (session()?.parentID) return []
@@ -316,20 +321,14 @@ export function Session() {
  const local = useLocal()

  function moveFirstChild() {
-    if (children().length === 1) return
-    const next = children().find((x) => !!x.parentID)
-    if (next) {
-      navigate({
-        type: "session",
-        sessionID: next.id,
-      })
-    }
+    const next = subagents()[0]
+    if (!next) return
+    navigate({ type: "session", sessionID: next.id })
  }

  function moveChild(direction: number) {
-    if (children().length === 1) return
-
    const sessions = children().filter((x) => !!x.parentID)
+    if (sessions.length === 0) return
    let next = sessions.findIndex((x) => x.id === session()?.id) + direction

    if (next >= sessions.length) next = 0
@@ -552,7 +551,6 @@ export function Session() {
    {
      title: sidebarVisible() ? "Hide sidebar" : "Show sidebar",
      value: "session.sidebar.toggle",
-      search: "toggle sidebar",
      keybind: "sidebar_toggle",
      category: "Session",
      onSelect: (dialog) => {
@@ -567,7 +565,6 @@ export function Session() {
    {
      title: conceal() ? "Disable code concealment" : "Enable code concealment",
      value: "session.toggle.conceal",
-      search: "toggle code concealment",
      keybind: "messages_toggle_conceal" as any,
      category: "Session",
      onSelect: (dialog) => {
@@ -578,7 +575,6 @@ export function Session() {
    {
      title: showTimestamps() ? "Hide timestamps" : "Show timestamps",
      value: "session.toggle.timestamps",
-      search: "toggle timestamps",
      category: "Session",
      slash: {
        name: "timestamps",
@@ -592,7 +588,6 @@ export function Session() {
    {
      title: showThinking() ? "Hide thinking" : "Show thinking",
      value: "session.toggle.thinking",
-      search: "toggle thinking",
      keybind: "display_thinking",
      category: "Session",
      slash: {
@@ -607,7 +602,6 @@ export function Session() {
    {
      title: showDetails() ? "Hide tool details" : "Show tool details",
      value: "session.toggle.actions",
-      search: "toggle tool details",
      keybind: "tool_details",
      category: "Session",
      onSelect: (dialog) => {
@@ -616,9 +610,8 @@ export function Session() {
      },
    },
    {
-      title: showScrollbar() ? "Hide session scrollbar" : "Show session scrollbar",
+      title: "Toggle session scrollbar",
      value: "session.toggle.scrollbar",
-      search: "toggle session scrollbar",
      keybind: "scrollbar_toggle",
      category: "Session",
      onSelect: (dialog) => {
@@ -1130,7 +1123,7 @@ export function Session() {
                      <UserMessage
                        index={index()}
                        onMouseUp={() => {
-                          if (renderer.getSelection()?.getSelectedText()) return
+                          if (renderer.hasSelection) return
                          dialog.replace(() => (
                            <DialogMessage
                              messageID={message.id}
@@ -1629,6 +1622,7 @@ function InlineTool(props: {
  complete: any
  pending: string
  spinner?: boolean
+  onClick?: () => void
  children: JSX.Element
  part: ToolPart
 }) {
@@ -1636,6 +1630,8 @@ function InlineTool(props: {
  const { theme } = useTheme()
  const ctx = use()
  const sync = useSync()
+  const renderer = useRenderer()
+  const [hover, setHover] = createSignal(false)

  const permission = createMemo(() => {
    const callID = sync.data.permission[ctx.sessionID]?.at(0)?.tool?.callID
@@ -1684,13 +1680,23 @@ function InlineTool(props: {
          return
        }
      }}
+      onMouseOver={() => props.onClick && setHover(true)}
+      onMouseOut={() => setHover(false)}
+      onMouseUp={() => {
+        if (renderer.hasSelection) return
+        props.onClick?.()
+      }}
    >
      <Switch>
        <Match when={props.spinner}>
-          <Spinner color={fg()} children={props.children} />
+          <Spinner color={hover() ? theme.text : fg()} children={props.children} />
        </Match>
        <Match when={true}>
-          <text paddingLeft={3} fg={fg()} attributes={denied() ? TextAttributes.STRIKETHROUGH : undefined}>
+          <text
+            paddingLeft={3}
+            fg={hover() ? theme.text : fg()}
+            attributes={denied() ? TextAttributes.STRIKETHROUGH : undefined}
+          >
            <Show fallback={<>~ {props.pending}</>} when={props.complete}>
              <span style={{ fg: props.iconColor }}>{props.icon}</span> {props.children}
            </Show>
@@ -1729,7 +1735,7 @@ function BlockTool(props: {
      onMouseOver={() => props.onClick && setHover(true)}
      onMouseOut={() => setHover(false)}
      onMouseUp={() => {
-        if (renderer.getSelection()?.getSelectedText()) return
+        if (renderer.hasSelection) return
        props.onClick?.()
      }}
    >
@@ -1949,10 +1955,7 @@ function WebSearch(props: ToolProps<any>) {
 }

 function Task(props: ToolProps<typeof TaskTool>) {
-  const { theme } = useTheme()
-  const keybind = useKeybind()
  const { navigate } = useRoute()
-  const local = useLocal()
  const sync = useSync()

  onMount(() => {
@@ -2005,6 +2008,15 @@ function Task(props: ToolProps<typeof TaskTool>) {
      complete={props.input.description}
      pending="Delegating..."
      part={props.part}
+      onClick={
+        props.metadata.sessionId
+          ? () => {
+              const id = props.metadata.sessionId
+              if (!id) return
+              navigate({ type: "session", sessionID: id })
+            }
+          : undefined
+      }
    >
      {content()}
    </InlineTool>
@@ -2056,9 +2068,7 @@ function Edit(props: ToolProps<typeof EditTool>) {
      </Match>
      <Match when={true}>
        <InlineTool icon="←" pending="Preparing edit..." complete={props.input.filePath} part={props.part}>
-          Edit{" "}
-          {normalizePath(props.input.filePath!)}{" "}
-          {input({ replaceAll: "replaceAll" in props.input ? props.input.replaceAll : undefined })}
+          Edit {normalizePath(props.input.filePath!)} {input({ replaceAll: props.input.replaceAll })}
        </InlineTool>
      </Match>
    </Switch>
--- a/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
+++ b/packages/opencode/src/cli/cmd/tui/ui/dialog-select.tsx
@@ -34,7 +34,6 @@ export interface DialogSelectOption<T = any> {
  title: string
  value: T
  description?: string
-  search?: string
  footer?: JSX.Element | string
  category?: string
  disabled?: boolean
@@ -86,8 +85,8 @@ export function DialogSelect<T>(props: DialogSelectProps<T>) {
    // users typically search by the item name, and not its category.
    const result = fuzzysort
      .go(needle, options, {
-        keys: ["title", "category", "search"],
-        scoreFn: (r) => r[0].score * 2 + r[1].score + r[2].score,
+        keys: ["title", "category"],
+        scoreFn: (r) => r[0].score * 2 + r[1].score,
      })
      .map((x) => x.obj)

--- a/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
+++ b/packages/opencode/src/cli/cmd/tui/util/clipboard.ts
@@ -6,7 +6,6 @@ import { tmpdir } from "os"
 import path from "path"
 import { Filesystem } from "../../../../util/filesystem"
 import { Process } from "../../../../util/process"
-import { which } from "../../../../util/which"

 /**
 * Writes text to clipboard via OSC 52 escape sequence.
@@ -77,7 +76,7 @@ export namespace Clipboard {
  const getCopyMethod = lazy(() => {
    const os = platform()

-    if (os === "darwin" && which("osascript")) {
+    if (os === "darwin" && Bun.which("osascript")) {
      console.log("clipboard: using osascript")
      return async (text: string) => {
        const escaped = text.replace(/\\/g, "\\\\").replace(/"/g, '\\"')
@@ -86,7 +85,7 @@ export namespace Clipboard {
    }

    if (os === "linux") {
-      if (process.env["WAYLAND_DISPLAY"] && which("wl-copy")) {
+      if (process.env["WAYLAND_DISPLAY"] && Bun.which("wl-copy")) {
        console.log("clipboard: using wl-copy")
        return async (text: string) => {
          const proc = Process.spawn(["wl-copy"], { stdin: "pipe", stdout: "ignore", stderr: "ignore" })
@@ -96,7 +95,7 @@ export namespace Clipboard {
          await proc.exited.catch(() => {})
        }
      }
-      if (which("xclip")) {
+      if (Bun.which("xclip")) {
        console.log("clipboard: using xclip")
        return async (text: string) => {
          const proc = Process.spawn(["xclip", "-selection", "clipboard"], {
@@ -110,7 +109,7 @@ export namespace Clipboard {
          await proc.exited.catch(() => {})
        }
      }
-      if (which("xsel")) {
+      if (Bun.which("xsel")) {
        console.log("clipboard: using xsel")
        return async (text: string) => {
          const proc = Process.spawn(["xsel", "--clipboard", "--input"], {
@@ -127,7 +126,7 @@ export namespace Clipboard {
    }

    if (os === "win32") {
-      console.log("clipboard: using windows runtime")
+      console.log("clipboard: using powershell")
      return async (text: string) => {
        // Pipe via stdin to avoid PowerShell string interpolation ($env:FOO, $(), etc.)
        const proc = Process.spawn(
@@ -136,7 +135,7 @@ export namespace Clipboard {
            "-NonInteractive",
            "-NoProfile",
            "-Command",
-            "[Console]::InputEncoding = [System.Text.Encoding]::UTF8; $null = [Windows.ApplicationModel.DataTransfer.DataPackage, Windows.ApplicationModel.DataTransfer, ContentType=WindowsRuntime]; $null = [Windows.ApplicationModel.DataTransfer.Clipboard, Windows.ApplicationModel.DataTransfer, ContentType=WindowsRuntime]; $pkg = New-Object Windows.ApplicationModel.DataTransfer.DataPackage; $pkg.SetText([Console]::In.ReadToEnd()); [Windows.ApplicationModel.DataTransfer.Clipboard]::SetContent($pkg); [Windows.ApplicationModel.DataTransfer.Clipboard]::Flush()",
+            "[Console]::InputEncoding = [System.Text.Encoding]::UTF8; Set-Clipboard -Value ([Console]::In.ReadToEnd())",
          ],
          {
            stdin: "pipe",
--- a/packages/opencode/src/cli/cmd/tui/worker.ts
+++ b/packages/opencode/src/cli/cmd/tui/worker.ts
@@ -10,7 +10,6 @@ import { GlobalBus } from "@/bus/global"
 import { createOpencodeClient, type Event } from "@opencode-ai/sdk/v2"
 import type { BunWebSocketData } from "hono/bun"
 import { Flag } from "@/flag/flag"
-import { setTimeout as sleep } from "node:timers/promises"

 await Log.init({
  print: process.argv.includes("--print-logs"),
@@ -76,7 +75,7 @@ const startEventStream = (directory: string) => {
      ).catch(() => undefined)

      if (!events) {
-        await sleep(250)
+        await Bun.sleep(250)
        continue
      }

@@ -85,7 +84,7 @@ const startEventStream = (directory: string) => {
      }

      if (!signal.aborted) {
-        await sleep(250)
+        await Bun.sleep(250)
      }
    }
  })().catch((error) => {
--- a/packages/opencode/src/config/config.ts
+++ b/packages/opencode/src/config/config.ts
@@ -32,7 +32,7 @@ import { Glob } from "../util/glob"
 import { PackageRegistry } from "@/bun/registry"
 import { proxied } from "@/util/proxied"
 import { iife } from "@/util/iife"
-import { Account } from "@/account"
+import { Control } from "@/control"
 import { ConfigPaths } from "./paths"
 import { Filesystem } from "@/util/filesystem"

@@ -108,6 +108,10 @@ export namespace Config {
      }
    }

+    const token = await Control.token()
+    if (token) {
+    }
+
    // Global user config overrides remote config.
    result = mergeConfigConcatArrays(result, await global())

@@ -174,15 +178,6 @@ export namespace Config {
      log.debug("loaded custom config from OPENCODE_CONFIG_CONTENT")
    }

-    const active = Account.active()
-    if (active?.workspace_id) {
-      const config = await Account.config(active.id, active.workspace_id)
-      result = mergeConfigConcatArrays(result, config ?? {})
-      const token = await Account.token(active.id)
-      // TODO: this is bad
-      process.env["OPENCODE_CONTROL_TOKEN"] = token
-    }
-
    // Load managed config files last (highest priority) - enterprise admin-controlled
    // Kept separate from directories array to avoid write operations when installing plugins
    // which would fail on system directories requiring elevated permissions
@@ -777,7 +772,6 @@ export namespace Config {
      stash_delete: z.string().optional().default("ctrl+d").describe("Delete stash entry"),
      model_provider_list: z.string().optional().default("ctrl+a").describe("Open provider list from model dialog"),
      model_favorite_toggle: z.string().optional().default("ctrl+f").describe("Toggle model favorite status"),
-      model_show_all_toggle: z.string().optional().default("ctrl+o").describe("Toggle showing all models"),
      session_share: z.string().optional().default("none").describe("Share current session"),
      session_unshare: z.string().optional().default("none").describe("Unshare current session"),
      session_interrupt: z.string().optional().default("escape").describe("Interrupt current session"),
@@ -818,12 +812,7 @@ export namespace Config {
      command_list: z.string().optional().default("ctrl+p").describe("List available commands"),
      agent_list: z.string().optional().default("<leader>a").describe("List agents"),
      agent_cycle: z.string().optional().default("tab").describe("Next agent"),
-      agent_cycle_reverse: z.string().optional().default("none").describe("Previous agent"),
-      permission_auto_accept_toggle: z
-        .string()
-        .optional()
-        .default("shift+tab")
-        .describe("Toggle auto-accept mode for permissions"),
+      agent_cycle_reverse: z.string().optional().default("shift+tab").describe("Previous agent"),
      variant_cycle: z.string().optional().default("ctrl+t").describe("Cycle model variants"),
      input_clear: z.string().optional().default("ctrl+c").describe("Clear input field"),
      input_paste: z.string().optional().default("ctrl+v").describe("Paste from clipboard"),
@@ -1162,16 +1151,6 @@ export namespace Config {
        .object({
          disable_paste_summary: z.boolean().optional(),
          batch_tool: z.boolean().optional().describe("Enable the batch tool"),
-          hashline_edit: z
-            .boolean()
-            .optional()
-            .describe("Enable hashline-backed edit/read tool behavior (default true, set false to disable)"),
-          hashline_autocorrect: z
-            .boolean()
-            .optional()
-            .describe(
-              "Enable hashline autocorrect cleanup for copied prefixes and formatting artifacts (default true)",
-            ),
          openTelemetry: z
            .boolean()
            .optional()
--- a/packages/opencode/src/control/control.sql.ts
+++ b/packages/opencode/src/control/control.sql.ts
@@ -1,18 +1,7 @@
-import { sqliteTable, text, integer, primaryKey } from "drizzle-orm/sqlite-core"
+import { sqliteTable, text, integer, primaryKey, uniqueIndex } from "drizzle-orm/sqlite-core"
+import { eq } from "drizzle-orm"
 import { Timestamps } from "@/storage/schema.sql"

-export const AccountTable = sqliteTable("account", {
-  id: text().primaryKey(),
-  email: text().notNull(),
-  url: text().notNull(),
-  access_token: text().notNull(),
-  refresh_token: text().notNull(),
-  token_expiry: integer(),
-  workspace_id: text(),
-  ...Timestamps,
-})
-
-// LEGACY
 export const ControlAccountTable = sqliteTable(
  "control_account",
  {
--- a/packages/opencode/src/control/index.ts
+++ b/packages/opencode/src/control/index.ts
@@ -0,0 +1,67 @@
+import { eq, and } from "drizzle-orm"
+import { Database } from "@/storage/db"
+import { ControlAccountTable } from "./control.sql"
+import z from "zod"
+
+export * from "./control.sql"
+
+export namespace Control {
+  export const Account = z.object({
+    email: z.string(),
+    url: z.string(),
+  })
+  export type Account = z.infer<typeof Account>
+
+  function fromRow(row: (typeof ControlAccountTable)["$inferSelect"]): Account {
+    return {
+      email: row.email,
+      url: row.url,
+    }
+  }
+
+  export function account(): Account | undefined {
+    const row = Database.use((db) =>
+      db.select().from(ControlAccountTable).where(eq(ControlAccountTable.active, true)).get(),
+    )
+    return row ? fromRow(row) : undefined
+  }
+
+  export async function token(): Promise<string | undefined> {
+    const row = Database.use((db) =>
+      db.select().from(ControlAccountTable).where(eq(ControlAccountTable.active, true)).get(),
+    )
+    if (!row) return undefined
+    if (row.token_expiry && row.token_expiry > Date.now()) return row.access_token
+
+    const res = await fetch(`${row.url}/oauth/token`, {
+      method: "POST",
+      headers: { "Content-Type": "application/x-www-form-urlencoded" },
+      body: new URLSearchParams({
+        grant_type: "refresh_token",
+        refresh_token: row.refresh_token,
+      }).toString(),
+    })
+
+    if (!res.ok) return
+
+    const json = (await res.json()) as {
+      access_token: string
+      refresh_token?: string
+      expires_in?: number
+    }
+
+    Database.use((db) =>
+      db
+        .update(ControlAccountTable)
+        .set({
+          access_token: json.access_token,
+          refresh_token: json.refresh_token ?? row.refresh_token,
+          token_expiry: json.expires_in ? Date.now() + json.expires_in * 1000 : undefined,
+        })
+        .where(and(eq(ControlAccountTable.email, row.email), eq(ControlAccountTable.url, row.url)))
+        .run(),
+    )
+
+    return json.access_token
+  }
+}
--- a/packages/opencode/src/file/ripgrep.ts
+++ b/packages/opencode/src/file/ripgrep.ts
@@ -8,7 +8,6 @@ import { lazy } from "../util/lazy"
 import { $ } from "bun"
 import { Filesystem } from "../util/filesystem"
 import { Process } from "../util/process"
-import { which } from "../util/which"
 import { text } from "node:stream/consumers"

 import { ZipReader, BlobReader, BlobWriter } from "@zip.js/zip.js"
@@ -127,7 +126,7 @@ export namespace Ripgrep {
  )

  const state = lazy(async () => {
-    const system = which("rg")
+    const system = Bun.which("rg")
    if (system) {
      const stat = await fs.stat(system).catch(() => undefined)
      if (stat?.isFile()) return { filepath: system }
--- a/packages/opencode/src/format/formatter.ts
+++ b/packages/opencode/src/format/formatter.ts
@@ -3,7 +3,6 @@ import { BunProc } from "../bun"
 import { Instance } from "../project/instance"
 import { Filesystem } from "../util/filesystem"
 import { Process } from "../util/process"
-import { which } from "../util/which"
 import { Flag } from "@/flag/flag"

 export interface Info {
@@ -19,7 +18,7 @@ export const gofmt: Info = {
  command: ["gofmt", "-w", "$FILE"],
  extensions: [".go"],
  async enabled() {
-    return which("gofmt") !== null
+    return Bun.which("gofmt") !== null
  },
 }

@@ -28,7 +27,7 @@ export const mix: Info = {
  command: ["mix", "format", "$FILE"],
  extensions: [".ex", ".exs", ".eex", ".heex", ".leex", ".neex", ".sface"],
  async enabled() {
-    return which("mix") !== null
+    return Bun.which("mix") !== null
  },
 }

@@ -153,7 +152,7 @@ export const zig: Info = {
  command: ["zig", "fmt", "$FILE"],
  extensions: [".zig", ".zon"],
  async enabled() {
-    return which("zig") !== null
+    return Bun.which("zig") !== null
  },
 }

@@ -172,7 +171,7 @@ export const ktlint: Info = {
  command: ["ktlint", "-F", "$FILE"],
  extensions: [".kt", ".kts"],
  async enabled() {
-    return which("ktlint") !== null
+    return Bun.which("ktlint") !== null
  },
 }

@@ -181,7 +180,7 @@ export const ruff: Info = {
  command: ["ruff", "format", "$FILE"],
  extensions: [".py", ".pyi"],
  async enabled() {
-    if (!which("ruff")) return false
+    if (!Bun.which("ruff")) return false
    const configs = ["pyproject.toml", "ruff.toml", ".ruff.toml"]
    for (const config of configs) {
      const found = await Filesystem.findUp(config, Instance.directory, Instance.worktree)
@@ -211,7 +210,7 @@ export const rlang: Info = {
  command: ["air", "format", "$FILE"],
  extensions: [".R"],
  async enabled() {
-    const airPath = which("air")
+    const airPath = Bun.which("air")
    if (airPath == null) return false

    try {
@@ -240,7 +239,7 @@ export const uvformat: Info = {
  extensions: [".py", ".pyi"],
  async enabled() {
    if (await ruff.enabled()) return false
-    if (which("uv") !== null) {
+    if (Bun.which("uv") !== null) {
      const proc = Process.spawn(["uv", "format", "--help"], { stderr: "pipe", stdout: "pipe" })
      const code = await proc.exited
      return code === 0
@@ -254,7 +253,7 @@ export const rubocop: Info = {
  command: ["rubocop", "--autocorrect", "$FILE"],
  extensions: [".rb", ".rake", ".gemspec", ".ru"],
  async enabled() {
-    return which("rubocop") !== null
+    return Bun.which("rubocop") !== null
  },
 }

@@ -263,7 +262,7 @@ export const standardrb: Info = {
  command: ["standardrb", "--fix", "$FILE"],
  extensions: [".rb", ".rake", ".gemspec", ".ru"],
  async enabled() {
-    return which("standardrb") !== null
+    return Bun.which("standardrb") !== null
  },
 }

@@ -272,7 +271,7 @@ export const htmlbeautifier: Info = {
  command: ["htmlbeautifier", "$FILE"],
  extensions: [".erb", ".html.erb"],
  async enabled() {
-    return which("htmlbeautifier") !== null
+    return Bun.which("htmlbeautifier") !== null
  },
 }

@@ -281,7 +280,7 @@ export const dart: Info = {
  command: ["dart", "format", "$FILE"],
  extensions: [".dart"],
  async enabled() {
-    return which("dart") !== null
+    return Bun.which("dart") !== null
  },
 }

@@ -290,7 +289,7 @@ export const ocamlformat: Info = {
  command: ["ocamlformat", "-i", "$FILE"],
  extensions: [".ml", ".mli"],
  async enabled() {
-    if (!which("ocamlformat")) return false
+    if (!Bun.which("ocamlformat")) return false
    const items = await Filesystem.findUp(".ocamlformat", Instance.directory, Instance.worktree)
    return items.length > 0
  },
@@ -301,7 +300,7 @@ export const terraform: Info = {
  command: ["terraform", "fmt", "$FILE"],
  extensions: [".tf", ".tfvars"],
  async enabled() {
-    return which("terraform") !== null
+    return Bun.which("terraform") !== null
  },
 }

@@ -310,7 +309,7 @@ export const latexindent: Info = {
  command: ["latexindent", "-w", "-s", "$FILE"],
  extensions: [".tex"],
  async enabled() {
-    return which("latexindent") !== null
+    return Bun.which("latexindent") !== null
  },
 }

@@ -319,7 +318,7 @@ export const gleam: Info = {
  command: ["gleam", "format", "$FILE"],
  extensions: [".gleam"],
  async enabled() {
-    return which("gleam") !== null
+    return Bun.which("gleam") !== null
  },
 }

@@ -328,7 +327,7 @@ export const shfmt: Info = {
  command: ["shfmt", "-w", "$FILE"],
  extensions: [".sh", ".bash"],
  async enabled() {
-    return which("shfmt") !== null
+    return Bun.which("shfmt") !== null
  },
 }

@@ -337,7 +336,7 @@ export const nixfmt: Info = {
  command: ["nixfmt", "$FILE"],
  extensions: [".nix"],
  async enabled() {
-    return which("nixfmt") !== null
+    return Bun.which("nixfmt") !== null
  },
 }

@@ -346,7 +345,7 @@ export const rustfmt: Info = {
  command: ["rustfmt", "$FILE"],
  extensions: [".rs"],
  async enabled() {
-    return which("rustfmt") !== null
+    return Bun.which("rustfmt") !== null
  },
 }

@@ -373,7 +372,7 @@ export const ormolu: Info = {
  command: ["ormolu", "-i", "$FILE"],
  extensions: [".hs"],
  async enabled() {
-    return which("ormolu") !== null
+    return Bun.which("ormolu") !== null
  },
 }

@@ -382,7 +381,7 @@ export const cljfmt: Info = {
  command: ["cljfmt", "fix", "--quiet", "$FILE"],
  extensions: [".clj", ".cljs", ".cljc", ".edn"],
  async enabled() {
-    return which("cljfmt") !== null
+    return Bun.which("cljfmt") !== null
  },
 }

@@ -391,6 +390,6 @@ export const dfmt: Info = {
  command: ["dfmt", "-i", "$FILE"],
  extensions: [".d"],
  async enabled() {
-    return which("dfmt") !== null
+    return Bun.which("dfmt") !== null
  },
 }
--- a/packages/opencode/src/index.ts
+++ b/packages/opencode/src/index.ts
@@ -3,8 +3,7 @@ import { hideBin } from "yargs/helpers"
 import { RunCommand } from "./cli/cmd/run"
 import { GenerateCommand } from "./cli/cmd/generate"
 import { Log } from "./util/log"
-import { LoginCommand, LogoutCommand, SwitchCommand, WorkspacesCommand } from "./cli/cmd/account"
-import { ProvidersCommand } from "./cli/cmd/providers"
+import { AuthCommand } from "./cli/cmd/auth"
 import { AgentCommand } from "./cli/cmd/agent"
 import { UpgradeCommand } from "./cli/cmd/upgrade"
 import { UninstallCommand } from "./cli/cmd/uninstall"
@@ -135,11 +134,7 @@ let cli = yargs(hideBin(process.argv))
  .command(RunCommand)
  .command(GenerateCommand)
  .command(DebugCommand)
-  .command(LoginCommand)
-  .command(LogoutCommand)
-  .command(SwitchCommand)
-  .command(WorkspacesCommand)
-  .command(ProvidersCommand)
+  .command(AuthCommand)
  .command(AgentCommand)
  .command(UpgradeCommand)
  .command(UninstallCommand)
--- a/packages/opencode/src/lsp/server.ts
+++ b/packages/opencode/src/lsp/server.ts
@@ -12,7 +12,6 @@ import { Instance } from "../project/instance"
 import { Flag } from "../flag/flag"
 import { Archive } from "../util/archive"
 import { Process } from "../util/process"
-import { which } from "../util/which"

 export namespace LSPServer {
  const log = Log.create({ service: "lsp.server" })
@@ -76,7 +75,7 @@ export namespace LSPServer {
    },
    extensions: [".ts", ".tsx", ".js", ".jsx", ".mjs"],
    async spawn(root) {
-      const deno = which("deno")
+      const deno = Bun.which("deno")
      if (!deno) {
        log.info("deno not found, please install deno first")
        return
@@ -123,7 +122,7 @@ export namespace LSPServer {
    extensions: [".vue"],
    root: NearestRoot(["package-lock.json", "bun.lockb", "bun.lock", "pnpm-lock.yaml", "yarn.lock"]),
    async spawn(root) {
-      let binary = which("vue-language-server")
+      let binary = Bun.which("vue-language-server")
      const args: string[] = []
      if (!binary) {
        const js = path.join(
@@ -261,7 +260,7 @@ export namespace LSPServer {

      let lintBin = await resolveBin(lintTarget)
      if (!lintBin) {
-        const found = which("oxlint")
+        const found = Bun.which("oxlint")
        if (found) lintBin = found
      }

@@ -282,7 +281,7 @@ export namespace LSPServer {

      let serverBin = await resolveBin(serverTarget)
      if (!serverBin) {
-        const found = which("oxc_language_server")
+        const found = Bun.which("oxc_language_server")
        if (found) serverBin = found
      }
      if (serverBin) {
@@ -333,7 +332,7 @@ export namespace LSPServer {
      let bin: string | undefined
      if (await Filesystem.exists(localBin)) bin = localBin
      if (!bin) {
-        const found = which("biome")
+        const found = Bun.which("biome")
        if (found) bin = found
      }

@@ -369,11 +368,11 @@ export namespace LSPServer {
    },
    extensions: [".go"],
    async spawn(root) {
-      let bin = which("gopls", {
+      let bin = Bun.which("gopls", {
        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
      })
      if (!bin) {
-        if (!which("go")) return
+        if (!Bun.which("go")) return
        if (Flag.OPENCODE_DISABLE_LSP_DOWNLOAD) return

        log.info("installing gopls")
@@ -406,12 +405,12 @@ export namespace LSPServer {
    root: NearestRoot(["Gemfile"]),
    extensions: [".rb", ".rake", ".gemspec", ".ru"],
    async spawn(root) {
-      let bin = which("rubocop", {
+      let bin = Bun.which("rubocop", {
        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
      })
      if (!bin) {
-        const ruby = which("ruby")
-        const gem = which("gem")
+        const ruby = Bun.which("ruby")
+        const gem = Bun.which("gem")
        if (!ruby || !gem) {
          log.info("Ruby not found, please install Ruby first")
          return
@@ -458,7 +457,7 @@ export namespace LSPServer {
        return undefined
      }

-      let binary = which("ty")
+      let binary = Bun.which("ty")

      const initialization: Record<string, string> = {}

@@ -510,7 +509,7 @@ export namespace LSPServer {
    extensions: [".py", ".pyi"],
    root: NearestRoot(["pyproject.toml", "setup.py", "setup.cfg", "requirements.txt", "Pipfile", "pyrightconfig.json"]),
    async spawn(root) {
-      let binary = which("pyright-langserver")
+      let binary = Bun.which("pyright-langserver")
      const args = []
      if (!binary) {
        const js = path.join(Global.Path.bin, "node_modules", "pyright", "dist", "pyright-langserver.js")
@@ -564,7 +563,7 @@ export namespace LSPServer {
    extensions: [".ex", ".exs"],
    root: NearestRoot(["mix.exs", "mix.lock"]),
    async spawn(root) {
-      let binary = which("elixir-ls")
+      let binary = Bun.which("elixir-ls")
      if (!binary) {
        const elixirLsPath = path.join(Global.Path.bin, "elixir-ls")
        binary = path.join(
@@ -575,7 +574,7 @@ export namespace LSPServer {
        )

        if (!(await Filesystem.exists(binary))) {
-          const elixir = which("elixir")
+          const elixir = Bun.which("elixir")
          if (!elixir) {
            log.error("elixir is required to run elixir-ls")
            return
@@ -626,12 +625,12 @@ export namespace LSPServer {
    extensions: [".zig", ".zon"],
    root: NearestRoot(["build.zig"]),
    async spawn(root) {
-      let bin = which("zls", {
+      let bin = Bun.which("zls", {
        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
      })

      if (!bin) {
-        const zig = which("zig")
+        const zig = Bun.which("zig")
        if (!zig) {
          log.error("Zig is required to use zls. Please install Zig first.")
          return
@@ -738,11 +737,11 @@ export namespace LSPServer {
    root: NearestRoot([".slnx", ".sln", ".csproj", "global.json"]),
    extensions: [".cs"],
    async spawn(root) {
-      let bin = which("csharp-ls", {
+      let bin = Bun.which("csharp-ls", {
        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
      })
      if (!bin) {
-        if (!which("dotnet")) {
+        if (!Bun.which("dotnet")) {
          log.error(".NET SDK is required to install csharp-ls")
          return
        }
@@ -777,11 +776,11 @@ export namespace LSPServer {
    root: NearestRoot([".slnx", ".sln", ".fsproj", "global.json"]),
    extensions: [".fs", ".fsi", ".fsx", ".fsscript"],
    async spawn(root) {
-      let bin = which("fsautocomplete", {
+      let bin = Bun.which("fsautocomplete", {
        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
      })
      if (!bin) {
-        if (!which("dotnet")) {
+        if (!Bun.which("dotnet")) {
          log.error(".NET SDK is required to install fsautocomplete")
          return
        }
@@ -818,7 +817,7 @@ export namespace LSPServer {
    async spawn(root) {
      // Check if sourcekit-lsp is available in the PATH
      // This is installed with the Swift toolchain
-      const sourcekit = which("sourcekit-lsp")
+      const sourcekit = Bun.which("sourcekit-lsp")
      if (sourcekit) {
        return {
          process: spawn(sourcekit, {
@@ -829,7 +828,7 @@ export namespace LSPServer {

      // If sourcekit-lsp not found, check if xcrun is available
      // This is specific to macOS where sourcekit-lsp is typically installed with Xcode
-      if (!which("xcrun")) return
+      if (!Bun.which("xcrun")) return

      const lspLoc = await $`xcrun --find sourcekit-lsp`.quiet().nothrow()

@@ -878,7 +877,7 @@ export namespace LSPServer {
    },
    extensions: [".rs"],
    async spawn(root) {
-      const bin = which("rust-analyzer")
+      const bin = Bun.which("rust-analyzer")
      if (!bin) {
        log.info("rust-analyzer not found in path, please install it")
        return
@@ -897,7 +896,7 @@ export namespace LSPServer {
    extensions: [".c", ".cpp", ".cc", ".cxx", ".c++", ".h", ".hpp", ".hh", ".hxx", ".h++"],
    async spawn(root) {
      const args = ["--background-index", "--clang-tidy"]
-      const fromPath = which("clangd")
+      const fromPath = Bun.which("clangd")
      if (fromPath) {
        return {
          process: spawn(fromPath, args, {
@@ -1042,7 +1041,7 @@ export namespace LSPServer {
    extensions: [".svelte"],
    root: NearestRoot(["package-lock.json", "bun.lockb", "bun.lock", "pnpm-lock.yaml", "yarn.lock"]),
    async spawn(root) {
-      let binary = which("svelteserver")
+      let binary = Bun.which("svelteserver")
      const args: string[] = []
      if (!binary) {
        const js = path.join(Global.Path.bin, "node_modules", "svelte-language-server", "bin", "server.js")
@@ -1089,7 +1088,7 @@ export namespace LSPServer {
      }
      const tsdk = path.dirname(tsserver)

-      let binary = which("astro-ls")
+      let binary = Bun.which("astro-ls")
      const args: string[] = []
      if (!binary) {
        const js = path.join(Global.Path.bin, "node_modules", "@astrojs", "language-server", "bin", "nodeServer.js")
@@ -1133,7 +1132,7 @@ export namespace LSPServer {
    root: NearestRoot(["pom.xml", "build.gradle", "build.gradle.kts", ".project", ".classpath"]),
    extensions: [".java"],
    async spawn(root) {
-      const java = which("java")
+      const java = Bun.which("java")
      if (!java) {
        log.error("Java 21 or newer is required to run the JDTLS. Please install it first.")
        return
@@ -1325,7 +1324,7 @@ export namespace LSPServer {
    extensions: [".yaml", ".yml"],
    root: NearestRoot(["package-lock.json", "bun.lockb", "bun.lock", "pnpm-lock.yaml", "yarn.lock"]),
    async spawn(root) {
-      let binary = which("yaml-language-server")
+      let binary = Bun.which("yaml-language-server")
      const args: string[] = []
      if (!binary) {
        const js = path.join(
@@ -1381,7 +1380,7 @@ export namespace LSPServer {
    ]),
    extensions: [".lua"],
    async spawn(root) {
-      let bin = which("lua-language-server", {
+      let bin = Bun.which("lua-language-server", {
        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
      })

@@ -1513,7 +1512,7 @@ export namespace LSPServer {
    extensions: [".php"],
    root: NearestRoot(["composer.json", "composer.lock", ".php-version"]),
    async spawn(root) {
-      let binary = which("intelephense")
+      let binary = Bun.which("intelephense")
      const args: string[] = []
      if (!binary) {
        const js = path.join(Global.Path.bin, "node_modules", "intelephense", "lib", "intelephense.js")
@@ -1557,7 +1556,7 @@ export namespace LSPServer {
    extensions: [".prisma"],
    root: NearestRoot(["schema.prisma", "prisma/schema.prisma", "prisma"], ["package.json"]),
    async spawn(root) {
-      const prisma = which("prisma")
+      const prisma = Bun.which("prisma")
      if (!prisma) {
        log.info("prisma not found, please install prisma")
        return
@@ -1575,7 +1574,7 @@ export namespace LSPServer {
    extensions: [".dart"],
    root: NearestRoot(["pubspec.yaml", "analysis_options.yaml"]),
    async spawn(root) {
-      const dart = which("dart")
+      const dart = Bun.which("dart")
      if (!dart) {
        log.info("dart not found, please install dart first")
        return
@@ -1593,7 +1592,7 @@ export namespace LSPServer {
    extensions: [".ml", ".mli"],
    root: NearestRoot(["dune-project", "dune-workspace", ".merlin", "opam"]),
    async spawn(root) {
-      const bin = which("ocamllsp")
+      const bin = Bun.which("ocamllsp")
      if (!bin) {
        log.info("ocamllsp not found, please install ocaml-lsp-server")
        return
@@ -1610,7 +1609,7 @@ export namespace LSPServer {
    extensions: [".sh", ".bash", ".zsh", ".ksh"],
    root: async () => Instance.directory,
    async spawn(root) {
-      let binary = which("bash-language-server")
+      let binary = Bun.which("bash-language-server")
      const args: string[] = []
      if (!binary) {
        const js = path.join(Global.Path.bin, "node_modules", "bash-language-server", "out", "cli.js")
@@ -1649,7 +1648,7 @@ export namespace LSPServer {
    extensions: [".tf", ".tfvars"],
    root: NearestRoot([".terraform.lock.hcl", "terraform.tfstate", "*.tf"]),
    async spawn(root) {
-      let bin = which("terraform-ls", {
+      let bin = Bun.which("terraform-ls", {
        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
      })

@@ -1732,7 +1731,7 @@ export namespace LSPServer {
    extensions: [".tex", ".bib"],
    root: NearestRoot([".latexmkrc", "latexmkrc", ".texlabroot", "texlabroot"]),
    async spawn(root) {
-      let bin = which("texlab", {
+      let bin = Bun.which("texlab", {
        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
      })

@@ -1822,7 +1821,7 @@ export namespace LSPServer {
    extensions: [".dockerfile", "Dockerfile"],
    root: async () => Instance.directory,
    async spawn(root) {
-      let binary = which("docker-langserver")
+      let binary = Bun.which("docker-langserver")
      const args: string[] = []
      if (!binary) {
        const js = path.join(Global.Path.bin, "node_modules", "dockerfile-language-server-nodejs", "lib", "server.js")
@@ -1861,7 +1860,7 @@ export namespace LSPServer {
    extensions: [".gleam"],
    root: NearestRoot(["gleam.toml"]),
    async spawn(root) {
-      const gleam = which("gleam")
+      const gleam = Bun.which("gleam")
      if (!gleam) {
        log.info("gleam not found, please install gleam first")
        return
@@ -1879,9 +1878,9 @@ export namespace LSPServer {
    extensions: [".clj", ".cljs", ".cljc", ".edn"],
    root: NearestRoot(["deps.edn", "project.clj", "shadow-cljs.edn", "bb.edn", "build.boot"]),
    async spawn(root) {
-      let bin = which("clojure-lsp")
+      let bin = Bun.which("clojure-lsp")
      if (!bin && process.platform === "win32") {
-        bin = which("clojure-lsp.exe")
+        bin = Bun.which("clojure-lsp.exe")
      }
      if (!bin) {
        log.info("clojure-lsp not found, please install clojure-lsp first")
@@ -1910,7 +1909,7 @@ export namespace LSPServer {
      return Instance.directory
    },
    async spawn(root) {
-      const nixd = which("nixd")
+      const nixd = Bun.which("nixd")
      if (!nixd) {
        log.info("nixd not found, please install nixd first")
        return
@@ -1931,7 +1930,7 @@ export namespace LSPServer {
    extensions: [".typ", ".typc"],
    root: NearestRoot(["typst.toml"]),
    async spawn(root) {
-      let bin = which("tinymist", {
+      let bin = Bun.which("tinymist", {
        PATH: process.env["PATH"] + path.delimiter + Global.Path.bin,
      })

@@ -2025,7 +2024,7 @@ export namespace LSPServer {
    extensions: [".hs", ".lhs"],
    root: NearestRoot(["stack.yaml", "cabal.project", "hie.yaml", "*.cabal"]),
    async spawn(root) {
-      const bin = which("haskell-language-server-wrapper")
+      const bin = Bun.which("haskell-language-server-wrapper")
      if (!bin) {
        log.info("haskell-language-server-wrapper not found, please install haskell-language-server")
        return
@@ -2043,7 +2042,7 @@ export namespace LSPServer {
    extensions: [".jl"],
    root: NearestRoot(["Project.toml", "Manifest.toml", "*.jl"]),
    async spawn(root) {
-      const julia = which("julia")
+      const julia = Bun.which("julia")
      if (!julia) {
        log.info("julia not found, please install julia first (https://julialang.org/downloads/)")
        return
--- a/packages/opencode/src/plugin/codex.ts
+++ b/packages/opencode/src/plugin/codex.ts
@@ -4,7 +4,6 @@ import { Installation } from "../installation"
 import { Auth, OAUTH_DUMMY_KEY } from "../auth"
 import os from "os"
 import { ProviderTransform } from "@/provider/transform"
-import { setTimeout as sleep } from "node:timers/promises"

 const log = Log.create({ service: "plugin.codex" })

@@ -603,7 +602,7 @@ export async function CodexAuthPlugin(input: PluginInput): Promise<Hooks> {
                    return { type: "failed" as const }
                  }

-                  await sleep(interval + OAUTH_POLLING_SAFETY_MARGIN_MS)
+                  await Bun.sleep(interval + OAUTH_POLLING_SAFETY_MARGIN_MS)
                }
              },
            }
--- a/packages/opencode/src/plugin/copilot.ts
+++ b/packages/opencode/src/plugin/copilot.ts
@@ -1,7 +1,6 @@
 import type { Hooks, PluginInput } from "@opencode-ai/plugin"
 import { Installation } from "@/installation"
 import { iife } from "@/util/iife"
-import { setTimeout as sleep } from "node:timers/promises"

 const CLIENT_ID = "Ov23li8tweQw6odWQebz"
 // Add a small safety buffer when polling to avoid hitting the server
@@ -271,7 +270,7 @@ export async function CopilotAuthPlugin(input: PluginInput): Promise<Hooks> {
                  }

                  if (data.error === "authorization_pending") {
-                    await sleep(deviceData.interval * 1000 + OAUTH_POLLING_SAFETY_MARGIN_MS)
+                    await Bun.sleep(deviceData.interval * 1000 + OAUTH_POLLING_SAFETY_MARGIN_MS)
                    continue
                  }

@@ -287,13 +286,13 @@ export async function CopilotAuthPlugin(input: PluginInput): Promise<Hooks> {
                      newInterval = serverInterval * 1000
                    }

-                    await sleep(newInterval + OAUTH_POLLING_SAFETY_MARGIN_MS)
+                    await Bun.sleep(newInterval + OAUTH_POLLING_SAFETY_MARGIN_MS)
                    continue
                  }

                  if (data.error) return { type: "failed" as const }

-                  await sleep(deviceData.interval * 1000 + OAUTH_POLLING_SAFETY_MARGIN_MS)
+                  await Bun.sleep(deviceData.interval * 1000 + OAUTH_POLLING_SAFETY_MARGIN_MS)
                  continue
                }
              },
--- a/packages/opencode/src/project/project.ts
+++ b/packages/opencode/src/project/project.ts
@@ -14,7 +14,6 @@ import { GlobalBus } from "@/bus/global"
 import { existsSync } from "fs"
 import { git } from "../util/git"
 import { Glob } from "../util/glob"
-import { which } from "../util/which"

 export namespace Project {
  const log = Log.create({ service: "project" })
@@ -98,7 +97,7 @@ export namespace Project {
      if (dotgit) {
        let sandbox = path.dirname(dotgit)

-        const gitBinary = which("git")
+        const gitBinary = Bun.which("git")

        // cached id calculation
        let id = await Filesystem.readText(path.join(dotgit, "opencode"))
--- a/packages/opencode/src/server/routes/session.ts
+++ b/packages/opencode/src/server/routes/session.ts
@@ -261,19 +261,13 @@ export const SessionRoutes = lazy(() =>
          sessionID: z.string(),
        }),
      ),
-      validator(
-        "query",
-        z.object({
-          directory: z.string().optional(),
-        }),
-      ),
      validator(
        "json",
        z.object({
          title: z.string().optional(),
          time: z
            .object({
-              archived: z.number().nullable().optional(),
+              archived: z.number().optional(),
            })
            .optional(),
        }),
@@ -286,8 +280,8 @@ export const SessionRoutes = lazy(() =>
        if (updates.title !== undefined) {
          session = await Session.setTitle({ sessionID, title: updates.title })
        }
-        if (updates.time !== undefined && "archived" in updates.time) {
-          session = await Session.setArchived({ sessionID, time: updates.time.archived ?? undefined })
+        if (updates.time?.archived !== undefined) {
+          session = await Session.setArchived({ sessionID, time: updates.time.archived })
        }

        return c.json(session)
--- a/packages/opencode/src/session/index.ts
+++ b/packages/opencode/src/session/index.ts
@@ -10,7 +10,7 @@ import { Flag } from "../flag/flag"
 import { Identifier } from "../id/id"
 import { Installation } from "../installation"

-import { Database, NotFoundError, eq, and, or, gte, isNull, isNotNull, desc, like, inArray, lt } from "../storage/db"
+import { Database, NotFoundError, eq, and, or, gte, isNull, desc, like, inArray, lt } from "../storage/db"
 import type { SQL } from "../storage/db"
 import { SessionTable, MessageTable, PartTable } from "./session.sql"
 import { ProjectTable } from "../project/project.sql"
@@ -401,7 +401,7 @@ export namespace Session {
      return Database.use((db) => {
        const row = db
          .update(SessionTable)
-          .set({ time_archived: input.time ?? null })
+          .set({ time_archived: input.time })
          .where(eq(SessionTable.id, input.sessionID))
          .returning()
          .get()
@@ -599,9 +599,6 @@ export namespace Session {
    if (input?.search) {
      conditions.push(like(SessionTable.title, `%${input.search}%`))
    }
-    if (input?.archived) {
-      conditions.push(isNotNull(SessionTable.time_archived))
-    }
    if (!input?.archived) {
      conditions.push(isNull(SessionTable.time_archived))
    }
--- a/packages/opencode/src/session/processor.ts
+++ b/packages/opencode/src/session/processor.ts
@@ -15,17 +15,11 @@ import { Config } from "@/config/config"
 import { SessionCompaction } from "./compaction"
 import { PermissionNext } from "@/permission/next"
 import { Question } from "@/question"
-import { NotFoundError } from "@/storage/db"
+
 export namespace SessionProcessor {
  const DOOM_LOOP_THRESHOLD = 3
  const log = Log.create({ service: "session.processor" })

-  const stale = (error: unknown) => {
-    if (NotFoundError.isInstance(error)) return true
-    if (error instanceof Error && error.message.includes("FOREIGN KEY constraint failed")) return true
-    return false
-  }
-
  export type Info = Awaited<ReturnType<typeof create>>
  export type Result = Awaited<ReturnType<Info["process"]>>

@@ -357,10 +351,6 @@ export namespace SessionProcessor {
              if (needsCompaction) break
            }
          } catch (e: any) {
-            if (stale(e)) {
-              SessionStatus.set(input.sessionID, { type: "idle" })
-              return "stop"
-            }
            log.error("process", {
              error: e,
              stack: JSON.stringify(e.stack),
@@ -394,47 +384,39 @@ export namespace SessionProcessor {
              SessionStatus.set(input.sessionID, { type: "idle" })
            }
          }
-          try {
-            if (snapshot) {
-              const patch = await Snapshot.patch(snapshot)
-              if (patch.files.length) {
-                await Session.updatePart({
-                  id: Identifier.ascending("part"),
-                  messageID: input.assistantMessage.id,
-                  sessionID: input.sessionID,
-                  type: "patch",
-                  hash: patch.hash,
-                  files: patch.files,
-                })
-              }
-              snapshot = undefined
+          if (snapshot) {
+            const patch = await Snapshot.patch(snapshot)
+            if (patch.files.length) {
+              await Session.updatePart({
+                id: Identifier.ascending("part"),
+                messageID: input.assistantMessage.id,
+                sessionID: input.sessionID,
+                type: "patch",
+                hash: patch.hash,
+                files: patch.files,
+              })
            }
-            const p = await MessageV2.parts(input.assistantMessage.id)
-            for (const part of p) {
-              if (part.type === "tool" && part.state.status !== "completed" && part.state.status !== "error") {
-                await Session.updatePart({
-                  ...part,
-                  state: {
-                    ...part.state,
-                    status: "error",
-                    error: "Tool execution aborted",
-                    time: {
-                      start: Date.now(),
-                      end: Date.now(),
-                    },
-                  },
-                })
-              }
-            }
-            input.assistantMessage.time.completed = Date.now()
-            await Session.updateMessage(input.assistantMessage)
-          } catch (e) {
-            if (stale(e)) {
-              SessionStatus.set(input.sessionID, { type: "idle" })
-              return "stop"
-            }
-            throw e
+            snapshot = undefined
          }
+          const p = await MessageV2.parts(input.assistantMessage.id)
+          for (const part of p) {
+            if (part.type === "tool" && part.state.status !== "completed" && part.state.status !== "error") {
+              await Session.updatePart({
+                ...part,
+                state: {
+                  ...part.state,
+                  status: "error",
+                  error: "Tool execution aborted",
+                  time: {
+                    start: Date.now(),
+                    end: Date.now(),
+                  },
+                },
+              })
+            }
+          }
+          input.assistantMessage.time.completed = Date.now()
+          await Session.updateMessage(input.assistantMessage)
          if (needsCompaction) return "compact"
          if (blocked) return "stop"
          if (input.assistantMessage.error) return "stop"
--- a/packages/opencode/src/session/prompt.ts
+++ b/packages/opencode/src/session/prompt.ts
@@ -37,9 +37,8 @@ import { SessionSummary } from "./summary"
 import { NamedError } from "@opencode-ai/util/error"
 import { fn } from "@/util/fn"
 import { SessionProcessor } from "./processor"
-import { NotFoundError } from "@/storage/db"
-import { Tool } from "@/tool/tool"
 import { TaskTool } from "@/tool/task"
+import { Tool } from "@/tool/tool"
 import { PermissionNext } from "@/permission/next"
 import { SessionStatus } from "./status"
 import { LLM } from "./llm"
@@ -292,7 +291,6 @@ export namespace SessionPrompt {

    let step = 0
    const session = await Session.get(sessionID)
-    let reply: MessageV2.Assistant | undefined
    while (true) {
      SessionStatus.set(sessionID, { type: "busy" })
      log.info("loop", { step, sessionID })
@@ -317,7 +315,11 @@ export namespace SessionPrompt {
      }

      if (!lastUser) throw new Error("No user message found in stream. This should never happen.")
-      if (shouldExitLoop(lastUser, lastAssistant)) {
+      if (
+        lastAssistant?.finish &&
+        !["tool-calls", "unknown"].includes(lastAssistant.finish) &&
+        lastUser.id < lastAssistant.id
+      ) {
        log.info("exiting loop", { sessionID })
        break
      }
@@ -592,7 +594,6 @@ export namespace SessionPrompt {
        model,
        abort,
      })
-      reply = processor.message
      using _ = defer(() => InstructionPrompt.clear(processor.message.id))

      // Check if user explicitly invoked an agent via @ in this turn
@@ -721,12 +722,6 @@ export namespace SessionPrompt {
      }
      return item
    }
-    if (reply) {
-      return {
-        info: reply,
-        parts: await MessageV2.parts(reply.id).catch(() => []),
-      }
-    }
    throw new Error("Impossible")
  })

@@ -1960,23 +1955,7 @@ NOTE: At any point in time through this workflow you should feel free to ask the
      if (!cleaned) return

      const title = cleaned.length > 100 ? cleaned.substring(0, 97) + "..." : cleaned
-      try {
-        return await Session.setTitle({ sessionID: input.session.id, title })
-      } catch (error) {
-        if (NotFoundError.isInstance(error)) return
-        throw error
-      }
+      return Session.setTitle({ sessionID: input.session.id, title })
    }
  }
-
-  /** @internal Exported for testing — determines whether the prompt loop should exit */
-  export function shouldExitLoop(
-    lastUser: MessageV2.User | undefined,
-    lastAssistant: MessageV2.Assistant | undefined,
-  ): boolean {
-    if (!lastUser) return false
-    if (!lastAssistant?.finish) return false
-    if (["tool-calls", "unknown"].includes(lastAssistant.finish)) return false
-    return lastAssistant.parentID === lastUser.id
-  }
 }
--- a/packages/opencode/src/session/prompt/codex_header.txt
+++ b/packages/opencode/src/session/prompt/codex_header.txt
@@ -5,7 +5,7 @@ You are an interactive CLI tool that helps users with software engineering tasks
 ## Editing constraints
 - Default to ASCII when editing or creating files. Only introduce non-ASCII or other Unicode characters when there is a clear justification and the file already uses them.
 - Only add comments if they are necessary to make a non-obvious block easier to understand.
- Prefer the edit tool for file edits. Use apply_patch only when it is available and clearly a better fit. Do not use apply_patch for changes that are auto-generated (i.e. generating package.json or running a lint or format command like gofmt) or when scripting is more efficient (such as search and replacing a string across a codebase).
+- Try to use apply_patch for single file edits, but it is fine to explore other options to make the edit if it does not work well. Do not use apply_patch for changes that are auto-generated (i.e. generating package.json or running a lint or format command like gofmt) or when scripting is more efficient (such as search and replacing a string across a codebase).

 ## Tool usage
 - Prefer specialized tools over shell for file operations:
--- a/packages/opencode/src/session/summary.ts
+++ b/packages/opencode/src/session/summary.ts
@@ -7,7 +7,6 @@ import { Identifier } from "@/id/id"
 import { Snapshot } from "@/snapshot"

 import { Storage } from "@/storage/storage"
-import { NotFoundError } from "@/storage/db"
 import { Bus } from "@/bus"

 export namespace SessionSummary {
@@ -83,19 +82,14 @@ export namespace SessionSummary {

  async function summarizeSession(input: { sessionID: string; messages: MessageV2.WithParts[] }) {
    const diffs = await computeDiff({ messages: input.messages })
-    try {
-      await Session.setSummary({
-        sessionID: input.sessionID,
-        summary: {
-          additions: diffs.reduce((sum, x) => sum + x.additions, 0),
-          deletions: diffs.reduce((sum, x) => sum + x.deletions, 0),
-          files: diffs.length,
-        },
-      })
-    } catch (error) {
-      if (NotFoundError.isInstance(error)) return
-      throw error
-    }
+    await Session.setSummary({
+      sessionID: input.sessionID,
+      summary: {
+        additions: diffs.reduce((sum, x) => sum + x.additions, 0),
+        deletions: diffs.reduce((sum, x) => sum + x.deletions, 0),
+        files: diffs.length,
+      },
+    })
    await Storage.write(["session_diff", input.sessionID], diffs)
    Bus.publish(Session.Event.Diff, {
      sessionID: input.sessionID,
@@ -107,20 +101,14 @@ export namespace SessionSummary {
    const messages = input.messages.filter(
      (m) => m.info.id === input.messageID || (m.info.role === "assistant" && m.info.parentID === input.messageID),
    )
-    const msgWithParts = messages.find((m) => m.info.id === input.messageID)
-    if (!msgWithParts || msgWithParts.info.role !== "user") return
-    const userMsg = msgWithParts.info
+    const msgWithParts = messages.find((m) => m.info.id === input.messageID)!
+    const userMsg = msgWithParts.info as MessageV2.User
    const diffs = await computeDiff({ messages })
    userMsg.summary = {
      ...userMsg.summary,
      diffs,
    }
-    try {
-      await Session.updateMessage(userMsg)
-    } catch (error) {
-      if (NotFoundError.isInstance(error)) return
-      throw error
-    }
+    await Session.updateMessage(userMsg)
  }

  export const diff = fn(
--- a/packages/opencode/src/shell/shell.ts
+++ b/packages/opencode/src/shell/shell.ts
@@ -1,10 +1,8 @@
 import { Flag } from "@/flag/flag"
 import { lazy } from "@/util/lazy"
 import { Filesystem } from "@/util/filesystem"
-import { which } from "@/util/which"
 import path from "path"
 import { spawn, type ChildProcess } from "child_process"
-import { setTimeout as sleep } from "node:timers/promises"

 const SIGKILL_TIMEOUT_MS = 200

@@ -24,13 +22,13 @@ export namespace Shell {

    try {
      process.kill(-pid, "SIGTERM")
-      await sleep(SIGKILL_TIMEOUT_MS)
+      await Bun.sleep(SIGKILL_TIMEOUT_MS)
      if (!opts?.exited?.()) {
        process.kill(-pid, "SIGKILL")
      }
    } catch (_e) {
      proc.kill("SIGTERM")
-      await sleep(SIGKILL_TIMEOUT_MS)
+      await Bun.sleep(SIGKILL_TIMEOUT_MS)
      if (!opts?.exited?.()) {
        proc.kill("SIGKILL")
      }
@@ -41,7 +39,7 @@ export namespace Shell {
  function fallback() {
    if (process.platform === "win32") {
      if (Flag.OPENCODE_GIT_BASH_PATH) return Flag.OPENCODE_GIT_BASH_PATH
-      const git = which("git")
+      const git = Bun.which("git")
      if (git) {
        // git.exe is typically at: C:\Program Files\Git\cmd\git.exe
        // bash.exe is at: C:\Program Files\Git\bin\bash.exe
@@ -51,7 +49,7 @@ export namespace Shell {
      return process.env.COMSPEC || "cmd.exe"
    }
    if (process.platform === "darwin") return "/bin/zsh"
-    const bash = which("bash")
+    const bash = Bun.which("bash")
    if (bash) return bash
    return "/bin/sh"
  }
--- a/packages/opencode/src/storage/db.ts
+++ b/packages/opencode/src/storage/db.ts
@@ -11,6 +11,7 @@ import { NamedError } from "@opencode-ai/util/error"
 import z from "zod"
 import path from "path"
 import { readFileSync, readdirSync, existsSync } from "fs"
+import * as schema from "./schema"

 declare const OPENCODE_MIGRATIONS: { sql: string; timestamp: number }[] | undefined

@@ -25,8 +26,10 @@ const log = Log.create({ service: "db" })

 export namespace Database {
  export const Path = path.join(Global.Path.data, "opencode.db")
+  type Schema = typeof schema
+  export type Transaction = SQLiteTransaction<"sync", void, Schema>

-  type Client = SQLiteBunDatabase
+  type Client = SQLiteBunDatabase<Schema>

  type Journal = { sql: string; timestamp: number }[]

@@ -79,7 +82,7 @@ export namespace Database {
    sqlite.run("PRAGMA foreign_keys = ON")
    sqlite.run("PRAGMA wal_checkpoint(PASSIVE)")

-    const db = drizzle({ client: sqlite })
+    const db = drizzle({ client: sqlite, schema })

    // Apply schema migrations
    const entries =
@@ -105,7 +108,7 @@ export namespace Database {
    Client.reset()
  }

-  export type TxOrDb = SQLiteTransaction<"sync", void, any, any> | Client
+  export type TxOrDb = Transaction | Client

  const ctx = Context.create<{
    tx: TxOrDb
--- a/packages/opencode/src/storage/schema.ts
+++ b/packages/opencode/src/storage/schema.ts
@@ -0,0 +1,5 @@
+export { ControlAccountTable } from "../control/control.sql"
+export { SessionTable, MessageTable, PartTable, TodoTable, PermissionTable } from "../session/session.sql"
+export { SessionShareTable } from "../share/share.sql"
+export { ProjectTable } from "../project/project.sql"
+export { WorkspaceTable } from "../control-plane/workspace.sql"
--- a/packages/opencode/src/tool/edit.ts
+++ b/packages/opencode/src/tool/edit.ts
@@ -5,7 +5,6 @@

 import z from "zod"
 import * as path from "path"
-import * as fs from "fs/promises"
 import { Tool } from "./tool"
 import { LSP } from "../lsp"
 import { createTwoFilesPatch, diffLines } from "diff"
@@ -18,158 +17,72 @@ import { Filesystem } from "../util/filesystem"
 import { Instance } from "../project/instance"
 import { Snapshot } from "@/snapshot"
 import { assertExternalDirectory } from "./external-directory"
-import {
-  HashlineEdit,
-  applyHashlineEdits,
-  hashlineOnlyCreates,
-  parseHashlineContent,
-  serializeHashlineContent,
-} from "./hashline"
-import { Config } from "../config/config"

 const MAX_DIAGNOSTICS_PER_FILE = 20
-const LEGACY_EDIT_MODE = "legacy"
-const HASHLINE_EDIT_MODE = "hashline"
-
-const LegacyEditParams = z.object({
-  filePath: z.string().describe("The absolute path to the file to modify"),
-  oldString: z.string().describe("The text to replace"),
-  newString: z.string().describe("The text to replace it with (must be different from oldString)"),
-  replaceAll: z.boolean().optional().describe("Replace all occurrences of oldString (default false)"),
-})
-
-const HashlineEditParams = z.object({
-  filePath: z.string().describe("The absolute path to the file to modify"),
-  edits: z.array(HashlineEdit).default([]),
-  delete: z.boolean().optional(),
-  rename: z.string().optional(),
-})
-
-const EditParams = z
-  .object({
-    filePath: z.string().describe("The absolute path to the file to modify"),
-    oldString: z.string().optional().describe("The text to replace"),
-    newString: z.string().optional().describe("The text to replace it with (must be different from oldString)"),
-    replaceAll: z.boolean().optional().describe("Replace all occurrences of oldString (default false)"),
-    edits: z.array(HashlineEdit).optional(),
-    delete: z.boolean().optional(),
-    rename: z.string().optional(),
-  })
-  .strict()
-  .superRefine((value, ctx) => {
-    const legacy = value.oldString !== undefined || value.newString !== undefined || value.replaceAll !== undefined
-    const hashline = value.edits !== undefined || value.delete !== undefined || value.rename !== undefined
-
-    if (legacy && hashline) {
-      ctx.addIssue({
-        code: "custom",
-        message: "Do not mix legacy (oldString/newString) and hashline (edits/delete/rename) fields.",
-      })
-      return
-    }
-
-    if (!legacy && !hashline) {
-      ctx.addIssue({
-        code: "custom",
-        message: "Provide either legacy fields (oldString/newString) or hashline fields (edits/delete/rename).",
-      })
-      return
-    }
-
-    if (legacy) {
-      if (value.oldString === undefined || value.newString === undefined) {
-        ctx.addIssue({
-          code: "custom",
-          message: "Legacy payload requires both oldString and newString.",
-        })
-      }
-      return
-    }
-
-    if (value.edits === undefined) {
-      ctx.addIssue({
-        code: "custom",
-        message: "Hashline payload requires edits (use [] when only delete is intended).",
-      })
-    }
-  })
-
-type LegacyEditParams = z.infer<typeof LegacyEditParams>
-type HashlineEditParams = z.infer<typeof HashlineEditParams>
-type EditParams = z.infer<typeof EditParams>

 function normalizeLineEndings(text: string): string {
  return text.replaceAll("\r\n", "\n")
 }

-function isLegacyParams(params: EditParams): params is LegacyEditParams {
-  return params.oldString !== undefined || params.newString !== undefined || params.replaceAll !== undefined
-}
-
-async function withLocks(paths: string[], fn: () => Promise<void>) {
-  const unique = Array.from(new Set(paths)).sort((a, b) => a.localeCompare(b))
-  const recurse = async (idx: number): Promise<void> => {
-    if (idx >= unique.length) return fn()
-    await FileTime.withLock(unique[idx], () => recurse(idx + 1))
-  }
-  await recurse(0)
-}
-
-function createFileDiff(file: string, before: string, after: string): Snapshot.FileDiff {
-  const filediff: Snapshot.FileDiff = {
-    file,
-    before,
-    after,
-    additions: 0,
-    deletions: 0,
-  }
-  for (const change of diffLines(before, after)) {
-    if (change.added) filediff.additions += change.count || 0
-    if (change.removed) filediff.deletions += change.count || 0
-  }
-  return filediff
-}
-
-async function diagnosticsOutput(filePath: string, output: string) {
-  await LSP.touchFile(filePath, true)
-  const diagnostics = await LSP.diagnostics()
-  const normalizedFilePath = Filesystem.normalizePath(filePath)
-  const issues = diagnostics[normalizedFilePath] ?? []
-  const errors = issues.filter((item) => item.severity === 1)
-  if (errors.length === 0) {
-    return {
-      output,
-      diagnostics,
+export const EditTool = Tool.define("edit", {
+  description: DESCRIPTION,
+  parameters: z.object({
+    filePath: z.string().describe("The absolute path to the file to modify"),
+    oldString: z.string().describe("The text to replace"),
+    newString: z.string().describe("The text to replace it with (must be different from oldString)"),
+    replaceAll: z.boolean().optional().describe("Replace all occurrences of oldString (default false)"),
+  }),
+  async execute(params, ctx) {
+    if (!params.filePath) {
+      throw new Error("filePath is required")
    }
-  }

-  const limited = errors.slice(0, MAX_DIAGNOSTICS_PER_FILE)
-  const suffix =
-    errors.length > MAX_DIAGNOSTICS_PER_FILE ? `\n... and ${errors.length - MAX_DIAGNOSTICS_PER_FILE} more` : ""
-  return {
-    output:
-      output +
-      `\n\nLSP errors detected in this file, please fix:\n<diagnostics file="${filePath}">\n${limited.map(LSP.Diagnostic.pretty).join("\n")}${suffix}\n</diagnostics>`,
-    diagnostics,
-  }
-}
+    if (params.oldString === params.newString) {
+      throw new Error("No changes to apply: oldString and newString are identical.")
+    }

-async function executeLegacy(params: LegacyEditParams, ctx: Tool.Context) {
-  if (params.oldString === params.newString) {
-    throw new Error("No changes to apply: oldString and newString are identical.")
-  }
+    const filePath = path.isAbsolute(params.filePath) ? params.filePath : path.join(Instance.directory, params.filePath)
+    await assertExternalDirectory(ctx, filePath)

-  const filePath = path.isAbsolute(params.filePath) ? params.filePath : path.join(Instance.directory, params.filePath)
-  await assertExternalDirectory(ctx, filePath)
+    let diff = ""
+    let contentOld = ""
+    let contentNew = ""
+    await FileTime.withLock(filePath, async () => {
+      if (params.oldString === "") {
+        const existed = await Filesystem.exists(filePath)
+        contentNew = params.newString
+        diff = trimDiff(createTwoFilesPatch(filePath, filePath, contentOld, contentNew))
+        await ctx.ask({
+          permission: "edit",
+          patterns: [path.relative(Instance.worktree, filePath)],
+          always: ["*"],
+          metadata: {
+            filepath: filePath,
+            diff,
+          },
+        })
+        await Filesystem.write(filePath, params.newString)
+        await Bus.publish(File.Event.Edited, {
+          file: filePath,
+        })
+        await Bus.publish(FileWatcher.Event.Updated, {
+          file: filePath,
+          event: existed ? "change" : "add",
+        })
+        FileTime.read(ctx.sessionID, filePath)
+        return
+      }

-  let diff = ""
-  let contentOld = ""
-  let contentNew = ""
-  await FileTime.withLock(filePath, async () => {
-    if (params.oldString === "") {
-      const existed = await Filesystem.exists(filePath)
-      contentNew = params.newString
-      diff = trimDiff(createTwoFilesPatch(filePath, filePath, contentOld, contentNew))
+      const stats = Filesystem.stat(filePath)
+      if (!stats) throw new Error(`File ${filePath} not found`)
+      if (stats.isDirectory()) throw new Error(`Path is a directory, not a file: ${filePath}`)
+      await FileTime.assert(ctx.sessionID, filePath)
+      contentOld = await Filesystem.readText(filePath)
+      contentNew = replace(contentOld, params.oldString, params.newString, params.replaceAll)
+
+      diff = trimDiff(
+        createTwoFilesPatch(filePath, filePath, normalizeLineEndings(contentOld), normalizeLineEndings(contentNew)),
+      )
      await ctx.ask({
        permission: "edit",
        patterns: [path.relative(Instance.worktree, filePath)],
@@ -179,319 +92,64 @@ async function executeLegacy(params: LegacyEditParams, ctx: Tool.Context) {
          diff,
        },
      })
-      await Filesystem.write(filePath, params.newString)
+
+      await Filesystem.write(filePath, contentNew)
      await Bus.publish(File.Event.Edited, {
        file: filePath,
      })
      await Bus.publish(FileWatcher.Event.Updated, {
        file: filePath,
-        event: existed ? "change" : "add",
+        event: "change",
      })
+      contentNew = await Filesystem.readText(filePath)
+      diff = trimDiff(
+        createTwoFilesPatch(filePath, filePath, normalizeLineEndings(contentOld), normalizeLineEndings(contentNew)),
+      )
      FileTime.read(ctx.sessionID, filePath)
-      return
+    })
+
+    const filediff: Snapshot.FileDiff = {
+      file: filePath,
+      before: contentOld,
+      after: contentNew,
+      additions: 0,
+      deletions: 0,
+    }
+    for (const change of diffLines(contentOld, contentNew)) {
+      if (change.added) filediff.additions += change.count || 0
+      if (change.removed) filediff.deletions += change.count || 0
    }

-    const stats = Filesystem.stat(filePath)
-    if (!stats) throw new Error(`File ${filePath} not found`)
-    if (stats.isDirectory()) throw new Error(`Path is a directory, not a file: ${filePath}`)
-    await FileTime.assert(ctx.sessionID, filePath)
-    contentOld = await Filesystem.readText(filePath)
-    contentNew = replace(contentOld, params.oldString, params.newString, params.replaceAll)
-
-    diff = trimDiff(
-      createTwoFilesPatch(filePath, filePath, normalizeLineEndings(contentOld), normalizeLineEndings(contentNew)),
-    )
-    await ctx.ask({
-      permission: "edit",
-      patterns: [path.relative(Instance.worktree, filePath)],
-      always: ["*"],
+    ctx.metadata({
      metadata: {
-        filepath: filePath,
        diff,
+        filediff,
+        diagnostics: {},
      },
    })

-    await Filesystem.write(filePath, contentNew)
-    await Bus.publish(File.Event.Edited, {
-      file: filePath,
-    })
-    await Bus.publish(FileWatcher.Event.Updated, {
-      file: filePath,
-      event: "change",
-    })
-    contentNew = await Filesystem.readText(filePath)
-    diff = trimDiff(
-      createTwoFilesPatch(filePath, filePath, normalizeLineEndings(contentOld), normalizeLineEndings(contentNew)),
-    )
-    FileTime.read(ctx.sessionID, filePath)
-  })
-
-  const filediff = createFileDiff(filePath, contentOld, contentNew)
-
-  ctx.metadata({
-    metadata: {
-      diff,
-      filediff,
-      diagnostics: {},
-      edit_mode: LEGACY_EDIT_MODE,
-    },
-  })
-
-  const result = await diagnosticsOutput(filePath, "Edit applied successfully.")
-
-  return {
-    metadata: {
-      diagnostics: result.diagnostics,
-      diff,
-      filediff,
-      edit_mode: LEGACY_EDIT_MODE,
-    },
-    title: `${path.relative(Instance.worktree, filePath)}`,
-    output: result.output,
-  }
-}
-
-async function executeHashline(
-  params: HashlineEditParams,
-  ctx: Tool.Context,
-  autocorrect: boolean,
-  aggressiveAutocorrect: boolean,
-) {
-  const sourcePath = path.isAbsolute(params.filePath) ? params.filePath : path.join(Instance.directory, params.filePath)
-  const targetPath = params.rename
-    ? path.isAbsolute(params.rename)
-      ? params.rename
-      : path.join(Instance.directory, params.rename)
-    : sourcePath
-
-  await assertExternalDirectory(ctx, sourcePath)
-  if (params.rename) {
-    await assertExternalDirectory(ctx, targetPath)
-  }
-
-  if (params.delete && params.edits.length > 0) {
-    throw new Error("delete=true cannot be combined with edits")
-  }
-  if (params.delete && params.rename) {
-    throw new Error("delete=true cannot be combined with rename")
-  }
-
-  let diff = ""
-  let before = ""
-  let after = ""
-  let noop = 0
-  let deleted = false
-  let changed = false
-  let diagnostics: Awaited<ReturnType<typeof LSP.diagnostics>> = {}
-  const paths = [sourcePath, targetPath]
-  await withLocks(paths, async () => {
-    const sourceStat = Filesystem.stat(sourcePath)
-    if (sourceStat?.isDirectory()) throw new Error(`Path is a directory, not a file: ${sourcePath}`)
-    const exists = Boolean(sourceStat)
-
-    if (params.rename && !exists) {
-      throw new Error("rename requires an existing source file")
+    let output = "Edit applied successfully."
+    await LSP.touchFile(filePath, true)
+    const diagnostics = await LSP.diagnostics()
+    const normalizedFilePath = Filesystem.normalizePath(filePath)
+    const issues = diagnostics[normalizedFilePath] ?? []
+    const errors = issues.filter((item) => item.severity === 1)
+    if (errors.length > 0) {
+      const limited = errors.slice(0, MAX_DIAGNOSTICS_PER_FILE)
+      const suffix =
+        errors.length > MAX_DIAGNOSTICS_PER_FILE ? `\n... and ${errors.length - MAX_DIAGNOSTICS_PER_FILE} more` : ""
+      output += `\n\nLSP errors detected in this file, please fix:\n<diagnostics file="${filePath}">\n${limited.map(LSP.Diagnostic.pretty).join("\n")}${suffix}\n</diagnostics>`
    }

-    if (params.delete) {
-      if (!exists) {
-        noop = 1
-        return
-      }
-      await FileTime.assert(ctx.sessionID, sourcePath)
-      before = await Filesystem.readText(sourcePath)
-      after = ""
-      diff = trimDiff(
-        createTwoFilesPatch(sourcePath, sourcePath, normalizeLineEndings(before), normalizeLineEndings(after)),
-      )
-      await ctx.ask({
-        permission: "edit",
-        patterns: [path.relative(Instance.worktree, sourcePath)],
-        always: ["*"],
-        metadata: {
-          filepath: sourcePath,
-          diff,
-        },
-      })
-      await fs.rm(sourcePath, { force: true })
-      await Bus.publish(File.Event.Edited, {
-        file: sourcePath,
-      })
-      await Bus.publish(FileWatcher.Event.Updated, {
-        file: sourcePath,
-        event: "unlink",
-      })
-      deleted = true
-      changed = true
-      return
-    }
-
-    if (!exists && !hashlineOnlyCreates(params.edits)) {
-      throw new Error("Missing file can only be created with append/prepend hashline edits")
-    }
-    if (exists) {
-      await FileTime.assert(ctx.sessionID, sourcePath)
-    }
-
-    const parsed = exists
-      ? parseHashlineContent(await Filesystem.readBytes(sourcePath))
-      : {
-          bom: false,
-          eol: "\n",
-          trailing: false,
-          lines: [] as string[],
-          text: "",
-          raw: "",
-        }
-
-    before = parsed.raw
-    const next = applyHashlineEdits({
-      lines: parsed.lines,
-      trailing: parsed.trailing,
-      edits: params.edits,
-      autocorrect,
-      aggressiveAutocorrect,
-    })
-    const output = serializeHashlineContent({
-      lines: next.lines,
-      trailing: next.trailing,
-      eol: parsed.eol,
-      bom: parsed.bom,
-    })
-    after = output.text
-
-    const noContentChange = before === after && sourcePath === targetPath
-    if (noContentChange) {
-      noop = 1
-      diff = trimDiff(
-        createTwoFilesPatch(sourcePath, sourcePath, normalizeLineEndings(before), normalizeLineEndings(after)),
-      )
-      return
-    }
-
-    diff = trimDiff(
-      createTwoFilesPatch(sourcePath, targetPath, normalizeLineEndings(before), normalizeLineEndings(after)),
-    )
-    const patterns = [path.relative(Instance.worktree, sourcePath)]
-    if (sourcePath !== targetPath) patterns.push(path.relative(Instance.worktree, targetPath))
-    await ctx.ask({
-      permission: "edit",
-      patterns: Array.from(new Set(patterns)),
-      always: ["*"],
-      metadata: {
-        filepath: sourcePath,
-        diff,
-      },
-    })
-
-    if (sourcePath === targetPath) {
-      await Filesystem.write(sourcePath, output.bytes)
-      await Bus.publish(File.Event.Edited, {
-        file: sourcePath,
-      })
-      await Bus.publish(FileWatcher.Event.Updated, {
-        file: sourcePath,
-        event: exists ? "change" : "add",
-      })
-      FileTime.read(ctx.sessionID, sourcePath)
-      changed = true
-      return
-    }
-
-    const targetExists = await Filesystem.exists(targetPath)
-    await Filesystem.write(targetPath, output.bytes)
-    await fs.rm(sourcePath, { force: true })
-    await Bus.publish(File.Event.Edited, {
-      file: sourcePath,
-    })
-    await Bus.publish(File.Event.Edited, {
-      file: targetPath,
-    })
-    await Bus.publish(FileWatcher.Event.Updated, {
-      file: sourcePath,
-      event: "unlink",
-    })
-    await Bus.publish(FileWatcher.Event.Updated, {
-      file: targetPath,
-      event: targetExists ? "change" : "add",
-    })
-    FileTime.read(ctx.sessionID, targetPath)
-    changed = true
-  })
-
-  const file = deleted ? sourcePath : targetPath
-  const filediff = createFileDiff(file, before, after)
-  ctx.metadata({
-    metadata: {
-      diff,
-      filediff,
-      diagnostics,
-      edit_mode: HASHLINE_EDIT_MODE,
-      noop,
-    },
-  })
-
-  if (!deleted && (changed || noop === 0)) {
-    const result = await diagnosticsOutput(targetPath, noop > 0 ? "No changes applied." : "Edit applied successfully.")
-    diagnostics = result.diagnostics
    return {
      metadata: {
        diagnostics,
        diff,
        filediff,
-        edit_mode: HASHLINE_EDIT_MODE,
-        noop,
      },
-      title: `${path.relative(Instance.worktree, targetPath)}`,
-      output: result.output,
+      title: `${path.relative(Instance.worktree, filePath)}`,
+      output,
    }
-  }
-
-  return {
-    metadata: {
-      diagnostics,
-      diff,
-      filediff,
-      edit_mode: HASHLINE_EDIT_MODE,
-      noop,
-    },
-    title: `${path.relative(Instance.worktree, file)}`,
-    output: deleted ? "Edit applied successfully." : "No changes applied.",
-  }
-}
-
-export const EditTool = Tool.define("edit", {
-  description: DESCRIPTION,
-  parameters: EditParams,
-  async execute(params, ctx) {
-    if (!params.filePath) {
-      throw new Error("filePath is required")
-    }
-
-    if (isLegacyParams(params)) {
-      return executeLegacy(params, ctx)
-    }
-
-    const config = await Config.get()
-    if (config.experimental?.hashline_edit === false) {
-      throw new Error(
-        "Hashline edit payload is disabled. Set experimental.hashline_edit to true to use hashline operations.",
-      )
-    }
-
-    const hashlineParams: HashlineEditParams = {
-      filePath: params.filePath,
-      edits: params.edits ?? [],
-      delete: params.delete,
-      rename: params.rename,
-    }
-
-    return executeHashline(
-      hashlineParams,
-      ctx,
-      config.experimental?.hashline_autocorrect !== false || Bun.env.OPENCODE_HL_AUTOCORRECT === "1",
-      Bun.env.OPENCODE_HL_AUTOCORRECT === "1",
-    )
  },
 })

--- a/packages/opencode/src/tool/edit.txt
+++ b/packages/opencode/src/tool/edit.txt
@@ -1,33 +1,10 @@
-Performs file edits with two supported payload schemas.
+Performs exact string replacements in files. 

 Usage:
- You must use your `Read` tool at least once before editing an existing file. This tool rejects stale edits when file contents changed since read.
+- You must use your `Read` tool at least once in the conversation before editing. This tool will error if you attempt an edit without reading the file. 
+- When editing text from Read tool output, ensure you preserve the exact indentation (tabs/spaces) as it appears AFTER the line number prefix. The line number prefix format is: line number + colon + space (e.g., `1: `). Everything after that space is the actual file content to match. Never include any part of the line number prefix in the oldString or newString.
 - ALWAYS prefer editing existing files in the codebase. NEVER write new files unless explicitly required.
 - Only use emojis if the user explicitly requests it. Avoid adding emojis to files unless asked.
-
-Legacy schema (always supported):
- `{ filePath, oldString, newString, replaceAll? }`
- Exact replacement only.
- The edit fails if `oldString` is not found.
- The edit fails if `oldString` matches multiple locations and `replaceAll` is not true.
- Use `replaceAll: true` for global replacements.
-
-Hashline schema (default behavior):
- `{ filePath, edits, delete?, rename? }`
- Do not mix legacy fields (`oldString/newString/replaceAll`) with hashline fields (`edits/delete/rename`) in one call.
- Use strict anchor references from `Read` output: `LINE#ID`.
- Hashline mode can be turned off with `experimental.hashline_edit: false`.
- Autocorrect cleanup is on by default and can be turned off with `experimental.hashline_autocorrect: false`.
- Default autocorrect only strips copied `LINE#ID:`/`>>>` prefixes; set `OPENCODE_HL_AUTOCORRECT=1` to opt into heavier cleanup heuristics.
- When `Read` returns `LINE#ID:<content>`, prefer hashline operations.
- Operations:
-  - `set_line { line, text }`
-  - `replace_lines { start_line, end_line, text }`
-  - `insert_after { line, text }`
-  - `insert_before { line, text }`
-  - `insert_between { after_line, before_line, text }`
-  - `append { text }`
-  - `prepend { text }`
-  - `replace { old_text, new_text, all? }`
- In hashline mode, provide the exact `LINE#ID` anchors from the latest `Read` result. Mismatched anchors are rejected and should be retried with the returned `retry with` anchors.
- Fallback guidance: GPT-family models can use `apply_patch` as fallback; non-GPT models should fallback to legacy `oldString/newString` payloads.
+- The edit will FAIL if `oldString` is not found in the file with an error "oldString not found in content".
+- The edit will FAIL if `oldString` is found multiple times in the file with an error "Found multiple matches for oldString. Provide more surrounding lines in oldString to identify the correct match." Either provide a larger string with more surrounding context to make it unique or use `replaceAll` to change every instance of `oldString`. 
+- Use `replaceAll` for replacing and renaming strings across the file. This parameter is useful if you want to rename a variable for instance.
--- a/packages/opencode/src/tool/grep.ts
+++ b/packages/opencode/src/tool/grep.ts
@@ -9,8 +9,6 @@ import DESCRIPTION from "./grep.txt"
 import { Instance } from "../project/instance"
 import path from "path"
 import { assertExternalDirectory } from "./external-directory"
-import { Config } from "../config/config"
-import { hashlineRef } from "./hashline"

 const MAX_LINE_LENGTH = 2000

@@ -118,7 +116,6 @@ export const GrepTool = Tool.define("grep", {
    }

    const totalMatches = matches.length
-    const useHashline = (await Config.get()).experimental?.hashline_edit !== false
    const outputLines = [`Found ${totalMatches} matches${truncated ? ` (showing first ${limit})` : ""}`]

    let currentFile = ""
@@ -132,11 +129,7 @@ export const GrepTool = Tool.define("grep", {
      }
      const truncatedLineText =
        match.lineText.length > MAX_LINE_LENGTH ? match.lineText.substring(0, MAX_LINE_LENGTH) + "..." : match.lineText
-      if (useHashline) {
-        outputLines.push(`  ${hashlineRef(match.lineNum, match.lineText)}:${truncatedLineText}`)
-      } else {
-        outputLines.push(`  Line ${match.lineNum}: ${truncatedLineText}`)
-      }
+      outputLines.push(`  Line ${match.lineNum}: ${truncatedLineText}`)
    }

    if (truncated) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Shoubhit Dash	d8c3d8d884	highlight clickable inline tools	2026-03-05 19:07:49 +05:30
Shoubhit Dash	66ba6c4d34	Merge branch 'dev' into fix/subagent-navigation-inline-click	2026-03-05 19:05:30 +05:30
ismeth	07348d14a2	fix(app): preserve question dock state across session switches (#16173 )	2026-03-05 19:05:16 +05:30
Shoubhit Dash	c4c3a020f9	refactor(tui): use renderer.hasSelection guards	2026-03-04 17:39:44 +05:30
Shoubhit Dash	002b81cd67	fix(tui): keep inline task navigation and fix nested child jump	2026-03-04 17:06:10 +05:30