From 10841f25f5df3a329526604e72e5f672d42e1a34 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 01:59:04 -0400
Subject: [PATCH 01/17] ade code: per-provider Chat/CLI interface choice
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add an Interface: Chat | CLI row to the ADE Code (Ink TUI) new-chat and
/model setup panes, matching the desktop/iOS switcher. Chat creates an
SDK chat via chat.createSession (all providers, including Claude — a new
path); CLI starts a tracked provider CLI terminal via start_cli_session
(claude/codex/cursor/droid/opencode). Defaults to Chat; editable on a
draft, read-only once a session exists.

- Generalize the Claude-only terminal paths: startClaudeTerminalSession
  -> provider-generic startCliTerminalSession; listTerminalSessions and
  remoteLauncher.isTerminalSessionLaunchable now surface every tracked
  CLI provider (not just Claude); terminalSessionToChatSummary, the
  Ctrl+T control gates, TerminalPane status ("<PROVIDER> CONTROL"),
  FooterControls label, and grid control hint are provider-neutral.
- Submit-path branching: focused terminal -> pty send/resume (Claude
  keeps its double-enter, other providers use pty.sendToSession); draft
  Interface=CLI -> tracked CLI terminal; otherwise chat.createSession.
- Interface-aware Cursor model gating in the model picker (Chat disables
  CLI-only Cursor models and vice versa).
- Keep Claude-only chrome: closed-transcript stripping, naming hint, and
  /model + /effort writing into a running Claude terminal.
- Tests: provider-generic start payloads (5 providers), trackedCli
  provider resolution, listTerminalSessions/isTerminalSessionLaunchable
  inclusivity, interface-row state machine + defaulting, Cursor gating.
- Docs: ADE Code README chat-setup + terminal-control sections.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../src/tuiClient/__tests__/adeApi.test.ts    | 118 ++++++++-
 .../tuiClient/__tests__/interfaceMode.test.ts |  87 +++++++
 .../src/tuiClient/__tests__/planMode.test.ts  |   1 +
 .../__tests__/remoteLauncher.test.ts          |  27 +++
 apps/ade-cli/src/tuiClient/adeApi.ts          |  58 +++--
 apps/ade-cli/src/tuiClient/app.tsx            | 226 +++++++++++++-----
 .../tuiClient/components/FooterControls.tsx   |  10 +-
 .../ModelPicker/ModelPickerPane.tsx           |   1 +
 .../ModelPicker/modelPickerLayout.test.ts     |  30 +++
 .../ModelPicker/modelPickerLayout.ts          |  23 +-
 .../src/tuiClient/components/RightPane.tsx    |   3 +
 .../src/tuiClient/components/TerminalPane.tsx |  50 +++-
 apps/ade-cli/src/tuiClient/remoteLauncher.ts  |  18 +-
 apps/ade-cli/src/tuiClient/types.ts           |  11 +
 docs/features/ade-code/README.md              |  26 +-
 15 files changed, 587 insertions(+), 102 deletions(-)
 create mode 100644 apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts

diff --git a/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts b/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts
index efd02b60b..8b963937b 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts
@@ -3,7 +3,8 @@ import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { AgentChatEventEnvelope } from "../../../../desktop/src/shared/types/chat";
-import { archiveChatSession, cancelSteerMessage, createChatSession, DEFAULT_CODEX_REASONING_EFFORT, deleteChatSession, dispatchSteerMessage, discoverProjectSlashCommands, editSteerMessage, getAvailableModels, getChatHistoryPage, latestGoal, latestTokenStats, listChatSessions, listLaneDiffStats, listPrsByLane, listTerminalSessions, resumeTerminalSession, runDefaultLaneSetup, sendChatMessage, signalTerminal, startClaudeTerminalSession, steerChatMessage, unarchiveChatSession } from "../adeApi";
+import { archiveChatSession, cancelSteerMessage, createChatSession, DEFAULT_CODEX_REASONING_EFFORT, deleteChatSession, dispatchSteerMessage, discoverProjectSlashCommands, editSteerMessage, getAvailableModels, getChatHistoryPage, latestGoal, latestTokenStats, listChatSessions, listLaneDiffStats, listPrsByLane, listTerminalSessions, resumeTerminalSession, runDefaultLaneSetup, sendChatMessage, signalTerminal, startCliTerminalSession, steerChatMessage, trackedCliTerminalProvider, unarchiveChatSession } from "../adeApi";
+import type { ChatTerminalSession } from "../../../../desktop/src/shared/types/sessions";
 import type { AdeCodeConnection } from "../types";
 
 const tmpPaths: string[] = [];
@@ -530,7 +531,7 @@ describe("createChatSession", () => {
   });
 });
 
-describe("startClaudeTerminalSession", () => {
+describe("startCliTerminalSession", () => {
   it("passes Claude model reasoning and permission controls to start_cli_session", async () => {
     const calls: Array<{ name: string; args?: Record<string, unknown> }> = [];
     const connection = {
@@ -544,8 +545,9 @@ describe("startClaudeTerminalSession", () => {
       },
     } as unknown as AdeCodeConnection;
 
-    await startClaudeTerminalSession({
+    await startCliTerminalSession({
       connection,
+      provider: "claude",
       laneId: "lane-1",
       title: "Claude smoke",
       model: "anthropic/claude-sonnet-4-6",
@@ -574,6 +576,101 @@ describe("startClaudeTerminalSession", () => {
       },
     ]);
   });
+
+  it("launches every provider CLI with its selected provider + fast mode", async () => {
+    for (const provider of ["codex", "cursor", "droid", "opencode", "claude"] as const) {
+      const calls: Array<{ name: string; args?: Record<string, unknown> }> = [];
+      const connection = {
+        tool: async (name: string, args?: Record<string, unknown>) => {
+          calls.push({ name, args });
+          return { sessionId: `term-${provider}`, terminalId: `term-${provider}`, session: null };
+        },
+      } as unknown as AdeCodeConnection;
+
+      await startCliTerminalSession({
+        connection,
+        provider,
+        laneId: "lane-1",
+        model: `${provider}-model`,
+        reasoningEffort: "medium",
+        fastMode: true,
+        permissionMode: "default",
+        initialInput: "Go",
+        cols: 120,
+        rows: 36,
+      });
+
+      expect(calls).toHaveLength(1);
+      expect(calls[0]!.name).toBe("start_cli_session");
+      expect(calls[0]!.args).toEqual(expect.objectContaining({
+        laneId: "lane-1",
+        provider,
+        model: `${provider}-model`,
+        reasoningEffort: "medium",
+        fastMode: true,
+        permissionMode: "default",
+        initialInput: "Go",
+        tracked: true,
+      }));
+    }
+  });
+
+  it("omits fastMode from the payload when the caller does not set it", async () => {
+    const calls: Array<{ name: string; args?: Record<string, unknown> }> = [];
+    const connection = {
+      tool: async (name: string, args?: Record<string, unknown>) => {
+        calls.push({ name, args });
+        return { sessionId: "term-1", terminalId: "term-1", session: null };
+      },
+    } as unknown as AdeCodeConnection;
+
+    await startCliTerminalSession({ connection, provider: "codex", laneId: "lane-1", cols: 100, rows: 28 });
+
+    expect(calls[0]!.args).not.toHaveProperty("fastMode");
+  });
+});
+
+describe("trackedCliTerminalProvider", () => {
+  const session = (overrides: Partial<ChatTerminalSession>): ChatTerminalSession => ({
+    terminalId: "t",
+    ptyId: null,
+    chatSessionId: null,
+    laneId: "lane-1",
+    laneName: "lane-1",
+    title: "t",
+    goal: null,
+    toolType: "shell",
+    status: "running",
+    runtimeState: "running",
+    active: true,
+    startedAt: "2026-01-01T00:00:00.000Z",
+    endedAt: null,
+    exitCode: null,
+    pid: null,
+    resumeCommand: null,
+    resumeMetadata: null,
+    lastOutputPreview: null,
+    summary: null,
+    ...overrides,
+  });
+
+  it("resolves each tracked CLI tool type to its provider", () => {
+    expect(trackedCliTerminalProvider(session({ toolType: "claude" }))).toBe("claude");
+    expect(trackedCliTerminalProvider(session({ toolType: "claude-orchestrated" }))).toBe("claude");
+    expect(trackedCliTerminalProvider(session({ toolType: "codex" }))).toBe("codex");
+    expect(trackedCliTerminalProvider(session({ toolType: "cursor-cli" }))).toBe("cursor");
+    expect(trackedCliTerminalProvider(session({ toolType: "droid" }))).toBe("droid");
+    expect(trackedCliTerminalProvider(session({ toolType: "opencode" }))).toBe("opencode");
+  });
+
+  it("falls back to resume metadata / command, and rejects plain shells", () => {
+    expect(trackedCliTerminalProvider(session({
+      toolType: "shell",
+      resumeMetadata: { provider: "codex", targetKind: "session", targetId: "x", launch: {} },
+    }))).toBe("codex");
+    expect(trackedCliTerminalProvider(session({ toolType: "shell", resumeCommand: "claude --resume s1" }))).toBe("claude");
+    expect(trackedCliTerminalProvider(session({ toolType: "shell" }))).toBeNull();
+  });
 });
 
 describe("resumeTerminalSession", () => {
@@ -664,7 +761,7 @@ describe("signalTerminal", () => {
 });
 
 describe("listTerminalSessions", () => {
-  it("only exposes Claude Code CLI sessions in the ADE code TUI", async () => {
+  it("exposes every tracked provider CLI session but hides chat-backed terminals and plain shells", async () => {
     const calls: Array<{ domain: string; action: string; args?: Record<string, unknown> }> = [];
     const sessions = [
       { terminalId: "claude-1", toolType: "claude" },
@@ -674,9 +771,14 @@ describe("listTerminalSessions", () => {
       { terminalId: "codex-1", toolType: "codex" },
       { terminalId: "codex-orch-1", toolType: "codex-orchestrated" },
       { terminalId: "legacy-codex-1", toolType: "shell", resumeMetadata: { provider: "codex" } },
+      { terminalId: "cursor-cli-1", toolType: "cursor-cli" },
+      { terminalId: "droid-1", toolType: "droid" },
+      { terminalId: "opencode-1", toolType: "opencode" },
+      // Chat-backed terminals (surface via the chat session list) + plain shells stay hidden.
       { terminalId: "chat-claude-1", toolType: "claude-chat" },
       { terminalId: "chat-codex-1", toolType: "codex-chat" },
-      { terminalId: "cursor-1", toolType: "cursor" },
+      { terminalId: "chat-cursor-1", toolType: "cursor" },
+      { terminalId: "chat-droid-1", toolType: "droid-chat" },
       { terminalId: "shell-1", toolType: "shell" },
     ];
     const connection = {
@@ -700,6 +802,12 @@ describe("listTerminalSessions", () => {
       "claude-orch-1",
       "legacy-claude-1",
       "legacy-claude-command-1",
+      "codex-1",
+      "codex-orch-1",
+      "legacy-codex-1",
+      "cursor-cli-1",
+      "droid-1",
+      "opencode-1",
     ]);
   });
 });
diff --git a/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts b/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts
new file mode 100644
index 000000000..ba7e6f627
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts
@@ -0,0 +1,87 @@
+import { describe, expect, it } from "vitest";
+import { buildSetupRows, cliProviderForModelStateProvider } from "../app";
+import type { AdeCodeInterfaceMode, AdeCodeModelState } from "../types";
+
+function baseModelState(overrides: Partial<AdeCodeModelState> = {}): AdeCodeModelState {
+  return {
+    provider: "codex",
+    interfaceMode: "chat",
+    model: "gpt-5.5",
+    modelId: null,
+    displayName: "GPT-5.5",
+    reasoningEffort: "medium",
+    fastMode: false,
+    permissionMode: "default",
+    interactionMode: "default",
+    claudePermissionMode: "default",
+    codexApprovalPolicy: "on-request",
+    codexSandbox: "workspace-write",
+    codexConfigSource: "flags",
+    opencodePermissionMode: "edit",
+    droidPermissionMode: "auto-low",
+    cursorModeId: "agent",
+    cursorAvailableModeIds: [],
+    cursorConfigValues: {},
+    ...overrides,
+  };
+}
+
+function setupRows(interfaceMode: AdeCodeInterfaceMode, interfaceEditable: boolean) {
+  return buildSetupRows({
+    modelState: baseModelState({ interfaceMode }),
+    models: [],
+    includeRefresh: false,
+    includeApply: true,
+    interfaceMode,
+    interfaceEditable,
+  });
+}
+
+// Mirror of the toggle the setup-row handler applies (Chat ↔ CLI).
+function toggleInterface(mode: AdeCodeInterfaceMode): AdeCodeInterfaceMode {
+  return mode === "cli" ? "chat" : "cli";
+}
+
+describe("cliProviderForModelStateProvider", () => {
+  it("maps each of the five CLI providers to itself", () => {
+    for (const provider of ["claude", "codex", "cursor", "droid", "opencode"] as const) {
+      expect(cliProviderForModelStateProvider(provider)).toBe(provider);
+    }
+  });
+
+  it("returns null for providers with no tracked CLI (Ollama / LM Studio)", () => {
+    expect(cliProviderForModelStateProvider("ollama")).toBeNull();
+    expect(cliProviderForModelStateProvider("lmstudio")).toBeNull();
+  });
+});
+
+describe("buildSetupRows interface row", () => {
+  it("inserts the Interface row immediately after Provider", () => {
+    const rows = setupRows("chat", true);
+    const kinds = rows.map((row) => row.kind);
+    expect(kinds[0]).toBe("provider");
+    expect(kinds[1]).toBe("interface");
+  });
+
+  it("defaults to Chat and reflects the current interface value", () => {
+    expect(setupRows("chat", true).find((row) => row.kind === "interface")?.value).toBe("Chat");
+    expect(setupRows("cli", true).find((row) => row.kind === "interface")?.value).toBe("CLI");
+  });
+
+  it("is editable/cyclable for a draft and read-only once a session exists", () => {
+    const draftRow = setupRows("chat", true).find((row) => row.kind === "interface")!;
+    expect(draftRow.disabled).toBeFalsy();
+    expect(draftRow.cyclable).toBe(true);
+    expect(draftRow.detail).toBe("Chat · CLI");
+
+    const committedRow = setupRows("cli", false).find((row) => row.kind === "interface")!;
+    expect(committedRow.disabled).toBe(true);
+    expect(committedRow.cyclable).toBe(false);
+    expect(committedRow.detail).toBe("tracked CLI session");
+  });
+
+  it("toggles Chat ↔ CLI (two-value state machine)", () => {
+    expect(toggleInterface("chat")).toBe("cli");
+    expect(toggleInterface("cli")).toBe("chat");
+  });
+});
diff --git a/apps/ade-cli/src/tuiClient/__tests__/planMode.test.ts b/apps/ade-cli/src/tuiClient/__tests__/planMode.test.ts
index d0b83032d..be21a3789 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/planMode.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/planMode.test.ts
@@ -6,6 +6,7 @@ import type { AdeCodeModelState } from "../types";
 function baseModelState(overrides: Partial<AdeCodeModelState>): AdeCodeModelState {
   return {
     provider: "codex",
+    interfaceMode: "chat",
     model: "gpt-5.5",
     modelId: null,
     displayName: "GPT-5.5",
diff --git a/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts b/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts
index 8322bf2cb..af8ecedc7 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts
@@ -209,6 +209,33 @@ describe("ade code remote launcher", () => {
     ]);
   });
 
+  it("lists every tracked provider CLI terminal and hides chat-backed terminals", async () => {
+    const terminals = [
+      { terminalId: "claude-cli", toolType: "claude", laneId: "lane-1", title: "Claude", status: "running", runtimeState: "idle", startedAt: "2026-06-15T00:00:00.000Z" },
+      { terminalId: "codex-cli", toolType: "codex", laneId: "lane-1", title: "Codex", status: "running", runtimeState: "idle", startedAt: "2026-06-15T00:00:00.000Z" },
+      { terminalId: "cursor-cli", toolType: "cursor-cli", laneId: "lane-1", title: "Cursor", status: "running", runtimeState: "idle", startedAt: "2026-06-15T00:00:00.000Z" },
+      { terminalId: "droid-cli", toolType: "droid", laneId: "lane-1", title: "Droid", status: "running", runtimeState: "idle", startedAt: "2026-06-15T00:00:00.000Z" },
+      { terminalId: "opencode-cli", toolType: "opencode", laneId: "lane-1", title: "OpenCode", status: "running", runtimeState: "idle", startedAt: "2026-06-15T00:00:00.000Z" },
+      // Chat-backed + plain shell must NOT be launchable.
+      { terminalId: "codex-chat", toolType: "codex-chat", laneId: "lane-1", title: "Codex chat", status: "running", runtimeState: "idle", startedAt: "2026-06-15T00:00:00.000Z" },
+      { terminalId: "cursor-chat", toolType: "cursor", laneId: "lane-1", title: "Cursor chat", status: "running", runtimeState: "idle", startedAt: "2026-06-15T00:00:00.000Z" },
+      { terminalId: "raw-shell", toolType: "shell", laneId: "lane-1", title: "Shell", status: "running", runtimeState: "idle", startedAt: "2026-06-15T00:00:00.000Z" },
+    ];
+    const client = {
+      request: async (_method: string, params: unknown) => {
+        const args = (params as { arguments?: { domain?: string; action?: string } }).arguments;
+        if (args?.domain === "chat" && args.action === "listSessions") return { result: [] };
+        if (args?.domain === "terminal" && args.action === "list") return { result: terminals };
+        throw new Error("unexpected request");
+      },
+    };
+
+    const result = await listRemoteSessions(client as never, "project-1");
+    expect(result.map((session) => session.sessionId).sort()).toEqual(
+      ["claude-cli", "codex-cli", "cursor-cli", "droid-cli", "opencode-cli"].sort(),
+    );
+  });
+
   it("does not register a new remote project when a path query is ambiguous", async () => {
     const request = vi.fn();
     await expect(selectProject(request as never, [
diff --git a/apps/ade-cli/src/tuiClient/adeApi.ts b/apps/ade-cli/src/tuiClient/adeApi.ts
index 6184e547a..2b39528b5 100644
--- a/apps/ade-cli/src/tuiClient/adeApi.ts
+++ b/apps/ade-cli/src/tuiClient/adeApi.ts
@@ -57,7 +57,7 @@ import type {
   TerminalSessionSummary,
 } from "../../../desktop/src/shared/types";
 import { discoverAllProjectSlashCommands } from "../../../desktop/src/main/services/chat/projectSlashCommandDiscovery";
-import type { AdeCodeConnection, ChatHistorySnapshot, CreatedChat, NavigateRequest, NavigateResult } from "./types";
+import type { AdeCodeConnection, AdeCodeProvider, ChatHistorySnapshot, CreatedChat, NavigateRequest, NavigateResult } from "./types";
 
 export const DEFAULT_CODEX_REASONING_EFFORT = "low";
 
@@ -154,17 +154,35 @@ const CHAT_BACKED_TERMINAL_TOOL_TYPES = new Set([
   "droid-chat",
 ]);
 
-const RESUMABLE_TERMINAL_TOOL_TYPES = new Set([
+const TRACKED_CLI_PROVIDERS = new Set<AdeCodeProvider>([
   "claude",
-  "claude-orchestrated",
+  "codex",
+  "cursor",
+  "droid",
+  "opencode",
 ]);
 
-function isClaudeTerminalSession(session: ChatTerminalSession): boolean {
+/**
+ * Resolve the CLI provider backing a tracked terminal session (or null when the
+ * session is not a provider CLI — e.g. a plain shell). Recognizes provider
+ * metadata, the tool-type prefix, and, as a legacy fallback, a `claude` resume
+ * command. Mirrors terminalSessionResumeProvider in app.tsx and
+ * isTerminalSessionLaunchable in remoteLauncher.ts. Callers should exclude
+ * CHAT_BACKED_TERMINAL_TOOL_TYPES first (a "cursor" chat vs a "cursor-cli" CLI).
+ */
+export function trackedCliTerminalProvider(session: ChatTerminalSession): AdeCodeProvider | null {
+  const metaProvider = session.resumeMetadata?.provider;
+  if (metaProvider && TRACKED_CLI_PROVIDERS.has(metaProvider as AdeCodeProvider)) {
+    return metaProvider as AdeCodeProvider;
+  }
   const toolType = session.toolType ?? "";
-  if (RESUMABLE_TERMINAL_TOOL_TYPES.has(toolType)) return true;
-  if (session.resumeMetadata?.provider === "claude") return true;
+  if (toolType.startsWith("codex")) return "codex";
+  if (toolType.startsWith("cursor")) return "cursor";
+  if (toolType.startsWith("droid")) return "droid";
+  if (toolType.startsWith("opencode")) return "opencode";
+  if (toolType.startsWith("claude")) return "claude";
   const resumeCommand = typeof session.resumeCommand === "string" ? session.resumeCommand.trim().toLowerCase() : "";
-  return Boolean(resumeCommand && /\bclaude\b/.test(resumeCommand));
+  return resumeCommand && /\bclaude\b/.test(resumeCommand) ? "claude" : null;
 }
 
 export async function listTerminalSessions(
@@ -178,7 +196,7 @@ export async function listTerminalSessions(
   return sessions.filter((session) => {
     const toolType = session.toolType ?? "";
     if (CHAT_BACKED_TERMINAL_TOOL_TYPES.has(toolType)) return false;
-    return isClaudeTerminalSession(session);
+    return trackedCliTerminalProvider(session) !== null;
   });
 }
 
@@ -216,8 +234,11 @@ export async function signalTerminal(
   await connection.action("terminal", "signal", { terminalId, signal });
 }
 
-export type StartClaudeTerminalSessionResult = {
-  provider: "claude";
+/** The five provider CLIs the TUI can launch as a tracked terminal session. */
+export type CliTerminalProvider = Extract<AdeCodeProvider, "claude" | "codex" | "cursor" | "droid" | "opencode">;
+
+export type StartCliTerminalSessionResult = {
+  provider: string;
   laneId: string;
   title: string;
   permissionMode: AgentChatPermissionMode;
@@ -261,25 +282,34 @@ export function normalizeChatTerminalSession(
   return terminalSummaryToChatSession(session);
 }
 
-export async function startClaudeTerminalSession(args: {
+/**
+ * Start a tracked provider CLI terminal via the shared `start_cli_session`
+ * action. The runtime owns launch-command construction (including Cursor CLI
+ * model-variant resolution) and title/goal derivation, so the TUI only forwards
+ * the picked provider/model/reasoning/permission plus the pane dimensions.
+ */
+export async function startCliTerminalSession(args: {
   connection: AdeCodeConnection;
+  provider: CliTerminalProvider;
   laneId: string;
   title?: string | null;
   model?: string | null;
   reasoningEffort?: string | null;
+  fastMode?: boolean;
   permissionMode?: AgentChatPermissionMode | null;
   initialInput?: string | null;
   cols: number;
   rows: number;
-}): Promise<StartClaudeTerminalSessionResult> {
-  const result = await args.connection.tool<Omit<StartClaudeTerminalSessionResult, "session"> & {
+}): Promise<StartCliTerminalSessionResult> {
+  const result = await args.connection.tool<Omit<StartCliTerminalSessionResult, "session"> & {
     session: ChatTerminalSession | TerminalSessionSummary | null;
   }>("start_cli_session", {
     laneId: args.laneId,
-    provider: "claude",
+    provider: args.provider,
     title: args.title ?? undefined,
     model: args.model ?? undefined,
     reasoningEffort: args.reasoningEffort ?? undefined,
+    ...(args.fastMode !== undefined ? { fastMode: args.fastMode } : {}),
     permissionMode: args.permissionMode ?? "default",
     initialInput: args.initialInput ?? undefined,
     cols: args.cols,
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index bc0ed48ec..dc864af50 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -14,7 +14,7 @@ import {
   resolveProviderGroupForModel,
   type ModelProviderGroup,
 } from "../../../desktop/src/shared/modelRegistry";
-import { resolveClaudeCliModelForLaunch } from "../../../desktop/src/shared/cliLaunch";
+import { LAUNCH_PROFILE_TITLE, LAUNCH_PROFILE_TOOL_TYPE, resolveClaudeCliModelForLaunch } from "../../../desktop/src/shared/cliLaunch";
 import { CURSOR_AVAILABLE_MODE_IDS, CURSOR_MODE_LABELS } from "../../../desktop/src/shared/cursorModes";
 import { getAgentSkillRootCandidates } from "../../../desktop/src/shared/agentSkillRoots";
 import type {
@@ -30,6 +30,7 @@ import type {
 	  AgentChatModelCatalogRefreshProvider,
 	  AgentChatModelInfo,
   AgentChatPermissionMode,
+  AgentChatProvider,
   AgentChatSession,
   AgentChatSessionSummary,
   AgentChatSlashCommand,
@@ -91,7 +92,8 @@ import {
   sendToTerminalSession,
   signalTerminal,
   setClaudeOutputStyle,
-  startClaudeTerminalSession,
+  startCliTerminalSession,
+  type CliTerminalProvider,
   steerChatMessage,
   tagChat,
   unarchiveChatSession,
@@ -240,6 +242,7 @@ import {
 import type {
   AdeCodeConnection,
   AdeCodeProvider,
+  AdeCodeInterfaceMode,
   AdeCodeModelState,
   LocalNotice,
   MentionSuggestion,
@@ -710,15 +713,24 @@ export function shouldToggleLatestFailedLineOnBlankEnter(args: {
     && !isTerminalSessionResumable(args.activeTerminalSession);
 }
 
+/** Narrow a terminal session's derived provider to an AgentChatProvider (CLI terminals are always one of the five). */
+function terminalSummaryProvider(session: ChatTerminalSession): AgentChatProvider {
+  const provider = terminalSessionProvider(session);
+  return provider === "codex" || provider === "claude" || provider === "opencode" || provider === "cursor" || provider === "droid"
+    ? provider
+    : "claude";
+}
+
 function terminalSessionToChatSummary(session: ChatTerminalSession): AgentChatSessionSummary {
   const status: AgentChatSessionSummary["status"] = session.status === "running"
     ? session.runtimeState === "idle" ? "idle" : "active"
     : "ended";
+  const provider = terminalSummaryProvider(session);
   return {
     sessionId: session.terminalId,
     laneId: session.laneId,
-    provider: "claude",
-    model: "claude-code",
+    provider,
+    model: provider === "claude" ? "claude-code" : `${provider} cli`,
     title: session.title,
     goal: session.goal,
     permissionMode: session.resumeMetadata?.launch?.permissionMode ?? "default",
@@ -862,6 +874,7 @@ function initialModelState(): AdeCodeModelState {
   const descriptor = getDefaultModelDescriptor("codex");
   return {
     provider: "codex",
+    interfaceMode: "chat",
     model: descriptor?.providerModelId ?? "gpt-5.5",
     modelId: descriptor?.id ?? null,
     displayName: descriptor?.displayName ?? "GPT-5.5",
@@ -903,6 +916,17 @@ function runtimeProviderForUiProvider(provider: AdeCodeProvider): ModelProviderG
   return provider === "ollama" || provider === "lmstudio" ? "opencode" : provider;
 }
 
+/**
+ * The provider CLI a modelState provider launches as, or null when it has no
+ * tracked CLI (Ollama / LM Studio are OpenCode-backed chat only). Gates the
+ * Interface=CLI launch path.
+ */
+export function cliProviderForModelStateProvider(provider: AdeCodeProvider): CliTerminalProvider | null {
+  return provider === "claude" || provider === "codex" || provider === "cursor" || provider === "droid" || provider === "opencode"
+    ? provider
+    : null;
+}
+
 function claudeModelCommandKey(state: AdeCodeModelState, terminalId: string | null | undefined): string {
   return JSON.stringify([
     terminalId ?? null,
@@ -1681,13 +1705,17 @@ function formatDoctorReport(args: {
   ].join("\n");
 }
 
-function buildSetupRows(args: {
+export function buildSetupRows(args: {
   modelState: AdeCodeModelState;
   models: AgentChatModelInfo[];
   includeRefresh: boolean;
   includeApply: boolean;
   outputStyle?: string | null;
   outputStyleEditable?: boolean;
+  /** Draft/next-chat interface (Chat = SDK chat, CLI = tracked terminal). */
+  interfaceMode: AdeCodeInterfaceMode;
+  /** False once a session exists — interface is fixed by the session type. */
+  interfaceEditable: boolean;
 }): SetupPaneRow[] {
   const efforts = modelReasoningEfforts(args.modelState, args.models);
   const descriptor = args.modelState.modelId ? getModelById(args.modelState.modelId) : undefined;
@@ -1702,6 +1730,18 @@ function buildSetupRows(args: {
       value: providerLabel(args.modelState.provider),
       cyclable: true,
     },
+    {
+      kind: "interface",
+      label: "Interface",
+      value: args.interfaceMode === "cli" ? "CLI" : "Chat",
+      detail: args.interfaceEditable
+        ? "Chat · CLI"
+        : args.interfaceMode === "cli"
+          ? "tracked CLI session"
+          : "ADE chat",
+      disabled: !args.interfaceEditable,
+      cyclable: args.interfaceEditable,
+    },
     {
       kind: "model",
       label: "Model",
@@ -3742,13 +3782,19 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       return { ...prev, [activeSessionId]: events };
     });
   }, [activeSessionId, events]);
-  const claudeTerminalControlAvailable = Boolean(
+  // Ctrl+T raw control works for any running tracked provider CLI (Claude,
+  // Codex, Cursor, Droid, OpenCode) — activeTerminalProvider is non-null for
+  // every terminal the TUI surfaces.
+  const terminalControlAvailable = Boolean(
     activeTerminalSession
       && activeTerminalSession.status === "running"
-      && activeTerminalProvider === "claude",
+      && activeTerminalProvider,
   );
-  const claudeTerminalControlActive = claudeTerminalControlAvailable
+  const terminalControlActive = terminalControlAvailable
     && attachedTerminalId === activeTerminalSession?.terminalId;
+  // Provider-neutral label for the terminal control chrome (footer "^t <label>",
+  // "<LABEL> CONTROL", pane status). Falls back to Claude for legacy sessions.
+  const terminalControlLabel = providerLabel(activeTerminalProvider ?? "claude");
   const activeCommandProvider = activeTerminalProvider ?? activeSession?.provider ?? modelState.provider;
   // Once a chat has any sent user message, the provider is locked — swapping
   // mid-thread breaks runtime continuity. Derived from events; persists across reloads.
@@ -4469,9 +4515,21 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       includeApply: true,
       outputStyle: "default",
       outputStyleEditable: false,
+      // Draft: the interface is the user's editable Chat/CLI choice.
+      interfaceMode: modelState.interfaceMode,
+      interfaceEditable: true,
     }),
     [modelState, models],
   );
+  // Once a session exists the interface is fixed by its type (a CLI terminal is
+  // active ⇒ CLI; an SDK chat ⇒ Chat). With no committed session yet (/model on a
+  // bare lane), it stays the editable draft pick.
+  const modelSetupInterfaceMode: AdeCodeInterfaceMode = activeTerminalSession
+    ? "cli"
+    : activeSession?.sessionId
+      ? "chat"
+      : modelState.interfaceMode;
+  const modelSetupInterfaceEditable = !activeSession?.sessionId && !activeTerminalSession;
   const modelSetupRows = useMemo(
     () => buildSetupRows({
       modelState,
@@ -4480,8 +4538,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       includeApply: true,
       outputStyle: activeSession?.claudeOutputStyle ?? "default",
       outputStyleEditable: Boolean(activeSession?.sessionId && activeSession.provider === "claude"),
+      interfaceMode: modelSetupInterfaceMode,
+      interfaceEditable: modelSetupInterfaceEditable,
     }),
-    [activeSession?.claudeOutputStyle, activeSession?.provider, activeSession?.sessionId, modelState, models],
+    [activeSession?.claudeOutputStyle, activeSession?.provider, activeSession?.sessionId, modelSetupInterfaceEditable, modelSetupInterfaceMode, modelState, models],
   );
   const modelPickerRows = useMemo(() => {
     if (!providerLocked) return modelSetupRows;
@@ -4552,8 +4612,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     // In grid view the per-tile resize effect owns terminal sizing; running the
     // single-view (full-pane) resize too would thrash the PTY between sizes.
     if (gridViewActive) return;
-    const cols = clampTerminalPaneCols(claudeTerminalControlActive ? terminalPaneWidth - 2 : terminalPaneWidth);
-    const terminalRows = claudeTerminalControlActive
+    const cols = clampTerminalPaneCols(terminalControlActive ? terminalPaneWidth - 2 : terminalPaneWidth);
+    const terminalRows = terminalControlActive
       ? Math.max(4, chatRowBudget - 1)
       : claudeTerminalRowsForPane(chatRowBudget);
     let cancelled = false;
@@ -4568,11 +4628,11 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     return () => {
       cancelled = true;
     };
-  }, [activeTerminalSession, chatRowBudget, claudeTerminalControlActive, connection, gridViewActive, terminalPaneWidth]);
+  }, [activeTerminalSession, chatRowBudget, terminalControlActive, connection, gridViewActive, terminalPaneWidth]);
 
   useEffect(() => {
     if (!connection || !activeTerminalSession) return;
-    if (claudeTerminalControlActive) return;
+    if (terminalControlActive) return;
     // Single-view preview poll only; grid tiles follow live pty chunks instead.
     if (gridViewActive) return;
     let cancelled = false;
@@ -4595,7 +4655,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       cancelled = true;
       clearInterval(timer);
     };
-  }, [activeTerminalSession, chatRowBudget, claudeTerminalControlActive, connection, gridViewActive, terminalPaneWidth]);
+  }, [activeTerminalSession, chatRowBudget, terminalControlActive, connection, gridViewActive, terminalPaneWidth]);
 
   useEffect(() => {
     modelStateRef.current = modelState;
@@ -6181,6 +6241,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         activeModelId: modelState.modelId,
         activeReasoningEffort: modelState.reasoningEffort,
         aiStatus,
+        interfaceMode: modelState.interfaceMode,
 		        query: "",
 	        selection: { kind: "provider", provider },
 	        providerTabKey: null,
@@ -6832,7 +6893,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     const activeLane = activeLaneIdRef.current;
     return terminalSessionsRef.current.find((session) => (
       session.status === "running"
-      && terminalSessionProvider(session) === "claude"
+      && terminalSessionProvider(session) != null
       && (!activeLane || session.laneId === activeLane)
     )) ?? null;
   }, []);
@@ -7625,8 +7686,11 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     laneId: string;
     title?: string | null;
     session?: ChatTerminalSession | null;
+    /** Provider of the tracked CLI, so the optimistic fallback row derives correctly. */
+    provider?: CliTerminalProvider;
   }) => {
     const lane = lanesById[args.laneId] ?? null;
+    const provider = args.provider ?? "claude";
     const optimistic: ChatTerminalSession = args.session
       ? { ...args.session, terminalId: args.sessionId }
       : {
@@ -7635,8 +7699,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         chatSessionId: null,
         laneId: args.laneId,
         laneName: lane?.name ?? args.laneId,
-        title: args.title?.trim() || "Claude Code",
-        toolType: "claude",
+        title: args.title?.trim() || LAUNCH_PROFILE_TITLE[provider],
+        // Drives terminalSessionProvider until terminal.list backfills the row.
+        toolType: LAUNCH_PROFILE_TOOL_TYPE[provider],
         goal: null,
         status: "running",
         runtimeState: "running",
@@ -7663,15 +7728,29 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       const cols = clampTerminalPaneCols(terminalPaneWidth);
       const terminalRows = claudeTerminalRowsForPane(chatRowBudget);
       if (terminal.status === "running") {
-        await writeTerminal(conn, terminal.terminalId, encodeTerminalPromptSubmit(text));
-        // Claude Code occasionally leaves a programmatic `text + Enter` sitting
-        // in its prompt editor. New/resumed launches already send a delayed
-        // confirm Enter; do the same for live embedded sessions so submitting
-        // from ADE behaves like manually focusing Claude with Ctrl+T and
-        // pressing Enter.
-        await delay(CLAUDE_TERMINAL_SUBMIT_CONFIRM_DELAY_MS);
-        await writeTerminal(conn, terminal.terminalId, encodeTerminalPromptSubmitConfirm());
-        await delay(CLAUDE_TERMINAL_SUBMIT_REFRESH_DELAY_MS);
+        if (terminalSessionProvider(terminal) === "claude") {
+          await writeTerminal(conn, terminal.terminalId, encodeTerminalPromptSubmit(text));
+          // Claude Code occasionally leaves a programmatic `text + Enter` sitting
+          // in its prompt editor. New/resumed launches already send a delayed
+          // confirm Enter; do the same for live embedded sessions so submitting
+          // from ADE behaves like manually focusing Claude with Ctrl+T and
+          // pressing Enter.
+          await delay(CLAUDE_TERMINAL_SUBMIT_CONFIRM_DELAY_MS);
+          await writeTerminal(conn, terminal.terminalId, encodeTerminalPromptSubmitConfirm());
+          await delay(CLAUDE_TERMINAL_SUBMIT_REFRESH_DELAY_MS);
+          await refreshTerminalPreview(conn, terminal.terminalId);
+          return true;
+        }
+        // Other providers: ptyService.sendToSession owns provider-specific live
+        // input delivery + submit timing (Codex/Cursor paste delays, Cursor
+        // input-ready wait), so no Claude-style double-enter here.
+        await sendToTerminalSession({
+          connection: conn,
+          sessionId: terminal.terminalId,
+          text,
+          cols,
+          rows: terminalRows,
+        });
         await refreshTerminalPreview(conn, terminal.terminalId);
         return true;
       }
@@ -7730,10 +7809,15 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     return true;
   }, [chatRowBudget, refreshState, registerOptimisticTerminalSession, selectActiveSessionId, setDraftChatMode, showChatInfoAfterDraftCommit, terminalPaneWidth]);
 
-  const startClaudeTerminalForPrompt = useCallback(async (text: string): Promise<string | null> => {
+  const startCliTerminalForPrompt = useCallback(async (text: string): Promise<string | null> => {
     const conn = connectionRef.current;
     const laneId = activeLaneIdRef.current;
     if (!conn || !laneId) return null;
+    const provider = cliProviderForModelStateProvider(modelStateRef.current.provider);
+    if (!provider) {
+      addNotice(`${providerLabel(modelStateRef.current.provider)} has no CLI session — switch the interface to Chat.`, "error");
+      return null;
+    }
     const lane = lanes.find((entry) => entry.id === laneId) ?? null;
     const unavailableMessage = laneWorktreeUnavailableMessage(lane);
     if (unavailableMessage) {
@@ -7748,16 +7832,18 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     const normalized = { ...modelStateRef.current, ...applyProviderPermissionMode(modelStateRef.current) };
     const cols = clampTerminalPaneCols(terminalPaneWidth);
     const terminalRows = claudeTerminalRowsForPane(chatRowBudget);
-    const activeClaudeChat = activeSessionRef.current?.provider === "claude" ? activeSessionRef.current : null;
+    const activeProviderChat = activeSessionRef.current?.provider === provider ? activeSessionRef.current : null;
     const title = pendingNewChatTitleRef.current
-      ?? activeClaudeChat?.title
-      ?? "Claude Code";
-    const created = await startClaudeTerminalSession({
+      ?? activeProviderChat?.title
+      ?? LAUNCH_PROFILE_TITLE[provider];
+    const created = await startCliTerminalSession({
       connection: conn,
+      provider,
       laneId,
       title,
       model: normalized.modelId ?? normalized.model,
       reasoningEffort: normalized.reasoningEffort,
+      fastMode: normalized.fastMode,
       permissionMode: normalized.permissionMode,
       initialInput: text.trim() ? text : null,
       cols,
@@ -7771,8 +7857,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       laneId,
       title,
       session: created.session,
+      provider,
     });
-    if (!claudeAutoNamingHintShownRef.current) {
+    if (provider === "claude" && !claudeAutoNamingHintShownRef.current) {
       claudeAutoNamingHintShownRef.current = true;
       addNotice("Claude sessions auto-name in the background when enabled — toggle in ADE desktop → Settings → AI Features.", "info");
     }
@@ -9756,8 +9843,11 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         setSelectedMentions((prev) => prev.filter((mention) => !mention.attachment));
         return;
       }
-      if (!gridViewActiveRef.current && modelStateRef.current.provider === "claude") {
-        const terminalId = await startClaudeTerminalForPrompt(terminalPrompt || " ");
+      // Interface=CLI draft (any provider): create a tracked CLI terminal. Chat
+      // interface falls through to createChatSession (below) for all providers,
+      // including Claude. Grid view never spawns a new terminal from a submit.
+      if (!gridViewActiveRef.current && modelStateRef.current.interfaceMode === "cli") {
+        const terminalId = await startCliTerminalForPrompt(terminalPrompt || " ");
         if (terminalId) {
           setSelectedMentions((prev) => prev.filter((mention) => !mention.attachment));
         }
@@ -9781,7 +9871,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       }
       addNotice(message, "error");
     }
-  }, [activeCommandProvider, activeFormField, addNotice, answerPendingInput, clearChatPromptDraft, ensureActiveSession, formValues, interceptLocalSlashCommand, pendingApproval, resolvePendingApproval, resumeClosedTerminalSession, rightPane, runInlineCommand, runRightCommand, selectedMentions, sendOrSteerChatMessage, setChatScrollOffset, slashCommands, slashIndex, slashRows, startClaudeTerminalForPrompt, submitClaudePromptToTerminal, submitRightForm, submitSelectedPendingQuestion]);
+  }, [activeCommandProvider, activeFormField, addNotice, answerPendingInput, clearChatPromptDraft, ensureActiveSession, formValues, interceptLocalSlashCommand, pendingApproval, resolvePendingApproval, resumeClosedTerminalSession, rightPane, runInlineCommand, runRightCommand, selectedMentions, sendOrSteerChatMessage, setChatScrollOffset, slashCommands, slashIndex, slashRows, startCliTerminalForPrompt, submitClaudePromptToTerminal, submitRightForm, submitSelectedPendingQuestion]);
 
   const launchPromptInBackground = useCallback(async (value: string) => {
     const text = value.trim();
@@ -9824,17 +9914,24 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       setError(null);
       const normalized = { ...modelStateRef.current, ...applyProviderPermissionMode(modelStateRef.current) };
       const runtimeProvider = runtimeProviderForUiProvider(normalized.provider);
-      if (runtimeProvider === "claude") {
+      // Interface=CLI (with a provider that has a CLI) launches a tracked
+      // terminal; everything else — including Claude Chat — creates an SDK chat.
+      const cliProvider = normalized.interfaceMode === "cli"
+        ? cliProviderForModelStateProvider(normalized.provider)
+        : null;
+      if (cliProvider) {
         const cols = clampTerminalPaneCols(terminalPaneWidth);
         const terminalRows = claudeTerminalRowsForPane(chatRowBudget);
         const terminalPrompt = promptTextForTerminal(text, promptAttachments);
-        const claudeTitle = pendingNewChatTitleRef.current ?? "Claude Code";
-        const createdTerminal = await startClaudeTerminalSession({
+        const cliTitle = pendingNewChatTitleRef.current ?? LAUNCH_PROFILE_TITLE[cliProvider];
+        const createdTerminal = await startCliTerminalSession({
           connection: conn,
+          provider: cliProvider,
           laneId,
-          title: claudeTitle,
+          title: cliTitle,
           model: normalized.modelId ?? normalized.model,
           reasoningEffort: normalized.reasoningEffort,
+          fastMode: normalized.fastMode,
           permissionMode: normalized.permissionMode,
           initialInput: terminalPrompt.trim() ? terminalPrompt : null,
           cols,
@@ -9843,10 +9940,11 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         registerOptimisticTerminalSession({
           sessionId: createdTerminal.sessionId,
           laneId,
-          title: claudeTitle,
+          title: cliTitle,
           session: createdTerminal.session,
+          provider: cliProvider,
         });
-        if (!claudeAutoNamingHintShownRef.current) {
+        if (cliProvider === "claude" && !claudeAutoNamingHintShownRef.current) {
           claudeAutoNamingHintShownRef.current = true;
           addNotice("Claude sessions auto-name in the background when enabled — toggle in ADE desktop → Settings → AI Features.", "info");
         }
@@ -10157,6 +10255,13 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       cycleProvider(direction);
       return;
     }
+    if (row.kind === "interface") {
+      // Only two values, so any cycle direction toggles Chat ↔ CLI. Editable
+      // rows only (disabled rows return above); a committed session's interface
+      // is fixed by its type.
+      applyModelState((prev) => ({ ...prev, interfaceMode: prev.interfaceMode === "cli" ? "chat" : "cli" }));
+      return;
+    }
     if (row.kind === "model") {
       cycleModel(direction);
       return;
@@ -10814,8 +10919,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       return;
     }
     if (isTerminalControlToggle(input, key)) {
-      // Grid view: Ctrl+T pops the focused Claude terminal tile out to single view
-      // and enters control; exiting control returns to the grid (handled above).
+      // Grid view: Ctrl+T pops the focused provider CLI terminal tile out to
+      // single view and enters control; exiting control returns to the grid.
       if (gridViewActiveRef.current) {
         const focusedId = focusedSessionIdForMultiView(multiViewRef.current);
         const tile = focusedId
@@ -10824,7 +10929,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         const terminal = focusedId
           ? terminalSessionsRef.current.find((entry) => entry.terminalId === focusedId) ?? null
           : null;
-        if (tile && terminal && terminal.status === "running" && terminalSessionProvider(terminal) === "claude") {
+        if (tile && terminal && terminal.status === "running" && terminalSessionProvider(terminal)) {
           controlReturnToGridRef.current = focusedId;
           setGridView(false);
           selectActiveLaneId(tile.laneId);
@@ -10838,7 +10943,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       if (
         terminal?.terminalId === activeSessionIdRef.current
         && terminal.status === "running"
-        && terminalSessionProvider(terminal) === "claude"
+        && terminalSessionProvider(terminal)
       ) {
         focusChat();
         setAttachedTerminalId(terminal.terminalId);
@@ -11570,6 +11675,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         activeModelId: modelState.modelId,
         activeReasoningEffort: modelState.reasoningEffort,
         aiStatus,
+        interfaceMode: modelState.interfaceMode,
         settingsRows: picker.settingsRows ?? [],
         footerFocus: picker.footerFocus ?? null,
         laneLabel: picker.laneLabel ?? null,
@@ -12259,6 +12365,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
 		        activeModelId: modelState.modelId,
             activeReasoningEffort: modelState.reasoningEffort,
             aiStatus,
+            interfaceMode: modelState.interfaceMode,
             settingsRows: picker.settingsRows ?? [],
             footerFocus: picker.footerFocus ?? null,
             laneLabel: picker.laneLabel ?? null,
@@ -13170,16 +13277,16 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
           },
         },
       );
-      if (claudeTerminalControlAvailable) {
+      if (terminalControlAvailable) {
         rightFooterItems.push({
           id: "footer:terminal-control",
-          label: "^t Claude",
+          label: `^t ${terminalControlLabel}`,
           onClick: () => {
             const terminal = activeTerminalSessionRef.current;
             if (
               terminal?.terminalId === activeSessionIdRef.current
               && terminal.status === "running"
-              && terminalSessionProvider(terminal) === "claude"
+              && terminalSessionProvider(terminal)
             ) {
               focusChat();
               setAttachedTerminalId(terminal.terminalId);
@@ -13420,6 +13527,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
           activeModelId: modelState.modelId,
           activeReasoningEffort: modelState.reasoningEffort,
           aiStatus,
+          interfaceMode: modelState.interfaceMode,
           settingsRows: picker.settingsRows ?? [],
           footerFocus: picker.footerFocus ?? null,
           laneLabel: picker.laneLabel ?? null,
@@ -13889,7 +13997,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     slashRows,
     startAddMode,
     subagentPaneCommandAvailable,
-    claudeTerminalControlAvailable,
+    terminalControlAvailable,
+    terminalControlLabel,
     submitSelectedPendingQuestion,
     submitPrompt,
     tileableDisplaySessions,
@@ -13973,13 +14082,14 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     });
   }, [connection, gridViewActive, multiView, chatWrapWidth, gridRowBudget]);
 
-  // Whether the grid's focused tile is a running Claude terminal — drives the
-  // footer "^t control (single)" hint so the unavailable-in-grid control is clear.
-  const gridFocusedTileIsClaudeTerminal = useMemo(() => {
+  // Whether the grid's focused tile is a running provider CLI terminal — drives
+  // the footer "^t control (single)" hint so the unavailable-in-grid control is
+  // clear (Ctrl+T control needs single view).
+  const gridFocusedTileIsTerminal = useMemo(() => {
     if (!gridViewActive || !multiView) return false;
     const focusedId = multiView.tiles[multiView.focusedIndex]?.sessionId ?? null;
     const terminal = focusedId ? terminalSessionById[focusedId] ?? null : null;
-    return Boolean(terminal && terminal.status === "running" && terminalSessionProvider(terminal) === "claude");
+    return Boolean(terminal && terminal.status === "running" && terminalSessionProvider(terminal));
   }, [gridViewActive, multiView, terminalSessionById]);
 
   if (error && !connection) {
@@ -14078,6 +14188,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
               <TerminalPane
                 title={activeTerminalSession.title}
                 terminalId={activeTerminalSession.terminalId}
+                cliLabel={terminalControlLabel}
+                claudeChrome={activeTerminalProvider === "claude"}
                 preview={terminalPreview}
                 liveChunks={terminalLiveChunks[activeTerminalSession.terminalId] ?? []}
                 attached={attachedTerminalId === activeTerminalSession.terminalId}
@@ -14140,6 +14252,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
 	                activeModelId: modelState.modelId,
                 activeReasoningEffort: modelState.reasoningEffort,
                 aiStatus,
+                interfaceMode: modelState.interfaceMode,
 	              }}
               onModelPickerMeasureOrigin={handlePickerMeasureOrigin}
             />
@@ -14261,9 +14374,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
           providerLocked={providerLocked}
           subagentsButtonVisible={subagentPaneCommandAvailable}
           planMode={isPlanMode(modelState)}
-          terminalControlAvailable={claudeTerminalControlAvailable}
-          terminalControlActive={claudeTerminalControlActive}
-          gridTerminalControlHint={gridFocusedTileIsClaudeTerminal}
+          terminalControlAvailable={terminalControlAvailable}
+          terminalControlActive={terminalControlActive}
+          terminalControlLabel={terminalControlLabel}
+          gridTerminalControlHint={gridFocusedTileIsTerminal}
           multiViewActive={Boolean(multiView)}
           multiViewMap={footerMultiViewMap}
         />
diff --git a/apps/ade-cli/src/tuiClient/components/FooterControls.tsx b/apps/ade-cli/src/tuiClient/components/FooterControls.tsx
index acb0953ed..f6692a1aa 100644
--- a/apps/ade-cli/src/tuiClient/components/FooterControls.tsx
+++ b/apps/ade-cli/src/tuiClient/components/FooterControls.tsx
@@ -168,6 +168,7 @@ export function FooterControls({
   planMode,
   terminalControlAvailable,
   terminalControlActive,
+  terminalControlLabel,
   gridTerminalControlHint,
   multiViewActive,
   multiViewMap,
@@ -190,7 +191,9 @@ export function FooterControls({
   planMode?: boolean;
   terminalControlAvailable?: boolean;
   terminalControlActive?: boolean;
-  /** Grid view, focused tile is a running Claude terminal: Ctrl+T opens it in single view to control. */
+  /** Provider label for the terminal control chrome (e.g. "Claude", "Codex"). */
+  terminalControlLabel?: string | null;
+  /** Grid view, focused tile is a running provider CLI terminal: Ctrl+T opens it in single view to control. */
   gridTerminalControlHint?: boolean;
   multiViewActive?: boolean;
   multiViewMap?: { count: number; focusedIndex: number; notice?: string | null } | null;
@@ -201,6 +204,7 @@ export function FooterControls({
   const agents = liveAgentCount ?? 0;
   const showSubagents = subagentsButtonVisible === true;
   const providerIsLocked = providerLocked === true;
+  const cliLabel = terminalControlLabel?.trim() || "Claude";
   const hoveredId = useHoveredHitId();
   const inlineHovered = (name: string) => hoveredId === `footer:inline:${name}`;
   const footerHovered = (id: string) => hoveredId === id;
@@ -348,7 +352,7 @@ export function FooterControls({
       <Text wrap="truncate-start">
         {terminalControlActive ? (
           <>
-            <Text color={theme.color.warning} bold>CLAUDE CONTROL</Text>
+            <Text color={theme.color.warning} bold>{`${cliLabel.toUpperCase()} CONTROL`}</Text>
             <Text dimColor>{" · "}</Text>
             <Hint keyLabel="^t" action="ADE" />
             <Text dimColor>{"  "}</Text>
@@ -405,7 +409,7 @@ export function FooterControls({
             {terminalControlAvailable ? (
               <>
                 <Text dimColor>{"  "}</Text>
-                <Hint keyLabel="^t" action="Claude" />
+                <Hint keyLabel="^t" action={cliLabel} />
               </>
             ) : null}
           </>
diff --git a/apps/ade-cli/src/tuiClient/components/ModelPicker/ModelPickerPane.tsx b/apps/ade-cli/src/tuiClient/components/ModelPicker/ModelPickerPane.tsx
index cb6285100..7b5f1ac67 100644
--- a/apps/ade-cli/src/tuiClient/components/ModelPicker/ModelPickerPane.tsx
+++ b/apps/ade-cli/src/tuiClient/components/ModelPicker/ModelPickerPane.tsx
@@ -230,6 +230,7 @@ function RailLogoSlot({ mark, dim = false }: { mark: ProviderMark; dim?: boolean
 
 function settingIcon(kind: SetupPaneRowKind): string {
   switch (kind) {
+    case "interface": return "⇄";
     case "reasoning": return "✦";
     case "permission": return "◆";
     case "codex-fast": return "↯";
diff --git a/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.test.ts b/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.test.ts
index cef6c1d51..16a9995f6 100644
--- a/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.test.ts
+++ b/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.test.ts
@@ -47,6 +47,36 @@ describe("buildModelPickerLayout", () => {
     expect(layout.entries.every((entry) => entry.family === "codex")).toBe(true);
   });
 
+  it("gates Cursor model availability on the interface mode", () => {
+    const cursorModels: AgentChatModelInfo[] = [
+      modelInfo({ id: "cursor/sdk-only", displayName: "Cursor SDK Only", family: "cursor", cursorAvailability: { sdk: true, cli: false } }),
+      modelInfo({ id: "cursor/cli-only", displayName: "Cursor CLI Only", family: "cursor", cursorAvailability: { sdk: false, cli: true } }),
+    ];
+    const build = (interfaceMode: "chat" | "cli") => {
+      const layout = buildModelPickerLayout({
+        models: cursorModels,
+        favorites: [],
+        recents: [],
+        activeModelId: null,
+        query: "",
+        selection: { kind: "provider", provider: "cursor" },
+        focusedIndex: 0,
+        searchMode: false,
+        interfaceMode,
+      });
+      const byId = new Map(layout.entries.map((entry) => [entry.modelId, entry] as const));
+      return {
+        sdkOnly: byId.get("cursor/sdk-only")?.isAvailable,
+        cliOnly: byId.get("cursor/cli-only")?.isAvailable,
+      };
+    };
+
+    // Chat interface: SDK-capable models available, CLI-only disabled.
+    expect(build("chat")).toEqual({ sdkOnly: true, cliOnly: false });
+    // CLI interface: the mirror image.
+    expect(build("cli")).toEqual({ sdkOnly: false, cliOnly: true });
+  });
+
   it("shows static Anthropic rows immediately before the runtime catalog warms", () => {
     const layout = buildModelPickerLayout({
       models: [modelInfo({ id: "openai/gpt-5", displayName: "GPT-5" })],
diff --git a/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.ts b/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.ts
index 5d1545a82..0a7c3fd56 100644
--- a/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.ts
+++ b/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.ts
@@ -11,7 +11,7 @@ import {
   type ProviderFamily,
   type ModelProviderGroup,
 } from "../../../../../desktop/src/shared/modelRegistry";
-import type { AdeCodeProvider } from "../../types";
+import type { AdeCodeInterfaceMode, AdeCodeProvider } from "../../types";
 import type {
   ModelPickerEntry,
   ModelPickerRailEntry,
@@ -310,8 +310,26 @@ export type BuildLayoutInput = {
   providerTabKey?: string | null;
   focusedIndex: number;
   searchMode: boolean;
+  /**
+   * Draft interface (Chat vs CLI). Gates Cursor model availability: Chat mode
+   * disables Cursor models that only support the CLI (and vice versa), mirroring
+   * desktop's AgentChatPane behavior. Defaults to Chat.
+   */
+  interfaceMode?: AdeCodeInterfaceMode;
 };
 
+/**
+ * Cursor exposes separate SDK (chat) and CLI availability per model. Mark a
+ * Cursor entry unavailable when the active interface can't launch it.
+ */
+function applyInterfaceAvailability(entry: ModelPickerEntry, interfaceMode: AdeCodeInterfaceMode): ModelPickerEntry {
+  if (entry.family !== "cursor" || !entry.cursorAvailability) return entry;
+  const supported = interfaceMode === "cli"
+    ? entry.cursorAvailability.cli === true
+    : entry.cursorAvailability.sdk !== false;
+  return supported ? entry : { ...entry, isAvailable: false };
+}
+
 export function buildModelPickerLayout(input: BuildLayoutInput): ModelPickerState {
   const favoritesSet = new Set(input.favorites);
   const runtimeEntries = input.catalog
@@ -324,7 +342,8 @@ export function buildModelPickerLayout(input: BuildLayoutInput): ModelPickerStat
   for (const entry of runtimeEntries) {
     entriesById.set(entry.modelId, entry);
   }
-  const allEntries = [...entriesById.values()];
+  const interfaceMode = input.interfaceMode ?? "chat";
+  const allEntries = [...entriesById.values()].map((entry) => applyInterfaceAvailability(entry, interfaceMode));
   // The TUI picker always shows the full provider catalog. Availability is
   // represented on each row (dimmed/SIGN IN), matching desktop, instead of
   // hiding models behind a separate "show all" switch.
diff --git a/apps/ade-cli/src/tuiClient/components/RightPane.tsx b/apps/ade-cli/src/tuiClient/components/RightPane.tsx
index 4ed4b1f53..12f6baccd 100644
--- a/apps/ade-cli/src/tuiClient/components/RightPane.tsx
+++ b/apps/ade-cli/src/tuiClient/components/RightPane.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import { Box, Text } from "ink";
 import type {
+  AdeCodeInterfaceMode,
   AdeCodeProvider,
   ChatInfoPlanStep,
   ChatInfoSnapshot,
@@ -1855,6 +1856,7 @@ export function RightPane({
 	    activeModelId: string | null;
 	    activeReasoningEffort?: string | null;
 	    aiStatus?: AiSettingsStatus | null;
+	    interfaceMode?: AdeCodeInterfaceMode;
 	  };
 }) {
   const { title, hint, branch } = paneTitle(content);
@@ -2004,6 +2006,7 @@ export function RightPane({
 			            activeModelId: modelPickerInputs.activeModelId,
 			            activeReasoningEffort: modelPickerInputs.activeReasoningEffort,
 			            aiStatus: modelPickerInputs.aiStatus,
+			            interfaceMode: modelPickerInputs.interfaceMode,
 			            settingsRows: content.settingsRows,
 		            footerFocus: content.footerFocus ?? null,
 		            laneLabel: content.laneLabel ?? null,
diff --git a/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx b/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
index 5c78d6e23..0d96056dc 100644
--- a/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
+++ b/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
@@ -18,6 +18,13 @@ const { Terminal: HeadlessTerminal } = headlessXtermModule;
 type TerminalPaneProps = {
   title: string;
   terminalId?: string | null;
+  /** Provider label shown in the control/preview status ("Claude", "Codex", …). Defaults to Claude Code. */
+  cliLabel?: string | null;
+  /**
+   * Apply the Claude-specific closed-transcript chrome stripping (spinner/box
+   * noise filters). Off for other providers, which get a plain control strip.
+   */
+  claudeChrome?: boolean;
   preview: ChatTerminalPreviewResult | null;
   liveChunks: string[];
   attached: boolean;
@@ -212,6 +219,26 @@ function compactClosedTerminalTranscript(value: string): string[] {
   return compacted;
 }
 
+/**
+ * Provider-neutral closed-transcript cleanup: strip terminal control codes and
+ * collapse blank runs, without the Claude-specific spinner/box noise filters.
+ */
+function compactTerminalTranscript(value: string): string[] {
+  const lines = stripTerminalControls(value).split(/\r\n|\n|\r/);
+  const compacted: string[] = [];
+  let lastWasBlank = false;
+  for (const rawLine of lines) {
+    const line = rawLine.replace(/\u00a0/g, " ").trimEnd();
+    const blank = line.trim().length === 0;
+    if (blank && lastWasBlank) continue;
+    compacted.push(line);
+    lastWasBlank = blank;
+  }
+  while (compacted.length && compacted[0]!.trim().length === 0) compacted.shift();
+  while (compacted.length && compacted[compacted.length - 1]!.trim().length === 0) compacted.pop();
+  return compacted;
+}
+
 function rgbColor(value: number | null | undefined): string | undefined {
   if (typeof value !== "number" || !Number.isFinite(value)) return undefined;
   const safe = Math.max(0, Math.min(0xffffff, Math.floor(value)));
@@ -354,20 +381,22 @@ export function styledRowsFromSnapshotRows(rows: TerminalSnapshotRow[], maxRows:
   return rows.slice(0, Math.max(0, maxRows)).map((row) => styledRowFromCells(row.cells, row.text));
 }
 
-function transcriptPreviewRows(transcript: string | null | undefined, maxRows: number): TerminalStyledRow[] {
-  const lines = compactClosedTerminalTranscript(transcript ?? "");
+function transcriptPreviewRows(transcript: string | null | undefined, maxRows: number, claudeChrome: boolean): TerminalStyledRow[] {
+  const lines = claudeChrome
+    ? compactClosedTerminalTranscript(transcript ?? "")
+    : compactTerminalTranscript(transcript ?? "");
   if (!lines.length) {
     return [{ runs: [{ text: "Terminal closed. Resume the chat to view live output.", style: {} }] }];
   }
   return lines.slice(-maxRows).map((line) => ({ runs: [{ text: line || " ", style: {} }] }));
 }
 
-function fallbackPreviewRows(preview: ChatTerminalPreviewResult | null, maxRows: number): TerminalStyledRow[] {
+function fallbackPreviewRows(preview: ChatTerminalPreviewResult | null, maxRows: number, claudeChrome: boolean): TerminalStyledRow[] {
   if (!preview) return [{ runs: [{ text: "No terminal preview yet.", style: {} }] }];
   if (preview.snapshot?.visibleRows?.length) {
     return styledRowsFromSnapshotRows(preview.snapshot.visibleRows, maxRows);
   }
-  return transcriptPreviewRows(preview.transcript, maxRows);
+  return transcriptPreviewRows(preview.transcript, maxRows, claudeChrome);
 }
 
 function terminalControlBorderColor(frame: string): string {
@@ -377,6 +406,8 @@ function terminalControlBorderColor(frame: string): string {
 export function TerminalPane({
   title,
   terminalId,
+  cliLabel,
+  claudeChrome = true,
   preview,
   liveChunks,
   attached,
@@ -510,12 +541,12 @@ export function TerminalPane({
   const lines = useMemo(() => {
     if (snapshotRows?.length && liveChunks.length === 0) return snapshotRows.slice(0, rows);
     if (preview?.transcript && preview.session.status !== "running" && !liveChunks.length) {
-      return transcriptPreviewRows(preview.transcript, rows);
+      return transcriptPreviewRows(preview.transcript, rows, claudeChrome);
     }
     const terminal = terminalRef.current;
     if (terminal) return styledRowsFromTerminal(terminal, rows, effectiveScrollOffset);
-    return fallbackPreviewRows(preview, rows);
-  }, [effectiveScrollOffset, liveChunks.length, preview, renderTick, rows, snapshotRows]);
+    return fallbackPreviewRows(preview, rows, claudeChrome);
+  }, [claudeChrome, effectiveScrollOffset, liveChunks.length, preview, renderTick, rows, snapshotRows]);
 
   // Surface scrollback bounds + the current visible text to the owner so it can
   // clamp keyboard scroll requests and copy the visible region. Cheap: gated on
@@ -529,10 +560,11 @@ export function TerminalPane({
     reportMetrics({ maxScrollable, visibleText: plainTextFromStyledRows(lines) });
   }, [lines, reportMetrics, snapshotRows]);
 
+  const controlLabel = cliLabel?.trim() || "Claude";
   const status = attached
-    ? "CLAUDE CONTROL · Ctrl+T returns to ADE · Ctrl+] escape"
+    ? `${controlLabel.toUpperCase()} CONTROL · Ctrl+T returns to ADE · Ctrl+] escape`
     : preview?.session.status === "running"
-      ? effectiveHiddenBottomRows > 0 ? "ADE prompt sends to Claude Code" : "live preview"
+      ? effectiveHiddenBottomRows > 0 ? `ADE prompt sends to ${controlLabel}` : "live preview"
       : preview?.session.resumeCommand
         ? "closed, resumable · Enter resumes"
         : "closed";
diff --git a/apps/ade-cli/src/tuiClient/remoteLauncher.ts b/apps/ade-cli/src/tuiClient/remoteLauncher.ts
index 5d2a90ade..f41dc5ffd 100644
--- a/apps/ade-cli/src/tuiClient/remoteLauncher.ts
+++ b/apps/ade-cli/src/tuiClient/remoteLauncher.ts
@@ -845,13 +845,27 @@ function terminalToChoice(session: ChatTerminalSession): RemoteSessionChoice {
   };
 }
 
+const TRACKED_CLI_REMOTE_PROVIDERS = new Set(["claude", "codex", "cursor", "droid", "opencode"]);
+
 function isTerminalSessionLaunchable(session: ChatTerminalSession): boolean {
   const toolType = session.toolType ?? "";
+  // Chat-backed terminals surface through the chat session list instead.
   if (toolType === "codex-chat" || toolType === "claude-chat" || toolType === "opencode-chat" || toolType === "cursor" || toolType === "droid-chat") {
     return false;
   }
-  if (toolType === "claude" || toolType === "claude-orchestrated") return true;
-  if (isRecord(session.resumeMetadata) && session.resumeMetadata.provider === "claude") return true;
+  // Any tracked provider CLI (claude/codex/cursor-cli/droid/opencode) is
+  // launchable — mirrors trackedCliTerminalProvider in adeApi.ts.
+  if (
+    toolType.startsWith("codex")
+    || toolType.startsWith("cursor")
+    || toolType.startsWith("droid")
+    || toolType.startsWith("opencode")
+    || toolType.startsWith("claude")
+  ) {
+    return true;
+  }
+  const provider = isRecord(session.resumeMetadata) ? session.resumeMetadata.provider : null;
+  if (typeof provider === "string" && TRACKED_CLI_REMOTE_PROVIDERS.has(provider)) return true;
   const resumeCommand = typeof session.resumeCommand === "string" ? session.resumeCommand.trim().toLowerCase() : "";
   return Boolean(resumeCommand && /\bclaude\b/.test(resumeCommand));
 }
diff --git a/apps/ade-cli/src/tuiClient/types.ts b/apps/ade-cli/src/tuiClient/types.ts
index e7715c26d..693b86191 100644
--- a/apps/ade-cli/src/tuiClient/types.ts
+++ b/apps/ade-cli/src/tuiClient/types.ts
@@ -71,8 +71,18 @@ export type AdeCodeConnection = {
 
 export type AdeCodeProvider = Extract<AgentChatProvider, "codex" | "claude" | "opencode" | "cursor" | "droid"> | "ollama" | "lmstudio";
 
+/**
+ * How a new chat draft is launched. `chat` creates an SDK chat via
+ * `chat.createSession`; `cli` starts a tracked provider CLI terminal via the
+ * `start_cli_session` action. Mirrors the desktop/iOS Chat/CLI switcher and
+ * defaults to `chat`.
+ */
+export type AdeCodeInterfaceMode = "chat" | "cli";
+
 export type AdeCodeModelState = {
   provider: AdeCodeProvider;
+  /** Draft-only: whether the next chat launches as an SDK chat or a tracked CLI terminal. */
+  interfaceMode: AdeCodeInterfaceMode;
   model: string;
   modelId: string | null;
   displayName: string;
@@ -101,6 +111,7 @@ export type ProviderReadinessRow = {
 
 export type SetupPaneRowKind =
   | "provider"
+  | "interface"
   | "model"
   | "reasoning"
   | "permission"
diff --git a/docs/features/ade-code/README.md b/docs/features/ade-code/README.md
index 42dc1fb15..c7ec39b7e 100644
--- a/docs/features/ade-code/README.md
+++ b/docs/features/ade-code/README.md
@@ -53,7 +53,7 @@ Point Cursor’s browser inspector at the served page for layout debugging. The
 | `apps/ade-cli/src/tuiClient/state.ts` | Persists terminal-client state under `~/.ade/`: the last selected chat per lane (`lastChatByLane`) plus the most recently active lane (`lastLaneId`), used to restore lane focus across launches. |
 | `apps/ade-cli/src/tuiClient/theme.ts` | Shared Ink color and status tokens. Mirrors the Claude Design wireframe terminal palette 1:1: surfaces, text levels, brand violets, status (`running`/`attention`/`idle`/`failed`/`primary`), executor brand colors (Claude/Codex/Cursor/OpenCode/Droid + Shell + Copilot), plus helper exports `laneStatusColor`, `agentStatusColor`, `agentStatusGlyph`, and per-provider `glyph` + `wordmark`. |
 | `apps/ade-cli/src/tuiClient/types.ts` | `AdeCodeConnection`, `ProjectLaunchContext`, `RightPaneContent` (`empty`, `help`, `status`, `details`, `diff`, `chat-info`, `new-chat-setup`, `model-setup`, `form`, `lane-details` with git stats + PR CI fields + lane chat counts, …), `ChatInfoSnapshot`, `ChatInfoPlan`, `ChatInfoPlanStep`, `SubagentSnapshot`, plus navigation DTOs aligned with `apps/desktop/src/shared/types`. |
-| `apps/ade-cli/src/tuiClient/components/` | `AdeWordmark`, `Drawer` (`visibleDrawerLaneCount` / `visibleDrawerChatCount`, `DrawerPrSummary` rows, lanes mode chat preview under the selected lane), `ChatView` (transcript renderer; exports `renderChatVisibleSelectionRows` / `renderChatSelectableRowTexts` / `selectedTextFromChatRows` for the ADE-owned mouse selection, plus `computeChatScrollMaxOffset` and `renderChatTranscriptPlainText`), `Header`, `RightPane` (`computeLaneChatCounts`, `LANE_DETAIL_PR_ACTION_INDEX`, wireframe `lane-details` STATUS/CHANGES/ACTIONS/PR/CHATS sections, Chat Info `chat-info`, `model-setup`), `SlashPalette`, `MentionPalette`, `ApprovalPrompt`, `ModelStatus`, `FooterControls`, and `TerminalPane` (xterm-headless preview pane that consumes `ChatTerminalPreviewResult` from `ade.terminal.preview` plus live `ade.pty.data` chunks to render a real terminal grid inside Ink; running Claude terminals can be put into direct control mode from the TUI). |
+| `apps/ade-cli/src/tuiClient/components/` | `AdeWordmark`, `Drawer` (`visibleDrawerLaneCount` / `visibleDrawerChatCount`, `DrawerPrSummary` rows, lanes mode chat preview under the selected lane), `ChatView` (transcript renderer; exports `renderChatVisibleSelectionRows` / `renderChatSelectableRowTexts` / `selectedTextFromChatRows` for the ADE-owned mouse selection, plus `computeChatScrollMaxOffset` and `renderChatTranscriptPlainText`), `Header`, `RightPane` (`computeLaneChatCounts`, `LANE_DETAIL_PR_ACTION_INDEX`, wireframe `lane-details` STATUS/CHANGES/ACTIONS/PR/CHATS sections, Chat Info `chat-info`, `model-setup`), `SlashPalette`, `MentionPalette`, `ApprovalPrompt`, `ModelStatus`, `FooterControls`, and `TerminalPane` (xterm-headless preview pane that consumes `ChatTerminalPreviewResult` from `ade.terminal.preview` plus live `ade.pty.data` chunks to render a real terminal grid inside Ink; running provider CLI terminals — Claude, Codex, Cursor, Droid, OpenCode — can be put into direct control mode from the TUI). |
 | `apps/ade-cli/src/tuiClient/keybindings/index.ts` | Verbatim `~/.claude/keybindings.json` reader and TUI action dispatcher (chord support, vim namespace, clipboard-image paste hooks). Resolves `defaultKeybindingsPath()`, parses the Claude keybindings schema, and maps key sequences onto TUI actions. |
 | `apps/ade-cli/src/tuiClient/statusline/index.ts` | Claude-compatible status line config reader and runner. Reads the `~/.claude/statusline.json` contract, executes the configured status command, and exposes the rendered lines to `ModelStatus`. |
 | `apps/ade-cli/src/tuiClient/components/ModelPicker/` | Ink ModelPicker pane: `ModelPickerPane.tsx` (provider/category rail + search + model rows), `modelPickerLayout.ts` (pure derivations — imports `modelOrdering` and `modelPickerSearch` from the desktop package so behaviour stays in lockstep with the renderer), `modelPickerGeometry.ts` (shared painted-row / click hit-test geometry), and `types.ts` (`ModelPickerEntry`, `ModelPickerRailEntry`, `ModelPickerState`, plus `AdeCodeProvider` extensions for `ollama` / `lmstudio`). Reads the provider-grouped catalog via `getModelCatalog`, preserves runtime `serviceTiers` and Cursor `cursorAvailability` metadata for Fast Mode / chat-vs-CLI parity, keeps the provider rail stable even when a runtime is signed out or empty, and reads favorites / recents via the cross-surface `modelPicker.*` store. |
@@ -136,13 +136,16 @@ For the embedded runtime there is no `projects.add` step — the in-process runt
 - **Composer** — multi-line input with mention completion (`@…`) sourced from `MentionPalette` and slash command completion from `SlashPalette`. Both palettes stay visible with a no-match row while the user is actively typing. Mention completion publishes local lane/chat hits immediately, then debounces remote file/git/PR RPCs; file results are cached per lane+query and git/PR results are cached per lane for the open TUI session. Pending tool approvals surface as `ApprovalPrompt`. AskUserQuestion-style answer requests (one or more questions, each with options) render every question inline with its option list and an `N of M answered` header. While such a request is pending and the composer is empty, keyboard input drives the picker instead of the prompt: `↑`/`↓` move the selected option (or move between questions when the active question has no options), `←`/`→` switch the active question, `1`-`9` select that option and submit it immediately, `Enter` submits the active question's current selection (advancing to the next unanswered question, or finalizing the whole request once every question is answered), and typing any text falls back to a custom free-text answer. Clicking an option submits it too. The deny chip still declines the whole request. Selection lives in `pendingInput.ts`'s `PendingQuestionSelectionState`; the old single-question `1`-`6` numeric quick-select is replaced by this flow.
 - **RightPane** — context-sensitive drawer for slash command output. The "right" placement commands (see below) render their results here as forms, lists, diffs, help text, or rendered objects. When a chat is active the default content is the **Chat Info** view (`kind: "chat-info"`): provider/model header, lane label, streaming/idle indicator with context-percent + token summary, plan steps for the current turn (plus the provider's plan explanation / streaming text when present), Codex `/goal` block when present, a roster of subagents (running first, then teammates and background), and — below the roster, like the Droid Missions block — a **TASKS** section (latest `todo_update` snapshot, desktop ChatTasksPanel parity) and a **PR** section (the lane's PR state + checks rollup with `/pr` hand-off hints, desktop ChatPrPane parity). Codex goal state comes from the shared chat event stream and is normalized so provider token budgets do not show as ADE-side limits. Selecting a subagent row with `↵` swaps the centre transcript to that agent's view via `buildSubagentTranscriptEvents`; `Esc` returns to the main chat. For an active lane with no chat focus, the default switches to the wireframe **`lane-details`** view: **STATUS** (clean/dirty, ahead/behind), **CHANGES** (file list + staged/unstaged counts from `diff.listLaneDiffStats`), **ACTIONS** (lane shortcuts — `new chat`, `open / create PR`, `stage all`, `move unstaged to new lane`, `commit`, `push`, `diff`, `reparent`, `delete lane`; each row carries a semantic glyph color so additive actions are green, navigational actions are violet, the rescue-unstaged action is amber, and `delete lane` is red), optional **PR #N** (state chip, CI activity via `checksPending` / `checksFailed`, `↵` opens the PR URL when the PR row is selected), and **CHATS** (active / closed / killed counts from `computeLaneChatCounts`). A `worktreeAvailable` guard surfaces a recoverable warning when the lane worktree path is missing from disk. `/model` opens a separate **`model-setup`** pane for provider/model/reasoning/permission picks before the first prompt.
 - **FooterControls** — two-row footer. The top row (mode bar, only present when there's content) shows provider glyph + label, model display, fast-mode badge, reasoning effort, permission summary, pending steer count, a 10-cell token usage bar (`TokenBar`) that recolors at 50 / 80 / 95 %, and the cached context-percent / token summary. The bottom row shows pane toggles (`^o` lanes, `^p` pane, `^a` chat info) and pane-specific hints (drawer mode lanes/chats, details navigation, chat scroll position, `/steer` reminder when steers are queued). The `⊚ chat info` chip shows the live subagent count when greater than zero. `footerControlsForAvailability(agentsAvailable)` decides which toggles are wired.
-- **Claude terminal control** — when the active session is a running
-  Claude terminal, `Ctrl+T` moves keyboard input from ADE into that
-  terminal. `TerminalPane` switches from preview mode to a bordered
-  control frame, stops hiding Claude's bottom input rows, and the footer
-  shows `CLAUDE CONTROL` with `Ctrl+T` to return to ADE and `Ctrl+]`
-  as the escape chord. Raw terminal input strips only those control
-  bytes before forwarding the rest to the PTY.
+- **Provider CLI terminal control** — when the active session is a
+  running provider CLI terminal (Claude, Codex, Cursor, Droid, or
+  OpenCode), `Ctrl+T` moves keyboard input from ADE into that terminal.
+  `TerminalPane` switches from preview mode to a bordered control frame,
+  stops hiding the CLI's bottom input rows, and the footer shows
+  `<PROVIDER> CONTROL` (e.g. `CODEX CONTROL`) with `Ctrl+T` to return to
+  ADE and `Ctrl+]` as the escape chord. Raw terminal input strips only
+  those control bytes before forwarding the rest to the PTY. `/model` and
+  `/effort` write directly into a running terminal only for Claude; other
+  providers rely on `pty.sendToSession` for continuation.
 - **Ctrl+C semantics** — when a chat turn is streaming or active, `Ctrl+C`
   cancels the turn through `cancelChatTurn`. Otherwise it arms a
   ~1.5 s "press again to exit" window so a stray Ctrl+C does not kill
@@ -249,12 +252,12 @@ ade code --embedded                      # in-process runtime fallback
 ade code remote --target mac --project ADE
                                          # attach through SSH to a saved desktop remote target/project
 ade code remote session --target mac --project ADE --session chat-1
-                                         # open a specific remote chat or Claude terminal session
+                                         # open a specific remote chat or provider CLI terminal session
 ade code remote --list-targets           # list saved desktop remote machines
 ade code remote --target mac --list-projects
                                          # list projects registered on that remote runtime
 ade code remote session --target mac --project ADE --list-sessions
-                                         # list launchable remote chats/Claude terminals
+                                         # list launchable remote chats/provider CLI terminals
 ade --project-root /repo code            # bind to a different project
 ade --socket /tmp/ade-runtime-dev.sock code
                                          # attach to a specific socket (dev runtime, peer machine, etc.)
@@ -286,7 +289,8 @@ After local changes, run `npm run build` inside `apps/ade-cli` so both `dist/cli
 ## Chat setup
 
 - `+ new chat` opens a draft setup view (`new-chat-setup`) in the right pane; it does not create a backend chat until the first prompt is sent from the middle composer.
-- `/model` opens the model setup view (`model-setup`) in the right pane. It can switch provider, model, reasoning, Fast Mode for fast-capable descriptors, and permission settings, refresh provider readiness through `ai.getStatus`, and open desktop Settings > AI Providers for full configuration. Cursor rows come from the same provider-grouped catalog as desktop, including `cursorAvailability`, so SDK chat models and Cursor CLI launch models stay separated consistently.
+- The draft setup and `/model` panes carry an **Interface: Chat | CLI** row (immediately after Provider), matching the desktop/iOS Chat/CLI switcher. **Chat** creates an SDK chat via `chat.createSession` (all providers, including Claude); **CLI** starts a tracked provider CLI terminal via the `start_cli_session` action (Claude, Codex, Cursor, Droid, or OpenCode). It defaults to `chat`, is editable while the chat is a draft, and becomes read-only once a session exists (its value then reflects the session type). First-prompt submit branches on it: draft `CLI` starts a tracked terminal; otherwise an SDK chat is created. Ollama / LM Studio have no CLI and stay Chat-only.
+- `/model` opens the model setup view (`model-setup`) in the right pane. It can switch provider, model, reasoning, Fast Mode for fast-capable descriptors, and permission settings, refresh provider readiness through `ai.getStatus`, and open desktop Settings > AI Providers for full configuration. Cursor rows come from the same provider-grouped catalog as desktop, including `cursorAvailability`, so SDK chat models and Cursor CLI launch models stay separated consistently — and the picker gates Cursor availability on the selected Interface (Chat disables CLI-only Cursor models and vice versa).
 - `/login` delegates only to provider CLIs that can authenticate in the current terminal: Claude (`claude auth login`), Codex (`codex login`), and OpenCode (`opencode auth login`). Cursor chat is `@cursor/sdk` and needs `CURSOR_API_KEY` or desktop Settings > AI Providers. Droid chat runs Factory Droid over ACP and needs `FACTORY_API_KEY` or Factory's interactive `droid` login.
 - The middle composer shows the selected provider, model, reasoning, and permission mode under the prompt so draft changes on the right are visible before the chat starts.
 

From bbd0545d649171b74047e822e4875bf3b45afecb Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 02:13:24 -0400
Subject: [PATCH 02/17] ade cli: remote/sync reliability hardening (audit
 batch)

Fixes remote/sync audit findings #1-#4, #6-#20, plus perf M6, bug-sweep #13, and perf L9.

Skips #5 per disposition because TUI app/component files are owned by concurrent perf work. Implements #6 as the requested partial version/capability validation only.
---
 apps/ade-cli/src/adeRpcServer.ts              |   4 +-
 apps/ade-cli/src/bootstrap.test.ts            |  51 +++
 apps/ade-cli/src/cli.ts                       |  45 ++-
 apps/ade-cli/src/eventBuffer.ts               |  71 ++++-
 apps/ade-cli/src/multiProjectRpcServer.ts     |   4 +
 .../sync/brainProjectActionsSyncHandler.ts    |  53 ++--
 .../src/services/sync/sharedSyncListener.ts   |  53 +++-
 .../src/services/sync/syncHostService.test.ts | 299 ++++++++++++++++++
 .../src/services/sync/syncHostService.ts      | 273 +++++++++++-----
 .../tuiClient/__tests__/connection.test.ts    | 155 +++++++++
 apps/ade-cli/src/tuiClient/connection.ts      |  91 +++++-
 apps/ade-cli/src/tuiClient/jsonRpcClient.ts   | 269 ++++++++++++++--
 apps/ade-cli/src/tuiClient/remoteLauncher.ts  | 280 ++++++++++++++--
 .../src/main/services/ipc/runtimeBridge.ts    |   6 +-
 .../localRuntimeConnectionPool.ts             |   8 +
 .../remoteRuntime/remoteConnectionPool.ts     |   8 +
 apps/desktop/src/preload/preload.ts           |   4 +
 .../desktop/src/shared/types/remoteRuntime.ts |   2 +
 18 files changed, 1490 insertions(+), 186 deletions(-)

diff --git a/apps/ade-cli/src/adeRpcServer.ts b/apps/ade-cli/src/adeRpcServer.ts
index 1b666a443..4380b4373 100644
--- a/apps/ade-cli/src/adeRpcServer.ts
+++ b/apps/ade-cli/src/adeRpcServer.ts
@@ -4844,7 +4844,9 @@ async function runTool(args: {
         events: sliced,
         nextCursor: result.nextCursor,
         hasMore: filtered.length > limit || result.hasMore,
-        eventEpoch: result.eventEpoch
+        eventEpoch: result.eventEpoch,
+        gap: result.gap === true,
+        oldestCursor: result.oldestCursor ?? null
       };
     }
     return runtime.eventBuffer.drain(cursor, limit);
diff --git a/apps/ade-cli/src/bootstrap.test.ts b/apps/ade-cli/src/bootstrap.test.ts
index d21209c48..0601ed6c4 100644
--- a/apps/ade-cli/src/bootstrap.test.ts
+++ b/apps/ade-cli/src/bootstrap.test.ts
@@ -35,9 +35,60 @@ describe("createEventBuffer", () => {
     const result = buffer.drain(0);
     // Should have IDs 3, 4, 5 (the oldest 1, 2 were evicted)
     expect(result.events.map((e) => e.id)).toEqual([3, 4, 5]);
+    expect(result.gap).toBe(true);
+    expect(result.oldestCursor).toBe(3);
     expect(result.events[0]!.payload).toEqual({ i: 2 });
   });
 
+  it("reports no gap when the next retained event is contiguous with the cursor", () => {
+    const buffer = createEventBuffer(3);
+
+    for (let i = 0; i < 5; i++) {
+      buffer.push({ timestamp: `2026-03-01T00:0${i}:00Z`, category: "runtime", payload: { i } });
+    }
+
+    const result = buffer.drain(2);
+    expect(result.events.map((event) => event.id)).toEqual([3, 4, 5]);
+    expect(result.gap).toBe(false);
+    expect(result.oldestCursor).toBe(3);
+  });
+
+  it("evicts by retained byte budget and reports the replay gap", () => {
+    const buffer = createEventBuffer(10, { maxBytes: 260, maxEventBytes: 260 });
+
+    for (let i = 0; i < 4; i++) {
+      buffer.push({
+        timestamp: `2026-03-01T00:0${i}:00Z`,
+        category: "pty",
+        payload: { data: "x".repeat(90), i },
+      });
+    }
+
+    const result = buffer.drain(0);
+    expect(result.events.length).toBeLessThan(4);
+    expect(result.events.at(-1)?.id).toBe(4);
+    expect(result.gap).toBe(true);
+    expect(result.oldestCursor).toBeGreaterThan(1);
+  });
+
+  it("does not retain events larger than the per-event cap but still notifies live subscribers", () => {
+    const buffer = createEventBuffer(10, { maxBytes: 1024, maxEventBytes: 64 });
+    const seen: BufferedEvent[] = [];
+    buffer.subscribe((event) => seen.push(event));
+
+    buffer.push({
+      timestamp: "2026-03-01T00:00:00Z",
+      category: "pty",
+      payload: { data: "x".repeat(200) },
+    });
+
+    expect(seen).toHaveLength(1);
+    const result = buffer.drain(0);
+    expect(result.events).toEqual([]);
+    expect(result.gap).toBe(true);
+    expect(result.nextCursor).toBe(1);
+  });
+
   it("drains events after cursor", () => {
     const buffer = createEventBuffer();
 
diff --git a/apps/ade-cli/src/cli.ts b/apps/ade-cli/src/cli.ts
index 2f8e57f68..be3813008 100644
--- a/apps/ade-cli/src/cli.ts
+++ b/apps/ade-cli/src/cli.ts
@@ -11250,6 +11250,33 @@ function createSocketConnection(socketPath: string): net.Socket {
   return net.createConnection(socketPath);
 }
 
+async function probeLocalSocketForLiveness(socketPath: string): Promise<"live" | "stale" | "unknown"> {
+  if (socketPath.startsWith("tcp://") || isAdeRuntimeNamedPipePath(socketPath)) {
+    return "unknown";
+  }
+  return await new Promise((resolve) => {
+    const socket = net.createConnection(socketPath);
+    let settled = false;
+    let timer: ReturnType<typeof setTimeout> | null = null;
+    const finish = (value: "live" | "stale" | "unknown") => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+      socket.destroy();
+      resolve(value);
+    };
+    timer = setTimeout(() => finish("unknown"), 500);
+    socket.once("connect", () => finish("live"));
+    socket.once("error", (error: NodeJS.ErrnoException) => {
+      if (error.code === "ENOENT" || error.code === "ECONNREFUSED") {
+        finish("stale");
+        return;
+      }
+      finish("unknown");
+    });
+  });
+}
+
 function isRetryableSocketConnectError(error: NodeJS.ErrnoException): boolean {
   return (
     error.code === "ENOENT" ||
@@ -13685,9 +13712,21 @@ async function runServe(
   fs.mkdirSync(layout.adeDir, { recursive: true, mode: 0o700 });
   if (!isAdeRuntimeNamedPipePath(socketPath)) {
     fs.mkdirSync(path.dirname(socketPath), { recursive: true, mode: 0o700 });
-    try {
-      fs.unlinkSync(socketPath);
-    } catch {}
+    if (fs.existsSync(socketPath)) {
+      const liveness = await probeLocalSocketForLiveness(socketPath);
+      if (liveness === "live" || liveness === "unknown") {
+        throw new CliExecutionError("ADE brain socket is already in use.", {
+          socketPath,
+          cause: liveness === "live"
+            ? "Another ADE brain is accepting connections on this socket."
+            : "ADE could not prove the existing socket is stale.",
+          nextAction: "Stop the existing ADE brain or choose a different --socket path.",
+        });
+      }
+      try {
+        fs.unlinkSync(socketPath);
+      } catch {}
+    }
   }
 
   const socketState = createHeadlessRpcServer(createHandler);
diff --git a/apps/ade-cli/src/eventBuffer.ts b/apps/ade-cli/src/eventBuffer.ts
index 6c4447da1..a27f0767b 100644
--- a/apps/ade-cli/src/eventBuffer.ts
+++ b/apps/ade-cli/src/eventBuffer.ts
@@ -12,6 +12,8 @@ export type EventBufferDrainResult = {
   nextCursor: number;
   hasMore: boolean;
   eventEpoch: string;
+  gap: boolean;
+  oldestCursor: number | null;
 };
 
 export type EventBuffer = {
@@ -23,18 +25,60 @@ export type EventBuffer = {
   size(): number;
 };
 
-export function createEventBuffer(capacity = 10_000): EventBuffer {
-  const events: BufferedEvent[] = [];
+type RetainedBufferedEvent = {
+  event: BufferedEvent;
+  bytes: number;
+};
+
+export type EventBufferOptions = {
+  maxBytes?: number;
+  maxEventBytes?: number;
+};
+
+const DEFAULT_EVENT_BUFFER_MAX_BYTES = 16 * 1024 * 1024;
+const DEFAULT_EVENT_BUFFER_MAX_EVENT_BYTES = 1024 * 1024;
+
+export function createEventBuffer(
+  capacity = 10_000,
+  options: EventBufferOptions = {},
+): EventBuffer {
+  const events: RetainedBufferedEvent[] = [];
   const listeners = new Set<(event: BufferedEvent) => void>();
   const eventEpoch = randomUUID();
+  const maxBytes = Math.max(0, Math.floor(options.maxBytes ?? DEFAULT_EVENT_BUFFER_MAX_BYTES));
+  const maxEventBytes = Math.max(0, Math.floor(options.maxEventBytes ?? DEFAULT_EVENT_BUFFER_MAX_EVENT_BYTES));
   let nextId = 1;
+  let retainedBytes = 0;
+
+  const evictOldest = (): void => {
+    const evicted = events.shift();
+    if (evicted) retainedBytes = Math.max(0, retainedBytes - evicted.bytes);
+  };
+
+  const drainMetadata = (cursor: number): Pick<EventBufferDrainResult, "gap" | "oldestCursor"> => {
+    const oldest = events[0]?.event.id ?? null;
+    if (oldest == null) {
+      return {
+        gap: cursor < nextId - 1,
+        oldestCursor: cursor < nextId - 1 ? nextId : null,
+      };
+    }
+    return {
+      gap: cursor < oldest - 1,
+      oldestCursor: oldest,
+    };
+  };
 
   return {
     push(event) {
       const entry: BufferedEvent = { id: nextId++, ...event };
-      events.push(entry);
-      while (events.length > capacity) {
-        events.shift();
+      const bytes = Buffer.byteLength(JSON.stringify(entry), "utf8");
+      if (capacity > 0 && maxBytes > 0 && bytes <= maxEventBytes) {
+        events.push({ event: entry, bytes });
+        retainedBytes += bytes;
+        while (events.length > capacity || retainedBytes > maxBytes) {
+          evictOldest();
+        }
       }
       for (const listener of [...listeners]) {
         try {
@@ -46,17 +90,26 @@ export function createEventBuffer(capacity = 10_000): EventBuffer {
     },
     drain(cursor, limit = 100) {
       const clamped = Math.max(1, Math.min(1000, limit));
-      const startIdx = events.findIndex((e) => e.id > cursor);
+      const metadata = drainMetadata(cursor);
+      const startIdx = events.findIndex((e) => e.event.id > cursor);
       if (startIdx === -1) {
-        return { events: [], nextCursor: cursor, hasMore: false, eventEpoch };
+        return {
+          events: [],
+          nextCursor: metadata.gap ? nextId - 1 : cursor,
+          hasMore: false,
+          eventEpoch,
+          ...metadata,
+        };
       }
       const slice = events.slice(startIdx, startIdx + clamped);
-      const lastId = slice.length > 0 ? slice[slice.length - 1]!.id : cursor;
+      const drained = slice.map((entry) => entry.event);
+      const lastId = drained.length > 0 ? drained[drained.length - 1]!.id : cursor;
       return {
-        events: slice,
+        events: drained,
         nextCursor: lastId,
         hasMore: startIdx + clamped < events.length,
         eventEpoch,
+        ...metadata,
       };
     },
     subscribe(listener) {
diff --git a/apps/ade-cli/src/multiProjectRpcServer.ts b/apps/ade-cli/src/multiProjectRpcServer.ts
index 195122fe3..c763eadf8 100644
--- a/apps/ade-cli/src/multiProjectRpcServer.ts
+++ b/apps/ade-cli/src/multiProjectRpcServer.ts
@@ -409,6 +409,8 @@ export function createMultiProjectRpcRequestHandler(
           nextCursor: scope.runtime.eventBuffer.latestCursor(),
           hasMore: false,
           eventEpoch,
+          gap: false,
+          oldestCursor: null,
         };
     for (const event of replayResult.events) {
       if (shouldForward(event))
@@ -419,6 +421,8 @@ export function createMultiProjectRpcRequestHandler(
       nextCursor: replayResult.nextCursor,
       hasMore: replayResult.hasMore,
       eventEpoch: replayResult.eventEpoch,
+      gap: replayResult.gap === true,
+      oldestCursor: replayResult.oldestCursor ?? null,
     };
   };
 
diff --git a/apps/ade-cli/src/services/sync/brainProjectActionsSyncHandler.ts b/apps/ade-cli/src/services/sync/brainProjectActionsSyncHandler.ts
index 391650175..27830540b 100644
--- a/apps/ade-cli/src/services/sync/brainProjectActionsSyncHandler.ts
+++ b/apps/ade-cli/src/services/sync/brainProjectActionsSyncHandler.ts
@@ -32,7 +32,11 @@ import {
   parseSyncEnvelope,
   wsDataToText,
 } from "./syncProtocol";
-import type { SyncProjectCatalogProvider } from "./syncHostService";
+import {
+  buildSyncHostHelloOkPayload,
+  buildSyncProjectCatalogMessages,
+  type SyncProjectCatalogProvider,
+} from "./syncHostService";
 import { resolveDeviceDisplayName } from "./deviceRegistryService";
 
 type BrainProjectActionsSyncHandlerArgs = {
@@ -209,6 +213,20 @@ function send(
   }));
 }
 
+function sendProjectCatalog(
+  ws: WebSocket,
+  catalog: SyncProjectCatalogPayload,
+  requestId?: string | null,
+): void {
+  for (const message of buildSyncProjectCatalogMessages({
+    projectCatalog: catalog,
+    requestId,
+    compressionThresholdBytes: DEFAULT_SYNC_COMPRESSION_THRESHOLD_BYTES,
+  })) {
+    send(ws, message.type, message.payload, message.requestId);
+  }
+}
+
 function projectActionsEnabled(provider: SyncProjectCatalogProvider): boolean {
   return Boolean(
     provider.browseDirectories
@@ -343,7 +361,7 @@ export function createBrainProjectActionsSyncHandler(
     try {
       const project = await action(payload);
       send(peer.ws, resultType, { ok: true, project }, requestId);
-      send(peer.ws, "project_catalog", await projectCatalog(args.projectCatalogProvider, args.logger));
+      sendProjectCatalog(peer.ws, await projectCatalog(args.projectCatalogProvider, args.logger));
     } catch (error) {
       send(peer.ws, resultType, {
         ok: false,
@@ -355,7 +373,7 @@ export function createBrainProjectActionsSyncHandler(
   const handleAuthenticatedEnvelope = async (peer: BrainPeerState, envelope: ReturnType<typeof parseSyncEnvelope>): Promise<void> => {
     switch (envelope.type) {
       case "project_catalog_request": {
-        send(peer.ws, "project_catalog", await projectCatalog(args.projectCatalogProvider, args.logger), envelope.requestId);
+        sendProjectCatalog(peer.ws, await projectCatalog(args.projectCatalogProvider, args.logger), envelope.requestId);
         break;
       }
       case "project_switch_request": {
@@ -410,7 +428,7 @@ export function createBrainProjectActionsSyncHandler(
           );
           send(peer.ws, "project_forget_result", result, envelope.requestId);
           if (result.ok) {
-            send(peer.ws, "project_catalog", await projectCatalog(args.projectCatalogProvider, args.logger));
+            sendProjectCatalog(peer.ws, await projectCatalog(args.projectCatalogProvider, args.logger));
           }
         } catch (error) {
           send(peer.ws, "project_forget_result", {
@@ -664,29 +682,20 @@ export function createBrainProjectActionsSyncHandler(
           peer.metadata = hello.peer;
           const catalog = await projectCatalog(args.projectCatalogProvider, args.logger);
           const brain = brainMetadata();
-          send(ws, "hello_ok", {
+          send(ws, "hello_ok", buildSyncHostHelloOkPayload({
             peer: hello.peer,
             brain,
             serverDbVersion: 0,
             heartbeatIntervalMs,
             pollIntervalMs,
-            projects: catalog.projects,
-            features: {
-              fileAccess: true,
-              terminalStreaming: true,
-              chatStreaming: { enabled: true },
-              projectCatalog: { enabled: true },
-              projectActions: { enabled: projectActionsEnabled(args.projectCatalogProvider) },
-              changesetAck: { enabled: true },
-              bootstrapAuth: true,
-              pairingAuth: { enabled: true, pinDigits: 6 },
-              commandRouting: {
-                mode: "allowlisted",
-                supportedActions: [],
-                actions: [],
-              },
-            },
-          }, envelope.requestId);
+            projectCatalog: catalog,
+            projectCatalogEnabled: true,
+            projectActionsEnabled: projectActionsEnabled(args.projectCatalogProvider),
+            remoteCommandSupportedActions: [],
+            remoteCommandDescriptors: [],
+            localCommandDescriptors: [],
+            compressionThresholdBytes: DEFAULT_SYNC_COMPRESSION_THRESHOLD_BYTES,
+          }), envelope.requestId);
           return;
         }
 
diff --git a/apps/ade-cli/src/services/sync/sharedSyncListener.ts b/apps/ade-cli/src/services/sync/sharedSyncListener.ts
index 666745581..43794d11d 100644
--- a/apps/ade-cli/src/services/sync/sharedSyncListener.ts
+++ b/apps/ade-cli/src/services/sync/sharedSyncListener.ts
@@ -29,6 +29,7 @@ const DEFAULT_PARKED_PEER_GRACE_MS = 30_000;
 // a few in-flight requests fit comfortably; anything beyond signals a peer
 // flooding an unowned socket.
 const PARKED_MESSAGE_BUFFER_LIMIT = 256;
+const PARKED_MESSAGE_BUFFER_BYTES = 512 * 1024;
 // Mirror of the syncService preferred-port semantics: insist on the first
 // candidate for ~3.2s before drifting, so a dying listener from a previous
 // brain process can free the port paired phones have saved.
@@ -112,6 +113,7 @@ export type SharedSyncListener = {
 type ParkedEntry = {
   snapshot: SyncPeerHandoffSnapshot;
   bufferedMessages: Array<{ data: RawData; isBinary: boolean }>;
+  bufferedBytes: number;
   onMessage: (data: RawData, isBinary: boolean) => void;
   onClose: () => void;
   onError: (error: Error) => void;
@@ -123,6 +125,16 @@ function isRetryableListenerBindError(error: unknown): boolean {
   return code === "EADDRINUSE" || code === "EACCES";
 }
 
+function rawDataBytes(data: RawData): number {
+  if (typeof data === "string") return Buffer.byteLength(data, "utf8");
+  if (Buffer.isBuffer(data)) return data.length;
+  if (Array.isArray(data)) {
+    return data.reduce((sum, chunk) => sum + rawDataBytes(chunk), 0);
+  }
+  if (data instanceof ArrayBuffer) return data.byteLength;
+  return Buffer.byteLength(String(data), "utf8");
+}
+
 export function createSharedSyncListener(options: {
   logger?: SharedSyncListenerLogger;
   bindHost?: string;
@@ -164,17 +176,50 @@ export function createSharedSyncListener(options: {
       }
       return;
     }
-    const bufferedMessages: Array<{ data: RawData; isBinary: boolean }> = [
-      ...(snapshot.bufferedMessages ?? []),
-    ];
+    const bufferedMessages: Array<{ data: RawData; isBinary: boolean }> = [];
+    let bufferedBytes = 0;
+    for (const message of snapshot.bufferedMessages ?? []) {
+      const messageBytes = rawDataBytes(message.data);
+      if (
+        bufferedMessages.length >= PARKED_MESSAGE_BUFFER_LIMIT ||
+        bufferedBytes + messageBytes > PARKED_MESSAGE_BUFFER_BYTES
+      ) {
+        try {
+          ws.close(4002, "Sync host handoff buffer exceeded");
+        } catch {}
+        return;
+      }
+      bufferedMessages.push(message);
+      bufferedBytes += messageBytes;
+    }
     const entry: ParkedEntry = {
       snapshot: { ...snapshot, bufferedMessages },
       bufferedMessages,
+      bufferedBytes,
       onMessage: (data, isBinary) => {
         // Buffer frames that arrive while no host owns the socket so the
         // adopting host can replay them (e.g. a hello sent mid-handoff).
-        if (bufferedMessages.length >= PARKED_MESSAGE_BUFFER_LIMIT) return;
+        const messageBytes = rawDataBytes(data);
+        if (
+          bufferedMessages.length >= PARKED_MESSAGE_BUFFER_LIMIT ||
+          entry.bufferedBytes + messageBytes > PARKED_MESSAGE_BUFFER_BYTES
+        ) {
+          unpark(entry);
+          logger.warn?.("sync_listener.parked_peer_buffer_overflow", {
+            peerDeviceId: snapshot.metadata?.deviceId ?? snapshot.pairedDeviceId ?? null,
+            bufferedMessages: bufferedMessages.length,
+            bufferedBytes: entry.bufferedBytes,
+            nextMessageBytes: messageBytes,
+          });
+          try {
+            ws.close(4002, "Sync host handoff buffer exceeded");
+          } catch {
+            // ignore close failures
+          }
+          return;
+        }
         bufferedMessages.push({ data, isBinary });
+        entry.bufferedBytes += messageBytes;
       },
       onClose: () => {
         const existing = parked.get(ws);
diff --git a/apps/ade-cli/src/services/sync/syncHostService.test.ts b/apps/ade-cli/src/services/sync/syncHostService.test.ts
index a29585809..d8b43ffdd 100644
--- a/apps/ade-cli/src/services/sync/syncHostService.test.ts
+++ b/apps/ade-cli/src/services/sync/syncHostService.test.ts
@@ -8,6 +8,7 @@ import type {
   CrsqlChangeRow,
   SyncMobileProjectSummary,
   SyncPeerMetadata,
+  SyncProjectCatalogPayload,
   SyncRemoteCommandDescriptor,
 } from "../../../../desktop/src/shared/types";
 import {
@@ -15,6 +16,7 @@ import {
   CHAT_EVENT_REPLAY_MAX_EVENTS,
   SYNC_HOST_CHAT_ACTIVE_BACKGROUND_BACKPRESSURE_BYTES,
   buildSyncHostHelloOkPayload,
+  buildSyncProjectCatalogMessages,
   createChatEventReplayBuffer,
   createSyncHostService,
   planChatEventResume,
@@ -222,6 +224,47 @@ describe("buildSyncHostHelloOkPayload", () => {
   });
 });
 
+describe("buildSyncProjectCatalogMessages", () => {
+  it("keeps small catalogs as a single catalog message", () => {
+    const project = createDiscoveryProject({ id: "project-small", rootPath: "/srv/small" });
+
+    expect(buildSyncProjectCatalogMessages({
+      projectCatalog: { projects: [project] },
+      requestId: "catalog-small",
+      compressionThresholdBytes: Number.MAX_SAFE_INTEGER,
+    })).toEqual([{
+      type: "project_catalog",
+      payload: { projects: [project] },
+      requestId: "catalog-small",
+    }]);
+  });
+
+  it("chunks oversized fallback catalogs with stable request metadata", () => {
+    const projects = Array.from({ length: 3 }, (_, index) =>
+      createDiscoveryProject({
+        id: `project-large-${index}`,
+        rootPath: `/srv/${"x".repeat(130_000)}-${index}`,
+      }));
+
+    const messages = buildSyncProjectCatalogMessages({
+      projectCatalog: { projects },
+      requestId: "catalog-large",
+      compressionThresholdBytes: Number.MAX_SAFE_INTEGER,
+      maxProjectCatalogEnvelopeBytes: 512,
+    });
+
+    expect(messages.length).toBeGreaterThan(1);
+    expect(messages.every((message) => message.type === "project_catalog_chunk")).toBe(true);
+    expect(messages.every((message) => message.requestId === "catalog-large")).toBe(true);
+    const payloads = messages.map((message) => message.payload as { catalogId: string; index: number; total: number; done: boolean; projects: SyncMobileProjectSummary[] });
+    expect(new Set(payloads.map((payload) => payload.catalogId)).size).toBe(1);
+    expect(payloads.map((payload) => payload.index)).toEqual([0, 1, 2]);
+    expect(payloads.every((payload) => payload.total === messages.length)).toBe(true);
+    expect(payloads.map((payload) => payload.done)).toEqual([false, false, true]);
+    expect(payloads.flatMap((payload) => payload.projects).map((project) => project.id)).toEqual(projects.map((project) => project.id));
+  });
+});
+
 function makeChange(dbVersion: number, seq: number, value = `value-${seq}`): CrsqlChangeRow {
   return {
     table: "kv",
@@ -1507,6 +1550,262 @@ describe("sync host handoff over a shared listener", () => {
       await listener.close();
     }
   });
+
+  it("closes parked peers when buffered handoff frames exceed the byte budget", async () => {
+    const listener = createSharedSyncListener({ bindHost: "127.0.0.1", parkedPeerGraceMs: 500 });
+    const logger = createDiscoveryLogger();
+    const loggedListener = createSharedSyncListener({
+      logger,
+      bindHost: "127.0.0.1",
+      parkedPeerGraceMs: 500,
+    });
+    let client: WebSocket | null = null;
+    try {
+      await listener.close();
+      const port = await loggedListener.ensureListening([0]);
+      client = new WebSocket(`ws://127.0.0.1:${port}`);
+      const { closeEvents } = trackClientEnvelopes(client);
+      await new Promise<void>((resolve, reject) => {
+        client!.once("open", () => resolve());
+        client!.once("error", reject);
+      });
+      client.send(Buffer.alloc(600 * 1024, "x"));
+
+      const closeEvent = await waitForValue(
+        () => closeEvents[0],
+        "parked byte-budget close",
+      );
+      expect(closeEvent.code).toBe(4002);
+      expect(closeEvent.reason).toBe("Sync host handoff buffer exceeded");
+      expect(logger.warn).toHaveBeenCalledWith(
+        "sync_listener.parked_peer_buffer_overflow",
+        expect.objectContaining({ nextMessageBytes: 600 * 1024 }),
+      );
+    } finally {
+      try {
+        client?.close();
+      } catch {
+        // ignore
+      }
+      await loggedListener.close();
+    }
+  });
+});
+
+describe("sync host reliability guards", () => {
+  beforeEach(() => {
+    publishMock.mockReset();
+    spawnMock.mockReset();
+    bonjourDestroyMock.mockReset();
+    bonjourConstructorMock.mockReset();
+    spawnMock.mockImplementation(() => ({ kill: vi.fn(), once: vi.fn(), unref: vi.fn() }));
+  });
+
+  function createReliabilityHost(
+    projectRoot: string,
+    overrides: Partial<Parameters<typeof createSyncHostService>[0]> = {},
+  ) {
+    const project = createDiscoveryProject({
+      id: "project-1",
+      rootPath: projectRoot,
+      isOpen: true,
+    });
+    const base = createHostArgs(projectRoot, [project]);
+    return createSyncHostService({
+      ...base,
+      projectId: "project-1",
+      db: {
+        sync: {
+          getSiteId: () => "site-host-reliability",
+          getDbVersion: () => 0,
+          exportChangesSince: () => [],
+          applyChanges: () => ({ appliedCount: 0 }),
+          discardUnpublishedChangesForTables: () => {},
+        },
+      },
+      deviceRegistryService: {
+        ...base.deviceRegistryService,
+        upsertPeerMetadata: vi.fn(),
+      },
+      ...overrides,
+    } as unknown as Parameters<typeof createSyncHostService>[0]);
+  }
+
+  it("serializes project switch handling without deadlocking later peer messages", async () => {
+    const { projectRoot, cleanup } = createTempProjectRoot();
+    const project = createDiscoveryProject({
+      id: "project-1",
+      rootPath: projectRoot,
+      isOpen: true,
+    });
+    const prepareProjectConnection = vi.fn(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 50));
+      return { ok: true, project, connection: null };
+    });
+    const completeProjectConnection = vi.fn(async () => {});
+    const host = createReliabilityHost(projectRoot, {
+      projectCatalogProvider: {
+        listProjects: vi.fn(async () => ({ projects: [project] })),
+        prepareProjectConnection,
+        completeProjectConnection,
+      },
+    });
+    let peer: Awaited<ReturnType<typeof connectPeer>> | null = null;
+    try {
+      const port = await host.waitUntilListening();
+      peer = await connectPeer(port, host.getBootstrapToken(), "ios-project-switch");
+
+      peer.ws.send(encodeSyncEnvelope({
+        type: "project_switch_request",
+        requestId: "switch-serialized",
+        payload: { projectId: "project-1" },
+      }));
+      peer.ws.send(encodeSyncEnvelope({
+        type: "project_catalog_request",
+        requestId: "catalog-after-switch",
+        payload: {},
+      }));
+
+      const switchResult = await waitForEnvelope(peer.envelopes, "project_switch_result", "switch-serialized");
+      const catalog = await waitForEnvelope(peer.envelopes, "project_catalog", "catalog-after-switch");
+      expect(switchResult.payload).toMatchObject({ ok: true });
+      expect((catalog.payload as SyncProjectCatalogPayload).projects.map((entry) => entry.id)).toEqual(["project-1"]);
+      expect(completeProjectConnection).toHaveBeenCalledTimes(1);
+    } finally {
+      try {
+        peer?.ws.close();
+      } catch {
+        // ignore
+      }
+      await host.dispose();
+      cleanup();
+    }
+  });
+
+  it("completes a prepared project switch even when result delivery fails", async () => {
+    const { projectRoot, cleanup } = createTempProjectRoot();
+    const project = createDiscoveryProject({
+      id: "project-1",
+      rootPath: projectRoot,
+      isOpen: true,
+    });
+    const completeProjectConnection = vi.fn(async () => {});
+    const host = createReliabilityHost(projectRoot, {
+      projectCatalogProvider: {
+        listProjects: vi.fn(async () => ({ projects: [project] })),
+        prepareProjectConnection: vi.fn(async () => ({ ok: true, project, connection: null })),
+        completeProjectConnection,
+      },
+    });
+    let peer: Awaited<ReturnType<typeof connectPeer>> | null = null;
+    let bufferedAmountSpy: { mockRestore(): void } | null = null;
+    try {
+      const port = await host.waitUntilListening();
+      peer = await connectPeer(port, host.getBootstrapToken(), "ios-project-switch-stall");
+      bufferedAmountSpy = vi
+        .spyOn(WebSocket.prototype, "bufferedAmount", "get")
+        .mockReturnValue(17 * 1024 * 1024);
+
+      peer.ws.send(encodeSyncEnvelope({
+        type: "project_switch_request",
+        requestId: "switch-stalled",
+        payload: { projectId: "project-1" },
+      }));
+
+      await waitForValue(
+        () => completeProjectConnection.mock.calls[0],
+        "project switch completion after send failure",
+      );
+      expect(completeProjectConnection).toHaveBeenCalledWith(
+        { projectId: "project-1" },
+        expect.objectContaining({ ok: true }),
+      );
+    } finally {
+      bufferedAmountSpy?.mockRestore();
+      try {
+        peer?.ws.close();
+      } catch {
+        // ignore
+      }
+      await host.dispose();
+      cleanup();
+    }
+  });
+
+  it("closes peers instead of queueing required sends beyond the byte budget", async () => {
+    const { projectRoot, cleanup } = createTempProjectRoot();
+    const host = createReliabilityHost(projectRoot);
+    let peer: Awaited<ReturnType<typeof connectPeer>> | null = null;
+    let bufferedAmountSpy: { mockRestore(): void } | null = null;
+    try {
+      const port = await host.waitUntilListening();
+      peer = await connectPeer(port, host.getBootstrapToken(), "ios-required-backpressure");
+      bufferedAmountSpy = vi
+        .spyOn(WebSocket.prototype, "bufferedAmount", "get")
+        .mockReturnValue(17 * 1024 * 1024);
+
+      peer.ws.send(encodeSyncEnvelope({
+        type: "file_request",
+        requestId: "required-backpressure",
+        payload: { action: "listWorkspaces", args: {} },
+      }));
+
+      const closeEvent = await waitForValue(
+        () => peer?.closeEvents[0],
+        "required-send backpressure close",
+      );
+      expect(closeEvent.code).toBe(4001);
+      expect(closeEvent.reason).toBe("Required sync response backpressured");
+    } finally {
+      bufferedAmountSpy?.mockRestore();
+      try {
+        peer?.ws.close();
+      } catch {
+        // ignore
+      }
+      await host.dispose();
+      cleanup();
+    }
+  });
+
+  it("rejects oversized artifact reads with a clear file response", async () => {
+    const { projectRoot, cleanup } = createTempProjectRoot();
+    const artifactPath = path.join(projectRoot, ".ade", "artifacts", "large.bin");
+    fs.mkdirSync(path.dirname(artifactPath), { recursive: true });
+    fs.writeFileSync(artifactPath, Buffer.alloc(8 * 1024 * 1024 + 1));
+    const host = createReliabilityHost(projectRoot);
+    let peer: Awaited<ReturnType<typeof connectPeer>> | null = null;
+    try {
+      const port = await host.waitUntilListening();
+      peer = await connectPeer(port, host.getBootstrapToken(), "ios-artifact-cap");
+      peer.ws.send(encodeSyncEnvelope({
+        type: "file_request",
+        requestId: "artifact-large",
+        payload: {
+          action: "readArtifact",
+          args: { path: artifactPath },
+        },
+      }));
+
+      const response = await waitForEnvelope(peer.envelopes, "file_response", "artifact-large");
+      expect(response.payload).toMatchObject({
+        ok: false,
+        action: "readArtifact",
+        error: {
+          code: "file_request_failed",
+        },
+      });
+      expect((response.payload as { error?: { message?: string } }).error?.message).toMatch(/too large to sync/i);
+    } finally {
+      try {
+        peer?.ws.close();
+      } catch {
+        // ignore
+      }
+      await host.dispose();
+      cleanup();
+    }
+  });
 });
 
 describe("chat_subscribe snapshots", () => {
diff --git a/apps/ade-cli/src/services/sync/syncHostService.ts b/apps/ade-cli/src/services/sync/syncHostService.ts
index a48d9770f..cd3df312a 100644
--- a/apps/ade-cli/src/services/sync/syncHostService.ts
+++ b/apps/ade-cli/src/services/sync/syncHostService.ts
@@ -179,6 +179,9 @@ const DEFAULT_TERMINAL_HISTORY_PAGE_BYTES = 262_144;
 const MIN_TERMINAL_HISTORY_PAGE_BYTES = 4_096;
 const MAX_TERMINAL_HISTORY_PAGE_BYTES = 524_288;
 const PEER_BACKPRESSURE_BYTES = 4 * 1024 * 1024;
+const REQUIRED_SEND_MAX_BUFFERED_BYTES = 16 * 1024 * 1024;
+const SEND_AND_WAIT_TIMEOUT_MS = 15_000;
+const MAX_SYNC_ARTIFACT_BYTES = 8 * 1024 * 1024;
 export const SYNC_HOST_CHAT_ACTIVE_BACKGROUND_BACKPRESSURE_BYTES = 512 * 1024;
 export const SYNC_HOST_CHAT_ACTIVE_CHANGESET_BATCH_BYTES = 64 * 1024;
 const MOBILE_COMMAND_RESULT_CACHE_TTL_MS = 30 * 60 * 1000;
@@ -207,6 +210,7 @@ const MAX_CHANGESET_ACK_RETRIES = 6;
 const LANE_PRESENCE_TTL_MS = 60_000;
 const SYNC_MDNS_SERVICE_TYPE = "ade-sync";
 const MAX_PROJECT_CATALOG_ENVELOPE_BYTES = 768 * 1024;
+const MAX_PROJECT_CATALOG_CHUNK_BYTES = 192 * 1024;
 const BONJOUR_PROJECT_TXT_ENTRY_LIMIT = 24;
 const BONJOUR_PROJECT_NAME_MAX_LENGTH = 48;
 export const SYNC_TAILNET_DISCOVERY_SERVICE_NAME = "svc:ade-sync";
@@ -217,6 +221,91 @@ export type NativeLanDiscoveryProcess = {
   ppid: number;
   command: string;
 };
+
+export type SyncProjectCatalogMessage =
+  | {
+      type: "project_catalog";
+      payload: SyncProjectCatalogPayload;
+      requestId?: string | null;
+    }
+  | {
+      type: "project_catalog_chunk";
+      payload: SyncProjectCatalogChunkPayload;
+      requestId?: string | null;
+    };
+
+export function splitSyncProjectCatalog(
+  projects: SyncMobileProjectSummary[],
+  maxChunkBytes = MAX_PROJECT_CATALOG_CHUNK_BYTES,
+): SyncMobileProjectSummary[][] {
+  const chunks: SyncMobileProjectSummary[][] = [];
+  let chunk: SyncMobileProjectSummary[] = [];
+  let chunkBytes = 0;
+
+  const flush = (): void => {
+    if (chunk.length === 0) return;
+    chunks.push(chunk);
+    chunk = [];
+    chunkBytes = 0;
+  };
+
+  for (const project of projects) {
+    const projectBytes = Buffer.byteLength(JSON.stringify(project), "utf8");
+    if (chunk.length > 0 && chunkBytes + projectBytes > maxChunkBytes) {
+      flush();
+    }
+    chunk.push(project);
+    chunkBytes += projectBytes;
+  }
+  flush();
+  return chunks;
+}
+
+export function buildSyncProjectCatalogMessages(args: {
+  projectCatalog: SyncProjectCatalogPayload;
+  requestId?: string | null;
+  compressionThresholdBytes?: number;
+  maxProjectCatalogEnvelopeBytes?: number;
+}): SyncProjectCatalogMessage[] {
+  const requestId = args.requestId ?? null;
+  const envelopeBytes = Buffer.byteLength(encodeSyncEnvelope({
+    type: "project_catalog",
+    payload: args.projectCatalog,
+    requestId,
+    compressionThresholdBytes: args.compressionThresholdBytes,
+  }), "utf8");
+  if (envelopeBytes <= (args.maxProjectCatalogEnvelopeBytes ?? MAX_PROJECT_CATALOG_ENVELOPE_BYTES)) {
+    return [{ type: "project_catalog", payload: args.projectCatalog, requestId }];
+  }
+
+  const chunks = splitSyncProjectCatalog(args.projectCatalog.projects);
+  const total = Math.max(1, chunks.length);
+  const catalogId = randomBytes(8).toString("hex");
+  if (chunks.length === 0) {
+    return [{
+      type: "project_catalog_chunk",
+      payload: {
+        catalogId,
+        index: 0,
+        total,
+        done: true,
+        projects: [],
+      },
+      requestId,
+    }];
+  }
+  return chunks.map((projects, index) => ({
+    type: "project_catalog_chunk",
+    payload: {
+      catalogId,
+      index,
+      total,
+      done: index === total - 1,
+      projects,
+    },
+    requestId,
+  }));
+}
 export function syncFileRequestWorkspaceId(payload: SyncFileRequest): string | null {
   switch (payload.action) {
     case "listTree":
@@ -277,6 +366,7 @@ type PeerState = {
   latencyMs: number | null;
   awaitingHeartbeatAt: string | null;
   missedHeartbeatCount: number;
+  backpressuredSinceMs: number | null;
   remoteAddress: string | null;
   remotePort: number | null;
   subscribedSessionIds: Set<string>;
@@ -291,6 +381,7 @@ type PeerState = {
   rosterSubscribed: boolean;
   rosterSeq: number;
   rosterBaseline: Map<string, string>;
+  messageQueue: Promise<void>;
 };
 
 type PendingChangesetBatch = {
@@ -1110,6 +1201,7 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
     logger: args.logger,
   });
   const heartbeatIntervalMs = Math.max(5_000, Math.floor(args.heartbeatIntervalMs ?? DEFAULT_SYNC_HEARTBEAT_INTERVAL_MS));
+  const backpressureTimeoutMs = Math.max(heartbeatIntervalMs * 3, 10_000);
   const pollIntervalMs = Math.max(100, Math.floor(args.pollIntervalMs ?? DEFAULT_SYNC_POLL_INTERVAL_MS));
   const brainStatusIntervalMs = Math.max(1_000, Math.floor(args.brainStatusIntervalMs ?? DEFAULT_BRAIN_STATUS_INTERVAL_MS));
   const authTimeoutMs = Math.max(1_000, Math.floor(args.authTimeoutMs ?? SYNC_HOST_AUTH_TIMEOUT_MS));
@@ -1117,7 +1209,6 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
   const maxChangesetBatchBytes = DEFAULT_MAX_CHANGESET_BATCH_BYTES;
   const maxChangesetBatchRows = DEFAULT_MAX_CHANGESET_BATCH_ROWS;
   const maxProjectCatalogEnvelopeBytes = MAX_PROJECT_CATALOG_ENVELOPE_BYTES;
-  const maxProjectCatalogChunkBytes = 192 * 1024;
   const hostProjectIdAliases = uniqueStrings(
     (args.projectIdAliases ?? [])
       .map((alias) => toOptionalString(alias))
@@ -1644,6 +1735,15 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
     for (const peer of peers) {
       if (!peer.authenticated || peer.ws.readyState !== WebSocket.OPEN) continue;
       if (isPeerBackpressured(peer)) {
+        if (isPeerBackpressuredTooLong(peer)) {
+          args.logger.warn("sync_host.peer_backpressure_timeout", {
+            peerDeviceId: peer.metadata?.deviceId ?? null,
+            bufferedAmount: peer.ws.bufferedAmount,
+            backpressuredMs: peer.backpressuredSinceMs == null ? null : Date.now() - peer.backpressuredSinceMs,
+          });
+          closeBackpressuredPeer(peer, "Backpressure timed out");
+          continue;
+        }
         args.logger.debug("sync_host.heartbeat_deferred_backpressure", {
           peerDeviceId: peer.metadata?.deviceId ?? null,
           bufferedAmount: peer.ws.bufferedAmount,
@@ -1718,6 +1818,7 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
       latencyMs: null,
       awaitingHeartbeatAt: null,
       missedHeartbeatCount: 0,
+      backpressuredSinceMs: null,
       remoteAddress,
       remotePort,
       subscribedSessionIds: new Set(),
@@ -1728,6 +1829,7 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
       rosterSubscribed: false,
       rosterSeq: 0,
       rosterBaseline: new Map(),
+      messageQueue: Promise.resolve(),
     };
     peers.add(peer);
     peer.authTimeout = setTimeout(() => {
@@ -1744,12 +1846,15 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
     }, authTimeoutMs);
     peer.authTimeout.unref?.();
     ws.on("message", (raw) => {
-      void handleMessage(peer, raw).catch((error) => {
-        args.logger.warn("sync_host.message_failed", {
-          error: error instanceof Error ? error.message : String(error),
-          peerDeviceId: peer.metadata?.deviceId ?? null,
+      peer.messageQueue = peer.messageQueue
+        .catch(() => {})
+        .then(() => handleMessage(peer, raw))
+        .catch((error) => {
+          args.logger.warn("sync_host.message_failed", {
+            error: error instanceof Error ? error.message : String(error),
+            peerDeviceId: peer.metadata?.deviceId ?? null,
+          });
         });
-      });
     });
     ws.on("close", (code, reason) => {
       clearPeerAuthTimeout(peer);
@@ -2419,8 +2524,25 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
   function sendRequired<TPayload>(peer: PeerState, type: SyncEnvelope["type"], payload: TPayload, requestId?: string | null): boolean {
     const ws = peer.ws;
     if (ws.readyState !== WebSocket.OPEN) return false;
+    const frames = encodeFramesFor(peer, type, payload, requestId);
+    const frameBytes = frames.reduce((sum, frame) => sum + Buffer.byteLength(frame, "utf8"), 0);
+    const backpressured = isPeerBackpressured(peer);
+    if (
+      ws.bufferedAmount + frameBytes > REQUIRED_SEND_MAX_BUFFERED_BYTES ||
+      (backpressured && isPeerBackpressuredTooLong(peer))
+    ) {
+      args.logger.warn("sync_host.required_send_backpressured", {
+        type,
+        requestId: requestId ?? null,
+        peerDeviceId: peer.metadata?.deviceId ?? peer.pairedDeviceId ?? null,
+        bufferedAmount: ws.bufferedAmount,
+        frameBytes,
+      });
+      closeBackpressuredPeer(peer, "Required sync response backpressured");
+      return false;
+    }
     let reported = false;
-    for (const frame of encodeFramesFor(peer, type, payload, requestId)) {
+    for (const frame of frames) {
       ws.send(frame, (error) => {
         if (!error || reported) return;
         reported = true;
@@ -2436,7 +2558,27 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
   }
 
   function isPeerBackpressured(peer: PeerState): boolean {
-    return peer.ws.bufferedAmount >= PEER_BACKPRESSURE_BYTES;
+    const backpressured = peer.ws.bufferedAmount >= PEER_BACKPRESSURE_BYTES;
+    if (!backpressured) {
+      peer.backpressuredSinceMs = null;
+      return false;
+    }
+    peer.backpressuredSinceMs ??= Date.now();
+    return true;
+  }
+
+  function closeBackpressuredPeer(peer: PeerState, reason: string): void {
+    try {
+      peer.ws.close(4001, reason);
+    } catch {
+      // ignore close failures
+    }
+  }
+
+  function isPeerBackpressuredTooLong(peer: PeerState): boolean {
+    if (!isPeerBackpressured(peer)) return false;
+    return peer.backpressuredSinceMs != null
+      && Date.now() - peer.backpressuredSinceMs >= backpressureTimeoutMs;
   }
 
   function shouldDeferBackgroundChangesForChat(peer: PeerState): boolean {
@@ -2456,38 +2598,45 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
       return Promise.reject(new Error("Cannot send on closed WebSocket."));
     }
     const frames = encodeFramesFor(ws, type, payload, requestId);
+    const frameBytes = frames.reduce((sum, frame) => sum + Buffer.byteLength(frame, "utf8"), 0);
+    if (ws.bufferedAmount + frameBytes > REQUIRED_SEND_MAX_BUFFERED_BYTES) {
+      return Promise.reject(new Error("WebSocket send buffer is over the required-send budget."));
+    }
     return new Promise<void>((resolve, reject) => {
       let failed = false;
       let remaining = frames.length;
+      const timer = setTimeout(() => {
+        if (failed) return;
+        failed = true;
+        reject(new Error(`Timed out sending ${type} after ${SEND_AND_WAIT_TIMEOUT_MS}ms.`));
+      }, SEND_AND_WAIT_TIMEOUT_MS);
       for (const frame of frames) {
         ws.send(frame, (error) => {
           if (failed) return;
           if (error) {
             failed = true;
+            clearTimeout(timer);
             reject(error);
             return;
           }
           remaining -= 1;
-          if (remaining === 0) resolve();
+          if (remaining === 0) {
+            clearTimeout(timer);
+            resolve();
+          }
         });
       }
     });
   }
 
-  function encodedEnvelopeBytes<TPayload>(
-    type: SyncEnvelope["type"],
-    payload: TPayload,
-    requestId?: string | null,
-  ): number {
-    return Buffer.byteLength(encodeSyncEnvelope({ type, payload, requestId, compressionThresholdBytes }), "utf8");
-  }
-
   function closeExistingPeersForDevice(deviceId: string, currentPeer: PeerState): void {
     const normalized = toOptionalString(deviceId);
     if (!normalized) return;
     for (const peer of peers) {
       if (peer === currentPeer) continue;
       if (peer.metadata?.deviceId !== normalized && peer.pairedDeviceId !== normalized) continue;
+      const presenceDeviceId = peer.metadata?.deviceId ?? peer.pairedDeviceId ?? normalized;
+      const presenceRemoved = removeAllPresenceForDevice(presenceDeviceId, "remote");
       peer.authenticated = false;
       peer.metadata = null;
       peer.authKind = null;
@@ -2498,6 +2647,9 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
       } catch {
         // ignore close failures
       }
+      if (presenceRemoved) {
+        broadcastBrainStatus();
+      }
     }
   }
 
@@ -2564,63 +2716,19 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
     }
   }
 
-  function splitProjectCatalog(projects: SyncMobileProjectSummary[]): SyncMobileProjectSummary[][] {
-    const chunks: SyncMobileProjectSummary[][] = [];
-    let chunk: SyncMobileProjectSummary[] = [];
-    let chunkBytes = 0;
-
-    const flush = (): void => {
-      if (chunk.length === 0) return;
-      chunks.push(chunk);
-      chunk = [];
-      chunkBytes = 0;
-    };
-
-    for (const project of projects) {
-      const projectBytes = Buffer.byteLength(JSON.stringify(project), "utf8");
-      if (chunk.length > 0 && chunkBytes + projectBytes > maxProjectCatalogChunkBytes) {
-        flush();
-      }
-      chunk.push(project);
-      chunkBytes += projectBytes;
-    }
-    flush();
-    return chunks;
-  }
-
   function sendProjectCatalog(
     peer: PeerState,
     projectCatalog: SyncProjectCatalogPayload,
     requestId?: string | null,
   ): void {
-    if (encodedEnvelopeBytes("project_catalog", projectCatalog, requestId) <= maxProjectCatalogEnvelopeBytes) {
-      send(peer.ws, "project_catalog", projectCatalog, requestId);
-      return;
-    }
-
-    const chunks = splitProjectCatalog(projectCatalog.projects);
-    const total = Math.max(1, chunks.length);
-    const catalogId = randomBytes(8).toString("hex");
-    if (chunks.length === 0) {
-      send(peer.ws, "project_catalog_chunk", {
-        catalogId,
-        index: 0,
-        total,
-        done: true,
-        projects: [],
-      } satisfies SyncProjectCatalogChunkPayload, requestId);
-      return;
+    for (const message of buildSyncProjectCatalogMessages({
+      projectCatalog,
+      requestId,
+      compressionThresholdBytes,
+      maxProjectCatalogEnvelopeBytes,
+    })) {
+      send(peer.ws, message.type, message.payload, message.requestId);
     }
-
-    chunks.forEach((projects, index) => {
-      send(peer.ws, "project_catalog_chunk", {
-        catalogId,
-        index,
-        total,
-        done: index === total - 1,
-        projects,
-      } satisfies SyncProjectCatalogChunkPayload, requestId);
-    });
   }
 
   async function handleProjectSwitchRequest(
@@ -3353,10 +3461,29 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
     } catch {
       throw new Error("Artifact path must resolve within .ade/artifacts.");
     }
-    if (!fs.existsSync(resolvedArtifactPath) || !fs.statSync(resolvedArtifactPath).isFile()) {
+    return resolvedArtifactPath;
+  }
+
+  async function readArtifactBlob(
+    request: Extract<SyncFileRequest, { action: "readArtifact" }>["args"],
+  ): Promise<SyncFileBlob> {
+    const artifactPath = resolveArtifactPath(request);
+    let stat: fs.Stats;
+    try {
+      stat = await fs.promises.stat(artifactPath);
+    } catch {
       throw new Error("Artifact file does not exist.");
     }
-    return resolvedArtifactPath;
+    if (!stat.isFile()) {
+      throw new Error("Artifact file does not exist.");
+    }
+    if (stat.size > MAX_SYNC_ARTIFACT_BYTES) {
+      throw new Error(
+        `Artifact is too large to sync (${stat.size} bytes; max ${MAX_SYNC_ARTIFACT_BYTES} bytes).`,
+      );
+    }
+    const buffer = await fs.promises.readFile(artifactPath);
+    return createBlobFromBuffer(normalizeRelative(path.relative(args.projectRoot, artifactPath)), buffer);
   }
 
   function isMobilePeer(peer: PeerState): boolean {
@@ -3453,8 +3580,7 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
           result = await args.fileService.searchText(payload.args);
           break;
         case "readArtifact": {
-          const artifactPath = resolveArtifactPath(payload.args);
-          result = createBlobFromBuffer(normalizeRelative(path.relative(args.projectRoot, artifactPath)), fs.readFileSync(artifactPath));
+          result = await readArtifactBlob(payload.args);
           break;
         }
         default:
@@ -4513,6 +4639,8 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
       for (const peer of peers) {
         if (!peer.authenticated || peer.authKind !== "paired" || peer.pairedDeviceId !== deviceId) continue;
         revokedConnectedPeer = true;
+        const presenceDeviceId = peer.metadata?.deviceId ?? peer.pairedDeviceId ?? deviceId;
+        const presenceRemoved = removeAllPresenceForDevice(presenceDeviceId, "remote");
         peer.authenticated = false;
         peer.metadata = null;
         peer.authKind = null;
@@ -4523,6 +4651,7 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
         } catch {
           // ignore close failures
         }
+        if (presenceRemoved) revokedConnectedPeer = true;
       }
       if (revokedConnectedPeer) {
         args.onStateChanged?.();
diff --git a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
index 197668ebf..81fb5a289 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
@@ -504,6 +504,30 @@ describe("connectToAde embedded mode", () => {
     expect(client.close).toHaveBeenCalledTimes(1);
   });
 
+  it("rechecks the machine socket after taking the spawn lock", async () => {
+    const socketPath = useMissingMachineSocket();
+    const lockPath = path.join(path.dirname(socketPath), `${path.basename(socketPath)}.spawn.lock`);
+    fs.mkdirSync(path.dirname(lockPath), { recursive: true });
+    fs.writeFileSync(lockPath, "stale\n0\n", "utf8");
+    const old = new Date(Date.now() - 60_000);
+    fs.utimesSync(lockPath, old, old);
+    const client = mockAttachedClient();
+    childProcess.spawn.mockImplementation(() => {
+      fs.mkdirSync(path.dirname(socketPath), { recursive: true });
+      fs.writeFileSync(socketPath, "", "utf8");
+      return childProcess.child;
+    });
+
+    const connection = await connectToAde({ project });
+    await connection.close();
+    const secondConnection = await connectToAde({ project });
+    await secondConnection.close();
+
+    expect(childProcess.spawn).toHaveBeenCalledTimes(1);
+    expect(client.request).toHaveBeenCalled();
+    expect(fs.existsSync(lockPath)).toBe(false);
+  });
+
   it("repairs the packaged service before spawning an unmanaged machine daemon", async () => {
     useMissingMachineSocket();
     const installEnvRoles: Array<string | undefined> = [];
@@ -738,6 +762,83 @@ describe("JsonRpcClient", () => {
     }
   });
 
+  it("matches responses whose ids are echoed as strings", async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-jsonrpc-"));
+    const socketPath = path.join(tmpDir, "rpc.sock");
+    const server = net.createServer((socket) => {
+      let buffer = "";
+      socket.on("data", (chunk) => {
+        buffer += chunk.toString("utf8");
+        while (true) {
+          const newline = buffer.indexOf("\n");
+          if (newline < 0) return;
+          const line = buffer.slice(0, newline).trim();
+          buffer = buffer.slice(newline + 1);
+          if (!line) continue;
+          const request = JSON.parse(line) as { id: number; method: string };
+          const response = `${JSON.stringify({
+            jsonrpc: "2.0",
+            id: String(request.id),
+            result: { method: request.method },
+          })}\n`;
+          socket.write(response.slice(0, 13));
+          socket.write(response.slice(13));
+        }
+      });
+    });
+
+    await listenRpc(server, socketPath);
+    const client = await JsonRpcClient.connect(socketPath);
+    try {
+      await expect(client.request("ping")).resolves.toEqual({ method: "ping" });
+    } finally {
+      client.close();
+      await closeServer(server);
+      fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+  });
+
+  it("handles large Content-Length frames split across many chunks", async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-jsonrpc-"));
+    const socketPath = path.join(tmpDir, "rpc.sock");
+    let resolveServerSocket: (socket: net.Socket) => void = () => {};
+    const serverSocketReady = new Promise<net.Socket>((resolve) => {
+      resolveServerSocket = resolve;
+    });
+    const server = net.createServer((socket) => {
+      resolveServerSocket(socket);
+    });
+
+    await listenRpc(server, socketPath);
+    const client = await JsonRpcClient.connect(socketPath);
+    const socket = await serverSocketReady;
+    try {
+      const notification = new Promise((resolve) => {
+        client.onNotification("chat/event", resolve);
+      });
+      const message = "x".repeat(128 * 1024);
+      const payload = JSON.stringify({
+        jsonrpc: "2.0",
+        method: "chat/event",
+        params: { message },
+      });
+      const framed = Buffer.concat([
+        Buffer.from(`Content-Length: ${Buffer.byteLength(payload, "utf8")}\r\n\r\n`, "ascii"),
+        Buffer.from(payload, "utf8"),
+      ]);
+      for (let offset = 0; offset < framed.length; offset += 1024) {
+        socket.write(framed.subarray(offset, offset + 1024));
+      }
+
+      await expect(notification).resolves.toEqual({ message });
+    } finally {
+      client.close();
+      socket.destroy();
+      await closeServer(server);
+      fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+  });
+
   it("fires onClose when the socket drops unexpectedly", async () => {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-jsonrpc-"));
     const socketPath = path.join(tmpDir, "rpc.sock");
@@ -777,6 +878,60 @@ describe("JsonRpcClient", () => {
       fs.rmSync(tmpDir, { recursive: true, force: true });
     }
   });
+
+  it("times out pending requests by tearing down the socket", async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-jsonrpc-"));
+    const socketPath = path.join(tmpDir, "rpc.sock");
+    let resolveServerSocket: (socket: net.Socket) => void = () => {};
+    const serverSocketReady = new Promise<net.Socket>((resolve) => {
+      resolveServerSocket = resolve;
+    });
+    const server = net.createServer((socket) => resolveServerSocket(socket));
+    await listenRpc(server, socketPath);
+    const client = await JsonRpcClient.connect(socketPath);
+    const socket = await serverSocketReady;
+    try {
+      const closed = new Promise<void>((resolve) => client.onClose(resolve));
+      const first = client.request("slow", undefined, { timeoutMs: 25 });
+      const second = client.request("also-slow", undefined, { timeoutMs: 1_000 });
+
+      await expect(first).rejects.toThrow(/timed out/i);
+      await expect(second).rejects.toThrow(/timed out|closed/i);
+      await expect(closed).resolves.toBeUndefined();
+      await expect(client.request("after-timeout")).rejects.toThrow(/closed/i);
+    } finally {
+      client.close();
+      socket.destroy();
+      await closeServer(server);
+      fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+  });
+
+  it("fails the connection on parse garbage instead of continuing", async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-jsonrpc-"));
+    const socketPath = path.join(tmpDir, "rpc.sock");
+    let resolveServerSocket: (socket: net.Socket) => void = () => {};
+    const serverSocketReady = new Promise<net.Socket>((resolve) => {
+      resolveServerSocket = resolve;
+    });
+    const server = net.createServer((socket) => resolveServerSocket(socket));
+    await listenRpc(server, socketPath);
+    const client = await JsonRpcClient.connect(socketPath);
+    const socket = await serverSocketReady;
+    try {
+      const closed = new Promise<void>((resolve) => client.onClose(resolve));
+      const pending = client.request("ping", undefined, { timeoutMs: 1_000 });
+      socket.write("this is not json\n");
+
+      await expect(pending).rejects.toThrow(/Invalid JSON-RPC response|non-JSON output|closed/i);
+      await expect(closed).resolves.toBeUndefined();
+    } finally {
+      client.close();
+      socket.destroy();
+      await closeServer(server);
+      fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+  });
 });
 
 async function loadStateModule(home: string): Promise<typeof import("../state")> {
diff --git a/apps/ade-cli/src/tuiClient/connection.ts b/apps/ade-cli/src/tuiClient/connection.ts
index 254fe3050..33d176ecd 100644
--- a/apps/ade-cli/src/tuiClient/connection.ts
+++ b/apps/ade-cli/src/tuiClient/connection.ts
@@ -58,7 +58,13 @@ type EmbeddedRuntime = {
     ) => () => void;
   };
   eventBuffer?: {
-    drain?: (cursor: number, limit?: number) => { events: BufferedEvent[]; nextCursor: number; hasMore: boolean };
+    drain?: (cursor: number, limit?: number) => {
+      events: BufferedEvent[];
+      nextCursor: number;
+      hasMore: boolean;
+      gap?: boolean;
+      oldestCursor?: number | null;
+    };
     subscribe?: (listener: (event: BufferedEvent) => void) => () => void;
   };
 };
@@ -80,6 +86,9 @@ type CreateEmbeddedRpcRequestHandler = (args: {
   serverVersion: string;
 }) => DirectHandler;
 
+const DAEMON_CONNECT_RETRY_INITIAL_DELAY_MS = 50;
+const DAEMON_CONNECT_RETRY_MAX_DELAY_MS = 200;
+
 const MULTI_PROJECT_RUNTIME_METHODS = new Set([
   "ade/initialize",
   "ade/initialized",
@@ -493,6 +502,50 @@ function spawnDaemon(socketPath: string): boolean {
   return true;
 }
 
+async function withSocketSpawnLock<T>(socketPath: string, task: () => Promise<T>): Promise<T> {
+  if (socketPath.startsWith("tcp://")) return await task();
+  const lockPath = path.join(path.dirname(socketPath), `${path.basename(socketPath)}.spawn.lock`);
+  fs.mkdirSync(path.dirname(lockPath), { recursive: true, mode: 0o700 });
+  const deadline = Date.now() + 10_000;
+  let fd: number | null = null;
+  while (fd == null) {
+    try {
+      fd = fs.openSync(lockPath, "wx", 0o600);
+      fs.writeFileSync(fd, `${process.pid}\n${Date.now()}\n`, "utf8");
+      break;
+    } catch (error) {
+      const code = (error as NodeJS.ErrnoException).code;
+      if (code !== "EEXIST") throw error;
+      try {
+        const stat = fs.statSync(lockPath);
+        if (Date.now() - stat.mtimeMs > 30_000) {
+          fs.unlinkSync(lockPath);
+          continue;
+        }
+      } catch (statError) {
+        if ((statError as NodeJS.ErrnoException).code === "ENOENT") continue;
+      }
+      if (Date.now() >= deadline) {
+        throw new Error(`Timed out waiting for ADE socket spawn lock at ${lockPath}.`);
+      }
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+  }
+
+  try {
+    return await task();
+  } finally {
+    if (fd != null) {
+      try {
+        fs.closeSync(fd);
+      } catch {}
+    }
+    try {
+      fs.unlinkSync(lockPath);
+    } catch {}
+  }
+}
+
 async function connectAttachedSocket(args: {
   socketPath: string;
   project: ProjectLaunchContext;
@@ -620,6 +673,10 @@ async function connectAttachedSocket(args: {
             limit: subscriptionArgs.limit ?? 100,
             replay: subscriptionArgs.replay,
           });
+          if (response && typeof response === "object" && "gap" in response) {
+            const gap = (response as { gap?: unknown }).gap === true;
+            if (gap) pending.length = 0;
+          }
           subscriptionId = response.subscriptionId;
           for (const payload of pending) {
             if (payload.subscriptionId === subscriptionId) {
@@ -666,12 +723,23 @@ async function connectAttachedSocketWithRetry(args: {
     } catch (error) {
       lastError = error;
       if (attempt + 1 >= args.attempts) break;
-      await new Promise((resolve) => setTimeout(resolve, args.delayMs));
+      const delayMs = retryDelayMs(args.delayMs, attempt);
+      if (delayMs > 0) {
+        await new Promise((resolve) => setTimeout(resolve, delayMs));
+      }
     }
   }
   throw lastError instanceof Error ? lastError : new Error(String(lastError));
 }
 
+function retryDelayMs(initialDelayMs: number, attempt: number): number {
+  if (initialDelayMs <= 0) return 0;
+  return Math.min(
+    DAEMON_CONNECT_RETRY_MAX_DELAY_MS,
+    Math.max(0, Math.floor(initialDelayMs * 2 ** attempt)),
+  );
+}
+
 export async function connectToAde(args: {
   project: ProjectLaunchContext;
   forceEmbedded?: boolean;
@@ -724,7 +792,7 @@ export async function connectToAde(args: {
         socketPath: machineSocketPath,
         project: args.project,
         attempts,
-        delayMs: 200,
+        delayMs: DAEMON_CONNECT_RETRY_INITIAL_DELAY_MS,
         shutdownOnStale: true,
       });
     const repairService = async (): Promise<AdeCodeConnection | null> => {
@@ -740,10 +808,13 @@ export async function connectToAde(args: {
     };
     try {
       if (!fs.existsSync(machineSocketPath)) {
-        const repaired = await repairService();
-        if (repaired) return repaired;
-        const spawned = spawnDaemon(machineSocketPath);
-        return await tryDaemon(spawned ? 25 : 1);
+        return await withSocketSpawnLock(machineSocketPath, async () => {
+          if (fs.existsSync(machineSocketPath)) return await tryDaemon(25);
+          const repaired = await repairService();
+          if (repaired) return repaired;
+          const spawned = spawnDaemon(machineSocketPath);
+          return await tryDaemon(spawned ? 25 : 1);
+        });
       }
       return await tryDaemon(1);
     } catch (firstError) {
@@ -753,8 +824,12 @@ export async function connectToAde(args: {
       const repaired = await repairService();
       if (repaired) return repaired;
       try {
-        const spawned = spawnDaemon(machineSocketPath);
+        const spawned = await withSocketSpawnLock(machineSocketPath, async () => {
+          if (fs.existsSync(machineSocketPath)) return false;
+          return spawnDaemon(machineSocketPath);
+        });
         if (spawned) return await tryDaemon(25);
+        return await tryDaemon(25);
       } catch (error) {
         attachError = error;
       }
diff --git a/apps/ade-cli/src/tuiClient/jsonRpcClient.ts b/apps/ade-cli/src/tuiClient/jsonRpcClient.ts
index d5ca02334..ad45f2b12 100644
--- a/apps/ade-cli/src/tuiClient/jsonRpcClient.ts
+++ b/apps/ade-cli/src/tuiClient/jsonRpcClient.ts
@@ -1,13 +1,15 @@
 import net from "node:net";
 
 type PendingRequest = {
+  method: string;
   resolve: (value: unknown) => void;
   reject: (reason: unknown) => void;
+  timer: ReturnType<typeof setTimeout>;
 };
 
 type JsonRpcResponse = {
   jsonrpc: "2.0";
-  id: number | string | null;
+  id?: number | string | null;
   result?: unknown;
   error?: {
     code: number;
@@ -20,13 +22,17 @@ type JsonRpcResponse = {
 
 export class JsonRpcClient {
   private nextId = 1;
-  private buffer = Buffer.alloc(0);
-  private pending = new Map<number, PendingRequest>();
+  private readonly buffer = new RpcByteQueue();
+  private pendingContentLength: number | null = null;
+  private pending = new Map<string, PendingRequest>();
   private notificationHandlers = new Map<string, Set<(params: unknown) => void>>();
   private closeHandlers = new Set<() => void>();
   private closed = false;
 
-  constructor(private readonly socket: net.Socket) {
+  constructor(
+    private readonly socket: net.Socket,
+    private readonly defaultTimeoutMs = 120_000,
+  ) {
     socket.on("data", (chunk: Buffer | string) => this.handleData(chunk));
     socket.on("error", (error) => this.handleSocketClosed(error));
     socket.on("close", () => this.handleSocketClosed(new Error("ADE RPC socket closed.")));
@@ -61,9 +67,20 @@ export class JsonRpcClient {
     });
   }
 
-  request<T = unknown>(method: string, params?: unknown): Promise<T> {
+  request<T = unknown>(
+    method: string,
+    params?: unknown,
+    options: { timeoutMs?: number } = {},
+  ): Promise<T> {
     if (this.closed) return Promise.reject(new Error("ADE RPC socket is closed."));
     const id = this.nextId++;
+    const pendingKey = String(id);
+    let timeoutMs: number;
+    try {
+      timeoutMs = normalizeRpcTimeoutMs(options.timeoutMs ?? this.defaultTimeoutMs);
+    } catch (error) {
+      return Promise.reject(error instanceof Error ? error : new Error(String(error)));
+    }
     const payload = {
       jsonrpc: "2.0",
       id,
@@ -71,13 +88,23 @@ export class JsonRpcClient {
       ...(params !== undefined ? { params } : {}),
     };
     return new Promise<T>((resolve, reject) => {
-      this.pending.set(id, {
+      const timer = setTimeout(() => {
+        if (!this.pending.has(pendingKey)) return;
+        this.failConnection(
+          new Error(`ADE RPC socket timed out waiting for method ${method} (${timeoutMs}ms).`),
+        );
+      }, timeoutMs);
+      this.pending.set(pendingKey, {
+        method,
         resolve: (value) => resolve(value as T),
         reject,
+        timer,
       });
       this.socket.write(`${JSON.stringify(payload)}\n`, "utf8", (error) => {
         if (!error) return;
-        this.pending.delete(id);
+        const pending = this.pending.get(pendingKey);
+        if (pending) clearTimeout(pending.timer);
+        this.pending.delete(pendingKey);
         reject(error);
       });
     });
@@ -108,9 +135,20 @@ export class JsonRpcClient {
   }
 
   private handleSocketClosed(error: Error): void {
+    this.failConnection(error);
+  }
+
+  private failConnection(error: Error): void {
     const wasClosed = this.closed;
     this.closed = true;
     this.rejectAll(error);
+    if (!wasClosed) {
+      try {
+        this.socket.destroy();
+      } catch {
+        // Socket teardown is best-effort after pending requests are rejected.
+      }
+    }
     if (wasClosed) return;
     for (const handler of [...this.closeHandlers]) {
       try {
@@ -132,20 +170,25 @@ export class JsonRpcClient {
   }
 
   private handleData(chunk: Buffer | string): void {
-    this.buffer = Buffer.concat([
-      this.buffer,
-      Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, "utf8"),
-    ]);
+    if (this.closed) return;
+    this.buffer.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, "utf8"));
     while (true) {
-      const next = this.takeNextPayload();
+      let next: string | null;
+      try {
+        next = this.takeNextPayload();
+      } catch (error) {
+        this.failConnection(error instanceof Error ? error : new Error(String(error)));
+        return;
+      }
       if (!next) return;
       const line = next.trim();
       if (!line) continue;
       let parsed: JsonRpcResponse | JsonRpcResponse[] | null = null;
       try {
         parsed = JSON.parse(line) as JsonRpcResponse | JsonRpcResponse[];
-      } catch {
-        continue;
+      } catch (error) {
+        this.failConnection(new Error(`Failed to parse ADE RPC response: ${error instanceof Error ? error.message : String(error)}`));
+        return;
       }
       const responses = Array.isArray(parsed) ? parsed : [parsed];
       for (const response of responses) this.handleResponse(response);
@@ -153,42 +196,69 @@ export class JsonRpcClient {
   }
 
   private takeNextPayload(): string | null {
-    while (this.buffer.length && /\s/.test(String.fromCharCode(this.buffer[0]!))) {
-      this.buffer = this.buffer.subarray(1);
+    if (this.pendingContentLength != null) {
+      return this.takeContentLengthBody();
+    }
+    while (this.buffer.length) {
+      const byte = this.buffer.peekByte(0);
+      if (byte == null || !isAsciiWhitespace(byte)) break;
+      this.buffer.discard(1);
     }
     if (!this.buffer.length) return null;
-    const first = String.fromCharCode(this.buffer[0]!);
-    if (first === "{" || first === "[") {
+    const first = this.buffer.peekByte(0);
+    if (first === 0x7b || first === 0x5b) {
       const idx = this.buffer.indexOf(0x0a);
-      if (idx < 0) return null;
-      const payload = this.buffer.subarray(0, idx).toString("utf8");
-      this.buffer = this.buffer.subarray(idx + 1);
+      if (idx < 0) {
+        if (this.buffer.length > MAX_RPC_BUFFER_BYTES) {
+          throw new Error(`ADE RPC socket sent an oversized partial frame (> ${MAX_RPC_BUFFER_BYTES} bytes).`);
+        }
+        return null;
+      }
+      if (idx > MAX_RPC_BUFFER_BYTES) {
+        throw new Error(`ADE RPC socket sent an oversized JSON line (> ${MAX_RPC_BUFFER_BYTES} bytes).`);
+      }
+      const payload = this.buffer.consume(idx).toString("utf8");
+      this.buffer.discard(1);
       return payload;
     }
+    const probe = this.buffer.peekAscii(Math.min(this.buffer.length, CONTENT_LENGTH_PREFIX.length)).toLowerCase();
+    if (!CONTENT_LENGTH_PREFIX.startsWith(probe)) {
+      throw new Error("ADE RPC socket sent non-JSON output.");
+    }
 
-    const crlfBoundary = this.buffer.indexOf("\r\n\r\n");
-    const lfBoundary = this.buffer.indexOf("\n\n");
+    const crlfBoundary = this.buffer.indexOfSequence(CRLF_HEADER_BOUNDARY);
+    const lfBoundary = this.buffer.indexOfSequence(LF_HEADER_BOUNDARY);
     let boundary: { index: number; length: number } | null = null;
     if (crlfBoundary >= 0) boundary = { index: crlfBoundary, length: 4 };
     else if (lfBoundary >= 0) boundary = { index: lfBoundary, length: 2 };
+    if (!boundary && this.buffer.length > MAX_RPC_HEADER_BYTES) {
+      throw new Error(`ADE RPC socket sent an oversized Content-Length header (> ${MAX_RPC_HEADER_BYTES} bytes).`);
+    }
     if (!boundary) return null;
-    const header = this.buffer.subarray(0, boundary.index).toString("ascii");
+    const header = this.buffer.consume(boundary.index).toString("ascii");
+    this.buffer.discard(boundary.length);
     const match = /^content-length\s*:\s*(\d+)\s*$/im.exec(header);
     if (!match) {
-      this.buffer = this.buffer.subarray(boundary.index + boundary.length);
-      return "";
+      throw new Error("ADE RPC socket sent a malformed Content-Length frame.");
     }
     const length = Number.parseInt(match[1]!, 10);
-    const bodyStart = boundary.index + boundary.length;
-    const bodyEnd = bodyStart + length;
-    if (this.buffer.length < bodyEnd) return null;
-    const payload = this.buffer.subarray(bodyStart, bodyEnd).toString("utf8");
-    this.buffer = this.buffer.subarray(bodyEnd);
-    return payload;
+    if (!Number.isFinite(length) || length < 0 || length > MAX_RPC_BUFFER_BYTES) {
+      throw new Error(`ADE RPC socket sent an oversized Content-Length frame (${length} bytes).`);
+    }
+    this.pendingContentLength = length;
+    return this.takeContentLengthBody();
+  }
+
+  private takeContentLengthBody(): string | null {
+    const length = this.pendingContentLength;
+    if (length == null) return null;
+    if (this.buffer.length < length) return null;
+    this.pendingContentLength = null;
+    return this.buffer.consume(length).toString("utf8");
   }
 
   private handleResponse(response: JsonRpcResponse): void {
-    if (typeof response.id !== "number") {
+    if (response.id == null) {
       if (typeof response.method === "string") {
         for (const handler of this.notificationHandlers.get(response.method) ?? []) {
           handler(response.params);
@@ -196,9 +266,11 @@ export class JsonRpcClient {
       }
       return;
     }
-    const pending = this.pending.get(response.id);
+    const pendingKey = String(response.id);
+    const pending = this.pending.get(pendingKey);
     if (!pending) return;
-    this.pending.delete(response.id);
+    this.pending.delete(pendingKey);
+    clearTimeout(pending.timer);
     if (response.error) {
       pending.reject(new Error(response.error.message));
       return;
@@ -208,8 +280,135 @@ export class JsonRpcClient {
 
   private rejectAll(error: Error): void {
     for (const pending of this.pending.values()) {
+      clearTimeout(pending.timer);
       pending.reject(error);
     }
     this.pending.clear();
   }
 }
+
+const MAX_RPC_BUFFER_BYTES = 16 * 1024 * 1024;
+const MAX_RPC_HEADER_BYTES = 64 * 1024;
+const MAX_RPC_TIMEOUT_MS = 2_147_483_647;
+const CONTENT_LENGTH_PREFIX = "content-length";
+const CRLF_HEADER_BOUNDARY = Buffer.from("\r\n\r\n", "ascii");
+const LF_HEADER_BOUNDARY = Buffer.from("\n\n", "ascii");
+
+class RpcByteQueue {
+  private chunks: Buffer[] = [];
+  private bytes = 0;
+
+  get length(): number {
+    return this.bytes;
+  }
+
+  push(chunk: Buffer): void {
+    if (!chunk.length) return;
+    this.chunks.push(chunk);
+    this.bytes += chunk.length;
+  }
+
+  peekByte(offset: number): number | undefined {
+    if (offset < 0 || offset >= this.bytes) return undefined;
+    let cursor = offset;
+    for (const chunk of this.chunks) {
+      if (cursor < chunk.length) return chunk[cursor];
+      cursor -= chunk.length;
+    }
+    return undefined;
+  }
+
+  peekAscii(length: number): string {
+    const clamped = Math.max(0, Math.min(length, this.bytes));
+    if (clamped === 0) return "";
+    const bytes = Buffer.allocUnsafe(clamped);
+    for (let index = 0; index < clamped; index += 1) {
+      bytes[index] = this.peekByte(index) ?? 0;
+    }
+    return bytes.toString("ascii");
+  }
+
+  indexOf(byte: number): number {
+    let offset = 0;
+    for (const chunk of this.chunks) {
+      const index = chunk.indexOf(byte);
+      if (index >= 0) return offset + index;
+      offset += chunk.length;
+    }
+    return -1;
+  }
+
+  indexOfSequence(sequence: Buffer): number {
+    if (sequence.length === 0) return 0;
+    if (this.bytes < sequence.length) return -1;
+    const maxStart = this.bytes - sequence.length;
+    for (let start = 0; start <= maxStart; start += 1) {
+      let matched = true;
+      for (let offset = 0; offset < sequence.length; offset += 1) {
+        if (this.peekByte(start + offset) !== sequence[offset]) {
+          matched = false;
+          break;
+        }
+      }
+      if (matched) return start;
+    }
+    return -1;
+  }
+
+  consume(length: number): Buffer {
+    const clamped = Math.max(0, Math.min(length, this.bytes));
+    if (clamped === 0) return Buffer.alloc(0);
+    if (this.chunks.length === 1 && clamped === this.chunks[0]!.length) {
+      const only = this.chunks.shift()!;
+      this.bytes = 0;
+      return only;
+    }
+
+    const parts: Buffer[] = [];
+    let remaining = clamped;
+    while (remaining > 0 && this.chunks.length > 0) {
+      const first = this.chunks[0]!;
+      if (remaining < first.length) {
+        parts.push(first.subarray(0, remaining));
+        this.chunks[0] = first.subarray(remaining);
+        this.bytes -= remaining;
+        remaining = 0;
+      } else {
+        parts.push(first);
+        this.chunks.shift();
+        this.bytes -= first.length;
+        remaining -= first.length;
+      }
+    }
+    return parts.length === 1 ? parts[0]! : Buffer.concat(parts, clamped);
+  }
+
+  discard(length: number): void {
+    let remaining = Math.max(0, Math.min(length, this.bytes));
+    while (remaining > 0 && this.chunks.length > 0) {
+      const first = this.chunks[0]!;
+      if (remaining < first.length) {
+        this.chunks[0] = first.subarray(remaining);
+        this.bytes -= remaining;
+        return;
+      }
+      this.chunks.shift();
+      this.bytes -= first.length;
+      remaining -= first.length;
+    }
+  }
+}
+
+function isAsciiWhitespace(byte: number): boolean {
+  return byte === 0x20 || byte === 0x09 || byte === 0x0a || byte === 0x0d;
+}
+
+function normalizeRpcTimeoutMs(value: number): number {
+  const timeoutMs = Number(value);
+  if (!Number.isFinite(timeoutMs) || timeoutMs <= 0 || timeoutMs > MAX_RPC_TIMEOUT_MS) {
+    throw new Error(
+      `ADE RPC timeout must be a finite positive number no greater than ${MAX_RPC_TIMEOUT_MS}.`,
+    );
+  }
+  return Math.ceil(timeoutMs);
+}
diff --git a/apps/ade-cli/src/tuiClient/remoteLauncher.ts b/apps/ade-cli/src/tuiClient/remoteLauncher.ts
index f41dc5ffd..d23e4b5c9 100644
--- a/apps/ade-cli/src/tuiClient/remoteLauncher.ts
+++ b/apps/ade-cli/src/tuiClient/remoteLauncher.ts
@@ -1,5 +1,8 @@
 import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
 import net, { type AddressInfo } from "node:net";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
 import readline from "node:readline";
 import readlinePromises from "node:readline/promises";
 import { RemoteTargetRegistry, normalizeRemoteTargetRoutes } from "../../../desktop/src/main/services/remoteRuntime/remoteTargetRegistry";
@@ -24,9 +27,21 @@ type JsonRpcResponse = {
   params?: unknown;
 };
 
+type InitializeResponse = {
+  runtimeInfo?: {
+    version?: string | null;
+    multiProject?: boolean;
+  };
+  capabilities?: {
+    projects?: boolean;
+  };
+};
+
 type PendingRequest = {
+  method: string;
   resolve: (value: unknown) => void;
   reject: (reason: unknown) => void;
+  timer: ReturnType<typeof setTimeout>;
 };
 
 type RemoteRuntimeLayout = {
@@ -84,11 +99,47 @@ type RemoteSessionChoice = {
 export type RunAdeCodeCli = (argv: string[]) => Promise<number>;
 
 const REMOTE_RPC_TIMEOUT_MS = 20_000;
+const REMOTE_RPC_REQUEST_TIMEOUT_MS = 120_000;
+const MAX_RPC_BUFFER_BYTES = 16 * 1024 * 1024;
+const MAX_STDERR_TAIL_BYTES = 32 * 1024;
 
 function errorMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
 
+class ByteRingBuffer {
+  private chunks: Buffer[] = [];
+  private bytes = 0;
+
+  constructor(private readonly maxBytes: number) {}
+
+  push(chunk: Buffer | string): void {
+    const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, "utf8");
+    if (this.maxBytes <= 0) return;
+    this.chunks.push(buffer);
+    this.bytes += buffer.length;
+    while (this.bytes > this.maxBytes && this.chunks.length > 0) {
+      const first = this.chunks[0]!;
+      const overflow = this.bytes - this.maxBytes;
+      if (overflow >= first.length) {
+        this.chunks.shift();
+        this.bytes -= first.length;
+      } else {
+        this.chunks[0] = first.subarray(overflow);
+        this.bytes -= overflow;
+      }
+    }
+  }
+
+  text(): string {
+    return Buffer.concat(this.chunks, this.bytes).toString("utf8").trim();
+  }
+
+  tailLines(limit = 8): string {
+    return this.text().split(/\r?\n/).filter(Boolean).slice(-limit).join("\n");
+  }
+}
+
 function isRecord(value: unknown): value is Record<string, unknown> {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
@@ -105,6 +156,37 @@ function readFlagValue(argv: string[], index: number, flag: string): string {
   return value;
 }
 
+function localCliVersion(): string {
+  const envVersion = process.env.ADE_CLI_VERSION?.trim();
+  if (envVersion) return envVersion;
+  let cursor = process.cwd();
+  while (true) {
+    const candidate = path.join(cursor, "package.json");
+    try {
+      const packageJson = JSON.parse(fs.readFileSync(candidate, "utf8")) as {
+        name?: unknown;
+        version?: unknown;
+      };
+      if (packageJson.name === "ade-cli" && typeof packageJson.version === "string" && packageJson.version.trim()) {
+        return packageJson.version.trim();
+      }
+    } catch {}
+    const parent = path.dirname(cursor);
+    if (parent === cursor) break;
+    cursor = parent;
+  }
+  try {
+    const packageJson = JSON.parse(
+      fs.readFileSync(path.resolve("apps/ade-cli/package.json"), "utf8"),
+    ) as { version?: unknown };
+    return typeof packageJson.version === "string" && packageJson.version.trim()
+      ? packageJson.version.trim()
+      : "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
+
 export function parseRemoteAdeCodeArgs(argv: string[]): RemoteCliOptions {
   const options: RemoteCliOptions = {
     help: false,
@@ -503,13 +585,13 @@ class ProcessJsonRpcClient {
   private nextId = 1;
   private buffer = Buffer.alloc(0);
   private readonly pending = new Map<number | string, PendingRequest>();
-  private readonly stderrChunks: Buffer[] = [];
+  private readonly stderrTail = new ByteRingBuffer(MAX_STDERR_TAIL_BYTES);
   private closed = false;
 
   constructor(private readonly child: ChildProcessWithoutNullStreams) {
     child.stdout.on("data", (chunk: Buffer | string) => this.handleData(chunk));
     child.stderr.on("data", (chunk: Buffer | string) => {
-      this.stderrChunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, "utf8"));
+      this.stderrTail.push(chunk);
     });
     child.on("error", (error) => this.handleClosed(error));
     child.on("close", (code, signal) => {
@@ -527,12 +609,23 @@ class ProcessJsonRpcClient {
       ...(params !== undefined ? { params } : {}),
     };
     return new Promise<T>((resolve, reject) => {
+      const timer = setTimeout(() => {
+        if (!this.pending.has(id)) return;
+        this.handleClosed(
+          new Error(`Remote ADE RPC timed out waiting for method ${method} (${REMOTE_RPC_REQUEST_TIMEOUT_MS}ms).`),
+        );
+        this.child.kill();
+      }, REMOTE_RPC_REQUEST_TIMEOUT_MS);
       this.pending.set(id, {
+        method,
         resolve: (value) => resolve(value as T),
         reject,
+        timer,
       });
       this.child.stdin.write(`${JSON.stringify(payload)}\n`, "utf8", (error) => {
         if (!error) return;
+        const pending = this.pending.get(id);
+        if (pending) clearTimeout(pending.timer);
         this.pending.delete(id);
         reject(error);
       });
@@ -548,9 +641,7 @@ class ProcessJsonRpcClient {
   }
 
   private closeMessage(code: number | null, signal: NodeJS.Signals | null): string {
-    const detail = this.stderrChunks.length
-      ? Buffer.concat(this.stderrChunks).toString("utf8").trim().split("\n").slice(-4).join("\n")
-      : "";
+    const detail = this.stderrTail.tailLines(8);
     const status = signal ? `signal ${signal}` : `code ${code ?? "unknown"}`;
     return detail
       ? `Remote ADE RPC exited with ${status}: ${detail}`
@@ -564,20 +655,35 @@ class ProcessJsonRpcClient {
   }
 
   private handleData(chunk: Buffer | string): void {
+    if (this.closed) return;
     this.buffer = Buffer.concat([
       this.buffer,
       Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, "utf8"),
     ]);
+    if (this.buffer.length > MAX_RPC_BUFFER_BYTES) {
+      this.handleClosed(new Error(`Remote ADE RPC sent an oversized partial frame (> ${MAX_RPC_BUFFER_BYTES} bytes).`));
+      this.child.kill();
+      return;
+    }
     while (true) {
-      const next = this.takeNextPayload();
+      let next: string | null;
+      try {
+        next = this.takeNextPayload();
+      } catch (error) {
+        this.handleClosed(error instanceof Error ? error : new Error(String(error)));
+        this.child.kill();
+        return;
+      }
       if (!next) return;
       const payload = next.trim();
       if (!payload) continue;
       let parsed: JsonRpcResponse | JsonRpcResponse[] | null = null;
       try {
         parsed = JSON.parse(payload) as JsonRpcResponse | JsonRpcResponse[];
-      } catch {
-        continue;
+      } catch (error) {
+        this.handleClosed(new Error(`Failed to parse remote ADE RPC response: ${error instanceof Error ? error.message : String(error)}`));
+        this.child.kill();
+        return;
       }
       const responses = Array.isArray(parsed) ? parsed : [parsed];
       for (const response of responses) this.handleResponse(response);
@@ -593,10 +699,17 @@ class ProcessJsonRpcClient {
     if (first === "{" || first === "[") {
       const idx = this.buffer.indexOf(0x0a);
       if (idx < 0) return null;
+      if (idx > MAX_RPC_BUFFER_BYTES) {
+        throw new Error(`Remote ADE RPC sent an oversized JSON line (> ${MAX_RPC_BUFFER_BYTES} bytes).`);
+      }
       const payload = this.buffer.subarray(0, idx).toString("utf8");
       this.buffer = this.buffer.subarray(idx + 1);
       return payload;
     }
+    const probe = this.buffer.subarray(0, Math.min(this.buffer.length, "content-length".length)).toString("ascii").toLowerCase();
+    if (!"content-length".startsWith(probe)) {
+      throw new Error("Remote ADE RPC sent non-JSON output on stdout.");
+    }
 
     const crlfBoundary = this.buffer.indexOf("\r\n\r\n");
     const lfBoundary = this.buffer.indexOf("\n\n");
@@ -607,10 +720,12 @@ class ProcessJsonRpcClient {
     const header = this.buffer.subarray(0, boundary.index).toString("ascii");
     const match = /^content-length\s*:\s*(\d+)\s*$/im.exec(header);
     if (!match) {
-      this.buffer = this.buffer.subarray(boundary.index + boundary.length);
-      return "";
+      throw new Error("Remote ADE RPC sent a malformed Content-Length frame.");
     }
     const length = Number.parseInt(match[1]!, 10);
+    if (!Number.isFinite(length) || length < 0 || length > MAX_RPC_BUFFER_BYTES) {
+      throw new Error(`Remote ADE RPC sent an oversized Content-Length frame (${length} bytes).`);
+    }
     const bodyStart = boundary.index + boundary.length;
     const bodyEnd = bodyStart + length;
     if (this.buffer.length < bodyEnd) return null;
@@ -633,6 +748,7 @@ class ProcessJsonRpcClient {
 
   private rejectAll(error: Error): void {
     for (const pending of this.pending.values()) {
+      clearTimeout(pending.timer);
       pending.reject(error);
     }
     this.pending.clear();
@@ -640,14 +756,35 @@ class ProcessJsonRpcClient {
 }
 
 async function initializeRemoteRpc(client: ProcessJsonRpcClient): Promise<void> {
-  await client.request("ade/initialize", {
+  const initialize = await client.request<InitializeResponse>("ade/initialize", {
     protocolVersion: "2025-06-18",
     clientName: "ade-code-remote",
+    clientInfo: { name: "ade-code-remote", version: localCliVersion() },
     identity: {
       role: "cto",
       callerId: `ade-code-remote:${process.pid}`,
     },
   });
+  const remoteVersion = typeof initialize?.runtimeInfo?.version === "string"
+    ? initialize.runtimeInfo.version.trim()
+    : "";
+  const localVersion = localCliVersion();
+  if (
+    remoteVersion &&
+    localVersion &&
+    remoteVersion !== "0.0.0" &&
+    localVersion !== "0.0.0" &&
+    remoteVersion !== localVersion
+  ) {
+    process.stderr.write(
+      `Warning: remote ADE is ${remoteVersion}, local ADE Code is ${localVersion}; continuing because required RPC capabilities are present.\n`,
+    );
+  }
+  if (initialize?.runtimeInfo?.multiProject !== true && initialize?.capabilities?.projects !== true) {
+    throw new Error(
+      `Remote ADE service ${remoteVersion || "unknown"} does not support the projects capability required by ade code remote. Update ADE on the remote machine.`,
+    );
+  }
   await client.request("ade/initialized");
 }
 
@@ -1024,26 +1161,82 @@ function printSessions(sessions: RemoteSessionChoice[]): void {
   }
 }
 
-async function startRemoteBridge(attempt: RemoteRpcAttempt): Promise<RemoteBridge> {
+async function startRemoteBridge(target: RemoteRuntimeTarget): Promise<RemoteBridge> {
+  const activeSockets = new Set<net.Socket>();
+  const activeChildren = new Set<ChildProcessWithoutNullStreams>();
+  const bridgeDir = process.platform === "win32"
+    ? null
+    : fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-remote-"));
+  if (bridgeDir) {
+    try {
+      fs.chmodSync(bridgeDir, 0o700);
+    } catch {}
+  }
+  const bridgeSocketPath = bridgeDir ? path.join(bridgeDir, "bridge.sock") : null;
+  let closing = false;
+
+  const currentTarget = (): RemoteRuntimeTarget => {
+    try {
+      return new RemoteTargetRegistry().get(target.id) ?? target;
+    } catch {
+      return target;
+    }
+  };
+
+  const selectBridgeAttempt = async (): Promise<RemoteRpcAttempt> => {
+    const session = await openRemoteRpcSession(currentTarget());
+    const attempt = session.attempt;
+    session.client.close();
+    return attempt;
+  };
+
   const server = net.createServer((socket) => {
-    const child = spawnRemoteRpcProcess(attempt);
+    activeSockets.add(socket);
+    socket.pause();
+    let child: ChildProcessWithoutNullStreams | null = null;
     let settled = false;
-    const teardown = (): void => {
+    const stderrTail = new ByteRingBuffer(MAX_STDERR_TAIL_BYTES);
+    const teardown = (reason?: string): void => {
       if (settled) return;
       settled = true;
+      activeSockets.delete(socket);
+      if (child) activeChildren.delete(child);
+      if (!closing && reason) {
+        const detail = stderrTail.tailLines(8);
+        process.stderr.write(
+          detail
+            ? `Remote ADE bridge closed: ${reason}\n${detail}\n`
+            : `Remote ADE bridge closed: ${reason}\n`,
+        );
+      }
       socket.destroy();
-      child.stdin.destroy();
-      child.stdout.destroy();
-      child.stderr.destroy();
-      child.kill();
+      if (child) {
+        child.stdin.destroy();
+        child.stdout.destroy();
+        child.stderr.destroy();
+        child.kill();
+      }
     };
-    socket.on("error", teardown);
-    socket.on("close", teardown);
-    child.on("error", teardown);
-    child.on("close", teardown);
-    child.stderr.resume();
-    socket.pipe(child.stdin);
-    child.stdout.pipe(socket);
+    socket.on("error", (error) => teardown(error.message));
+    socket.on("close", () => teardown());
+    void selectBridgeAttempt()
+      .then((attempt) => {
+        if (settled || closing) return;
+        child = spawnRemoteRpcProcess(attempt);
+        activeChildren.add(child);
+        child.stderr.on("data", (chunk: Buffer | string) => stderrTail.push(chunk));
+        child.on("error", (error) => teardown(error.message));
+        child.on("close", (code, signal) => {
+          const status = signal ? `signal ${signal}` : `code ${code ?? "unknown"}`;
+          teardown(`ssh child exited with ${status}`);
+        });
+        socket.pipe(child.stdin);
+        child.stdout.pipe(socket);
+        socket.resume();
+      })
+      .catch((error) => {
+        teardown(error instanceof Error ? error.message : String(error));
+      });
   });
   server.maxConnections = 1;
 
@@ -1062,17 +1255,42 @@ async function startRemoteBridge(attempt: RemoteRpcAttempt): Promise<RemoteBridg
     };
     server.once("listening", onListening);
     server.once("error", onError);
-    server.listen(0, "127.0.0.1");
+    if (bridgeSocketPath) server.listen(bridgeSocketPath);
+    else server.listen(0, "127.0.0.1");
   });
 
-  const address = server.address() as AddressInfo | null;
-  if (!address) {
-    throw new Error("Remote bridge did not bind a local port.");
+  let socketUrl: string;
+  if (bridgeSocketPath) {
+    socketUrl = bridgeSocketPath;
+  } else {
+    const address = server.address() as AddressInfo | null;
+    if (!address) {
+      throw new Error("Remote bridge did not bind a local port.");
+    }
+    socketUrl = `tcp://127.0.0.1:${address.port}`;
   }
   return {
-    socketUrl: `tcp://127.0.0.1:${address.port}`,
+    socketUrl,
     close: async () => {
+      closing = true;
+      for (const socket of [...activeSockets]) socket.destroy();
+      for (const child of [...activeChildren]) {
+        child.stdin.destroy();
+        child.stdout.destroy();
+        child.stderr.destroy();
+        child.kill();
+      }
       await new Promise<void>((resolve) => server.close(() => resolve()));
+      if (bridgeSocketPath) {
+        try {
+          fs.unlinkSync(bridgeSocketPath);
+        } catch {}
+      }
+      if (bridgeDir) {
+        try {
+          fs.rmdirSync(bridgeDir);
+        } catch {}
+      }
     },
   };
 }
@@ -1141,7 +1359,7 @@ export async function runAdeCodeRemote(argv: string[], runAdeCodeCli: RunAdeCode
     }
 
     remote.client.close();
-    bridge = await startRemoteBridge(remote.attempt);
+    bridge = await startRemoteBridge(target);
     process.stderr.write(
       `Connecting ADE Code to ${target.name} · ${project.displayName}${session ? ` · ${session.title}` : ""}\n`,
     );
diff --git a/apps/desktop/src/main/services/ipc/runtimeBridge.ts b/apps/desktop/src/main/services/ipc/runtimeBridge.ts
index 436e90739..ed0b9988e 100644
--- a/apps/desktop/src/main/services/ipc/runtimeBridge.ts
+++ b/apps/desktop/src/main/services/ipc/runtimeBridge.ts
@@ -96,7 +96,7 @@ type RuntimeEventWindowSubscription = {
 
 type RuntimeEventSubscriptionInit = Pick<
   RemoteRuntimeStreamEventsResult,
-  "nextCursor" | "hasMore" | "eventEpoch"
+  "nextCursor" | "hasMore" | "eventEpoch" | "gap" | "oldestCursor"
 >;
 
 type RuntimeEventSubscribe = (
@@ -1016,6 +1016,8 @@ export function registerRuntimeBridge({
           nextCursor: subscriptionInit?.nextCursor ?? request.cursor ?? 0,
           hasMore: subscriptionInit?.hasMore === true,
           ...(subscriptionInit?.eventEpoch ? { eventEpoch: subscriptionInit.eventEpoch } : {}),
+          ...(subscriptionInit?.gap === true ? { gap: true } : {}),
+          ...(typeof subscriptionInit?.oldestCursor === "number" ? { oldestCursor: subscriptionInit.oldestCursor } : {}),
         };
       }
       return await localRuntimeConnectionPool.streamEventsForRoot(
@@ -1075,6 +1077,8 @@ export function registerRuntimeBridge({
           nextCursor: subscriptionInit?.nextCursor ?? request.cursor ?? 0,
           hasMore: subscriptionInit?.hasMore === true,
           ...(subscriptionInit?.eventEpoch ? { eventEpoch: subscriptionInit.eventEpoch } : {}),
+          ...(subscriptionInit?.gap === true ? { gap: true } : {}),
+          ...(typeof subscriptionInit?.oldestCursor === "number" ? { oldestCursor: subscriptionInit.oldestCursor } : {}),
         };
       }
       const result = await remoteConnectionService.streamEvents(
diff --git a/apps/desktop/src/main/services/localRuntime/localRuntimeConnectionPool.ts b/apps/desktop/src/main/services/localRuntime/localRuntimeConnectionPool.ts
index 4e11d2341..1857beb06 100644
--- a/apps/desktop/src/main/services/localRuntime/localRuntimeConnectionPool.ts
+++ b/apps/desktop/src/main/services/localRuntime/localRuntimeConnectionPool.ts
@@ -1136,6 +1136,10 @@ export class LocalRuntimeConnectionPool {
           : clampCursor(request.cursor),
         hasMore: record.hasMore === true,
         ...(eventEpoch ? { eventEpoch } : {}),
+        ...(record.gap === true ? { gap: true } : {}),
+        ...(typeof record.oldestCursor === "number" && Number.isFinite(record.oldestCursor)
+          ? { oldestCursor: Math.max(0, Math.floor(record.oldestCursor)) }
+          : {}),
       };
     }
 
@@ -1851,6 +1855,10 @@ function normalizeRuntimeEventsSubscribeResult(
       : clampCursor(fallbackCursor),
     hasMore: record.hasMore === true,
     ...(eventEpoch ? { eventEpoch } : {}),
+    ...(record.gap === true ? { gap: true } : {}),
+    ...(typeof record.oldestCursor === "number" && Number.isFinite(record.oldestCursor)
+      ? { oldestCursor: Math.max(0, Math.floor(record.oldestCursor)) }
+      : {}),
   };
 }
 
diff --git a/apps/desktop/src/main/services/remoteRuntime/remoteConnectionPool.ts b/apps/desktop/src/main/services/remoteRuntime/remoteConnectionPool.ts
index 44cff6b43..fc48bc7a6 100644
--- a/apps/desktop/src/main/services/remoteRuntime/remoteConnectionPool.ts
+++ b/apps/desktop/src/main/services/remoteRuntime/remoteConnectionPool.ts
@@ -709,6 +709,10 @@ export class RemoteConnectionPool {
             : clampCursor(request.cursor),
         hasMore: record.hasMore === true,
         ...(eventEpoch ? { eventEpoch } : {}),
+        ...(record.gap === true ? { gap: true } : {}),
+        ...(typeof record.oldestCursor === "number" && Number.isFinite(record.oldestCursor)
+          ? { oldestCursor: Math.max(0, Math.floor(record.oldestCursor)) }
+          : {}),
       };
     }
 
@@ -1164,6 +1168,10 @@ function normalizeRuntimeEventsSubscribeResult(
         : clampCursor(fallbackCursor),
     hasMore: record.hasMore === true,
     ...(eventEpoch ? { eventEpoch } : {}),
+    ...(record.gap === true ? { gap: true } : {}),
+    ...(typeof record.oldestCursor === "number" && Number.isFinite(record.oldestCursor)
+      ? { oldestCursor: Math.max(0, Math.floor(record.oldestCursor)) }
+      : {}),
   };
 }
 
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index 427fe44a3..01c1b4598 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -1866,6 +1866,10 @@ async function pollRemoteRuntimeEvents(): Promise<void> {
         return;
       }
     }
+    if (batch.gap === true) {
+      resetRemoteRuntimeEventDedup(binding.key);
+      resetRemoteRuntimeEmptyPolls();
+    }
 
     remoteRuntimeEventCursor = Number.isFinite(batch.nextCursor)
       ? Math.max(0, Math.floor(batch.nextCursor))
diff --git a/apps/desktop/src/shared/types/remoteRuntime.ts b/apps/desktop/src/shared/types/remoteRuntime.ts
index d05f45c7a..c1cc63858 100644
--- a/apps/desktop/src/shared/types/remoteRuntime.ts
+++ b/apps/desktop/src/shared/types/remoteRuntime.ts
@@ -213,6 +213,8 @@ export type RemoteRuntimeStreamEventsResult = {
   nextCursor: number;
   hasMore: boolean;
   eventEpoch?: string | null;
+  gap?: boolean;
+  oldestCursor?: number | null;
 };
 
 export type RemoteRuntimeEventNotificationPayload = {

From 7c2a74a1b8e8d6d509acdd18976c00d1a6d67bc9 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 02:32:15 -0400
Subject: [PATCH 03/17] =?UTF-8?q?ade=20code:=20perf=20=E2=80=94=20single-p?=
 =?UTF-8?q?ass=20rows,=20memoized=20children,=20debounced=20background=20r?=
 =?UTF-8?q?efresh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Findings:
- H1: derive selectable transcript rows once per render and build copy text lazily.
- H2: reuse pending steers, gate full Chat Info scans, and collapse cheap latest scans.
- H3/M8: memoize hot TUI children and stabilize high-churn props without adding hover throttles.
- H4: debounce/coalesce background session refreshes with an in-flight guard.
- M5: LRU-cache assistant markdown parses by message text.
- M7: tighten terminal grid reads and avoid trailing blank cell/row rendering.
- L10: reconcile local Ink install to locked 7.1.0 and validate ADE CLI.
---
 .../src/tuiClient/__tests__/ChatView.test.tsx |  62 ++++
 .../tuiClient/__tests__/appPolling.test.tsx   |  76 ++++-
 .../src/tuiClient/__tests__/format.test.ts    |  21 +-
 apps/ade-cli/src/tuiClient/aggregate.ts       |   3 +-
 apps/ade-cli/src/tuiClient/app.tsx            | 301 +++++++++++-------
 .../src/tuiClient/components/ChatView.tsx     |  61 +++-
 .../src/tuiClient/components/Drawer.tsx       |   4 +-
 .../tuiClient/components/FooterControls.tsx   |   4 +-
 .../src/tuiClient/components/Header.tsx       |   4 +-
 .../src/tuiClient/components/RightPane.tsx    |   4 +-
 .../src/tuiClient/components/TerminalPane.tsx |  74 +++--
 apps/ade-cli/src/tuiClient/format.ts          |  77 ++++-
 apps/ade-cli/src/tuiClient/pendingInput.ts    |   9 +-
 apps/desktop/src/shared/chatSubagents.ts      |  73 +++++
 14 files changed, 614 insertions(+), 159 deletions(-)

diff --git a/apps/ade-cli/src/tuiClient/__tests__/ChatView.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/ChatView.test.tsx
index 4901940d4..1320e6c78 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/ChatView.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/ChatView.test.tsx
@@ -3,10 +3,14 @@ import { describe, expect, it } from "vitest";
 import { render } from "ink-testing-library";
 import {
   ChatView,
+  chatScrollMaxOffsetFromSelectableRows,
   computeChatScrollMaxOffset,
+  renderChatSelectableRows,
   renderChatSelectableRowTexts,
+  renderChatSelectableRowTextsFromRows,
   renderChatTranscriptPlainText,
   renderChatVisibleSelectionRows,
+  renderChatVisibleSelectionRowsFromRows,
   selectedTextFromChatRows,
   workGroupExpandKey,
 } from "../components/ChatView";
@@ -120,6 +124,64 @@ describe("ChatView", () => {
       .toContain("selectable row 12");
   });
 
+  it("derives scroll and selection data from one selectable row pass", () => {
+    const events = Array.from({ length: 8 }, (_, index): AgentChatEventEnvelope => ({
+      sessionId: "s1",
+      timestamp: `2026-01-01T12:00:${String(index).padStart(2, "0")}.000Z`,
+      sequence: index + 1,
+      event: {
+        type: index % 2 === 0 ? "user_message" : "text",
+        text: `single pass row ${index + 1}`,
+      },
+    }));
+    const blocks = aggregateChatBlocks({ events, notices: [], activeSession: session });
+    const selectableRows = renderChatSelectableRows({
+      blocks,
+      width: 80,
+      streaming: true,
+      showWorkingIndicator: true,
+    });
+
+    expect(chatScrollMaxOffsetFromSelectableRows({ rows: selectableRows, maxRows: 5 })).toBe(
+      computeChatScrollMaxOffset({
+        blocks,
+        events,
+        notices: [],
+        activeSession: session,
+        maxRows: 5,
+        width: 80,
+        streaming: true,
+        showWorkingIndicator: true,
+      }),
+    );
+    expect(renderChatVisibleSelectionRowsFromRows({
+      rows: selectableRows,
+      maxRows: 5,
+      scrollOffsetRows: 1,
+      unseenMessageCount: 2,
+    })).toEqual(renderChatVisibleSelectionRows({
+      blocks,
+      events,
+      notices: [],
+      activeSession: session,
+      maxRows: 5,
+      scrollOffsetRows: 1,
+      unseenMessageCount: 2,
+      width: 80,
+      streaming: true,
+      showWorkingIndicator: true,
+    }));
+    expect(renderChatSelectableRowTextsFromRows(selectableRows)).toEqual(renderChatSelectableRowTexts({
+      blocks,
+      events,
+      notices: [],
+      activeSession: session,
+      width: 80,
+      streaming: true,
+      showWorkingIndicator: true,
+    }));
+  });
+
   it("renders a bordered hero card with the ADE wordmark when the chat is empty", () => {
     const frame = renderEvents([]);
     // Hero card uses a bordered box
diff --git a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
index 730a510d0..5abe4928a 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
@@ -15,6 +15,7 @@ const mocks = vi.hoisted(() => ({
   getChatHistory: vi.fn(),
   getSlashCommands: vi.fn(),
   getAvailableModels: vi.fn(),
+  fsWatch: vi.fn(),
 }));
 
 vi.mock("../connection", () => ({
@@ -52,11 +53,27 @@ vi.mock("../adeApi", async () => {
   };
 });
 
-import { AdeCodeApp, isLaneWorktreeAvailable, MENTION_REMOTE_DEBOUNCE_MS, shouldHydrateRefreshHistory } from "../app";
+vi.mock("node:fs", async () => {
+  const actual = await vi.importActual<typeof import("node:fs")>("node:fs");
+  return {
+    ...actual,
+    watch: mocks.fsWatch,
+    default: {
+      ...actual,
+      watch: mocks.fsWatch,
+    },
+  };
+});
+
+import { AdeCodeApp, BACKGROUND_REFRESH_DEBOUNCE_MS, isLaneWorktreeAvailable, MENTION_REMOTE_DEBOUNCE_MS, shouldHydrateRefreshHistory } from "../app";
 
 const reactActGlobal = globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT?: boolean };
 let previousReactActEnvironment: boolean | undefined;
 
+function stripAnsi(text: string): string {
+  return text.replace(/\u001b\[[0-?]*[ -/]*[@-~]/g, "");
+}
+
 beforeAll(() => {
   previousReactActEnvironment = reactActGlobal.IS_REACT_ACT_ENVIRONMENT;
   reactActGlobal.IS_REACT_ACT_ENVIRONMENT = true;
@@ -126,6 +143,24 @@ async function flushAsyncEffects() {
   });
 }
 
+async function flushInkFrame() {
+  await act(async () => {
+    await vi.advanceTimersByTimeAsync(40);
+  });
+  await flushAsyncEffects();
+}
+
+async function waitForFrame(instance: ReturnType<typeof render>, text: string) {
+  for (let i = 0; i < 100; i++) {
+    if (stripAnsi(instance.frames.join("\n")).includes(text)) return;
+    await flushAsyncEffects();
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(10);
+    });
+  }
+  expect(stripAnsi(instance.frames.join("\n"))).toContain(text);
+}
+
 async function renderApp(element: React.ReactElement): Promise<ReturnType<typeof render>> {
   let instance: ReturnType<typeof render> | null = null;
   await act(async () => {
@@ -188,6 +223,7 @@ describe("AdeCodeApp polling", () => {
     });
     mocks.getSlashCommands.mockResolvedValue([]);
     mocks.getAvailableModels.mockResolvedValue([]);
+    mocks.fsWatch.mockReturnValue({ close: vi.fn() });
   });
 
   afterEach(() => {
@@ -223,6 +259,12 @@ describe("AdeCodeApp polling", () => {
     });
     await flushAsyncEffects();
 
+    expect(mocks.listChatSessions).toHaveBeenCalledTimes(1);
+    await act(async () => {
+      await vi.advanceTimersByTimeAsync(BACKGROUND_REFRESH_DEBOUNCE_MS);
+    });
+    await flushAsyncEffects();
+
     expect(mocks.listChatSessions).toHaveBeenCalledTimes(2);
     expect(mocks.getChatHistory).toHaveBeenCalledTimes(0);
 
@@ -260,24 +302,25 @@ describe("AdeCodeApp polling", () => {
   });
 
   it("shows startup retry guidance and automatically reconnects", async () => {
-    mocks.connectToAde
-      .mockRejectedValueOnce(new Error("socket down"))
-      .mockResolvedValueOnce(connection);
+    mocks.connectToAde.mockImplementation(async () => {
+      throw new Error("socket down");
+    });
 
-    const instance = render(<AdeCodeApp project={project} />);
-    await flushAsyncEffects();
+    const instance = await renderApp(<AdeCodeApp project={project} />);
 
-    expect(instance.lastFrame()).toContain("r retry now");
-    expect(mocks.connectToAde).toHaveBeenCalledTimes(1);
+    await waitForFrame(instance, "r retry now");
+    expect(mocks.connectToAde).toHaveBeenCalled();
 
+    const callsBeforeRetry = mocks.connectToAde.mock.calls.length;
+    mocks.connectToAde.mockResolvedValue(connection);
     await act(async () => {
       await vi.advanceTimersByTimeAsync(3_000);
     });
     await flushAsyncEffects();
 
-    expect(mocks.connectToAde).toHaveBeenCalledTimes(2);
+    expect(mocks.connectToAde.mock.calls.length).toBeGreaterThan(callsBeforeRetry);
 
-    instance.unmount();
+    await unmountApp(instance);
   });
 
   it("debounces mention RPCs and caches lane git/pr suggestions", async () => {
@@ -290,24 +333,25 @@ describe("AdeCodeApp polling", () => {
     });
     connection.action = actionMock as unknown as AdeCodeConnection["action"];
 
-    const instance = render(<AdeCodeApp project={project} />);
-    await flushAsyncEffects();
+    const instance = await renderApp(<AdeCodeApp project={project} />);
 
     await act(async () => {
       instance.stdin.write("@a");
-      await vi.advanceTimersByTimeAsync(MENTION_REMOTE_DEBOUNCE_MS - 1);
     });
-    await flushAsyncEffects();
+    await flushInkFrame();
 
     expect(connection.action).not.toHaveBeenCalledWith("git", "listRecentCommits", expect.anything());
 
     await act(async () => {
-      await vi.advanceTimersByTimeAsync(1);
+      await vi.advanceTimersByTimeAsync(MENTION_REMOTE_DEBOUNCE_MS);
     });
     await flushAsyncEffects();
 
     await act(async () => {
       instance.stdin.write("b");
+    });
+    await flushInkFrame();
+    await act(async () => {
       await vi.advanceTimersByTimeAsync(MENTION_REMOTE_DEBOUNCE_MS);
     });
     await flushAsyncEffects();
@@ -317,7 +361,7 @@ describe("AdeCodeApp polling", () => {
     expect(calls.filter(([domain, action]) => domain === "git" && action === "listRecentCommits")).toHaveLength(1);
     expect(calls.filter(([domain, action]) => domain === "pr" && action === "listAll")).toHaveLength(1);
 
-    instance.unmount();
+    await unmountApp(instance);
   });
 });
 
diff --git a/apps/ade-cli/src/tuiClient/__tests__/format.test.ts b/apps/ade-cli/src/tuiClient/__tests__/format.test.ts
index effb1e04c..2af7ebcdc 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/format.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/format.test.ts
@@ -1,5 +1,14 @@
 import { describe, expect, it } from "vitest";
-import { diffLineKind, latestExpandableFailureId, parseAssistantMarkdown, parseInlineRuns, renderChatLines, renderObject } from "../format";
+import {
+  __clearAssistantMarkdownCacheForTests,
+  __getAssistantMarkdownCacheStatsForTests,
+  diffLineKind,
+  latestExpandableFailureId,
+  parseAssistantMarkdown,
+  parseInlineRuns,
+  renderChatLines,
+  renderObject,
+} from "../format";
 
 describe("diffLineKind", () => {
   it("classifies hunk, meta, add, del, and context lines", () => {
@@ -18,6 +27,16 @@ describe("diffLineKind", () => {
 });
 
 describe("renderChatLines", () => {
+  it("LRU-caches assistant markdown parses by message text", () => {
+    __clearAssistantMarkdownCacheForTests();
+    const text = "Paragraph text\n\n```ts\nconst value = 1;\n```";
+    const first = parseAssistantMarkdown(text);
+    const second = parseAssistantMarkdown(text);
+
+    expect(second).toBe(first);
+    expect(__getAssistantMarkdownCacheStatsForTests().entries).toBe(1);
+  });
+
   it("parses assistant markdown into stable blocks", () => {
     const blocks = parseAssistantMarkdown([
       "# Heading",
diff --git a/apps/ade-cli/src/tuiClient/aggregate.ts b/apps/ade-cli/src/tuiClient/aggregate.ts
index 0febb5810..f07066df9 100644
--- a/apps/ade-cli/src/tuiClient/aggregate.ts
+++ b/apps/ade-cli/src/tuiClient/aggregate.ts
@@ -539,6 +539,7 @@ export function aggregateChatBlocks(args: {
   activeSession: AgentChatSessionSummary | null;
   expandedLineIds?: Set<string>;
   maxBlocks?: number;
+  pendingSteers?: PendingSteer[];
 }): AggregatedBlock[] {
   const lines = renderChatLines({
     events: args.events,
@@ -551,7 +552,7 @@ export function aggregateChatBlocks(args: {
   for (const line of lines) linesById.set(line.id, line);
 
   const blocks: AggregatedBlock[] = [];
-  const pendingSteerIds = new Set(derivePendingSteers(args.events).map((steer) => steer.steerId));
+  const pendingSteerIds = new Set((args.pendingSteers ?? derivePendingSteers(args.events)).map((steer) => steer.steerId));
   const subagentParentItemIds = new Set<string>();
   for (const envelope of args.events) {
     const parentItemId = subagentParentItemId(envelope.event);
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index dc864af50..9c7751a1b 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -132,9 +132,11 @@ import {
 } from "./newLaneForm";
 import {
   ChatView,
-  computeChatScrollMaxOffset,
-  renderChatSelectableRowTexts,
-  renderChatVisibleSelectionRows,
+  chatScrollMaxOffsetFromSelectableRows,
+  hasConversationContent,
+  renderChatSelectableRows,
+  renderChatSelectableRowTextsFromRows,
+  renderChatVisibleSelectionRowsFromRows,
   selectedTextFromChatRows,
   type ChatVisibleSelectionRow,
   type ChatTextSelection,
@@ -258,6 +260,9 @@ import type {
 } from "./types";
 
 const PURPLE = theme.color.accent;
+const EMPTY_CHAT_EVENTS: AgentChatEventEnvelope[] = [];
+const EMPTY_SUBAGENT_SNAPSHOTS: SubagentSnapshot[] = [];
+const EMPTY_TERMINAL_CHUNKS: string[] = [];
 const EFFORTS = ["low", "medium", "high", "xhigh", "max", "ultracode"];
 const PROVIDER_OPTIONS: Array<{ value: AdeCodeProvider; label: string }> = [
   { value: "claude", label: "Claude" },
@@ -290,6 +295,7 @@ type DrawerChatAction = "new-chat";
 // — fewer, larger renders means far less per-token transcript re-wrap/flicker,
 // while staying well within smooth-streaming range for text.
 const CHAT_EVENT_FLUSH_MS = 48;
+export const BACKGROUND_REFRESH_DEBOUNCE_MS = 200;
 const PTY_ATTACHED_FLUSH_MS = 16;
 const PTY_PREVIEW_FLUSH_MS = 32;
 const TERMINAL_PREVIEW_POLL_MS = 1_000;
@@ -1243,7 +1249,7 @@ function formatGoalBannerLine(goal: CodexThreadGoal | null): string | null {
   return right.length ? `◎ ${objective}   ${right.join(" · ")}` : `◎ ${objective}`;
 }
 
-import { subagentSnapshotsFromEvents } from "../../../desktop/src/shared/chatSubagents";
+import { subagentActivitySummaryFromEvents, subagentSnapshotsFromEvents } from "../../../desktop/src/shared/chatSubagents";
 export { subagentSnapshotsFromEvents };
 
 const LANE_WORKTREE_AVAILABILITY_CACHE_TTL_MS = 2_000;
@@ -2980,6 +2986,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     maxScrollable: 0,
     visibleText: "",
   });
+  const handleTerminalViewportMetrics = useCallback((metrics: { maxScrollable: number; visibleText: string }) => {
+    terminalViewportMetricsRef.current = metrics;
+  }, []);
   const [activeLaneId, setActiveLaneId] = useState<string | null>(null);
   const [activeSessionId, setActiveSessionId] = useState<string | null>(project.sessionHint);
   const [events, setEvents] = useState<AgentChatEventEnvelope[]>([]);
@@ -3156,6 +3165,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   // batched render on a short timer (see flushPendingChatEvents / scheduleChatFlush).
   const pendingChatEnvelopesRef = useRef<AgentChatEventEnvelope[]>([]);
   const chatFlushTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const backgroundRefreshTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const backgroundRefreshInFlightRef = useRef(false);
+  const backgroundRefreshPendingAfterInFlightRef = useRef(false);
   const refreshGenerationRef = useRef(0);
   const chatScrollOffsetRowsRef = useRef(0);
   const chatScrollMaxOffsetRef = useRef(0);
@@ -3200,7 +3212,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const modelStateRef = useRef<AdeCodeModelState>(initialModelState());
   const chatMouseSelectionRef = useRef<ChatSelectionState | null>(null);
   const chatSelectionAnchorRef = useRef<ChatSelectionPoint | null>(null);
-  const selectableChatRowTextsRef = useRef<string[]>([]);
+  const selectableChatRowCountRef = useRef(0);
+  const selectableChatRowTextBuilderRef = useRef<() => string[]>(() => []);
   const drawerPreviewGenerationRef = useRef(0);
   const drawerOpenRef = useRef(false);
   const drawerSectionRef = useRef<"lanes" | "chats">("lanes");
@@ -3536,7 +3549,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       stopChatSelectionEdgeScroll();
       return;
     }
-    const rowCount = selectableChatRowTextsRef.current.length;
+    const rowCount = selectableChatRowCountRef.current;
     if (!rowCount) {
       stopChatSelectionEdgeScroll();
       return;
@@ -3823,15 +3836,33 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     footerReasoningSupportedRef.current = footerReasoningSupported;
   }, [footerFastSupported, footerReasoningSupported]);
   const latestFailedLineId = useMemo(() => latestExpandableFailureId(events), [events]);
-  const subagentSnapshots = useMemo(() => subagentSnapshotsFromEvents(events), [events]);
-  const liveAgentCount = useMemo(
-    () => subagentSnapshots.filter((snap) => snap.status === "running").length,
-    [subagentSnapshots],
+  // Chat info is available for any active chat — including Claude terminal
+  // sessions (resume row / status); subagent rows fill in when the provider
+  // emits agent lifecycle events.
+  const subagentPaneCommandAvailable = Boolean(activeDisplaySession && !draftChatActive);
+  const subagentActivity = useMemo(() => subagentActivitySummaryFromEvents(events), [events]);
+  const chatInfoPaneVisible = rightOpen && rightPane.kind === "chat-info";
+  const shouldAutoOpenSubagentPane = Boolean(
+    activeSessionId
+      && subagentPaneCommandAvailable
+      && subagentActivity.totalCount > 0
+      && !subagentAutoOpenedSessionsRef.current.has(activeSessionId)
+      && !userDismissedRightPaneRef.current
+      && !rightOpen,
+  );
+  const shouldDeriveFullChatInfo = chatInfoPaneVisible || inspectedSubagentId != null || shouldAutoOpenSubagentPane;
+  const subagentSnapshots = useMemo(
+    () => shouldDeriveFullChatInfo ? subagentSnapshotsFromEvents(events) : EMPTY_SUBAGENT_SNAPSHOTS,
+    [events, shouldDeriveFullChatInfo],
   );
+  const chatInfoEvents = shouldDeriveFullChatInfo ? events : EMPTY_CHAT_EVENTS;
+  const liveAgentCount = shouldDeriveFullChatInfo
+    ? subagentSnapshots.filter((snap) => snap.status === "running").length
+    : subagentActivity.runningCount;
   const chatInfo = useMemo(() => {
     const chatLaneId = activeDisplaySession?.laneId ?? activeLaneId;
     return deriveChatInfoSnapshot({
-      events,
+      events: chatInfoEvents,
       activeSession: activeDisplaySession,
       provider: modelState.provider,
       modelLabel: modelState.displayName || modelState.model || modelState.provider,
@@ -3846,6 +3877,39 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       // resume row (activating it calls resumeClosedTerminalSession).
       resumableTerminal: isTerminalSessionResumable(activeTerminalSession),
     });
+  }, [
+    activeDisplaySession,
+    activeLane?.name,
+    activeLaneId,
+    activeTerminalSession,
+    chatInfoEvents,
+    currentGoal,
+    inspectedSubagentId,
+    modelState.displayName,
+    modelState.model,
+    modelState.provider,
+    prByLaneId,
+    statusLineStats,
+    streaming,
+    subagentSnapshots,
+  ]);
+  const buildChatInfoSnapshot = useCallback(() => {
+    const chatLaneId = activeDisplaySession?.laneId ?? activeLaneId;
+    const snapshots = shouldDeriveFullChatInfo ? subagentSnapshots : subagentSnapshotsFromEvents(events);
+    return deriveChatInfoSnapshot({
+      events,
+      activeSession: activeDisplaySession,
+      provider: modelState.provider,
+      modelLabel: modelState.displayName || modelState.model || modelState.provider,
+      laneLabel: activeLane?.name ?? null,
+      snapshots,
+      tokenStats: statusLineStats,
+      goal: currentGoal,
+      streaming,
+      inspectedSubagentId,
+      pr: (chatLaneId ? prByLaneId?.[chatLaneId] : null) ?? null,
+      resumableTerminal: isTerminalSessionResumable(activeTerminalSession),
+    });
   }, [
     activeDisplaySession,
     activeLane?.name,
@@ -3858,18 +3922,19 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     modelState.model,
     modelState.provider,
     prByLaneId,
+    shouldDeriveFullChatInfo,
     statusLineStats,
     streaming,
     subagentSnapshots,
   ]);
   const chatInfoRef = useRef(chatInfo);
+  const buildChatInfoSnapshotRef = useRef(buildChatInfoSnapshot);
   useEffect(() => {
     chatInfoRef.current = chatInfo;
   }, [chatInfo]);
-  // Chat info is available for any active chat — including Claude terminal
-  // sessions (resume row / status); subagent rows fill in when the provider
-  // emits agent lifecycle events.
-  const subagentPaneCommandAvailable = Boolean(activeDisplaySession && !draftChatActive);
+  useEffect(() => {
+    buildChatInfoSnapshotRef.current = buildChatInfoSnapshot;
+  }, [buildChatInfoSnapshot]);
   const subagentsButtonVisibleRef = useRef<boolean>(false);
   useEffect(() => {
     subagentsButtonVisibleRef.current = subagentPaneCommandAvailable;
@@ -3936,7 +4001,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     setInlineRowFocus({ cell: null });
     setRightPane({
       kind: "chat-info",
-      info: chatInfo,
+      info: buildChatInfoSnapshot(),
     });
     setRightSelectionIndex(0);
     setRightOpen(true);
@@ -3944,7 +4009,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     lastUserOpenedPaneRef.current = "chat-info";
     return true;
   }, [
-    chatInfo,
+    buildChatInfoSnapshot,
     selectFooterControl,
     setPaneFocus,
     stashActiveInput,
@@ -3978,7 +4043,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   useEffect(() => {
     const sessionId = activeSessionId;
     if (!sessionId || !subagentPaneCommandAvailable) return;
-    if (subagentSnapshots.length === 0) return;
+    if (subagentActivity.totalCount === 0) return;
     if (subagentAutoOpenedSessionsRef.current.has(sessionId)) return;
     if (userDismissedRightPaneRef.current) return;
     // chat-info already visible → agents are already shown; consume the flag.
@@ -3989,11 +4054,11 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     // A different pane is intentionally open → don't stomp it; retry when it
     // next changes (this effect re-runs on rightPane.kind / rightOpen).
     if (rightOpen) return;
-    setRightPane({ kind: "chat-info", info: chatInfoRef.current });
+    setRightPane({ kind: "chat-info", info: buildChatInfoSnapshot() });
     setRightSelectionIndex(0);
     setRightOpen(true);
     subagentAutoOpenedSessionsRef.current.add(sessionId);
-  }, [activeSessionId, rightOpen, rightPane.kind, subagentPaneCommandAvailable, subagentSnapshots.length]);
+  }, [activeSessionId, buildChatInfoSnapshot, rightOpen, rightPane.kind, subagentActivity.totalCount, subagentPaneCommandAvailable]);
   const promptHistory = useMemo(() => events
     .map((envelope) => envelope.event)
     .filter((event): event is Extract<AgentChatEventEnvelope["event"], { type: "user_message" }> => event.type === "user_message")
@@ -4353,6 +4418,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     }
     return buildSubagentTranscriptEvents({ events, activeSession, snapshot: selectedAgentSnapshot });
   }, [activeSession, events, realSubagentTranscript, selectedAgentSnapshot]);
+  const displayPendingSteers = useMemo(
+    () => displayEvents === events ? pendingSteers : derivePendingSteers(displayEvents),
+    [displayEvents, events, pendingSteers],
+  );
   // Fetch the real child transcript for the inspected subagent when the runtime
   // can produce one (Codex app-server threads / OpenCode child sessions). Falls
   // back silently to local reconstruction on null/empty/error.
@@ -4412,8 +4481,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       notices: displayNotices,
       activeSession,
       expandedLineIds,
+      pendingSteers: displayPendingSteers,
     }),
-    [activeSession, displayEvents, displayNotices, expandedLineIds],
+    [activeSession, displayEvents, displayNotices, displayPendingSteers, expandedLineIds],
   );
   const displayStreaming = selectedAgentSnapshot ? selectedAgentSnapshot.status === "running" : streaming;
   const displayInterrupted = selectedAgentSnapshot ? false : interrupted && !displayStreaming;
@@ -4427,18 +4497,21 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     || mode === "connecting"
     || liveAgentCount > 0;
   const showChatWorkingIndicator = modelState.provider !== "claude" && activeSession?.provider !== "claude";
-  const chatScrollMaxOffset = useMemo(() => computeChatScrollMaxOffset({
+  const selectableChatRows = useMemo(() => renderChatSelectableRows({
     blocks: displayBlocks,
-    events: displayEvents,
-    notices: displayNotices,
-    activeSession,
     expandedLineIds,
-    maxRows: chatRowBudget,
+    width: chatWrapWidth,
     streaming: displayStreaming,
     interrupted: displayInterrupted,
     showWorkingIndicator: showChatWorkingIndicator,
-    width: chatWrapWidth,
-  }), [activeSession, chatRowBudget, chatWrapWidth, displayBlocks, displayEvents, displayInterrupted, displayNotices, displayStreaming, expandedLineIds, showChatWorkingIndicator]);
+  }), [chatWrapWidth, displayBlocks, displayInterrupted, displayStreaming, expandedLineIds, showChatWorkingIndicator]);
+  const chatScrollMaxOffset = useMemo(() => {
+    if (!hasConversationContent(displayBlocks) && !displayStreaming && !displayInterrupted) return 0;
+    return chatScrollMaxOffsetFromSelectableRows({
+      rows: selectableChatRows,
+      maxRows: chatRowBudget,
+    });
+  }, [chatRowBudget, displayBlocks, displayInterrupted, displayStreaming, selectableChatRows]);
   chatScrollMaxOffsetRef.current = chatScrollMaxOffset;
   const effectiveChatScrollOffsetRows = clampChatScrollOffsetRows(chatScrollOffsetRows, chatScrollMaxOffset);
   chatScrollOffsetRowsRef.current = effectiveChatScrollOffsetRows;
@@ -4451,58 +4524,19 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const unseenMessageCount = effectiveChatScrollOffsetRows > 0
     ? Math.max(0, displayEvents.length - lastSeenAtBottomEventCountRef.current)
     : 0;
-  const visibleChatSelectionRows = useMemo(() => renderChatVisibleSelectionRows({
-    blocks: displayBlocks,
-    events: displayEvents,
-    notices: displayNotices,
-    activeSession,
-    expandedLineIds,
+  const visibleChatSelectionRows = useMemo(() => renderChatVisibleSelectionRowsFromRows({
+    rows: selectableChatRows,
     maxRows: chatRowBudget,
     scrollOffsetRows: effectiveChatScrollOffsetRows,
     unseenMessageCount,
-    width: chatWrapWidth,
-    streaming: displayStreaming,
-    interrupted: displayInterrupted,
-    showWorkingIndicator: showChatWorkingIndicator,
   }), [
-    activeSession,
     chatRowBudget,
-    chatWrapWidth,
-    displayBlocks,
-    displayEvents,
-    displayInterrupted,
-    displayNotices,
-    displayStreaming,
     effectiveChatScrollOffsetRows,
-    expandedLineIds,
-    showChatWorkingIndicator,
+    selectableChatRows,
     unseenMessageCount,
   ]);
-  const selectableChatRowTexts = useMemo(() => renderChatSelectableRowTexts({
-    blocks: displayBlocks,
-    events: displayEvents,
-    notices: displayNotices,
-    activeSession,
-    expandedLineIds,
-    width: chatWrapWidth,
-    streaming: displayStreaming,
-    interrupted: displayInterrupted,
-    showWorkingIndicator: showChatWorkingIndicator,
-  }), [
-    activeSession,
-    chatWrapWidth,
-    displayBlocks,
-    displayEvents,
-    displayInterrupted,
-    displayNotices,
-    displayStreaming,
-    expandedLineIds,
-    showChatWorkingIndicator,
-  ]);
-  selectableChatRowTextsRef.current = selectableChatRowTexts;
-  useEffect(() => {
-    selectableChatRowTextsRef.current = selectableChatRowTexts;
-  }, [selectableChatRowTexts]);
+  selectableChatRowCountRef.current = selectableChatRows.length;
+  selectableChatRowTextBuilderRef.current = () => renderChatSelectableRowTextsFromRows(selectableChatRows);
   const providerReadinessRows = useMemo(
     () => buildProviderReadinessRows(aiStatus, storedApiKeyProviders, openCodeDiagnostics),
     [aiStatus, openCodeDiagnostics, storedApiKeyProviders],
@@ -7028,6 +7062,45 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     refreshStateRef.current = refreshState;
   }, [refreshState]);
 
+  const runBackgroundRefresh = useCallback(() => {
+    if (backgroundRefreshInFlightRef.current) {
+      backgroundRefreshPendingAfterInFlightRef.current = true;
+      return;
+    }
+    backgroundRefreshInFlightRef.current = true;
+    void refreshStateRef.current({ hydrateHistory: false })
+      .catch(() => undefined)
+      .finally(() => {
+        backgroundRefreshInFlightRef.current = false;
+        if (!backgroundRefreshPendingAfterInFlightRef.current) return;
+        backgroundRefreshPendingAfterInFlightRef.current = false;
+        if (backgroundRefreshTimerRef.current) clearTimeout(backgroundRefreshTimerRef.current);
+        backgroundRefreshTimerRef.current = setTimeout(() => {
+          backgroundRefreshTimerRef.current = null;
+          runBackgroundRefresh();
+        }, BACKGROUND_REFRESH_DEBOUNCE_MS);
+        backgroundRefreshTimerRef.current.unref?.();
+      });
+  }, []);
+
+  const scheduleBackgroundRefresh = useCallback(() => {
+    if (backgroundRefreshTimerRef.current) {
+      clearTimeout(backgroundRefreshTimerRef.current);
+    }
+    backgroundRefreshTimerRef.current = setTimeout(() => {
+      backgroundRefreshTimerRef.current = null;
+      runBackgroundRefresh();
+    }, BACKGROUND_REFRESH_DEBOUNCE_MS);
+    backgroundRefreshTimerRef.current.unref?.();
+  }, [runBackgroundRefresh]);
+
+  useEffect(() => () => {
+    if (backgroundRefreshTimerRef.current) {
+      clearTimeout(backgroundRefreshTimerRef.current);
+      backgroundRefreshTimerRef.current = null;
+    }
+  }, []);
+
   const flushPendingChatEvents = useCallback(() => {
     if (chatFlushTimerRef.current) {
       clearTimeout(chatFlushTimerRef.current);
@@ -7126,7 +7199,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       if (!openSessionIds.has(envelope.sessionId)) {
         // Event for a session we're not displaying — refresh summaries (cheap,
         // dedup-guarded). Only the open-session token stream below is coalesced.
-        void refreshStateRef.current({ hydrateHistory: false }).catch(() => undefined);
+        scheduleBackgroundRefresh();
         return;
       }
       const clearedAtNow = clearedAtRef.current;
@@ -7150,10 +7223,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         if (isActiveSessionEvent) setInterrupted(false);
         if (isActiveSessionEvent && activePaneRef.current !== "drawer") {
           setRightPane((prev) => {
-            if (prev.kind === "chat-info") return { kind: "chat-info", info: chatInfoRef.current };
+            if (prev.kind === "chat-info") return { kind: "chat-info", info: buildChatInfoSnapshotRef.current() };
             if (prev.kind !== "empty" && prev.kind !== "lane-details") return prev;
             setRightOpen(true);
-            return { kind: "chat-info", info: chatInfoRef.current };
+            return { kind: "chat-info", info: buildChatInfoSnapshotRef.current() };
           });
         }
       }
@@ -7177,12 +7250,12 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         // Drawer navigation keeps lane details in the right pane.
         if (!isActiveSessionEvent || activePaneRef.current === "drawer") return;
         setRightPane((prev) => {
-          if (prev.kind === "chat-info") return { kind: "chat-info", info: chatInfoRef.current };
+          if (prev.kind === "chat-info") return { kind: "chat-info", info: buildChatInfoSnapshotRef.current() };
           if (prev.kind !== "empty" && prev.kind !== "lane-details") return prev;
           setRightOpen(true);
           return {
             kind: "chat-info",
-            info: chatInfoRef.current,
+            info: buildChatInfoSnapshotRef.current(),
           };
         });
       }
@@ -7196,7 +7269,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     };
     // Re-bind only when the connection itself changes (reconnect). clearedAt and
     // refreshState are read via refs so their churn doesn't drop the buffer.
-  }, [connection, flushPendingChatEvents, scheduleChatFlush, setSessionInterrupted, setSessionStreaming]);
+  }, [connection, flushPendingChatEvents, scheduleBackgroundRefresh, scheduleChatFlush, setSessionInterrupted, setSessionStreaming]);
 
   useEffect(() => {
     if (!connection) return;
@@ -7479,7 +7552,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   // flight to refreshState.
   const showChatInfoAfterDraftCommit = useCallback(() => {
     if (!isNewChatSetupPane(rightPaneRef.current)) return;
-    setRightPane({ kind: "chat-info", info: chatInfoRef.current });
+    setRightPane({ kind: "chat-info", info: buildChatInfoSnapshotRef.current() });
     setRightSelectionIndex(0);
     setRightOpen(true);
     lastUserOpenedPaneRef.current = "chat-info";
@@ -7941,7 +8014,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       addNotice("Copied selected chat text.", "success");
       return true;
     }
-    const text = selectedTextFromChatRows(selectableChatRowTextsRef.current, resolvedSelection);
+    const text = selectedTextFromChatRows(selectableChatRowTextBuilderRef.current(), resolvedSelection);
     if (text.length === 0) {
       addNotice("No chat text selected.", "info");
       return false;
@@ -14092,19 +14165,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     return Boolean(terminal && terminal.status === "running" && terminalSessionProvider(terminal));
   }, [gridViewActive, multiView, terminalSessionById]);
 
-  if (error && !connection) {
-    return (
-      <Box flexDirection="column">
-        <Text color="red">ade-code failed to start</Text>
-        <Text>{error}</Text>
-        <Text color={theme.color.mutedFg} dimColor>r retry now · Ctrl+C quit</Text>
-      </Box>
-    );
-  }
-
   // Footer mini-map: show tile state when multi-view is open, or just the
   // transient notice when we have something to flash but no grid yet.
-  const footerMultiViewMap = (() => {
+  const footerMultiViewMap = useMemo(() => {
     if (multiView) {
       return { count: multiView.tiles.length, focusedIndex: multiView.focusedIndex, notice: multiViewNotice };
     }
@@ -14112,7 +14175,40 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       return { count: 1, focusedIndex: 0, notice: multiViewNotice };
     }
     return null;
-  })();
+  }, [multiView, multiViewNotice]);
+  const rightPaneModelPickerInputs = useMemo(() => ({
+    models,
+    catalog: modelCatalog,
+    favorites: modelPickerFavorites,
+    recents: modelPickerRecents,
+    activeModelId: modelState.modelId,
+    activeReasoningEffort: modelState.reasoningEffort,
+    aiStatus,
+    interfaceMode: modelState.interfaceMode,
+  }), [
+    aiStatus,
+    modelCatalog,
+    modelPickerFavorites,
+    modelPickerRecents,
+    modelState.interfaceMode,
+    modelState.modelId,
+    modelState.reasoningEffort,
+    models,
+  ]);
+  const activeTerminalScroll = readTerminalScroll(terminalScrollBySessionId, activeTerminalSession?.terminalId);
+  const activeTerminalLiveChunks = activeTerminalSession
+    ? terminalLiveChunks[activeTerminalSession.terminalId] ?? EMPTY_TERMINAL_CHUNKS
+    : EMPTY_TERMINAL_CHUNKS;
+
+  if (error && !connection) {
+    return (
+      <Box flexDirection="column">
+        <Text color="red">ade-code failed to start</Text>
+        <Text>{error}</Text>
+        <Text color={theme.color.mutedFg} dimColor>r retry now · Ctrl+C quit</Text>
+      </Box>
+    );
+  }
 
   return (
     <SpinTickProvider active={spinTickActive}>
@@ -14191,7 +14287,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
                 cliLabel={terminalControlLabel}
                 claudeChrome={activeTerminalProvider === "claude"}
                 preview={terminalPreview}
-                liveChunks={terminalLiveChunks[activeTerminalSession.terminalId] ?? []}
+                liveChunks={activeTerminalLiveChunks}
                 attached={attachedTerminalId === activeTerminalSession.terminalId}
                 width={terminalPaneWidth}
                 height={chatRowBudget}
@@ -14199,11 +14295,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
                   && activeTerminalSession.status === "running"
                   && isClaudePlaceholderTitle(activeTerminalSession.title)}
                 hiddenBottomRows={CLAUDE_TERMINAL_HIDDEN_INPUT_ROWS}
-                scrollOffset={readTerminalScroll(terminalScrollBySessionId, activeTerminalSession.terminalId).scrollOffset}
-                pendingNewCount={readTerminalScroll(terminalScrollBySessionId, activeTerminalSession.terminalId).pendingNewCount}
-                onViewportMetrics={(metrics) => {
-                  terminalViewportMetricsRef.current = metrics;
-                }}
+                scrollOffset={activeTerminalScroll.scrollOffset}
+                pendingNewCount={activeTerminalScroll.pendingNewCount}
+                onViewportMetrics={handleTerminalViewportMetrics}
               />
             ) : (
               <>
@@ -14244,16 +14338,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
 	              activeProvider={activeCommandProvider as AdeCodeProvider}
 	              width={rightPaneWidth}
               scrollOffsetRows={rightPaneScrollOffsetRows}
-		              modelPickerInputs={{
-	                models,
-		                catalog: modelCatalog,
-		                favorites: modelPickerFavorites,
-	                recents: modelPickerRecents,
-	                activeModelId: modelState.modelId,
-                activeReasoningEffort: modelState.reasoningEffort,
-                aiStatus,
-                interfaceMode: modelState.interfaceMode,
-	              }}
+              modelPickerInputs={rightPaneModelPickerInputs}
               onModelPickerMeasureOrigin={handlePickerMeasureOrigin}
             />
           ) : null}
diff --git a/apps/ade-cli/src/tuiClient/components/ChatView.tsx b/apps/ade-cli/src/tuiClient/components/ChatView.tsx
index 96ce6ca79..420ce636b 100644
--- a/apps/ade-cli/src/tuiClient/components/ChatView.tsx
+++ b/apps/ade-cli/src/tuiClient/components/ChatView.tsx
@@ -1400,6 +1400,63 @@ function selectableRowsForBlocks({
   return baseRows;
 }
 
+export function renderChatSelectableRows({
+  blocks,
+  width = DEFAULT_VIEW_WIDTH,
+  streaming = false,
+  interrupted = false,
+  showWorkingIndicator = true,
+  expandedLineIds,
+}: {
+  blocks: AggregatedBlock[];
+  width?: number;
+  streaming?: boolean;
+  interrupted?: boolean;
+  showWorkingIndicator?: boolean;
+  expandedLineIds?: Set<string>;
+}): RenderedChatRow[] {
+  return selectableRowsForBlocks({
+    blocks,
+    width,
+    streaming,
+    interrupted,
+    showWorkingIndicator,
+    expandedGroupIds: expandedLineIds,
+  });
+}
+
+export function chatScrollMaxOffsetFromSelectableRows({
+  rows,
+  maxRows,
+}: {
+  rows: ReadonlyArray<RenderedChatRow>;
+  maxRows?: number;
+}): number {
+  return maxScrollOffsetForRows(rows.length, maxRows);
+}
+
+export function renderChatSelectableRowTextsFromRows(rows: ReadonlyArray<RenderedChatRow>): string[] {
+  return rows.map(renderedRowText);
+}
+
+export function renderChatVisibleSelectionRowsFromRows({
+  rows,
+  maxRows,
+  scrollOffsetRows = 0,
+  unseenMessageCount = 0,
+}: {
+  rows: RenderedChatRow[];
+  maxRows?: number;
+  scrollOffsetRows?: number;
+  unseenMessageCount?: number;
+}): ChatVisibleSelectionRow[] {
+  return sliceRows(rows, maxRows, scrollOffsetRows, unseenMessageCount).map((row) => ({
+    sourceRow: typeof row.sourceRowIndex === "number" ? row.sourceRowIndex : null,
+    text: renderedRowText(row),
+    expandableId: row.expandableGroupId ?? null,
+  }));
+}
+
 function visibleRowsForBlocks({
   blocks,
   maxRows,
@@ -1670,7 +1727,7 @@ export function computeChatScrollMaxOffset({
   return maxScrollOffsetForRows(rowCount, maxRows);
 }
 
-export function ChatView({
+function ChatViewComponent({
   events,
   blocks: providedBlocks,
   notices,
@@ -1889,3 +1946,5 @@ export function ChatView({
     </Box>
   );
 }
+
+export const ChatView = React.memo(ChatViewComponent);
diff --git a/apps/ade-cli/src/tuiClient/components/Drawer.tsx b/apps/ade-cli/src/tuiClient/components/Drawer.tsx
index f0d004e51..bfe57c215 100644
--- a/apps/ade-cli/src/tuiClient/components/Drawer.tsx
+++ b/apps/ade-cli/src/tuiClient/components/Drawer.tsx
@@ -88,7 +88,7 @@ function pad(text: string, width: number): string {
   return text + " ".repeat(width - text.length);
 }
 
-export function Drawer({
+function DrawerComponent({
   lanes,
   sessions,
   activeLaneId,
@@ -323,6 +323,8 @@ export function Drawer({
   );
 }
 
+export const Drawer = React.memo(DrawerComponent);
+
 // Lane-card chrome note: the drawer's mouse hit-test (drawerMouseHitForLayout
 // in drawerLayout.ts) models exactly two border rows per lane card (top +
 // bottom) plus a 1-row margin between cards. The rounded box used per lane
diff --git a/apps/ade-cli/src/tuiClient/components/FooterControls.tsx b/apps/ade-cli/src/tuiClient/components/FooterControls.tsx
index f6692a1aa..ceabc44d2 100644
--- a/apps/ade-cli/src/tuiClient/components/FooterControls.tsx
+++ b/apps/ade-cli/src/tuiClient/components/FooterControls.tsx
@@ -149,7 +149,7 @@ function Cell({
   return <Text color={baseColor}>{value}</Text>;
 }
 
-export function FooterControls({
+function FooterControlsComponent({
   provider,
   providerLocked,
   modelDisplay,
@@ -418,3 +418,5 @@ export function FooterControls({
     </Box>
   );
 }
+
+export const FooterControls = React.memo(FooterControlsComponent);
diff --git a/apps/ade-cli/src/tuiClient/components/Header.tsx b/apps/ade-cli/src/tuiClient/components/Header.tsx
index 7dc4641b4..aebdd5615 100644
--- a/apps/ade-cli/src/tuiClient/components/Header.tsx
+++ b/apps/ade-cli/src/tuiClient/components/Header.tsx
@@ -17,7 +17,7 @@ export function laneIconGlyph(icon: LaneIcon | null | undefined): string {
   return LANE_ICON_GLYPH[icon] ?? "▎";
 }
 
-export function Header({
+function HeaderComponent({
   projectName,
   lane,
   chatTitle,
@@ -95,3 +95,5 @@ export function Header({
     </Box>
   );
 }
+
+export const Header = React.memo(HeaderComponent);
diff --git a/apps/ade-cli/src/tuiClient/components/RightPane.tsx b/apps/ade-cli/src/tuiClient/components/RightPane.tsx
index 12f6baccd..7e8df666f 100644
--- a/apps/ade-cli/src/tuiClient/components/RightPane.tsx
+++ b/apps/ade-cli/src/tuiClient/components/RightPane.tsx
@@ -1826,7 +1826,7 @@ function paneTitle(content: RightPaneContent): { title: string; hint?: string; b
 // Main right pane component
 // ---------------------------------------------------------------------------
 
-export function RightPane({
+function RightPaneComponent({
   content,
   formValues = {},
   activeFormField = 0,
@@ -2079,3 +2079,5 @@ export function RightPane({
     </Box>
   );
 }
+
+export const RightPane = React.memo(RightPaneComponent);
diff --git a/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx b/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
index 0d96056dc..6b2eef5c8 100644
--- a/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
+++ b/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
@@ -275,16 +275,16 @@ function styleForCell(cell: TerminalSnapshotCell): TerminalRunStyle {
     backgroundColor = color;
     color = nextColor;
   }
-  return {
-    ...(color ? { color } : {}),
-    ...(backgroundColor ? { backgroundColor } : {}),
-    ...(cell.bold ? { bold: true } : {}),
-    ...(cell.dim ? { dim: true } : {}),
-    ...(cell.italic ? { italic: true } : {}),
-    ...(cell.underline ? { underline: true } : {}),
-    ...(cell.inverse ? { inverse: true } : {}),
-    ...(cell.strikethrough ? { strikethrough: true } : {}),
-  };
+  const style: TerminalRunStyle = {};
+  if (color) style.color = color;
+  if (backgroundColor) style.backgroundColor = backgroundColor;
+  if (cell.bold) style.bold = true;
+  if (cell.dim) style.dim = true;
+  if (cell.italic) style.italic = true;
+  if (cell.underline) style.underline = true;
+  if (cell.inverse) style.inverse = true;
+  if (cell.strikethrough) style.strikethrough = true;
+  return style;
 }
 
 function styleKey(style: TerminalRunStyle): string {
@@ -323,19 +323,38 @@ function snapshotCellFromXtermCell(cell: XtermBufferCell | undefined): TerminalS
   }
   const fgMode = cell.isFgRGB() ? "rgb" : cell.isFgPalette() ? "palette" : "default";
   const bgMode = cell.isBgRGB() ? "rgb" : cell.isBgPalette() ? "palette" : "default";
-  return {
+  const snapshot: TerminalSnapshotCell = {
     text: cell.getChars() || " ",
     fg: fgMode === "default" ? null : cell.getFgColor(),
     bg: bgMode === "default" ? null : cell.getBgColor(),
     fgMode,
     bgMode,
-    ...(cell.isBold() ? { bold: true } : {}),
-    ...(cell.isDim() ? { dim: true } : {}),
-    ...(cell.isItalic() ? { italic: true } : {}),
-    ...(cell.isUnderline() ? { underline: true } : {}),
-    ...(cell.isInverse() ? { inverse: true } : {}),
-    ...(cell.isStrikethrough() ? { strikethrough: true } : {}),
   };
+  if (cell.isBold()) snapshot.bold = true;
+  if (cell.isDim()) snapshot.dim = true;
+  if (cell.isItalic()) snapshot.italic = true;
+  if (cell.isUnderline()) snapshot.underline = true;
+  if (cell.isInverse()) snapshot.inverse = true;
+  if (cell.isStrikethrough()) snapshot.strikethrough = true;
+  return snapshot;
+}
+
+function isBlankDefaultCell(cell: TerminalSnapshotCell): boolean {
+  return (cell.text || " ") === " "
+    && cell.fg == null
+    && cell.bg == null
+    && cell.fgMode === "default"
+    && cell.bgMode === "default"
+    && !cell.bold
+    && !cell.dim
+    && !cell.italic
+    && !cell.underline
+    && !cell.inverse
+    && !cell.strikethrough;
+}
+
+function isBlankStyledRow(row: TerminalStyledRow): boolean {
+  return row.runs.every((run) => run.text.trim().length === 0 && Object.keys(run.style).length === 0);
 }
 
 function styledRowsFromTerminal(
@@ -355,12 +374,23 @@ function styledRowsFromTerminal(
       rows.push({ runs: [{ text: " ", style: {} }] });
       continue;
     }
+    const fallbackText = line.translateToString(true);
+    if (!fallbackText) {
+      rows.push({ runs: [{ text: " ", style: {} }] });
+      continue;
+    }
     const cells: TerminalSnapshotCell[] = [];
-    for (let column = 0; column < terminal.cols; column += 1) {
-      cells.push(snapshotCellFromXtermCell(line.getCell(column) as unknown as XtermBufferCell | undefined));
+    let lastContentColumn = -1;
+    const scanColumns = Math.min(terminal.cols, fallbackText.length);
+    for (let column = 0; column < scanColumns; column += 1) {
+      const cell = snapshotCellFromXtermCell(line.getCell(column) as unknown as XtermBufferCell | undefined);
+      cells.push(cell);
+      if (!isBlankDefaultCell(cell)) lastContentColumn = column;
     }
-    rows.push(styledRowFromCells(cells, line.translateToString(true)));
+    if (lastContentColumn >= 0) cells.length = lastContentColumn + 1;
+    rows.push(styledRowFromCells(lastContentColumn >= 0 ? cells : [], fallbackText));
   }
+  while (rows.length > 1 && isBlankStyledRow(rows[rows.length - 1]!)) rows.pop();
   return rows;
 }
 
@@ -403,7 +433,7 @@ function terminalControlBorderColor(frame: string): string {
   return frame === "◐" || frame === "◑" ? theme.color.warning : theme.color.attention2;
 }
 
-export function TerminalPane({
+function TerminalPaneComponent({
   title,
   terminalId,
   cliLabel,
@@ -643,3 +673,5 @@ export function TerminalPane({
     </Box>
   );
 }
+
+export const TerminalPane = React.memo(TerminalPaneComponent);
diff --git a/apps/ade-cli/src/tuiClient/format.ts b/apps/ade-cli/src/tuiClient/format.ts
index 340cbb69e..bbcfb91f9 100644
--- a/apps/ade-cli/src/tuiClient/format.ts
+++ b/apps/ade-cli/src/tuiClient/format.ts
@@ -384,8 +384,61 @@ function appendBlockTokens(tokens: Token[], blocks: AssistantMarkdownBlock[]): v
   }
 }
 
-export function parseAssistantMarkdown(text: string): AssistantMarkdownBlock[] {
-  if (!text.length) return [];
+const MARKDOWN_CACHE_MAX_ENTRIES = 500;
+const MARKDOWN_CACHE_MAX_BYTES = 50 * 1024 * 1024;
+const markdownCache = new Map<string, { blocks: AssistantMarkdownBlock[]; bytes: number }>();
+let markdownCacheBytes = 0;
+
+function estimateMarkdownBytes(text: string, blocks: AssistantMarkdownBlock[]): number {
+  let bytes = text.length * 2 + 32;
+  for (const block of blocks) {
+    bytes += 48;
+    switch (block.kind) {
+      case "code":
+        bytes += (block.language?.length ?? 0) * 2;
+        for (const line of block.lines) bytes += line.length * 2 + 16;
+        break;
+      case "table":
+        for (const header of block.headers) bytes += header.length * 2 + 16;
+        for (const row of block.rows) {
+          for (const cell of row) bytes += cell.length * 2 + 16;
+        }
+        break;
+      case "heading":
+      case "paragraph":
+      case "quote":
+      case "bullet":
+      case "numbered":
+        bytes += block.text.length * 2;
+        break;
+      case "hr":
+        break;
+      default:
+        break;
+    }
+  }
+  return bytes;
+}
+
+function rememberMarkdownParse(text: string, blocks: AssistantMarkdownBlock[]): AssistantMarkdownBlock[] {
+  const bytes = estimateMarkdownBytes(text, blocks);
+  markdownCache.set(text, { blocks, bytes });
+  markdownCacheBytes += bytes;
+  while (markdownCache.size > MARKDOWN_CACHE_MAX_ENTRIES || markdownCacheBytes > MARKDOWN_CACHE_MAX_BYTES) {
+    const oldest = markdownCache.keys().next().value;
+    if (oldest === undefined) break;
+    const evicted = markdownCache.get(oldest);
+    markdownCache.delete(oldest);
+    if (evicted) markdownCacheBytes -= evicted.bytes;
+    if (markdownCache.size === 0) {
+      markdownCacheBytes = 0;
+      break;
+    }
+  }
+  return blocks;
+}
+
+function parseAssistantMarkdownUncached(text: string): AssistantMarkdownBlock[] {
   const blocks: AssistantMarkdownBlock[] = [];
   try {
     const tokens = Lexer.lex(text.replace(/\r\n/g, "\n"));
@@ -399,6 +452,26 @@ export function parseAssistantMarkdown(text: string): AssistantMarkdownBlock[] {
   return blocks;
 }
 
+export function parseAssistantMarkdown(text: string): AssistantMarkdownBlock[] {
+  if (!text.length) return [];
+  const hit = markdownCache.get(text);
+  if (hit) {
+    markdownCache.delete(text);
+    markdownCache.set(text, hit);
+    return hit.blocks;
+  }
+  return rememberMarkdownParse(text, parseAssistantMarkdownUncached(text));
+}
+
+export function __clearAssistantMarkdownCacheForTests(): void {
+  markdownCache.clear();
+  markdownCacheBytes = 0;
+}
+
+export function __getAssistantMarkdownCacheStatsForTests(): { entries: number; bytes: number } {
+  return { entries: markdownCache.size, bytes: markdownCacheBytes };
+}
+
 export function latestExpandableFailureId(events: AgentChatEventEnvelope[]): string | null {
   for (let index = events.length - 1; index >= 0; index -= 1) {
     const envelope = events[index]!;
diff --git a/apps/ade-cli/src/tuiClient/pendingInput.ts b/apps/ade-cli/src/tuiClient/pendingInput.ts
index 9451c8d59..398091908 100644
--- a/apps/ade-cli/src/tuiClient/pendingInput.ts
+++ b/apps/ade-cli/src/tuiClient/pendingInput.ts
@@ -34,14 +34,13 @@ function isApprovalMode(request: PendingInputRequest | undefined): boolean {
 
 export function latestPendingApproval(events: AgentChatEventEnvelope[]): PendingApproval | null {
   const resolved = new Set<string>();
-  for (const envelope of events) {
-    const event = envelope.event as Record<string, unknown>;
+  for (let index = events.length - 1; index >= 0; index -= 1) {
+    const event = events[index]?.event as Record<string, unknown> | undefined;
+    if (!event) continue;
     if (event.type === "pending_input_resolved" && typeof event.itemId === "string") {
       resolved.add(event.itemId);
+      continue;
     }
-  }
-  for (let index = events.length - 1; index >= 0; index -= 1) {
-    const event = events[index]?.event as Record<string, unknown> | undefined;
     if (!event || event.type !== "approval_request" || typeof event.itemId !== "string") continue;
     if (resolved.has(event.itemId)) continue;
     const request = requestFromApprovalEvent(event);
diff --git a/apps/desktop/src/shared/chatSubagents.ts b/apps/desktop/src/shared/chatSubagents.ts
index 55c9a5388..a849e3c5c 100644
--- a/apps/desktop/src/shared/chatSubagents.ts
+++ b/apps/desktop/src/shared/chatSubagents.ts
@@ -307,6 +307,79 @@ export function subagentSnapshotsFromEvents(events: AgentChatEventEnvelope[]): S
   return [...snapshots.values()];
 }
 
+export function subagentActivitySummaryFromEvents(events: AgentChatEventEnvelope[]): { totalCount: number; runningCount: number } {
+  const snapshots = new Map<string, Pick<SubagentSnapshot, "status" | "kind" | "background" | "turnId">>();
+  const terminalTurnIds = new Set<string>();
+
+  for (const envelope of events) {
+    const event = envelope.event as Record<string, unknown>;
+    const type = typeof event.type === "string" ? event.type : "";
+    const turnId = typeof event.turnId === "string" ? event.turnId : null;
+    if (turnId && (type === "done" || (type === "status" && event.turnStatus !== "started"))) {
+      terminalTurnIds.add(turnId);
+    }
+
+    if (type === "teammate.idle") {
+      const teamName = typeof event.teamName === "string" ? event.teamName : "";
+      const teammateName = typeof event.teammateName === "string" ? event.teammateName : "";
+      if (!teammateName) continue;
+      snapshots.set(`teammate:${teamName}:${teammateName}`, {
+        kind: "teammate",
+        status: "running",
+        turnId,
+      });
+      continue;
+    }
+
+    if (type === "task.completed") {
+      const teamName = typeof event.teamName === "string" ? event.teamName : "";
+      const teammateName = typeof event.teammateName === "string" ? event.teammateName : "";
+      if (!teammateName) continue;
+      snapshots.set(`teammate:${teamName}:${teammateName}`, {
+        kind: "teammate",
+        status: "completed",
+        turnId,
+      });
+      continue;
+    }
+
+    if (!type.startsWith("subagent")) continue;
+    const taskId = typeof event.taskId === "string" && event.taskId.trim() ? event.taskId.trim() : null;
+    const agentId = typeof event.agentId === "string" && event.agentId.trim() ? event.agentId.trim() : null;
+    const id = agentId ?? taskId;
+    if (!id) continue;
+    if (taskId && id !== taskId) snapshots.delete(taskId);
+    const status = type === "subagent_result" || type === "subagent.completed"
+      ? event.status === "failed" || event.status === "stopped" || event.status === "completed"
+        ? event.status
+        : "completed"
+      : "running";
+    snapshots.set(id, {
+      kind: "subagent",
+      status,
+      background: event.background === true,
+      turnId,
+    });
+  }
+
+  let runningCount = 0;
+  for (const [id, snapshot] of snapshots) {
+    let status = snapshot.status;
+    if (
+      snapshot.kind === "subagent"
+      && status === "running"
+      && snapshot.background !== true
+      && snapshot.turnId
+      && terminalTurnIds.has(snapshot.turnId)
+    ) {
+      status = "stopped";
+      snapshots.set(id, { ...snapshot, status });
+    }
+    if (status === "running") runningCount += 1;
+  }
+  return { totalCount: snapshots.size, runningCount };
+}
+
 export function buildSubagentPaneRows(content: SubagentPaneContent): SubagentPaneRow[] {
   const foregroundSubagents = content.snapshots.filter((snap) => (
     snap.kind === "subagent"

From 1f2ddb126689e41f9db9650704a89df7083fce47 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 03:18:35 -0400
Subject: [PATCH 04/17] ade code: fix tui bug and parity batch

---
 apps/ade-cli/package-lock.json                |  19 +-
 apps/ade-cli/package.json                     |   1 +
 .../src/tuiClient/__tests__/ChatView.test.tsx |  12 +
 .../tuiClient/__tests__/RightPane.test.tsx    |  26 +
 .../src/tuiClient/__tests__/adeApi.test.ts    |  37 ++
 .../src/tuiClient/__tests__/aggregate.test.ts |  24 +
 .../src/tuiClient/__tests__/appInput.test.ts  | 143 ++++-
 .../tuiClient/__tests__/connection.test.ts    |   4 +-
 .../tuiClient/__tests__/drawerLayout.test.ts  |  13 +
 .../tuiClient/__tests__/keybindings.test.ts   |  14 +
 .../tuiClient/__tests__/newLaneForm.test.ts   |  94 ++-
 .../src/tuiClient/__tests__/state.test.ts     |  37 +-
 apps/ade-cli/src/tuiClient/adeApi.ts          |  11 +-
 apps/ade-cli/src/tuiClient/aggregate.ts       |  19 +
 apps/ade-cli/src/tuiClient/app.tsx            | 596 +++++++++++++++---
 apps/ade-cli/src/tuiClient/bracketedPaste.ts  |  72 +++
 .../src/tuiClient/components/ChatView.tsx     |  44 +-
 .../src/tuiClient/components/RightPane.tsx    |  27 +-
 apps/ade-cli/src/tuiClient/displayWidth.ts    | 117 ++++
 apps/ade-cli/src/tuiClient/drawerLayout.ts    |   8 +-
 .../src/tuiClient/keybindings/index.ts        |  20 +-
 apps/ade-cli/src/tuiClient/newLaneForm.ts     |  49 +-
 apps/ade-cli/src/tuiClient/state.ts           |  84 ++-
 apps/ade-cli/src/tuiClient/types.ts           |   9 +
 apps/ade-cli/tsup.config.ts                   |   1 +
 docs/features/ade-code/README.md              |  73 ++-
 26 files changed, 1326 insertions(+), 228 deletions(-)
 create mode 100644 apps/ade-cli/src/tuiClient/bracketedPaste.ts
 create mode 100644 apps/ade-cli/src/tuiClient/displayWidth.ts

diff --git a/apps/ade-cli/package-lock.json b/apps/ade-cli/package-lock.json
index 6bd871fd5..7c5772f1a 100644
--- a/apps/ade-cli/package-lock.json
+++ b/apps/ade-cli/package-lock.json
@@ -32,6 +32,7 @@
         "opencode-ai": "^1.15.5",
         "react": "^19.2.7",
         "sql.js": "^1.13.0",
+        "string-width": "^4.2.3",
         "ws": "^8.20.0",
         "yaml": "^2.8.2",
         "zod": "^4.3.6"
@@ -1822,7 +1823,6 @@
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
       "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -2552,8 +2552,7 @@
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "license": "MIT",
-      "optional": true
+      "license": "MIT"
     },
     "node_modules/encodeurl": {
       "version": "2.0.0",
@@ -3493,7 +3492,6 @@
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=8"
       }
@@ -5341,7 +5339,6 @@
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -5356,7 +5353,6 @@
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -7636,8 +7632,7 @@
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "optional": true
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
       "version": "5.2.0",
@@ -8100,8 +8095,7 @@
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "optional": true
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "encodeurl": {
       "version": "2.0.0",
@@ -8697,8 +8691,7 @@
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "optional": true
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
     "is-in-ci": {
       "version": "2.0.0",
@@ -9851,7 +9844,6 @@
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
       "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "optional": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -9862,7 +9854,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
       "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "optional": true,
       "requires": {
         "ansi-regex": "^5.0.1"
       }
diff --git a/apps/ade-cli/package.json b/apps/ade-cli/package.json
index 06378d539..9bcb9a0f1 100644
--- a/apps/ade-cli/package.json
+++ b/apps/ade-cli/package.json
@@ -48,6 +48,7 @@
     "opencode-ai": "^1.15.5",
     "react": "^19.2.7",
     "sql.js": "^1.13.0",
+    "string-width": "^4.2.3",
     "ws": "^8.20.0",
     "yaml": "^2.8.2",
     "zod": "^4.3.6"
diff --git a/apps/ade-cli/src/tuiClient/__tests__/ChatView.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/ChatView.test.tsx
index 1320e6c78..c1d69d6e6 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/ChatView.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/ChatView.test.tsx
@@ -104,6 +104,18 @@ describe("ChatView", () => {
     )).toBe("  const value = 1;  \n    return value;  ");
   });
 
+  it("selects CJK and emoji by terminal display cells", () => {
+    expect(selectedTextFromChatRows(
+      ["a界b"],
+      { startRow: 0, startColumn: 1, endRow: 0, endColumn: 2 },
+    )).toBe("界");
+
+    expect(selectedTextFromChatRows(
+      ["a🙂b"],
+      { startRow: 0, startColumn: 1, endRow: 0, endColumn: 2 },
+    )).toBe("🙂");
+  });
+
   it("copies selected absolute transcript rows outside the visible viewport", () => {
     const events = Array.from({ length: 12 }, (_, index): AgentChatEventEnvelope => ({
       sessionId: "s1",
diff --git a/apps/ade-cli/src/tuiClient/__tests__/RightPane.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/RightPane.test.tsx
index ae3a5b3a0..958c7461e 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/RightPane.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/RightPane.test.tsx
@@ -511,6 +511,7 @@ describe("RightPane lane-details", () => {
           ...baseLaneDetails,
         }}
         focused
+        width={80}
       />,
     );
     const frame = stripAnsi(result.lastFrame() ?? "");
@@ -540,6 +541,7 @@ describe("RightPane lane-details", () => {
           },
         }}
         focused
+        width={80}
       />,
     );
     const frame = stripAnsi(result.lastFrame() ?? "");
@@ -581,6 +583,30 @@ describe("RightPane lane-details", () => {
     expect(frame).toContain("● clean");
   });
 
+  it("surfaces retryable lane setup failure in lane details", () => {
+    const result = render(
+      <RightPane
+        content={{
+          kind: "lane-details",
+          ...baseLaneDetails,
+          setup: {
+            status: "failed",
+            label: "Setup failed",
+            detail: "Template install failed · press r to retry",
+            retryable: true,
+          },
+        }}
+        focused
+        width={80}
+      />,
+    );
+    const frame = stripAnsi(result.lastFrame() ?? "");
+
+    expect(frame).toContain("SETUP");
+    expect(frame).toContain("Setup failed");
+    expect(frame).toContain("press r to retry");
+  });
+
   it("shows action shortcuts only for the selected row", () => {
     const result = render(
       <RightPane
diff --git a/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts b/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts
index 8b963937b..a0d639db2 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts
@@ -107,6 +107,43 @@ describe("runDefaultLaneSetup", () => {
       { domain: "lane", action: "initEnv", args: { laneId: "lane-1" } },
     ]);
   });
+
+  it("applies an explicit setup template instead of the default", async () => {
+    const calls: Array<{ domain: string; action: string; args: Record<string, unknown> | undefined }> = [];
+    const connection = {
+      action: async (domain: string, action: string, args?: Record<string, unknown>) => {
+        calls.push({ domain, action, args });
+        if (action === "listTemplates") return [{ id: "tpl-default", name: "Default" }, { id: "tpl-custom", name: "Custom" }];
+        if (action === "getDefaultTemplate") return "tpl-default";
+        if (action === "applyTemplate") {
+          return { laneId: "lane-1", steps: [], startedAt: "2026-01-01T00:00:00.000Z", overallStatus: "completed" };
+        }
+        throw new Error(`unexpected action ${action}`);
+      },
+    } as unknown as AdeCodeConnection;
+
+    const result = await runDefaultLaneSetup(connection, "lane-1", { templateId: "tpl-custom" });
+
+    expect(result.templateId).toBe("tpl-custom");
+    expect(calls).toEqual([
+      { domain: "lane", action: "listTemplates", args: undefined },
+      { domain: "lane", action: "getDefaultTemplate", args: undefined },
+      { domain: "lane", action: "applyTemplate", args: { laneId: "lane-1", templateId: "tpl-custom" } },
+    ]);
+  });
+
+  it("rejects an explicit setup template that does not exist", async () => {
+    const connection = {
+      action: async (_domain: string, action: string) => {
+        if (action === "listTemplates") return [{ id: "tpl-default", name: "Default" }];
+        if (action === "getDefaultTemplate") return "tpl-default";
+        throw new Error(`unexpected action ${action}`);
+      },
+    } as unknown as AdeCodeConnection;
+
+    await expect(runDefaultLaneSetup(connection, "lane-1", { templateId: "missing" }))
+      .rejects.toThrow('Setup template "missing" was not found.');
+  });
 });
 
 describe("getChatHistoryPage", () => {
diff --git a/apps/ade-cli/src/tuiClient/__tests__/aggregate.test.ts b/apps/ade-cli/src/tuiClient/__tests__/aggregate.test.ts
index 1019cd35c..1c04b7e9b 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/aggregate.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/aggregate.test.ts
@@ -177,6 +177,30 @@ describe("aggregateChatBlocks typed groups", () => {
     expect(activity!.entries[0]).toMatchObject({ label: "compacting memory", detail: "trimming context" });
   });
 
+  it("compacts PreToolUse hook errors into one failed hook activity row", () => {
+    const events: AgentChatEventEnvelope[] = [
+      env("2026-01-01T12:00:00.000Z", {
+        type: "system_notice",
+        noticeKind: "hook",
+        message: "Hook: PreToolUse: Bash error",
+        turnId: "turn-1",
+      } as AgentChatEvent),
+    ];
+    const blocks = aggregate(events);
+    const activity = blocks.find((b) => b.kind === "runtime-activity") as Extract<AggregatedBlock, { kind: "runtime-activity" }> | undefined;
+
+    expect(blocks).toHaveLength(1);
+    expect(activity?.entries).toEqual([
+      {
+        id: expect.any(String),
+        label: "hook",
+        detail: "PreToolUse: Bash error",
+        status: "failed",
+      },
+    ]);
+    expect(activity?.live).toBe(false);
+  });
+
   it("collapses a context_compact begin→end into one block that flips live→done", () => {
     const events: AgentChatEventEnvelope[] = [
       env("2026-01-01T12:00:00.000Z", { type: "context_compact", trigger: "auto", state: "started", turnId: "turn-1" }),
diff --git a/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts b/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
index 996d6966a..32dd214ee 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
@@ -14,6 +14,7 @@ import {
   deletePreviousPromptWord,
   encodeTerminalPromptSubmit,
   encodeTerminalPromptSubmitConfirm,
+  latestAuthFailedPrompt,
   applyCoalescedPromptInput,
   firstUrlInText,
   footerControlsForAvailability,
@@ -73,11 +74,14 @@ import {
   splitTerminalControlInput,
   stableInkViewportRows,
   subagentSnapshotsFromEvents,
+  terminalBracketedPasteDisableSequence,
+  terminalBracketedPasteEnableSequence,
   terminalAlternateScreenDisableSequence,
   terminalAlternateScrollDisableSequence,
   terminalInteractiveRestoreSequence,
   terminalMouseTrackingDisableSequence,
   terminalMouseTrackingEnableSequence,
+  terminalControlInputAction,
   isClaudePlaceholderTitle,
   isClipboardScratchTemp,
   mergeOptimisticTerminalSessions,
@@ -85,11 +89,19 @@ import {
   clipboardImageCacheRootForRuntime,
   uploadClipboardImageAttachmentToRuntime,
 } from "../app";
+import {
+  BRACKETED_PASTE_END,
+  BRACKETED_PASTE_START,
+  EMPTY_BRACKETED_PASTE_STATE,
+  consumeBracketedPasteInput,
+  formatTerminalControlForwardedInput,
+  stripBracketedPasteMarkers,
+} from "../bracketedPaste";
 import { clampTerminalPaneCols } from "../components/TerminalPane";
 import { clipboardScratchDir } from "../imageTargets";
 import type { AdeCodeConnection, ChatInfoSnapshot, LocalNotice, RightPaneContent } from "../types";
 import { resolveSubagentCapability } from "../../../../desktop/src/shared/subagentCapabilities";
-import type { AgentChatSession, AgentChatSessionSummary } from "../../../../desktop/src/shared/types/chat";
+import type { AgentChatEventEnvelope, AgentChatSession, AgentChatSessionSummary } from "../../../../desktop/src/shared/types/chat";
 import type { LaneSummary } from "../../../../desktop/src/shared/types/lanes";
 import type { ChatTerminalSession } from "../../../../desktop/src/shared/types/sessions";
 import type { ChatTerminalPreviewResult } from "../../../../desktop/src/shared/types";
@@ -1148,6 +1160,14 @@ describe("terminal control toggle", () => {
     expect(isTerminalControlToggle("t", {})).toBe(false);
   });
 
+  it("ignores arbitrary input while attached but still recognizes detach chords", () => {
+    expect(terminalControlInputAction("x", {})).toBe("ignore");
+    expect(terminalControlInputAction("\x1b[A", {})).toBe("ignore");
+    expect(terminalControlInputAction("t", { ctrl: true })).toBe("detach");
+    expect(terminalControlInputAction("\x14", {})).toBe("detach");
+    expect(terminalControlInputAction("\x1d", {})).toBe("detach");
+  });
+
   it("detaches from terminal control while preserving other raw input bytes", () => {
     expect(splitTerminalControlInput("a\x14b\x1dc")).toEqual({
       detach: true,
@@ -1158,6 +1178,20 @@ describe("terminal control toggle", () => {
       forwarded: "\x1b[A",
     });
   });
+
+  it("wraps multiline forwarded terminal control input in bracketed paste", () => {
+    expect(formatTerminalControlForwardedInput("one\ntwo")).toBe(
+      `${BRACKETED_PASTE_START}one\ntwo${BRACKETED_PASTE_END}`,
+    );
+    expect(splitTerminalControlInput("one\r\ntwo")).toEqual({
+      detach: false,
+      forwarded: `${BRACKETED_PASTE_START}one\ntwo${BRACKETED_PASTE_END}`,
+    });
+    expect(splitTerminalControlInput(`\x14one\ntwo`)).toEqual({
+      detach: true,
+      forwarded: `${BRACKETED_PASTE_START}one\ntwo${BRACKETED_PASTE_END}`,
+    });
+  });
 });
 
 describe("pane width helpers", () => {
@@ -1443,12 +1477,23 @@ describe("prompt editing helpers", () => {
 
   it("does not split multi-byte characters when editing or wrapping", () => {
     expect(promptDisplayRowsWithCursor("a🙂b", 2, 3).rows).toEqual([
-      { text: "a🙂", start: 0, end: 3, cursorColumn: null },
+      { text: "a", start: 0, end: 1, cursorColumn: null },
+      { text: "🙂", start: 1, end: 3, cursorColumn: null },
       { text: "b", start: 3, end: 4, cursorColumn: 0 },
     ]);
     expect(deletePromptBackward("a🙂b", 3)).toEqual({ value: "ab", cursor: 1 });
     expect(deletePromptForward("a🙂b", 1)).toEqual({ value: "ab", cursor: 1 });
   });
+
+  it("counts CJK and emoji prompt cursor columns in terminal cells", () => {
+    const cjk = promptDisplayRowsWithCursor("a界bc", 4, 2);
+    expect(cjk.rows[0]).toEqual({ text: "a界b", start: 0, end: 3, cursorColumn: 3 });
+    expect(cjk.rows[1]).toEqual({ text: "c", start: 3, end: 4, cursorColumn: null });
+
+    const emoji = promptDisplayRowsWithCursor("a🙂bc", 4, 3);
+    expect(emoji.rows[0]).toEqual({ text: "a🙂b", start: 0, end: 4, cursorColumn: 3 });
+    expect(emoji.rows[1]).toEqual({ text: "c", start: 4, end: 5, cursorColumn: null });
+  });
 });
 
 describe("optimistic chat summaries", () => {
@@ -1504,6 +1549,58 @@ describe("optimistic chat summaries", () => {
   });
 });
 
+describe("latestAuthFailedPrompt", () => {
+  it("restores the most recent prompt when the latest turn failed with auth", () => {
+    const events: AgentChatEventEnvelope[] = [
+      {
+        sessionId: "s1",
+        timestamp: "2026-01-01T12:00:00.000Z",
+        sequence: 1,
+        event: { type: "user_message", text: "retry deploy", turnId: "turn-1" },
+      },
+      {
+        sessionId: "s1",
+        timestamp: "2026-01-01T12:00:01.000Z",
+        sequence: 2,
+        event: { type: "error", message: "Authentication failed: token expired", turnId: "turn-1" },
+      },
+    ];
+
+    expect(latestAuthFailedPrompt(events)).toBe("retry deploy");
+  });
+
+  it("ignores older auth failures once a later user turn succeeds", () => {
+    const events: AgentChatEventEnvelope[] = [
+      {
+        sessionId: "s1",
+        timestamp: "2026-01-01T12:00:00.000Z",
+        sequence: 1,
+        event: { type: "user_message", text: "first", turnId: "turn-1" },
+      },
+      {
+        sessionId: "s1",
+        timestamp: "2026-01-01T12:00:01.000Z",
+        sequence: 2,
+        event: { type: "error", message: "auth required", turnId: "turn-1" },
+      },
+      {
+        sessionId: "s1",
+        timestamp: "2026-01-01T12:00:02.000Z",
+        sequence: 3,
+        event: { type: "user_message", text: "second", turnId: "turn-2" },
+      },
+      {
+        sessionId: "s1",
+        timestamp: "2026-01-01T12:00:03.000Z",
+        sequence: 4,
+        event: { type: "done", status: "completed", turnId: "turn-2" },
+      },
+    ];
+
+    expect(latestAuthFailedPrompt(events)).toBeNull();
+  });
+});
+
 describe("terminal mouse tracking", () => {
   it("uses one conservative cross-terminal mouse baseline", () => {
     expect(terminalMouseTrackingEnableSequence()).toBe("\x1b[?1000h\x1b[?1002h\x1b[?1006h");
@@ -1516,9 +1613,14 @@ describe("terminal mouse tracking", () => {
 
   it("restores mouse tracking, alternate scroll, and the alt screen together", () => {
     expect(terminalInteractiveRestoreSequence()).toBe(
-      `${terminalMouseTrackingDisableSequence()}${terminalAlternateScrollDisableSequence()}${terminalAlternateScreenDisableSequence()}`,
+      `${terminalMouseTrackingDisableSequence()}${terminalAlternateScrollDisableSequence()}${terminalBracketedPasteDisableSequence()}${terminalAlternateScreenDisableSequence()}`,
     );
   });
+
+  it("uses standard bracketed paste mode toggles for terminal control", () => {
+    expect(terminalBracketedPasteEnableSequence()).toBe("\x1b[?2004h");
+    expect(terminalBracketedPasteDisableSequence()).toBe("\x1b[?2004l");
+  });
 });
 
 describe("encodeTerminalPromptSubmit", () => {
@@ -1536,6 +1638,41 @@ describe("encodeTerminalPromptSubmit", () => {
   });
 });
 
+describe("bracketed paste input", () => {
+  it("buffers pasted text and keeps embedded newlines as literal input", () => {
+    const result = consumeBracketedPasteInput(
+      EMPTY_BRACKETED_PASTE_STATE,
+      `${BRACKETED_PASTE_START}one\r\ntwo${BRACKETED_PASTE_END}`,
+    );
+
+    expect(result).toEqual({
+      consumed: true,
+      state: EMPTY_BRACKETED_PASTE_STATE,
+      text: "one\ntwo",
+    });
+  });
+
+  it("supports bracketed paste split across input chunks", () => {
+    const first = consumeBracketedPasteInput(EMPTY_BRACKETED_PASTE_STATE, `${BRACKETED_PASTE_START}one`);
+    expect(first).toEqual({
+      consumed: true,
+      state: { active: true, buffer: "one" },
+      text: "",
+    });
+
+    const second = consumeBracketedPasteInput(first.state, `\ntwo${BRACKETED_PASTE_END}`);
+    expect(second).toEqual({
+      consumed: true,
+      state: EMPTY_BRACKETED_PASTE_STATE,
+      text: "one\ntwo",
+    });
+  });
+
+  it("strips stray bracketed paste markers from printable prompt input", () => {
+    expect(stripBracketedPasteMarkers(`${BRACKETED_PASTE_START}alpha${BRACKETED_PASTE_END}`)).toBe("alpha");
+  });
+});
+
 describe("clipboard image attachment routing", () => {
   it("captures remote clipboard images into a local scratch root", () => {
     expect(clipboardImageCacheRootForRuntime({
diff --git a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
index 81fb5a289..4b84898fb 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
@@ -965,9 +965,9 @@ describe("ade-code TUI state", () => {
 
   it("persists the last lane id with last chat pointers", async () => {
     const home = fs.mkdtempSync(path.join(os.tmpdir(), "ade-tui-state-"));
-    const { loadAdeCodeState, saveAdeCodeState } = await loadStateModule(home);
+    const { loadAdeCodeState, saveAdeCodeStateAsync } = await loadStateModule(home);
 
-    saveAdeCodeState({
+    await saveAdeCodeStateAsync({
       lastChatByLane: { "lane-2": "chat-9" },
       lastChatByProjectLane: {},
       lastLaneId: "lane-2",
diff --git a/apps/ade-cli/src/tuiClient/__tests__/drawerLayout.test.ts b/apps/ade-cli/src/tuiClient/__tests__/drawerLayout.test.ts
index 568d3a43e..48bed7b52 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/drawerLayout.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/drawerLayout.test.ts
@@ -138,4 +138,17 @@ describe("drawerMouseHitForLayout", () => {
     expect(drawerMouseHitForLayout({ y: 13, layout })).toEqual({ kind: "chat", laneIndex: 1, chatIndex: 3 });
     expect(drawerMouseHitForLayout({ y: 14, layout })).toEqual({ kind: "lane", index: 1 });
   });
+
+  it("maps the drawer + new lane row through the shared layout model", () => {
+    const layout = computeDrawerLayout({
+      panelHeight: 20,
+      lanes: [laneInput("a", 0)],
+      expandedLaneIndex: null,
+      selectedLaneIndex: null,
+      scrollOffsetRows: 0,
+    });
+
+    expect(layout.newLaneRow).toBe(19);
+    expect(drawerMouseHitForLayout({ y: layout.newLaneRow, layout })).toEqual({ kind: "new-lane" });
+  });
 });
diff --git a/apps/ade-cli/src/tuiClient/__tests__/keybindings.test.ts b/apps/ade-cli/src/tuiClient/__tests__/keybindings.test.ts
index 9a6257611..ffb1f5246 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/keybindings.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/keybindings.test.ts
@@ -1,8 +1,10 @@
 import { describe, expect, it } from "vitest";
 import {
   dispatchKeybinding,
+  keybindingsEditorCommand,
   keypressToChord,
   normalizeKeyChord,
+  splitEditorCommand,
   validateClaudeKeybindingsConfig,
 } from "../keybindings";
 
@@ -113,4 +115,16 @@ describe("keybindings", () => {
     expect(keypressToChord("", { pageDown: true })).toBe("pagedown");
     expect(keypressToChord("k", { ctrl: true })).toBe("ctrl+k");
   });
+
+  it("builds editor argv without shell parsing the target file path", () => {
+    expect(splitEditorCommand("code --wait")).toEqual(["code", "--wait"]);
+    expect(keybindingsEditorCommand("/tmp/keybindings.json", "code --wait", "darwin")).toEqual({
+      command: "code",
+      args: ["--wait", "/tmp/keybindings.json"],
+    });
+    expect(keybindingsEditorCommand("/tmp/keybindings.json", undefined, "darwin")).toEqual({
+      command: "open",
+      args: ["/tmp/keybindings.json"],
+    });
+  });
 });
diff --git a/apps/ade-cli/src/tuiClient/__tests__/newLaneForm.test.ts b/apps/ade-cli/src/tuiClient/__tests__/newLaneForm.test.ts
index f987ae75b..4983d4f2c 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/newLaneForm.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/newLaneForm.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import type { LaneSummary } from "../../../../desktop/src/shared/types/lanes";
+import type { LaneLinearIssue, LaneSummary } from "../../../../desktop/src/shared/types/lanes";
 import { LANE_COLOR_PALETTE } from "../../../../desktop/src/shared/laneColorPalette";
 import {
   NEW_LANE_COLOR_OPTIONS,
@@ -23,16 +23,44 @@ function lane(id: string, name: string): LaneSummary {
   return { id, name } as LaneSummary;
 }
 
+function linearIssue(overrides: Partial<LaneLinearIssue> = {}): LaneLinearIssue {
+  return {
+    id: "issue-1",
+    identifier: "ADE-123",
+    title: "Fix setup parity",
+    description: null,
+    url: "https://linear.app/ade/issue/ADE-123/fix-setup-parity",
+    projectId: "project-1",
+    projectSlug: "ade",
+    projectName: "ADE",
+    teamId: "team-1",
+    teamKey: "ADE",
+    teamName: "ADE",
+    stateId: "state-1",
+    stateName: "Todo",
+    stateType: "unstarted",
+    priority: 0,
+    priorityLabel: "none",
+    labels: [],
+    assigneeId: null,
+    assigneeName: null,
+    branchName: null,
+    createdAt: "2026-01-01T00:00:00.000Z",
+    updatedAt: "2026-01-01T00:00:00.000Z",
+    ...overrides,
+  };
+}
+
 describe("newLaneFormFields", () => {
   it("shows mode-specific fields for each start mode, always ending in the create button", () => {
     const primary = newLaneFormFields("primary").map((field) => field.name);
-    expect(primary).toEqual(["name", "color", "start", "baseBranch", "create"]);
+    expect(primary).toEqual(["name", "color", "start", "baseBranch", "linearIssue", "templateId", "create"]);
 
     const child = newLaneFormFields("child", { activeLaneName: "Current" }).map((field) => field.name);
-    expect(child).toEqual(["name", "color", "start", "parent", "baseBranch", "create"]);
+    expect(child).toEqual(["name", "color", "start", "parent", "baseBranch", "linearIssue", "templateId", "create"]);
 
     const imported = newLaneFormFields("import").map((field) => field.name);
-    expect(imported).toEqual(["name", "color", "start", "branchSource", "branch", "baseBranch", "create"]);
+    expect(imported).toEqual(["name", "color", "start", "branchSource", "branch", "baseBranch", "linearIssue", "templateId", "create"]);
   });
 
   it("keeps the start row at the same index across modes so focus stays put", () => {
@@ -113,12 +141,12 @@ describe("branch typeahead", () => {
 
 describe("newLaneFormFieldRowOffsets", () => {
   it("matches the NewLaneFormPane block heights (start = 5 rows, typeahead +4, create = 2)", () => {
-    // primary: name(1), color(4), start(7), baseBranch(12, +typeahead), create(19)
-    expect(newLaneFormFieldRowOffsets(newLaneFormFields("primary"))).toEqual([1, 4, 7, 12, 19]);
-    // child has no typeahead: name(1), color(4), start(7), parent(12), base(15), create(18)
-    expect(newLaneFormFieldRowOffsets(newLaneFormFields("child"))).toEqual([1, 4, 7, 12, 15, 18]);
-    // import: name(1), color(4), start(7), source(12), branch(15, +typeahead), base(22), create(25)
-    expect(newLaneFormFieldRowOffsets(newLaneFormFields("import"))).toEqual([1, 4, 7, 12, 15, 22, 25]);
+    // primary: name(1), color(4), start(7), baseBranch(12, +typeahead), issue(19), template(22), create(25)
+    expect(newLaneFormFieldRowOffsets(newLaneFormFields("primary"))).toEqual([1, 4, 7, 12, 19, 22, 25]);
+    // child has no typeahead: name(1), color(4), start(7), parent(12), base(15), issue(18), template(21), create(24)
+    expect(newLaneFormFieldRowOffsets(newLaneFormFields("child"))).toEqual([1, 4, 7, 12, 15, 18, 21, 24]);
+    // import: name(1), color(4), start(7), source(12), branch(15, +typeahead), base(22), issue(25), template(28), create(31)
+    expect(newLaneFormFieldRowOffsets(newLaneFormFields("import"))).toEqual([1, 4, 7, 12, 15, 22, 25, 28, 31]);
     expect(NEW_LANE_TYPEAHEAD_ROWS).toBe(4);
   });
 });
@@ -236,4 +264,50 @@ describe("buildNewLaneSubmission", () => {
       activeLaneId: null,
     })).toEqual({ kind: "error", message: "Branch is required." });
   });
+
+  it("attaches Linear issue metadata and selected setup template to create payloads", () => {
+    const issue = linearIssue();
+
+    expect(buildNewLaneSubmission({
+      values: { name: "feature-x", start: "primary", linearIssue: "ADE-123", templateId: "tpl-default" },
+      lanes,
+      activeLaneId: "lane-1",
+      linearIssue: issue,
+    })).toEqual({
+      kind: "create",
+      payload: {
+        name: "feature-x",
+        branchName: "ade-123-fix-setup-parity",
+        linearIssue: issue,
+      },
+      templateId: "tpl-default",
+    });
+
+    expect(buildNewLaneSubmission({
+      values: { name: "stacked", start: "child", linearIssue: "ADE-123" },
+      lanes,
+      activeLaneId: "lane-2",
+      linearIssue: issue,
+    })).toMatchObject({
+      kind: "createChild",
+      payload: {
+        name: "stacked",
+        parentLaneId: "lane-2",
+        branchName: "ade-123-fix-setup-parity",
+        linearIssue: issue,
+      },
+    });
+  });
+
+  it("rejects Linear issue attachment for imported branches", () => {
+    expect(buildNewLaneSubmission({
+      values: { name: "adopted", start: "import", branch: "origin/feature-y", linearIssue: "ADE-123" },
+      lanes,
+      activeLaneId: null,
+      linearIssue: linearIssue(),
+    })).toEqual({
+      kind: "error",
+      message: "Linear issue attachment is not supported when importing an existing branch.",
+    });
+  });
 });
diff --git a/apps/ade-cli/src/tuiClient/__tests__/state.test.ts b/apps/ade-cli/src/tuiClient/__tests__/state.test.ts
index 1c70fd560..84892e353 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/state.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/state.test.ts
@@ -2,7 +2,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
-import { loadAdeCodeState, normalizeAdeCodeState, saveAdeCodeProjectState, scopedAdeCodeState } from "../state";
+import { loadAdeCodeState, normalizeAdeCodeState, saveAdeCodeProjectStateAsync, scopedAdeCodeState } from "../state";
 
 afterEach(() => {
   delete process.env.ADE_CODE_STATE_DIR;
@@ -69,15 +69,15 @@ describe("ade code persisted state", () => {
     });
   });
 
-  it("merges project-scoped saves with existing state under the shared state file", () => {
+  it("merges project-scoped saves with existing state under the shared state file", async () => {
     const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-state-"));
     process.env.ADE_CODE_STATE_DIR = stateDir;
 
-    saveAdeCodeProjectState("/repo-a", {
+    await saveAdeCodeProjectStateAsync("/repo-a", {
       lastChatByLane: { main: "repo-a-chat" },
       lastLaneId: "repo-a-lane",
     });
-    saveAdeCodeProjectState("/repo-b", {
+    await saveAdeCodeProjectStateAsync("/repo-b", {
       lastChatByLane: { main: "repo-b-chat" },
       lastLaneId: "repo-b-lane",
     });
@@ -93,4 +93,33 @@ describe("ade code persisted state", () => {
     });
     expect(fs.existsSync(path.join(stateDir, "ade-code-state.json.lock"))).toBe(false);
   });
+
+  it("retries async saves behind an existing lock without blocking the caller", async () => {
+    const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-state-"));
+    process.env.ADE_CODE_STATE_DIR = stateDir;
+    fs.mkdirSync(stateDir, { recursive: true });
+    const lockPath = path.join(stateDir, "ade-code-state.json.lock");
+    fs.writeFileSync(lockPath, "other writer");
+
+    const savePromise = saveAdeCodeProjectStateAsync("/repo-a", {
+      lastChatByLane: { main: "repo-a-chat" },
+      lastLaneId: "repo-a-lane",
+    });
+    let settled = false;
+    savePromise.then(() => {
+      settled = true;
+    });
+    await Promise.resolve();
+
+    expect(settled).toBe(false);
+
+    fs.unlinkSync(lockPath);
+    await savePromise;
+
+    const persisted = loadAdeCodeState();
+    expect(persisted.lastChatByProjectLane).toEqual({
+      [path.resolve("/repo-a")]: { main: "repo-a-chat" },
+    });
+    expect(fs.existsSync(lockPath)).toBe(false);
+  });
 });
diff --git a/apps/ade-cli/src/tuiClient/adeApi.ts b/apps/ade-cli/src/tuiClient/adeApi.ts
index 2b39528b5..cb3fd2977 100644
--- a/apps/ade-cli/src/tuiClient/adeApi.ts
+++ b/apps/ade-cli/src/tuiClient/adeApi.ts
@@ -79,15 +79,20 @@ export type DefaultLaneSetupResult = {
 export async function runDefaultLaneSetup(
   connection: AdeCodeConnection,
   laneId: string,
+  options: { templateId?: string | null } = {},
 ): Promise<DefaultLaneSetupResult> {
   const [templates, defaultTemplateId] = await Promise.all([
     connection.action<LaneTemplate[]>("lane", "listTemplates").catch(() => []),
     connection.action<string | null>("lane", "getDefaultTemplate").catch(() => null),
   ]);
-  const trimmedTemplateId = typeof defaultTemplateId === "string" ? defaultTemplateId.trim() : "";
-  const templateId = trimmedTemplateId && templates.some((template) => template.id === trimmedTemplateId)
-    ? trimmedTemplateId
+  const explicitTemplateId = typeof options.templateId === "string" ? options.templateId.trim() : "";
+  const trimmedTemplateId = explicitTemplateId || (typeof defaultTemplateId === "string" ? defaultTemplateId.trim() : "");
+  const templateId = trimmedTemplateId
+    ? templates.find((template) => template.id === trimmedTemplateId)?.id ?? null
     : null;
+  if (explicitTemplateId && !templateId) {
+    throw new Error(`Setup template "${explicitTemplateId}" was not found.`);
+  }
   const progress = templateId
     ? await connection.action<LaneEnvInitProgress>("lane", "applyTemplate", { laneId, templateId })
     : await connection.action<LaneEnvInitProgress>("lane", "initEnv", { laneId });
diff --git a/apps/ade-cli/src/tuiClient/aggregate.ts b/apps/ade-cli/src/tuiClient/aggregate.ts
index f07066df9..bfc17a332 100644
--- a/apps/ade-cli/src/tuiClient/aggregate.ts
+++ b/apps/ade-cli/src/tuiClient/aggregate.ts
@@ -455,6 +455,14 @@ function runtimeActivityFromEvent(id: string, event: AgentChatEvent): RuntimeAct
   return null;
 }
 
+function summarizePreToolUseHookError(event: AgentChatEvent): string | null {
+  if (event.type !== "system_notice") return null;
+  if ((event as { noticeKind?: string }).noticeKind !== "hook") return null;
+  const message = event.message.replace(/\s+/g, " ").trim();
+  const match = message.match(/^hook:\s*(PreToolUse:[^\n]+?\s+error)$/i);
+  return match?.[1]?.trim() ?? null;
+}
+
 function appendRuntimeActivityBlock(
   blocks: AggregatedBlock[],
   id: string,
@@ -846,6 +854,17 @@ export function aggregateChatBlocks(args: {
     if (isSteerLifecycleNotice(event)) {
       continue;
     }
+    const hookError = summarizePreToolUseHookError(event);
+    if (hookError) {
+      appendRuntimeActivityBlock(blocks, id, turnId, {
+        id,
+        label: "hook",
+        detail: hookError,
+        status: "failed",
+      });
+      finishTurnBlocks(blocks, turnId);
+      continue;
+    }
     if (event.type === "activity") {
       const activity = runtimeActivityFromEvent(id, event);
       if (activity) appendRuntimeActivityBlock(blocks, id, turnId, activity);
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index 9c7751a1b..c005ecc5a 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -38,7 +38,7 @@ import type {
 } from "../../../desktop/src/shared/types/chat";
 import type { AiSettingsStatus, OpenCodeRuntimeSnapshot } from "../../../desktop/src/shared/types/config";
 import type { DiffLineStats, GitConflictState } from "../../../desktop/src/shared/types/git";
-import type { LaneDeleteRisk, LaneSummary } from "../../../desktop/src/shared/types/lanes";
+import type { LaneDeleteRisk, LaneLinearIssue, LaneSummary } from "../../../desktop/src/shared/types/lanes";
 import type { FeedbackPreparedDraft, FeedbackSubmission } from "../../../desktop/src/shared/types/feedback";
 import type { ChatTerminalPreviewResult, ChatTerminalSession } from "../../../desktop/src/shared/types";
 import {
@@ -173,6 +173,19 @@ import { clipboardScratchDir, isImageFilePath, latestOpenableImageTarget, readCl
 import { appendReservedTuiEvent, dedupeTuiEvents, reserveTuiEventDedupKey, syncTuiEventDedupKeys } from "./eventDedup";
 import { advanceOlderHistoryCursor, prependOlderTuiHistory, splitSnapshotForDisplay, takeNewestChunk, TUI_LOADED_EVENT_CAP } from "./olderHistory";
 import { coalesceTextDeltaEnvelopes } from "./assistantTextIdentity";
+import {
+  EMPTY_BRACKETED_PASTE_STATE,
+  consumeBracketedPasteInput,
+  formatTerminalControlForwardedInput,
+  stripBracketedPasteMarkers,
+  type BracketedPasteState,
+} from "./bracketedPaste";
+import {
+  displayCellForCodeUnitIndex,
+  displayClusters,
+  splitByDisplayCells,
+  terminalDisplayWidth,
+} from "./displayWidth";
 import { loadAdeCodeState, saveAdeCodeProjectState, scopedAdeCodeState } from "./state";
 import { SpinTickProvider } from "./spinTick";
 import { ACTIVE_SESSION_PLACEHOLDER, buildLinearToolRequest } from "./linearCommands";
@@ -247,6 +260,7 @@ import type {
   AdeCodeInterfaceMode,
   AdeCodeModelState,
   LocalNotice,
+  LaneSetupStatus,
   MentionSuggestion,
   PendingApproval,
   ProviderReadinessRow,
@@ -279,7 +293,7 @@ const MODEL_CATALOG_CLIENT_REFRESH_TTL_MS = 5 * 60_000;
 const MODEL_CATALOG_LOCAL_CLIENT_REFRESH_TTL_MS = 30_000;
 const CLAUDE_PERMISSION_OPTIONS = ["default", "auto", "plan", "acceptEdits", "bypassPermissions"] as const;
 const OPENCODE_PERMISSION_OPTIONS = ["plan", "edit", "full-auto", "config-toml"] as const;
-const DROID_PERMISSION_OPTIONS = ["read-only", "auto-low", "auto-medium", "auto-high"] as const;
+const DROID_PERMISSION_OPTIONS = ["read-only", "auto-low", "auto-medium", "auto-high", "agi"] as const;
 type PaneFocus = "drawer" | "chat" | "details" | "addMode";
 type AddModeState = { cursorLaneId: string; cursorChatId: string | null };
 export type FooterControl = "drawer" | "details" | "agents";
@@ -1082,6 +1096,7 @@ function codexPresetPatch(preset: CodexPreset): Pick<AdeCodeModelState, "codexAp
 
 function droidPermissionToLegacy(mode: AdeCodeModelState["droidPermissionMode"]): AgentChatPermissionMode {
   if (mode === "read-only") return "plan";
+  if (mode === "agi") return "plan";
   if (mode === "auto-low") return "edit";
   if (mode === "auto-medium") return "default";
   return "full-auto";
@@ -1127,6 +1142,7 @@ const MODE_DESCRIPTIONS: Record<string, string> = {
   "auto-low": "low-autonomy ops",
   "auto-medium": "medium-autonomy ops",
   "auto-high": "high-autonomy ops",
+  agi: "orchestrator mission",
   "config-toml": "config-defined mode",
 };
 
@@ -1135,7 +1151,7 @@ function modeDescription(summary: string): string {
 }
 
 function modeAccentColor(summary: string): string {
-  if (summary === "plan" || summary === "read-only") return theme.color.planMode;
+  if (summary === "plan" || summary === "read-only" || summary === "agi") return theme.color.planMode;
   if (summary === "bypass" || summary === "full-auto" || summary === "auto-high") return theme.color.warning;
   return theme.color.accent;
 }
@@ -1381,6 +1397,77 @@ function seedLaneDetails(
   };
 }
 
+function normalizeLaneLinearIssue(value: unknown): LaneLinearIssue | null {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  const record = value as Record<string, unknown>;
+  if (typeof record.id !== "string" || typeof record.identifier !== "string" || typeof record.title !== "string") {
+    return null;
+  }
+  return record as LaneLinearIssue;
+}
+
+function exactLinearIssueSearchMatch(input: string, result: unknown): LaneLinearIssue | null {
+  const normalized = input.trim().toLowerCase();
+  const candidates = Array.isArray(result)
+    ? result
+    : result && typeof result === "object" && Array.isArray((result as { issues?: unknown[] }).issues)
+      ? (result as { issues: unknown[] }).issues
+      : [];
+  const issues = candidates
+    .map(normalizeLaneLinearIssue)
+    .filter((issue): issue is LaneLinearIssue => issue !== null);
+  return issues.find((issue) => (
+    issue.id.toLowerCase() === normalized
+    || issue.identifier.toLowerCase() === normalized
+  )) ?? null;
+}
+
+async function resolveLinearIssueForNewLane(
+  conn: AdeCodeConnection,
+  input: string,
+): Promise<LaneLinearIssue | null> {
+  const trimmed = input.trim();
+  if (!trimmed) return null;
+  const result = await conn.action("cto", "searchLinearIssues", { query: trimmed, first: 5 });
+  return exactLinearIssueSearchMatch(trimmed, result);
+}
+
+function authErrorTextFromEvent(event: AgentChatEventEnvelope["event"]): string | null {
+  const record = event as Record<string, unknown>;
+  if (event.type === "error") {
+    return typeof record.message === "string"
+      ? record.message
+      : typeof record.error === "string"
+        ? record.error
+        : null;
+  }
+  if (event.type === "system_notice" || event.type === "status") {
+    return typeof record.message === "string" ? record.message : null;
+  }
+  return null;
+}
+
+export function latestAuthFailedPrompt(events: readonly AgentChatEventEnvelope[]): string | null {
+  let lastUserIndex = -1;
+  for (let index = events.length - 1; index >= 0; index -= 1) {
+    if (events[index]?.event.type === "user_message") {
+      lastUserIndex = index;
+      break;
+    }
+  }
+  if (lastUserIndex < 0) return null;
+  const userEvent = events[lastUserIndex]!.event as Extract<AgentChatEventEnvelope["event"], { type: "user_message" }>;
+  const prompt = (userEvent.displayText ?? userEvent.text ?? "").trim();
+  if (!prompt) return null;
+  const tail = events.slice(lastUserIndex + 1);
+  const authFailure = tail.some((envelope) => {
+    const text = authErrorTextFromEvent(envelope.event);
+    if (!text) return false;
+    return /\b(auth|authentication|login|log in|api key|unauthorized|401|not authenticated|expired|invalid key)\b/i.test(text);
+  });
+  return authFailure ? prompt : null;
+}
+
 function deriveDrawerPreviewChatInfo(
   session: AgentChatSessionSummary,
   previewEvents: AgentChatEventEnvelope[],
@@ -1966,7 +2053,7 @@ function printableInput(input: string): string {
 }
 
 function printablePromptInput(input: string): string {
-  return input
+  return stripBracketedPasteMarkers(input)
     .replace(/\r\n/g, "\n")
     .replace(/\r/g, "\n")
     .replace(/[\u0000-\u0009\u000b-\u001f\u007f]/g, "");
@@ -2155,6 +2242,15 @@ type PromptDisplayRow = PromptVisualRow & {
   cursorColumn: number | null;
 };
 
+type BackgroundLaunchStatus = {
+  id: number;
+  laneId: string;
+  laneName: string;
+  prompt: string;
+  status: "running" | "failed";
+  error?: string;
+};
+
 export function clampPromptCursor(value: string, cursor: number | null | undefined): number {
   if (!Number.isFinite(cursor ?? Number.NaN)) return value.length;
   return Math.max(0, Math.min(value.length, Math.floor(cursor ?? value.length)));
@@ -2165,23 +2261,23 @@ function buildPromptVisualRows(value: string, width: number): PromptVisualRow[]
   const rows: PromptVisualRow[] = [];
   let start = 0;
   let text = "";
-  for (let index = 0; index < value.length;) {
-    const char = [...value.slice(index)].at(0) ?? "";
-    const nextIndex = index + char.length;
-    if (char === "\n") {
-      rows.push({ text, start, end: index });
-      start = nextIndex;
+  let textWidth = 0;
+  for (const cluster of displayClusters(value)) {
+    if (cluster.text === "\n") {
+      rows.push({ text, start, end: cluster.start });
+      start = cluster.end;
       text = "";
-      index = nextIndex;
+      textWidth = 0;
       continue;
     }
-    if ([...text].length >= safeWidth) {
-      rows.push({ text, start, end: index });
-      start = index;
+    if (text && textWidth + cluster.width > safeWidth) {
+      rows.push({ text, start, end: cluster.start });
+      start = cluster.start;
       text = "";
+      textWidth = 0;
     }
-    text += char;
-    index = nextIndex;
+    text += cluster.text;
+    textWidth += cluster.width;
   }
   if (text.length > 0) rows.push({ text, start, end: value.length });
   if (!rows.length || (start === value.length && text.length === 0)) {
@@ -2212,7 +2308,7 @@ export function promptDisplayRowsWithCursor(
     value.length > 0
     && lastRow
     && lastRow.end === value.length
-    && lastRow.text.length >= safeWidth
+    && terminalDisplayWidth(lastRow.text) >= safeWidth
   ) {
     allRows.push({ text: "", start: value.length, end: value.length });
   }
@@ -2223,7 +2319,7 @@ export function promptDisplayRowsWithCursor(
   const visibleRows = allRows.slice(start, start + visibleCount);
   const visibleCursorRow = Math.max(0, cursorRowIndex - start);
   const cursorRow = visibleRows[visibleCursorRow] ?? visibleRows[visibleRows.length - 1] ?? { text: "", start: safeCursor, end: safeCursor };
-  const cursorColumn = Math.max(0, Math.min([...cursorRow.text].length, [...value.slice(cursorRow.start, safeCursor)].length));
+  const cursorColumn = displayCellForCodeUnitIndex(cursorRow.text, safeCursor - cursorRow.start);
   return {
     rows: visibleRows.map((row, index) => ({
       ...row,
@@ -2380,6 +2476,16 @@ function useTerminalAlternateScreen(): void {
   }, []);
 }
 
+function useTerminalBracketedPaste(): void {
+  useEffect(() => {
+    if (!process.stdin.isTTY || !process.stdout.isTTY) return;
+    process.stdout.write(terminalBracketedPasteEnableSequence());
+    return () => {
+      process.stdout.write(terminalBracketedPasteDisableSequence());
+    };
+  }, []);
+}
+
 type TerminalMouseInput = {
   kind: "wheel" | "click" | "drag" | "release" | "move" | "other";
   x: number | null;
@@ -2618,8 +2724,16 @@ export function terminalAlternateScreenDisableSequence(): string {
   return "\x1b[?1049l";
 }
 
+export function terminalBracketedPasteEnableSequence(): string {
+  return "\x1b[?2004h";
+}
+
+export function terminalBracketedPasteDisableSequence(): string {
+  return "\x1b[?2004l";
+}
+
 export function terminalInteractiveRestoreSequence(): string {
-  return `${terminalMouseTrackingDisableSequence()}${terminalAlternateScrollDisableSequence()}${terminalAlternateScreenDisableSequence()}`;
+  return `${terminalMouseTrackingDisableSequence()}${terminalAlternateScrollDisableSequence()}${terminalBracketedPasteDisableSequence()}${terminalAlternateScreenDisableSequence()}`;
 }
 
 function disableTerminalMouseTracking(): void {
@@ -2764,7 +2878,17 @@ export function isClaudePlaceholderTitle(title: string | null | undefined): bool
 
 export function splitTerminalControlInput(raw: string): { detach: boolean; forwarded: string } {
   const forwarded = raw.replace(/[\x14\x1d]/g, "");
-  return { detach: forwarded.length !== raw.length, forwarded };
+  return {
+    detach: forwarded.length !== raw.length,
+    forwarded: formatTerminalControlForwardedInput(forwarded),
+  };
+}
+
+export function terminalControlInputAction(
+  input: string,
+  key: { ctrl?: boolean; meta?: boolean },
+): "detach" | "ignore" {
+  return input === "\x1d" || isTerminalControlToggle(input, key) ? "detach" : "ignore";
 }
 
 function claudeTerminalRowsForPane(rows: number): number {
@@ -2946,6 +3070,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const rows = stableInkViewportRows(terminalRows);
   useTerminalAlternateScreen();
   useTerminalAlternateScroll();
+  useTerminalBracketedPaste();
   useTerminalMouseTracking();
   useTerminalProcessRestore();
   const [connection, setConnection] = useState<AdeCodeConnection | null>(null);
@@ -3012,6 +3137,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const [storedApiKeyProviders, setStoredApiKeyProviders] = useState<string[]>([]);
   const [openCodeDiagnostics, setOpenCodeDiagnostics] = useState<OpenCodeRuntimeSnapshot | null>(null);
   const [rightPane, setRightPane] = useState<RightPaneContent>({ kind: "empty" });
+  const [laneSetupStatusByLaneId, setLaneSetupStatusByLaneId] = useState<Record<string, LaneSetupStatus>>({});
   // Measured (1-based) content origin of the model picker, reported by
   // ModelPickerPane via Ink/Yoga so the click hit-test maps to where rows
   // actually paint — robust to window size, no hardcoded offset. Null until the
@@ -3030,6 +3156,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const [activePane, setActivePane] = useState<PaneFocus>("chat");
   const [prompt, setPrompt] = useState("");
   const [promptCursor, setPromptCursor] = useState(0);
+  const [backgroundLaunchStatus, setBackgroundLaunchStatus] = useState<BackgroundLaunchStatus | null>(null);
   const [error, setError] = useState<string | null>(null);
   const [contextPercent, setContextPercent] = useState<number | null>(null);
   const [tokenSummary, setTokenSummary] = useState<string | null>(null);
@@ -3065,6 +3192,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   // keyed by subagent id so a stale fetch never bleeds into a different agent. Null
   // ⇒ fall back to the locally-reconstructed transcript.
   const [realSubagentTranscript, setRealSubagentTranscript] = useState<{ id: string; status: SubagentSnapshot["status"]; envelopes: AgentChatEventEnvelope[] } | null>(null);
+  const unavailableSubagentTranscriptKeysRef = useRef<Set<string>>(new Set());
   const [mentionSuggestions, setMentionSuggestions] = useState<MentionSuggestion[]>([]);
   const [mentionIndex, setMentionIndex] = useState(0);
   const [selectedMentions, setSelectedMentions] = useState<MentionSuggestion[]>([]);
@@ -3147,6 +3275,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   }, []);
   const promptRef = useRef("");
   const promptCursorRef = useRef(0);
+  const bracketedPasteStateRef = useRef<BracketedPasteState>(EMPTY_BRACKETED_PASTE_STATE);
+  const submitRightFormInFlightRef = useRef(false);
+  const backgroundLaunchSeqRef = useRef(0);
   const previousPromptValueRef = useRef("");
   const promptHistoryRef = useRef<string[]>([]);
   const promptHistoryIndexRef = useRef<number | null>(null);
@@ -3158,6 +3289,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   // the CURRENT pane without stale-closure state (see showChatInfoAfterDraftCommit).
   const rightPaneRef = useRef<RightPaneContent>({ kind: "empty" });
   const lastLocalSendAtRef = useRef<number>(0);
+  const eventsRef = useRef<AgentChatEventEnvelope[]>([]);
   const eventCountRef = useRef<number>(0);
   const eventDedupKeysRef = useRef<Set<string>>(new Set());
   const eventDedupKeyOrderRef = useRef<string[]>([]);
@@ -3272,6 +3404,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     eventsBySessionIdRef.current = eventsBySessionId;
   }, [eventsBySessionId]);
 
+  useEffect(() => {
+    eventsRef.current = events;
+  }, [events]);
+
   useEffect(() => {
     promptHistoryBySessionIdRef.current = promptHistoryBySessionId;
   }, [promptHistoryBySessionId]);
@@ -3373,11 +3509,34 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     });
   }, []);
 
+  const mergeHydratedEventsWithLive = useCallback((sessionId: string, displayEvents: AgentChatEventEnvelope[]) => {
+    const existing = eventsBySessionIdRef.current[sessionId] ?? [];
+    const pending = pendingChatEnvelopesRef.current.filter((envelope) => envelope.sessionId === sessionId);
+    if (existing.length === 0 && pending.length === 0) return displayEvents;
+    return dedupeTuiEvents(
+      [...displayEvents, ...existing, ...pending],
+      Math.max(TUI_LOADED_EVENT_CAP, displayEvents.length, existing.length + pending.length),
+    );
+  }, []);
+
+  const commitActiveSessionEvents = useCallback((
+    sessionId: string,
+    nextEvents: AgentChatEventEnvelope[],
+    eventCount = nextEvents.length,
+  ) => {
+    eventDedupKeyOrderRef.current = syncTuiEventDedupKeys(eventDedupKeysRef.current, nextEvents);
+    eventCountRef.current = eventCount;
+    eventsRef.current = nextEvents;
+    setEvents(nextEvents);
+    setEventsBySessionId((prev) => ({ ...prev, [sessionId]: nextEvents }));
+  }, []);
+
   const clearTranscriptPreview = useCallback(() => {
     clearOlderHistoryCursor(activeSessionIdRef.current);
     eventDedupKeysRef.current.clear();
     eventDedupKeyOrderRef.current = [];
     eventCountRef.current = 0;
+    eventsRef.current = [];
     setEvents([]);
     setClearedAt(null);
     setCurrentGoal(null);
@@ -4081,6 +4240,12 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const statusRows = statusLineRows;
   const modelStatusOverlayRows = statusRows
     + (draftChatActive || (vimModeEnabled && !hideVimModeIndicator) || modelState.fastMode ? 1 : 0);
+  const backgroundLaunchRows = backgroundLaunchStatus ? 1 : 0;
+  const backgroundLaunchStatusText = backgroundLaunchStatus
+    ? backgroundLaunchStatus.status === "running"
+      ? `launching in ${backgroundLaunchStatus.laneName}...`
+      : `launch failed in ${backgroundLaunchStatus.laneName}: ${backgroundLaunchStatus.error ?? "restore draft"}`
+    : null;
   const goalBannerRows = goalBannerText ? 1 : 0;
   const addModeRows = addMode ? 1 : 0;
   const rightPaneMaxWidth = rightPane.kind === "model-picker"
@@ -4091,7 +4256,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const promptPaneWidth = Math.max(MIN_CENTER_PANE_WIDTH, finiteFloor(columns, MIN_CENTER_PANE_WIDTH));
   const promptDisplay = promptDisplayRowsWithCursor(prompt, Math.max(1, promptPaneWidth - 5), promptCursor, PROMPT_MAX_ROWS);
   const promptRows = promptDisplay.rows;
-  const chatRowBudget = Math.max(4, rows - 8 - (promptRows.length - 1) - statusRows - goalBannerRows - addModeRows);
+  const chatRowBudget = Math.max(4, rows - 8 - (promptRows.length - 1) - statusRows - goalBannerRows - addModeRows - backgroundLaunchRows);
   const chatWrapWidth = resolveChatWrapWidth(centerWidth, drawerOpen, rightPaneWidth);
   const terminalPaneWidth = resolveTerminalPaneWidth(centerWidth);
   const orderedDrawerLanes = useMemo(
@@ -4268,6 +4433,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       selectActiveSessionId(sessionId);
     }
     if (loadedSessionIdRef.current === sessionId) return;
+    clearLoadedTranscript();
 
     const conn = connectionRef.current;
     if (!conn) return;
@@ -4306,12 +4472,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         // scroll-back drains it locally before the byte cursor — keeping the
         // displayed-oldest ← buffer ← tailStartOffset seams contiguous.
         const dedupedHistory = dedupeTuiEvents(visibleHistory, Math.max(1, visibleHistory.length));
-        const { display: historyEvents, buffer: olderBuffer } = splitSnapshotForDisplay(dedupedHistory);
+        const { display, buffer: olderBuffer } = splitSnapshotForDisplay(dedupedHistory);
+        const historyEvents = mergeHydratedEventsWithLive(sessionId, display);
         loadedSessionIdRef.current = sessionId;
-        eventCountRef.current = history.events.length;
-        eventDedupKeyOrderRef.current = syncTuiEventDedupKeys(eventDedupKeysRef.current, historyEvents);
-        setEvents(historyEvents);
-        setEventsBySessionId((prev) => ({ ...prev, [sessionId]: historyEvents }));
+        commitActiveSessionEvents(sessionId, historyEvents, history.events.length);
         // A locally cleared transcript view must not page older history back in.
         if (!clearedAtValue && olderBuffer.length > 0) {
           olderSnapshotBufferBySessionIdRef.current[sessionId] = olderBuffer;
@@ -4334,7 +4498,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         // Best-effort preview hydration; leave prior content on transient errors.
       }
     })();
-  }, [clearOlderHistoryCursor, seedOlderHistoryCursor, selectActiveLaneId, selectActiveSessionId, setDraftChatMode, setGridView, setSessionInterrupted, setSessionStreaming, setStreaming]);
+  }, [clearOlderHistoryCursor, commitActiveSessionEvents, mergeHydratedEventsWithLive, seedOlderHistoryCursor, selectActiveLaneId, selectActiveSessionId, setDraftChatMode, setGridView, setSessionInterrupted, setSessionStreaming, setStreaming]);
   const enterDrawerChatListForLane = useCallback((lane: LaneSummary) => {
     const laneSessions = displaySessions.filter((entry) => entry.laneId === lane.id);
     const visibleSessions = laneSessions.slice(0, visibleDrawerChatCount(laneSessions.length));
@@ -4422,6 +4586,54 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     () => displayEvents === events ? pendingSteers : derivePendingSteers(displayEvents),
     [displayEvents, events, pendingSteers],
   );
+  const addTranscriptProbeNotice = useCallback((text: string) => {
+    setNotices((prev) => [
+      ...prev.slice(-10),
+      { id: noticeId(), timestamp: new Date().toISOString(), text, tone: "info", sessionId: activeSessionIdRef.current },
+    ]);
+  }, []);
+  const inspectSubagentWithTranscriptProbe = useCallback((snapshot: SubagentSnapshot | null) => {
+    if (!snapshot) {
+      setInspectedSubagentId(null);
+      setChatScrollOffset(0);
+      return;
+    }
+    const conn = connectionRef.current;
+    const sessionId = activeSessionIdRef.current;
+    if (!conn || !sessionId || !chatInfo.capability.canViewFullTranscript) {
+      setInspectedSubagentId(snapshot.id);
+      setChatScrollOffset(0);
+      return;
+    }
+    const probeKey = `${snapshot.id}:${snapshot.status}`;
+    void getSubagentTranscript(conn, {
+      sessionId,
+      agentId: snapshot.id,
+      laneId: activeLaneIdRef.current,
+    })
+      .then((messages) => {
+        const envelopes = messages && messages.length > 0
+          ? subagentTranscriptMessagesToEvents({ messages, snapshot, sessionId })
+          : [];
+        if (envelopes.length > 0) {
+          unavailableSubagentTranscriptKeysRef.current.delete(probeKey);
+          setRealSubagentTranscript({ id: snapshot.id, status: snapshot.status, envelopes });
+        } else {
+          unavailableSubagentTranscriptKeysRef.current.add(probeKey);
+          setRealSubagentTranscript((prev) => prev?.id === snapshot.id ? null : prev);
+          addTranscriptProbeNotice("Subagent transcript unavailable; showing local reconstruction.");
+        }
+        setInspectedSubagentId(snapshot.id);
+        setChatScrollOffset(0);
+      })
+      .catch((err) => {
+        unavailableSubagentTranscriptKeysRef.current.add(probeKey);
+        setRealSubagentTranscript((prev) => prev?.id === snapshot.id ? null : prev);
+        addTranscriptProbeNotice(`Subagent transcript unavailable; showing local reconstruction. ${err instanceof Error ? err.message : String(err)}`);
+        setInspectedSubagentId(snapshot.id);
+        setChatScrollOffset(0);
+      });
+  }, [addTranscriptProbeNotice, chatInfo.capability.canViewFullTranscript, setChatScrollOffset]);
   // Fetch the real child transcript for the inspected subagent when the runtime
   // can produce one (Codex app-server threads / OpenCode child sessions). Falls
   // back silently to local reconstruction on null/empty/error.
@@ -4434,6 +4646,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     const conn = connectionRef.current;
     const sessionId = activeSessionId;
     if (!conn || !sessionId || !chatInfo.capability.canViewFullTranscript) return;
+    const probeKey = `${snapshot.id}:${snapshot.status}`;
+    if (unavailableSubagentTranscriptKeysRef.current.has(probeKey)) return;
     // Re-fetch when the subagent's status changes (e.g. running → completed) so a
     // transcript first fetched mid-run is refreshed once the agent finishes,
     // rather than caching a partial transcript forever.
@@ -4445,16 +4659,28 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       laneId: activeLane?.id ?? null,
     })
       .then((messages) => {
-        if (cancelled || !messages || messages.length === 0) return;
+        if (cancelled) return;
+        const envelopes = messages && messages.length > 0
+          ? subagentTranscriptMessagesToEvents({ messages, snapshot, sessionId })
+          : [];
+        if (envelopes.length === 0) {
+          unavailableSubagentTranscriptKeysRef.current.add(probeKey);
+          addTranscriptProbeNotice("Subagent transcript unavailable; showing local reconstruction.");
+          return;
+        }
+        unavailableSubagentTranscriptKeysRef.current.delete(probeKey);
         setRealSubagentTranscript({
           id: snapshot.id,
           status: snapshot.status,
-          envelopes: subagentTranscriptMessagesToEvents({ messages, snapshot, sessionId }),
+          envelopes,
         });
       })
-      .catch(() => { /* keep the locally-reconstructed transcript */ });
+      .catch(() => {
+        unavailableSubagentTranscriptKeysRef.current.add(probeKey);
+        addTranscriptProbeNotice("Subagent transcript unavailable; showing local reconstruction.");
+      });
     return () => { cancelled = true; };
-  }, [activeLane?.id, activeSessionId, chatInfo.capability.canViewFullTranscript, realSubagentTranscript, selectedAgentSnapshot]);
+  }, [activeLane?.id, activeSessionId, addTranscriptProbeNotice, chatInfo.capability.canViewFullTranscript, realSubagentTranscript, selectedAgentSnapshot]);
   // Notices are a single global list, but each one is tagged with the scope it
   // fired in (a chat session, a specific new-chat draft, or null/global). A
   // new-chat draft shows only the notices fired in that exact draft so global
@@ -4861,6 +5087,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     let previewEvents: AgentChatEventEnvelope[] = [];
     if (drawerPreviewSession.sessionId === activeSessionId) {
       previewEvents = events;
+    } else if (eventsBySessionId[drawerPreviewSession.sessionId]) {
+      previewEvents = eventsBySessionId[drawerPreviewSession.sessionId] ?? [];
     } else if (drawerPreviewSessionId === drawerPreviewSession.sessionId) {
       previewEvents = drawerPreviewEvents;
     }
@@ -4877,6 +5105,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     drawerPreviewSession,
     drawerPreviewSessionId,
     events,
+    eventsBySessionId,
     lanes,
   ]);
 
@@ -4982,6 +5211,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     if (lastUserOpenedPaneRef.current !== null) return;
     // Form panes (rename, new-lane, pr-open) are user-driven; never overwrite.
     if (rightPane.kind === "form") return;
+    if (rightPane.kind === "model-picker") return;
+    if (pendingQuestionStateRef.current) return;
     const next = resolveContextDefault({
       draftChatActive: draftChatActiveRef.current,
       // Includes Claude terminal sessions so their context default is the
@@ -5309,12 +5540,14 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
 
         if (cancelled) return;
         const chatCounts = computeLaneChatCounts(displaySessions, laneId);
+        const setup = laneSetupStatusByLaneId[laneId] ?? null;
         setRightPane((prev) => {
           if (cancelled) return prev;
           if (prev.kind !== "lane-details" && prev.kind !== "empty") return prev;
           if (prev.kind === "lane-details" && prev.lane.id !== laneId) return prev;
           const previousIndex = prev.kind === "lane-details" ? prev.selectedActionIndex : 0;
           const previousShowFiles = prev.kind === "lane-details" ? prev.showFiles : false;
+          const previousSetup = prev.kind === "lane-details" ? prev.setup ?? null : null;
           const maxIndex = LANE_DETAIL_ACTIONS.length - 1 + (pr ? 1 : 0);
           return {
             kind: "lane-details",
@@ -5330,6 +5563,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
               deletions: laneDiffStats?.deletions ?? 0,
             },
             files,
+            setup: setup ?? previousSetup,
             pr,
             chats: chatCounts,
             showFiles: previousShowFiles,
@@ -5350,7 +5584,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       cancelled = true;
       clearInterval(interval);
     };
-  }, [activeLane, diffByLaneId, displaySessions, highlightedDrawerLane, lanes, rightOpen, rightPane.kind, rightPaneLaneId, unavailableLaneIds]);
+  }, [activeLane, diffByLaneId, displaySessions, highlightedDrawerLane, laneSetupStatusByLaneId, lanes, rightOpen, rightPane.kind, rightPaneLaneId, unavailableLaneIds]);
 
   useEffect(() => {
     if (!drawerLaneId || !lanes.some((lane) => lane.id === drawerLaneId)) {
@@ -5395,17 +5629,61 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     ]);
   }, []);
 
-  const runLaneSetupAfterCreate = useCallback((conn: AdeCodeConnection, lane: LaneSummary) => {
-    void runDefaultLaneSetup(conn, lane.id)
-      .then(({ progress }) => {
-        if (progress.overallStatus !== "failed") return;
+  const runLaneSetupAfterCreate = useCallback((conn: AdeCodeConnection, lane: LaneSummary, options: { templateId?: string | null } = {}) => {
+    const templateId = options.templateId?.trim() || null;
+    const running: LaneSetupStatus = {
+      status: "running",
+      label: templateId ? `applying setup template ${templateId}` : "setting up lane environment",
+      templateId,
+    };
+    setLaneSetupStatusByLaneId((prev) => ({ ...prev, [lane.id]: running }));
+    setRightPane((prev) => prev.kind === "lane-details" && prev.lane.id === lane.id
+      ? { ...prev, setup: running }
+      : prev);
+    void runDefaultLaneSetup(conn, lane.id, { templateId })
+      .then(({ progress, templateId: appliedTemplateId }) => {
+        if (progress.overallStatus !== "failed") {
+          const completed: LaneSetupStatus = {
+            status: "completed",
+            label: appliedTemplateId ? `setup template ${appliedTemplateId} applied` : "lane environment ready",
+            templateId: appliedTemplateId,
+          };
+          setLaneSetupStatusByLaneId((prev) => ({ ...prev, [lane.id]: completed }));
+          setRightPane((prev) => prev.kind === "lane-details" && prev.lane.id === lane.id
+            ? { ...prev, setup: completed }
+            : prev);
+          return;
+        }
         const failedStep = progress.steps.find((step) => step.status === "failed");
         const detail = failedStep?.error?.trim()
           || (failedStep ? `${failedStep.label} failed.` : "Environment setup failed.");
+        const failed: LaneSetupStatus = {
+          status: "failed",
+          label: failedStep?.label ? `${failedStep.label} failed` : "lane setup failed",
+          detail: `${detail} · press r to retry`,
+          templateId: appliedTemplateId,
+          retryable: true,
+        };
+        setLaneSetupStatusByLaneId((prev) => ({ ...prev, [lane.id]: failed }));
+        setRightPane((prev) => prev.kind === "lane-details" && prev.lane.id === lane.id
+          ? { ...prev, setup: failed }
+          : prev);
         addNotice(`Lane setup failed for ${lane.name}: ${detail}`, "error");
       })
       .catch((err) => {
-        addNotice(`Lane setup failed for ${lane.name}: ${err instanceof Error ? err.message : String(err)}`, "error");
+        const detail = err instanceof Error ? err.message : String(err);
+        const failed: LaneSetupStatus = {
+          status: "failed",
+          label: "lane setup failed",
+          detail: `${detail} · press r to retry`,
+          templateId,
+          retryable: true,
+        };
+        setLaneSetupStatusByLaneId((prev) => ({ ...prev, [lane.id]: failed }));
+        setRightPane((prev) => prev.kind === "lane-details" && prev.lane.id === lane.id
+          ? { ...prev, setup: failed }
+          : prev);
+        addNotice(`Lane setup failed for ${lane.name}: ${detail}`, "error");
       });
   }, [addNotice]);
 
@@ -5804,7 +6082,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         }
         return;
       }
-      void writeTerminal(connection, attachedTerminalId, raw).catch((err) => {
+      void writeTerminal(connection, attachedTerminalId, terminalControlInput.forwarded).catch((err) => {
         addNotice(err instanceof Error ? err.message : String(err), "error");
       });
     };
@@ -6580,7 +6858,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
           // displayed-oldest ← buffer ← tailStartOffset seams contiguous.
           const dedupedHistory = dedupeTuiEvents(visibleHistory, Math.max(1, visibleHistory.length));
           const { display, buffer: olderBuffer } = splitSnapshotForDisplay(dedupedHistory);
-          nextEvents = display;
+          nextEvents = mergeHydratedEventsWithLive(nextSessionId, display);
           const activeModelId = nextSession?.modelId ?? null;
           const fallbackContext = activeModelId ? getModelById(activeModelId)?.contextWindow ?? null : null;
           const stats = latestTokenStats(history.events, fallbackContext);
@@ -6648,10 +6926,14 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     selectActiveLaneId(nextLaneId);
     selectActiveSessionId(nextSessionId);
     if (nextEvents !== null) {
-      eventDedupKeyOrderRef.current = syncTuiEventDedupKeys(eventDedupKeysRef.current, nextEvents);
-      setEvents(nextEvents);
       if (nextSessionId) {
-        setEventsBySessionId((prev) => ({ ...prev, [nextSessionId]: nextEvents ?? [] }));
+        commitActiveSessionEvents(nextSessionId, nextEvents, eventCountRef.current || nextEvents.length);
+      } else {
+        eventDedupKeysRef.current.clear();
+        eventDedupKeyOrderRef.current = [];
+        eventCountRef.current = 0;
+        eventsRef.current = [];
+        setEvents(nextEvents);
       }
     }
     setSlashCommands(nextCommands);
@@ -6731,7 +7013,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       }
       if (draftMode) draftSeededFromHistoryRef.current = true;
     }
-  }, [clearedAt, clearOlderHistoryCursor, drawerLaneId, loadProviderModels, modelState.provider, project, seedOlderHistoryCursor, selectActiveLaneId, selectActiveSessionId, selectedDrawerChatAction, setDraftChatMode, setSessionInterrupted, setSessionStreaming, setStreaming]);
+  }, [clearedAt, clearOlderHistoryCursor, commitActiveSessionEvents, drawerLaneId, loadProviderModels, mergeHydratedEventsWithLive, modelState.provider, project, seedOlderHistoryCursor, selectActiveLaneId, selectActiveSessionId, selectedDrawerChatAction, setDraftChatMode, setSessionInterrupted, setSessionStreaming, setStreaming]);
 
   const renameLane = useCallback(async (laneIdArg: string | null, name: string) => {
     const conn = connectionRef.current;
@@ -7157,21 +7439,20 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         if (key !== null) reserved.push({ envelope, key });
       }
       if (reserved.length > 0) {
-        setEvents((prev) => {
-          let events = prev;
-          let order = eventDedupKeyOrderRef.current;
-          // Same rationale as the per-session map above: never let live appends
-          // trim below the paged-in scroll-back window.
-          const appendLimit = Math.max(500, prev.length);
-          for (const { envelope, key } of reserved) {
-            const appended = appendReservedTuiEvent(events, envelope, eventDedupKeysRef.current, order, key, appendLimit);
-            events = appended.events;
-            order = appended.eventKeys;
-          }
-          eventDedupKeyOrderRef.current = order;
-          eventCountRef.current = events.length;
-          return events;
-        });
+        let nextEvents = eventsRef.current;
+        let nextOrder = eventDedupKeyOrderRef.current;
+        // Same rationale as the per-session map above: never let live appends
+        // trim below the paged-in scroll-back window.
+        const appendLimit = Math.max(500, nextEvents.length);
+        for (const { envelope, key } of reserved) {
+          const appended = appendReservedTuiEvent(nextEvents, envelope, eventDedupKeysRef.current, nextOrder, key, appendLimit);
+          nextEvents = appended.events;
+          nextOrder = appended.eventKeys;
+        }
+        eventDedupKeyOrderRef.current = nextOrder;
+        eventCountRef.current = nextEvents.length;
+        eventsRef.current = nextEvents;
+        setEvents(nextEvents);
       }
     }
     // Note: stable deps ([]) — uses only refs + stable setters. This keeps the
@@ -7196,6 +7477,12 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
           ? currentMultiView.tiles.map((tile) => tile.sessionId)
           : [activeSessionIdRef.current].filter((value): value is string => Boolean(value)),
       );
+      const drawerBrowsingChatId = drawerOpenRef.current
+        && drawerSectionRef.current === "chats"
+        && selectedDrawerChatActionRef.current == null
+        ? selectedDrawerChatIdRef.current
+        : null;
+      if (drawerBrowsingChatId) openSessionIds.add(drawerBrowsingChatId);
       if (!openSessionIds.has(envelope.sessionId)) {
         // Event for a session we're not displaying — refresh summaries (cheap,
         // dedup-guarded). Only the open-session token stream below is coalesced.
@@ -7450,6 +7737,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       return;
     }
     let cancelled = false;
+    let unsubscribe: (() => void) | null = null;
     const refreshPrsByLane = async () => {
       try {
         const prs = await listPrsByLane(connection);
@@ -7472,11 +7760,24 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     const timer = setInterval(() => {
       void refreshPrsByLane();
     }, 30_000);
+    void connection.subscribeRuntimeEvents({ category: "runtime", cursor: 0, limit: 50, replay: false }, (event) => {
+      const type = typeof event.payload.type === "string" ? event.payload.type : "";
+      if (type !== "prs-updated" && type !== "pr-notification") return;
+      void refreshPrsByLane();
+      void refreshState({ hydrateHistory: false }).catch(() => undefined);
+    }).then((stop) => {
+      if (cancelled) {
+        stop();
+        return;
+      }
+      unsubscribe = stop;
+    }).catch(() => {});
     return () => {
       cancelled = true;
       clearInterval(timer);
+      unsubscribe?.();
     };
-  }, [connection]);
+  }, [connection, refreshState]);
 
   // Detect an attached socket dropping mid-session. Without this the UI freezes
   // on a stale snapshot (and a spinner that never resolves) with no retry.
@@ -9050,7 +9351,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         : result;
       setRightPane({ kind: "details", title: `ADE ${domain}.${action}`, body: renderObject(body, 24) });
     }
-  }, [activateLaneWithLastChat, activeCommandProvider, activeLane?.name, activeSession?.provider, activeSession?.sessionId, activeSession?.title, addNotice, applyDrawerChatSelection, archiveChat, archiveLane, ensureActiveSession, focusDetails, lanes, mode, modelState.modelId, modelState.reasoningEffort, models, openChatDeleteForm, openChatRenameForm, openFeedbackForm, openForm, openLaneDeleteForm, openLaneRenameForm, openModelPicker, openNewChatSetup, openNewLaneForm, openSubagentsPane, pendingSteers, project, refreshState, renameLane, runLaneSetupAfterCreate, selectActiveLaneId, selectActiveSessionId, sendOrSteerChatMessage, sessions, setChatScrollOffset, subagentPaneCommandAvailable, unarchiveChat, unarchiveLane]);
+  }, [activateLaneWithLastChat, activeCommandProvider, activeLane?.name, activeSession?.provider, activeSession?.sessionId, activeSession?.title, addNotice, applyDrawerChatSelection, archiveChat, archiveLane, ensureActiveSession, focusChat, focusDetails, lanes, mode, modelState.modelId, modelState.provider, modelState.reasoningEffort, models, openChatDeleteForm, openChatRenameForm, openFeedbackForm, openForm, openLaneDeleteForm, openLaneRenameForm, openModelPicker, openNewChatSetup, openNewLaneForm, openSubagentsPane, pendingSteers, project, refreshState, renameLane, runLaneSetupAfterCreate, selectActiveLaneId, selectActiveSessionId, sendOrSteerChatMessage, sessions, setChatScrollOffset, subagentPaneCommandAvailable, unarchiveChat, unarchiveLane]);
 
   const runInlineCommand = useCallback(async (name: string, args: string) => {
     if (name === "/quit") {
@@ -9111,6 +9412,18 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         addNotice(`${providerLabel(provider)} auth completed. Refreshing provider status.`, "success");
         await refreshAiSetupStatus({ force: true });
         await loadProviderModels(provider, { applyDefault: false });
+        const activeProvider = normalizeProvider(activeSessionRef.current?.provider ?? modelStateRef.current.provider);
+        if (provider === activeProvider) {
+          const failedPrompt = latestAuthFailedPrompt(eventsRef.current);
+          if (failedPrompt) {
+            setPrompt(failedPrompt);
+            promptRef.current = failedPrompt;
+            promptCursorRef.current = failedPrompt.length;
+            chatDraftRef.current = failedPrompt;
+            addNotice("logged in — press Enter to resend", "info");
+            focusChat();
+          }
+        }
       } else {
         addNotice(`${providerLabel(provider)} login exited with code ${code ?? "unknown"}.`, "error");
       }
@@ -9324,7 +9637,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     const laneId = activeLaneIdRef.current;
     const sessionId = activeSessionIdRef.current;
     if (!conn) return;
+    if (submitRightFormInFlightRef.current) return;
+    submitRightFormInFlightRef.current = true;
 
+    try {
     const requireField = (name: string, label: string): string | null => {
       const value = values[name]?.trim() ?? "";
       if (value) return value;
@@ -9335,7 +9651,23 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     if (form.command === "new-lane") {
       const name = requireField("name", "Name");
       if (!name) return;
-      const submission = buildNewLaneSubmission({ values, lanes, activeLaneId });
+      const linearIssueInput = values.linearIssue?.trim() ?? "";
+      if (normalizeNewLaneStart(values.start) === "import" && linearIssueInput) {
+        addNotice("Linear issue attachment is not supported when importing an existing branch.", "error");
+        return;
+      }
+      const linearIssue = linearIssueInput
+        ? await resolveLinearIssueForNewLane(conn, linearIssueInput).catch((err) => {
+            addNotice(`Linear issue lookup failed: ${err instanceof Error ? err.message : String(err)}`, "error");
+            return undefined;
+          })
+        : null;
+      if (linearIssue === undefined) return;
+      if (linearIssueInput && !linearIssue) {
+        addNotice(`No Linear issue matched "${linearIssueInput}".`, "error");
+        return;
+      }
+      const submission = buildNewLaneSubmission({ values, lanes, activeLaneId, linearIssue });
       if (submission.kind === "error") {
         addNotice(submission.message, "error");
         return;
@@ -9372,7 +9704,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       lastUserOpenedPaneRef.current = null;
       focusAfterDetails();
       addNotice(`Created lane ${created.name}.`, "success");
-      runLaneSetupAfterCreate(conn, created);
+      runLaneSetupAfterCreate(conn, created, { templateId: submission.templateId });
       await refreshState();
       setDrawerLaneId(created.id);
       setSelectedDrawerLaneId(created.id);
@@ -9634,6 +9966,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         addNotice(`Feedback failed: ${message}`, "error");
       }
     }
+    } finally {
+      submitRightFormInFlightRef.current = false;
+    }
   }, [activeLaneId, addNotice, focusAfterDetails, lanes, refreshState, renameLane, runLaneSetupAfterCreate, selectActiveLaneId, selectActiveSessionId, selectFallbackChatAfterRemoval, sessions]);
 
   const openLatestImage = useCallback(() => {
@@ -9977,6 +10312,15 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       addNotice(unavailableMessage, "error");
       return;
     }
+    const launchId = backgroundLaunchSeqRef.current + 1;
+    backgroundLaunchSeqRef.current = launchId;
+    setBackgroundLaunchStatus({
+      id: launchId,
+      laneId,
+      laneName: lane?.name ?? "lane",
+      prompt: submittedValue,
+      status: "running",
+    });
     let launched = false;
     try {
       setInterrupted(false);
@@ -10057,15 +10401,17 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       });
       setDraftChatMode(true);
       addNotice(`Launched chat in ${lane?.name ?? "lane"}.`, "success");
+      setBackgroundLaunchStatus((prev) => prev?.id === launchId ? null : prev);
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
-      if (!launched) {
-        setPrompt(submittedValue);
-        promptRef.current = submittedValue;
-        chatDraftRef.current = submittedValue;
-      } else {
-        setDraftChatMode(true);
-      }
+      setPrompt(submittedValue);
+      promptRef.current = submittedValue;
+      promptCursorRef.current = submittedValue.length;
+      chatDraftRef.current = submittedValue;
+      setDraftChatMode(true);
+      setBackgroundLaunchStatus((prev) => prev?.id === launchId
+        ? { ...prev, status: "failed", error: message }
+        : prev);
       setError(message);
       addNotice(launched ? `Launched chat, but follow-up failed: ${message}` : message, "error");
     }
@@ -10976,10 +11322,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         retryStartupConnection();
         return;
       }
-      if (printableInput(input) || key.return || key.upArrow || key.downArrow) return;
+      return;
     }
     if (attachedTerminalIdRef.current) {
-      if (input === "\x1d" || isTerminalControlToggle(input, key)) {
+      if (terminalControlInputAction(input, key) === "detach") {
         setAttachedTerminalId(null);
         // If we popped out of the grid to take control, drop back into it.
         const returnSessionId = controlReturnToGridRef.current;
@@ -11140,15 +11486,15 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
           chatSelectionAnchorRef.current = null;
           if (activeSelection) updateChatMouseSelection(null);
           focusDrawerOnly();
-          if (!addModeRef.current && mouse.y === drawerBottomRow - 1) {
-            setDrawerSection("lanes");
-            setSelectedDrawerLaneAction("new-lane");
-            setSelectedDrawerLaneId(null);
-            openNewLaneForm();
-            return;
-          }
           const hit = drawerMouseHitForLayout({ y: drawerLocalY, layout: drawerLayoutValue });
-          if (hit?.kind === "lane") {
+          if (hit?.kind === "new-lane") {
+            if (!addModeRef.current) {
+              setDrawerSection("lanes");
+              setSelectedDrawerLaneAction("new-lane");
+              setSelectedDrawerLaneId(null);
+              openNewLaneForm();
+            }
+          } else if (hit?.kind === "lane") {
             const lane = drawerLaneRows[hit.index];
             if (lane) {
               setDrawerSection("lanes");
@@ -11351,6 +11697,19 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       meta: key.meta === true,
     });
 
+    if (textInputActive) {
+      const pasted = consumeBracketedPasteInput(bracketedPasteStateRef.current, input);
+      bracketedPasteStateRef.current = pasted.state;
+      if (pasted.consumed) {
+        const text = printableMultilineInput(pasted.text);
+        if (text) {
+          const next = insertPromptText(prompt, promptCursorRef.current, text);
+          handlePromptChange(next.value, next.cursor);
+        }
+        return;
+      }
+    }
+
     // Searchable /help command reference: filter type-ahead + ↑↓ navigation + ↵
     // run. Handled before the command palette so the help pane owns keystrokes
     // while it is the active right pane. esc / Ctrl+K close it.
@@ -12148,11 +12507,6 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       return;
     }
 
-    if (isChatCopyShortcut(input, key) && isChatTextSelectionRange(chatMouseSelectionRef.current)) {
-      copyChatSelection();
-      return;
-    }
-
     if (isCtrlInput(input, key, "c")) {
       const conn = connectionRef.current;
       const sessionId = activeSessionIdRef.current;
@@ -12164,10 +12518,19 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
           .catch((err) => addNotice(err instanceof Error ? err.message : String(err), "error"));
         return;
       }
+      if (isChatCopyShortcut(input, key) && isChatTextSelectionRange(chatMouseSelectionRef.current)) {
+        copyChatSelection();
+        return;
+      }
       requestCtrlCExit();
       return;
     }
 
+    if (isChatCopyShortcut(input, key) && isChatTextSelectionRange(chatMouseSelectionRef.current)) {
+      copyChatSelection();
+      return;
+    }
+
     if (pendingApproval?.mode === "approval" && !pendingApproval.highStakes && ["a", "d", "y", "n"].includes(input)) {
       void resolvePendingApproval(pendingApproval, input === "a" || input === "y" ? "accept" : "decline")
         .catch((err) => addNotice(err instanceof Error ? err.message : String(err), "error"));
@@ -12420,8 +12783,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         if (selectedSnapshot && !chatInfoRef.current.capability.canViewFullTranscript) {
           return;
         }
-        setInspectedSubagentId(selectedSnapshot?.id ?? null);
-        setChatScrollOffset(0);
+        inspectSubagentWithTranscriptProbe(selectedSnapshot);
         return;
       }
       return;
@@ -12646,6 +13008,21 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         setRightPane((prev) => prev.kind === "lane-details" ? { ...prev, showFiles: !prev.showFiles } : prev);
         return;
       }
+      if (
+        input === "r"
+        && !key.ctrl
+        && !key.meta
+        && laneDetails.setup?.status === "failed"
+        && laneDetails.setup.retryable
+      ) {
+        const conn = connectionRef.current;
+        if (!conn) {
+          addNotice("Cannot retry setup while ADE is disconnected.", "error");
+          return;
+        }
+        runLaneSetupAfterCreate(conn, laneDetails.lane, { templateId: laneDetails.setup.templateId ?? null });
+        return;
+      }
       if (key.return) {
         if (worktreeMissing) {
           addNotice(laneWorktreeUnavailableMessage(laneDetails.lane) ?? "Lane worktree is unavailable.", "error");
@@ -13099,6 +13476,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const paletteBottomRows = 5
     + (promptRows.length - 1)
     + modelStatusOverlayRows
+    + backgroundLaunchRows
     + (attachedImageChips.length ? 1 : 0)
     + errorRows;
   // Slash palette grows with available terminal height (clamped) so it's bigger
@@ -13472,22 +13850,21 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
             },
             zIndex: 2,
           });
+        } else if (hit?.kind === "new-lane" && !addMode) {
+          addTarget({
+            id: "drawer:new-lane",
+            rect: { x: 1, y, w: drawerPaneWidth, h: 1 },
+            onClick: () => {
+              focusDrawerOnly();
+              setDrawerSection("lanes");
+              setSelectedDrawerLaneAction("new-lane");
+              setSelectedDrawerLaneId(null);
+              openNewLaneForm();
+            },
+            zIndex: 4,
+          });
         }
       }
-      if (!addMode) {
-        addTarget({
-          id: "drawer:new-lane",
-          rect: { x: 1, y: Math.max(drawerTopRow, drawerBottomRow - 1), w: drawerPaneWidth, h: 1 },
-          onClick: () => {
-            focusDrawerOnly();
-            setDrawerSection("lanes");
-            setSelectedDrawerLaneAction("new-lane");
-            setSelectedDrawerLaneId(null);
-            openNewLaneForm();
-          },
-          zIndex: 4,
-        });
-      }
     }
 
     if (showCommandPalette) {
@@ -14402,6 +14779,16 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
             <Text color={theme.color.t3}>{` · ${modeDescription(modeChangeNotice.summary)}`}</Text>
           </Box>
         ) : null}
+        {backgroundLaunchStatusText ? (
+          <Box paddingX={1} flexShrink={0}>
+            <Text
+              color={backgroundLaunchStatus?.status === "failed" ? theme.color.error : theme.color.accent}
+              wrap="truncate-end"
+            >
+              {backgroundLaunchStatusText}
+            </Text>
+          </Box>
+        ) : null}
         <Box
           borderStyle="round"
           borderColor={isPlanMode(modelState) ? theme.color.planMode : (promptFocused ? PURPLE : theme.color.border)}
@@ -14414,11 +14801,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
             const last = index === promptRows.length - 1;
             const cursorColumn = promptFocused ? line.cursorColumn : null;
             const hasCursor = cursorColumn != null;
-            const lineChars = [...line.text];
-            const hasCursorChar = hasCursor && cursorColumn < lineChars.length;
-            const beforeCursor = hasCursor ? lineChars.slice(0, cursorColumn).join("") : line.text;
-            const cursorText = hasCursor ? (hasCursorChar ? lineChars[cursorColumn] ?? " " : " ") : "";
-            const afterCursor = hasCursor ? lineChars.slice(cursorColumn + (hasCursorChar ? 1 : 0)).join("") : "";
+            const cursorParts = hasCursor ? splitByDisplayCells(line.text, cursorColumn, cursorColumn + 1) : null;
+            const beforeCursor = cursorParts?.before ?? line.text;
+            const cursorText = cursorParts ? (cursorParts.selected || " ") : "";
+            const afterCursor = cursorParts?.after ?? "";
             return (
               <Box key={`${index}:${line.text}:${line.start}:${line.end}`} flexDirection="row">
                 <Text color={PURPLE}>{index === 0 ? "› " : "  "}</Text>
diff --git a/apps/ade-cli/src/tuiClient/bracketedPaste.ts b/apps/ade-cli/src/tuiClient/bracketedPaste.ts
new file mode 100644
index 000000000..2c105669b
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/bracketedPaste.ts
@@ -0,0 +1,72 @@
+export const BRACKETED_PASTE_START = "\x1b[200~";
+export const BRACKETED_PASTE_END = "\x1b[201~";
+
+export type BracketedPasteState = {
+  active: boolean;
+  buffer: string;
+};
+
+export const EMPTY_BRACKETED_PASTE_STATE: BracketedPasteState = {
+  active: false,
+  buffer: "",
+};
+
+export function containsBracketedPasteMarker(value: string): boolean {
+  return value.includes(BRACKETED_PASTE_START) || value.includes(BRACKETED_PASTE_END);
+}
+
+export function stripBracketedPasteMarkers(value: string): string {
+  return value.split(BRACKETED_PASTE_START).join("").split(BRACKETED_PASTE_END).join("");
+}
+
+export function consumeBracketedPasteInput(
+  state: BracketedPasteState,
+  input: string,
+): { state: BracketedPasteState; text: string; consumed: boolean } {
+  let active = state.active;
+  let buffer = state.buffer;
+  let remaining = input;
+  let text = "";
+  let consumed = active || containsBracketedPasteMarker(input);
+
+  while (remaining.length > 0) {
+    if (active) {
+      const end = remaining.indexOf(BRACKETED_PASTE_END);
+      if (end < 0) {
+        buffer += remaining;
+        remaining = "";
+        continue;
+      }
+      text += buffer + remaining.slice(0, end);
+      buffer = "";
+      active = false;
+      remaining = remaining.slice(end + BRACKETED_PASTE_END.length);
+      continue;
+    }
+
+    const start = remaining.indexOf(BRACKETED_PASTE_START);
+    if (start < 0) {
+      text += consumed ? stripBracketedPasteMarkers(remaining) : remaining;
+      remaining = "";
+      continue;
+    }
+    text += stripBracketedPasteMarkers(remaining.slice(0, start));
+    active = true;
+    remaining = remaining.slice(start + BRACKETED_PASTE_START.length);
+  }
+
+  return {
+    state: { active, buffer },
+    text: text.replace(/\r\n?/g, "\n"),
+    consumed,
+  };
+}
+
+export function formatTerminalControlForwardedInput(input: string): string {
+  if (!input) return input;
+  if (containsBracketedPasteMarker(input)) return input;
+  const normalized = input.replace(/\r\n?/g, "\n");
+  if (!normalized.includes("\n")) return input;
+  if (normalized === "\n") return input;
+  return `${BRACKETED_PASTE_START}${normalized}${BRACKETED_PASTE_END}`;
+}
diff --git a/apps/ade-cli/src/tuiClient/components/ChatView.tsx b/apps/ade-cli/src/tuiClient/components/ChatView.tsx
index 420ce636b..adc8451c9 100644
--- a/apps/ade-cli/src/tuiClient/components/ChatView.tsx
+++ b/apps/ade-cli/src/tuiClient/components/ChatView.tsx
@@ -29,6 +29,13 @@ import {
 } from "./AdeWordmark";
 import { laneIconGlyph } from "./Header";
 import type { AdeCodeProvider } from "../types";
+import {
+  hardWrapDisplayText,
+  sliceByDisplayCells,
+  splitByDisplayCells,
+  terminalDisplayWidth,
+  truncateDisplayEnd,
+} from "../displayWidth";
 
 // Hero halo target: when no chat content is visible, let the hero stretch to a
 // roomy reading width instead of staying narrow against an empty pane.
@@ -90,7 +97,7 @@ export function workGroupExpandKey(blockId: string): string {
 }
 
 function textWidth(value: string): number {
-  return [...value].length;
+  return terminalDisplayWidth(value);
 }
 
 function repeat(value: string, count: number): string {
@@ -110,19 +117,11 @@ function maxRenderedLineWidth(lines: string[]): number {
 }
 
 function truncateEnd(value: string, max: number): string {
-  if (textWidth(value) <= max) return value;
-  if (max <= 1) return value.slice(0, Math.max(0, max));
-  return `${[...value].slice(0, max - 1).join("")}…`;
+  return truncateDisplayEnd(value, max);
 }
 
 function hardWrapWord(word: string, width: number): string[] {
-  if (width <= 1) return [word];
-  const chars = [...word];
-  const chunks: string[] = [];
-  for (let index = 0; index < chars.length; index += width) {
-    chunks.push(chars.slice(index, index + width).join(""));
-  }
-  return chunks;
+  return hardWrapDisplayText(word, width);
 }
 
 function wrapText(value: string, width: number, firstPrefix = "", restPrefix = firstPrefix): string[] {
@@ -1296,25 +1295,19 @@ function normalizeSelection(selection: ChatTextSelection): ChatTextSelection {
   };
 }
 
-function selectedRangeForRow(rowIndex: number, selection: ChatTextSelection, lineLength: number): [number, number] | null {
+function selectedRangeForRow(rowIndex: number, selection: ChatTextSelection, lineWidth: number): [number, number] | null {
   const normalized = normalizeSelection(selection);
   if (rowIndex < normalized.startRow || rowIndex > normalized.endRow) return null;
   const rawStart = rowIndex === normalized.startRow ? normalized.startColumn : 0;
-  const rawEnd = rowIndex === normalized.endRow ? normalized.endColumn + 1 : Math.max(lineLength, 1);
-  const start = Math.max(0, Math.min(rawStart, Math.max(lineLength, 1)));
-  const end = Math.max(start, Math.min(rawEnd, Math.max(lineLength, 1)));
+  const rawEnd = rowIndex === normalized.endRow ? normalized.endColumn + 1 : Math.max(lineWidth, 1);
+  const start = Math.max(0, Math.min(rawStart, Math.max(lineWidth, 1)));
+  const end = Math.max(start, Math.min(rawEnd, Math.max(lineWidth, 1)));
   return end > start ? [start, end] : null;
 }
 
 function splitTextByColumns(value: string, start: number, end: number): [string, string, string] {
-  const chars = [...(value || BLANK_ROW_TEXT)];
-  const safeStart = Math.max(0, Math.min(start, chars.length));
-  const safeEnd = Math.max(safeStart, Math.min(end, chars.length));
-  return [
-    chars.slice(0, safeStart).join(""),
-    chars.slice(safeStart, safeEnd).join(""),
-    chars.slice(safeEnd).join(""),
-  ];
+  const parts = splitByDisplayCells(value || BLANK_ROW_TEXT, start, end);
+  return [parts.before, parts.selected, parts.after];
 }
 
 const ChatRow = React.memo(function ChatRow({
@@ -1638,13 +1631,12 @@ export function selectedTextFromChatRows(rows: string[], selection: ChatTextSele
   const selected: string[] = [];
   for (let rowIndex = normalized.startRow; rowIndex <= normalized.endRow; rowIndex += 1) {
     const row = rows[rowIndex] ?? "";
-    const chars = [...row];
-    const range = selectedRangeForRow(rowIndex, normalized, chars.length);
+    const range = selectedRangeForRow(rowIndex, normalized, textWidth(row));
     if (!range) {
       selected.push("");
       continue;
     }
-    selected.push(chars.slice(range[0], range[1]).join(""));
+    selected.push(sliceByDisplayCells(row, range[0], range[1]));
   }
   return selected.join("\n");
 }
diff --git a/apps/ade-cli/src/tuiClient/components/RightPane.tsx b/apps/ade-cli/src/tuiClient/components/RightPane.tsx
index 7e8df666f..6faf7e1cc 100644
--- a/apps/ade-cli/src/tuiClient/components/RightPane.tsx
+++ b/apps/ade-cli/src/tuiClient/components/RightPane.tsx
@@ -131,6 +131,10 @@ export function laneDetailsInteractionLayout(content: LaneDetailsContent): LaneD
   row += 2; // STATUS section heading with marginTop.
   row += 1; // working state.
   row += 1; // ahead / behind line.
+  if (content.setup) {
+    row += 2; // SETUP section heading with marginTop.
+    row += content.setup.detail ? 2 : 1;
+  }
   if (worktreeMissing) {
     row += 2; // UNAVAILABLE section heading with marginTop.
     row += 1; // unavailable detail.
@@ -437,6 +441,12 @@ function LaneDetailsPane({
     workingColor = theme.color.running;
     workingLabel = "clean";
   }
+  const setup = content.setup ?? null;
+  const setupColor = setup?.status === "failed"
+    ? theme.color.error
+    : setup?.status === "running"
+      ? theme.color.running
+      : theme.color.t3;
 
   let laneDetailsFooterHint = "↑↓ move · ↵ run · tab next section · esc close";
   if (worktreeMissing) {
@@ -460,6 +470,19 @@ function LaneDetailsPane({
           <Text color={theme.color.t4}> {tailTruncate(remoteLabel, Math.max(5, contentWidth - 8))}</Text>
         ) : null}
       </Box>
+      {setup ? (
+        <>
+          <LaneSectionHead title="SETUP" width={contentWidth} />
+          <Text color={setupColor} wrap="truncate-end">
+            {setup.status === "running" ? "●" : setup.status === "failed" ? "×" : "✓"} {endTruncate(setup.label, contentWidth - 2)}
+          </Text>
+          {setup.detail ? (
+            <Text color={setup.status === "failed" ? theme.color.error : theme.color.t4} dimColor={setup.status !== "failed"} wrap="truncate-end">
+              {"  "}{endTruncate(setup.detail, contentWidth - 2)}
+            </Text>
+          ) : null}
+        </>
+      ) : null}
       {worktreeMissing ? (
         <>
           <LaneSectionHead title="UNAVAILABLE" width={contentWidth} />
@@ -1631,7 +1654,9 @@ function NewLaneFormPane({
       case "name":
       case "parent":
       case "branch":
-      case "baseBranch": {
+      case "baseBranch":
+      case "linearIssue":
+      case "templateId": {
         const value = formValues[field.name]?.trim() ?? "";
         return (
           <Box key={field.name} flexDirection="column" marginTop={1}>
diff --git a/apps/ade-cli/src/tuiClient/displayWidth.ts b/apps/ade-cli/src/tuiClient/displayWidth.ts
new file mode 100644
index 000000000..bc381bee1
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/displayWidth.ts
@@ -0,0 +1,117 @@
+import stringWidth from "string-width";
+
+export type DisplayCluster = {
+  text: string;
+  start: number;
+  end: number;
+  width: number;
+};
+
+const segmenter = typeof Intl !== "undefined" && "Segmenter" in Intl
+  ? new Intl.Segmenter(undefined, { granularity: "grapheme" })
+  : null;
+
+export function terminalDisplayWidth(value: string): number {
+  return stringWidth(value);
+}
+
+export function displayClusters(value: string): DisplayCluster[] {
+  const clusters: DisplayCluster[] = [];
+  if (segmenter) {
+    for (const segment of segmenter.segment(value)) {
+      const text = segment.segment;
+      clusters.push({
+        text,
+        start: segment.index,
+        end: segment.index + text.length,
+        width: terminalDisplayWidth(text),
+      });
+    }
+    return clusters;
+  }
+  let index = 0;
+  for (const text of [...value]) {
+    clusters.push({
+      text,
+      start: index,
+      end: index + text.length,
+      width: terminalDisplayWidth(text),
+    });
+    index += text.length;
+  }
+  return clusters;
+}
+
+export function codeUnitIndexForDisplayCell(value: string, cell: number): number {
+  const target = Math.max(0, cell);
+  let cells = 0;
+  for (const cluster of displayClusters(value)) {
+    if (target <= cells) return cluster.start;
+    if (target < cells + cluster.width) return cluster.start;
+    cells += cluster.width;
+  }
+  return value.length;
+}
+
+export function displayCellForCodeUnitIndex(value: string, index: number): number {
+  const target = Math.max(0, Math.min(value.length, index));
+  let cells = 0;
+  for (const cluster of displayClusters(value)) {
+    if (target <= cluster.start) return cells;
+    if (target < cluster.end) return cells;
+    cells += cluster.width;
+  }
+  return cells;
+}
+
+export function sliceByDisplayCells(value: string, startCell: number, endCell: number): string {
+  const start = Math.max(0, startCell);
+  const end = Math.max(start, endCell);
+  let cells = 0;
+  let output = "";
+  for (const cluster of displayClusters(value)) {
+    const next = cells + cluster.width;
+    if (next > start && cells < end) output += cluster.text;
+    cells = next;
+  }
+  return output;
+}
+
+export function splitByDisplayCells(
+  value: string,
+  startCell: number,
+  endCell: number,
+): { before: string; selected: string; after: string } {
+  const start = Math.max(0, Math.min(startCell, terminalDisplayWidth(value)));
+  const end = Math.max(start, Math.min(endCell, terminalDisplayWidth(value)));
+  return {
+    before: sliceByDisplayCells(value, 0, start),
+    selected: sliceByDisplayCells(value, start, end),
+    after: sliceByDisplayCells(value, end, Number.POSITIVE_INFINITY),
+  };
+}
+
+export function truncateDisplayEnd(value: string, maxCells: number): string {
+  if (terminalDisplayWidth(value) <= maxCells) return value;
+  if (maxCells <= 1) return sliceByDisplayCells(value, 0, Math.max(0, maxCells));
+  return `${sliceByDisplayCells(value, 0, maxCells - 1)}…`;
+}
+
+export function hardWrapDisplayText(value: string, width: number): string[] {
+  const safeWidth = Math.max(1, width);
+  const chunks: string[] = [];
+  let current = "";
+  let currentWidth = 0;
+  for (const cluster of displayClusters(value)) {
+    const clusterWidth = Math.max(0, cluster.width);
+    if (current && currentWidth + clusterWidth > safeWidth) {
+      chunks.push(current);
+      current = "";
+      currentWidth = 0;
+    }
+    current += cluster.text;
+    currentWidth += clusterWidth;
+  }
+  if (current || chunks.length === 0) chunks.push(current);
+  return chunks;
+}
diff --git a/apps/ade-cli/src/tuiClient/drawerLayout.ts b/apps/ade-cli/src/tuiClient/drawerLayout.ts
index 6d4a19b58..df3588b5d 100644
--- a/apps/ade-cli/src/tuiClient/drawerLayout.ts
+++ b/apps/ade-cli/src/tuiClient/drawerLayout.ts
@@ -84,6 +84,7 @@ export type DrawerLanePlan = {
 export type DrawerLayout = {
   laneStart: number;
   lanes: DrawerLanePlan[];
+  newLaneRow: number;
 };
 
 export function computeDrawerLayout({
@@ -151,13 +152,14 @@ export function computeDrawerLayout({
     plan.moreCount = more;
     remaining -= rowsUsed;
   }
-  return { laneStart, lanes: plans };
+  return { laneStart, lanes: plans, newLaneRow: Math.max(1, panelHeight - 1) };
 }
 
 export type DrawerMouseHit =
   | { kind: "lane"; index: number }
   | { kind: "chat"; laneIndex: number; chatIndex: number }
   | { kind: "new-chat" }
+  | { kind: "new-lane" }
   | null;
 
 /**
@@ -173,7 +175,9 @@ export function drawerMouseHitForLayout({
   y: number | null;
   layout: DrawerLayout;
 }): DrawerMouseHit {
-  if (y == null || layout.lanes.length === 0) return null;
+  if (y == null) return null;
+  if (y === layout.newLaneRow) return { kind: "new-lane" };
+  if (layout.lanes.length === 0) return null;
   let line = 3; // first lane card's top border row
   for (let index = 0; index < layout.lanes.length; index += 1) {
     const plan = layout.lanes[index]!;
diff --git a/apps/ade-cli/src/tuiClient/keybindings/index.ts b/apps/ade-cli/src/tuiClient/keybindings/index.ts
index d79b0e973..04c1241ba 100644
--- a/apps/ade-cli/src/tuiClient/keybindings/index.ts
+++ b/apps/ade-cli/src/tuiClient/keybindings/index.ts
@@ -442,10 +442,24 @@ export function dispatchKeybinding(
 
 export function openKeybindingsFile(filePath = defaultKeybindingsPath()): { command: string; args: string[] } {
   const editor = process.env.VISUAL || process.env.EDITOR;
-  const command = editor || (process.platform === "darwin" ? "open" : "xdg-open");
-  const args = editor ? [filePath] : [filePath];
-  const child = spawn(command, args, { stdio: "ignore", detached: true, shell: Boolean(editor) });
+  const { command, args } = keybindingsEditorCommand(filePath, editor, process.platform);
+  const child = spawn(command, args, { stdio: "ignore", detached: true, shell: false });
   child.on("error", () => undefined);
   child.unref();
   return { command, args };
 }
+
+export function keybindingsEditorCommand(
+  filePath: string,
+  editor: string | undefined,
+  platform: NodeJS.Platform,
+): { command: string; args: string[] } {
+  const editorParts = editor ? splitEditorCommand(editor) : [];
+  const command = editorParts[0] || (platform === "darwin" ? "open" : "xdg-open");
+  const args = editorParts.length ? [...editorParts.slice(1), filePath] : [filePath];
+  return { command, args };
+}
+
+export function splitEditorCommand(value: string): string[] {
+  return value.trim().split(/\s+/).filter(Boolean);
+}
diff --git a/apps/ade-cli/src/tuiClient/newLaneForm.ts b/apps/ade-cli/src/tuiClient/newLaneForm.ts
index c92e568c0..fd1a6576a 100644
--- a/apps/ade-cli/src/tuiClient/newLaneForm.ts
+++ b/apps/ade-cli/src/tuiClient/newLaneForm.ts
@@ -1,5 +1,6 @@
-import type { LaneSummary } from "../../../desktop/src/shared/types/lanes";
+import type { LaneLinearIssue, LaneSummary } from "../../../desktop/src/shared/types/lanes";
 import { LANE_COLOR_PALETTE } from "../../../desktop/src/shared/laneColorPalette";
+import { linearIssueBranchName } from "../../../desktop/src/shared/linearIssueBranch";
 
 /**
  * Pure model for the /new lane form — mirrors the desktop CreateLaneDialog's
@@ -117,6 +118,8 @@ export function newLaneFormFields(
   } else {
     fields.push({ name: "baseBranch", label: "Base branch", placeholder: "default" });
   }
+  fields.push({ name: "linearIssue", label: "Linear issue", placeholder: "ADE-123 or issue id" });
+  fields.push({ name: "templateId", label: "Setup template", placeholder: "default" });
   fields.push({ name: "create", label: "Create" });
   return fields;
 }
@@ -240,19 +243,37 @@ export function newLaneCreateAction(args: {
 // ---------------------------------------------------------------------------
 
 export type NewLaneSubmission =
-  | { kind: "create"; payload: { name: string; baseBranch?: string }; color?: string }
+  | {
+      kind: "create";
+      payload: { name: string; baseBranch?: string; branchName?: string; linearIssue?: LaneLinearIssue | null };
+      color?: string;
+      templateId?: string;
+    }
   | {
       kind: "createChild";
-      payload: { name: string; parentLaneId: string; baseBranchRef?: string };
+      payload: {
+        name: string;
+        parentLaneId: string;
+        baseBranchRef?: string;
+        branchName?: string;
+        linearIssue?: LaneLinearIssue | null;
+      };
+      color?: string;
+      templateId?: string;
+    }
+  | {
+      kind: "importBranch";
+      payload: { branchRef: string; name: string; baseBranch?: string };
       color?: string;
+      templateId?: string;
     }
-  | { kind: "importBranch"; payload: { branchRef: string; name: string; baseBranch?: string }; color?: string }
   | { kind: "error"; message: string };
 
 export function buildNewLaneSubmission(args: {
   values: Record<string, string | undefined>;
   lanes: LaneSummary[];
   activeLaneId: string | null;
+  linearIssue?: LaneLinearIssue | null;
 }): NewLaneSubmission {
   const start = normalizeNewLaneStart(args.values.start);
   const name = args.values.name?.trim() ?? "";
@@ -260,8 +281,23 @@ export function buildNewLaneSubmission(args: {
   const baseBranch = args.values.baseBranch?.trim() || undefined;
   const color = args.values.color?.trim() || undefined;
   const withColor = color ? { color } : {};
+  const templateId = args.values.templateId?.trim() || undefined;
+  const withTemplate = templateId ? { templateId } : {};
+  const linearIssueInput = args.values.linearIssue?.trim() ?? "";
+  const withLinearIssue = args.linearIssue
+    ? {
+        linearIssue: args.linearIssue,
+        branchName: linearIssueBranchName(args.linearIssue) ?? undefined,
+      }
+    : {};
 
   if (start === "import") {
+    if (linearIssueInput) {
+      return {
+        kind: "error",
+        message: "Linear issue attachment is not supported when importing an existing branch.",
+      };
+    }
     // branchRef passes through as typed/picked: lane.importBranch accepts both
     // local names and remote refs ("origin/x" — and resolves bare names against
     // origin + all remotes via resolveImportBranchTarget), and listBranches
@@ -272,6 +308,7 @@ export function buildNewLaneSubmission(args: {
       kind: "importBranch",
       payload: { branchRef, name, ...(baseBranch ? { baseBranch } : {}) },
       ...withColor,
+      ...withTemplate,
     };
   }
 
@@ -295,8 +332,10 @@ export function buildNewLaneSubmission(args: {
         name,
         parentLaneId: parent.id,
         ...(baseBranch ? { baseBranchRef: baseBranch } : {}),
+        ...withLinearIssue,
       },
       ...withColor,
+      ...withTemplate,
     };
   }
 
@@ -305,7 +344,9 @@ export function buildNewLaneSubmission(args: {
     payload: {
       name,
       ...(baseBranch ? { baseBranch } : {}),
+      ...withLinearIssue,
     },
     ...withColor,
+    ...withTemplate,
   };
 }
diff --git a/apps/ade-cli/src/tuiClient/state.ts b/apps/ade-cli/src/tuiClient/state.ts
index 1508fbb08..bf012d61a 100644
--- a/apps/ade-cli/src/tuiClient/state.ts
+++ b/apps/ade-cli/src/tuiClient/state.ts
@@ -16,6 +16,8 @@ const STATE_LOCK_TIMEOUT_MS = 2_000;
 const STATE_LOCK_STALE_MS = 30_000;
 const STATE_LOCK_RETRY_MS = 25;
 
+let stateWriteQueue: Promise<void> = Promise.resolve();
+
 export function loadAdeCodeState(): AdeCodeState {
   try {
     const raw = fs.readFileSync(getStatePath(), "utf8");
@@ -26,21 +28,36 @@ export function loadAdeCodeState(): AdeCodeState {
 }
 
 export function saveAdeCodeState(state: AdeCodeState): void {
-  withStateLock(() => writeAdeCodeStateUnlocked(state));
+  void saveAdeCodeStateAsync(state);
+}
+
+export function saveAdeCodeStateAsync(state: AdeCodeState): Promise<void> {
+  return enqueueStateWrite(() => withStateLock(async () => {
+    await writeAdeCodeStateUnlocked(state);
+  }));
 }
 
-function writeAdeCodeStateUnlocked(state: AdeCodeState): void {
+async function writeAdeCodeStateUnlocked(state: AdeCodeState): Promise<void> {
   try {
     const { dir, path: statePath } = getStatePaths();
-    fs.mkdirSync(dir, { recursive: true });
+    await fs.promises.mkdir(dir, { recursive: true });
     const tempPath = `${statePath}.${process.pid}.${Date.now()}.tmp`;
-    fs.writeFileSync(tempPath, JSON.stringify(state, null, 2), "utf8");
-    fs.renameSync(tempPath, statePath);
+    await fs.promises.writeFile(tempPath, JSON.stringify(state, null, 2), "utf8");
+    await fs.promises.rename(tempPath, statePath);
   } catch {
     // best-effort persistence; ignore
   }
 }
 
+async function readAdeCodeStateUnlocked(): Promise<AdeCodeState> {
+  try {
+    const raw = await fs.promises.readFile(getStatePath(), "utf8");
+    return normalizeAdeCodeState(JSON.parse(raw));
+  } catch {
+    return emptyAdeCodeState();
+  }
+}
+
 export function scopedAdeCodeState(
   state: AdeCodeState,
   projectRoot: string,
@@ -56,8 +73,15 @@ export function saveAdeCodeProjectState(
   projectRoot: string,
   projectState: Pick<AdeCodeState, "lastChatByLane" | "lastLaneId">,
 ): void {
-  withStateLock(() => {
-    const current = loadAdeCodeState();
+  void saveAdeCodeProjectStateAsync(projectRoot, projectState);
+}
+
+export function saveAdeCodeProjectStateAsync(
+  projectRoot: string,
+  projectState: Pick<AdeCodeState, "lastChatByLane" | "lastLaneId">,
+): Promise<void> {
+  return enqueueStateWrite(() => withStateLock(async () => {
+    const current = await readAdeCodeStateUnlocked();
     const projectKey = normalizeProjectKey(projectRoot);
     current.lastChatByProjectLane[projectKey] = { ...projectState.lastChatByLane };
     if (projectState.lastLaneId) {
@@ -67,8 +91,8 @@ export function saveAdeCodeProjectState(
     }
     current.lastChatByLane = { ...projectState.lastChatByLane };
     current.lastLaneId = projectState.lastLaneId;
-    writeAdeCodeStateUnlocked(current);
-  });
+    await writeAdeCodeStateUnlocked(current);
+  }));
 }
 
 export function normalizeAdeCodeState(value: unknown): AdeCodeState {
@@ -109,36 +133,42 @@ function getStatePath(): string {
   return getStatePaths().path;
 }
 
-function withStateLock(write: () => void): void {
+function enqueueStateWrite(write: () => Promise<void>): Promise<void> {
+  const run = stateWriteQueue.then(write, write);
+  stateWriteQueue = run.catch(() => undefined);
+  return run;
+}
+
+async function withStateLock(write: () => Promise<void>): Promise<void> {
   const { dir, lockPath } = getStatePaths();
-  let fd: number | null = null;
+  let handle: fs.promises.FileHandle | null = null;
   const deadline = Date.now() + STATE_LOCK_TIMEOUT_MS;
   try {
-    fs.mkdirSync(dir, { recursive: true });
-    while (fd === null) {
+    await fs.promises.mkdir(dir, { recursive: true });
+    while (handle === null) {
       try {
-        fd = fs.openSync(lockPath, "wx");
-        fs.writeFileSync(fd, JSON.stringify({ pid: process.pid, createdAt: new Date().toISOString() }));
+        handle = await fs.promises.open(lockPath, "wx");
+        await handle.writeFile(JSON.stringify({ pid: process.pid, createdAt: new Date().toISOString() }));
       } catch (error) {
         const code = (error as NodeJS.ErrnoException).code;
         if (code !== "EEXIST") throw error;
-        removeStaleStateLock(lockPath);
+        await removeStaleStateLock(lockPath);
         if (Date.now() >= deadline) return;
-        sleepSync(STATE_LOCK_RETRY_MS);
+        await delay(STATE_LOCK_RETRY_MS);
       }
     }
-    write();
+    await write();
   } catch {
     // best-effort persistence; ignore
   } finally {
-    if (fd !== null) {
+    if (handle !== null) {
       try {
-        fs.closeSync(fd);
+        await handle.close();
       } catch {
         // ignore
       }
       try {
-        fs.unlinkSync(lockPath);
+        await fs.promises.unlink(lockPath);
       } catch {
         // ignore
       }
@@ -146,19 +176,21 @@ function withStateLock(write: () => void): void {
   }
 }
 
-function removeStaleStateLock(lockPath: string): void {
+async function removeStaleStateLock(lockPath: string): Promise<void> {
   try {
-    const stat = fs.statSync(lockPath);
+    const stat = await fs.promises.stat(lockPath);
     if (Date.now() - stat.mtimeMs > STATE_LOCK_STALE_MS) {
-      fs.unlinkSync(lockPath);
+      await fs.promises.unlink(lockPath);
     }
   } catch {
     // ignore
   }
 }
 
-function sleepSync(ms: number): void {
-  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+function delay(ms: number): Promise<void> {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
 }
 
 function normalizeStringRecord(value: unknown): Record<string, string> {
diff --git a/apps/ade-cli/src/tuiClient/types.ts b/apps/ade-cli/src/tuiClient/types.ts
index 693b86191..45b748b26 100644
--- a/apps/ade-cli/src/tuiClient/types.ts
+++ b/apps/ade-cli/src/tuiClient/types.ts
@@ -310,6 +310,7 @@ export type RightPaneContent =
         deletions: number;
       };
       files: { path: string; status: "M" | "A" | "D" | "?"; staged: boolean }[];
+      setup?: LaneSetupStatus | null;
       pr: {
         number: number;
         state: "open" | "closed" | "merged";
@@ -329,6 +330,14 @@ export type RightPaneContent =
       worktreeAvailable?: boolean;
     };
 
+export type LaneSetupStatus = {
+  status: "running" | "failed" | "completed";
+  label: string;
+  detail?: string;
+  templateId?: string | null;
+  retryable?: boolean;
+};
+
 export type LocalNotice = {
   id: string;
   timestamp: string;
diff --git a/apps/ade-cli/tsup.config.ts b/apps/ade-cli/tsup.config.ts
index 030a5aef5..0388ccebe 100644
--- a/apps/ade-cli/tsup.config.ts
+++ b/apps/ade-cli/tsup.config.ts
@@ -22,6 +22,7 @@ const tuiNoExternal = [
   "@opencode-ai/sdk",
   "@xterm/headless",
   "marked",
+  "string-width",
   "ws",
   "yaml",
   /^highlight\.js(?:\/.*)?$/,
diff --git a/docs/features/ade-code/README.md b/docs/features/ade-code/README.md
index c7ec39b7e..eabb6e082 100644
--- a/docs/features/ade-code/README.md
+++ b/docs/features/ade-code/README.md
@@ -35,7 +35,7 @@ Point Cursor’s browser inspector at the served page for layout debugging. The
 | `apps/ade-cli/src/tuiClient/aggregate.ts` | Pure derivations on top of the chat event stream. Produces `AggregatedBlock`s (assistant text, tool-calls / files-changed / plan / compaction groups, runtime-activity rows for subagent and activity envelopes, queued steers) and `derivePendingSteers`, consumed by `ChatView` and the right-pane steer view. |
 | `apps/ade-cli/src/tuiClient/drawerSelection.ts` | Pure selectors for the lane / chat drawer (active row, expanded groups, keyboard navigation). |
 | `apps/ade-cli/src/tuiClient/drawerLayout.ts` | Single source of truth for drawer row layout: `computeDrawerLayout` (expanded chat block + compact per-lane chat previews under a height budget) and `drawerMouseHitForLayout`, shared by the Drawer renderer and the app's mouse hit-testing so the two cannot drift. |
-| `apps/ade-cli/src/tuiClient/newLaneForm.ts` | Pure model for the `/new lane` form: start-from modes (primary / child / import), runtime placement toggle, per-mode field lists, and `buildNewLaneSubmission` mapping form values onto `lane.create` / `lane.createChild` / `lane.importBranch` payloads. |
+| `apps/ade-cli/src/tuiClient/newLaneForm.ts` | Pure model for the `/new lane` form: start-from modes (primary / child / import), Linear issue + setup-template fields, per-mode field lists, and `buildNewLaneSubmission` mapping form values onto `lane.create` / `lane.createChild` / `lane.importBranch` payloads. |
 | `apps/ade-cli/src/tuiClient/eventDedup.ts` | Reserves and syncs chat-event dedupe keys so replayed runtime events do not render twice. |
 | `apps/ade-cli/src/tuiClient/feedback.ts` | Builds the multi-field `/feedback` form. Validates required fields, packs the `FeedbackDraftInput` envelope, and adds project / lane / runtime context before submission. |
 | `apps/ade-cli/src/tuiClient/heartbeat.ts` | Maintains the `startTuiHeartbeat` loop that tells the runtime the terminal client is still attached. |
@@ -53,7 +53,7 @@ Point Cursor’s browser inspector at the served page for layout debugging. The
 | `apps/ade-cli/src/tuiClient/state.ts` | Persists terminal-client state under `~/.ade/`: the last selected chat per lane (`lastChatByLane`) plus the most recently active lane (`lastLaneId`), used to restore lane focus across launches. |
 | `apps/ade-cli/src/tuiClient/theme.ts` | Shared Ink color and status tokens. Mirrors the Claude Design wireframe terminal palette 1:1: surfaces, text levels, brand violets, status (`running`/`attention`/`idle`/`failed`/`primary`), executor brand colors (Claude/Codex/Cursor/OpenCode/Droid + Shell + Copilot), plus helper exports `laneStatusColor`, `agentStatusColor`, `agentStatusGlyph`, and per-provider `glyph` + `wordmark`. |
 | `apps/ade-cli/src/tuiClient/types.ts` | `AdeCodeConnection`, `ProjectLaunchContext`, `RightPaneContent` (`empty`, `help`, `status`, `details`, `diff`, `chat-info`, `new-chat-setup`, `model-setup`, `form`, `lane-details` with git stats + PR CI fields + lane chat counts, …), `ChatInfoSnapshot`, `ChatInfoPlan`, `ChatInfoPlanStep`, `SubagentSnapshot`, plus navigation DTOs aligned with `apps/desktop/src/shared/types`. |
-| `apps/ade-cli/src/tuiClient/components/` | `AdeWordmark`, `Drawer` (`visibleDrawerLaneCount` / `visibleDrawerChatCount`, `DrawerPrSummary` rows, lanes mode chat preview under the selected lane), `ChatView` (transcript renderer; exports `renderChatVisibleSelectionRows` / `renderChatSelectableRowTexts` / `selectedTextFromChatRows` for the ADE-owned mouse selection, plus `computeChatScrollMaxOffset` and `renderChatTranscriptPlainText`), `Header`, `RightPane` (`computeLaneChatCounts`, `LANE_DETAIL_PR_ACTION_INDEX`, wireframe `lane-details` STATUS/CHANGES/ACTIONS/PR/CHATS sections, Chat Info `chat-info`, `model-setup`), `SlashPalette`, `MentionPalette`, `ApprovalPrompt`, `ModelStatus`, `FooterControls`, and `TerminalPane` (xterm-headless preview pane that consumes `ChatTerminalPreviewResult` from `ade.terminal.preview` plus live `ade.pty.data` chunks to render a real terminal grid inside Ink; running provider CLI terminals — Claude, Codex, Cursor, Droid, OpenCode — can be put into direct control mode from the TUI). |
+| `apps/ade-cli/src/tuiClient/components/` | `AdeWordmark`, `Drawer` (`visibleDrawerLaneCount` / `visibleDrawerChatCount`, `DrawerPrSummary` rows, lanes mode chat preview under the selected lane), `ChatView` (transcript renderer; exports `renderChatVisibleSelectionRows` / `renderChatSelectableRowTexts` / `selectedTextFromChatRows` for the ADE-owned mouse selection, plus `computeChatScrollMaxOffset` and `renderChatTranscriptPlainText`), `Header`, `RightPane` (`computeLaneChatCounts`, `LANE_DETAIL_PR_ACTION_INDEX`, wireframe `lane-details` STATUS/SETUP/CHANGES/ACTIONS/PR/CHATS sections, Chat Info `chat-info`, `model-setup`), `SlashPalette`, `MentionPalette`, `ApprovalPrompt`, `ModelStatus`, `FooterControls`, and `TerminalPane` (xterm-headless preview pane that consumes `ChatTerminalPreviewResult` from `ade.terminal.preview` plus live `ade.pty.data` chunks to render a real terminal grid inside Ink; running provider CLI terminals — Claude, Codex, Cursor, Droid, OpenCode — can be put into direct control mode from the TUI). |
 | `apps/ade-cli/src/tuiClient/keybindings/index.ts` | Verbatim `~/.claude/keybindings.json` reader and TUI action dispatcher (chord support, vim namespace, clipboard-image paste hooks). Resolves `defaultKeybindingsPath()`, parses the Claude keybindings schema, and maps key sequences onto TUI actions. |
 | `apps/ade-cli/src/tuiClient/statusline/index.ts` | Claude-compatible status line config reader and runner. Reads the `~/.claude/statusline.json` contract, executes the configured status command, and exposes the rendered lines to `ModelStatus`. |
 | `apps/ade-cli/src/tuiClient/components/ModelPicker/` | Ink ModelPicker pane: `ModelPickerPane.tsx` (provider/category rail + search + model rows), `modelPickerLayout.ts` (pure derivations — imports `modelOrdering` and `modelPickerSearch` from the desktop package so behaviour stays in lockstep with the renderer), `modelPickerGeometry.ts` (shared painted-row / click hit-test geometry), and `types.ts` (`ModelPickerEntry`, `ModelPickerRailEntry`, `ModelPickerState`, plus `AdeCodeProvider` extensions for `ollama` / `lmstudio`). Reads the provider-grouped catalog via `getModelCatalog`, preserves runtime `serviceTiers` and Cursor `cursorAvailability` metadata for Fast Mode / chat-vs-CLI parity, keeps the provider rail stable even when a runtime is signed out or empty, and reads favorites / recents via the cross-surface `modelPicker.*` store. |
@@ -134,7 +134,7 @@ For the embedded runtime there is no `projects.add` step — the in-process runt
 - **Drawer** (toggled with the configured shortcut) — two modes, **lanes** (default) and **chats**, switched with `Tab` while the drawer is focused. Lane cards show name + status (no branch ref — that lives in lane details). Every lane shows its chats: the selected lane expands the full chat block (the same tight single-row chats every lane shows, distinguished only by a violet border plus a trailing `+ new chat` row — there is no `CHATS` header), while every other lane renders a compact always-visible preview (the lane's chats as single rows, plus a `+N more` tail only when the row budget can't fit them all) whose rows are clickable and select lane + chat in one step. Row layout and mouse hit-testing share one pure model (`drawerLayout.ts: computeDrawerLayout` / `drawerMouseHitForLayout`) so the two cannot drift. In **lanes** mode, `↑`/`↓` move lane cards; `↓` on an available lane enters **chats** mode for that lane; `↵` opens lane details or resumes the lane's last chat. In **chats** mode, `↑`/`↓` move chat rows and `+ new chat`; highlighting a chat previews it in the centre pane via `resolveTuiChatRefreshTarget` before `↵` commits the session. `↑` at the top of the chat list returns to **lanes**; `↓` past the last chat drops to the next lane card. Lane and chat selection drive the right pane's context.
 - **ChatView** — the main transcript. Renders user, assistant, tool, and system events from `chat/event` notifications. For the non-Claude runtimes the transcript mirrors the desktop work log: each tool call is one stacked line (`✓ read apps/x.ts`) with the desktop slug + target-arg derivation (pure helpers imported from `apps/desktop/.../chatTranscriptRows` and `toolPresentation`), `web_search` events group with tool calls, reasoning renders as a collapsed `Thinking…`/`Thought` row with a one-line preview, and every row truncates to the pane width (rows never wrap — the scroll math assumes 1 row = 1 line). The most recent expandable failure id is tracked so `Enter` can drill into it. Mouse selection is ADE-owned so it can follow virtual transcript rows: drag selects, edge-drag scrolls, wheel scrolling preserves the highlighted range, Shift-click extends the current anchor, and `Ctrl+C` / delivered `Cmd+C` copy selected chat text.
 - **Composer** — multi-line input with mention completion (`@…`) sourced from `MentionPalette` and slash command completion from `SlashPalette`. Both palettes stay visible with a no-match row while the user is actively typing. Mention completion publishes local lane/chat hits immediately, then debounces remote file/git/PR RPCs; file results are cached per lane+query and git/PR results are cached per lane for the open TUI session. Pending tool approvals surface as `ApprovalPrompt`. AskUserQuestion-style answer requests (one or more questions, each with options) render every question inline with its option list and an `N of M answered` header. While such a request is pending and the composer is empty, keyboard input drives the picker instead of the prompt: `↑`/`↓` move the selected option (or move between questions when the active question has no options), `←`/`→` switch the active question, `1`-`9` select that option and submit it immediately, `Enter` submits the active question's current selection (advancing to the next unanswered question, or finalizing the whole request once every question is answered), and typing any text falls back to a custom free-text answer. Clicking an option submits it too. The deny chip still declines the whole request. Selection lives in `pendingInput.ts`'s `PendingQuestionSelectionState`; the old single-question `1`-`6` numeric quick-select is replaced by this flow.
-- **RightPane** — context-sensitive drawer for slash command output. The "right" placement commands (see below) render their results here as forms, lists, diffs, help text, or rendered objects. When a chat is active the default content is the **Chat Info** view (`kind: "chat-info"`): provider/model header, lane label, streaming/idle indicator with context-percent + token summary, plan steps for the current turn (plus the provider's plan explanation / streaming text when present), Codex `/goal` block when present, a roster of subagents (running first, then teammates and background), and — below the roster, like the Droid Missions block — a **TASKS** section (latest `todo_update` snapshot, desktop ChatTasksPanel parity) and a **PR** section (the lane's PR state + checks rollup with `/pr` hand-off hints, desktop ChatPrPane parity). Codex goal state comes from the shared chat event stream and is normalized so provider token budgets do not show as ADE-side limits. Selecting a subagent row with `↵` swaps the centre transcript to that agent's view via `buildSubagentTranscriptEvents`; `Esc` returns to the main chat. For an active lane with no chat focus, the default switches to the wireframe **`lane-details`** view: **STATUS** (clean/dirty, ahead/behind), **CHANGES** (file list + staged/unstaged counts from `diff.listLaneDiffStats`), **ACTIONS** (lane shortcuts — `new chat`, `open / create PR`, `stage all`, `move unstaged to new lane`, `commit`, `push`, `diff`, `reparent`, `delete lane`; each row carries a semantic glyph color so additive actions are green, navigational actions are violet, the rescue-unstaged action is amber, and `delete lane` is red), optional **PR #N** (state chip, CI activity via `checksPending` / `checksFailed`, `↵` opens the PR URL when the PR row is selected), and **CHATS** (active / closed / killed counts from `computeLaneChatCounts`). A `worktreeAvailable` guard surfaces a recoverable warning when the lane worktree path is missing from disk. `/model` opens a separate **`model-setup`** pane for provider/model/reasoning/permission picks before the first prompt.
+- **RightPane** — context-sensitive drawer for slash command output. The "right" placement commands (see below) render their results here as forms, lists, diffs, help text, or rendered objects. When a chat is active the default content is the **Chat Info** view (`kind: "chat-info"`): provider/model header, lane label, streaming/idle indicator with context-percent + token summary, plan steps for the current turn (plus the provider's plan explanation / streaming text when present), Codex `/goal` block when present, a roster of subagents (running first, then teammates and background), and — below the roster, like the Droid Missions block — a **TASKS** section (latest `todo_update` snapshot, desktop ChatTasksPanel parity) and a **PR** section (the lane's PR state + checks rollup with `/pr` hand-off hints, desktop ChatPrPane parity). PR rows refresh from runtime PR update notifications when available and still keep the 30s poll as a fallback. Codex goal state comes from the shared chat event stream and is normalized so provider token budgets do not show as ADE-side limits. Selecting a subagent row with `↵` first probes for a usable subagent transcript; if one is available the centre transcript swaps to it, otherwise the local reconstruction stays visible with a notice. `Esc` returns to the main chat. For an active lane with no chat focus, the default switches to the wireframe **`lane-details`** view: **STATUS** (clean/dirty, ahead/behind), optional **SETUP** (lane setup progress or retryable failure; press `r` on a failed setup to retry), **CHANGES** (file list + staged/unstaged counts from `diff.listLaneDiffStats`), **ACTIONS** (lane shortcuts — `new chat`, `open / create PR`, `stage all`, `move unstaged to new lane`, `commit`, `push`, `diff`, `reparent`, `delete lane`; each row carries a semantic glyph color so additive actions are green, navigational actions are violet, the rescue-unstaged action is amber, and `delete lane` is red), optional **PR #N** (state chip, CI activity via `checksPending` / `checksFailed`, `↵` opens the PR URL when the PR row is selected), and **CHATS** (active / closed / killed counts from `computeLaneChatCounts`). A `worktreeAvailable` guard surfaces a recoverable warning when the lane worktree path is missing from disk. `/model` opens a separate **`model-setup`** pane for provider/model/reasoning/permission picks before the first prompt.
 - **FooterControls** — two-row footer. The top row (mode bar, only present when there's content) shows provider glyph + label, model display, fast-mode badge, reasoning effort, permission summary, pending steer count, a 10-cell token usage bar (`TokenBar`) that recolors at 50 / 80 / 95 %, and the cached context-percent / token summary. The bottom row shows pane toggles (`^o` lanes, `^p` pane, `^a` chat info) and pane-specific hints (drawer mode lanes/chats, details navigation, chat scroll position, `/steer` reminder when steers are queued). The `⊚ chat info` chip shows the live subagent count when greater than zero. `footerControlsForAvailability(agentsAvailable)` decides which toggles are wired.
 - **Provider CLI terminal control** — when the active session is a
   running provider CLI terminal (Claude, Codex, Cursor, Droid, or
@@ -159,13 +159,18 @@ Heartbeats are kept alive with `startTuiHeartbeat` so the runtime knows the chat
 
 `commands.ts` exports the built-in slash command catalog. `placement` decides whether the command runs inline in the chat or opens the right pane. The TUI also discovers project command files, Codex prompts, and Agent Skill roots before a chat exists, then refreshes against server-provided `AgentChatSlashCommand`s from the active runtime via `getSlashCommands`. Provider/runtime commands win over same-named built-ins except for local terminal controls such as `/login`, `/quit`, and `/clear`.
 
-Inline (acts on chat or shell):
+Inline (acts immediately in the TUI):
 
 | Command | Effect |
 | --- | --- |
 | `/commit [message]` | Commit lane changes through `git.commit`. |
 | `/push` | Push the active lane branch. |
+| `/pull [--ff-only\|--rebase\|--merge]` | Pull the active lane branch; default is fast-forward-only. |
+| `/undo` | Undo the last recorded HEAD change on the active lane branch. |
+| `/redo` | Redo the most recently undone HEAD change on the active lane. |
+| `/stage all` | Stage all changes in the active lane. |
 | `/clear` | Clear the local TUI transcript view. |
+| `/login` | Sign in to the active CLI-backed provider from this terminal; after a successful login, the TUI restores the most recent auth-failed prompt for resend. |
 | `/open` | Hand the current ADE context off to desktop via `app/navigate`. |
 | `/quit` | Exit `ade code`. |
 | `/steer cancel` | Remove the latest staged steer message from the local queue. |
@@ -173,49 +178,67 @@ Inline (acts on chat or shell):
 | `/steer send` | Claude only: deliver the latest staged steer inline into the active turn (SDK `dispatchSteer mode: "inline"`). |
 | `/steer interrupt` | Claude only: interrupt the active turn and run the latest staged steer next (`dispatchSteer mode: "interrupt"`). |
 
-Right pane (open the contextual drawer):
+Right pane (open contextual content):
 
 | Command | Pane |
 | --- | --- |
 | `/steer` | Show staged steer messages and their delivery state. |
-| `/new lane` | Lane creation form (desktop CreateLaneDialog parity): "Start from" mode chips — primary base branch / child of a lane / import an existing branch — swap the visible fields. Backed by `newLaneForm.ts` and the `lane.create` / `lane.createChild` / `lane.importBranch` actions. |
+| `/new lane` | Lane creation form (desktop CreateLaneDialog parity): start-from modes for primary base branch / child lane / import branch, color picker, optional Linear issue attachment, optional setup template id, and post-create setup progress with retryable failure. Backed by `newLaneForm.ts` and the `lane.create` / `lane.createChild` / `lane.importBranch` actions. |
 | `/new chat [title]` | New chat in the active lane. |
-| `/rename [title]` | Rename the active chat. |
+| `/rename [title]`, `/chat rename [title]` | Rename the active chat. |
+| `/chat archive` | Archive the active chat. |
+| `/chat unarchive <chat-id\|title>` | Unarchive a chat by id or title. |
+| `/chat archived [filter]` | List archived chats. |
+| `/chat delete` | Delete the active chat after confirmation. |
 | `/tag <tag\|clear>` | Tag the active Claude chat (Claude only). |
 | `/output-style [style]` | List or select the active Claude output style (Claude only). |
 | `/plugin [reload\|native args]` | List, reload, or manage Claude plugins (Claude only). |
+| `/status` | Project, lane, and runtime state summary. |
+| `/context` | Show chat context usage. |
 | `/agents` | List Claude agents from user/project config (Claude only). |
-| `/info` | Open the Chat Info pane for the active chat (plan, Codex goal, subagents). |
+| `/info` | Open Chat Info for the active chat: plan, goal, tasks, PR rollup, and subagents. |
 | `/skills` | List Agent Skills from project, user, inherited, and bundled ADE roots. |
-| `/context` | Show Claude context usage breakdown (Claude only). |
 | `/init` | Generate AGENTS.md and Claude pointer files (Claude only). |
-| `/status` | Project, lane, runtime state summary. |
 | `/diff` | Active lane diff (file list with summarized hunks). |
 | `/log` | Recent commits. |
-| `/pr`, `/pr open`, `/pr review`, `/pr checks` | PR detail pane (bare `/pr` combines the summary with live checks), create/open PR, reviews, checks. |
-| `/linear …` (`list`, `workflows`, `run`, `route`, `sync`, `ingress`, `pull`, `comment`, `status`, `assign`, `label`, `set-state`, `issue`, `attach`, `detach`, `issues`, `create-from`) | Linear sub-router; backed by `linearCommands.ts`. `attach` / `detach` / `issues` operate on the active chat session by default (session-scoped attachment via the `lane` domain's `attachLinearIssueToSession` / `detachLinearIssueFromSession` / `listLinearIssuesForSession`), or on a `--lane` (`linkLinearIssues` / `unlinkLinearIssues`); `comment` / `set-state` / `assign` / `label` write to the issue through the `linear_issue_tracker` domain over the daemon bridge. |
-| `/chats` | Sessions in the active lane. |
-| `/switch [lane\|chat]` | Switcher palette. |
+| `/reparent <parent-lane-id\|parent-name> [stack-base-ref]` | Move the active lane under another lane. |
+| `/lane rename [name]` | Rename the active lane. |
+| `/lane archive` | Archive the active lane. |
+| `/lane unarchive <lane-id\|name>` | Unarchive a lane by id or name. |
+| `/lane archived` | List archived lanes. |
+| `/lane delete` | Open a right-pane confirmation form for deleting the active lane. |
+| `/pr` | Open PR details with summary and checks. |
+| `/pr open` | Create or open a PR for the active lane. |
+| `/pr review` | Show PR reviews. |
+| `/pr comments` | Show actionable PR comments. |
+| `/pr comment <text>` | Comment on the active PR. |
+| `/pr approve [note]` | Approve the active PR. |
+| `/pr request-changes <text>` | Request changes on the active PR. |
+| `/pr land [confirm] [merge\|squash\|rebase] [bypass]` | Merge the active PR after confirmation. |
+| `/pr update-branch [merge\|rebase]` | Update the PR branch with its base. |
+| `/pr checks` | Show PR checks. |
+| `/linear …` (`list`, `workflows`, `run`, `route`, `sync`, `ingress`, `pull`, `comment`, `comments`, `status`, `assign`, `label`, `set-state`, `issue`, `attach`, `detach`, `issues`, `create-from`) | Linear sub-router; backed by `linearCommands.ts`. `attach` / `detach` / `issues` operate on the active chat session by default, or on a `--lane`; issue write verbs bridge through `linear_issue_tracker`. |
+| `/feedback` | Multi-field feedback form wired to `feedback.submit` via the `feedback.ts` form builder. |
+| `/chats [filter]` | List chats in the active lane. |
+| `/switch [lane\|chat]` | Switch lane or chat. |
 | `/help` | Keymap and command help. |
-| `/lane delete` | Open a right-pane confirmation form for deleting the active lane (shows lane name, branch ref, and dirty state; force toggle exposed when the lane has uncommitted changes). |
 | `/keybindings [open]` | Show Claude-compatible keybinding config diagnostics. Pass `open` to launch the configured editor on `~/.claude/keybindings.json`. |
 | `/statusline` | Show Claude-compatible status line config. |
 | `/doctor` | Show ADE Code and Claude-compat diagnostics. |
-| `/feedback` | Multi-field feedback form (category / summary / details / expected / actual / environment / additional context) wired to `feedback.submit` via the `feedback.ts` form builder. |
-| `/model` | Open the unified model / reasoning / permission picker (right pane `model-picker` view, with rail + fuzzy search). |
-| `/effort` | Open a focused reasoning-effort-only picker for the active provider (skips the model rail when only the effort needs to change). For Claude terminal sessions, the picker writes the effort directly into the running Claude transcript via `submitClaudePromptToTerminal` so the change applies without restarting the chat. |
+| `/model` | Open the unified model / reasoning / permission picker. |
+| `/effort` | Open a focused reasoning-effort-only picker for the active provider. |
 | `/system` | System and runtime details. |
-| `/ade <domain.action> [json]` | Run an allowlisted ADE action; shows result in RightPane. |
+| `/ade <domain.action\|command> [json]` | Run an allowlisted ADE action or force a TUI command; shows result in RightPane. |
 
-Inline chat commands (run through the active Claude SDK session, Claude only):
+Inline chat commands (forwarded through the active chat runtime):
 
 | Command | Effect |
 | --- | --- |
-| `/compact [instructions]` | Compact the Claude context window through the active SDK session. |
+| `/compact [instructions]` | Compact the active Claude or Codex context window. |
 | `/usage` | Show Claude usage / rate-limit window through the active SDK session. |
 | `/insights` | Generate Claude session insights through the active SDK session. |
 | `/fast [on\|off]` | Toggle Claude fast mode through the active SDK session. |
-| `/goal [<objective>\|clear\|pause\|resume]` | Set, pause, resume, or clear the chat goal. Token-budget management is intentionally not exposed — when a Codex thread reports `budget_limited`, ADE auto-clears the runtime budget and the goal banner stays in the active state. |
+| `/goal [<objective>\|clear\|status active\|paused\|complete]` | Set, clear, or inspect the active Claude/Codex chat goal. Token-budget management is intentionally not exposed — when a Codex thread reports `budget_limited`, ADE auto-clears the runtime budget and the goal banner stays in the active state. |
 
 Claude-only commands only appear in the slash palette when the active chat's provider is `claude`. The palette filters built-in entries by their `providers` whitelist so a Codex / OpenCode / Cursor chat does not show parity affordances that have no backing call. `/skills` is deliberately provider-agnostic because it only reads markdown package roots and does not call a provider runtime.
 
@@ -282,8 +305,8 @@ After local changes, run `npm run build` inside `apps/ade-cli` so both `dist/cli
 - **Status line.** `tuiClient/statusline/index.ts` reads `~/.claude/statusline.json`, executes the configured command, and feeds the rendered lines into `ModelStatus`. `/statusline` shows the contract and the most recent stdout/stderr. When a status command produces output, the status panel hides the default token/context meter for the same row.
 - **Vim namespace.** When vim mode is active, the model-status row exposes the current `insert`/`normal` mode tag and the keybindings dispatcher routes `vim.*` actions.
 - **Clipboard image paste.** Cross-platform clipboard-image paste is wired into the composer (Linux via `xclip`/`wl-paste`, macOS via `pngpaste`/AppleScript, Windows via PowerShell), so pasting a screenshot uploads it as a Claude attachment alongside text. The clipboard always lives on the machine running the TUI, so the routing depends on where the runtime is: for a **local** runtime the image is materialized under the project workspace (`.ade/cache/...`) and attached by path. For a **remote** runtime the workspace path lives on another machine, so writing there locally would fail (EACCES) and the agent couldn't read it — instead the image is materialized into a local scratch dir and its bytes are uploaded to the runtime via the `chat/saveTempAttachment` action (`saveRuntimeTempAttachment`, mirroring the desktop composer), which returns a runtime-valid path that is then mentioned. The local scratch temp is cleaned up after upload; a pre-existing user file the clipboard merely *referenced* is uploaded but never deleted.
-- **`auto` permission mode.** The Claude permission picker accepts `auto` (mapped onto the SDK `permissionMode: "auto"`) in addition to `default`, `plan`, `acceptEdits`, and `bypassPermissions`.
-- **Chat Info (subagent panel).** The right pane's Chat Info view replaces the legacy Subagents tab strip. It puts the main agent in row 0 and the live subagent / teammate / background roster in rows 1..N, all selectable with `↑`/`↓`; `↵` inspects a subagent by replaying its events into the main transcript via `buildSubagentTranscriptEvents`. Snapshots are still keyed by `agentId + parentToolUseId` and reconstructed from `subagent_*` envelopes (plus `teammate.idle` / `task.completed` for teammates) through `subagentSnapshotsFromEvents()`. Sibling subagents that share a parent tool-use id are tracked separately by counting resolved subagent ids per parent and only adopting the placeholder parent row when exactly one resolves under it. Each snapshot carries `parentToolUseId`, `turnId`, `startedAt`, `endedAt`, and a derived `durationMs` so rows show elapsed time even when the runtime did not report `usage.durationMs`. The `^a` footer toggle opens or closes the Chat Info pane.
+- **Permission modes.** The Claude picker accepts `auto` (mapped onto the SDK `permissionMode: "auto"`) in addition to `default`, `plan`, `acceptEdits`, and `bypassPermissions`. The Droid picker cycles the same ordered modes as desktop, including `agi` after the `auto-*` levels.
+- **Chat Info (subagent panel).** The right pane's Chat Info view replaces the legacy Subagents tab strip. It puts the main agent in row 0 and the live subagent / teammate / background roster in rows 1..N, all selectable with `↑`/`↓`; `↵` probes for a usable subagent transcript and only swaps the main transcript when that fetch succeeds, otherwise the local reconstruction remains visible with a notice. Snapshots are still keyed by `agentId + parentToolUseId` and reconstructed from `subagent_*` envelopes (plus `teammate.idle` / `task.completed` for teammates) through `subagentSnapshotsFromEvents()`. Sibling subagents that share a parent tool-use id are tracked separately by counting resolved subagent ids per parent and only adopting the placeholder parent row when exactly one resolves under it. Each snapshot carries `parentToolUseId`, `turnId`, `startedAt`, `endedAt`, and a derived `durationMs` so rows show elapsed time even when the runtime did not report `usage.durationMs`. The `^a` footer toggle opens or closes the Chat Info pane.
 - **Context, output styles, plugins.** `/context`, `/output-style`, and `/plugin` call `chat.getContextUsage`, `chat.listClaudeOutputStyles` / `chat.setClaudeOutputStyle`, and `chat.listClaudePlugins` / `chat.reloadClaudePlugins` against the same Claude SDK runtime the desktop chat uses.
 
 ## Chat setup
@@ -291,7 +314,7 @@ After local changes, run `npm run build` inside `apps/ade-cli` so both `dist/cli
 - `+ new chat` opens a draft setup view (`new-chat-setup`) in the right pane; it does not create a backend chat until the first prompt is sent from the middle composer.
 - The draft setup and `/model` panes carry an **Interface: Chat | CLI** row (immediately after Provider), matching the desktop/iOS Chat/CLI switcher. **Chat** creates an SDK chat via `chat.createSession` (all providers, including Claude); **CLI** starts a tracked provider CLI terminal via the `start_cli_session` action (Claude, Codex, Cursor, Droid, or OpenCode). It defaults to `chat`, is editable while the chat is a draft, and becomes read-only once a session exists (its value then reflects the session type). First-prompt submit branches on it: draft `CLI` starts a tracked terminal; otherwise an SDK chat is created. Ollama / LM Studio have no CLI and stay Chat-only.
 - `/model` opens the model setup view (`model-setup`) in the right pane. It can switch provider, model, reasoning, Fast Mode for fast-capable descriptors, and permission settings, refresh provider readiness through `ai.getStatus`, and open desktop Settings > AI Providers for full configuration. Cursor rows come from the same provider-grouped catalog as desktop, including `cursorAvailability`, so SDK chat models and Cursor CLI launch models stay separated consistently — and the picker gates Cursor availability on the selected Interface (Chat disables CLI-only Cursor models and vice versa).
-- `/login` delegates only to provider CLIs that can authenticate in the current terminal: Claude (`claude auth login`), Codex (`codex login`), and OpenCode (`opencode auth login`). Cursor chat is `@cursor/sdk` and needs `CURSOR_API_KEY` or desktop Settings > AI Providers. Droid chat runs Factory Droid over ACP and needs `FACTORY_API_KEY` or Factory's interactive `droid` login.
+- `/login` delegates only to provider CLIs that can authenticate in the current terminal: Claude (`claude auth login`), Codex (`codex login`), and OpenCode (`opencode auth login`). After a successful login for the active provider, an auth-failed latest prompt is restored into the composer with a "logged in — press Enter to resend" notice. Cursor chat is `@cursor/sdk` and needs `CURSOR_API_KEY` or desktop Settings > AI Providers. Droid chat runs Factory Droid over ACP and needs `FACTORY_API_KEY` or Factory's interactive `droid` login.
 - The middle composer shows the selected provider, model, reasoning, and permission mode under the prompt so draft changes on the right are visible before the chat starts.
 
 ## Deeplinks (`ade open` / `ade link` / `ade linear install`)

From c608bd03c014b72737c6b9e2f8c3a569d312af55 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 04:12:12 -0400
Subject: [PATCH 05/17] ade code + sync: review-wave fixups (R1-R5, T1-T2)

---
 .../src/services/sync/syncHostService.test.ts | 146 ++++++++
 .../src/services/sync/syncHostService.ts      |  87 +++--
 .../src/tuiClient/__tests__/adeApi.test.ts    |  10 +-
 .../src/tuiClient/__tests__/appInput.test.ts  |  93 ++++-
 .../tuiClient/__tests__/connection.test.ts    |  77 ++++
 .../__tests__/remoteLauncher.test.ts          |  32 ++
 apps/ade-cli/src/tuiClient/adeApi.ts          |   8 +-
 apps/ade-cli/src/tuiClient/app.tsx            | 346 ++++++++++++++----
 apps/ade-cli/src/tuiClient/connection.ts      |  43 ++-
 apps/ade-cli/src/tuiClient/remoteLauncher.ts  |  14 +-
 apps/ade-cli/src/tuiClient/types.ts           |  15 +-
 apps/desktop/src/preload/preload.test.ts      |  68 ++++
 apps/desktop/src/preload/preload.ts           |  26 +-
 13 files changed, 845 insertions(+), 120 deletions(-)

diff --git a/apps/ade-cli/src/services/sync/syncHostService.test.ts b/apps/ade-cli/src/services/sync/syncHostService.test.ts
index d8b43ffdd..623ecb0b9 100644
--- a/apps/ade-cli/src/services/sync/syncHostService.test.ts
+++ b/apps/ade-cli/src/services/sync/syncHostService.test.ts
@@ -1765,6 +1765,152 @@ describe("sync host reliability guards", () => {
       }
       await host.dispose();
       cleanup();
+    }
+	  });
+
+  it("closes peers instead of dropping project catalog chunks under backpressure", async () => {
+    const { projectRoot, cleanup } = createTempProjectRoot();
+    const host = createReliabilityHost(projectRoot);
+    let peer: Awaited<ReturnType<typeof connectPeer>> | null = null;
+    let bufferedAmountSpy: { mockRestore(): void } | null = null;
+    try {
+      const port = await host.waitUntilListening();
+      peer = await connectPeer(port, host.getBootstrapToken(), "ios-catalog-backpressure");
+      bufferedAmountSpy = vi
+        .spyOn(WebSocket.prototype, "bufferedAmount", "get")
+        .mockReturnValue(17 * 1024 * 1024);
+
+      peer.ws.send(encodeSyncEnvelope({
+        type: "project_catalog_request",
+        requestId: "catalog-backpressure",
+        payload: {},
+      }));
+
+      const closeEvent = await waitForValue(
+        () => peer?.closeEvents[0],
+        "project catalog required-send backpressure close",
+      );
+      expect(closeEvent.code).toBe(4001);
+      expect(closeEvent.reason).toBe("Required sync response backpressured");
+    } finally {
+      bufferedAmountSpy?.mockRestore();
+      try {
+        peer?.ws.close();
+      } catch {
+        // ignore
+      }
+      await host.dispose();
+      cleanup();
+    }
+  });
+
+  it("processes heartbeat pongs while a long command is still queued", async () => {
+    vi.useFakeTimers();
+    const { projectRoot, cleanup } = createTempProjectRoot();
+    const sendMessage = vi.fn((): Promise<void> => new Promise<void>(() => {}));
+    const host = createReliabilityHost(projectRoot, {
+      heartbeatIntervalMs: 5_000,
+      agentChatService: {
+        sendMessage,
+        subscribeToEvents: vi.fn(() => vi.fn()),
+      } as unknown as Parameters<typeof createSyncHostService>[0]["agentChatService"],
+    });
+    let peer: ReturnType<typeof trackClientEnvelopes> & { ws: WebSocket } | null = null;
+    const waitForTrackedEnvelope = (
+      tracked: ReturnType<typeof trackClientEnvelopes>,
+      predicate: (envelope: ParsedSyncEnvelope) => boolean,
+      _label: string,
+    ): Promise<ParsedSyncEnvelope> => {
+      const existing = tracked.envelopes.find(predicate);
+      if (existing) return Promise.resolve(existing);
+      return new Promise((resolve) => {
+        const cleanupListener = () => {
+          peer?.ws.off("message", onMessage);
+        };
+        const onMessage = () => {
+          const match = tracked.envelopes.find(predicate);
+          if (!match) return;
+          cleanupListener();
+          resolve(match);
+        };
+        peer?.ws.on("message", onMessage);
+      });
+    };
+    try {
+      const port = await host.waitUntilListening();
+      const ws = new WebSocket(`ws://127.0.0.1:${port}`);
+      const tracked = trackClientEnvelopes(ws);
+      peer = { ws, ...tracked };
+      await new Promise<void>((resolve, reject) => {
+        ws.once("open", () => resolve());
+        ws.once("error", reject);
+      });
+      const helloOk = waitForTrackedEnvelope(tracked, (envelope) => envelope.type === "hello_ok", "hello_ok");
+      ws.send(encodeSyncEnvelope({
+        type: "hello",
+        payload: {
+          peer: {
+            deviceId: "desktop-heartbeat",
+            deviceName: "Desktop heartbeat",
+            platform: "macOS",
+            deviceType: "desktop",
+            siteId: "desktop-heartbeat-site",
+            dbVersion: 0,
+          },
+          auth: { kind: "bootstrap", token: host.getBootstrapToken() },
+        },
+      }));
+      await helloOk;
+
+      const commandAck = waitForTrackedEnvelope(
+        tracked,
+        (envelope) => envelope.type === "command_ack" && envelope.requestId === "long-command",
+        "long command ack",
+      );
+      ws.send(encodeSyncEnvelope({
+        type: "command",
+        requestId: "long-command",
+        projectId: "project-1",
+        payload: {
+          commandId: "long-command",
+          action: "chat.send",
+          projectId: "project-1",
+          args: {
+            sessionId: "session-1",
+            text: "hello",
+          },
+        },
+      }));
+      await commandAck;
+
+      const ping = waitForTrackedEnvelope(
+        tracked,
+        (envelope) => envelope.type === "heartbeat" && (envelope.payload as { kind?: string } | null)?.kind === "ping",
+        "heartbeat ping",
+      );
+      await vi.advanceTimersByTimeAsync(5_000);
+      const pingEnvelope = await ping;
+      ws.send(encodeSyncEnvelope({
+        type: "heartbeat",
+        payload: {
+          kind: "pong",
+          sentAt: (pingEnvelope.payload as { sentAt?: string }).sentAt,
+        },
+      }));
+
+      await vi.advanceTimersByTimeAsync(10_000);
+      await Promise.resolve();
+      expect(tracked.closeEvents).toEqual([]);
+      expect(sendMessage).toHaveBeenCalledTimes(1);
+    } finally {
+      try {
+        peer?.ws.close();
+      } catch {
+        // ignore
+      }
+      await host.dispose();
+      cleanup();
+      vi.useRealTimers();
     }
   });
 
diff --git a/apps/ade-cli/src/services/sync/syncHostService.ts b/apps/ade-cli/src/services/sync/syncHostService.ts
index cd3df312a..3518f59e5 100644
--- a/apps/ade-cli/src/services/sync/syncHostService.ts
+++ b/apps/ade-cli/src/services/sync/syncHostService.ts
@@ -6,7 +6,7 @@ import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
 import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
 import { Bonjour, type Service as BonjourService } from "bonjour-service";
-import { WebSocketServer, WebSocket, type RawData } from "ws";
+import { WebSocketServer, WebSocket } from "ws";
 import { resolveAdeLayout } from "../../../../desktop/src/shared/adeLayout";
 import type {
   AgentChatEventEnvelope,
@@ -105,7 +105,7 @@ import type { DeviceRegistryService } from "./deviceRegistryService";
 import { createSyncPairingStore, type SyncPairingRecord } from "./syncPairingStore";
 import type { SyncPinStore } from "./syncPinStore";
 import type { SyncRuntimeNameStore } from "./syncRuntimeNameStore";
-import { DEFAULT_SYNC_COMPRESSION_THRESHOLD_BYTES, DEFAULT_SYNC_HOST_PORT, DEFAULT_SYNC_MAX_FRAME_BYTES, encodeSyncEnvelope, encodeSyncEnvelopeFrames, mapPlatform, parseSyncEnvelope, SYNC_CHUNKED_ENVELOPES_CAPABILITY, wsDataToText } from "./syncProtocol";
+import { DEFAULT_SYNC_COMPRESSION_THRESHOLD_BYTES, DEFAULT_SYNC_HOST_PORT, DEFAULT_SYNC_MAX_FRAME_BYTES, encodeSyncEnvelope, encodeSyncEnvelopeFrames, mapPlatform, parseSyncEnvelope, SYNC_CHUNKED_ENVELOPES_CAPABILITY, wsDataToText, type ParsedSyncEnvelope } from "./syncProtocol";
 import { resolveTailscaleCliPath } from "./resolveTailscaleCliPath";
 import { createSyncRemoteCommandService, type SyncRemoteCommandService } from "./syncRemoteCommandService";
 import {
@@ -1846,9 +1846,20 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
     }, authTimeoutMs);
     peer.authTimeout.unref?.();
     ws.on("message", (raw) => {
+      let envelope: ParsedSyncEnvelope;
+      try {
+        envelope = parseSyncEnvelope(wsDataToText(raw));
+      } catch (error) {
+        args.logger.warn("sync_host.message_parse_failed", {
+          error: error instanceof Error ? error.message : String(error),
+          peerDeviceId: peer.metadata?.deviceId ?? null,
+        });
+        return;
+      }
+      if (handleImmediateControlEnvelope(peer, envelope)) return;
       peer.messageQueue = peer.messageQueue
         .catch(() => {})
-        .then(() => handleMessage(peer, raw))
+        .then(() => handleMessage(peer, envelope))
         .catch((error) => {
           args.logger.warn("sync_host.message_failed", {
             error: error instanceof Error ? error.message : String(error),
@@ -2720,16 +2731,16 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
     peer: PeerState,
     projectCatalog: SyncProjectCatalogPayload,
     requestId?: string | null,
-  ): void {
-    for (const message of buildSyncProjectCatalogMessages({
-      projectCatalog,
-      requestId,
-      compressionThresholdBytes,
-      maxProjectCatalogEnvelopeBytes,
-    })) {
-      send(peer.ws, message.type, message.payload, message.requestId);
-    }
-  }
+	  ): void {
+	    for (const message of buildSyncProjectCatalogMessages({
+	      projectCatalog,
+	      requestId,
+	      compressionThresholdBytes,
+	      maxProjectCatalogEnvelopeBytes,
+	    })) {
+	      if (!sendRequired(peer, message.type, message.payload, message.requestId)) break;
+	    }
+	  }
 
   async function handleProjectSwitchRequest(
     peer: PeerState,
@@ -3875,13 +3886,43 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
     }
   }
 
-  async function handleMessage(peer: PeerState, raw: RawData): Promise<void> {
-    const rawText = wsDataToText(raw);
-    const envelope = parseSyncEnvelope(rawText);
+  function markPeerMessageSeen(peer: PeerState): string | null {
     const heartbeatAwaitedAt = peer.awaitingHeartbeatAt;
     peer.lastSeenAt = nowIso();
     peer.awaitingHeartbeatAt = null;
     peer.missedHeartbeatCount = 0;
+    return heartbeatAwaitedAt;
+  }
+
+  function handleHeartbeatEnvelope(
+    peer: PeerState,
+    envelope: ParsedSyncEnvelope,
+    heartbeatAwaitedAt: string | null,
+  ): void {
+    const payload = envelope.payload as { kind?: string; sentAt?: string } | null;
+    if (payload?.kind === "ping") {
+      send(peer.ws, "heartbeat", {
+        kind: "pong",
+        sentAt: payload.sentAt ?? nowIso(),
+        dbVersion: args.db.sync.getDbVersion(),
+      }, envelope.requestId);
+    } else if (payload?.kind === "pong" && heartbeatAwaitedAt) {
+      const now = Date.now();
+      const sentAtMs = Date.parse(heartbeatAwaitedAt);
+      peer.latencyMs = Number.isFinite(sentAtMs) ? Math.max(0, now - sentAtMs) : null;
+      peer.awaitingHeartbeatAt = null;
+    }
+  }
+
+  function handleImmediateControlEnvelope(peer: PeerState, envelope: ParsedSyncEnvelope): boolean {
+    if (!peer.authenticated || envelope.type !== "heartbeat") return false;
+    const heartbeatAwaitedAt = markPeerMessageSeen(peer);
+    handleHeartbeatEnvelope(peer, envelope, heartbeatAwaitedAt);
+    return true;
+  }
+
+  async function handleMessage(peer: PeerState, envelope: ParsedSyncEnvelope): Promise<void> {
+    const heartbeatAwaitedAt = markPeerMessageSeen(peer);
 
     if (!peer.authenticated) {
       if (envelope.type !== "hello" && envelope.type !== "pairing_request") {
@@ -4155,19 +4196,7 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
         break;
       }
       case "heartbeat": {
-        const payload = envelope.payload as { kind?: string; sentAt?: string } | null;
-        if (payload?.kind === "ping") {
-          send(peer.ws, "heartbeat", {
-            kind: "pong",
-            sentAt: payload.sentAt ?? nowIso(),
-            dbVersion: args.db.sync.getDbVersion(),
-          }, envelope.requestId);
-        } else if (payload?.kind === "pong" && heartbeatAwaitedAt) {
-          const now = Date.now();
-          const sentAtMs = Date.parse(heartbeatAwaitedAt);
-          peer.latencyMs = Number.isFinite(sentAtMs) ? Math.max(0, now - sentAtMs) : null;
-          peer.awaitingHeartbeatAt = null;
-        }
+        handleHeartbeatEnvelope(peer, envelope, heartbeatAwaitedAt);
         break;
       }
       case "changeset_batch": {
diff --git a/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts b/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts
index a0d639db2..7a7a5db8d 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/adeApi.test.ts
@@ -433,7 +433,7 @@ describe("discoverProjectSlashCommands", () => {
 });
 
 describe("getAvailableModels", () => {
-  it("activates dynamic Cursor model discovery for TUI model lists", async () => {
+  it("sources Cursor model discovery from the active TUI interface", async () => {
     const calls: Array<{ domain: string; action: string; args?: Record<string, unknown> }> = [];
     const connection = {
       action: vi.fn(async (domain: string, action: string, args?: Record<string, unknown>) => {
@@ -443,15 +443,19 @@ describe("getAvailableModels", () => {
     } as any;
 
     await getAvailableModels(connection, "cursor");
+    await getAvailableModels(connection, "cursor", { interfaceMode: "cli" });
 
     expect(calls).toEqual([
       {
         domain: "chat",
         action: "getAvailableModels",
-        // TUI chats run cursor through the SDK, so only that source is probed
-        // synchronously; the CLI flavor revalidates in the background on the host.
         args: { provider: "cursor", activateRuntime: true, cursorSource: "sdk" },
       },
+      {
+        domain: "chat",
+        action: "getAvailableModels",
+        args: { provider: "cursor", activateRuntime: true, cursorSource: "cli" },
+      },
     ]);
   });
 });
diff --git a/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts b/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
index 32dd214ee..30e3efd12 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
@@ -87,6 +87,9 @@ import {
   mergeOptimisticTerminalSessions,
   promptTextForTerminal,
   clipboardImageCacheRootForRuntime,
+  cursorSourceForInterfaceMode,
+  reconcileCursorModelStateForInterface,
+  resolveCursorCliModelForLaunch,
   uploadClipboardImageAttachmentToRuntime,
 } from "../app";
 import {
@@ -99,13 +102,37 @@ import {
 } from "../bracketedPaste";
 import { clampTerminalPaneCols } from "../components/TerminalPane";
 import { clipboardScratchDir } from "../imageTargets";
-import type { AdeCodeConnection, ChatInfoSnapshot, LocalNotice, RightPaneContent } from "../types";
+import type { AdeCodeConnection, AdeCodeModelState, ChatInfoSnapshot, LocalNotice, RightPaneContent } from "../types";
 import { resolveSubagentCapability } from "../../../../desktop/src/shared/subagentCapabilities";
-import type { AgentChatEventEnvelope, AgentChatSession, AgentChatSessionSummary } from "../../../../desktop/src/shared/types/chat";
+import type { AgentChatEventEnvelope, AgentChatModelInfo, AgentChatSession, AgentChatSessionSummary } from "../../../../desktop/src/shared/types/chat";
 import type { LaneSummary } from "../../../../desktop/src/shared/types/lanes";
 import type { ChatTerminalSession } from "../../../../desktop/src/shared/types/sessions";
 import type { ChatTerminalPreviewResult } from "../../../../desktop/src/shared/types";
 
+function cursorModelState(overrides: Partial<AdeCodeModelState> = {}): AdeCodeModelState {
+  return {
+    provider: "cursor",
+    interfaceMode: "chat",
+    model: "sdk-only",
+    modelId: "cursor/sdk-only",
+    displayName: "SDK only",
+    reasoningEffort: null,
+    fastMode: false,
+    permissionMode: "default",
+    interactionMode: "default",
+    claudePermissionMode: "default",
+    codexApprovalPolicy: "never",
+    codexSandbox: "workspace-write",
+    codexConfigSource: "config-toml",
+    opencodePermissionMode: "edit",
+    droidPermissionMode: "auto-low",
+    cursorModeId: "agent",
+    cursorAvailableModeIds: ["agent"],
+    cursorConfigValues: {},
+    ...overrides,
+  };
+}
+
 describe("session activity helpers", () => {
   it("keeps Ink output below the terminal height to avoid full-screen clears", () => {
     expect(stableInkViewportRows(40)).toBe(39);
@@ -1457,6 +1484,10 @@ describe("prompt editing helpers", () => {
     expect(movePromptCursorVertical("abcdef", 3, 1, 1)).toBe(4);
     expect(movePromptCursorVertical("abcdef", 3, 4, -1)).toBe(1);
     expect(movePromptCursorVertical("abc", 3, 3, 1)).toBe(3);
+    expect(movePromptCursorVertical("a界bcde", 4, 2, 1)).toBe(6);
+    expect(movePromptCursorVertical("a界bcde", 4, 6, -1)).toBe(2);
+    expect(movePromptCursorVertical("a🙂bcde", 4, 3, 1)).toBe(7);
+    expect(movePromptCursorVertical("a🙂bcde", 4, 7, -1)).toBe(3);
   });
 
   it("detects prompt visual-row edges for attachment and model-row navigation", () => {
@@ -1494,6 +1525,64 @@ describe("prompt editing helpers", () => {
     expect(emoji.rows[0]).toEqual({ text: "a🙂b", start: 0, end: 4, cursorColumn: 3 });
     expect(emoji.rows[1]).toEqual({ text: "c", start: 4, end: 5, cursorColumn: null });
   });
+
+  it("sources and validates Cursor models by TUI interface", () => {
+    const sdkOnly: AgentChatModelInfo = {
+      id: "cursor/sdk-only",
+      modelId: "cursor/sdk-only",
+      displayName: "SDK only",
+      isDefault: true,
+      cursorAvailability: { sdk: true, cli: false },
+    };
+    const cliOnly: AgentChatModelInfo = {
+      id: "cursor/cli-only",
+      modelId: "cursor/cli-only",
+      displayName: "CLI only",
+      isDefault: false,
+      cursorAvailability: { sdk: false, cli: true },
+      cursorCliVariants: [{ modelId: "cli-only-default" }],
+    };
+    const cliReady: AgentChatModelInfo = {
+      id: "cursor/cli-ready",
+      modelId: "cursor/cli-ready",
+      displayName: "CLI ready",
+      isDefault: false,
+      reasoningEfforts: [{ effort: "high", description: "High" }],
+      cursorAvailability: { sdk: true, cli: true },
+      cursorCliVariants: [
+        { modelId: "cli-ready-default" },
+        { modelId: "cli-ready-high", reasoningEffort: "high" },
+      ],
+    };
+
+    expect(cursorSourceForInterfaceMode("chat")).toBe("sdk");
+    expect(cursorSourceForInterfaceMode("cli")).toBe("cli");
+
+    const toggled = reconcileCursorModelStateForInterface(
+      cursorModelState(),
+      "cli",
+      [sdkOnly, cliOnly],
+    );
+    expect(toggled).toMatchObject({
+      interfaceMode: "cli",
+      modelId: "cursor/cli-only",
+      model: "cli-only-default",
+      displayName: "CLI only",
+    });
+
+    expect(() => resolveCursorCliModelForLaunch(cursorModelState(), [sdkOnly]))
+      .toThrow(/available for chat only/i);
+    expect(resolveCursorCliModelForLaunch(
+      cursorModelState({
+        interfaceMode: "cli",
+        model: "cli-ready",
+        modelId: "cursor/cli-ready",
+        displayName: "CLI ready",
+        reasoningEffort: "high",
+      }),
+      [cliReady],
+    )).toBe("cli-ready-high");
+  });
 });
 
 describe("optimistic chat summaries", () => {
diff --git a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
index 4b84898fb..07d6969b6 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
@@ -469,6 +469,83 @@ describe("connectToAde embedded mode", () => {
       serverSocketRef.current?.destroy();
       await new Promise<void>((resolve) => server.close(() => resolve()));
       fs.rmSync(tmpDir, { recursive: true, force: true });
+    }
+	  });
+
+  it("surfaces runtime event replay gaps to subscribers", async () => {
+    const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-connection-gap-"));
+    const socketPath = path.join(tmpDir, "ade.sock");
+    const server = net.createServer((socket) => {
+      let buffer = "";
+      socket.on("error", () => {});
+      socket.on("data", (chunk) => {
+        buffer += chunk.toString("utf8");
+        while (true) {
+          const newline = buffer.indexOf("\n");
+          if (newline < 0) return;
+          const line = buffer.slice(0, newline).trim();
+          buffer = buffer.slice(newline + 1);
+          if (!line) continue;
+          const request = JSON.parse(line) as { id: number; method: string; params?: Record<string, unknown> };
+          const result = (() => {
+            if (request.method === "ade/initialize") {
+              return {
+                runtimeInfo: { multiProject: true, defaultRole: "cto" },
+                capabilities: { projects: true },
+              };
+            }
+            if (request.method === "projects.add") {
+              return { projectId: "project-daemon", rootPath: project.projectRoot };
+            }
+            if (request.method === "runtimeEvents.subscribe") {
+              return {
+                subscriptionId: "runtime-sub-gap",
+                gap: true,
+                oldestCursor: 12,
+                nextCursor: 90,
+              };
+            }
+            if (request.method === "runtimeEvents.unsubscribe") {
+              return { removed: true };
+            }
+            return null;
+          })();
+          if (!socket.destroyed && socket.writable) {
+            socket.write(`${JSON.stringify({ jsonrpc: "2.0", id: request.id, result })}\n`);
+          }
+        }
+      });
+    });
+    await new Promise<void>((resolve) => server.listen(socketPath, resolve));
+
+    const connection = await connectToAde({
+      project,
+      socketPath,
+    });
+    try {
+      const gaps: unknown[] = [];
+      const callback = vi.fn();
+      const unsubscribe = await connection.subscribeRuntimeEvents(
+        {
+          category: "runtime",
+          cursor: 50,
+          limit: 10,
+          onGap: (gap) => gaps.push(gap),
+        },
+        callback,
+      );
+      expect(gaps).toEqual([{
+        gap: true,
+        oldestCursor: 12,
+        nextCursor: 90,
+        subscriptionId: "runtime-sub-gap",
+      }]);
+      expect(callback).not.toHaveBeenCalled();
+      unsubscribe();
+    } finally {
+      await connection.close();
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+      fs.rmSync(tmpDir, { recursive: true, force: true });
     }
   });
 
diff --git a/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts b/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts
index af8ecedc7..7eb0df1be 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts
@@ -1,13 +1,23 @@
+import { EventEmitter } from "node:events";
+import { PassThrough } from "node:stream";
 import { describe, expect, it, vi } from "vitest";
 import {
   buildRemoteRuntimeRpcCommand,
   listRemoteSessions,
   parseRemoteAdeCodeArgs,
+  ProcessJsonRpcClient,
   remoteRuntimeLayoutCandidates,
   selectProject,
   takeAdeCodeRemoteArgs,
 } from "../remoteLauncher";
 
+class FakeRemoteRpcChild extends EventEmitter {
+  readonly stdout = new PassThrough();
+  readonly stderr = new PassThrough();
+  readonly stdin = new PassThrough();
+  readonly kill = vi.fn();
+}
+
 describe("ade code remote launcher", () => {
   it("detects remote as the first standalone ade code positional", () => {
     expect(takeAdeCodeRemoteArgs(["remote", "session", "--target", "mac"])).toEqual([
@@ -54,6 +64,28 @@ describe("ade code remote launcher", () => {
     expect(buildRemoteRuntimeRpcCommand(layout)).toContain("exec $HOME/.ade-beta/bin/ade --socket $HOME/.ade-beta/sock/ade.sock rpc --stdio");
   });
 
+  it("clears pending RPC timers when remote responses resolve or reject", async () => {
+    const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
+    const child = new FakeRemoteRpcChild();
+    const client = new ProcessJsonRpcClient(child as never);
+
+    const resolved = client.request("ade/ping");
+    child.stdout.write(`${JSON.stringify({ jsonrpc: "2.0", id: 1, result: { ok: true } })}\n`);
+    await expect(resolved).resolves.toEqual({ ok: true });
+
+    const rejected = client.request("ade/fail");
+    child.stdout.write(`${JSON.stringify({
+      jsonrpc: "2.0",
+      id: 2,
+      error: { code: -32000, message: "remote failed" },
+    })}\n`);
+    await expect(rejected).rejects.toThrow("remote failed");
+
+    expect(clearTimeoutSpy).toHaveBeenCalledTimes(2);
+    client.close();
+    clearTimeoutSpy.mockRestore();
+  });
+
   it("attaches to stable remote runtimes without repairing or installing services", () => {
     const layout: Parameters<typeof buildRemoteRuntimeRpcCommand>[0] = {
       channel: null,
diff --git a/apps/ade-cli/src/tuiClient/adeApi.ts b/apps/ade-cli/src/tuiClient/adeApi.ts
index cb3fd2977..37959ac91 100644
--- a/apps/ade-cli/src/tuiClient/adeApi.ts
+++ b/apps/ade-cli/src/tuiClient/adeApi.ts
@@ -57,7 +57,7 @@ import type {
   TerminalSessionSummary,
 } from "../../../desktop/src/shared/types";
 import { discoverAllProjectSlashCommands } from "../../../desktop/src/main/services/chat/projectSlashCommandDiscovery";
-import type { AdeCodeConnection, AdeCodeProvider, ChatHistorySnapshot, CreatedChat, NavigateRequest, NavigateResult } from "./types";
+import type { AdeCodeConnection, AdeCodeInterfaceMode, AdeCodeProvider, ChatHistorySnapshot, CreatedChat, NavigateRequest, NavigateResult } from "./types";
 
 export const DEFAULT_CODEX_REASONING_EFFORT = "low";
 
@@ -448,7 +448,9 @@ export function discoverProjectSlashCommands(workspaceRoot: string): AgentChatSl
 export async function getAvailableModels(
   connection: AdeCodeConnection,
   provider: AgentChatProvider,
+  options: { interfaceMode?: AdeCodeInterfaceMode } = {},
 ): Promise<AgentChatModelInfo[]> {
+  const cursorSource = options.interfaceMode === "cli" ? "cli" : "sdk";
   return await connection.action<AgentChatModelInfo[]>("chat", "getAvailableModels", {
     provider,
     // Cursor needs a live probe for SDK/CLI service tiers. Droid is also probed
@@ -457,9 +459,7 @@ export async function getAvailableModels(
     // Codex is intentionally NOT here: its tiers come from the app-server, which
     // loadAvailableModels always queries regardless of activateRuntime.
     activateRuntime: provider === "cursor" || provider === "droid",
-    // TUI chats run cursor models through the SDK; probing only that source
-    // keeps the picker refresh off the slower cursor-agent CLI spawn.
-    ...(provider === "cursor" ? { cursorSource: "sdk" } : {}),
+    ...(provider === "cursor" ? { cursorSource } : {}),
   });
 }
 
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index c005ecc5a..edcdeefe6 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -10,8 +10,10 @@ import {
   getRuntimeModelRefForDescriptor,
   listModelDescriptorsForProvider,
   modelSupportsFastMode,
+  resolveCursorCliModelVariant,
   resolveModelDescriptor,
   resolveProviderGroupForModel,
+  type ModelDescriptor,
   type ModelProviderGroup,
 } from "../../../desktop/src/shared/modelRegistry";
 import { LAUNCH_PROFILE_TITLE, LAUNCH_PROFILE_TOOL_TYPE, resolveClaudeCliModelForLaunch } from "../../../desktop/src/shared/cliLaunch";
@@ -25,10 +27,10 @@ import type {
   AgentChatReloadClaudePluginsResult,
 	  AgentChatEventEnvelope,
 	  AgentChatFileRef,
-	  AgentChatModelCatalog,
-	  AgentChatModelCatalogModel,
-	  AgentChatModelCatalogRefreshProvider,
-	  AgentChatModelInfo,
+		  AgentChatModelCatalog,
+		  AgentChatModelCatalogModel,
+		  AgentChatModelCatalogRefreshProvider,
+		  AgentChatModelInfo,
   AgentChatPermissionMode,
   AgentChatProvider,
   AgentChatSession,
@@ -181,6 +183,7 @@ import {
   type BracketedPasteState,
 } from "./bracketedPaste";
 import {
+  codeUnitIndexForDisplayCell,
   displayCellForCodeUnitIndex,
   displayClusters,
   splitByDisplayCells,
@@ -997,6 +1000,44 @@ function modelInfoSupportsFastMode(model: AgentChatModelInfo | null | undefined)
     || modelSupportsFastMode(descriptor);
 }
 
+function cursorDescriptorForModelInfo(model: AgentChatModelInfo | null | undefined): ModelDescriptor | undefined {
+  const modelId = model?.modelId ?? model?.id;
+  return modelId ? getModelById(modelId) : undefined;
+}
+
+function cursorAvailabilityForModel(
+  model: AgentChatModelInfo | null | undefined,
+  descriptor = cursorDescriptorForModelInfo(model),
+): { cli: boolean; sdk: boolean } | null {
+  return model?.cursorAvailability ?? descriptor?.cursorAvailability ?? null;
+}
+
+export function cursorModelAvailableForInterface(
+  model: AgentChatModelInfo | null | undefined,
+  interfaceMode: AdeCodeInterfaceMode,
+): boolean {
+  const descriptor = cursorDescriptorForModelInfo(model);
+  if (descriptor?.family !== "cursor" && model?.family !== "cursor") return true;
+  const availability = cursorAvailabilityForModel(model, descriptor);
+  if (!availability) return false;
+  return interfaceMode === "cli" ? availability.cli === true : availability.sdk === true;
+}
+
+export function cursorSourceForInterfaceMode(interfaceMode: AdeCodeInterfaceMode): "sdk" | "cli" {
+  return interfaceMode === "cli" ? "cli" : "sdk";
+}
+
+function providerModelsCacheKey(provider: AdeCodeProvider, interfaceMode: AdeCodeInterfaceMode): string {
+  return provider === "cursor" ? `cursor:${cursorSourceForInterfaceMode(interfaceMode)}` : provider;
+}
+
+function modelCatalogRefreshCacheKey(
+  provider: AgentChatModelCatalogRefreshProvider,
+  cursorSource?: "sdk" | "cli",
+): string {
+  return provider === "cursor" ? `cursor:${cursorSource ?? "sdk"}` : provider;
+}
+
 function fallbackModelStatePatch(provider: AdeCodeProvider): Pick<AdeCodeModelState, "provider" | "model" | "modelId" | "displayName" | "reasoningEffort"> {
   const registryProvider = provider === "ollama" || provider === "lmstudio" ? "opencode" : provider;
   const descriptor = getDefaultModelDescriptor(registryProvider)
@@ -1019,10 +1060,112 @@ function registryModelsForProvider(provider: AdeCodeProvider): AgentChatModelInf
     id: descriptor.id,
     modelId: descriptor.id,
     displayName: descriptor.displayName,
-    isDefault: descriptor.id === getDefaultModelDescriptor(provider)?.id,
-    reasoningEfforts: descriptor.reasoningTiers?.map((effort) => ({ effort, description: effort })),
-    ...(descriptor.serviceTiers?.length ? { serviceTiers: descriptor.serviceTiers } : {}),
-  }));
+	    isDefault: descriptor.id === getDefaultModelDescriptor(provider)?.id,
+	    reasoningEfforts: descriptor.reasoningTiers?.map((effort) => ({ effort, description: effort })),
+	    ...(descriptor.serviceTiers?.length ? { serviceTiers: descriptor.serviceTiers } : {}),
+	    ...(descriptor.cursorAvailability ? { cursorAvailability: descriptor.cursorAvailability } : {}),
+	    ...(descriptor.cursorCliVariants?.length ? { cursorCliVariants: descriptor.cursorCliVariants } : {}),
+	  }));
+	}
+
+function compatibleCursorModelForInterface(
+  models: readonly AgentChatModelInfo[],
+  interfaceMode: AdeCodeInterfaceMode,
+): AgentChatModelInfo | null {
+  const compatible = models.filter((model) => cursorModelAvailableForInterface(model, interfaceMode));
+  return compatible.find((model) => model.isDefault) ?? compatible[0] ?? null;
+}
+
+function modelInfoMatchesModelState(model: AgentChatModelInfo, state: AdeCodeModelState): boolean {
+  const selected = (state.modelId ?? state.model).trim().toLowerCase();
+  if (!selected) return false;
+  return [model.id, model.modelId, ...(model.aliases ?? [])]
+    .filter((value): value is string => typeof value === "string")
+    .some((value) => value.trim().toLowerCase() === selected);
+}
+
+export function reconcileCursorModelStateForInterface(
+  state: AdeCodeModelState,
+  interfaceMode: AdeCodeInterfaceMode,
+  models: readonly AgentChatModelInfo[],
+): AdeCodeModelState {
+  if (state.provider !== "cursor") return { ...state, interfaceMode };
+  const currentModel = models.find((model) => modelInfoMatchesModelState(model, state)) ?? null;
+  const descriptor = state.modelId ? getModelById(state.modelId) : undefined;
+  const availability = cursorAvailabilityForModel(currentModel, descriptor);
+  const currentAllowed = availability
+    ? (interfaceMode === "cli" ? availability.cli === true : availability.sdk === true)
+    : false;
+  if (currentAllowed && descriptor?.family === "cursor") {
+    const supportsFast = modelSupportsFastMode(descriptor);
+    return {
+      ...state,
+      interfaceMode,
+      model: interfaceMode === "cli"
+        ? resolveCursorCliModelVariant(descriptor, {
+            reasoningEffort: state.reasoningEffort,
+            fastMode: supportsFast && state.fastMode,
+          })
+        : getRuntimeModelRefForDescriptor(descriptor, "cursor"),
+      fastMode: supportsFast ? state.fastMode : false,
+    };
+  }
+  if (currentAllowed) return { ...state, interfaceMode };
+  const fallback = compatibleCursorModelForInterface(models, interfaceMode);
+  if (!fallback) {
+    return {
+      ...state,
+      interfaceMode,
+      model: "",
+      modelId: null,
+      displayName: providerLabel("cursor"),
+      reasoningEffort: null,
+      fastMode: false,
+    };
+  }
+  const patch = modelStatePatchForModel("cursor", fallback);
+  const fallbackDescriptor = patch.modelId ? getModelById(patch.modelId) : undefined;
+  const launchDescriptor = fallbackDescriptor?.family === "cursor" && fallback.cursorCliVariants?.length
+    ? { ...fallbackDescriptor, cursorCliVariants: fallback.cursorCliVariants }
+    : fallbackDescriptor;
+  const supportsFast = modelInfoSupportsFastMode(fallback);
+  return {
+    ...state,
+    ...patch,
+    interfaceMode,
+    model: interfaceMode === "cli" && launchDescriptor?.family === "cursor"
+      ? resolveCursorCliModelVariant(launchDescriptor, {
+          reasoningEffort: patch.reasoningEffort,
+          fastMode: supportsFast && state.fastMode,
+        })
+      : patch.model,
+    fastMode: supportsFast ? state.fastMode : false,
+  };
+}
+
+export function resolveCursorCliModelForLaunch(
+  state: AdeCodeModelState,
+  models: readonly AgentChatModelInfo[] = [],
+): string {
+  const modelId = (state.modelId ?? state.model).trim();
+  if (!modelId) throw new Error("Choose a Cursor CLI model before launching a CLI session.");
+  const modelInfo = models.find((model) => modelInfoMatchesModelState(model, state)) ?? null;
+  const descriptor = getModelById(modelId);
+  const availability = cursorAvailabilityForModel(modelInfo, descriptor);
+  if (!availability?.cli) {
+    throw new Error("This Cursor model is available for chat only. Choose a Cursor CLI model for a CLI session.");
+  }
+  if (descriptor?.family === "cursor") {
+    const launchDescriptor = modelInfo?.cursorCliVariants?.length
+      ? { ...descriptor, cursorCliVariants: modelInfo.cursorCliVariants }
+      : descriptor;
+    const supportsFast = modelSupportsFastMode(launchDescriptor);
+    return resolveCursorCliModelVariant(launchDescriptor, {
+      reasoningEffort: state.reasoningEffort,
+      fastMode: supportsFast && state.fastMode,
+    });
+  }
+  return modelId.toLowerCase().startsWith("cursor/") ? modelId.slice("cursor/".length) : modelId;
 }
 
 function modelReasoningEfforts(modelState: AdeCodeModelState, models: AgentChatModelInfo[]): string[] {
@@ -2342,9 +2485,9 @@ export function movePromptCursorVertical(value: string, width: number, cursor: n
   if (!row) return safeCursor;
   const target = rows[rowIndex + delta];
   if (!target) return safeCursor;
-  const column = Math.max(0, Math.min([...row.text].length, [...value.slice(row.start, safeCursor)].length));
-  const targetPrefix = [...target.text].slice(0, column).join("");
-  return Math.max(target.start, Math.min(target.end, target.start + targetPrefix.length));
+  const column = displayCellForCodeUnitIndex(row.text, safeCursor - row.start);
+  const targetOffset = codeUnitIndexForDisplayCell(target.text, column);
+  return Math.max(target.start, Math.min(target.end, target.start + targetOffset));
 }
 
 export function isPromptCursorOnFirstVisualRow(value: string, width: number, cursor: number): boolean {
@@ -3008,6 +3151,9 @@ function modelInfoFromDescriptor(modelRef: string): AgentChatModelInfo | null {
     displayName: descriptor.displayName,
     isDefault: false,
     reasoningEfforts: descriptor.reasoningTiers?.map((effort) => ({ effort, description: effort })),
+    ...(descriptor.serviceTiers?.length ? { serviceTiers: descriptor.serviceTiers } : {}),
+    ...(descriptor.cursorAvailability ? { cursorAvailability: descriptor.cursorAvailability } : {}),
+    ...(descriptor.cursorCliVariants?.length ? { cursorCliVariants: descriptor.cursorCliVariants } : {}),
   };
 }
 
@@ -3378,9 +3524,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const olderSnapshotBufferBySessionIdRef = useRef<Record<string, AgentChatEventEnvelope[]>>({});
   // Render mirror of the cursor for the "↑ loading earlier…" indicator.
   const [olderHistoryStatusBySessionId, setOlderHistoryStatusBySessionId] = useState<Record<string, "loading" | "available" | "exhausted">>({});
-	  const providerModelsCacheRef = useRef<Map<AdeCodeProvider, AgentChatModelInfo[]>>(new Map());
+	  const providerModelsCacheRef = useRef<Map<string, AgentChatModelInfo[]>>(new Map());
 	  const modelCatalogRef = useRef<AgentChatModelCatalog | null>(null);
-	  const modelCatalogProviderRefreshedAtRef = useRef<Map<AgentChatModelCatalogRefreshProvider, number>>(new Map());
+		  const modelCatalogProviderRefreshedAtRef = useRef<Map<string, number>>(new Map());
   const pendingModelCommitTimerRef = useRef<NodeJS.Timeout | null>(null);
   const pendingModelCommitStateRef = useRef<AdeCodeModelState | null>(null);
 
@@ -6146,14 +6292,16 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     setAiStatusCheckedAt(new Date().toISOString());
   }, []);
 
-	  const loadProviderModels = useCallback(async (provider: AdeCodeProvider, options: { applyDefault?: boolean; force?: boolean } = {}) => {
+	  const loadProviderModels = useCallback(async (provider: AdeCodeProvider, options: { applyDefault?: boolean; force?: boolean; interfaceMode?: AdeCodeInterfaceMode } = {}) => {
     const conn = connectionRef.current;
-    const cached = providerModelsCacheRef.current.get(provider);
+    const interfaceMode = options.interfaceMode ?? modelStateRef.current.interfaceMode;
+    const cacheKey = providerModelsCacheKey(provider, interfaceMode);
+    const cached = providerModelsCacheRef.current.get(cacheKey);
     let nextModels = cached ?? registryModelsForProvider(provider);
     if (options.force === true || !cached) {
       try {
-        nextModels = conn ? await getAvailableModels(conn, provider) : registryModelsForProvider(provider);
-        providerModelsCacheRef.current.set(provider, nextModels);
+        nextModels = conn ? await getAvailableModels(conn, provider, { interfaceMode }) : registryModelsForProvider(provider);
+        providerModelsCacheRef.current.set(cacheKey, nextModels);
       } catch {
         nextModels = cached ?? registryModelsForProvider(provider);
       }
@@ -6178,41 +6326,44 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
 	  const refreshModelCatalog = useCallback(async (options: { refreshProvider?: AgentChatModelCatalogRefreshProvider } = {}) => {
 	    const conn = connectionRef.current;
 	    if (!conn) return modelCatalogRef.current;
-	    if (!options.refreshProvider && modelCatalogRef.current) {
-	      setModelCatalog(modelCatalogRef.current);
-	      return modelCatalogRef.current;
-	    }
-	    if (options.refreshProvider && modelCatalogRef.current) {
-	      const refreshedAt = modelCatalogProviderRefreshedAtRef.current.get(options.refreshProvider);
-	      if (refreshedAt && Date.now() - refreshedAt <= modelCatalogClientRefreshTtlMs(options.refreshProvider)) {
-	        setModelCatalog(modelCatalogRef.current);
-	        return modelCatalogRef.current;
-	      }
-	    }
-	    try {
+		    if (!options.refreshProvider && modelCatalogRef.current) {
+		      setModelCatalog(modelCatalogRef.current);
+		      return modelCatalogRef.current;
+		    }
+		    const cursorSource = options.refreshProvider === "cursor"
+		      ? cursorSourceForInterfaceMode(modelStateRef.current.interfaceMode)
+		      : undefined;
+		    const refreshCacheKey = options.refreshProvider
+		      ? modelCatalogRefreshCacheKey(options.refreshProvider, cursorSource)
+		      : null;
+		    if (options.refreshProvider && modelCatalogRef.current) {
+		      const refreshedAt = refreshCacheKey ? modelCatalogProviderRefreshedAtRef.current.get(refreshCacheKey) : undefined;
+		      if (refreshedAt && Date.now() - refreshedAt <= modelCatalogClientRefreshTtlMs(options.refreshProvider)) {
+		        setModelCatalog(modelCatalogRef.current);
+		        return modelCatalogRef.current;
+		      }
+		    }
+		    try {
 	      const catalog = await getModelCatalog(conn, {
 	        mode: options.refreshProvider ? "refresh-stale" : "cached",
 	        ...(options.refreshProvider ? { refreshProvider: options.refreshProvider } : {}),
-	        // TUI chats run cursor models through the SDK; refreshing only that
-	        // source keeps the catalog probe off the slower host cursor-agent CLI
-	        // spawn (mirrors getAvailableModels and the desktop ModelPicker).
-	        ...(options.refreshProvider === "cursor" ? { cursorSource: "sdk" as const } : {}),
+	        ...(cursorSource ? { cursorSource } : {}),
 	      });
 	      modelCatalogRef.current = catalog;
-	      setModelCatalog(catalog);
-	      if (options.refreshProvider && catalog.stale !== true) {
-	        modelCatalogProviderRefreshedAtRef.current.set(options.refreshProvider, Date.now());
-	      }
-	      if (options.refreshProvider && catalog.stale === true) {
+		      setModelCatalog(catalog);
+		      if (refreshCacheKey && catalog.stale !== true) {
+		        modelCatalogProviderRefreshedAtRef.current.set(refreshCacheKey, Date.now());
+		      }
+		      if (options.refreshProvider && catalog.stale === true) {
 	        void getModelCatalog(conn, {
 	          mode: "force",
 	          refreshProvider: options.refreshProvider,
-	          ...(options.refreshProvider === "cursor" ? { cursorSource: "sdk" as const } : {}),
-	        }).then((freshCatalog) => {
-	          if (connectionRef.current !== conn) return;
-	          modelCatalogRef.current = freshCatalog;
-	          modelCatalogProviderRefreshedAtRef.current.set(options.refreshProvider!, Date.now());
-	          setModelCatalog(freshCatalog);
+	          ...(cursorSource ? { cursorSource } : {}),
+		        }).then((freshCatalog) => {
+		          if (connectionRef.current !== conn) return;
+		          modelCatalogRef.current = freshCatalog;
+		          if (refreshCacheKey) modelCatalogProviderRefreshedAtRef.current.set(refreshCacheKey, Date.now());
+		          setModelCatalog(freshCatalog);
 	        }).catch(() => undefined);
 	      }
 	      return catalog;
@@ -6907,7 +7058,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     const projectCommands = discoverProjectSlashCommands(nextLane?.worktreePath || project.workspaceRoot);
     const nextCommands = remoteCommands.length ? remoteCommands : projectCommands;
     const provider = normalizeProvider(nextProvider);
-    const cachedModels = providerModelsCacheRef.current.get(provider);
+    const cachedModels = providerModelsCacheRef.current.get(providerModelsCacheKey(provider, modelStateRef.current.interfaceMode));
     const nextModels = cachedModels ?? registryModelsForProvider(provider);
     if (!cachedModels) {
       void loadProviderModels(provider, { applyDefault: false }).catch(() => undefined);
@@ -7556,9 +7707,15 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     };
     // Re-bind only when the connection itself changes (reconnect). clearedAt and
     // refreshState are read via refs so their churn doesn't drop the buffer.
-  }, [connection, flushPendingChatEvents, scheduleBackgroundRefresh, scheduleChatFlush, setSessionInterrupted, setSessionStreaming]);
+	  }, [connection, flushPendingChatEvents, scheduleBackgroundRefresh, scheduleChatFlush, setSessionInterrupted, setSessionStreaming]);
 
-  useEffect(() => {
+  const handleRuntimeEventGap = useCallback(() => {
+    void refreshState({ hydrateHistory: true }).catch((err) => {
+      setError(err instanceof Error ? err.message : String(err));
+    });
+  }, [refreshState]);
+
+	  useEffect(() => {
     if (!connection) return;
     let disposed = false;
     let unsubscribe: (() => void) | null = null;
@@ -7624,7 +7781,13 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       ptyFlushTimerRef.current = setTimeout(flushPendingPty, delayMs);
     };
 
-    void connection.subscribeRuntimeEvents({ category: "pty", cursor: 0, limit: 50, replay: false }, (event) => {
+    void connection.subscribeRuntimeEvents({
+      category: "pty",
+      cursor: 0,
+      limit: 50,
+      replay: false,
+      onGap: handleRuntimeEventGap,
+    }, (event) => {
       const payload = event.payload as { type?: unknown; event?: unknown };
       const terminalEvent = payload.event as { sessionId?: unknown; data?: unknown } | undefined;
       const sessionId = typeof terminalEvent?.sessionId === "string" ? terminalEvent.sessionId : null;
@@ -7668,7 +7831,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       // Flush whatever is buffered so a reconnect doesn't strand chunks.
       flushPendingPty();
     };
-  }, [connection, refreshState]);
+  }, [connection, handleRuntimeEventGap, refreshState]);
 
   useEffect(() => {
     if (!connection || !activeSessionId) {
@@ -7760,7 +7923,13 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     const timer = setInterval(() => {
       void refreshPrsByLane();
     }, 30_000);
-    void connection.subscribeRuntimeEvents({ category: "runtime", cursor: 0, limit: 50, replay: false }, (event) => {
+    void connection.subscribeRuntimeEvents({
+      category: "runtime",
+      cursor: 0,
+      limit: 50,
+      replay: false,
+      onGap: handleRuntimeEventGap,
+    }, (event) => {
       const type = typeof event.payload.type === "string" ? event.payload.type : "";
       if (type !== "prs-updated" && type !== "pr-notification") return;
       void refreshPrsByLane();
@@ -7777,7 +7946,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       clearInterval(timer);
       unsubscribe?.();
     };
-  }, [connection, refreshState]);
+  }, [connection, handleRuntimeEventGap, refreshState]);
 
   // Detect an attached socket dropping mid-session. Without this the UI freezes
   // on a stale snapshot (and a spinner that never resolves) with no retry.
@@ -8043,7 +8212,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
 
   const applyLocalModelArg = useCallback((value: string, providerOverride?: AdeCodeProvider) => {
     const provider = providerOverride ?? modelStateRef.current.provider;
-    const availableModels = providerModelsCacheRef.current.get(provider) ?? models;
+    const availableModels = providerModelsCacheRef.current.get(
+      providerModelsCacheKey(provider, modelStateRef.current.interfaceMode),
+    ) ?? models;
     const patch = modelStatePatchForArg(provider, availableModels, value);
     const next = { ...modelStateRef.current, ...patch };
     modelStateRef.current = next;
@@ -8204,6 +8375,12 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       return null;
     }
     const normalized = { ...modelStateRef.current, ...applyProviderPermissionMode(modelStateRef.current) };
+    const launchModel = provider === "cursor"
+      ? resolveCursorCliModelForLaunch(
+          normalized,
+          providerModelsCacheRef.current.get(providerModelsCacheKey("cursor", "cli")) ?? models,
+        )
+      : normalized.modelId ?? normalized.model;
     const cols = clampTerminalPaneCols(terminalPaneWidth);
     const terminalRows = claudeTerminalRowsForPane(chatRowBudget);
     const activeProviderChat = activeSessionRef.current?.provider === provider ? activeSessionRef.current : null;
@@ -8215,7 +8392,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       provider,
       laneId,
       title,
-      model: normalized.modelId ?? normalized.model,
+      model: launchModel,
       reasoningEffort: normalized.reasoningEffort,
       fastMode: normalized.fastMode,
       permissionMode: normalized.permissionMode,
@@ -8241,7 +8418,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     showChatInfoAfterDraftCommit();
     await refreshState();
     return created.sessionId;
-  }, [addNotice, chatRowBudget, lanes, refreshState, registerOptimisticTerminalSession, selectActiveSessionId, setDraftChatMode, showChatInfoAfterDraftCommit, terminalPaneWidth]);
+  }, [addNotice, chatRowBudget, lanes, models, refreshState, registerOptimisticTerminalSession, selectActiveSessionId, setDraftChatMode, showChatInfoAfterDraftCommit, terminalPaneWidth]);
 
   const sendClaudeModelCommandToTerminal = useCallback(async (modelRef?: string | null): Promise<boolean> => {
     const terminal = activeTerminalSessionRef.current;
@@ -10337,6 +10514,12 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         ? cliProviderForModelStateProvider(normalized.provider)
         : null;
       if (cliProvider) {
+        const launchModel = cliProvider === "cursor"
+          ? resolveCursorCliModelForLaunch(
+              normalized,
+              providerModelsCacheRef.current.get(providerModelsCacheKey("cursor", "cli")) ?? models,
+            )
+          : normalized.modelId ?? normalized.model;
         const cols = clampTerminalPaneCols(terminalPaneWidth);
         const terminalRows = claudeTerminalRowsForPane(chatRowBudget);
         const terminalPrompt = promptTextForTerminal(text, promptAttachments);
@@ -10346,7 +10529,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
           provider: cliProvider,
           laneId,
           title: cliTitle,
-          model: normalized.modelId ?? normalized.model,
+          model: launchModel,
           reasoningEffort: normalized.reasoningEffort,
           fastMode: normalized.fastMode,
           permissionMode: normalized.permissionMode,
@@ -10415,7 +10598,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       setError(message);
       addNotice(launched ? `Launched chat, but follow-up failed: ${message}` : message, "error");
     }
-  }, [addNotice, chatRowBudget, lanes, refreshState, registerOptimisticTerminalSession, selectedMentions, setChatScrollOffset, setDraftChatMode, terminalPaneWidth]);
+  }, [addNotice, chatRowBudget, lanes, models, refreshState, registerOptimisticTerminalSession, selectedMentions, setChatScrollOffset, setDraftChatMode, terminalPaneWidth]);
 
   const insertMention = useCallback((suggestion: MentionSuggestion) => {
     const range = activeMention(prompt);
@@ -10485,10 +10668,19 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       })) {
         addNotice("Provider is locked for this chat. /new chat to switch.", "info");
         return;
-      }
-      const previousModelState = modelStateRef.current;
-      const nextModelState: AdeCodeModelState = {
-        ...previousModelState,
+	      }
+	      const previousModelState = modelStateRef.current;
+	      if (provider === "cursor" && !cursorModelAvailableForInterface(target, previousModelState.interfaceMode)) {
+	        addNotice(
+	          previousModelState.interfaceMode === "cli"
+	            ? "This Cursor model is available for chat only. Choose a Cursor CLI model."
+	            : "This Cursor model is available for CLI only. Switch Interface to CLI or choose a chat model.",
+	          "error",
+	        );
+	        return;
+	      }
+	      const nextModelState: AdeCodeModelState = {
+	        ...previousModelState,
         ...modelStatePatchForModel(provider, target),
         fastMode: (target.serviceTiers?.some((tier) => tier.trim().toLowerCase() === "fast") || modelSupportsFastMode(descriptor))
           ? previousModelState.fastMode
@@ -10553,7 +10745,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       addNotice("Provider is locked for this chat. /new chat to switch.", "info");
       return;
     }
-    const immediateModels = providerModelsCacheRef.current.get(provider) ?? registryModelsForProvider(provider);
+    const immediateModels = providerModelsCacheRef.current.get(
+      providerModelsCacheKey(provider, modelStateRef.current.interfaceMode),
+    ) ?? registryModelsForProvider(provider);
     setModels(immediateModels);
     const model = immediateModels.find((entry) => entry.isDefault) ?? immediateModels[0] ?? null;
     applyModelState((prev) => {
@@ -10674,13 +10868,27 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       cycleProvider(direction);
       return;
     }
-    if (row.kind === "interface") {
-      // Only two values, so any cycle direction toggles Chat ↔ CLI. Editable
-      // rows only (disabled rows return above); a committed session's interface
-      // is fixed by its type.
-      applyModelState((prev) => ({ ...prev, interfaceMode: prev.interfaceMode === "cli" ? "chat" : "cli" }));
-      return;
-    }
+	    if (row.kind === "interface") {
+	      // Only two values, so any cycle direction toggles Chat ↔ CLI. Editable
+	      // rows only (disabled rows return above); a committed session's interface
+	      // is fixed by its type.
+	      const nextInterface = modelStateRef.current.interfaceMode === "cli" ? "chat" : "cli";
+	      const cursorModels = providerModelsCacheRef.current.get(providerModelsCacheKey("cursor", nextInterface))
+	        ?? (modelStateRef.current.provider === "cursor" ? models : registryModelsForProvider("cursor"));
+	      applyModelState((prev) => reconcileCursorModelStateForInterface(prev, nextInterface, cursorModels));
+	      if (modelStateRef.current.provider === "cursor") {
+	        void loadProviderModels("cursor", {
+	          applyDefault: false,
+	          force: true,
+	          interfaceMode: nextInterface,
+	        }).then((loaded) => {
+	          const current = modelStateRef.current;
+	          if (current.provider !== "cursor" || current.interfaceMode !== nextInterface) return;
+	          applyModelState((prev) => reconcileCursorModelStateForInterface(prev, nextInterface, loaded));
+	        }).catch(() => undefined);
+	      }
+	      return;
+	    }
     if (row.kind === "model") {
       cycleModel(direction);
       return;
@@ -10746,7 +10954,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       lastUserOpenedPaneRef.current = null;
       focusChat();
     }
-  }, [addNotice, applyModelState, cycleModel, cyclePermission, cycleProvider, cycleReasoning, focusChat, refreshAiSetupStatus, refreshState, sendClaudeModelCommandToTerminal]);
+  }, [addNotice, applyModelState, cycleModel, cyclePermission, cycleProvider, cycleReasoning, focusChat, loadProviderModels, models, refreshAiSetupStatus, refreshState, sendClaudeModelCommandToTerminal]);
 
   const recallPromptHistory = useCallback((direction: "previous" | "next"): boolean => {
     const focusedSessionId = (gridViewActiveRef.current ? focusedSessionIdForMultiView(multiViewRef.current) : null);
diff --git a/apps/ade-cli/src/tuiClient/connection.ts b/apps/ade-cli/src/tuiClient/connection.ts
index 33d176ecd..f288753c1 100644
--- a/apps/ade-cli/src/tuiClient/connection.ts
+++ b/apps/ade-cli/src/tuiClient/connection.ts
@@ -6,7 +6,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { resolveAdeLayout } from "../../../desktop/src/shared/adeLayout";
 import { resolveMachineAdeLayout } from "../services/projects/machineLayout";
 import { JsonRpcClient } from "./jsonRpcClient";
-import type { AdeCodeConnection, ProjectLaunchContext } from "./types";
+import type { AdeCodeConnection, ProjectLaunchContext, RuntimeEventGapMetadata } from "./types";
 import type { AgentChatEventEnvelope } from "../../../desktop/src/shared/types/chat";
 import type { BufferedEvent } from "../eventBuffer";
 import { resolveAdeDefaultRole } from "../runtimeRoles";
@@ -255,6 +255,30 @@ type PendingRuntimeEvent = {
   event: BufferedEvent;
 };
 
+function runtimeEventGapMetadata(
+  value: unknown,
+  subscriptionId?: string | null,
+): RuntimeEventGapMetadata | null {
+  if (!value || typeof value !== "object" || (value as { gap?: unknown }).gap !== true) return null;
+  const source = value as {
+    oldestCursor?: unknown;
+    nextCursor?: unknown;
+    subscriptionId?: unknown;
+  };
+  return {
+    gap: true,
+    oldestCursor: typeof source.oldestCursor === "number" && Number.isFinite(source.oldestCursor)
+      ? Math.max(0, Math.floor(source.oldestCursor))
+      : null,
+    nextCursor: typeof source.nextCursor === "number" && Number.isFinite(source.nextCursor)
+      ? Math.max(0, Math.floor(source.nextCursor))
+      : null,
+    subscriptionId: typeof source.subscriptionId === "string"
+      ? source.subscriptionId
+      : subscriptionId ?? null,
+  };
+}
+
 async function initialize(request: AdeRpcRequest): Promise<InitializeResult> {
   const result = await request<InitializeResult>("ade/initialize", {
     protocolVersion: "2025-06-18",
@@ -673,9 +697,10 @@ async function connectAttachedSocket(args: {
             limit: subscriptionArgs.limit ?? 100,
             replay: subscriptionArgs.replay,
           });
-          if (response && typeof response === "object" && "gap" in response) {
-            const gap = (response as { gap?: unknown }).gap === true;
-            if (gap) pending.length = 0;
+          const gap = runtimeEventGapMetadata(response, response.subscriptionId);
+          if (gap) {
+            pending.length = 0;
+            subscriptionArgs.onGap?.(gap);
           }
           subscriptionId = response.subscriptionId;
           for (const payload of pending) {
@@ -919,10 +944,12 @@ export async function connectToAde(args: {
       const eventBuffer = runtime.eventBuffer;
       if (!eventBuffer) return () => {};
       const shouldForward = (event: BufferedEvent) => !category || event.category === category;
-      const replay = subscriptionArgs.replay !== false && typeof eventBuffer.drain === "function"
-        ? eventBuffer.drain(subscriptionArgs.cursor ?? 0, subscriptionArgs.limit ?? 100)
-        : { events: [] };
-      for (const event of replay.events) {
+	      const replay = subscriptionArgs.replay !== false && typeof eventBuffer.drain === "function"
+	        ? eventBuffer.drain(subscriptionArgs.cursor ?? 0, subscriptionArgs.limit ?? 100)
+	        : { events: [] };
+	      const gap = runtimeEventGapMetadata(replay);
+	      if (gap) subscriptionArgs.onGap?.(gap);
+	      for (const event of replay.events) {
         if (shouldForward(event)) callback(event);
       }
       if (typeof eventBuffer.subscribe !== "function") return () => {};
diff --git a/apps/ade-cli/src/tuiClient/remoteLauncher.ts b/apps/ade-cli/src/tuiClient/remoteLauncher.ts
index d23e4b5c9..f84d4eafb 100644
--- a/apps/ade-cli/src/tuiClient/remoteLauncher.ts
+++ b/apps/ade-cli/src/tuiClient/remoteLauncher.ts
@@ -581,7 +581,7 @@ function withTimeout<T>(promise: Promise<T>, timeoutMs: number, message: string)
   });
 }
 
-class ProcessJsonRpcClient {
+export class ProcessJsonRpcClient {
   private nextId = 1;
   private buffer = Buffer.alloc(0);
   private readonly pending = new Map<number | string, PendingRequest>();
@@ -616,6 +616,7 @@ class ProcessJsonRpcClient {
         );
         this.child.kill();
       }, REMOTE_RPC_REQUEST_TIMEOUT_MS);
+      timer.unref?.();
       this.pending.set(id, {
         method,
         resolve: (value) => resolve(value as T),
@@ -739,6 +740,7 @@ class ProcessJsonRpcClient {
     const pending = this.pending.get(response.id);
     if (!pending) return;
     this.pending.delete(response.id);
+    clearTimeout(pending.timer);
     if (response.error) {
       pending.reject(new Error(response.error.message));
       return;
@@ -1161,7 +1163,7 @@ function printSessions(sessions: RemoteSessionChoice[]): void {
   }
 }
 
-async function startRemoteBridge(target: RemoteRuntimeTarget): Promise<RemoteBridge> {
+async function startRemoteBridge(target: RemoteRuntimeTarget, initialAttempt?: RemoteRpcAttempt): Promise<RemoteBridge> {
   const activeSockets = new Set<net.Socket>();
   const activeChildren = new Set<ChildProcessWithoutNullStreams>();
   const bridgeDir = process.platform === "win32"
@@ -1183,7 +1185,13 @@ async function startRemoteBridge(target: RemoteRuntimeTarget): Promise<RemoteBri
     }
   };
 
+  let firstBridgeAttempt: RemoteRpcAttempt | null = initialAttempt ?? null;
   const selectBridgeAttempt = async (): Promise<RemoteRpcAttempt> => {
+    if (firstBridgeAttempt) {
+      const attempt = firstBridgeAttempt;
+      firstBridgeAttempt = null;
+      return attempt;
+    }
     const session = await openRemoteRpcSession(currentTarget());
     const attempt = session.attempt;
     session.client.close();
@@ -1359,7 +1367,7 @@ export async function runAdeCodeRemote(argv: string[], runAdeCodeCli: RunAdeCode
     }
 
     remote.client.close();
-    bridge = await startRemoteBridge(target);
+    bridge = await startRemoteBridge(target, remote.attempt);
     process.stderr.write(
       `Connecting ADE Code to ${target.name} · ${project.displayName}${session ? ` · ${session.title}` : ""}\n`,
     );
diff --git a/apps/ade-cli/src/tuiClient/types.ts b/apps/ade-cli/src/tuiClient/types.ts
index 45b748b26..0cd65389f 100644
--- a/apps/ade-cli/src/tuiClient/types.ts
+++ b/apps/ade-cli/src/tuiClient/types.ts
@@ -45,6 +45,13 @@ export type RunAdeActionResult<T = unknown> = {
   statusHints?: Record<string, unknown>;
 };
 
+export type RuntimeEventGapMetadata = {
+  gap: true;
+  oldestCursor: number | null;
+  nextCursor: number | null;
+  subscriptionId?: string | null;
+};
+
 export type AdeCodeConnection = {
   mode: RuntimeMode;
   projectRoot: string;
@@ -63,7 +70,13 @@ export type AdeCodeConnection = {
    */
   onConnectionClose?(handler: () => void): () => void;
   subscribeRuntimeEvents(
-    args: { category?: BufferedEvent["category"] | null; cursor?: number; limit?: number; replay?: boolean },
+    args: {
+      category?: BufferedEvent["category"] | null;
+      cursor?: number;
+      limit?: number;
+      replay?: boolean;
+      onGap?: (gap: RuntimeEventGapMetadata) => void;
+    },
     callback: (event: BufferedEvent) => void,
   ): Promise<() => void>;
   close(): Promise<void>;
diff --git a/apps/desktop/src/preload/preload.test.ts b/apps/desktop/src/preload/preload.test.ts
index 3e733f19a..aeff53bb1 100644
--- a/apps/desktop/src/preload/preload.test.ts
+++ b/apps/desktop/src/preload/preload.test.ts
@@ -4135,6 +4135,74 @@ describe("preload OAuth bridge", () => {
       unsubscribe();
     } finally {
       vi.useRealTimers();
+    }
+	  });
+
+  it("notifies the existing project binding refresh path when event polling reports a gap", async () => {
+    vi.useFakeTimers();
+    try {
+      const binding = {
+        kind: "remote",
+        key: "remote:target-1:project-1",
+        targetId: "target-1",
+        runtimeName: "Remote",
+        projectId: "project-1",
+        rootPath: "/remote/project",
+        displayName: "Project",
+      };
+      const invoke = vi.fn(async (channel: string) => {
+        if (channel === IPC.appGetWindowSession) {
+          return { windowId: 1, project: null, binding };
+        }
+        if (channel === IPC.remoteRuntimeStreamEvents) {
+          return {
+            events: [],
+            nextCursor: 42,
+            hasMore: false,
+            gap: true,
+            oldestCursor: 12,
+            eventEpoch: "epoch-a",
+          };
+        }
+        return undefined;
+      });
+      const on = vi.fn();
+      const removeListener = vi.fn();
+      const exposeInMainWorld = vi.fn((name: string, value: unknown) => {
+        (globalThis as any).__bridgeName = name;
+        (globalThis as any).__adeBridge = value;
+      });
+
+      vi.doMock("electron", () => ({
+        contextBridge: { exposeInMainWorld },
+        ipcRenderer: { invoke, on, removeListener },
+        webFrame: {
+          getZoomLevel: vi.fn(() => 0),
+          setZoomLevel: vi.fn(),
+          getZoomFactor: vi.fn(() => 1),
+        },
+      }));
+
+      await import("./preload");
+
+      const bridge = (globalThis as any).__adeBridge;
+      const bindingChanged = vi.fn();
+      const unsubscribeBinding = bridge.app.onProjectBindingChanged(bindingChanged);
+      const unsubscribeEvents = bridge.project.onStateEvent(vi.fn());
+
+      await vi.advanceTimersByTimeAsync(0);
+
+      expect(bindingChanged).toHaveBeenCalledWith(binding);
+      expect(invoke).toHaveBeenCalledWith(IPC.remoteRuntimeStreamEvents, {
+        id: "target-1",
+        projectId: "project-1",
+        request: { cursor: 0, limit: 100, replay: false },
+      });
+
+      unsubscribeEvents();
+      unsubscribeBinding();
+    } finally {
+      vi.useRealTimers();
     }
   });
 
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index 01c1b4598..7f9259ca8 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -972,6 +972,9 @@ let projectBindingVersion = 0;
 let projectBindingRefreshPromise: Promise<OpenProjectBinding | null> | null = null;
 let projectRuntimeTransitionDepth = 0;
 let activeRemoteProjectOpenPromise: Promise<OpenProjectBinding> | null = null;
+const projectBindingChangedCallbacks = new Set<
+  (binding: OpenProjectBinding | null) => void
+>();
 
 function rememberProjectBinding(binding: OpenProjectBinding | null): void {
   const previousKey = currentProjectBinding?.key ?? null;
@@ -988,6 +991,23 @@ function rememberProjectBinding(binding: OpenProjectBinding | null): void {
   }
 }
 
+function notifyProjectBindingChangedCallbacks(
+  binding: OpenProjectBinding | null,
+): void {
+  rememberProjectBinding(binding);
+  clearProjectScopedReadCaches();
+  for (const callback of [...projectBindingChangedCallbacks]) {
+    try {
+      callback(binding);
+    } catch (error) {
+      console.warn(
+        "[preload] project binding listener failed",
+        error instanceof Error ? error.message : String(error),
+      );
+    }
+  }
+}
+
 function localProjectBindingForRoot(rootPath: string): OpenProjectBinding {
   const trimmed = rootPath.trim();
   if (!trimmed) {
@@ -1869,6 +1889,7 @@ async function pollRemoteRuntimeEvents(): Promise<void> {
     if (batch.gap === true) {
       resetRemoteRuntimeEventDedup(binding.key);
       resetRemoteRuntimeEmptyPolls();
+      notifyProjectBindingChangedCallbacks(binding);
     }
 
     remoteRuntimeEventCursor = Number.isFinite(batch.nextCursor)
@@ -3219,6 +3240,7 @@ contextBridge.exposeInMainWorld("ade", {
     onProjectBindingChanged: (
       cb: (binding: OpenProjectBinding | null) => void,
     ) => {
+      projectBindingChangedCallbacks.add(cb);
       const listener = (
         _event: Electron.IpcRendererEvent,
         payload: OpenProjectBinding | null,
@@ -3228,8 +3250,10 @@ contextBridge.exposeInMainWorld("ade", {
         cb(payload);
       };
       ipcRenderer.on(IPC.appProjectBindingChanged, listener);
-      return () =>
+      return () => {
+        projectBindingChangedCallbacks.delete(cb);
         ipcRenderer.removeListener(IPC.appProjectBindingChanged, listener);
+      };
     },
     onNavigate: (cb: (request: AppNavigationRequest) => void) => {
       const listener = (

From e3b705d1f162a92d55fcc1b1b4e345534cbdfc0c Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 11:05:31 -0400
Subject: [PATCH 06/17] Persist Work Chat/CLI interface choice on iOS (+
 desktop verify)

The in-project New Chat screen and the all-projects hub composer both
defaulted the Chat/CLI switcher to .chat on every open, so the choice was
forgotten across app restarts and project switches. Add a shared per-project
store (WorkNewSessionModePreferences, keyed by project id in the app-group
UserDefaults) that mirrors desktop's per-project WorkProjectViewState.draftKind.

- Seed sessionMode from the store in each composer's init (not onAppear) so the
  sessionMode onChange never fires to reset runtimeMode to the provider default.
- Persist only on an explicit Chat/CLI switcher tap via a new onUserSelect
  callback; programmatic model-availability fallbacks never write the store.
- A stored CLI choice is honored only when the restored model can run in CLI;
  otherwise the session opens on chat without discarding the preference.

Desktop already persists this per project (WorkProjectViewState.draftKind in
localStorage ade.workViewState.v1, preserved across new-draft/close-tab/lane-
refresh/project-switch); no desktop change needed.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../ios/ADE/Views/Hub/HubComposerDrawer.swift | 26 +++++-
 .../ADE/Views/Work/WorkNewChatScreen.swift    | 83 +++++++++++++++++--
 apps/ios/ADE/Views/Work/WorkPreviews.swift    |  1 +
 apps/ios/ADE/Views/Work/WorkRootScreen.swift  |  1 +
 apps/ios/ADETests/ADETests.swift              | 28 +++++++
 5 files changed, 133 insertions(+), 6 deletions(-)

diff --git a/apps/ios/ADE/Views/Hub/HubComposerDrawer.swift b/apps/ios/ADE/Views/Hub/HubComposerDrawer.swift
index f4334c971..d3ae5d8bc 100644
--- a/apps/ios/ADE/Views/Hub/HubComposerDrawer.swift
+++ b/apps/ios/ADE/Views/Hub/HubComposerDrawer.swift
@@ -106,17 +106,39 @@ struct HubComposerDrawer: View {
 
   init(onCreated: @escaping (HubCreatedChat) -> Void) {
     self.onCreated = onCreated
+    var restoredProvider = "claude"
+    var restoredModelId = "claude-sonnet-4-6"
     if let saved = WorkComposerPreferences.load() {
+      restoredProvider = saved.provider
+      restoredModelId = saved.modelId
       _provider = State(initialValue: saved.provider)
       _modelId = State(initialValue: saved.modelId)
       _runtimeMode = State(initialValue: saved.runtimeMode)
       _reasoningEffort = State(initialValue: saved.reasoningEffort)
       _codexFastMode = State(initialValue: saved.codexFastMode)
     }
+    var restoredProjectId = ""
     if let dest = HubComposerDrawer.loadLastDestination() {
+      restoredProjectId = dest.projectId
       _pickedProjectId = State(initialValue: dest.projectId)
       _selectedLaneId = State(initialValue: dest.laneId)
     }
+    // Restore the last explicitly chosen Chat/CLI interface for the restored
+    // destination project (shared per-project store with the in-project New Chat
+    // screen), honoring a stored CLI choice only when the restored model can run
+    // in CLI — otherwise open on chat without discarding the preference. Seeding
+    // the initial @State here keeps the sessionMode onChange from resetting
+    // runtimeMode to the provider default.
+    var restoredMode: WorkNewSessionMode = .chat
+    if let savedMode = WorkNewSessionModePreferences.load(projectId: restoredProjectId) {
+      if savedMode == .cli,
+         !workModelAllowedForAvailabilityMode(modelId: restoredModelId, provider: restoredProvider, mode: .cli) {
+        restoredMode = .chat
+      } else {
+        restoredMode = savedMode
+      }
+    }
+    _sessionMode = State(initialValue: restoredMode)
   }
 
   // MARK: Derived state
@@ -200,7 +222,9 @@ struct HubComposerDrawer: View {
         VStack(spacing: 14) {
           destinationControl
           if !isDictating {
-            WorkSessionTypeSwitcher(selection: $sessionMode)
+            WorkSessionTypeSwitcher(selection: $sessionMode, onUserSelect: { mode in
+              WorkNewSessionModePreferences.save(mode, projectId: pickedProjectId)
+            })
               .frame(maxWidth: .infinity, alignment: .center)
           }
           if let errorMessage {
diff --git a/apps/ios/ADE/Views/Work/WorkNewChatScreen.swift b/apps/ios/ADE/Views/Work/WorkNewChatScreen.swift
index 89832aff2..8b4a84e2a 100644
--- a/apps/ios/ADE/Views/Work/WorkNewChatScreen.swift
+++ b/apps/ios/ADE/Views/Work/WorkNewChatScreen.swift
@@ -28,9 +28,52 @@ enum WorkNewSessionMode: String, CaseIterable, Identifiable {
   }
 }
 
+/// Per-project "last explicitly chosen" Chat vs CLI interface for the new-session
+/// composers. Restored as the default when the composer opens so the choice
+/// survives app restarts, project switches, and launching a session — desktop
+/// keeps the same choice per project in `WorkProjectViewState.draftKind`.
+/// Written ONLY on an explicit tap of the Chat/CLI switcher, never by
+/// programmatic model-availability fallbacks, so a stored CLI choice that a
+/// restored chat-only model can't honor drops to chat for that session without
+/// discarding the preference. Shared between the in-project New Chat screen and
+/// the all-projects hub composer.
+enum WorkNewSessionModePreferences {
+  /// Versioned map of projectId → mode raw value, so a future field change can
+  /// migrate rather than mis-decode.
+  private static let storageKey = "ade.work.newSessionModeByProject.v1"
+  private static var defaults: UserDefaults { ADESharedContainer.defaults }
+
+  private static func normalizedProjectId(_ projectId: String?) -> String? {
+    let trimmed = projectId?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+    return trimmed.isEmpty ? nil : trimmed
+  }
+
+  /// The last explicitly chosen interface for this project, or nil when the user
+  /// has not picked one yet (the caller then defaults to `.chat`).
+  static func load(projectId: String?) -> WorkNewSessionMode? {
+    guard let key = normalizedProjectId(projectId) else { return nil }
+    let map = defaults.dictionary(forKey: storageKey) as? [String: String]
+    guard let raw = map?[key] else { return nil }
+    return WorkNewSessionMode(rawValue: raw)
+  }
+
+  /// Persists the user's explicit interface choice for this project. No-op when
+  /// the project id is unknown so a nil-scope session can't clobber a good record.
+  static func save(_ mode: WorkNewSessionMode, projectId: String?) {
+    guard let key = normalizedProjectId(projectId) else { return }
+    var map = (defaults.dictionary(forKey: storageKey) as? [String: String]) ?? [:]
+    map[key] = mode.rawValue
+    defaults.set(map, forKey: storageKey)
+  }
+}
+
 /// Desktop `ModeSwitcherPills` parity: compact Chat/CLI toggle for the nav bar.
 struct WorkSessionTypeSwitcher: View {
   @Binding var selection: WorkNewSessionMode
+  /// Fired only on an explicit user tap that changes the selection (never on a
+  /// programmatic seed/restore), so callers can persist the choice without a
+  /// restore or availability fallback overwriting the stored preference.
+  var onUserSelect: ((WorkNewSessionMode) -> Void)? = nil
 
   var body: some View {
     HStack(spacing: 4) {
@@ -41,6 +84,7 @@ struct WorkSessionTypeSwitcher: View {
           withAnimation(.snappy(duration: 0.16)) {
             selection = mode
           }
+          onUserSelect?(mode)
         } label: {
           HStack(spacing: 6) {
             Image(systemName: mode.systemImage)
@@ -289,6 +333,10 @@ struct WorkNewChatScreen: View {
 
   let lanes: [LaneSummary]
   let preferredLaneId: String?
+  /// Project scope for the per-project Chat/CLI interface preference. Captured at
+  /// construction (the screen is pushed for the active project) so it is stable
+  /// while shown.
+  let activeProjectId: String?
   let onStarted: @MainActor (AgentChatSessionSummary, String) async -> Void
   let onCliStarted: @MainActor (TerminalSessionSummary) async -> Void
   let onRefreshLanes: @MainActor () async -> Void
@@ -315,12 +363,14 @@ struct WorkNewChatScreen: View {
   init(
     lanes: [LaneSummary],
     preferredLaneId: String?,
+    activeProjectId: String?,
     onStarted: @escaping @MainActor (AgentChatSessionSummary, String) async -> Void,
     onCliStarted: @escaping @MainActor (TerminalSessionSummary) async -> Void,
     onRefreshLanes: @escaping @MainActor () async -> Void
   ) {
     self.lanes = lanes
     self.preferredLaneId = preferredLaneId
+    self.activeProjectId = activeProjectId
     self.onStarted = onStarted
     self.onCliStarted = onCliStarted
     self.onRefreshLanes = onRefreshLanes
@@ -328,13 +378,34 @@ struct WorkNewChatScreen: View {
     // on the user's most recent choices. Seeding the @State initial values here
     // (rather than assigning in onAppear) avoids the provider/model onChange
     // handlers firing and resetting runtimeMode back to the provider default.
+    var restoredProvider = "claude"
+    var restoredModelId = "claude-sonnet-4-6"
     if let saved = WorkComposerPreferences.load() {
+      restoredProvider = saved.provider
+      restoredModelId = saved.modelId
       _provider = State(initialValue: saved.provider)
       _modelId = State(initialValue: saved.modelId)
       _runtimeMode = State(initialValue: saved.runtimeMode)
       _reasoningEffort = State(initialValue: saved.reasoningEffort)
       _codexFastMode = State(initialValue: saved.codexFastMode)
     }
+    // Restore the last explicitly chosen Chat/CLI interface for this project so
+    // the choice survives app restarts, project switches, and launching a
+    // session. Seeding the initial @State here (not onAppear) keeps the
+    // sessionMode onChange from firing and resetting runtimeMode to the provider
+    // default. A stored CLI choice is only honored when the restored model can
+    // actually run in CLI; otherwise the session opens on chat WITHOUT rewriting
+    // the stored preference (a later switcher tap overwrites it).
+    var restoredMode: WorkNewSessionMode = .chat
+    if let savedMode = WorkNewSessionModePreferences.load(projectId: activeProjectId) {
+      if savedMode == .cli,
+         !workModelAllowedForAvailabilityMode(modelId: restoredModelId, provider: restoredProvider, mode: .cli) {
+        restoredMode = .chat
+      } else {
+        restoredMode = savedMode
+      }
+    }
+    _sessionMode = State(initialValue: restoredMode)
   }
 
   /// The live composer selection. Persisted as the app-wide "last used" choice
@@ -438,7 +509,9 @@ struct WorkNewChatScreen: View {
     .adeRootTabBarHidden()
     .toolbar {
       ToolbarItem(placement: .principal) {
-        WorkSessionTypeSwitcher(selection: $sessionMode)
+        WorkSessionTypeSwitcher(selection: $sessionMode, onUserSelect: { mode in
+          WorkNewSessionModePreferences.save(mode, projectId: activeProjectId)
+        })
       }
       ToolbarItem(placement: .topBarTrailing) {
         if busy {
@@ -448,10 +521,10 @@ struct WorkNewChatScreen: View {
     }
     .onAppear {
       // A restored selection (see init) can carry a model only valid in the mode
-      // it was last used in — e.g. a CLI-only Cursor model. The screen opens in
-      // .chat and normalizeSelection only runs on a sessionMode *change*, which
-      // never fires for the initial state, so a CLI-only model would otherwise
-      // reach Send → createChatSession. Normalize here, but only when the model is
+      // it was last used in — e.g. a CLI-only Cursor model. normalizeSelection
+      // only runs on a sessionMode *change*, which never fires for the seeded
+      // initial state, so a model disallowed for the (possibly restored) mode
+      // would otherwise reach Send. Normalize here, but only when the model is
       // actually disallowed, so a valid restored selection keeps its runtimeMode.
       let availabilityMode: WorkCursorAvailabilityMode = sessionMode == .cli ? .cli : .chat
       if !workModelAllowedForAvailabilityMode(modelId: modelId, provider: provider, mode: availabilityMode) {
diff --git a/apps/ios/ADE/Views/Work/WorkPreviews.swift b/apps/ios/ADE/Views/Work/WorkPreviews.swift
index 031ae05f6..605ef5ebc 100644
--- a/apps/ios/ADE/Views/Work/WorkPreviews.swift
+++ b/apps/ios/ADE/Views/Work/WorkPreviews.swift
@@ -499,6 +499,7 @@ private enum WorkPreviewData {
     WorkNewChatScreen(
       lanes: [WorkPreviewData.lane],
       preferredLaneId: WorkPreviewData.lane.id,
+      activeProjectId: nil,
       onStarted: { _, _ in },
       onCliStarted: { _ in },
       onRefreshLanes: {}
diff --git a/apps/ios/ADE/Views/Work/WorkRootScreen.swift b/apps/ios/ADE/Views/Work/WorkRootScreen.swift
index 230f77760..51b3eb07e 100644
--- a/apps/ios/ADE/Views/Work/WorkRootScreen.swift
+++ b/apps/ios/ADE/Views/Work/WorkRootScreen.swift
@@ -634,6 +634,7 @@ struct WorkRootScreen: View {
         WorkNewChatScreen(
           lanes: workOrderedLanes.isEmpty ? lanes : workOrderedLanes,
           preferredLaneId: route.preferredLaneId,
+          activeProjectId: syncService.activeProjectId,
           onStarted: { summary, opener in
             let sessionId = summary.sessionId
             let trimmed = opener.trimmingCharacters(in: .whitespacesAndNewlines)
diff --git a/apps/ios/ADETests/ADETests.swift b/apps/ios/ADETests/ADETests.swift
index 429272db9..18f186642 100644
--- a/apps/ios/ADETests/ADETests.swift
+++ b/apps/ios/ADETests/ADETests.swift
@@ -6805,6 +6805,34 @@ final class ADETests: XCTestCase {
     XCTAssertEqual(WorkComposerPreferences.load()?.modelId, "claude-opus-4-8")
   }
 
+  func testWorkNewSessionModePreferencesPerProjectPersistence() {
+    let storageKey = "ade.work.newSessionModeByProject.v1"
+    ADESharedContainer.defaults.removeObject(forKey: storageKey)
+    defer { ADESharedContainer.defaults.removeObject(forKey: storageKey) }
+
+    // Unset → nil so the caller defaults to .chat.
+    XCTAssertNil(WorkNewSessionModePreferences.load(projectId: "project-a"))
+
+    // Per-project round-trip: a choice for one project is scoped to it.
+    WorkNewSessionModePreferences.save(.cli, projectId: "project-a")
+    WorkNewSessionModePreferences.save(.chat, projectId: "project-b")
+    XCTAssertEqual(WorkNewSessionModePreferences.load(projectId: "project-a"), .cli)
+    XCTAssertEqual(WorkNewSessionModePreferences.load(projectId: "project-b"), .chat)
+
+    // Overwrites are last-write-wins per project and don't touch siblings.
+    WorkNewSessionModePreferences.save(.chat, projectId: "project-a")
+    XCTAssertEqual(WorkNewSessionModePreferences.load(projectId: "project-a"), .chat)
+    XCTAssertEqual(WorkNewSessionModePreferences.load(projectId: "project-b"), .chat)
+
+    // Unknown/blank project scope is a no-op on save and nil on load, so a
+    // nil-scope session can never clobber a good per-project record.
+    WorkNewSessionModePreferences.save(.cli, projectId: nil)
+    WorkNewSessionModePreferences.save(.cli, projectId: "   ")
+    XCTAssertNil(WorkNewSessionModePreferences.load(projectId: nil))
+    XCTAssertNil(WorkNewSessionModePreferences.load(projectId: ""))
+    XCTAssertEqual(WorkNewSessionModePreferences.load(projectId: "project-a"), .chat)
+  }
+
   func testWorkComposerRuntimeProviderCoercesLocalOpenCodeGroups() {
     // Local OpenCode-routed groups must collapse to the wireable `opencode`
     // provider so a persisted "last used" selection restores supported access

From 9a9f3f682456e5ff6712a713d4387a5aadc9dce5 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 11:28:26 -0400
Subject: [PATCH 07/17] ade code: interface persistence, closed-session
 browsing, /secrets, picker digit fix

---
 .../src/tuiClient/__tests__/Drawer.test.tsx   |  54 ++
 .../tuiClient/__tests__/appPolling.test.tsx   |   2 +
 .../src/tuiClient/__tests__/commands.test.ts  |  15 +
 .../tuiClient/__tests__/connection.test.ts    |   6 +
 .../tuiClient/__tests__/drawerLayout.test.ts  |  22 +
 .../tuiClient/__tests__/interfaceMode.test.ts |   7 +-
 .../tuiClient/__tests__/pendingInput.test.ts  | 113 +++-
 .../src/tuiClient/__tests__/state.test.ts     |  27 +
 apps/ade-cli/src/tuiClient/app.tsx            | 603 ++++++++++++++----
 apps/ade-cli/src/tuiClient/commands.ts        |   1 +
 .../src/tuiClient/components/Drawer.tsx       | 111 +++-
 .../src/tuiClient/components/RightPane.tsx    |   4 +-
 apps/ade-cli/src/tuiClient/drawerLayout.ts    |  54 +-
 apps/ade-cli/src/tuiClient/drawerSelection.ts |  15 +-
 apps/ade-cli/src/tuiClient/pendingInput.ts    |  86 ++-
 apps/ade-cli/src/tuiClient/project.ts         |   2 +-
 apps/ade-cli/src/tuiClient/relativeTime.ts    |  20 +
 apps/ade-cli/src/tuiClient/state.ts           |  32 +-
 apps/ade-cli/src/tuiClient/types.ts           |   2 +-
 docs/features/ade-code/README.md              |  25 +-
 20 files changed, 1039 insertions(+), 162 deletions(-)
 create mode 100644 apps/ade-cli/src/tuiClient/relativeTime.ts

diff --git a/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx
index 347c842cf..a7a1a705a 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx
@@ -164,6 +164,60 @@ describe("Drawer lane and chat navigation layout", () => {
     expect(chatModeFrame).not.toContain("next lane");
   });
 
+  it("renders ended tracked CLI sessions behind the closed group in chat mode", () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date("2026-05-12T12:00:00.000Z"));
+
+    const openSession: AgentChatSessionSummary = {
+      sessionId: "chat-open",
+      laneId: "lane-1",
+      provider: "codex",
+      model: "gpt-5.5",
+      title: "Open chat",
+      status: "idle",
+      startedAt: "2026-05-12T11:30:00.000Z",
+      endedAt: null,
+      lastActivityAt: "2026-05-12T11:31:00.000Z",
+      lastOutputPreview: null,
+      summary: null,
+    };
+    const closedSession: AgentChatSessionSummary = {
+      sessionId: "term-1",
+      laneId: "lane-1",
+      provider: "codex",
+      model: "gpt-5.5",
+      title: "Closed CLI",
+      status: "idle",
+      startedAt: "2026-05-12T10:00:00.000Z",
+      endedAt: "2026-05-12T11:45:00.000Z",
+      lastActivityAt: "2026-05-12T11:45:00.000Z",
+      lastOutputPreview: null,
+      summary: null,
+    };
+
+    const frame = stripAnsi(render(
+      <Drawer
+        lanes={[lane("lane-1", "Feature", "feature/closed-cli", "2026-05-12T11:55:00.000Z")]}
+        sessions={[openSession]}
+        closedSessions={[closedSession]}
+        closedCliExpandedLaneIds={new Set(["lane-1"])}
+        activeLaneId="lane-1"
+        activeSessionId="chat-open"
+        browsingLaneId="lane-1"
+        selectedLaneIndex={0}
+        selectedChatIndex={2}
+        panelHeight={30}
+        mode="chats"
+        focused
+      />,
+    ).lastFrame() ?? "");
+
+    expect(frame).toContain("▾ closed (1)");
+    expect(frame).toContain("Closed");
+    expect(frame).toContain("15m ago");
+    expect(frame).toContain("◎");
+  });
+
   it("previews chats under non-selected lanes and hides branch refs from lane cards", () => {
     const sessions: AgentChatSessionSummary[] = [
       {
diff --git a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
index 5abe4928a..c57a2d105 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/appPolling.test.tsx
@@ -35,6 +35,8 @@ vi.mock("../state", async () => {
       lastChatByProjectLane: { "/repo": { "lane-1": "chat-1" } },
       lastLaneByProject: { "/repo": "lane-1" },
       lastLaneId: null,
+      draftKind: "chat",
+      draftKindByProject: {},
     }),
     saveAdeCodeProjectState: vi.fn(),
   };
diff --git a/apps/ade-cli/src/tuiClient/__tests__/commands.test.ts b/apps/ade-cli/src/tuiClient/__tests__/commands.test.ts
index 690da61d7..060eac7cb 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/commands.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/commands.test.ts
@@ -102,6 +102,17 @@ describe("commands", () => {
     }));
   });
 
+  it("routes /secrets to the ADE Code right pane", () => {
+    const parsed = parseCommand("/secrets");
+    expect(parsed?.spec?.name).toBe("/secrets");
+    expect(parsed ? commandPlacement(parsed) : null).toBe("right");
+    expect(paletteCommands("/sec")).toContainEqual(expect.objectContaining({
+      name: "/secrets",
+      source: "ade",
+      description: "List project secret names and copy masked values",
+    }));
+  });
+
   it("routes runtime commands to chat", () => {
     const parsed = parseCommand("/ship now", [
       { name: "/ship", description: "Ship it", source: "sdk" },
@@ -204,6 +215,10 @@ describe("commands", () => {
       name: "/skills",
       description: "List agent skills from project, user, and ADE bundled roots",
     }));
+    expect(rows).toContainEqual(expect.objectContaining({
+      name: "/secrets",
+      description: "List project secret names and copy masked values",
+    }));
     expect(rows).toContainEqual(expect.objectContaining({
       name: "/compact",
       description: "Compact the active chat context",
diff --git a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
index 07d6969b6..1932c20d3 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
@@ -1037,6 +1037,8 @@ describe("ade-code TUI state", () => {
       lastChatByProjectLane: {},
       lastLaneId: null,
       lastLaneByProject: {},
+      draftKind: "chat",
+      draftKindByProject: {},
     });
   });
 
@@ -1049,6 +1051,8 @@ describe("ade-code TUI state", () => {
       lastChatByProjectLane: {},
       lastLaneId: "lane-2",
       lastLaneByProject: {},
+      draftKind: "cli",
+      draftKindByProject: {},
     });
 
     expect(loadAdeCodeState()).toEqual({
@@ -1056,6 +1060,8 @@ describe("ade-code TUI state", () => {
       lastChatByProjectLane: {},
       lastLaneId: "lane-2",
       lastLaneByProject: {},
+      draftKind: "cli",
+      draftKindByProject: {},
     });
   });
 });
diff --git a/apps/ade-cli/src/tuiClient/__tests__/drawerLayout.test.ts b/apps/ade-cli/src/tuiClient/__tests__/drawerLayout.test.ts
index 48bed7b52..c80cc6bb9 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/drawerLayout.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/drawerLayout.test.ts
@@ -92,6 +92,28 @@ describe("drawerMouseHitForLayout", () => {
     expect(drawerMouseHitForLayout({ y: 15, layout })).toEqual({ kind: "lane", index: 1 });
   });
 
+  it("maps expanded closed CLI group rows through the shared layout model", () => {
+    const layout = computeDrawerLayout({
+      panelHeight: 60,
+      lanes: [laneInput("a", 2, { closedChatCount: 3, closedExpanded: true })],
+      expandedLaneIndex: 0,
+      selectedLaneIndex: 0,
+      scrollOffsetRows: 0,
+    });
+
+    expect(layout.lanes[0]).toMatchObject({
+      visibleChatCount: 2,
+      closedToggleVisible: true,
+      visibleClosedChatCount: 3,
+      closedExpanded: true,
+    });
+    expect(drawerMouseHitForLayout({ y: 5, layout })).toEqual({ kind: "chat", laneIndex: 0, chatIndex: 0 });
+    expect(drawerMouseHitForLayout({ y: 7, layout })).toEqual({ kind: "closed-toggle", laneIndex: 0 });
+    expect(drawerMouseHitForLayout({ y: 8, layout })).toEqual({ kind: "closed-chat", laneIndex: 0, closedIndex: 0 });
+    expect(drawerMouseHitForLayout({ y: 10, layout })).toEqual({ kind: "closed-chat", laneIndex: 0, closedIndex: 2 });
+    expect(drawerMouseHitForLayout({ y: 11, layout })).toEqual({ kind: "new-chat" });
+  });
+
   it("maps an expanded empty lane's new-chat row directly under its lane line", () => {
     const layout = computeDrawerLayout({
       panelHeight: 60,
diff --git a/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts b/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts
index ba7e6f627..8c03bc8e1 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { buildSetupRows, cliProviderForModelStateProvider } from "../app";
+import { buildSetupRows, cliProviderForModelStateProvider, initialModelState } from "../app";
 import type { AdeCodeInterfaceMode, AdeCodeModelState } from "../types";
 
 function baseModelState(overrides: Partial<AdeCodeModelState> = {}): AdeCodeModelState {
@@ -84,4 +84,9 @@ describe("buildSetupRows interface row", () => {
     expect(toggleInterface("chat")).toBe("cli");
     expect(toggleInterface("cli")).toBe("chat");
   });
+
+  it("defaults new drafts from the remembered interface mode", () => {
+    expect(initialModelState("cli").interfaceMode).toBe("cli");
+    expect(initialModelState("chat").interfaceMode).toBe("chat");
+  });
 });
diff --git a/apps/ade-cli/src/tuiClient/__tests__/pendingInput.test.ts b/apps/ade-cli/src/tuiClient/__tests__/pendingInput.test.ts
index 00ab0d173..949c9b2c4 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/pendingInput.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/pendingInput.test.ts
@@ -3,12 +3,14 @@ import type { AgentChatEventEnvelope, PendingInputRequest } from "../../../../de
 import {
   answerForQuestion,
   buildPendingInputAnswers,
+  convertPendingQuestionDigitSelectionToText,
   createPendingQuestionSelectionState,
   latestPendingApproval,
   movePendingQuestionFocus,
   movePendingQuestionOption,
   pendingQuestionAnsweredCount,
   pendingQuestionSelectionValue,
+  selectPendingQuestionDigit,
   selectPendingQuestionOptionIndex,
 } from "../pendingInput";
 
@@ -31,6 +33,16 @@ const baseRequest: PendingInputRequest = {
   canProceedWithoutAnswer: false,
 };
 
+function questionApproval(request: PendingInputRequest = baseRequest) {
+  return {
+    itemId: "item-questions",
+    description: "Need input",
+    highStakes: false,
+    mode: "question" as const,
+    request,
+  };
+}
+
 describe("pendingInput", () => {
   it("maps option numbers to structured answers", () => {
     expect(buildPendingInputAnswers(baseRequest, "2")).toEqual({ path: "manual" });
@@ -157,13 +169,7 @@ describe("pendingInput", () => {
         },
       ],
     };
-    const approval = {
-      itemId: "item-questions",
-      description: "Need input",
-      highStakes: false,
-      mode: "question" as const,
-      request,
-    };
+    const approval = questionApproval(request);
 
     const initial = createPendingQuestionSelectionState(approval)!;
     expect(pendingQuestionSelectionValue(request, initial)).toBe("recommended");
@@ -197,13 +203,7 @@ describe("pendingInput", () => {
         multiSelect: true,
       }],
     };
-    const approval = {
-      itemId: "item-multi",
-      description: "Need input",
-      highStakes: false,
-      mode: "question" as const,
-      request,
-    };
+    const approval = questionApproval(request);
 
     const initial = createPendingQuestionSelectionState(approval)!;
     expect(pendingQuestionSelectionValue(request, initial)).toBeNull();
@@ -230,4 +230,89 @@ describe("pendingInput", () => {
     expect(pendingQuestionAnsweredCount(request, { path: "manual" })).toBe(1);
     expect(pendingQuestionAnsweredCount(request, { path: "manual", second: "yes" })).toBe(2);
   });
+
+  it("selects a numbered option provisionally until Enter submits the highlighted answer", () => {
+    const initial = createPendingQuestionSelectionState(questionApproval())!;
+    const result = selectPendingQuestionDigit(baseRequest, initial, "2");
+
+    expect(result.selected).toBe(true);
+    expect(pendingQuestionSelectionValue(baseRequest, result.state)).toBe("manual");
+    expect(result.state.answers).toEqual({});
+    expect(result.state.pendingDigitSelection).toEqual(expect.objectContaining({
+      digit: "2",
+      previousOptionIndex: 0,
+      questionId: "path",
+    }));
+  });
+
+  it("converts a provisional digit into free text and restores the previous option", () => {
+    const request: PendingInputRequest = {
+      ...baseRequest,
+      questions: [{
+        ...baseRequest.questions[0]!,
+        options: [
+          { label: "One", value: "one" },
+          { label: "Two", value: "two" },
+          { label: "Three", value: "three" },
+        ],
+      }],
+    };
+    const initial = createPendingQuestionSelectionState(questionApproval(request))!;
+    const selected = selectPendingQuestionDigit(request, initial, "3").state;
+
+    const converted = convertPendingQuestionDigitSelectionToText(request, selected, " apples");
+
+    expect(converted?.text).toBe("3 apples");
+    expect(converted?.state.pendingDigitSelection).toBeNull();
+    expect(converted ? pendingQuestionSelectionValue(request, converted.state) : null).toBe("one");
+  });
+
+  it("leaves out-of-range digits for the composer", () => {
+    const initial = createPendingQuestionSelectionState(questionApproval())!;
+    const result = selectPendingQuestionDigit(baseRequest, initial, "9");
+
+    expect(result.selected).toBe(false);
+    expect(result.state).toBe(initial);
+    expect(convertPendingQuestionDigitSelectionToText(baseRequest, result.state, "9")).toBeNull();
+  });
+
+  it("replaces a provisional quick-select on rapid in-range digits", () => {
+    const selectedOne = selectPendingQuestionDigit(baseRequest, createPendingQuestionSelectionState(questionApproval())!, "1").state;
+    const selectedTwo = selectPendingQuestionDigit(baseRequest, selectedOne, "2").state;
+
+    expect(pendingQuestionSelectionValue(baseRequest, selectedTwo)).toBe("manual");
+    expect(selectedTwo.pendingDigitSelection).toEqual(expect.objectContaining({
+      digit: "2",
+      previousOptionIndex: 0,
+    }));
+  });
+
+  it("converts an out-of-range second digit after a provisional quick-select into text", () => {
+    const request: PendingInputRequest = {
+      ...baseRequest,
+      questions: [{
+        ...baseRequest.questions[0]!,
+        options: [
+          { label: "One", value: "one" },
+          { label: "Two", value: "two" },
+          { label: "Three", value: "three" },
+        ],
+      }],
+    };
+    const selectedThree = selectPendingQuestionDigit(request, createPendingQuestionSelectionState(questionApproval(request))!, "3").state;
+    const ignoredNine = selectPendingQuestionDigit(request, selectedThree, "9");
+    const converted = convertPendingQuestionDigitSelectionToText(request, ignoredNine.state, "9");
+
+    expect(ignoredNine.selected).toBe(false);
+    expect(converted?.text).toBe("39");
+    expect(converted ? pendingQuestionSelectionValue(request, converted.state) : null).toBe("one");
+  });
+
+  it("keeps direct option selection immediate for click-style callers", () => {
+    const initial = createPendingQuestionSelectionState(questionApproval())!;
+    const selected = selectPendingQuestionOptionIndex(baseRequest, initial, 1);
+
+    expect(pendingQuestionSelectionValue(baseRequest, selected)).toBe("manual");
+    expect(selected.pendingDigitSelection).toBeNull();
+  });
 });
diff --git a/apps/ade-cli/src/tuiClient/__tests__/state.test.ts b/apps/ade-cli/src/tuiClient/__tests__/state.test.ts
index 84892e353..18f0f3460 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/state.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/state.test.ts
@@ -21,11 +21,17 @@ describe("ade code persisted state", () => {
         "/repo-a": "repo-a-lane",
         "/repo-b": "repo-b-lane",
       },
+      draftKind: "chat",
+      draftKindByProject: {
+        "/repo-a": "chat",
+        "/repo-b": "cli",
+      },
     });
 
     expect(scopedAdeCodeState(state, "/repo-b")).toEqual({
       lastChatByLane: { main: "repo-b-chat" },
       lastLaneId: "repo-b-lane",
+      draftKind: "cli",
     });
   });
 
@@ -33,6 +39,7 @@ describe("ade code persisted state", () => {
     const state = normalizeAdeCodeState({
       lastChatByLane: { main: "legacy-chat" },
       lastLaneId: "legacy-lane",
+      draftKind: "cli",
       lastChatByProjectLane: {
         "/repo-a": { main: "repo-a-chat" },
       },
@@ -44,6 +51,7 @@ describe("ade code persisted state", () => {
     expect(scopedAdeCodeState(state, "/repo-b")).toEqual({
       lastChatByLane: { main: "legacy-chat" },
       lastLaneId: "legacy-lane",
+      draftKind: "cli",
     });
   });
 
@@ -59,6 +67,12 @@ describe("ade code persisted state", () => {
         "/repo-a": "repo-a-lane",
         "/repo-b": null,
       },
+      draftKind: "terminal",
+      draftKindByProject: {
+        "/repo-a": "cli",
+        "/repo-b": "terminal",
+        "/repo-c": "chat",
+      },
     });
 
     expect(state).toEqual({
@@ -66,6 +80,8 @@ describe("ade code persisted state", () => {
       lastChatByProjectLane: { "/repo-a": { main: "repo-a-chat" } },
       lastLaneId: null,
       lastLaneByProject: { "/repo-a": "repo-a-lane" },
+      draftKind: "chat",
+      draftKindByProject: { "/repo-a": "cli", "/repo-c": "chat" },
     });
   });
 
@@ -76,10 +92,12 @@ describe("ade code persisted state", () => {
     await saveAdeCodeProjectStateAsync("/repo-a", {
       lastChatByLane: { main: "repo-a-chat" },
       lastLaneId: "repo-a-lane",
+      draftKind: "chat",
     });
     await saveAdeCodeProjectStateAsync("/repo-b", {
       lastChatByLane: { main: "repo-b-chat" },
       lastLaneId: "repo-b-lane",
+      draftKind: "cli",
     });
 
     const persisted = loadAdeCodeState();
@@ -91,6 +109,11 @@ describe("ade code persisted state", () => {
       [path.resolve("/repo-a")]: "repo-a-lane",
       [path.resolve("/repo-b")]: "repo-b-lane",
     });
+    expect(persisted.draftKindByProject).toEqual({
+      [path.resolve("/repo-a")]: "chat",
+      [path.resolve("/repo-b")]: "cli",
+    });
+    expect(persisted.draftKind).toBe("cli");
     expect(fs.existsSync(path.join(stateDir, "ade-code-state.json.lock"))).toBe(false);
   });
 
@@ -104,6 +127,7 @@ describe("ade code persisted state", () => {
     const savePromise = saveAdeCodeProjectStateAsync("/repo-a", {
       lastChatByLane: { main: "repo-a-chat" },
       lastLaneId: "repo-a-lane",
+      draftKind: "cli",
     });
     let settled = false;
     savePromise.then(() => {
@@ -120,6 +144,9 @@ describe("ade code persisted state", () => {
     expect(persisted.lastChatByProjectLane).toEqual({
       [path.resolve("/repo-a")]: { main: "repo-a-chat" },
     });
+    expect(persisted.draftKindByProject).toEqual({
+      [path.resolve("/repo-a")]: "cli",
+    });
     expect(fs.existsSync(lockPath)).toBe(false);
   });
 });
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index edcdeefe6..50507ba8b 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -42,6 +42,7 @@ import type { AiSettingsStatus, OpenCodeRuntimeSnapshot } from "../../../desktop
 import type { DiffLineStats, GitConflictState } from "../../../desktop/src/shared/types/git";
 import type { LaneDeleteRisk, LaneLinearIssue, LaneSummary } from "../../../desktop/src/shared/types/lanes";
 import type { FeedbackPreparedDraft, FeedbackSubmission } from "../../../desktop/src/shared/types/feedback";
+import type { ProjectSecretsListResult, ProjectSecretValueResult } from "../../../desktop/src/shared/types/projectSecrets";
 import type { ChatTerminalPreviewResult, ChatTerminalSession } from "../../../desktop/src/shared/types";
 import {
   DEFAULT_CODEX_REASONING_EFFORT,
@@ -170,6 +171,7 @@ import { resolveTuiChatRefreshTarget } from "./project";
 import { chatSelectionCopyText, resolveDrawerChatSelection } from "./drawerSelection";
 import { sortLanesForStackGraph } from "./laneTree";
 import { latestExpandableFailureId, renderObject, summarizeDiffChanges } from "./format";
+import { formatRelativePastTime } from "./relativeTime";
 import { startTuiHeartbeat, type TuiHeartbeat } from "./heartbeat";
 import { clipboardScratchDir, isImageFilePath, latestOpenableImageTarget, readClipboardImageAttachment, readImageDimensions } from "./imageTargets";
 import { appendReservedTuiEvent, dedupeTuiEvents, reserveTuiEventDedupKey, syncTuiEventDedupKeys } from "./eventDedup";
@@ -220,6 +222,7 @@ import {
 import {
   answerForQuestion,
   buildPendingInputAnswers,
+  convertPendingQuestionDigitSelectionToText,
   createPendingQuestionSelectionState,
   ensurePendingQuestionSelectionState,
   latestPendingApproval,
@@ -228,6 +231,7 @@ import {
   optionsForPendingQuestion,
   pendingQuestionAnsweredCount,
   pendingQuestionSelectionValue,
+  selectPendingQuestionDigit,
   selectPendingQuestionOptionIndex,
   setPendingQuestionOptionIndex,
   type PendingQuestionSelectionState,
@@ -301,7 +305,11 @@ type PaneFocus = "drawer" | "chat" | "details" | "addMode";
 type AddModeState = { cursorLaneId: string; cursorChatId: string | null };
 export type FooterControl = "drawer" | "details" | "agents";
 type DrawerLaneAction = "new-lane";
-type DrawerChatAction = "new-chat";
+type DrawerChatAction = "new-chat" | "closed-toggle";
+type DrawerChatListItem =
+  | { kind: "chat"; session: AgentChatSessionSummary }
+  | { kind: "closed-toggle"; laneId: string; count: number; expanded: boolean }
+  | { kind: "closed-chat"; session: AgentChatSessionSummary };
 
 // Streaming chat events are coalesced into a single React render per frame
 // (~40fps) instead of one render per token. Lifecycle edges (turn start/stop,
@@ -767,6 +775,57 @@ function terminalSessionToChatSummary(session: ChatTerminalSession): AgentChatSe
   };
 }
 
+function sortSessionsByRecentActivity<T extends { startedAt: string; lastActivityAt?: string | null }>(sessions: T[]): T[] {
+  return [...sessions].sort((left, right) => {
+    const rightMs = Date.parse(right.lastActivityAt ?? right.startedAt);
+    const leftMs = Date.parse(left.lastActivityAt ?? left.startedAt);
+    return (Number.isFinite(rightMs) ? rightMs : 0) - (Number.isFinite(leftMs) ? leftMs : 0);
+  });
+}
+
+function buildDrawerChatItems(args: {
+  openSessions: AgentChatSessionSummary[];
+  closedSessions: AgentChatSessionSummary[];
+  closedToggleVisible: boolean;
+  closedExpanded: boolean;
+  laneId: string | null;
+}): DrawerChatListItem[] {
+  const items: DrawerChatListItem[] = args.openSessions.map((session) => ({ kind: "chat", session }));
+  if (args.closedToggleVisible && args.laneId) {
+    items.push({
+      kind: "closed-toggle",
+      laneId: args.laneId,
+      count: args.closedSessions.length,
+      expanded: args.closedExpanded,
+    });
+    if (args.closedExpanded) {
+      items.push(...args.closedSessions.map((session): DrawerChatListItem => ({ kind: "closed-chat", session })));
+    }
+  }
+  return items;
+}
+
+function sessionFromDrawerChatItem(item: DrawerChatListItem | null | undefined): AgentChatSessionSummary | null {
+  return item?.kind === "chat" || item?.kind === "closed-chat" ? item.session : null;
+}
+
+function drawerChatActionForItem(item: DrawerChatListItem | null | undefined): DrawerChatAction | null {
+  return item?.kind === "closed-toggle" ? "closed-toggle" : null;
+}
+
+const RIGHT_CHAT_CLOSED_TOGGLE_ID = "__closed_cli_toggle__";
+
+function closedCliRightPaneRow(session: AgentChatSessionSummary, activeSessionId: string | null): string {
+  const active = session.sessionId === activeSessionId ? "●" : "○";
+  const provider = theme.provider((session.provider as AdeCodeProvider) ?? null);
+  const ended = formatRelativePastTime(session.endedAt ?? session.lastActivityAt ?? session.startedAt);
+  return `${active} ${provider.glyph} ${session.title ?? session.sessionId} · ended ${ended}`;
+}
+
+function openChatRightPaneRow(session: AgentChatSessionSummary, activeSessionId: string | null): string {
+  return `${session.sessionId === activeSessionId ? "●" : "○"} ${session.title ?? session.sessionId} · ${session.provider}`;
+}
+
 export function chatSessionToOptimisticSummary(
   session: AgentChatSession,
   title?: string | null,
@@ -893,11 +952,11 @@ export function shouldHydrateRefreshHistory(args: {
     || args.loadedSessionId !== args.nextSessionId;
 }
 
-function initialModelState(): AdeCodeModelState {
+export function initialModelState(draftKind: AdeCodeInterfaceMode = "chat"): AdeCodeModelState {
   const descriptor = getDefaultModelDescriptor("codex");
   return {
     provider: "codex",
-    interfaceMode: "chat",
+    interfaceMode: draftKind,
     model: descriptor?.providerModelId ?? "gpt-5.5",
     modelId: descriptor?.id ?? null,
     displayName: descriptor?.displayName ?? "GPT-5.5",
@@ -3267,7 +3326,12 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const [slashCommands, setSlashCommands] = useState<AgentChatSlashCommand[]>([]);
   const [keybindings, setKeybindings] = useState(() => readClaudeKeybindingsFile({ create: false }).bindings);
   const [models, setModels] = useState<AgentChatModelInfo[]>([]);
-  const [modelState, setModelState] = useState<AdeCodeModelState>(initialModelState);
+  const [initialAdeCodeState] = useState(() => (
+    remoteLaunch
+      ? { lastChatByLane: {}, lastLaneId: null, draftKind: "chat" as AdeCodeInterfaceMode }
+      : scopedAdeCodeState(loadAdeCodeState(), project.projectRoot)
+  ));
+  const [modelState, setModelState] = useState<AdeCodeModelState>(() => initialModelState(initialAdeCodeState.draftKind));
   const [modeChangeNotice, setModeChangeNotice] = useState<{ summary: string; key: string } | null>(null);
   const lastPermissionSummaryRef = useRef<string | null>(null);
   const modeNoticeTimerRef = useRef<NodeJS.Timeout | null>(null);
@@ -3297,6 +3361,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const [formValues, setFormValues] = useState<Record<string, string>>({});
   const [formFieldIndex, setFormFieldIndex] = useState(0);
   const [rightSelectionIndex, setRightSelectionIndex] = useState(0);
+  const [rightChatsClosedExpanded, setRightChatsClosedExpanded] = useState(false);
   const [drawerOpen, setDrawerOpen] = useState(false);
   const [rightOpen, setRightOpen] = useState(false);
   const [activePane, setActivePane] = useState<PaneFocus>("chat");
@@ -3354,6 +3419,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const [helpRecents, setHelpRecents] = useState<string[]>([]);
   const helpRecentsRef = useRef<string[]>([]);
   helpRecentsRef.current = helpRecents;
+  const rightChatsQueryRef = useRef("");
   // Indexed (grouped, keybind-enriched) command reference. Rebuilt only when the
   // user's Claude keybinding registry changes, so keybind chips reflect config.
   const helpIndexGroups = useMemo(() => buildHelpIndex(BUILTIN_COMMANDS, keybindings), [keybindings]);
@@ -3361,6 +3427,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const [drawerPreviewSessionId, setDrawerPreviewSessionId] = useState<string | null>(null);
   const [drawerPreviewEvents, setDrawerPreviewEvents] = useState<AgentChatEventEnvelope[]>([]);
   const [drawerLaneId, setDrawerLaneId] = useState<string | null>(null);
+  const [drawerClosedCliExpandedLaneIds, setDrawerClosedCliExpandedLaneIds] = useState<Set<string>>(() => new Set());
   const [selectedDrawerLaneId, setSelectedDrawerLaneId] = useState<string | null>(null);
   const [selectedDrawerChatId, setSelectedDrawerChatId] = useState<string | null>(null);
   const [selectedDrawerLaneAction, setSelectedDrawerLaneAction] = useState<DrawerLaneAction | null>(null);
@@ -3457,13 +3524,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const draftSeededFromHistoryRef = useRef(false);
   const initialNewChatPreviewRef = useRef(true);
   const attachProbeInFlightRef = useRef(false);
-  const [initialAdeCodeState] = useState(() => (
-    remoteLaunch
-      ? { lastChatByLane: {}, lastLaneId: null }
-      : scopedAdeCodeState(loadAdeCodeState(), project.projectRoot)
-  ));
   const lastChatByLaneRef = useRef<Map<string, string>>(new Map(Object.entries(initialAdeCodeState.lastChatByLane)));
   const lastLaneIdRef = useRef<string | null>(initialAdeCodeState.lastLaneId);
+  const draftKindRef = useRef<AdeCodeInterfaceMode>(initialAdeCodeState.draftKind);
   const lastChatByLaneWriteTimerRef = useRef<NodeJS.Timeout | null>(null);
   const pendingNewChatTitleRef = useRef<string | null>(null);
   const lastUserOpenedPaneRef = useRef<RightPaneContent["kind"] | null>(null);
@@ -3487,7 +3550,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const claudeTerminalSubmitQueueRef = useRef<Promise<unknown>>(Promise.resolve());
   const lastModelPickerClaudeSentKeyRef = useRef<string | null>(null);
   const exitRequestedRef = useRef(false);
-  const modelStateRef = useRef<AdeCodeModelState>(initialModelState());
+  const modelStateRef = useRef<AdeCodeModelState>(initialModelState(initialAdeCodeState.draftKind));
   const chatMouseSelectionRef = useRef<ChatSelectionState | null>(null);
   const chatSelectionAnchorRef = useRef<ChatSelectionPoint | null>(null);
   const selectableChatRowCountRef = useRef(0);
@@ -3597,10 +3660,19 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       for (const [laneId, sessionId] of lastChatByLaneRef.current) {
         lastChatByLane[laneId] = sessionId;
       }
-      saveAdeCodeProjectState(project.projectRoot, { lastChatByLane, lastLaneId: lastLaneIdRef.current });
+      saveAdeCodeProjectState(project.projectRoot, {
+        lastChatByLane,
+        lastLaneId: lastLaneIdRef.current,
+        draftKind: draftKindRef.current,
+      });
     }, 500);
   }, [project.projectRoot, remoteLaunch]);
 
+  const persistExplicitDraftKind = useCallback((draftKind: AdeCodeInterfaceMode) => {
+    draftKindRef.current = draftKind;
+    persistAdeCodeState();
+  }, [persistAdeCodeState]);
+
   const setChatScrollOffset = useCallback((value: number | ((previous: number) => number)) => {
     const multiSessionId = (gridViewActiveRef.current ? focusedSessionIdForMultiView(multiViewRef.current) : null);
     if (multiSessionId) {
@@ -4056,14 +4128,28 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   );
   const activeTerminalProvider = terminalSessionProvider(activeTerminalSession);
   const displaySessions = useMemo(
-    () => [...sessions.filter((session) => !session.archivedAt), ...terminalSessions.map(terminalSessionToChatSummary)]
-      .sort((left, right) => {
-        const rightMs = Date.parse(right.lastActivityAt ?? right.startedAt);
-        const leftMs = Date.parse(left.lastActivityAt ?? left.startedAt);
-        return (Number.isFinite(rightMs) ? rightMs : 0) - (Number.isFinite(leftMs) ? leftMs : 0);
-      }),
+    () => sortSessionsByRecentActivity([
+      ...sessions.filter((session) => !session.archivedAt),
+      ...terminalSessions.map(terminalSessionToChatSummary),
+    ]),
     [sessions, terminalSessions],
   );
+  const closedCliSessions = useMemo(
+    () => sortSessionsByRecentActivity(
+      terminalSessions
+        .filter((session) => session.status !== "running" && terminalSessionProvider(session) != null)
+        .map(terminalSessionToChatSummary),
+    ),
+    [terminalSessions],
+  );
+  const closedCliSessionIds = useMemo(
+    () => new Set(closedCliSessions.map((session) => session.sessionId)),
+    [closedCliSessions],
+  );
+  const openDrawerSessions = useMemo(
+    () => displaySessions.filter((session) => !closedCliSessionIds.has(session.sessionId)),
+    [closedCliSessionIds, displaySessions],
+  );
   const sessionBySessionId = useMemo(() => {
     const out: Record<string, AgentChatSessionSummary> = {};
     for (const session of displaySessions) out[session.sessionId] = session;
@@ -4422,8 +4508,12 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     [lanes],
   );
   const drawerLaneSessions = useMemo(
-    () => displaySessions.filter((session) => session.laneId === drawerLaneId),
-    [displaySessions, drawerLaneId],
+    () => openDrawerSessions.filter((session) => session.laneId === drawerLaneId),
+    [drawerLaneId, openDrawerSessions],
+  );
+  const drawerLaneClosedSessions = useMemo(
+    () => closedCliSessions.filter((session) => session.laneId === (drawerLaneId ?? activeLaneId)),
+    [activeLaneId, closedCliSessions, drawerLaneId],
   );
   const selectedLaneIndex = useMemo(() => {
     if (selectedDrawerLaneAction === "new-lane") return drawerLaneRows.length;
@@ -4439,7 +4529,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   // Single source of truth for the drawer's row layout, shared with the
   // Drawer renderer (which derives the identical layout from the same inputs)
   // so mouse hit-testing cannot drift from what is on screen.
-  const drawerSessionsSource = addMode ? tileableDisplaySessions : displaySessions;
+  const drawerSessionsSource = addMode ? tileableDisplaySessions : openDrawerSessions;
   const drawerLayoutValue = useMemo<DrawerLayout>(() => {
     const mode = addMode ? "chats" : drawerSection;
     const sliceSelected = addMode ? addModeLaneIndex : selectedLaneIndex;
@@ -4457,6 +4547,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       lanes: orderedDrawerLanes.map((lane): DrawerLaneInput => ({
         laneId: lane.id,
         chatCount: drawerSessionsSource.filter((session) => session.laneId === lane.id).length,
+        closedChatCount: addMode ? 0 : closedCliSessions.filter((session) => session.laneId === lane.id).length,
+        closedExpanded: drawerClosedCliExpandedLaneIds.has(lane.id),
         worktreeAvailable: !unavailableLaneIds.has(lane.id),
       })),
       expandedLaneIndex: expandedAbsolute,
@@ -4472,6 +4564,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     drawerScrollOffsetRows,
     drawerSection,
     drawerSessionsSource,
+    drawerClosedCliExpandedLaneIds,
+    closedCliSessions,
     orderedDrawerLanes,
     selectedLaneIndex,
     unavailableLaneIds,
@@ -4492,6 +4586,17 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       .slice(0, plan.visibleChatCount);
     return laneSessions[hit.chatIndex] ?? null;
   }, [drawerSessionsSource]);
+  const drawerClosedSessionForHit = useCallback((
+    hit: { laneIndex: number; closedIndex: number },
+    layout: DrawerLayout,
+  ): AgentChatSessionSummary | null => {
+    const plan = layout.lanes[hit.laneIndex];
+    if (!plan) return null;
+    const laneSessions = closedCliSessions
+      .filter((session) => session.laneId === plan.laneId)
+      .slice(0, plan.visibleClosedChatCount);
+    return laneSessions[hit.closedIndex] ?? null;
+  }, [closedCliSessions]);
   const drawerVisibleLaneSessions = useMemo(() => {
     // Cap the browsable chat list at what the drawer actually renders for the
     // expanded lane so keyboard selection can't land on an invisible row.
@@ -4500,13 +4605,37 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     const cap = plan ? plan.visibleChatCount : visibleDrawerChatCount(drawerLaneSessions.length);
     return drawerLaneSessions.slice(0, cap);
   }, [activeLaneId, drawerLaneId, drawerLaneSessions, drawerLayoutValue]);
+  const drawerVisibleLaneClosedSessions = useMemo(() => {
+    const laneId = drawerLaneId ?? activeLaneId;
+    const plan = drawerLayoutValue.lanes.find((entry) => entry.laneId === laneId && entry.expanded) ?? null;
+    const cap = plan?.visibleClosedChatCount ?? 0;
+    return drawerLaneClosedSessions.slice(0, cap);
+  }, [activeLaneId, drawerLaneClosedSessions, drawerLaneId, drawerLayoutValue]);
+  const drawerVisibleChatItems = useMemo(() => {
+    const laneId = drawerLaneId ?? activeLaneId;
+    const plan = drawerLayoutValue.lanes.find((entry) => entry.laneId === laneId && entry.expanded) ?? null;
+    return buildDrawerChatItems({
+      laneId,
+      openSessions: drawerVisibleLaneSessions,
+      closedSessions: drawerVisibleLaneClosedSessions,
+      closedToggleVisible: plan?.closedToggleVisible ?? false,
+      closedExpanded: plan?.closedExpanded ?? false,
+    });
+  }, [activeLaneId, drawerLaneId, drawerLayoutValue, drawerVisibleLaneClosedSessions, drawerVisibleLaneSessions]);
   const selectedChatIndex = useMemo(() => {
-    if (selectedDrawerChatAction === "new-chat") return drawerVisibleLaneSessions.length;
+    if (selectedDrawerChatAction === "new-chat") return drawerVisibleChatItems.length;
+    if (selectedDrawerChatAction === "closed-toggle") {
+      const index = drawerVisibleChatItems.findIndex((item) => item.kind === "closed-toggle");
+      return index >= 0 ? index : 0;
+    }
     const targetId = selectedDrawerChatId
       ?? (drawerLaneId === activeLaneId ? activeSessionId : null);
-    const index = drawerVisibleLaneSessions.findIndex((session) => session.sessionId === targetId);
+    const index = drawerVisibleChatItems.findIndex((item) => {
+      const session = sessionFromDrawerChatItem(item);
+      return session?.sessionId === targetId;
+    });
     return index >= 0 ? index : 0;
-  }, [activeLaneId, activeSessionId, drawerLaneId, drawerVisibleLaneSessions, selectedDrawerChatAction, selectedDrawerChatId]);
+  }, [activeLaneId, activeSessionId, drawerLaneId, drawerVisibleChatItems, selectedDrawerChatAction, selectedDrawerChatId]);
   const addModeChatIndex = useMemo(() => {
     if (!addMode) return selectedChatIndex;
     const allLaneSessions = tileableDisplaySessions.filter((session) => session.laneId === addMode.cursorLaneId);
@@ -4545,6 +4674,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       clearLoadedTranscript();
       return;
     }
+    if (selection.action === "closed-toggle") {
+      return;
+    }
 
     if (!selection.session) {
       draftChatActiveRef.current = false;
@@ -4645,8 +4777,29 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       }
     })();
   }, [clearOlderHistoryCursor, commitActiveSessionEvents, mergeHydratedEventsWithLive, seedOlderHistoryCursor, selectActiveLaneId, selectActiveSessionId, setDraftChatMode, setGridView, setSessionInterrupted, setSessionStreaming, setStreaming]);
+  const toggleDrawerClosedCliGroup = useCallback((laneId: string | null) => {
+    if (!laneId) return;
+    setDrawerClosedCliExpandedLaneIds((prev) => {
+      const next = new Set(prev);
+      if (next.has(laneId)) next.delete(laneId);
+      else next.add(laneId);
+      return next;
+    });
+    setSelectedDrawerChatAction("closed-toggle");
+    setSelectedDrawerChatId(null);
+  }, []);
+  const selectDrawerChatIndex = useCallback((index: number) => {
+    const item = drawerVisibleChatItems[index] ?? null;
+    const session = sessionFromDrawerChatItem(item);
+    const action = item ? drawerChatActionForItem(item) : "new-chat";
+    setSelectedDrawerChatAction(action);
+    setSelectedDrawerChatId(session?.sessionId ?? null);
+    if (action !== "closed-toggle") {
+      applyDrawerChatSelection({ session, action });
+    }
+  }, [applyDrawerChatSelection, drawerVisibleChatItems]);
   const enterDrawerChatListForLane = useCallback((lane: LaneSummary) => {
-    const laneSessions = displaySessions.filter((entry) => entry.laneId === lane.id);
+    const laneSessions = openDrawerSessions.filter((entry) => entry.laneId === lane.id);
     const visibleSessions = laneSessions.slice(0, visibleDrawerChatCount(laneSessions.length));
     const lastSessionId = lastChatByLaneRef.current.get(lane.id);
     const session =
@@ -4661,7 +4814,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     setSelectedDrawerChatId(session?.sessionId ?? null);
     setSelectedDrawerChatAction(action);
     applyDrawerChatSelection({ session: session ?? null, action });
-  }, [applyDrawerChatSelection, displaySessions, selectActiveLaneId]);
+  }, [applyDrawerChatSelection, openDrawerSessions, selectActiveLaneId]);
   const activeMentionRange = useMemo(() => (
     activePane === "chat" ? activeMention(prompt) : null
   ), [activePane, prompt]);
@@ -5222,7 +5375,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   }, [activeLaneId, drawerLaneId, drawerSection, lanes, selectedDrawerLaneId]);
 
   const drawerPreviewSession = useMemo(() => {
-    if (drawerSection !== "chats" || selectedDrawerChatAction === "new-chat" || !selectedDrawerChatId) {
+    if (drawerSection !== "chats" || selectedDrawerChatAction !== null || !selectedDrawerChatId) {
       return null;
     }
     return displaySessions.find((session) => session.sessionId === selectedDrawerChatId) ?? null;
@@ -5304,7 +5457,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       setDrawerPreviewEvents([]);
       return;
     }
-    if (selectedDrawerChatAction === "new-chat" || !selectedDrawerChatId) {
+    if (selectedDrawerChatAction !== null || !selectedDrawerChatId) {
       setDrawerPreviewSessionId(null);
       setDrawerPreviewEvents([]);
       return;
@@ -5750,14 +5903,17 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       activeSessionId,
       draftChatActive,
       drawerLaneId,
-      drawerVisibleLaneSessions,
+      drawerVisibleLaneSessions: drawerVisibleChatItems
+        .map(sessionFromDrawerChatItem)
+        .filter((session): session is AgentChatSessionSummary => Boolean(session)),
+      closedToggleVisible: drawerVisibleChatItems.some((item) => item.kind === "closed-toggle"),
       selectedDrawerChatAction,
       selectedDrawerChatId,
     });
     if (!next) return;
     setSelectedDrawerChatId(next.selectedDrawerChatId);
     setSelectedDrawerChatAction(next.selectedDrawerChatAction);
-  }, [activeLaneId, activeSessionId, draftChatActive, drawerLaneId, drawerVisibleLaneSessions, selectedDrawerChatAction, selectedDrawerChatId]);
+  }, [activeLaneId, activeSessionId, draftChatActive, drawerLaneId, drawerVisibleChatItems, selectedDrawerChatAction, selectedDrawerChatId]);
 
   useEffect(() => {
     setSlashIndex(0);
@@ -5834,7 +5990,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   }, [addNotice]);
 
   const activateLaneWithLastChat = useCallback((lane: LaneSummary, options: { notify?: boolean } = {}) => {
-    const laneSessions = displaySessions.filter((entry) => entry.laneId === lane.id);
+    const laneSessions = openDrawerSessions.filter((entry) => entry.laneId === lane.id);
     const lastSessionId = lastChatByLaneRef.current.get(lane.id);
     const session =
       laneSessions.find((entry) => entry.sessionId === lastSessionId)
@@ -5848,7 +6004,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     setSelectedDrawerChatAction(action);
     applyDrawerChatSelection({ session: session ?? null, action });
     if (options.notify) addNotice(`Switched to lane ${lane.name}.`, "success");
-  }, [addNotice, applyDrawerChatSelection, displaySessions, selectActiveLaneId]);
+  }, [addNotice, applyDrawerChatSelection, openDrawerSessions, selectActiveLaneId]);
 
   const cycleActiveLane = useCallback((direction: 1 | -1) => {
     if (!orderedDrawerLanes.length) return;
@@ -6939,7 +7095,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     const nextSessions = mergeOptimisticChatSessions(listedSessions, optimisticChatSessionsRef.current);
     const listedTerminalSessions = await listTerminalSessions(conn).catch(() => []);
     const nextTerminalSessions = mergeOptimisticTerminalSessions(listedTerminalSessions, optimisticTerminalSessionsRef.current);
-    const nextDisplaySessions = [...nextSessions, ...nextTerminalSessions.map(terminalSessionToChatSummary)];
+    const nextDisplaySessions = sortSessionsByRecentActivity([
+      ...nextSessions,
+      ...nextTerminalSessions.map(terminalSessionToChatSummary),
+    ]);
     const draftMode = draftChatActiveRef.current;
     const target = resolveTuiChatRefreshTarget({
       lanes: nextLanes,
@@ -7469,7 +7628,11 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
           for (const [laneId, sessionId] of lastChatByLaneRef.current) {
             lastChatByLane[laneId] = sessionId;
           }
-          saveAdeCodeProjectState(project.projectRoot, { lastChatByLane, lastLaneId: lastLaneIdRef.current });
+          saveAdeCodeProjectState(project.projectRoot, {
+            lastChatByLane,
+            lastLaneId: lastLaneIdRef.current,
+            draftKind: draftKindRef.current,
+          });
         }
       }
       if (pendingModelCommitTimerRef.current) {
@@ -8505,6 +8668,143 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     return true;
   }, [addNotice, displaySessions, drawerSection, selectedDrawerChatAction, selectedDrawerChatId]);
 
+  const copyProjectSecret = useCallback(async (name: string): Promise<void> => {
+    const conn = connectionRef.current;
+    if (!conn) {
+      addNotice("ADE runtime is still connecting.", "error");
+      return;
+    }
+    const secret = await conn.action<ProjectSecretValueResult>("project_secret", "get", { name });
+    if (!writeClipboardText(secret.value)) {
+      addNotice("Could not find a clipboard command for this terminal.", "error");
+      return;
+    }
+    addNotice(`copied ${secret.name}`, "success");
+  }, [addNotice]);
+
+  const openSecretsPane = useCallback(async (): Promise<void> => {
+    const conn = connectionRef.current;
+    if (!conn) {
+      setRightPane({
+        kind: "details",
+        title: "Secrets",
+        body: "ADE runtime is still connecting. Try again when the connection is ready.",
+      });
+      return;
+    }
+    setRightPane({ kind: "list", title: "Secrets", rows: [], emptyText: "Loading secrets..." });
+    const result = await conn.action<ProjectSecretsListResult>("project_secret", "list", {});
+    const secrets = [...(result.secrets ?? [])].sort((left, right) => left.name.localeCompare(right.name));
+    setRightSelectionIndex(0);
+    setRightPane({
+      kind: "list",
+      title: "Secrets",
+      rows: secrets.map((secret) => `${secret.name} · •••• · ${secret.valueLength} chars`),
+      emptyText: "No secrets saved.",
+      action: { kind: "copy-secret", ids: secrets.map((secret) => secret.name) },
+    });
+  }, []);
+
+  const openChatsListPane = useCallback((rawQuery: string, closedExpanded = rightChatsClosedExpanded): void => {
+    const laneId = activeLaneIdRef.current;
+    const query = rawQuery.trim().toLowerCase();
+    rightChatsQueryRef.current = rawQuery;
+    if (!laneId) {
+      setRightPane({ kind: "details", title: "Chats", body: "No active lane is selected." });
+      return;
+    }
+    const matchesQuery = (session: AgentChatSessionSummary): boolean => !query
+      || session.sessionId.toLowerCase().includes(query)
+      || (session.title ?? "").toLowerCase().includes(query)
+      || (session.goal ?? "").toLowerCase().includes(query)
+      || session.provider.toLowerCase().includes(query);
+    const openMatches = openDrawerSessions
+      .filter((session) => session.laneId === laneId)
+      .filter(matchesQuery);
+    const closedMatches = closedCliSessions
+      .filter((session) => session.laneId === laneId)
+      .filter(matchesQuery);
+    const rows = openMatches.map((session) => openChatRightPaneRow(session, activeSessionIdRef.current));
+    const ids = openMatches.map((session) => session.sessionId);
+    if (closedMatches.length > 0) {
+      rows.push(`${closedExpanded ? "▾" : "▸"} closed (${closedMatches.length})`);
+      ids.push(RIGHT_CHAT_CLOSED_TOGGLE_ID);
+      if (closedExpanded) {
+        rows.push(...closedMatches.map((session) => closedCliRightPaneRow(session, activeSessionIdRef.current)));
+        ids.push(...closedMatches.map((session) => session.sessionId));
+      }
+    }
+    const activeId = activeSessionIdRef.current;
+    const activeIndex = activeId ? ids.indexOf(activeId) : -1;
+    const selectedIndex = activeIndex >= 0 ? activeIndex : 0;
+    setRightSelectionIndex(selectedIndex);
+    setRightPane({
+      kind: "list",
+      title: query ? `Chats · ${rawQuery.trim()}` : "Chats",
+      rows,
+      emptyText: query ? "No chats matched this filter." : "No chats in this lane.",
+      action: { kind: "chat-list", ids },
+    });
+  }, [closedCliSessions, openDrawerSessions, rightChatsClosedExpanded]);
+
+  const toggleRightChatsClosedGroup = useCallback(() => {
+    const next = !rightChatsClosedExpanded;
+    setRightChatsClosedExpanded(next);
+    openChatsListPane(rightChatsQueryRef.current, next);
+  }, [openChatsListPane, rightChatsClosedExpanded]);
+
+  const activateRightPaneListItem = useCallback((selectedId: string, actionKind: NonNullable<Extract<RightPaneContent, { kind: "list" }>["action"]>["kind"]) => {
+    if (actionKind === "copy-secret") {
+      void copyProjectSecret(selectedId).catch((err) => addNotice(err instanceof Error ? err.message : String(err), "error"));
+      return;
+    }
+    if (actionKind === "switch-lane") {
+      const lane = lanes.find((entry) => entry.id === selectedId);
+      if (!lane) return;
+      activateLaneWithLastChat(lane, { notify: true });
+      return;
+    }
+    if (actionKind === "chat-list" && selectedId === RIGHT_CHAT_CLOSED_TOGGLE_ID) {
+      toggleRightChatsClosedGroup();
+      return;
+    }
+    const session = displaySessions.find((entry) => entry.sessionId === selectedId);
+    if (!session) return;
+    selectActiveLaneId(session.laneId);
+    setDrawerLaneId(session.laneId);
+    setSelectedDrawerLaneId(session.laneId);
+    setSelectedDrawerChatAction(null);
+    setSelectedDrawerChatId(session.sessionId);
+    const terminal = actionKind === "chat-list"
+      ? terminalSessions.find((entry) => entry.terminalId === session.sessionId && entry.status !== "running") ?? null
+      : null;
+    if (terminal) {
+      if (!isTerminalSessionResumable(terminal)) {
+        addNotice("This CLI session cannot be resumed.", "info");
+        return;
+      }
+      void resumeClosedTerminalSession(terminal)
+        .then((resumed) => {
+          if (resumed) addNotice("Resuming CLI session…", "info");
+        })
+        .catch((err) => addNotice(err instanceof Error ? err.message : String(err), "error"));
+      return;
+    }
+    selectActiveSessionId(session.sessionId);
+    addNotice(`Switched to chat ${session.title ?? session.sessionId}.`, "success");
+  }, [
+    activateLaneWithLastChat,
+    addNotice,
+    copyProjectSecret,
+    displaySessions,
+    lanes,
+    resumeClosedTerminalSession,
+    selectActiveLaneId,
+    selectActiveSessionId,
+    terminalSessions,
+    toggleRightChatsClosedGroup,
+  ]);
+
   const sendOrSteerChatMessage = useCallback(async (
     sessionId: string,
     text: string,
@@ -8622,6 +8922,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         openModelPicker();
         return;
       }
+      if (name === "/secrets") {
+        await openSecretsPane();
+        return;
+      }
       if (name === "/effort") {
         openModelPicker({ focusKind: "reasoning" });
         return;
@@ -8786,6 +9090,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       setRightPane({ kind: "details", title: "Skills", body: listAgentMarkdownEntries(project.workspaceRoot, "skills") });
       return;
     }
+    if (name === "/secrets") {
+      await openSecretsPane();
+      return;
+    }
     if (name === "/init") {
       try {
         const body = ensureClaudeInitFiles(project.workspaceRoot);
@@ -9405,23 +9713,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       return;
     }
     if (name === "/chats") {
-      const query = args.trim().toLowerCase();
-      const laneSessions = displaySessions
-        .filter((session) => session.laneId === laneId)
-        .filter((session) => !query
-          || session.sessionId.toLowerCase().includes(query)
-          || (session.title ?? "").toLowerCase().includes(query)
-          || (session.goal ?? "").toLowerCase().includes(query)
-          || session.provider.toLowerCase().includes(query));
-      const selectedIndex = Math.max(0, laneSessions.findIndex((session) => session.sessionId === sessionId));
-      setRightSelectionIndex(selectedIndex);
-      setRightPane({
-        kind: "list",
-        title: query ? `Chats · ${args.trim()}` : "Chats",
-        rows: laneSessions.map((session) => `${session.sessionId === sessionId ? "●" : "○"} ${session.title ?? session.sessionId} · ${session.provider}`),
-        emptyText: query ? "No chats matched this filter." : "No chats in this lane.",
-        action: { kind: "switch-chat", ids: laneSessions.map((session) => session.sessionId) },
-      });
+      setRightChatsClosedExpanded(false);
+      openChatsListPane(args, false);
       return;
     }
     if (name === "/switch") {
@@ -9528,7 +9821,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         : result;
       setRightPane({ kind: "details", title: `ADE ${domain}.${action}`, body: renderObject(body, 24) });
     }
-  }, [activateLaneWithLastChat, activeCommandProvider, activeLane?.name, activeSession?.provider, activeSession?.sessionId, activeSession?.title, addNotice, applyDrawerChatSelection, archiveChat, archiveLane, ensureActiveSession, focusChat, focusDetails, lanes, mode, modelState.modelId, modelState.provider, modelState.reasoningEffort, models, openChatDeleteForm, openChatRenameForm, openFeedbackForm, openForm, openLaneDeleteForm, openLaneRenameForm, openModelPicker, openNewChatSetup, openNewLaneForm, openSubagentsPane, pendingSteers, project, refreshState, renameLane, runLaneSetupAfterCreate, selectActiveLaneId, selectActiveSessionId, sendOrSteerChatMessage, sessions, setChatScrollOffset, subagentPaneCommandAvailable, unarchiveChat, unarchiveLane]);
+  }, [activateLaneWithLastChat, activeCommandProvider, activeLane?.name, activeSession?.provider, activeSession?.sessionId, activeSession?.title, addNotice, applyDrawerChatSelection, archiveChat, archiveLane, ensureActiveSession, focusChat, focusDetails, lanes, mode, modelState.modelId, modelState.provider, modelState.reasoningEffort, models, openChatDeleteForm, openChatRenameForm, openChatsListPane, openFeedbackForm, openForm, openLaneDeleteForm, openLaneRenameForm, openModelPicker, openNewChatSetup, openNewLaneForm, openSecretsPane, openSubagentsPane, pendingSteers, project, refreshState, renameLane, runLaneSetupAfterCreate, selectActiveLaneId, selectActiveSessionId, sendOrSteerChatMessage, sessions, setChatScrollOffset, subagentPaneCommandAvailable, unarchiveChat, unarchiveLane]);
 
   const runInlineCommand = useCallback(async (name: string, args: string) => {
     if (name === "/quit") {
@@ -10872,10 +11165,11 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
 	      // Only two values, so any cycle direction toggles Chat ↔ CLI. Editable
 	      // rows only (disabled rows return above); a committed session's interface
 	      // is fixed by its type.
-	      const nextInterface = modelStateRef.current.interfaceMode === "cli" ? "chat" : "cli";
-	      const cursorModels = providerModelsCacheRef.current.get(providerModelsCacheKey("cursor", nextInterface))
-	        ?? (modelStateRef.current.provider === "cursor" ? models : registryModelsForProvider("cursor"));
-	      applyModelState((prev) => reconcileCursorModelStateForInterface(prev, nextInterface, cursorModels));
+		      const nextInterface = modelStateRef.current.interfaceMode === "cli" ? "chat" : "cli";
+		      const cursorModels = providerModelsCacheRef.current.get(providerModelsCacheKey("cursor", nextInterface))
+		        ?? (modelStateRef.current.provider === "cursor" ? models : registryModelsForProvider("cursor"));
+		      persistExplicitDraftKind(nextInterface);
+		      applyModelState((prev) => reconcileCursorModelStateForInterface(prev, nextInterface, cursorModels));
 	      if (modelStateRef.current.provider === "cursor") {
 	        void loadProviderModels("cursor", {
 	          applyDefault: false,
@@ -10954,7 +11248,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       lastUserOpenedPaneRef.current = null;
       focusChat();
     }
-  }, [addNotice, applyModelState, cycleModel, cyclePermission, cycleProvider, cycleReasoning, focusChat, loadProviderModels, models, refreshAiSetupStatus, refreshState, sendClaudeModelCommandToTerminal]);
+	  }, [addNotice, applyModelState, cycleModel, cyclePermission, cycleProvider, cycleReasoning, focusChat, loadProviderModels, models, persistExplicitDraftKind, refreshAiSetupStatus, refreshState, sendClaudeModelCommandToTerminal]);
 
   const recallPromptHistory = useCallback((direction: "previous" | "next"): boolean => {
     const focusedSessionId = (gridViewActiveRef.current ? focusedSessionIdForMultiView(multiViewRef.current) : null);
@@ -11727,6 +12021,29 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
               setSelectedDrawerChatId(session.sessionId);
               applyDrawerChatSelection({ session, action: null });
             }
+          } else if (hit?.kind === "closed-toggle") {
+            const lane = drawerLaneRows[hit.laneIndex];
+            if (lane) {
+              setSelectedDrawerLaneAction(null);
+              setSelectedDrawerLaneId(lane.id);
+              setDrawerLaneId(lane.id);
+              selectActiveLaneId(lane.id);
+              setDrawerSection("chats");
+              toggleDrawerClosedCliGroup(lane.id);
+            }
+          } else if (hit?.kind === "closed-chat") {
+            const session = drawerClosedSessionForHit(hit, drawerLayoutValue);
+            const lane = drawerLaneRows[hit.laneIndex];
+            if (session && lane) {
+              setSelectedDrawerLaneAction(null);
+              setSelectedDrawerLaneId(lane.id);
+              setDrawerLaneId(lane.id);
+              selectActiveLaneId(lane.id);
+              setDrawerSection("chats");
+              setSelectedDrawerChatAction(null);
+              setSelectedDrawerChatId(session.sessionId);
+              applyDrawerChatSelection({ session, action: null });
+            }
           } else if (hit?.kind === "new-chat") {
             setDrawerSection("chats");
             setSelectedDrawerChatAction("new-chat");
@@ -12557,23 +12874,33 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         updateQuestionState((state) => movePendingQuestionFocus(pendingQuestionApproval.request, state, key.leftArrow ? -1 : 1));
         return;
       }
+      const printableSuffix = !key.ctrl && !key.meta && !key.return ? printableInput(input) : "";
       if (/^[1-9]$/.test(input)) {
         let selected = false;
-        let submitAfterSelect = false;
         updateQuestionState((state) => {
-          const question = pendingQuestionApproval.request?.questions[state.activeQuestionIndex];
-          const options = optionsForPendingQuestion(pendingQuestionApproval.request, question, state.activeQuestionIndex);
-          if (!options[Number(input) - 1]) return state;
-          selected = true;
-          submitAfterSelect = question?.multiSelect !== true;
-          return selectPendingQuestionOptionIndex(pendingQuestionApproval.request, state, Number(input) - 1);
+          const result = selectPendingQuestionDigit(pendingQuestionApproval.request, state, input);
+          selected = result.selected;
+          return result.state;
         });
-        if (selected && submitAfterSelect) {
-          void submitSelectedPendingQuestion(pendingQuestionApproval)
-            .catch((err) => addNotice(err instanceof Error ? err.message : String(err), "error"));
+        if (selected) return;
+      }
+      if (printableSuffix) {
+        let convertedText: string | null = null;
+        updateQuestionState((state) => {
+          const result = convertPendingQuestionDigitSelectionToText(
+            pendingQuestionApproval.request,
+            state,
+            printableSuffix,
+          );
+          if (!result) return state;
+          convertedText = result.text;
+          return result.state;
+        });
+        if (convertedText != null) {
+          const next = insertPromptText(promptRef.current, promptCursorRef.current, convertedText);
+          handlePromptChange(next.value, next.cursor);
           return;
         }
-        if (selected) return;
       }
       if (key.return) {
         void submitSelectedPendingQuestion(pendingQuestionApproval)
@@ -13276,23 +13603,23 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       setRightSelectionIndex((index) => (max > 0 ? (index + 1) % max : 0));
       return;
     }
+    if (
+      pane === "details"
+      && rightOpen
+      && rightPane.kind === "list"
+      && rightPane.action?.kind === "copy-secret"
+      && input.toLowerCase() === "c"
+      && !key.ctrl
+      && !key.meta
+    ) {
+      const selectedId = rightPane.action.ids[rightSelectionIndex] ?? rightPane.action.ids[0] ?? null;
+      if (selectedId) activateRightPaneListItem(selectedId, rightPane.action.kind);
+      return;
+    }
     if (pane === "details" && rightOpen && rightPane.kind === "list" && rightPane.action && key.return) {
       const selectedId = rightPane.action.ids[rightSelectionIndex] ?? rightPane.action.ids[0] ?? null;
       if (!selectedId) return;
-      if (rightPane.action.kind === "switch-lane") {
-        const lane = lanes.find((entry) => entry.id === selectedId);
-        if (!lane) return;
-        activateLaneWithLastChat(lane, { notify: true });
-        return;
-      }
-      const session = displaySessions.find((entry) => entry.sessionId === selectedId);
-      if (!session) return;
-      selectActiveLaneId(session.laneId);
-      setDrawerLaneId(session.laneId);
-      setSelectedDrawerLaneId(session.laneId);
-      selectActiveSessionId(session.sessionId);
-      setSelectedDrawerChatId(session.sessionId);
-      addNotice(`Switched to chat ${session.title ?? session.sessionId}.`, "success");
+      activateRightPaneListItem(selectedId, rightPane.action.kind);
       return;
     }
 
@@ -13390,7 +13717,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       && !key.meta
       && (input === "r" || input === "R" || input === "a" || input === "A" || input === "x" || input === "X")
     ) {
-      const selectedChat = drawerVisibleLaneSessions[selectedChatIndex] ?? null;
+      const selectedItem = drawerVisibleChatItems[selectedChatIndex] ?? null;
+      const selectedChat = selectedItem?.kind === "chat" ? selectedItem.session : null;
       if (selectedChat && sessions.some((session) => session.sessionId === selectedChat.sessionId)) {
         const hotkey = input.toLowerCase();
         if (hotkey === "r") openChatRenameForm(selectedChat.sessionId);
@@ -13419,11 +13747,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         // The user uses Tab / Esc / Enter on the lane card to switch sections.
         if (selectedChatIndex <= 0 && selectedDrawerChatAction !== "new-chat") return;
         const nextIndex = Math.max(0, selectedChatIndex - 1);
-        const session = drawerVisibleLaneSessions[nextIndex] ?? null;
-        const action: DrawerChatAction | null = session ? null : "new-chat";
-        setSelectedDrawerChatAction(action);
-        setSelectedDrawerChatId(session?.sessionId ?? null);
-        applyDrawerChatSelection({ session, action });
+        selectDrawerChatIndex(nextIndex);
       }
       return;
     }
@@ -13448,14 +13772,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         // Chats section: clamp at the bottom (the "+ new chat" row) instead of
         // popping over to the next lane card.
         const atChatBottom = selectedDrawerChatAction === "new-chat"
-          || selectedChatIndex >= drawerVisibleLaneSessions.length;
+          || selectedChatIndex >= drawerVisibleChatItems.length;
         if (atChatBottom) return;
-        const nextIndex = Math.min(drawerVisibleLaneSessions.length, selectedChatIndex + 1);
-        const session = drawerVisibleLaneSessions[nextIndex] ?? null;
-        const action: DrawerChatAction | null = session ? null : "new-chat";
-        setSelectedDrawerChatAction(action);
-        setSelectedDrawerChatId(session?.sessionId ?? null);
-        applyDrawerChatSelection({ session, action });
+        const nextIndex = Math.min(drawerVisibleChatItems.length, selectedChatIndex + 1);
+        selectDrawerChatIndex(nextIndex);
       }
       return;
     }
@@ -13482,7 +13802,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
             addNotice(unavailableMessage, "error");
             return;
           }
-          const laneSessions = displaySessions.filter((entry) => entry.laneId === lane.id);
+          const laneSessions = openDrawerSessions.filter((entry) => entry.laneId === lane.id);
           const lastSessionId = lastChatByLaneRef.current.get(lane.id);
           const session =
             laneSessions.find((s) => s.sessionId === lastSessionId)
@@ -13496,11 +13816,31 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
           });
         }
       } else {
-        if (selectedDrawerChatAction === "new-chat" || selectedChatIndex >= drawerVisibleLaneSessions.length) {
+        if (selectedDrawerChatAction === "new-chat" || selectedChatIndex >= drawerVisibleChatItems.length) {
           openNewChatSetup();
           setRightOpen(true);
           return;
         }
+        if (selectedDrawerChatAction === "closed-toggle") {
+          toggleDrawerClosedCliGroup(drawerLaneId ?? activeLaneId);
+          return;
+        }
+        const selectedSession = sessionFromDrawerChatItem(drawerVisibleChatItems[selectedChatIndex]);
+        const selectedTerminal = selectedSession
+          ? terminalSessions.find((terminal) => terminal.terminalId === selectedSession.sessionId && terminal.status !== "running")
+          : null;
+        if (selectedTerminal) {
+          if (!isTerminalSessionResumable(selectedTerminal)) {
+            addNotice("This CLI session cannot be resumed.", "info");
+            return;
+          }
+          void resumeClosedTerminalSession(selectedTerminal)
+            .then((resumed) => {
+              if (resumed) addNotice("Resuming CLI session…", "info");
+            })
+            .catch((err) => addNotice(err instanceof Error ? err.message : String(err), "error"));
+          return;
+        }
         focusChat();
       }
       return;
@@ -14043,6 +14383,47 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
             },
             zIndex: 2,
           });
+        } else if (hit?.kind === "closed-toggle") {
+          const hitLane = drawerLaneRows[hit.laneIndex];
+          if (!hitLane) continue;
+          addTarget({
+            id: `drawer:closed-toggle:${hitLane.id}:${y}`,
+            rect: { x: 1, y, w: drawerPaneWidth, h: 1 },
+            onClick: () => {
+              if (addModeRef.current) return;
+              focusDrawerOnly();
+              setSelectedDrawerLaneAction(null);
+              setSelectedDrawerLaneId(hitLane.id);
+              setDrawerLaneId(hitLane.id);
+              selectActiveLaneId(hitLane.id);
+              setDrawerSection("chats");
+              toggleDrawerClosedCliGroup(hitLane.id);
+            },
+            zIndex: 2,
+          });
+        } else if (hit?.kind === "closed-chat") {
+          const session = drawerClosedSessionForHit(hit, drawerLayoutValue);
+          const hitLane = drawerLaneRows[hit.laneIndex];
+          if (!session) continue;
+          addTarget({
+            id: `drawer:closed-chat:${session.sessionId}:${y}`,
+            rect: { x: 1, y, w: drawerPaneWidth, h: 1 },
+            onClick: () => {
+              if (addModeRef.current) return;
+              focusDrawerOnly();
+              if (hitLane) {
+                setSelectedDrawerLaneAction(null);
+                setSelectedDrawerLaneId(hitLane.id);
+                setDrawerLaneId(hitLane.id);
+                selectActiveLaneId(hitLane.id);
+              }
+              setDrawerSection("chats");
+              setSelectedDrawerChatAction(null);
+              setSelectedDrawerChatId(session.sessionId);
+              applyDrawerChatSelection({ session, action: null });
+            },
+            zIndex: 2,
+          });
         } else if (hit?.kind === "new-chat") {
           addTarget({
             id: `drawer:new-chat:${y}`,
@@ -14543,20 +14924,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
               setRightSelectionIndex(index);
               const selectedId = rightPane.action?.ids[index] ?? null;
               if (!selectedId || !rightPane.action) return;
-              if (rightPane.action.kind === "switch-lane") {
-                const lane = lanes.find((entry) => entry.id === selectedId);
-                if (!lane) return;
-                activateLaneWithLastChat(lane, { notify: true });
-                return;
-              }
-              const session = displaySessions.find((entry) => entry.sessionId === selectedId);
-              if (!session) return;
-              selectActiveLaneId(session.laneId);
-              setDrawerLaneId(session.laneId);
-              setSelectedDrawerLaneId(session.laneId);
-              selectActiveSessionId(session.sessionId);
-              setSelectedDrawerChatId(session.sessionId);
-              addNotice(`Switched to chat ${session.title ?? session.sessionId}.`, "success");
+              activateRightPaneListItem(selectedId, rightPane.action.kind);
             },
             zIndex: 3,
           });
@@ -14576,6 +14944,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     addNotice,
     addTileToGrid,
     answerPendingInput,
+    activateRightPaneListItem,
     activateLaneWithLastChat,
     applyDrawerChatSelection,
     centerWidth,
@@ -14595,6 +14964,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     drawerLayoutValue,
     drawerOpen,
     drawerPaneWidth,
+    drawerClosedSessionForHit,
     drawerSessionForChatHit,
     drawerVisibleLaneSessions,
     focusChat,
@@ -14660,6 +15030,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     submitSelectedPendingQuestion,
     submitPrompt,
     tileableDisplaySessions,
+    toggleDrawerClosedCliGroup,
     toggleDetailsPane,
     toggleDrawerPane,
     toggleModelPickerFavoriteId,
@@ -14816,7 +15187,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
           {drawerOpen ? (
             <Drawer
               lanes={lanes}
-              sessions={addMode ? tileableDisplaySessions : displaySessions}
+              sessions={addMode ? tileableDisplaySessions : openDrawerSessions}
+              closedSessions={addMode ? [] : closedCliSessions}
               activeLaneId={activeLaneId}
               activeSessionId={activeSessionId}
               browsingLaneId={addMode?.cursorLaneId ?? drawerLaneId ?? activeLaneId}
@@ -14829,10 +15201,11 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
               loading={mode === "connecting" || lanes.length === 0}
               prByLaneId={prByLaneId}
               diffByLaneId={diffByLaneId}
-	              unavailableLaneIds={unavailableLaneIds}
-	              width={drawerPaneWidth}
-	              scrollOffsetRows={drawerScrollOffsetRows}
-	            />
+              unavailableLaneIds={unavailableLaneIds}
+              width={drawerPaneWidth}
+              scrollOffsetRows={drawerScrollOffsetRows}
+              closedCliExpandedLaneIds={drawerClosedCliExpandedLaneIds}
+            />
           ) : null}
           <Box width={centerWidth} flexDirection="column">
             {pendingApproval?.highStakes ? (
diff --git a/apps/ade-cli/src/tuiClient/commands.ts b/apps/ade-cli/src/tuiClient/commands.ts
index 27c9e3734..703d86ac9 100644
--- a/apps/ade-cli/src/tuiClient/commands.ts
+++ b/apps/ade-cli/src/tuiClient/commands.ts
@@ -66,6 +66,7 @@ export const BUILTIN_COMMANDS: BuiltinCommand[] = [
   { name: "/agents", description: "List Claude agents from user and project config", placement: "right", providers: ["claude"], category: "Nav" },
   { name: "/info", description: "Open active chat info, plan, goal, and agents", placement: "right", category: "Nav" },
   { name: "/skills", description: "List agent skills from project, user, and ADE bundled roots", placement: "right", category: "Nav" },
+  { name: "/secrets", description: "List project secret names and copy masked values", placement: "right", category: "Nav" },
   { name: "/compact", description: "Compact the active chat context", placement: "chat", argumentHint: "[instructions]", providers: ["claude", "codex"], category: "Model" },
   { name: "/init", description: "Generate AGENTS.md and Claude pointer files", placement: "right", providers: ["claude"], category: "Nav" },
   { name: "/usage", description: "Show Claude usage through the active SDK session", placement: "chat", providers: ["claude"], category: "Model" },
diff --git a/apps/ade-cli/src/tuiClient/components/Drawer.tsx b/apps/ade-cli/src/tuiClient/components/Drawer.tsx
index bfe57c215..d73bf75da 100644
--- a/apps/ade-cli/src/tuiClient/components/Drawer.tsx
+++ b/apps/ade-cli/src/tuiClient/components/Drawer.tsx
@@ -5,6 +5,7 @@ import type { DiffLineStats } from "../../../../desktop/src/shared/types/git";
 import type { LaneSummary } from "../../../../desktop/src/shared/types/lanes";
 import { formatSessionLabel } from "../format";
 import { computeStackRowMeta, sortLanesForStackGraph } from "../laneTree";
+import { formatRelativePastTime } from "../relativeTime";
 import { useSpinFrame } from "../spinTick";
 import { theme, type LaneStatusKind } from "../theme";
 import type { AdeCodeProvider } from "../types";
@@ -91,6 +92,7 @@ function pad(text: string, width: number): string {
 function DrawerComponent({
   lanes,
   sessions,
+  closedSessions = [],
   activeLaneId,
   activeSessionId,
   browsingLaneId,
@@ -107,9 +109,11 @@ function DrawerComponent({
   unavailableLaneIds = new Set<string>(),
   width: requestedWidth,
   scrollOffsetRows = 0,
+  closedCliExpandedLaneIds = new Set<string>(),
 }: {
   lanes: LaneSummary[];
   sessions: AgentChatSessionSummary[];
+  closedSessions?: AgentChatSessionSummary[];
   activeLaneId: string | null;
   activeSessionId: string | null;
   browsingLaneId: string | null;
@@ -126,6 +130,7 @@ function DrawerComponent({
   unavailableLaneIds?: ReadonlySet<string>;
   width?: number;
   scrollOffsetRows?: number;
+  closedCliExpandedLaneIds?: ReadonlySet<string>;
 }) {
   const { stdout } = useStdout();
   const resolvedPanelHeight = panelHeight ?? stdout?.rows ?? 40;
@@ -159,6 +164,8 @@ function DrawerComponent({
     lanes: ordered.map((lane): DrawerLaneInput => ({
       laneId: lane.id,
       chatCount: sessions.filter((s) => s.laneId === lane.id).length,
+      closedChatCount: closedSessions.filter((s) => s.laneId === lane.id).length,
+      closedExpanded: closedCliExpandedLaneIds.has(lane.id),
       worktreeAvailable: !unavailableLaneIds.has(lane.id),
     })),
     expandedLaneIndex: expandedAbsoluteIndex,
@@ -175,6 +182,11 @@ function DrawerComponent({
         .filter((s) => s.laneId === expandedPlan.laneId)
         .slice(0, expandedPlan.visibleChatCount)
     : [];
+  const laneClosedSessions = expandedPlan
+    ? closedSessions
+        .filter((s) => s.laneId === expandedPlan.laneId)
+        .slice(0, expandedPlan.visibleClosedChatCount)
+    : [];
 
   const width = density === "mini"
     ? DRAWER_WIDTH_MINI
@@ -197,6 +209,7 @@ function DrawerComponent({
         laneStart={laneStart}
         laneTotal={ordered.length}
         sessions={laneSessions}
+        closedSessions={laneClosedSessions}
         activeLaneId={activeLaneId}
         activeSessionId={activeSessionId}
         browsingLaneId={browsing}
@@ -243,7 +256,9 @@ function DrawerComponent({
           const worktreeAvailable = plan.worktreeAvailable;
           const status = deriveLaneStatus(lane, sessions, activeLaneId, unavailableLaneIds);
           const sessionsInLane = sessions.filter((session) => session.laneId === lane.id);
+          const closedInLane = closedSessions.filter((session) => session.laneId === lane.id);
           const laneChatSessions = sessionsInLane.slice(0, plan.visibleChatCount);
+          const laneClosedChatSessions = closedInLane.slice(0, plan.visibleClosedChatCount);
           const showChatBlock = plan.expanded;
           // Flat rows: no side borders or per-card padding, so content uses the
           // full drawer width. Only the outer drawer border (2) + the lane
@@ -283,6 +298,10 @@ function DrawerComponent({
               {showChatBlock ? (
                 <ChatBlock
                   sessions={laneChatSessions}
+                  closedSessions={laneClosedChatSessions}
+                  closedCount={closedInLane.length}
+                  closedExpanded={plan.closedExpanded}
+                  closedToggleVisible={plan.closedToggleVisible}
                   activeSessionId={activeSessionId}
                   selectedChatIndex={selectedChatIndex}
                   width={laneContentWidth}
@@ -622,6 +641,10 @@ function ChatRow({
  */
 function ChatBlock({
   sessions,
+  closedSessions,
+  closedCount,
+  closedExpanded,
+  closedToggleVisible,
   activeSessionId,
   selectedChatIndex,
   width,
@@ -630,6 +653,10 @@ function ChatBlock({
   hoveredId,
 }: {
   sessions: AgentChatSessionSummary[];
+  closedSessions: AgentChatSessionSummary[];
+  closedCount: number;
+  closedExpanded: boolean;
+  closedToggleVisible: boolean;
   activeSessionId: string | null;
   selectedChatIndex: number;
   width: number;
@@ -645,6 +672,9 @@ function ChatBlock({
     );
   }
   const max = Math.max(8, width - 4);
+  const closedToggleIndex = sessions.length;
+  const closedStartIndex = closedToggleIndex + (closedToggleVisible ? 1 : 0);
+  const newChatIndex = closedStartIndex + (closedExpanded ? closedSessions.length : 0);
   return (
     <Box flexDirection="column">
       {sessions.map((session, index) => {
@@ -662,8 +692,26 @@ function ChatBlock({
           />
         );
       })}
+      {closedToggleVisible ? (
+        <ClosedCliToggleRow
+          count={closedCount}
+          expanded={closedExpanded}
+          max={max}
+          selected={interactive && selectedChatIndex === closedToggleIndex}
+          hovered={hoveredId?.startsWith("drawer:closed-toggle:") ?? false}
+        />
+      ) : null}
+      {closedExpanded ? closedSessions.map((session, index) => (
+        <ClosedCliRow
+          key={session.sessionId}
+          session={session}
+          max={max}
+          selected={interactive && selectedChatIndex === closedStartIndex + index}
+          hovered={hoveredId?.startsWith(`drawer:closed-chat:${session.sessionId}:`) ?? false}
+        />
+      )) : null}
       <Box>
-        <Text color={(interactive && selectedChatIndex === sessions.length) || (hoveredId?.startsWith("drawer:new-chat:") ?? false) ? theme.color.violet : theme.color.t4}>
+        <Text color={(interactive && selectedChatIndex === newChatIndex) || (hoveredId?.startsWith("drawer:new-chat:") ?? false) ? theme.color.violet : theme.color.t4}>
           + new chat
         </Text>
       </Box>
@@ -671,6 +719,64 @@ function ChatBlock({
   );
 }
 
+function ClosedCliToggleRow({
+  count,
+  expanded,
+  max,
+  selected,
+  hovered,
+}: {
+  count: number;
+  expanded: boolean;
+  max: number;
+  selected: boolean;
+  hovered: boolean;
+}) {
+  const label = truncate(`${expanded ? "▾" : "▸"} closed (${count})`, max);
+  return (
+    <Box>
+      <Text
+        color={selected || hovered ? theme.color.violet : theme.color.t4}
+        dimColor={!selected && !hovered}
+        wrap="truncate-end"
+      >
+        {label}
+      </Text>
+    </Box>
+  );
+}
+
+function ClosedCliRow({
+  session,
+  max,
+  selected,
+  hovered,
+}: {
+  session: AgentChatSessionSummary;
+  max: number;
+  selected: boolean;
+  hovered: boolean;
+}) {
+  const provider = (session.provider as AdeCodeProvider) ?? null;
+  const exec = theme.provider(provider);
+  const dot = statusGlyph("idle");
+  const ended = formatRelativePastTime(session.endedAt ?? session.lastActivityAt ?? session.startedAt);
+  const suffix = ` ${ended}`;
+  const label = truncate(formatSessionLabel(session), Math.max(3, max - suffix.length - 4));
+  return (
+    <Box>
+      <Text wrap="truncate-end">
+        <Text color={dot.color} dimColor>{dot.glyph} </Text>
+        <Text color={exec.color}>{exec.glyph} </Text>
+        <Text color={selected || hovered ? theme.color.violet : theme.color.t3} dimColor={!selected && !hovered}>
+          {label}
+        </Text>
+        <Text color={theme.color.t5} dimColor>{suffix}</Text>
+      </Text>
+    </Box>
+  );
+}
+
 function ActiveChatSpin() {
   const frame = useSpinFrame();
   return <Text color={theme.color.running}>{frame} </Text>;
@@ -733,6 +839,7 @@ function MiniDrawer({
   laneStart,
   laneTotal,
   sessions,
+  closedSessions,
   activeLaneId,
   activeSessionId,
   browsingLaneId,
@@ -753,6 +860,7 @@ function MiniDrawer({
   laneStart: number;
   laneTotal: number;
   sessions: AgentChatSessionSummary[];
+  closedSessions: AgentChatSessionSummary[];
   activeLaneId: string | null;
   activeSessionId: string | null;
   browsingLaneId: string | null;
@@ -767,6 +875,7 @@ function MiniDrawer({
 }) {
   void focused;
   void browsingLaneId;
+  void closedSessions;
   const hoveredId = useHoveredHitId();
   const inner = width - 2;
   return (
diff --git a/apps/ade-cli/src/tuiClient/components/RightPane.tsx b/apps/ade-cli/src/tuiClient/components/RightPane.tsx
index 6faf7e1cc..9d2cf1a34 100644
--- a/apps/ade-cli/src/tuiClient/components/RightPane.tsx
+++ b/apps/ade-cli/src/tuiClient/components/RightPane.tsx
@@ -1956,7 +1956,9 @@ function RightPaneComponent({
             </Text>
           ) : null}
           {content.action && content.rows.length ? (
-            <Text color={theme.color.t4} dimColor>arrows move · enter opens</Text>
+            <Text color={theme.color.t4} dimColor>
+              {content.action.kind === "copy-secret" ? "arrows move · enter/c copies" : "arrows move · enter opens"}
+            </Text>
           ) : null}
         </Box>
       ) : null}
diff --git a/apps/ade-cli/src/tuiClient/drawerLayout.ts b/apps/ade-cli/src/tuiClient/drawerLayout.ts
index df3588b5d..e7d3f977c 100644
--- a/apps/ade-cli/src/tuiClient/drawerLayout.ts
+++ b/apps/ade-cli/src/tuiClient/drawerLayout.ts
@@ -20,8 +20,9 @@
  * chat, no gaps) so a card barely changes when you select it — it just gains a
  * violet border. The two shapes differ only by their trailing row:
  *   - Expanded lane (the selected/browsing one): chats directly under the lane
- *     line + a "+ new chat" row. Unavailable worktrees render a single
- *     "worktree missing" row instead of chats.
+ *     line, an optional collapsed/expanded closed-CLI group, and a "+ new chat"
+ *     row. Unavailable worktrees render a single "worktree missing" row instead
+ *     of chats.
  *   - Every other lane: the same chats + an optional "+N more" row when the
  *     row budget can't fit them all.
  */
@@ -63,8 +64,12 @@ export function drawerLaneWindow(
 
 export type DrawerLaneInput = {
   laneId: string;
-  /** Total chat sessions in the lane. */
+  /** Total open/live chat sessions in the lane. */
   chatCount: number;
+  /** Ended tracked CLI sessions in the lane. */
+  closedChatCount?: number;
+  /** Whether the closed CLI group is expanded for this lane. */
+  closedExpanded?: boolean;
   /** Lane worktree exists on disk (missing worktrees swap the expanded chat block for a warning). */
   worktreeAvailable: boolean;
 };
@@ -76,6 +81,12 @@ export type DrawerLanePlan = {
   expanded: boolean;
   /** Chats rendered for this lane (expanded block rows or compact preview rows). */
   visibleChatCount: number;
+  /** Whether the expanded lane renders the collapsed/expanded closed-CLI row. */
+  closedToggleVisible: boolean;
+  /** Closed CLI rows rendered below the closed toggle. */
+  visibleClosedChatCount: number;
+  /** Whether the closed CLI row is expanded. */
+  closedExpanded: boolean;
   /** Hidden-chat count behind the compact preview's "+N more" row (0 = no row). */
   moreCount: number;
   worktreeAvailable: boolean;
@@ -116,6 +127,9 @@ export function computeDrawerLayout({
     laneIndex: laneStart + offset,
     expanded: laneStart + offset === expandedLaneIndex,
     visibleChatCount: 0,
+    closedToggleVisible: false,
+    visibleClosedChatCount: 0,
+    closedExpanded: lane.closedExpanded === true,
     moreCount: 0,
     worktreeAvailable: lane.worktreeAvailable,
   }));
@@ -128,9 +142,24 @@ export function computeDrawerLayout({
       // single "worktree missing" row — no chat rows, no header.
       remaining = Math.max(0, remaining - 1);
     } else {
-      const chats = visibleDrawerChatCount(lane.chatCount, chatRowBudget);
+      const closedCount = Math.max(0, Math.floor(lane.closedChatCount ?? 0));
+      const closedToggleRows = closedCount > 0 && chatRowBudget > 1 ? 1 : 0;
+      const availableAfterFixedRows = Math.max(0, chatRowBudget - 1 - closedToggleRows);
+      const closedReserve = lane.closedExpanded && closedCount > 0
+        ? Math.min(closedCount, Math.max(1, Math.floor(availableAfterFixedRows / 2)))
+        : 0;
+      const chats = Math.min(
+        lane.chatCount,
+        DRAWER_COMPACT_CHAT_CAP,
+        Math.max(0, availableAfterFixedRows - closedReserve),
+      );
       expandedPlan.visibleChatCount = chats;
-      const blockRows = chats + 1; // tight chats + "+ new chat"
+      expandedPlan.closedToggleVisible = closedToggleRows > 0;
+      if (lane.closedExpanded && closedCount > 0) {
+        const closedRows = Math.max(0, availableAfterFixedRows - chats);
+        expandedPlan.visibleClosedChatCount = Math.min(closedCount, DRAWER_COMPACT_CHAT_CAP, closedRows);
+      }
+      const blockRows = chats + closedToggleRows + expandedPlan.visibleClosedChatCount + 1; // tight rows + "+ new chat"
       remaining = Math.max(0, remaining - blockRows);
     }
   }
@@ -158,6 +187,8 @@ export function computeDrawerLayout({
 export type DrawerMouseHit =
   | { kind: "lane"; index: number }
   | { kind: "chat"; laneIndex: number; chatIndex: number }
+  | { kind: "closed-toggle"; laneIndex: number }
+  | { kind: "closed-chat"; laneIndex: number; closedIndex: number }
   | { kind: "new-chat" }
   | { kind: "new-lane" }
   | null;
@@ -197,9 +228,18 @@ export function drawerMouseHitForLayout({
         for (let chatIdx = 0; chatIdx < chatCount; chatIdx += 1) {
           if (y === line + chatIdx) return { kind: "chat", laneIndex: index, chatIndex: chatIdx };
         }
-        const newChatY = line + chatCount;
+        line += chatCount;
+        if (plan.closedToggleVisible) {
+          if (y === line) return { kind: "closed-toggle", laneIndex: index };
+          line += 1;
+          for (let closedIdx = 0; closedIdx < plan.visibleClosedChatCount; closedIdx += 1) {
+            if (y === line + closedIdx) return { kind: "closed-chat", laneIndex: index, closedIndex: closedIdx };
+          }
+          line += plan.visibleClosedChatCount;
+        }
+        const newChatY = line;
         if (y === newChatY) return { kind: "new-chat" };
-        line += chatCount + 1;
+        line += 1;
       }
     } else if (plan.visibleChatCount > 0) {
       // Compact preview: one row per chat, then an optional "+N more" row.
diff --git a/apps/ade-cli/src/tuiClient/drawerSelection.ts b/apps/ade-cli/src/tuiClient/drawerSelection.ts
index d0fd143bb..b574b81de 100644
--- a/apps/ade-cli/src/tuiClient/drawerSelection.ts
+++ b/apps/ade-cli/src/tuiClient/drawerSelection.ts
@@ -2,17 +2,17 @@ import type { AgentChatSessionSummary } from "../../../desktop/src/shared/types/
 
 export type DrawerChatSelection = {
   selectedDrawerChatId: string | null;
-  selectedDrawerChatAction: "new-chat" | null;
+  selectedDrawerChatAction: "new-chat" | "closed-toggle" | null;
 };
 
 export function chatSelectionCopyText(args: {
   drawerSection: "lanes" | "chats";
   displaySessions: AgentChatSessionSummary[];
-  selectedDrawerChatAction: "new-chat" | null;
+  selectedDrawerChatAction: "new-chat" | "closed-toggle" | null;
   selectedDrawerChatId: string | null;
 }): string | null {
   if (args.drawerSection !== "chats") return null;
-  if (args.selectedDrawerChatAction === "new-chat" || !args.selectedDrawerChatId) return null;
+  if (args.selectedDrawerChatAction !== null || !args.selectedDrawerChatId) return null;
   const session = args.displaySessions.find((entry) => entry.sessionId === args.selectedDrawerChatId);
   if (!session) return null;
   return session.title?.trim() || session.sessionId;
@@ -24,7 +24,8 @@ export function resolveDrawerChatSelection(args: {
   draftChatActive: boolean;
   drawerLaneId: string | null;
   drawerVisibleLaneSessions: AgentChatSessionSummary[];
-  selectedDrawerChatAction: "new-chat" | null;
+  closedToggleVisible?: boolean;
+  selectedDrawerChatAction: "new-chat" | "closed-toggle" | null;
   selectedDrawerChatId: string | null;
 }): DrawerChatSelection | null {
   const selectedChatIsVisible = Boolean(
@@ -35,6 +36,12 @@ export function resolveDrawerChatSelection(args: {
     return null;
   }
 
+  const selectedClosedToggleIsValid = args.selectedDrawerChatAction === "closed-toggle"
+    && args.selectedDrawerChatId == null
+    && args.drawerLaneId != null
+    && args.closedToggleVisible === true;
+  if (selectedClosedToggleIsValid) return null;
+
   const selectedNewChatIsValid = args.selectedDrawerChatAction === "new-chat"
     && args.selectedDrawerChatId == null
     && args.drawerLaneId != null;
diff --git a/apps/ade-cli/src/tuiClient/pendingInput.ts b/apps/ade-cli/src/tuiClient/pendingInput.ts
index 398091908..deb88426c 100644
--- a/apps/ade-cli/src/tuiClient/pendingInput.ts
+++ b/apps/ade-cli/src/tuiClient/pendingInput.ts
@@ -88,6 +88,12 @@ export type PendingQuestionSelectionState = {
   answers: Record<string, string | string[]>;
   optionIndexByQuestionId: Record<string, number>;
   selectedValuesByQuestionId: Record<string, string[]>;
+  pendingDigitSelection: {
+    questionId: string;
+    digit: string;
+    previousOptionIndex: number;
+    previousSelectedValues: string[];
+  } | null;
 };
 
 export function optionsForPendingQuestion(
@@ -124,6 +130,7 @@ export function createPendingQuestionSelectionState(
     answers: {},
     optionIndexByQuestionId,
     selectedValuesByQuestionId: {},
+    pendingDigitSelection: null,
   };
 }
 
@@ -136,6 +143,7 @@ export function ensurePendingQuestionSelectionState(
     return {
       ...previous,
       selectedValuesByQuestionId: previous.selectedValuesByQuestionId ?? {},
+      pendingDigitSelection: previous.pendingDigitSelection ?? null,
     };
   }
   return createPendingQuestionSelectionState(approval);
@@ -177,7 +185,7 @@ export function setPendingQuestionOptionIndex(
   if (!options.length) return state;
   const clamped = Math.max(0, Math.min(options.length - 1, optionIndex));
   return {
-    ...state,
+    ...clearPendingQuestionDigitSelection(state),
     optionIndexByQuestionId: {
       ...state.optionIndexByQuestionId,
       [question.id]: clamped,
@@ -212,6 +220,53 @@ export function selectPendingQuestionOptionIndex(
   };
 }
 
+export function selectPendingQuestionDigit(
+  request: PendingInputRequest | undefined,
+  state: PendingQuestionSelectionState,
+  digit: string,
+): { state: PendingQuestionSelectionState; selected: boolean } {
+  if (!/^[1-9]$/.test(digit)) return { state, selected: false };
+  const questions = request?.questions ?? [];
+  const question = questions[state.activeQuestionIndex];
+  if (!question) return { state, selected: false };
+  const options = optionsForPendingQuestion(request, question, state.activeQuestionIndex);
+  const optionIndex = Number(digit) - 1;
+  if (!options[optionIndex]) return { state, selected: false };
+  const baseline = restorePendingQuestionDigitSelection(state);
+  const previousOptionIndex = baseline.optionIndexByQuestionId[question.id] ?? defaultOptionIndex(options);
+  const previousSelectedValues = [...(baseline.selectedValuesByQuestionId[question.id] ?? [])];
+  const next = question.multiSelect
+    ? selectPendingQuestionOptionIndex(request, baseline, optionIndex)
+    : setPendingQuestionOptionIndex(request, baseline, optionIndex);
+  return {
+    selected: true,
+    state: {
+      ...next,
+      pendingDigitSelection: {
+        questionId: question.id,
+        digit,
+        previousOptionIndex,
+        previousSelectedValues,
+      },
+    },
+  };
+}
+
+export function convertPendingQuestionDigitSelectionToText(
+  request: PendingInputRequest | undefined,
+  state: PendingQuestionSelectionState,
+  suffix: string,
+): { state: PendingQuestionSelectionState; text: string } | null {
+  const pending = state.pendingDigitSelection;
+  if (!pending || suffix.length === 0) return null;
+  const question = request?.questions?.[state.activeQuestionIndex];
+  if (!question || question.id !== pending.questionId) return null;
+  return {
+    state: restorePendingQuestionDigitSelection(state),
+    text: `${pending.digit}${suffix}`,
+  };
+}
+
 export function movePendingQuestionOption(
   request: PendingInputRequest | undefined,
   state: PendingQuestionSelectionState,
@@ -235,7 +290,7 @@ export function movePendingQuestionFocus(
   const count = request?.questions?.length ?? 0;
   if (count <= 0) return state;
   return {
-    ...state,
+    ...clearPendingQuestionDigitSelection(state),
     activeQuestionIndex: (state.activeQuestionIndex + delta + count) % count,
   };
 }
@@ -256,3 +311,30 @@ export function buildPendingInputAnswers(
     answerForQuestion(question, lines[index] ?? text),
   ]));
 }
+
+function clearPendingQuestionDigitSelection(state: PendingQuestionSelectionState): PendingQuestionSelectionState {
+  return state.pendingDigitSelection ? { ...state, pendingDigitSelection: null } : state;
+}
+
+function restorePendingQuestionDigitSelection(state: PendingQuestionSelectionState): PendingQuestionSelectionState {
+  const pending = state.pendingDigitSelection;
+  if (!pending) return state;
+  const optionIndexByQuestionId = { ...state.optionIndexByQuestionId };
+  if (pending.previousOptionIndex >= 0) {
+    optionIndexByQuestionId[pending.questionId] = pending.previousOptionIndex;
+  } else {
+    delete optionIndexByQuestionId[pending.questionId];
+  }
+  const selectedValuesByQuestionId = { ...state.selectedValuesByQuestionId };
+  if (pending.previousSelectedValues.length > 0) {
+    selectedValuesByQuestionId[pending.questionId] = pending.previousSelectedValues;
+  } else {
+    delete selectedValuesByQuestionId[pending.questionId];
+  }
+  return {
+    ...state,
+    optionIndexByQuestionId,
+    selectedValuesByQuestionId,
+    pendingDigitSelection: null,
+  };
+}
diff --git a/apps/ade-cli/src/tuiClient/project.ts b/apps/ade-cli/src/tuiClient/project.ts
index 8682d3249..607feba81 100644
--- a/apps/ade-cli/src/tuiClient/project.ts
+++ b/apps/ade-cli/src/tuiClient/project.ts
@@ -178,7 +178,7 @@ export function resolveTuiChatRefreshTarget(args: {
   draftChatActive: boolean;
   initialNewChatPreview: boolean;
   newChatPreviewLaneId: string | null;
-  selectedDrawerChatAction: "new-chat" | null;
+  selectedDrawerChatAction: "new-chat" | "closed-toggle" | null;
   drawerLaneId: string | null;
   drawerBrowsingChatId?: string | null;
   drawerBrowsingNewChat?: boolean;
diff --git a/apps/ade-cli/src/tuiClient/relativeTime.ts b/apps/ade-cli/src/tuiClient/relativeTime.ts
new file mode 100644
index 000000000..b6e09333c
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/relativeTime.ts
@@ -0,0 +1,20 @@
+export function formatRelativePastTime(timestamp: string | null | undefined, nowMs = Date.now()): string {
+  if (!timestamp) return "ended";
+  const thenMs = Date.parse(timestamp);
+  if (!Number.isFinite(thenMs)) return "ended";
+  const diffSeconds = Math.max(0, Math.floor((nowMs - thenMs) / 1000));
+  if (diffSeconds < 45) return "just now";
+  if (diffSeconds < 90) return "1m ago";
+  const minutes = Math.floor(diffSeconds / 60);
+  if (minutes < 60) return `${minutes}m ago`;
+  const hours = Math.floor(minutes / 60);
+  if (hours < 24) return `${hours}h ago`;
+  const days = Math.floor(hours / 24);
+  if (days < 14) return `${days}d ago`;
+  const weeks = Math.floor(days / 7);
+  if (weeks < 8) return `${weeks}w ago`;
+  const months = Math.floor(days / 30);
+  if (months < 12) return `${months}mo ago`;
+  const years = Math.floor(days / 365);
+  return `${Math.max(1, years)}y ago`;
+}
diff --git a/apps/ade-cli/src/tuiClient/state.ts b/apps/ade-cli/src/tuiClient/state.ts
index bf012d61a..6df9e25e2 100644
--- a/apps/ade-cli/src/tuiClient/state.ts
+++ b/apps/ade-cli/src/tuiClient/state.ts
@@ -2,11 +2,15 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 
+export type AdeCodeDraftKind = "chat" | "cli";
+
 export type AdeCodeState = {
   lastChatByLane: Record<string, string>;
   lastChatByProjectLane: Record<string, Record<string, string>>;
   lastLaneId: string | null;
   lastLaneByProject: Record<string, string>;
+  draftKind: AdeCodeDraftKind;
+  draftKindByProject: Record<string, AdeCodeDraftKind>;
 };
 
 const STATE_DIR = path.join(os.homedir(), ".ade");
@@ -61,24 +65,25 @@ async function readAdeCodeStateUnlocked(): Promise<AdeCodeState> {
 export function scopedAdeCodeState(
   state: AdeCodeState,
   projectRoot: string,
-): Pick<AdeCodeState, "lastChatByLane" | "lastLaneId"> {
+): Pick<AdeCodeState, "lastChatByLane" | "lastLaneId" | "draftKind"> {
   const projectKey = normalizeProjectKey(projectRoot);
   return {
     lastChatByLane: state.lastChatByProjectLane[projectKey] ?? state.lastChatByLane,
     lastLaneId: state.lastLaneByProject[projectKey] ?? state.lastLaneId,
+    draftKind: state.draftKindByProject[projectKey] ?? state.draftKind,
   };
 }
 
 export function saveAdeCodeProjectState(
   projectRoot: string,
-  projectState: Pick<AdeCodeState, "lastChatByLane" | "lastLaneId">,
+  projectState: Pick<AdeCodeState, "lastChatByLane" | "lastLaneId" | "draftKind">,
 ): void {
   void saveAdeCodeProjectStateAsync(projectRoot, projectState);
 }
 
 export function saveAdeCodeProjectStateAsync(
   projectRoot: string,
-  projectState: Pick<AdeCodeState, "lastChatByLane" | "lastLaneId">,
+  projectState: Pick<AdeCodeState, "lastChatByLane" | "lastLaneId" | "draftKind">,
 ): Promise<void> {
   return enqueueStateWrite(() => withStateLock(async () => {
     const current = await readAdeCodeStateUnlocked();
@@ -89,8 +94,10 @@ export function saveAdeCodeProjectStateAsync(
     } else {
       delete current.lastLaneByProject[projectKey];
     }
+    current.draftKindByProject[projectKey] = projectState.draftKind;
     current.lastChatByLane = { ...projectState.lastChatByLane };
     current.lastLaneId = projectState.lastLaneId;
+    current.draftKind = projectState.draftKind;
     await writeAdeCodeStateUnlocked(current);
   }));
 }
@@ -104,6 +111,8 @@ export function normalizeAdeCodeState(value: unknown): AdeCodeState {
     lastChatByProjectLane: normalizeNestedStringRecord(parsed.lastChatByProjectLane),
     lastLaneId: typeof parsed.lastLaneId === "string" ? parsed.lastLaneId : null,
     lastLaneByProject: normalizeStringRecord(parsed.lastLaneByProject),
+    draftKind: normalizeDraftKind(parsed.draftKind),
+    draftKindByProject: normalizeDraftKindRecord(parsed.draftKindByProject),
   };
 }
 
@@ -113,6 +122,8 @@ function emptyAdeCodeState(): AdeCodeState {
     lastChatByProjectLane: {},
     lastLaneId: null,
     lastLaneByProject: {},
+    draftKind: "chat",
+    draftKindByProject: {},
   };
 }
 
@@ -213,3 +224,18 @@ function normalizeNestedStringRecord(value: unknown): Record<string, Record<stri
   }
   return normalized;
 }
+
+function normalizeDraftKind(value: unknown): AdeCodeDraftKind {
+  return value === "cli" ? "cli" : "chat";
+}
+
+function normalizeDraftKindRecord(value: unknown): Record<string, AdeCodeDraftKind> {
+  const normalized: Record<string, AdeCodeDraftKind> = {};
+  if (!value || typeof value !== "object" || Array.isArray(value)) return normalized;
+  for (const [key, entry] of Object.entries(value)) {
+    if (entry === "chat" || entry === "cli") {
+      normalized[key] = entry;
+    }
+  }
+  return normalized;
+}
diff --git a/apps/ade-cli/src/tuiClient/types.ts b/apps/ade-cli/src/tuiClient/types.ts
index 0cd65389f..3b61809b1 100644
--- a/apps/ade-cli/src/tuiClient/types.ts
+++ b/apps/ade-cli/src/tuiClient/types.ts
@@ -258,7 +258,7 @@ export type RightPaneContent =
       rows: string[];
       emptyText?: string;
       action?: {
-        kind: "switch-lane" | "switch-chat";
+        kind: "switch-lane" | "switch-chat" | "chat-list" | "copy-secret";
         ids: string[];
       };
     }
diff --git a/docs/features/ade-code/README.md b/docs/features/ade-code/README.md
index eabb6e082..9c1e06fbe 100644
--- a/docs/features/ade-code/README.md
+++ b/docs/features/ade-code/README.md
@@ -29,12 +29,12 @@ Point Cursor’s browser inspector at the served page for layout debugging. The
 | `apps/ade-cli/src/tuiClient/connection.ts` | Resolves attached vs embedded mode, runs the `ade/initialize` handshake, registers the project with `projects.add`, wraps subsequent requests with `projectId`. Computes the expected SHA-256 build hash from the resolved CLI entrypoint and compares it against the runtime's reported `runtimeInfo.buildHash` / `defaultRole` / `projectRoot`; a mismatch throws `StaleAdeSocketError`, optionally shuts the stale runtime process down, and lets `spawnDaemon` start a compatible one (with `ADE_DEFAULT_ROLE=cto` in the spawned env). `initializeEmbeddedCto` injects a trusted `cto` role only when `ADE_DEFAULT_ROLE` is not already set to a valid value. |
 | `apps/ade-cli/src/runtimeRoles.ts` | `ADE_RUNTIME_ROLES` (`cto`, `orchestrator`, `agent`, `external`, `evaluator`), `normalizeAdeRuntimeRole`, and `resolveAdeDefaultRole`. Shared by `cli.ts`, `adeRpcServer.ts`, `multiProjectRpcServer.ts`, and `tuiClient/connection.ts` so role parsing stays consistent across surfaces. |
 | `apps/ade-cli/src/tuiClient/jsonRpcClient.ts` | Socket client: connect, request/response, `chat/event` notifications. |
-| `apps/ade-cli/src/tuiClient/commands.ts` / `linearCommands.ts` | Slash command catalog and routing. `commands.ts` ships `/lane delete` (right-pane confirmation form that destroys the active lane), `/effort` (reasoning-effort-only picker, a narrower companion to `/model`), and provider-agnostic `/skills` for Agent Skill discovery. `linearCommands.ts` requires a sub-command — bare `/linear` returns the usage hint instead of silently picking `workflows`. It also routes the session/lane attachment verbs (`attach` / `detach` / `issues` → `lane` domain session-scoped or lane-scoped actions) and the issue write-bridge verbs (`comment` / `set-state` / `assign` / `label` → `linear_issue_tracker` domain), reusing `--issue-id` / `--linear-issue-json` / attachment flags (`source`, `includeInPr`, `closeOnMerge`, `role`) parsing shared with the typed `ade linear` CLI commands in `cli.ts`. |
+| `apps/ade-cli/src/tuiClient/commands.ts` / `linearCommands.ts` | Slash command catalog and routing. `commands.ts` ships `/lane delete` (right-pane confirmation form that destroys the active lane), `/effort` (reasoning-effort-only picker, a narrower companion to `/model`), provider-agnostic `/skills` for Agent Skill discovery, and provider-agnostic `/secrets` for masked project-secret listing/copying. `linearCommands.ts` requires a sub-command — bare `/linear` returns the usage hint instead of silently picking `workflows`. It also routes the session/lane attachment verbs (`attach` / `detach` / `issues` → `lane` domain session-scoped or lane-scoped actions) and the issue write-bridge verbs (`comment` / `set-state` / `assign` / `label` → `linear_issue_tracker` domain), reusing `--issue-id` / `--linear-issue-json` / attachment flags (`source`, `includeInPr`, `closeOnMerge`, `role`) parsing shared with the typed `ade linear` CLI commands in `cli.ts`. |
 | `apps/ade-cli/src/tuiClient/rightPaneFormatters.ts` | Pure formatters for right-pane result panes (PR summary / review / checks / comments, Linear status, system details). Keeps `app.tsx` free of ad-hoc rendering helpers. |
 | `apps/ade-cli/src/tuiClient/format.ts` | Transcript rendering helpers for the TUI. |
 | `apps/ade-cli/src/tuiClient/aggregate.ts` | Pure derivations on top of the chat event stream. Produces `AggregatedBlock`s (assistant text, tool-calls / files-changed / plan / compaction groups, runtime-activity rows for subagent and activity envelopes, queued steers) and `derivePendingSteers`, consumed by `ChatView` and the right-pane steer view. |
 | `apps/ade-cli/src/tuiClient/drawerSelection.ts` | Pure selectors for the lane / chat drawer (active row, expanded groups, keyboard navigation). |
-| `apps/ade-cli/src/tuiClient/drawerLayout.ts` | Single source of truth for drawer row layout: `computeDrawerLayout` (expanded chat block + compact per-lane chat previews under a height budget) and `drawerMouseHitForLayout`, shared by the Drawer renderer and the app's mouse hit-testing so the two cannot drift. |
+| `apps/ade-cli/src/tuiClient/drawerLayout.ts` | Single source of truth for drawer row layout: `computeDrawerLayout` (expanded chat block, closed-CLI group rows, and compact per-lane chat previews under a height budget) and `drawerMouseHitForLayout`, shared by the Drawer renderer and the app's mouse hit-testing so the two cannot drift. |
 | `apps/ade-cli/src/tuiClient/newLaneForm.ts` | Pure model for the `/new lane` form: start-from modes (primary / child / import), Linear issue + setup-template fields, per-mode field lists, and `buildNewLaneSubmission` mapping form values onto `lane.create` / `lane.createChild` / `lane.importBranch` payloads. |
 | `apps/ade-cli/src/tuiClient/eventDedup.ts` | Reserves and syncs chat-event dedupe keys so replayed runtime events do not render twice. |
 | `apps/ade-cli/src/tuiClient/feedback.ts` | Builds the multi-field `/feedback` form. Validates required fields, packs the `FeedbackDraftInput` envelope, and adds project / lane / runtime context before submission. |
@@ -43,17 +43,17 @@ Point Cursor’s browser inspector at the served page for layout debugging. The
 | `apps/ade-cli/src/tuiClient/imageTargets.ts` | Finds the latest openable Codex image result / viewed image target for terminal open actions, and materializes the clipboard image into a `cacheRoot` for paste (`readClipboardImageAttachment`, `clipboardScratchDir`). `cacheRoot` is where the bytes are written *locally* — the project workspace root for a local runtime, but a local scratch dir for a remote runtime (whose real workspace path lives on another machine). Every disk interaction is best-effort: a permission/IO failure yields `null` rather than throwing out of the React handler. |
 | `apps/ade-cli/src/tuiClient/laneTree.ts` | Stack-graph ordering for the lane drawer (`sortLanesForStackGraph`). |
 | `apps/ade-cli/src/tuiClient/project.ts` | Lane/chat launch resolution: `chooseInitialLane`, `chooseTuiLaunchLane`, and `resolveTuiChatRefreshTarget` (drawer chat browsing via `drawerBrowsingChatId` / `drawerBrowsingNewChat` previews a session in the centre pane before Enter commits it). |
-| `apps/ade-cli/src/tuiClient/pendingInput.ts` | Derives pending tool approvals and answer prompts from the chat event stream. Also owns the pure multi-question selection state machine (`PendingQuestionSelectionState` + `create`/`ensure`/`move`/`set` helpers and `optionsForPendingQuestion`) that backs the AskUserQuestion-style approval UI: per-question selected-option index, active-question focus, accumulated answers, answered-count, and the resolved value for the active question (selected option → question `defaultAssumption`). Only the first question inherits the legacy request-level `options` fallback; later questions must carry their own. |
+| `apps/ade-cli/src/tuiClient/pendingInput.ts` | Derives pending tool approvals and answer prompts from the chat event stream. Also owns the pure multi-question selection state machine (`PendingQuestionSelectionState` + `create`/`ensure`/`move`/`set` helpers and `optionsForPendingQuestion`) that backs the AskUserQuestion-style approval UI: per-question selected-option index, active-question focus, provisional digit quick-select, accumulated answers, answered-count, and the resolved value for the active question (selected option → question `defaultAssumption`). Only the first question inherits the legacy request-level `options` fallback; later questions must carry their own. |
 | `apps/ade-cli/src/tuiClient/planMode.ts` | Provider-agnostic plan-mode detector (`isPlanMode(modelState)`) plus `hasFirstUserMessage` event scan. Decides whether the composer should display the plan-mode badge and gate destructive tools. |
 | `apps/ade-cli/src/tuiClient/spinTick.tsx` | Shared monotonic spinner tick provider (`SpinTickProvider`) so every animated glyph in the TUI ticks in lockstep. |
 | `apps/ade-cli/src/tuiClient/chatInfo.ts` | Builds `ChatInfoSnapshot` for the right-pane Chat Info view (provider/model, lane, plan steps, Codex goal, context %, token summary, subagent roster, streaming state). Consumes the same chat-event stream the TUI is already replaying; Codex goal display treats provider budget-limited states as active because ADE keeps goals unlimited. |
 | `apps/ade-cli/src/services/sync/syncRemoteCommandService.ts` | Runtime action registry used by desktop, iOS, and ADE Code attached clients. Exposes the typed `chat.getCodexGoal`, `chat.setCodexGoal`, `chat.setCodexGoalStatus`, and `chat.clearCodexGoal` actions so clients can update Codex goals without injecting `/goal` prompt text into CLI-backed chats. |
 | `apps/ade-cli/src/tuiClient/subagentPane.ts` | Pure builders for the Chat Info pane's subagent roster: `buildSubagentPaneRows`, `subagentIndexForPaneLine`, `selectedSubagentSnapshot`, and `subagentPaneContentFromRightPane` (extracts a `SubagentPaneContent` from the `chat-info` right-pane state). `subagentSnapshotsFromEvents` reconstructs snapshots from `subagent_*` and teammate envelopes with sibling-aware parent-placeholder resolution. |
 | `apps/ade-cli/src/tuiClient/workEventIds.ts` | Stable Work-tab identity helpers used by the TUI to thread `ade.work-*` event ids through the renderer without re-deriving them per frame. |
-| `apps/ade-cli/src/tuiClient/state.ts` | Persists terminal-client state under `~/.ade/`: the last selected chat per lane (`lastChatByLane`) plus the most recently active lane (`lastLaneId`), used to restore lane focus across launches. |
+| `apps/ade-cli/src/tuiClient/state.ts` | Persists terminal-client state under `~/.ade/`: the last selected chat per lane (`lastChatByLane`), the most recently active lane (`lastLaneId`), and the last explicitly chosen draft Interface (`draftKind`, `chat` or `cli`). Entries are project-scoped with legacy global fallback, matching desktop's project-scoped Work view memory. |
 | `apps/ade-cli/src/tuiClient/theme.ts` | Shared Ink color and status tokens. Mirrors the Claude Design wireframe terminal palette 1:1: surfaces, text levels, brand violets, status (`running`/`attention`/`idle`/`failed`/`primary`), executor brand colors (Claude/Codex/Cursor/OpenCode/Droid + Shell + Copilot), plus helper exports `laneStatusColor`, `agentStatusColor`, `agentStatusGlyph`, and per-provider `glyph` + `wordmark`. |
 | `apps/ade-cli/src/tuiClient/types.ts` | `AdeCodeConnection`, `ProjectLaunchContext`, `RightPaneContent` (`empty`, `help`, `status`, `details`, `diff`, `chat-info`, `new-chat-setup`, `model-setup`, `form`, `lane-details` with git stats + PR CI fields + lane chat counts, …), `ChatInfoSnapshot`, `ChatInfoPlan`, `ChatInfoPlanStep`, `SubagentSnapshot`, plus navigation DTOs aligned with `apps/desktop/src/shared/types`. |
-| `apps/ade-cli/src/tuiClient/components/` | `AdeWordmark`, `Drawer` (`visibleDrawerLaneCount` / `visibleDrawerChatCount`, `DrawerPrSummary` rows, lanes mode chat preview under the selected lane), `ChatView` (transcript renderer; exports `renderChatVisibleSelectionRows` / `renderChatSelectableRowTexts` / `selectedTextFromChatRows` for the ADE-owned mouse selection, plus `computeChatScrollMaxOffset` and `renderChatTranscriptPlainText`), `Header`, `RightPane` (`computeLaneChatCounts`, `LANE_DETAIL_PR_ACTION_INDEX`, wireframe `lane-details` STATUS/SETUP/CHANGES/ACTIONS/PR/CHATS sections, Chat Info `chat-info`, `model-setup`), `SlashPalette`, `MentionPalette`, `ApprovalPrompt`, `ModelStatus`, `FooterControls`, and `TerminalPane` (xterm-headless preview pane that consumes `ChatTerminalPreviewResult` from `ade.terminal.preview` plus live `ade.pty.data` chunks to render a real terminal grid inside Ink; running provider CLI terminals — Claude, Codex, Cursor, Droid, OpenCode — can be put into direct control mode from the TUI). |
+| `apps/ade-cli/src/tuiClient/components/` | `AdeWordmark`, `Drawer` (`visibleDrawerLaneCount` / `visibleDrawerChatCount`, `DrawerPrSummary` rows, lanes mode chat preview under the selected lane, closed tracked CLI session group), `ChatView` (transcript renderer; exports `renderChatVisibleSelectionRows` / `renderChatSelectableRowTexts` / `selectedTextFromChatRows` for the ADE-owned mouse selection, plus `computeChatScrollMaxOffset` and `renderChatTranscriptPlainText`), `Header`, `RightPane` (`computeLaneChatCounts`, `LANE_DETAIL_PR_ACTION_INDEX`, wireframe `lane-details` STATUS/SETUP/CHANGES/ACTIONS/PR/CHATS sections, Chat Info `chat-info`, `model-setup`, masked `/secrets` list), `SlashPalette`, `MentionPalette`, `ApprovalPrompt`, `ModelStatus`, `FooterControls`, and `TerminalPane` (xterm-headless preview pane that consumes `ChatTerminalPreviewResult` from `ade.terminal.preview` plus live `ade.pty.data` chunks to render a real terminal grid inside Ink; running provider CLI terminals — Claude, Codex, Cursor, Droid, OpenCode — can be put into direct control mode from the TUI). |
 | `apps/ade-cli/src/tuiClient/keybindings/index.ts` | Verbatim `~/.claude/keybindings.json` reader and TUI action dispatcher (chord support, vim namespace, clipboard-image paste hooks). Resolves `defaultKeybindingsPath()`, parses the Claude keybindings schema, and maps key sequences onto TUI actions. |
 | `apps/ade-cli/src/tuiClient/statusline/index.ts` | Claude-compatible status line config reader and runner. Reads the `~/.claude/statusline.json` contract, executes the configured status command, and exposes the rendered lines to `ModelStatus`. |
 | `apps/ade-cli/src/tuiClient/components/ModelPicker/` | Ink ModelPicker pane: `ModelPickerPane.tsx` (provider/category rail + search + model rows), `modelPickerLayout.ts` (pure derivations — imports `modelOrdering` and `modelPickerSearch` from the desktop package so behaviour stays in lockstep with the renderer), `modelPickerGeometry.ts` (shared painted-row / click hit-test geometry), and `types.ts` (`ModelPickerEntry`, `ModelPickerRailEntry`, `ModelPickerState`, plus `AdeCodeProvider` extensions for `ollama` / `lmstudio`). Reads the provider-grouped catalog via `getModelCatalog`, preserves runtime `serviceTiers` and Cursor `cursorAvailability` metadata for Fast Mode / chat-vs-CLI parity, keeps the provider rail stable even when a runtime is signed out or empty, and reads favorites / recents via the cross-surface `modelPicker.*` store. |
@@ -131,10 +131,10 @@ For the embedded runtime there is no `projects.add` step — the in-process runt
 `apps/ade-cli/src/tuiClient/app.tsx` is the Ink root. Layout:
 
 - **Header** — project name, active lane, branch, and the terminal client frame.
-- **Drawer** (toggled with the configured shortcut) — two modes, **lanes** (default) and **chats**, switched with `Tab` while the drawer is focused. Lane cards show name + status (no branch ref — that lives in lane details). Every lane shows its chats: the selected lane expands the full chat block (the same tight single-row chats every lane shows, distinguished only by a violet border plus a trailing `+ new chat` row — there is no `CHATS` header), while every other lane renders a compact always-visible preview (the lane's chats as single rows, plus a `+N more` tail only when the row budget can't fit them all) whose rows are clickable and select lane + chat in one step. Row layout and mouse hit-testing share one pure model (`drawerLayout.ts: computeDrawerLayout` / `drawerMouseHitForLayout`) so the two cannot drift. In **lanes** mode, `↑`/`↓` move lane cards; `↓` on an available lane enters **chats** mode for that lane; `↵` opens lane details or resumes the lane's last chat. In **chats** mode, `↑`/`↓` move chat rows and `+ new chat`; highlighting a chat previews it in the centre pane via `resolveTuiChatRefreshTarget` before `↵` commits the session. `↑` at the top of the chat list returns to **lanes**; `↓` past the last chat drops to the next lane card. Lane and chat selection drive the right pane's context.
+- **Drawer** (toggled with the configured shortcut) — two modes, **lanes** (default) and **chats**, switched with `Tab` while the drawer is focused. Lane cards show name + status (no branch ref — that lives in lane details). Every lane shows its chats: the selected lane expands the full chat block (the same tight single-row chats every lane shows, distinguished only by a violet border plus a trailing `+ new chat` row — there is no `CHATS` header), while every other lane renders a compact always-visible preview (the lane's chats as single rows, plus a `+N more` tail only when the row budget can't fit them all) whose rows are clickable and select lane + chat in one step. Ended tracked CLI sessions are hidden behind a `closed (N)` row in the expanded lane; expanding it shows dim one-line rows with provider glyph, title, and relative end time, and `↵` resumes a resumable closed CLI session through the same terminal resume path as desktop. Row layout and mouse hit-testing share one pure model (`drawerLayout.ts: computeDrawerLayout` / `drawerMouseHitForLayout`) so open chats, closed toggles, closed sessions, and `+ new chat` cannot drift. In **lanes** mode, `↑`/`↓` move lane cards; `↓` on an available lane enters **chats** mode for that lane; `↵` opens lane details or resumes the lane's last chat. In **chats** mode, `↑`/`↓` move within the lane's chat rows, closed group, and `+ new chat`; highlighting a chat previews it in the centre pane via `resolveTuiChatRefreshTarget` before `↵` commits the session. `Esc` returns from the chat list to **lanes**. Lane and chat selection drive the right pane's context.
 - **ChatView** — the main transcript. Renders user, assistant, tool, and system events from `chat/event` notifications. For the non-Claude runtimes the transcript mirrors the desktop work log: each tool call is one stacked line (`✓ read apps/x.ts`) with the desktop slug + target-arg derivation (pure helpers imported from `apps/desktop/.../chatTranscriptRows` and `toolPresentation`), `web_search` events group with tool calls, reasoning renders as a collapsed `Thinking…`/`Thought` row with a one-line preview, and every row truncates to the pane width (rows never wrap — the scroll math assumes 1 row = 1 line). The most recent expandable failure id is tracked so `Enter` can drill into it. Mouse selection is ADE-owned so it can follow virtual transcript rows: drag selects, edge-drag scrolls, wheel scrolling preserves the highlighted range, Shift-click extends the current anchor, and `Ctrl+C` / delivered `Cmd+C` copy selected chat text.
-- **Composer** — multi-line input with mention completion (`@…`) sourced from `MentionPalette` and slash command completion from `SlashPalette`. Both palettes stay visible with a no-match row while the user is actively typing. Mention completion publishes local lane/chat hits immediately, then debounces remote file/git/PR RPCs; file results are cached per lane+query and git/PR results are cached per lane for the open TUI session. Pending tool approvals surface as `ApprovalPrompt`. AskUserQuestion-style answer requests (one or more questions, each with options) render every question inline with its option list and an `N of M answered` header. While such a request is pending and the composer is empty, keyboard input drives the picker instead of the prompt: `↑`/`↓` move the selected option (or move between questions when the active question has no options), `←`/`→` switch the active question, `1`-`9` select that option and submit it immediately, `Enter` submits the active question's current selection (advancing to the next unanswered question, or finalizing the whole request once every question is answered), and typing any text falls back to a custom free-text answer. Clicking an option submits it too. The deny chip still declines the whole request. Selection lives in `pendingInput.ts`'s `PendingQuestionSelectionState`; the old single-question `1`-`6` numeric quick-select is replaced by this flow.
-- **RightPane** — context-sensitive drawer for slash command output. The "right" placement commands (see below) render their results here as forms, lists, diffs, help text, or rendered objects. When a chat is active the default content is the **Chat Info** view (`kind: "chat-info"`): provider/model header, lane label, streaming/idle indicator with context-percent + token summary, plan steps for the current turn (plus the provider's plan explanation / streaming text when present), Codex `/goal` block when present, a roster of subagents (running first, then teammates and background), and — below the roster, like the Droid Missions block — a **TASKS** section (latest `todo_update` snapshot, desktop ChatTasksPanel parity) and a **PR** section (the lane's PR state + checks rollup with `/pr` hand-off hints, desktop ChatPrPane parity). PR rows refresh from runtime PR update notifications when available and still keep the 30s poll as a fallback. Codex goal state comes from the shared chat event stream and is normalized so provider token budgets do not show as ADE-side limits. Selecting a subagent row with `↵` first probes for a usable subagent transcript; if one is available the centre transcript swaps to it, otherwise the local reconstruction stays visible with a notice. `Esc` returns to the main chat. For an active lane with no chat focus, the default switches to the wireframe **`lane-details`** view: **STATUS** (clean/dirty, ahead/behind), optional **SETUP** (lane setup progress or retryable failure; press `r` on a failed setup to retry), **CHANGES** (file list + staged/unstaged counts from `diff.listLaneDiffStats`), **ACTIONS** (lane shortcuts — `new chat`, `open / create PR`, `stage all`, `move unstaged to new lane`, `commit`, `push`, `diff`, `reparent`, `delete lane`; each row carries a semantic glyph color so additive actions are green, navigational actions are violet, the rescue-unstaged action is amber, and `delete lane` is red), optional **PR #N** (state chip, CI activity via `checksPending` / `checksFailed`, `↵` opens the PR URL when the PR row is selected), and **CHATS** (active / closed / killed counts from `computeLaneChatCounts`). A `worktreeAvailable` guard surfaces a recoverable warning when the lane worktree path is missing from disk. `/model` opens a separate **`model-setup`** pane for provider/model/reasoning/permission picks before the first prompt.
+- **Composer** — multi-line input with mention completion (`@…`) sourced from `MentionPalette` and slash command completion from `SlashPalette`. Both palettes stay visible with a no-match row while the user is actively typing. Mention completion publishes local lane/chat hits immediately, then debounces remote file/git/PR RPCs; file results are cached per lane+query and git/PR results are cached per lane for the open TUI session. Pending tool approvals surface as `ApprovalPrompt`. AskUserQuestion-style answer requests (one or more questions, each with options) render every question inline with its option list and an `N of M answered` header. While such a request is pending and the composer is empty, keyboard input drives the picker instead of the prompt: `↑`/`↓` move the selected option (or move between questions when the active question has no options), `←`/`→` switch the active question, `1`-`9` within the option count highlights that option without submitting, and `Enter` submits the active question's current selection (advancing to the next unanswered question, or finalizing the whole request once every question is answered). If the next printable input after a digit quick-select is text, that digit becomes the start of a free-text answer and the previous option highlight is restored; digits above the option count type directly into the composer. Clicking an option still submits it immediately. The deny chip still declines the whole request. Selection lives in `pendingInput.ts`'s `PendingQuestionSelectionState`.
+- **RightPane** — context-sensitive drawer for slash command output. The "right" placement commands (see below) render their results here as forms, lists, diffs, help text, or rendered objects. `/secrets` opens a masked project-secret list and copies the selected secret value to the local system clipboard with `Enter` or `c`; it never reveals values inline and only uses the read actions behind the existing project-secret RPC path. When a chat is active the default content is the **Chat Info** view (`kind: "chat-info"`): provider/model header, lane label, streaming/idle indicator with context-percent + token summary, plan steps for the current turn (plus the provider's plan explanation / streaming text when present), Codex `/goal` block when present, a roster of subagents (running first, then teammates and background), and — below the roster, like the Droid Missions block — a **TASKS** section (latest `todo_update` snapshot, desktop ChatTasksPanel parity) and a **PR** section (the lane's PR state + checks rollup with `/pr` hand-off hints, desktop ChatPrPane parity). PR rows refresh from runtime PR update notifications when available and still keep the 30s poll as a fallback. Codex goal state comes from the shared chat event stream and is normalized so provider token budgets do not show as ADE-side limits. Selecting a subagent row with `↵` first probes for a usable subagent transcript; if one is available the centre transcript swaps to it, otherwise the local reconstruction stays visible with a notice. `Esc` returns to the main chat. For an active lane with no chat focus, the default switches to the wireframe **`lane-details`** view: **STATUS** (clean/dirty, ahead/behind), optional **SETUP** (lane setup progress or retryable failure; press `r` on a failed setup to retry), **CHANGES** (file list + staged/unstaged counts from `diff.listLaneDiffStats`), **ACTIONS** (lane shortcuts — `new chat`, `open / create PR`, `stage all`, `move unstaged to new lane`, `commit`, `push`, `diff`, `reparent`, `delete lane`; each row carries a semantic glyph color so additive actions are green, navigational actions are violet, the rescue-unstaged action is amber, and `delete lane` is red), optional **PR #N** (state chip, CI activity via `checksPending` / `checksFailed`, `↵` opens the PR URL when the PR row is selected), and **CHATS** (active / closed / killed counts from `computeLaneChatCounts`). A `worktreeAvailable` guard surfaces a recoverable warning when the lane worktree path is missing from disk. `/model` opens a separate **`model-setup`** pane for provider/model/reasoning/permission picks before the first prompt.
 - **FooterControls** — two-row footer. The top row (mode bar, only present when there's content) shows provider glyph + label, model display, fast-mode badge, reasoning effort, permission summary, pending steer count, a 10-cell token usage bar (`TokenBar`) that recolors at 50 / 80 / 95 %, and the cached context-percent / token summary. The bottom row shows pane toggles (`^o` lanes, `^p` pane, `^a` chat info) and pane-specific hints (drawer mode lanes/chats, details navigation, chat scroll position, `/steer` reminder when steers are queued). The `⊚ chat info` chip shows the live subagent count when greater than zero. `footerControlsForAvailability(agentsAvailable)` decides which toggles are wired.
 - **Provider CLI terminal control** — when the active session is a
   running provider CLI terminal (Claude, Codex, Cursor, Droid, or
@@ -198,6 +198,7 @@ Right pane (open contextual content):
 | `/agents` | List Claude agents from user/project config (Claude only). |
 | `/info` | Open Chat Info for the active chat: plan, goal, tasks, PR rollup, and subagents. |
 | `/skills` | List Agent Skills from project, user, inherited, and bundled ADE roots. |
+| `/secrets` | List project secret names with masked values; `Enter` or `c` copies the selected value to the local system clipboard without revealing it. |
 | `/init` | Generate AGENTS.md and Claude pointer files (Claude only). |
 | `/diff` | Active lane diff (file list with summarized hunks). |
 | `/log` | Recent commits. |
@@ -219,7 +220,7 @@ Right pane (open contextual content):
 | `/pr checks` | Show PR checks. |
 | `/linear …` (`list`, `workflows`, `run`, `route`, `sync`, `ingress`, `pull`, `comment`, `comments`, `status`, `assign`, `label`, `set-state`, `issue`, `attach`, `detach`, `issues`, `create-from`) | Linear sub-router; backed by `linearCommands.ts`. `attach` / `detach` / `issues` operate on the active chat session by default, or on a `--lane`; issue write verbs bridge through `linear_issue_tracker`. |
 | `/feedback` | Multi-field feedback form wired to `feedback.submit` via the `feedback.ts` form builder. |
-| `/chats [filter]` | List chats in the active lane. |
+| `/chats [filter]` | List chats in the active lane, with ended tracked CLI sessions behind a `closed (N)` toggle. Selecting a closed CLI session resumes it when resumable. |
 | `/switch [lane\|chat]` | Switch lane or chat. |
 | `/help` | Keymap and command help. |
 | `/keybindings [open]` | Show Claude-compatible keybinding config diagnostics. Pass `open` to launch the configured editor on `~/.claude/keybindings.json`. |
@@ -240,7 +241,7 @@ Inline chat commands (forwarded through the active chat runtime):
 | `/fast [on\|off]` | Toggle Claude fast mode through the active SDK session. |
 | `/goal [<objective>\|clear\|status active\|paused\|complete]` | Set, clear, or inspect the active Claude/Codex chat goal. Token-budget management is intentionally not exposed — when a Codex thread reports `budget_limited`, ADE auto-clears the runtime budget and the goal banner stays in the active state. |
 
-Claude-only commands only appear in the slash palette when the active chat's provider is `claude`. The palette filters built-in entries by their `providers` whitelist so a Codex / OpenCode / Cursor chat does not show parity affordances that have no backing call. `/skills` is deliberately provider-agnostic because it only reads markdown package roots and does not call a provider runtime.
+Claude-only commands only appear in the slash palette when the active chat's provider is `claude`. The palette filters built-in entries by their `providers` whitelist so a Codex / OpenCode / Cursor chat does not show parity affordances that have no backing call. `/skills` and `/secrets` are deliberately provider-agnostic because they use ADE project data instead of provider runtime commands.
 
 Several slash commands forward to a desktop route when issued from `ade code`:
 
@@ -264,7 +265,7 @@ Lane resolution at launch goes through helpers in `tuiClient/project.ts`:
 2. `chooseTuiLaunchLane(lanes, context, lastLaneId)` — the actual TUI entry point. If the context lane is explicit (a `--lane` hint, or the user invoked `ade code` from inside a non-primary lane's worktree / attached root), that wins. Otherwise the persisted `AdeCodeState.lastLaneId` from `~/.ade/` wins so reopening the TUI returns to the previously focused lane. Falls back to the context choice when there is no persisted lane.
 3. `resolveTuiChatRefreshTarget(...)` — while the drawer is open in **chats** mode, `drawerBrowsingChatId` can preview a highlighted session in the centre pane (without committing it) until the user presses `↵`.
 
-Lane selection persists `lastLaneId` and updates the runtime's session state so the same lane is reflected in desktop and iOS clients attached to the same runtime.
+Lane selection persists `lastLaneId` and updates the runtime's session state so the same lane is reflected in desktop and iOS clients attached to the same runtime. New-chat Interface memory (`draftKind: "chat" | "cli"`) is persisted in the same TUI state file, project-scoped the same way as desktop's Work view state.
 
 ## Launch
 
@@ -312,7 +313,7 @@ After local changes, run `npm run build` inside `apps/ade-cli` so both `dist/cli
 ## Chat setup
 
 - `+ new chat` opens a draft setup view (`new-chat-setup`) in the right pane; it does not create a backend chat until the first prompt is sent from the middle composer.
-- The draft setup and `/model` panes carry an **Interface: Chat | CLI** row (immediately after Provider), matching the desktop/iOS Chat/CLI switcher. **Chat** creates an SDK chat via `chat.createSession` (all providers, including Claude); **CLI** starts a tracked provider CLI terminal via the `start_cli_session` action (Claude, Codex, Cursor, Droid, or OpenCode). It defaults to `chat`, is editable while the chat is a draft, and becomes read-only once a session exists (its value then reflects the session type). First-prompt submit branches on it: draft `CLI` starts a tracked terminal; otherwise an SDK chat is created. Ollama / LM Studio have no CLI and stay Chat-only.
+- The draft setup and `/model` panes carry an **Interface: Chat | CLI** row (immediately after Provider), matching the desktop/iOS Chat/CLI switcher. **Chat** creates an SDK chat via `chat.createSession` (all providers, including Claude); **CLI** starts a tracked provider CLI terminal via the `start_cli_session` action (Claude, Codex, Cursor, Droid, or OpenCode). New drafts default to the last explicitly selected Interface for the project, persisted in `~/.ade/ade-code-state.json` with legacy fallback; programmatic draft resets do not overwrite it. The row is editable while the chat is a draft and becomes read-only once a session exists (its value then reflects the session type). First-prompt submit branches on it: draft `CLI` starts a tracked terminal; otherwise an SDK chat is created. Ollama / LM Studio have no CLI and stay Chat-only.
 - `/model` opens the model setup view (`model-setup`) in the right pane. It can switch provider, model, reasoning, Fast Mode for fast-capable descriptors, and permission settings, refresh provider readiness through `ai.getStatus`, and open desktop Settings > AI Providers for full configuration. Cursor rows come from the same provider-grouped catalog as desktop, including `cursorAvailability`, so SDK chat models and Cursor CLI launch models stay separated consistently — and the picker gates Cursor availability on the selected Interface (Chat disables CLI-only Cursor models and vice versa).
 - `/login` delegates only to provider CLIs that can authenticate in the current terminal: Claude (`claude auth login`), Codex (`codex login`), and OpenCode (`opencode auth login`). After a successful login for the active provider, an auth-failed latest prompt is restored into the composer with a "logged in — press Enter to resend" notice. Cursor chat is `@cursor/sdk` and needs `CURSOR_API_KEY` or desktop Settings > AI Providers. Droid chat runs Factory Droid over ACP and needs `FACTORY_API_KEY` or Factory's interactive `droid` login.
 - The middle composer shows the selected provider, model, reasoning, and permission mode under the prompt so draft changes on the right are visible before the chat starts.

From 580ee3dd182c730531a003fe8cd29ea1dc8aeeef Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 11:49:07 -0400
Subject: [PATCH 08/17] Hub composer: reload per-project Chat/CLI mode on
 project switch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The hub composer seeded sessionMode once in init and never reloaded it when
the destination project changed, so switching from a project saved as Chat to
one saved as CLI (or vice versa) left submit branching on the stale mode.

Centralize the availability-aware fallback in a pure
WorkNewSessionModePreferences.resolvedMode(stored:modelId:provider:) (reused by
both composers' init) and add HubComposerDrawer.reloadSessionMode(forProjectId:)
called wherever pickedProjectId changes — the projectRow tap and the
reconcileDestination fallback. Reload is read-only; explicit switcher taps
remain the only writes, and a stored CLI choice still drops to chat for the
session when the current model can't run in CLI without discarding the pref.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---
 .../ios/ADE/Views/Hub/HubComposerDrawer.swift | 46 +++++++++++++------
 .../ADE/Views/Work/WorkNewChatScreen.swift    | 33 +++++++++----
 apps/ios/ADETests/ADETests.swift              | 44 ++++++++++++++++++
 3 files changed, 100 insertions(+), 23 deletions(-)

diff --git a/apps/ios/ADE/Views/Hub/HubComposerDrawer.swift b/apps/ios/ADE/Views/Hub/HubComposerDrawer.swift
index d3ae5d8bc..0da2a2e9c 100644
--- a/apps/ios/ADE/Views/Hub/HubComposerDrawer.swift
+++ b/apps/ios/ADE/Views/Hub/HubComposerDrawer.swift
@@ -128,17 +128,14 @@ struct HubComposerDrawer: View {
     // screen), honoring a stored CLI choice only when the restored model can run
     // in CLI — otherwise open on chat without discarding the preference. Seeding
     // the initial @State here keeps the sessionMode onChange from resetting
-    // runtimeMode to the provider default.
-    var restoredMode: WorkNewSessionMode = .chat
-    if let savedMode = WorkNewSessionModePreferences.load(projectId: restoredProjectId) {
-      if savedMode == .cli,
-         !workModelAllowedForAvailabilityMode(modelId: restoredModelId, provider: restoredProvider, mode: .cli) {
-        restoredMode = .chat
-      } else {
-        restoredMode = savedMode
-      }
-    }
-    _sessionMode = State(initialValue: restoredMode)
+    // runtimeMode to the provider default. Switching the destination project
+    // inside the open drawer reloads this per-project mode (see
+    // `reloadSessionMode(forProjectId:)`).
+    _sessionMode = State(initialValue: WorkNewSessionModePreferences.resolvedMode(
+      stored: WorkNewSessionModePreferences.load(projectId: restoredProjectId),
+      modelId: restoredModelId,
+      provider: restoredProvider
+    ))
   }
 
   // MARK: Derived state
@@ -454,6 +451,9 @@ struct HubComposerDrawer: View {
       // Switching projects resets the lane to that project's default; the user
       // can still tap a specific lane (or auto-create) below to confirm.
       selectedLaneId = defaultLaneId(forProjectId: project.id)
+      // …and restores that project's own last Chat/CLI choice so `submit` never
+      // branches on a stale mode from the previously targeted project.
+      reloadSessionMode(forProjectId: project.id)
     } label: {
       HStack(spacing: 9) {
         HubProjectIcon(iconDataUrl: project.iconDataUrl, isActive: isSelected)
@@ -847,8 +847,12 @@ struct HubComposerDrawer: View {
       return
     }
     if pickedProjectId.isEmpty || !projects.contains(where: { $0.id == pickedProjectId }) {
-      pickedProjectId = syncService.activeProject?.id ?? projects[0].id
-      selectedLaneId = defaultLaneId(forProjectId: pickedProjectId)
+      let resolvedProjectId = syncService.activeProject?.id ?? projects[0].id
+      pickedProjectId = resolvedProjectId
+      selectedLaneId = defaultLaneId(forProjectId: resolvedProjectId)
+      // The seeded mode was for the (now invalid) restored project; realign it
+      // with the project we actually fell back to.
+      reloadSessionMode(forProjectId: resolvedProjectId)
       return
     }
     if !isAutoCreateLane {
@@ -859,6 +863,22 @@ struct HubComposerDrawer: View {
     }
   }
 
+  /// Reloads the per-project Chat/CLI interface when the destination project
+  /// changes, so the switcher and the mode `submit` branches on always reflect
+  /// the project actually being targeted (e.g. project A saved Chat, project B
+  /// saved CLI). Applies the same session-only availability fallback as init and
+  /// never writes the store — only an explicit switcher tap persists a choice.
+  private func reloadSessionMode(forProjectId projectId: String) {
+    let resolved = WorkNewSessionModePreferences.resolvedMode(
+      stored: WorkNewSessionModePreferences.load(projectId: projectId),
+      modelId: modelId,
+      provider: provider
+    )
+    if resolved != sessionMode {
+      sessionMode = resolved
+    }
+  }
+
   // MARK: Last-destination persistence (App Group)
 
   private struct HubLastDestination: Codable, Equatable {
diff --git a/apps/ios/ADE/Views/Work/WorkNewChatScreen.swift b/apps/ios/ADE/Views/Work/WorkNewChatScreen.swift
index 8b4a84e2a..441ec1ee4 100644
--- a/apps/ios/ADE/Views/Work/WorkNewChatScreen.swift
+++ b/apps/ios/ADE/Views/Work/WorkNewChatScreen.swift
@@ -65,6 +65,24 @@ enum WorkNewSessionModePreferences {
     map[key] = mode.rawValue
     defaults.set(map, forKey: storageKey)
   }
+
+  /// Resolves the interface to actually use for a session given a stored choice
+  /// and the current model: honors the stored choice but drops a CLI preference
+  /// to chat when the model can't run in CLI. Pure — reads and writes no store —
+  /// so it is safe to reuse from init and from live per-project switches without
+  /// ever overwriting an explicit switcher choice.
+  static func resolvedMode(
+    stored: WorkNewSessionMode?,
+    modelId: String,
+    provider: String
+  ) -> WorkNewSessionMode {
+    guard let stored else { return .chat }
+    if stored == .cli,
+       !workModelAllowedForAvailabilityMode(modelId: modelId, provider: provider, mode: .cli) {
+      return .chat
+    }
+    return stored
+  }
 }
 
 /// Desktop `ModeSwitcherPills` parity: compact Chat/CLI toggle for the nav bar.
@@ -396,16 +414,11 @@ struct WorkNewChatScreen: View {
     // default. A stored CLI choice is only honored when the restored model can
     // actually run in CLI; otherwise the session opens on chat WITHOUT rewriting
     // the stored preference (a later switcher tap overwrites it).
-    var restoredMode: WorkNewSessionMode = .chat
-    if let savedMode = WorkNewSessionModePreferences.load(projectId: activeProjectId) {
-      if savedMode == .cli,
-         !workModelAllowedForAvailabilityMode(modelId: restoredModelId, provider: restoredProvider, mode: .cli) {
-        restoredMode = .chat
-      } else {
-        restoredMode = savedMode
-      }
-    }
-    _sessionMode = State(initialValue: restoredMode)
+    _sessionMode = State(initialValue: WorkNewSessionModePreferences.resolvedMode(
+      stored: WorkNewSessionModePreferences.load(projectId: activeProjectId),
+      modelId: restoredModelId,
+      provider: restoredProvider
+    ))
   }
 
   /// The live composer selection. Persisted as the app-wide "last used" choice
diff --git a/apps/ios/ADETests/ADETests.swift b/apps/ios/ADETests/ADETests.swift
index 18f186642..27df931d1 100644
--- a/apps/ios/ADETests/ADETests.swift
+++ b/apps/ios/ADETests/ADETests.swift
@@ -6833,6 +6833,50 @@ final class ADETests: XCTestCase {
     XCTAssertEqual(WorkNewSessionModePreferences.load(projectId: "project-a"), .chat)
   }
 
+  func testWorkNewSessionModeResolveReloadsPerProjectWithoutWriting() {
+    let storageKey = "ade.work.newSessionModeByProject.v1"
+    ADESharedContainer.defaults.removeObject(forKey: storageKey)
+    defer { ADESharedContainer.defaults.removeObject(forKey: storageKey) }
+
+    // Switching the destination project inside an open composer reloads that
+    // project's own choice — project A saved Chat, project B saved CLI — so the
+    // mode the composer submits on tracks the targeted project rather than the
+    // one the drawer opened on (the hub project-switch regression). A CLI-capable
+    // model honors a stored CLI choice.
+    XCTAssertTrue(
+      workModelAllowedForAvailabilityMode(modelId: "claude-sonnet-4-6", provider: "claude", mode: .cli),
+      "precondition: claude-sonnet-4-6 must be CLI-capable"
+    )
+    WorkNewSessionModePreferences.save(.chat, projectId: "proj-a")
+    WorkNewSessionModePreferences.save(.cli, projectId: "proj-b")
+    XCTAssertEqual(
+      WorkNewSessionModePreferences.resolvedMode(
+        stored: WorkNewSessionModePreferences.load(projectId: "proj-a"),
+        modelId: "claude-sonnet-4-6", provider: "claude"),
+      .chat
+    )
+    XCTAssertEqual(
+      WorkNewSessionModePreferences.resolvedMode(
+        stored: WorkNewSessionModePreferences.load(projectId: "proj-b"),
+        modelId: "claude-sonnet-4-6", provider: "claude"),
+      .cli
+    )
+
+    // A project with no stored choice resolves to chat.
+    XCTAssertEqual(
+      WorkNewSessionModePreferences.resolvedMode(
+        stored: WorkNewSessionModePreferences.load(projectId: "proj-unset"),
+        modelId: "claude-sonnet-4-6", provider: "claude"),
+      .chat
+    )
+
+    // Resolving/reloading is read-only: the availability fallback and every
+    // project switch must leave the stored choices untouched (only an explicit
+    // switcher tap persists a mode).
+    XCTAssertEqual(WorkNewSessionModePreferences.load(projectId: "proj-a"), .chat)
+    XCTAssertEqual(WorkNewSessionModePreferences.load(projectId: "proj-b"), .cli)
+  }
+
   func testWorkComposerRuntimeProviderCoercesLocalOpenCodeGroups() {
     // Local OpenCode-routed groups must collapse to the wireable `opencode`
     // provider so a persisted "last used" selection restores supported access

From 5ee4469e161ab47b95fd9b1226ab41b7d48009a8 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 12:14:39 -0400
Subject: [PATCH 09/17] =?UTF-8?q?ade=20code:=20quality=20synthesis=20?=
 =?UTF-8?q?=E2=80=94=20digit-picker=20fixes,=20app.tsx=20extractions,=20UI?=
 =?UTF-8?q?=20polish?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__tests__/ApprovalPrompt.test.tsx         |   2 +
 .../src/tuiClient/__tests__/Drawer.test.tsx   |  13 +-
 .../tuiClient/__tests__/RightPane.test.tsx    |  37 +
 .../tuiClient/__tests__/TerminalPane.test.tsx |   4 +-
 .../src/tuiClient/__tests__/appInput.test.ts  |  14 +-
 .../__tests__/closedCliSessions.test.ts       |  63 ++
 .../tuiClient/__tests__/interfaceMode.test.ts |   2 +-
 .../__tests__/modelPickerController.test.ts   |  57 ++
 .../tuiClient/__tests__/pendingInput.test.ts  |  35 +
 .../tuiClient/__tests__/relativeTime.test.ts  |   9 +
 .../tuiClient/__tests__/remoteBridge.test.ts  |  35 +
 .../__tests__/remoteLauncher.test.ts          |  32 -
 apps/ade-cli/src/tuiClient/app.tsx            | 904 +++---------------
 .../src/tuiClient/closedCliSessions.ts        | 155 +++
 .../tuiClient/components/ApprovalPrompt.tsx   |   2 +-
 .../src/tuiClient/components/Drawer.tsx       |   5 +-
 .../ModelPicker/ModelPickerPane.tsx           |  41 +-
 .../ModelPicker/modelPickerGeometry.ts        |  46 +-
 .../ModelPicker/modelPickerLayout.ts          |  46 +-
 .../src/tuiClient/components/TerminalPane.tsx |   6 +-
 .../src/tuiClient/modelPickerController.ts    |  43 +
 apps/ade-cli/src/tuiClient/modelState.ts      | 555 +++++++++++
 apps/ade-cli/src/tuiClient/pendingInput.ts    |   7 +
 .../ade-cli/src/tuiClient/providerMetadata.ts |  92 ++
 apps/ade-cli/src/tuiClient/relativeTime.ts    |   4 +-
 apps/ade-cli/src/tuiClient/remoteBridge.ts    | 422 ++++++++
 apps/ade-cli/src/tuiClient/remoteLauncher.ts  | 425 +-------
 docs/features/ade-code/README.md              |   4 +-
 28 files changed, 1705 insertions(+), 1355 deletions(-)
 create mode 100644 apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts
 create mode 100644 apps/ade-cli/src/tuiClient/__tests__/modelPickerController.test.ts
 create mode 100644 apps/ade-cli/src/tuiClient/__tests__/relativeTime.test.ts
 create mode 100644 apps/ade-cli/src/tuiClient/__tests__/remoteBridge.test.ts
 create mode 100644 apps/ade-cli/src/tuiClient/closedCliSessions.ts
 create mode 100644 apps/ade-cli/src/tuiClient/modelPickerController.ts
 create mode 100644 apps/ade-cli/src/tuiClient/modelState.ts
 create mode 100644 apps/ade-cli/src/tuiClient/providerMetadata.ts
 create mode 100644 apps/ade-cli/src/tuiClient/remoteBridge.ts

diff --git a/apps/ade-cli/src/tuiClient/__tests__/ApprovalPrompt.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/ApprovalPrompt.test.tsx
index 8985c849d..ddf01f66c 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/ApprovalPrompt.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/ApprovalPrompt.test.tsx
@@ -63,6 +63,8 @@ describe("ApprovalPrompt", () => {
     expect(frame).toContain("Banner text");
     expect(frame).toContain("Compact");
     expect(frame).toContain("Detailed");
+    expect(frame).toContain("1-9");
+    expect(frame).toContain("pick");
     expect(frame).toContain("enter");
     expect(frame).toContain("next/send");
   });
diff --git a/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx
index a7a1a705a..c0c063507 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx
@@ -4,6 +4,7 @@ import { render } from "ink-testing-library";
 import type { AgentChatSessionSummary } from "../../../../desktop/src/shared/types/chat";
 import type { LaneSummary } from "../../../../desktop/src/shared/types/lanes";
 import { Drawer } from "../components/Drawer";
+import type { ClosedCliSessionSummary } from "../closedCliSessions";
 
 function stripAnsi(text: string): string {
   return text.replace(/\u001b\[[0-?]*[ -/]*[@-~]/g, "");
@@ -181,18 +182,21 @@ describe("Drawer lane and chat navigation layout", () => {
       lastOutputPreview: null,
       summary: null,
     };
-    const closedSession: AgentChatSessionSummary = {
+    const closedSession: ClosedCliSessionSummary = {
       sessionId: "term-1",
       laneId: "lane-1",
       provider: "codex",
       model: "gpt-5.5",
-      title: "Closed CLI",
+      title: "CLI",
       status: "idle",
       startedAt: "2026-05-12T10:00:00.000Z",
       endedAt: "2026-05-12T11:45:00.000Z",
       lastActivityAt: "2026-05-12T11:45:00.000Z",
       lastOutputPreview: null,
       summary: null,
+      terminalStatus: "failed",
+      terminalExitCode: 1,
+      terminalRuntimeState: "killed",
     };
 
     const frame = stripAnsi(render(
@@ -213,8 +217,9 @@ describe("Drawer lane and chat navigation layout", () => {
     ).lastFrame() ?? "");
 
     expect(frame).toContain("▾ closed (1)");
-    expect(frame).toContain("Closed");
-    expect(frame).toContain("15m ago");
+    expect(frame).toContain("CLI");
+    expect(frame).toContain("· 15m ago");
+    expect(frame).toContain("✗");
     expect(frame).toContain("◎");
   });
 
diff --git a/apps/ade-cli/src/tuiClient/__tests__/RightPane.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/RightPane.test.tsx
index 958c7461e..e1cf0f4e7 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/RightPane.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/RightPane.test.tsx
@@ -835,6 +835,43 @@ describe("RightPane setup panes", () => {
     expect(frame).toContain("reasoning");
     expect(frame).not.toContain("think high");
   });
+
+  it("renders the selected model-picker setting detail in the footer", () => {
+    const result = render(
+      <RightPane
+        content={{
+          kind: "model-picker",
+          surface: "new-chat",
+          query: "",
+          searchMode: false,
+          selection: { kind: "provider", provider: "codex" },
+          providerTabKey: null,
+          focusedIndex: 0,
+          footerFocus: "interface",
+          settingsRows: [
+            { kind: "interface", label: "Interface", value: "Chat", detail: "Chat · CLI", cyclable: true },
+            { kind: "permission", label: "Permissions", value: "default", detail: "default · edit", cyclable: true },
+            { kind: "apply", label: "Confirm", value: "ready", detail: "returns focus to the chat composer" },
+          ],
+        }}
+        modelPickerInputs={{
+          models: [
+            { id: "openai/gpt-5.5", displayName: "GPT-5.5", isDefault: true },
+          ],
+          favorites: [],
+          recents: [],
+          activeModelId: "openai/gpt-5.5",
+          activeReasoningEffort: "medium",
+        }}
+        focused
+        width={80}
+      />,
+    );
+    const frame = stripAnsi(result.lastFrame() ?? "");
+
+    expect(frame).toContain("interface");
+    expect(frame).toContain("Chat · CLI");
+  });
 });
 
 describe("RightPane details", () => {
diff --git a/apps/ade-cli/src/tuiClient/__tests__/TerminalPane.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/TerminalPane.test.tsx
index 8d5b0ce48..78ff31df3 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/TerminalPane.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/TerminalPane.test.tsx
@@ -145,8 +145,8 @@ describe("TerminalPane", () => {
     const frame = stripAnsi(result.lastFrame() ?? "");
 
     expect(frame).toContain("CLAUDE CONTROL");
-    expect(frame).toContain("Ctrl+T returns to ADE");
-    expect(frame).toContain("Ctrl+] escape");
+    expect(frame).toContain("^t returns to ADE");
+    expect(frame).toContain("^] escape");
     expect(frame).toContain("permission prompt");
   });
 
diff --git a/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts b/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
index 30e3efd12..618479452 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
@@ -28,7 +28,6 @@ import {
   isTerminalSessionFastPollActive,
   isLaneWorktreeAvailable,
   isTerminalSessionWorking,
-  isTerminalSessionResumable,
   shouldToggleLatestFailedLineOnBlankEnter,
   isTerminalControlToggle,
   isChatTextSelectionRange,
@@ -39,8 +38,6 @@ import {
   chatSelectionFromAnchor,
   chatSessionToOptimisticSummary,
   chatSelectionPointFromVisibleRows,
-  codexApprovalSandboxLabel,
-  cursorModeIdsForState,
   moveChatSelectionFocusByRows,
   mergeOptimisticChatSessions,
   insertPromptText,
@@ -54,7 +51,6 @@ import {
   modelPickerPaneContentOrigin,
   modelPickerProviderSwitchBlocked,
   mergeNewChatModelPickerContext,
-  normalizeCatalogProvider,
   planSessionStatePrune,
   planTerminalBufferPrune,
   isNewChatSetupPane,
@@ -87,11 +83,17 @@ import {
   mergeOptimisticTerminalSessions,
   promptTextForTerminal,
   clipboardImageCacheRootForRuntime,
+  uploadClipboardImageAttachmentToRuntime,
+} from "../app";
+import { isTerminalSessionResumable } from "../closedCliSessions";
+import {
+  codexApprovalSandboxLabel,
+  cursorModeIdsForState,
   cursorSourceForInterfaceMode,
   reconcileCursorModelStateForInterface,
   resolveCursorCliModelForLaunch,
-  uploadClipboardImageAttachmentToRuntime,
-} from "../app";
+} from "../modelState";
+import { normalizeCatalogProvider } from "../providerMetadata";
 import {
   BRACKETED_PASTE_END,
   BRACKETED_PASTE_START,
diff --git a/apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts b/apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts
new file mode 100644
index 000000000..9163723dd
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts
@@ -0,0 +1,63 @@
+import { describe, expect, it } from "vitest";
+import type { ChatTerminalSession } from "../../../../desktop/src/shared/types/sessions";
+import {
+  closedCliRightPaneRow,
+  closedCliSessionStatusKind,
+  deriveClosedCliSessions,
+  deriveOpenDrawerSessions,
+} from "../closedCliSessions";
+
+function terminal(overrides: Partial<ChatTerminalSession> = {}): ChatTerminalSession {
+  return {
+    terminalId: "terminal-1",
+    ptyId: null,
+    chatSessionId: null,
+    laneId: "lane-1",
+    laneName: "Lane 1",
+    title: "Codex CLI",
+    toolType: "codex",
+    goal: null,
+    status: "completed",
+    runtimeState: "exited",
+    active: false,
+    startedAt: "2026-01-01T00:00:00.000Z",
+    endedAt: "2026-01-01T00:01:00.000Z",
+    exitCode: 0,
+    pid: null,
+    resumeCommand: "codex resume terminal-1",
+    resumeMetadata: { provider: "codex", targetKind: "session", targetId: "terminal-1", launch: {} },
+    lastOutputPreview: null,
+    summary: null,
+    ...overrides,
+  };
+}
+
+describe("closedCliSessions", () => {
+  it("preserves failed terminal signals for closed-session status glyphs", () => {
+    const [session] = deriveClosedCliSessions([
+      terminal({ status: "failed", exitCode: 1, runtimeState: "killed" }),
+    ]);
+
+    expect(session).toBeDefined();
+    expect(closedCliSessionStatusKind(session!)).toBe("failed");
+    expect(closedCliRightPaneRow(session!, null)).toContain("✗");
+  });
+
+  it("filters closed CLI sessions out of the open drawer list", () => {
+    const [closed] = deriveClosedCliSessions([terminal()]);
+    const open = {
+      sessionId: "chat-1",
+      laneId: "lane-1",
+      provider: "codex" as const,
+      model: "gpt-5.5",
+      status: "idle" as const,
+      startedAt: "2026-01-01T00:00:00.000Z",
+      endedAt: null,
+      lastActivityAt: "2026-01-01T00:01:00.000Z",
+      lastOutputPreview: null,
+      summary: null,
+    };
+
+    expect(deriveOpenDrawerSessions([open, closed!], [closed!])).toEqual([open]);
+  });
+});
diff --git a/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts b/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts
index 8c03bc8e1..be3175e95 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { buildSetupRows, cliProviderForModelStateProvider, initialModelState } from "../app";
+import { buildSetupRows, cliProviderForModelStateProvider, initialModelState } from "../modelState";
 import type { AdeCodeInterfaceMode, AdeCodeModelState } from "../types";
 
 function baseModelState(overrides: Partial<AdeCodeModelState> = {}): AdeCodeModelState {
diff --git a/apps/ade-cli/src/tuiClient/__tests__/modelPickerController.test.ts b/apps/ade-cli/src/tuiClient/__tests__/modelPickerController.test.ts
new file mode 100644
index 000000000..bf7663e4f
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/__tests__/modelPickerController.test.ts
@@ -0,0 +1,57 @@
+import { describe, expect, it } from "vitest";
+import { buildModelPickerLayoutInput, modelPickerRefreshProvider } from "../modelPickerController";
+import type { AdeCodeModelState, ModelPickerRightPaneContent } from "../types";
+
+const modelState: Pick<AdeCodeModelState, "modelId" | "reasoningEffort" | "interfaceMode"> = {
+  modelId: "openai/gpt-5.5",
+  reasoningEffort: "medium",
+  interfaceMode: "chat",
+};
+
+describe("modelPickerController", () => {
+  it("only refreshes dynamic model catalog providers", () => {
+    expect(modelPickerRefreshProvider("opencode")).toBe("opencode");
+    expect(modelPickerRefreshProvider("cursor")).toBe("cursor");
+    expect(modelPickerRefreshProvider("droid")).toBe("droid");
+    expect(modelPickerRefreshProvider("lmstudio")).toBe("lmstudio");
+    expect(modelPickerRefreshProvider("ollama")).toBe("ollama");
+    expect(modelPickerRefreshProvider("codex")).toBeNull();
+    expect(modelPickerRefreshProvider("claude")).toBeNull();
+  });
+
+  it("builds the shared layout input from picker and model state", () => {
+    const picker: ModelPickerRightPaneContent = {
+      kind: "model-picker",
+      surface: "chat",
+      query: "sonnet",
+      searchMode: true,
+      selection: { kind: "provider", provider: "claude" },
+      providerTabKey: "anthropic",
+      focusedIndex: 2,
+      footerFocus: "reasoning",
+      settingsRows: [{ kind: "reasoning", label: "Reasoning", value: "high" }],
+      laneLabel: "purpose-lane",
+    };
+
+    expect(buildModelPickerLayoutInput({
+      picker,
+      models: [],
+      catalog: null,
+      favorites: ["openai/gpt-5.5"],
+      recents: ["anthropic/claude-sonnet-4-6"],
+      modelState,
+      aiStatus: null,
+    })).toMatchObject({
+      query: "sonnet",
+      searchMode: true,
+      selection: { kind: "provider", provider: "claude" },
+      providerTabKey: "anthropic",
+      focusedIndex: 2,
+      footerFocus: "reasoning",
+      activeModelId: "openai/gpt-5.5",
+      activeReasoningEffort: "medium",
+      interfaceMode: "chat",
+      laneLabel: "purpose-lane",
+    });
+  });
+});
diff --git a/apps/ade-cli/src/tuiClient/__tests__/pendingInput.test.ts b/apps/ade-cli/src/tuiClient/__tests__/pendingInput.test.ts
index 949c9b2c4..fb0c2c9ee 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/pendingInput.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/pendingInput.test.ts
@@ -3,6 +3,7 @@ import type { AgentChatEventEnvelope, PendingInputRequest } from "../../../../de
 import {
   answerForQuestion,
   buildPendingInputAnswers,
+  cancelPendingQuestionDigitSelection,
   convertPendingQuestionDigitSelectionToText,
   createPendingQuestionSelectionState,
   latestPendingApproval,
@@ -267,6 +268,40 @@ describe("pendingInput", () => {
     expect(converted ? pendingQuestionSelectionValue(request, converted.state) : null).toBe("one");
   });
 
+  it("restores the original default when a provisional digit is cancelled before Enter", () => {
+    const initial = createPendingQuestionSelectionState(questionApproval())!;
+    const selected = selectPendingQuestionDigit(baseRequest, initial, "2").state;
+
+    const cancelled = cancelPendingQuestionDigitSelection(selected);
+
+    expect(cancelled.cancelled).toBe(true);
+    expect(cancelled.state.pendingDigitSelection).toBeNull();
+    expect(pendingQuestionSelectionValue(baseRequest, cancelled.state)).toBe("recommended");
+  });
+
+  it("lets Backspace-cancelled digit input fall back to plain typed text", () => {
+    const request: PendingInputRequest = {
+      ...baseRequest,
+      questions: [{
+        ...baseRequest.questions[0]!,
+        options: [
+          { label: "One", value: "one" },
+          { label: "Two", value: "two" },
+          { label: "Three", value: "three" },
+        ],
+      }],
+    };
+    const initial = createPendingQuestionSelectionState(questionApproval(request))!;
+    const selected = selectPendingQuestionDigit(request, initial, "3").state;
+
+    const cancelled = cancelPendingQuestionDigitSelection(selected);
+
+    expect(cancelled.cancelled).toBe(true);
+    expect(convertPendingQuestionDigitSelectionToText(request, cancelled.state, " apples")).toBeNull();
+    expect(pendingQuestionSelectionValue(request, cancelled.state)).toBe("one");
+    expect(answerForQuestion(request.questions[0]!, "3 apples")).toBe("3 apples");
+  });
+
   it("leaves out-of-range digits for the composer", () => {
     const initial = createPendingQuestionSelectionState(questionApproval())!;
     const result = selectPendingQuestionDigit(baseRequest, initial, "9");
diff --git a/apps/ade-cli/src/tuiClient/__tests__/relativeTime.test.ts b/apps/ade-cli/src/tuiClient/__tests__/relativeTime.test.ts
new file mode 100644
index 000000000..52e918a5e
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/__tests__/relativeTime.test.ts
@@ -0,0 +1,9 @@
+import { describe, expect, it } from "vitest";
+import { formatRelativePastTime } from "../relativeTime";
+
+describe("formatRelativePastTime", () => {
+  it("uses a neutral fallback for missing or invalid timestamps", () => {
+    expect(formatRelativePastTime(null)).toBe("recently");
+    expect(formatRelativePastTime("not-a-date")).toBe("recently");
+  });
+});
diff --git a/apps/ade-cli/src/tuiClient/__tests__/remoteBridge.test.ts b/apps/ade-cli/src/tuiClient/__tests__/remoteBridge.test.ts
new file mode 100644
index 000000000..c9d21c074
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/__tests__/remoteBridge.test.ts
@@ -0,0 +1,35 @@
+import { EventEmitter } from "node:events";
+import { PassThrough } from "node:stream";
+import { describe, expect, it, vi } from "vitest";
+import { ProcessJsonRpcClient } from "../remoteBridge";
+
+class FakeRemoteRpcChild extends EventEmitter {
+  readonly stdout = new PassThrough();
+  readonly stderr = new PassThrough();
+  readonly stdin = new PassThrough();
+  readonly kill = vi.fn();
+}
+
+describe("remoteBridge", () => {
+  it("clears pending RPC timers when remote responses resolve or reject", async () => {
+    const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
+    const child = new FakeRemoteRpcChild();
+    const client = new ProcessJsonRpcClient(child as never);
+
+    const resolved = client.request("ade/ping");
+    child.stdout.write(`${JSON.stringify({ jsonrpc: "2.0", id: 1, result: { ok: true } })}\n`);
+    await expect(resolved).resolves.toEqual({ ok: true });
+
+    const rejected = client.request("ade/fail");
+    child.stdout.write(`${JSON.stringify({
+      jsonrpc: "2.0",
+      id: 2,
+      error: { code: -32000, message: "remote failed" },
+    })}\n`);
+    await expect(rejected).rejects.toThrow("remote failed");
+
+    expect(clearTimeoutSpy).toHaveBeenCalledTimes(2);
+    client.close();
+    clearTimeoutSpy.mockRestore();
+  });
+});
diff --git a/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts b/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts
index 7eb0df1be..af8ecedc7 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/remoteLauncher.test.ts
@@ -1,23 +1,13 @@
-import { EventEmitter } from "node:events";
-import { PassThrough } from "node:stream";
 import { describe, expect, it, vi } from "vitest";
 import {
   buildRemoteRuntimeRpcCommand,
   listRemoteSessions,
   parseRemoteAdeCodeArgs,
-  ProcessJsonRpcClient,
   remoteRuntimeLayoutCandidates,
   selectProject,
   takeAdeCodeRemoteArgs,
 } from "../remoteLauncher";
 
-class FakeRemoteRpcChild extends EventEmitter {
-  readonly stdout = new PassThrough();
-  readonly stderr = new PassThrough();
-  readonly stdin = new PassThrough();
-  readonly kill = vi.fn();
-}
-
 describe("ade code remote launcher", () => {
   it("detects remote as the first standalone ade code positional", () => {
     expect(takeAdeCodeRemoteArgs(["remote", "session", "--target", "mac"])).toEqual([
@@ -64,28 +54,6 @@ describe("ade code remote launcher", () => {
     expect(buildRemoteRuntimeRpcCommand(layout)).toContain("exec $HOME/.ade-beta/bin/ade --socket $HOME/.ade-beta/sock/ade.sock rpc --stdio");
   });
 
-  it("clears pending RPC timers when remote responses resolve or reject", async () => {
-    const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
-    const child = new FakeRemoteRpcChild();
-    const client = new ProcessJsonRpcClient(child as never);
-
-    const resolved = client.request("ade/ping");
-    child.stdout.write(`${JSON.stringify({ jsonrpc: "2.0", id: 1, result: { ok: true } })}\n`);
-    await expect(resolved).resolves.toEqual({ ok: true });
-
-    const rejected = client.request("ade/fail");
-    child.stdout.write(`${JSON.stringify({
-      jsonrpc: "2.0",
-      id: 2,
-      error: { code: -32000, message: "remote failed" },
-    })}\n`);
-    await expect(rejected).rejects.toThrow("remote failed");
-
-    expect(clearTimeoutSpy).toHaveBeenCalledTimes(2);
-    client.close();
-    clearTimeoutSpy.mockRestore();
-  });
-
   it("attaches to stable remote runtimes without repairing or installing services", () => {
     const layout: Parameters<typeof buildRemoteRuntimeRpcCommand>[0] = {
       channel: null,
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index 50507ba8b..491760c6d 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -5,24 +5,14 @@ import os from "node:os";
 import path from "node:path";
 import { Box, Text, useApp, useInput } from "ink";
 import {
-  getDefaultModelDescriptor,
   getModelById,
-  getRuntimeModelRefForDescriptor,
-  listModelDescriptorsForProvider,
   modelSupportsFastMode,
-  resolveCursorCliModelVariant,
   resolveModelDescriptor,
   resolveProviderGroupForModel,
-  type ModelDescriptor,
-  type ModelProviderGroup,
 } from "../../../desktop/src/shared/modelRegistry";
 import { LAUNCH_PROFILE_TITLE, LAUNCH_PROFILE_TOOL_TYPE, resolveClaudeCliModelForLaunch } from "../../../desktop/src/shared/cliLaunch";
-import { CURSOR_AVAILABLE_MODE_IDS, CURSOR_MODE_LABELS } from "../../../desktop/src/shared/cursorModes";
 import { getAgentSkillRootCandidates } from "../../../desktop/src/shared/agentSkillRoots";
 import type {
-  AgentChatCodexApprovalPolicy,
-  AgentChatCodexConfigSource,
-  AgentChatCodexSandbox,
   AgentChatClaudePlugin,
   AgentChatReloadClaudePluginsResult,
 	  AgentChatEventEnvelope,
@@ -31,8 +21,6 @@ import type {
 		  AgentChatModelCatalogModel,
 		  AgentChatModelCatalogRefreshProvider,
 		  AgentChatModelInfo,
-  AgentChatPermissionMode,
-  AgentChatProvider,
   AgentChatSession,
   AgentChatSessionSummary,
   AgentChatSlashCommand,
@@ -158,6 +146,45 @@ import { Header } from "./components/Header";
 import { CHAT_INFO_RESUME_ROW_LINES, chatInfoSelectionOffset, computeLaneChatCounts, DETAILS_BODY_MAX_LINES, LANE_DETAIL_ACTIONS, LANE_DETAIL_PR_ACTION_INDEX, laneDetailsInteractionLayout, rightPaneScrollableRowCount, RightPane } from "./components/RightPane";
 import { buildModelPickerLayout, defaultSelectionFor, railEntrySelection } from "./components/ModelPicker/modelPickerLayout";
 import { modelPickerGeometry } from "./components/ModelPicker/modelPickerGeometry";
+import { buildModelPickerLayoutInput, modelPickerRefreshProvider } from "./modelPickerController";
+import {
+  CODEX_PRESETS,
+  CLAUDE_PERMISSION_OPTIONS,
+  DROID_PERMISSION_OPTIONS,
+  OPENCODE_PERMISSION_OPTIONS,
+  applyProviderPermissionMode,
+  buildSetupRows,
+  cliProviderForModelStateProvider,
+  codexApprovalSandboxLabel,
+  codexPresetPatch,
+  cursorModeIdsForState,
+  cursorModelAvailableForInterface,
+  cursorSourceForInterfaceMode,
+  defaultSetupSelectionIndex,
+  droidPermissionToLegacy,
+  fallbackModelStatePatch,
+  initialModelState,
+  modeAccentColor,
+  modeDescription,
+  modelCatalogRefreshCacheKey,
+  modelInfoSupportsFastMode,
+  modelReasoningEfforts,
+  modelStatePatchForModel,
+  permissionSummary,
+  providerModelsCacheKey,
+  reconcileCursorModelStateForInterface,
+  registryModelsForProvider,
+  resolveCodexPreset,
+  resolveCursorCliModelForLaunch,
+  runtimeProviderForUiProvider,
+} from "./modelState";
+import {
+  TUI_PROVIDER_OPTIONS,
+  TUI_PROVIDERS,
+  normalizeCatalogProvider,
+  normalizeProvider,
+  providerLabel,
+} from "./providerMetadata";
 import { SlashPalette, slashPaletteReservedRows } from "./components/SlashPalette";
 import { MentionPalette, MENTION_PALETTE_ROWS } from "./components/MentionPalette";
 import { CommandPalette, COMMAND_PALETTE_ROWS, type CommandPaletteItem } from "./components/CommandPalette";
@@ -169,9 +196,23 @@ import { AddChatModeBanner } from "./components/AddChatMode";
 import { theme } from "./theme";
 import { resolveTuiChatRefreshTarget } from "./project";
 import { chatSelectionCopyText, resolveDrawerChatSelection } from "./drawerSelection";
+import {
+  RIGHT_CHAT_CLOSED_TOGGLE_ID,
+  buildDrawerChatItems,
+  closedCliRightPaneRow,
+  deriveClosedCliSessions,
+  deriveOpenDrawerSessions,
+  drawerChatActionForItem,
+  isTerminalSessionResumable,
+  sessionFromDrawerChatItem,
+  sortSessionsByRecentActivity,
+  terminalSessionProvider,
+  terminalSessionToChatSummary,
+  type DrawerChatAction,
+  type DrawerChatListItem,
+} from "./closedCliSessions";
 import { sortLanesForStackGraph } from "./laneTree";
 import { latestExpandableFailureId, renderObject, summarizeDiffChanges } from "./format";
-import { formatRelativePastTime } from "./relativeTime";
 import { startTuiHeartbeat, type TuiHeartbeat } from "./heartbeat";
 import { clipboardScratchDir, isImageFilePath, latestOpenableImageTarget, readClipboardImageAttachment, readImageDimensions } from "./imageTargets";
 import { appendReservedTuiEvent, dedupeTuiEvents, reserveTuiEventDedupKey, syncTuiEventDedupKeys } from "./eventDedup";
@@ -222,6 +263,7 @@ import {
 import {
   answerForQuestion,
   buildPendingInputAnswers,
+  cancelPendingQuestionDigitSelection,
   convertPendingQuestionDigitSelectionToText,
   createPendingQuestionSelectionState,
   ensurePendingQuestionSelectionState,
@@ -280,36 +322,18 @@ import type {
   RuntimeMode,
 } from "./types";
 
+export { isTerminalSessionResumable } from "./closedCliSessions";
+
 const PURPLE = theme.color.accent;
 const EMPTY_CHAT_EVENTS: AgentChatEventEnvelope[] = [];
 const EMPTY_SUBAGENT_SNAPSHOTS: SubagentSnapshot[] = [];
 const EMPTY_TERMINAL_CHUNKS: string[] = [];
-const EFFORTS = ["low", "medium", "high", "xhigh", "max", "ultracode"];
-const PROVIDER_OPTIONS: Array<{ value: AdeCodeProvider; label: string }> = [
-  { value: "claude", label: "Claude" },
-  { value: "codex", label: "Codex" },
-  { value: "cursor", label: "Cursor" },
-  { value: "droid", label: "Droid" },
-  { value: "opencode", label: "OpenCode" },
-  { value: "ollama", label: "Ollama" },
-  { value: "lmstudio", label: "LM Studio" },
-];
-const PROVIDERS = new Set<AdeCodeProvider>(PROVIDER_OPTIONS.map((provider) => provider.value));
-const CODEX_PRESETS = ["default", "edit", "plan", "full-auto", "config-toml"] as const;
 const MODEL_CATALOG_CLIENT_REFRESH_TTL_MS = 5 * 60_000;
 const MODEL_CATALOG_LOCAL_CLIENT_REFRESH_TTL_MS = 30_000;
-const CLAUDE_PERMISSION_OPTIONS = ["default", "auto", "plan", "acceptEdits", "bypassPermissions"] as const;
-const OPENCODE_PERMISSION_OPTIONS = ["plan", "edit", "full-auto", "config-toml"] as const;
-const DROID_PERMISSION_OPTIONS = ["read-only", "auto-low", "auto-medium", "auto-high", "agi"] as const;
 type PaneFocus = "drawer" | "chat" | "details" | "addMode";
 type AddModeState = { cursorLaneId: string; cursorChatId: string | null };
 export type FooterControl = "drawer" | "details" | "agents";
 type DrawerLaneAction = "new-lane";
-type DrawerChatAction = "new-chat" | "closed-toggle";
-type DrawerChatListItem =
-  | { kind: "chat"; session: AgentChatSessionSummary }
-  | { kind: "closed-toggle"; laneId: string; count: number; expanded: boolean }
-  | { kind: "closed-chat"; session: AgentChatSessionSummary };
 
 // Streaming chat events are coalesced into a single React render per frame
 // (~40fps) instead of one render per token. Lifecycle edges (turn start/stop,
@@ -717,15 +741,6 @@ function openExternalUrl(url: string, notice: (message: string, tone?: LocalNoti
   return true;
 }
 
-export function isTerminalSessionResumable(session: ChatTerminalSession | null | undefined): boolean {
-  return Boolean(
-    session
-      && session.status !== "running"
-      && terminalSessionResumeProvider(session)
-      && (session.resumeMetadata || session.resumeCommand),
-  );
-}
-
 export function shouldToggleLatestFailedLineOnBlankEnter(args: {
   pane: PaneFocus;
   prompt: string;
@@ -744,84 +759,6 @@ export function shouldToggleLatestFailedLineOnBlankEnter(args: {
     && !isTerminalSessionResumable(args.activeTerminalSession);
 }
 
-/** Narrow a terminal session's derived provider to an AgentChatProvider (CLI terminals are always one of the five). */
-function terminalSummaryProvider(session: ChatTerminalSession): AgentChatProvider {
-  const provider = terminalSessionProvider(session);
-  return provider === "codex" || provider === "claude" || provider === "opencode" || provider === "cursor" || provider === "droid"
-    ? provider
-    : "claude";
-}
-
-function terminalSessionToChatSummary(session: ChatTerminalSession): AgentChatSessionSummary {
-  const status: AgentChatSessionSummary["status"] = session.status === "running"
-    ? session.runtimeState === "idle" ? "idle" : "active"
-    : "ended";
-  const provider = terminalSummaryProvider(session);
-  return {
-    sessionId: session.terminalId,
-    laneId: session.laneId,
-    provider,
-    model: provider === "claude" ? "claude-code" : `${provider} cli`,
-    title: session.title,
-    goal: session.goal,
-    permissionMode: session.resumeMetadata?.launch?.permissionMode ?? "default",
-    status,
-    startedAt: session.startedAt,
-    endedAt: session.endedAt,
-    lastActivityAt: session.endedAt ?? session.startedAt,
-    lastOutputPreview: session.lastOutputPreview,
-    summary: session.summary,
-    surface: "work",
-  };
-}
-
-function sortSessionsByRecentActivity<T extends { startedAt: string; lastActivityAt?: string | null }>(sessions: T[]): T[] {
-  return [...sessions].sort((left, right) => {
-    const rightMs = Date.parse(right.lastActivityAt ?? right.startedAt);
-    const leftMs = Date.parse(left.lastActivityAt ?? left.startedAt);
-    return (Number.isFinite(rightMs) ? rightMs : 0) - (Number.isFinite(leftMs) ? leftMs : 0);
-  });
-}
-
-function buildDrawerChatItems(args: {
-  openSessions: AgentChatSessionSummary[];
-  closedSessions: AgentChatSessionSummary[];
-  closedToggleVisible: boolean;
-  closedExpanded: boolean;
-  laneId: string | null;
-}): DrawerChatListItem[] {
-  const items: DrawerChatListItem[] = args.openSessions.map((session) => ({ kind: "chat", session }));
-  if (args.closedToggleVisible && args.laneId) {
-    items.push({
-      kind: "closed-toggle",
-      laneId: args.laneId,
-      count: args.closedSessions.length,
-      expanded: args.closedExpanded,
-    });
-    if (args.closedExpanded) {
-      items.push(...args.closedSessions.map((session): DrawerChatListItem => ({ kind: "closed-chat", session })));
-    }
-  }
-  return items;
-}
-
-function sessionFromDrawerChatItem(item: DrawerChatListItem | null | undefined): AgentChatSessionSummary | null {
-  return item?.kind === "chat" || item?.kind === "closed-chat" ? item.session : null;
-}
-
-function drawerChatActionForItem(item: DrawerChatListItem | null | undefined): DrawerChatAction | null {
-  return item?.kind === "closed-toggle" ? "closed-toggle" : null;
-}
-
-const RIGHT_CHAT_CLOSED_TOGGLE_ID = "__closed_cli_toggle__";
-
-function closedCliRightPaneRow(session: AgentChatSessionSummary, activeSessionId: string | null): string {
-  const active = session.sessionId === activeSessionId ? "●" : "○";
-  const provider = theme.provider((session.provider as AdeCodeProvider) ?? null);
-  const ended = formatRelativePastTime(session.endedAt ?? session.lastActivityAt ?? session.startedAt);
-  return `${active} ${provider.glyph} ${session.title ?? session.sessionId} · ended ${ended}`;
-}
-
 function openChatRightPaneRow(session: AgentChatSessionSummary, activeSessionId: string | null): string {
   return `${session.sessionId === activeSessionId ? "●" : "○"} ${session.title ?? session.sessionId} · ${session.provider}`;
 }
@@ -952,63 +889,6 @@ export function shouldHydrateRefreshHistory(args: {
     || args.loadedSessionId !== args.nextSessionId;
 }
 
-export function initialModelState(draftKind: AdeCodeInterfaceMode = "chat"): AdeCodeModelState {
-  const descriptor = getDefaultModelDescriptor("codex");
-  return {
-    provider: "codex",
-    interfaceMode: draftKind,
-    model: descriptor?.providerModelId ?? "gpt-5.5",
-    modelId: descriptor?.id ?? null,
-    displayName: descriptor?.displayName ?? "GPT-5.5",
-    reasoningEffort: DEFAULT_CODEX_REASONING_EFFORT,
-    fastMode: false,
-    permissionMode: "default",
-    interactionMode: "default",
-    claudePermissionMode: "default",
-    codexApprovalPolicy: "on-request",
-    codexSandbox: "workspace-write",
-    codexConfigSource: "flags",
-    opencodePermissionMode: "edit",
-    droidPermissionMode: "auto-low",
-    cursorModeId: "agent",
-    cursorAvailableModeIds: [],
-    cursorConfigValues: {},
-  };
-}
-
-type CodexPreset = (typeof CODEX_PRESETS)[number];
-
-function providerLabel(provider: AdeCodeProvider): string {
-  return PROVIDER_OPTIONS.find((entry) => entry.value === provider)?.label ?? provider;
-}
-
-function normalizeProvider(value: string | null | undefined): AdeCodeProvider {
-  return PROVIDERS.has(value as AdeCodeProvider) ? value as AdeCodeProvider : "codex";
-}
-
-export function normalizeCatalogProvider(value: string | null | undefined): AdeCodeProvider {
-  const normalized = (value ?? "").trim().toLowerCase();
-  if (normalized === "anthropic") return "claude";
-  if (normalized === "openai") return "codex";
-  if (normalized === "factory") return "droid";
-  return normalizeProvider(normalized);
-}
-
-function runtimeProviderForUiProvider(provider: AdeCodeProvider): ModelProviderGroup {
-  return provider === "ollama" || provider === "lmstudio" ? "opencode" : provider;
-}
-
-/**
- * The provider CLI a modelState provider launches as, or null when it has no
- * tracked CLI (Ollama / LM Studio are OpenCode-backed chat only). Gates the
- * Interface=CLI launch path.
- */
-export function cliProviderForModelStateProvider(provider: AdeCodeProvider): CliTerminalProvider | null {
-  return provider === "claude" || provider === "codex" || provider === "cursor" || provider === "droid" || provider === "opencode"
-    ? provider
-    : null;
-}
-
 function claudeModelCommandKey(state: AdeCodeModelState, terminalId: string | null | undefined): string {
   return JSON.stringify([
     terminalId ?? null,
@@ -1024,373 +904,6 @@ function modelCatalogClientRefreshTtlMs(provider?: AgentChatModelCatalogRefreshP
     : MODEL_CATALOG_CLIENT_REFRESH_TTL_MS;
 }
 
-function firstReasoningEffortForModel(model: AgentChatModelInfo | null | undefined, provider: AdeCodeProvider): string | null {
-  const efforts = model?.reasoningEfforts?.map((entry) => entry.effort).filter(Boolean) ?? [];
-  const modelId = `${model?.modelId ?? ""} ${model?.id ?? ""} ${model?.displayName ?? ""}`.toLowerCase();
-  if (modelId.includes("fable") && efforts.includes("high")) return "high";
-  if (efforts.includes(DEFAULT_CODEX_REASONING_EFFORT)) return DEFAULT_CODEX_REASONING_EFFORT;
-  if (efforts.length) return efforts[0] ?? null;
-  const descriptor = model?.modelId || model?.id ? getModelById(model.modelId ?? model.id) : undefined;
-  const descriptorEfforts = descriptor?.reasoningTiers ?? [];
-  const descriptorId = `${descriptor?.id ?? ""} ${descriptor?.providerModelId ?? ""} ${descriptor?.displayName ?? ""}`.toLowerCase();
-  if (descriptorId.includes("fable") && descriptorEfforts.includes("high")) return "high";
-  if (descriptorEfforts.includes(DEFAULT_CODEX_REASONING_EFFORT)) return DEFAULT_CODEX_REASONING_EFFORT;
-  if (descriptorEfforts.length) return descriptorEfforts[0] ?? null;
-  return provider === "codex" ? DEFAULT_CODEX_REASONING_EFFORT : null;
-}
-
-function modelStatePatchForModel(provider: AdeCodeProvider, model: AgentChatModelInfo): Pick<AdeCodeModelState, "provider" | "model" | "modelId" | "displayName" | "reasoningEffort"> {
-  const modelId = model.modelId ?? model.id;
-  const descriptor = getModelById(modelId);
-  const resolvedProvider = descriptor ? normalizeProvider(resolveProviderGroupForModel(descriptor)) : provider;
-  const runtimeProvider = runtimeProviderForUiProvider(resolvedProvider);
-  return {
-    provider: resolvedProvider,
-    model: descriptor ? getRuntimeModelRefForDescriptor(descriptor, runtimeProvider) : model.id,
-    modelId,
-    displayName: model.displayName,
-    reasoningEffort: firstReasoningEffortForModel(model, resolvedProvider),
-  };
-}
-
-function modelInfoSupportsFastMode(model: AgentChatModelInfo | null | undefined): boolean {
-  const descriptor = model?.modelId || model?.id ? getModelById(model.modelId ?? model.id) : undefined;
-  return Boolean(model?.serviceTiers?.some((tier) => tier.trim().toLowerCase() === "fast"))
-    || modelSupportsFastMode(descriptor);
-}
-
-function cursorDescriptorForModelInfo(model: AgentChatModelInfo | null | undefined): ModelDescriptor | undefined {
-  const modelId = model?.modelId ?? model?.id;
-  return modelId ? getModelById(modelId) : undefined;
-}
-
-function cursorAvailabilityForModel(
-  model: AgentChatModelInfo | null | undefined,
-  descriptor = cursorDescriptorForModelInfo(model),
-): { cli: boolean; sdk: boolean } | null {
-  return model?.cursorAvailability ?? descriptor?.cursorAvailability ?? null;
-}
-
-export function cursorModelAvailableForInterface(
-  model: AgentChatModelInfo | null | undefined,
-  interfaceMode: AdeCodeInterfaceMode,
-): boolean {
-  const descriptor = cursorDescriptorForModelInfo(model);
-  if (descriptor?.family !== "cursor" && model?.family !== "cursor") return true;
-  const availability = cursorAvailabilityForModel(model, descriptor);
-  if (!availability) return false;
-  return interfaceMode === "cli" ? availability.cli === true : availability.sdk === true;
-}
-
-export function cursorSourceForInterfaceMode(interfaceMode: AdeCodeInterfaceMode): "sdk" | "cli" {
-  return interfaceMode === "cli" ? "cli" : "sdk";
-}
-
-function providerModelsCacheKey(provider: AdeCodeProvider, interfaceMode: AdeCodeInterfaceMode): string {
-  return provider === "cursor" ? `cursor:${cursorSourceForInterfaceMode(interfaceMode)}` : provider;
-}
-
-function modelCatalogRefreshCacheKey(
-  provider: AgentChatModelCatalogRefreshProvider,
-  cursorSource?: "sdk" | "cli",
-): string {
-  return provider === "cursor" ? `cursor:${cursorSource ?? "sdk"}` : provider;
-}
-
-function fallbackModelStatePatch(provider: AdeCodeProvider): Pick<AdeCodeModelState, "provider" | "model" | "modelId" | "displayName" | "reasoningEffort"> {
-  const registryProvider = provider === "ollama" || provider === "lmstudio" ? "opencode" : provider;
-  const descriptor = getDefaultModelDescriptor(registryProvider)
-    ?? listModelDescriptorsForProvider(registryProvider)[0]
-    ?? getDefaultModelDescriptor("codex");
-  return {
-    provider,
-    model: descriptor ? getRuntimeModelRefForDescriptor(descriptor, registryProvider) : "gpt-5.5",
-    modelId: descriptor?.id ?? null,
-    displayName: descriptor?.displayName ?? providerLabel(provider),
-    reasoningEffort: descriptor?.id.includes("fable") && descriptor.reasoningTiers?.includes("high")
-      ? "high"
-      : descriptor?.reasoningTiers?.[0] ?? (provider === "codex" ? DEFAULT_CODEX_REASONING_EFFORT : null),
-  };
-}
-
-function registryModelsForProvider(provider: AdeCodeProvider): AgentChatModelInfo[] {
-  if (provider === "ollama" || provider === "lmstudio") return [];
-  return listModelDescriptorsForProvider(provider).map((descriptor) => ({
-    id: descriptor.id,
-    modelId: descriptor.id,
-    displayName: descriptor.displayName,
-	    isDefault: descriptor.id === getDefaultModelDescriptor(provider)?.id,
-	    reasoningEfforts: descriptor.reasoningTiers?.map((effort) => ({ effort, description: effort })),
-	    ...(descriptor.serviceTiers?.length ? { serviceTiers: descriptor.serviceTiers } : {}),
-	    ...(descriptor.cursorAvailability ? { cursorAvailability: descriptor.cursorAvailability } : {}),
-	    ...(descriptor.cursorCliVariants?.length ? { cursorCliVariants: descriptor.cursorCliVariants } : {}),
-	  }));
-	}
-
-function compatibleCursorModelForInterface(
-  models: readonly AgentChatModelInfo[],
-  interfaceMode: AdeCodeInterfaceMode,
-): AgentChatModelInfo | null {
-  const compatible = models.filter((model) => cursorModelAvailableForInterface(model, interfaceMode));
-  return compatible.find((model) => model.isDefault) ?? compatible[0] ?? null;
-}
-
-function modelInfoMatchesModelState(model: AgentChatModelInfo, state: AdeCodeModelState): boolean {
-  const selected = (state.modelId ?? state.model).trim().toLowerCase();
-  if (!selected) return false;
-  return [model.id, model.modelId, ...(model.aliases ?? [])]
-    .filter((value): value is string => typeof value === "string")
-    .some((value) => value.trim().toLowerCase() === selected);
-}
-
-export function reconcileCursorModelStateForInterface(
-  state: AdeCodeModelState,
-  interfaceMode: AdeCodeInterfaceMode,
-  models: readonly AgentChatModelInfo[],
-): AdeCodeModelState {
-  if (state.provider !== "cursor") return { ...state, interfaceMode };
-  const currentModel = models.find((model) => modelInfoMatchesModelState(model, state)) ?? null;
-  const descriptor = state.modelId ? getModelById(state.modelId) : undefined;
-  const availability = cursorAvailabilityForModel(currentModel, descriptor);
-  const currentAllowed = availability
-    ? (interfaceMode === "cli" ? availability.cli === true : availability.sdk === true)
-    : false;
-  if (currentAllowed && descriptor?.family === "cursor") {
-    const supportsFast = modelSupportsFastMode(descriptor);
-    return {
-      ...state,
-      interfaceMode,
-      model: interfaceMode === "cli"
-        ? resolveCursorCliModelVariant(descriptor, {
-            reasoningEffort: state.reasoningEffort,
-            fastMode: supportsFast && state.fastMode,
-          })
-        : getRuntimeModelRefForDescriptor(descriptor, "cursor"),
-      fastMode: supportsFast ? state.fastMode : false,
-    };
-  }
-  if (currentAllowed) return { ...state, interfaceMode };
-  const fallback = compatibleCursorModelForInterface(models, interfaceMode);
-  if (!fallback) {
-    return {
-      ...state,
-      interfaceMode,
-      model: "",
-      modelId: null,
-      displayName: providerLabel("cursor"),
-      reasoningEffort: null,
-      fastMode: false,
-    };
-  }
-  const patch = modelStatePatchForModel("cursor", fallback);
-  const fallbackDescriptor = patch.modelId ? getModelById(patch.modelId) : undefined;
-  const launchDescriptor = fallbackDescriptor?.family === "cursor" && fallback.cursorCliVariants?.length
-    ? { ...fallbackDescriptor, cursorCliVariants: fallback.cursorCliVariants }
-    : fallbackDescriptor;
-  const supportsFast = modelInfoSupportsFastMode(fallback);
-  return {
-    ...state,
-    ...patch,
-    interfaceMode,
-    model: interfaceMode === "cli" && launchDescriptor?.family === "cursor"
-      ? resolveCursorCliModelVariant(launchDescriptor, {
-          reasoningEffort: patch.reasoningEffort,
-          fastMode: supportsFast && state.fastMode,
-        })
-      : patch.model,
-    fastMode: supportsFast ? state.fastMode : false,
-  };
-}
-
-export function resolveCursorCliModelForLaunch(
-  state: AdeCodeModelState,
-  models: readonly AgentChatModelInfo[] = [],
-): string {
-  const modelId = (state.modelId ?? state.model).trim();
-  if (!modelId) throw new Error("Choose a Cursor CLI model before launching a CLI session.");
-  const modelInfo = models.find((model) => modelInfoMatchesModelState(model, state)) ?? null;
-  const descriptor = getModelById(modelId);
-  const availability = cursorAvailabilityForModel(modelInfo, descriptor);
-  if (!availability?.cli) {
-    throw new Error("This Cursor model is available for chat only. Choose a Cursor CLI model for a CLI session.");
-  }
-  if (descriptor?.family === "cursor") {
-    const launchDescriptor = modelInfo?.cursorCliVariants?.length
-      ? { ...descriptor, cursorCliVariants: modelInfo.cursorCliVariants }
-      : descriptor;
-    const supportsFast = modelSupportsFastMode(launchDescriptor);
-    return resolveCursorCliModelVariant(launchDescriptor, {
-      reasoningEffort: state.reasoningEffort,
-      fastMode: supportsFast && state.fastMode,
-    });
-  }
-  return modelId.toLowerCase().startsWith("cursor/") ? modelId.slice("cursor/".length) : modelId;
-}
-
-function modelReasoningEfforts(modelState: AdeCodeModelState, models: AgentChatModelInfo[]): string[] {
-  const model = models.find((entry) => entry.id === modelState.modelId || entry.modelId === modelState.modelId);
-  const fromModel = model?.reasoningEfforts?.map((entry) => entry.effort).filter(Boolean) ?? [];
-  if (fromModel.length) return fromModel;
-  const descriptor = modelState.modelId ? getModelById(modelState.modelId) : undefined;
-  if (descriptor?.reasoningTiers?.length) return descriptor.reasoningTiers;
-  return modelState.provider === "codex" ? EFFORTS : [];
-}
-
-function resolveCodexPreset(modelState: AdeCodeModelState): CodexPreset | "custom" {
-  if (modelState.codexConfigSource === "config-toml") return "config-toml";
-  if (modelState.codexApprovalPolicy === "never" && modelState.codexSandbox === "danger-full-access") return "full-auto";
-  if (modelState.codexApprovalPolicy === "untrusted" && modelState.codexSandbox === "workspace-write") return "edit";
-  if (
-    (modelState.codexApprovalPolicy === "on-request" || modelState.codexApprovalPolicy === "untrusted")
-    && modelState.codexSandbox === "read-only"
-  ) return "plan";
-  if (
-    (modelState.codexApprovalPolicy === "on-request" || modelState.codexApprovalPolicy === "on-failure" || modelState.codexApprovalPolicy === "untrusted")
-    && modelState.codexSandbox === "workspace-write"
-  ) return "default";
-  return "custom";
-}
-
-export function codexApprovalSandboxLabel(modelState: Pick<AdeCodeModelState, "codexApprovalPolicy" | "codexSandbox">): string {
-  return `${modelState.codexApprovalPolicy} · ${modelState.codexSandbox}`;
-}
-
-function codexPresetPatch(preset: CodexPreset): Pick<AdeCodeModelState, "codexApprovalPolicy" | "codexSandbox" | "codexConfigSource" | "permissionMode"> {
-  if (preset === "full-auto") {
-    return {
-      codexApprovalPolicy: "never",
-      codexSandbox: "danger-full-access",
-      codexConfigSource: "flags",
-      permissionMode: "full-auto",
-    };
-  }
-  if (preset === "plan") {
-    return {
-      codexApprovalPolicy: "on-request",
-      codexSandbox: "read-only",
-      codexConfigSource: "flags",
-      permissionMode: "plan",
-    };
-  }
-  if (preset === "edit") {
-    return {
-      codexApprovalPolicy: "untrusted",
-      codexSandbox: "workspace-write",
-      codexConfigSource: "flags",
-      permissionMode: "edit",
-    };
-  }
-  if (preset === "config-toml") {
-    return {
-      codexApprovalPolicy: "on-request",
-      codexSandbox: "workspace-write",
-      codexConfigSource: "config-toml",
-      permissionMode: "config-toml",
-    };
-  }
-  return {
-    codexApprovalPolicy: "on-request",
-    codexSandbox: "workspace-write",
-    codexConfigSource: "flags",
-    permissionMode: "default",
-  };
-}
-
-function droidPermissionToLegacy(mode: AdeCodeModelState["droidPermissionMode"]): AgentChatPermissionMode {
-  if (mode === "read-only") return "plan";
-  if (mode === "agi") return "plan";
-  if (mode === "auto-low") return "edit";
-  if (mode === "auto-medium") return "default";
-  return "full-auto";
-}
-
-function cursorModeLabel(modeId: string | null | undefined): string {
-  const normalized = modeId?.trim().toLowerCase() || "agent";
-  return CURSOR_MODE_LABELS[normalized] ?? normalized;
-}
-
-export function cursorModeIdsForState(modelState: Pick<AdeCodeModelState, "cursorAvailableModeIds">): string[] {
-  const snapshotIds = modelState.cursorAvailableModeIds
-    .map((modeId) => modeId.trim())
-    .filter(Boolean);
-  return snapshotIds.length ? snapshotIds : [...CURSOR_AVAILABLE_MODE_IDS];
-}
-
-function permissionSummary(modelState: AdeCodeModelState): string {
-  if (modelState.provider === "codex") return resolveCodexPreset(modelState);
-  if (modelState.provider === "claude") {
-    if (modelState.interactionMode === "plan" || modelState.claudePermissionMode === "plan") return "plan";
-    if (modelState.claudePermissionMode === "auto") return "auto";
-    if (modelState.claudePermissionMode === "acceptEdits") return "accept edits";
-    if (modelState.claudePermissionMode === "bypassPermissions") return "bypass";
-    return "default";
-  }
-  if (modelState.provider === "opencode") return modelState.opencodePermissionMode;
-  if (modelState.provider === "droid") return modelState.droidPermissionMode;
-  return cursorModeLabel(modelState.cursorModeId);
-}
-
-const MODE_DESCRIPTIONS: Record<string, string> = {
-  plan: "read-only deliberation",
-  default: "ask before acting",
-  auto: "auto-approve safe actions",
-  "accept edits": "auto-approve file edits",
-  bypass: "skip permission checks",
-  "full-auto": "no approvals required",
-  edit: "edit-mode operations",
-  agent: "agent-driven actions",
-  ask: "confirm each action",
-  "read-only": "no edits or execution",
-  "auto-low": "low-autonomy ops",
-  "auto-medium": "medium-autonomy ops",
-  "auto-high": "high-autonomy ops",
-  agi: "orchestrator mission",
-  "config-toml": "config-defined mode",
-};
-
-function modeDescription(summary: string): string {
-  return MODE_DESCRIPTIONS[summary] ?? "permission mode";
-}
-
-function modeAccentColor(summary: string): string {
-  if (summary === "plan" || summary === "read-only" || summary === "agi") return theme.color.planMode;
-  if (summary === "bypass" || summary === "full-auto" || summary === "auto-high") return theme.color.warning;
-  return theme.color.accent;
-}
-
-function permissionOptionsDetail(modelState: AdeCodeModelState): string {
-  if (modelState.provider === "codex") return CODEX_PRESETS.join(" · ");
-  if (modelState.provider === "claude") return "default · plan · auto · bypass";
-  if (modelState.provider === "opencode") return OPENCODE_PERMISSION_OPTIONS.join(" · ");
-  if (modelState.provider === "droid") return DROID_PERMISSION_OPTIONS.join(" · ");
-  return cursorModeIdsForState(modelState).map((modeId) => cursorModeLabel(modeId)).join(" · ");
-}
-
-function applyProviderPermissionMode(modelState: AdeCodeModelState): Partial<AdeCodeModelState> {
-  if (modelState.provider === "codex") {
-    const preset = resolveCodexPreset(modelState);
-    return { permissionMode: preset === "custom" ? modelState.permissionMode : preset };
-  }
-  if (modelState.provider === "claude") {
-    if (modelState.interactionMode === "plan" || modelState.claudePermissionMode === "plan") {
-      return { permissionMode: "plan", interactionMode: "plan", claudePermissionMode: "plan" };
-    }
-    if (modelState.claudePermissionMode === "auto") return { permissionMode: "auto", interactionMode: "default" };
-    if (modelState.claudePermissionMode === "acceptEdits") return { permissionMode: "edit", interactionMode: "default" };
-    if (modelState.claudePermissionMode === "bypassPermissions") return { permissionMode: "full-auto", interactionMode: "default" };
-    return { permissionMode: "default", interactionMode: "default" };
-  }
-  if (modelState.provider === "opencode") return { permissionMode: modelState.opencodePermissionMode };
-  if (modelState.provider === "droid") return { permissionMode: droidPermissionToLegacy(modelState.droidPermissionMode) };
-  if (modelState.provider === "cursor") {
-    if (modelState.cursorModeId === "plan") return { permissionMode: "plan" };
-    if (modelState.cursorModeId === "ask") return { permissionMode: "edit" };
-    if (modelState.cursorModeId === "full-auto") return { permissionMode: "full-auto" };
-    return { permissionMode: "default" };
-  }
-  return {};
-}
-
 function noticeId(): string {
   return `${Date.now()}:${Math.random().toString(36).slice(2)}`;
 }
@@ -2000,126 +1513,6 @@ function formatDoctorReport(args: {
   ].join("\n");
 }
 
-export function buildSetupRows(args: {
-  modelState: AdeCodeModelState;
-  models: AgentChatModelInfo[];
-  includeRefresh: boolean;
-  includeApply: boolean;
-  outputStyle?: string | null;
-  outputStyleEditable?: boolean;
-  /** Draft/next-chat interface (Chat = SDK chat, CLI = tracked terminal). */
-  interfaceMode: AdeCodeInterfaceMode;
-  /** False once a session exists — interface is fixed by the session type. */
-  interfaceEditable: boolean;
-}): SetupPaneRow[] {
-  const efforts = modelReasoningEfforts(args.modelState, args.models);
-  const descriptor = args.modelState.modelId ? getModelById(args.modelState.modelId) : undefined;
-  const activeModel = args.models.find((entry) => entry.id === args.modelState.modelId || entry.modelId === args.modelState.modelId);
-  const fastSupported =
-    Boolean(activeModel?.serviceTiers?.some((tier) => tier.trim().toLowerCase() === "fast"))
-    || modelSupportsFastMode(descriptor);
-  const rows: SetupPaneRow[] = [
-    {
-      kind: "provider",
-      label: "Provider",
-      value: providerLabel(args.modelState.provider),
-      cyclable: true,
-    },
-    {
-      kind: "interface",
-      label: "Interface",
-      value: args.interfaceMode === "cli" ? "CLI" : "Chat",
-      detail: args.interfaceEditable
-        ? "Chat · CLI"
-        : args.interfaceMode === "cli"
-          ? "tracked CLI session"
-          : "ADE chat",
-      disabled: !args.interfaceEditable,
-      cyclable: args.interfaceEditable,
-    },
-    {
-      kind: "model",
-      label: "Model",
-      value: args.modelState.displayName,
-      detail: args.models.length ? `${args.models.length} available` : "using registry default",
-      cyclable: true,
-    },
-    {
-      kind: "reasoning",
-      label: "Reasoning",
-      value: args.modelState.reasoningEffort ?? "none",
-      detail: efforts.length ? efforts.join(", ") : "not exposed by this model",
-      disabled: !efforts.length,
-      cyclable: true,
-    },
-    {
-      kind: "permission",
-      label: "Permissions",
-      value: permissionSummary(args.modelState),
-      detail: permissionOptionsDetail(args.modelState),
-      cyclable: true,
-    },
-  ];
-  rows.push({
-    kind: "codex-fast",
-    label: "Fast mode",
-    value: fastSupported && args.modelState.fastMode ? "on" : "off",
-    detail: "on · off",
-    disabled: !fastSupported,
-    cyclable: true,
-  });
-  if (args.modelState.provider === "claude") {
-    rows.push({
-      kind: "output-style",
-      label: "Output style",
-      value: args.outputStyle?.trim() || "default",
-      detail: args.outputStyleEditable === false
-        ? "active Claude chat only"
-        : "default · concise · verbose",
-      disabled: args.outputStyleEditable === false,
-      cyclable: true,
-    });
-  }
-  if (args.includeRefresh) {
-    rows.push({
-      kind: "refresh-status",
-      label: "Refresh status",
-      value: "run",
-      detail: "checks provider auth/runtime state",
-    });
-  }
-  if (args.includeApply) {
-    rows.push({
-      kind: "apply",
-      label: "Confirm",
-      value: "ready",
-      detail: "returns focus to the chat composer",
-    });
-  }
-  return rows;
-}
-
-function defaultSetupSelectionIndex(rows: SetupPaneRow[]): number {
-  const applyIndex = rows.findIndex((row) => row.kind === "apply");
-  return applyIndex >= 0 ? applyIndex : 0;
-}
-
-function defaultModelPickerSelectionIndex(rows: SetupPaneRow[]): number {
-  const modelIndex = rows.findIndex((row) => row.kind === "model" && !row.disabled);
-  if (modelIndex >= 0) return modelIndex;
-  const reasoningIndex = rows.findIndex((row) => row.kind === "reasoning" && !row.disabled);
-  if (reasoningIndex >= 0) return reasoningIndex;
-  return defaultSetupSelectionIndex(rows);
-}
-
-function setupSelectionIndexForKind(rows: SetupPaneRow[], preferredKind: SetupPaneRowKind | null | undefined): number {
-  if (preferredKind) {
-    const preferredIndex = rows.findIndex((row) => row.kind === preferredKind);
-    if (preferredIndex >= 0) return preferredIndex;
-  }
-  return defaultModelPickerSelectionIndex(rows);
-}
-
 type ConnectionStatusProvider = Extract<AdeCodeProvider, "claude" | "codex" | "cursor" | "droid">;
 
 function providerConnectionDetail(status: AiSettingsStatus | null, provider: ConnectionStatusProvider): ProviderReadinessRow {
@@ -3101,22 +2494,6 @@ function claudeTerminalRowsForPane(rows: number): number {
   );
 }
 
-function terminalSessionProvider(session: ChatTerminalSession | null | undefined): AdeCodeProvider | null {
-  return terminalSessionResumeProvider(session) ?? (session ? "claude" : null);
-}
-
-function terminalSessionResumeProvider(session: ChatTerminalSession | null | undefined): AdeCodeProvider | null {
-  const provider = session?.resumeMetadata?.provider ?? null;
-  if (provider && PROVIDERS.has(provider as AdeCodeProvider)) return provider as AdeCodeProvider;
-  const toolType = session?.toolType ?? "";
-  if (toolType.startsWith("codex")) return "codex";
-  if (toolType.startsWith("cursor")) return "cursor";
-  if (toolType.startsWith("droid")) return "droid";
-  if (toolType.startsWith("opencode")) return "opencode";
-  if (toolType.startsWith("claude")) return "claude";
-  return null;
-}
-
 export function promptTextForTerminal(text: string, attachments: AgentChatFileRef[]): string {
   const attachmentPaths = attachments.map((attachment) => attachment.path).filter(Boolean);
   if (!attachmentPaths.length) return text;
@@ -4135,20 +3512,12 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     [sessions, terminalSessions],
   );
   const closedCliSessions = useMemo(
-    () => sortSessionsByRecentActivity(
-      terminalSessions
-        .filter((session) => session.status !== "running" && terminalSessionProvider(session) != null)
-        .map(terminalSessionToChatSummary),
-    ),
+    () => deriveClosedCliSessions(terminalSessions),
     [terminalSessions],
   );
-  const closedCliSessionIds = useMemo(
-    () => new Set(closedCliSessions.map((session) => session.sessionId)),
-    [closedCliSessions],
-  );
   const openDrawerSessions = useMemo(
-    () => displaySessions.filter((session) => !closedCliSessionIds.has(session.sessionId)),
-    [closedCliSessionIds, displaySessions],
+    () => deriveOpenDrawerSessions(displaySessions, closedCliSessions),
+    [closedCliSessions, displaySessions],
   );
   const sessionBySessionId = useMemo(() => {
     const out: Record<string, AgentChatSessionSummary> = {};
@@ -4475,7 +3844,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
   const backgroundLaunchRows = backgroundLaunchStatus ? 1 : 0;
   const backgroundLaunchStatusText = backgroundLaunchStatus
     ? backgroundLaunchStatus.status === "running"
-      ? `launching in ${backgroundLaunchStatus.laneName}...`
+      ? `launching in ${backgroundLaunchStatus.laneName}…`
       : `launch failed in ${backgroundLaunchStatus.laneName}: ${backgroundLaunchStatus.error ?? "restore draft"}`
     : null;
   const goalBannerRows = goalBannerText ? 1 : 0;
@@ -5958,7 +5327,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         }
         const failedStep = progress.steps.find((step) => step.status === "failed");
         const detail = failedStep?.error?.trim()
-          || (failedStep ? `${failedStep.label} failed.` : "Environment setup failed.");
+          || (failedStep ? `${failedStep.label} failed` : "Environment setup failed");
         const failed: LaneSetupStatus = {
           status: "failed",
           label: failedStep?.label ? `${failedStep.label} failed` : "lane setup failed",
@@ -6852,26 +6221,29 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       // Build a starter selection from current activeModelId/recents so the
       // picker opens with relevant content already filtered.
       const provider = modelState.provider;
-	      const layoutSeed = buildModelPickerLayout({
+	      const layoutSeed = buildModelPickerLayout(buildModelPickerLayoutInput({
+	        picker: {
+	          kind: "model-picker",
+	          surface,
+	          query: "",
+	          searchMode: false,
+	          selection: { kind: "provider", provider },
+	          providerTabKey: null,
+	          focusedIndex: 0,
+	          railFocused: true,
+	          footerFocus: options.focusKind ?? null,
+	          settingsRows: surface === "new-chat" ? newChatSetupRows : (providerLockedRef.current ? modelPickerRows : modelSetupRows),
+	          laneLabel: surface === "new-chat"
+	            ? (lanes.find((entry) => entry.id === activeLaneIdRef.current)?.name ?? activeLane?.name ?? null)
+	            : null,
+	        },
 	        models,
 	        catalog: modelCatalogRef.current ?? modelCatalog,
 	        favorites: modelPickerFavorites,
 	        recents: modelPickerRecents,
-        activeModelId: modelState.modelId,
-        activeReasoningEffort: modelState.reasoningEffort,
-        aiStatus,
-        interfaceMode: modelState.interfaceMode,
-		        query: "",
-	        selection: { kind: "provider", provider },
-	        providerTabKey: null,
-	        focusedIndex: 0,
-	        searchMode: false,
-        settingsRows: surface === "new-chat" ? newChatSetupRows : (providerLockedRef.current ? modelPickerRows : modelSetupRows),
-        footerFocus: options.focusKind ?? null,
-        laneLabel: surface === "new-chat"
-          ? (lanes.find((entry) => entry.id === activeLaneIdRef.current)?.name ?? activeLane?.name ?? null)
-          : null,
-      });
+	        modelState,
+	        aiStatus,
+      }));
       const selection = defaultSelectionFor(
         modelState.modelId,
         modelPickerRecents,
@@ -8679,7 +8051,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       addNotice("Could not find a clipboard command for this terminal.", "error");
       return;
     }
-    addNotice(`copied ${secret.name}`, "success");
+    addNotice(`Copied ${secret.name}`, "success");
   }, [addNotice]);
 
   const openSecretsPane = useCallback(async (): Promise<void> => {
@@ -8692,7 +8064,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       });
       return;
     }
-    setRightPane({ kind: "list", title: "Secrets", rows: [], emptyText: "Loading secrets..." });
+    setRightPane({ kind: "list", title: "Secrets", rows: [], emptyText: "Loading secrets…" });
     const result = await conn.action<ProjectSecretsListResult>("project_secret", "list", {});
     const secrets = [...(result.secrets ?? [])].sort((left, right) => left.name.localeCompare(right.name));
     setRightSelectionIndex(0);
@@ -9845,8 +9217,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     const sessionId = activeSessionIdRef.current;
     if (name === "/login") {
       const requestedProvider = args.trim().split(/\s+/)[0]?.toLowerCase() ?? "";
-      if (requestedProvider && !PROVIDERS.has(requestedProvider as AdeCodeProvider)) {
-        addNotice(`Unknown provider "${requestedProvider}". Try one of: ${PROVIDER_OPTIONS.map((entry) => entry.value).join(", ")}.`, "error");
+      if (requestedProvider && !TUI_PROVIDERS.has(requestedProvider as AdeCodeProvider)) {
+        addNotice(`Unknown provider "${requestedProvider}". Try one of: ${TUI_PROVIDER_OPTIONS.map((entry) => entry.value).join(", ")}.`, "error");
         return;
       }
       const provider = requestedProvider
@@ -11061,8 +10433,8 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       addNotice("Provider is locked for this chat. /new chat to switch.", "info");
       return;
     }
-    const index = Math.max(0, PROVIDER_OPTIONS.findIndex((entry) => entry.value === modelState.provider));
-    const next = PROVIDER_OPTIONS[(index + delta + PROVIDER_OPTIONS.length) % PROVIDER_OPTIONS.length]?.value ?? "codex";
+    const index = Math.max(0, TUI_PROVIDER_OPTIONS.findIndex((entry) => entry.value === modelState.provider));
+    const next = TUI_PROVIDER_OPTIONS[(index + delta + TUI_PROVIDER_OPTIONS.length) % TUI_PROVIDER_OPTIONS.length]?.value ?? "codex";
     selectProvider(next);
   }, [addNotice, modelState.provider, selectProvider]);
 
@@ -12624,24 +11996,15 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       && rightPane.footerFocus == null
     ) {
       const picker = rightPane;
-      const layout = buildModelPickerLayout({
+      const layout = buildModelPickerLayout(buildModelPickerLayoutInput({
+        picker,
         models,
         catalog: modelCatalogRef.current ?? modelCatalog,
         favorites: modelPickerFavorites,
         recents: modelPickerRecents,
-        activeModelId: modelState.modelId,
-        activeReasoningEffort: modelState.reasoningEffort,
+        modelState,
         aiStatus,
-        interfaceMode: modelState.interfaceMode,
-        settingsRows: picker.settingsRows ?? [],
-        footerFocus: picker.footerFocus ?? null,
-        laneLabel: picker.laneLabel ?? null,
-        query: picker.query,
-        selection: picker.selection,
-        providerTabKey: picker.providerTabKey ?? null,
-        focusedIndex: picker.focusedIndex,
-        searchMode: picker.searchMode,
-      });
+      }));
       const nextTabKey = nextModelPickerProviderTabKey({
         providerTabs: layout.providerTabs,
         providerTabIndex: layout.providerTabIndex,
@@ -12850,17 +12213,26 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
 
     if (pendingQuestionKeyActive) {
       if (!pendingQuestionApproval) return;
-      const updateQuestionState = (
-        updater: (state: PendingQuestionSelectionState) => PendingQuestionSelectionState,
-      ): boolean => {
+	      const updateQuestionState = (
+	        updater: (state: PendingQuestionSelectionState) => PendingQuestionSelectionState,
+	      ): boolean => {
         const current = ensurePendingQuestionSelectionState(pendingQuestionApproval, pendingQuestionStateRef.current);
         if (!current) return false;
         const next = updater(current);
         pendingQuestionStateRef.current = next;
-        setPendingQuestionState(next);
-        return true;
-      };
-      if (key.upArrow || key.downArrow) {
+	        setPendingQuestionState(next);
+	        return true;
+	      };
+	      if (key.escape || key.backspace || key.delete) {
+	        let cancelled = false;
+	        updateQuestionState((state) => {
+	          const result = cancelPendingQuestionDigitSelection(state);
+	          cancelled = result.cancelled;
+	          return result.state;
+	        });
+	        if (cancelled) return;
+	      }
+	      if (key.upArrow || key.downArrow) {
         updateQuestionState((state) => {
           const question = pendingQuestionApproval.request?.questions[state.activeQuestionIndex];
           const options = optionsForPendingQuestion(pendingQuestionApproval.request, question, state.activeQuestionIndex);
@@ -13326,25 +12698,16 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
 
     if (pane === "details" && rightOpen && rightPane.kind === "model-picker") {
       const picker = rightPane;
-      // Re-derive layout each keystroke so we never select stale indexes.
-	      const layout = buildModelPickerLayout({
-	        models,
-	        catalog: modelCatalogRef.current ?? modelCatalog,
-	        favorites: modelPickerFavorites,
+	      // Re-derive layout each keystroke so we never select stale indexes.
+		      const layout = buildModelPickerLayout(buildModelPickerLayoutInput({
+		        picker,
+		        models,
+		        catalog: modelCatalogRef.current ?? modelCatalog,
+		        favorites: modelPickerFavorites,
 		        recents: modelPickerRecents,
-		        activeModelId: modelState.modelId,
-            activeReasoningEffort: modelState.reasoningEffort,
-            aiStatus,
-            interfaceMode: modelState.interfaceMode,
-            settingsRows: picker.settingsRows ?? [],
-            footerFocus: picker.footerFocus ?? null,
-            laneLabel: picker.laneLabel ?? null,
-		        query: picker.query,
-	        selection: picker.selection,
-	        providerTabKey: picker.providerTabKey ?? null,
-	        focusedIndex: picker.focusedIndex,
-	        searchMode: picker.searchMode,
-      });
+		        modelState,
+		        aiStatus,
+	      }));
       const pickerSettingsRows = (picker.settingsRows ?? []).filter((row) => row.kind !== "provider" && row.kind !== "model");
       const lastModelIndex = Math.max(0, layout.entries.length - 1);
       // Navigation has two stages. Stage 1 is the SELECTION AREA — two columns:
@@ -13378,14 +12741,10 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
             : nextEntry.kind === "recents"
               ? ({ kind: "recents" } as const)
               : ({ kind: "provider", provider: nextEntry.provider } as const);
-        if (nextSelection.kind === "provider") {
-          const refreshProvider =
-            nextSelection.provider === "opencode" || nextSelection.provider === "cursor" || nextSelection.provider === "droid"
-            || nextSelection.provider === "lmstudio" || nextSelection.provider === "ollama"
-              ? nextSelection.provider
-              : null;
-          if (refreshProvider) void refreshModelCatalog({ refreshProvider });
-        }
+	        if (nextSelection.kind === "provider") {
+	          const refreshProvider = modelPickerRefreshProvider(nextSelection.provider);
+	          if (refreshProvider) void refreshModelCatalog({ refreshProvider });
+	        }
         setRightPane({ ...picker, selection: nextSelection, providerTabKey: null, focusedIndex: 0, footerFocus: null, railFocused: true, query: "", searchMode: false });
       };
 
@@ -14558,24 +13917,15 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       const rightBodyTop = 2 + goalBannerRows + addModeRows;
       if (rightPane.kind === "model-picker") {
         const picker = rightPane;
-        const layout = buildModelPickerLayout({
+        const layout = buildModelPickerLayout(buildModelPickerLayoutInput({
+          picker,
           models,
           catalog: modelCatalogRef.current ?? modelCatalog,
           favorites: modelPickerFavorites,
           recents: modelPickerRecents,
-          activeModelId: modelState.modelId,
-          activeReasoningEffort: modelState.reasoningEffort,
+          modelState,
           aiStatus,
-          interfaceMode: modelState.interfaceMode,
-          settingsRows: picker.settingsRows ?? [],
-          footerFocus: picker.footerFocus ?? null,
-          laneLabel: picker.laneLabel ?? null,
-          query: picker.query,
-          selection: picker.selection,
-          providerTabKey: picker.providerTabKey ?? null,
-          focusedIndex: picker.focusedIndex,
-          searchMode: picker.searchMode,
-        });
+        }));
         // Single geometry source: derive every clickable rect from the SAME
         // constants + windowing the render uses (modelPickerGeometry), so a
         // click lands on the row the user sees. Prefer the pane's MEASURED
@@ -14618,11 +13968,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
             onClick: () => {
               const nextSelection = railEntrySelection(entry);
               if (nextSelection.kind === "provider") {
-                const refreshProvider =
-                  nextSelection.provider === "opencode" || nextSelection.provider === "cursor" || nextSelection.provider === "droid"
-                  || nextSelection.provider === "lmstudio" || nextSelection.provider === "ollama"
-                    ? nextSelection.provider
-                    : null;
+                const refreshProvider = modelPickerRefreshProvider(nextSelection.provider);
                 if (refreshProvider) void refreshModelCatalog({ refreshProvider });
               }
               setRightPane({
diff --git a/apps/ade-cli/src/tuiClient/closedCliSessions.ts b/apps/ade-cli/src/tuiClient/closedCliSessions.ts
new file mode 100644
index 000000000..c56acc7f1
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/closedCliSessions.ts
@@ -0,0 +1,155 @@
+import type { AgentChatSessionSummary } from "../../../desktop/src/shared/types/chat";
+import type { ChatTerminalSession } from "../../../desktop/src/shared/types/sessions";
+import { formatRelativePastTime } from "./relativeTime";
+import { theme } from "./theme";
+import type { AdeCodeProvider } from "./types";
+import { TUI_PROVIDERS } from "./providerMetadata";
+import { statusGlyph, type StatusKind } from "./components/designKit";
+
+export type ClosedCliSessionSummary = AgentChatSessionSummary & {
+  terminalStatus?: ChatTerminalSession["status"];
+  terminalExitCode?: ChatTerminalSession["exitCode"];
+  terminalRuntimeState?: ChatTerminalSession["runtimeState"];
+};
+
+export type DrawerChatAction = "new-chat" | "closed-toggle";
+
+export type DrawerChatListItem =
+  | { kind: "chat"; session: AgentChatSessionSummary }
+  | { kind: "closed-toggle"; laneId: string; count: number; expanded: boolean }
+  | { kind: "closed-chat"; session: ClosedCliSessionSummary };
+
+export const RIGHT_CHAT_CLOSED_TOGGLE_ID = "__closed_cli_toggle__";
+
+export function terminalSessionResumeProvider(session: ChatTerminalSession | null | undefined): AdeCodeProvider | null {
+  const provider = session?.resumeMetadata?.provider ?? null;
+  if (provider && TUI_PROVIDERS.has(provider as AdeCodeProvider)) return provider as AdeCodeProvider;
+  const toolType = session?.toolType ?? "";
+  if (toolType.startsWith("codex")) return "codex";
+  if (toolType.startsWith("cursor")) return "cursor";
+  if (toolType.startsWith("droid")) return "droid";
+  if (toolType.startsWith("opencode")) return "opencode";
+  if (toolType.startsWith("claude")) return "claude";
+  return null;
+}
+
+export function terminalSessionProvider(session: ChatTerminalSession | null | undefined): AdeCodeProvider | null {
+  return terminalSessionResumeProvider(session) ?? (session ? "claude" : null);
+}
+
+export function isTerminalSessionResumable(session: ChatTerminalSession | null | undefined): boolean {
+  return Boolean(
+    session
+      && session.status !== "running"
+      && terminalSessionResumeProvider(session)
+      && (session.resumeMetadata || session.resumeCommand),
+  );
+}
+
+/** Narrow a terminal session's derived provider to an AgentChatProvider (CLI terminals are always one of the five). */
+function terminalSummaryProvider(session: ChatTerminalSession): AgentChatSessionSummary["provider"] {
+  const provider = terminalSessionProvider(session);
+  return provider === "codex" || provider === "claude" || provider === "opencode" || provider === "cursor" || provider === "droid"
+    ? provider
+    : "claude";
+}
+
+export function terminalSessionToChatSummary(session: ChatTerminalSession): ClosedCliSessionSummary {
+  const status: AgentChatSessionSummary["status"] = session.status === "running"
+    ? session.runtimeState === "idle" ? "idle" : "active"
+    : "ended";
+  const provider = terminalSummaryProvider(session);
+  return {
+    sessionId: session.terminalId,
+    laneId: session.laneId,
+    provider,
+    model: provider === "claude" ? "claude-code" : `${provider} cli`,
+    title: session.title,
+    goal: session.goal,
+    permissionMode: session.resumeMetadata?.launch?.permissionMode ?? "default",
+    status,
+    startedAt: session.startedAt,
+    endedAt: session.endedAt,
+    lastActivityAt: session.endedAt ?? session.startedAt,
+    lastOutputPreview: session.lastOutputPreview,
+    summary: session.summary,
+    surface: "work",
+    terminalStatus: session.status,
+    terminalExitCode: session.exitCode,
+    terminalRuntimeState: session.runtimeState,
+  };
+}
+
+export function sortSessionsByRecentActivity<T extends { startedAt: string; lastActivityAt?: string | null }>(sessions: T[]): T[] {
+  return [...sessions].sort((left, right) => {
+    const rightMs = Date.parse(right.lastActivityAt ?? right.startedAt);
+    const leftMs = Date.parse(left.lastActivityAt ?? left.startedAt);
+    return (Number.isFinite(rightMs) ? rightMs : 0) - (Number.isFinite(leftMs) ? leftMs : 0);
+  });
+}
+
+export function deriveClosedCliSessions(terminalSessions: ChatTerminalSession[]): ClosedCliSessionSummary[] {
+  return sortSessionsByRecentActivity(
+    terminalSessions
+      .filter((session) => session.status !== "running" && terminalSessionProvider(session) != null)
+      .map(terminalSessionToChatSummary),
+  );
+}
+
+export function deriveOpenDrawerSessions(
+  displaySessions: AgentChatSessionSummary[],
+  closedCliSessions: AgentChatSessionSummary[],
+): AgentChatSessionSummary[] {
+  const closedCliSessionIds = new Set(closedCliSessions.map((session) => session.sessionId));
+  return displaySessions.filter((session) => !closedCliSessionIds.has(session.sessionId));
+}
+
+export function buildDrawerChatItems(args: {
+  openSessions: AgentChatSessionSummary[];
+  closedSessions: ClosedCliSessionSummary[];
+  closedToggleVisible: boolean;
+  closedExpanded: boolean;
+  laneId: string | null;
+}): DrawerChatListItem[] {
+  const items: DrawerChatListItem[] = args.openSessions.map((session) => ({ kind: "chat", session }));
+  if (args.closedToggleVisible && args.laneId) {
+    items.push({
+      kind: "closed-toggle",
+      laneId: args.laneId,
+      count: args.closedSessions.length,
+      expanded: args.closedExpanded,
+    });
+    if (args.closedExpanded) {
+      items.push(...args.closedSessions.map((session): DrawerChatListItem => ({ kind: "closed-chat", session })));
+    }
+  }
+  return items;
+}
+
+export function sessionFromDrawerChatItem(item: DrawerChatListItem | null | undefined): AgentChatSessionSummary | null {
+  return item?.kind === "chat" || item?.kind === "closed-chat" ? item.session : null;
+}
+
+export function drawerChatActionForItem(item: DrawerChatListItem | null | undefined): DrawerChatAction | null {
+  return item?.kind === "closed-toggle" ? "closed-toggle" : null;
+}
+
+export function closedCliSessionStatusKind(session: AgentChatSessionSummary): StatusKind {
+  const closed = session as ClosedCliSessionSummary;
+  if (
+    closed.terminalStatus === "failed"
+    || (closed.terminalExitCode != null && closed.terminalExitCode !== 0)
+    || closed.terminalRuntimeState === "killed"
+  ) {
+    return "failed";
+  }
+  return "idle";
+}
+
+export function closedCliRightPaneRow(session: AgentChatSessionSummary, activeSessionId: string | null): string {
+  const status = statusGlyph(closedCliSessionStatusKind(session));
+  const marker = session.sessionId === activeSessionId ? "●" : status.glyph;
+  const provider = theme.provider((session.provider as AdeCodeProvider) ?? null);
+  const ended = formatRelativePastTime(session.endedAt ?? session.lastActivityAt ?? session.startedAt);
+  return `${marker} ${provider.glyph} ${session.title ?? session.sessionId} · ended ${ended}`;
+}
diff --git a/apps/ade-cli/src/tuiClient/components/ApprovalPrompt.tsx b/apps/ade-cli/src/tuiClient/components/ApprovalPrompt.tsx
index cbc0ac861..4c8fd7775 100644
--- a/apps/ade-cli/src/tuiClient/components/ApprovalPrompt.tsx
+++ b/apps/ade-cli/src/tuiClient/components/ApprovalPrompt.tsx
@@ -200,7 +200,7 @@ export function ApprovalPrompt({
 
   // Footer hints, keyed to the real bindings in app input handling.
   const hints: Array<[string, string]> = isQuestion
-    ? [["↑↓", "choose"], ["←→", "question"], ["enter", "next/send"], ["type", "custom"], ["deny", "decline"]]
+    ? [["↑↓", "choose"], ["←→", "question"], ["1-9", "pick"], ["enter", "next/send"], ["type", "custom"], ["deny", "decline"]]
     : highStakes
       ? [["approve", "allow"], ["deny", "decline"], ["enter", "confirm"]]
       : [["a", "approve"], ["d", "deny"]];
diff --git a/apps/ade-cli/src/tuiClient/components/Drawer.tsx b/apps/ade-cli/src/tuiClient/components/Drawer.tsx
index d73bf75da..1bd3ff015 100644
--- a/apps/ade-cli/src/tuiClient/components/Drawer.tsx
+++ b/apps/ade-cli/src/tuiClient/components/Drawer.tsx
@@ -6,6 +6,7 @@ import type { LaneSummary } from "../../../../desktop/src/shared/types/lanes";
 import { formatSessionLabel } from "../format";
 import { computeStackRowMeta, sortLanesForStackGraph } from "../laneTree";
 import { formatRelativePastTime } from "../relativeTime";
+import { closedCliSessionStatusKind } from "../closedCliSessions";
 import { useSpinFrame } from "../spinTick";
 import { theme, type LaneStatusKind } from "../theme";
 import type { AdeCodeProvider } from "../types";
@@ -759,9 +760,9 @@ function ClosedCliRow({
 }) {
   const provider = (session.provider as AdeCodeProvider) ?? null;
   const exec = theme.provider(provider);
-  const dot = statusGlyph("idle");
+  const dot = statusGlyph(closedCliSessionStatusKind(session));
   const ended = formatRelativePastTime(session.endedAt ?? session.lastActivityAt ?? session.startedAt);
-  const suffix = ` ${ended}`;
+  const suffix = ` · ${ended}`;
   const label = truncate(formatSessionLabel(session), Math.max(3, max - suffix.length - 4));
   return (
     <Box>
diff --git a/apps/ade-cli/src/tuiClient/components/ModelPicker/ModelPickerPane.tsx b/apps/ade-cli/src/tuiClient/components/ModelPicker/ModelPickerPane.tsx
index 7b5f1ac67..8416bc5b5 100644
--- a/apps/ade-cli/src/tuiClient/components/ModelPicker/ModelPickerPane.tsx
+++ b/apps/ade-cli/src/tuiClient/components/ModelPicker/ModelPickerPane.tsx
@@ -5,6 +5,7 @@ import type { SetupPaneRow, SetupPaneRowKind } from "../../types";
 import { useHoveredHitId } from "../../hitTestRegistry";
 import { KeyHints } from "../designKit";
 import type { ModelPickerAuthStatus, ModelPickerEntry, ModelPickerRailEntry, ModelPickerState } from "./types";
+import { normalizeProviderToken, providerFamilyLabel, titleCaseProviderName } from "../../providerMetadata";
 // The model list is a FIXED-height window so a long catalog (e.g. OpenCode's
 // dozens of providers) scrolls inside its own region instead of shoving the
 // settings footer around. Settings stay stickied below. Geometry constants +
@@ -36,37 +37,13 @@ function authPip(status: ModelPickerAuthStatus): { glyph: string; color: string
   return null;
 }
 
-const RAIL_LABELS: Record<string, string> = {
-  claude: "Anthropic",
-  codex: "OpenAI",
-  droid: "Droid",
-  cursor: "Cursor",
-  opencode: "OpenCode",
-  ollama: "Ollama",
-  lmstudio: "LM Studio",
-};
-
-function normalizeProviderToken(value: string | null | undefined): string {
-  return (value ?? "")
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "");
-}
-
 function titleCaseProvider(value: string): string {
-  const trimmed = value.trim();
-  if (!trimmed) return "";
-  const normalized = normalizeProviderToken(trimmed);
-  const known = PROVIDER_MARKS[normalized]?.label;
-  if (known) return known;
-  return trimmed
-    .replace(/\b\w/g, (ch) => ch.toUpperCase())
-    .replace(/\bAi\b/g, "AI");
+  return PROVIDER_MARKS[normalizeProviderToken(value)]?.label ?? titleCaseProviderName(value);
 }
 
 function providerLabelFor(entry: Pick<ModelPickerEntry, "family" | "subProvider">): string {
   if (entry.subProvider?.trim()) return titleCaseProvider(entry.subProvider);
-  return RAIL_LABELS[entry.family] ?? theme.provider(entry.family).label;
+  return providerFamilyLabel(entry.family);
 }
 
 type ProviderMark = {
@@ -263,7 +240,7 @@ function VerticalRail({
         const showCursor = selected && focused;
         const pip = entry.kind === "provider" ? authPip(entry.authStatus) : null;
         const label = entry.kind === "provider"
-          ? (RAIL_LABELS[entry.provider] ?? entry.label)
+          ? providerFamilyLabel(entry.provider)
           : entry.kind === "favorites"
             ? "Favs"
             : "Recents";
@@ -428,6 +405,9 @@ function SettingsFooter({
   if (!visibleRows.length) return null;
   const settingRows = visibleRows.filter((row) => row.kind !== "apply");
   const applyRow = visibleRows.find((row) => row.kind === "apply") ?? null;
+  const focusedDetail = footerFocus
+    ? settingRows.find((row) => row.kind === footerFocus && !row.disabled)?.detail?.trim() ?? null
+    : null;
   const divider = "─".repeat(Math.max(4, width));
 
   return (
@@ -450,6 +430,13 @@ function SettingsFooter({
               </Box>
             );
           })}
+          {focusedDetail ? (
+            <Box paddingLeft={3}>
+              <Text color={theme.color.t5} dimColor wrap="truncate-end">
+                {endTruncate(focusedDetail, Math.max(4, width - 3))}
+              </Text>
+            </Box>
+          ) : null}
         </Box>
       ) : null}
       {applyRow ? (
diff --git a/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerGeometry.ts b/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerGeometry.ts
index 111e7a8e7..c2ccd8d03 100644
--- a/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerGeometry.ts
+++ b/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerGeometry.ts
@@ -1,4 +1,5 @@
 import type { ModelPickerProviderTab, ModelPickerState } from "./types";
+import { titleCaseProviderName } from "../../providerMetadata";
 
 /**
  * Screen rectangle in 1-based terminal cells. Structurally identical to
@@ -85,45 +86,8 @@ function endTruncate(value: string, max: number): string {
   return `${value.slice(0, Math.max(0, max - 1))}…`;
 }
 
-function normalizeProviderToken(value: string | null | undefined): string {
-  return (value ?? "")
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "");
-}
-
-const PROVIDER_TAB_LABELS: Record<string, string> = {
-  anthropic: "Anthropic",
-  claude: "Anthropic",
-  openai: "OpenAI",
-  codex: "OpenAI",
-  google: "Google",
-  gemini: "Google",
-  deepseek: "DeepSeek",
-  mistral: "Mistral",
-  xai: "xAI",
-  grok: "xAI",
-  groq: "Groq",
-  together: "Together",
-  openrouter: "OpenRouter",
-  opencode: "OpenCode",
-  droid: "Droid",
-  factory: "Droid",
-  cursor: "Cursor",
-  kimi: "Kimi",
-  moonshot: "Kimi",
-  ollama: "Ollama",
-  lmstudio: "LM Studio",
-};
-
 export function formatProviderTabLabel(value: string): string {
-  const trimmed = value.trim();
-  if (!trimmed) return "";
-  const known = PROVIDER_TAB_LABELS[normalizeProviderToken(trimmed)];
-  if (known) return known;
-  return trimmed
-    .replace(/\b\w/g, (ch) => ch.toUpperCase())
-    .replace(/\bAi\b/g, "AI");
+  return titleCaseProviderName(value);
 }
 
 export type ProviderTabSegment = {
@@ -344,6 +308,10 @@ export function modelPickerGeometry(input: GeometryInput): ModelPickerGeometry {
   );
   const settingRows = visibleRows.filter((row) => row.kind !== "apply");
   const applyRow = visibleRows.find((row) => row.kind === "apply") ?? null;
+  const focusedDetailVisible = Boolean(
+    state.footerFocus
+    && settingRows.some((row) => row.kind === state.footerFocus && !row.disabled && row.detail?.trim()),
+  );
 
   // The settings list has its OWN marginTop (1) below the divider (the divider
   // sits at footerTop), so rows paint at footerTop+2. The render is vertical,
@@ -362,7 +330,7 @@ export function modelPickerGeometry(input: GeometryInput): ModelPickerGeometry {
   // below the divider when there are no settings. Rendered as "[ Apply ]".
   let apply: HitRect | null = null;
   if (applyRow) {
-    const applyY = settingRows.length ? chipsY + settingRows.length + 1 : footerTop + 2;
+    const applyY = settingRows.length ? chipsY + settingRows.length + (focusedDetailVisible ? 2 : 1) : footerTop + 2;
     apply = { x: paneLeft, y: applyY, w: Math.max(8, Math.min(paneWidth, 24)), h: 1 };
   }
 
diff --git a/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.ts b/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.ts
index 0a7c3fd56..01ee93f69 100644
--- a/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.ts
+++ b/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.ts
@@ -19,16 +19,7 @@ import type {
   ModelPickerAuthStatus,
 } from "./types";
 import type { SetupPaneRow, SetupPaneRowKind } from "../../types";
-
-const PROVIDER_LABELS: Record<AdeCodeProvider, string> = {
-  codex: "OpenAI",
-  claude: "Anthropic",
-  opencode: "OpenCode",
-  cursor: "Cursor",
-  droid: "Droid",
-  ollama: "Ollama",
-  lmstudio: "LM Studio",
-};
+import { normalizeProvider, providerFamilyLabel as providerLabel, titleCaseProviderName } from "../../providerMetadata";
 
 const PROVIDER_ORDER: readonly AdeCodeProvider[] = [
   "claude",
@@ -43,27 +34,8 @@ const PROVIDER_ORDER: readonly AdeCodeProvider[] = [
 const RAIL_PROVIDER_ORDER: readonly AdeCodeProvider[] = PROVIDER_ORDER;
 const STATIC_REGISTRY_FALLBACK_PROVIDERS: readonly ModelProviderGroup[] = ["claude", "codex"];
 
-function providerLabel(provider: AdeCodeProvider): string {
-  return PROVIDER_LABELS[provider] ?? provider;
-}
-
 function openCodeProviderLabel(providerId: string): string {
-  const normalized = providerId.trim().toLowerCase();
-  const labels: Record<string, string> = {
-    anthropic: "Anthropic",
-    claude: "Anthropic",
-    openai: "OpenAI",
-    google: "Google",
-    deepseek: "DeepSeek",
-    mistral: "Mistral",
-    xai: "xAI",
-    groq: "Groq",
-    together: "Together",
-    openrouter: "OpenRouter",
-    ollama: "Ollama",
-    lmstudio: "LM Studio",
-  };
-  return labels[normalized] ?? providerId.trim().replace(/\b\w/g, (ch) => ch.toUpperCase());
+  return titleCaseProviderName(providerId);
 }
 
 function providerSignInHint(provider: AdeCodeProvider): string {
@@ -138,20 +110,6 @@ export function modelPickerProviderAuthStatus(
   return "unknown";
 }
 
-function normalizeProvider(value: ProviderFamily | string | undefined): AdeCodeProvider {
-  // resolveProviderGroupForModel already returns ModelProviderGroup values
-  // (claude/codex/opencode/cursor/droid). Map ProviderFamily aliases as well so
-  // raw registry families resolve correctly.
-  if (value === "claude" || value === "anthropic") return "claude";
-  if (value === "codex" || value === "openai") return "codex";
-  if (value === "opencode") return "opencode";
-  if (value === "ollama") return "ollama";
-  if (value === "lmstudio") return "lmstudio";
-  if (value === "cursor") return "cursor";
-  if (value === "droid" || value === "factory") return "droid";
-  return "codex";
-}
-
 function providerFromCatalogGroup(groupKey: string, fallbackFamily?: string): AdeCodeProvider {
   const normalized = groupKey.trim().toLowerCase();
   if (normalized === "claude" || normalized === "codex" || normalized === "opencode" || normalized === "cursor" || normalized === "droid") {
diff --git a/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx b/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
index 6b2eef5c8..8891d6f5b 100644
--- a/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
+++ b/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
@@ -592,7 +592,7 @@ function TerminalPaneComponent({
 
   const controlLabel = cliLabel?.trim() || "Claude";
   const status = attached
-    ? `${controlLabel.toUpperCase()} CONTROL · Ctrl+T returns to ADE · Ctrl+] escape`
+    ? `${controlLabel.toUpperCase()} CONTROL · ^t returns to ADE · ^] escape`
     : preview?.session.status === "running"
       ? effectiveHiddenBottomRows > 0 ? `ADE prompt sends to ${controlLabel}` : "live preview"
       : preview?.session.resumeCommand
@@ -634,10 +634,10 @@ function TerminalPaneComponent({
   const content = (
     <>
       <Box width={contentWidth}>
-        <Text color={attached ? theme.color.warning : theme.color.accent}>
+        <Text color={attached ? theme.color.warning : theme.color.accent} wrap="truncate-end">
           {attached ? `${spinFrame} ${title}` : title}
         </Text>
-        <Text color={theme.color.mutedFg}>  {status}</Text>
+        <Text color={theme.color.mutedFg} wrap="truncate-end">  {status}</Text>
         {namingHint && !attached ? (
           <Text color={theme.color.accent}>{`  ${spinFrame} naming…`}</Text>
         ) : null}
diff --git a/apps/ade-cli/src/tuiClient/modelPickerController.ts b/apps/ade-cli/src/tuiClient/modelPickerController.ts
new file mode 100644
index 000000000..510588925
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/modelPickerController.ts
@@ -0,0 +1,43 @@
+import type {
+  AgentChatModelCatalog,
+  AgentChatModelCatalogRefreshProvider,
+  AgentChatModelInfo,
+} from "../../../desktop/src/shared/types/chat";
+import type { AiSettingsStatus } from "../../../desktop/src/shared/types/config";
+import type { AdeCodeInterfaceMode, AdeCodeModelState, AdeCodeProvider, ModelPickerRightPaneContent } from "./types";
+import type { BuildLayoutInput } from "./components/ModelPicker/modelPickerLayout";
+import { refreshProviderForModelPicker } from "./providerMetadata";
+
+export function modelPickerRefreshProvider(provider: AdeCodeProvider): AgentChatModelCatalogRefreshProvider | null {
+  return refreshProviderForModelPicker(provider);
+}
+
+export function buildModelPickerLayoutInput(args: {
+  picker: ModelPickerRightPaneContent;
+  models: AgentChatModelInfo[];
+  catalog: AgentChatModelCatalog | null | undefined;
+  favorites: string[];
+  recents: string[];
+  modelState: Pick<AdeCodeModelState, "modelId" | "reasoningEffort" | "interfaceMode">;
+  aiStatus: AiSettingsStatus | null;
+  interfaceMode?: AdeCodeInterfaceMode;
+}): BuildLayoutInput {
+  return {
+    models: args.models,
+    catalog: args.catalog,
+    favorites: args.favorites,
+    recents: args.recents,
+    activeModelId: args.modelState.modelId,
+    activeReasoningEffort: args.modelState.reasoningEffort,
+    aiStatus: args.aiStatus,
+    interfaceMode: args.interfaceMode ?? args.modelState.interfaceMode,
+    settingsRows: args.picker.settingsRows ?? [],
+    footerFocus: args.picker.footerFocus ?? null,
+    laneLabel: args.picker.laneLabel ?? null,
+    query: args.picker.query,
+    selection: args.picker.selection,
+    providerTabKey: args.picker.providerTabKey ?? null,
+    focusedIndex: args.picker.focusedIndex,
+    searchMode: args.picker.searchMode,
+  };
+}
diff --git a/apps/ade-cli/src/tuiClient/modelState.ts b/apps/ade-cli/src/tuiClient/modelState.ts
new file mode 100644
index 000000000..0f1d7827c
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/modelState.ts
@@ -0,0 +1,555 @@
+import {
+  getDefaultModelDescriptor,
+  getModelById,
+  getRuntimeModelRefForDescriptor,
+  listModelDescriptorsForProvider,
+  modelSupportsFastMode,
+  resolveCursorCliModelVariant,
+  resolveProviderGroupForModel,
+  type ModelDescriptor,
+  type ModelProviderGroup,
+} from "../../../desktop/src/shared/modelRegistry";
+import { CURSOR_AVAILABLE_MODE_IDS, CURSOR_MODE_LABELS } from "../../../desktop/src/shared/cursorModes";
+import type {
+  AgentChatModelCatalogRefreshProvider,
+  AgentChatModelInfo,
+  AgentChatPermissionMode,
+} from "../../../desktop/src/shared/types/chat";
+import { DEFAULT_CODEX_REASONING_EFFORT, type CliTerminalProvider } from "./adeApi";
+import { theme } from "./theme";
+import type { AdeCodeInterfaceMode, AdeCodeModelState, AdeCodeProvider, SetupPaneRow, SetupPaneRowKind } from "./types";
+import { normalizeProvider, providerLabel } from "./providerMetadata";
+
+export const EFFORTS = ["low", "medium", "high", "xhigh", "max", "ultracode"];
+export const CODEX_PRESETS = ["default", "edit", "plan", "full-auto", "config-toml"] as const;
+export const CLAUDE_PERMISSION_OPTIONS = ["default", "auto", "plan", "acceptEdits", "bypassPermissions"] as const;
+export const OPENCODE_PERMISSION_OPTIONS = ["plan", "edit", "full-auto", "config-toml"] as const;
+export const DROID_PERMISSION_OPTIONS = ["read-only", "auto-low", "auto-medium", "auto-high", "agi"] as const;
+
+export type CodexPreset = (typeof CODEX_PRESETS)[number];
+
+export function initialModelState(draftKind: AdeCodeInterfaceMode = "chat"): AdeCodeModelState {
+  const descriptor = getDefaultModelDescriptor("codex");
+  return {
+    provider: "codex",
+    interfaceMode: draftKind,
+    model: descriptor?.providerModelId ?? "gpt-5.5",
+    modelId: descriptor?.id ?? null,
+    displayName: descriptor?.displayName ?? "GPT-5.5",
+    reasoningEffort: DEFAULT_CODEX_REASONING_EFFORT,
+    fastMode: false,
+    permissionMode: "default",
+    interactionMode: "default",
+    claudePermissionMode: "default",
+    codexApprovalPolicy: "on-request",
+    codexSandbox: "workspace-write",
+    codexConfigSource: "flags",
+    opencodePermissionMode: "edit",
+    droidPermissionMode: "auto-low",
+    cursorModeId: "agent",
+    cursorAvailableModeIds: [],
+    cursorConfigValues: {},
+  };
+}
+
+export function runtimeProviderForUiProvider(provider: AdeCodeProvider): ModelProviderGroup {
+  return provider === "ollama" || provider === "lmstudio" ? "opencode" : provider;
+}
+
+/**
+ * The provider CLI a modelState provider launches as, or null when it has no
+ * tracked CLI (Ollama / LM Studio are OpenCode-backed chat only). Gates the
+ * Interface=CLI launch path.
+ */
+export function cliProviderForModelStateProvider(provider: AdeCodeProvider): CliTerminalProvider | null {
+  return provider === "claude" || provider === "codex" || provider === "cursor" || provider === "droid" || provider === "opencode"
+    ? provider
+    : null;
+}
+
+function firstReasoningEffortForModel(model: AgentChatModelInfo | null | undefined, provider: AdeCodeProvider): string | null {
+  const efforts = model?.reasoningEfforts?.map((entry) => entry.effort).filter(Boolean) ?? [];
+  const modelId = `${model?.modelId ?? ""} ${model?.id ?? ""} ${model?.displayName ?? ""}`.toLowerCase();
+  if (modelId.includes("fable") && efforts.includes("high")) return "high";
+  if (efforts.includes(DEFAULT_CODEX_REASONING_EFFORT)) return DEFAULT_CODEX_REASONING_EFFORT;
+  if (efforts.length) return efforts[0] ?? null;
+  const descriptor = model?.modelId || model?.id ? getModelById(model.modelId ?? model.id) : undefined;
+  const descriptorEfforts = descriptor?.reasoningTiers ?? [];
+  const descriptorId = `${descriptor?.id ?? ""} ${descriptor?.providerModelId ?? ""} ${descriptor?.displayName ?? ""}`.toLowerCase();
+  if (descriptorId.includes("fable") && descriptorEfforts.includes("high")) return "high";
+  if (descriptorEfforts.includes(DEFAULT_CODEX_REASONING_EFFORT)) return DEFAULT_CODEX_REASONING_EFFORT;
+  if (descriptorEfforts.length) return descriptorEfforts[0] ?? null;
+  return provider === "codex" ? DEFAULT_CODEX_REASONING_EFFORT : null;
+}
+
+export function modelStatePatchForModel(provider: AdeCodeProvider, model: AgentChatModelInfo): Pick<AdeCodeModelState, "provider" | "model" | "modelId" | "displayName" | "reasoningEffort"> {
+  const modelId = model.modelId ?? model.id;
+  const descriptor = getModelById(modelId);
+  const resolvedProvider = descriptor ? normalizeProvider(resolveProviderGroupForModel(descriptor)) : provider;
+  const runtimeProvider = runtimeProviderForUiProvider(resolvedProvider);
+  return {
+    provider: resolvedProvider,
+    model: descriptor ? getRuntimeModelRefForDescriptor(descriptor, runtimeProvider) : model.id,
+    modelId,
+    displayName: model.displayName,
+    reasoningEffort: firstReasoningEffortForModel(model, resolvedProvider),
+  };
+}
+
+export function modelInfoSupportsFastMode(model: AgentChatModelInfo | null | undefined): boolean {
+  const descriptor = model?.modelId || model?.id ? getModelById(model.modelId ?? model.id) : undefined;
+  return Boolean(model?.serviceTiers?.some((tier) => tier.trim().toLowerCase() === "fast"))
+    || modelSupportsFastMode(descriptor);
+}
+
+function cursorDescriptorForModelInfo(model: AgentChatModelInfo | null | undefined): ModelDescriptor | undefined {
+  const modelId = model?.modelId ?? model?.id;
+  return modelId ? getModelById(modelId) : undefined;
+}
+
+function cursorAvailabilityForModel(
+  model: AgentChatModelInfo | null | undefined,
+  descriptor = cursorDescriptorForModelInfo(model),
+): { cli: boolean; sdk: boolean } | null {
+  return model?.cursorAvailability ?? descriptor?.cursorAvailability ?? null;
+}
+
+export function cursorModelAvailableForInterface(
+  model: AgentChatModelInfo | null | undefined,
+  interfaceMode: AdeCodeInterfaceMode,
+): boolean {
+  const descriptor = cursorDescriptorForModelInfo(model);
+  if (descriptor?.family !== "cursor" && model?.family !== "cursor") return true;
+  const availability = cursorAvailabilityForModel(model, descriptor);
+  if (!availability) return false;
+  return interfaceMode === "cli" ? availability.cli === true : availability.sdk === true;
+}
+
+export function cursorSourceForInterfaceMode(interfaceMode: AdeCodeInterfaceMode): "sdk" | "cli" {
+  return interfaceMode === "cli" ? "cli" : "sdk";
+}
+
+export function providerModelsCacheKey(provider: AdeCodeProvider, interfaceMode: AdeCodeInterfaceMode): string {
+  return provider === "cursor" ? `cursor:${cursorSourceForInterfaceMode(interfaceMode)}` : provider;
+}
+
+export function modelCatalogRefreshCacheKey(
+  provider: AgentChatModelCatalogRefreshProvider,
+  cursorSource?: "sdk" | "cli",
+): string {
+  return provider === "cursor" ? `cursor:${cursorSource ?? "sdk"}` : provider;
+}
+
+export function fallbackModelStatePatch(provider: AdeCodeProvider): Pick<AdeCodeModelState, "provider" | "model" | "modelId" | "displayName" | "reasoningEffort"> {
+  const registryProvider = provider === "ollama" || provider === "lmstudio" ? "opencode" : provider;
+  const descriptor = getDefaultModelDescriptor(registryProvider)
+    ?? listModelDescriptorsForProvider(registryProvider)[0]
+    ?? getDefaultModelDescriptor("codex");
+  return {
+    provider,
+    model: descriptor ? getRuntimeModelRefForDescriptor(descriptor, registryProvider) : "gpt-5.5",
+    modelId: descriptor?.id ?? null,
+    displayName: descriptor?.displayName ?? providerLabel(provider),
+    reasoningEffort: descriptor?.id.includes("fable") && descriptor.reasoningTiers?.includes("high")
+      ? "high"
+      : descriptor?.reasoningTiers?.[0] ?? (provider === "codex" ? DEFAULT_CODEX_REASONING_EFFORT : null),
+  };
+}
+
+export function registryModelsForProvider(provider: AdeCodeProvider): AgentChatModelInfo[] {
+  if (provider === "ollama" || provider === "lmstudio") return [];
+  return listModelDescriptorsForProvider(provider).map((descriptor) => ({
+    id: descriptor.id,
+    modelId: descriptor.id,
+    displayName: descriptor.displayName,
+    isDefault: descriptor.id === getDefaultModelDescriptor(provider)?.id,
+    reasoningEfforts: descriptor.reasoningTiers?.map((effort) => ({ effort, description: effort })),
+    ...(descriptor.serviceTiers?.length ? { serviceTiers: descriptor.serviceTiers } : {}),
+    ...(descriptor.cursorAvailability ? { cursorAvailability: descriptor.cursorAvailability } : {}),
+    ...(descriptor.cursorCliVariants?.length ? { cursorCliVariants: descriptor.cursorCliVariants } : {}),
+  }));
+}
+
+function compatibleCursorModelForInterface(
+  models: readonly AgentChatModelInfo[],
+  interfaceMode: AdeCodeInterfaceMode,
+): AgentChatModelInfo | null {
+  const compatible = models.filter((model) => cursorModelAvailableForInterface(model, interfaceMode));
+  return compatible.find((model) => model.isDefault) ?? compatible[0] ?? null;
+}
+
+function modelInfoMatchesModelState(model: AgentChatModelInfo, state: AdeCodeModelState): boolean {
+  const selected = (state.modelId ?? state.model).trim().toLowerCase();
+  if (!selected) return false;
+  return [model.id, model.modelId, ...(model.aliases ?? [])]
+    .filter((value): value is string => typeof value === "string")
+    .some((value) => value.trim().toLowerCase() === selected);
+}
+
+export function reconcileCursorModelStateForInterface(
+  state: AdeCodeModelState,
+  interfaceMode: AdeCodeInterfaceMode,
+  models: readonly AgentChatModelInfo[],
+): AdeCodeModelState {
+  if (state.provider !== "cursor") return { ...state, interfaceMode };
+  const currentModel = models.find((model) => modelInfoMatchesModelState(model, state)) ?? null;
+  const descriptor = state.modelId ? getModelById(state.modelId) : undefined;
+  const availability = cursorAvailabilityForModel(currentModel, descriptor);
+  const currentAllowed = availability
+    ? (interfaceMode === "cli" ? availability.cli === true : availability.sdk === true)
+    : false;
+  if (currentAllowed && descriptor?.family === "cursor") {
+    const supportsFast = modelSupportsFastMode(descriptor);
+    return {
+      ...state,
+      interfaceMode,
+      model: interfaceMode === "cli"
+        ? resolveCursorCliModelVariant(descriptor, {
+            reasoningEffort: state.reasoningEffort,
+            fastMode: supportsFast && state.fastMode,
+          })
+        : getRuntimeModelRefForDescriptor(descriptor, "cursor"),
+      fastMode: supportsFast ? state.fastMode : false,
+    };
+  }
+  if (currentAllowed) return { ...state, interfaceMode };
+  const fallback = compatibleCursorModelForInterface(models, interfaceMode);
+  if (!fallback) {
+    return {
+      ...state,
+      interfaceMode,
+      model: "",
+      modelId: null,
+      displayName: providerLabel("cursor"),
+      reasoningEffort: null,
+      fastMode: false,
+    };
+  }
+  const patch = modelStatePatchForModel("cursor", fallback);
+  const fallbackDescriptor = patch.modelId ? getModelById(patch.modelId) : undefined;
+  const launchDescriptor = fallbackDescriptor?.family === "cursor" && fallback.cursorCliVariants?.length
+    ? { ...fallbackDescriptor, cursorCliVariants: fallback.cursorCliVariants }
+    : fallbackDescriptor;
+  const supportsFast = modelInfoSupportsFastMode(fallback);
+  return {
+    ...state,
+    ...patch,
+    interfaceMode,
+    model: interfaceMode === "cli" && launchDescriptor?.family === "cursor"
+      ? resolveCursorCliModelVariant(launchDescriptor, {
+          reasoningEffort: patch.reasoningEffort,
+          fastMode: supportsFast && state.fastMode,
+        })
+      : patch.model,
+    fastMode: supportsFast ? state.fastMode : false,
+  };
+}
+
+export function resolveCursorCliModelForLaunch(
+  state: AdeCodeModelState,
+  models: readonly AgentChatModelInfo[] = [],
+): string {
+  const modelId = (state.modelId ?? state.model).trim();
+  if (!modelId) throw new Error("Choose a Cursor CLI model before launching a CLI session.");
+  const modelInfo = models.find((model) => modelInfoMatchesModelState(model, state)) ?? null;
+  const descriptor = getModelById(modelId);
+  const availability = cursorAvailabilityForModel(modelInfo, descriptor);
+  if (!availability?.cli) {
+    throw new Error("This Cursor model is available for chat only. Choose a Cursor CLI model for a CLI session.");
+  }
+  if (descriptor?.family === "cursor") {
+    const launchDescriptor = modelInfo?.cursorCliVariants?.length
+      ? { ...descriptor, cursorCliVariants: modelInfo.cursorCliVariants }
+      : descriptor;
+    const supportsFast = modelSupportsFastMode(launchDescriptor);
+    return resolveCursorCliModelVariant(launchDescriptor, {
+      reasoningEffort: state.reasoningEffort,
+      fastMode: supportsFast && state.fastMode,
+    });
+  }
+  return modelId.toLowerCase().startsWith("cursor/") ? modelId.slice("cursor/".length) : modelId;
+}
+
+export function modelReasoningEfforts(modelState: AdeCodeModelState, models: AgentChatModelInfo[]): string[] {
+  const model = models.find((entry) => entry.id === modelState.modelId || entry.modelId === modelState.modelId);
+  const fromModel = model?.reasoningEfforts?.map((entry) => entry.effort).filter(Boolean) ?? [];
+  if (fromModel.length) return fromModel;
+  const descriptor = modelState.modelId ? getModelById(modelState.modelId) : undefined;
+  if (descriptor?.reasoningTiers?.length) return descriptor.reasoningTiers;
+  return modelState.provider === "codex" ? EFFORTS : [];
+}
+
+export function resolveCodexPreset(modelState: AdeCodeModelState): CodexPreset | "custom" {
+  if (modelState.codexConfigSource === "config-toml") return "config-toml";
+  if (modelState.codexApprovalPolicy === "never" && modelState.codexSandbox === "danger-full-access") return "full-auto";
+  if (modelState.codexApprovalPolicy === "untrusted" && modelState.codexSandbox === "workspace-write") return "edit";
+  if (
+    (modelState.codexApprovalPolicy === "on-request" || modelState.codexApprovalPolicy === "untrusted")
+    && modelState.codexSandbox === "read-only"
+  ) return "plan";
+  if (
+    (modelState.codexApprovalPolicy === "on-request" || modelState.codexApprovalPolicy === "on-failure" || modelState.codexApprovalPolicy === "untrusted")
+    && modelState.codexSandbox === "workspace-write"
+  ) return "default";
+  return "custom";
+}
+
+export function codexApprovalSandboxLabel(modelState: Pick<AdeCodeModelState, "codexApprovalPolicy" | "codexSandbox">): string {
+  return `${modelState.codexApprovalPolicy} · ${modelState.codexSandbox}`;
+}
+
+export function codexPresetPatch(preset: CodexPreset): Pick<AdeCodeModelState, "codexApprovalPolicy" | "codexSandbox" | "codexConfigSource" | "permissionMode"> {
+  if (preset === "full-auto") {
+    return {
+      codexApprovalPolicy: "never",
+      codexSandbox: "danger-full-access",
+      codexConfigSource: "flags",
+      permissionMode: "full-auto",
+    };
+  }
+  if (preset === "plan") {
+    return {
+      codexApprovalPolicy: "on-request",
+      codexSandbox: "read-only",
+      codexConfigSource: "flags",
+      permissionMode: "plan",
+    };
+  }
+  if (preset === "edit") {
+    return {
+      codexApprovalPolicy: "untrusted",
+      codexSandbox: "workspace-write",
+      codexConfigSource: "flags",
+      permissionMode: "edit",
+    };
+  }
+  if (preset === "config-toml") {
+    return {
+      codexApprovalPolicy: "on-request",
+      codexSandbox: "workspace-write",
+      codexConfigSource: "config-toml",
+      permissionMode: "config-toml",
+    };
+  }
+  return {
+    codexApprovalPolicy: "on-request",
+    codexSandbox: "workspace-write",
+    codexConfigSource: "flags",
+    permissionMode: "default",
+  };
+}
+
+export function droidPermissionToLegacy(mode: AdeCodeModelState["droidPermissionMode"]): AgentChatPermissionMode {
+  if (mode === "read-only") return "plan";
+  if (mode === "agi") return "plan";
+  if (mode === "auto-low") return "edit";
+  if (mode === "auto-medium") return "default";
+  return "full-auto";
+}
+
+function cursorModeLabel(modeId: string | null | undefined): string {
+  const normalized = modeId?.trim().toLowerCase() || "agent";
+  return CURSOR_MODE_LABELS[normalized] ?? normalized;
+}
+
+export function cursorModeIdsForState(modelState: Pick<AdeCodeModelState, "cursorAvailableModeIds">): string[] {
+  const snapshotIds = modelState.cursorAvailableModeIds
+    .map((modeId) => modeId.trim())
+    .filter(Boolean);
+  return snapshotIds.length ? snapshotIds : [...CURSOR_AVAILABLE_MODE_IDS];
+}
+
+export function permissionSummary(modelState: AdeCodeModelState): string {
+  if (modelState.provider === "codex") return resolveCodexPreset(modelState);
+  if (modelState.provider === "claude") {
+    if (modelState.interactionMode === "plan" || modelState.claudePermissionMode === "plan") return "plan";
+    if (modelState.claudePermissionMode === "auto") return "auto";
+    if (modelState.claudePermissionMode === "acceptEdits") return "accept edits";
+    if (modelState.claudePermissionMode === "bypassPermissions") return "bypass";
+    return "default";
+  }
+  if (modelState.provider === "opencode") return modelState.opencodePermissionMode;
+  if (modelState.provider === "droid") return modelState.droidPermissionMode;
+  return cursorModeLabel(modelState.cursorModeId);
+}
+
+const MODE_DESCRIPTIONS: Record<string, string> = {
+  plan: "read-only deliberation",
+  default: "ask before acting",
+  auto: "auto-approve safe actions",
+  "accept edits": "auto-approve file edits",
+  bypass: "skip permission checks",
+  "full-auto": "no approvals required",
+  edit: "edit-mode operations",
+  agent: "agent-driven actions",
+  ask: "confirm each action",
+  "read-only": "no edits or execution",
+  "auto-low": "low-autonomy ops",
+  "auto-medium": "medium-autonomy ops",
+  "auto-high": "high-autonomy ops",
+  agi: "orchestrator mission",
+  "config-toml": "config-defined mode",
+};
+
+export function modeDescription(summary: string): string {
+  return MODE_DESCRIPTIONS[summary] ?? "permission mode";
+}
+
+export function modeAccentColor(summary: string): string {
+  if (summary === "plan" || summary === "read-only" || summary === "agi") return theme.color.planMode;
+  if (summary === "bypass" || summary === "full-auto" || summary === "auto-high") return theme.color.warning;
+  return theme.color.accent;
+}
+
+function permissionOptionsDetail(modelState: AdeCodeModelState): string {
+  if (modelState.provider === "codex") return CODEX_PRESETS.join(" · ");
+  if (modelState.provider === "claude") return "default · plan · auto · bypass";
+  if (modelState.provider === "opencode") return OPENCODE_PERMISSION_OPTIONS.join(" · ");
+  if (modelState.provider === "droid") return DROID_PERMISSION_OPTIONS.join(" · ");
+  return cursorModeIdsForState(modelState).map((modeId) => cursorModeLabel(modeId)).join(" · ");
+}
+
+export function applyProviderPermissionMode(modelState: AdeCodeModelState): Partial<AdeCodeModelState> {
+  if (modelState.provider === "codex") {
+    const preset = resolveCodexPreset(modelState);
+    return { permissionMode: preset === "custom" ? modelState.permissionMode : preset };
+  }
+  if (modelState.provider === "claude") {
+    if (modelState.interactionMode === "plan" || modelState.claudePermissionMode === "plan") {
+      return { permissionMode: "plan", interactionMode: "plan", claudePermissionMode: "plan" };
+    }
+    if (modelState.claudePermissionMode === "auto") return { permissionMode: "auto", interactionMode: "default" };
+    if (modelState.claudePermissionMode === "acceptEdits") return { permissionMode: "edit", interactionMode: "default" };
+    if (modelState.claudePermissionMode === "bypassPermissions") return { permissionMode: "full-auto", interactionMode: "default" };
+    return { permissionMode: "default", interactionMode: "default" };
+  }
+  if (modelState.provider === "opencode") return { permissionMode: modelState.opencodePermissionMode };
+  if (modelState.provider === "droid") return { permissionMode: droidPermissionToLegacy(modelState.droidPermissionMode) };
+  if (modelState.provider === "cursor") {
+    if (modelState.cursorModeId === "plan") return { permissionMode: "plan" };
+    if (modelState.cursorModeId === "ask") return { permissionMode: "edit" };
+    if (modelState.cursorModeId === "full-auto") return { permissionMode: "full-auto" };
+    return { permissionMode: "default" };
+  }
+  return {};
+}
+
+export function buildSetupRows(args: {
+  modelState: AdeCodeModelState;
+  models: AgentChatModelInfo[];
+  includeRefresh: boolean;
+  includeApply: boolean;
+  outputStyle?: string | null;
+  outputStyleEditable?: boolean;
+  /** Draft/next-chat interface (Chat = SDK chat, CLI = tracked terminal). */
+  interfaceMode: AdeCodeInterfaceMode;
+  /** False once a session exists — interface is fixed by the session type. */
+  interfaceEditable: boolean;
+}): SetupPaneRow[] {
+  const efforts = modelReasoningEfforts(args.modelState, args.models);
+  const descriptor = args.modelState.modelId ? getModelById(args.modelState.modelId) : undefined;
+  const activeModel = args.models.find((entry) => entry.id === args.modelState.modelId || entry.modelId === args.modelState.modelId);
+  const fastSupported =
+    Boolean(activeModel?.serviceTiers?.some((tier) => tier.trim().toLowerCase() === "fast"))
+    || modelSupportsFastMode(descriptor);
+  const rows: SetupPaneRow[] = [
+    {
+      kind: "provider",
+      label: "Provider",
+      value: providerLabel(args.modelState.provider),
+      cyclable: true,
+    },
+    {
+      kind: "interface",
+      label: "Interface",
+      value: args.interfaceMode === "cli" ? "CLI" : "Chat",
+      detail: args.interfaceEditable
+        ? "Chat · CLI"
+        : args.interfaceMode === "cli"
+          ? "tracked CLI session"
+          : "ADE chat",
+      disabled: !args.interfaceEditable,
+      cyclable: args.interfaceEditable,
+    },
+    {
+      kind: "model",
+      label: "Model",
+      value: args.modelState.displayName,
+      detail: args.models.length ? `${args.models.length} available` : "using registry default",
+      cyclable: true,
+    },
+    {
+      kind: "reasoning",
+      label: "Reasoning",
+      value: args.modelState.reasoningEffort ?? "none",
+      detail: efforts.length ? efforts.join(", ") : "not exposed by this model",
+      disabled: !efforts.length,
+      cyclable: true,
+    },
+    {
+      kind: "permission",
+      label: "Permissions",
+      value: permissionSummary(args.modelState),
+      detail: permissionOptionsDetail(args.modelState),
+      cyclable: true,
+    },
+  ];
+  rows.push({
+    kind: "codex-fast",
+    label: "Fast mode",
+    value: fastSupported && args.modelState.fastMode ? "on" : "off",
+    detail: "on · off",
+    disabled: !fastSupported,
+    cyclable: true,
+  });
+  if (args.modelState.provider === "claude") {
+    rows.push({
+      kind: "output-style",
+      label: "Output style",
+      value: args.outputStyle?.trim() || "default",
+      detail: args.outputStyleEditable === false
+        ? "active Claude chat only"
+        : "default · concise · verbose",
+      disabled: args.outputStyleEditable === false,
+      cyclable: true,
+    });
+  }
+  if (args.includeRefresh) {
+    rows.push({
+      kind: "refresh-status",
+      label: "Refresh status",
+      value: "run",
+      detail: "checks provider auth/runtime state",
+    });
+  }
+  if (args.includeApply) {
+    rows.push({
+      kind: "apply",
+      label: "Confirm",
+      value: "ready",
+      detail: "returns focus to the chat composer",
+    });
+  }
+  return rows;
+}
+
+export function defaultSetupSelectionIndex(rows: SetupPaneRow[]): number {
+  const applyIndex = rows.findIndex((row) => row.kind === "apply");
+  return applyIndex >= 0 ? applyIndex : 0;
+}
+
+export function defaultModelPickerSelectionIndex(rows: SetupPaneRow[]): number {
+  const modelIndex = rows.findIndex((row) => row.kind === "model" && !row.disabled);
+  if (modelIndex >= 0) return modelIndex;
+  const reasoningIndex = rows.findIndex((row) => row.kind === "reasoning" && !row.disabled);
+  if (reasoningIndex >= 0) return reasoningIndex;
+  return defaultSetupSelectionIndex(rows);
+}
+
+export function setupSelectionIndexForKind(rows: SetupPaneRow[], preferredKind: SetupPaneRowKind | null | undefined): number {
+  if (preferredKind) {
+    const preferredIndex = rows.findIndex((row) => row.kind === preferredKind);
+    if (preferredIndex >= 0) return preferredIndex;
+  }
+  return defaultModelPickerSelectionIndex(rows);
+}
diff --git a/apps/ade-cli/src/tuiClient/pendingInput.ts b/apps/ade-cli/src/tuiClient/pendingInput.ts
index deb88426c..54171655d 100644
--- a/apps/ade-cli/src/tuiClient/pendingInput.ts
+++ b/apps/ade-cli/src/tuiClient/pendingInput.ts
@@ -267,6 +267,13 @@ export function convertPendingQuestionDigitSelectionToText(
   };
 }
 
+export function cancelPendingQuestionDigitSelection(
+  state: PendingQuestionSelectionState,
+): { state: PendingQuestionSelectionState; cancelled: boolean } {
+  if (!state.pendingDigitSelection) return { state, cancelled: false };
+  return { state: restorePendingQuestionDigitSelection(state), cancelled: true };
+}
+
 export function movePendingQuestionOption(
   request: PendingInputRequest | undefined,
   state: PendingQuestionSelectionState,
diff --git a/apps/ade-cli/src/tuiClient/providerMetadata.ts b/apps/ade-cli/src/tuiClient/providerMetadata.ts
new file mode 100644
index 000000000..84ee4bfee
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/providerMetadata.ts
@@ -0,0 +1,92 @@
+import type { ProviderFamily } from "../../../desktop/src/shared/modelRegistry";
+import type { AgentChatModelCatalogRefreshProvider } from "../../../desktop/src/shared/types/chat";
+import type { AdeCodeProvider } from "./types";
+
+export const TUI_PROVIDER_OPTIONS: Array<{ value: AdeCodeProvider; label: string }> = [
+  { value: "claude", label: "Claude" },
+  { value: "codex", label: "Codex" },
+  { value: "cursor", label: "Cursor" },
+  { value: "droid", label: "Droid" },
+  { value: "opencode", label: "OpenCode" },
+  { value: "ollama", label: "Ollama" },
+  { value: "lmstudio", label: "LM Studio" },
+];
+
+export const TUI_PROVIDERS = new Set<AdeCodeProvider>(TUI_PROVIDER_OPTIONS.map((provider) => provider.value));
+
+const PROVIDER_FAMILY_LABELS: Record<AdeCodeProvider, string> = {
+  codex: "OpenAI",
+  claude: "Anthropic",
+  opencode: "OpenCode",
+  cursor: "Cursor",
+  droid: "Droid",
+  ollama: "Ollama",
+  lmstudio: "LM Studio",
+};
+
+export const PROVIDER_TOKEN_LABELS: Record<string, string> = {
+  anthropic: "Anthropic",
+  claude: "Anthropic",
+  openai: "OpenAI",
+  codex: "OpenAI",
+  google: "Google",
+  gemini: "Google",
+  deepseek: "DeepSeek",
+  mistral: "Mistral",
+  xai: "xAI",
+  grok: "xAI",
+  groq: "Groq",
+  together: "Together",
+  openrouter: "OpenRouter",
+  opencode: "OpenCode",
+  droid: "Droid",
+  factory: "Droid",
+  cursor: "Cursor",
+  kimi: "Kimi",
+  moonshot: "Kimi",
+  ollama: "Ollama",
+  lmstudio: "LM Studio",
+};
+
+export function providerLabel(provider: AdeCodeProvider): string {
+  return TUI_PROVIDER_OPTIONS.find((entry) => entry.value === provider)?.label ?? provider;
+}
+
+export function providerFamilyLabel(provider: AdeCodeProvider): string {
+  return PROVIDER_FAMILY_LABELS[provider] ?? provider;
+}
+
+export function normalizeProvider(value: ProviderFamily | string | null | undefined): AdeCodeProvider {
+  const normalized = (value ?? "").trim().toLowerCase();
+  if (normalized === "anthropic") return "claude";
+  if (normalized === "openai") return "codex";
+  if (normalized === "factory") return "droid";
+  return TUI_PROVIDERS.has(normalized as AdeCodeProvider) ? normalized as AdeCodeProvider : "codex";
+}
+
+export function normalizeCatalogProvider(value: string | null | undefined): AdeCodeProvider {
+  return normalizeProvider(value);
+}
+
+export function normalizeProviderToken(value: string | null | undefined): string {
+  return (value ?? "")
+    .trim()
+    .toLowerCase()
+    .replace(/[^a-z0-9]+/g, "");
+}
+
+export function titleCaseProviderName(value: string): string {
+  const trimmed = value.trim();
+  if (!trimmed) return "";
+  const known = PROVIDER_TOKEN_LABELS[normalizeProviderToken(trimmed)];
+  if (known) return known;
+  return trimmed
+    .replace(/\b\w/g, (ch) => ch.toUpperCase())
+    .replace(/\bAi\b/g, "AI");
+}
+
+export function refreshProviderForModelPicker(provider: AdeCodeProvider): AgentChatModelCatalogRefreshProvider | null {
+  return provider === "opencode" || provider === "cursor" || provider === "droid" || provider === "lmstudio" || provider === "ollama"
+    ? provider
+    : null;
+}
diff --git a/apps/ade-cli/src/tuiClient/relativeTime.ts b/apps/ade-cli/src/tuiClient/relativeTime.ts
index b6e09333c..706ed2606 100644
--- a/apps/ade-cli/src/tuiClient/relativeTime.ts
+++ b/apps/ade-cli/src/tuiClient/relativeTime.ts
@@ -1,7 +1,7 @@
 export function formatRelativePastTime(timestamp: string | null | undefined, nowMs = Date.now()): string {
-  if (!timestamp) return "ended";
+  if (!timestamp) return "recently";
   const thenMs = Date.parse(timestamp);
-  if (!Number.isFinite(thenMs)) return "ended";
+  if (!Number.isFinite(thenMs)) return "recently";
   const diffSeconds = Math.max(0, Math.floor((nowMs - thenMs) / 1000));
   if (diffSeconds < 45) return "just now";
   if (diffSeconds < 90) return "1m ago";
diff --git a/apps/ade-cli/src/tuiClient/remoteBridge.ts b/apps/ade-cli/src/tuiClient/remoteBridge.ts
new file mode 100644
index 000000000..977a803d3
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/remoteBridge.ts
@@ -0,0 +1,422 @@
+import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
+import fs from "node:fs";
+import net, { type AddressInfo } from "node:net";
+import os from "node:os";
+import path from "node:path";
+import { RemoteTargetRegistry } from "../../../desktop/src/main/services/remoteRuntime/remoteTargetRegistry";
+import type {
+  RemoteRuntimeTarget,
+  RemoteRuntimeTargetRoute,
+} from "../../../desktop/src/shared/types/remoteRuntime";
+
+type JsonRpcResponse = {
+  jsonrpc: "2.0";
+  id?: number | string | null;
+  result?: unknown;
+  error?: {
+    code: number;
+    message: string;
+    data?: unknown;
+  };
+  method?: string;
+  params?: unknown;
+};
+
+type PendingRequest = {
+  method: string;
+  resolve: (value: unknown) => void;
+  reject: (reason: unknown) => void;
+  timer: ReturnType<typeof setTimeout>;
+};
+
+export type RemoteRuntimeLayout = {
+  channel: "alpha" | "beta" | null;
+  homeDirName: string;
+  homeDirExpr: string;
+  binDirExpr: string;
+  runtimeDirExpr: string;
+  socketExpr: string;
+  binaryExpr: string;
+};
+
+export type RemoteRpcAttempt = {
+  target: RemoteRuntimeTarget;
+  route: RemoteRuntimeTargetRoute;
+  layout: RemoteRuntimeLayout;
+  command: string;
+  sshArgs: string[];
+  label: string;
+};
+
+export type RemoteRpcSession = {
+  client: ProcessJsonRpcClient;
+  attempt: RemoteRpcAttempt;
+};
+
+export type RemoteBridge = {
+  socketUrl: string;
+  close: () => Promise<void>;
+};
+
+const REMOTE_RPC_REQUEST_TIMEOUT_MS = 120_000;
+const MAX_RPC_BUFFER_BYTES = 16 * 1024 * 1024;
+const MAX_STDERR_TAIL_BYTES = 32 * 1024;
+
+class ByteRingBuffer {
+  private chunks: Buffer[] = [];
+  private bytes = 0;
+
+  constructor(private readonly maxBytes: number) {}
+
+  push(chunk: Buffer | string): void {
+    const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, "utf8");
+    if (this.maxBytes <= 0) return;
+    this.chunks.push(buffer);
+    this.bytes += buffer.length;
+    while (this.bytes > this.maxBytes && this.chunks.length > 0) {
+      const first = this.chunks[0]!;
+      const overflow = this.bytes - this.maxBytes;
+      if (overflow >= first.length) {
+        this.chunks.shift();
+        this.bytes -= first.length;
+      } else {
+        this.chunks[0] = first.subarray(overflow);
+        this.bytes -= overflow;
+      }
+    }
+  }
+
+  text(): string {
+    return Buffer.concat(this.chunks, this.bytes).toString("utf8").trim();
+  }
+
+  tailLines(limit = 8): string {
+    return this.text().split(/\r?\n/).filter(Boolean).slice(-limit).join("\n");
+  }
+}
+
+export function spawnRemoteRpcProcess(attempt: RemoteRpcAttempt): ChildProcessWithoutNullStreams {
+  return spawn("ssh", attempt.sshArgs, {
+    stdio: ["pipe", "pipe", "pipe"],
+  });
+}
+
+export class ProcessJsonRpcClient {
+  private nextId = 1;
+  private buffer = Buffer.alloc(0);
+  private readonly pending = new Map<number | string, PendingRequest>();
+  private readonly stderrTail = new ByteRingBuffer(MAX_STDERR_TAIL_BYTES);
+  private closed = false;
+
+  constructor(private readonly child: ChildProcessWithoutNullStreams) {
+    child.stdout.on("data", (chunk: Buffer | string) => this.handleData(chunk));
+    child.stderr.on("data", (chunk: Buffer | string) => {
+      this.stderrTail.push(chunk);
+    });
+    child.on("error", (error) => this.handleClosed(error));
+    child.on("close", (code, signal) => {
+      this.handleClosed(new Error(this.closeMessage(code, signal)));
+    });
+  }
+
+  request<T = unknown>(method: string, params?: unknown): Promise<T> {
+    if (this.closed) return Promise.reject(new Error("Remote ADE RPC connection is closed."));
+    const id = this.nextId++;
+    const payload = {
+      jsonrpc: "2.0",
+      id,
+      method,
+      ...(params !== undefined ? { params } : {}),
+    };
+    return new Promise<T>((resolve, reject) => {
+      const timer = setTimeout(() => {
+        if (!this.pending.has(id)) return;
+        this.handleClosed(
+          new Error(`Remote ADE RPC timed out waiting for method ${method} (${REMOTE_RPC_REQUEST_TIMEOUT_MS}ms).`),
+        );
+        this.child.kill();
+      }, REMOTE_RPC_REQUEST_TIMEOUT_MS);
+      timer.unref?.();
+      this.pending.set(id, {
+        method,
+        resolve: (value) => resolve(value as T),
+        reject,
+        timer,
+      });
+      this.child.stdin.write(`${JSON.stringify(payload)}\n`, "utf8", (error) => {
+        if (!error) return;
+        const pending = this.pending.get(id);
+        if (pending) clearTimeout(pending.timer);
+        this.pending.delete(id);
+        reject(error);
+      });
+    });
+  }
+
+  close(): void {
+    if (this.closed) return;
+    this.closed = true;
+    this.rejectAll(new Error("Remote ADE RPC connection closed."));
+    this.child.stdin.end();
+    this.child.kill();
+  }
+
+  private closeMessage(code: number | null, signal: NodeJS.Signals | null): string {
+    const detail = this.stderrTail.tailLines(8);
+    const status = signal ? `signal ${signal}` : `code ${code ?? "unknown"}`;
+    return detail
+      ? `Remote ADE RPC exited with ${status}: ${detail}`
+      : `Remote ADE RPC exited with ${status}.`;
+  }
+
+  private handleClosed(error: Error): void {
+    if (this.closed) return;
+    this.closed = true;
+    this.rejectAll(error);
+  }
+
+  private handleData(chunk: Buffer | string): void {
+    if (this.closed) return;
+    this.buffer = Buffer.concat([
+      this.buffer,
+      Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, "utf8"),
+    ]);
+    if (this.buffer.length > MAX_RPC_BUFFER_BYTES) {
+      this.handleClosed(new Error(`Remote ADE RPC sent an oversized partial frame (> ${MAX_RPC_BUFFER_BYTES} bytes).`));
+      this.child.kill();
+      return;
+    }
+    while (true) {
+      let next: string | null;
+      try {
+        next = this.takeNextPayload();
+      } catch (error) {
+        this.handleClosed(error instanceof Error ? error : new Error(String(error)));
+        this.child.kill();
+        return;
+      }
+      if (!next) return;
+      const payload = next.trim();
+      if (!payload) continue;
+      let parsed: JsonRpcResponse | JsonRpcResponse[] | null = null;
+      try {
+        parsed = JSON.parse(payload) as JsonRpcResponse | JsonRpcResponse[];
+      } catch (error) {
+        this.handleClosed(new Error(`Failed to parse remote ADE RPC response: ${error instanceof Error ? error.message : String(error)}`));
+        this.child.kill();
+        return;
+      }
+      const responses = Array.isArray(parsed) ? parsed : [parsed];
+      for (const response of responses) this.handleResponse(response);
+    }
+  }
+
+  private takeNextPayload(): string | null {
+    while (this.buffer.length && /\s/.test(String.fromCharCode(this.buffer[0]!))) {
+      this.buffer = this.buffer.subarray(1);
+    }
+    if (!this.buffer.length) return null;
+    const first = String.fromCharCode(this.buffer[0]!);
+    if (first === "{" || first === "[") {
+      const idx = this.buffer.indexOf(0x0a);
+      if (idx < 0) return null;
+      if (idx > MAX_RPC_BUFFER_BYTES) {
+        throw new Error(`Remote ADE RPC sent an oversized JSON line (> ${MAX_RPC_BUFFER_BYTES} bytes).`);
+      }
+      const payload = this.buffer.subarray(0, idx).toString("utf8");
+      this.buffer = this.buffer.subarray(idx + 1);
+      return payload;
+    }
+    const probe = this.buffer.subarray(0, Math.min(this.buffer.length, "content-length".length)).toString("ascii").toLowerCase();
+    if (!"content-length".startsWith(probe)) {
+      throw new Error("Remote ADE RPC sent non-JSON output on stdout.");
+    }
+
+    const crlfBoundary = this.buffer.indexOf("\r\n\r\n");
+    const lfBoundary = this.buffer.indexOf("\n\n");
+    let boundary: { index: number; length: number } | null = null;
+    if (crlfBoundary >= 0) boundary = { index: crlfBoundary, length: 4 };
+    else if (lfBoundary >= 0) boundary = { index: lfBoundary, length: 2 };
+    if (!boundary) return null;
+    const header = this.buffer.subarray(0, boundary.index).toString("ascii");
+    const match = /^content-length\s*:\s*(\d+)\s*$/im.exec(header);
+    if (!match) {
+      throw new Error("Remote ADE RPC sent a malformed Content-Length frame.");
+    }
+    const length = Number.parseInt(match[1]!, 10);
+    if (!Number.isFinite(length) || length < 0 || length > MAX_RPC_BUFFER_BYTES) {
+      throw new Error(`Remote ADE RPC sent an oversized Content-Length frame (${length} bytes).`);
+    }
+    const bodyStart = boundary.index + boundary.length;
+    const bodyEnd = bodyStart + length;
+    if (this.buffer.length < bodyEnd) return null;
+    const payload = this.buffer.subarray(bodyStart, bodyEnd).toString("utf8");
+    this.buffer = this.buffer.subarray(bodyEnd);
+    return payload;
+  }
+
+  private handleResponse(response: JsonRpcResponse): void {
+    if (response.id == null) return;
+    const pending = this.pending.get(response.id);
+    if (!pending) return;
+    this.pending.delete(response.id);
+    clearTimeout(pending.timer);
+    if (response.error) {
+      pending.reject(new Error(response.error.message));
+      return;
+    }
+    pending.resolve(response.result);
+  }
+
+  private rejectAll(error: Error): void {
+    for (const pending of this.pending.values()) {
+      clearTimeout(pending.timer);
+      pending.reject(error);
+    }
+    this.pending.clear();
+  }
+}
+
+export async function startRemoteBridge(args: {
+  target: RemoteRuntimeTarget;
+  initialAttempt?: RemoteRpcAttempt;
+  openRemoteRpcSession: (target: RemoteRuntimeTarget) => Promise<RemoteRpcSession>;
+}): Promise<RemoteBridge> {
+  const activeSockets = new Set<net.Socket>();
+  const activeChildren = new Set<ChildProcessWithoutNullStreams>();
+  const bridgeDir = process.platform === "win32"
+    ? null
+    : fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-remote-"));
+  if (bridgeDir) {
+    try {
+      fs.chmodSync(bridgeDir, 0o700);
+    } catch {}
+  }
+  const bridgeSocketPath = bridgeDir ? path.join(bridgeDir, "bridge.sock") : null;
+  let closing = false;
+
+  const currentTarget = (): RemoteRuntimeTarget => {
+    try {
+      return new RemoteTargetRegistry().get(args.target.id) ?? args.target;
+    } catch {
+      return args.target;
+    }
+  };
+
+  let firstBridgeAttempt: RemoteRpcAttempt | null = args.initialAttempt ?? null;
+  const selectBridgeAttempt = async (): Promise<RemoteRpcAttempt> => {
+    if (firstBridgeAttempt) {
+      const attempt = firstBridgeAttempt;
+      firstBridgeAttempt = null;
+      return attempt;
+    }
+    const session = await args.openRemoteRpcSession(currentTarget());
+    const attempt = session.attempt;
+    session.client.close();
+    return attempt;
+  };
+
+  const server = net.createServer((socket) => {
+    activeSockets.add(socket);
+    socket.pause();
+    let child: ChildProcessWithoutNullStreams | null = null;
+    let settled = false;
+    const stderrTail = new ByteRingBuffer(MAX_STDERR_TAIL_BYTES);
+    const teardown = (reason?: string): void => {
+      if (settled) return;
+      settled = true;
+      activeSockets.delete(socket);
+      if (child) activeChildren.delete(child);
+      if (!closing && reason) {
+        const detail = stderrTail.tailLines(8);
+        process.stderr.write(
+          detail
+            ? `Remote ADE bridge closed: ${reason}\n${detail}\n`
+            : `Remote ADE bridge closed: ${reason}\n`,
+        );
+      }
+      socket.destroy();
+      if (child) {
+        child.stdin.destroy();
+        child.stdout.destroy();
+        child.stderr.destroy();
+        child.kill();
+      }
+    };
+    socket.on("error", (error) => teardown(error.message));
+    socket.on("close", () => teardown());
+    void selectBridgeAttempt()
+      .then((attempt) => {
+        if (settled || closing) return;
+        child = spawnRemoteRpcProcess(attempt);
+        activeChildren.add(child);
+        child.stderr.on("data", (chunk: Buffer | string) => stderrTail.push(chunk));
+        child.on("error", (error) => teardown(error.message));
+        child.on("close", (code, signal) => {
+          const status = signal ? `signal ${signal}` : `code ${code ?? "unknown"}`;
+          teardown(`ssh child exited with ${status}`);
+        });
+        socket.pipe(child.stdin);
+        child.stdout.pipe(socket);
+        socket.resume();
+      })
+      .catch((error) => {
+        teardown(error instanceof Error ? error.message : String(error));
+      });
+  });
+  server.maxConnections = 1;
+
+  await new Promise<void>((resolve, reject) => {
+    const cleanup = (): void => {
+      server.off("listening", onListening);
+      server.off("error", onError);
+    };
+    const onListening = (): void => {
+      cleanup();
+      resolve();
+    };
+    const onError = (error: Error): void => {
+      cleanup();
+      reject(error);
+    };
+    server.once("listening", onListening);
+    server.once("error", onError);
+    if (bridgeSocketPath) server.listen(bridgeSocketPath);
+    else server.listen(0, "127.0.0.1");
+  });
+
+  let socketUrl: string;
+  if (bridgeSocketPath) {
+    socketUrl = bridgeSocketPath;
+  } else {
+    const address = server.address() as AddressInfo | null;
+    if (!address) {
+      throw new Error("Remote bridge did not bind a local port.");
+    }
+    socketUrl = `tcp://127.0.0.1:${address.port}`;
+  }
+  return {
+    socketUrl,
+    close: async () => {
+      closing = true;
+      for (const socket of [...activeSockets]) socket.destroy();
+      for (const child of [...activeChildren]) {
+        child.stdin.destroy();
+        child.stdout.destroy();
+        child.stderr.destroy();
+        child.kill();
+      }
+      await new Promise<void>((resolve) => server.close(() => resolve()));
+      if (bridgeSocketPath) {
+        try {
+          fs.unlinkSync(bridgeSocketPath);
+        } catch {}
+      }
+      if (bridgeDir) {
+        try {
+          fs.rmdirSync(bridgeDir);
+        } catch {}
+      }
+    },
+  };
+}
diff --git a/apps/ade-cli/src/tuiClient/remoteLauncher.ts b/apps/ade-cli/src/tuiClient/remoteLauncher.ts
index f84d4eafb..a229816d4 100644
--- a/apps/ade-cli/src/tuiClient/remoteLauncher.ts
+++ b/apps/ade-cli/src/tuiClient/remoteLauncher.ts
@@ -1,7 +1,4 @@
-import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
-import net, { type AddressInfo } from "node:net";
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import readline from "node:readline";
 import readlinePromises from "node:readline/promises";
@@ -13,19 +10,15 @@ import type {
 } from "../../../desktop/src/shared/types/remoteRuntime";
 import type { AgentChatSessionSummary } from "../../../desktop/src/shared/types/chat";
 import type { ChatTerminalSession } from "../../../desktop/src/shared/types/sessions";
-
-type JsonRpcResponse = {
-  jsonrpc: "2.0";
-  id?: number | string | null;
-  result?: unknown;
-  error?: {
-    code: number;
-    message: string;
-    data?: unknown;
-  };
-  method?: string;
-  params?: unknown;
-};
+import {
+  ProcessJsonRpcClient,
+  spawnRemoteRpcProcess,
+  startRemoteBridge,
+  type RemoteBridge,
+  type RemoteRpcAttempt,
+  type RemoteRpcSession,
+  type RemoteRuntimeLayout,
+} from "./remoteBridge";
 
 type InitializeResponse = {
   runtimeInfo?: {
@@ -37,42 +30,6 @@ type InitializeResponse = {
   };
 };
 
-type PendingRequest = {
-  method: string;
-  resolve: (value: unknown) => void;
-  reject: (reason: unknown) => void;
-  timer: ReturnType<typeof setTimeout>;
-};
-
-type RemoteRuntimeLayout = {
-  channel: "alpha" | "beta" | null;
-  homeDirName: string;
-  homeDirExpr: string;
-  binDirExpr: string;
-  runtimeDirExpr: string;
-  socketExpr: string;
-  binaryExpr: string;
-};
-
-type RemoteRpcAttempt = {
-  target: RemoteRuntimeTarget;
-  route: RemoteRuntimeTargetRoute;
-  layout: RemoteRuntimeLayout;
-  command: string;
-  sshArgs: string[];
-  label: string;
-};
-
-type RemoteRpcSession = {
-  client: ProcessJsonRpcClient;
-  attempt: RemoteRpcAttempt;
-};
-
-type RemoteBridge = {
-  socketUrl: string;
-  close: () => Promise<void>;
-};
-
 type RemoteLaunchScope = "project" | "session";
 
 type RemoteCliOptions = {
@@ -99,47 +56,11 @@ type RemoteSessionChoice = {
 export type RunAdeCodeCli = (argv: string[]) => Promise<number>;
 
 const REMOTE_RPC_TIMEOUT_MS = 20_000;
-const REMOTE_RPC_REQUEST_TIMEOUT_MS = 120_000;
-const MAX_RPC_BUFFER_BYTES = 16 * 1024 * 1024;
-const MAX_STDERR_TAIL_BYTES = 32 * 1024;
 
 function errorMessage(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
 
-class ByteRingBuffer {
-  private chunks: Buffer[] = [];
-  private bytes = 0;
-
-  constructor(private readonly maxBytes: number) {}
-
-  push(chunk: Buffer | string): void {
-    const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, "utf8");
-    if (this.maxBytes <= 0) return;
-    this.chunks.push(buffer);
-    this.bytes += buffer.length;
-    while (this.bytes > this.maxBytes && this.chunks.length > 0) {
-      const first = this.chunks[0]!;
-      const overflow = this.bytes - this.maxBytes;
-      if (overflow >= first.length) {
-        this.chunks.shift();
-        this.bytes -= first.length;
-      } else {
-        this.chunks[0] = first.subarray(overflow);
-        this.bytes -= overflow;
-      }
-    }
-  }
-
-  text(): string {
-    return Buffer.concat(this.chunks, this.bytes).toString("utf8").trim();
-  }
-
-  tailLines(limit = 8): string {
-    return this.text().split(/\r?\n/).filter(Boolean).slice(-limit).join("\n");
-  }
-}
-
 function isRecord(value: unknown): value is Record<string, unknown> {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
@@ -565,12 +486,6 @@ function remoteRpcAttempts(target: RemoteRuntimeTarget): RemoteRpcAttempt[] {
   return attempts;
 }
 
-function spawnRemoteRpcProcess(attempt: RemoteRpcAttempt): ChildProcessWithoutNullStreams {
-  return spawn("ssh", attempt.sshArgs, {
-    stdio: ["pipe", "pipe", "pipe"],
-  });
-}
-
 function withTimeout<T>(promise: Promise<T>, timeoutMs: number, message: string): Promise<T> {
   let timer: ReturnType<typeof setTimeout> | null = null;
   return new Promise<T>((resolve, reject) => {
@@ -581,182 +496,6 @@ function withTimeout<T>(promise: Promise<T>, timeoutMs: number, message: string)
   });
 }
 
-export class ProcessJsonRpcClient {
-  private nextId = 1;
-  private buffer = Buffer.alloc(0);
-  private readonly pending = new Map<number | string, PendingRequest>();
-  private readonly stderrTail = new ByteRingBuffer(MAX_STDERR_TAIL_BYTES);
-  private closed = false;
-
-  constructor(private readonly child: ChildProcessWithoutNullStreams) {
-    child.stdout.on("data", (chunk: Buffer | string) => this.handleData(chunk));
-    child.stderr.on("data", (chunk: Buffer | string) => {
-      this.stderrTail.push(chunk);
-    });
-    child.on("error", (error) => this.handleClosed(error));
-    child.on("close", (code, signal) => {
-      this.handleClosed(new Error(this.closeMessage(code, signal)));
-    });
-  }
-
-  request<T = unknown>(method: string, params?: unknown): Promise<T> {
-    if (this.closed) return Promise.reject(new Error("Remote ADE RPC connection is closed."));
-    const id = this.nextId++;
-    const payload = {
-      jsonrpc: "2.0",
-      id,
-      method,
-      ...(params !== undefined ? { params } : {}),
-    };
-    return new Promise<T>((resolve, reject) => {
-      const timer = setTimeout(() => {
-        if (!this.pending.has(id)) return;
-        this.handleClosed(
-          new Error(`Remote ADE RPC timed out waiting for method ${method} (${REMOTE_RPC_REQUEST_TIMEOUT_MS}ms).`),
-        );
-        this.child.kill();
-      }, REMOTE_RPC_REQUEST_TIMEOUT_MS);
-      timer.unref?.();
-      this.pending.set(id, {
-        method,
-        resolve: (value) => resolve(value as T),
-        reject,
-        timer,
-      });
-      this.child.stdin.write(`${JSON.stringify(payload)}\n`, "utf8", (error) => {
-        if (!error) return;
-        const pending = this.pending.get(id);
-        if (pending) clearTimeout(pending.timer);
-        this.pending.delete(id);
-        reject(error);
-      });
-    });
-  }
-
-  close(): void {
-    if (this.closed) return;
-    this.closed = true;
-    this.rejectAll(new Error("Remote ADE RPC connection closed."));
-    this.child.stdin.end();
-    this.child.kill();
-  }
-
-  private closeMessage(code: number | null, signal: NodeJS.Signals | null): string {
-    const detail = this.stderrTail.tailLines(8);
-    const status = signal ? `signal ${signal}` : `code ${code ?? "unknown"}`;
-    return detail
-      ? `Remote ADE RPC exited with ${status}: ${detail}`
-      : `Remote ADE RPC exited with ${status}.`;
-  }
-
-  private handleClosed(error: Error): void {
-    if (this.closed) return;
-    this.closed = true;
-    this.rejectAll(error);
-  }
-
-  private handleData(chunk: Buffer | string): void {
-    if (this.closed) return;
-    this.buffer = Buffer.concat([
-      this.buffer,
-      Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk, "utf8"),
-    ]);
-    if (this.buffer.length > MAX_RPC_BUFFER_BYTES) {
-      this.handleClosed(new Error(`Remote ADE RPC sent an oversized partial frame (> ${MAX_RPC_BUFFER_BYTES} bytes).`));
-      this.child.kill();
-      return;
-    }
-    while (true) {
-      let next: string | null;
-      try {
-        next = this.takeNextPayload();
-      } catch (error) {
-        this.handleClosed(error instanceof Error ? error : new Error(String(error)));
-        this.child.kill();
-        return;
-      }
-      if (!next) return;
-      const payload = next.trim();
-      if (!payload) continue;
-      let parsed: JsonRpcResponse | JsonRpcResponse[] | null = null;
-      try {
-        parsed = JSON.parse(payload) as JsonRpcResponse | JsonRpcResponse[];
-      } catch (error) {
-        this.handleClosed(new Error(`Failed to parse remote ADE RPC response: ${error instanceof Error ? error.message : String(error)}`));
-        this.child.kill();
-        return;
-      }
-      const responses = Array.isArray(parsed) ? parsed : [parsed];
-      for (const response of responses) this.handleResponse(response);
-    }
-  }
-
-  private takeNextPayload(): string | null {
-    while (this.buffer.length && /\s/.test(String.fromCharCode(this.buffer[0]!))) {
-      this.buffer = this.buffer.subarray(1);
-    }
-    if (!this.buffer.length) return null;
-    const first = String.fromCharCode(this.buffer[0]!);
-    if (first === "{" || first === "[") {
-      const idx = this.buffer.indexOf(0x0a);
-      if (idx < 0) return null;
-      if (idx > MAX_RPC_BUFFER_BYTES) {
-        throw new Error(`Remote ADE RPC sent an oversized JSON line (> ${MAX_RPC_BUFFER_BYTES} bytes).`);
-      }
-      const payload = this.buffer.subarray(0, idx).toString("utf8");
-      this.buffer = this.buffer.subarray(idx + 1);
-      return payload;
-    }
-    const probe = this.buffer.subarray(0, Math.min(this.buffer.length, "content-length".length)).toString("ascii").toLowerCase();
-    if (!"content-length".startsWith(probe)) {
-      throw new Error("Remote ADE RPC sent non-JSON output on stdout.");
-    }
-
-    const crlfBoundary = this.buffer.indexOf("\r\n\r\n");
-    const lfBoundary = this.buffer.indexOf("\n\n");
-    let boundary: { index: number; length: number } | null = null;
-    if (crlfBoundary >= 0) boundary = { index: crlfBoundary, length: 4 };
-    else if (lfBoundary >= 0) boundary = { index: lfBoundary, length: 2 };
-    if (!boundary) return null;
-    const header = this.buffer.subarray(0, boundary.index).toString("ascii");
-    const match = /^content-length\s*:\s*(\d+)\s*$/im.exec(header);
-    if (!match) {
-      throw new Error("Remote ADE RPC sent a malformed Content-Length frame.");
-    }
-    const length = Number.parseInt(match[1]!, 10);
-    if (!Number.isFinite(length) || length < 0 || length > MAX_RPC_BUFFER_BYTES) {
-      throw new Error(`Remote ADE RPC sent an oversized Content-Length frame (${length} bytes).`);
-    }
-    const bodyStart = boundary.index + boundary.length;
-    const bodyEnd = bodyStart + length;
-    if (this.buffer.length < bodyEnd) return null;
-    const payload = this.buffer.subarray(bodyStart, bodyEnd).toString("utf8");
-    this.buffer = this.buffer.subarray(bodyEnd);
-    return payload;
-  }
-
-  private handleResponse(response: JsonRpcResponse): void {
-    if (response.id == null) return;
-    const pending = this.pending.get(response.id);
-    if (!pending) return;
-    this.pending.delete(response.id);
-    clearTimeout(pending.timer);
-    if (response.error) {
-      pending.reject(new Error(response.error.message));
-      return;
-    }
-    pending.resolve(response.result);
-  }
-
-  private rejectAll(error: Error): void {
-    for (const pending of this.pending.values()) {
-      clearTimeout(pending.timer);
-      pending.reject(error);
-    }
-    this.pending.clear();
-  }
-}
-
 async function initializeRemoteRpc(client: ProcessJsonRpcClient): Promise<void> {
   const initialize = await client.request<InitializeResponse>("ade/initialize", {
     protocolVersion: "2025-06-18",
@@ -1163,146 +902,6 @@ function printSessions(sessions: RemoteSessionChoice[]): void {
   }
 }
 
-async function startRemoteBridge(target: RemoteRuntimeTarget, initialAttempt?: RemoteRpcAttempt): Promise<RemoteBridge> {
-  const activeSockets = new Set<net.Socket>();
-  const activeChildren = new Set<ChildProcessWithoutNullStreams>();
-  const bridgeDir = process.platform === "win32"
-    ? null
-    : fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-remote-"));
-  if (bridgeDir) {
-    try {
-      fs.chmodSync(bridgeDir, 0o700);
-    } catch {}
-  }
-  const bridgeSocketPath = bridgeDir ? path.join(bridgeDir, "bridge.sock") : null;
-  let closing = false;
-
-  const currentTarget = (): RemoteRuntimeTarget => {
-    try {
-      return new RemoteTargetRegistry().get(target.id) ?? target;
-    } catch {
-      return target;
-    }
-  };
-
-  let firstBridgeAttempt: RemoteRpcAttempt | null = initialAttempt ?? null;
-  const selectBridgeAttempt = async (): Promise<RemoteRpcAttempt> => {
-    if (firstBridgeAttempt) {
-      const attempt = firstBridgeAttempt;
-      firstBridgeAttempt = null;
-      return attempt;
-    }
-    const session = await openRemoteRpcSession(currentTarget());
-    const attempt = session.attempt;
-    session.client.close();
-    return attempt;
-  };
-
-  const server = net.createServer((socket) => {
-    activeSockets.add(socket);
-    socket.pause();
-    let child: ChildProcessWithoutNullStreams | null = null;
-    let settled = false;
-    const stderrTail = new ByteRingBuffer(MAX_STDERR_TAIL_BYTES);
-    const teardown = (reason?: string): void => {
-      if (settled) return;
-      settled = true;
-      activeSockets.delete(socket);
-      if (child) activeChildren.delete(child);
-      if (!closing && reason) {
-        const detail = stderrTail.tailLines(8);
-        process.stderr.write(
-          detail
-            ? `Remote ADE bridge closed: ${reason}\n${detail}\n`
-            : `Remote ADE bridge closed: ${reason}\n`,
-        );
-      }
-      socket.destroy();
-      if (child) {
-        child.stdin.destroy();
-        child.stdout.destroy();
-        child.stderr.destroy();
-        child.kill();
-      }
-    };
-    socket.on("error", (error) => teardown(error.message));
-    socket.on("close", () => teardown());
-    void selectBridgeAttempt()
-      .then((attempt) => {
-        if (settled || closing) return;
-        child = spawnRemoteRpcProcess(attempt);
-        activeChildren.add(child);
-        child.stderr.on("data", (chunk: Buffer | string) => stderrTail.push(chunk));
-        child.on("error", (error) => teardown(error.message));
-        child.on("close", (code, signal) => {
-          const status = signal ? `signal ${signal}` : `code ${code ?? "unknown"}`;
-          teardown(`ssh child exited with ${status}`);
-        });
-        socket.pipe(child.stdin);
-        child.stdout.pipe(socket);
-        socket.resume();
-      })
-      .catch((error) => {
-        teardown(error instanceof Error ? error.message : String(error));
-      });
-  });
-  server.maxConnections = 1;
-
-  await new Promise<void>((resolve, reject) => {
-    const cleanup = (): void => {
-      server.off("listening", onListening);
-      server.off("error", onError);
-    };
-    const onListening = (): void => {
-      cleanup();
-      resolve();
-    };
-    const onError = (error: Error): void => {
-      cleanup();
-      reject(error);
-    };
-    server.once("listening", onListening);
-    server.once("error", onError);
-    if (bridgeSocketPath) server.listen(bridgeSocketPath);
-    else server.listen(0, "127.0.0.1");
-  });
-
-  let socketUrl: string;
-  if (bridgeSocketPath) {
-    socketUrl = bridgeSocketPath;
-  } else {
-    const address = server.address() as AddressInfo | null;
-    if (!address) {
-      throw new Error("Remote bridge did not bind a local port.");
-    }
-    socketUrl = `tcp://127.0.0.1:${address.port}`;
-  }
-  return {
-    socketUrl,
-    close: async () => {
-      closing = true;
-      for (const socket of [...activeSockets]) socket.destroy();
-      for (const child of [...activeChildren]) {
-        child.stdin.destroy();
-        child.stdout.destroy();
-        child.stderr.destroy();
-        child.kill();
-      }
-      await new Promise<void>((resolve) => server.close(() => resolve()));
-      if (bridgeSocketPath) {
-        try {
-          fs.unlinkSync(bridgeSocketPath);
-        } catch {}
-      }
-      if (bridgeDir) {
-        try {
-          fs.rmdirSync(bridgeDir);
-        } catch {}
-      }
-    },
-  };
-}
-
 export function takeAdeCodeRemoteArgs(rest: string[]): string[] | null {
   const valueFlags = new Set([
     "--project-root",
@@ -1367,7 +966,11 @@ export async function runAdeCodeRemote(argv: string[], runAdeCodeCli: RunAdeCode
     }
 
     remote.client.close();
-    bridge = await startRemoteBridge(target, remote.attempt);
+    bridge = await startRemoteBridge({
+      target,
+      initialAttempt: remote.attempt,
+      openRemoteRpcSession,
+    });
     process.stderr.write(
       `Connecting ADE Code to ${target.name} · ${project.displayName}${session ? ` · ${session.title}` : ""}\n`,
     );
diff --git a/docs/features/ade-code/README.md b/docs/features/ade-code/README.md
index 9c1e06fbe..0db349f03 100644
--- a/docs/features/ade-code/README.md
+++ b/docs/features/ade-code/README.md
@@ -141,8 +141,8 @@ For the embedded runtime there is no `projects.add` step — the in-process runt
   OpenCode), `Ctrl+T` moves keyboard input from ADE into that terminal.
   `TerminalPane` switches from preview mode to a bordered control frame,
   stops hiding the CLI's bottom input rows, and the footer shows
-  `<PROVIDER> CONTROL` (e.g. `CODEX CONTROL`) with `Ctrl+T` to return to
-  ADE and `Ctrl+]` as the escape chord. Raw terminal input strips only
+  `<PROVIDER> CONTROL` (e.g. `CODEX CONTROL`) with `^t` to return to
+  ADE and `^]` as the escape chord. Raw terminal input strips only
   those control bytes before forwarding the rest to the PTY. `/model` and
   `/effort` write directly into a running terminal only for Claude; other
   providers rely on `pty.sendToSession` for continuation.

From 1d8983d8d98e0c7c4c7ebd7afcadb136e0ccab18 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 12:27:06 -0400
Subject: [PATCH 10/17] =?UTF-8?q?ade=20code:=20closed-session=20glyph=20?=
 =?UTF-8?q?=E2=80=94=20user-initiated=20closes=20are=20not=20failures?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Re-review finding: exit 130/143 and runtimeState 'killed' are the daemon's
user-initiated close classification (ptyService.statusFromExit), so the
closed-session drawer was marking most intentionally closed CLI sessions
with the failed glyph. Only terminalStatus === 'failed' or a genuine
non-{0,130,143} exit code renders failed now.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../__tests__/closedCliSessions.test.ts       | 22 +++++++++++++++++++
 .../src/tuiClient/closedCliSessions.ts        |  8 +++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts b/apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts
index 9163723dd..c4e07bb17 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts
@@ -43,6 +43,28 @@ describe("closedCliSessions", () => {
     expect(closedCliRightPaneRow(session!, null)).toContain("✗");
   });
 
+  it("treats user-initiated closes as idle, not failed", () => {
+    const sessions = deriveClosedCliSessions([
+      terminal({ terminalId: "t-sigint", status: "disposed", exitCode: 130, runtimeState: "killed" }),
+      terminal({ terminalId: "t-sigterm", status: "disposed", exitCode: 143, runtimeState: "killed" }),
+      terminal({ terminalId: "t-clean", status: "completed", exitCode: 0, runtimeState: "exited" }),
+      terminal({ terminalId: "t-ui-close", status: "disposed", exitCode: null, runtimeState: "killed" }),
+    ]);
+
+    for (const session of sessions) {
+      expect(closedCliSessionStatusKind(session)).toBe("idle");
+    }
+  });
+
+  it("flags genuine non-zero exits as failed", () => {
+    const [session] = deriveClosedCliSessions([
+      terminal({ terminalId: "t-crash", status: "completed", exitCode: 2, runtimeState: "exited" }),
+    ]);
+
+    expect(session).toBeDefined();
+    expect(closedCliSessionStatusKind(session!)).toBe("failed");
+  });
+
   it("filters closed CLI sessions out of the open drawer list", () => {
     const [closed] = deriveClosedCliSessions([terminal()]);
     const open = {
diff --git a/apps/ade-cli/src/tuiClient/closedCliSessions.ts b/apps/ade-cli/src/tuiClient/closedCliSessions.ts
index c56acc7f1..0b00a1036 100644
--- a/apps/ade-cli/src/tuiClient/closedCliSessions.ts
+++ b/apps/ade-cli/src/tuiClient/closedCliSessions.ts
@@ -134,12 +134,16 @@ export function drawerChatActionForItem(item: DrawerChatListItem | null | undefi
   return item?.kind === "closed-toggle" ? "closed-toggle" : null;
 }
 
+// Exit 130 (Ctrl+C) and 143 (SIGTERM) are user-initiated closes — the daemon
+// classifies them as disposed/killed, not failed (ptyService.statusFromExit),
+// so only genuine failures may render the failed glyph here.
+const USER_CLOSE_EXIT_CODES = new Set([0, 130, 143]);
+
 export function closedCliSessionStatusKind(session: AgentChatSessionSummary): StatusKind {
   const closed = session as ClosedCliSessionSummary;
   if (
     closed.terminalStatus === "failed"
-    || (closed.terminalExitCode != null && closed.terminalExitCode !== 0)
-    || closed.terminalRuntimeState === "killed"
+    || (closed.terminalExitCode != null && !USER_CLOSE_EXIT_CODES.has(closed.terminalExitCode))
   ) {
     return "failed";
   }

From ca03a8235e44eea18e5799230fa3813213cf8580 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 12:34:05 -0400
Subject: [PATCH 11/17] ade cli: parity with hardening branch

---
 apps/ade-cli/README.md  |  6 +++++-
 apps/ade-cli/src/cli.ts | 40 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/apps/ade-cli/README.md b/apps/ade-cli/README.md
index ea59aac23..5ba7dcdd1 100644
--- a/apps/ade-cli/README.md
+++ b/apps/ade-cli/README.md
@@ -192,6 +192,8 @@ sync.getPin   sync.setPin   sync.clearPin
 sync.setActiveLanePresence
 ```
 
+`runtimeEvents.subscribe` returns `eventEpoch`, `nextCursor`, `hasMore`, `gap`, and `oldestCursor`; when `gap` is true, the caller's cursor predates the retained buffer and it should refresh state before resuming from `oldestCursor` / `nextCursor`.
+
 **Project-scoped** — every other request must carry `params.projectId`. `ade/actions/call` (and the legacy ADE action / tool catalog underneath it) is dispatched into the per-project `ProjectScope` returned by `ProjectScopeRegistry.get(projectId)`.
 
 `ade/initialize` advertises `runtimeInfo.multiProject: true` and `capabilities.projects: true`. Clients use that to switch between sending `projectId` per request (multi-project runtime) and the legacy per-process binding (embedded runtime). Sync is owned by the sync service for the most-recently-opened registered project; `ProjectScopeRegistry.ensureSyncHost` refreshes the active sync project when projects are added or removed.
@@ -217,7 +219,7 @@ ade code --print-state             # smoke-test the connection and exit
 ade code remote --target mac --project ADE
                                    # attach to a saved desktop remote machine
 ade code remote session --target mac --project ADE --session chat-1
-                                   # open a remote chat or Claude terminal session
+                                   # open a remote chat or provider CLI terminal session
 ade --socket /path/to/ade.sock code   # attach to a specific local endpoint
 ade --project-root /repo code      # bind to a specific project root
 ```
@@ -291,6 +293,8 @@ ade prs comments pr-id --text
 ade run defs --text
 ade run start web --lane lane-id
 ade shell start --lane lane-id -- npm test
+ade terminal list --lane lane-id --text
+ade terminal resume --terminal session-id --text
 ade new chat --mode chat --lane lane-id --provider codex --model openai/gpt-5.5 --reasoning-effort xhigh --no-fast --permissions full-auto --prompt "fix failing tests"
 ade new chat --mode cli --lane lane-id --provider codex --model openai/gpt-5.5 --reasoning-effort xhigh --no-fast --permissions full-auto --prompt "fix failing tests"
 ade new chat --mode chat --lane auto --lane-name fix-checkout-flow --prompt "fix failing tests"
diff --git a/apps/ade-cli/src/cli.ts b/apps/ade-cli/src/cli.ts
index be3813008..b0f7dec10 100644
--- a/apps/ade-cli/src/cli.ts
+++ b/apps/ade-cli/src/cli.ts
@@ -478,7 +478,8 @@ const TOP_LEVEL_HELP = `${ADE_BANNER}
     $ ade prs list | create | show | checks          Manage PRs, queues, and GitHub integration
     $ ade run defs | ps | start | logs              Manage Run tab process definitions and runtime
     $ ade shell start | write | resize | close      Launch and control tracked shell sessions
-    $ ade terminal list | read | write | signal     Control an attached session terminal
+    $ ade terminal list | resume | read | write | signal
+                                                    Control an attached session terminal
     $ ade history list | show | commits | export     Inspect ADE operation timeline and lane commits
     $ ade chat list | create | send | interrupt     Work with ADE agent chats
     $ ade cto state | chats                         Operate CTO state and Work chats
@@ -1151,12 +1152,12 @@ const HELP_BY_COMMAND: Record<string, string> = {
     $ ade code remote --target <machine> --project <project>
                                                      Launch against a saved desktop remote machine
     $ ade code remote session --target <machine> --project <project> --session <session>
-                                                     Open a specific remote chat or Claude terminal session
+                                                     Open a specific remote chat or provider CLI terminal session
     $ ade code remote --list-targets               List saved remote machines
     $ ade code remote --target <machine> --list-projects
                                                      List ADE projects available on the remote machine
     $ ade code remote session --target <machine> --project <project> --list-sessions
-                                                     List remote chat and Claude terminal sessions
+                                                     List remote chat and provider CLI terminal sessions
     $ ade --project-root <path> code                Launch against a specific ADE project
 
   Keys:
@@ -1389,8 +1390,9 @@ const HELP_BY_COMMAND: Record<string, string> = {
   tracked agent CLI session. Use attached runtime mode when you want the same
   terminal the app is viewing.
 
-    $ ade terminal list --chat-session <owner-session-id> --text  List terminals for a session
+    $ ade terminal list --chat-session <owner-session-id> --text  List running and ended terminals for a session
     $ ade terminal active --chat-session <owner-session-id> --text Show the active terminal
+    $ ade terminal resume --terminal <session-id> --text Resume an ended provider CLI terminal
     $ ade terminal read --terminal <session-id> --text Read terminal scrollback
     $ ade terminal read --pty <pty-id> --text       Read by PTY id
     $ ade app-control logs --text                   Read the active App Control launch terminal
@@ -5918,6 +5920,7 @@ function buildTerminalPlan(args: string[]): CliPlan {
     return {
       kind: "execute",
       label: "terminal list",
+      formatter: "terminal-list",
       steps: [
         actionStep(
           "result",
@@ -5932,6 +5935,31 @@ function buildTerminalPlan(args: string[]): CliPlan {
       ],
     };
   }
+  if (sub === "resume" || sub === "reattach") {
+    const terminal =
+      readValue(args, ["--terminal", "--terminal-id", "--session", "--session-id"]) ??
+      firstStandalonePositional(args);
+    return {
+      kind: "execute",
+      label: "terminal resume",
+      formatter: "pty-create",
+      steps: [
+        actionStep(
+          "result",
+          "pty",
+          "resumeSession",
+          collectGenericObjectArgs(args, {
+            sessionId: requireValue(terminal, "terminalId"),
+            cols: readIntOption(args, ["--cols"], 120),
+            rows: readIntOption(args, ["--rows"], 36),
+            model: readValue(args, ["--model", "--model-id"]),
+            reasoningEffort: readValue(args, ["--reasoning", "--reasoning-effort"]),
+            permissionMode: readValue(args, ["--permission-mode", "--permissions"]),
+          }),
+        ),
+      ],
+    };
+  }
   if (sub === "active" || sub === "current") {
     return {
       kind: "execute",
@@ -15232,13 +15260,15 @@ function formatTerminalList(value: unknown): string {
       ? [value]
       : firstArray(value, ["terminals", "items"]);
   return renderTable(
-    ["terminal", "pty", "chat", "status", "runtime", "title"],
+    ["terminal", "pty", "chat", "status", "runtime", "ended", "resume", "title"],
     terminals.map((terminal) => [
       terminal.terminalId,
       terminal.ptyId,
       terminal.chatSessionId,
       terminal.status,
       terminal.runtimeState,
+      terminal.endedAt,
+      terminal.endedAt && (terminal.resumeCommand || terminal.resumeMetadata) ? "yes" : "",
       terminal.title,
     ]),
     "ADE attached terminals\n(no terminals found)",

From e524259aff675e6e596f72b416e15a6c614911a2 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 12:34:28 -0400
Subject: [PATCH 12/17] docs: sync internal docs with ade-code hardening branch

---
 docs/ARCHITECTURE.md                          | 11 ++++----
 docs/features/ade-code/README.md              | 28 +++++++++++++------
 docs/features/remote-runtime/README.md        | 20 +++++++------
 .../remote-runtime/internal-architecture.md   |  2 +-
 docs/features/sync-and-multi-device/README.md | 21 ++++++++++++++
 .../sync-and-multi-device/ios-companion.md    | 15 +++++++++-
 6 files changed, 73 insertions(+), 24 deletions(-)

diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index 63757955f..02c02c1b7 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -116,7 +116,7 @@ Product positioning and workflows live in [`docs/PRD.md`](../docs/PRD.md). This
 - **SSH stdio bridge (`ade rpc --stdio`)** — runs a single-session JSON-RPC runtime over stdin/stdout. This is what desktop's `RemoteConnectionPool` execs over SSH after `bootstrapRemoteRuntime` has uploaded a matching `ade-<platform-arch>` binary. Exits when the SSH channel closes.
 - **Terminal client (`ade code`)** — launches the Ink + React Work chat (`apps/ade-cli/src/tuiClient/`). Defaults to attaching to the machine brain and will start it if the endpoint is missing. `ade --socket /path code` requires a specific endpoint; `ade code --embedded` keeps the in-process runtime fallback explicit.
 
-**Multi-project RPC.** The runtime exposes runtime-scoped methods (`projects.list/add/remove/touch`, `sync.*`, `runtime/info`, `machineInfo.get`, `runtimeEvents.subscribe/unsubscribe`) directly. Project-scoped operations dispatch through `ade/actions/call` with a `projectId`. Per-project services are spun up lazily by `ProjectScopeRegistry` (`apps/ade-cli/src/services/projects/projectScope.ts`) which calls `createAdeRuntime({ projectRoot, ... })` the first time a project is touched. The project registry (`projectRegistry.ts`) is the durable list of known projects; `machineLayout.ts` resolves machine-wide paths under `~/.ade/`. Wire formats live in `apps/ade-cli/src/multiProjectRpcServer.ts`.
+**Multi-project RPC.** The runtime exposes runtime-scoped methods (`projects.list/add/remove/touch`, `sync.*`, `runtime/info`, `machineInfo.get`, `runtimeEvents.subscribe/unsubscribe`) directly. Project-scoped operations dispatch through `ade/actions/call` with a `projectId`. Per-project services are spun up lazily by `ProjectScopeRegistry` (`apps/ade-cli/src/services/projects/projectScope.ts`) which calls `createAdeRuntime({ projectRoot, ... })` the first time a project is touched. The project registry (`projectRegistry.ts`) is the durable list of known projects; `machineLayout.ts` resolves machine-wide paths under `~/.ade/`. Wire formats live in `apps/ade-cli/src/multiProjectRpcServer.ts`. Runtime-event replay is backed by `apps/ade-cli/src/eventBuffer.ts`, a bounded buffer (10k events, 16 MB total, 1 MB per retained event by default) that returns `eventEpoch`, `gap`, and `oldestCursor` so clients can detect daemon restarts or evicted history. `projects.list` resolves host-side project icons under a connect-path budget (64 icons / 12 MB per call); records outside the budget get a null icon instead of blocking connection setup.
 
 **Runtime-side services** (under `apps/ade-cli/src/services/`):
 
@@ -189,9 +189,10 @@ Build outputs (configured in `apps/desktop/tsup.config.ts`):
 Terminal-native **Work** chat client (Ink 7 + React 19) for agents and power users who live in a shell, built into `apps/ade-cli/src/tuiClient/`. Its UI dependencies live under `apps/ade-cli` and are intentionally independent of the desktop renderer's React stack. It is a peer of the desktop client, not a wrapper around it: it speaks the same multi-project JSON-RPC surface and binds to an ADE runtime the same way.
 
 - **Attached mode** (default): connects to `$ADE_HOME/sock/ade.sock`, or to an explicit endpoint passed on the parent `ade` invocation. Starts the brain if the endpoint is missing.
+- **Remote mode**: `ade code remote` reads saved desktop remote targets, picks a target/project/session, starts `ade rpc --stdio` over SSH, bridges that stdio stream to a local one-connection socket (`remoteBridge.ts`), and then runs the normal TUI against the bridged endpoint. Compatibility checks that only make sense for local processes (entrypoint build hash and project-root equality) are skipped.
 - **Embedded mode**: `--embedded` / `--headless` runs the shared `apps/ade-cli` services in-process without going through a machine brain. Used when no brain endpoint or manual runtime endpoint is reachable.
 
-Shared chat DTOs are imported from `apps/desktop/src/shared/types/*` (never the renderer barrel) so `npm run typecheck` in `apps/ade-cli` covers both typed commands and the TUI. Entry: `apps/ade-cli/src/tuiClient/cli.tsx` → `apps/ade-cli/dist/tuiClient/cli.mjs`, loaded by `ade code`. The built TUI bundle is intended to run in isolation: tsup bundles its Ink/xterm/highlight dependencies and injects ESM shims for `__dirname` / `__filename`; both `apps/ade-cli/scripts/verify-built-cli.mjs` and the desktop artifact validators smoke-import it and run `runAdeCodeCli(["--help"])`. The TUI can hand off to a desktop window via the `app/navigate` JSON-RPC method when a desktop client is attached to the same runtime.
+Shared chat DTOs are imported from `apps/desktop/src/shared/types/*` (never the renderer barrel) so `npm run typecheck` in `apps/ade-cli` covers both typed commands and the TUI. Entry: `apps/ade-cli/src/tuiClient/cli.tsx` → `apps/ade-cli/dist/tuiClient/cli.mjs`, loaded by `ade code`. The built TUI bundle is intended to run in isolation: tsup bundles its Ink/xterm/highlight dependencies and injects ESM shims for `__dirname` / `__filename`; both `apps/ade-cli/scripts/verify-built-cli.mjs` and the desktop artifact validators smoke-import it and run `runAdeCodeCli(["--help"])`. Provider/model/interface setup is kept in pure helpers (`modelState.ts`, `providerMetadata.ts`, `modelPickerController.ts`) so Chat-vs-CLI availability, Cursor SDK-vs-CLI model filtering, permission presets, Fast Mode, and setup rows stay testable outside the Ink root. The TUI can hand off to a desktop window via the `app/navigate` JSON-RPC method when a desktop client is attached to the same runtime.
 
 ### 2.4 iOS client (`apps/ios/`)
 
@@ -397,7 +398,7 @@ Related feature docs: [Chat](./features/chat/README.md), [Agents](./features/age
 - `contextBridge.exposeInMainWorld("ade", { ... })` — the only cross-isolated-world surface.
 - Methods are typed via TypeScript imports from `apps/desktop/src/shared/types/`.
 - Two categories: **invoke methods** (`ipcRenderer.invoke(channel, args)` returning `Promise<T>`) and **event subscriptions** (`ipcRenderer.on(channel, handler)`).
-- Runtime-backed event subscriptions can merge local Electron IPC and the runtime event stream behind one renderer API. For example, `window.ade.lanes.onLifecycleEvent` listens to `ade.lanes.lifecycle.event` for desktop-local fallback paths and to runtime `lane_lifecycle_event` payloads for local-brain or SSH-bound windows.
+- Runtime-backed event subscriptions can merge local Electron IPC and the runtime event stream behind one renderer API. For example, `window.ade.lanes.onLifecycleEvent` listens to `ade.lanes.lifecycle.event` for desktop-local fallback paths and to runtime `lane_lifecycle_event` payloads for local-brain or SSH-bound windows. Runtime stream results (`RemoteRuntimeStreamEventsResult` in `apps/desktop/src/shared/types/remoteRuntime.ts`) carry `eventEpoch`, `gap`, and `oldestCursor`; preload resets cursors/dedupe on epoch changes and notifies project-binding refresh paths when a gap means replay history was evicted.
 - `contextIsolation: true`, `nodeIntegration: false`, `sandbox: false` (required for preload functionality).
 - Global window type: `apps/desktop/src/preload/global.d.ts`.
 - `window.ade.project.getDroppedPath(file)` wraps Electron's `webUtils.getPathForFile()` so renderer drag-drop handlers can resolve the absolute path of a `File` payload without the renderer needing Node APIs. Used by the Command Palette project browser to accept dropped folders.
@@ -541,12 +542,12 @@ Most services described here live under `apps/desktop/src/main/services/<domain>
 | `github/` | `githubService.ts` | GitHub REST/GraphQL access; PR CRUD; checks; reviewers. |
 | `history/` | `operationService.ts` | Operation audit records (one row per mutation). |
 | `ios/` | `iosSimulatorService.ts` | macOS-only iOS Simulator backend: tool readiness probes, simctl device + app discovery, build/install/launch with progress events (hardened with `simctl bootstatus` and `simctl install` timeouts), screenshot + ADEInspector + accessibility hit-test, Simulator.app window live-view status, idb-backed input, and single-owner chat session locking. The macOS Simulator window placement / capture state probe (`getSimulatorWindowState`, `prepareSimulatorWindowForCapture`) lives next to the IPC handlers in `ipc/registerIpc.ts` because it depends on the active `BrowserWindow`. See [features/ios-simulator/README.md](./features/ios-simulator/README.md). |
-| `ipc/` | `registerIpc.ts`, `runtimeBridge.ts`, `ipcTimeouts.ts` | Single registration point for all IPC handlers. `runtimeBridge.ts` owns the runtime-facing channels (remote target registry, remote-runtime connect / project list / project-open / action dispatch / sync dispatch / event stream, per-target `listActionRegistry` lookup against the remote daemon, local-work checks, LAN + Tailscale discovery with diagnostics) and routes runtime calls through `LocalRuntimeConnectionPool` or `RemoteConnectionPool` based on the active window binding. Remote project opens are generation-guarded per window/webContents before main persists the binding. It also subscribes `powerMonitor` `resume` and `unlock-screen` to `remoteConnectionService.probeSavedConnections()` so a laptop waking up cycles dead SSH sessions before the renderer pokes them. `ipcTimeouts.ts` carries the default 30-second handler timeout plus named channel-level overrides for long direct IPC operations; it does not inspect runtime action payloads. |
+| `ipc/` | `registerIpc.ts`, `runtimeBridge.ts`, `ipcTimeouts.ts` | Single registration point for all IPC handlers. `runtimeBridge.ts` owns the runtime-facing channels (remote target registry, remote-runtime connect / project list / project-open / action dispatch / sync dispatch / event stream, per-target `listActionRegistry` lookup against the remote daemon, local-work checks, LAN + Tailscale discovery with diagnostics) and routes runtime calls through `LocalRuntimeConnectionPool` or `RemoteConnectionPool` based on the active window binding. Event-stream subscription init/results preserve replay-gap metadata (`gap`, `oldestCursor`, `eventEpoch`) for both local and remote bindings. Remote project opens are generation-guarded per window/webContents before main persists the binding. It also subscribes `powerMonitor` `resume` and `unlock-screen` to `remoteConnectionService.probeSavedConnections()` so a laptop waking up cycles dead SSH sessions before the renderer pokes them. `ipcTimeouts.ts` carries the default 30-second handler timeout plus named channel-level overrides for long direct IPC operations; it does not inspect runtime action payloads. |
 | `jobs/` | `jobEngine.ts` | Event-driven background scheduler for lane refresh + conflict prediction. Coalesced, debounced. |
 | `keybindings/` | `keybindingsService.ts` | User keybindings read/write. |
 | `lanes/` | `laneService.ts`, `laneEnvironmentService.ts`, `laneTemplateService.ts`, `laneProxyService.ts`, `portAllocationService.ts`, `autoRebaseService.ts`, `rebaseSuggestionService.ts`, `laneLaunchContext.ts`, `oauthRedirectService.ts`, `runtimeDiagnosticsService.ts` | Worktree lifecycle, env bootstrap, templates, reverse proxy, port leases, auto-rebase, suggestions, OAuth redirect, diagnostics. |
 | `logging/` | `logger.ts` | File-backed structured logger. |
-| `localRuntime/` | `localRuntimeConnectionPool.ts` | Desktop-side client for the local brain endpoint. Spawns or attaches to the machine endpoint, registers local projects with `projects.add`, dispatches local runtime actions with per-call timeouts where needed, emits `local_runtime.action_slow` warn logs (with `ensureProjectMs` / `connectMs` / `daemonCallMs` breakdown) whenever a call exceeds 500 ms or throws, polls runtime events, and installs the background service best-effort in packaged builds. |
+| `localRuntime/` | `localRuntimeConnectionPool.ts` | Desktop-side client for the local brain endpoint. Spawns or attaches to the machine endpoint, registers local projects with `projects.add`, dispatches local runtime actions with per-call timeouts where needed, emits `local_runtime.action_slow` warn logs (with `ensureProjectMs` / `connectMs` / `daemonCallMs` breakdown) whenever a call exceeds 500 ms or throws, polls/subscribes to runtime events while preserving `eventEpoch`/gap metadata, and installs the background service best-effort in packaged builds. |
 | `onboarding/` | `onboardingService.ts`, `onboardingSuggestedConfig.ts` | First-run flow, defaults detection, existing lane discovery. `onboardingSuggestedConfig.ts` contains pure workflow parsing and suggested `.ade/ade.yaml` generation. |
 | `opencode/` | `openCodeRuntime.ts`, `openCodeServerManager.ts`, `openCodeBinaryManager.ts`, `openCodeInventory.ts`, `openCodeModelCatalog.ts` | OpenCode server spawn, binary resolution, model discovery. |
 | `orchestration/` | `orchestrationService.ts`, `applyPatches.ts`, `patchPolicy.ts`, `manifestNormalization.ts`, `runtimeProfile.ts` | Work-tab orchestration for multi-phase plans. `orchestrationService` manages run lifecycle, manifest persistence, the `leadState.planning` state machine, `plan.md`, validation strategy/findings, asset bundles, and the `lineage` delegation ledger (lead→worker/validator spawn + result edges). `patchPolicy` keeps privileged fields (`leadState.planning`, `planSpec`, and the `/lineage` ledger) behind service methods so the lead cannot forge intake, planning rounds, model routing, approval readiness, or delegation edges with a raw patch. `runtimeProfile` resolves the active orchestration profile per session and gates model selection / plan approval on planning readiness. The renderer surfaces live in `renderer/components/orchestration/` (see §7.3). The former `orchestrator/` and `missions/` directories were consolidated into this service. |
diff --git a/docs/features/ade-code/README.md b/docs/features/ade-code/README.md
index 0db349f03..ca1d42de0 100644
--- a/docs/features/ade-code/README.md
+++ b/docs/features/ade-code/README.md
@@ -26,13 +26,21 @@ Point Cursor’s browser inspector at the served page for layout debugging. The
 | `apps/ade-cli/src/tuiClient/app.tsx` | Primary Ink/React surface: navigation, composer, drawers, right pane, session lifecycle, slash command dispatch. Owns startup reconnect/retry UI, the debounced/cached `@` mention loader, terminal mode restoration on exit/heartbeat shutdown, and the `Ctrl+Y` "copy ADE deeplink" handler which resolves the focused lane / PR row through `buildDeeplinkForRow` and copies the canonical `ade://...` URL to the system clipboard. Also backs `/skills` by listing Agent Skill roots from project, user, inherited, and bundled ADE locations, independent of the active provider. |
 | `apps/ade-cli/src/tuiClient/deeplinkRow.ts` | Pure helper used by the `Ctrl+Y` keybinding. Maps the focused lane or PR row (including parsing a GitHub PR URL when the right pane only carries the URL) onto a `DeeplinkTarget` and returns the built `ade://` URL. Tested in `tuiClient/__tests__/deeplinkKeybind.test.ts`. |
 | `apps/ade-cli/src/commands/deeplinks.ts` | `ade open`, `ade link`, and `ade linear install` subcommands. Shares the parser + builder with the desktop main process so URLs round-trip across both surfaces. See [features/deeplinks/README.md](../deeplinks/README.md). |
-| `apps/ade-cli/src/tuiClient/connection.ts` | Resolves attached vs embedded mode, runs the `ade/initialize` handshake, registers the project with `projects.add`, wraps subsequent requests with `projectId`. Computes the expected SHA-256 build hash from the resolved CLI entrypoint and compares it against the runtime's reported `runtimeInfo.buildHash` / `defaultRole` / `projectRoot`; a mismatch throws `StaleAdeSocketError`, optionally shuts the stale runtime process down, and lets `spawnDaemon` start a compatible one (with `ADE_DEFAULT_ROLE=cto` in the spawned env). `initializeEmbeddedCto` injects a trusted `cto` role only when `ADE_DEFAULT_ROLE` is not already set to a valid value. |
+| `apps/ade-cli/src/tuiClient/connection.ts` | Resolves attached vs embedded mode, runs the `ade/initialize` handshake, registers the project with `projects.add`, wraps subsequent requests with `projectId`, and exposes `subscribeRuntimeEvents`. Computes the expected SHA-256 build hash from the resolved CLI entrypoint and compares it against the runtime's reported `runtimeInfo.buildHash` / `defaultRole` / `projectRoot`; a mismatch throws `StaleAdeSocketError`, optionally shuts the stale runtime process down, and lets `spawnDaemon` start a compatible one (with `ADE_DEFAULT_ROLE=cto` in the spawned env). Remote sockets skip local build-hash/project-root compatibility checks. Runtime-event subscription responses surface replay gaps (`gap`, `oldestCursor`, `nextCursor`) to callers so the TUI can reset stale cursors instead of silently missing events. `initializeEmbeddedCto` injects a trusted `cto` role only when `ADE_DEFAULT_ROLE` is not already set to a valid value. |
 | `apps/ade-cli/src/runtimeRoles.ts` | `ADE_RUNTIME_ROLES` (`cto`, `orchestrator`, `agent`, `external`, `evaluator`), `normalizeAdeRuntimeRole`, and `resolveAdeDefaultRole`. Shared by `cli.ts`, `adeRpcServer.ts`, `multiProjectRpcServer.ts`, and `tuiClient/connection.ts` so role parsing stays consistent across surfaces. |
-| `apps/ade-cli/src/tuiClient/jsonRpcClient.ts` | Socket client: connect, request/response, `chat/event` notifications. |
+| `apps/ade-cli/src/tuiClient/jsonRpcClient.ts` | Socket client for Unix/named-pipe and `tcp://` endpoints. Supports JSON-line and Content-Length frames, per-request timeouts, unexpected-close callbacks, notifications (`chat/event`, `runtime/event`), and bounded read buffers (16 MB frame cap, 64 KB header cap) so a wedged runtime cannot grow memory unbounded. |
+| `apps/ade-cli/src/tuiClient/remoteLauncher.ts` | `ade code remote` CLI: parses target/project/session flags, lists saved desktop remote machines, probes stable/beta/alpha ADE homes over SSH, registers or selects a remote project, lists launchable remote chats/tracked CLI terminals, and invokes the normal TUI with remote project/session hints. |
+| `apps/ade-cli/src/tuiClient/remoteBridge.ts` | Remote transport shim used by `remoteLauncher.ts`: starts `ade rpc --stdio` over SSH, performs process-backed JSON-RPC for selection/listing, then exposes a local one-connection bridge socket (Unix socket on POSIX, loopback TCP on Windows) to the regular TUI. Owns stderr tails, 16 MB RPC frame limits, child-process cleanup, and bridge-socket teardown. |
 | `apps/ade-cli/src/tuiClient/commands.ts` / `linearCommands.ts` | Slash command catalog and routing. `commands.ts` ships `/lane delete` (right-pane confirmation form that destroys the active lane), `/effort` (reasoning-effort-only picker, a narrower companion to `/model`), provider-agnostic `/skills` for Agent Skill discovery, and provider-agnostic `/secrets` for masked project-secret listing/copying. `linearCommands.ts` requires a sub-command — bare `/linear` returns the usage hint instead of silently picking `workflows`. It also routes the session/lane attachment verbs (`attach` / `detach` / `issues` → `lane` domain session-scoped or lane-scoped actions) and the issue write-bridge verbs (`comment` / `set-state` / `assign` / `label` → `linear_issue_tracker` domain), reusing `--issue-id` / `--linear-issue-json` / attachment flags (`source`, `includeInPr`, `closeOnMerge`, `role`) parsing shared with the typed `ade linear` CLI commands in `cli.ts`. |
+| `apps/ade-cli/src/tuiClient/providerMetadata.ts` | Provider labels, family labels, token normalization, and provider lookup helpers shared by setup rows and the model picker. Keeps Anthropic/OpenAI/Factory aliases mapped onto the TUI's provider ids and decides which providers support runtime catalog refresh. |
+| `apps/ade-cli/src/tuiClient/modelState.ts` | Pure model/setup state for draft chats and `/model`: initial provider/model defaults, Chat vs CLI interface mode, Cursor chat-vs-CLI availability reconciliation, Codex preset/approval/sandbox mapping, provider-specific permission summaries, reasoning effort derivation, Fast Mode support, and the `SetupPaneRow` list rendered in setup panes. |
+| `apps/ade-cli/src/tuiClient/modelPickerController.ts` | Small adapter between right-pane model-picker state and `modelPickerLayout.ts`: supplies active model/reasoning/interface, favorites/recents, AI status, footer focus, lane label, and provider refresh routing. |
 | `apps/ade-cli/src/tuiClient/rightPaneFormatters.ts` | Pure formatters for right-pane result panes (PR summary / review / checks / comments, Linear status, system details). Keeps `app.tsx` free of ad-hoc rendering helpers. |
 | `apps/ade-cli/src/tuiClient/format.ts` | Transcript rendering helpers for the TUI. |
+| `apps/ade-cli/src/tuiClient/displayWidth.ts` | Grapheme-aware terminal-cell helpers using `string-width`: code-unit ↔ display-cell mapping, display-cell slicing, truncation, wrapping, and selection splitting for Unicode-safe chat/model/right-pane rendering. |
 | `apps/ade-cli/src/tuiClient/aggregate.ts` | Pure derivations on top of the chat event stream. Produces `AggregatedBlock`s (assistant text, tool-calls / files-changed / plan / compaction groups, runtime-activity rows for subagent and activity envelopes, queued steers) and `derivePendingSteers`, consumed by `ChatView` and the right-pane steer view. |
+| `apps/ade-cli/src/tuiClient/bracketedPaste.ts` | Bracketed-paste parser/formatter for terminal-control mode and multi-line forwarded input. Normalizes pasted newlines and wraps multi-line user input in bracketed-paste markers before writing it into provider CLI PTYs. |
+| `apps/ade-cli/src/tuiClient/closedCliSessions.ts` | Converts ended tracked CLI terminal sessions into chat-like drawer rows, filters them out of open chat lists, derives resumability/provider metadata, and maps user-initiated closes (0/130/143) to the neutral idle glyph instead of a failure state. |
 | `apps/ade-cli/src/tuiClient/drawerSelection.ts` | Pure selectors for the lane / chat drawer (active row, expanded groups, keyboard navigation). |
 | `apps/ade-cli/src/tuiClient/drawerLayout.ts` | Single source of truth for drawer row layout: `computeDrawerLayout` (expanded chat block, closed-CLI group rows, and compact per-lane chat previews under a height budget) and `drawerMouseHitForLayout`, shared by the Drawer renderer and the app's mouse hit-testing so the two cannot drift. |
 | `apps/ade-cli/src/tuiClient/newLaneForm.ts` | Pure model for the `/new lane` form: start-from modes (primary / child / import), Linear issue + setup-template fields, per-mode field lists, and `buildNewLaneSubmission` mapping form values onto `lane.create` / `lane.createChild` / `lane.importBranch` payloads. |
@@ -50,7 +58,7 @@ Point Cursor’s browser inspector at the served page for layout debugging. The
 | `apps/ade-cli/src/services/sync/syncRemoteCommandService.ts` | Runtime action registry used by desktop, iOS, and ADE Code attached clients. Exposes the typed `chat.getCodexGoal`, `chat.setCodexGoal`, `chat.setCodexGoalStatus`, and `chat.clearCodexGoal` actions so clients can update Codex goals without injecting `/goal` prompt text into CLI-backed chats. |
 | `apps/ade-cli/src/tuiClient/subagentPane.ts` | Pure builders for the Chat Info pane's subagent roster: `buildSubagentPaneRows`, `subagentIndexForPaneLine`, `selectedSubagentSnapshot`, and `subagentPaneContentFromRightPane` (extracts a `SubagentPaneContent` from the `chat-info` right-pane state). `subagentSnapshotsFromEvents` reconstructs snapshots from `subagent_*` and teammate envelopes with sibling-aware parent-placeholder resolution. |
 | `apps/ade-cli/src/tuiClient/workEventIds.ts` | Stable Work-tab identity helpers used by the TUI to thread `ade.work-*` event ids through the renderer without re-deriving them per frame. |
-| `apps/ade-cli/src/tuiClient/state.ts` | Persists terminal-client state under `~/.ade/`: the last selected chat per lane (`lastChatByLane`), the most recently active lane (`lastLaneId`), and the last explicitly chosen draft Interface (`draftKind`, `chat` or `cli`). Entries are project-scoped with legacy global fallback, matching desktop's project-scoped Work view memory. |
+| `apps/ade-cli/src/tuiClient/state.ts` | Persists terminal-client state under `~/.ade/ade-code-state.json`: the last selected chat per lane (`lastChatByLane`), the most recently active lane (`lastLaneId`), and the last explicitly chosen draft Interface (`draftKind`, `chat` or `cli`). Entries are project-scoped with legacy global fallback, matching desktop's project-scoped Work view memory. Writes are serialized through a short lock file so multiple TUI instances do not corrupt the JSON state. |
 | `apps/ade-cli/src/tuiClient/theme.ts` | Shared Ink color and status tokens. Mirrors the Claude Design wireframe terminal palette 1:1: surfaces, text levels, brand violets, status (`running`/`attention`/`idle`/`failed`/`primary`), executor brand colors (Claude/Codex/Cursor/OpenCode/Droid + Shell + Copilot), plus helper exports `laneStatusColor`, `agentStatusColor`, `agentStatusGlyph`, and per-provider `glyph` + `wordmark`. |
 | `apps/ade-cli/src/tuiClient/types.ts` | `AdeCodeConnection`, `ProjectLaunchContext`, `RightPaneContent` (`empty`, `help`, `status`, `details`, `diff`, `chat-info`, `new-chat-setup`, `model-setup`, `form`, `lane-details` with git stats + PR CI fields + lane chat counts, …), `ChatInfoSnapshot`, `ChatInfoPlan`, `ChatInfoPlanStep`, `SubagentSnapshot`, plus navigation DTOs aligned with `apps/desktop/src/shared/types`. |
 | `apps/ade-cli/src/tuiClient/components/` | `AdeWordmark`, `Drawer` (`visibleDrawerLaneCount` / `visibleDrawerChatCount`, `DrawerPrSummary` rows, lanes mode chat preview under the selected lane, closed tracked CLI session group), `ChatView` (transcript renderer; exports `renderChatVisibleSelectionRows` / `renderChatSelectableRowTexts` / `selectedTextFromChatRows` for the ADE-owned mouse selection, plus `computeChatScrollMaxOffset` and `renderChatTranscriptPlainText`), `Header`, `RightPane` (`computeLaneChatCounts`, `LANE_DETAIL_PR_ACTION_INDEX`, wireframe `lane-details` STATUS/SETUP/CHANGES/ACTIONS/PR/CHATS sections, Chat Info `chat-info`, `model-setup`, masked `/secrets` list), `SlashPalette`, `MentionPalette`, `ApprovalPrompt`, `ModelStatus`, `FooterControls`, and `TerminalPane` (xterm-headless preview pane that consumes `ChatTerminalPreviewResult` from `ade.terminal.preview` plus live `ade.pty.data` chunks to render a real terminal grid inside Ink; running provider CLI terminals — Claude, Codex, Cursor, Droid, OpenCode — can be put into direct control mode from the TUI). |
@@ -289,12 +297,14 @@ ade --socket /tmp/ade-runtime-dev.sock code
 
 `ade code remote` is a launcher around the same TUI. It reads saved desktop
 remote targets, probes stable/beta/alpha ADE homes over SSH, starts
-`ade rpc --stdio` on the selected machine, exposes that stdio stream as a local
-loopback `tcp://` JSON-RPC socket, and then invokes the normal `runAdeCodeCli`
-with `--remote`, `--remote-label`, `--require-socket`, remote project roots,
-and the selected `--lane` / `--session` hints. Remote launches skip local
-project-root and build-hash compatibility checks because the authoritative
-runtime and filesystem are on the target machine.
+`ade rpc --stdio` on the selected machine, and hands that stdio stream to
+`remoteBridge.ts`, which exposes a local one-connection JSON-RPC endpoint
+(temporary Unix socket on POSIX, loopback `tcp://` on Windows). It then invokes
+the normal `runAdeCodeCli` with `--remote`, `--remote-label`,
+`--require-socket`, remote project roots, and the selected `--lane` /
+`--session` hints. Remote launches skip local project-root and build-hash
+compatibility checks because the authoritative runtime and filesystem are on
+the target machine.
 
 After local changes, run `npm run build` inside `apps/ade-cli` so both `dist/cli.cjs` and `dist/tuiClient/cli.mjs` exist for packaged and linked use. The CLI build verifier imports `dist/tuiClient/cli.mjs` from an isolated temp directory, checks that bundled `__dirname` / `__filename` references have ESM shims, and confirms `runAdeCodeCli(["--help"])` prints the ADE Code help banner without relying on repo-local `node_modules`. During repo development, `npm run dev:code` runs the source TUI in the terminal against the shared dev runtime at `/tmp/ade-runtime-dev.sock`; `npm run dev:code:web` mirrors that same process in the browser (see [Browser mirror](#browser-mirror-development)).
 
diff --git a/docs/features/remote-runtime/README.md b/docs/features/remote-runtime/README.md
index f5b7d09c3..ed56217d6 100644
--- a/docs/features/remote-runtime/README.md
+++ b/docs/features/remote-runtime/README.md
@@ -12,7 +12,8 @@ The wire transport is the same JSON-RPC the local machine runtime answers. The r
   `lastSucceededAt` plus manual-disconnect state), runtime RPC client
   (timeouts treated as fatal), remote connection pool (eviction listeners,
   retryable read-only actions and selected retryable sync reads, local TCP
-  forwards for remote preview URLs, optional-action fallbacks), remote
+  forwards for remote preview URLs, optional-action fallbacks, event-stream
+  gap/epoch propagation), remote
   connection service (`powerMonitor`-driven `probeSavedConnections`, explicit
   connect vs implicit reconnect policy), `runtimeDiscovery.ts` (Bonjour +
   Tailscale with `discoverLanRuntimes` returning `{ machines, diagnostics }`).
@@ -53,14 +54,17 @@ The wire transport is the same JSON-RPC the local machine runtime answers. The r
   opens before retrying read-only project calls, blocks mutating action/sync
   calls with the "Project is switching" error, and avoids refreshing a stale
   runtime binding. Remote event polling suppresses buffered replay on the first
-  live subscription and backs off when idle; lane preview URLs returned by a
-  remote runtime are localized through a local TCP forward before the renderer
-  opens them.
+  live subscription, resets cursors on `eventEpoch` changes, notifies project
+  refresh paths on `gap: true`, and backs off when idle; lane preview URLs
+  returned by a remote runtime are localized through a local TCP forward before
+  the renderer opens them.
 - `apps/ade-cli/src/multiProjectRpcServer.ts` — runtime-level project catalog
-  and sync methods plus project-scoped action dispatch. `projects.list` inlines
-  each project's host-resolved icon (`icon: { dataUrl, sourcePath, mimeType }`)
-  so a connected desktop can render the real project logo in its remote tab
-  instead of a blank folder.
+  and sync methods plus project-scoped action dispatch. `runtimeEvents.*`
+  replies include `eventEpoch`, `gap`, and `oldestCursor` from the runtime's
+  bounded event buffer. `projects.list` inlines host-resolved icons, with
+  `dataUrl`, `sourcePath`, and `mimeType` fields, under a connect-path budget
+  (64 icons / 12 MB per call), so a connected desktop can render real project
+  logos without letting an oversized registry stall connection setup.
 - `apps/ade-cli/src/services/projects/` — machine project registry,
   per-project service scope cache, and `projectIconResolver.ts`
   (`resolveRemoteProjectIcon`, an electron-free port of the desktop icon
diff --git a/docs/features/remote-runtime/internal-architecture.md b/docs/features/remote-runtime/internal-architecture.md
index e392fbe84..0e1f85411 100644
--- a/docs/features/remote-runtime/internal-architecture.md
+++ b/docs/features/remote-runtime/internal-architecture.md
@@ -41,7 +41,7 @@ Project-scoped operations are routed through `ade/actions/call` and carry `param
 
 Runtime event streaming uses `ade/actions/call` with `name: "stream_events"` for one-shot pulls, and `runtimeEvents.subscribe` (with `runtime/event` notifications) for live streaming. For remote bindings the desktop reconnects the SSH transport before re-subscribing, matching normal remote action behavior after disconnects. The initial remote subscription starts with `replay: false` when the cursor is still zero, so opening a remote project does not flood the renderer with buffered history before live events arrive; catch-up polls still use a short delay while idle remote polls back off. For local bindings, preload polls the local runtime through `localRuntimeStreamEvents` so runtime-owned chat, terminal, pty, lane, file-watch, process, and test events are delivered through the same renderer fanout used by remote projects.
 
-Each `stream_events` response carries a per-runtime `eventEpoch` UUID minted when the daemon's `eventBuffer` is constructed. The preload event pump compares it against the last seen epoch for the active binding; if it changes (daemon restart, ssh reconnect to a fresh process) the cursor and dedup set reset and the next poll starts from `cursor=0`. The `startedAtMs` "drop events older than the pump start" filter is only applied to **local** bindings — remote pumps rely on the epoch reset instead, so older events backfilled after a reconnect are still delivered.
+Each `stream_events` response carries a per-runtime `eventEpoch` UUID minted when the daemon's `eventBuffer` is constructed. The preload event pump compares it against the last seen epoch for the active binding; if it changes (daemon restart, ssh reconnect to a fresh process) the cursor and dedup set reset and the next poll starts from `cursor=0`. Responses can also include `gap: true` with `oldestCursor` when the requested cursor is older than the bounded replay buffer; preload clears the dedupe set and notifies the project-binding refresh callbacks so renderer projections re-hydrate from authoritative reads instead of assuming no events were missed. The `startedAtMs` "drop events older than the pump start" filter is only applied to **local** bindings — remote pumps rely on the epoch reset instead, so older events backfilled after a reconnect are still delivered.
 
 The remote event buffer categories are intentionally narrow: `orchestrator`, `dag_mutation`, `runtime`, and `pty`. Preload dispatches `runtime` events by their payload `type` so domain-specific updates such as agent chat, terminal, lane, PR, file-watch, process, test, project-state, usage, automation, conflict, GitHub, Linear, feedback, Computer Use, iOS Simulator, and App Control changes still reach their dedicated remote subscribers without expanding the wire-level category enum. ade-cli wires these source-tagged payloads into the runtime event buffer in `bootstrap.ts` so a remote-bound window sees the same event fanout as the local host. Headless runtimes start `usageTrackingService` during `createAdeRuntime()` after the ADE action registry is bound, so the usage poller and threshold events run only once the runtime can answer the matching usage/budget actions.
 
diff --git a/docs/features/sync-and-multi-device/README.md b/docs/features/sync-and-multi-device/README.md
index e347cc46c..905fc4720 100644
--- a/docs/features/sync-and-multi-device/README.md
+++ b/docs/features/sync-and-multi-device/README.md
@@ -142,6 +142,21 @@ package. The desktop tree only contains thin re-export proxies plus the
 legacy fallback; do not edit the desktop copies expecting the runtime to
 see your change.
 
+Runtime support files outside `services/sync/`:
+
+- `apps/ade-cli/src/eventBuffer.ts` — bounded runtime-event replay buffer
+  used by multi-project RPC and desktop/TUI event streams. Retains up to
+  10,000 events / 16 MB total / 1 MB per event by default, emits live
+  subscribers best-effort even for oversize events, and returns
+  `eventEpoch`, `gap`, and `oldestCursor` from `drain()` so clients can
+  reset stale cursors when a daemon restarts or history was evicted.
+- `apps/ade-cli/src/multiProjectRpcServer.ts` — machine-level JSON-RPC
+  surface for `projects.*`, `sync.*`, `runtimeEvents.*`, and project-scoped
+  `ade/actions/call`. Runtime-event subscribe replies include the gap
+  fields above; `projects.list` resolves host-side icons under a connect-path
+  budget (64 icons / 12 MB per call) so large project registries cannot stall
+  remote desktop or mobile catalog setup just to inline artwork.
+
 Canonical files (`apps/ade-cli/src/services/sync/`):
 
 - `syncService.ts` (~1,160 lines) — orchestrator that wires the runtime,
@@ -320,6 +335,12 @@ replay only for the explicit retry-safe allowlist (status/discovery/device/PIN r
 lane-presence announce, and model-picker reads); other sync mutations surface
 connection errors rather than being replayed after reconnect.
 
+Runtime-event IPC uses the same local/remote binding path. `RemoteRuntimeStreamEventsResult`
+includes `eventEpoch`, `gap`, and `oldestCursor`; preload resets its cursor and
+dedupe cache on epoch changes, and when a poll/subscription reports `gap: true`
+it triggers the normal project-binding refresh path so renderer projections
+recover from an evicted replay window instead of assuming the cursor was exact.
+
 `sync.connectToBrain` is a legacy API name. New docs should call this a
 runtime connection or sync authority connection.
 
diff --git a/docs/features/sync-and-multi-device/ios-companion.md b/docs/features/sync-and-multi-device/ios-companion.md
index 569fbea1f..1cefdcf00 100644
--- a/docs/features/sync-and-multi-device/ios-companion.md
+++ b/docs/features/sync-and-multi-device/ios-companion.md
@@ -132,7 +132,9 @@ apps/ios/
 │   │   │                            # FilesWorkspacePickerDropdown
 │   │   ├── Work/                    # WorkRootScreen, WorkChatSessionView,
 │   │   │                            # Work*Helpers, WorkNewChatScreen (chat/CLI
-│   │   │                            #   launcher), WorkLanePickerDropdown,
+│   │   │                            #   launcher + per-project interface
+│   │   │                            #   preference shared with Hub),
+│   │   │                            # WorkLanePickerDropdown,
 │   │   │                            # WorkChatAttachmentTray,
 │   │   │                            # WorkArtifactTerminalViews,
 │   │   │                            # TerminalSessionScreen + SwiftTermSessionView
@@ -650,6 +652,17 @@ runtime-catalog row representing the same filesystem path disappear
 together without hiding matching paths from other paired machines.
 Opening or selecting the project again clears those hidden keys.
 
+The Work and Hub new-session composers share the same Chat/CLI interface
+preference store (`WorkNewSessionModePreferences`,
+`ade.work.newSessionModeByProject.v1` in the App Group defaults). The value is
+keyed by project id and is written only when the user explicitly taps the
+Chat/CLI switcher, so opening a composer, switching projects, or falling back
+from a CLI-only selection to a chat-compatible model never clobbers the user's
+stored choice. `WorkNewChatScreen` captures the active project id when pushed;
+`HubComposerDrawer` reloads the preference whenever its Project destination
+changes so a hub-created session cannot accidentally launch with the previous
+project's interface mode.
+
 ### Shipped
 
 | Tab | Icon | Desktop equivalent | Capabilities |

From d0d87d08039350a90ff49a49919d8ed9b1a6e041 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 12:41:25 -0400
Subject: [PATCH 13/17] =?UTF-8?q?test:=20steward=20pass=20=E2=80=94=20prun?=
 =?UTF-8?q?e,=20consolidate=20ade-code=20suite?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/tuiClient/__tests__/Drawer.test.tsx   | 71 +++++++++++++-
 .../src/tuiClient/__tests__/appInput.test.ts  | 73 +++++++++++++++
 .../__tests__/closedCliSessions.test.ts       | 85 -----------------
 .../tuiClient/__tests__/connection.test.ts    | 34 +++++++
 .../src/tuiClient/__tests__/format.test.ts    |  8 ++
 .../tuiClient/__tests__/interfaceMode.test.ts | 92 -------------------
 .../__tests__/modelPickerController.test.ts   | 57 ------------
 .../tuiClient/__tests__/relativeTime.test.ts  |  9 --
 .../tuiClient/__tests__/remoteBridge.test.ts  | 35 -------
 .../ModelPicker/modelPickerLayout.test.ts     | 56 +++++++++++
 10 files changed, 241 insertions(+), 279 deletions(-)
 delete mode 100644 apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts
 delete mode 100644 apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts
 delete mode 100644 apps/ade-cli/src/tuiClient/__tests__/modelPickerController.test.ts
 delete mode 100644 apps/ade-cli/src/tuiClient/__tests__/relativeTime.test.ts
 delete mode 100644 apps/ade-cli/src/tuiClient/__tests__/remoteBridge.test.ts

diff --git a/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx
index c0c063507..9568d263d 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/Drawer.test.tsx
@@ -3,8 +3,15 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import { render } from "ink-testing-library";
 import type { AgentChatSessionSummary } from "../../../../desktop/src/shared/types/chat";
 import type { LaneSummary } from "../../../../desktop/src/shared/types/lanes";
+import type { ChatTerminalSession } from "../../../../desktop/src/shared/types/sessions";
 import { Drawer } from "../components/Drawer";
-import type { ClosedCliSessionSummary } from "../closedCliSessions";
+import {
+  closedCliRightPaneRow,
+  closedCliSessionStatusKind,
+  deriveClosedCliSessions,
+  deriveOpenDrawerSessions,
+  type ClosedCliSessionSummary,
+} from "../closedCliSessions";
 
 function stripAnsi(text: string): string {
   return text.replace(/\u001b\[[0-?]*[ -/]*[@-~]/g, "");
@@ -38,6 +45,31 @@ function lane(id: string, name: string, branchRef: string, createdAt: string, ah
   };
 }
 
+function terminal(overrides: Partial<ChatTerminalSession> = {}): ChatTerminalSession {
+  return {
+    terminalId: "terminal-1",
+    ptyId: null,
+    chatSessionId: null,
+    laneId: "lane-1",
+    laneName: "Lane 1",
+    title: "Codex CLI",
+    toolType: "codex",
+    goal: null,
+    status: "completed",
+    runtimeState: "exited",
+    active: false,
+    startedAt: "2026-01-01T00:00:00.000Z",
+    endedAt: "2026-01-01T00:01:00.000Z",
+    exitCode: 0,
+    pid: null,
+    resumeCommand: "codex resume terminal-1",
+    resumeMetadata: { provider: "codex", targetKind: "session", targetId: "terminal-1", launch: {} },
+    lastOutputPreview: null,
+    summary: null,
+    ...overrides,
+  };
+}
+
 afterEach(() => {
   vi.useRealTimers();
 });
@@ -84,6 +116,43 @@ describe("Drawer diff stats", () => {
   });
 });
 
+describe("Drawer closed CLI sessions", () => {
+  it.each([
+    ["failed status", { status: "failed", exitCode: 1, runtimeState: "killed" }, "failed"],
+    ["non-zero exit", { status: "completed", exitCode: 2, runtimeState: "exited" }, "failed"],
+    ["user close", { status: "disposed", exitCode: 130, runtimeState: "killed" }, "idle"],
+    ["clean close", { status: "completed", exitCode: 0, runtimeState: "exited" }, "idle"],
+  ] as const)("classifies %s for closed-session glyphs", (_label, overrides, expected) => {
+    const [session] = deriveClosedCliSessions([terminal({
+      terminalId: `t-${_label.replace(/\s+/g, "-")}`,
+      ...overrides,
+    })]);
+
+    expect(session).toBeTruthy();
+    expect(closedCliSessionStatusKind(session!)).toBe(expected);
+    expect(closedCliRightPaneRow(session!, null)).toContain(expected === "failed" ? "✗" : "○");
+  });
+
+  it("filters closed CLI sessions out of the open drawer list", () => {
+    const [closed] = deriveClosedCliSessions([terminal()]);
+    const open: AgentChatSessionSummary = {
+      sessionId: "chat-1",
+      laneId: "lane-1",
+      provider: "codex",
+      model: "gpt-5.5",
+      status: "idle",
+      startedAt: "2026-01-01T00:00:00.000Z",
+      endedAt: null,
+      lastActivityAt: "2026-01-01T00:01:00.000Z",
+      lastOutputPreview: null,
+      summary: null,
+    };
+
+    expect(closed).toBeTruthy();
+    expect(deriveOpenDrawerSessions([open, closed!], [closed!])).toEqual([open]);
+  });
+});
+
 describe("Drawer lane and chat navigation layout", () => {
   it("puts the primary lane first and removes old header/footer controls", () => {
     const frame = stripAnsi(render(
diff --git a/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts b/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
index 618479452..902399023 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
@@ -87,9 +87,12 @@ import {
 } from "../app";
 import { isTerminalSessionResumable } from "../closedCliSessions";
 import {
+  buildSetupRows,
+  cliProviderForModelStateProvider,
   codexApprovalSandboxLabel,
   cursorModeIdsForState,
   cursorSourceForInterfaceMode,
+  initialModelState,
   reconcileCursorModelStateForInterface,
   resolveCursorCliModelForLaunch,
 } from "../modelState";
@@ -135,6 +138,30 @@ function cursorModelState(overrides: Partial<AdeCodeModelState> = {}): AdeCodeMo
   };
 }
 
+function setupPaneModelState(overrides: Partial<AdeCodeModelState> = {}): AdeCodeModelState {
+  return {
+    provider: "codex",
+    interfaceMode: "chat",
+    model: "gpt-5.5",
+    modelId: null,
+    displayName: "GPT-5.5",
+    reasoningEffort: "medium",
+    fastMode: false,
+    permissionMode: "default",
+    interactionMode: "default",
+    claudePermissionMode: "default",
+    codexApprovalPolicy: "on-request",
+    codexSandbox: "workspace-write",
+    codexConfigSource: "flags",
+    opencodePermissionMode: "edit",
+    droidPermissionMode: "auto-low",
+    cursorModeId: "agent",
+    cursorAvailableModeIds: [],
+    cursorConfigValues: {},
+    ...overrides,
+  };
+}
+
 describe("session activity helpers", () => {
   it("keeps Ink output below the terminal height to avoid full-screen clears", () => {
     expect(stableInkViewportRows(40)).toBe(39);
@@ -1031,6 +1058,52 @@ describe("inlineRowCellOrder", () => {
   });
 });
 
+describe("interface draft setup", () => {
+  function interfaceRows(interfaceMode: AdeCodeModelState["interfaceMode"], interfaceEditable: boolean) {
+    return buildSetupRows({
+      modelState: setupPaneModelState({ interfaceMode }),
+      models: [],
+      includeRefresh: false,
+      includeApply: true,
+      interfaceMode,
+      interfaceEditable,
+    });
+  }
+
+  it("maps tracked CLI providers and rejects chat-only providers", () => {
+    for (const provider of ["claude", "codex", "cursor", "droid", "opencode"] as const) {
+      expect(cliProviderForModelStateProvider(provider)).toBe(provider);
+    }
+    expect(cliProviderForModelStateProvider("ollama")).toBeNull();
+    expect(cliProviderForModelStateProvider("lmstudio")).toBeNull();
+  });
+
+  it("keeps the Interface setup row after Provider and labels the active mode", () => {
+    const chatRows = interfaceRows("chat", true);
+    const cliRows = interfaceRows("cli", true);
+
+    expect(chatRows.map((row) => row.kind).slice(0, 2)).toEqual(["provider", "interface"]);
+    expect(chatRows.find((row) => row.kind === "interface")).toMatchObject({
+      value: "Chat",
+      disabled: false,
+      cyclable: true,
+      detail: "Chat · CLI",
+    });
+    expect(cliRows.find((row) => row.kind === "interface")?.value).toBe("CLI");
+  });
+
+  it("locks Interface after launch and remembers the draft default", () => {
+    expect(interfaceRows("cli", false).find((row) => row.kind === "interface")).toMatchObject({
+      value: "CLI",
+      disabled: true,
+      cyclable: false,
+      detail: "tracked CLI session",
+    });
+    expect(initialModelState("cli").interfaceMode).toBe("cli");
+    expect(initialModelState("chat").interfaceMode).toBe("chat");
+  });
+});
+
 describe("provider permission helpers", () => {
   it("summarizes Codex approval and sandbox as a footer detail", () => {
     expect(codexApprovalSandboxLabel({
diff --git a/apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts b/apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts
deleted file mode 100644
index c4e07bb17..000000000
--- a/apps/ade-cli/src/tuiClient/__tests__/closedCliSessions.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { describe, expect, it } from "vitest";
-import type { ChatTerminalSession } from "../../../../desktop/src/shared/types/sessions";
-import {
-  closedCliRightPaneRow,
-  closedCliSessionStatusKind,
-  deriveClosedCliSessions,
-  deriveOpenDrawerSessions,
-} from "../closedCliSessions";
-
-function terminal(overrides: Partial<ChatTerminalSession> = {}): ChatTerminalSession {
-  return {
-    terminalId: "terminal-1",
-    ptyId: null,
-    chatSessionId: null,
-    laneId: "lane-1",
-    laneName: "Lane 1",
-    title: "Codex CLI",
-    toolType: "codex",
-    goal: null,
-    status: "completed",
-    runtimeState: "exited",
-    active: false,
-    startedAt: "2026-01-01T00:00:00.000Z",
-    endedAt: "2026-01-01T00:01:00.000Z",
-    exitCode: 0,
-    pid: null,
-    resumeCommand: "codex resume terminal-1",
-    resumeMetadata: { provider: "codex", targetKind: "session", targetId: "terminal-1", launch: {} },
-    lastOutputPreview: null,
-    summary: null,
-    ...overrides,
-  };
-}
-
-describe("closedCliSessions", () => {
-  it("preserves failed terminal signals for closed-session status glyphs", () => {
-    const [session] = deriveClosedCliSessions([
-      terminal({ status: "failed", exitCode: 1, runtimeState: "killed" }),
-    ]);
-
-    expect(session).toBeDefined();
-    expect(closedCliSessionStatusKind(session!)).toBe("failed");
-    expect(closedCliRightPaneRow(session!, null)).toContain("✗");
-  });
-
-  it("treats user-initiated closes as idle, not failed", () => {
-    const sessions = deriveClosedCliSessions([
-      terminal({ terminalId: "t-sigint", status: "disposed", exitCode: 130, runtimeState: "killed" }),
-      terminal({ terminalId: "t-sigterm", status: "disposed", exitCode: 143, runtimeState: "killed" }),
-      terminal({ terminalId: "t-clean", status: "completed", exitCode: 0, runtimeState: "exited" }),
-      terminal({ terminalId: "t-ui-close", status: "disposed", exitCode: null, runtimeState: "killed" }),
-    ]);
-
-    for (const session of sessions) {
-      expect(closedCliSessionStatusKind(session)).toBe("idle");
-    }
-  });
-
-  it("flags genuine non-zero exits as failed", () => {
-    const [session] = deriveClosedCliSessions([
-      terminal({ terminalId: "t-crash", status: "completed", exitCode: 2, runtimeState: "exited" }),
-    ]);
-
-    expect(session).toBeDefined();
-    expect(closedCliSessionStatusKind(session!)).toBe("failed");
-  });
-
-  it("filters closed CLI sessions out of the open drawer list", () => {
-    const [closed] = deriveClosedCliSessions([terminal()]);
-    const open = {
-      sessionId: "chat-1",
-      laneId: "lane-1",
-      provider: "codex" as const,
-      model: "gpt-5.5",
-      status: "idle" as const,
-      startedAt: "2026-01-01T00:00:00.000Z",
-      endedAt: null,
-      lastActivityAt: "2026-01-01T00:01:00.000Z",
-      lastOutputPreview: null,
-      summary: null,
-    };
-
-    expect(deriveOpenDrawerSessions([open, closed!], [closed!])).toEqual([open]);
-  });
-});
diff --git a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
index 1932c20d3..383876fe6 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
@@ -1,12 +1,15 @@
+import { EventEmitter } from "node:events";
 import fs from "node:fs";
 import { createHash } from "node:crypto";
 import net from "node:net";
 import os from "node:os";
 import path from "node:path";
+import { PassThrough } from "node:stream";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { connectToAde } from "../connection";
 import { JsonRpcClient } from "../jsonRpcClient";
 import { startTuiHeartbeat, type TuiHeartbeat } from "../heartbeat";
+import { ProcessJsonRpcClient } from "../remoteBridge";
 import {
   appendDedupedTuiEvent,
   appendReservedTuiEvent,
@@ -92,6 +95,13 @@ const originalAdeHome = process.env.ADE_HOME;
 const originalAdeRpcSocketPath = process.env.ADE_RPC_SOCKET_PATH;
 const originalAdeDefaultRole = process.env.ADE_DEFAULT_ROLE;
 
+class FakeRemoteRpcChild extends EventEmitter {
+  readonly stdout = new PassThrough();
+  readonly stderr = new PassThrough();
+  readonly stdin = new PassThrough();
+  readonly kill = vi.fn();
+}
+
 function restoreEnv(): void {
   process.argv[1] = originalArgv1;
   if (originalAdeHome === undefined) delete process.env.ADE_HOME;
@@ -1011,6 +1021,30 @@ describe("JsonRpcClient", () => {
   });
 });
 
+describe("ProcessJsonRpcClient", () => {
+  it("clears pending RPC timers when remote responses resolve or reject", async () => {
+    const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
+    const child = new FakeRemoteRpcChild();
+    const client = new ProcessJsonRpcClient(child as never);
+
+    const resolved = client.request("ade/ping");
+    child.stdout.write(`${JSON.stringify({ jsonrpc: "2.0", id: 1, result: { ok: true } })}\n`);
+    await expect(resolved).resolves.toEqual({ ok: true });
+
+    const rejected = client.request("ade/fail");
+    child.stdout.write(`${JSON.stringify({
+      jsonrpc: "2.0",
+      id: 2,
+      error: { code: -32000, message: "remote failed" },
+    })}\n`);
+    await expect(rejected).rejects.toThrow("remote failed");
+
+    expect(clearTimeoutSpy).toHaveBeenCalledTimes(2);
+    client.close();
+    clearTimeoutSpy.mockRestore();
+  });
+});
+
 async function loadStateModule(home: string): Promise<typeof import("../state")> {
   vi.resetModules();
   vi.spyOn(os, "homedir").mockReturnValue(home);
diff --git a/apps/ade-cli/src/tuiClient/__tests__/format.test.ts b/apps/ade-cli/src/tuiClient/__tests__/format.test.ts
index 2af7ebcdc..a1be9e09f 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/format.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/format.test.ts
@@ -9,6 +9,7 @@ import {
   renderChatLines,
   renderObject,
 } from "../format";
+import { formatRelativePastTime } from "../relativeTime";
 
 describe("diffLineKind", () => {
   it("classifies hunk, meta, add, del, and context lines", () => {
@@ -26,6 +27,13 @@ describe("diffLineKind", () => {
   });
 });
 
+describe("formatRelativePastTime", () => {
+  it("uses a neutral fallback for missing or invalid timestamps", () => {
+    expect(formatRelativePastTime(null)).toBe("recently");
+    expect(formatRelativePastTime("not-a-date")).toBe("recently");
+  });
+});
+
 describe("renderChatLines", () => {
   it("LRU-caches assistant markdown parses by message text", () => {
     __clearAssistantMarkdownCacheForTests();
diff --git a/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts b/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts
deleted file mode 100644
index be3175e95..000000000
--- a/apps/ade-cli/src/tuiClient/__tests__/interfaceMode.test.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { buildSetupRows, cliProviderForModelStateProvider, initialModelState } from "../modelState";
-import type { AdeCodeInterfaceMode, AdeCodeModelState } from "../types";
-
-function baseModelState(overrides: Partial<AdeCodeModelState> = {}): AdeCodeModelState {
-  return {
-    provider: "codex",
-    interfaceMode: "chat",
-    model: "gpt-5.5",
-    modelId: null,
-    displayName: "GPT-5.5",
-    reasoningEffort: "medium",
-    fastMode: false,
-    permissionMode: "default",
-    interactionMode: "default",
-    claudePermissionMode: "default",
-    codexApprovalPolicy: "on-request",
-    codexSandbox: "workspace-write",
-    codexConfigSource: "flags",
-    opencodePermissionMode: "edit",
-    droidPermissionMode: "auto-low",
-    cursorModeId: "agent",
-    cursorAvailableModeIds: [],
-    cursorConfigValues: {},
-    ...overrides,
-  };
-}
-
-function setupRows(interfaceMode: AdeCodeInterfaceMode, interfaceEditable: boolean) {
-  return buildSetupRows({
-    modelState: baseModelState({ interfaceMode }),
-    models: [],
-    includeRefresh: false,
-    includeApply: true,
-    interfaceMode,
-    interfaceEditable,
-  });
-}
-
-// Mirror of the toggle the setup-row handler applies (Chat ↔ CLI).
-function toggleInterface(mode: AdeCodeInterfaceMode): AdeCodeInterfaceMode {
-  return mode === "cli" ? "chat" : "cli";
-}
-
-describe("cliProviderForModelStateProvider", () => {
-  it("maps each of the five CLI providers to itself", () => {
-    for (const provider of ["claude", "codex", "cursor", "droid", "opencode"] as const) {
-      expect(cliProviderForModelStateProvider(provider)).toBe(provider);
-    }
-  });
-
-  it("returns null for providers with no tracked CLI (Ollama / LM Studio)", () => {
-    expect(cliProviderForModelStateProvider("ollama")).toBeNull();
-    expect(cliProviderForModelStateProvider("lmstudio")).toBeNull();
-  });
-});
-
-describe("buildSetupRows interface row", () => {
-  it("inserts the Interface row immediately after Provider", () => {
-    const rows = setupRows("chat", true);
-    const kinds = rows.map((row) => row.kind);
-    expect(kinds[0]).toBe("provider");
-    expect(kinds[1]).toBe("interface");
-  });
-
-  it("defaults to Chat and reflects the current interface value", () => {
-    expect(setupRows("chat", true).find((row) => row.kind === "interface")?.value).toBe("Chat");
-    expect(setupRows("cli", true).find((row) => row.kind === "interface")?.value).toBe("CLI");
-  });
-
-  it("is editable/cyclable for a draft and read-only once a session exists", () => {
-    const draftRow = setupRows("chat", true).find((row) => row.kind === "interface")!;
-    expect(draftRow.disabled).toBeFalsy();
-    expect(draftRow.cyclable).toBe(true);
-    expect(draftRow.detail).toBe("Chat · CLI");
-
-    const committedRow = setupRows("cli", false).find((row) => row.kind === "interface")!;
-    expect(committedRow.disabled).toBe(true);
-    expect(committedRow.cyclable).toBe(false);
-    expect(committedRow.detail).toBe("tracked CLI session");
-  });
-
-  it("toggles Chat ↔ CLI (two-value state machine)", () => {
-    expect(toggleInterface("chat")).toBe("cli");
-    expect(toggleInterface("cli")).toBe("chat");
-  });
-
-  it("defaults new drafts from the remembered interface mode", () => {
-    expect(initialModelState("cli").interfaceMode).toBe("cli");
-    expect(initialModelState("chat").interfaceMode).toBe("chat");
-  });
-});
diff --git a/apps/ade-cli/src/tuiClient/__tests__/modelPickerController.test.ts b/apps/ade-cli/src/tuiClient/__tests__/modelPickerController.test.ts
deleted file mode 100644
index bf7663e4f..000000000
--- a/apps/ade-cli/src/tuiClient/__tests__/modelPickerController.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { buildModelPickerLayoutInput, modelPickerRefreshProvider } from "../modelPickerController";
-import type { AdeCodeModelState, ModelPickerRightPaneContent } from "../types";
-
-const modelState: Pick<AdeCodeModelState, "modelId" | "reasoningEffort" | "interfaceMode"> = {
-  modelId: "openai/gpt-5.5",
-  reasoningEffort: "medium",
-  interfaceMode: "chat",
-};
-
-describe("modelPickerController", () => {
-  it("only refreshes dynamic model catalog providers", () => {
-    expect(modelPickerRefreshProvider("opencode")).toBe("opencode");
-    expect(modelPickerRefreshProvider("cursor")).toBe("cursor");
-    expect(modelPickerRefreshProvider("droid")).toBe("droid");
-    expect(modelPickerRefreshProvider("lmstudio")).toBe("lmstudio");
-    expect(modelPickerRefreshProvider("ollama")).toBe("ollama");
-    expect(modelPickerRefreshProvider("codex")).toBeNull();
-    expect(modelPickerRefreshProvider("claude")).toBeNull();
-  });
-
-  it("builds the shared layout input from picker and model state", () => {
-    const picker: ModelPickerRightPaneContent = {
-      kind: "model-picker",
-      surface: "chat",
-      query: "sonnet",
-      searchMode: true,
-      selection: { kind: "provider", provider: "claude" },
-      providerTabKey: "anthropic",
-      focusedIndex: 2,
-      footerFocus: "reasoning",
-      settingsRows: [{ kind: "reasoning", label: "Reasoning", value: "high" }],
-      laneLabel: "purpose-lane",
-    };
-
-    expect(buildModelPickerLayoutInput({
-      picker,
-      models: [],
-      catalog: null,
-      favorites: ["openai/gpt-5.5"],
-      recents: ["anthropic/claude-sonnet-4-6"],
-      modelState,
-      aiStatus: null,
-    })).toMatchObject({
-      query: "sonnet",
-      searchMode: true,
-      selection: { kind: "provider", provider: "claude" },
-      providerTabKey: "anthropic",
-      focusedIndex: 2,
-      footerFocus: "reasoning",
-      activeModelId: "openai/gpt-5.5",
-      activeReasoningEffort: "medium",
-      interfaceMode: "chat",
-      laneLabel: "purpose-lane",
-    });
-  });
-});
diff --git a/apps/ade-cli/src/tuiClient/__tests__/relativeTime.test.ts b/apps/ade-cli/src/tuiClient/__tests__/relativeTime.test.ts
deleted file mode 100644
index 52e918a5e..000000000
--- a/apps/ade-cli/src/tuiClient/__tests__/relativeTime.test.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { describe, expect, it } from "vitest";
-import { formatRelativePastTime } from "../relativeTime";
-
-describe("formatRelativePastTime", () => {
-  it("uses a neutral fallback for missing or invalid timestamps", () => {
-    expect(formatRelativePastTime(null)).toBe("recently");
-    expect(formatRelativePastTime("not-a-date")).toBe("recently");
-  });
-});
diff --git a/apps/ade-cli/src/tuiClient/__tests__/remoteBridge.test.ts b/apps/ade-cli/src/tuiClient/__tests__/remoteBridge.test.ts
deleted file mode 100644
index c9d21c074..000000000
--- a/apps/ade-cli/src/tuiClient/__tests__/remoteBridge.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { EventEmitter } from "node:events";
-import { PassThrough } from "node:stream";
-import { describe, expect, it, vi } from "vitest";
-import { ProcessJsonRpcClient } from "../remoteBridge";
-
-class FakeRemoteRpcChild extends EventEmitter {
-  readonly stdout = new PassThrough();
-  readonly stderr = new PassThrough();
-  readonly stdin = new PassThrough();
-  readonly kill = vi.fn();
-}
-
-describe("remoteBridge", () => {
-  it("clears pending RPC timers when remote responses resolve or reject", async () => {
-    const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
-    const child = new FakeRemoteRpcChild();
-    const client = new ProcessJsonRpcClient(child as never);
-
-    const resolved = client.request("ade/ping");
-    child.stdout.write(`${JSON.stringify({ jsonrpc: "2.0", id: 1, result: { ok: true } })}\n`);
-    await expect(resolved).resolves.toEqual({ ok: true });
-
-    const rejected = client.request("ade/fail");
-    child.stdout.write(`${JSON.stringify({
-      jsonrpc: "2.0",
-      id: 2,
-      error: { code: -32000, message: "remote failed" },
-    })}\n`);
-    await expect(rejected).rejects.toThrow("remote failed");
-
-    expect(clearTimeoutSpy).toHaveBeenCalledTimes(2);
-    client.close();
-    clearTimeoutSpy.mockRestore();
-  });
-});
diff --git a/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.test.ts b/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.test.ts
index 16a9995f6..f4752bb4f 100644
--- a/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.test.ts
+++ b/apps/ade-cli/src/tuiClient/components/ModelPicker/modelPickerLayout.test.ts
@@ -1,5 +1,7 @@
 import { describe, expect, it } from "vitest";
 import type { AgentChatModelCatalog, AgentChatModelInfo } from "../../../../../desktop/src/shared/types/chat";
+import { buildModelPickerLayoutInput, modelPickerRefreshProvider } from "../../modelPickerController";
+import type { AdeCodeModelState, ModelPickerRightPaneContent } from "../../types";
 import { buildModelPickerLayout, defaultSelectionFor } from "./modelPickerLayout";
 
 function modelInfo(overrides: Partial<AgentChatModelInfo> & { id: string }): AgentChatModelInfo {
@@ -10,6 +12,12 @@ function modelInfo(overrides: Partial<AgentChatModelInfo> & { id: string }): Age
   };
 }
 
+const modelState: Pick<AdeCodeModelState, "modelId" | "reasoningEffort" | "interfaceMode"> = {
+  modelId: "openai/gpt-5.5",
+  reasoningEffort: "medium",
+  interfaceMode: "chat",
+};
+
 describe("buildModelPickerLayout", () => {
   const models: AgentChatModelInfo[] = [
     modelInfo({ id: "anthropic/claude-opus-4-8", displayName: "Claude Opus 4.8 1M" }),
@@ -278,6 +286,54 @@ describe("buildModelPickerLayout", () => {
   });
 });
 
+describe("modelPickerController", () => {
+  it("only refreshes dynamic model catalog providers", () => {
+    expect(modelPickerRefreshProvider("opencode")).toBe("opencode");
+    expect(modelPickerRefreshProvider("cursor")).toBe("cursor");
+    expect(modelPickerRefreshProvider("droid")).toBe("droid");
+    expect(modelPickerRefreshProvider("lmstudio")).toBe("lmstudio");
+    expect(modelPickerRefreshProvider("ollama")).toBe("ollama");
+    expect(modelPickerRefreshProvider("codex")).toBeNull();
+    expect(modelPickerRefreshProvider("claude")).toBeNull();
+  });
+
+  it("builds the shared layout input from picker and model state", () => {
+    const picker: ModelPickerRightPaneContent = {
+      kind: "model-picker",
+      surface: "chat",
+      query: "sonnet",
+      searchMode: true,
+      selection: { kind: "provider", provider: "claude" },
+      providerTabKey: "anthropic",
+      focusedIndex: 2,
+      footerFocus: "reasoning",
+      settingsRows: [{ kind: "reasoning", label: "Reasoning", value: "high" }],
+      laneLabel: "purpose-lane",
+    };
+
+    expect(buildModelPickerLayoutInput({
+      picker,
+      models: [],
+      catalog: null,
+      favorites: ["openai/gpt-5.5"],
+      recents: ["anthropic/claude-sonnet-4-6"],
+      modelState,
+      aiStatus: null,
+    })).toMatchObject({
+      query: "sonnet",
+      searchMode: true,
+      selection: { kind: "provider", provider: "claude" },
+      providerTabKey: "anthropic",
+      focusedIndex: 2,
+      footerFocus: "reasoning",
+      activeModelId: "openai/gpt-5.5",
+      activeReasoningEffort: "medium",
+      interfaceMode: "chat",
+      laneLabel: "purpose-lane",
+    });
+  });
+});
+
 describe("defaultSelectionFor", () => {
   it("prefers recents when present", () => {
     const layout = buildModelPickerLayout({

From 0d80f5d981649cbb710519bd3f292df51fc91f79 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 13:19:59 -0400
Subject: [PATCH 14/17] =?UTF-8?q?ship:=20iteration=201=20=E2=80=94=20addre?=
 =?UTF-8?q?ss=2010=20review=20comments=20(greptile=20P1,=20codex=20P1,=20c?=
 =?UTF-8?q?oderabbit=20x8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- remoteBridge + cli.ts transports: normalize JSON-RPC response ids (class sweep)
- connection.ts: unlink stale socket before daemon spawn retry; owner-aware spawn-lock cleanup
- eventBuffer: oversized skipped events mark replay gaps
- syncHostService: queued-message watchdog timeout + warning metadata
- TerminalPane: full-column wide-glyph scan
- displayWidth: splitByDisplayCells single-pass grapheme partition (+ new test file)
- modelState: ollama/lmstudio use OpenCode permission behavior (not Cursor)
- state.ts: final state write flushed + awaited on signal exit
- preload: gap polling no longer fires same-binding project refresh

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 apps/ade-cli/src/bootstrap.test.ts            |  13 ++
 apps/ade-cli/src/cli.ts                       |  16 ++-
 apps/ade-cli/src/eventBuffer.ts               |  17 ++-
 .../src/services/sync/syncHostService.test.ts |  63 +++++++++
 .../src/services/sync/syncHostService.ts      |  23 ++-
 .../tuiClient/__tests__/TerminalPane.test.tsx |  21 +++
 .../src/tuiClient/__tests__/appInput.test.ts  |  27 ++++
 .../tuiClient/__tests__/connection.test.ts    |  28 +++-
 .../tuiClient/__tests__/displayWidth.test.ts  |  12 ++
 .../src/tuiClient/__tests__/state.test.ts     |  26 +++-
 apps/ade-cli/src/tuiClient/app.tsx            |  61 ++++----
 .../src/tuiClient/components/TerminalPane.tsx |   3 +-
 apps/ade-cli/src/tuiClient/connection.ts      | 132 ++++++++++++++++--
 apps/ade-cli/src/tuiClient/displayWidth.ts    |  16 ++-
 apps/ade-cli/src/tuiClient/modelState.ts      |   6 +-
 apps/ade-cli/src/tuiClient/remoteBridge.ts    |  16 ++-
 apps/ade-cli/src/tuiClient/state.ts           |   4 +
 apps/desktop/src/preload/preload.test.ts      |   5 +-
 apps/desktop/src/preload/preload.ts           |   1 -
 19 files changed, 411 insertions(+), 79 deletions(-)
 create mode 100644 apps/ade-cli/src/tuiClient/__tests__/displayWidth.test.ts

diff --git a/apps/ade-cli/src/bootstrap.test.ts b/apps/ade-cli/src/bootstrap.test.ts
index 0601ed6c4..012f0fe88 100644
--- a/apps/ade-cli/src/bootstrap.test.ts
+++ b/apps/ade-cli/src/bootstrap.test.ts
@@ -89,6 +89,19 @@ describe("createEventBuffer", () => {
     expect(result.nextCursor).toBe(1);
   });
 
+  it("reports a replay gap when an oversized event is skipped between retained events", () => {
+    const buffer = createEventBuffer(10, { maxBytes: 4096, maxEventBytes: 180 });
+
+    buffer.push({ timestamp: "2026-03-01T00:00:00Z", category: "runtime", payload: { data: "small-1" } });
+    buffer.push({ timestamp: "2026-03-01T00:00:01Z", category: "runtime", payload: { data: "x".repeat(500) } });
+    buffer.push({ timestamp: "2026-03-01T00:00:02Z", category: "runtime", payload: { data: "small-2" } });
+
+    const result = buffer.drain(1);
+    expect(result.events.map((event) => event.id)).toEqual([3]);
+    expect(result.gap).toBe(true);
+    expect(result.oldestCursor).toBe(3);
+  });
+
   it("drains events after cursor", () => {
     const buffer = createEventBuffer();
 
diff --git a/apps/ade-cli/src/cli.ts b/apps/ade-cli/src/cli.ts
index a2cfa0483..ecf0867ff 100644
--- a/apps/ade-cli/src/cli.ts
+++ b/apps/ade-cli/src/cli.ts
@@ -11368,7 +11368,7 @@ class SocketJsonRpcClient {
   private nextId = 1;
   private closedError: Error | null = null;
   private pending = new Map<
-    number,
+    string,
     {
       resolve: (value: unknown) => void;
       reject: (error: Error) => void;
@@ -11418,15 +11418,16 @@ class SocketJsonRpcClient {
     };
     const body = `${JSON.stringify(payload)}\n`;
     return new Promise((resolve, reject) => {
+      const pendingKey = String(id);
       const timer = setTimeout(() => {
-        this.pending.delete(id);
+        this.pending.delete(pendingKey);
         reject(new Error(`Timed out waiting for ${method}.`));
       }, this.timeoutMs);
-      this.pending.set(id, { resolve, reject, timer });
+      this.pending.set(pendingKey, { resolve, reject, timer });
       this.socket.write(body, "utf8", (error) => {
         if (!error) return;
         clearTimeout(timer);
-        this.pending.delete(id);
+        this.pending.delete(pendingKey);
         reject(error);
       });
     });
@@ -11509,7 +11510,7 @@ class SocketJsonRpcClient {
       return;
     }
     if (!isRecord(parsed)) return;
-    const id = typeof parsed.id === "number" ? parsed.id : null;
+    const id = typeof parsed.id === "number" || typeof parsed.id === "string" ? parsed.id : null;
     if (id == null) {
       const method = asString(parsed.method);
       if (!method) return;
@@ -11521,9 +11522,10 @@ class SocketJsonRpcClient {
       }
       return;
     }
-    const pending = this.pending.get(id);
+    const pendingKey = String(id);
+    const pending = this.pending.get(pendingKey);
     if (!pending) return;
-    this.pending.delete(id);
+    this.pending.delete(pendingKey);
     clearTimeout(pending.timer);
     if (isRecord(parsed.error)) {
       pending.reject(
diff --git a/apps/ade-cli/src/eventBuffer.ts b/apps/ade-cli/src/eventBuffer.ts
index a27f0767b..4015657d2 100644
--- a/apps/ade-cli/src/eventBuffer.ts
+++ b/apps/ade-cli/src/eventBuffer.ts
@@ -49,6 +49,7 @@ export function createEventBuffer(
   const maxEventBytes = Math.max(0, Math.floor(options.maxEventBytes ?? DEFAULT_EVENT_BUFFER_MAX_EVENT_BYTES));
   let nextId = 1;
   let retainedBytes = 0;
+  let lastSkippedCursor: number | null = null;
 
   const evictOldest = (): void => {
     const evicted = events.shift();
@@ -57,15 +58,20 @@ export function createEventBuffer(
 
   const drainMetadata = (cursor: number): Pick<EventBufferDrainResult, "gap" | "oldestCursor"> => {
     const oldest = events[0]?.event.id ?? null;
+    const skippedGap = lastSkippedCursor != null && cursor < lastSkippedCursor;
     if (oldest == null) {
+      const gap = cursor < nextId - 1 || skippedGap;
       return {
-        gap: cursor < nextId - 1,
-        oldestCursor: cursor < nextId - 1 ? nextId : null,
+        gap,
+        oldestCursor: gap ? nextId : null,
       };
     }
+    const retainedGap = cursor < oldest - 1;
     return {
-      gap: cursor < oldest - 1,
-      oldestCursor: oldest,
+      gap: retainedGap || skippedGap,
+      oldestCursor: skippedGap
+        ? Math.max(oldest, (lastSkippedCursor ?? 0) + 1)
+        : oldest,
     };
   };
 
@@ -73,6 +79,9 @@ export function createEventBuffer(
     push(event) {
       const entry: BufferedEvent = { id: nextId++, ...event };
       const bytes = Buffer.byteLength(JSON.stringify(entry), "utf8");
+      if (bytes > maxEventBytes) {
+        lastSkippedCursor = entry.id;
+      }
       if (capacity > 0 && maxBytes > 0 && bytes <= maxEventBytes) {
         events.push({ event: entry, bytes });
         retainedBytes += bytes;
diff --git a/apps/ade-cli/src/services/sync/syncHostService.test.ts b/apps/ade-cli/src/services/sync/syncHostService.test.ts
index f737374f9..f772d3375 100644
--- a/apps/ade-cli/src/services/sync/syncHostService.test.ts
+++ b/apps/ade-cli/src/services/sync/syncHostService.test.ts
@@ -1916,6 +1916,69 @@ describe("sync host reliability guards", () => {
     }
   });
 
+  it("times out a hung queued message and continues with later messages", async () => {
+    const { projectRoot, cleanup } = createTempProjectRoot();
+    const logger = createDiscoveryLogger();
+    const sendMessage = vi.fn((): Promise<void> => new Promise<void>(() => {}));
+    const host = createReliabilityHost(projectRoot, {
+      logger,
+      messageTimeoutMs: 100,
+      agentChatService: {
+        sendMessage,
+        subscribeToEvents: vi.fn(() => vi.fn()),
+      } as unknown as Parameters<typeof createSyncHostService>[0]["agentChatService"],
+    });
+    let peer: Awaited<ReturnType<typeof connectPeer>> | null = null;
+    try {
+      const port = await host.waitUntilListening();
+      peer = await connectPeer(port, host.getBootstrapToken(), "desktop-timeout");
+
+      peer.ws.send(encodeSyncEnvelope({
+        type: "command",
+        requestId: "hung-command",
+        projectId: "project-1",
+        payload: {
+          commandId: "hung-command",
+          action: "chat.send",
+          projectId: "project-1",
+          args: {
+            sessionId: "session-1",
+            text: "hello",
+          },
+        },
+      }));
+      await waitForEnvelope(peer.envelopes, "command_ack", "hung-command");
+
+      peer.ws.send(encodeSyncEnvelope({
+        type: "project_catalog_request",
+        requestId: "catalog-after-timeout",
+        payload: {},
+      }));
+
+      const catalog = await waitForEnvelope(peer.envelopes, "project_catalog", "catalog-after-timeout");
+      expect((catalog.payload as SyncProjectCatalogPayload).projects.map((project) => project.id)).toEqual(["project-1"]);
+      await waitForValue(
+        () => logger.warn.mock.calls.find(([event]) => event === "sync_host.message_failed") ?? null,
+        "message timeout warning",
+      );
+      expect(logger.warn).toHaveBeenCalledWith("sync_host.message_failed", expect.objectContaining({
+        error: expect.stringContaining("Timed out handling sync message command"),
+        messageType: "command",
+        peerDeviceId: "desktop-timeout",
+        requestId: "hung-command",
+      }));
+      expect(sendMessage).toHaveBeenCalledTimes(1);
+    } finally {
+      try {
+        peer?.ws.close();
+      } catch {
+        // ignore
+      }
+      await host.dispose();
+      cleanup();
+    }
+  });
+
   it("rejects oversized artifact reads with a clear file response", async () => {
     const { projectRoot, cleanup } = createTempProjectRoot();
     const artifactPath = path.join(projectRoot, ".ade", "artifacts", "large.bin");
diff --git a/apps/ade-cli/src/services/sync/syncHostService.ts b/apps/ade-cli/src/services/sync/syncHostService.ts
index 09282f253..ebae9434d 100644
--- a/apps/ade-cli/src/services/sync/syncHostService.ts
+++ b/apps/ade-cli/src/services/sync/syncHostService.ts
@@ -181,6 +181,7 @@ const MAX_TERMINAL_HISTORY_PAGE_BYTES = 524_288;
 const PEER_BACKPRESSURE_BYTES = 4 * 1024 * 1024;
 const REQUIRED_SEND_MAX_BUFFERED_BYTES = 16 * 1024 * 1024;
 const SEND_AND_WAIT_TIMEOUT_MS = 15_000;
+const DEFAULT_SYNC_MESSAGE_TIMEOUT_MS = 60_000;
 const MAX_SYNC_ARTIFACT_BYTES = 8 * 1024 * 1024;
 export const SYNC_HOST_CHAT_ACTIVE_BACKGROUND_BACKPRESSURE_BYTES = 512 * 1024;
 export const SYNC_HOST_CHAT_ACTIVE_CHANGESET_BATCH_BYTES = 64 * 1024;
@@ -626,6 +627,7 @@ type SyncHostServiceArgs = {
   heartbeatIntervalMs?: number;
   pollIntervalMs?: number;
   authTimeoutMs?: number;
+  messageTimeoutMs?: number;
   brainStatusIntervalMs?: number;
   compressionThresholdBytes?: number;
   deviceRegistryService?: DeviceRegistryService;
@@ -1242,6 +1244,7 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
   const pollIntervalMs = Math.max(100, Math.floor(args.pollIntervalMs ?? DEFAULT_SYNC_POLL_INTERVAL_MS));
   const brainStatusIntervalMs = Math.max(1_000, Math.floor(args.brainStatusIntervalMs ?? DEFAULT_BRAIN_STATUS_INTERVAL_MS));
   const authTimeoutMs = Math.max(1_000, Math.floor(args.authTimeoutMs ?? SYNC_HOST_AUTH_TIMEOUT_MS));
+  const messageTimeoutMs = Math.max(100, Math.floor(args.messageTimeoutMs ?? DEFAULT_SYNC_MESSAGE_TIMEOUT_MS));
   const compressionThresholdBytes = Math.max(256, Math.floor(args.compressionThresholdBytes ?? DEFAULT_SYNC_COMPRESSION_THRESHOLD_BYTES));
   const maxChangesetBatchBytes = DEFAULT_MAX_CHANGESET_BATCH_BYTES;
   const maxChangesetBatchRows = DEFAULT_MAX_CHANGESET_BATCH_ROWS;
@@ -1899,11 +1902,16 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
       if (handleImmediateControlEnvelope(peer, envelope)) return;
       peer.messageQueue = peer.messageQueue
         .catch(() => {})
-        .then(() => handleMessage(peer, envelope))
+        .then(() => handleMessageWithTimeout(peer, envelope))
         .catch((error) => {
           args.logger.warn("sync_host.message_failed", {
             error: error instanceof Error ? error.message : String(error),
             peerDeviceId: peer.metadata?.deviceId ?? null,
+            peerDeviceName: peer.metadata?.deviceName ?? null,
+            remoteAddress: peer.remoteAddress ?? null,
+            remotePort: peer.remotePort ?? null,
+            messageType: envelope.type,
+            requestId: envelope.requestId ?? null,
           });
         });
     });
@@ -4038,6 +4046,19 @@ export function createSyncHostService(args: SyncHostServiceArgs) {
     return true;
   }
 
+  function handleMessageWithTimeout(peer: PeerState, envelope: ParsedSyncEnvelope): Promise<void> {
+    let timer: ReturnType<typeof setTimeout> | null = null;
+    const timeout = new Promise<never>((_resolve, reject) => {
+      timer = setTimeout(() => {
+        reject(new Error(`Timed out handling sync message ${envelope.type} after ${messageTimeoutMs}ms.`));
+      }, messageTimeoutMs);
+      timer.unref?.();
+    });
+    return Promise.race([handleMessage(peer, envelope), timeout]).finally(() => {
+      if (timer) clearTimeout(timer);
+    });
+  }
+
   async function handleMessage(peer: PeerState, envelope: ParsedSyncEnvelope): Promise<void> {
     const heartbeatAwaitedAt = markPeerMessageSeen(peer);
 
diff --git a/apps/ade-cli/src/tuiClient/__tests__/TerminalPane.test.tsx b/apps/ade-cli/src/tuiClient/__tests__/TerminalPane.test.tsx
index 78ff31df3..e4b107891 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/TerminalPane.test.tsx
+++ b/apps/ade-cli/src/tuiClient/__tests__/TerminalPane.test.tsx
@@ -8,6 +8,10 @@ function stripAnsi(value: string): string {
   return value.replace(/\u001b\[[0-?]*[ -/]*[@-~]/g, "");
 }
 
+function countMatches(value: string, pattern: RegExp): number {
+  return value.match(pattern)?.length ?? 0;
+}
+
 /** Poll until `check()` is truthy (xterm write callbacks are async). */
 async function waitFor(check: () => boolean, timeoutMs = 1_000): Promise<void> {
   const deadline = Date.now() + timeoutMs;
@@ -179,6 +183,23 @@ describe("TerminalPane", () => {
     expect(stripAnsi(result.lastFrame() ?? "")).toContain("fresh echo");
   });
 
+  it("keeps wide glyphs when extracting styled rows from a live terminal", async () => {
+    const result = render(
+      <TerminalPane
+        title="Claude Code"
+        preview={null}
+        liveChunks={["界界界\r\n"]}
+        attached={false}
+        width={20}
+        height={5}
+        hiddenBottomRows={0}
+      />,
+    );
+
+    await waitFor(() => countMatches(stripAnsi(result.lastFrame() ?? ""), /界/g) >= 3);
+    expect(countMatches(stripAnsi(result.lastFrame() ?? ""), /界/g)).toBeGreaterThanOrEqual(3);
+  });
+
   it("applies live PTY chunks on top of the newest snapshot seed", async () => {
     const result = render(
       <TerminalPane
diff --git a/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts b/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
index 902399023..d82b9c32d 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/appInput.test.ts
@@ -93,6 +93,8 @@ import {
   cursorModeIdsForState,
   cursorSourceForInterfaceMode,
   initialModelState,
+  applyProviderPermissionMode,
+  permissionSummary,
   reconcileCursorModelStateForInterface,
   resolveCursorCliModelForLaunch,
 } from "../modelState";
@@ -1116,6 +1118,31 @@ describe("provider permission helpers", () => {
     expect(cursorModeIdsForState({ cursorAvailableModeIds: ["ask", "plan"] })).toEqual(["ask", "plan"]);
     expect(cursorModeIdsForState({ cursorAvailableModeIds: [] })).toContain("agent");
   });
+
+  it("uses OpenCode permissions for Ollama and LM Studio chat providers", () => {
+    for (const provider of ["ollama", "lmstudio"] as const) {
+      const modelState = setupPaneModelState({
+        provider,
+        opencodePermissionMode: "plan",
+        cursorModeId: "ask",
+      });
+      const permissionRow = buildSetupRows({
+        modelState,
+        models: [],
+        includeRefresh: false,
+        includeApply: true,
+        interfaceMode: "chat",
+        interfaceEditable: true,
+      }).find((row) => row.kind === "permission");
+
+      expect(permissionSummary(modelState)).toBe("plan");
+      expect(applyProviderPermissionMode(modelState)).toEqual({ permissionMode: "plan" });
+      expect(permissionRow).toMatchObject({
+        value: "plan",
+        detail: "plan · edit · full-auto · config-toml",
+      });
+    }
+  });
 });
 
 describe("formatGitConflictReport", () => {
diff --git a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
index 383876fe6..a9560894d 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/connection.test.ts
@@ -615,6 +615,30 @@ describe("connectToAde embedded mode", () => {
     expect(fs.existsSync(lockPath)).toBe(false);
   });
 
+  it("unlinks stale machine socket files before retrying daemon startup", async () => {
+    const socketPath = useMissingMachineSocket();
+    fs.mkdirSync(path.dirname(socketPath), { recursive: true });
+    fs.writeFileSync(socketPath, "");
+    expect(fs.existsSync(socketPath)).toBe(true);
+
+    const client = mockAttachedClient();
+    let connectAttempts = 0;
+    vi.mocked(JsonRpcClient.connect).mockImplementation(async () => {
+      connectAttempts += 1;
+      if (connectAttempts === 1) {
+        throw Object.assign(new Error("connect ECONNREFUSED"), { code: "ECONNREFUSED" });
+      }
+      return client as unknown as JsonRpcClient;
+    });
+
+    const connection = await connectToAde({ project });
+    await connection.close();
+
+    expect(childProcess.spawn).toHaveBeenCalledTimes(1);
+    expect(connectAttempts).toBeGreaterThan(1);
+    expect(fs.existsSync(socketPath)).toBe(false);
+  });
+
   it("repairs the packaged service before spawning an unmanaged machine daemon", async () => {
     useMissingMachineSocket();
     const installEnvRoles: Array<string | undefined> = [];
@@ -1022,13 +1046,13 @@ describe("JsonRpcClient", () => {
 });
 
 describe("ProcessJsonRpcClient", () => {
-  it("clears pending RPC timers when remote responses resolve or reject", async () => {
+  it("matches string response ids and clears pending RPC timers", async () => {
     const clearTimeoutSpy = vi.spyOn(global, "clearTimeout");
     const child = new FakeRemoteRpcChild();
     const client = new ProcessJsonRpcClient(child as never);
 
     const resolved = client.request("ade/ping");
-    child.stdout.write(`${JSON.stringify({ jsonrpc: "2.0", id: 1, result: { ok: true } })}\n`);
+    child.stdout.write(`${JSON.stringify({ jsonrpc: "2.0", id: "1", result: { ok: true } })}\n`);
     await expect(resolved).resolves.toEqual({ ok: true });
 
     const rejected = client.request("ade/fail");
diff --git a/apps/ade-cli/src/tuiClient/__tests__/displayWidth.test.ts b/apps/ade-cli/src/tuiClient/__tests__/displayWidth.test.ts
new file mode 100644
index 000000000..5921672d1
--- /dev/null
+++ b/apps/ade-cli/src/tuiClient/__tests__/displayWidth.test.ts
@@ -0,0 +1,12 @@
+import { describe, expect, it } from "vitest";
+import { splitByDisplayCells } from "../displayWidth";
+
+describe("splitByDisplayCells", () => {
+  it("assigns a wide cluster that crosses a split boundary to one segment", () => {
+    expect(splitByDisplayCells("ab界cd", 2, 3)).toEqual({
+      before: "ab",
+      selected: "界",
+      after: "cd",
+    });
+  });
+});
diff --git a/apps/ade-cli/src/tuiClient/__tests__/state.test.ts b/apps/ade-cli/src/tuiClient/__tests__/state.test.ts
index 18f0f3460..94463b7e6 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/state.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/state.test.ts
@@ -2,7 +2,14 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, it } from "vitest";
-import { loadAdeCodeState, normalizeAdeCodeState, saveAdeCodeProjectStateAsync, scopedAdeCodeState } from "../state";
+import {
+  flushAdeCodeStateWrites,
+  loadAdeCodeState,
+  normalizeAdeCodeState,
+  saveAdeCodeProjectState,
+  saveAdeCodeProjectStateAsync,
+  scopedAdeCodeState,
+} from "../state";
 
 afterEach(() => {
   delete process.env.ADE_CODE_STATE_DIR;
@@ -149,4 +156,21 @@ describe("ade code persisted state", () => {
     });
     expect(fs.existsSync(lockPath)).toBe(false);
   });
+
+  it("flushes fire-and-forget project state saves before shutdown", async () => {
+    const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), "ade-code-state-"));
+    process.env.ADE_CODE_STATE_DIR = stateDir;
+
+    saveAdeCodeProjectState("/repo-a", {
+      lastChatByLane: { main: "repo-a-chat" },
+      lastLaneId: "repo-a-lane",
+      draftKind: "cli",
+    });
+    await flushAdeCodeStateWrites();
+
+    const persisted = loadAdeCodeState();
+    expect(persisted.lastChatByProjectLane[path.resolve("/repo-a")]).toEqual({ main: "repo-a-chat" });
+    expect(persisted.lastLaneByProject[path.resolve("/repo-a")]).toBe("repo-a-lane");
+    expect(persisted.draftKindByProject[path.resolve("/repo-a")]).toBe("cli");
+  });
 });
diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index 491760c6d..a8707c65d 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -232,7 +232,7 @@ import {
   splitByDisplayCells,
   terminalDisplayWidth,
 } from "./displayWidth";
-import { loadAdeCodeState, saveAdeCodeProjectState, scopedAdeCodeState } from "./state";
+import { flushAdeCodeStateWrites, loadAdeCodeState, saveAdeCodeProjectState, scopedAdeCodeState } from "./state";
 import { SpinTickProvider } from "./spinTick";
 import { ACTIVE_SESSION_PLACEHOLDER, buildLinearToolRequest } from "./linearCommands";
 import {
@@ -3026,6 +3026,28 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
 
   const streaming = activeSessionId ? !!streamingBySessionId[activeSessionId] : false;
 
+  const saveCurrentAdeCodeState = useCallback(() => {
+    if (remoteLaunch) return;
+    const lastChatByLane: Record<string, string> = {};
+    for (const [laneId, sessionId] of lastChatByLaneRef.current) {
+      lastChatByLane[laneId] = sessionId;
+    }
+    saveAdeCodeProjectState(project.projectRoot, {
+      lastChatByLane,
+      lastLaneId: lastLaneIdRef.current,
+      draftKind: draftKindRef.current,
+    });
+  }, [project.projectRoot, remoteLaunch]);
+
+  const flushPendingAdeCodeState = useCallback(async () => {
+    if (lastChatByLaneWriteTimerRef.current) {
+      clearTimeout(lastChatByLaneWriteTimerRef.current);
+      lastChatByLaneWriteTimerRef.current = null;
+      saveCurrentAdeCodeState();
+    }
+    await flushAdeCodeStateWrites();
+  }, [saveCurrentAdeCodeState]);
+
   const persistAdeCodeState = useCallback(() => {
     if (remoteLaunch) return;
     if (lastChatByLaneWriteTimerRef.current) {
@@ -3033,17 +3055,9 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     }
     lastChatByLaneWriteTimerRef.current = setTimeout(() => {
       lastChatByLaneWriteTimerRef.current = null;
-      const lastChatByLane: Record<string, string> = {};
-      for (const [laneId, sessionId] of lastChatByLaneRef.current) {
-        lastChatByLane[laneId] = sessionId;
-      }
-      saveAdeCodeProjectState(project.projectRoot, {
-        lastChatByLane,
-        lastLaneId: lastLaneIdRef.current,
-        draftKind: draftKindRef.current,
-      });
+      saveCurrentAdeCodeState();
     }, 500);
-  }, [project.projectRoot, remoteLaunch]);
+  }, [remoteLaunch, saveCurrentAdeCodeState]);
 
   const persistExplicitDraftKind = useCallback((draftKind: AdeCodeInterfaceMode) => {
     draftKindRef.current = draftKind;
@@ -6952,10 +6966,13 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
         heartbeatRef.current = remoteLaunch
           ? null
           : startTuiHeartbeat(project.projectRoot, {
-            beforeSignalExit: () => {
+            beforeSignalExit: async () => {
               restoreTerminalInteractiveModes();
               signalActiveTerminalForExitSync();
-              return signalActiveTerminalForExit();
+              await Promise.allSettled([
+                flushPendingAdeCodeState(),
+                signalActiveTerminalForExit(),
+              ]);
             },
           });
         connectionRef.current = conn;
@@ -6992,21 +7009,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       }
       heartbeatRef.current?.stop();
       heartbeatRef.current = null;
-      if (lastChatByLaneWriteTimerRef.current) {
-        clearTimeout(lastChatByLaneWriteTimerRef.current);
-        lastChatByLaneWriteTimerRef.current = null;
-        if (!remoteLaunch) {
-          const lastChatByLane: Record<string, string> = {};
-          for (const [laneId, sessionId] of lastChatByLaneRef.current) {
-            lastChatByLane[laneId] = sessionId;
-          }
-          saveAdeCodeProjectState(project.projectRoot, {
-            lastChatByLane,
-            lastLaneId: lastLaneIdRef.current,
-            draftKind: draftKindRef.current,
-          });
-        }
-      }
+      void flushPendingAdeCodeState().catch(() => {});
       if (pendingModelCommitTimerRef.current) {
         clearTimeout(pendingModelCommitTimerRef.current);
         pendingModelCommitTimerRef.current = null;
@@ -7020,7 +7023,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       connectionRef.current = null;
       void conn?.close().catch(() => {});
     };
-  }, [connectionRetrySeq, forceEmbedded, preferServiceRepair, project, remoteLaunch, requireSocket, signalActiveTerminalForExit, signalActiveTerminalForExitSync, socketPath]);
+  }, [connectionRetrySeq, flushPendingAdeCodeState, forceEmbedded, preferServiceRepair, project, remoteLaunch, requireSocket, signalActiveTerminalForExit, signalActiveTerminalForExitSync, socketPath]);
 
   // Stable handle to the latest refreshState so the chat-event subscription can
   // call it without listing refreshState as a dependency (its identity churns on
diff --git a/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx b/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
index 8891d6f5b..8c0ac120d 100644
--- a/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
+++ b/apps/ade-cli/src/tuiClient/components/TerminalPane.tsx
@@ -381,8 +381,7 @@ function styledRowsFromTerminal(
     }
     const cells: TerminalSnapshotCell[] = [];
     let lastContentColumn = -1;
-    const scanColumns = Math.min(terminal.cols, fallbackText.length);
-    for (let column = 0; column < scanColumns; column += 1) {
+    for (let column = 0; column < terminal.cols; column += 1) {
       const cell = snapshotCellFromXtermCell(line.getCell(column) as unknown as XtermBufferCell | undefined);
       cells.push(cell);
       if (!isBlankDefaultCell(cell)) lastContentColumn = column;
diff --git a/apps/ade-cli/src/tuiClient/connection.ts b/apps/ade-cli/src/tuiClient/connection.ts
index f288753c1..49c2e78d9 100644
--- a/apps/ade-cli/src/tuiClient/connection.ts
+++ b/apps/ade-cli/src/tuiClient/connection.ts
@@ -1,6 +1,7 @@
 import { spawn } from "node:child_process";
 import { createHash } from "node:crypto";
 import fs from "node:fs";
+import net from "node:net";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { resolveAdeLayout } from "../../../desktop/src/shared/adeLayout";
@@ -526,29 +527,134 @@ function spawnDaemon(socketPath: string): boolean {
   return true;
 }
 
+type SocketSpawnLockOwner = {
+  id: string | null;
+  pid: number | null;
+};
+
+function createSocketSpawnLockOwner(): SocketSpawnLockOwner {
+  return {
+    id: `${process.pid}:${Date.now()}:${Math.random().toString(36).slice(2)}`,
+    pid: process.pid,
+  };
+}
+
+function serializeSocketSpawnLockOwner(owner: SocketSpawnLockOwner): string {
+  return JSON.stringify({
+    id: owner.id,
+    pid: owner.pid,
+    createdAt: new Date().toISOString(),
+  });
+}
+
+function readSocketSpawnLockOwner(lockPath: string): SocketSpawnLockOwner {
+  const raw = fs.readFileSync(lockPath, "utf8");
+  try {
+    const parsed = JSON.parse(raw) as { id?: unknown; pid?: unknown };
+    return {
+      id: typeof parsed.id === "string" ? parsed.id : null,
+      pid: typeof parsed.pid === "number" && Number.isInteger(parsed.pid) && parsed.pid > 0
+        ? parsed.pid
+        : null,
+    };
+  } catch {
+    const [pidLine] = raw.split(/\r?\n/u);
+    const pid = Number.parseInt(pidLine ?? "", 10);
+    return {
+      id: null,
+      pid: Number.isInteger(pid) && pid > 0 ? pid : null,
+    };
+  }
+}
+
+function processExists(pid: number): boolean {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (error) {
+    return (error as NodeJS.ErrnoException).code === "EPERM";
+  }
+}
+
+function unlinkSocketSpawnLockIfStale(lockPath: string): boolean {
+  try {
+    const stat = fs.statSync(lockPath);
+    const owner = readSocketSpawnLockOwner(lockPath);
+    if (owner.pid != null && processExists(owner.pid)) return false;
+    if (owner.pid == null && Date.now() - stat.mtimeMs <= 30_000) return false;
+    fs.unlinkSync(lockPath);
+    return true;
+  } catch (error) {
+    return (error as NodeJS.ErrnoException).code === "ENOENT";
+  }
+}
+
+function unlinkSocketSpawnLockIfOwner(lockPath: string, ownerId: string | null): void {
+  if (!ownerId) return;
+  try {
+    const owner = readSocketSpawnLockOwner(lockPath);
+    if (owner.id !== ownerId) return;
+    fs.unlinkSync(lockPath);
+  } catch {
+    // ignore cleanup races
+  }
+}
+
+async function probeLocalSocketLiveness(socketPath: string): Promise<"live" | "stale" | "unknown"> {
+  if (socketPath.startsWith("tcp://")) return "unknown";
+  return await new Promise((resolve) => {
+    const socket = net.createConnection(socketPath);
+    let settled = false;
+    let timer: ReturnType<typeof setTimeout> | null = null;
+    const finish = (result: "live" | "stale" | "unknown") => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+      socket.destroy();
+      resolve(result);
+    };
+    timer = setTimeout(() => finish("unknown"), 500);
+    timer.unref?.();
+    socket.once("connect", () => finish("live"));
+    socket.once("error", (error: NodeJS.ErrnoException) => {
+      if (error.code === "ENOENT" || error.code === "ECONNREFUSED") {
+        finish("stale");
+        return;
+      }
+      finish("unknown");
+    });
+  });
+}
+
+async function unlinkStaleLocalSocket(socketPath: string): Promise<boolean> {
+  if (socketPath.startsWith("tcp://")) return false;
+  try {
+    const stat = fs.lstatSync(socketPath);
+    if (!stat.isSocket() && !stat.isFile()) return false;
+    if (stat.isSocket() && await probeLocalSocketLiveness(socketPath) !== "stale") return false;
+    fs.unlinkSync(socketPath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 async function withSocketSpawnLock<T>(socketPath: string, task: () => Promise<T>): Promise<T> {
   if (socketPath.startsWith("tcp://")) return await task();
   const lockPath = path.join(path.dirname(socketPath), `${path.basename(socketPath)}.spawn.lock`);
   fs.mkdirSync(path.dirname(lockPath), { recursive: true, mode: 0o700 });
   const deadline = Date.now() + 10_000;
+  const owner = createSocketSpawnLockOwner();
   let fd: number | null = null;
   while (fd == null) {
     try {
       fd = fs.openSync(lockPath, "wx", 0o600);
-      fs.writeFileSync(fd, `${process.pid}\n${Date.now()}\n`, "utf8");
+      fs.writeFileSync(fd, serializeSocketSpawnLockOwner(owner), "utf8");
       break;
     } catch (error) {
       const code = (error as NodeJS.ErrnoException).code;
       if (code !== "EEXIST") throw error;
-      try {
-        const stat = fs.statSync(lockPath);
-        if (Date.now() - stat.mtimeMs > 30_000) {
-          fs.unlinkSync(lockPath);
-          continue;
-        }
-      } catch (statError) {
-        if ((statError as NodeJS.ErrnoException).code === "ENOENT") continue;
-      }
+      if (unlinkSocketSpawnLockIfStale(lockPath)) continue;
       if (Date.now() >= deadline) {
         throw new Error(`Timed out waiting for ADE socket spawn lock at ${lockPath}.`);
       }
@@ -564,9 +670,7 @@ async function withSocketSpawnLock<T>(socketPath: string, task: () => Promise<T>
         fs.closeSync(fd);
       } catch {}
     }
-    try {
-      fs.unlinkSync(lockPath);
-    } catch {}
+    unlinkSocketSpawnLockIfOwner(lockPath, owner.id);
   }
 }
 
@@ -850,7 +954,7 @@ export async function connectToAde(args: {
       if (repaired) return repaired;
       try {
         const spawned = await withSocketSpawnLock(machineSocketPath, async () => {
-          if (fs.existsSync(machineSocketPath)) return false;
+          if (fs.existsSync(machineSocketPath) && !(await unlinkStaleLocalSocket(machineSocketPath))) return false;
           return spawnDaemon(machineSocketPath);
         });
         if (spawned) return await tryDaemon(25);
diff --git a/apps/ade-cli/src/tuiClient/displayWidth.ts b/apps/ade-cli/src/tuiClient/displayWidth.ts
index bc381bee1..d9b4446cb 100644
--- a/apps/ade-cli/src/tuiClient/displayWidth.ts
+++ b/apps/ade-cli/src/tuiClient/displayWidth.ts
@@ -84,11 +84,17 @@ export function splitByDisplayCells(
 ): { before: string; selected: string; after: string } {
   const start = Math.max(0, Math.min(startCell, terminalDisplayWidth(value)));
   const end = Math.max(start, Math.min(endCell, terminalDisplayWidth(value)));
-  return {
-    before: sliceByDisplayCells(value, 0, start),
-    selected: sliceByDisplayCells(value, start, end),
-    after: sliceByDisplayCells(value, end, Number.POSITIVE_INFINITY),
-  };
+  let cells = 0;
+  let before = "";
+  let selected = "";
+  let after = "";
+  for (const cluster of displayClusters(value)) {
+    if (cells < start) before += cluster.text;
+    else if (cells < end) selected += cluster.text;
+    else after += cluster.text;
+    cells += cluster.width;
+  }
+  return { before, selected, after };
 }
 
 export function truncateDisplayEnd(value: string, maxCells: number): string {
diff --git a/apps/ade-cli/src/tuiClient/modelState.ts b/apps/ade-cli/src/tuiClient/modelState.ts
index 0f1d7827c..165650d1c 100644
--- a/apps/ade-cli/src/tuiClient/modelState.ts
+++ b/apps/ade-cli/src/tuiClient/modelState.ts
@@ -368,7 +368,7 @@ export function permissionSummary(modelState: AdeCodeModelState): string {
     if (modelState.claudePermissionMode === "bypassPermissions") return "bypass";
     return "default";
   }
-  if (modelState.provider === "opencode") return modelState.opencodePermissionMode;
+  if (runtimeProviderForUiProvider(modelState.provider) === "opencode") return modelState.opencodePermissionMode;
   if (modelState.provider === "droid") return modelState.droidPermissionMode;
   return cursorModeLabel(modelState.cursorModeId);
 }
@@ -404,7 +404,7 @@ export function modeAccentColor(summary: string): string {
 function permissionOptionsDetail(modelState: AdeCodeModelState): string {
   if (modelState.provider === "codex") return CODEX_PRESETS.join(" · ");
   if (modelState.provider === "claude") return "default · plan · auto · bypass";
-  if (modelState.provider === "opencode") return OPENCODE_PERMISSION_OPTIONS.join(" · ");
+  if (runtimeProviderForUiProvider(modelState.provider) === "opencode") return OPENCODE_PERMISSION_OPTIONS.join(" · ");
   if (modelState.provider === "droid") return DROID_PERMISSION_OPTIONS.join(" · ");
   return cursorModeIdsForState(modelState).map((modeId) => cursorModeLabel(modeId)).join(" · ");
 }
@@ -423,7 +423,7 @@ export function applyProviderPermissionMode(modelState: AdeCodeModelState): Part
     if (modelState.claudePermissionMode === "bypassPermissions") return { permissionMode: "full-auto", interactionMode: "default" };
     return { permissionMode: "default", interactionMode: "default" };
   }
-  if (modelState.provider === "opencode") return { permissionMode: modelState.opencodePermissionMode };
+  if (runtimeProviderForUiProvider(modelState.provider) === "opencode") return { permissionMode: modelState.opencodePermissionMode };
   if (modelState.provider === "droid") return { permissionMode: droidPermissionToLegacy(modelState.droidPermissionMode) };
   if (modelState.provider === "cursor") {
     if (modelState.cursorModeId === "plan") return { permissionMode: "plan" };
diff --git a/apps/ade-cli/src/tuiClient/remoteBridge.ts b/apps/ade-cli/src/tuiClient/remoteBridge.ts
index 977a803d3..1a91e7c7a 100644
--- a/apps/ade-cli/src/tuiClient/remoteBridge.ts
+++ b/apps/ade-cli/src/tuiClient/remoteBridge.ts
@@ -104,7 +104,7 @@ export function spawnRemoteRpcProcess(attempt: RemoteRpcAttempt): ChildProcessWi
 export class ProcessJsonRpcClient {
   private nextId = 1;
   private buffer = Buffer.alloc(0);
-  private readonly pending = new Map<number | string, PendingRequest>();
+  private readonly pending = new Map<string, PendingRequest>();
   private readonly stderrTail = new ByteRingBuffer(MAX_STDERR_TAIL_BYTES);
   private closed = false;
 
@@ -129,15 +129,16 @@ export class ProcessJsonRpcClient {
       ...(params !== undefined ? { params } : {}),
     };
     return new Promise<T>((resolve, reject) => {
+      const pendingKey = String(id);
       const timer = setTimeout(() => {
-        if (!this.pending.has(id)) return;
+        if (!this.pending.has(pendingKey)) return;
         this.handleClosed(
           new Error(`Remote ADE RPC timed out waiting for method ${method} (${REMOTE_RPC_REQUEST_TIMEOUT_MS}ms).`),
         );
         this.child.kill();
       }, REMOTE_RPC_REQUEST_TIMEOUT_MS);
       timer.unref?.();
-      this.pending.set(id, {
+      this.pending.set(pendingKey, {
         method,
         resolve: (value) => resolve(value as T),
         reject,
@@ -145,9 +146,9 @@ export class ProcessJsonRpcClient {
       });
       this.child.stdin.write(`${JSON.stringify(payload)}\n`, "utf8", (error) => {
         if (!error) return;
-        const pending = this.pending.get(id);
+        const pending = this.pending.get(pendingKey);
         if (pending) clearTimeout(pending.timer);
-        this.pending.delete(id);
+        this.pending.delete(pendingKey);
         reject(error);
       });
     });
@@ -257,9 +258,10 @@ export class ProcessJsonRpcClient {
 
   private handleResponse(response: JsonRpcResponse): void {
     if (response.id == null) return;
-    const pending = this.pending.get(response.id);
+    const pendingKey = String(response.id);
+    const pending = this.pending.get(pendingKey);
     if (!pending) return;
-    this.pending.delete(response.id);
+    this.pending.delete(pendingKey);
     clearTimeout(pending.timer);
     if (response.error) {
       pending.reject(new Error(response.error.message));
diff --git a/apps/ade-cli/src/tuiClient/state.ts b/apps/ade-cli/src/tuiClient/state.ts
index 6df9e25e2..06c56fd12 100644
--- a/apps/ade-cli/src/tuiClient/state.ts
+++ b/apps/ade-cli/src/tuiClient/state.ts
@@ -102,6 +102,10 @@ export function saveAdeCodeProjectStateAsync(
   }));
 }
 
+export function flushAdeCodeStateWrites(): Promise<void> {
+  return stateWriteQueue;
+}
+
 export function normalizeAdeCodeState(value: unknown): AdeCodeState {
   const parsed = value && typeof value === "object" && !Array.isArray(value)
     ? value as Partial<AdeCodeState>
diff --git a/apps/desktop/src/preload/preload.test.ts b/apps/desktop/src/preload/preload.test.ts
index aeff53bb1..9e57fd91b 100644
--- a/apps/desktop/src/preload/preload.test.ts
+++ b/apps/desktop/src/preload/preload.test.ts
@@ -4138,7 +4138,7 @@ describe("preload OAuth bridge", () => {
     }
 	  });
 
-  it("notifies the existing project binding refresh path when event polling reports a gap", async () => {
+  it("does not notify project binding listeners for same-binding event polling gaps", async () => {
     vi.useFakeTimers();
     try {
       const binding = {
@@ -4160,7 +4160,6 @@ describe("preload OAuth bridge", () => {
             nextCursor: 42,
             hasMore: false,
             gap: true,
-            oldestCursor: 12,
             eventEpoch: "epoch-a",
           };
         }
@@ -4192,7 +4191,7 @@ describe("preload OAuth bridge", () => {
 
       await vi.advanceTimersByTimeAsync(0);
 
-      expect(bindingChanged).toHaveBeenCalledWith(binding);
+      expect(bindingChanged).not.toHaveBeenCalled();
       expect(invoke).toHaveBeenCalledWith(IPC.remoteRuntimeStreamEvents, {
         id: "target-1",
         projectId: "project-1",
diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.ts
index 7f9259ca8..d89a641fb 100644
--- a/apps/desktop/src/preload/preload.ts
+++ b/apps/desktop/src/preload/preload.ts
@@ -1889,7 +1889,6 @@ async function pollRemoteRuntimeEvents(): Promise<void> {
     if (batch.gap === true) {
       resetRemoteRuntimeEventDedup(binding.key);
       resetRemoteRuntimeEmptyPolls();
-      notifyProjectBindingChangedCallbacks(binding);
     }
 
     remoteRuntimeEventCursor = Number.isFinite(batch.nextCursor)

From d442d2d627909a61063ac32afab6b9553d11bf44 Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 13:35:17 -0400
Subject: [PATCH 15/17] =?UTF-8?q?ship:=20iteration=202=20=E2=80=94=20addre?=
 =?UTF-8?q?ss=202=20codex=20P3s=20(grid=20claudeChrome,=20CJK=20truncate?=
 =?UTF-8?q?=20overflow)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- MultiChatGrid passes claudeChrome by derived terminal provider so non-Claude
  grid tiles keep neutral closed-transcript cleanup
- truncateDisplayEnd uses a cluster-boundary-safe prefix so a leading wide
  grapheme can no longer overflow the allocated cell width (+ regression tests)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../tuiClient/__tests__/displayWidth.test.ts  | 22 ++++++++++++++++++-
 .../tuiClient/components/MultiChatGrid.tsx    |  2 ++
 apps/ade-cli/src/tuiClient/displayWidth.ts    | 18 +++++++++++++--
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/apps/ade-cli/src/tuiClient/__tests__/displayWidth.test.ts b/apps/ade-cli/src/tuiClient/__tests__/displayWidth.test.ts
index 5921672d1..8aaf428a8 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/displayWidth.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/displayWidth.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { splitByDisplayCells } from "../displayWidth";
+import { splitByDisplayCells, terminalDisplayWidth, truncateDisplayEnd } from "../displayWidth";
 
 describe("splitByDisplayCells", () => {
   it("assigns a wide cluster that crosses a split boundary to one segment", () => {
@@ -10,3 +10,23 @@ describe("splitByDisplayCells", () => {
     });
   });
 });
+
+describe("truncateDisplayEnd", () => {
+  it("never exceeds maxCells when a wide grapheme straddles the ellipsis boundary", () => {
+    const truncated = truncateDisplayEnd("界面设置", 2);
+    expect(terminalDisplayWidth(truncated)).toBeLessThanOrEqual(2);
+    expect(truncated).toBe("…");
+  });
+
+  it("keeps whole wide clusters that fit before the ellipsis", () => {
+    const truncated = truncateDisplayEnd("界面设置", 5);
+    expect(truncated).toBe("界面…");
+    expect(terminalDisplayWidth(truncated)).toBe(5);
+  });
+
+  it("leaves narrow text untouched below the budget and truncates above it", () => {
+    expect(truncateDisplayEnd("abc", 4)).toBe("abc");
+    expect(truncateDisplayEnd("abcdef", 4)).toBe("abc…");
+    expect(truncateDisplayEnd("ab", 1)).toBe("a");
+  });
+});
diff --git a/apps/ade-cli/src/tuiClient/components/MultiChatGrid.tsx b/apps/ade-cli/src/tuiClient/components/MultiChatGrid.tsx
index 1494b3bac..2a256c7a5 100644
--- a/apps/ade-cli/src/tuiClient/components/MultiChatGrid.tsx
+++ b/apps/ade-cli/src/tuiClient/components/MultiChatGrid.tsx
@@ -15,6 +15,7 @@ import {
   type MultiViewTile,
 } from "../multiChatLayout";
 import { useHitTestTarget } from "../hitTestRegistry";
+import { terminalSessionProvider } from "../closedCliSessions";
 import { theme } from "../theme";
 
 type TileData = {
@@ -104,6 +105,7 @@ function TerminalChatTile({
         preview={preview}
         liveChunks={liveChunks}
         attached={attached}
+        claudeChrome={terminalSessionProvider(terminal) === "claude"}
         width={innerWidth}
         height={Math.max(1, rect.h - 3)}
         scrollOffset={scrollOffset}
diff --git a/apps/ade-cli/src/tuiClient/displayWidth.ts b/apps/ade-cli/src/tuiClient/displayWidth.ts
index d9b4446cb..8459da45c 100644
--- a/apps/ade-cli/src/tuiClient/displayWidth.ts
+++ b/apps/ade-cli/src/tuiClient/displayWidth.ts
@@ -97,10 +97,24 @@ export function splitByDisplayCells(
   return { before, selected, after };
 }
 
+// A cluster-boundary-safe prefix: never includes a cluster that would push the
+// prefix past `budget` cells (sliceByDisplayCells keeps a straddling wide
+// cluster, which would overflow the allocated width here).
+function displayPrefixWithinCells(value: string, budget: number): string {
+  let out = "";
+  let cells = 0;
+  for (const cluster of displayClusters(value)) {
+    if (cells + cluster.width > budget) break;
+    out += cluster.text;
+    cells += cluster.width;
+  }
+  return out;
+}
+
 export function truncateDisplayEnd(value: string, maxCells: number): string {
   if (terminalDisplayWidth(value) <= maxCells) return value;
-  if (maxCells <= 1) return sliceByDisplayCells(value, 0, Math.max(0, maxCells));
-  return `${sliceByDisplayCells(value, 0, maxCells - 1)}…`;
+  if (maxCells <= 1) return displayPrefixWithinCells(value, Math.max(0, maxCells));
+  return `${displayPrefixWithinCells(value, maxCells - 1)}…`;
 }
 
 export function hardWrapDisplayText(value: string, width: number): string[] {

From 9a50966c93bfad1cd0b08faecafa4fab1e2106df Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 14:02:47 -0400
Subject: [PATCH 16/17] =?UTF-8?q?ship:=20iteration=203=20=E2=80=94=20quote?=
 =?UTF-8?q?-aware=20VISUAL/EDITOR=20parsing=20(codex=20P3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

splitEditorCommand now tokenizes with quote/escape support so editors like
'emacsclient -a ""' or app paths with spaces keep working after the
shell:false hardening; quoted empty strings survive as argv entries.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .../tuiClient/__tests__/keybindings.test.ts   | 19 +++++++
 .../src/tuiClient/keybindings/index.ts        | 52 ++++++++++++++++++-
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/apps/ade-cli/src/tuiClient/__tests__/keybindings.test.ts b/apps/ade-cli/src/tuiClient/__tests__/keybindings.test.ts
index ffb1f5246..080a88819 100644
--- a/apps/ade-cli/src/tuiClient/__tests__/keybindings.test.ts
+++ b/apps/ade-cli/src/tuiClient/__tests__/keybindings.test.ts
@@ -127,4 +127,23 @@ describe("keybindings", () => {
       args: ["/tmp/keybindings.json"],
     });
   });
+
+  it("preserves quoted segments in VISUAL/EDITOR values", () => {
+    expect(splitEditorCommand('emacsclient -a ""')).toEqual(["emacsclient", "-a", ""]);
+    expect(splitEditorCommand('"/Applications/Visual Studio Code.app/Contents/MacOS/Electron" --wait')).toEqual([
+      "/Applications/Visual Studio Code.app/Contents/MacOS/Electron",
+      "--wait",
+    ]);
+    expect(splitEditorCommand("vim -c 'set ft=json'")).toEqual(["vim", "-c", "set ft=json"]);
+    expect(splitEditorCommand('code --user-data-dir "/tmp/my dir"')).toEqual([
+      "code",
+      "--user-data-dir",
+      "/tmp/my dir",
+    ]);
+    expect(splitEditorCommand("edit\\ or --flag")).toEqual(["edit or", "--flag"]);
+    expect(keybindingsEditorCommand("/tmp/keybindings.json", 'emacsclient -a ""', "linux")).toEqual({
+      command: "emacsclient",
+      args: ["-a", "", "/tmp/keybindings.json"],
+    });
+  });
 });
diff --git a/apps/ade-cli/src/tuiClient/keybindings/index.ts b/apps/ade-cli/src/tuiClient/keybindings/index.ts
index 04c1241ba..125eadc1d 100644
--- a/apps/ade-cli/src/tuiClient/keybindings/index.ts
+++ b/apps/ade-cli/src/tuiClient/keybindings/index.ts
@@ -460,6 +460,56 @@ export function keybindingsEditorCommand(
   return { command, args };
 }
 
+// Quote-aware split so VISUAL/EDITOR values like `emacsclient -a ""` or
+// `"/Applications/Visual Studio Code.app/..." --wait` keep their quoted
+// segments as single argv entries (spawn runs with shell:false, so nothing
+// re-tokenizes downstream). Supports '..', "..", and backslash escapes;
+// an explicitly quoted empty string is preserved as an argument.
 export function splitEditorCommand(value: string): string[] {
-  return value.trim().split(/\s+/).filter(Boolean);
+  const parts: string[] = [];
+  let current = "";
+  let hasToken = false;
+  let quote: '"' | "'" | null = null;
+  for (let i = 0; i < value.length; i += 1) {
+    const ch = value[i];
+    if (quote === "'") {
+      if (ch === "'") quote = null;
+      else current += ch;
+      continue;
+    }
+    if (quote === '"') {
+      if (ch === "\\" && value[i + 1] === '"') {
+        current += '"';
+        i += 1;
+      } else if (ch === '"') {
+        quote = null;
+      } else {
+        current += ch;
+      }
+      continue;
+    }
+    if (ch === "'" || ch === '"') {
+      quote = ch;
+      hasToken = true;
+      continue;
+    }
+    if (ch === "\\" && i + 1 < value.length) {
+      current += value[i + 1];
+      hasToken = true;
+      i += 1;
+      continue;
+    }
+    if (/\s/.test(ch)) {
+      if (hasToken || current) {
+        parts.push(current);
+        current = "";
+        hasToken = false;
+      }
+      continue;
+    }
+    current += ch;
+    hasToken = true;
+  }
+  if (hasToken || current) parts.push(current);
+  return parts;
 }

From 46153fec2037f33712bda639694ea7745107a20c Mon Sep 17 00:00:00 2001
From: Arul Sharma <31745423+arul28@users.noreply.github.com>
Date: Fri, 3 Jul 2026 14:17:30 -0400
Subject: [PATCH 17/17] =?UTF-8?q?ship:=20iteration=204=20=E2=80=94=20provi?=
 =?UTF-8?q?der-aware=20terminal=20hydrate=20+=20local-provider=20permissio?=
 =?UTF-8?q?n=20cycle=20(codex=20P1/P2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- selecting a non-Claude tracked CLI session now hydrates model state from
  terminalSessionProvider instead of forcing claude (footer/model targets the
  right provider for subsequent changes and launches)
- cyclePermission + updateChatModel payload route ollama/lmstudio through the
  OpenCode permission branch via runtimeProviderForUiProvider (class sweep)

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 apps/ade-cli/src/tuiClient/app.tsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/ade-cli/src/tuiClient/app.tsx b/apps/ade-cli/src/tuiClient/app.tsx
index a8707c65d..30956bbfc 100644
--- a/apps/ade-cli/src/tuiClient/app.tsx
+++ b/apps/ade-cli/src/tuiClient/app.tsx
@@ -6669,11 +6669,12 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
     }
     if (nextTerminalSession) {
       const current = modelStateRef.current;
-      if (current.provider !== "claude") {
+      const terminalProvider = terminalSessionProvider(nextTerminalSession) ?? "claude";
+      if (current.provider !== terminalProvider) {
         setModelState((prev) => {
           const next = {
             ...prev,
-            ...fallbackModelStatePatch("claude"),
+            ...fallbackModelStatePatch(terminalProvider),
             permissionMode: nextTerminalSession.resumeMetadata?.launch?.permissionMode ?? prev.permissionMode,
             claudePermissionMode: nextTerminalSession.resumeMetadata?.launch?.claudePermissionMode ?? prev.claudePermissionMode,
           };
@@ -6866,7 +6867,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       codexApprovalPolicy: normalized.provider === "codex" ? normalized.codexApprovalPolicy : undefined,
       codexSandbox: normalized.provider === "codex" ? normalized.codexSandbox : undefined,
       codexConfigSource: normalized.provider === "codex" ? normalized.codexConfigSource : undefined,
-      opencodePermissionMode: normalized.provider === "opencode" ? normalized.opencodePermissionMode : undefined,
+      opencodePermissionMode: runtimeProviderForUiProvider(normalized.provider) === "opencode" ? normalized.opencodePermissionMode : undefined,
       droidPermissionMode: normalized.provider === "droid" ? normalized.droidPermissionMode : undefined,
       cursorModeId: normalized.provider === "cursor" ? normalized.cursorModeId : undefined,
       cursorConfigValues: normalized.provider === "cursor" ? normalized.cursorConfigValues : undefined,
@@ -10501,7 +10502,7 @@ export function AdeCodeApp({ project, forceEmbedded, requireSocket, socketPath,
       }));
       return;
     }
-    if (modelState.provider === "opencode") {
+    if (runtimeProviderForUiProvider(modelState.provider) === "opencode") {
       const index = Math.max(0, OPENCODE_PERMISSION_OPTIONS.findIndex((entry) => entry === modelState.opencodePermissionMode));
       const next = OPENCODE_PERMISSION_OPTIONS[(index + delta + OPENCODE_PERMISSION_OPTIONS.length) % OPENCODE_PERMISSION_OPTIONS.length] ?? "edit";
       applyModelState((prev) => ({ ...prev, opencodePermissionMode: next, permissionMode: next }));