diff --git a/.gitignore b/.gitignore
index bdedfe006..7ce8fdca2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,5 @@ __screenshots__/
 /browser-sidebar-comment-preload.js.map
 /preload.js.map
 /bootstrap.js.map
+/.teacode/
+/.teacode-*/
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 00242c719..8a0124a74 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/desktop",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "private": true,
   "main": "dist-electron/main.js",
   "scripts": {
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index d12d21b85..103c97440 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -1106,12 +1106,6 @@ function configureApplicationMenu(): void {
     {
       label: "View",
       submenu: [
-        {
-          label: "New Terminal Tab",
-          ...acceleratorProps("CmdOrCtrl+T"),
-          click: () => dispatchMenuAction("new-terminal-tab"),
-        },
-        { type: "separator" },
         {
           label: "Toggle Sidebar",
           ...acceleratorProps("CmdOrCtrl+B"),
@@ -2562,12 +2556,12 @@ function getIconOption(): { icon: string } | Record<string, never> {
 // transparent (`#00000000`) over the vibrancy material. Windows/Linux have no vibrancy:
 // a transparent window there leaves backdrop-filter surfaces bleeding through and, on
 // fractional DPI, rendering blurry. So off macOS we create an opaque window and skip the
-// macOS-only options. The background tracks the OS light/dark appearance purely to avoid
-// a bright flash before the renderer paints — the window is shown only after first paint
-// (`show: false`), so this color is not expected to match a custom in-app theme exactly.
+// macOS-only options. The background is a fixed dark tone purely to avoid a flash before
+// the renderer paints — the app is dark-only, and the window is shown only after first
+// paint (`show: false`), so this color need not match the in-app surface exactly.
 function getWindowMaterialOptions(): BrowserWindowConstructorOptions {
   if (process.platform !== "darwin") {
-    return { backgroundColor: nativeTheme.shouldUseDarkColors ? "#181818" : "#ffffff" };
+    return { backgroundColor: "#181818" };
   }
   return {
     vibrancy: "under-window",
@@ -2599,6 +2593,9 @@ function getTitleBarOptions(): BrowserWindowConstructorOptions {
 }
 
 function createWindow(): BrowserWindow {
+  // Let the renderer decide the theme via the setTheme IPC call.
+  // Start with system default; the renderer will override on first paint.
+
   const window = new BrowserWindow({
     width: 1100,
     height: 780,
diff --git a/apps/server/package.json b/apps/server/package.json
index 473b72592..748cfdfca 100644
--- a/apps/server/package.json
+++ b/apps/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "t3",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/apps/server/src/keybindings.test.ts b/apps/server/src/keybindings.test.ts
index 6faa6f478..35fcfaca1 100644
--- a/apps/server/src/keybindings.test.ts
+++ b/apps/server/src/keybindings.test.ts
@@ -77,12 +77,12 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
     Effect.sync(() => {
       const compiled = compileResolvedKeybindingRule({
         key: "mod+d",
-        command: "terminal.split",
+        command: "chat.split",
         when: "terminalOpen && !terminalFocus",
       });
 
       assert.deepEqual(compiled, {
-        command: "terminal.split",
+        command: "chat.split",
         shortcut: {
           key: "d",
           metaKey: false,
@@ -106,7 +106,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
   it.effect("encodes resolved plus-key shortcuts", () =>
     Effect.gen(function* () {
       const encoded = yield* Schema.encodeEffect(ResolvedKeybindingFromConfig)({
-        command: "terminal.toggle",
+        command: "sidebar.toggle",
         shortcut: {
           key: "+",
           metaKey: false,
@@ -118,7 +118,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       });
 
       assert.equal(encoded.key, "mod++");
-      assert.equal(encoded.command, "terminal.toggle");
+      assert.equal(encoded.command, "sidebar.toggle");
     }),
   );
 
@@ -127,14 +127,14 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       assert.isNull(
         compileResolvedKeybindingRule({
           key: "mod+shift+d+o",
-          command: "terminal.new",
+          command: "chat.new",
         }),
       );
 
       assert.isNull(
         compileResolvedKeybindingRule({
           key: "mod+d",
-          command: "terminal.split",
+          command: "chat.split",
           when: "terminalFocus && (",
         }),
       );
@@ -142,7 +142,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       assert.isNull(
         compileResolvedKeybindingRule({
           key: "mod+d",
-          command: "terminal.split",
+          command: "chat.split",
           when: `${"!".repeat(300)}terminalFocus`,
         }),
       );
@@ -258,7 +258,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       const { keybindingsConfigPath } = yield* ServerConfig;
       yield* fs.writeFileString(
         keybindingsConfigPath,
-        JSON.stringify({ keybindings: [{ key: "mod+9", command: "terminal.toggle" }] }),
+        JSON.stringify({ keybindings: [{ key: "mod+9", command: "sidebar.toggle" }] }),
       );
 
       const configState = yield* Effect.gen(function* () {
@@ -268,7 +268,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       assert.deepEqual(configState.issues, []);
       assert.isTrue(
         configState.keybindings.some(
-          (entry) => entry.command === "terminal.toggle" && entry.shortcut.key === "9",
+          (entry) => entry.command === "sidebar.toggle" && entry.shortcut.key === "9",
         ),
       );
 
@@ -279,7 +279,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
 
       const persisted = yield* readKeybindingsConfig(keybindingsConfigPath);
       assert.isTrue(
-        persisted.some((entry) => entry.key === "mod+9" && entry.command === "terminal.toggle"),
+        persisted.some((entry) => entry.key === "mod+9" && entry.command === "sidebar.toggle"),
       );
     }).pipe(Effect.provide(makeKeybindingsLayer())),
   );
@@ -290,7 +290,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       const { keybindingsConfigPath } = yield* ServerConfig;
       yield* fs.writeFileString(
         keybindingsConfigPath,
-        '{"key":"mod+9","command":"terminal.toggle"}',
+        '{"key":"mod+9","command":"sidebar.toggle"}',
       );
 
       const configState = yield* Effect.gen(function* () {
@@ -300,7 +300,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       assert.deepEqual(configState.issues, []);
       assert.isTrue(
         configState.keybindings.some(
-          (entry) => entry.command === "terminal.toggle" && entry.shortcut.key === "9",
+          (entry) => entry.command === "sidebar.toggle" && entry.shortcut.key === "9",
         ),
       );
     }).pipe(Effect.provide(makeKeybindingsLayer())),
@@ -333,8 +333,8 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       yield* fs.writeFileString(
         keybindingsConfigPath,
         JSON.stringify([
-          { key: "mod+j", command: "terminal.toggle" },
-          { key: "mod+shift+d+o", command: "terminal.new" },
+          { key: "mod+j", command: "sidebar.toggle" },
+          { key: "mod+shift+d+o", command: "chat.new" },
           { key: "mod+x", command: "invalid.command" },
         ]),
       );
@@ -344,7 +344,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
         return yield* keybindings.loadConfigState;
       });
 
-      assert.isTrue(configState.keybindings.some((entry) => entry.command === "terminal.toggle"));
+      assert.isTrue(configState.keybindings.some((entry) => entry.command === "sidebar.toggle"));
       assert.isFalse(
         configState.keybindings.some((entry) => String(entry.command) === "invalid.command"),
       );
@@ -448,7 +448,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       // including one the user rebound to a custom key, plus a non-creation command.
       yield* writeKeybindingsConfig(keybindingsConfigPath, [
         { key: "mod+n", command: "chat.new", when: "!terminalFocus" },
-        { key: "mod+shift+k", command: "chat.newTerminal", when: "!terminalFocus" },
+        { key: "mod+shift+k", command: "chat.newChat", when: "!terminalFocus" },
         { key: "mod+shift+u", command: "settings.usage", when: "!terminalFocus" },
       ]);
 
@@ -471,7 +471,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
         persisted.some(
           (entry) =>
             entry.key === "mod+shift+k" &&
-            entry.command === "chat.newTerminal" &&
+            entry.command === "chat.newChat" &&
             entry.when === "!terminalFocus || isMac",
         ),
       );
@@ -596,7 +596,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       Effect.gen(function* () {
         const { keybindingsConfigPath } = yield* ServerConfig;
         yield* writeKeybindingsConfig(keybindingsConfigPath, [
-          { key: "mod+shift+t", command: "terminal.toggle" },
+          { key: "mod+shift+t", command: "sidebar.toggle" },
           { key: "mod+shift+r", command: "script.run-tests.run" },
         ]);
 
@@ -608,17 +608,13 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
         const persisted = yield* readKeybindingsConfig(keybindingsConfigPath);
         const byCommand = new Map(persisted.map((entry) => [entry.command, entry]));
 
-        const persistedToggle = byCommand.get("terminal.toggle");
+        const persistedToggle = byCommand.get("sidebar.toggle");
         assert.isNotNull(persistedToggle);
         assert.equal(persistedToggle?.key, "mod+shift+t");
         assert.isFalse(
-          persisted.some((entry) => entry.command === "terminal.toggle" && entry.key === "mod+j"),
+          persisted.some((entry) => entry.command === "sidebar.toggle" && entry.key === "mod+b"),
         );
 
-        const persistedNewTerminalThread = byCommand.get("chat.newTerminal");
-        assert.isNotNull(persistedNewTerminalThread);
-        assert.equal(persistedNewTerminalThread?.key, "mod+shift+t");
-
         for (const defaultRule of DEFAULT_KEYBINDINGS) {
           assert.isTrue(byCommand.has(defaultRule.command), `expected ${defaultRule.command}`);
         }
@@ -635,7 +631,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
     return Effect.gen(function* () {
       const { keybindingsConfigPath } = yield* ServerConfig;
       yield* writeKeybindingsConfig(keybindingsConfigPath, [
-        { key: "mod+j", command: "script.custom-action.run" },
+        { key: "mod+b", command: "script.custom-action.run" },
       ]);
 
       yield* Effect.gen(function* () {
@@ -644,7 +640,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       });
 
       const persisted = yield* readKeybindingsConfig(keybindingsConfigPath);
-      assert.isFalse(persisted.some((entry) => entry.command === "terminal.toggle"));
+      assert.isFalse(persisted.some((entry) => entry.command === "sidebar.toggle"));
       assert.isTrue(persisted.some((entry) => entry.command === "script.custom-action.run"));
 
       assert.isTrue(
@@ -666,7 +662,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
     Effect.gen(function* () {
       const { keybindingsConfigPath } = yield* ServerConfig;
       yield* writeKeybindingsConfig(keybindingsConfigPath, [
-        { key: "mod+j", command: "terminal.toggle" },
+        { key: "mod+j", command: "sidebar.toggle" },
       ]);
 
       const resolved = yield* Effect.gen(function* () {
@@ -681,7 +677,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       const persistedView = persisted.map(({ key, command }) => ({ key, command }));
 
       assert.deepEqual(persistedView, [
-        { key: "mod+j", command: "terminal.toggle" },
+        { key: "mod+j", command: "sidebar.toggle" },
         { key: "mod+shift+r", command: "script.run-tests.run" },
       ]);
       assert.isTrue(resolved.some((entry) => entry.command === "script.run-tests.run"));
@@ -761,7 +757,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       const { keybindingsConfigPath } = yield* ServerConfig;
       const { dirname } = yield* Path.Path;
       yield* writeKeybindingsConfig(keybindingsConfigPath, [
-        { key: "mod+j", command: "terminal.toggle" },
+        { key: "mod+j", command: "sidebar.toggle" },
       ]);
       yield* fs.chmod(dirname(keybindingsConfigPath), 0o500);
 
@@ -778,7 +774,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
 
       const persisted = yield* readKeybindingsConfig(keybindingsConfigPath);
       const persistedView = persisted.map(({ key, command }) => ({ key, command }));
-      assert.deepEqual(persistedView, [{ key: "mod+j", command: "terminal.toggle" }]);
+      assert.deepEqual(persistedView, [{ key: "mod+j", command: "sidebar.toggle" }]);
     }).pipe(Effect.provide(makeKeybindingsLayer())),
   );
 
@@ -786,7 +782,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
     Effect.gen(function* () {
       const { keybindingsConfigPath } = yield* ServerConfig;
       yield* writeKeybindingsConfig(keybindingsConfigPath, [
-        { key: "mod+j", command: "terminal.toggle" },
+        { key: "mod+j", command: "sidebar.toggle" },
       ]);
 
       const [first, second] = yield* Effect.gen(function* () {
@@ -797,7 +793,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       });
 
       assert.deepEqual(first, second);
-      assert.isTrue(second.some((entry) => entry.command === "terminal.toggle"));
+      assert.isTrue(second.some((entry) => entry.command === "sidebar.toggle"));
     }).pipe(Effect.provide(makeKeybindingsLayer())),
   );
 
@@ -805,7 +801,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
     Effect.gen(function* () {
       const { keybindingsConfigPath } = yield* ServerConfig;
       yield* writeKeybindingsConfig(keybindingsConfigPath, [
-        { key: "mod+j", command: "terminal.toggle" },
+        { key: "mod+j", command: "sidebar.toggle" },
       ]);
 
       const loadedAfterUpsert = yield* Effect.gen(function* () {
@@ -819,7 +815,7 @@ it.layer(NodeServices.layer)("keybindings", (it) => {
       });
 
       assert.isTrue(loadedAfterUpsert.some((entry) => entry.command === "script.run-tests.run"));
-      assert.isTrue(loadedAfterUpsert.some((entry) => entry.command === "terminal.toggle"));
+      assert.isTrue(loadedAfterUpsert.some((entry) => entry.command === "sidebar.toggle"));
     }).pipe(Effect.provide(makeKeybindingsLayer())),
   );
 
diff --git a/apps/server/src/keybindings.ts b/apps/server/src/keybindings.ts
index 4fa903839..a52f6f303 100644
--- a/apps/server/src/keybindings.ts
+++ b/apps/server/src/keybindings.ts
@@ -65,31 +65,18 @@ type WhenToken =
   | { type: "rparen" };
 
 export const DEFAULT_KEYBINDINGS: ReadonlyArray<KeybindingRule> = [
-  { key: "mod+b", command: "sidebar.toggle", when: "!terminalFocus" },
-  { key: "mod+alt+b", command: "rightPanel.toggle", when: "!terminalFocus" },
+  { key: "mod+b", command: "sidebar.toggle" },
+  { key: "mod+alt+b", command: "rightPanel.toggle" },
   { key: "mod+k", command: "sidebar.search" },
-  { key: "mod+shift+o", command: "sidebar.addProject", when: "!terminalFocus" },
-  { key: "mod+i", command: "sidebar.importThread", when: "!terminalFocus" },
-  { key: "mod+j", command: "terminal.toggle" },
-  { key: "mod+d", command: "terminal.split", when: "terminalFocus" },
-  { key: "mod+shift+arrowright", command: "terminal.splitRight", when: "terminalFocus" },
-  { key: "mod+shift+arrowleft", command: "terminal.splitLeft", when: "terminalFocus" },
-  { key: "mod+shift+arrowdown", command: "terminal.splitDown", when: "terminalFocus" },
-  { key: "mod+shift+arrowup", command: "terminal.splitUp", when: "terminalFocus" },
-  // Reserve Cmd/Ctrl+T for the terminal workspace's "new tab" action while focused.
-  { key: "mod+t", command: "terminal.new", when: "terminalFocus" },
-  { key: "mod+w", command: "terminal.close", when: "terminalFocus" },
-  { key: "mod+shift+j", command: "terminal.workspace.newFullWidth" },
-  { key: "mod+w", command: "terminal.workspace.closeActive", when: "terminalWorkspaceOpen" },
-  { key: "mod+1", command: "terminal.workspace.terminal", when: "terminalWorkspaceOpen" },
-  { key: "mod+2", command: "terminal.workspace.chat", when: "terminalWorkspaceOpen" },
-  { key: "mod+shift+b", command: "browser.toggle", when: "!terminalFocus" },
-  { key: "mod+d", command: "diff.toggle", when: "!terminalFocus" },
+  { key: "mod+shift+o", command: "sidebar.addProject" },
+  { key: "mod+i", command: "sidebar.importThread" },
+  { key: "mod+shift+b", command: "browser.toggle" },
+  { key: "mod+d", command: "diff.toggle" },
   // Cmd-only instead of mod so Ctrl+L remains available to shells on non-macOS.
-  { key: "cmd+l", command: "composer.focus.toggle", when: "!terminalFocus" },
-  { key: "mod+shift+m", command: "modelPicker.toggle", when: "!terminalFocus" },
-  { key: "mod+shift+e", command: "traitsPicker.toggle", when: "!terminalFocus" },
-  { key: "mod+shift+u", command: "settings.usage", when: "!terminalFocus" },
+  { key: "cmd+l", command: "composer.focus.toggle" },
+  { key: "mod+shift+m", command: "modelPicker.toggle" },
+  { key: "mod+shift+e", command: "traitsPicker.toggle" },
+  { key: "mod+shift+u", command: "settings.usage" },
   // New thread (chat.new) is the primary create action; it falls back to the most
   // recent project when no project is active.
   //
@@ -98,25 +85,24 @@ export const DEFAULT_KEYBINDINGS: ReadonlyArray<KeybindingRule> = [
   // dropped the chord while the terminal had focus (you couldn't open a new chat/terminal
   // from the terminal). The `|| isMac` escape hatch fires them on macOS regardless of
   // focus, while Linux/Windows keep `!terminalFocus` so Ctrl-chords still reach the shell.
-  { key: "mod+n", command: "chat.new", when: "!terminalFocus || isMac" },
-  { key: "mod+shift+n", command: "chat.newLatestProject", when: "!terminalFocus || isMac" },
-  { key: "mod+alt+n", command: "chat.newChat", when: "!terminalFocus || isMac" },
-  { key: "mod+shift+t", command: "chat.newTerminal", when: "!terminalFocus || isMac" },
-  { key: "mod+alt+c", command: "chat.newClaude", when: "!terminalFocus || isMac" },
-  { key: "mod+alt+x", command: "chat.newCodex", when: "!terminalFocus || isMac" },
-  { key: "mod+alt+r", command: "chat.newCursor", when: "!terminalFocus || isMac" },
-  { key: "mod+\\", command: "chat.split", when: "!terminalFocus || isMac" },
-  { key: "mod+1", command: "thread.jump.1", when: "!terminalFocus && !terminalWorkspaceOpen" },
-  { key: "mod+2", command: "thread.jump.2", when: "!terminalFocus && !terminalWorkspaceOpen" },
-  { key: "mod+3", command: "thread.jump.3", when: "!terminalFocus && !terminalWorkspaceOpen" },
-  { key: "mod+4", command: "thread.jump.4", when: "!terminalFocus && !terminalWorkspaceOpen" },
-  { key: "mod+5", command: "thread.jump.5", when: "!terminalFocus && !terminalWorkspaceOpen" },
-  { key: "mod+6", command: "thread.jump.6", when: "!terminalFocus && !terminalWorkspaceOpen" },
-  { key: "mod+7", command: "thread.jump.7", when: "!terminalFocus && !terminalWorkspaceOpen" },
-  { key: "mod+8", command: "thread.jump.8", when: "!terminalFocus && !terminalWorkspaceOpen" },
-  { key: "mod+9", command: "thread.jump.9", when: "!terminalFocus && !terminalWorkspaceOpen" },
-  { key: "mod+shift+]", command: "chat.visible.next", when: "!terminalFocus" },
-  { key: "mod+shift+[", command: "chat.visible.previous", when: "!terminalFocus" },
+  { key: "mod+n", command: "chat.new" },
+  { key: "mod+shift+n", command: "chat.newLatestProject" },
+  { key: "mod+alt+n", command: "chat.newChat" },
+  { key: "mod+alt+c", command: "chat.newClaude" },
+  { key: "mod+alt+x", command: "chat.newCodex" },
+  { key: "mod+alt+r", command: "chat.newCursor" },
+  { key: "mod+\\", command: "chat.split" },
+  { key: "mod+1", command: "thread.jump.1" },
+  { key: "mod+2", command: "thread.jump.2" },
+  { key: "mod+3", command: "thread.jump.3" },
+  { key: "mod+4", command: "thread.jump.4" },
+  { key: "mod+5", command: "thread.jump.5" },
+  { key: "mod+6", command: "thread.jump.6" },
+  { key: "mod+7", command: "thread.jump.7" },
+  { key: "mod+8", command: "thread.jump.8" },
+  { key: "mod+9", command: "thread.jump.9" },
+  { key: "mod+shift+]", command: "chat.visible.next" },
+  { key: "mod+shift+[", command: "chat.visible.previous" },
   { key: "mod+o", command: "editor.openFavorite" },
 ];
 
@@ -576,7 +562,6 @@ const CREATION_COMMANDS_WITH_TERMINAL_ESCAPE = new Set<KeybindingRule["command"]
   "chat.newLatestProject",
   "chat.newChat",
   "chat.newLocal",
-  "chat.newTerminal",
   "chat.newClaude",
   "chat.newCodex",
   "chat.newCursor",
diff --git a/apps/server/src/wsRpc.ts b/apps/server/src/wsRpc.ts
index e43cd451c..a8c6824fb 100644
--- a/apps/server/src/wsRpc.ts
+++ b/apps/server/src/wsRpc.ts
@@ -3,7 +3,6 @@ import { stat as statPath } from "node:fs/promises";
 
 import {
   CommandId,
-  DEFAULT_TERMINAL_ID,
   ORCHESTRATION_WS_METHODS,
   ThreadId,
   WS_METHODS,
@@ -66,8 +65,6 @@ import { ServerEnvironment } from "./environment/Services/ServerEnvironment";
 import { ServerLifecycleEvents } from "./serverLifecycleEvents";
 import { ServerRuntimeStartup } from "./serverRuntimeStartup";
 import { ServerSettingsService } from "./serverSettings";
-import { TerminalManager } from "./terminal/Services/Manager";
-import { TerminalThreadTitleTracker } from "./terminal/terminalThreadTitleTracker";
 import { WorkspaceEntries } from "./workspace/Services/WorkspaceEntries";
 import { WorkspaceFileSystem } from "./workspace/Services/WorkspaceFileSystem";
 import { WorkspaceManager } from "./workspace/Services/WorkspaceManager";
@@ -379,7 +376,6 @@ export const makeWsRpcLayer = () =>
       const runtimeStartup = yield* ServerRuntimeStartup;
       const serverEnvironment = yield* ServerEnvironment;
       const serverSettings = yield* ServerSettingsService;
-      const terminalManager = yield* TerminalManager;
       const textGeneration = yield* TextGeneration;
       const workspaceEntries = yield* WorkspaceEntries;
       const workspaceFileSystem = yield* WorkspaceFileSystem;
@@ -477,40 +473,6 @@ export const makeWsRpcLayer = () =>
         providerSessionDirectory,
       });
 
-      // Terminal-first threads are created with the generic "New terminal" placeholder.
-      // The tracker buffers per-terminal input and, once a meaningful command is submitted,
-      // surfaces a safe title used to auto-rename the thread on its first command.
-      const terminalTitleTracker = new TerminalThreadTitleTracker();
-      const resetTerminalTitleBuffer = (threadId: string, terminalId: string | null) =>
-        Effect.sync(() => terminalTitleTracker.reset(threadId, terminalId));
-      // Terminal auto-titles are best-effort metadata and must never block or fail terminal writes.
-      const maybeAutoRenameTerminalThread = Effect.fnUntraced(function* (input: {
-        threadId: string;
-        terminalId: string;
-        data: string;
-      }) {
-        const readModel = yield* orchestrationEngine.getReadModel();
-        const thread = readModel.threads.find((entry) => entry.id === input.threadId);
-        if (!thread) {
-          return;
-        }
-        const nextTitle = terminalTitleTracker.consumeWrite({
-          currentTitle: thread.title,
-          data: input.data,
-          terminalId: input.terminalId,
-          threadId: input.threadId,
-        });
-        if (!nextTitle) {
-          return;
-        }
-        yield* orchestrationEngine.dispatch({
-          type: "thread.meta.update",
-          commandId: CommandId.makeUnsafe(`server:terminal-title-rename:${crypto.randomUUID()}`),
-          threadId: ThreadId.makeUnsafe(input.threadId),
-          title: nextTitle,
-        });
-      });
-
       const stopLocalServerAndTrackedProjectRun = Effect.fnUntraced(function* (input: {
         pid: number;
         port: number;
@@ -1135,58 +1097,6 @@ export const makeWsRpcLayer = () =>
         [WS_METHODS.workspaceHandoffThread]: (input) =>
           rpcEffect(handoffThreadWorkspace(input), "Failed to hand off the thread workspace"),
 
-        [WS_METHODS.terminalOpen]: (input) =>
-          rpcEffect(
-            resetTerminalTitleBuffer(input.threadId, input.terminalId ?? DEFAULT_TERMINAL_ID).pipe(
-              Effect.andThen(terminalManager.open(input)),
-            ),
-            "Failed to open terminal",
-          ),
-        [WS_METHODS.terminalWrite]: (input) =>
-          rpcEffect(
-            terminalManager.write(input).pipe(
-              Effect.tap(() =>
-                maybeAutoRenameTerminalThread({
-                  threadId: input.threadId,
-                  terminalId: input.terminalId ?? DEFAULT_TERMINAL_ID,
-                  data: input.data,
-                }).pipe(Effect.catch(() => Effect.void)),
-              ),
-            ),
-            "Failed to write terminal",
-          ),
-        [WS_METHODS.terminalAckOutput]: (input) =>
-          rpcEffect(terminalManager.ackOutput(input), "Failed to acknowledge terminal output"),
-        [WS_METHODS.terminalResize]: (input) =>
-          rpcEffect(terminalManager.resize(input), "Failed to resize terminal"),
-        [WS_METHODS.terminalClear]: (input) =>
-          rpcEffect(terminalManager.clear(input), "Failed to clear terminal"),
-        [WS_METHODS.terminalRestart]: (input) =>
-          rpcEffect(
-            resetTerminalTitleBuffer(input.threadId, input.terminalId ?? DEFAULT_TERMINAL_ID).pipe(
-              Effect.andThen(terminalManager.restart(input)),
-            ),
-            "Failed to restart terminal",
-          ),
-        [WS_METHODS.terminalClose]: (input) =>
-          rpcEffect(
-            resetTerminalTitleBuffer(input.threadId, input.terminalId ?? null).pipe(
-              Effect.andThen(terminalManager.close(input)),
-            ),
-            "Failed to close terminal",
-          ),
-        [WS_METHODS.subscribeTerminalEvents]: () =>
-          // Terminal output is an ordered byte stream with renderer ACK accounting.
-          // Keep this lossless: dropping chunks would create holes until reattach.
-          Stream.callback((queue) =>
-            Effect.gen(function* () {
-              const unsubscribe = yield* terminalManager.subscribe((event) => {
-                Effect.runFork(Queue.offer(queue, event).pipe(Effect.asVoid));
-              });
-              yield* Effect.addFinalizer(() => Effect.sync(unsubscribe));
-            }),
-          ),
-
         [WS_METHODS.serverGetConfig]: () =>
           rpcEffect(loadServerConfig, "Failed to load server config"),
         [WS_METHODS.serverGetEnvironment]: () =>
diff --git a/apps/web/package.json b/apps/web/package.json
index 2ac1ccc19..b8a6820c8 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/web",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/apps/web/src/appSettings.test.ts b/apps/web/src/appSettings.test.ts
index 228069a67..0f3164bb1 100644
--- a/apps/web/src/appSettings.test.ts
+++ b/apps/web/src/appSettings.test.ts
@@ -668,7 +668,6 @@ describe("AppSettingsSchema", () => {
       ),
     ).toMatchObject({
       claudeBinaryPath: "",
-      uiDensity: "comfortable",
       chatFontSizePx: DEFAULT_CHAT_FONT_SIZE_PX,
       codexBinaryPath: "/usr/local/bin/codex",
       codexHomePath: "",
diff --git a/apps/web/src/appSettings.ts b/apps/web/src/appSettings.ts
index 09a9861c4..076b5ce1c 100644
--- a/apps/web/src/appSettings.ts
+++ b/apps/web/src/appSettings.ts
@@ -40,16 +40,14 @@ import {
 import { ensureNativeApi } from "./nativeApi";
 import { providerDiscoveryQueryKeys } from "./lib/providerDiscoveryReactQuery";
 import { serverQueryKeys, serverSettingsQueryOptions } from "./lib/serverReactQuery";
-import {
-  DEFAULT_UI_DENSITY,
-  UI_DENSITY_MODES,
-  normalizeUiDensity as normalizeUiDensityValue,
-} from "./lib/appDensity";
 
 const APP_SETTINGS_STORAGE_KEY = "teacode:app-settings:v1";
 const SERVER_SETTINGS_MIGRATION_STORAGE_KEY = "t3code:server-settings-migrated:v1";
 const MAX_CUSTOM_MODEL_COUNT = 32;
 export const MAX_CUSTOM_MODEL_LENGTH = 256;
+export const MIN_WINDOW_TRANSPARENCY = 0;
+export const MAX_WINDOW_TRANSPARENCY = 30;
+export const DEFAULT_WINDOW_TRANSPARENCY = 20;
 export const MIN_CHAT_FONT_SIZE_PX = 11;
 export const MAX_CHAT_FONT_SIZE_PX = 18;
 export const DEFAULT_CHAT_FONT_SIZE_PX = 14;
@@ -71,17 +69,10 @@ export const SidebarPosition = Schema.Literals(["left", "right"]);
 export type SidebarPosition = typeof SidebarPosition.Type;
 export const DEFAULT_SIDEBAR_POSITION: SidebarPosition = "left";
 /** Optional decorative image behind the main chat canvas. */
-export const AppBackground = Schema.Literals(["none", "london", "rio", "sf", "tokyo"]);
-export type AppBackground = typeof AppBackground.Type;
-export const DEFAULT_APP_BACKGROUND: AppBackground = "none";
 export const TaskListDisplayMode = Schema.Literals(["sidebar", "composer"]);
 export type TaskListDisplayMode = typeof TaskListDisplayMode.Type;
 export const DEFAULT_TASK_LIST_DISPLAY_MODE: TaskListDisplayMode = "sidebar";
 
-export const UiDensity = Schema.Literals(UI_DENSITY_MODES);
-export type UiDensity = typeof UiDensity.Type;
-export { DEFAULT_UI_DENSITY };
-
 export const ChatHeaderControlIdSchema = Schema.Literals(DEFAULT_CHAT_HEADER_CONTROL_ORDER);
 
 export function getDefaultNativeFontSmoothing(platform = globalThis.navigator?.platform ?? "") {
@@ -131,10 +122,11 @@ const withDefaults =
 
 export const AppSettingsSchema = Schema.Struct({
   claudeBinaryPath: Schema.String.check(Schema.isMaxLength(4096)).pipe(withDefaults(() => "")),
-  uiDensity: UiDensity.pipe(withDefaults(() => DEFAULT_UI_DENSITY)),
   // Default color applied when highlighting selected transcript text.
   highlightColor: ThreadMarkerColor.pipe(withDefaults(() => "yellow" as const)),
   chatFontSizePx: Schema.Number.pipe(withDefaults(() => DEFAULT_CHAT_FONT_SIZE_PX)),
+  /** How much of the desktop shows through the window canvas, as a percentage. */
+  windowTransparency: Schema.Number.pipe(withDefaults(() => DEFAULT_WINDOW_TRANSPARENCY)),
   terminalFontSizePx: Schema.Number.pipe(withDefaults(() => DEFAULT_TERMINAL_FONT_SIZE_PX)),
   codexBinaryPath: Schema.String.check(Schema.isMaxLength(4096)).pipe(withDefaults(() => "")),
   codexHomePath: Schema.String.check(Schema.isMaxLength(4096)).pipe(withDefaults(() => "")),
@@ -176,7 +168,6 @@ export const AppSettingsSchema = Schema.Struct({
     withDefaults(() => DEFAULT_SIDEBAR_THREAD_SORT_ORDER),
   ),
   sidebarPosition: SidebarPosition.pipe(withDefaults(() => DEFAULT_SIDEBAR_POSITION)),
-  appBackground: AppBackground.pipe(withDefaults(() => DEFAULT_APP_BACKGROUND)),
   timestampFormat: TimestampFormat.pipe(withDefaults(() => DEFAULT_TIMESTAMP_FORMAT)),
   customCodexModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
   customClaudeModels: Schema.Array(Schema.String).pipe(withDefaults(() => [])),
@@ -322,6 +313,14 @@ export function normalizeCustomModelSlugs(
   return normalizedModels;
 }
 
+export function normalizeWindowTransparency(value: number | null | undefined): number {
+  if (typeof value !== "number" || !Number.isFinite(value)) {
+    return DEFAULT_WINDOW_TRANSPARENCY;
+  }
+
+  return Math.min(MAX_WINDOW_TRANSPARENCY, Math.max(MIN_WINDOW_TRANSPARENCY, Math.round(value)));
+}
+
 export function normalizeChatFontSizePx(value: number | null | undefined): number {
   if (typeof value !== "number" || !Number.isFinite(value)) {
     return DEFAULT_CHAT_FONT_SIZE_PX;
@@ -365,8 +364,8 @@ function normalizeAppSettings(settings: AppSettings): AppSettings {
       settings.openCodeBinaryPath,
     ),
     piBinaryPath: normalizeProviderBinaryPathOverride("pi", settings.piBinaryPath),
-    uiDensity: normalizeUiDensityValue(settings.uiDensity),
     chatFontSizePx: normalizeChatFontSizePx(settings.chatFontSizePx),
+    windowTransparency: normalizeWindowTransparency(settings.windowTransparency),
     terminalFontSizePx: normalizeTerminalFontSizePx(settings.terminalFontSizePx),
     customCodexModels: normalizeCustomModelSlugs(settings.customCodexModels, "codex"),
     customClaudeModels: normalizeCustomModelSlugs(settings.customClaudeModels, "claudeAgent"),
diff --git a/apps/web/src/chatHeaderLayout.test.ts b/apps/web/src/chatHeaderLayout.test.ts
index da2a8a2d2..19fa699a6 100644
--- a/apps/web/src/chatHeaderLayout.test.ts
+++ b/apps/web/src/chatHeaderLayout.test.ts
@@ -29,26 +29,25 @@ describe("chatHeaderLayout", () => {
   });
 
   it("rejects unknown control ids", () => {
-    expect(isChatHeaderControlId("diff")).toBe(true);
+    expect(isChatHeaderControlId("gitActions")).toBe(true);
     expect(isChatHeaderControlId("bogus")).toBe(false);
   });
 
   it("dedupes and drops unknown ids from the hidden set", () => {
-    expect(normalizeHiddenChatHeaderControls(["bogus", "diff", "diff", "usage"])).toEqual([
-      "diff",
-      "usage",
-    ]);
+    expect(
+      normalizeHiddenChatHeaderControls(["bogus", "gitActions", "gitActions", "usage"]),
+    ).toEqual(["gitActions", "usage"]);
   });
 
   it("dedupes and drops unknown ids from a persisted order", () => {
-    expect(normalizeChatHeaderControlOrder(["diff", "bogus", "diff", "usage"]).slice(0, 2)).toEqual(
-      ["diff", "usage"],
-    );
+    expect(
+      normalizeChatHeaderControlOrder(["gitActions", "bogus", "gitActions", "usage"]).slice(0, 2),
+    ).toEqual(["gitActions", "usage"]);
   });
 
   it("appends controls missing from a stale persisted order", () => {
-    const stale = normalizeChatHeaderControlOrder(["diff", "usage"]);
-    expect(stale.slice(0, 2)).toEqual(["diff", "usage"]);
+    const stale = normalizeChatHeaderControlOrder(["gitActions", "usage"]);
+    expect(stale.slice(0, 2)).toEqual(["gitActions", "usage"]);
     expect(new Set(stale)).toEqual(new Set(ALL_CHAT_HEADER_CONTROL_IDS));
     expect(stale).toHaveLength(ALL_CHAT_HEADER_CONTROL_IDS.length);
   });
@@ -60,25 +59,17 @@ describe("chatHeaderLayout", () => {
         DEFAULT_CHAT_HEADER_CONTROL_ORDER,
       ),
     ).toBe(true);
-    expect(sameChatHeaderControlOrder(["diff"], ["usage"])).toBe(false);
+    expect(sameChatHeaderControlOrder(["handoff"], ["usage"])).toBe(false);
   });
 
   it("sorts by the configured order and pushes unlisted controls last", () => {
-    const order: ChatHeaderControlId[] = ["diff", "usage"];
-    expect(compareChatHeaderControlsByOrder(order, "diff", "usage")).toBeLessThan(0);
+    const order: ChatHeaderControlId[] = ["gitActions", "usage"];
+    expect(compareChatHeaderControlsByOrder(order, "gitActions", "usage")).toBeLessThan(0);
     expect(compareChatHeaderControlsByOrder(order, "usage", "handoff")).toBeLessThan(0);
     expect(
       DEFAULT_CHAT_HEADER_CONTROL_ORDER.toSorted((left, right) =>
         compareChatHeaderControlsByOrder(order, left, right),
       ),
-    ).toEqual([
-      "diff",
-      "usage",
-      "handoff",
-      "projectScripts",
-      "environment",
-      "openIn",
-      "gitActions",
-    ]);
+    ).toEqual(["gitActions", "usage", "handoff", "projectScripts", "environment", "openIn"]);
   });
 });
diff --git a/apps/web/src/chatHeaderLayout.ts b/apps/web/src/chatHeaderLayout.ts
index d44bb1150..370a9ae0b 100644
--- a/apps/web/src/chatHeaderLayout.ts
+++ b/apps/web/src/chatHeaderLayout.ts
@@ -9,8 +9,7 @@ export type ChatHeaderControlId =
   | "projectScripts"
   | "environment"
   | "openIn"
-  | "gitActions"
-  | "diff";
+  | "gitActions";
 
 export const DEFAULT_CHAT_HEADER_CONTROL_ORDER = [
   "usage",
@@ -19,7 +18,6 @@ export const DEFAULT_CHAT_HEADER_CONTROL_ORDER = [
   "environment",
   "openIn",
   "gitActions",
-  "diff",
 ] as const satisfies readonly ChatHeaderControlId[];
 
 export const CHAT_HEADER_CONTROL_LABELS: Record<
@@ -50,10 +48,6 @@ export const CHAT_HEADER_CONTROL_LABELS: Record<
     title: "Git actions",
     description: "Commit, push, and pull request shortcuts.",
   },
-  diff: {
-    title: "Diff panel",
-    description: "Toggle the diff panel and the +/- change count.",
-  },
 };
 
 const CHAT_HEADER_CONTROL_ID_SET: ReadonlySet<ChatHeaderControlId> = new Set(
diff --git a/apps/web/src/chatPanelState.ts b/apps/web/src/chatPanelState.ts
deleted file mode 100644
index 355cb5c72..000000000
--- a/apps/web/src/chatPanelState.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { TurnId } from "@t3tools/contracts";
-
-export interface ChatPanelState {
-  panel: "diff" | null;
-  diffTurnId: TurnId | null;
-  diffFilePath: string | null;
-  hasOpenedPanel: boolean;
-  lastOpenPanel: "diff";
-}
diff --git a/apps/web/src/components/AppSnapCoordinator.tsx b/apps/web/src/components/AppSnapCoordinator.tsx
index 6068cfd32..97979bce1 100644
--- a/apps/web/src/components/AppSnapCoordinator.tsx
+++ b/apps/web/src/components/AppSnapCoordinator.tsx
@@ -37,7 +37,6 @@ import {
   effectiveComposerAttachmentCount,
 } from "../lib/composerSend";
 import { useStore } from "../store";
-import { useTerminalStateStore } from "../terminalStateStore";
 import { toastManager } from "./ui/toast";
 
 const MAX_DEDUPED_CAPTURE_IDS = 128;
@@ -93,7 +92,6 @@ export function AppSnapCoordinator() {
   const navigate = useNavigate();
   const { handleNewChat } = useHandleNewChat();
   const { focusedThreadId } = useFocusedChatContext();
-  const openChatThreadPage = useTerminalStateStore((state) => state.openChatThreadPage);
   const { settings } = useAppSettings();
   const focusedThreadRef = useRef<ThreadId | null>(focusedThreadId);
   const lastInteractionRef = useRef<AppSnapThreadAffinity | null>(null);
@@ -266,13 +264,12 @@ export function AppSnapCoordinator() {
 
   const routeToThread = useCallback(
     async (threadId: ThreadId) => {
-      openChatThreadPage(threadId);
       if (focusedThreadRef.current !== threadId) {
         await navigate({ to: "/$threadId", params: { threadId } });
       }
       requestComposerFocus(threadId);
     },
-    [navigate, openChatThreadPage],
+    [navigate],
   );
 
   const resolveDestination = useCallback(
diff --git a/apps/web/src/components/ChatMarkdown.test.tsx b/apps/web/src/components/ChatMarkdown.test.tsx
index fec071602..3f57ded87 100644
--- a/apps/web/src/components/ChatMarkdown.test.tsx
+++ b/apps/web/src/components/ChatMarkdown.test.tsx
@@ -13,10 +13,6 @@ vi.mock("@pierre/diffs", () => ({
     }),
 }));
 
-vi.mock("../hooks/useTheme", () => ({
-  useTheme: () => ({ resolvedTheme: "light" }),
-}));
-
 async function renderMarkdown(
   text: string,
   cwd = "C:\\Users\\LENOVO\\dpcode",
diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx
index 2b600b495..1146dde2c 100644
--- a/apps/web/src/components/ChatMarkdown.tsx
+++ b/apps/web/src/components/ChatMarkdown.tsx
@@ -28,12 +28,11 @@ import rehypeKatex from "rehype-katex";
 import remarkGfm from "remark-gfm";
 import remarkMath from "remark-math";
 import { copyTextToClipboard } from "../hooks/useCopyToClipboard";
-import { resolveDiffThemeName, type DiffThemeName } from "../lib/diffRendering";
+import { DIFF_THEME_NAME, type DiffThemeName } from "../lib/diffRendering";
 import { dedentCode, parseCodeFenceInfo, type CodeFenceInfo } from "../lib/codeFence";
 import { getFileIconName, pathLooksLikeKnownFile } from "../file-icons";
 import { CentralIcon } from "~/lib/central-icons";
 import { isLocalImageMarkdownSrc } from "../lib/localImageUrls";
-import { useTheme } from "../hooks/useTheme";
 import { useSmoothStreamedText } from "../hooks/useSmoothStreamedText";
 import { openWorkspaceFileReference, useWorkspaceFileOpener } from "../lib/workspaceFileOpener";
 import { resolveMarkdownFileLinkTarget, rewriteMarkdownFileUriHref } from "../markdown-links";
@@ -726,18 +725,12 @@ function inlineCodeFilePath(raw: string): string | null {
 // meta/ctrl-click — or a surface without a viewer — opens the preferred
 // external editor. `targetPath` may carry a `:line` suffix (used to open); the
 // chip icon and title use the position-free path.
-function OpenableFileChip(props: {
-  targetPath: string;
-  theme: "light" | "dark";
-  label?: ReactNode;
-  href?: string;
-}) {
+function OpenableFileChip(props: { targetPath: string; label?: ReactNode; href?: string }) {
   const opener = useWorkspaceFileOpener();
   const chipPath = props.targetPath.replace(MARKDOWN_LINK_POSITION_SUFFIX_PATTERN, "");
   return (
     <InlineMentionChip
       path={chipPath}
-      theme={props.theme}
       href={props.href ?? props.targetPath}
       onActivate={(event) => {
         event.preventDefault();
@@ -957,8 +950,7 @@ function ChatMarkdown({
   markers,
   onTaskToggle,
 }: ChatMarkdownProps) {
-  const { resolvedTheme } = useTheme();
-  const diffThemeName = resolveDiffThemeName(resolvedTheme);
+  const diffThemeName = DIFF_THEME_NAME;
   // Reveal streamed text at a steady, adaptive cadence so tokens appear fluidly instead of
   // in the ~100ms network clumps that land in the store. No-ops (returns `text`) when not
   // streaming or under reduced motion. Governs cadence only; the deferred value below still
@@ -1019,7 +1011,6 @@ function ChatMarkdown({
         return (
           <OpenableFileChip
             targetPath={targetPath}
-            theme={resolvedTheme}
             label={nodeToPlainText(children)}
             {...(restoredHref ? { href: restoredHref } : {})}
           />
@@ -1058,7 +1049,7 @@ function ChatMarkdown({
           const filePath = inlineCodeFilePath(nodeToPlainText(children));
           if (filePath) {
             const targetPath = resolveMarkdownFileLinkTarget(filePath, cwd) ?? filePath;
-            return <OpenableFileChip targetPath={targetPath} theme={resolvedTheme} />;
+            return <OpenableFileChip targetPath={targetPath} />;
           }
         }
         return (
@@ -1106,7 +1097,7 @@ function ChatMarkdown({
         return <input {...props} />;
       },
     }),
-    [cwd, diffThemeName, isStreaming, onImageExpand, onTaskToggle, resolvedTheme],
+    [cwd, diffThemeName, isStreaming, onImageExpand, onTaskToggle],
   );
 
   return (
diff --git a/apps/web/src/components/ChatView.browser.tsx b/apps/web/src/components/ChatView.browser.tsx
index 263096933..97c8e6367 100644
--- a/apps/web/src/components/ChatView.browser.tsx
+++ b/apps/web/src/components/ChatView.browser.tsx
@@ -29,11 +29,6 @@ import {
   AUTO_SCROLL_BOTTOM_THRESHOLD_PX,
   getScrollContainerDistanceFromBottom,
 } from "../chat-scroll";
-import {
-  INLINE_TERMINAL_CONTEXT_PLACEHOLDER,
-  type TerminalContextDraft,
-  removeInlineTerminalContextPlaceholder,
-} from "../lib/terminalContext";
 import { isMacPlatform } from "../lib/utils";
 import { readNativeApi } from "../nativeApi";
 import { getRouter } from "../router";
@@ -45,7 +40,6 @@ import {
   sendEffectRpcChunk,
   sendEffectRpcExit,
 } from "../test/effectRpcWebSocketMock";
-import { useTerminalStateStore } from "../terminalStateStore";
 import { resetWsNativeApiForTest } from "../wsNativeApi";
 import { estimateTimelineMessageHeight } from "./timelineHeight";
 
@@ -192,25 +186,6 @@ function createAssistantMessage(options: { id: MessageId; text: string; offsetSe
   };
 }
 
-function createTerminalContext(input: {
-  id: string;
-  terminalLabel: string;
-  lineStart: number;
-  lineEnd: number;
-  text: string;
-}): TerminalContextDraft {
-  return {
-    id: input.id,
-    threadId: THREAD_ID,
-    terminalId: `terminal-${input.id}`,
-    terminalLabel: input.terminalLabel,
-    lineStart: input.lineStart,
-    lineEnd: input.lineEnd,
-    text: input.text,
-    createdAt: NOW_ISO,
-  };
-}
-
 function createComposerImage(input: {
   id: string;
   previewUrl: string;
@@ -1038,20 +1013,7 @@ function resolveWsRpc(body: WsRequestEnvelope["body"]): unknown {
       truncated: false,
     };
   }
-  if (tag === WS_METHODS.terminalOpen) {
-    return {
-      threadId: typeof body.threadId === "string" ? body.threadId : THREAD_ID,
-      terminalId: typeof body.terminalId === "string" ? body.terminalId : "default",
-      cwd: typeof body.cwd === "string" ? body.cwd : "/repo/project",
-      status: "running",
-      pid: 123,
-      history: "",
-      exitCode: null,
-      exitSignal: null,
-      updatedAt: NOW_ISO,
-    };
-  }
-  if (tag === WS_METHODS.shellOpenInEditor || tag === WS_METHODS.terminalWrite) {
+  if (tag === WS_METHODS.shellOpenInEditor) {
     return null;
   }
   return {};
@@ -1121,7 +1083,6 @@ const worker = setupWorker(
       if (
         method === WS_METHODS.subscribeServerProviderStatuses ||
         method === WS_METHODS.subscribeServerSettings ||
-        method === WS_METHODS.subscribeTerminalEvents ||
         method === WS_METHODS.subscribeOrchestrationDomainEvents
       ) {
         return;
@@ -1593,9 +1554,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
       sidebarThreadSummaryById: {},
       threadsHydrated: false,
     });
-    useTerminalStateStore.setState({
-      terminalStateByThreadId: {},
-    });
   });
 
   afterEach(() => {
@@ -2095,7 +2053,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
           projectId: PROJECT_ID,
           createdAt: NOW_ISO,
           runtimeMode: "full-access",
-          entryPoint: "chat",
           branch: "feature/draft-automation",
           worktreePath: "/repo/worktrees/draft-automation",
           envMode: "worktree",
@@ -2198,7 +2155,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
           projectId: PROJECT_ID,
           createdAt: NOW_ISO,
           runtimeMode: "full-access",
-          entryPoint: "chat",
           branch: null,
           worktreePath: null,
           envMode: "local",
@@ -2284,7 +2240,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
           projectId: PROJECT_ID,
           createdAt: NOW_ISO,
           runtimeMode: "full-access",
-          entryPoint: "chat",
           branch: null,
           worktreePath: null,
           envMode: "local",
@@ -2358,148 +2313,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
     }
   });
 
-  it("runs project scripts from local draft threads at the project cwd", async () => {
-    useComposerDraftStore.setState({
-      draftThreadsByThreadId: {
-        [THREAD_ID]: {
-          projectId: PROJECT_ID,
-          createdAt: NOW_ISO,
-          runtimeMode: "full-access",
-          entryPoint: "chat",
-          branch: null,
-          worktreePath: null,
-          envMode: "local",
-        },
-      },
-      projectDraftThreadIdByProjectId: {
-        [PROJECT_ID]: THREAD_ID,
-      },
-    });
-
-    const mounted = await mountChatView({
-      viewport: { ...DEFAULT_VIEWPORT, width: 1_400 },
-      snapshot: withProjectScripts(createDraftOnlySnapshot(), [
-        {
-          id: "lint",
-          name: "Lint",
-          command: "bun run lint",
-          icon: "lint",
-          runOnWorktreeCreate: false,
-        },
-      ]),
-    });
-
-    try {
-      const runButton = await waitForElement(
-        () =>
-          Array.from(document.querySelectorAll("button")).find(
-            (button) => button.title === "Run Lint",
-          ) as HTMLButtonElement | null,
-        "Unable to find Run Lint button.",
-      );
-      runButton.click();
-
-      await vi.waitFor(
-        () => {
-          const openRequest = wsRequests.find(
-            (request) =>
-              request._tag === WS_METHODS.terminalOpen && request.cwd === "/repo/project",
-          );
-          expect(openRequest).toMatchObject({
-            _tag: WS_METHODS.terminalOpen,
-            threadId: THREAD_ID,
-            cwd: "/repo/project",
-            env: {
-              CHITAURI_PROJECT_ROOT: "/repo/project",
-            },
-          });
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-
-      await vi.waitFor(
-        () => {
-          const writeRequest = wsRequests.find(
-            (request) => request._tag === WS_METHODS.terminalWrite,
-          );
-          expect(writeRequest).toMatchObject({
-            _tag: WS_METHODS.terminalWrite,
-            threadId: THREAD_ID,
-            data: "bun run lint\r",
-          });
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-    } finally {
-      await mounted.cleanup();
-    }
-  });
-
-  it("runs project scripts from worktree draft threads at the worktree cwd", async () => {
-    useComposerDraftStore.setState({
-      draftThreadsByThreadId: {
-        [THREAD_ID]: {
-          projectId: PROJECT_ID,
-          createdAt: NOW_ISO,
-          runtimeMode: "full-access",
-          entryPoint: "chat",
-          branch: "feature/draft",
-          worktreePath: "/repo/worktrees/feature-draft",
-          envMode: "worktree",
-        },
-      },
-      projectDraftThreadIdByProjectId: {
-        [PROJECT_ID]: THREAD_ID,
-      },
-    });
-
-    const mounted = await mountChatView({
-      viewport: { ...DEFAULT_VIEWPORT, width: 1_400 },
-      snapshot: withProjectScripts(createDraftOnlySnapshot(), [
-        {
-          id: "test",
-          name: "Test",
-          command: "bun run test",
-          icon: "test",
-          runOnWorktreeCreate: false,
-        },
-      ]),
-    });
-
-    try {
-      const runButton = await waitForElement(
-        () =>
-          Array.from(document.querySelectorAll("button")).find(
-            (button) => button.title === "Run Test",
-          ) as HTMLButtonElement | null,
-        "Unable to find Run Test button.",
-      );
-      runButton.click();
-
-      await vi.waitFor(
-        () => {
-          const openRequest = wsRequests.find(
-            (request) =>
-              request._tag === WS_METHODS.terminalOpen &&
-              request.cwd === "/repo/worktrees/feature-draft",
-          );
-          expect(openRequest).toMatchObject({
-            _tag: WS_METHODS.terminalOpen,
-            threadId: THREAD_ID,
-            cwd: "/repo/worktrees/feature-draft",
-            env: {
-              CHITAURI_PROJECT_ROOT: "/repo/project",
-              CHITAURI_WORKTREE_PATH: "/repo/worktrees/feature-draft",
-            },
-          });
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-    } finally {
-      await mounted.cleanup();
-    }
-  });
-
   it("toggles composer focus with Cmd+L", async () => {
     const mounted = await mountChatView({
       viewport: DEFAULT_VIEWPORT,
@@ -2617,162 +2430,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
     }
   });
 
-  it("keeps removed terminal context pills removed when a new one is added", async () => {
-    const removedLabel = "Terminal 1 lines 1-2";
-    const addedLabel = "Terminal 2 lines 9-10";
-    useComposerDraftStore.getState().addTerminalContext(
-      THREAD_ID,
-      createTerminalContext({
-        id: "ctx-removed",
-        terminalLabel: "Terminal 1",
-        lineStart: 1,
-        lineEnd: 2,
-        text: "bun i\nno changes",
-      }),
-    );
-
-    const mounted = await mountChatView({
-      viewport: DEFAULT_VIEWPORT,
-      snapshot: createSnapshotForTargetUser({
-        targetMessageId: "msg-user-terminal-pill-backspace" as MessageId,
-        targetText: "terminal pill backspace target",
-      }),
-    });
-
-    try {
-      await vi.waitFor(
-        () => {
-          expect(document.body.textContent).toContain(removedLabel);
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-
-      const store = useComposerDraftStore.getState();
-      const currentPrompt = store.draftsByThreadId[THREAD_ID]?.prompt ?? "";
-      const nextPrompt = removeInlineTerminalContextPlaceholder(currentPrompt, 0);
-      store.setPrompt(THREAD_ID, nextPrompt.prompt);
-      store.removeTerminalContext(THREAD_ID, "ctx-removed");
-
-      await vi.waitFor(
-        () => {
-          expect(useComposerDraftStore.getState().draftsByThreadId[THREAD_ID]).toBeUndefined();
-          expect(document.body.textContent).not.toContain(removedLabel);
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-
-      useComposerDraftStore.getState().addTerminalContext(
-        THREAD_ID,
-        createTerminalContext({
-          id: "ctx-added",
-          terminalLabel: "Terminal 2",
-          lineStart: 9,
-          lineEnd: 10,
-          text: "git status\nOn branch main",
-        }),
-      );
-
-      await vi.waitFor(
-        () => {
-          const draft = useComposerDraftStore.getState().draftsByThreadId[THREAD_ID];
-          expect(draft?.terminalContexts.map((context) => context.id)).toEqual(["ctx-added"]);
-          expect(document.body.textContent).toContain(addedLabel);
-          expect(document.body.textContent).not.toContain(removedLabel);
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-    } finally {
-      await mounted.cleanup();
-    }
-  });
-
-  it("disables send when the composer only contains an expired terminal pill", async () => {
-    const expiredLabel = "Terminal 1 line 4";
-    useComposerDraftStore.getState().addTerminalContext(
-      THREAD_ID,
-      createTerminalContext({
-        id: "ctx-expired-only",
-        terminalLabel: "Terminal 1",
-        lineStart: 4,
-        lineEnd: 4,
-        text: "",
-      }),
-    );
-
-    const mounted = await mountChatView({
-      viewport: DEFAULT_VIEWPORT,
-      snapshot: createSnapshotForTargetUser({
-        targetMessageId: "msg-user-expired-pill-disabled" as MessageId,
-        targetText: "expired pill disabled target",
-      }),
-    });
-
-    try {
-      await vi.waitFor(
-        () => {
-          expect(document.body.textContent).toContain(expiredLabel);
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-
-      const sendButton = await waitForSendButton();
-      expect(sendButton.disabled).toBe(true);
-    } finally {
-      await mounted.cleanup();
-    }
-  });
-
-  it("warns when sending text while omitting expired terminal pills", async () => {
-    const expiredLabel = "Terminal 1 line 4";
-    useComposerDraftStore.getState().addTerminalContext(
-      THREAD_ID,
-      createTerminalContext({
-        id: "ctx-expired-send-warning",
-        terminalLabel: "Terminal 1",
-        lineStart: 4,
-        lineEnd: 4,
-        text: "",
-      }),
-    );
-    useComposerDraftStore
-      .getState()
-      .setPrompt(THREAD_ID, `yoo${INLINE_TERMINAL_CONTEXT_PLACEHOLDER}waddup`);
-
-    const mounted = await mountChatView({
-      viewport: DEFAULT_VIEWPORT,
-      snapshot: createSnapshotForTargetUser({
-        targetMessageId: "msg-user-expired-pill-warning" as MessageId,
-        targetText: "expired pill warning target",
-      }),
-    });
-
-    try {
-      await vi.waitFor(
-        () => {
-          expect(document.body.textContent).toContain(expiredLabel);
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-
-      const sendButton = await waitForSendButton();
-      expect(sendButton.disabled).toBe(false);
-      sendButton.click();
-
-      await vi.waitFor(
-        () => {
-          expect(document.body.textContent).toContain(
-            "Expired terminal context omitted from message",
-          );
-          expect(document.body.textContent).not.toContain(expiredLabel);
-          expect(document.body.textContent).toContain("yoowaddup");
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-    } finally {
-      await mounted.cleanup();
-    }
-  });
-
   it("shows a pointer cursor for the running stop button", async () => {
     const mounted = await mountChatView({
       viewport: DEFAULT_VIEWPORT,
@@ -2929,7 +2586,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
         images: [queuedImage],
         files: [],
         assistantSelections: [],
-        terminalContexts: [],
         fileComments: [],
         pastedTexts: [],
         skills: [],
@@ -2953,7 +2609,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
         images: [],
         files: [],
         assistantSelections: [],
-        terminalContexts: [],
         fileComments: [],
         pastedTexts: [],
         skills: [],
@@ -3043,7 +2698,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
         images: [],
         files: [],
         assistantSelections: [],
-        terminalContexts: [],
         fileComments: [],
         pastedTexts: [],
         skills: [],
@@ -3119,7 +2773,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
         images: [queuedImage],
         files: [],
         assistantSelections: [],
-        terminalContexts: [],
         fileComments: [],
         pastedTexts: [],
         skills: [],
@@ -3372,7 +3025,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
           projectId: HOME_PROJECT_ID,
           createdAt: NOW_ISO,
           runtimeMode: "full-access",
-          entryPoint: "chat",
           branch: null,
           worktreePath: null,
           envMode: "local",
@@ -3738,114 +3390,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
     }
   });
 
-  it("runs the setup action from the newly-created worktree before starting the turn", async () => {
-    const mounted = await mountChatView({
-      viewport: DEFAULT_VIEWPORT,
-      snapshot: withProjectScripts(
-        createSnapshotForTargetUser({
-          targetMessageId: "msg-user-new-worktree-setup-action-test" as MessageId,
-          targetText: "new worktree setup action test",
-        }),
-        [
-          {
-            id: "setup",
-            name: "Setup",
-            command: "printf setup",
-            icon: "configure",
-            runOnWorktreeCreate: true,
-          },
-        ],
-      ),
-    });
-
-    try {
-      const newThreadButton = page.getByTestId("new-thread-button");
-      await expect.element(newThreadButton).toBeInTheDocument();
-      await newThreadButton.click();
-
-      const newThreadPath = await waitForURL(
-        mounted.router,
-        (path) => UUID_ROUTE_RE.test(path),
-        "Route should have changed to a new draft thread UUID.",
-      );
-      const newThreadId = newThreadPath.slice(1) as ThreadId;
-
-      await waitForEnvironmentModeButton("Worktree");
-      await waitForServerConfigToApply();
-
-      useComposerDraftStore.getState().setPrompt(newThreadId, "Ship it with setup");
-      const composerEditor = await waitForComposerEditor();
-      await vi.waitFor(
-        () => {
-          expect(composerEditor.textContent ?? "").toContain("Ship it with setup");
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-
-      const sendButton = await waitForSendButton();
-      expect(sendButton.disabled).toBe(false);
-      await sendButton.click();
-
-      await vi.waitFor(
-        () => {
-          const createWorktreeIndex = wsRequests.findIndex((request) => {
-            return request._tag === WS_METHODS.workspaceProvisionThreadWorktree;
-          });
-          expect(createWorktreeIndex).toBeGreaterThanOrEqual(0);
-          const createWorktreeRequest = wsRequests[createWorktreeIndex];
-          if (
-            !createWorktreeRequest ||
-            createWorktreeRequest._tag !== WS_METHODS.workspaceProvisionThreadWorktree
-          ) {
-            throw new Error("Expected create worktree request.");
-          }
-          expect(createWorktreeRequest).toMatchObject({
-            baseBranch: null,
-            newBranch: expect.stringMatching(/^teacode\/[0-9a-f]{8}$/),
-          });
-          const worktreePath = `/repo/.codex/worktrees/project/${String(
-            createWorktreeRequest.newBranch,
-          ).replaceAll("/", "-")}`;
-
-          const terminalOpenIndex = wsRequests.findIndex((request) => {
-            return (
-              request._tag === WS_METHODS.terminalOpen &&
-              request.threadId === newThreadId &&
-              request.cwd === worktreePath
-            );
-          });
-          expect(terminalOpenIndex).toBeGreaterThan(createWorktreeIndex);
-          expect(wsRequests[terminalOpenIndex]).toMatchObject({
-            _tag: WS_METHODS.terminalOpen,
-            cwd: worktreePath,
-            env: {
-              CHITAURI_PROJECT_ROOT: "/repo/project",
-              CHITAURI_WORKTREE_PATH: worktreePath,
-            },
-          });
-
-          const terminalWriteIndex = wsRequests.findIndex((request) => {
-            return (
-              request._tag === WS_METHODS.terminalWrite &&
-              request.threadId === newThreadId &&
-              request.data === "printf setup\r"
-            );
-          });
-          expect(terminalWriteIndex).toBeGreaterThan(terminalOpenIndex);
-
-          const turnStartIndex = wsRequests.findIndex((request) => {
-            const command = readDispatchedCommand(request);
-            return command?.type === "thread.turn.start" && command.threadId === newThreadId;
-          });
-          expect(turnStartIndex).toBeGreaterThan(terminalWriteIndex);
-        },
-        { timeout: 10_000, interval: 16 },
-      );
-    } finally {
-      await mounted.cleanup();
-    }
-  });
-
   it("hydrates the provider alongside a sticky claude model", async () => {
     useComposerDraftStore.setState({
       stickyModelSelectionByProvider: {
@@ -4065,211 +3609,6 @@ describe("ChatView timeline estimator parity (full app)", () => {
     }
   });
 
-  it("promotes terminal-first shortcut threads so they render as terminal rows", async () => {
-    const mounted = await mountChatView({
-      viewport: DEFAULT_VIEWPORT,
-      snapshot: createSnapshotForTargetUser({
-        targetMessageId: "msg-user-terminal-shortcut-test" as MessageId,
-        targetText: "terminal shortcut test",
-      }),
-      configureFixture: (nextFixture) => {
-        nextFixture.serverConfig = {
-          ...nextFixture.serverConfig,
-          keybindings: [
-            {
-              command: "chat.newTerminal",
-              shortcut: {
-                key: "t",
-                metaKey: false,
-                ctrlKey: false,
-                shiftKey: true,
-                altKey: false,
-                modKey: true,
-              },
-              whenAst: {
-                type: "not",
-                node: { type: "identifier", name: "terminalFocus" },
-              },
-            },
-          ],
-        };
-      },
-    });
-
-    try {
-      await waitForServerConfigToApply();
-      const composerEditor = await waitForComposerEditor();
-      composerEditor.focus();
-      await waitForLayout();
-      const newThreadPath = await triggerTerminalThreadShortcutUntilPath(
-        mounted.router,
-        (path) => UUID_ROUTE_RE.test(path),
-        "Route should have changed to a new terminal-first draft thread UUID from the shortcut.",
-      );
-      const newThreadId = newThreadPath.slice(1) as ThreadId;
-
-      await vi.waitFor(
-        () => {
-          expect(
-            wsRequests.some(
-              (request) =>
-                request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
-                typeof request.command === "object" &&
-                request.command !== null &&
-                "type" in request.command &&
-                "threadId" in request.command &&
-                request.command.type === "thread.create" &&
-                request.command.threadId === newThreadId,
-            ),
-          ).toBe(true);
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-
-      useStore.getState().syncServerReadModel(addThreadToSnapshot(fixture.snapshot, newThreadId));
-      useComposerDraftStore.getState().clearDraftThread(newThreadId);
-
-      await vi.waitFor(
-        () => {
-          const terminalThreadRow = document.querySelector<HTMLElement>(
-            '[data-thread-entry-point="terminal"]',
-          );
-          expect(terminalThreadRow).not.toBeNull();
-          expect(terminalThreadRow?.textContent).toContain("New thread");
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-    } finally {
-      await mounted.cleanup();
-    }
-  });
-
-  it("promotes a stored terminal draft using its saved context and model selection", async () => {
-    const draftThreadId = ThreadId.makeUnsafe("thread-terminal-draft-reuse");
-    useComposerDraftStore.setState({
-      draftsByThreadId: {
-        [draftThreadId]: {
-          prompt: "",
-          promptHistorySavedDraft: null,
-          images: [],
-          files: [],
-          nonPersistedImageIds: [],
-          persistedAttachments: [],
-          assistantSelections: [],
-          terminalContexts: [],
-          fileComments: [],
-          pastedTexts: [],
-          skills: [],
-          mentions: [],
-          queuedTurns: [],
-          modelSelectionByProvider: {
-            claudeAgent: {
-              provider: "claudeAgent",
-              model: "claude-opus-4-6",
-              options: {
-                effort: "max",
-              },
-            },
-          },
-          activeProvider: "claudeAgent",
-          runtimeMode: null,
-        },
-      },
-      draftThreadsByThreadId: {
-        [draftThreadId]: {
-          projectId: PROJECT_ID,
-          createdAt: NOW_ISO,
-          runtimeMode: "approval-required",
-          entryPoint: "terminal",
-          branch: "feature/terminal-title",
-          worktreePath: "/repo/project/.worktrees/terminal-title",
-          envMode: "worktree",
-        },
-      },
-      projectDraftThreadIdByProjectId: {
-        [`${PROJECT_ID}::terminal`]: draftThreadId,
-      },
-      stickyModelSelectionByProvider: {},
-      stickyActiveProvider: null,
-    });
-
-    const mounted = await mountChatView({
-      viewport: DEFAULT_VIEWPORT,
-      snapshot: createSnapshotForTargetUser({
-        targetMessageId: "msg-user-terminal-draft-reuse-test" as MessageId,
-        targetText: "terminal draft reuse test",
-      }),
-      configureFixture: (nextFixture) => {
-        nextFixture.serverConfig = {
-          ...nextFixture.serverConfig,
-          keybindings: [
-            {
-              command: "chat.newTerminal",
-              shortcut: {
-                key: "t",
-                metaKey: false,
-                ctrlKey: false,
-                shiftKey: true,
-                altKey: false,
-                modKey: true,
-              },
-              whenAst: {
-                type: "not",
-                node: { type: "identifier", name: "terminalFocus" },
-              },
-            },
-          ],
-        };
-      },
-    });
-
-    try {
-      await waitForServerConfigToApply();
-      const composerEditor = await waitForComposerEditor();
-      composerEditor.focus();
-      await waitForLayout();
-      dispatchTerminalThreadShortcut();
-
-      await waitForURL(
-        mounted.router,
-        (path) => path === `/${draftThreadId}`,
-        "Shortcut should reuse the stored terminal draft thread route.",
-      );
-
-      await vi.waitFor(
-        () => {
-          const createRequest = wsRequests.find(
-            (request) =>
-              request._tag === ORCHESTRATION_WS_METHODS.dispatchCommand &&
-              typeof request.command === "object" &&
-              request.command !== null &&
-              "type" in request.command &&
-              "threadId" in request.command &&
-              request.command.type === "thread.create" &&
-              request.command.threadId === draftThreadId,
-          );
-
-          expect(createRequest).toBeTruthy();
-          expect(createRequest?.command).toMatchObject({
-            branch: "feature/terminal-title",
-            worktreePath: "/repo/project/.worktrees/terminal-title",
-            runtimeMode: "approval-required",
-            modelSelection: {
-              provider: "claudeAgent",
-              model: "claude-opus-4-6",
-              options: {
-                effort: "max",
-              },
-            },
-          });
-        },
-        { timeout: 8_000, interval: 16 },
-      );
-    } finally {
-      await mounted.cleanup();
-    }
-  });
-
   it("exposes the plan details sidebar button when a plan is awaiting follow-up", async () => {
     const mounted = await mountChatView({
       viewport: DEFAULT_VIEWPORT,
diff --git a/apps/web/src/components/ChatView.logic.test.ts b/apps/web/src/components/ChatView.logic.test.ts
index 466c51499..21f644cd3 100644
--- a/apps/web/src/components/ChatView.logic.test.ts
+++ b/apps/web/src/components/ChatView.logic.test.ts
@@ -18,19 +18,14 @@ import {
   resolveActiveThreadTitle,
   resolveActiveTurnLiveDiffState,
   resolveCommittedProviderModel,
-  resolveProjectScriptTerminalTarget,
   resolveQueuedSteerGateTransition,
   resolveRuntimeModeAfterApprovalDecision,
   QUEUED_STEER_GATE_TIMEOUT_MS,
-  buildExpiredTerminalContextToastCopy,
-  shouldAutoDeleteTerminalThreadOnLastClose,
   shouldConsumePendingCustomBinaryConfirmation,
   shouldEnableComposerPastedTextCollapse,
   shouldHandlePromptHistoryNavigationKey,
-  shouldRenderProviderHealthBanner,
   shouldShowComposerModelBootstrapSkeleton,
   shouldStartActiveTurnLayoutGrace,
-  shouldRenderTerminalWorkspace,
   worktreeSetupHasError,
 } from "./ChatView.logic";
 
@@ -103,7 +98,7 @@ describe("prompt history navigation", () => {
       },
       {
         role: "user",
-        text: "First prompt\n\n<terminal_context>\n# Terminal\noutput\n</terminal_context>",
+        text: "First prompt",
         source: "native",
       },
       {
@@ -762,61 +757,6 @@ describe("shouldConsumePendingCustomBinaryConfirmation", () => {
 });
 
 describe("deriveComposerSendState", () => {
-  it("treats expired terminal pills as non-sendable content", () => {
-    const state = deriveComposerSendState({
-      prompt: "\uFFFC",
-      imageCount: 0,
-      fileCount: 0,
-      assistantSelectionCount: 0,
-      fileCommentCount: 0,
-      terminalContexts: [
-        {
-          id: "ctx-expired",
-          threadId: ThreadId.makeUnsafe("thread-1"),
-          terminalId: "default",
-          terminalLabel: "Terminal 1",
-          lineStart: 4,
-          lineEnd: 4,
-          text: "",
-          createdAt: "2026-03-17T12:52:29.000Z",
-        },
-      ],
-      pastedTexts: [],
-    });
-
-    expect(state.trimmedPrompt).toBe("");
-    expect(state.sendableTerminalContexts).toEqual([]);
-    expect(state.expiredTerminalContextCount).toBe(1);
-    expect(state.hasSendableContent).toBe(false);
-  });
-
-  it("keeps text sendable while excluding expired terminal pills", () => {
-    const state = deriveComposerSendState({
-      prompt: `yoo \uFFFC waddup`,
-      imageCount: 0,
-      fileCount: 0,
-      assistantSelectionCount: 0,
-      fileCommentCount: 0,
-      terminalContexts: [
-        {
-          id: "ctx-expired",
-          threadId: ThreadId.makeUnsafe("thread-1"),
-          terminalId: "default",
-          terminalLabel: "Terminal 1",
-          lineStart: 4,
-          lineEnd: 4,
-          text: "",
-          createdAt: "2026-03-17T12:52:29.000Z",
-        },
-      ],
-      pastedTexts: [],
-    });
-
-    expect(state.trimmedPrompt).toBe("yoo  waddup");
-    expect(state.expiredTerminalContextCount).toBe(1);
-    expect(state.hasSendableContent).toBe(true);
-  });
-
   it("treats assistant selections as sendable content", () => {
     const state = deriveComposerSendState({
       prompt: "",
@@ -824,7 +764,6 @@ describe("deriveComposerSendState", () => {
       fileCount: 0,
       assistantSelectionCount: 1,
       fileCommentCount: 0,
-      terminalContexts: [],
       pastedTexts: [],
     });
 
@@ -838,7 +777,6 @@ describe("deriveComposerSendState", () => {
       fileCount: 0,
       assistantSelectionCount: 0,
       fileCommentCount: 1,
-      terminalContexts: [],
       pastedTexts: [],
     });
 
@@ -852,7 +790,6 @@ describe("deriveComposerSendState", () => {
       fileCount: 1,
       assistantSelectionCount: 0,
       fileCommentCount: 0,
-      terminalContexts: [],
       pastedTexts: [],
     });
 
@@ -860,134 +797,6 @@ describe("deriveComposerSendState", () => {
   });
 });
 
-describe("buildExpiredTerminalContextToastCopy", () => {
-  it("formats clear empty-state guidance", () => {
-    expect(buildExpiredTerminalContextToastCopy(1, "empty")).toEqual({
-      title: "Expired terminal context won't be sent",
-      description: "Remove it or re-add it to include terminal output.",
-    });
-  });
-
-  it("formats omission guidance for sent messages", () => {
-    expect(buildExpiredTerminalContextToastCopy(2, "omitted")).toEqual({
-      title: "Expired terminal contexts omitted from message",
-      description: "Re-add it if you want that terminal output included.",
-    });
-  });
-});
-
-describe("shouldRenderTerminalWorkspace", () => {
-  it("renders the workspace shell before the active project has hydrated", () => {
-    expect(
-      shouldRenderTerminalWorkspace({
-        presentationMode: "workspace",
-        terminalOpen: true,
-      }),
-    ).toBe(true);
-  });
-
-  it("renders only for an open workspace terminal", () => {
-    expect(
-      shouldRenderTerminalWorkspace({
-        presentationMode: "workspace",
-        terminalOpen: true,
-      }),
-    ).toBe(true);
-    expect(
-      shouldRenderTerminalWorkspace({
-        presentationMode: "drawer",
-        terminalOpen: true,
-      }),
-    ).toBe(false);
-  });
-});
-
-describe("resolveProjectScriptTerminalTarget", () => {
-  it("reuses the base terminal only when no terminal is open or running", () => {
-    const target = resolveProjectScriptTerminalTarget({
-      baseTerminalId: "default",
-      createTerminalId: () => "new-terminal",
-      hasRunningTerminal: false,
-      terminalOpen: false,
-    });
-
-    expect(target).toEqual({
-      shouldCreateNewTerminal: false,
-      terminalId: "default",
-    });
-  });
-
-  it("creates a fresh terminal when a live terminal could keep stale cwd or env", () => {
-    expect(
-      resolveProjectScriptTerminalTarget({
-        baseTerminalId: "default",
-        createTerminalId: () => "visible-script-terminal",
-        hasRunningTerminal: false,
-        terminalOpen: true,
-      }),
-    ).toEqual({
-      shouldCreateNewTerminal: true,
-      terminalId: "visible-script-terminal",
-    });
-
-    expect(
-      resolveProjectScriptTerminalTarget({
-        baseTerminalId: "default",
-        createTerminalId: () => "running-script-terminal",
-        hasRunningTerminal: true,
-        terminalOpen: false,
-      }),
-    ).toEqual({
-      shouldCreateNewTerminal: true,
-      terminalId: "running-script-terminal",
-    });
-  });
-
-  it("honors explicit requests for a new terminal", () => {
-    const target = resolveProjectScriptTerminalTarget({
-      baseTerminalId: "default",
-      createTerminalId: () => "forced-script-terminal",
-      hasRunningTerminal: false,
-      preferNewTerminal: true,
-      terminalOpen: false,
-    });
-
-    expect(target).toEqual({
-      shouldCreateNewTerminal: true,
-      terminalId: "forced-script-terminal",
-    });
-  });
-});
-
-describe("shouldRenderProviderHealthBanner", () => {
-  it("does not show chat provider health while a terminal thread is active", () => {
-    expect(
-      shouldRenderProviderHealthBanner({
-        threadEntryPoint: "terminal",
-        terminalWorkspaceTerminalTabActive: false,
-      }),
-    ).toBe(false);
-  });
-
-  it("does not show chat provider health while the terminal workspace tab is active", () => {
-    expect(
-      shouldRenderProviderHealthBanner({
-        threadEntryPoint: "chat",
-        terminalWorkspaceTerminalTabActive: true,
-      }),
-    ).toBe(false);
-  });
-
-  it("shows chat provider health only on the chat surface", () => {
-    expect(
-      shouldRenderProviderHealthBanner({
-        threadEntryPoint: "chat",
-        terminalWorkspaceTerminalTabActive: false,
-      }),
-    ).toBe(true);
-  });
-});
-
 describe("shouldStartActiveTurnLayoutGrace", () => {
   it("starts the grace window when a live turn just became settled", () => {
     expect(
@@ -1261,68 +1070,6 @@ describe("hasServerAcknowledgedLocalDispatch", () => {
   });
 });
 
-describe("shouldAutoDeleteTerminalThreadOnLastClose", () => {
-  it("deletes untouched terminal-first placeholder threads when the last terminal closes", () => {
-    expect(
-      shouldAutoDeleteTerminalThreadOnLastClose({
-        isLastTerminal: true,
-        isServerThread: true,
-        terminalEntryPoint: "terminal",
-        thread: {
-          title: "New terminal",
-          messages: [],
-          latestTurn: null,
-          session: null,
-          activities: [],
-          proposedPlans: [],
-        },
-      }),
-    ).toBe(true);
-  });
-
-  it("keeps non-placeholder or already-used threads", () => {
-    expect(
-      shouldAutoDeleteTerminalThreadOnLastClose({
-        isLastTerminal: true,
-        isServerThread: true,
-        terminalEntryPoint: "terminal",
-        thread: {
-          title: "Manual rename",
-          messages: [],
-          latestTurn: null,
-          session: null,
-          activities: [],
-          proposedPlans: [],
-        },
-      }),
-    ).toBe(false);
-
-    expect(
-      shouldAutoDeleteTerminalThreadOnLastClose({
-        isLastTerminal: true,
-        isServerThread: true,
-        terminalEntryPoint: "terminal",
-        thread: {
-          title: "New terminal",
-          messages: [
-            {
-              id: "msg-1" as never,
-              role: "user",
-              text: "hello",
-              createdAt: "2026-04-06T12:00:00.000Z",
-              streaming: false,
-            },
-          ],
-          latestTurn: null,
-          session: null,
-          activities: [],
-          proposedPlans: [],
-        },
-      }),
-    ).toBe(false);
-  });
-});
-
 describe("resolveRuntimeModeAfterApprovalDecision", () => {
   it("switches approval-required threads to full-access on acceptForSession", () => {
     expect(resolveRuntimeModeAfterApprovalDecision("approval-required", "acceptForSession")).toBe(
diff --git a/apps/web/src/components/ChatView.logic.ts b/apps/web/src/components/ChatView.logic.ts
index dd3caa1b6..52b94145d 100644
--- a/apps/web/src/components/ChatView.logic.ts
+++ b/apps/web/src/components/ChatView.logic.ts
@@ -12,7 +12,6 @@ import {
 import { normalizeModelSlug } from "@t3tools/shared/model";
 import { buildTeaCodeBranchName } from "@t3tools/shared/git";
 import { isGenericChatThreadTitle } from "@t3tools/shared/chatThreads";
-import { isGenericTerminalThreadTitle } from "@t3tools/shared/terminalThreads";
 import {
   type ChatAssistantSelectionAttachment,
   type ChatMessage,
@@ -25,11 +24,6 @@ import {
 } from "../types";
 import { type DraftThreadState } from "../composerDraftStore";
 import { Schema } from "effect";
-import {
-  filterTerminalContextsWithText,
-  stripInlineTerminalContextPlaceholders,
-  type TerminalContextDraft,
-} from "../lib/terminalContext";
 import { deriveDisplayedUserMessageState } from "../lib/composerMessageContext";
 import { filterPastedTextsWithText, type PastedTextDraft } from "../lib/composerPastedText";
 import {
@@ -70,13 +64,6 @@ export function resolveRuntimeModeAfterApprovalDecision(
   return null;
 }
 
-export function shouldRenderProviderHealthBanner(input: {
-  threadEntryPoint: ThreadPrimarySurface;
-  terminalWorkspaceTerminalTabActive: boolean;
-}): boolean {
-  return input.threadEntryPoint === "chat" && !input.terminalWorkspaceTerminalTabActive;
-}
-
 // Big-paste cards are sent only by the normal chat path; non-chat composer flows
 // read plain editor text, so they must let Lexical insert pasted text normally.
 export function shouldEnableComposerPastedTextCollapse(input: {
@@ -386,7 +373,7 @@ export function buildLocalDraftThread(
     id: threadId,
     codexThreadId: null,
     projectId: draftThread.projectId,
-    title: draftThread.entryPoint === "terminal" ? "New terminal" : "New thread",
+    title: "New thread",
     modelSelection: fallbackModelSelection,
     runtimeMode: draftThread.runtimeMode,
     session: null,
@@ -786,24 +773,16 @@ export function deriveComposerSendState(options: {
   fileCount: number;
   assistantSelectionCount: number;
   fileCommentCount: number;
-  terminalContexts: ReadonlyArray<TerminalContextDraft>;
   pastedTexts: ReadonlyArray<PastedTextDraft>;
 }): {
   trimmedPrompt: string;
-  sendableTerminalContexts: TerminalContextDraft[];
-  expiredTerminalContextCount: number;
   sendablePastedTexts: PastedTextDraft[];
   hasSendableContent: boolean;
 } {
-  const trimmedPrompt = stripInlineTerminalContextPlaceholders(options.prompt).trim();
-  const sendableTerminalContexts = filterTerminalContextsWithText(options.terminalContexts);
-  const expiredTerminalContextCount =
-    options.terminalContexts.length - sendableTerminalContexts.length;
+  const trimmedPrompt = options.prompt.trim();
   const sendablePastedTexts = filterPastedTextsWithText(options.pastedTexts);
   return {
     trimmedPrompt,
-    sendableTerminalContexts,
-    expiredTerminalContextCount,
     sendablePastedTexts,
     hasSendableContent:
       trimmedPrompt.length > 0 ||
@@ -811,7 +790,6 @@ export function deriveComposerSendState(options: {
       options.fileCount > 0 ||
       options.assistantSelectionCount > 0 ||
       options.fileCommentCount > 0 ||
-      sendableTerminalContexts.length > 0 ||
       sendablePastedTexts.length > 0,
   };
 }
@@ -828,79 +806,6 @@ export function collectUserMessageAssistantSelections(
   );
 }
 
-export function buildExpiredTerminalContextToastCopy(
-  expiredTerminalContextCount: number,
-  variant: "omitted" | "empty",
-): { title: string; description: string } {
-  const count = Math.max(1, Math.floor(expiredTerminalContextCount));
-  const noun = count === 1 ? "Expired terminal context" : "Expired terminal contexts";
-  if (variant === "empty") {
-    return {
-      title: `${noun} won't be sent`,
-      description: "Remove it or re-add it to include terminal output.",
-    };
-  }
-  return {
-    title: `${noun} omitted from message`,
-    description: "Re-add it if you want that terminal output included.",
-  };
-}
-
-export function shouldRenderTerminalWorkspace(options: {
-  presentationMode: "drawer" | "workspace";
-  terminalOpen: boolean;
-}): boolean {
-  // The workspace shell should paint immediately; the terminal viewport gates the
-  // backend attach until a valid cwd is available.
-  return options.terminalOpen && options.presentationMode === "workspace";
-}
-
-export function resolveProjectScriptTerminalTarget(options: {
-  baseTerminalId: string;
-  createTerminalId: () => string;
-  hasRunningTerminal: boolean;
-  preferNewTerminal?: boolean | undefined;
-  terminalOpen: boolean;
-}): { shouldCreateNewTerminal: boolean; terminalId: string } {
-  // Project scripts require their requested cwd/env before the command write;
-  // live PTYs keep their launch context, so visible or running terminals get a new tab.
-  const shouldCreateNewTerminal =
-    Boolean(options.preferNewTerminal) || options.terminalOpen || options.hasRunningTerminal;
-
-  return {
-    shouldCreateNewTerminal,
-    terminalId: shouldCreateNewTerminal ? options.createTerminalId() : options.baseTerminalId,
-  };
-}
-
-export function shouldAutoDeleteTerminalThreadOnLastClose(options: {
-  isLastTerminal: boolean;
-  isServerThread: boolean;
-  terminalEntryPoint: ThreadPrimarySurface;
-  thread:
-    | Pick<Thread, "activities" | "latestTurn" | "messages" | "proposedPlans" | "session" | "title">
-    | null
-    | undefined;
-}): boolean {
-  const { thread } = options;
-  if (
-    !options.isLastTerminal ||
-    !options.isServerThread ||
-    options.terminalEntryPoint !== "terminal" ||
-    !thread
-  ) {
-    return false;
-  }
-  return (
-    isGenericTerminalThreadTitle(thread.title) &&
-    thread.messages.length === 0 &&
-    thread.latestTurn === null &&
-    thread.session === null &&
-    thread.activities.length === 0 &&
-    thread.proposedPlans.length === 0
-  );
-}
-
 export interface ThreadBreadcrumb {
   threadId: ThreadIdType;
   title: string;
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index f53873e70..29544f31f 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -133,7 +133,6 @@ import { reconcileDeletedThreadFromClient } from "../lib/deletedThreadClientReco
 import { dispatchThreadRename } from "../lib/threadRename";
 import { useHandleNewChat } from "../hooks/useHandleNewChat";
 import { useComposerDropzone } from "../hooks/useComposerDropzone";
-import { useDiffRouteSearch } from "../hooks/useDiffRouteSearch";
 import {
   buildThreadBreadcrumbs,
   derivePromptHistoryFromMessages,
@@ -143,7 +142,6 @@ import {
   resolveActiveThreadTitle,
   resolveActiveTurnLiveDiffState,
   resolveCommittedProviderModel,
-  resolveProjectScriptTerminalTarget,
   resolvePromptHistoryNavigation,
   shouldHandlePromptHistoryNavigationKey,
   shouldEnableComposerPastedTextCollapse,
@@ -201,7 +199,7 @@ import {
   togglePendingUserInputOptionSelection,
   type PendingUserInputDraftAnswer,
 } from "../pendingUserInput";
-import { selectRightDockState, useRightDockStore } from "../rightDockStore";
+// rightDock removed
 import { useStore } from "../store";
 import { RenameThreadDialog } from "./RenameThreadDialog";
 import { getThreadFromState } from "../threadDerivation";
@@ -213,13 +211,7 @@ import {
   resolvePlanFollowUpSubmission,
 } from "../proposedPlan";
 import { truncateTitle } from "../truncateTitle";
-import {
-  DEFAULT_THREAD_TERMINAL_ID,
-  MAX_TERMINALS_PER_GROUP,
-  type ChatMessage,
-  type Thread,
-} from "../types";
-import { useTheme } from "../hooks/useTheme";
+import { type ChatMessage, type Thread } from "../types";
 import { useThreadWorkspaceHandoff } from "../hooks/useThreadWorkspaceHandoff";
 import { useComposerCommandMenuItems } from "../hooks/useComposerCommandMenuItems";
 import { useThreadHandoff } from "../hooks/useThreadHandoff";
@@ -232,8 +224,7 @@ import {
   shortcutLabelForCommand,
 } from "../keybindings";
 import PlanSidebar from "./PlanSidebar";
-import TerminalWorkspaceTabs from "./TerminalWorkspaceTabs";
-import ThreadTerminalDrawer from "./terminal/LazyThreadTerminalDrawer";
+// Terminal workspace tabs and drawer removed
 import {
   ChevronDownIcon,
   ChevronLeftIcon,
@@ -251,7 +242,7 @@ import { DisclosureChevron } from "./ui/DisclosureChevron";
 import { DisclosureRegion } from "./ui/DisclosureRegion";
 import { Skeleton } from "./ui/skeleton";
 import { Menu, MenuItem, MenuPopup, MenuTrigger } from "./ui/menu";
-import { disposeAndCloseTerminalSession, randomTerminalId } from "./terminal/terminalSession";
+// terminalSession removed
 import { cn, isMacPlatform, randomUUID } from "~/lib/utils";
 import { toastManager } from "./ui/toast";
 import { decodeProjectScriptKeybindingRule } from "~/lib/projectScriptKeybindings";
@@ -265,14 +256,10 @@ import {
   type ProjectScriptRunOptions,
   type ProjectScriptRunResult,
 } from "~/projectScripts";
-import { runProjectCommandInTerminal } from "~/projectTerminalRunner";
+// projectTerminalRunner removed
 import { newCommandId, newMessageId, newProjectId, newThreadId } from "~/lib/utils";
 import { readNativeApi } from "~/nativeApi";
-import {
-  confirmTerminalTabClose,
-  resolveTerminalCloseTitle,
-  shouldPromptForTerminalClose,
-} from "~/lib/terminalCloseConfirmation";
+// terminalCloseConfirmation removed
 import { promoteThreadCreate } from "~/lib/threadCreatePromotion";
 import {
   getAppModelOptions,
@@ -283,8 +270,7 @@ import {
   resolveAssistantDeliveryMode,
   useAppSettings,
 } from "../appSettings";
-import { resolveTerminalNewAction } from "../lib/terminalNewAction";
-import { isTerminalFocused } from "../lib/terminalFocus";
+// terminalNewAction and terminalFocus removed
 import { compareProvidersByOrder } from "../providerOrdering";
 import {
   type ComposerFileAttachment,
@@ -303,14 +289,7 @@ import {
 } from "../composerDraftStore";
 import { useComposerFocusRequestStore } from "../composerFocusRequestStore";
 import { appendComposerPromptText } from "../lib/chatReferences";
-import {
-  IMAGE_ONLY_BOOTSTRAP_PROMPT,
-  formatTerminalContextLabel,
-  insertInlineTerminalContextPlaceholder,
-  removeInlineTerminalContextPlaceholder,
-  type TerminalContextDraft,
-  type TerminalContextSelection,
-} from "../lib/terminalContext";
+import { IMAGE_ONLY_BOOTSTRAP_PROMPT } from "../lib/composerPlaceholders";
 import {
   appendComposerMessageContext,
   appendOriginalComposerPromptBlocks,
@@ -340,9 +319,8 @@ import {
   resolveNextComposerFooterTier,
   shouldUseCompactComposerFooter,
 } from "./composerFooterLayout";
-import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
-import { collectTerminalIdsFromLayout } from "../terminalPaneLayout";
-import type { ChatPanelState } from "../chatPanelState";
+// terminalStateStore and terminalPaneLayout removed
+
 import { ComposerPromptEditor, type ComposerPromptEditorHandle } from "./ComposerPromptEditor";
 import { PullRequestThreadDialog } from "./PullRequestThreadDialog";
 import { ChatHeader } from "./chat/ChatHeader";
@@ -423,12 +401,9 @@ import {
 import {
   ACTIVE_TURN_LAYOUT_SETTLE_DELAY_MS,
   shouldStartActiveTurnLayoutGrace,
-  shouldAutoDeleteTerminalThreadOnLastClose,
-  buildExpiredTerminalContextToastCopy,
   buildLocalDraftThread,
   DISMISSED_PROVIDER_HEALTH_BANNERS_KEY,
   DismissedProviderHealthBannersSchema,
-  shouldRenderTerminalWorkspace,
   collectUserMessageBlobPreviewUrls,
   deriveComposerSendState,
   failWorktreeSetupSnapshot,
@@ -443,7 +418,6 @@ import {
   PullRequestDialogState,
   type QueuedSteerGate,
   resolveQueuedSteerGateTransition,
-  shouldRenderProviderHealthBanner,
   resolveRuntimeModeAfterApprovalDecision,
   revokeBlobPreviewUrl,
   revokeUserMessagePreviewUrls,
@@ -491,88 +465,6 @@ const LOCAL_PROJECT_DRAFT_CONTEXT = {
 } as const;
 const DRAFT_PROJECT_SYNC_MAX_ATTEMPTS = 6;
 const DRAFT_PROJECT_SYNC_DELAY_MS = 50;
-const SETUP_SCRIPT_TERMINAL_ACTIVITY_START_TIMEOUT_MS = 1_000;
-const SETUP_SCRIPT_TERMINAL_MAX_RUNTIME_MS = 10 * 60 * 1000;
-
-function terminalHasRunningSubprocess(threadId: ThreadId, terminalId: string): boolean {
-  const terminalState = selectThreadTerminalState(
-    useTerminalStateStore.getState().terminalStateByThreadId,
-    threadId,
-  );
-  return terminalState.runningTerminalIds.includes(terminalId);
-}
-
-function waitForSetupScriptTerminalActivity(input: {
-  threadId: ThreadId;
-  terminalId: string;
-  observeStartTimeoutMs?: number;
-  maxRuntimeMs?: number;
-}): Promise<void> {
-  if (typeof window === "undefined") {
-    return Promise.resolve();
-  }
-
-  const observeStartTimeoutMs =
-    input.observeStartTimeoutMs ?? SETUP_SCRIPT_TERMINAL_ACTIVITY_START_TIMEOUT_MS;
-  const maxRuntimeMs = input.maxRuntimeMs ?? SETUP_SCRIPT_TERMINAL_MAX_RUNTIME_MS;
-
-  return new Promise((resolve) => {
-    let resolved = false;
-    let observedRunning = terminalHasRunningSubprocess(input.threadId, input.terminalId);
-    let observeStartTimer: number | null = null;
-    let maxRuntimeTimer: number | null = null;
-
-    const unsubscribe = useTerminalStateStore.subscribe(() => {
-      checkRunningState();
-    });
-
-    const clearTimers = () => {
-      if (observeStartTimer !== null) {
-        window.clearTimeout(observeStartTimer);
-        observeStartTimer = null;
-      }
-      if (maxRuntimeTimer !== null) {
-        window.clearTimeout(maxRuntimeTimer);
-        maxRuntimeTimer = null;
-      }
-    };
-
-    const finish = () => {
-      if (resolved) return;
-      resolved = true;
-      clearTimers();
-      unsubscribe();
-      resolve();
-    };
-
-    const ensureMaxRuntimeTimer = () => {
-      if (maxRuntimeTimer !== null) return;
-      maxRuntimeTimer = window.setTimeout(finish, maxRuntimeMs);
-    };
-
-    function checkRunningState() {
-      const running = terminalHasRunningSubprocess(input.threadId, input.terminalId);
-      if (running) {
-        observedRunning = true;
-        if (observeStartTimer !== null) {
-          window.clearTimeout(observeStartTimer);
-          observeStartTimer = null;
-        }
-        ensureMaxRuntimeTimer();
-        return;
-      }
-      if (observedRunning) {
-        finish();
-      }
-    }
-
-    checkRunningState();
-    if (!observedRunning) {
-      observeStartTimer = window.setTimeout(finish, observeStartTimeoutMs);
-    }
-  });
-}
-
 function waitForDraftProjectSyncDelay(ms: number): Promise<void> {
   return new Promise((resolve) => {
     window.setTimeout(resolve, ms);
@@ -726,7 +618,6 @@ function buildQueuedComposerPreviewText(input: {
   images: ReadonlyArray<ComposerImageAttachment>;
   files: ReadonlyArray<ComposerFileAttachment>;
   assistantSelections: ReadonlyArray<{ id: string }>;
-  terminalContexts: ReadonlyArray<TerminalContextDraft>;
   fileComments: ReadonlyArray<FileCommentDraft>;
   pastedTexts: ReadonlyArray<PastedTextDraft>;
 }): string {
@@ -744,10 +635,6 @@ function buildQueuedComposerPreviewText(input: {
   if (input.assistantSelections.length > 0) {
     return formatAssistantSelectionQueuePreview(input.assistantSelections.length);
   }
-  const firstTerminalContext = input.terminalContexts[0];
-  if (firstTerminalContext) {
-    return formatTerminalContextLabel(firstTerminalContext);
-  }
   const firstFileComment = input.fileComments[0];
   if (firstFileComment) {
     return formatFileCommentLabel(firstFileComment);
@@ -770,22 +657,6 @@ function formatPastedTextTitleSeed(pastedTexts: ReadonlyArray<PastedTextDraft>):
 }
 
 const COMPOSER_PATH_QUERY_DEBOUNCE_MS = 120;
-const syncTerminalContextsByIds = (
-  contexts: ReadonlyArray<TerminalContextDraft>,
-  ids: ReadonlyArray<string>,
-): TerminalContextDraft[] => {
-  const contextsById = new Map(contexts.map((context) => [context.id, context]));
-  return ids.flatMap((id) => {
-    const context = contextsById.get(id);
-    return context ? [context] : [];
-  });
-};
-
-const terminalContextIdListsEqual = (
-  contexts: ReadonlyArray<TerminalContextDraft>,
-  ids: ReadonlyArray<string>,
-): boolean =>
-  contexts.length === ids.length && contexts.every((context, index) => context.id === ids[index]);
 
 function ComposerControlSkeleton(props: { widthClassName: string }) {
   return (
@@ -822,7 +693,6 @@ interface ChatViewProps {
   surfaceMode?: "single" | "split";
   presentationMode?: "default" | "editor";
   isFocusedPane?: boolean;
-  panelState?: ChatPanelState;
   onToggleDiffPanel?: () => void;
   onOpenTurnDiffPanel?: (turnId: TurnId, filePath?: string) => void;
   onSplitSurface?: () => void;
@@ -879,7 +749,6 @@ export default function ChatView({
   surfaceMode = "single",
   presentationMode = "default",
   isFocusedPane = true,
-  panelState,
   onToggleDiffPanel,
   onOpenTurnDiffPanel,
   onSplitSurface,
@@ -909,8 +778,7 @@ export default function ChatView({
   const { handleNewThread } = useHandleNewThread();
   const { handleNewChat } = useHandleNewChat();
   const { createThreadHandoff } = useThreadHandoff();
-  const rawSearch = useDiffRouteSearch();
-  const { resolvedTheme } = useTheme();
+  const rawSearch = { panel: null as string | null };
   const queryClient = useQueryClient();
   const isEditorRail = presentationMode === "editor";
   const isInactiveSplitPane = surfaceMode === "split" && !isFocusedPane;
@@ -926,7 +794,6 @@ export default function ChatView({
   const composerFiles = composerDraft.files;
   const composerAssistantSelections = composerDraft.assistantSelections;
   const composerFileComments = composerDraft.fileComments;
-  const composerTerminalContexts = composerDraft.terminalContexts;
   const composerPastedTexts = composerDraft.pastedTexts;
   const composerSkills = composerDraft.skills;
   const composerMentions = composerDraft.mentions;
@@ -940,7 +807,6 @@ export default function ChatView({
         fileCount: composerFiles.length,
         assistantSelectionCount: composerAssistantSelections.length,
         fileCommentCount: composerFileComments.length,
-        terminalContexts: composerTerminalContexts,
         pastedTexts: composerPastedTexts,
       }),
     [
@@ -948,7 +814,6 @@ export default function ChatView({
       composerFileComments.length,
       composerFiles.length,
       composerImages.length,
-      composerTerminalContexts,
       composerPastedTexts,
       prompt,
     ],
@@ -984,20 +849,8 @@ export default function ChatView({
   );
   const addComposerDraftFileComment = useComposerDraftStore((store) => store.addFileComment);
   const clearComposerDraftFileComments = useComposerDraftStore((store) => store.clearFileComments);
-  const insertComposerDraftTerminalContext = useComposerDraftStore(
-    (store) => store.insertTerminalContext,
-  );
-  const addComposerDraftTerminalContexts = useComposerDraftStore(
-    (store) => store.addTerminalContexts,
-  );
-  const removeComposerDraftTerminalContext = useComposerDraftStore(
-    (store) => store.removeTerminalContext,
-  );
   const addComposerDraftPastedTexts = useComposerDraftStore((store) => store.addPastedTexts);
   const removeComposerDraftPastedText = useComposerDraftStore((store) => store.removePastedText);
-  const setComposerDraftTerminalContexts = useComposerDraftStore(
-    (store) => store.setTerminalContexts,
-  );
   const setComposerDraftSkills = useComposerDraftStore((store) => store.setSkills);
   const setComposerDraftMentions = useComposerDraftStore((store) => store.setMentions);
   const syncComposerDraftPersistedAttachments = useComposerDraftStore(
@@ -1037,7 +890,6 @@ export default function ChatView({
   const composerAssistantSelectionsRef = useRef<ComposerAssistantSelectionAttachment[]>(
     composerAssistantSelections,
   );
-  const composerTerminalContextsRef = useRef<TerminalContextDraft[]>(composerTerminalContexts);
   const composerFileCommentsRef = useRef<FileCommentDraft[]>(composerFileComments);
   const composerPastedTextsRef = useRef<PastedTextDraft[]>(composerPastedTexts);
   const [localDraftErrorsByThreadId, setLocalDraftErrorsByThreadId] = useState<
@@ -1084,7 +936,6 @@ export default function ChatView({
   // When set, the thread-change reset effect will open the sidebar instead of closing it.
   // Used by "Implement in a new thread" to carry the sidebar-open intent across navigation.
   const planSidebarOpenOnNextThreadRef = useRef(false);
-  const [terminalFocusRequestId, setTerminalFocusRequestId] = useState(0);
   const [composerHighlightedItemId, setComposerHighlightedItemId] = useState<string | null>(null);
   const [pullRequestDialogState, setPullRequestDialogState] =
     useState<PullRequestDialogState | null>(null);
@@ -1212,7 +1063,6 @@ export default function ChatView({
   const sendInFlightRef = useRef(false);
   const sendPreflightInFlightRef = useRef(false);
   const dragDepthRef = useRef(0);
-  const terminalOpenByThreadRef = useRef<Record<string, boolean>>({});
   const activatedThreadIdRef = useRef<ThreadId | null>(null);
   useEffect(() => {
     promptHistoryNavigationRef.current = null;
@@ -1247,35 +1097,7 @@ export default function ChatView({
     restoredQueuedSourceProposedPlanRef.current = restoredSourceProposedPlan ?? null;
   }, [restoredSourceProposedPlan]);
 
-  const terminalState = useTerminalStateStore((state) =>
-    selectThreadTerminalState(state.terminalStateByThreadId, threadId),
-  );
-  const storeSetTerminalOpen = useTerminalStateStore((s) => s.setTerminalOpen);
-  const storeSetTerminalPresentationMode = useTerminalStateStore(
-    (s) => s.setTerminalPresentationMode,
-  );
-  const storeSetTerminalWorkspaceLayout = useTerminalStateStore(
-    (s) => s.setTerminalWorkspaceLayout,
-  );
-  const storeOpenChatThreadPage = useTerminalStateStore((s) => s.openChatThreadPage);
-  const storeOpenTerminalThreadPage = useTerminalStateStore((s) => s.openTerminalThreadPage);
-  const storeSetTerminalWorkspaceTab = useTerminalStateStore((s) => s.setTerminalWorkspaceTab);
-  const storeSetTerminalHeight = useTerminalStateStore((s) => s.setTerminalHeight);
-  const storeSetTerminalMetadata = useTerminalStateStore((s) => s.setTerminalMetadata);
-  const storeSetTerminalActivity = useTerminalStateStore((s) => s.setTerminalActivity);
-  const storeSplitTerminalLeft = useTerminalStateStore((s) => s.splitTerminalLeft);
-  const storeSplitTerminalRight = useTerminalStateStore((s) => s.splitTerminalRight);
-  const storeSplitTerminalDown = useTerminalStateStore((s) => s.splitTerminalDown);
-  const storeSplitTerminalUp = useTerminalStateStore((s) => s.splitTerminalUp);
-  const storeNewTerminal = useTerminalStateStore((s) => s.newTerminal);
-  const storeNewTerminalTab = useTerminalStateStore((s) => s.newTerminalTab);
-  const storeOpenNewFullWidthTerminal = useTerminalStateStore((s) => s.openNewFullWidthTerminal);
-  const storeCloseWorkspaceChat = useTerminalStateStore((s) => s.closeWorkspaceChat);
-  const storeSetActiveTerminal = useTerminalStateStore((s) => s.setActiveTerminal);
-  const storeCloseTerminal = useTerminalStateStore((s) => s.closeTerminal);
-  const storeCloseTerminalGroup = useTerminalStateStore((s) => s.closeTerminalGroup);
-  const storeResizeTerminalSplit = useTerminalStateStore((s) => s.resizeTerminalSplit);
-  const storeClearTerminalState = useTerminalStateStore((s) => s.clearTerminalState);
+  // terminal state store removed
 
   const setPrompt = useCallback(
     (nextPrompt: string) => {
@@ -1326,13 +1148,6 @@ export default function ChatView({
       threadId,
     ],
   );
-  const addComposerTerminalContextsToDraft = useCallback(
-    (contexts: TerminalContextDraft[]) => {
-      discardPromptHistoryNavigationForComposerMutation();
-      addComposerDraftTerminalContexts(threadId, contexts);
-    },
-    [addComposerDraftTerminalContexts, discardPromptHistoryNavigationForComposerMutation, threadId],
-  );
   const addComposerPastedTextsToDraft = useCallback(
     (pastedTexts: PastedTextDraft[]) => {
       discardPromptHistoryNavigationForComposerMutation();
@@ -1366,35 +1181,6 @@ export default function ChatView({
     discardPromptHistoryNavigationForComposerMutation();
     clearComposerDraftFileComments(threadId);
   }, [clearComposerDraftFileComments, discardPromptHistoryNavigationForComposerMutation, threadId]);
-  const removeComposerTerminalContextFromDraft = useCallback(
-    (contextId: string) => {
-      discardPromptHistoryNavigationForComposerMutation();
-      const contextIndex = composerTerminalContexts.findIndex(
-        (context) => context.id === contextId,
-      );
-      if (contextIndex < 0) {
-        return;
-      }
-      const nextPrompt = removeInlineTerminalContextPlaceholder(promptRef.current, contextIndex);
-      promptRef.current = nextPrompt.prompt;
-      setPrompt(nextPrompt.prompt);
-      removeComposerDraftTerminalContext(threadId, contextId);
-      setComposerCursor(nextPrompt.cursor);
-      setComposerTrigger(
-        detectComposerTrigger(
-          nextPrompt.prompt,
-          expandCollapsedComposerCursor(nextPrompt.prompt, nextPrompt.cursor),
-        ),
-      );
-    },
-    [
-      composerTerminalContexts,
-      discardPromptHistoryNavigationForComposerMutation,
-      removeComposerDraftTerminalContext,
-      setPrompt,
-      threadId,
-    ],
-  );
   const removeComposerPastedTextFromDraft = useCallback(
     (pastedTextId: string) => {
       discardPromptHistoryNavigationForComposerMutation();
@@ -1465,7 +1251,7 @@ export default function ChatView({
   const isLocalDraftThread = !isServerThread && localDraftThread !== undefined;
   const canCheckoutPullRequestIntoThread = isLocalDraftThread;
   const diffOpen = rawSearch.panel === "diff";
-  const resolvedDiffOpen = panelState ? panelState.panel === "diff" : diffOpen;
+  const resolvedDiffOpen = diffOpen;
   const activeThreadId = activeThread?.id ?? null;
   const activeLatestTurn = activeThread?.latestTurn ?? null;
   const threadActivities = activeThread?.activities ?? EMPTY_ACTIVITIES;
@@ -1623,11 +1409,7 @@ export default function ChatView({
       }
 
       const activeDraftThread = getDraftThread(threadId);
-      if (
-        !isServerThread &&
-        activeDraftThread?.projectId === activeProject.id &&
-        activeDraftThread.entryPoint === "chat"
-      ) {
+      if (!isServerThread && activeDraftThread?.projectId === activeProject.id) {
         setDraftThreadContext(threadId, draftThreadContext);
         setProjectDraftThreadId(activeProject.id, threadId, draftThreadContext);
         return;
@@ -3013,7 +2795,7 @@ export default function ChatView({
     canOfferReviewSlashCommand({
       prompt: composerPromptWithoutActiveSlashTrigger,
       imageCount: composerImages.length,
-      terminalContextCount: composerTerminalContexts.length,
+      terminalContextCount: 0,
       selectedSkillCount: selectedComposerSkills.length,
       selectedMentionCount: selectedComposerMentions.length,
     });
@@ -3023,7 +2805,7 @@ export default function ChatView({
     canOfferForkSlashCommand({
       prompt: composerPromptWithoutActiveSlashTrigger,
       imageCount: composerImages.length,
-      terminalContextCount: composerTerminalContexts.length,
+      terminalContextCount: 0,
       selectedSkillCount: selectedComposerSkills.length,
       selectedMentionCount: selectedComposerMentions.length,
     });
@@ -3287,28 +3069,7 @@ export default function ChatView({
       }),
     [activeLatestTurn?.turnId, rawWorkLogEntries, turnDiffSummaries],
   );
-  const splitTerminalShortcutLabel = useMemo(
-    () =>
-      shortcutLabelForCommand(keybindings, "terminal.splitRight") ??
-      shortcutLabelForCommand(keybindings, "terminal.split"),
-    [keybindings],
-  );
-  const splitTerminalDownShortcutLabel = useMemo(
-    () => shortcutLabelForCommand(keybindings, "terminal.splitDown"),
-    [keybindings],
-  );
-  const newTerminalShortcutLabel = useMemo(
-    () => shortcutLabelForCommand(keybindings, "terminal.new"),
-    [keybindings],
-  );
-  const closeTerminalShortcutLabel = useMemo(
-    () => shortcutLabelForCommand(keybindings, "terminal.close"),
-    [keybindings],
-  );
-  const closeWorkspaceShortcutLabel = useMemo(
-    () => shortcutLabelForCommand(keybindings, "terminal.workspace.closeActive"),
-    [keybindings],
-  );
+  // terminal shortcut labels removed
   const diffPanelShortcutLabel = useMemo(
     () => shortcutLabelForCommand(keybindings, "diff.toggle"),
     [keybindings],
@@ -3380,39 +3141,10 @@ export default function ChatView({
     (activeThread.messages.length > 0 ||
       (activeThread.session !== null && activeThread.session.status !== "closed")),
   );
-  const activeTerminalGroup =
-    terminalState.terminalGroups.find(
-      (group) => group.id === terminalState.activeTerminalGroupId,
-    ) ??
-    terminalState.terminalGroups.find((group) =>
-      collectTerminalIdsFromLayout(group.layout).includes(terminalState.activeTerminalId),
-    ) ??
-    null;
-  const hasReachedSplitLimit =
-    (activeTerminalGroup ? collectTerminalIdsFromLayout(activeTerminalGroup.layout).length : 0) >=
-    MAX_TERMINALS_PER_GROUP;
-  const terminalWorkspaceOpen = shouldRenderTerminalWorkspace({
-    presentationMode: terminalState.presentationMode,
-    terminalOpen: terminalState.terminalOpen,
-  });
-  const terminalWorkspaceTerminalTabActive =
-    terminalWorkspaceOpen &&
-    (terminalState.workspaceLayout === "terminal-only" ||
-      terminalState.workspaceActiveTab === "terminal");
-  const isTerminalPrimarySurface = terminalState.entryPoint === "terminal";
-  const isTerminalEnvironmentContext =
-    isTerminalPrimarySurface || terminalWorkspaceTerminalTabActive;
-  const shouldShowProviderHealthBanner = shouldRenderProviderHealthBanner({
-    threadEntryPoint: terminalState.entryPoint,
-    terminalWorkspaceTerminalTabActive,
-  });
-  // Terminal-only threads should not pay to mount the hidden chat/composer pane.
-  const shouldRenderChatPaneContent = !(
-    terminalWorkspaceTerminalTabActive && terminalState.workspaceLayout === "terminal-only"
-  );
+  const shouldShowProviderHealthBanner = true;
+  const shouldRenderChatPaneContent = true;
   const secondaryChromeThreadId = activeThread?.id ?? threadId;
-  const shouldDeferSecondaryChrome =
-    activeThread !== undefined && !isCenteredEmptyLanding && !terminalWorkspaceTerminalTabActive;
+  const shouldDeferSecondaryChrome = activeThread !== undefined && !isCenteredEmptyLanding;
   const [secondaryChromeState, setSecondaryChromeState] = useState(() => ({
     threadId: secondaryChromeThreadId,
     ready: true,
@@ -3445,10 +3177,7 @@ export default function ChatView({
       window.cancelAnimationFrame(frame);
     };
   }, [secondaryChromeThreadId, shouldDeferSecondaryChrome]);
-  const terminalWorkspaceChatTabActive =
-    terminalWorkspaceOpen &&
-    terminalState.workspaceLayout === "both" &&
-    terminalState.workspaceActiveTab === "chat";
+  // terminalWorkspaceChatTabActive removed
   const setThreadError = useCallback(
     (targetThreadId: ThreadId | null, error: string | null) => {
       if (!targetThreadId) return;
@@ -3533,56 +3262,6 @@ export default function ChatView({
       setIsModelPickerOpen(false);
     }
   }, []);
-  const addTerminalContextToDraft = useCallback(
-    (selection: TerminalContextSelection) => {
-      if (!activeThread) {
-        return;
-      }
-      discardPromptHistoryNavigationForComposerMutation();
-      const snapshot = composerEditorRef.current?.readSnapshot() ?? {
-        value: promptRef.current,
-        cursor: composerCursor,
-        expandedCursor: expandCollapsedComposerCursor(promptRef.current, composerCursor),
-        selectionCollapsed: true,
-        terminalContextIds: composerTerminalContexts.map((context) => context.id),
-      };
-      const insertion = insertInlineTerminalContextPlaceholder(
-        snapshot.value,
-        snapshot.expandedCursor,
-      );
-      const nextCollapsedCursor = collapseExpandedComposerCursor(
-        insertion.prompt,
-        insertion.cursor,
-      );
-      const inserted = insertComposerDraftTerminalContext(
-        activeThread.id,
-        insertion.prompt,
-        {
-          id: randomUUID(),
-          threadId: activeThread.id,
-          createdAt: new Date().toISOString(),
-          ...selection,
-        },
-        insertion.contextIndex,
-      );
-      if (!inserted) {
-        return;
-      }
-      promptRef.current = insertion.prompt;
-      setComposerCursor(nextCollapsedCursor);
-      setComposerTrigger(detectComposerTrigger(insertion.prompt, insertion.cursor));
-      window.requestAnimationFrame(() => {
-        composerEditorRef.current?.focusAt(nextCollapsedCursor);
-      });
-    },
-    [
-      activeThread,
-      composerCursor,
-      composerTerminalContexts,
-      discardPromptHistoryNavigationForComposerMutation,
-      insertComposerDraftTerminalContext,
-    ],
-  );
   // Collapse an oversized paste into an attachment card above the composer instead
   // of flooding the editor with raw text. The card holds the full content until the
   // user sends or clicks "Show in text field".
@@ -3602,382 +3281,10 @@ export default function ChatView({
     },
     [activeThread, addComposerDraftPastedTexts, discardPromptHistoryNavigationForComposerMutation],
   );
-  const setTerminalOpen = useCallback(
-    (open: boolean) => {
-      if (!activeThreadId) return;
-      storeSetTerminalOpen(activeThreadId, open);
-    },
-    [activeThreadId, storeSetTerminalOpen],
-  );
-  const setTerminalPresentationMode = useCallback(
-    (mode: "drawer" | "workspace") => {
-      if (!activeThreadId) return;
-      storeSetTerminalPresentationMode(activeThreadId, mode);
-    },
-    [activeThreadId, storeSetTerminalPresentationMode],
-  );
-  const setTerminalWorkspaceLayout = useCallback(
-    (layout: "both" | "terminal-only") => {
-      if (!activeThreadId) return;
-      storeSetTerminalWorkspaceLayout(activeThreadId, layout);
-    },
-    [activeThreadId, storeSetTerminalWorkspaceLayout],
-  );
-  const setTerminalWorkspaceTab = useCallback(
-    (tab: "terminal" | "chat") => {
-      if (!activeThreadId) return;
-      storeSetTerminalWorkspaceTab(activeThreadId, tab);
-    },
-    [activeThreadId, storeSetTerminalWorkspaceTab],
-  );
-  const setTerminalHeight = useCallback(
-    (height: number) => {
-      if (!activeThreadId) return;
-      storeSetTerminalHeight(activeThreadId, height);
-    },
-    [activeThreadId, storeSetTerminalHeight],
-  );
-  const toggleTerminalVisibility = useCallback(() => {
-    if (!activeThreadId) return;
-    if (!terminalState.terminalOpen) {
-      setTerminalPresentationMode("drawer");
-    }
-    setTerminalOpen(!terminalState.terminalOpen);
-  }, [activeThreadId, setTerminalOpen, setTerminalPresentationMode, terminalState.terminalOpen]);
-  const expandTerminalWorkspace = useCallback(() => {
-    if (!activeThreadId) return;
-    setTerminalPresentationMode("workspace");
-    setTerminalWorkspaceLayout("both");
-    setTerminalWorkspaceTab("terminal");
-  }, [
-    activeThreadId,
-    setTerminalPresentationMode,
-    setTerminalWorkspaceLayout,
-    setTerminalWorkspaceTab,
-  ]);
-  const collapseTerminalWorkspace = useCallback(() => {
-    if (!activeThreadId) return;
-    setTerminalPresentationMode("drawer");
-  }, [activeThreadId, setTerminalPresentationMode]);
-  const splitTerminalRight = useCallback(() => {
-    if (!activeThreadId || hasReachedSplitLimit) return;
-    const terminalId = randomTerminalId();
-    storeSplitTerminalRight(activeThreadId, terminalId);
-    setTerminalFocusRequestId((value) => value + 1);
-  }, [activeThreadId, hasReachedSplitLimit, storeSplitTerminalRight]);
-  const splitTerminalLeft = useCallback(() => {
-    if (!activeThreadId || hasReachedSplitLimit) return;
-    const terminalId = randomTerminalId();
-    storeSplitTerminalLeft(activeThreadId, terminalId);
-    setTerminalFocusRequestId((value) => value + 1);
-  }, [activeThreadId, hasReachedSplitLimit, storeSplitTerminalLeft]);
-  const splitTerminalDown = useCallback(() => {
-    if (!activeThreadId || hasReachedSplitLimit) return;
-    const terminalId = randomTerminalId();
-    storeSplitTerminalDown(activeThreadId, terminalId);
-    setTerminalFocusRequestId((value) => value + 1);
-  }, [activeThreadId, hasReachedSplitLimit, storeSplitTerminalDown]);
-  const splitTerminalUp = useCallback(() => {
-    if (!activeThreadId || hasReachedSplitLimit) return;
-    const terminalId = randomTerminalId();
-    storeSplitTerminalUp(activeThreadId, terminalId);
-    setTerminalFocusRequestId((value) => value + 1);
-  }, [activeThreadId, hasReachedSplitLimit, storeSplitTerminalUp]);
-  const createNewTerminal = useCallback(() => {
-    if (!activeThreadId) return;
-    const terminalId = randomTerminalId();
-    storeNewTerminal(activeThreadId, terminalId);
-    setTerminalFocusRequestId((value) => value + 1);
-  }, [activeThreadId, storeNewTerminal]);
-  const createNewTerminalTab = useCallback(
-    (targetTerminalId: string) => {
-      if (!activeThreadId) return;
-      const terminalId = randomTerminalId();
-      storeNewTerminalTab(activeThreadId, targetTerminalId, terminalId);
-      setTerminalFocusRequestId((value) => value + 1);
-    },
-    [activeThreadId, storeNewTerminalTab],
-  );
-  const createTerminalFromShortcut = useCallback(() => {
-    const action = resolveTerminalNewAction({
-      terminalOpen: terminalState.terminalOpen,
-      activeTerminalId: terminalState.activeTerminalId,
-      activeTerminalGroupId: terminalState.activeTerminalGroupId,
-      terminalGroups: terminalState.terminalGroups,
-    });
-
-    if (action.kind === "new-group") {
-      if (!terminalState.terminalOpen) {
-        setTerminalOpen(true);
-      }
-      createNewTerminal();
-      return;
-    }
-
-    createNewTerminalTab(action.targetTerminalId);
-  }, [
-    createNewTerminal,
-    createNewTerminalTab,
-    setTerminalOpen,
-    terminalState.activeTerminalGroupId,
-    terminalState.activeTerminalId,
-    terminalState.terminalGroups,
-    terminalState.terminalOpen,
-  ]);
-  const moveTerminalToNewGroup = useCallback(
-    (terminalId: string) => {
-      if (!activeThreadId) return;
-      storeNewTerminal(activeThreadId, terminalId);
-      setTerminalFocusRequestId((value) => value + 1);
-    },
-    [activeThreadId, storeNewTerminal],
-  );
-  const openNewFullWidthTerminal = useCallback(() => {
-    if (!activeThreadId || !activeProject) return;
-    const terminalId = randomTerminalId();
-    storeOpenNewFullWidthTerminal(activeThreadId, terminalId);
-    setTerminalFocusRequestId((value) => value + 1);
-  }, [activeProject, activeThreadId, storeOpenNewFullWidthTerminal]);
-  // Desktop accelerators like Cmd+T can be claimed by Electron before the page sees keydown.
-  useEffect(() => {
-    const onMenuAction = window.desktopBridge?.onMenuAction;
-    if (typeof onMenuAction !== "function" || !isFocusedPane) {
-      return;
-    }
-
-    const unsubscribe = onMenuAction((action) => {
-      if (action !== "new-terminal-tab") return;
-      createTerminalFromShortcut();
-    });
-
-    return () => {
-      unsubscribe?.();
-    };
-  }, [createTerminalFromShortcut, isFocusedPane]);
-  const activateTerminal = useCallback(
-    (terminalId: string) => {
-      if (!activeThreadId) return;
-      storeSetActiveTerminal(activeThreadId, terminalId);
-      setTerminalFocusRequestId((value) => value + 1);
-    },
-    [activeThreadId, storeSetActiveTerminal],
-  );
-  const closeTerminal = useCallback(
-    async (terminalId: string) => {
-      const api = readNativeApi();
-      if (!activeThreadId || !api) return;
-      const isFinalTerminal = terminalState.terminalIds.length <= 1;
-      const shouldDeletePlaceholderTerminalThread = shouldAutoDeleteTerminalThreadOnLastClose({
-        isLastTerminal: isFinalTerminal,
-        isServerThread,
-        terminalEntryPoint: terminalState.entryPoint,
-        thread: activeThread,
-      });
-      const confirmed = await confirmTerminalTabClose({
-        api,
-        enabled: shouldPromptForTerminalClose({
-          confirmationEnabled: settings.confirmTerminalTabClose,
-          runningTerminalIds: terminalState.runningTerminalIds,
-          terminalAttentionStatesById: terminalState.terminalAttentionStatesById,
-          terminalId,
-        }),
-        terminalTitle: resolveTerminalCloseTitle({
-          terminalId,
-          terminalLabelsById: terminalState.terminalLabelsById,
-          terminalTitleOverridesById: terminalState.terminalTitleOverridesById,
-        }),
-        willDeleteThread: shouldDeletePlaceholderTerminalThread,
-      });
-      if (!confirmed) {
-        return;
-      }
-      disposeAndCloseTerminalSession({
-        api,
-        threadId: activeThreadId,
-        terminalId,
-        clearHistoryBeforeClose: isFinalTerminal,
-      });
-      storeCloseTerminal(activeThreadId, terminalId);
-      setTerminalFocusRequestId((value) => value + 1);
-      if (!shouldDeletePlaceholderTerminalThread) {
-        return;
-      }
-      void (async () => {
-        try {
-          await api.orchestration.dispatchCommand({
-            type: "thread.delete",
-            commandId: newCommandId(),
-            threadId: activeThreadId,
-          });
-          void reconcileDeletedThreadFromClient({
-            threadId: activeThreadId,
-            removeDeletedThreadFromClientState:
-              useStore.getState().removeDeletedThreadFromClientState,
-          });
-          useComposerDraftStore.getState().clearDraftThread(activeThreadId);
-          storeClearTerminalState(activeThreadId);
-          await handleNewChat({ fresh: true });
-        } catch (error) {
-          console.error("Failed to delete empty terminal thread after closing its last terminal", {
-            threadId: activeThreadId,
-            error,
-          });
-        }
-      })();
-    },
-    [
-      activeThread,
-      activeThreadId,
-      handleNewChat,
-      isServerThread,
-      navigate,
-      storeClearTerminalState,
-      storeCloseTerminal,
-      syncServerShellSnapshot,
-      settings.confirmTerminalTabClose,
-      terminalState.entryPoint,
-      terminalState.runningTerminalIds,
-      terminalState.terminalAttentionStatesById,
-      terminalState.terminalIds.length,
-      terminalState.terminalLabelsById,
-      terminalState.terminalTitleOverridesById,
-    ],
-  );
-  const closeActiveWorkspaceView = useCallback(() => {
-    if (!activeThreadId || !terminalWorkspaceOpen) {
-      return;
-    }
-    if (terminalState.workspaceLayout === "both" && terminalState.workspaceActiveTab === "chat") {
-      // Going terminal-only hides the chat/terminal switcher, leaving chat-backed
-      // threads with no mouse path back to chat. For those, collapse the workspace
-      // to the normal chat + terminal-drawer layout instead of stranding the user.
-      if (terminalState.entryPoint === "chat") {
-        collapseTerminalWorkspace();
-        return;
-      }
-      storeCloseWorkspaceChat(activeThreadId);
-      return;
-    }
-    closeTerminal(terminalState.activeTerminalId);
-  }, [
-    activeThreadId,
-    closeTerminal,
-    collapseTerminalWorkspace,
-    storeCloseWorkspaceChat,
-    terminalState.activeTerminalId,
-    terminalState.entryPoint,
-    terminalState.workspaceActiveTab,
-    terminalState.workspaceLayout,
-    terminalWorkspaceOpen,
-  ]);
-  // The terminal's panel toggle mirrors the right dock's collapse control: it shows
-  // or hides the side panel only when this thread already has a pane to show.
-  const rightDockOpen = useRightDockStore((store) => selectRightDockState(threadId)(store).open);
-  const hasRightDockPanes = useRightDockStore(
-    (store) => selectRightDockState(threadId)(store).panes.length > 0,
-  );
-  const setRightDockOpen = useRightDockStore((store) => store.setDockOpen);
-  const toggleRightDock = useCallback(() => {
-    setRightDockOpen(threadId, !rightDockOpen);
-  }, [rightDockOpen, setRightDockOpen, threadId]);
-  const terminalDrawerProps = useMemo(
-    () => ({
-      threadId,
-      onTogglePanel: hasRightDockPanes ? toggleRightDock : undefined,
-      isPanelOpen: hasRightDockPanes ? rightDockOpen : undefined,
-      cwd: gitCwd ?? activeProject?.cwd ?? "",
-      runtimeEnv: threadTerminalRuntimeEnv,
-      height: terminalState.terminalHeight,
-      terminalIds: terminalState.terminalIds,
-      terminalLabelsById: terminalState.terminalLabelsById,
-      terminalTitleOverridesById: terminalState.terminalTitleOverridesById,
-      terminalCliKindsById: terminalState.terminalCliKindsById,
-      terminalAttentionStatesById: terminalState.terminalAttentionStatesById ?? {},
-      runningTerminalIds: terminalState.runningTerminalIds,
-      activeTerminalId: terminalState.activeTerminalId,
-      terminalGroups: terminalState.terminalGroups,
-      activeTerminalGroupId: terminalState.activeTerminalGroupId,
-      focusRequestId: terminalFocusRequestId,
-      onSplitTerminal: splitTerminalRight,
-      onSplitTerminalDown: splitTerminalDown,
-      onNewTerminal: createNewTerminal,
-      onNewTerminalTab: createNewTerminalTab,
-      onMoveTerminalToGroup: moveTerminalToNewGroup,
-      splitShortcutLabel: splitTerminalShortcutLabel ?? undefined,
-      splitDownShortcutLabel: splitTerminalDownShortcutLabel ?? undefined,
-      newShortcutLabel: newTerminalShortcutLabel ?? undefined,
-      closeShortcutLabel: closeTerminalShortcutLabel ?? undefined,
-      workspaceCloseShortcutLabel: closeWorkspaceShortcutLabel ?? undefined,
-      onActiveTerminalChange: activateTerminal,
-      onCloseTerminal: closeTerminal,
-      onCloseTerminalGroup: (groupId: string) => {
-        if (!activeThreadId) return;
-        storeCloseTerminalGroup(activeThreadId, groupId);
-      },
-      onHeightChange: setTerminalHeight,
-      onResizeTerminalSplit: (groupId: string, splitId: string, weights: number[]) => {
-        if (!activeThreadId) return;
-        storeResizeTerminalSplit(activeThreadId, groupId, splitId, weights);
-      },
-      onTerminalMetadataChange: (
-        terminalId: string,
-        metadata: { cliKind: "codex" | "claude" | null; label: string },
-      ) => {
-        if (!activeThreadId) return;
-        storeSetTerminalMetadata(activeThreadId, terminalId, metadata);
-      },
-      onTerminalActivityChange: (
-        terminalId: string,
-        activity: {
-          hasRunningSubprocess: boolean;
-          agentState: "running" | "attention" | "review" | null;
-        },
-      ) => {
-        if (!activeThreadId) return;
-        storeSetTerminalActivity(activeThreadId, terminalId, activity);
-      },
-      onAddTerminalContext: addTerminalContextToDraft,
-    }),
-    [
-      activeProject?.cwd,
-      activateTerminal,
-      addTerminalContextToDraft,
-      closeTerminal,
-      closeTerminalShortcutLabel,
-      closeWorkspaceShortcutLabel,
-      createNewTerminal,
-      createNewTerminalTab,
-      moveTerminalToNewGroup,
-      gitCwd,
-      activeThreadId,
-      newTerminalShortcutLabel,
-      setTerminalHeight,
-      splitTerminalRight,
-      splitTerminalDown,
-      splitTerminalShortcutLabel,
-      splitTerminalDownShortcutLabel,
-      storeCloseTerminalGroup,
-      storeResizeTerminalSplit,
-      storeSetTerminalActivity,
-      storeSetTerminalMetadata,
-      terminalFocusRequestId,
-      terminalState.activeTerminalGroupId,
-      terminalState.activeTerminalId,
-      terminalState.terminalAttentionStatesById,
-      terminalState.terminalCliKindsById,
-      terminalState.terminalGroups,
-      terminalState.terminalHeight,
-      terminalState.terminalIds,
-      terminalState.terminalLabelsById,
-      terminalState.terminalTitleOverridesById,
-      terminalState.runningTerminalIds,
-      threadId,
-      threadTerminalRuntimeEnv,
-      toggleRightDock,
-      rightDockOpen,
-      hasRightDockPanes,
-    ],
-  );
+  // terminal state callbacks removed
+  // Desktop menu terminal action removed
+  // terminal activate/close callbacks removed
+  // rightDock and terminalDrawerProps removed
   const runProjectScript = useCallback(
     async (
       script: ProjectScript,
@@ -3991,76 +3298,20 @@ export default function ChatView({
           return { ...current, [activeProject.id]: script.id };
         });
       }
-      const targetCwd = options?.cwd ?? gitCwd ?? activeProject.cwd;
-      const baseTerminalId =
-        terminalState.activeTerminalId ||
-        terminalState.terminalIds[0] ||
-        DEFAULT_THREAD_TERMINAL_ID;
-      const { shouldCreateNewTerminal, terminalId: targetTerminalId } =
-        resolveProjectScriptTerminalTarget({
-          baseTerminalId,
-          createTerminalId: randomTerminalId,
-          hasRunningTerminal: terminalState.runningTerminalIds.length > 0,
-          preferNewTerminal: options?.preferNewTerminal,
-          terminalOpen: terminalState.terminalOpen,
-        });
 
-      setTerminalOpen(true);
-      if (shouldCreateNewTerminal) {
-        storeNewTerminal(activeThreadId, targetTerminalId);
-      } else {
-        storeSetActiveTerminal(activeThreadId, targetTerminalId);
-      }
-      setTerminalFocusRequestId((value) => value + 1);
-
-      try {
-        const { metadata } = await runProjectCommandInTerminal({
-          api,
-          threadId: activeThreadId,
-          terminalId: targetTerminalId,
-          project: {
-            cwd: activeProject.cwd,
-          },
-          cwd: targetCwd,
-          command: script.command,
-          worktreePath: options?.worktreePath ?? activeThread.worktreePath ?? null,
-          ...(options?.env ? { env: options.env } : {}),
-        });
-        if (metadata) {
-          storeSetTerminalMetadata(activeThreadId, targetTerminalId, {
-            cliKind: metadata.cliKind,
-            label: metadata.label,
-          });
-        }
-        return { terminalId: targetTerminalId };
-      } catch (error) {
-        setThreadError(
-          activeThreadId,
-          error instanceof Error ? error.message : `Failed to run script "${script.name}".`,
-        );
-        if (options?.throwOnError) {
-          throw error instanceof Error
-            ? error
-            : new Error(`Failed to run script "${script.name}".`);
-        }
-        return null;
+      setThreadError(activeThreadId, `Script "${script.name}" cannot run without a terminal.`);
+      if (options?.throwOnError) {
+        throw new Error(`Script "${script.name}" cannot run without a terminal.`);
       }
+      return null;
     },
     [
       activeProject,
       activeThread,
       activeThreadId,
       gitCwd,
-      setTerminalOpen,
       setThreadError,
-      storeNewTerminal,
-      storeSetActiveTerminal,
-      storeSetTerminalMetadata,
       setLastInvokedScriptByProjectId,
-      terminalState.activeTerminalId,
-      terminalState.terminalOpen,
-      terminalState.runningTerminalIds,
-      terminalState.terminalIds,
     ],
   );
   const stopActiveThreadSession = useCallback(async () => {
@@ -4694,14 +3945,14 @@ export default function ChatView({
   }, [activeThread?.id]);
 
   useEffect(() => {
-    if (!activeThread?.id || terminalState.terminalOpen || isInactiveSplitPane) return;
+    if (!activeThread?.id || isInactiveSplitPane) return;
     const frame = window.requestAnimationFrame(() => {
       focusComposer();
     });
     return () => {
       window.cancelAnimationFrame(frame);
     };
-  }, [activeThread?.id, focusComposer, isInactiveSplitPane, terminalState.terminalOpen]);
+  }, [activeThread?.id, focusComposer, isInactiveSplitPane]);
 
   useEffect(() => {
     composerImagesRef.current = composerImages;
@@ -4715,10 +3966,6 @@ export default function ChatView({
     composerAssistantSelectionsRef.current = composerAssistantSelections;
   }, [composerAssistantSelections]);
 
-  useEffect(() => {
-    composerTerminalContextsRef.current = composerTerminalContexts;
-  }, [composerTerminalContexts]);
-
   useEffect(() => {
     composerFileCommentsRef.current = composerFileComments;
   }, [composerFileComments]);
@@ -5078,28 +4325,6 @@ export default function ChatView({
     serverAcknowledgedLocalDispatch,
   ]);
 
-  useEffect(() => {
-    if (!activeThreadId) return;
-    const previous = terminalOpenByThreadRef.current[activeThreadId] ?? false;
-    const current = Boolean(terminalState.terminalOpen);
-
-    if (!previous && current) {
-      terminalOpenByThreadRef.current[activeThreadId] = current;
-      setTerminalFocusRequestId((value) => value + 1);
-      return;
-    } else if (previous && !current) {
-      terminalOpenByThreadRef.current[activeThreadId] = current;
-      const frame = window.requestAnimationFrame(() => {
-        focusComposer();
-      });
-      return () => {
-        window.cancelAnimationFrame(frame);
-      };
-    }
-
-    terminalOpenByThreadRef.current[activeThreadId] = current;
-  }, [activeThreadId, focusComposer, terminalState.terminalOpen]);
-
   useEffect(() => {
     if (!activeThreadId) {
       activatedThreadIdRef.current = null;
@@ -5109,29 +4334,7 @@ export default function ChatView({
       return;
     }
     activatedThreadIdRef.current = activeThreadId;
-    if (terminalState.entryPoint !== "terminal") {
-      return;
-    }
-    storeOpenTerminalThreadPage(activeThreadId);
-  }, [activeThreadId, storeOpenTerminalThreadPage, terminalState.entryPoint]);
-
-  useEffect(() => {
-    if (!terminalWorkspaceOpen) {
-      return;
-    }
-
-    if (terminalState.workspaceActiveTab === "terminal") {
-      setTerminalFocusRequestId((value) => value + 1);
-      return;
-    }
-
-    const frame = window.requestAnimationFrame(() => {
-      focusComposer();
-    });
-    return () => {
-      window.cancelAnimationFrame(frame);
-    };
-  }, [focusComposer, terminalState.workspaceActiveTab, terminalWorkspaceOpen]);
+  }, [activeThreadId]);
 
   const onInterrupt = useCallback(async () => {
     const api = readNativeApi();
@@ -5168,17 +4371,8 @@ export default function ChatView({
         return;
       }
       const composerPickerShortcutActive =
-        !isTerminalFocused() &&
-        !isComposerApprovalState &&
-        canHandleComposerPickerShortcut(event, composerFormRef.current);
-      const shortcutContext = {
-        terminalFocus: isTerminalFocused(),
-        terminalOpen: Boolean(terminalState.terminalOpen),
-        terminalWorkspaceOpen,
-        terminalWorkspaceTerminalOnly: terminalState.workspaceLayout === "terminal-only",
-        terminalWorkspaceTerminalTabActive,
-        terminalWorkspaceChatTabActive,
-      };
+        !isComposerApprovalState && canHandleComposerPickerShortcut(event, composerFormRef.current);
+      const shortcutContext = {};
 
       const command = resolveShortcutCommand(event, keybindings, {
         context: shortcutContext,
@@ -5211,98 +4405,6 @@ export default function ChatView({
         return;
       }
 
-      if (command === "terminal.toggle") {
-        event.preventDefault();
-        event.stopPropagation();
-        toggleTerminalVisibility();
-        return;
-      }
-
-      if (command === "terminal.split" || command === "terminal.splitRight") {
-        event.preventDefault();
-        event.stopPropagation();
-        if (!terminalState.terminalOpen) {
-          setTerminalOpen(true);
-        }
-        splitTerminalRight();
-        return;
-      }
-
-      if (command === "terminal.splitLeft") {
-        event.preventDefault();
-        event.stopPropagation();
-        if (!terminalState.terminalOpen) {
-          setTerminalOpen(true);
-        }
-        splitTerminalLeft();
-        return;
-      }
-
-      if (command === "terminal.splitDown") {
-        event.preventDefault();
-        event.stopPropagation();
-        if (!terminalState.terminalOpen) {
-          setTerminalOpen(true);
-        }
-        splitTerminalDown();
-        return;
-      }
-
-      if (command === "terminal.splitUp") {
-        event.preventDefault();
-        event.stopPropagation();
-        if (!terminalState.terminalOpen) {
-          setTerminalOpen(true);
-        }
-        splitTerminalUp();
-        return;
-      }
-
-      if (command === "terminal.close") {
-        event.preventDefault();
-        event.stopPropagation();
-        if (!terminalState.terminalOpen) return;
-        closeTerminal(terminalState.activeTerminalId);
-        return;
-      }
-
-      if (command === "terminal.new") {
-        event.preventDefault();
-        event.stopPropagation();
-        createTerminalFromShortcut();
-        return;
-      }
-
-      if (command === "terminal.workspace.newFullWidth") {
-        event.preventDefault();
-        event.stopPropagation();
-        openNewFullWidthTerminal();
-        return;
-      }
-
-      if (command === "terminal.workspace.closeActive") {
-        event.preventDefault();
-        event.stopPropagation();
-        closeActiveWorkspaceView();
-        return;
-      }
-
-      if (command === "terminal.workspace.terminal") {
-        event.preventDefault();
-        event.stopPropagation();
-        if (!terminalWorkspaceOpen) return;
-        setTerminalWorkspaceTab("terminal");
-        return;
-      }
-
-      if (command === "terminal.workspace.chat") {
-        event.preventDefault();
-        event.stopPropagation();
-        if (!terminalWorkspaceOpen) return;
-        setTerminalWorkspaceTab("chat");
-        return;
-      }
-
       if (command === "diff.toggle") {
         event.preventDefault();
         event.stopPropagation();
@@ -5310,14 +4412,6 @@ export default function ChatView({
         return;
       }
 
-      if (command === "rightPanel.toggle") {
-        event.preventDefault();
-        event.stopPropagation();
-        if (!hasRightDockPanes) return;
-        toggleRightDock();
-        return;
-      }
-
       if (command === "chat.split") {
         event.preventDefault();
         event.stopPropagation();
@@ -5339,24 +4433,9 @@ export default function ChatView({
     return () => window.removeEventListener("keydown", handler, { capture: true });
   }, [
     activeProject,
-    terminalState.terminalOpen,
-    terminalState.activeTerminalId,
-    terminalState.workspaceLayout,
     activeThreadId,
-    closeTerminal,
-    closeActiveWorkspaceView,
-    createTerminalFromShortcut,
-    setTerminalOpen,
-    openNewFullWidthTerminal,
     runProjectScript,
     keybindings,
-    splitTerminalDown,
-    splitTerminalLeft,
-    splitTerminalRight,
-    splitTerminalUp,
-    terminalWorkspaceChatTabActive,
-    terminalWorkspaceOpen,
-    terminalWorkspaceTerminalTabActive,
     onToggleDiff,
     onInterrupt,
     onSplitSurface,
@@ -5364,15 +4443,11 @@ export default function ChatView({
     hasLiveTurn,
     handleModelPickerOpenChange,
     handleTraitsPickerOpenChange,
-    hasRightDockPanes,
     isComposerApprovalState,
     pendingUserInputs.length,
-    setTerminalWorkspaceTab,
     surfaceMode,
     scheduleComposerFocus,
     toggleComposerFocus,
-    toggleRightDock,
-    toggleTerminalVisibility,
   ]);
 
   // --- Composer attachment entry points -------------------------------------
@@ -5583,9 +4658,6 @@ export default function ChatView({
         for (const comment of restoredFileComments) {
           addComposerFileCommentToDraft(comment);
         }
-        if (queuedTurn.terminalContexts.length > 0) {
-          addComposerTerminalContextsToDraft(queuedTurn.terminalContexts);
-        }
         if (queuedTurn.pastedTexts.length > 0) {
           addComposerPastedTextsToDraft(queuedTurn.pastedTexts);
         }
@@ -5617,7 +4689,6 @@ export default function ChatView({
       addComposerFileCommentToDraft,
       addComposerFilesToDraft,
       addComposerImagesToDraft,
-      addComposerTerminalContextsToDraft,
       addComposerPastedTextsToDraft,
       clearComposerDraftContent,
       scheduleComposerFocus,
@@ -5718,8 +4789,6 @@ export default function ChatView({
       queuedChatTurn?.assistantSelections ?? composerAssistantSelections;
     const composerImagesForSend = composerRegularImagesForSend;
     const composerFileCommentsForSend = queuedChatTurn?.fileComments ?? composerFileComments;
-    const composerTerminalContextsForSend =
-      queuedChatTurn?.terminalContexts ?? composerTerminalContexts;
     const composerPastedTextsForSend = queuedChatTurn?.pastedTexts ?? composerPastedTexts;
     const selectedComposerSkillsForSend =
       queuedChatTurn?.skills ?? selectedComposerSkillsRef.current;
@@ -5736,8 +4805,6 @@ export default function ChatView({
     const envModeForSend = queuedChatTurn?.envMode ?? envMode;
     const {
       trimmedPrompt: trimmed,
-      sendableTerminalContexts: sendableComposerTerminalContexts,
-      expiredTerminalContextCount,
       sendablePastedTexts: sendableComposerPastedTexts,
       hasSendableContent,
     } = deriveComposerSendState({
@@ -5746,7 +4813,6 @@ export default function ChatView({
       fileCount: composerFilesForSend.length,
       assistantSelectionCount: composerAssistantSelectionsForSend.length,
       fileCommentCount: composerFileCommentsForSend.length,
-      terminalContexts: composerTerminalContextsForSend,
       pastedTexts: composerPastedTextsForSend,
     });
     let trimmedPromptForSend = trimmed;
@@ -5770,7 +4836,6 @@ export default function ChatView({
       composerFilesForSend.length > 0 ||
       composerAssistantSelectionsForSend.length > 0 ||
       composerFileCommentsForSend.length > 0 ||
-      sendableComposerTerminalContexts.length > 0 ||
       sendableComposerPastedTexts.length > 0;
     // Queued chat turns already captured their intended mode. Live plan follow-ups
     // with attachments must use the normal send path so references are preserved.
@@ -5817,7 +4882,6 @@ export default function ChatView({
       composerFilesForSend.length === 0 &&
       composerAssistantSelectionsForSend.length === 0 &&
       composerFileCommentsForSend.length === 0 &&
-      sendableComposerTerminalContexts.length === 0 &&
       sendableComposerPastedTexts.length === 0 &&
       // Provider mentions are structured turn metadata, and automation definitions persist text only.
       selectedComposerMentionsForSend.length === 0;
@@ -5838,17 +4902,6 @@ export default function ChatView({
           })
         : undefined);
     if (!hasSendableContent) {
-      if (expiredTerminalContextCount > 0) {
-        const toastCopy = buildExpiredTerminalContextToastCopy(
-          expiredTerminalContextCount,
-          "empty",
-        );
-        toastManager.add({
-          type: "warning",
-          title: toastCopy.title,
-          description: toastCopy.description,
-        });
-      }
       return false;
     }
     if (!activeProject) return false;
@@ -5896,7 +4949,6 @@ export default function ChatView({
           images: queuedImagesForPersistence,
           files: composerFilesForSend,
           assistantSelections: composerAssistantSelectionsForSend,
-          terminalContexts: sendableComposerTerminalContexts,
           fileComments: composerFileCommentsForSend,
           pastedTexts: sendableComposerPastedTexts,
         }),
@@ -5905,7 +4957,6 @@ export default function ChatView({
         files: composerFilesForSend,
         assistantSelections: composerAssistantSelectionsForSend,
         fileComments: composerFileCommentsForSend,
-        terminalContexts: sendableComposerTerminalContexts,
         pastedTexts: sendableComposerPastedTexts,
         skills: selectedComposerSkillsForSend,
         mentions: selectedComposerMentionsForSend,
@@ -5937,8 +4988,7 @@ export default function ChatView({
         titleSeed = `File: ${composerFilesForSend[0]?.name ?? "attachment"}`;
       } else if (composerAssistantSelectionsForSend.length > 0) {
         titleSeed = formatAssistantSelectionTitleSeed(composerAssistantSelectionsForSend.length);
-      } else if (sendableComposerTerminalContexts.length > 0) {
-        titleSeed = formatTerminalContextLabel(sendableComposerTerminalContexts[0]!);
+      } else if (false) {
       } else if (composerFileCommentsForSend.length > 0) {
         titleSeed = formatFileCommentTitleSeed(composerFileCommentsForSend.length);
       } else if (sendableComposerPastedTexts.length > 0) {
@@ -6073,14 +5123,12 @@ export default function ChatView({
     const composerFilesSnapshot = [...composerFilesForSend];
     const composerAssistantSelectionsSnapshot = [...composerAssistantSelectionsForSend];
     const composerFileCommentsSnapshot = [...composerFileCommentsForSend];
-    const composerTerminalContextsSnapshot = [...sendableComposerTerminalContexts];
     const composerPastedTextsSnapshot = [...sendableComposerPastedTexts];
     const composerSkillsSnapshot = [...selectedComposerSkillsForSend];
     const composerMentionsSnapshot = [...selectedComposerMentionsForSend];
     const visibleMessageTextForSend = appendComposerMessageContext({
       prompt: promptForSend,
       assistantSelections: composerAssistantSelectionsSnapshot,
-      terminalContexts: composerTerminalContextsSnapshot,
       fileComments: composerFileCommentsSnapshot,
       pastedTexts: composerPastedTextsSnapshot,
     });
@@ -6155,17 +5203,6 @@ export default function ChatView({
     armTranscriptAutoFollow(threadIdForSend, true);
 
     setThreadError(threadIdForSend, null);
-    if (expiredTerminalContextCount > 0) {
-      const toastCopy = buildExpiredTerminalContextToastCopy(
-        expiredTerminalContextCount,
-        "omitted",
-      );
-      toastManager.add({
-        type: "warning",
-        title: toastCopy.title,
-        description: toastCopy.description,
-      });
-    }
     // Queued turns are dispatched from their captured snapshot, so this send path
     // must not clear a separate live draft the user may already be editing.
     if (queuedChatTurn === null) {
@@ -6313,13 +5350,7 @@ export default function ChatView({
           if (nextThreadWorktreePath) {
             setupScriptOptions.cwd = nextThreadWorktreePath;
           }
-          const setupTerminal = await runProjectScript(setupScript, setupScriptOptions);
-          if (setupTerminal) {
-            await waitForSetupScriptTerminalActivity({
-              threadId: threadIdForSend,
-              terminalId: setupTerminal.terminalId,
-            });
-          }
+          await runProjectScript(setupScript, setupScriptOptions);
         }
       }
 
@@ -6402,7 +5433,6 @@ export default function ChatView({
         composerFilesRef.current.length === 0 &&
         composerAssistantSelectionsRef.current.length === 0 &&
         composerFileCommentsRef.current.length === 0 &&
-        composerTerminalContextsRef.current.length === 0 &&
         composerPastedTextsRef.current.length === 0
       ) {
         setOptimisticUserMessages((existing) => {
@@ -6431,7 +5461,6 @@ export default function ChatView({
         for (const comment of composerFileCommentsSnapshot) {
           addComposerFileCommentToDraft(comment);
         }
-        addComposerTerminalContextsToDraft(composerTerminalContextsSnapshot);
         addComposerPastedTextsToDraft(composerPastedTextsSnapshot);
         updateSelectedComposerSkills(composerSkillsSnapshot);
         updateSelectedComposerMentions(composerMentionsSnapshot);
@@ -7693,7 +6722,6 @@ export default function ChatView({
     cursor: number;
     expandedCursor: number;
     selectionCollapsed: boolean;
-    terminalContextIds: string[];
   } => {
     const editorSnapshot = composerEditorRef.current?.readSnapshot();
     if (editorSnapshot) {
@@ -7704,9 +6732,8 @@ export default function ChatView({
       cursor: composerCursor,
       expandedCursor: expandCollapsedComposerCursor(promptRef.current, composerCursor),
       selectionCollapsed: true,
-      terminalContextIds: composerTerminalContexts.map((context) => context.id),
     };
-  }, [composerCursor, composerTerminalContexts]);
+  }, [composerCursor]);
 
   const resolveActiveComposerTrigger = useCallback((): {
     snapshot: {
@@ -7894,7 +6921,7 @@ export default function ChatView({
         });
         return;
       }
-      await handleNewThread(activeProject.id, { entryPoint: "chat" });
+      await handleNewThread(activeProject.id);
     },
     openForkTargetPicker: () => {
       setComposerCommandPicker("fork-target");
@@ -8073,7 +7100,6 @@ export default function ChatView({
       nextCursor: number,
       expandedCursor: number,
       cursorAdjacentToMention: boolean,
-      terminalContextIds: string[],
     ) => {
       if (activePendingProgress?.activeQuestion && activePendingUserInput) {
         const interruptedNavigation = promptHistoryNavigationRef.current;
@@ -8136,12 +7162,6 @@ export default function ChatView({
       if (composerCommandPicker !== null && nextPrompt.trim().length > 0) {
         setComposerCommandPicker(null);
       }
-      if (!terminalContextIdListsEqual(composerTerminalContexts, terminalContextIds)) {
-        setComposerDraftTerminalContexts(
-          threadId,
-          syncTerminalContextsByIds(composerTerminalContexts, terminalContextIds),
-        );
-      }
       setComposerCursor(nextCursor);
       setComposerTrigger(
         cursorAdjacentToMention ? null : detectComposerTrigger(nextPrompt, expandedCursor),
@@ -8150,14 +7170,12 @@ export default function ChatView({
     [
       activePendingProgress?.activeQuestion,
       activePendingUserInput,
-      composerTerminalContexts,
       composerCommandPicker,
       onChangeActivePendingUserInputCustomAnswer,
       promptHistory,
       restoreComposerDraftPromptHistorySavedDraft,
       setPrompt,
       setComposerDraftPromptHistorySavedDraft,
-      setComposerDraftTerminalContexts,
       setComposerCommandPicker,
       setRestoredQueuedSourceProposedPlan,
       threadId,
@@ -8362,28 +7380,6 @@ export default function ChatView({
       search: (previous) => ({ ...stripDiffSearchParams(previous), view: "editor" }),
     });
   }, [activeProjectIdForNewChat, handleNewThread]);
-  const onOpenEditorChat = useCallback(
-    (nextThreadId: ThreadId) => {
-      storeOpenChatThreadPage(nextThreadId);
-      onNavigateToThread(nextThreadId);
-    },
-    [onNavigateToThread, storeOpenChatThreadPage],
-  );
-  const onOpenEditorTerminal = useCallback(() => {
-    if (!activeThreadId) return;
-    setTerminalPresentationMode("workspace");
-    setTerminalWorkspaceLayout("terminal-only");
-    setTerminalWorkspaceTab("terminal");
-    setTerminalFocusRequestId((value) => value + 1);
-  }, [
-    activeThreadId,
-    setTerminalPresentationMode,
-    setTerminalWorkspaceLayout,
-    setTerminalWorkspaceTab,
-  ]);
-  const onCloseEditorTerminal = useCallback(() => {
-    void closeTerminal(terminalState.activeTerminalId);
-  }, [closeTerminal, terminalState.activeTerminalId]);
   const onRevertUserMessage = useCallback(
     (messageId: MessageId) => {
       const targetTurnCount = revertTurnCountByUserMessageId.get(messageId);
@@ -8756,7 +7752,6 @@ export default function ChatView({
                       ) : (
                         <ComposerCommandMenu
                           items={composerMenuItems}
-                          resolvedTheme={resolvedTheme}
                           isLoading={isComposerMenuLoading}
                           triggerKind={
                             composerCommandPicker !== null
@@ -8803,13 +7798,7 @@ export default function ChatView({
                           : prompt
                     }
                     cursor={composerCursor}
-                    terminalContexts={
-                      !isComposerApprovalState && pendingUserInputs.length === 0
-                        ? composerTerminalContexts
-                        : []
-                    }
                     mentionReferences={selectedComposerMentions}
-                    onRemoveTerminalContext={removeComposerTerminalContextFromDraft}
                     onChange={onPromptChange}
                     onCommandKeyDown={onComposerCommandKey}
                     onPaste={onComposerPaste}
@@ -8857,6 +7846,7 @@ export default function ChatView({
                           : "min-w-0 flex-1 gap-1 overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden sm:min-w-max sm:overflow-visible",
                       )}
                     >
+                      {composerPickerControls}
                       {activeTaskList || sidebarProposedPlan || planSidebarOpen ? (
                         <Button
                           variant="ghost"
@@ -8877,12 +7867,11 @@ export default function ChatView({
                       data-chat-composer-actions="right"
                       className="flex shrink-0 items-center gap-1"
                     >
-                      {composerPickerControls}
                       {activePendingProgress ? (
                         <Button
                           type="submit"
                           size="sm"
-                          className="rounded-full px-4"
+                          className="rounded-lg px-4"
                           disabled={
                             activePendingIsResponding ||
                             (activePendingProgress.isLastQuestion
@@ -8917,7 +7906,7 @@ export default function ChatView({
                             <Button
                               type="submit"
                               size="sm"
-                              className="h-9 rounded-full px-4 sm:h-8"
+                              className="h-9 rounded-lg px-4 sm:h-8"
                               disabled={isSendBusy || isConnecting}
                             >
                               {isConnecting || isSendBusy ? "Sending..." : "Refine"}
@@ -8927,7 +7916,7 @@ export default function ChatView({
                               <Button
                                 type="submit"
                                 size="sm"
-                                className="h-9 rounded-l-full rounded-r-none px-4 sm:h-8"
+                                className="h-9 rounded-l-lg rounded-r-none px-4 sm:h-8"
                                 disabled={isSendBusy || isConnecting}
                               >
                                 {isConnecting || isSendBusy ? "Sending..." : "Implement"}
@@ -8938,7 +7927,7 @@ export default function ChatView({
                                     <Button
                                       size="sm"
                                       variant="default"
-                                      className="h-9 rounded-l-none rounded-r-full border-l-white/12 px-2 sm:h-8"
+                                      className="h-9 rounded-l-none rounded-r-lg border-l-white/12 px-2 sm:h-8"
                                       aria-label="Implementation actions"
                                       disabled={isSendBusy || isConnecting}
                                     />
@@ -8961,8 +7950,7 @@ export default function ChatView({
                           <Button
                             type="submit"
                             variant="prominent"
-                            size="icon-xs"
-                            className="size-8 rounded-full sm:size-8"
+                            size="icon-sm"
                             disabled={
                               isSendBusy || isConnecting || !composerSendState.hasSendableContent
                             }
@@ -8996,10 +7984,7 @@ export default function ChatView({
                                 />
                               </svg>
                             ) : (
-                              <ComposerSendArrowIcon
-                                aria-hidden="true"
-                                className="size-5 shrink-0"
-                              />
+                              <ComposerSendArrowIcon aria-hidden="true" className="size-4" />
                             )}
                           </Button>
                         )
@@ -9103,7 +8088,6 @@ export default function ChatView({
         <ChatHeader
           activeThreadId={activeThread.id}
           activeThreadTitle={surfaceTitle ?? activeThreadDisplayTitle}
-          activeThreadEntryPoint={terminalState.entryPoint}
           activeProvider={activeThread.modelSelection.provider ?? activeThread.session?.provider}
           activeProjectName={isEditorRail ? undefined : activeProjectDisplayName}
           threadBreadcrumbs={threadBreadcrumbs}
@@ -9111,7 +8095,7 @@ export default function ChatView({
             ? { className: cn(CHAT_SURFACE_HEADER_PADDING_X_CLASS, "h-full") }
             : {})}
           hideSidebarControls={isEditorRail}
-          hideHandoffControls={terminalWorkspaceTerminalTabActive || isEditorRail}
+          hideHandoffControls={isEditorRail}
           isGitRepo={isGitRepo}
           openInTarget={threadWorkspaceCwd}
           activeProjectScripts={isEditorRail ? undefined : activeProjectScripts}
@@ -9130,8 +8114,6 @@ export default function ChatView({
           gitCwd={threadWorkspaceCwd}
           diffTotals={repoDiffTotals}
           showGitActions={showGitActions && !isEditorRail}
-          showDiffToggle={!isEditorRail}
-          diffOpen={resolvedDiffOpen}
           diffDisabledReason={diffDisabledReason}
           surfaceMode={surfaceMode}
           chatLayoutAction={
@@ -9151,21 +8133,6 @@ export default function ChatView({
                   }
                 : null
           }
-          editorChatControls={
-            isEditorRail && activeProject
-              ? {
-                  projectId: activeProject.id,
-                  activeSurface: terminalWorkspaceTerminalTabActive ? "terminal" : "chat",
-                  terminalAvailable: terminalState.terminalOpen,
-                  terminalHasRunningActivity: terminalState.runningTerminalIds.length > 0,
-                  onNewChat: onNewEditorChat,
-                  onNewTerminal: onOpenEditorTerminal,
-                  onOpenChat: onOpenEditorChat,
-                  onOpenTerminal: onOpenEditorTerminal,
-                  onCloseTerminal: onCloseEditorTerminal,
-                }
-              : null
-          }
           changeThreadAction={
             surfaceMode === "split" && isFocusedPane && onChangeThreadInSplitPane
               ? {
@@ -9178,7 +8145,6 @@ export default function ChatView({
           onAddProjectScript={saveProjectScript}
           onUpdateProjectScript={updateProjectScript}
           onDeleteProjectScript={deleteProjectScript}
-          onToggleDiff={onToggleDiff}
           onCreateHandoff={onCreateHandoffThread}
           onNavigateToThread={onNavigateToThread}
           onRenameThread={() => setRenameDialogOpen(true)}
@@ -9202,27 +8168,11 @@ export default function ChatView({
         rateLimitStatus={visibleActiveRateLimitStatus}
         onDismiss={dismissActiveRateLimitBanner}
       />
-      {terminalWorkspaceOpen && !isEditorRail ? (
-        <TerminalWorkspaceTabs
-          activeTab={terminalState.workspaceActiveTab}
-          isWorking={isWorking}
-          terminalHasRunningActivity={terminalState.runningTerminalIds.length > 0}
-          terminalCount={terminalState.terminalIds.length}
-          workspaceLayout={terminalState.workspaceLayout}
-          onSelectTab={setTerminalWorkspaceTab}
-        />
-      ) : null}
       {/* Main content area with optional plan sidebar */}
       <div className="relative flex min-h-0 min-w-0 flex-1 overflow-hidden">
         {/* Chat column */}
         <div className="relative flex min-h-0 min-w-0 flex-1 flex-col">
-          <div
-            aria-hidden={terminalWorkspaceTerminalTabActive}
-            className={cn(
-              "flex min-h-0 min-w-0 flex-1 flex-col",
-              terminalWorkspaceTerminalTabActive ? "pointer-events-none invisible" : "",
-            )}
-          >
+          <div className="flex min-h-0 min-w-0 flex-1 flex-col">
             {shouldRenderChatPaneContent && isCenteredEmptyLanding ? (
               <div
                 className={cn(
@@ -9276,7 +8226,6 @@ export default function ChatView({
                       followLiveOutput={hasStreamingAssistantText}
                       onIsAtEndChange={onIsAtEndChange}
                       markdownCwd={threadWorkspaceCwd ?? undefined}
-                      resolvedTheme={resolvedTheme}
                       chatFontSizePx={settings.chatFontSizePx}
                       timestampFormat={timestampFormat}
                       workspaceRoot={activeProject?.cwd ?? undefined}
@@ -9296,7 +8245,6 @@ export default function ChatView({
                         ) : undefined
                       }
                       emptyStateProjectName={activeProjectDisplayName}
-                      terminalWorkspaceTerminalTabActive={terminalWorkspaceTerminalTabActive}
                       onMessagesScroll={onMessagesScroll}
                       onMessagesClickCapture={onMessagesClickCapture}
                       onMessagesMouseUp={onMessagesMouseUp}
@@ -9325,19 +8273,21 @@ export default function ChatView({
                     "relative z-10 w-full shrink-0 overflow-visible",
                     CHAT_COLUMN_GUTTER_CLASS_NAME,
                     composerDisclosure ? "pt-2" : "-mt-5 pt-0 sm:pt-0",
-                    // A trailing BranchToolbar only renders for legacy git threads; otherwise the
-                    // composer is the last element, so give it a comfortable bottom margin.
-                    isGitRepo ? "pb-0.5" : "pb-3 sm:pb-4",
+                    "pb-1 sm:pb-1.5",
                   )}
                   // Match the transcript's right inset so the composer stays aligned with chat
                   // content (and clear of the docked Environment overlay).
                 >
                   {composerSectionWithDisclosure}
                 </div>
-                {secondaryChromeReady && isGitRepo ? (
+                {secondaryChromeReady ? (
                   <div className={CHAT_COLUMN_GUTTER_CLASS_NAME}>
-                    <div className={COMPOSER_COLUMN_FRAME_CLASS_NAME}>
-                      <BranchToolbar {...branchToolbarProps} className="w-full min-w-0" />
+                    <div
+                      className={cn(COMPOSER_COLUMN_FRAME_CLASS_NAME, "flex items-center gap-2")}
+                    >
+                      {isGitRepo ? (
+                        <BranchToolbar {...branchToolbarProps} className="min-w-0 flex-1" />
+                      ) : null}
                     </div>
                   </div>
                 ) : null}
@@ -9359,28 +8309,6 @@ export default function ChatView({
               />
             ) : null}
           </div>
-
-          {terminalWorkspaceOpen ? (
-            <div
-              aria-hidden={!terminalWorkspaceTerminalTabActive}
-              className={cn(
-                "absolute inset-0 min-h-0 min-w-0 transition-[opacity,translate] duration-menu ease-out motion-reduce:transition-none",
-                terminalWorkspaceTerminalTabActive
-                  ? "translate-y-0 opacity-100"
-                  : "pointer-events-none translate-y-1 opacity-0",
-              )}
-            >
-              <ThreadTerminalDrawer
-                key={`${activeThread.id}-workspace`}
-                {...terminalDrawerProps}
-                presentationMode="workspace"
-                isVisible={terminalWorkspaceTerminalTabActive}
-                onTogglePresentationMode={
-                  terminalState.workspaceLayout === "both" ? collapseTerminalWorkspace : undefined
-                }
-              />
-            </div>
-          ) : null}
         </div>
         {/* end chat column */}
 
@@ -9405,20 +8333,6 @@ export default function ChatView({
       </div>
       {/* end horizontal flex container */}
 
-      {(() => {
-        if (!terminalState.terminalOpen || terminalWorkspaceOpen) {
-          return null;
-        }
-        return (
-          <ThreadTerminalDrawer
-            key={activeThread.id}
-            {...terminalDrawerProps}
-            presentationMode="drawer"
-            onTogglePresentationMode={expandTerminalWorkspace}
-          />
-        );
-      })()}
-
       <ComposerSlashStatusDialog
         open={isSlashStatusDialogOpen}
         onOpenChange={setIsSlashStatusDialogOpen}
diff --git a/apps/web/src/components/ComposerPromptEditor.tsx b/apps/web/src/components/ComposerPromptEditor.tsx
index aa9b555bf..b504cd16b 100644
--- a/apps/web/src/components/ComposerPromptEditor.tsx
+++ b/apps/web/src/components/ComposerPromptEditor.tsx
@@ -58,7 +58,6 @@ import {
   splitPromptIntoComposerSegments,
 } from "~/composer-editor-mentions";
 import { parseBareComposerLink } from "~/lib/linkChips";
-import { type TerminalContextDraft } from "~/lib/terminalContext";
 import { shouldCollapsePastedText } from "~/lib/composerPastedText";
 import type { ProviderMentionReference } from "@t3tools/contracts";
 import { cn } from "~/lib/utils";
@@ -73,13 +72,11 @@ import {
   ComposerSkillNode,
   ComposerSlashCommandNode,
   ComposerAgentMentionNode,
-  ComposerTerminalContextNode,
   ComposerLinkNode,
   $createComposerMentionNode,
   $createComposerSkillNode,
   $createComposerSlashCommandNode,
   $createComposerAgentMentionNode,
-  $createComposerTerminalContextNode,
   $createComposerLinkNode,
   isComposerInlineTokenNode,
   COMPOSER_NODE_CLASSES,
@@ -88,31 +85,8 @@ import {
 
 const COMPOSER_EDITOR_HMR_KEY = `composer-editor-${Math.random().toString(36).slice(2)}`;
 
-const ComposerTerminalContextActionsContext = createContext<{
-  onRemoveTerminalContext: (contextId: string) => void;
-}>({
-  onRemoveTerminalContext: () => {},
-});
-
 // Node classes imported from ./composer-nodes
 
-function terminalContextSignature(contexts: ReadonlyArray<TerminalContextDraft>): string {
-  return contexts
-    .map((context) =>
-      [
-        context.id,
-        context.threadId,
-        context.terminalId,
-        context.terminalLabel,
-        context.lineStart,
-        context.lineEnd,
-        context.createdAt,
-        context.text,
-      ].join("\u001f"),
-    )
-    .join("\u001e");
-}
-
 function mentionReferencesSignature(mentions: ReadonlyArray<ProviderMentionReference>): string {
   return mentions.map((mention) => `${mention.name}\u0000${mention.path}`).join("\u0001");
 }
@@ -224,7 +198,7 @@ function getAbsoluteOffsetForPoint(node: LexicalNode, pointOffset: number): numb
     current = nextParent;
   }
 
-  if (node instanceof ComposerLinkNode || node instanceof ComposerTerminalContextNode) {
+  if (node instanceof ComposerLinkNode) {
     return getAbsoluteOffsetForInlineTokenPoint(node, offset, pointOffset);
   }
 
@@ -277,7 +251,7 @@ function getExpandedAbsoluteOffsetForPoint(node: LexicalNode, pointOffset: numbe
     current = nextParent;
   }
 
-  if (node instanceof ComposerLinkNode || node instanceof ComposerTerminalContextNode) {
+  if (node instanceof ComposerLinkNode) {
     return getExpandedAbsoluteOffsetForInlineTokenPoint(node, offset, pointOffset);
   }
 
@@ -320,8 +294,7 @@ function findSelectionPointAtOffset(
     node instanceof ComposerSkillNode ||
     node instanceof ComposerSlashCommandNode ||
     node instanceof ComposerAgentMentionNode ||
-    node instanceof ComposerLinkNode ||
-    node instanceof ComposerTerminalContextNode
+    node instanceof ComposerLinkNode
   ) {
     return findSelectionPointForInlineToken(node, remainingRef);
   }
@@ -440,7 +413,6 @@ function $appendTextWithLineBreaks(parent: ElementNode, text: string): void {
 
 function $setComposerEditorPrompt(
   prompt: string,
-  terminalContexts: ReadonlyArray<TerminalContextDraft>,
   mentionReferences: ReadonlyArray<ProviderMentionReference> = [],
 ): void {
   const root = $getRoot();
@@ -448,7 +420,7 @@ function $setComposerEditorPrompt(
   const paragraph = $createParagraphNode();
   root.append(paragraph);
 
-  const segments = splitPromptIntoComposerSegments(prompt, terminalContexts, mentionReferences);
+  const segments = splitPromptIntoComposerSegments(prompt, mentionReferences);
   for (const segment of segments) {
     if (segment.type === "mention") {
       paragraph.append($createComposerMentionNode(segment.path, segment.kind));
@@ -463,12 +435,6 @@ function $setComposerEditorPrompt(
       paragraph.append($createComposerSlashCommandNode(segment.command));
       continue;
     }
-    if (segment.type === "terminal-context") {
-      if (segment.context) {
-        paragraph.append($createComposerTerminalContextNode(segment.context));
-      }
-      continue;
-    }
     if (segment.type === "agent-mention") {
       paragraph.append($createComposerAgentMentionNode(segment.alias, segment.color));
       continue;
@@ -481,16 +447,6 @@ function $setComposerEditorPrompt(
   }
 }
 
-function collectTerminalContextIds(node: LexicalNode): string[] {
-  if (node instanceof ComposerTerminalContextNode) {
-    return [node.__context.id];
-  }
-  if ($isElementNode(node)) {
-    return node.getChildren().flatMap((child) => collectTerminalContextIds(child));
-  }
-  return [];
-}
-
 export interface ComposerPromptEditorHandle {
   blur: () => void;
   focus: () => void;
@@ -502,19 +458,16 @@ export interface ComposerPromptEditorHandle {
     cursor: number;
     expandedCursor: number;
     selectionCollapsed: boolean;
-    terminalContextIds: string[];
   };
 }
 
 interface ComposerPromptEditorProps {
   value: string;
   cursor: number;
-  terminalContexts: ReadonlyArray<TerminalContextDraft>;
   mentionReferences?: ReadonlyArray<ProviderMentionReference>;
   disabled: boolean;
   placeholder: string;
   className?: string;
-  onRemoveTerminalContext: (contextId: string) => void;
   /**
    * Invoked when a sufficiently large text paste should collapse into an attachment
    * card instead of inserting raw text. When omitted, pastes insert as text.
@@ -525,7 +478,6 @@ interface ComposerPromptEditorProps {
     nextCursor: number,
     expandedCursor: number,
     cursorAdjacentToMention: boolean,
-    terminalContextIds: string[],
   ) => void;
   onCommandKeyDown?: (
     key: "ArrowDown" | "ArrowUp" | "Enter" | "Tab" | "Slash",
@@ -697,7 +649,6 @@ function ComposerInlineTokenSelectionNormalizePlugin() {
 
 function ComposerInlineTokenBackspacePlugin() {
   const [editor] = useLexicalComposerContext();
-  const { onRemoveTerminalContext } = useContext(ComposerTerminalContextActionsContext);
 
   useEffect(() => {
     return editor.registerCommand(
@@ -716,12 +667,7 @@ function ComposerInlineTokenBackspacePlugin() {
           }
           const tokenStart = getAbsoluteOffsetForPoint(candidate, 0);
           candidate.remove();
-          if (candidate instanceof ComposerTerminalContextNode) {
-            onRemoveTerminalContext(candidate.__context.id);
-            $setSelectionAtComposerOffset(selectionOffset);
-          } else {
-            $setSelectionAtComposerOffset(tokenStart);
-          }
+          $setSelectionAtComposerOffset(tokenStart);
           event?.preventDefault();
           return true;
         };
@@ -757,7 +703,7 @@ function ComposerInlineTokenBackspacePlugin() {
       },
       COMMAND_PRIORITY_HIGH,
     );
-  }, [editor, onRemoveTerminalContext]);
+  }, [editor]);
 
   return null;
 }
@@ -889,12 +835,10 @@ function ComposerBigPastePlugin(props: { onCollapsePastedText: (text: string) =>
 function ComposerPromptEditorInner({
   value,
   cursor,
-  terminalContexts,
   mentionReferences = [],
   disabled,
   placeholder,
   className,
-  onRemoveTerminalContext,
   onCollapsePastedText,
   onChange,
   onCommandKeyDown,
@@ -904,8 +848,6 @@ function ComposerPromptEditorInner({
   const [editor] = useLexicalComposerContext();
   const onChangeRef = useRef(onChange);
   const initialCursor = clampCollapsedComposerCursor(value, cursor);
-  const terminalContextsSignature = terminalContextSignature(terminalContexts);
-  const terminalContextsSignatureRef = useRef(terminalContextsSignature);
   const mentionsSignature = mentionReferencesSignature(mentionReferences);
   const mentionsSignatureRef = useRef(mentionsSignature);
   const snapshotRef = useRef({
@@ -913,13 +855,8 @@ function ComposerPromptEditorInner({
     cursor: initialCursor,
     expandedCursor: expandCollapsedComposerCursor(value, initialCursor),
     selectionCollapsed: true,
-    terminalContextIds: terminalContexts.map((context) => context.id),
   });
   const isApplyingControlledUpdateRef = useRef(false);
-  const terminalContextActions = useMemo(
-    () => ({ onRemoveTerminalContext }),
-    [onRemoveTerminalContext],
-  );
 
   useEffect(() => {
     onChangeRef.current = onChange;
@@ -949,12 +886,10 @@ function ComposerPromptEditorInner({
   useLayoutEffect(() => {
     const normalizedCursor = clampCollapsedComposerCursor(value, cursor);
     const previousSnapshot = snapshotRef.current;
-    const contextsChanged = terminalContextsSignatureRef.current !== terminalContextsSignature;
     const mentionsChanged = mentionsSignatureRef.current !== mentionsSignature;
     if (
       previousSnapshot.value === value &&
       previousSnapshot.cursor === normalizedCursor &&
-      !contextsChanged &&
       !mentionsChanged
     ) {
       return;
@@ -965,23 +900,20 @@ function ComposerPromptEditorInner({
       cursor: normalizedCursor,
       expandedCursor: expandCollapsedComposerCursor(value, normalizedCursor),
       selectionCollapsed: true,
-      terminalContextIds: terminalContexts.map((context) => context.id),
     };
-    terminalContextsSignatureRef.current = terminalContextsSignature;
     mentionsSignatureRef.current = mentionsSignature;
 
     const rootElement = editor.getRootElement();
     const isFocused = Boolean(rootElement && document.activeElement === rootElement);
-    if (previousSnapshot.value === value && !contextsChanged && !mentionsChanged && !isFocused) {
+    if (previousSnapshot.value === value && !mentionsChanged && !isFocused) {
       return;
     }
 
     isApplyingControlledUpdateRef.current = true;
     editor.update(() => {
-      const shouldRewriteEditorState =
-        previousSnapshot.value !== value || contextsChanged || mentionsChanged;
+      const shouldRewriteEditorState = previousSnapshot.value !== value || mentionsChanged;
       if (shouldRewriteEditorState) {
-        $setComposerEditorPrompt(value, terminalContexts, mentionReferences);
+        $setComposerEditorPrompt(value, mentionReferences);
       }
       if (shouldRewriteEditorState || isFocused) {
         $setSelectionAtComposerOffset(normalizedCursor);
@@ -990,15 +922,7 @@ function ComposerPromptEditorInner({
     queueMicrotask(() => {
       isApplyingControlledUpdateRef.current = false;
     });
-  }, [
-    cursor,
-    editor,
-    mentionReferences,
-    mentionsSignature,
-    terminalContexts,
-    terminalContextsSignature,
-    value,
-  ]);
+  }, [cursor, editor, mentionReferences, mentionsSignature, value]);
 
   const focusAt = useCallback(
     (nextCursor: number) => {
@@ -1014,14 +938,12 @@ function ComposerPromptEditorInner({
         cursor: boundedCursor,
         expandedCursor: expandCollapsedComposerCursor(snapshotRef.current.value, boundedCursor),
         selectionCollapsed: true,
-        terminalContextIds: snapshotRef.current.terminalContextIds,
       };
       onChangeRef.current(
         snapshotRef.current.value,
         boundedCursor,
         snapshotRef.current.expandedCursor,
         false,
-        snapshotRef.current.terminalContextIds,
       );
     },
     [editor],
@@ -1044,7 +966,6 @@ function ComposerPromptEditorInner({
     cursor: number;
     expandedCursor: number;
     selectionCollapsed: boolean;
-    terminalContextIds: string[];
   } => {
     let snapshot = snapshotRef.current;
     editor.getEditorState().read(() => {
@@ -1064,13 +985,11 @@ function ComposerPromptEditorInner({
         nextValue,
         $readExpandedSelectionOffsetFromEditorState(fallbackExpandedCursor),
       );
-      const terminalContextIds = collectTerminalContextIds($getRoot());
       snapshot = {
         value: nextValue,
         cursor: nextCursor,
         expandedCursor: nextExpandedCursor,
         selectionCollapsed,
-        terminalContextIds,
       };
     });
     snapshotRef.current = snapshot;
@@ -1117,14 +1036,11 @@ function ComposerPromptEditorInner({
         nextValue,
         $readExpandedSelectionOffsetFromEditorState(fallbackExpandedCursor),
       );
-      const terminalContextIds = collectTerminalContextIds($getRoot());
       const previousSnapshot = snapshotRef.current;
       if (
         previousSnapshot.value === nextValue &&
         previousSnapshot.cursor === nextCursor &&
-        previousSnapshot.expandedCursor === nextExpandedCursor &&
-        previousSnapshot.terminalContextIds.length === terminalContextIds.length &&
-        previousSnapshot.terminalContextIds.every((id, index) => id === terminalContextIds[index])
+        previousSnapshot.expandedCursor === nextExpandedCursor
       ) {
         return;
       }
@@ -1136,69 +1052,58 @@ function ComposerPromptEditorInner({
         cursor: nextCursor,
         expandedCursor: nextExpandedCursor,
         selectionCollapsed,
-        terminalContextIds,
       };
       const cursorAdjacentToMention =
         isCollapsedCursorAdjacentToInlineToken(nextValue, nextCursor, "left") ||
         isCollapsedCursorAdjacentToInlineToken(nextValue, nextCursor, "right");
-      onChangeRef.current(
-        nextValue,
-        nextCursor,
-        nextExpandedCursor,
-        cursorAdjacentToMention,
-        terminalContextIds,
-      );
+      onChangeRef.current(nextValue, nextCursor, nextExpandedCursor, cursorAdjacentToMention);
     });
   }, []);
 
   return (
-    <ComposerTerminalContextActionsContext.Provider value={terminalContextActions}>
-      <div className="relative">
-        <PlainTextPlugin
-          contentEditable={
-            <ContentEditable
-              className={cn(
-                "block max-h-[200px] w-full overflow-y-auto whitespace-pre-wrap break-words bg-transparent text-foreground focus:outline-none",
-                COMPOSER_EDITOR_TYPOGRAPHY_CLASS_NAME,
-                COMPOSER_EDITOR_MIN_HEIGHT_CLASS_NAME,
-                COMPOSER_EDITOR_CONTENT_RESET_CLASS_NAME,
-                className,
-              )}
-              data-testid="composer-editor"
-              aria-placeholder={placeholder}
-              placeholder={<span />}
-              onPaste={onPaste}
-            />
-          }
-          placeholder={
-            terminalContexts.length > 0 ? null : (
-              <div
-                className={cn(
-                  "pointer-events-none absolute inset-0",
-                  COMPOSER_PLACEHOLDER_TEXT_CLASS_NAME,
-                  COMPOSER_EDITOR_TYPOGRAPHY_CLASS_NAME,
-                )}
-              >
-                {placeholder}
-              </div>
-            )
-          }
-          ErrorBoundary={LexicalErrorBoundary}
-        />
-        <OnChangePlugin onChange={handleEditorChange} />
-        <ComposerCommandKeyPlugin {...(onCommandKeyDown ? { onCommandKeyDown } : {})} />
-        <ComposerInlineTokenArrowPlugin />
-        <ComposerInlineTokenSelectionNormalizePlugin />
-        <ComposerInlineTokenBackspacePlugin />
-        <ComposerSlashCommandTransformPlugin />
-        <ComposerLinkTransformPlugin />
-        <ComposerLinkPastePlugin />
-        {onCollapsePastedText ? (
-          <ComposerBigPastePlugin onCollapsePastedText={onCollapsePastedText} />
-        ) : null}
-        <HistoryPlugin />
-      </div>
-    </ComposerTerminalContextActionsContext.Provider>
+    <div className="relative">
+      <PlainTextPlugin
+        contentEditable={
+          <ContentEditable
+            className={cn(
+              "block max-h-[200px] w-full overflow-y-auto whitespace-pre-wrap break-words bg-transparent text-foreground focus:outline-none",
+              COMPOSER_EDITOR_TYPOGRAPHY_CLASS_NAME,
+              COMPOSER_EDITOR_MIN_HEIGHT_CLASS_NAME,
+              COMPOSER_EDITOR_CONTENT_RESET_CLASS_NAME,
+              className,
+            )}
+            data-testid="composer-editor"
+            aria-placeholder={placeholder}
+            placeholder={<span />}
+            onPaste={onPaste}
+          />
+        }
+        placeholder={
+          <div
+            className={cn(
+              "pointer-events-none absolute inset-0",
+              COMPOSER_PLACEHOLDER_TEXT_CLASS_NAME,
+              COMPOSER_EDITOR_TYPOGRAPHY_CLASS_NAME,
+            )}
+          >
+            {placeholder}
+          </div>
+        }
+        ErrorBoundary={LexicalErrorBoundary}
+      />
+      <OnChangePlugin onChange={handleEditorChange} />
+      <ComposerCommandKeyPlugin {...(onCommandKeyDown ? { onCommandKeyDown } : {})} />
+      <ComposerInlineTokenArrowPlugin />
+      <ComposerInlineTokenSelectionNormalizePlugin />
+      <ComposerInlineTokenBackspacePlugin />
+      <ComposerSlashCommandTransformPlugin />
+      <ComposerLinkTransformPlugin />
+      <ComposerLinkPastePlugin />
+      {onCollapsePastedText ? (
+        <ComposerBigPastePlugin onCollapsePastedText={onCollapsePastedText} />
+      ) : null}
+      <HistoryPlugin />
+    </div>
   );
 }
 
@@ -1209,12 +1114,10 @@ export const ComposerPromptEditor = forwardRef<
   {
     value,
     cursor,
-    terminalContexts,
     mentionReferences,
     disabled,
     placeholder,
     className,
-    onRemoveTerminalContext,
     onCollapsePastedText,
     onChange,
     onCommandKeyDown,
@@ -1223,7 +1126,6 @@ export const ComposerPromptEditor = forwardRef<
   ref,
 ) {
   const initialValueRef = useRef(value);
-  const initialTerminalContextsRef = useRef(terminalContexts);
   // Normalize once at the wrapper boundary so the inner editor can treat mention refs as concrete.
   const normalizedMentionReferences = mentionReferences ?? [];
   const initialMentionReferencesRef = useRef(normalizedMentionReferences);
@@ -1233,11 +1135,7 @@ export const ComposerPromptEditor = forwardRef<
       editable: true,
       nodes: [...COMPOSER_NODE_CLASSES],
       editorState: () => {
-        $setComposerEditorPrompt(
-          initialValueRef.current,
-          initialTerminalContextsRef.current,
-          initialMentionReferencesRef.current,
-        );
+        $setComposerEditorPrompt(initialValueRef.current, initialMentionReferencesRef.current);
       },
       onError: (error) => {
         throw error;
@@ -1251,11 +1149,9 @@ export const ComposerPromptEditor = forwardRef<
       <ComposerPromptEditorInner
         value={value}
         cursor={cursor}
-        terminalContexts={terminalContexts}
         mentionReferences={normalizedMentionReferences}
         disabled={disabled}
         placeholder={placeholder}
-        onRemoveTerminalContext={onRemoveTerminalContext}
         onChange={onChange}
         onPaste={onPaste}
         editorRef={ref}
diff --git a/apps/web/src/components/DiffPanel.logic.test.ts b/apps/web/src/components/DiffPanel.logic.test.ts
deleted file mode 100644
index 1a61e21d9..000000000
--- a/apps/web/src/components/DiffPanel.logic.test.ts
+++ /dev/null
@@ -1,364 +0,0 @@
-import { ProjectId, ThreadId, TurnId } from "@t3tools/contracts";
-import { describe, expect, it } from "vitest";
-
-import type { DraftThreadState } from "../composerDraftStore";
-import type { Thread } from "../types";
-import {
-  filterRenderableFilesForSearch,
-  isDiffPanelPickerOptionSelected,
-  isStaleDiffTurnSelection,
-  resolveConversationCacheScope,
-  resolveDiffPanelGitStatusQueriesEnabled,
-  resolveDiffPanelQueriesEnabled,
-  resolveDiffPanelRepoLiveRefresh,
-  resolveDiffPanelRepoLiveRefetchIntervalMs,
-  resolveDiffPanelScopeCountQueriesEnabled,
-  resolveDiffPanelScopeFileCounts,
-  resolveDiffPanelScopePickerValue,
-  resolveDiffPanelThread,
-  resolveDiffPanelViewSource,
-  resolveInitialDiffViewKind,
-  resolveSelectedTurnSummary,
-  DIFF_PANEL_PICKER_SCOPE_OPTIONS,
-  DIFF_PANEL_REPO_LIVE_REFETCH_INTERVAL_MS,
-} from "./DiffPanel.logic";
-
-const PROJECT_ID = ProjectId.makeUnsafe("project-1");
-const THREAD_ID = ThreadId.makeUnsafe("thread-1");
-
-function makeThread(overrides: Partial<Thread> = {}): Thread {
-  return {
-    id: THREAD_ID,
-    codexThreadId: null,
-    projectId: PROJECT_ID,
-    title: "Thread 1",
-    modelSelection: { provider: "codex", model: "gpt-5.4-mini" },
-    runtimeMode: "full-access",
-    session: null,
-    messages: [],
-    proposedPlans: [],
-    error: null,
-    createdAt: "2026-04-16T10:00:00.000Z",
-    updatedAt: "2026-04-16T10:00:00.000Z",
-    latestTurn: {
-      turnId: TurnId.makeUnsafe("turn-1"),
-      state: "completed",
-      requestedAt: "2026-04-16T10:00:00.000Z",
-      startedAt: "2026-04-16T10:00:01.000Z",
-      completedAt: "2026-04-16T10:00:02.000Z",
-      assistantMessageId: null,
-      sourceProposedPlan: undefined,
-    },
-    lastVisitedAt: "2026-04-16T10:00:02.000Z",
-    branch: null,
-    worktreePath: null,
-    turnDiffSummaries: [],
-    activities: [],
-    ...overrides,
-  };
-}
-
-function makeDraftThread(overrides: Partial<DraftThreadState> = {}): DraftThreadState {
-  return {
-    projectId: PROJECT_ID,
-    createdAt: "2026-04-16T10:00:00.000Z",
-    runtimeMode: "full-access",
-    entryPoint: "chat",
-    branch: null,
-    worktreePath: null,
-    envMode: "local",
-    ...overrides,
-  };
-}
-
-describe("resolveDiffPanelThread", () => {
-  it("keeps the server-backed thread when one exists", () => {
-    const serverThread = makeThread({ title: "Server thread" });
-
-    expect(
-      resolveDiffPanelThread({
-        threadId: THREAD_ID,
-        serverThread,
-        draftThread: makeDraftThread({ branch: "feature/draft" }),
-        fallbackModelSelection: { provider: "codex", model: "gpt-5.4-mini" },
-      }),
-    ).toBe(serverThread);
-  });
-
-  it("builds a local draft-backed thread when the server thread is missing", () => {
-    const resolved = resolveDiffPanelThread({
-      threadId: THREAD_ID,
-      serverThread: undefined,
-      draftThread: makeDraftThread({
-        branch: "feature/draft",
-        worktreePath: "/tmp/worktree",
-        envMode: "worktree",
-      }),
-      fallbackModelSelection: { provider: "codex", model: "gpt-5.4-mini" },
-    });
-
-    expect(resolved).toMatchObject({
-      id: THREAD_ID,
-      projectId: PROJECT_ID,
-      title: "New thread",
-      envMode: "worktree",
-      branch: "feature/draft",
-      worktreePath: "/tmp/worktree",
-      turnDiffSummaries: [],
-    });
-  });
-
-  it("returns undefined when neither a server thread nor a draft thread exists", () => {
-    expect(
-      resolveDiffPanelThread({
-        threadId: THREAD_ID,
-        serverThread: undefined,
-        draftThread: null,
-        fallbackModelSelection: null,
-      }),
-    ).toBeUndefined();
-  });
-});
-
-describe("diff panel view source helpers", () => {
-  it("defaults to repo view when no turn is selected", () => {
-    expect(resolveInitialDiffViewKind(null)).toBe("repo");
-  });
-
-  it("defaults to turn view when a turn is selected", () => {
-    expect(resolveInitialDiffViewKind(TurnId.makeUnsafe("turn-1"))).toBe("turn");
-  });
-
-  it("resolves repo and turn view sources", () => {
-    expect(
-      resolveDiffPanelViewSource({
-        diffViewKind: "repo",
-        repoDiffScope: "unstaged",
-        selectedTurnId: null,
-      }),
-    ).toEqual({ kind: "repo", scope: "unstaged" });
-
-    expect(
-      resolveDiffPanelViewSource({
-        diffViewKind: "turn",
-        repoDiffScope: "branch",
-        selectedTurnId: TurnId.makeUnsafe("turn-1"),
-      }),
-    ).toEqual({ kind: "turn", turnId: TurnId.makeUnsafe("turn-1") });
-  });
-
-  it("gates diff queries when the pane is hidden or collapsed", () => {
-    expect(resolveDiffPanelQueriesEnabled({ diffOpen: true, queriesEnabled: true })).toBe(true);
-    expect(resolveDiffPanelQueriesEnabled({ diffOpen: true, queriesEnabled: false })).toBe(false);
-    expect(resolveDiffPanelQueriesEnabled({ diffOpen: false, queriesEnabled: true })).toBe(false);
-    expect(
-      resolveDiffPanelScopeCountQueriesEnabled({ queriesEnabled: true, scopePickerOpen: false }),
-    ).toBe(false);
-    expect(
-      resolveDiffPanelScopeCountQueriesEnabled({ queriesEnabled: true, scopePickerOpen: true }),
-    ).toBe(true);
-  });
-
-  it("only enables git status work for repo diffs with a cwd", () => {
-    expect(
-      resolveDiffPanelGitStatusQueriesEnabled({
-        queriesEnabled: true,
-        activeCwd: "/repo",
-        diffViewKind: "repo",
-      }),
-    ).toBe(true);
-    expect(
-      resolveDiffPanelGitStatusQueriesEnabled({
-        queriesEnabled: true,
-        activeCwd: "/repo",
-        diffViewKind: "turn",
-      }),
-    ).toBe(false);
-    expect(
-      resolveDiffPanelGitStatusQueriesEnabled({
-        queriesEnabled: true,
-        activeCwd: null,
-        diffViewKind: "repo",
-      }),
-    ).toBe(false);
-  });
-
-  it("only surfaces scope file counts for the active scope until the picker opens", () => {
-    expect(
-      resolveDiffPanelScopeFileCounts({
-        viewSource: { kind: "repo", scope: "unstaged" },
-        activeScopeFileCount: 3,
-        scopePickerOpen: false,
-        pickerScopeCounts: { unstaged: 3, staged: 1 },
-      }),
-    ).toEqual({ unstaged: 3 });
-    expect(
-      resolveDiffPanelScopeFileCounts({
-        viewSource: { kind: "repo", scope: "unstaged" },
-        activeScopeFileCount: 3,
-        scopePickerOpen: true,
-        pickerScopeCounts: { unstaged: 3, staged: 1 },
-      }),
-    ).toEqual({ unstaged: 3, staged: 1 });
-  });
-
-  it("only polls repo diffs while a turn is live and the repo view is active", () => {
-    expect(
-      resolveDiffPanelRepoLiveRefresh({
-        latestTurn: null,
-        session: null,
-        messages: [],
-        activities: [],
-      }),
-    ).toBe(false);
-    expect(
-      resolveDiffPanelRepoLiveRefresh({
-        latestTurn: {
-          turnId: TurnId.makeUnsafe("turn-1"),
-          state: "running",
-          requestedAt: "2026-04-16T10:00:00.000Z",
-          startedAt: "2026-04-16T10:00:01.000Z",
-          completedAt: null,
-          assistantMessageId: null,
-          sourceProposedPlan: undefined,
-        },
-        session: {
-          provider: "codex",
-          status: "running",
-          orchestrationStatus: "running",
-          activeTurnId: TurnId.makeUnsafe("turn-1"),
-          createdAt: "2026-04-16T10:00:00.000Z",
-          updatedAt: "2026-04-16T10:00:01.000Z",
-        },
-        messages: [],
-        activities: [],
-      }),
-    ).toBe(true);
-    expect(
-      resolveDiffPanelRepoLiveRefetchIntervalMs({
-        queriesEnabled: true,
-        liveRefreshEnabled: true,
-        diffViewKind: "repo",
-        shouldPollRepoDiff: true,
-      }),
-    ).toBe(DIFF_PANEL_REPO_LIVE_REFETCH_INTERVAL_MS);
-    expect(
-      resolveDiffPanelRepoLiveRefetchIntervalMs({
-        queriesEnabled: true,
-        liveRefreshEnabled: true,
-        diffViewKind: "turn",
-        shouldPollRepoDiff: true,
-      }),
-    ).toBe(false);
-  });
-
-  it("resolves scope picker values for repo, all turns, and last turn", () => {
-    const latestTurnId = TurnId.makeUnsafe("turn-latest");
-    const olderTurnId = TurnId.makeUnsafe("turn-older");
-
-    expect(
-      resolveDiffPanelScopePickerValue({
-        viewSource: { kind: "repo", scope: "workingTree" },
-        latestTurnId,
-      }),
-    ).toBe("workingTree");
-    expect(
-      resolveDiffPanelScopePickerValue({
-        viewSource: { kind: "repo", scope: "staged" },
-        latestTurnId,
-      }),
-    ).toBe("staged");
-    expect(
-      resolveDiffPanelScopePickerValue({
-        viewSource: { kind: "turn", turnId: null },
-        latestTurnId,
-      }),
-    ).toBe("allTurns");
-    expect(
-      resolveDiffPanelScopePickerValue({
-        viewSource: { kind: "turn", turnId: null },
-        latestTurnId,
-        turnScopeIntent: "last",
-      }),
-    ).toBe("lastTurn");
-    expect(
-      resolveDiffPanelScopePickerValue({
-        viewSource: { kind: "turn", turnId: latestTurnId },
-        latestTurnId,
-      }),
-    ).toBe("lastTurn");
-    expect(
-      resolveDiffPanelScopePickerValue({
-        viewSource: { kind: "turn", turnId: olderTurnId },
-        latestTurnId,
-      }),
-    ).toBeNull();
-  });
-
-  it("keeps the persisted default working-tree scope available in the picker", () => {
-    expect(DIFF_PANEL_PICKER_SCOPE_OPTIONS).toContain("workingTree");
-  });
-
-  it("marks picker options selected only when they match the active scope", () => {
-    const latestTurnId = TurnId.makeUnsafe("turn-latest");
-
-    expect(
-      isDiffPanelPickerOptionSelected(
-        { kind: "turn", turnId: null },
-        { id: "allTurns" },
-        latestTurnId,
-        "all",
-      ),
-    ).toBe(true);
-    expect(
-      isDiffPanelPickerOptionSelected(
-        { kind: "turn", turnId: latestTurnId },
-        { id: "lastTurn" },
-        latestTurnId,
-        "last",
-      ),
-    ).toBe(true);
-    expect(
-      isDiffPanelPickerOptionSelected(
-        { kind: "turn", turnId: TurnId.makeUnsafe("turn-older") },
-        { id: "lastTurn" },
-        latestTurnId,
-        "last",
-      ),
-    ).toBe(false);
-  });
-
-  it("detects stale turn selections and resolves summaries without fallback", () => {
-    const summaries = [
-      {
-        turnId: TurnId.makeUnsafe("turn-1"),
-        checkpointTurnCount: 1,
-        completedAt: "2026-04-16T10:00:02.000Z",
-      },
-    ] as const;
-
-    expect(resolveSelectedTurnSummary(TurnId.makeUnsafe("turn-1"), summaries)).toMatchObject({
-      turnId: TurnId.makeUnsafe("turn-1"),
-    });
-    expect(
-      resolveSelectedTurnSummary(TurnId.makeUnsafe("turn-missing"), summaries),
-    ).toBeUndefined();
-    expect(isStaleDiffTurnSelection(TurnId.makeUnsafe("turn-missing"), summaries)).toBe(true);
-    expect(isStaleDiffTurnSelection(null, summaries)).toBe(false);
-  });
-
-  it("builds compact conversation cache scopes from the latest checkpoint count", () => {
-    expect(resolveConversationCacheScope(undefined)).toBeNull();
-    expect(resolveConversationCacheScope(3)).toBe("conversation:to-3");
-  });
-
-  it("filters renderable files by path query", () => {
-    const files = [
-      { name: "apps/web/src/components/ChatView.tsx", hunks: [] },
-      { name: "apps/web/src/components/DiffPanel.tsx", hunks: [] },
-    ] as unknown as Parameters<typeof filterRenderableFilesForSearch>[0];
-
-    expect(filterRenderableFilesForSearch(files, "diffpanel")).toHaveLength(1);
-    expect(filterRenderableFilesForSearch(files, "")).toHaveLength(2);
-  });
-});
diff --git a/apps/web/src/components/DiffPanel.logic.ts b/apps/web/src/components/DiffPanel.logic.ts
deleted file mode 100644
index db3e75eb5..000000000
--- a/apps/web/src/components/DiffPanel.logic.ts
+++ /dev/null
@@ -1,274 +0,0 @@
-// FILE: DiffPanel.logic.ts
-// Purpose: Resolve the thread context the diff panel should use across server-backed and local draft chats.
-// Exports: resolveDiffPanelThread, diff view source helpers
-// Depends on: ChatView.logic draft-thread normalization.
-
-import {
-  DEFAULT_MODEL_BY_PROVIDER,
-  type ModelSelection,
-  type ThreadId,
-  type TurnId,
-} from "@t3tools/contracts";
-import type { FileDiffMetadata } from "@pierre/diffs/react";
-
-import type { DraftThreadState } from "../composerDraftStore";
-import type { RepoDiffScope } from "../repoDiffScopeStore";
-import { REPO_DIFF_SCOPE_LABELS } from "../repoDiffScopeStore";
-import { hasLiveTurnTailWork, isLatestTurnSettled } from "../session-logic";
-import { buildLocalDraftThread } from "./ChatView.logic";
-import { buildFileDiffRenderKey, resolveFileDiffPath } from "../lib/diffRendering";
-import type { ChatMessage, Thread } from "../types";
-
-export type DiffViewKind = "repo" | "turn";
-
-/** Distinguishes all-turns vs last-turn when no specific turn id is selected. */
-export type DiffPanelTurnScopeIntent = "all" | "last";
-
-export type DiffPanelViewSource =
-  | { kind: "repo"; scope: RepoDiffScope }
-  | { kind: "turn"; turnId: TurnId | null };
-
-export type DiffPanelScopePickerValue = RepoDiffScope | "allTurns" | "lastTurn";
-
-export type DiffPanelPickerOption =
-  | { id: "scope"; scope: RepoDiffScope }
-  | { id: "allTurns" }
-  | { id: "lastTurn" };
-
-export const DIFF_PANEL_PICKER_SCOPE_OPTIONS: ReadonlyArray<RepoDiffScope> = [
-  "workingTree",
-  "unstaged",
-  "staged",
-  "branch",
-];
-
-// Reuse the chat-view draft fallback so diff surfaces keep working before the first server turn exists.
-export function resolveDiffPanelThread(input: {
-  threadId: ThreadId | null | undefined;
-  serverThread: Thread | undefined;
-  draftThread: DraftThreadState | null | undefined;
-  fallbackModelSelection: ModelSelection | null | undefined;
-}): Thread | undefined {
-  if (input.serverThread) {
-    return input.serverThread;
-  }
-  if (!input.threadId || !input.draftThread) {
-    return undefined;
-  }
-
-  return buildLocalDraftThread(
-    input.threadId,
-    input.draftThread,
-    input.fallbackModelSelection ?? {
-      provider: "codex",
-      model: DEFAULT_MODEL_BY_PROVIDER.codex,
-    },
-    null,
-  );
-}
-
-export function resolveInitialDiffViewKind(selectedTurnId: TurnId | null): DiffViewKind {
-  return selectedTurnId === null ? "repo" : "turn";
-}
-
-/** Relaxed cadence for the open review pane — git invalidation handles turn boundaries. */
-export const DIFF_PANEL_REPO_LIVE_REFETCH_INTERVAL_MS = 10_000;
-
-export function resolveDiffPanelRepoLiveRefresh(input: {
-  latestTurn: Thread["latestTurn"];
-  session: Thread["session"];
-  messages: ReadonlyArray<Pick<ChatMessage, "role" | "streaming" | "turnId">>;
-  activities: Thread["activities"];
-}): boolean {
-  if (!input.latestTurn?.startedAt) {
-    return false;
-  }
-
-  const hasLiveTail = hasLiveTurnTailWork({
-    latestTurn: input.latestTurn,
-    messages: input.messages,
-    activities: input.activities,
-    session: input.session,
-  });
-
-  return !isLatestTurnSettled(input.latestTurn, input.session) || hasLiveTail;
-}
-
-export function resolveDiffPanelRepoLiveRefetchIntervalMs(input: {
-  queriesEnabled: boolean;
-  liveRefreshEnabled: boolean;
-  diffViewKind: DiffViewKind;
-  shouldPollRepoDiff: boolean;
-}): number | false {
-  if (
-    !input.queriesEnabled ||
-    !input.liveRefreshEnabled ||
-    input.diffViewKind !== "repo" ||
-    !input.shouldPollRepoDiff
-  ) {
-    return false;
-  }
-  return DIFF_PANEL_REPO_LIVE_REFETCH_INTERVAL_MS;
-}
-
-/** Gate expensive git/diff fetches so a hidden or collapsed review pane stays idle. */
-export function resolveDiffPanelQueriesEnabled(input: {
-  diffOpen: boolean;
-  queriesEnabled?: boolean;
-}): boolean {
-  return input.diffOpen && (input.queriesEnabled ?? true);
-}
-
-export function resolveDiffPanelScopeCountQueriesEnabled(input: {
-  queriesEnabled: boolean;
-  scopePickerOpen: boolean;
-}): boolean {
-  return input.queriesEnabled && input.scopePickerOpen;
-}
-
-export function resolveDiffPanelGitStatusQueriesEnabled(input: {
-  queriesEnabled: boolean;
-  activeCwd: string | null;
-  diffViewKind: DiffViewKind;
-}): boolean {
-  return input.queriesEnabled && input.activeCwd !== null && input.diffViewKind === "repo";
-}
-
-export function resolveDiffPanelScopeFileCounts(input: {
-  viewSource: DiffPanelViewSource;
-  activeScopeFileCount: number | undefined;
-  scopePickerOpen: boolean;
-  pickerScopeCounts: Partial<Record<RepoDiffScope, number>>;
-}): Partial<Record<RepoDiffScope, number>> {
-  if (input.scopePickerOpen) {
-    return input.pickerScopeCounts;
-  }
-  if (
-    input.viewSource.kind === "repo" &&
-    typeof input.activeScopeFileCount === "number" &&
-    input.activeScopeFileCount > 0
-  ) {
-    return { [input.viewSource.scope]: input.activeScopeFileCount };
-  }
-  return {};
-}
-
-export function resolveDiffPanelViewSource(input: {
-  diffViewKind: DiffViewKind;
-  repoDiffScope: RepoDiffScope;
-  selectedTurnId: TurnId | null;
-}): DiffPanelViewSource {
-  if (input.diffViewKind === "turn") {
-    return { kind: "turn", turnId: input.selectedTurnId };
-  }
-  return { kind: "repo", scope: input.repoDiffScope };
-}
-
-export function resolveDiffPanelPickerLabel(
-  source: DiffPanelViewSource,
-  turnScopeIntent?: DiffPanelTurnScopeIntent,
-): string {
-  if (source.kind === "turn") {
-    if (source.turnId !== null) {
-      return "Turn diff";
-    }
-    return turnScopeIntent === "last" ? "Last turn" : "All turns";
-  }
-  return REPO_DIFF_SCOPE_LABELS[source.scope];
-}
-
-export function resolveSelectedTurnSummary<T extends { turnId: TurnId }>(
-  selectedTurnId: TurnId | null,
-  orderedTurnDiffSummaries: ReadonlyArray<T>,
-): T | undefined {
-  if (!selectedTurnId) {
-    return undefined;
-  }
-  return orderedTurnDiffSummaries.find((summary) => summary.turnId === selectedTurnId);
-}
-
-export function isStaleDiffTurnSelection(
-  selectedTurnId: TurnId | null,
-  orderedTurnDiffSummaries: ReadonlyArray<{ turnId: TurnId }>,
-): boolean {
-  if (!selectedTurnId) {
-    return false;
-  }
-  return !orderedTurnDiffSummaries.some((summary) => summary.turnId === selectedTurnId);
-}
-
-/** Radio value for the left diff-source picker; null when a specific older turn is active. */
-export function resolveDiffPanelScopePickerValue(input: {
-  viewSource: DiffPanelViewSource;
-  latestTurnId: TurnId | null;
-  turnScopeIntent?: DiffPanelTurnScopeIntent;
-}): DiffPanelScopePickerValue | null {
-  if (input.viewSource.kind === "repo") {
-    return input.viewSource.scope;
-  }
-  if (input.viewSource.turnId === null) {
-    return input.turnScopeIntent === "last" ? "lastTurn" : "allTurns";
-  }
-  if (input.viewSource.turnId === input.latestTurnId) {
-    return "lastTurn";
-  }
-  return null;
-}
-
-export function resolveConversationCacheScope(
-  conversationCheckpointTurnCount: number | undefined,
-): string | null {
-  if (typeof conversationCheckpointTurnCount !== "number") {
-    return null;
-  }
-  return `conversation:to-${conversationCheckpointTurnCount}`;
-}
-
-export function isDiffPanelPickerOptionSelected(
-  source: DiffPanelViewSource,
-  option: DiffPanelPickerOption,
-  latestTurnId: TurnId | null,
-  turnScopeIntent?: DiffPanelTurnScopeIntent,
-): boolean {
-  const activeValue = resolveDiffPanelScopePickerValue({
-    viewSource: source,
-    latestTurnId,
-    // Omit the key entirely when undefined: under exactOptionalPropertyTypes an
-    // explicit `undefined` is not assignable to the optional `turnScopeIntent`.
-    ...(turnScopeIntent !== undefined ? { turnScopeIntent } : {}),
-  });
-  if (activeValue === null) {
-    return false;
-  }
-  if (option.id === "allTurns") {
-    return activeValue === "allTurns";
-  }
-  if (option.id === "lastTurn") {
-    return activeValue === "lastTurn";
-  }
-  return activeValue === option.scope;
-}
-
-export function filterRenderableFilesForSearch(
-  files: ReadonlyArray<FileDiffMetadata>,
-  query: string,
-): FileDiffMetadata[] {
-  const normalizedQuery = query.trim().toLowerCase();
-  if (!normalizedQuery) {
-    return [...files];
-  }
-  return files.filter((fileDiff) => {
-    const filePath = resolveFileDiffPath(fileDiff).toLowerCase();
-    return filePath.includes(normalizedQuery);
-  });
-}
-
-export function areAllRenderableFilesCollapsed(
-  files: ReadonlyArray<FileDiffMetadata>,
-  collapsedFiles: ReadonlySet<string>,
-): boolean {
-  if (files.length === 0) {
-    return false;
-  }
-  return files.every((fileDiff) => collapsedFiles.has(buildFileDiffRenderKey(fileDiff)));
-}
diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsx
deleted file mode 100644
index 4d1c09216..000000000
--- a/apps/web/src/components/DiffPanel.tsx
+++ /dev/null
@@ -1,1208 +0,0 @@
-// FILE: DiffPanel.tsx
-// Purpose: Coordinates diff-panel data sources, toolbar state, and patch body rendering.
-// Layer: Diff panel container
-
-import { useQuery } from "@tanstack/react-query";
-import { useNavigate, useParams } from "@tanstack/react-router";
-import { ThreadId, type TurnId } from "@t3tools/contracts";
-import type { FileDiffMetadata } from "@pierre/diffs/react";
-import { Columns2Icon, CopyIcon, EllipsisIcon, FolderIcon, Rows3Icon, XIcon } from "~/lib/icons";
-import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
-import {
-  gitBranchesQueryOptions,
-  gitStatusQueryOptions,
-  gitWorkingTreeDiffQueryOptions,
-} from "~/lib/gitReactQuery";
-import {
-  checkpointDiffQueryOptions,
-  resolveCheckpointDiffQueryDisplayState,
-} from "~/lib/providerReactQuery";
-import { stripDiffSearchParams } from "../diffRouteSearch";
-import { useTheme } from "../hooks/useTheme";
-import { useDiffRouteSearch } from "../hooks/useDiffRouteSearch";
-import {
-  buildFileDiffRenderKey,
-  getRenderablePatch,
-  resolveDiffCopyText,
-  sortFileDiffsByPath,
-  summarizePatchTotals,
-  summarizeRenderablePatchStats,
-} from "../lib/diffRendering";
-import {
-  appendChatFileReference,
-  appendComposerPromptText,
-  buildDiffSelectionReference,
-  buildWhyChangedPrompt,
-} from "../lib/chatReferences";
-import { resolveDiffEnvironmentState } from "../lib/threadEnvironment";
-import { disclosureWidthClassName } from "../lib/disclosureMotion";
-import { useCopyToClipboard } from "../hooks/useCopyToClipboard";
-import { type RepoDiffScope, useRepoDiffScopeStore } from "../repoDiffScopeStore";
-import { useStore } from "../store";
-import { createProjectSelector } from "../storeSelectors";
-import { inferCheckpointTurnCountByTurnId } from "../session-logic";
-import { type TimestampFormat, useAppSettings } from "../appSettings";
-import { useComposerDraftStore } from "../composerDraftStore";
-import { DOCK_HEADER_ICON_BUTTON_CLASS, type DiffRenderMode } from "./chat/chatHeaderControls";
-import {
-  areAllRenderableFilesCollapsed,
-  DIFF_PANEL_PICKER_SCOPE_OPTIONS,
-  isStaleDiffTurnSelection,
-  resolveConversationCacheScope,
-  resolveDiffPanelGitStatusQueriesEnabled,
-  resolveDiffPanelQueriesEnabled,
-  resolveDiffPanelScopeCountQueriesEnabled,
-  resolveDiffPanelRepoLiveRefetchIntervalMs,
-  resolveDiffPanelScopeFileCounts,
-  resolveDiffPanelScopePickerValue,
-  resolveDiffPanelThread,
-  resolveDiffPanelViewSource,
-  resolveInitialDiffViewKind,
-  resolveSelectedTurnSummary,
-  type DiffPanelTurnScopeIntent,
-  type DiffViewKind,
-} from "./DiffPanel.logic";
-import { DiffPanelPatchViewport } from "./DiffPanelPatchViewport";
-import { DiffPanelToolbar } from "./DiffPanelToolbar";
-import { ReviewFileTreePanel } from "./ReviewFileTreePanel";
-import { ComposerPickerMenuPopup } from "./chat/ComposerPickerMenuPopup";
-import { closestThroughShadow } from "./chat/chatSelectionActions";
-import { TranscriptSelectionAction } from "./chat/TranscriptSelectionAction";
-import { useCodeSelectionAction } from "./chat/useCodeSelectionAction";
-import {
-  createDiffPanelRepoLiveRefreshSelector,
-  createDiffPanelThreadCatalogSelector,
-  toDiffPanelThreadCatalog,
-  type DiffPanelThreadCatalog,
-} from "./diffPanelSelectors";
-import { DiffPanelLoadingState, DiffPanelShell, type DiffPanelMode } from "./DiffPanelShell";
-import { IconButton } from "./ui/icon-button";
-import {
-  Menu,
-  MenuCheckboxItem,
-  MenuGroup,
-  MenuGroupLabel,
-  MenuItem,
-  MenuRadioGroup,
-  MenuRadioItem,
-  MenuTrigger,
-} from "./ui/menu";
-import { REPO_DIFF_SCOPE_LABELS } from "../repoDiffScopeStore";
-import { PanelStateMessage } from "./chat/PanelStateMessage";
-import type { ChatPanelState } from "../chatPanelState";
-import { formatShortTimestamp } from "../timestampFormat";
-import type { TurnDiffSummary } from "../types";
-
-const EDITOR_DIFF_OPTIONS_MENU_ICON_CLASS_NAME = "size-3.5 shrink-0 text-muted-foreground";
-
-function EditorDiffOptionsCountBadge(props: { count: number | undefined }) {
-  if (typeof props.count !== "number" || props.count <= 0) {
-    return null;
-  }
-  return (
-    <span className="ml-auto rounded-full bg-muted px-1.5 text-[11px] font-medium text-muted-foreground tabular-nums">
-      {props.count}
-    </span>
-  );
-}
-
-function EditorDiffOptionsMenu(props: {
-  scopePickerValue: string | null;
-  scopeFileCounts: Partial<Record<RepoDiffScope, number>>;
-  selectedTurnId: TurnId | null;
-  orderedTurnDiffSummaries: ReadonlyArray<TurnDiffSummary>;
-  inferredCheckpointTurnCountByTurnId: Record<string, number>;
-  timestampFormat: TimestampFormat;
-  renderableFiles: ReadonlyArray<FileDiffMetadata>;
-  diffWordWrap: boolean;
-  diffIgnoreWhitespace: boolean;
-  diffCopyText: string | null;
-  isDiffCopied: boolean;
-  allFilesCollapsed: boolean;
-  diffRenderMode: DiffRenderMode;
-  onSelectRepoScope: (scope: RepoDiffScope) => void;
-  onSelectAllTurns: () => void;
-  onSelectLastTurn: () => void;
-  onSelectTurn: (turnId: TurnId | null) => void;
-  onDiffRenderModeChange: (mode: DiffRenderMode) => void;
-  onDiffWordWrapChange: (enabled: boolean) => void;
-  onDiffIgnoreWhitespaceChange: (enabled: boolean) => void;
-  onCopyDiff: () => void;
-  onToggleCollapseAll: () => void;
-}) {
-  const [optionsOpen, setOptionsOpen] = useState(false);
-
-  return (
-    <Menu open={optionsOpen} onOpenChange={setOptionsOpen}>
-      <MenuTrigger
-        render={
-          <IconButton
-            variant="ghost"
-            size="icon-xs"
-            className="text-muted-foreground hover:text-foreground"
-            label="Diff options"
-            title="Diff options"
-            onClick={() => {
-              setOptionsOpen(true);
-            }}
-            onKeyDown={(event) => {
-              if (event.key === "Enter" || event.key === " ") {
-                setOptionsOpen(true);
-              }
-            }}
-            onPointerDown={() => {
-              setOptionsOpen(true);
-            }}
-          >
-            <EllipsisIcon className="size-3.5" />
-          </IconButton>
-        }
-      />
-      <ComposerPickerMenuPopup align="end" side="bottom" sideOffset={6} className="w-64 min-w-64">
-        <MenuGroup>
-          <MenuGroupLabel>Source</MenuGroupLabel>
-          <MenuRadioGroup
-            value={props.scopePickerValue ?? ""}
-            onValueChange={(value) => {
-              if (value === "allTurns") {
-                props.onSelectAllTurns();
-                return;
-              }
-              if (value === "lastTurn") {
-                props.onSelectLastTurn();
-                return;
-              }
-              if (
-                value === "workingTree" ||
-                value === "unstaged" ||
-                value === "staged" ||
-                value === "branch"
-              ) {
-                props.onSelectRepoScope(value);
-              }
-            }}
-          >
-            {DIFF_PANEL_PICKER_SCOPE_OPTIONS.map((scope) => (
-              <MenuRadioItem key={scope} value={scope}>
-                <span className="min-w-0 flex-1 truncate">{REPO_DIFF_SCOPE_LABELS[scope]}</span>
-                <EditorDiffOptionsCountBadge count={props.scopeFileCounts[scope]} />
-              </MenuRadioItem>
-            ))}
-            <MenuRadioItem value="allTurns">
-              <span className="min-w-0 flex-1 truncate">All turns</span>
-            </MenuRadioItem>
-            <MenuRadioItem value="lastTurn">
-              <span className="min-w-0 flex-1 truncate">Last turn</span>
-            </MenuRadioItem>
-          </MenuRadioGroup>
-        </MenuGroup>
-
-        {props.orderedTurnDiffSummaries.length > 0 ? (
-          <MenuGroup>
-            <MenuGroupLabel>Turns</MenuGroupLabel>
-            <MenuRadioGroup
-              value={props.selectedTurnId ?? "all-turns"}
-              onValueChange={(value) => {
-                props.onSelectTurn(value === "all-turns" ? null : (value as TurnId));
-              }}
-            >
-              <MenuRadioItem value="all-turns">
-                <span className="min-w-0 flex-1 truncate">All turns</span>
-              </MenuRadioItem>
-              {props.orderedTurnDiffSummaries.map((summary) => {
-                const turnNumber =
-                  summary.checkpointTurnCount ??
-                  props.inferredCheckpointTurnCountByTurnId[summary.turnId] ??
-                  "?";
-                return (
-                  <MenuRadioItem key={summary.turnId} value={summary.turnId}>
-                    <span className="min-w-0 flex-1 truncate">Turn {turnNumber}</span>
-                    <span className="shrink-0 text-[11px] text-muted-foreground tabular-nums">
-                      {formatShortTimestamp(summary.completedAt, props.timestampFormat)}
-                    </span>
-                  </MenuRadioItem>
-                );
-              })}
-            </MenuRadioGroup>
-          </MenuGroup>
-        ) : null}
-
-        <MenuGroup>
-          <MenuGroupLabel>View</MenuGroupLabel>
-          <MenuRadioGroup
-            value={props.diffRenderMode}
-            onValueChange={(value) => {
-              if (value === "stacked" || value === "split") {
-                props.onDiffRenderModeChange(value);
-              }
-            }}
-          >
-            <MenuRadioItem value="stacked">
-              <Rows3Icon className={EDITOR_DIFF_OPTIONS_MENU_ICON_CLASS_NAME} />
-              <span>Stacked diff</span>
-            </MenuRadioItem>
-            <MenuRadioItem value="split">
-              <Columns2Icon className={EDITOR_DIFF_OPTIONS_MENU_ICON_CLASS_NAME} />
-              <span>Split diff</span>
-            </MenuRadioItem>
-          </MenuRadioGroup>
-          <MenuCheckboxItem
-            checked={props.diffIgnoreWhitespace}
-            variant="switch"
-            onCheckedChange={(checked) => {
-              props.onDiffIgnoreWhitespaceChange(checked === true);
-            }}
-          >
-            Ignore whitespace-only changes
-          </MenuCheckboxItem>
-          <MenuCheckboxItem
-            checked={props.diffWordWrap}
-            variant="switch"
-            onCheckedChange={(checked) => {
-              props.onDiffWordWrapChange(checked === true);
-            }}
-          >
-            Wrap long lines
-          </MenuCheckboxItem>
-          {props.diffCopyText ? (
-            <MenuItem
-              onClick={() => {
-                props.onCopyDiff();
-              }}
-            >
-              <CopyIcon className={EDITOR_DIFF_OPTIONS_MENU_ICON_CLASS_NAME} />
-              <span>{props.isDiffCopied ? "Copied diff" : "Copy diff"}</span>
-            </MenuItem>
-          ) : null}
-          {props.renderableFiles.length > 0 ? (
-            <MenuItem
-              onClick={() => {
-                props.onToggleCollapseAll();
-              }}
-            >
-              <FolderIcon className={EDITOR_DIFF_OPTIONS_MENU_ICON_CLASS_NAME} />
-              <span>{props.allFilesCollapsed ? "Expand all files" : "Collapse all files"}</span>
-            </MenuItem>
-          ) : null}
-        </MenuGroup>
-      </ComposerPickerMenuPopup>
-    </Menu>
-  );
-}
-
-function EditorDiffControls(props: {
-  scopePickerValue: string | null;
-  scopeFileCounts: Partial<Record<RepoDiffScope, number>>;
-  selectedTurnId: TurnId | null;
-  orderedTurnDiffSummaries: ReadonlyArray<TurnDiffSummary>;
-  inferredCheckpointTurnCountByTurnId: Record<string, number>;
-  timestampFormat: TimestampFormat;
-  renderableFiles: ReadonlyArray<FileDiffMetadata>;
-  diffRenderMode: DiffRenderMode;
-  diffWordWrap: boolean;
-  diffIgnoreWhitespace: boolean;
-  diffCopyText: string | null;
-  isDiffCopied: boolean;
-  allFilesCollapsed: boolean;
-  onSelectRepoScope: (scope: RepoDiffScope) => void;
-  onSelectAllTurns: () => void;
-  onSelectLastTurn: () => void;
-  onSelectTurn: (turnId: TurnId | null) => void;
-  onDiffRenderModeChange: (mode: DiffRenderMode) => void;
-  onDiffWordWrapChange: (enabled: boolean) => void;
-  onDiffIgnoreWhitespaceChange: (enabled: boolean) => void;
-  onCopyDiff: () => void;
-  onToggleCollapseAll: () => void;
-}) {
-  return (
-    <div className="flex items-center gap-1">
-      <EditorDiffOptionsMenu
-        scopePickerValue={props.scopePickerValue}
-        scopeFileCounts={props.scopeFileCounts}
-        selectedTurnId={props.selectedTurnId}
-        orderedTurnDiffSummaries={props.orderedTurnDiffSummaries}
-        inferredCheckpointTurnCountByTurnId={props.inferredCheckpointTurnCountByTurnId}
-        timestampFormat={props.timestampFormat}
-        renderableFiles={props.renderableFiles}
-        diffWordWrap={props.diffWordWrap}
-        diffIgnoreWhitespace={props.diffIgnoreWhitespace}
-        diffCopyText={props.diffCopyText}
-        isDiffCopied={props.isDiffCopied}
-        allFilesCollapsed={props.allFilesCollapsed}
-        diffRenderMode={props.diffRenderMode}
-        onSelectRepoScope={props.onSelectRepoScope}
-        onSelectAllTurns={props.onSelectAllTurns}
-        onSelectLastTurn={props.onSelectLastTurn}
-        onSelectTurn={props.onSelectTurn}
-        onDiffRenderModeChange={props.onDiffRenderModeChange}
-        onDiffWordWrapChange={props.onDiffWordWrapChange}
-        onDiffIgnoreWhitespaceChange={props.onDiffIgnoreWhitespaceChange}
-        onCopyDiff={props.onCopyDiff}
-        onToggleCollapseAll={props.onToggleCollapseAll}
-      />
-    </div>
-  );
-}
-
-interface DiffPanelProps {
-  mode?: DiffPanelMode;
-  threadId?: ThreadId | null;
-  panelState?: Pick<ChatPanelState, "panel" | "diffTurnId" | "diffFilePath">;
-  onUpdatePanelState?: (
-    patch: Partial<Pick<ChatPanelState, "panel" | "diffTurnId" | "diffFilePath">>,
-  ) => void;
-  onClosePanel?: () => void;
-  liveRefreshEnabled?: boolean;
-  /** When false, skip git/diff fetches (e.g. right dock collapsed or pane hidden). */
-  queriesEnabled?: boolean;
-  hideHeader?: boolean;
-  onRenderableFilesChange?: (files: ReadonlyArray<FileDiffMetadata>, isLoading: boolean) => void;
-  onEditorDiffOptionsChange?: (control: ReactNode | null) => void;
-}
-
-export { DiffWorkerPoolProvider } from "./DiffWorkerPoolProvider";
-
-export default function DiffPanel({
-  mode = "inline",
-  threadId: controlledThreadId,
-  panelState,
-  onUpdatePanelState,
-  onClosePanel,
-  liveRefreshEnabled = true,
-  queriesEnabled = true,
-  hideHeader = false,
-  onRenderableFilesChange,
-  onEditorDiffOptionsChange,
-}: DiffPanelProps) {
-  const navigate = useNavigate();
-  const { resolvedTheme } = useTheme();
-  const { settings } = useAppSettings();
-  const [diffRenderMode, setDiffRenderMode] = useState<DiffRenderMode>("split");
-  const [diffWordWrap, setDiffWordWrap] = useState(settings.diffWordWrap);
-  const [diffIgnoreWhitespace, setDiffIgnoreWhitespace] = useState(true);
-  const [scopePickerOpen, setScopePickerOpen] = useState(false);
-  const handleScopePickerOpenChange = useCallback((open: boolean) => {
-    setScopePickerOpen((previous) => (previous === open ? previous : open));
-  }, []);
-  const repoDiffScope = useRepoDiffScopeStore((store) => store.scope);
-  const setRepoDiffScope = useRepoDiffScopeStore((store) => store.setScope);
-  const [collapsedFiles, setCollapsedFiles] = useState<Set<string>>(() => new Set());
-  const [fileTreeOpen, setFileTreeOpen] = useState(false);
-  // Lazy-mount the review file tree on first open so a closed diff panel never
-  // pays to filter/build/render the side tree (the common case). Keep it mounted
-  // afterward so the open/close animation plays and the filter + expand state
-  // persist across toggles.
-  const [fileTreeMounted, setFileTreeMounted] = useState(false);
-  const toggleFileTree = useCallback(() => {
-    setFileTreeOpen((previous) => !previous);
-    setFileTreeMounted(true);
-  }, []);
-  const closeFileTree = useCallback(() => {
-    setFileTreeOpen(false);
-  }, []);
-  const patchViewportRef = useRef<HTMLDivElement>(null);
-  const previousDiffOpenRef = useRef(false);
-  const routeThreadId = useParams({
-    strict: false,
-    select: (params) => (params.threadId ? ThreadId.makeUnsafe(params.threadId) : null),
-  });
-  const diffSearch = useDiffRouteSearch();
-  const diffOpen = panelState ? panelState.panel === "diff" : diffSearch.diff === "1";
-  const diffQueriesEnabled = useMemo(
-    () =>
-      resolveDiffPanelQueriesEnabled({
-        diffOpen,
-        queriesEnabled,
-      }),
-    [diffOpen, queriesEnabled],
-  );
-  const scopeCountQueriesEnabled = useMemo(
-    () =>
-      resolveDiffPanelScopeCountQueriesEnabled({
-        queriesEnabled: diffQueriesEnabled,
-        scopePickerOpen,
-      }),
-    [diffQueriesEnabled, scopePickerOpen],
-  );
-  const activeThreadId = controlledThreadId ?? routeThreadId;
-  const serverThreadCatalog = useStore(
-    useMemo(() => createDiffPanelThreadCatalogSelector(activeThreadId), [activeThreadId]),
-  );
-  const shouldPollRepoDiff = useStore(
-    useMemo(() => createDiffPanelRepoLiveRefreshSelector(activeThreadId), [activeThreadId]),
-  );
-  const draftThread = useComposerDraftStore((store) =>
-    activeThreadId ? (store.draftThreadsByThreadId[activeThreadId] ?? null) : null,
-  );
-  const fallbackDraftProjectId = draftThread?.projectId ?? null;
-  const fallbackDraftProject = useStore(
-    useMemo(() => createProjectSelector(fallbackDraftProjectId), [fallbackDraftProjectId]),
-  );
-  // Keep draft-backed thread context available before the first server turn exists.
-  const activeThreadContext = useMemo((): DiffPanelThreadCatalog | undefined => {
-    if (serverThreadCatalog) {
-      return serverThreadCatalog;
-    }
-    const draftBackedThread = resolveDiffPanelThread({
-      threadId: activeThreadId,
-      serverThread: undefined,
-      draftThread,
-      fallbackModelSelection: fallbackDraftProject?.defaultModelSelection ?? null,
-    });
-    return draftBackedThread ? toDiffPanelThreadCatalog(draftBackedThread) : undefined;
-  }, [
-    activeThreadId,
-    draftThread,
-    fallbackDraftProject?.defaultModelSelection,
-    serverThreadCatalog,
-  ]);
-  const activeProjectId = activeThreadContext?.projectId ?? draftThread?.projectId ?? null;
-  const activeProject = useStore(
-    useMemo(() => createProjectSelector(activeProjectId), [activeProjectId]),
-  );
-  const resolvedThreadEnvMode =
-    serverThreadCatalog?.envMode ?? draftThread?.envMode ?? activeThreadContext?.envMode;
-  const resolvedThreadWorktreePath =
-    serverThreadCatalog?.worktreePath ??
-    draftThread?.worktreePath ??
-    activeThreadContext?.worktreePath ??
-    null;
-  const diffEnvironmentState = resolveDiffEnvironmentState({
-    projectCwd: activeProject?.cwd ?? null,
-    envMode: resolvedThreadEnvMode,
-    worktreePath: resolvedThreadWorktreePath,
-  });
-  const diffEnvironmentPending = diffEnvironmentState.pending;
-  const activeCwd = diffEnvironmentState.cwd;
-  const selectedTurnId = panelState
-    ? (panelState.diffTurnId ?? null)
-    : (diffSearch.diffTurnId ?? null);
-  const [diffViewKind, setDiffViewKind] = useState<DiffViewKind>(() =>
-    resolveInitialDiffViewKind(selectedTurnId),
-  );
-  const [turnScopeIntent, setTurnScopeIntent] = useState<DiffPanelTurnScopeIntent>(() =>
-    selectedTurnId === null ? "all" : "last",
-  );
-  const gitStatusQueriesEnabled = useMemo(
-    () =>
-      resolveDiffPanelGitStatusQueriesEnabled({
-        queriesEnabled: diffQueriesEnabled,
-        activeCwd,
-        diffViewKind,
-      }),
-    [activeCwd, diffQueriesEnabled, diffViewKind],
-  );
-  const gitBranchesQuery = useQuery({
-    ...gitBranchesQueryOptions(activeCwd ?? null),
-    enabled: diffQueriesEnabled && activeCwd !== null,
-  });
-  const gitStatusQuery = useQuery({
-    ...gitStatusQueryOptions(activeCwd ?? null),
-    enabled: gitStatusQueriesEnabled,
-  });
-  const gitRepoStatus = gitBranchesQuery.isSuccess ? gitBranchesQuery.data.isRepo : undefined;
-  const gitRepoStatusError =
-    gitBranchesQuery.error instanceof Error
-      ? gitBranchesQuery.error.message
-      : gitBranchesQuery.error
-        ? "Failed to check git repository."
-        : null;
-  const isGitRepo = gitRepoStatus === true;
-  const turnDiffSummaries = activeThreadContext?.turnDiffSummaries ?? [];
-  const inferredCheckpointTurnCountByTurnId = useMemo(
-    () => inferCheckpointTurnCountByTurnId(turnDiffSummaries),
-    [turnDiffSummaries],
-  );
-  const repoDiffLiveRefreshIntervalMs = useMemo(
-    () =>
-      resolveDiffPanelRepoLiveRefetchIntervalMs({
-        queriesEnabled: diffQueriesEnabled,
-        liveRefreshEnabled,
-        diffViewKind,
-        shouldPollRepoDiff,
-      }),
-    [diffQueriesEnabled, diffViewKind, liveRefreshEnabled, shouldPollRepoDiff],
-  );
-  const orderedTurnDiffSummaries = useMemo(
-    () =>
-      [...turnDiffSummaries].toSorted((left, right) => {
-        const leftTurnCount =
-          left.checkpointTurnCount ?? inferredCheckpointTurnCountByTurnId[left.turnId] ?? 0;
-        const rightTurnCount =
-          right.checkpointTurnCount ?? inferredCheckpointTurnCountByTurnId[right.turnId] ?? 0;
-        if (leftTurnCount !== rightTurnCount) {
-          return rightTurnCount - leftTurnCount;
-        }
-        return right.completedAt.localeCompare(left.completedAt);
-      }),
-    [inferredCheckpointTurnCountByTurnId, turnDiffSummaries],
-  );
-
-  const selectedFilePath = panelState
-    ? (panelState.diffFilePath ?? null)
-    : (diffSearch.diffFilePath ?? null);
-  const selectedTurn = useMemo(
-    () => resolveSelectedTurnSummary(selectedTurnId, orderedTurnDiffSummaries),
-    [orderedTurnDiffSummaries, selectedTurnId],
-  );
-  const selectedCheckpointTurnCount =
-    selectedTurn &&
-    (selectedTurn.checkpointTurnCount ?? inferredCheckpointTurnCountByTurnId[selectedTurn.turnId]);
-  const selectedCheckpointRange = useMemo(
-    () =>
-      typeof selectedCheckpointTurnCount === "number"
-        ? {
-            fromTurnCount: Math.max(0, selectedCheckpointTurnCount - 1),
-            toTurnCount: selectedCheckpointTurnCount,
-          }
-        : null,
-    [selectedCheckpointTurnCount],
-  );
-  const conversationCheckpointTurnCount = useMemo(() => {
-    const turnCounts = orderedTurnDiffSummaries
-      .map(
-        (summary) =>
-          summary.checkpointTurnCount ?? inferredCheckpointTurnCountByTurnId[summary.turnId],
-      )
-      .filter((value): value is number => typeof value === "number");
-    if (turnCounts.length === 0) {
-      return undefined;
-    }
-    const latest = Math.max(...turnCounts);
-    return latest > 0 ? latest : undefined;
-  }, [inferredCheckpointTurnCountByTurnId, orderedTurnDiffSummaries]);
-  const conversationCheckpointRange = useMemo(
-    () =>
-      !selectedTurn &&
-      turnScopeIntent !== "last" &&
-      typeof conversationCheckpointTurnCount === "number"
-        ? {
-            fromTurnCount: 0,
-            toTurnCount: conversationCheckpointTurnCount,
-          }
-        : null,
-    [conversationCheckpointTurnCount, selectedTurn, turnScopeIntent],
-  );
-  const activeCheckpointRange = selectedTurn
-    ? selectedCheckpointRange
-    : conversationCheckpointRange;
-  const conversationCacheScope = useMemo(
-    () =>
-      selectedTurn || orderedTurnDiffSummaries.length === 0
-        ? null
-        : resolveConversationCacheScope(conversationCheckpointTurnCount),
-    [conversationCheckpointTurnCount, orderedTurnDiffSummaries.length, selectedTurn],
-  );
-  const activeCheckpointDiffQuery = useQuery(
-    checkpointDiffQueryOptions({
-      threadId: activeThreadId,
-      fromTurnCount: activeCheckpointRange?.fromTurnCount ?? null,
-      toTurnCount: activeCheckpointRange?.toTurnCount ?? null,
-      ignoreWhitespace: diffIgnoreWhitespace,
-      cacheScope: selectedTurn ? `turn:${selectedTurn.turnId}` : conversationCacheScope,
-      enabled:
-        diffQueriesEnabled && isGitRepo && !diffEnvironmentPending && diffViewKind === "turn",
-    }),
-  );
-  const selectedTurnCheckpointDiff = selectedTurn
-    ? activeCheckpointDiffQuery.data?.diff
-    : undefined;
-  const conversationCheckpointDiff = selectedTurn
-    ? undefined
-    : activeCheckpointDiffQuery.data?.diff;
-  const checkpointDiffDisplay = resolveCheckpointDiffQueryDisplayState({
-    isLoading: activeCheckpointDiffQuery.isLoading,
-    isFetching: activeCheckpointDiffQuery.isFetching,
-    data: activeCheckpointDiffQuery.data,
-    error: activeCheckpointDiffQuery.error,
-  });
-  const isLoadingCheckpointDiff = checkpointDiffDisplay.isLoading;
-  const checkpointDiffError = checkpointDiffDisplay.error;
-
-  const selectedPatch = selectedTurn ? selectedTurnCheckpointDiff : conversationCheckpointDiff;
-  const hasResolvedPatch = typeof selectedPatch === "string";
-  const hasNoNetChanges = hasResolvedPatch && selectedPatch.trim().length === 0;
-  const unstagedDiffQuery = useQuery(
-    gitWorkingTreeDiffQueryOptions({
-      cwd: activeCwd ?? null,
-      scope: "unstaged",
-      enabled: scopeCountQueriesEnabled && !diffEnvironmentPending,
-    }),
-  );
-  const stagedDiffQuery = useQuery(
-    gitWorkingTreeDiffQueryOptions({
-      cwd: activeCwd ?? null,
-      scope: "staged",
-      enabled: scopeCountQueriesEnabled && !diffEnvironmentPending,
-    }),
-  );
-  const branchDiffQuery = useQuery(
-    gitWorkingTreeDiffQueryOptions({
-      cwd: activeCwd ?? null,
-      scope: "branch",
-      enabled: scopeCountQueriesEnabled && !diffEnvironmentPending,
-    }),
-  );
-  const repoDiffQuery = useQuery(
-    gitWorkingTreeDiffQueryOptions({
-      cwd: activeCwd ?? null,
-      scope: repoDiffScope,
-      enabled: diffQueriesEnabled && !diffEnvironmentPending && diffViewKind === "repo",
-      refetchInterval: repoDiffLiveRefreshIntervalMs,
-    }),
-  );
-  const repoPatch = repoDiffQuery.data?.patch;
-  const hasResolvedRepoPatch = typeof repoPatch === "string";
-  const hasNoRepoChanges = hasResolvedRepoPatch && repoPatch.trim().length === 0;
-  const repoDiffError =
-    repoDiffQuery.error instanceof Error
-      ? repoDiffQuery.error.message
-      : repoDiffQuery.error
-        ? "Failed to load repo diff."
-        : null;
-  const branchHasCommittedChanges = (gitStatusQuery.data?.aheadCount ?? 0) > 0;
-
-  useEffect(() => {
-    if (
-      diffOpen &&
-      diffViewKind === "repo" &&
-      repoDiffScope === "workingTree" &&
-      hasResolvedRepoPatch &&
-      hasNoRepoChanges &&
-      branchHasCommittedChanges
-    ) {
-      setRepoDiffScope("branch");
-    }
-  }, [
-    branchHasCommittedChanges,
-    diffOpen,
-    diffViewKind,
-    hasNoRepoChanges,
-    hasResolvedRepoPatch,
-    repoDiffScope,
-    setRepoDiffScope,
-  ]);
-
-  const viewSource = useMemo(
-    () =>
-      resolveDiffPanelViewSource({
-        diffViewKind,
-        repoDiffScope,
-        selectedTurnId,
-      }),
-    [diffViewKind, repoDiffScope, selectedTurnId],
-  );
-  const activeReviewPatch = diffViewKind === "repo" ? repoPatch : selectedPatch;
-  const activeReviewError = diffViewKind === "repo" ? repoDiffError : checkpointDiffError;
-  const activeReviewIsLoading =
-    diffViewKind === "repo" ? repoDiffQuery.isLoading : isLoadingCheckpointDiff;
-  const activeReviewHasNoChanges = diffViewKind === "repo" ? hasNoRepoChanges : hasNoNetChanges;
-  const { copyToClipboard: copyDiffToClipboard, isCopied: isDiffCopied } = useCopyToClipboard();
-  const diffCopyText = useMemo(() => resolveDiffCopyText(activeReviewPatch), [activeReviewPatch]);
-  // The parsed patch is structural and theme-agnostic — theming is applied
-  // separately via the themed row key and buildDiffPanelUnsafeCSS (cached per
-  // theme). Keeping `resolvedTheme` out of the parse cache scope and these deps
-  // avoids re-parsing the whole patch on every light/dark toggle.
-  const renderablePatch = useMemo(() => getRenderablePatch(activeReviewPatch), [activeReviewPatch]);
-  const renderableFiles = useMemo(() => {
-    if (!renderablePatch || renderablePatch.kind !== "files") {
-      return [];
-    }
-    return sortFileDiffsByPath(renderablePatch.files);
-  }, [renderablePatch]);
-  useEffect(() => {
-    onRenderableFilesChange?.(renderableFiles, activeReviewIsLoading);
-  }, [activeReviewIsLoading, onRenderableFilesChange, renderableFiles]);
-  const activePatchStat = useMemo(
-    () => summarizeRenderablePatchStats(renderablePatch),
-    [renderablePatch],
-  );
-  const workingTreeDiffQuery = useQuery(
-    gitWorkingTreeDiffQueryOptions({
-      cwd: activeCwd ?? null,
-      scope: "workingTree",
-      enabled: scopeCountQueriesEnabled && !diffEnvironmentPending,
-    }),
-  );
-  const pickerScopeFileCounts = useMemo(() => {
-    const counts: Partial<Record<RepoDiffScope, number>> = {};
-    const workingTreeCount = summarizePatchTotals(workingTreeDiffQuery.data?.patch)?.fileCount;
-    const unstagedCount = summarizePatchTotals(unstagedDiffQuery.data?.patch)?.fileCount;
-    const stagedCount = summarizePatchTotals(stagedDiffQuery.data?.patch)?.fileCount;
-    const branchCount = summarizePatchTotals(branchDiffQuery.data?.patch)?.fileCount;
-    if (typeof workingTreeCount === "number") counts.workingTree = workingTreeCount;
-    if (typeof unstagedCount === "number") counts.unstaged = unstagedCount;
-    if (typeof stagedCount === "number") counts.staged = stagedCount;
-    if (typeof branchCount === "number") counts.branch = branchCount;
-    return counts;
-  }, [
-    branchDiffQuery.data?.patch,
-    stagedDiffQuery.data?.patch,
-    unstagedDiffQuery.data?.patch,
-    workingTreeDiffQuery.data?.patch,
-  ]);
-  const scopeFileCounts = useMemo(
-    () =>
-      resolveDiffPanelScopeFileCounts({
-        viewSource,
-        activeScopeFileCount: activePatchStat?.fileCount,
-        scopePickerOpen,
-        pickerScopeCounts: pickerScopeFileCounts,
-      }),
-    [activePatchStat?.fileCount, pickerScopeFileCounts, scopePickerOpen, viewSource],
-  );
-  const allFilesCollapsed = useMemo(
-    () => areAllRenderableFilesCollapsed(renderableFiles, collapsedFiles),
-    [collapsedFiles, renderableFiles],
-  );
-  useEffect(() => {
-    if (diffOpen && !previousDiffOpenRef.current) {
-      setDiffWordWrap(settings.diffWordWrap);
-      setDiffViewKind(resolveInitialDiffViewKind(selectedTurnId));
-    }
-    previousDiffOpenRef.current = diffOpen;
-  }, [diffOpen, selectedTurnId, settings.diffWordWrap]);
-
-  useEffect(() => {
-    if (selectedTurnId !== null) {
-      setDiffViewKind((current) => (current === "turn" ? current : "turn"));
-    }
-  }, [selectedTurnId]);
-
-  useEffect(() => {
-    if (!selectedFilePath || !patchViewportRef.current) {
-      return;
-    }
-    const target = Array.from(
-      patchViewportRef.current.querySelectorAll<HTMLElement>("[data-diff-file-path]"),
-    ).find((element) => element.dataset.diffFilePath === selectedFilePath);
-    target?.scrollIntoView({ block: "nearest" });
-  }, [selectedFilePath, renderableFiles]);
-
-  const toggleFileCollapsed = useCallback((fileKey: string) => {
-    setCollapsedFiles((prev) => {
-      const next = new Set(prev);
-      if (next.has(fileKey)) next.delete(fileKey);
-      else next.add(fileKey);
-      return next;
-    });
-  }, []);
-
-  // Per-file header actions that talk to the active thread's composer draft.
-  const diffFileChatActions = useMemo(
-    () =>
-      activeThreadId
-        ? {
-            onReferenceInChat: (filePath: string) => {
-              appendChatFileReference(activeThreadId, { path: filePath });
-            },
-            onAskWhyChanged: (filePath: string) => {
-              appendComposerPromptText(activeThreadId, buildWhyChangedPrompt(filePath));
-            },
-          }
-        : undefined,
-    [activeThreadId],
-  );
-
-  // Highlight diff code -> floating "Add to chat" -> mention + quoted snippet.
-  // The diff body renders inside the @pierre/diffs shadow root, so selection
-  // ancestors are resolved through shadow boundaries.
-  const readDiffSelection = useCallback((container: HTMLElement) => {
-    const selection = window.getSelection();
-    if (!selection || selection.rangeCount === 0 || selection.isCollapsed) {
-      return null;
-    }
-    const anchorRow = closestThroughShadow(selection.anchorNode, "[data-diff-file-path]");
-    const focusRow = closestThroughShadow(selection.focusNode, "[data-diff-file-path]");
-    if (!anchorRow || anchorRow !== focusRow || !container.contains(anchorRow)) {
-      return null;
-    }
-    const filePath = anchorRow.getAttribute("data-diff-file-path") ?? "";
-    const text = selection
-      .toString()
-      .replace(/\r\n/g, "\n")
-      .replace(/^\n+|\n+$/g, "")
-      .trim();
-    if (filePath.length === 0 || text.length === 0) {
-      return null;
-    }
-    return { filePath, text };
-  }, []);
-  const commitDiffSelection = useCallback(
-    (payload: { filePath: string; text: string }) => {
-      if (activeThreadId) {
-        appendComposerPromptText(
-          activeThreadId,
-          buildDiffSelectionReference(payload.filePath, payload.text),
-        );
-      }
-    },
-    [activeThreadId],
-  );
-  const diffSelectionAction = useCodeSelectionAction({
-    enabled: activeThreadId !== null,
-    readSelection: readDiffSelection,
-    onCommit: commitDiffSelection,
-  });
-
-  const updateDiffSelection = useCallback(
-    (input: { turnId: TurnId | null; filePath?: string | null }) => {
-      if (!activeThreadContext) return;
-      if (onUpdatePanelState) {
-        onUpdatePanelState({
-          panel: "diff",
-          diffTurnId: input.turnId,
-          diffFilePath: input.filePath ?? null,
-        });
-        return;
-      }
-      void navigate({
-        to: "/$threadId",
-        params: { threadId: activeThreadContext.id },
-        search: (previous) => {
-          const rest = stripDiffSearchParams(previous);
-          return {
-            ...rest,
-            panel: "diff",
-            diff: "1",
-            ...(input.turnId ? { diffTurnId: input.turnId } : {}),
-            ...(input.filePath ? { diffFilePath: input.filePath } : {}),
-          };
-        },
-      });
-    },
-    [activeThreadContext, navigate, onUpdatePanelState],
-  );
-  useEffect(() => {
-    if (!diffOpen || !activeThreadContext) {
-      return;
-    }
-    if (!isStaleDiffTurnSelection(selectedTurnId, orderedTurnDiffSummaries)) {
-      return;
-    }
-    updateDiffSelection({ turnId: null, filePath: null });
-  }, [
-    activeThreadContext,
-    diffOpen,
-    orderedTurnDiffSummaries,
-    selectedTurnId,
-    updateDiffSelection,
-  ]);
-  const selectTurn = useCallback(
-    (turnId: TurnId | null) => {
-      setDiffViewKind("turn");
-      setTurnScopeIntent(turnId === null ? "all" : "last");
-      updateDiffSelection({ turnId, filePath: null });
-    },
-    [updateDiffSelection],
-  );
-  const selectRepoScope = useCallback(
-    (scope: typeof repoDiffScope) => {
-      setDiffViewKind("repo");
-      setRepoDiffScope(scope);
-      if (selectedTurnId !== null) {
-        updateDiffSelection({ turnId: null, filePath: null });
-      }
-    },
-    [selectedTurnId, setRepoDiffScope, updateDiffSelection],
-  );
-  const selectAllTurns = useCallback(() => {
-    setTurnScopeIntent("all");
-    selectTurn(null);
-  }, [selectTurn]);
-  const selectLastTurn = useCallback(() => {
-    const latestTurn = orderedTurnDiffSummaries[0];
-    setTurnScopeIntent("last");
-    setDiffViewKind("turn");
-    if (!latestTurn) {
-      if (selectedTurnId !== null) {
-        updateDiffSelection({ turnId: null, filePath: null });
-      }
-      return;
-    }
-    selectTurn(latestTurn.turnId);
-  }, [orderedTurnDiffSummaries, selectTurn, selectedTurnId, updateDiffSelection]);
-  const toggleCollapseAll = useCallback(() => {
-    setCollapsedFiles((previous) => {
-      if (areAllRenderableFilesCollapsed(renderableFiles, previous)) {
-        return new Set();
-      }
-      return new Set(renderableFiles.map((fileDiff) => buildFileDiffRenderKey(fileDiff)));
-    });
-  }, [renderableFiles]);
-  const selectFile = useCallback(
-    (filePath: string) => {
-      updateDiffSelection({ turnId: selectedTurnId, filePath });
-    },
-    [selectedTurnId, updateDiffSelection],
-  );
-  const showDiffToolbar = Boolean(activeThreadContext && isGitRepo && !diffEnvironmentPending);
-  const copyDiff = useCallback(() => {
-    if (diffCopyText) {
-      copyDiffToClipboard(diffCopyText, undefined);
-    }
-  }, [copyDiffToClipboard, diffCopyText]);
-  const latestTurnId = orderedTurnDiffSummaries[0]?.turnId ?? null;
-  const scopePickerValue = useMemo(
-    () =>
-      resolveDiffPanelScopePickerValue({
-        viewSource,
-        latestTurnId,
-        turnScopeIntent,
-      }),
-    [latestTurnId, turnScopeIntent, viewSource],
-  );
-  const editorDiffOptionsControl = useMemo(
-    () =>
-      hideHeader ? (
-        <EditorDiffControls
-          scopePickerValue={scopePickerValue}
-          scopeFileCounts={scopeFileCounts}
-          selectedTurnId={selectedTurnId}
-          orderedTurnDiffSummaries={orderedTurnDiffSummaries}
-          inferredCheckpointTurnCountByTurnId={inferredCheckpointTurnCountByTurnId}
-          timestampFormat={settings.timestampFormat}
-          renderableFiles={renderableFiles}
-          diffRenderMode={diffRenderMode}
-          diffWordWrap={diffWordWrap}
-          diffIgnoreWhitespace={diffIgnoreWhitespace}
-          diffCopyText={diffCopyText}
-          isDiffCopied={isDiffCopied}
-          allFilesCollapsed={allFilesCollapsed}
-          onSelectRepoScope={selectRepoScope}
-          onSelectAllTurns={selectAllTurns}
-          onSelectLastTurn={selectLastTurn}
-          onSelectTurn={selectTurn}
-          onDiffRenderModeChange={setDiffRenderMode}
-          onDiffWordWrapChange={setDiffWordWrap}
-          onDiffIgnoreWhitespaceChange={setDiffIgnoreWhitespace}
-          onCopyDiff={copyDiff}
-          onToggleCollapseAll={toggleCollapseAll}
-        />
-      ) : null,
-    [
-      allFilesCollapsed,
-      copyDiff,
-      diffCopyText,
-      diffIgnoreWhitespace,
-      diffRenderMode,
-      diffWordWrap,
-      hideHeader,
-      inferredCheckpointTurnCountByTurnId,
-      isDiffCopied,
-      orderedTurnDiffSummaries,
-      renderableFiles,
-      scopeFileCounts,
-      scopePickerValue,
-      selectAllTurns,
-      selectLastTurn,
-      selectRepoScope,
-      selectTurn,
-      selectedTurnId,
-      settings.timestampFormat,
-      toggleCollapseAll,
-    ],
-  );
-  useEffect(() => {
-    onEditorDiffOptionsChange?.(editorDiffOptionsControl);
-  }, [editorDiffOptionsControl, onEditorDiffOptionsChange]);
-  useEffect(
-    () => () => {
-      onEditorDiffOptionsChange?.(null);
-    },
-    [onEditorDiffOptionsChange],
-  );
-
-  const shellHeader = useMemo(
-    () =>
-      hideHeader ? null : showDiffToolbar ? (
-        <DiffPanelToolbar
-          // Remount per thread so per-thread view state (e.g. the expanded
-          // turn-list page size) does not leak across thread navigations.
-          key={activeThreadId ?? "no-thread"}
-          activeCwd={activeCwd}
-          activeThreadId={activeThreadId}
-          viewSource={viewSource}
-          turnScopeIntent={turnScopeIntent}
-          scopeFileCounts={scopeFileCounts}
-          activeStats={
-            activePatchStat
-              ? {
-                  additions: activePatchStat.additions,
-                  deletions: activePatchStat.deletions,
-                }
-              : null
-          }
-          orderedTurnDiffSummaries={orderedTurnDiffSummaries}
-          inferredCheckpointTurnCountByTurnId={inferredCheckpointTurnCountByTurnId}
-          selectedTurnId={selectedTurnId}
-          timestampFormat={settings.timestampFormat}
-          renderableFiles={renderableFiles}
-          selectedFilePath={selectedFilePath}
-          fileTreeOpen={fileTreeOpen}
-          resolvedTheme={resolvedTheme}
-          diffRenderMode={diffRenderMode}
-          diffWordWrap={diffWordWrap}
-          diffIgnoreWhitespace={diffIgnoreWhitespace}
-          diffCopyText={diffCopyText}
-          isDiffCopied={isDiffCopied}
-          allFilesCollapsed={allFilesCollapsed}
-          onSelectRepoScope={selectRepoScope}
-          onSelectAllTurns={selectAllTurns}
-          onSelectLastTurn={selectLastTurn}
-          onSelectTurn={selectTurn}
-          onSelectFile={selectFile}
-          onToggleFileTree={toggleFileTree}
-          onDiffRenderModeChange={setDiffRenderMode}
-          onDiffWordWrapChange={setDiffWordWrap}
-          onDiffIgnoreWhitespaceChange={setDiffIgnoreWhitespace}
-          onCopyDiff={copyDiff}
-          onToggleCollapseAll={toggleCollapseAll}
-          scopePickerOpen={scopePickerOpen}
-          onScopePickerOpenChange={handleScopePickerOpenChange}
-          {...(onClosePanel ? { onClosePanel } : {})}
-        />
-      ) : onClosePanel ? (
-        <div className="flex h-full w-full items-center justify-end px-3 [-webkit-app-region:no-drag]">
-          <IconButton
-            variant="chrome"
-            size="icon-xs"
-            label="Close file view"
-            className={DOCK_HEADER_ICON_BUTTON_CLASS}
-            onClick={(event) => {
-              event.stopPropagation();
-              onClosePanel();
-            }}
-          >
-            <XIcon className="size-3.5" />
-          </IconButton>
-        </div>
-      ) : null,
-    [
-      activeCwd,
-      activePatchStat,
-      activeThreadId,
-      allFilesCollapsed,
-      copyDiff,
-      diffCopyText,
-      diffIgnoreWhitespace,
-      diffRenderMode,
-      diffWordWrap,
-      fileTreeOpen,
-      hideHeader,
-      inferredCheckpointTurnCountByTurnId,
-      isDiffCopied,
-      handleScopePickerOpenChange,
-      onClosePanel,
-      orderedTurnDiffSummaries,
-      scopePickerOpen,
-      renderableFiles,
-      resolvedTheme,
-      scopeFileCounts,
-      selectAllTurns,
-      selectFile,
-      selectLastTurn,
-      selectRepoScope,
-      selectTurn,
-      selectedFilePath,
-      selectedTurnId,
-      settings.timestampFormat,
-      showDiffToolbar,
-      toggleCollapseAll,
-      toggleFileTree,
-      turnScopeIntent,
-      viewSource,
-    ],
-  );
-
-  return (
-    <DiffPanelShell mode={mode} header={shellHeader}>
-      {!activeThreadContext ? (
-        <PanelStateMessage density="compact" fill="flex">
-          Select a thread to inspect turn diffs.
-        </PanelStateMessage>
-      ) : gitRepoStatus === false ? (
-        <PanelStateMessage density="compact" fill="flex">
-          Turn diffs are unavailable because this project is not a git repository.
-        </PanelStateMessage>
-      ) : gitRepoStatusError ? (
-        <PanelStateMessage density="compact" fill="flex">
-          {gitRepoStatusError}
-        </PanelStateMessage>
-      ) : gitRepoStatus === undefined && diffQueriesEnabled && activeCwd ? (
-        <DiffPanelLoadingState label="Checking git repository..." />
-      ) : diffEnvironmentPending ? (
-        <PanelStateMessage density="compact" fill="flex">
-          This chat environment is still being prepared. Diffs will be available once the worktree
-          is ready.
-        </PanelStateMessage>
-      ) : (
-        <div className="flex min-h-0 min-w-0 flex-1 overflow-hidden">
-          <div
-            ref={patchViewportRef}
-            className="diff-panel-viewport flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden"
-            onMouseUp={diffSelectionAction.onContainerMouseUp}
-          >
-            <DiffPanelPatchViewport
-              renderablePatch={renderablePatch}
-              renderableFiles={renderableFiles}
-              resolvedTheme={resolvedTheme}
-              diffRenderMode={diffRenderMode}
-              diffWordWrap={diffWordWrap}
-              workspaceRoot={activeCwd ?? null}
-              collapsedFiles={collapsedFiles}
-              onToggleFileCollapsed={toggleFileCollapsed}
-              chatActions={diffFileChatActions}
-              isLoading={activeReviewIsLoading}
-              hasNoChanges={activeReviewHasNoChanges}
-              error={activeReviewError}
-              viewKind={diffViewKind}
-              loadingLabel={
-                diffViewKind === "repo"
-                  ? `Loading ${REPO_DIFF_SCOPE_LABELS[repoDiffScope].toLowerCase()} diff...`
-                  : "Loading checkpoint diff..."
-              }
-              emptyLabel={
-                diffViewKind === "repo"
-                  ? "No changes in the selected diff source."
-                  : orderedTurnDiffSummaries.length === 0
-                    ? "No turn diffs are available yet."
-                    : "No net changes in this selection."
-              }
-              unavailableLabel="No repo diff is available right now."
-            />
-            {diffSelectionAction.pendingAction ? (
-              <TranscriptSelectionAction
-                left={diffSelectionAction.pendingAction.left}
-                top={diffSelectionAction.pendingAction.top}
-                placement={diffSelectionAction.pendingAction.placement}
-                onAddToChat={diffSelectionAction.commit}
-              />
-            ) : null}
-          </div>
-          {hideHeader ? null : (
-            <div
-              className={disclosureWidthClassName(fileTreeOpen, "w-[min(42%,28rem)]", "shrink-0")}
-              aria-hidden={!fileTreeOpen}
-              inert={!fileTreeOpen}
-            >
-              {/* Empty until first open: the wrapper stays mounted (free) so the
-                  width reveal animates, but the tree only filters/builds once the
-                  user actually opens it. */}
-              {fileTreeMounted ? (
-                <ReviewFileTreePanel
-                  files={renderableFiles}
-                  selectedFilePath={selectedFilePath}
-                  resolvedTheme={resolvedTheme}
-                  isLoading={activeReviewIsLoading}
-                  onSelectFile={selectFile}
-                  onClose={closeFileTree}
-                />
-              ) : null}
-            </div>
-          )}
-        </div>
-      )}
-    </DiffPanelShell>
-  );
-}
diff --git a/apps/web/src/components/DiffPanelFileJumpMenu.tsx b/apps/web/src/components/DiffPanelFileJumpMenu.tsx
deleted file mode 100644
index c00f416c6..000000000
--- a/apps/web/src/components/DiffPanelFileJumpMenu.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-// FILE: DiffPanelFileJumpMenu.tsx
-// Purpose: Searchable "jump to file" picker for the diff panel toolbar. Reuses the
-//          composer picker shell and FileEntryIcon (central-icons-reversed) so file
-//          rows match the command menu and git pane.
-// Layer: Diff panel UI
-
-import type { FileDiffMetadata } from "@pierre/diffs/react";
-import { memo, useMemo, useState } from "react";
-
-import { SearchIcon } from "~/lib/icons";
-import { cn } from "~/lib/utils";
-import { filterRenderableFilesForSearch } from "./DiffPanel.logic";
-import { ComposerPickerMenuPopup } from "./chat/ComposerPickerMenuPopup";
-import { PickerPanelShell } from "./chat/PickerPanelShell";
-import { FileEntryIcon } from "./chat/FileEntryIcon";
-import { DiffStat } from "./chat/DiffStatLabel";
-import { IconButton } from "./ui/icon-button";
-import { Menu, MenuItem, MenuTrigger } from "./ui/menu";
-import {
-  resolveFileDiffPath,
-  splitRepoRelativePath,
-  summarizeFileDiffStats,
-} from "../lib/diffRendering";
-
-const DIFF_FILE_JUMP_ICON_SLOT_CLASS_NAME =
-  "flex size-4 shrink-0 items-center justify-center text-muted-foreground/60";
-
-const DIFF_FILE_JUMP_FILE_ICON_CLASS_NAME =
-  "size-3.5 text-[var(--color-text-foreground)] opacity-70 dark:opacity-80";
-
-const DiffFileJumpRow = memo(function DiffFileJumpRow(props: {
-  fileDiff: FileDiffMetadata;
-  resolvedTheme: "light" | "dark";
-  isSelected: boolean;
-  onSelect: (filePath: string) => void;
-}) {
-  const filePath = resolveFileDiffPath(props.fileDiff);
-  const { dir, name } = splitRepoRelativePath(filePath);
-  const stat = useMemo(() => summarizeFileDiffStats([props.fileDiff]), [props.fileDiff]);
-
-  return (
-    <MenuItem
-      className={cn(
-        "gap-2 px-2 py-1.5",
-        props.isSelected && "bg-[var(--color-background-button-secondary)]",
-      )}
-      onClick={() => {
-        props.onSelect(filePath);
-      }}
-    >
-      <span className={DIFF_FILE_JUMP_ICON_SLOT_CLASS_NAME}>
-        <FileEntryIcon
-          pathValue={filePath}
-          kind="file"
-          theme={props.resolvedTheme}
-          className={DIFF_FILE_JUMP_FILE_ICON_CLASS_NAME}
-        />
-      </span>
-      <div className="min-w-0 flex flex-1 items-center gap-2 overflow-hidden">
-        <div className="min-w-0 flex flex-1 items-baseline gap-1.5 overflow-hidden">
-          <span className="shrink-0 text-[11.5px] font-medium text-foreground/85">{name}</span>
-          {dir ? (
-            <span className="truncate text-[11px] text-muted-foreground/55">{dir}</span>
-          ) : null}
-        </div>
-        <DiffStat
-          additions={stat.additions}
-          deletions={stat.deletions}
-          className="shrink-0 text-[11px] tabular-nums"
-        />
-      </div>
-    </MenuItem>
-  );
-});
-
-export function DiffPanelFileJumpMenu(props: {
-  renderableFiles: ReadonlyArray<FileDiffMetadata>;
-  selectedFilePath: string | null;
-  resolvedTheme: "light" | "dark";
-  onSelectFile: (filePath: string) => void;
-}) {
-  const [fileSearchQuery, setFileSearchQuery] = useState("");
-
-  const filteredFiles = useMemo(
-    () => filterRenderableFilesForSearch(props.renderableFiles, fileSearchQuery),
-    [fileSearchQuery, props.renderableFiles],
-  );
-
-  return (
-    <Menu
-      onOpenChange={(open) => {
-        if (!open) {
-          setFileSearchQuery("");
-        }
-      }}
-    >
-      <MenuTrigger
-        render={
-          <IconButton
-            variant="ghost"
-            size="icon-xs"
-            className="text-muted-foreground hover:text-foreground"
-            label="Jump to file"
-            title="Jump to file"
-          >
-            <SearchIcon className="size-3.5" />
-          </IconButton>
-        }
-      />
-      <ComposerPickerMenuPopup
-        align="end"
-        side="bottom"
-        sideOffset={6}
-        className="w-[min(24rem,calc(100vw-2rem))] min-w-[18rem]"
-      >
-        <PickerPanelShell
-          searchPlaceholder="Jump to file"
-          query={fileSearchQuery}
-          onQueryChange={setFileSearchQuery}
-          stopSearchKeyPropagation
-          autoFocusSearch
-          widthClassName="w-full"
-          bleedParentPadding
-          listMaxHeightClassName="max-h-64"
-        >
-          {props.renderableFiles.length === 0 ? (
-            <p className="px-2.5 py-3 text-[11px] text-muted-foreground">No files in this diff.</p>
-          ) : filteredFiles.length === 0 ? (
-            <p className="px-2.5 py-3 text-[11px] text-muted-foreground">No matching files.</p>
-          ) : (
-            filteredFiles.map((fileDiff) => {
-              const filePath = resolveFileDiffPath(fileDiff);
-              return (
-                <DiffFileJumpRow
-                  key={fileDiff.cacheKey ?? filePath}
-                  fileDiff={fileDiff}
-                  resolvedTheme={props.resolvedTheme}
-                  isSelected={props.selectedFilePath === filePath}
-                  onSelect={(path) => {
-                    props.onSelectFile(path);
-                    setFileSearchQuery("");
-                  }}
-                />
-              );
-            })
-          )}
-        </PickerPanelShell>
-      </ComposerPickerMenuPopup>
-    </Menu>
-  );
-}
diff --git a/apps/web/src/components/DiffPanelFileList.tsx b/apps/web/src/components/DiffPanelFileList.tsx
index 085952def..63680bc41 100644
--- a/apps/web/src/components/DiffPanelFileList.tsx
+++ b/apps/web/src/components/DiffPanelFileList.tsx
@@ -99,7 +99,6 @@ function DiffFileCollapseChevron(props: { collapsed: boolean }) {
 
 const DiffPanelFileRow = memo(function DiffPanelFileRow(props: {
   fileDiff: FileDiffMetadata;
-  resolvedTheme: "light" | "dark";
   diffRenderMode: DiffRenderMode;
   diffWordWrap: boolean;
   workspaceRoot: string | null;
@@ -154,7 +153,6 @@ const DiffPanelFileRow = memo(function DiffPanelFileRow(props: {
     >
       <FileDiffCard
         fileDiff={props.fileDiff}
-        theme={props.resolvedTheme}
         diffStyle={props.diffRenderMode === "split" ? "split" : "unified"}
         overflow={props.diffWordWrap ? "wrap" : "scroll"}
         collapsed={props.isCollapsed}
@@ -191,7 +189,6 @@ function areCollapsedSetsEqual(left: ReadonlySet<string>, right: ReadonlySet<str
 export const DiffPanelFileList = memo(
   function DiffPanelFileList(props: {
     renderableFiles: ReadonlyArray<FileDiffMetadata>;
-    resolvedTheme: "light" | "dark";
     diffRenderMode: DiffRenderMode;
     diffWordWrap: boolean;
     workspaceRoot: string | null;
@@ -213,12 +210,10 @@ export const DiffPanelFileList = memo(
       <FileDiffSurface className="h-full min-h-0 overflow-auto px-2 pb-2">
         {props.renderableFiles.map((fileDiff) => {
           const fileKey = buildFileDiffRenderKey(fileDiff);
-          const themedFileKey = `${fileKey}:${props.resolvedTheme}`;
           return (
             <DiffPanelFileRow
-              key={themedFileKey}
+              key={fileKey}
               fileDiff={fileDiff}
-              resolvedTheme={props.resolvedTheme}
               diffRenderMode={props.diffRenderMode}
               diffWordWrap={props.diffWordWrap}
               workspaceRoot={props.workspaceRoot}
@@ -234,7 +229,6 @@ export const DiffPanelFileList = memo(
   (previous, next) => {
     return (
       previous.renderableFiles === next.renderableFiles &&
-      previous.resolvedTheme === next.resolvedTheme &&
       previous.diffRenderMode === next.diffRenderMode &&
       previous.diffWordWrap === next.diffWordWrap &&
       previous.workspaceRoot === next.workspaceRoot &&
diff --git a/apps/web/src/components/DiffPanelPatchViewport.tsx b/apps/web/src/components/DiffPanelPatchViewport.tsx
index 818045a38..ef1500bb5 100644
--- a/apps/web/src/components/DiffPanelPatchViewport.tsx
+++ b/apps/web/src/components/DiffPanelPatchViewport.tsx
@@ -17,7 +17,6 @@ export const DiffPanelPatchViewport = memo(
   function DiffPanelPatchViewport(props: {
     renderablePatch: RenderablePatch | null;
     renderableFiles: ReadonlyArray<FileDiffMetadata>;
-    resolvedTheme: "light" | "dark";
     diffRenderMode: DiffRenderMode;
     diffWordWrap: boolean;
     workspaceRoot: string | null;
@@ -76,7 +75,6 @@ export const DiffPanelPatchViewport = memo(
         <div className={viewportClassName}>
           <DiffPanelFileList
             renderableFiles={props.renderableFiles}
-            resolvedTheme={props.resolvedTheme}
             diffRenderMode={props.diffRenderMode}
             diffWordWrap={props.diffWordWrap}
             workspaceRoot={props.workspaceRoot}
@@ -110,7 +108,6 @@ export const DiffPanelPatchViewport = memo(
     return (
       previous.renderablePatch === next.renderablePatch &&
       previous.renderableFiles === next.renderableFiles &&
-      previous.resolvedTheme === next.resolvedTheme &&
       previous.diffRenderMode === next.diffRenderMode &&
       previous.diffWordWrap === next.diffWordWrap &&
       previous.workspaceRoot === next.workspaceRoot &&
diff --git a/apps/web/src/components/DiffPanelToolbar.tsx b/apps/web/src/components/DiffPanelToolbar.tsx
deleted file mode 100644
index e229c46d5..000000000
--- a/apps/web/src/components/DiffPanelToolbar.tsx
+++ /dev/null
@@ -1,515 +0,0 @@
-// FILE: DiffPanelToolbar.tsx
-// Purpose: Unified review toolbar for the diff panel — scope picker, stats, file jump,
-//          view options, git actions, and turn selection. Picker chrome matches the
-//          Environment panel (EnvironmentRow triggers + ComposerPickerMenuPopup menus).
-// Layer: Diff panel UI
-
-import type { FileDiffMetadata } from "@pierre/diffs/react";
-import type { ThreadId, TurnId } from "@t3tools/contracts";
-import { FaPlusMinus } from "react-icons/fa6";
-import { memo, useMemo, useState, type ReactNode } from "react";
-
-import GitActionsControl from "~/components/GitActionsControl";
-import {
-  ChangesIcon,
-  Columns2Icon,
-  CopyIcon,
-  DiffIcon,
-  EllipsisIcon,
-  FolderIcon,
-  FoldersIcon,
-  GitBranchIcon,
-  GitCommitIcon,
-  ListChecksIcon,
-  Rows3Icon,
-  XIcon,
-} from "~/lib/icons";
-import { cn } from "~/lib/utils";
-import type { TimestampFormat } from "~/appSettings";
-import type { TurnDiffSummary } from "~/types";
-import type { RepoDiffScope } from "~/repoDiffScopeStore";
-import { REPO_DIFF_SCOPE_LABELS } from "~/repoDiffScopeStore";
-import { formatShortTimestamp } from "~/timestampFormat";
-import {
-  DIFF_PANEL_PICKER_SCOPE_OPTIONS,
-  resolveDiffPanelPickerLabel,
-  resolveDiffPanelScopePickerValue,
-  type DiffPanelTurnScopeIntent,
-  type DiffPanelViewSource,
-} from "./DiffPanel.logic";
-import { DiffPanelFileJumpMenu } from "./DiffPanelFileJumpMenu";
-import { ComposerPickerMenuPopup } from "./chat/ComposerPickerMenuPopup";
-import { EnvironmentRowBody, EnvironmentRowChevron } from "./chat/environment/EnvironmentRow";
-import { DOCK_HEADER_ICON_BUTTON_CLASS, type DiffRenderMode } from "./chat/chatHeaderControls";
-import { DiffStat } from "./chat/DiffStatLabel";
-import { IconButton } from "./ui/icon-button";
-import {
-  Menu,
-  MenuCheckboxItem,
-  MenuGroup,
-  MenuGroupLabel,
-  MenuItem,
-  MenuRadioGroup,
-  MenuRadioItem,
-  MenuTrigger,
-} from "./ui/menu";
-const DIFF_PANEL_PICKER_ICON_CLASS_NAME = "size-3.5 shrink-0 text-[var(--color-text-foreground)]";
-
-/** Tighter than EnvironmentRow — dock header has no 16px icon gutter column. */
-const DIFF_PANEL_PICKER_TRIGGER_CLASS_NAME = cn(
-  "flex h-8 min-w-0 max-w-[min(38%,11rem)] cursor-pointer items-center gap-1.5 rounded-lg py-1 pl-1.5 pr-2 text-left",
-  "text-[length:var(--app-font-size-ui,14px)] font-normal text-[var(--color-text-foreground)]",
-  "outline-none transition-colors",
-  "hover:bg-[var(--color-background-elevated-secondary)]",
-  "focus-visible:bg-[var(--color-background-elevated-secondary)]",
-);
-
-const DIFF_PANEL_MENU_ICON_CLASS_NAME = "size-3.5 shrink-0 text-muted-foreground";
-const INITIAL_VISIBLE_TURN_COUNT = 5;
-const TURN_SHOW_MORE_INCREMENT = 20;
-
-const DIFF_PANEL_TOOLBAR_ICON_BUTTON_CLASS_NAME = "text-muted-foreground hover:text-foreground";
-
-function DiffPanelToolbarDivider() {
-  return <div aria-hidden className="mx-1 h-4 w-px shrink-0 bg-border/60" />;
-}
-
-interface DiffPanelToolbarProps {
-  activeCwd: string | null;
-  activeThreadId: ThreadId | null;
-  viewSource: DiffPanelViewSource;
-  turnScopeIntent: DiffPanelTurnScopeIntent;
-  scopeFileCounts: Partial<Record<RepoDiffScope, number>>;
-  activeStats: { additions: number; deletions: number } | null;
-  orderedTurnDiffSummaries: ReadonlyArray<TurnDiffSummary>;
-  inferredCheckpointTurnCountByTurnId: Record<string, number>;
-  selectedTurnId: TurnId | null;
-  timestampFormat: TimestampFormat;
-  renderableFiles: ReadonlyArray<FileDiffMetadata>;
-  selectedFilePath: string | null;
-  fileTreeOpen: boolean;
-  resolvedTheme: "light" | "dark";
-  diffRenderMode: DiffRenderMode;
-  diffWordWrap: boolean;
-  diffIgnoreWhitespace: boolean;
-  diffCopyText: string | null;
-  isDiffCopied: boolean;
-  allFilesCollapsed: boolean;
-  onSelectRepoScope: (scope: RepoDiffScope) => void;
-  onSelectAllTurns: () => void;
-  onSelectLastTurn: () => void;
-  onSelectTurn: (turnId: TurnId | null) => void;
-  onSelectFile: (filePath: string) => void;
-  onToggleFileTree: () => void;
-  onDiffRenderModeChange: (mode: DiffRenderMode) => void;
-  onDiffWordWrapChange: (enabled: boolean) => void;
-  onDiffIgnoreWhitespaceChange: (enabled: boolean) => void;
-  onCopyDiff: () => void;
-  onToggleCollapseAll: () => void;
-  scopePickerOpen?: boolean;
-  onScopePickerOpenChange?: (open: boolean) => void;
-  onClosePanel?: () => void;
-}
-
-function ScopeCountBadge(props: { count: number | undefined }) {
-  if (typeof props.count !== "number" || props.count <= 0) {
-    return null;
-  }
-  return (
-    <span className="rounded-full bg-muted px-1.5 text-[11px] font-medium text-muted-foreground tabular-nums">
-      {props.count}
-    </span>
-  );
-}
-
-function resolveScopeMenuIcon(scope: RepoDiffScope | "lastTurn") {
-  switch (scope) {
-    case "unstaged":
-      return <ChangesIcon className={DIFF_PANEL_MENU_ICON_CLASS_NAME} />;
-    case "staged":
-      return <ListChecksIcon className={DIFF_PANEL_MENU_ICON_CLASS_NAME} />;
-    case "branch":
-      return <GitBranchIcon className={DIFF_PANEL_MENU_ICON_CLASS_NAME} />;
-    case "lastTurn":
-      return (
-        <span className="inline-flex size-3.5 shrink-0 items-center justify-center text-muted-foreground">
-          <FaPlusMinus className="size-2.25" />
-        </span>
-      );
-    default:
-      return <DiffIcon className={DIFF_PANEL_MENU_ICON_CLASS_NAME} />;
-  }
-}
-
-function resolveTurnNumber(
-  summary: TurnDiffSummary,
-  inferredCheckpointTurnCountByTurnId: Record<string, number>,
-): string {
-  return String(
-    summary.checkpointTurnCount ?? inferredCheckpointTurnCountByTurnId[summary.turnId] ?? "?",
-  );
-}
-
-export const DiffPanelToolbar = memo(function DiffPanelToolbar(props: DiffPanelToolbarProps) {
-  const [visibleTurnCount, setVisibleTurnCount] = useState(INITIAL_VISIBLE_TURN_COUNT);
-  const scopePickerLabel = useMemo(
-    () => resolveDiffPanelPickerLabel(props.viewSource, props.turnScopeIntent),
-    [props.turnScopeIntent, props.viewSource],
-  );
-
-  const scopePickerIcon = useMemo((): ReactNode => {
-    if (props.viewSource.kind === "turn") {
-      return <FaPlusMinus className="size-2.5 text-[var(--color-text-foreground)]" />;
-    }
-    return <ChangesIcon className={DIFF_PANEL_PICKER_ICON_CLASS_NAME} />;
-  }, [props.viewSource.kind]);
-
-  const scopePickerCount =
-    props.viewSource.kind === "repo" ? props.scopeFileCounts[props.viewSource.scope] : undefined;
-
-  const selectedTurnSummary = useMemo(
-    () =>
-      props.selectedTurnId
-        ? props.orderedTurnDiffSummaries.find((summary) => summary.turnId === props.selectedTurnId)
-        : undefined,
-    [props.orderedTurnDiffSummaries, props.selectedTurnId],
-  );
-  const turnsMenuLabel =
-    props.viewSource.kind === "turn" && props.selectedTurnId === null
-      ? "All turns"
-      : props.viewSource.kind === "turn" && props.selectedTurnId
-        ? `Turn ${
-            selectedTurnSummary
-              ? resolveTurnNumber(selectedTurnSummary, props.inferredCheckpointTurnCountByTurnId)
-              : (props.inferredCheckpointTurnCountByTurnId[props.selectedTurnId] ?? "?")
-          }`
-        : "Turns";
-
-  const latestTurnId = props.orderedTurnDiffSummaries[0]?.turnId ?? null;
-  const scopePickerValue = resolveDiffPanelScopePickerValue({
-    viewSource: props.viewSource,
-    latestTurnId,
-    turnScopeIntent: props.turnScopeIntent,
-  });
-  const selectedTurnIndex = props.selectedTurnId
-    ? props.orderedTurnDiffSummaries.findIndex((summary) => summary.turnId === props.selectedTurnId)
-    : -1;
-  const effectiveVisibleTurnCount = Math.max(
-    visibleTurnCount,
-    selectedTurnIndex >= 0 ? selectedTurnIndex + 1 : 0,
-  );
-  const visibleTurnSummaries = props.orderedTurnDiffSummaries.slice(0, effectiveVisibleTurnCount);
-  const hiddenTurnCount = Math.max(
-    0,
-    props.orderedTurnDiffSummaries.length - visibleTurnSummaries.length,
-  );
-  const nextVisibleTurnCount = Math.min(
-    props.orderedTurnDiffSummaries.length,
-    effectiveVisibleTurnCount + TURN_SHOW_MORE_INCREMENT,
-  );
-
-  return (
-    <div className="flex h-full w-full min-w-0 items-center gap-2 [-webkit-app-region:no-drag]">
-      <Menu
-        {...(props.scopePickerOpen !== undefined ? { open: props.scopePickerOpen } : {})}
-        onOpenChange={props.onScopePickerOpenChange}
-      >
-        <MenuTrigger
-          render={
-            <button
-              type="button"
-              className={DIFF_PANEL_PICKER_TRIGGER_CLASS_NAME}
-              aria-label="Choose diff source"
-            />
-          }
-        >
-          <EnvironmentRowBody
-            compact
-            icon={scopePickerIcon}
-            label={<span className="truncate">{scopePickerLabel}</span>}
-            trailing={
-              <>
-                <ScopeCountBadge count={scopePickerCount} />
-                <EnvironmentRowChevron />
-              </>
-            }
-          />
-        </MenuTrigger>
-        <ComposerPickerMenuPopup
-          align="start"
-          side="bottom"
-          sideOffset={6}
-          className="w-56 min-w-56"
-        >
-          <MenuGroup>
-            <MenuGroupLabel>Diff source</MenuGroupLabel>
-            <MenuRadioGroup
-              value={scopePickerValue ?? ""}
-              onValueChange={(value) => {
-                if (value === "allTurns") {
-                  props.onSelectAllTurns();
-                  return;
-                }
-                if (value === "lastTurn") {
-                  props.onSelectLastTurn();
-                  return;
-                }
-                if (
-                  value === "workingTree" ||
-                  value === "unstaged" ||
-                  value === "staged" ||
-                  value === "branch"
-                ) {
-                  props.onSelectRepoScope(value);
-                }
-              }}
-            >
-              {DIFF_PANEL_PICKER_SCOPE_OPTIONS.map((scope) => (
-                <MenuRadioItem key={scope} value={scope}>
-                  {resolveScopeMenuIcon(scope)}
-                  <span className="min-w-0 flex-1 truncate">{REPO_DIFF_SCOPE_LABELS[scope]}</span>
-                  <ScopeCountBadge count={props.scopeFileCounts[scope]} />
-                </MenuRadioItem>
-              ))}
-              <MenuRadioItem value="allTurns">
-                <GitCommitIcon className={DIFF_PANEL_MENU_ICON_CLASS_NAME} />
-                <span className="min-w-0 flex-1 truncate">All turns</span>
-              </MenuRadioItem>
-              <MenuRadioItem value="lastTurn">
-                {resolveScopeMenuIcon("lastTurn")}
-                <span className="min-w-0 flex-1 truncate">Last turn</span>
-              </MenuRadioItem>
-            </MenuRadioGroup>
-          </MenuGroup>
-        </ComposerPickerMenuPopup>
-      </Menu>
-
-      {props.activeStats ? (
-        <DiffStat
-          additions={props.activeStats.additions}
-          deletions={props.activeStats.deletions}
-          className="shrink-0 text-[11px] font-medium"
-        />
-      ) : null}
-
-      <div className="ml-auto flex min-w-0 items-center gap-1.5">
-        <div className="flex items-center gap-1">
-          <Menu>
-            <MenuTrigger
-              render={
-                <IconButton
-                  variant="ghost"
-                  size="icon-xs"
-                  className={DIFF_PANEL_TOOLBAR_ICON_BUTTON_CLASS_NAME}
-                  label="Diff view options"
-                  title="Diff view options"
-                >
-                  <EllipsisIcon className="size-3.5" />
-                </IconButton>
-              }
-            />
-            <ComposerPickerMenuPopup
-              align="end"
-              side="bottom"
-              sideOffset={6}
-              className="w-60 min-w-60"
-            >
-              <MenuGroup>
-                <MenuGroupLabel>View</MenuGroupLabel>
-                <div
-                  className="mx-2 mb-1 grid grid-cols-2 rounded-lg bg-[var(--color-background-elevated-secondary)] p-0.5"
-                  role="radiogroup"
-                  aria-label="Diff view"
-                >
-                  {(["stacked", "split"] as const).map((mode) => {
-                    const selected = props.diffRenderMode === mode;
-                    return (
-                      <button
-                        key={mode}
-                        type="button"
-                        role="radio"
-                        aria-checked={selected}
-                        className={cn(
-                          "flex h-7 min-w-0 cursor-pointer items-center justify-center gap-1.5 rounded-md px-2 text-[11px] transition-colors",
-                          selected
-                            ? "bg-[var(--color-background-button-secondary)] text-[var(--color-text-foreground)]"
-                            : "text-muted-foreground hover:text-foreground",
-                        )}
-                        onClick={() => props.onDiffRenderModeChange(mode)}
-                      >
-                        {mode === "stacked" ? (
-                          <Rows3Icon className="size-3.5 shrink-0" />
-                        ) : (
-                          <Columns2Icon className="size-3.5 shrink-0" />
-                        )}
-                        <span className="truncate">{mode === "stacked" ? "Stacked" : "Split"}</span>
-                      </button>
-                    );
-                  })}
-                </div>
-                <MenuCheckboxItem
-                  checked={props.diffIgnoreWhitespace}
-                  variant="switch"
-                  onCheckedChange={(checked) => {
-                    props.onDiffIgnoreWhitespaceChange(checked === true);
-                  }}
-                >
-                  Ignore whitespace-only changes
-                </MenuCheckboxItem>
-                <MenuCheckboxItem
-                  checked={props.diffWordWrap}
-                  variant="switch"
-                  onCheckedChange={(checked) => {
-                    props.onDiffWordWrapChange(checked === true);
-                  }}
-                >
-                  Wrap long lines
-                </MenuCheckboxItem>
-                {props.diffCopyText ? (
-                  <MenuItem
-                    onClick={() => {
-                      props.onCopyDiff();
-                    }}
-                  >
-                    <CopyIcon className={DIFF_PANEL_MENU_ICON_CLASS_NAME} />
-                    <span>{props.isDiffCopied ? "Copied diff" : "Copy diff"}</span>
-                  </MenuItem>
-                ) : null}
-                {props.renderableFiles.length > 0 ? (
-                  <MenuItem
-                    onClick={() => {
-                      props.onToggleCollapseAll();
-                    }}
-                  >
-                    <FolderIcon className={DIFF_PANEL_MENU_ICON_CLASS_NAME} />
-                    <span>
-                      {props.allFilesCollapsed ? "Expand all files" : "Collapse all files"}
-                    </span>
-                  </MenuItem>
-                ) : null}
-              </MenuGroup>
-            </ComposerPickerMenuPopup>
-          </Menu>
-
-          <DiffPanelFileJumpMenu
-            renderableFiles={props.renderableFiles}
-            selectedFilePath={props.selectedFilePath}
-            resolvedTheme={props.resolvedTheme}
-            onSelectFile={props.onSelectFile}
-          />
-
-          <IconButton
-            variant="ghost"
-            size="icon-xs"
-            className={cn(
-              DIFF_PANEL_TOOLBAR_ICON_BUTTON_CLASS_NAME,
-              props.fileTreeOpen &&
-                "bg-[var(--color-background-button-secondary)] text-foreground hover:text-foreground",
-            )}
-            aria-pressed={props.fileTreeOpen}
-            label={props.fileTreeOpen ? "Hide file tree" : "Show file tree"}
-            title={props.fileTreeOpen ? "Hide file tree" : "Show file tree"}
-            onClick={props.onToggleFileTree}
-          >
-            <FoldersIcon className="size-3.5" />
-          </IconButton>
-        </div>
-
-        <DiffPanelToolbarDivider />
-
-        {props.activeCwd ? (
-          <GitActionsControl
-            gitCwd={props.activeCwd}
-            activeThreadId={props.activeThreadId}
-            hideQuickActionLabel
-          />
-        ) : null}
-
-        <Menu>
-          <MenuTrigger
-            render={
-              <button
-                type="button"
-                className={cn(DIFF_PANEL_PICKER_TRIGGER_CLASS_NAME, "max-w-[min(32%,9.5rem)]")}
-                aria-label="Choose turn diff"
-              />
-            }
-          >
-            <EnvironmentRowBody
-              compact
-              icon={<FaPlusMinus className="size-2.5 text-[var(--color-text-foreground)]" />}
-              label={<span className="truncate">{turnsMenuLabel}</span>}
-              trailing={<EnvironmentRowChevron />}
-            />
-          </MenuTrigger>
-          <ComposerPickerMenuPopup
-            align="end"
-            side="bottom"
-            sideOffset={6}
-            className="w-60 min-w-60"
-          >
-            <MenuGroup>
-              <MenuGroupLabel>Turns</MenuGroupLabel>
-              <MenuRadioGroup
-                value={props.selectedTurnId ?? "all-turns"}
-                onValueChange={(value) => {
-                  if (value === "all-turns") {
-                    props.onSelectTurn(null);
-                    return;
-                  }
-                  props.onSelectTurn(value as TurnId);
-                }}
-              >
-                <MenuRadioItem value="all-turns">
-                  <GitCommitIcon className={DIFF_PANEL_MENU_ICON_CLASS_NAME} />
-                  <span className="min-w-0 flex-1 truncate">All turns</span>
-                </MenuRadioItem>
-                {visibleTurnSummaries.map((summary) => (
-                  <MenuRadioItem key={summary.turnId} value={summary.turnId}>
-                    <FaPlusMinus className="size-2.5 shrink-0 text-muted-foreground" />
-                    <span className="min-w-0 flex-1 truncate">
-                      Turn {resolveTurnNumber(summary, props.inferredCheckpointTurnCountByTurnId)}
-                    </span>
-                    <span className="shrink-0 text-[11px] text-muted-foreground tabular-nums">
-                      {formatShortTimestamp(summary.completedAt, props.timestampFormat)}
-                    </span>
-                  </MenuRadioItem>
-                ))}
-              </MenuRadioGroup>
-              {hiddenTurnCount > 0 ? (
-                <button
-                  type="button"
-                  className={cn(
-                    "mx-1 mt-1 flex h-8 w-[calc(100%-0.5rem)] cursor-pointer items-center justify-center rounded-md px-2 text-[11px]",
-                    "text-muted-foreground transition-colors hover:bg-[var(--color-background-elevated-secondary)] hover:text-foreground",
-                  )}
-                  onClick={() => setVisibleTurnCount(nextVisibleTurnCount)}
-                >
-                  Show {Math.min(TURN_SHOW_MORE_INCREMENT, hiddenTurnCount)} more
-                </button>
-              ) : null}
-            </MenuGroup>
-          </ComposerPickerMenuPopup>
-        </Menu>
-
-        {props.onClosePanel ? (
-          <>
-            <DiffPanelToolbarDivider />
-            <IconButton
-              variant="chrome"
-              size="icon-xs"
-              label="Close file view"
-              className={DOCK_HEADER_ICON_BUTTON_CLASS}
-              onClick={(event) => {
-                event.stopPropagation();
-                props.onClosePanel?.();
-              }}
-            >
-              <XIcon className="size-3.5" />
-            </IconButton>
-          </>
-        ) : null}
-      </div>
-    </div>
-  );
-});
diff --git a/apps/web/src/components/DiffWorkerPoolProvider.tsx b/apps/web/src/components/DiffWorkerPoolProvider.tsx
index 5babd4248..554fdcdc4 100644
--- a/apps/web/src/components/DiffWorkerPoolProvider.tsx
+++ b/apps/web/src/components/DiffWorkerPoolProvider.tsx
@@ -1,8 +1,7 @@
 import { WorkerPoolContextProvider, useWorkerPool } from "@pierre/diffs/react";
 import DiffsWorker from "@pierre/diffs/worker/worker.js?worker";
 import { useEffect, useMemo, type ReactNode } from "react";
-import { useTheme } from "../hooks/useTheme";
-import { resolveDiffThemeName, type DiffThemeName } from "../lib/diffRendering";
+import { DIFF_THEME_NAME, type DiffThemeName } from "../lib/diffRendering";
 
 function DiffWorkerThemeSync({ themeName }: { themeName: DiffThemeName }) {
   const workerPool = useWorkerPool();
@@ -29,8 +28,7 @@ function DiffWorkerThemeSync({ themeName }: { themeName: DiffThemeName }) {
 }
 
 export function DiffWorkerPoolProvider({ children }: { children?: ReactNode }) {
-  const { resolvedTheme } = useTheme();
-  const diffThemeName = resolveDiffThemeName(resolvedTheme);
+  const diffThemeName = DIFF_THEME_NAME;
   const workerPoolSize = useMemo(() => {
     const cores =
       typeof navigator === "undefined" ? 4 : Math.max(1, navigator.hardwareConcurrency || 4);
diff --git a/apps/web/src/components/EditorWorkspaceView.test.tsx b/apps/web/src/components/EditorWorkspaceView.test.tsx
deleted file mode 100644
index 0d828e7f6..000000000
--- a/apps/web/src/components/EditorWorkspaceView.test.tsx
+++ /dev/null
@@ -1,488 +0,0 @@
-// FILE: EditorWorkspaceView.test.tsx
-// Purpose: Guards the editor-style shell layout around file/diff sidebars.
-// Layer: Component rendering tests
-// Depends on: EditorWorkspaceView and React server rendering.
-
-import type { FileDiffMetadata } from "@pierre/diffs/react";
-import { ProjectId } from "@t3tools/contracts";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it, vi } from "vitest";
-
-import { EditorWorkspaceView } from "./EditorWorkspaceView";
-import { WorkspaceSearchSidebar } from "./chat/workspaceExplorer";
-import { projectQueryKeys } from "../lib/projectReactQuery";
-import { SidebarProvider } from "./ui/sidebar";
-
-vi.mock("../hooks/useTheme", () => ({
-  useTheme: () => ({ resolvedTheme: "dark" }),
-}));
-
-vi.mock("~/hooks/useDesktopTopBarGutter", () => ({
-  useDesktopTopBarTrafficLightGutterClassName: () => "traffic-light-gutter",
-  useDesktopTopBarWindowControlsGutterClassName: () => "windows-caption-gutter",
-}));
-
-function createFileDiff(path: string, additions: number, deletions: number): FileDiffMetadata {
-  return {
-    cacheKey: path,
-    name: path,
-    prevName: path,
-    hunks: [
-      {
-        additionLines: additions,
-        deletionLines: deletions,
-      },
-    ],
-  } as FileDiffMetadata;
-}
-
-describe("EditorWorkspaceView", () => {
-  it("renders a project switcher arrow beside the project title", () => {
-    const markup = renderToStaticMarkup(
-      <EditorWorkspaceView
-        workspaceRoot="/Users/tester/project"
-        projectName="project"
-        currentProjectId={ProjectId.makeUnsafe("project-current")}
-        projectOptions={[{ id: ProjectId.makeUnsafe("project-current"), name: "project" }]}
-        selectedFilePath={null}
-        expandedDirectories={new Set()}
-        centerMode="diff"
-        diffFiles={[]}
-        selectedDiffFilePath={null}
-        diffPanel={<div>Diff panel</div>}
-        chatPanel={<div>Chat panel</div>}
-        onSelectFile={vi.fn()}
-        onSelectDiffFile={vi.fn()}
-        onToggleDirectory={vi.fn()}
-        onCenterModeChange={vi.fn()}
-        onExitEditorView={vi.fn()}
-        onSelectProject={vi.fn()}
-      />,
-    );
-
-    expect(markup).toContain('aria-label="Switch project"');
-    expect(markup).toContain("project");
-  });
-
-  it("reserves a top-bar gutter for Windows caption controls", () => {
-    const markup = renderToStaticMarkup(
-      <EditorWorkspaceView
-        workspaceRoot="/Users/tester/project"
-        projectName="project"
-        selectedFilePath={null}
-        expandedDirectories={new Set()}
-        centerMode="diff"
-        diffFiles={[]}
-        selectedDiffFilePath={null}
-        diffPanel={<div>Diff panel</div>}
-        chatPanel={<div>Chat panel</div>}
-        onSelectFile={vi.fn()}
-        onSelectDiffFile={vi.fn()}
-        onToggleDirectory={vi.fn()}
-        onCenterModeChange={vi.fn()}
-        onExitEditorView={vi.fn()}
-      />,
-    );
-
-    expect(markup).toContain("windows-caption-gutter");
-  });
-
-  it("renders diff options beside the changed-file line totals", () => {
-    const markup = renderToStaticMarkup(
-      <SidebarProvider>
-        <EditorWorkspaceView
-          workspaceRoot="/Users/tester/project"
-          projectName="project"
-          selectedFilePath={null}
-          expandedDirectories={new Set()}
-          centerMode="diff"
-          diffFiles={[createFileDiff("apps/web/src/components/EditorWorkspaceView.tsx", 3, 1)]}
-          selectedDiffFilePath={null}
-          diffOptionsControl={
-            <button type="button" aria-label="Diff options">
-              Options
-            </button>
-          }
-          diffPanel={<div>Diff panel</div>}
-          chatPanel={<div>Chat panel</div>}
-          onSelectFile={vi.fn()}
-          onSelectDiffFile={vi.fn()}
-          onToggleDirectory={vi.fn()}
-          onCenterModeChange={vi.fn()}
-          onExitEditorView={vi.fn()}
-        />
-      </SidebarProvider>,
-    );
-
-    expect(markup).toContain("Changed files");
-    expect(markup).toContain("+3");
-    expect(markup).toContain("-1");
-    expect(markup).toContain('aria-label="Diff options"');
-
-    // Options sit in the "Changed files" header row; the +/- totals render in
-    // the stats row below it.
-    const changedFilesIndex = markup.indexOf("Changed files");
-    const optionsIndex = markup.indexOf('aria-label="Diff options"', changedFilesIndex);
-    const additionsIndex = markup.indexOf(">+3<", optionsIndex);
-    const deletionsIndex = markup.indexOf(">-1<", additionsIndex);
-
-    expect(optionsIndex).toBeGreaterThan(changedFilesIndex);
-    expect(additionsIndex).toBeGreaterThan(optionsIndex);
-    expect(deletionsIndex).toBeGreaterThan(additionsIndex);
-  });
-
-  it("shows skeleton rows instead of the empty message while the diff loads", () => {
-    const markup = renderToStaticMarkup(
-      <SidebarProvider>
-        <EditorWorkspaceView
-          workspaceRoot="/Users/tester/project"
-          projectName="project"
-          selectedFilePath={null}
-          expandedDirectories={new Set()}
-          centerMode="diff"
-          diffFiles={[]}
-          diffFilesLoading={true}
-          selectedDiffFilePath={null}
-          diffPanel={<div>Diff panel</div>}
-          chatPanel={<div>Chat panel</div>}
-          onSelectFile={vi.fn()}
-          onSelectDiffFile={vi.fn()}
-          onToggleDirectory={vi.fn()}
-          onCenterModeChange={vi.fn()}
-          onExitEditorView={vi.fn()}
-        />
-      </SidebarProvider>,
-    );
-
-    expect(markup).toContain('aria-label="Loading changed files..."');
-    expect(markup).not.toContain("No files in this diff.");
-  });
-
-  it("keeps the diff panel mounted but hidden while browsing files", () => {
-    const queryClient = new QueryClient();
-    const markup = renderToStaticMarkup(
-      <QueryClientProvider client={queryClient}>
-        <SidebarProvider>
-          <EditorWorkspaceView
-            workspaceRoot={null}
-            projectName="project"
-            selectedFilePath={null}
-            expandedDirectories={new Set()}
-            centerMode="file"
-            diffFiles={[]}
-            selectedDiffFilePath={null}
-            diffPanel={<div>Diff panel body</div>}
-            chatPanel={<div>Chat panel</div>}
-            onSelectFile={vi.fn()}
-            onSelectDiffFile={vi.fn()}
-            onToggleDirectory={vi.fn()}
-            onCenterModeChange={vi.fn()}
-            onExitEditorView={vi.fn()}
-          />
-        </SidebarProvider>
-      </QueryClientProvider>,
-    );
-
-    expect(markup).toContain("Diff panel body");
-    const diffWrapperIndex = markup.indexOf("Diff panel body");
-    const hiddenIndex = markup.lastIndexOf("hidden", diffWrapperIndex);
-    expect(hiddenIndex).toBeGreaterThan(-1);
-  });
-
-  it("renders image files through the local image preview instead of text preview", () => {
-    const queryClient = new QueryClient();
-    const markup = renderToStaticMarkup(
-      <QueryClientProvider client={queryClient}>
-        <EditorWorkspaceView
-          workspaceRoot="/Users/tester/project"
-          projectName="project"
-          selectedFilePath="assets/screenshot.png"
-          expandedDirectories={new Set()}
-          centerMode="file"
-          diffFiles={[]}
-          selectedDiffFilePath={null}
-          diffPanel={<div>Diff panel</div>}
-          chatPanel={<div>Chat panel</div>}
-          onSelectFile={vi.fn()}
-          onSelectDiffFile={vi.fn()}
-          onToggleDirectory={vi.fn()}
-          onCenterModeChange={vi.fn()}
-          onExitEditorView={vi.fn()}
-        />
-      </QueryClientProvider>,
-    );
-
-    expect(markup).toContain("local-image-preview");
-    expect(markup).toContain(
-      "/api/local-image?path=assets%2Fscreenshot.png&amp;cwd=%2FUsers%2Ftester%2Fproject",
-    );
-    expect(markup).not.toContain("editor-file-viewer__plain");
-    expect(markup).not.toContain("editor-file-viewer__highlight");
-  });
-
-  it("routes PDFs through the shared preview surface instead of a bespoke viewer", () => {
-    const queryClient = new QueryClient();
-    const markup = renderToStaticMarkup(
-      <QueryClientProvider client={queryClient}>
-        <EditorWorkspaceView
-          workspaceRoot="/Users/tester/project"
-          projectName="project"
-          selectedFilePath="docs/spec.pdf"
-          expandedDirectories={new Set()}
-          centerMode="file"
-          diffFiles={[]}
-          selectedDiffFilePath={null}
-          diffPanel={<div>Diff panel</div>}
-          chatPanel={<div>Chat panel</div>}
-          onSelectFile={vi.fn()}
-          onSelectDiffFile={vi.fn()}
-          onToggleDirectory={vi.fn()}
-          onCenterModeChange={vi.fn()}
-          onExitEditorView={vi.fn()}
-        />
-      </QueryClientProvider>,
-    );
-
-    // PDFs have no in-app viewer: they take the ordinary file-read path, whose
-    // shared header (breadcrumb + "Open in editor") stays available so the file
-    // can be handed to an external app once the read reports it as binary.
-    expect(markup).toContain('title="docs/spec.pdf"');
-    expect(markup).toContain('aria-label="Open in editor"');
-    expect(markup).not.toContain("<iframe");
-    expect(markup).not.toContain("Loading PDF");
-  });
-
-  it("keeps scratch-workspace PDFs on the shared preview surface without a workspace", () => {
-    const queryClient = new QueryClient();
-    const markup = renderToStaticMarkup(
-      <QueryClientProvider client={queryClient}>
-        <EditorWorkspaceView
-          workspaceRoot={null}
-          projectName="project"
-          selectedFilePath="/tmp/chitauri-codex-workspaces/thread-1/report.pdf"
-          expandedDirectories={new Set()}
-          centerMode="file"
-          diffFiles={[]}
-          selectedDiffFilePath={null}
-          diffPanel={<div>Diff panel</div>}
-          chatPanel={<div>Chat panel</div>}
-          onSelectFile={vi.fn()}
-          onSelectDiffFile={vi.fn()}
-          onToggleDirectory={vi.fn()}
-          onCenterModeChange={vi.fn()}
-          onExitEditorView={vi.fn()}
-        />
-      </QueryClientProvider>,
-    );
-
-    // The absolute path still resolves through the local-file preview grant, so
-    // the pane waits on the grant rather than dead-ending on "no workspace".
-    expect(markup).toContain('aria-label="Loading file..."');
-    expect(markup).not.toContain("No workspace is attached");
-    expect(markup).not.toContain("Loading PDF");
-  });
-
-  it("renders scratch-workspace image previews without an attached workspace", () => {
-    const queryClient = new QueryClient();
-    const markup = renderToStaticMarkup(
-      <QueryClientProvider client={queryClient}>
-        <EditorWorkspaceView
-          workspaceRoot={null}
-          projectName="project"
-          selectedFilePath="/tmp/chitauri-codex-workspaces/thread-1/shot.png"
-          expandedDirectories={new Set()}
-          centerMode="file"
-          diffFiles={[]}
-          selectedDiffFilePath={null}
-          diffPanel={<div>Diff panel</div>}
-          chatPanel={<div>Chat panel</div>}
-          onSelectFile={vi.fn()}
-          onSelectDiffFile={vi.fn()}
-          onToggleDirectory={vi.fn()}
-          onCenterModeChange={vi.fn()}
-          onExitEditorView={vi.fn()}
-        />
-      </QueryClientProvider>,
-    );
-
-    expect(markup).toContain("local-image-preview");
-    expect(markup).toContain(
-      "/api/local-image?path=%2Ftmp%2Fchitauri-codex-workspaces%2Fthread-1%2Fshot.png",
-    );
-    expect(markup).not.toContain("No workspace is attached");
-    expect(markup).not.toContain("cwd=");
-  });
-
-  it("renders absolute local image previews without an attached workspace", () => {
-    const queryClient = new QueryClient();
-    const markup = renderToStaticMarkup(
-      <QueryClientProvider client={queryClient}>
-        <EditorWorkspaceView
-          workspaceRoot={null}
-          projectName="project"
-          selectedFilePath="/Users/tester/Downloads/shot.png"
-          expandedDirectories={new Set()}
-          centerMode="file"
-          diffFiles={[]}
-          selectedDiffFilePath={null}
-          diffPanel={<div>Diff panel</div>}
-          chatPanel={<div>Chat panel</div>}
-          onSelectFile={vi.fn()}
-          onSelectDiffFile={vi.fn()}
-          onToggleDirectory={vi.fn()}
-          onCenterModeChange={vi.fn()}
-          onExitEditorView={vi.fn()}
-        />
-      </QueryClientProvider>,
-    );
-
-    expect(markup).toContain('aria-label="Loading file..."');
-    expect(markup).not.toContain("/api/local-image?path=%2FUsers%2Ftester%2FDownloads%2Fshot.png");
-    expect(markup).not.toContain("No workspace is attached");
-    expect(markup).not.toContain("cwd=");
-  });
-
-  it("shows the file-preview path breadcrumb and overflow menu for Markdown files", () => {
-    const queryClient = new QueryClient();
-    const markup = renderToStaticMarkup(
-      <QueryClientProvider client={queryClient}>
-        <EditorWorkspaceView
-          workspaceRoot="/Users/tester/project"
-          projectName="project"
-          selectedFilePath="docs/README.md"
-          expandedDirectories={new Set()}
-          centerMode="file"
-          diffFiles={[]}
-          selectedDiffFilePath={null}
-          diffPanel={<div>Diff panel</div>}
-          chatPanel={<div>Chat panel</div>}
-          onSelectFile={vi.fn()}
-          onSelectDiffFile={vi.fn()}
-          onToggleDirectory={vi.fn()}
-          onCenterModeChange={vi.fn()}
-          onExitEditorView={vi.fn()}
-        />
-      </QueryClientProvider>,
-    );
-
-    // The header renders a path breadcrumb (project › …dirs › file).
-    expect(markup).toContain('aria-label="File path"');
-    expect(markup).toContain("README.md");
-    // Markdown files surface their source/rendered toggle in the header next
-    // to the Open-in picker, whose editor menu trigger is always rendered.
-    expect(markup).toContain('aria-label="Markdown view"');
-    expect(markup).toContain('aria-label="Editor options"');
-  });
-
-  it("renders a search item in the activity bar below files and diff", () => {
-    const queryClient = new QueryClient();
-    const markup = renderToStaticMarkup(
-      <QueryClientProvider client={queryClient}>
-        <SidebarProvider>
-          <EditorWorkspaceView
-            workspaceRoot="/Users/tester/project"
-            projectName="project"
-            selectedFilePath={null}
-            expandedDirectories={new Set()}
-            centerMode="file"
-            diffFiles={[]}
-            selectedDiffFilePath={null}
-            diffPanel={<div>Diff panel</div>}
-            chatPanel={<div>Chat panel</div>}
-            onSelectFile={vi.fn()}
-            onSelectDiffFile={vi.fn()}
-            onToggleDirectory={vi.fn()}
-            onCenterModeChange={vi.fn()}
-            onExitEditorView={vi.fn()}
-          />
-        </SidebarProvider>
-      </QueryClientProvider>,
-    );
-
-    const filesIndex = markup.indexOf('aria-label="Hide files sidebar"');
-    const diffIndex = markup.indexOf('aria-label="Diff"');
-    const searchIndex = markup.indexOf('aria-label="Search files"');
-    expect(filesIndex).toBeGreaterThan(-1);
-    expect(diffIndex).toBeGreaterThan(filesIndex);
-    expect(searchIndex).toBeGreaterThan(diffIndex);
-  });
-
-  it("prompts for a query in the search sidebar before searching", () => {
-    const queryClient = new QueryClient();
-    const markup = renderToStaticMarkup(
-      <QueryClientProvider client={queryClient}>
-        <WorkspaceSearchSidebar
-          workspaceRoot="/Users/tester/project"
-          query=""
-          onQueryChange={vi.fn()}
-          selectedFilePath={null}
-          onSelectFile={vi.fn()}
-          onReferenceInChat={undefined}
-        />
-      </QueryClientProvider>,
-    );
-
-    expect(markup).toContain('placeholder="Search files..."');
-    expect(markup).toContain("Search files by name or path.");
-  });
-
-  it("lists only matching files from the workspace search results", () => {
-    const queryClient = new QueryClient();
-    queryClient.setQueryData(
-      projectQueryKeys.searchEntries("/Users/tester/project", "editor", 80, "file"),
-      {
-        entries: [{ path: "apps/web/src/components/EditorWorkspaceView.tsx", kind: "file" }],
-        truncated: false,
-      },
-    );
-    const markup = renderToStaticMarkup(
-      <QueryClientProvider client={queryClient}>
-        <WorkspaceSearchSidebar
-          workspaceRoot="/Users/tester/project"
-          query="editor"
-          onQueryChange={vi.fn()}
-          selectedFilePath="apps/web/src/components/EditorWorkspaceView.tsx"
-          onSelectFile={vi.fn()}
-          onReferenceInChat={undefined}
-        />
-      </QueryClientProvider>,
-    );
-
-    expect(markup).toContain('title="apps/web/src/components/EditorWorkspaceView.tsx"');
-    expect(markup).toContain("EditorWorkspaceView.tsx");
-    expect(markup).not.toContain("No matching files.");
-  });
-
-  it("shows pointer cursor on activity buttons that switch files and diff", () => {
-    const queryClient = new QueryClient();
-    const markup = renderToStaticMarkup(
-      <QueryClientProvider client={queryClient}>
-        <SidebarProvider>
-          <EditorWorkspaceView
-            workspaceRoot="/Users/tester/project"
-            projectName="project"
-            selectedFilePath={null}
-            expandedDirectories={new Set()}
-            centerMode="file"
-            diffFiles={[]}
-            selectedDiffFilePath={null}
-            diffPanel={<div>Diff panel</div>}
-            chatPanel={<div>Chat panel</div>}
-            onSelectFile={vi.fn()}
-            onSelectDiffFile={vi.fn()}
-            onToggleDirectory={vi.fn()}
-            onCenterModeChange={vi.fn()}
-            onExitEditorView={vi.fn()}
-          />
-        </SidebarProvider>
-      </QueryClientProvider>,
-    );
-
-    // Files is the active mode with a visible sidebar, so its button reads as
-    // a sidebar collapse toggle; Diff stays a plain mode switch.
-    expect(markup).toContain('aria-label="Hide files sidebar"');
-    expect(markup).toContain('aria-label="Diff"');
-    expect(markup.match(/cursor-pointer/g)?.length).toBeGreaterThanOrEqual(2);
-  });
-});
diff --git a/apps/web/src/components/EditorWorkspaceView.tsx b/apps/web/src/components/EditorWorkspaceView.tsx
deleted file mode 100644
index 990121bfc..000000000
--- a/apps/web/src/components/EditorWorkspaceView.tsx
+++ /dev/null
@@ -1,700 +0,0 @@
-// FILE: EditorWorkspaceView.tsx
-// Purpose: Read-only editor-style thread surface with file explorer, workspace
-//          file search, file/diff preview, and chat.
-// Layer: Chat route presentation
-
-import type { ProjectId } from "@t3tools/contracts";
-import type { FileDiffMetadata } from "@pierre/diffs/react";
-import {
-  type CSSProperties,
-  type KeyboardEvent as ReactKeyboardEvent,
-  type PointerEvent as ReactPointerEvent,
-  type ReactNode,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-
-import {
-  ChangesIcon,
-  ChatBubbleIcon,
-  ChevronDownIcon,
-  DiffIcon,
-  FoldersIcon,
-  PanelRightCloseIcon,
-  SearchIcon,
-} from "~/lib/icons";
-import {
-  useDesktopTopBarTrafficLightGutterClassName,
-  useDesktopTopBarWindowControlsGutterClassName,
-} from "~/hooks/useDesktopTopBarGutter";
-import {
-  buildFileDiffRenderKey,
-  resolveFileDiffPath,
-  splitRepoRelativePath,
-  summarizeFileDiffStats,
-} from "~/lib/diffRendering";
-import { showFileReferenceContextMenu } from "~/lib/fileReferenceContextMenu";
-import type { ChatFileReference } from "~/lib/chatReferences";
-import type { FileCommentSelection } from "~/lib/fileComments";
-import { cn } from "~/lib/utils";
-import { useTheme } from "~/hooks/useTheme";
-import { Skeleton } from "./ui/skeleton";
-import {
-  ChatHeaderButton,
-  ChatHeaderIconButton,
-  CHAT_SURFACE_HEADER_DIVIDER_CLASS_NAME,
-  CHAT_SURFACE_HEADER_HEIGHT_CLASS,
-} from "./chat/chatHeaderControls";
-import { EXPLORER_ROW_PROPS, useExplorerListNavigation } from "./chat/explorerListNavigation";
-import { FileEntryIcon } from "./chat/FileEntryIcon";
-import { fileRowClassName } from "./chat/fileRowStyles";
-import { DiffStat } from "./chat/DiffStatLabel";
-import { PanelStateMessage } from "./chat/PanelStateMessage";
-import {
-  ExplorerActivityBarButton,
-  setFileReferenceDragData,
-  WorkspaceFilesSidebar,
-  WorkspaceSearchSidebar,
-} from "./chat/workspaceExplorer";
-import { ProjectMenuPicker, type ProjectMenuPickerOption } from "./ProjectMenuPicker";
-import { WorkspaceFilePreview } from "./WorkspaceFilePreview";
-
-type EditorCenterMode = "file" | "diff";
-type EditorActivityBarItem = EditorCenterMode | "search";
-
-const EDITOR_CHAT_PANE_STORAGE_KEY = "chitauri.editor.chatPaneWidth";
-const EDITOR_SIDEBAR_VISIBLE_STORAGE_KEY = "chitauri.editor.sidebarVisible";
-const EDITOR_CHAT_PANE_VISIBLE_STORAGE_KEY = "chitauri.editor.chatPaneVisible";
-const EDITOR_CHAT_PANE_DEFAULT_WIDTH = 384;
-const EDITOR_CHAT_PANE_MIN_WIDTH = 320;
-const EDITOR_CHAT_PANE_MAX_WIDTH = 600;
-const EDITOR_CHAT_PANE_KEYBOARD_STEP = 24;
-
-interface EditorWorkspaceViewProps {
-  workspaceRoot: string | null;
-  projectName: string | null;
-  currentProjectId?: ProjectId | null;
-  projectOptions?: ReadonlyArray<ProjectMenuPickerOption>;
-  selectedFilePath: string | null;
-  expandedDirectories: ReadonlySet<string>;
-  centerMode: EditorCenterMode;
-  diffFiles: ReadonlyArray<FileDiffMetadata>;
-  diffFilesLoading?: boolean;
-  selectedDiffFilePath: string | null;
-  diffOptionsControl?: ReactNode;
-  diffPanel: ReactNode;
-  chatPanel: ReactNode;
-  onSelectFile: (path: string) => void;
-  onSelectDiffFile: (path: string) => void;
-  onToggleDirectory: (path: string) => void;
-  onCenterModeChange: (mode: EditorCenterMode) => void;
-  onExitEditorView: () => void;
-  onReferenceInChat?: (reference: ChatFileReference) => void;
-  onAskWhyInChat?: (reference: ChatFileReference) => void;
-  onCommentInChat?: (comment: FileCommentSelection) => void;
-  onSelectProject?: (projectId: ProjectId) => void;
-}
-
-function clampEditorChatPaneWidth(width: number): number {
-  return Math.min(
-    EDITOR_CHAT_PANE_MAX_WIDTH,
-    Math.max(EDITOR_CHAT_PANE_MIN_WIDTH, Math.round(width)),
-  );
-}
-
-function readStoredEditorChatPaneWidth(): number {
-  if (typeof window === "undefined") {
-    return EDITOR_CHAT_PANE_DEFAULT_WIDTH;
-  }
-
-  try {
-    const rawValue = window.localStorage.getItem(EDITOR_CHAT_PANE_STORAGE_KEY);
-    const parsed = rawValue === null ? Number.NaN : Number.parseFloat(rawValue);
-    return Number.isFinite(parsed)
-      ? clampEditorChatPaneWidth(parsed)
-      : EDITOR_CHAT_PANE_DEFAULT_WIDTH;
-  } catch {
-    return EDITOR_CHAT_PANE_DEFAULT_WIDTH;
-  }
-}
-
-function storeEditorChatPaneWidth(width: number): void {
-  if (typeof window === "undefined") {
-    return;
-  }
-
-  try {
-    window.localStorage.setItem(
-      EDITOR_CHAT_PANE_STORAGE_KEY,
-      String(clampEditorChatPaneWidth(width)),
-    );
-  } catch {
-    // Best-effort preference persistence only.
-  }
-}
-
-function readStoredEditorVisibility(key: string): boolean {
-  if (typeof window === "undefined") {
-    return true;
-  }
-  try {
-    return window.localStorage.getItem(key) !== "false";
-  } catch {
-    return true;
-  }
-}
-
-function storeEditorVisibility(key: string, visible: boolean): void {
-  if (typeof window === "undefined") {
-    return;
-  }
-  try {
-    window.localStorage.setItem(key, String(visible));
-  } catch {
-    // Best-effort preference persistence only.
-  }
-}
-
-interface EditorChatPaneResizeState {
-  pointerId: number;
-  startX: number;
-  startWidth: number;
-  pendingWidth: number;
-  rafId: number | null;
-  restoreBodyCursor: string;
-  restoreBodyUserSelect: string;
-  onPointerMove: (event: PointerEvent) => void;
-  onPointerEnd: (event: PointerEvent) => void;
-}
-
-function DiffFileRow(props: {
-  fileDiff: FileDiffMetadata;
-  selected: boolean;
-  resolvedTheme: "light" | "dark";
-  onSelectFile: (path: string) => void;
-  onFileContextMenu: (filePath: string, position: { x: number; y: number }) => void;
-}) {
-  const filePath = resolveFileDiffPath(props.fileDiff);
-  const { dir, name } = splitRepoRelativePath(filePath);
-  const stat = useMemo(() => summarizeFileDiffStats([props.fileDiff]), [props.fileDiff]);
-
-  return (
-    <button
-      {...EXPLORER_ROW_PROPS}
-      type="button"
-      className={fileRowClassName(props.selected, "h-8 px-2")}
-      title={filePath}
-      draggable
-      onDragStart={(event) => {
-        setFileReferenceDragData(event.dataTransfer, filePath);
-      }}
-      onClick={() => props.onSelectFile(filePath)}
-      onContextMenu={(event) => {
-        event.preventDefault();
-        props.onFileContextMenu(filePath, { x: event.clientX, y: event.clientY });
-      }}
-    >
-      <FileEntryIcon
-        pathValue={filePath}
-        kind="file"
-        theme={props.resolvedTheme}
-        className="size-3.5 shrink-0"
-      />
-      <div className="min-w-0 flex-1 overflow-hidden">
-        <div className="flex min-w-0 items-baseline gap-1.5 overflow-hidden">
-          <span className="shrink-0 truncate font-medium">{name}</span>
-          {dir ? (
-            <span className="min-w-0 truncate text-[11px] text-muted-foreground/55">{dir}</span>
-          ) : null}
-        </div>
-      </div>
-      <DiffStat
-        additions={stat.additions}
-        deletions={stat.deletions}
-        className="shrink-0 text-[11px] tabular-nums"
-      />
-    </button>
-  );
-}
-
-const DIFF_FILE_SKELETON_ROW_WIDTHS = ["w-10/12", "w-7/12", "w-9/12", "w-6/12", "w-8/12"];
-
-function DiffFilesLoadingRows() {
-  return (
-    <div className="space-y-1 px-1 py-1" role="status" aria-label="Loading changed files...">
-      {DIFF_FILE_SKELETON_ROW_WIDTHS.map((width) => (
-        <div key={width} className="flex h-8 items-center gap-1.5 px-2">
-          <Skeleton className="size-3.5 shrink-0 rounded-sm" />
-          <Skeleton className={cn("h-3 rounded-full", width)} />
-          <Skeleton className="ml-auto h-3 w-9 shrink-0 rounded-full" />
-        </div>
-      ))}
-    </div>
-  );
-}
-
-function DiffFilesSidebar(props: {
-  files: ReadonlyArray<FileDiffMetadata>;
-  isLoading: boolean;
-  selectedFilePath: string | null;
-  optionsControl?: ReactNode;
-  onSelectFile: (path: string) => void;
-  onReferenceInChat: ((reference: ChatFileReference) => void) | undefined;
-  onAskWhyInChat: ((reference: ChatFileReference) => void) | undefined;
-}) {
-  const { resolvedTheme } = useTheme();
-  const { onAskWhyInChat, onReferenceInChat } = props;
-  const handleListKeyDown = useExplorerListNavigation();
-  const totals = useMemo(() => summarizeFileDiffStats(props.files), [props.files]);
-  const hasDiffStats = totals.additions > 0 || totals.deletions > 0;
-  const showLoadingRows = props.isLoading && props.files.length === 0;
-  const handleFileContextMenu = useCallback(
-    (filePath: string, position: { x: number; y: number }) => {
-      void showFileReferenceContextMenu({
-        path: filePath,
-        position,
-        onReferenceInChat,
-        onAskWhyInChat,
-      });
-    },
-    [onAskWhyInChat, onReferenceInChat],
-  );
-
-  return (
-    <aside className="flex min-h-[11rem] w-full shrink-0 flex-col border-b border-border/65 bg-[var(--color-background-surface)] lg:h-full lg:w-56 lg:border-b-0 lg:border-r">
-      <div className="flex h-10 shrink-0 items-center gap-2 border-b border-border/65 px-3">
-        <DiffIcon className="size-3.5 shrink-0 text-muted-foreground" />
-        <span className="min-w-0 flex-1 truncate text-[12px] font-medium text-foreground/86">
-          Changed files
-        </span>
-        <div className="ml-auto flex shrink-0 items-center gap-1.5">
-          {props.files.length > 0 ? (
-            <span className="rounded-full bg-muted px-1.5 text-[11px] font-medium text-muted-foreground tabular-nums">
-              {props.files.length}
-            </span>
-          ) : null}
-          {props.optionsControl}
-        </div>
-      </div>
-      {hasDiffStats ? (
-        <div className="flex h-8 shrink-0 items-center gap-2 border-b border-border/45 px-3">
-          <DiffStat
-            additions={totals.additions}
-            deletions={totals.deletions}
-            className="text-[11px] tabular-nums"
-          />
-        </div>
-      ) : null}
-      {/* Keyboard nav lives on the scrolling list, not the whole aside, so the
-          header's actions menu stays out of arrow-key scope (the search sidebars
-          attach at the aside because their only header control is a text input). */}
-      <div
-        className={cn(
-          "min-h-0 flex-1 overflow-auto px-1 py-1",
-          !showLoadingRows && props.files.length === 0 && "flex flex-col",
-        )}
-        onKeyDown={handleListKeyDown}
-      >
-        {showLoadingRows ? (
-          <DiffFilesLoadingRows />
-        ) : props.files.length === 0 ? (
-          <PanelStateMessage density="compact" fill="flex">
-            <p>No files in this diff.</p>
-          </PanelStateMessage>
-        ) : (
-          props.files.map((fileDiff) => {
-            const filePath = resolveFileDiffPath(fileDiff);
-            return (
-              <DiffFileRow
-                key={buildFileDiffRenderKey(fileDiff)}
-                fileDiff={fileDiff}
-                resolvedTheme={resolvedTheme}
-                selected={props.selectedFilePath === filePath}
-                onSelectFile={props.onSelectFile}
-                onFileContextMenu={handleFileContextMenu}
-              />
-            );
-          })
-        )}
-      </div>
-    </aside>
-  );
-}
-
-function EditorActivityBar(props: {
-  centerMode: EditorCenterMode;
-  searchActive: boolean;
-  sidebarVisible: boolean;
-  onSelectItem: (item: EditorActivityBarItem) => void;
-}) {
-  const filesActive = props.sidebarVisible && !props.searchActive && props.centerMode === "file";
-  const diffActive = props.sidebarVisible && !props.searchActive && props.centerMode === "diff";
-  const searchActive = props.sidebarVisible && props.searchActive;
-  return (
-    <nav
-      className="flex w-12 shrink-0 flex-col items-center border-r border-border/65 bg-[var(--color-background-surface)]"
-      aria-label="Editor activity bar"
-    >
-      <ExplorerActivityBarButton
-        label={filesActive ? "Hide files sidebar" : "Files"}
-        active={filesActive}
-        onClick={() => props.onSelectItem("file")}
-      >
-        <FoldersIcon className="size-5" />
-      </ExplorerActivityBarButton>
-      <ExplorerActivityBarButton
-        label={diffActive ? "Hide diff sidebar" : "Diff"}
-        active={diffActive}
-        onClick={() => props.onSelectItem("diff")}
-      >
-        <ChangesIcon className="size-5" />
-      </ExplorerActivityBarButton>
-      <ExplorerActivityBarButton
-        label={searchActive ? "Hide search sidebar" : "Search files"}
-        active={searchActive}
-        onClick={() => props.onSelectItem("search")}
-      >
-        <SearchIcon className="size-5" />
-      </ExplorerActivityBarButton>
-    </nav>
-  );
-}
-
-export function EditorWorkspaceView(props: EditorWorkspaceViewProps) {
-  // The editor header sits flush against the window's left edge whenever the
-  // global sidebar is collapsed, so it has to clear the macOS traffic lights the
-  // same way every other chat-surface header does.
-  const trafficLightGutterClassName = useDesktopTopBarTrafficLightGutterClassName();
-  const [chatPaneWidth, setChatPaneWidth] = useState(readStoredEditorChatPaneWidth);
-  const chatPaneResizeStateRef = useRef<EditorChatPaneResizeState | null>(null);
-  // Both side surfaces can be hidden so the main content takes the full width:
-  // re-clicking the active activity-bar item collapses the sidebar (VS Code
-  // style), and the header chat toggle hides the chat pane (kept mounted so
-  // the chat runtime survives).
-  const [sidebarVisible, setSidebarVisible] = useState(() =>
-    readStoredEditorVisibility(EDITOR_SIDEBAR_VISIBLE_STORAGE_KEY),
-  );
-  const [chatPaneVisible, setChatPaneVisible] = useState(() =>
-    readStoredEditorVisibility(EDITOR_CHAT_PANE_VISIBLE_STORAGE_KEY),
-  );
-  // The search pane replaces the explorer/diff sidebar without touching the
-  // center mode, so picking a result simply opens it in the file preview. The
-  // query lives here so it survives toggling between sidebar panes.
-  const [searchPaneActive, setSearchPaneActive] = useState(false);
-  const [searchQuery, setSearchQuery] = useState("");
-  const desktopTopBarWindowControlsGutterClassName =
-    useDesktopTopBarWindowControlsGutterClassName();
-  const { centerMode, onCenterModeChange } = props;
-  const handleActivityBarSelectItem = useCallback(
-    (item: EditorActivityBarItem) => {
-      const itemActive =
-        sidebarVisible &&
-        (item === "search" ? searchPaneActive : !searchPaneActive && centerMode === item);
-      if (itemActive) {
-        setSidebarVisible(false);
-        storeEditorVisibility(EDITOR_SIDEBAR_VISIBLE_STORAGE_KEY, false);
-        return;
-      }
-      if (!sidebarVisible) {
-        setSidebarVisible(true);
-        storeEditorVisibility(EDITOR_SIDEBAR_VISIBLE_STORAGE_KEY, true);
-      }
-      if (item === "search") {
-        setSearchPaneActive(true);
-        return;
-      }
-      setSearchPaneActive(false);
-      onCenterModeChange(item);
-    },
-    [centerMode, onCenterModeChange, searchPaneActive, sidebarVisible],
-  );
-  const toggleChatPaneVisible = useCallback(() => {
-    setChatPaneVisible((previous) => {
-      const next = !previous;
-      storeEditorVisibility(EDITOR_CHAT_PANE_VISIBLE_STORAGE_KEY, next);
-      return next;
-    });
-  }, []);
-
-  const stopChatPaneResize = useCallback(() => {
-    const resizeState = chatPaneResizeStateRef.current;
-    if (!resizeState || typeof window === "undefined") {
-      return;
-    }
-
-    if (resizeState.rafId !== null) {
-      window.cancelAnimationFrame(resizeState.rafId);
-      resizeState.rafId = null;
-    }
-
-    window.removeEventListener("pointermove", resizeState.onPointerMove);
-    window.removeEventListener("pointerup", resizeState.onPointerEnd);
-    window.removeEventListener("pointercancel", resizeState.onPointerEnd);
-    document.body.style.cursor = resizeState.restoreBodyCursor;
-    document.body.style.userSelect = resizeState.restoreBodyUserSelect;
-    setChatPaneWidth(resizeState.pendingWidth);
-    storeEditorChatPaneWidth(resizeState.pendingWidth);
-    chatPaneResizeStateRef.current = null;
-  }, []);
-
-  useEffect(() => stopChatPaneResize, [stopChatPaneResize]);
-
-  const handleChatPaneResizePointerDown = useCallback(
-    (event: ReactPointerEvent<HTMLDivElement>) => {
-      if (event.button !== 0 || typeof window === "undefined") {
-        return;
-      }
-
-      event.preventDefault();
-      event.stopPropagation();
-      stopChatPaneResize();
-
-      const resizeState: EditorChatPaneResizeState = {
-        pointerId: event.pointerId,
-        startX: event.clientX,
-        startWidth: chatPaneWidth,
-        pendingWidth: chatPaneWidth,
-        rafId: null,
-        restoreBodyCursor: document.body.style.cursor,
-        restoreBodyUserSelect: document.body.style.userSelect,
-        onPointerMove: () => undefined,
-        onPointerEnd: () => undefined,
-      };
-
-      resizeState.onPointerMove = (moveEvent) => {
-        if (moveEvent.pointerId !== resizeState.pointerId) {
-          return;
-        }
-
-        resizeState.pendingWidth = clampEditorChatPaneWidth(
-          resizeState.startWidth + resizeState.startX - moveEvent.clientX,
-        );
-
-        if (resizeState.rafId !== null) {
-          return;
-        }
-
-        resizeState.rafId = window.requestAnimationFrame(() => {
-          resizeState.rafId = null;
-          setChatPaneWidth(resizeState.pendingWidth);
-        });
-      };
-
-      resizeState.onPointerEnd = (endEvent) => {
-        if (endEvent.pointerId !== resizeState.pointerId) {
-          return;
-        }
-        stopChatPaneResize();
-      };
-
-      chatPaneResizeStateRef.current = resizeState;
-      document.body.style.cursor = "col-resize";
-      document.body.style.userSelect = "none";
-      window.addEventListener("pointermove", resizeState.onPointerMove);
-      window.addEventListener("pointerup", resizeState.onPointerEnd);
-      window.addEventListener("pointercancel", resizeState.onPointerEnd);
-    },
-    [chatPaneWidth, stopChatPaneResize],
-  );
-
-  const handleChatPaneResizeDoubleClick = useCallback(() => {
-    setChatPaneWidth(EDITOR_CHAT_PANE_DEFAULT_WIDTH);
-    storeEditorChatPaneWidth(EDITOR_CHAT_PANE_DEFAULT_WIDTH);
-  }, []);
-
-  const handleChatPaneResizeKeyDown = useCallback(
-    (event: ReactKeyboardEvent<HTMLDivElement>) => {
-      let nextWidth: number | null = null;
-
-      if (event.key === "ArrowLeft") {
-        nextWidth = chatPaneWidth + EDITOR_CHAT_PANE_KEYBOARD_STEP;
-      } else if (event.key === "ArrowRight") {
-        nextWidth = chatPaneWidth - EDITOR_CHAT_PANE_KEYBOARD_STEP;
-      } else if (event.key === "Home") {
-        nextWidth = EDITOR_CHAT_PANE_MIN_WIDTH;
-      } else if (event.key === "End") {
-        nextWidth = EDITOR_CHAT_PANE_MAX_WIDTH;
-      }
-
-      if (nextWidth === null) {
-        return;
-      }
-
-      event.preventDefault();
-      const clampedWidth = clampEditorChatPaneWidth(nextWidth);
-      setChatPaneWidth(clampedWidth);
-      storeEditorChatPaneWidth(clampedWidth);
-    },
-    [chatPaneWidth],
-  );
-
-  return (
-    <div className="flex h-full min-h-0 min-w-0 flex-1 flex-col bg-[var(--color-background-root)] text-foreground">
-      <div
-        className={cn(
-          "flex shrink-0 items-center gap-2 px-2 sm:px-3",
-          CHAT_SURFACE_HEADER_HEIGHT_CLASS,
-          CHAT_SURFACE_HEADER_DIVIDER_CLASS_NAME,
-          desktopTopBarWindowControlsGutterClassName,
-        )}
-      >
-        <div
-          className={cn("flex min-w-0 flex-1 items-center gap-1.5", trafficLightGutterClassName)}
-        >
-          <div className="flex min-w-0 items-baseline gap-2">
-            <span className="truncate text-[13px] font-medium text-foreground">
-              {props.projectName ?? "Workspace"}
-            </span>
-            <span className="hidden truncate text-[11px] text-muted-foreground/70 sm:inline">
-              {props.workspaceRoot ?? "No workspace"}
-            </span>
-          </div>
-          {props.onSelectProject && (props.projectOptions?.length ?? 0) > 0 ? (
-            <ProjectMenuPicker
-              projectOptions={props.projectOptions ?? []}
-              selectedProjectId={props.currentProjectId ?? null}
-              onProjectIdChange={props.onSelectProject}
-              trigger={
-                <ChatHeaderIconButton
-                  type="button"
-                  tone="plain"
-                  label="Switch project"
-                  title="Switch project"
-                  className="size-6"
-                >
-                  <ChevronDownIcon className="size-3.5" />
-                </ChatHeaderIconButton>
-              }
-            />
-          ) : null}
-        </div>
-        <ChatHeaderButton
-          type="button"
-          tone="outline"
-          aria-pressed={chatPaneVisible}
-          title={chatPaneVisible ? "Hide chat panel" : "Show chat panel"}
-          className="gap-1.5"
-          onClick={toggleChatPaneVisible}
-        >
-          <PanelRightCloseIcon className="size-3.5" />
-          <span className="sr-only">{chatPaneVisible ? "Hide chat panel" : "Show chat panel"}</span>
-        </ChatHeaderButton>
-        <ChatHeaderButton
-          type="button"
-          tone="outline"
-          aria-pressed={true}
-          title="Switch to chat view"
-          className="w-[5.5rem] gap-1.5"
-          onClick={props.onExitEditorView}
-        >
-          <ChatBubbleIcon className="size-3.5" />
-          <span className="truncate font-normal">Chat</span>
-        </ChatHeaderButton>
-      </div>
-      <div className="flex min-h-0 min-w-0 flex-1 overflow-hidden">
-        <EditorActivityBar
-          centerMode={props.centerMode}
-          searchActive={searchPaneActive}
-          sidebarVisible={sidebarVisible}
-          onSelectItem={handleActivityBarSelectItem}
-        />
-        <div className="flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden lg:flex-row">
-          {!sidebarVisible ? null : searchPaneActive ? (
-            <WorkspaceSearchSidebar
-              workspaceRoot={props.workspaceRoot}
-              query={searchQuery}
-              onQueryChange={setSearchQuery}
-              selectedFilePath={props.selectedFilePath}
-              onSelectFile={props.onSelectFile}
-              onReferenceInChat={props.onReferenceInChat}
-            />
-          ) : props.centerMode === "diff" ? (
-            <DiffFilesSidebar
-              files={props.diffFiles}
-              isLoading={props.diffFilesLoading ?? false}
-              selectedFilePath={props.selectedDiffFilePath}
-              optionsControl={props.diffOptionsControl}
-              onSelectFile={props.onSelectDiffFile}
-              onReferenceInChat={props.onReferenceInChat}
-              onAskWhyInChat={props.onAskWhyInChat}
-            />
-          ) : (
-            <WorkspaceFilesSidebar
-              workspaceRoot={props.workspaceRoot}
-              selectedFilePath={props.selectedFilePath}
-              expandedDirectories={props.expandedDirectories}
-              onSelectFile={props.onSelectFile}
-              onToggleDirectory={props.onToggleDirectory}
-              onReferenceInChat={props.onReferenceInChat}
-            />
-          )}
-          <main className="flex min-h-[16rem] min-w-0 flex-1 border-b border-border/65 lg:h-full lg:border-b-0">
-            {/* Keep the diff panel mounted while browsing files: unmounting it
-                drops the parsed patch, diff worker pool, and query subscriptions,
-                which made every Files -> Diff switch a cold multi-second reload. */}
-            <div className={cn("min-h-0 min-w-0 flex-1", props.centerMode !== "diff" && "hidden")}>
-              {props.diffPanel}
-            </div>
-            {props.centerMode === "file" ? (
-              <div className="flex min-h-0 min-w-0 flex-1">
-                <WorkspaceFilePreview
-                  workspaceRoot={props.workspaceRoot}
-                  filePath={props.selectedFilePath}
-                  onReferenceInChat={props.onReferenceInChat}
-                  onAskWhyInChat={props.onAskWhyInChat}
-                  onCommentInChat={props.onCommentInChat}
-                />
-              </div>
-            ) : null}
-          </main>
-          <div
-            role="separator"
-            aria-label="Resize chat panel"
-            aria-orientation="vertical"
-            aria-valuemin={EDITOR_CHAT_PANE_MIN_WIDTH}
-            aria-valuemax={EDITOR_CHAT_PANE_MAX_WIDTH}
-            aria-valuenow={chatPaneWidth}
-            tabIndex={0}
-            title="Drag to resize chat panel"
-            className={cn(
-              "group relative z-10 w-0 shrink-0 cursor-col-resize outline-none",
-              chatPaneVisible ? "hidden lg:block" : "hidden",
-            )}
-            onPointerDown={handleChatPaneResizePointerDown}
-            onDoubleClick={handleChatPaneResizeDoubleClick}
-            onKeyDown={handleChatPaneResizeKeyDown}
-          >
-            <span
-              className="absolute inset-y-0 left-[-3px] w-1.5 cursor-col-resize bg-transparent transition-colors group-hover:bg-[var(--color-background-button-secondary-hover)] group-focus-visible:bg-[var(--color-background-button-secondary-hover)]"
-              aria-hidden="true"
-            />
-            <span
-              className="pointer-events-none absolute inset-y-0 left-0 w-px bg-[var(--app-surface-divider)] transition-colors group-hover:bg-[var(--info)] group-focus-visible:bg-[var(--info)]"
-              aria-hidden="true"
-            />
-          </div>
-          {/* Hidden (not unmounted) so the chat runtime and composer focus
-              state survive toggling the pane. */}
-          <aside
-            className={cn(
-              "min-h-[18rem] w-full shrink-0 bg-[var(--color-background-surface)] lg:h-full lg:w-[var(--editor-chat-pane-width)]",
-              chatPaneVisible ? "flex" : "hidden",
-            )}
-            style={
-              {
-                "--editor-chat-pane-width": `${chatPaneWidth}px`,
-              } as CSSProperties
-            }
-          >
-            {props.chatPanel}
-          </aside>
-        </div>
-      </div>
-    </div>
-  );
-}
-
-export default EditorWorkspaceView;
diff --git a/apps/web/src/components/EventRouter.browser.tsx b/apps/web/src/components/EventRouter.browser.tsx
index f8850c98b..6c14756c3 100644
--- a/apps/web/src/components/EventRouter.browser.tsx
+++ b/apps/web/src/components/EventRouter.browser.tsx
@@ -254,7 +254,6 @@ const worker = setupWorker(
       if (
         method === WS_METHODS.subscribeServerProviderStatuses ||
         method === WS_METHODS.subscribeServerSettings ||
-        method === WS_METHODS.subscribeTerminalEvents ||
         method === WS_METHODS.subscribeOrchestrationDomainEvents
       ) {
         return;
@@ -887,7 +886,6 @@ describe("EventRouter scoped orchestration sync", () => {
           projectId: PROJECT_ID,
           createdAt: NOW_ISO,
           runtimeMode: "full-access",
-          entryPoint: "chat",
           branch: null,
           worktreePath: null,
           envMode: "local",
diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx
index 17296b5a1..bf02a2fb1 100644
--- a/apps/web/src/components/GitActionsControl.tsx
+++ b/apps/web/src/components/GitActionsControl.tsx
@@ -95,7 +95,7 @@ import {
   invalidateGitQueries,
 } from "~/lib/gitReactQuery";
 import { cn, newCommandId, randomUUID } from "~/lib/utils";
-import { resolvePathLinkTarget } from "~/terminal-links";
+import { resolvePathLinkTarget } from "~/lib/pathLinks";
 import { readNativeApi } from "~/nativeApi";
 import { createThreadSelector } from "~/storeSelectors";
 import { useStore } from "~/store";
diff --git a/apps/web/src/components/KeybindingsToast.browser.tsx b/apps/web/src/components/KeybindingsToast.browser.tsx
index c8e4bdd5d..b99f6c72f 100644
--- a/apps/web/src/components/KeybindingsToast.browser.tsx
+++ b/apps/web/src/components/KeybindingsToast.browser.tsx
@@ -240,7 +240,6 @@ const worker = setupWorker(
       if (
         method === WS_METHODS.subscribeServerProviderStatuses ||
         method === WS_METHODS.subscribeServerSettings ||
-        method === WS_METHODS.subscribeTerminalEvents ||
         method === WS_METHODS.subscribeOrchestrationDomainEvents
       ) {
         return;
diff --git a/apps/web/src/components/PlanSidebar.tsx b/apps/web/src/components/PlanSidebar.tsx
index 4df7e202d..24f296256 100644
--- a/apps/web/src/components/PlanSidebar.tsx
+++ b/apps/web/src/components/PlanSidebar.tsx
@@ -156,7 +156,7 @@ const PlanSidebar = memo(function PlanSidebar({
                 </span>
               </CollapsibleTrigger>
               <CollapsiblePanel>
-                <div className="mt-2 rounded-[8px] border border-panel-border bg-hover p-3">
+                <div className="mt-2 rounded-lg border border-panel-border bg-hover p-3">
                   <ChatMarkdown
                     text={displayedPlanMarkdown ?? ""}
                     cwd={markdownCwd}
diff --git a/apps/web/src/components/RateLimitsPanel.tsx b/apps/web/src/components/RateLimitsPanel.tsx
index cc8cb3470..71c28995d 100644
--- a/apps/web/src/components/RateLimitsPanel.tsx
+++ b/apps/web/src/components/RateLimitsPanel.tsx
@@ -24,7 +24,7 @@ export default function RateLimitsPanel({
   return (
     <Collapsible open={open} onOpenChange={setOpen}>
       <div className="mx-auto w-full max-w-3xl px-3">
-        <div className="rounded-[8px] border border-panel-border bg-panel">
+        <div className="rounded-lg border border-panel-border bg-panel">
           <CollapsibleTrigger className="flex w-full items-center justify-between gap-2 px-3 py-2 text-xs text-muted-foreground transition-colors hover:text-foreground">
             <span className="flex items-center gap-1.5">
               <svg
diff --git a/apps/web/src/components/ReviewFileTreePanel.test.tsx b/apps/web/src/components/ReviewFileTreePanel.test.tsx
deleted file mode 100644
index 3a823570a..000000000
--- a/apps/web/src/components/ReviewFileTreePanel.test.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-// FILE: ReviewFileTreePanel.test.tsx
-// Purpose: Guards the compact review file-tree panel: it renders the filter
-//          input, the nested/compressed changed files, and coherent empty and
-//          loading states.
-// Layer: Component rendering tests
-
-import type { FileDiffMetadata } from "@pierre/diffs/react";
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it, vi } from "vitest";
-
-import { ReviewFileTreePanel } from "./ReviewFileTreePanel";
-
-function createFileDiff(path: string): FileDiffMetadata {
-  return {
-    cacheKey: path,
-    name: path,
-    prevName: path,
-    hunks: [{ additionLines: 2, deletionLines: 1 }],
-  } as FileDiffMetadata;
-}
-
-describe("ReviewFileTreePanel", () => {
-  it("renders the filter input and the nested, compressed changed files", () => {
-    const markup = renderToStaticMarkup(
-      <ReviewFileTreePanel
-        files={[
-          createFileDiff("apps/server/src/codex.ts"),
-          createFileDiff("apps/web/src/ChatView.tsx"),
-        ]}
-        selectedFilePath="apps/web/src/ChatView.tsx"
-        resolvedTheme="dark"
-        onSelectFile={vi.fn()}
-      />,
-    );
-
-    expect(markup).toContain('placeholder="Filter files..."');
-    // Top-level directory plus the compressed single-child chains.
-    expect(markup).toContain("apps");
-    expect(markup).toContain("server/src");
-    expect(markup).toContain("web/src");
-    // Leaf file names render inside the expanded tree.
-    expect(markup).toContain("codex.ts");
-    expect(markup).toContain("ChatView.tsx");
-  });
-
-  it("renders a same-named file and directory replacement as distinct rows", () => {
-    // Deleting `foo` while adding `foo/bar.ts` produces sibling nodes that share
-    // the path "foo"; the panel must render both without colliding React keys.
-    const markup = renderToStaticMarkup(
-      <ReviewFileTreePanel
-        files={[createFileDiff("foo"), createFileDiff("foo/bar.ts")]}
-        selectedFilePath="foo"
-        resolvedTheme="dark"
-        onSelectFile={vi.fn()}
-      />,
-    );
-
-    expect(markup).toContain("foo");
-    expect(markup).toContain("bar.ts");
-  });
-
-  it("shows a coherent empty state when there are no files", () => {
-    const markup = renderToStaticMarkup(
-      <ReviewFileTreePanel
-        files={[]}
-        selectedFilePath={null}
-        resolvedTheme="light"
-        onSelectFile={vi.fn()}
-      />,
-    );
-
-    expect(markup).toContain("No files in this diff.");
-  });
-
-  it("shows a loading state while the diff is loading with no files yet", () => {
-    const markup = renderToStaticMarkup(
-      <ReviewFileTreePanel
-        files={[]}
-        isLoading
-        selectedFilePath={null}
-        resolvedTheme="light"
-        onSelectFile={vi.fn()}
-      />,
-    );
-
-    expect(markup).toContain("Loading changed files...");
-    expect(markup).not.toContain("No files in this diff.");
-  });
-});
diff --git a/apps/web/src/components/ReviewFileTreePanel.tsx b/apps/web/src/components/ReviewFileTreePanel.tsx
deleted file mode 100644
index 5aa47dc6c..000000000
--- a/apps/web/src/components/ReviewFileTreePanel.tsx
+++ /dev/null
@@ -1,267 +0,0 @@
-// FILE: ReviewFileTreePanel.tsx
-// Purpose: Compact, searchable file-tree side panel for the review/diff panel.
-//          Renders the changed files of the active diff as a nested, collapsible
-//          tree and navigates the diff on click. Reuses the diff path helpers,
-//          file-row chrome, file icons, and disclosure motion shared with the
-//          editor explorer instead of duplicating them.
-// Layer: Diff panel UI
-
-import type { FileDiffMetadata } from "@pierre/diffs/react";
-import {
-  forwardRef,
-  memo,
-  useCallback,
-  useMemo,
-  useState,
-  type ComponentPropsWithoutRef,
-  type KeyboardEvent as ReactKeyboardEvent,
-  type ReactNode,
-} from "react";
-
-import { buildFileDiffTree, type FileDiffTreeNode } from "~/lib/fileDiffTree";
-import { XIcon } from "~/lib/icons";
-import { cn } from "~/lib/utils";
-
-import { filterRenderableFilesForSearch } from "./DiffPanel.logic";
-import { FileEntryIcon } from "./chat/FileEntryIcon";
-import { fileRowClassName, fileRowIndentStyle } from "./chat/fileRowStyles";
-import { PanelStateMessage } from "./chat/PanelStateMessage";
-import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "./ui/collapsible";
-import { DisclosureChevron } from "./ui/DisclosureChevron";
-import { IconButton } from "./ui/icon-button";
-import { SearchInput } from "./ui/search-input";
-import { Skeleton } from "./ui/skeleton";
-
-// Forwards its ref and spreads incoming props so directory rows can act as the
-// Collapsible trigger (Base UI injects onClick/aria/data + ref onto this element).
-const ReviewTreeRow = forwardRef<
-  HTMLButtonElement,
-  {
-    depth: number;
-    selected: boolean;
-    leading: ReactNode;
-    label: string;
-    labelClassName?: string;
-  } & ComponentPropsWithoutRef<"button">
->(function ReviewTreeRow(
-  { depth, selected, leading, label, labelClassName, className, ...rest },
-  ref,
-) {
-  return (
-    <button
-      {...rest}
-      ref={ref}
-      type="button"
-      className={fileRowClassName(selected, cn("h-7 pr-2", className))}
-      style={fileRowIndentStyle(depth)}
-      title={label}
-    >
-      {leading}
-      <span className={cn("min-w-0 truncate", labelClassName)}>{label}</span>
-    </button>
-  );
-});
-
-const ReviewFileTreeNodes = memo(function ReviewFileTreeNodes(props: {
-  nodes: ReadonlyArray<FileDiffTreeNode>;
-  depth: number;
-  selectedFilePath: string | null;
-  resolvedTheme: "light" | "dark";
-  isPathCollapsed: (path: string) => boolean;
-  onToggleDirectory: (path: string) => void;
-  onSelectFile: (path: string) => void;
-}) {
-  return (
-    <>
-      {props.nodes.map((node) => {
-        if (node.kind === "file") {
-          return (
-            // Namespace keys by kind: a diff that replaces a file with a
-            // same-named directory (delete `foo`, add `foo/bar`) yields sibling
-            // file and directory nodes sharing the same path.
-            <ReviewTreeRow
-              key={`file:${node.path}`}
-              depth={props.depth}
-              selected={node.path === props.selectedFilePath}
-              leading={
-                <FileEntryIcon
-                  pathValue={node.path}
-                  kind="file"
-                  theme={props.resolvedTheme}
-                  className="size-3.5 shrink-0 opacity-80"
-                />
-              }
-              label={node.name}
-              onClick={() => props.onSelectFile(node.path)}
-            />
-          );
-        }
-        const open = !props.isPathCollapsed(node.path);
-        return (
-          <Collapsible
-            key={`dir:${node.path}`}
-            open={open}
-            onOpenChange={() => props.onToggleDirectory(node.path)}
-          >
-            <CollapsibleTrigger
-              render={
-                <ReviewTreeRow
-                  depth={props.depth}
-                  selected={false}
-                  leading={<DisclosureChevron open={open} className="opacity-75" />}
-                  label={node.name}
-                  labelClassName="font-medium text-foreground/80"
-                />
-              }
-            />
-            <CollapsiblePanel>
-              <ReviewFileTreeNodes
-                nodes={node.children}
-                depth={props.depth + 1}
-                selectedFilePath={props.selectedFilePath}
-                resolvedTheme={props.resolvedTheme}
-                isPathCollapsed={props.isPathCollapsed}
-                onToggleDirectory={props.onToggleDirectory}
-                onSelectFile={props.onSelectFile}
-              />
-            </CollapsiblePanel>
-          </Collapsible>
-        );
-      })}
-    </>
-  );
-});
-
-const REVIEW_TREE_SKELETON_ROW_WIDTHS = ["w-9/12", "w-6/12", "w-8/12", "w-5/12", "w-7/12"];
-
-function ReviewFileTreeLoadingRows() {
-  return (
-    <div className="space-y-1.5 px-1 py-1.5" role="status" aria-label="Loading changed files...">
-      {REVIEW_TREE_SKELETON_ROW_WIDTHS.map((width, index) => (
-        <div
-          key={width}
-          className="flex h-5 items-center gap-1.5"
-          style={fileRowIndentStyle(index % 2)}
-        >
-          <Skeleton className="size-3.5 shrink-0 rounded-sm" />
-          <Skeleton className={cn("h-3 rounded-full", width)} />
-        </div>
-      ))}
-    </div>
-  );
-}
-
-export const ReviewFileTreePanel = memo(function ReviewFileTreePanel(props: {
-  files: ReadonlyArray<FileDiffMetadata>;
-  selectedFilePath: string | null;
-  resolvedTheme: "light" | "dark";
-  isLoading?: boolean;
-  className?: string;
-  onSelectFile: (filePath: string) => void;
-  onClose?: () => void;
-}) {
-  const [query, setQuery] = useState("");
-  // Default fully expanded (the diff file set is known upfront and usually
-  // small), so we track which directories the user has *collapsed* rather than
-  // an expanded allow-list. While searching, collapse state is ignored so every
-  // match stays visible.
-  const [collapsedPaths, setCollapsedPaths] = useState<ReadonlySet<string>>(() => new Set());
-
-  const filteredFiles = useMemo(
-    () => filterRenderableFilesForSearch(props.files, query),
-    [props.files, query],
-  );
-  const tree = useMemo(() => buildFileDiffTree(filteredFiles), [filteredFiles]);
-
-  const isSearching = query.trim().length > 0;
-  const isPathCollapsed = useCallback(
-    (path: string) => !isSearching && collapsedPaths.has(path),
-    [collapsedPaths, isSearching],
-  );
-  const handleToggleDirectory = useCallback((path: string) => {
-    setCollapsedPaths((previous) => {
-      const next = new Set(previous);
-      if (next.has(path)) {
-        next.delete(path);
-      } else {
-        next.add(path);
-      }
-      return next;
-    });
-  }, []);
-  const handleSearchKeyDown = useCallback(
-    (event: ReactKeyboardEvent<HTMLInputElement>) => {
-      if (event.key === "Escape" && query.length > 0) {
-        event.stopPropagation();
-        setQuery("");
-      }
-    },
-    [query.length],
-  );
-
-  const hasFiles = props.files.length > 0;
-  const showLoadingRows = (props.isLoading ?? false) && !hasFiles;
-
-  return (
-    <aside
-      className={cn(
-        "flex h-full w-full min-h-0 min-w-0 flex-col border-l border-border bg-[var(--color-background-surface)]",
-        props.className,
-      )}
-      aria-label="Review files"
-    >
-      <div className="flex shrink-0 items-center gap-1.5 border-b border-border/65 p-2">
-        <SearchInput
-          value={query}
-          spellCheck={false}
-          autoCorrect="off"
-          autoCapitalize="off"
-          placeholder="Filter files..."
-          aria-label="Filter files"
-          onChange={(event) => setQuery(event.target.value)}
-          onKeyDown={handleSearchKeyDown}
-        />
-        {props.onClose ? (
-          <IconButton
-            variant="ghost"
-            size="icon-xs"
-            className="shrink-0 text-muted-foreground hover:text-foreground"
-            label="Hide file tree"
-            title="Hide file tree"
-            onClick={props.onClose}
-          >
-            <XIcon className="size-3.5" />
-          </IconButton>
-        ) : null}
-      </div>
-      <div
-        className={cn(
-          "min-h-0 flex-1 overflow-auto px-1 py-1",
-          (showLoadingRows || tree.length === 0) && "flex flex-col",
-        )}
-      >
-        {showLoadingRows ? (
-          <ReviewFileTreeLoadingRows />
-        ) : !hasFiles ? (
-          <PanelStateMessage density="compact" fill="flex">
-            <p>No files in this diff.</p>
-          </PanelStateMessage>
-        ) : tree.length === 0 ? (
-          <PanelStateMessage density="compact" fill="flex">
-            <p>No matching files.</p>
-          </PanelStateMessage>
-        ) : (
-          <ReviewFileTreeNodes
-            nodes={tree}
-            depth={0}
-            selectedFilePath={props.selectedFilePath}
-            resolvedTheme={props.resolvedTheme}
-            isPathCollapsed={isPathCollapsed}
-            onToggleDirectory={handleToggleDirectory}
-            onSelectFile={props.onSelectFile}
-          />
-        )}
-      </div>
-    </aside>
-  );
-});
diff --git a/apps/web/src/components/ShortcutsDialog.tsx b/apps/web/src/components/ShortcutsDialog.tsx
index 8c694edf2..092322e83 100644
--- a/apps/web/src/components/ShortcutsDialog.tsx
+++ b/apps/web/src/components/ShortcutsDialog.tsx
@@ -30,7 +30,7 @@ export default function ShortcutsDialog(props: {
   keybindings: ResolvedKeybindingsConfig;
   projectScripts: ReadonlyArray<ProjectScript>;
   platform: string;
-  context: ShortcutSheetContext;
+  context?: ShortcutSheetContext;
 }) {
   const [query, setQuery] = useState("");
   const inputRef = useRef<HTMLInputElement>(null);
@@ -57,7 +57,7 @@ export default function ShortcutsDialog(props: {
         keybindings: props.keybindings,
         projectScripts: props.projectScripts,
         platform: props.platform,
-        context: props.context,
+        context: props.context ?? {},
       }),
     [props.keybindings, props.projectScripts, props.platform, props.context],
   );
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index fcf5a3500..446db4161 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -22,7 +22,6 @@ import {
   PlayIcon,
   SettingsIcon,
   StopFilledIcon,
-  TerminalIcon,
   Trash2,
   TriangleAlertIcon,
   WorktreeIcon,
@@ -145,8 +144,7 @@ import { useComposerDraftStore } from "../composerDraftStore";
 import { resolveThreadEnvironmentPresentation } from "../lib/threadEnvironment";
 import { dispatchThreadRename } from "../lib/threadRename";
 import { quotePosixShellArgument } from "../lib/shellQuote";
-import { DEFAULT_THREAD_TERMINAL_ID, type SidebarThreadSummary, type Thread } from "../types";
-import { shouldRenderTerminalWorkspace } from "./ChatView.logic";
+import { type SidebarThreadSummary, type Thread } from "../types";
 import { CHAT_SURFACE_HEADER_HEIGHT_CLASS } from "./chat/chatHeaderControls";
 import { ProviderIcon } from "./ProviderIcon";
 import { SidebarLeadingControls } from "./SidebarHeaderNavigationControls";
@@ -163,7 +161,6 @@ import { ThreadPinToggleButton } from "./ThreadPinToggleButton";
 import { ThreadRunningSpinner } from "./ThreadRunningSpinner";
 import { RenameDialog } from "./RenameDialog";
 import { RenameThreadDialog } from "./RenameThreadDialog";
-import { disposeTerminalRuntimeThread } from "./terminal/terminalRuntimeHandle";
 import {
   SidebarSearchPalette,
   type ImportProviderKind,
@@ -173,7 +170,6 @@ import {
 import { useHandleNewChat } from "../hooks/useHandleNewChat";
 import { useHandleNewThread } from "../hooks/useHandleNewThread";
 import { useThreadHandoff } from "../hooks/useThreadHandoff";
-import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
 import { useProjectRunStore, type ProjectRunState } from "../projectRunStore";
 import {
   selectPrimaryProjectRunCommand,
@@ -294,7 +290,6 @@ import {
   resolveAvailableHandoffTargetProviders,
   resolveThreadHandoffBadgeLabel,
 } from "../lib/threadHandoff";
-import { isTerminalFocused } from "../lib/terminalFocus";
 import { normalizeSettingsSection } from "../settingsNavigation";
 import {
   sidebarHoverRevealHideClassName,
@@ -466,7 +461,6 @@ function threadJumpLabelMapsEqual(
 function buildThreadJumpLabelMap(input: {
   keybindings: ResolvedKeybindingsConfig;
   platform: string;
-  terminalOpen: boolean;
   threadJumpCommandByThreadId: ReadonlyMap<
     ThreadId,
     NonNullable<ReturnType<typeof threadJumpCommandForIndex>>
@@ -478,10 +472,6 @@ function buildThreadJumpLabelMap(input: {
 
   const shortcutLabelOptions = {
     platform: input.platform,
-    context: {
-      terminalFocus: false,
-      terminalOpen: input.terminalOpen,
-    },
   } as const;
   const mapping = new Map<ThreadId, string>();
   for (const [threadId, command] of input.threadJumpCommandByThreadId) {
@@ -611,26 +601,15 @@ function resolveThreadRowMetaChips(input: {
   return chips;
 }
 
-function ProviderAvatarWithTerminal({
+function ProviderAvatar({
   provider,
   handoffSourceProvider,
   handoffTooltip,
-  terminalStatus,
-  terminalCount,
 }: {
   provider: ProviderKind;
   handoffSourceProvider?: ProviderKind | null;
   handoffTooltip?: string | null;
-  terminalStatus: TerminalStatusIndicator | null;
-  terminalCount: number;
 }) {
-  const showBadge = terminalCount > 1 || terminalStatus !== null;
-  const badgeTooltip =
-    terminalCount > 1
-      ? `${terminalCount} ${pluralize(terminalCount, "terminal")} open`
-      : (terminalStatus?.label ?? "Terminal open");
-  const badgeColorClass = terminalStatus?.colorClass ?? "text-muted-foreground/55";
-
   const hasHandoff = Boolean(handoffSourceProvider);
   const containerClass = hasHandoff
     ? "relative inline-flex h-3 w-4.5 shrink-0 items-center"
@@ -661,37 +640,7 @@ function ProviderAvatarWithTerminal({
       avatarNode
     );
 
-  return (
-    <span className="relative inline-flex shrink-0 items-center">
-      {wrappedAvatar}
-      {showBadge ? (
-        <Tooltip>
-          <TooltipTrigger
-            render={
-              <span
-                aria-label={badgeTooltip}
-                className="sidebar-icon-chip absolute -top-1.5 -right-1.5 inline-flex size-3 min-w-3 items-center justify-center rounded-full px-px"
-              >
-                {terminalCount > 1 ? (
-                  <span
-                    className={cn(
-                      "text-[11px] font-semibold leading-none tabular-nums",
-                      badgeColorClass,
-                    )}
-                  >
-                    {terminalCount}
-                  </span>
-                ) : (
-                  <TerminalIcon className={cn("size-2.5", badgeColorClass)} />
-                )}
-              </span>
-            }
-          />
-          <TooltipPopup side="top">{badgeTooltip}</TooltipPopup>
-        </Tooltip>
-      ) : null}
-    </span>
-  );
+  return <span className="relative inline-flex shrink-0 items-center">{wrappedAvatar}</span>;
 }
 
 function renderSubagentLabel(input: {
@@ -768,12 +717,6 @@ function SidebarSubagentLabel(props: {
   });
 }
 
-interface TerminalStatusIndicator {
-  label: "Terminal input needed" | "Terminal task completed" | "Terminal process running";
-  colorClass: string;
-  pulse: boolean;
-}
-
 interface PrStatusIndicator {
   label: PrStatePresentation["label"];
   colorClass: string;
@@ -818,35 +761,6 @@ function toThreadPr(
   };
 }
 
-function terminalStatusFromThreadState(input: {
-  runningTerminalIds: string[];
-  terminalAttentionStatesById: Record<string, "attention" | "review">;
-}): TerminalStatusIndicator | null {
-  const terminalAttentionStates = Object.values(input.terminalAttentionStatesById ?? {});
-  if (terminalAttentionStates.includes("attention")) {
-    return {
-      label: "Terminal input needed",
-      colorClass: "text-info",
-      pulse: false,
-    };
-  }
-  if ((input.runningTerminalIds?.length ?? 0) > 0) {
-    return {
-      label: "Terminal process running",
-      colorClass: "text-success",
-      pulse: true,
-    };
-  }
-  if (terminalAttentionStates.includes("review")) {
-    return {
-      label: "Terminal task completed",
-      colorClass: "text-success",
-      pulse: false,
-    };
-  }
-  return null;
-}
-
 function prStatusIndicator(pr: ThreadPr): PrStatusIndicator | null {
   if (!pr) return null;
   const presentation = resolvePrStatePresentation(pr);
@@ -1067,13 +981,9 @@ export default function Sidebar() {
   const reorderProjects = useStore((store) => store.reorderProjects);
   const renameProjectLocally = useStore((store) => store.renameProjectLocally);
   const clearComposerDraftForThread = useComposerDraftStore((store) => store.clearDraftThread);
-  const terminalStateByThreadId = useTerminalStateStore((state) => state.terminalStateByThreadId);
   const projectRunsByProjectId = useProjectRunStore((state) => state.runsByProjectId);
   const storeUpsertProjectRun = useProjectRunStore((state) => state.upsertRun);
   const storeRemoveProjectRun = useProjectRunStore((state) => state.removeRun);
-  const clearTerminalState = useTerminalStateStore((state) => state.clearTerminalState);
-  const openChatThreadPage = useTerminalStateStore((state) => state.openChatThreadPage);
-  const openTerminalThreadPage = useTerminalStateStore((state) => state.openTerminalThreadPage);
   const clearProjectDraftThreads = useComposerDraftStore((store) => store.clearProjectDraftThreads);
   const clearProjectDraftThreadById = useComposerDraftStore(
     (store) => store.clearProjectDraftThreadById,
@@ -1350,14 +1260,6 @@ export default function Sidebar() {
       sidebarThreadSummaryById,
     ],
   );
-  const routeTerminalState = routeThreadId
-    ? selectThreadTerminalState(terminalStateByThreadId, routeThreadId)
-    : null;
-  const terminalOpen = routeTerminalState?.terminalOpen ?? false;
-  const terminalWorkspaceOpen = shouldRenderTerminalWorkspace({
-    presentationMode: routeTerminalState?.presentationMode ?? "drawer",
-    terminalOpen,
-  });
   const pinnedThreadIds = useMemo(
     () =>
       derivePinnedThreadIdsForSidebar({
@@ -2301,7 +2203,7 @@ export default function Sidebar() {
   );
 
   /**
-   * Delete a single thread: stop session, close terminal, dispatch delete,
+   * Delete a single thread: stop session, dispatch delete,
    * clean up drafts/state, and optionally remove orphaned worktree.
    * Callers handle thread-level confirmation; this still prompts for worktree removal.
    */
@@ -2358,13 +2260,6 @@ export default function Sidebar() {
           .catch(() => undefined);
       }
 
-      try {
-        disposeTerminalRuntimeThread(threadId);
-        await api.terminal.close({ threadId, deleteHistory: true });
-      } catch {
-        // Terminal may already be closed
-      }
-
       const allDeletedIds = deletedIds ?? new Set<ThreadId>();
       const shouldNavigateToFallback = routeThreadId === threadId;
       const fallbackThreadId = getFallbackThreadIdAfterDelete({
@@ -2388,7 +2283,6 @@ export default function Sidebar() {
       unpinThread(threadId);
       clearComposerDraftForThread(threadId);
       clearProjectDraftThreadById(thread.projectId, thread.id);
-      clearTerminalState(threadId);
 
       if (shouldNavigateToFallback) {
         if (fallbackThreadId) {
@@ -2431,7 +2325,6 @@ export default function Sidebar() {
       appSettings.sidebarThreadSortOrder,
       clearComposerDraftForThread,
       clearProjectDraftThreadById,
-      clearTerminalState,
       handleNewChat,
       navigate,
       projectById,
@@ -2954,9 +2847,6 @@ export default function Sidebar() {
           { id: "mark-unread", label: "Mark unread" },
           ...handoffItems,
           { id: "copy-path", label: "Copy Path", separatorBefore: true },
-          ...(threadWorkspacePath
-            ? [{ id: "open-path-in-terminal", label: "Open Path in Terminal" }]
-            : []),
           { id: "copy-thread-id", label: "Copy Thread ID" },
           ...(options?.extraItems ?? []),
           { id: "archive", label: "Archive", separatorBefore: true },
@@ -3002,91 +2892,6 @@ export default function Sidebar() {
         copyPathToClipboard(threadWorkspacePath);
         return;
       }
-      if (clicked === "open-path-in-terminal") {
-        if (!threadWorkspacePath) {
-          toastManager.add({
-            type: "error",
-            title: "Path unavailable",
-            description: "This thread does not have a workspace path to open.",
-          });
-          return;
-        }
-        await navigate({ to: "/$threadId", params: { threadId } });
-        const terminalStore = useTerminalStateStore.getState();
-        const currentTerminalState = selectThreadTerminalState(
-          terminalStore.terminalStateByThreadId,
-          threadId,
-        );
-
-        // Reuse the active terminal when one is already open and idle so that
-        // repeatedly invoking "Open Path in Terminal" doesn't pile up tabs.
-        // Only spawn a fresh tab when there is no terminal yet, the active id
-        // is stale (no longer in the layout), or the active terminal is busy
-        // running a subprocess.
-        const candidateBaseTerminalId =
-          currentTerminalState.activeTerminalId ||
-          currentTerminalState.terminalIds[0] ||
-          DEFAULT_THREAD_TERMINAL_ID;
-        const baseTerminalAvailable =
-          currentTerminalState.terminalOpen &&
-          currentTerminalState.terminalIds.includes(candidateBaseTerminalId) &&
-          !currentTerminalState.runningTerminalIds.includes(candidateBaseTerminalId);
-        const shouldCreateNewTerminal = !baseTerminalAvailable;
-        const targetTerminalId = shouldCreateNewTerminal
-          ? `terminal-${randomUUID()}`
-          : candidateBaseTerminalId;
-
-        const previousTerminalOpen = currentTerminalState.terminalOpen;
-        const previousPresentationMode = currentTerminalState.presentationMode;
-        const previousActiveTerminalId = currentTerminalState.activeTerminalId;
-
-        terminalStore.setTerminalPresentationMode(threadId, "drawer");
-        terminalStore.setTerminalOpen(threadId, true);
-        if (shouldCreateNewTerminal) {
-          terminalStore.newTerminal(threadId, targetTerminalId);
-        } else {
-          terminalStore.setActiveTerminal(threadId, targetTerminalId);
-        }
-
-        const cdCommand = `cd ${quotePosixShellArgument(threadWorkspacePath)}\r`;
-        try {
-          if (shouldCreateNewTerminal) {
-            // A brand new PTY needs an explicit cwd so that the shell's first
-            // prompt already shows the workspace path. The follow-up `cd` write
-            // makes the navigation visible in the scrollback (it's effectively
-            // a no-op since the shell is already there, but it matches the
-            // user-typed-it experience).
-            await api.terminal.open({
-              threadId,
-              terminalId: targetTerminalId,
-              cwd: threadWorkspacePath,
-            });
-          }
-          // Existing PTYs keep their launch cwd/env on reattach; writing `cd`
-          // navigates in place without replacing shell state.
-          await api.terminal.write({
-            threadId,
-            terminalId: targetTerminalId,
-            data: cdCommand,
-          });
-        } catch (error) {
-          if (shouldCreateNewTerminal) {
-            terminalStore.closeTerminal(threadId, targetTerminalId);
-          }
-          terminalStore.setTerminalPresentationMode(threadId, previousPresentationMode);
-          terminalStore.setTerminalOpen(threadId, previousTerminalOpen);
-          if (previousActiveTerminalId) {
-            terminalStore.setActiveTerminal(threadId, previousActiveTerminalId);
-          }
-          toastManager.add({
-            type: "error",
-            title: "Unable to open terminal",
-            description:
-              error instanceof Error ? error.message : "The terminal could not be opened.",
-          });
-        }
-        return;
-      }
       if (clicked === "copy-thread-id") {
         copyThreadIdToClipboard(threadId);
         return;
@@ -3228,8 +3033,6 @@ export default function Sidebar() {
   const { activateThreadFromSidebarIntent } = useThreadActivationController({
     clearSelection,
     navigate,
-    openChatThreadPage,
-    openTerminalThreadPage,
     prewarmThreadDetailForIntent,
     rememberLastThreadRouteNow,
     routeThreadId,
@@ -3237,7 +3040,6 @@ export default function Sidebar() {
     setOptimisticActiveThreadId,
     setSelectionAnchor,
     sidebarThreadSummaryById,
-    terminalStateByThreadId,
   });
 
   const handleStartProjectRun = useCallback(
@@ -3254,7 +3056,7 @@ export default function Sidebar() {
       // The dialog lets the user edit the default command before launching, so an
       // explicit override wins over the resolved default while reusing its cwd.
       const command = commandOverride?.trim() || runCommand.command;
-      // Dev servers run from the project root; mirror the env the terminal runner
+      // Dev servers run from the project root; mirror the env the runner
       // would otherwise inject so scripts resolve project paths identically.
       const env = projectScriptRuntimeEnv({
         project: { cwd: project.cwd },
@@ -4275,14 +4077,7 @@ export default function Sidebar() {
     () => [...threadJumpCommandByThreadId.keys()],
     [threadJumpCommandByThreadId],
   );
-  const getCurrentSidebarShortcutContext = useCallback(
-    () => ({
-      terminalFocus: isTerminalFocused(),
-      terminalOpen,
-      terminalWorkspaceOpen,
-    }),
-    [terminalOpen, terminalWorkspaceOpen],
-  );
+  const getCurrentSidebarShortcutContext = useCallback(() => ({}), []);
   const [threadJumpLabelByThreadId, setThreadJumpLabelByThreadId] =
     useState<ReadonlyMap<ThreadId, string>>(EMPTY_THREAD_JUMP_LABELS);
   const threadJumpLabelsRef = useRef<ReadonlyMap<ThreadId, string>>(EMPTY_THREAD_JUMP_LABELS);
@@ -4384,6 +4179,39 @@ export default function Sidebar() {
     );
   }
 
+  /**
+   * The row's single identity glyph, rendered *before* the title.
+   *
+   * One slot, one glyph: a pull-request badge outranks the provider avatar,
+   * because when a thread has a PR that is the more specific fact about it and
+   * two icons on one row read as noise.
+   */
+  function renderThreadIdentityGlyph(input: {
+    prStatus: PrStatusIndicator | null;
+    provider: ProviderKind;
+    handoffSourceProvider: ProviderKind | null;
+    handoffTooltip: string | null;
+    showProviderAvatar: boolean;
+  }) {
+    if (input.prStatus) {
+      return (
+        <ThreadPrStatusBadge
+          prStatus={input.prStatus}
+          onOpen={openPrLink}
+          className="pointer-events-auto size-4"
+        />
+      );
+    }
+    if (!input.showProviderAvatar) return null;
+    return (
+      <ProviderAvatar
+        provider={input.provider}
+        handoffSourceProvider={input.handoffSourceProvider}
+        handoffTooltip={input.handoffTooltip}
+      />
+    );
+  }
+
   function renderThreadRowTrailingCluster(input: {
     isSubagentThread: boolean;
     threadJumpLabel: string | null;
@@ -4467,21 +4295,12 @@ export default function Sidebar() {
   }
 
   function renderPinnedThreadRow(thread: SidebarThreadSummary) {
-    const threadTerminalState = selectThreadTerminalState(terminalStateByThreadId, thread.id);
-    const threadEntryPoint = threadTerminalState.entryPoint;
-    const terminalStatus = terminalStatusFromThreadState({
-      runningTerminalIds: threadTerminalState.runningTerminalIds,
-      terminalAttentionStatesById: threadTerminalState.terminalAttentionStatesById,
-    });
-    const terminalCount = threadTerminalState.terminalIds.length;
     const isActive = visualActiveSidebarThreadId === thread.id;
     const rightMetaChips = resolveThreadRowMetaChips({
       thread,
       includeHandoffBadge: true,
       handoffShownInAvatar:
-        threadEntryPoint !== "terminal" &&
-        !isGenericChatThreadTitle(thread.title) &&
-        Boolean(thread.handoff?.sourceProvider),
+        !isGenericChatThreadTitle(thread.title) && Boolean(thread.handoff?.sourceProvider),
     });
     const threadStatus = resolveThreadStatusForSidebar(thread);
     const isSubagentThread = Boolean(thread.parentThreadId);
@@ -4511,13 +4330,6 @@ export default function Sidebar() {
         data-thread-hover-anchor={hoverAnchorId}
         className="group/thread-row relative w-full"
       >
-        {leadingPrStatus ? (
-          <ThreadPrStatusBadge
-            prStatus={leadingPrStatus}
-            onOpen={openPrLink}
-            className="pointer-events-auto absolute left-1.5 top-1/2 z-30 size-5 -translate-y-1/2"
-          />
-        ) : null}
         <div
           role="button"
           tabIndex={0}
@@ -4528,8 +4340,7 @@ export default function Sidebar() {
             // space, with a trailing reserve that grows only for the badges actually
             // present — instead of a rigid grid that permanently fenced off a
             // timestamp-era column and squeezed the title/project even when wide.
-            "relative h-auto min-h-10 gap-1.5 py-1 transition-[background-color,color,scale] duration-press ease-out active:scale-[0.96] motion-reduce:active:scale-100",
-            leadingPrStatus && "pl-8",
+            "relative h-auto min-h-8 gap-1 py-0.5 transition-[background-color,color,scale] duration-press ease-out active:scale-[0.96] motion-reduce:active:scale-100",
             resolveThreadRowTrailingReserveClass({
               metaChipCount: isActive ? rightMetaChips.length : 0,
               hasTrailingGlyph: hasTrailingStatusGlyph,
@@ -4561,40 +4372,34 @@ export default function Sidebar() {
             });
           }}
         >
-          {threadEntryPoint === "terminal" ? (
-            <SidebarGlyph icon={TerminalIcon} variant="chrome" />
-          ) : showThreadProviderAvatar ? (
-            <ProviderAvatarWithTerminal
-              provider={thread.modelSelection.provider ?? thread.session?.provider}
-              handoffSourceProvider={thread.handoff?.sourceProvider ?? null}
-              handoffTooltip={handoffBadgeLabel}
-              terminalStatus={terminalStatus}
-              terminalCount={terminalCount}
-            />
-          ) : null}
-          <div className="grid min-w-0 flex-1 gap-0.5 text-left">
-            <div className="flex min-w-0 items-center gap-1.5">
-              <span
-                className={cn(
-                  "min-w-0 flex-1 truncate text-[length:calc(var(--app-font-size-ui,12px)+0.5px)] leading-5",
-                  isActive ? "text-foreground" : SIDEBAR_ROW_LABEL_TEXT_CLASS_NAME,
-                )}
-                data-testid={`thread-title-${thread.id}`}
-              >
-                {isSubagentThread ? (
-                  <SidebarSubagentLabel
-                    threadId={thread.id}
-                    parentThreadId={thread.parentThreadId}
-                    agentId={thread.subagentAgentId}
-                    nickname={thread.subagentNickname}
-                    role={thread.subagentRole}
-                    title={thread.title}
-                  />
-                ) : (
-                  thread.title
-                )}
-              </span>
-            </div>
+          <div className="flex min-w-0 flex-1 items-center gap-1 text-left">
+            {renderThreadIdentityGlyph({
+              prStatus: leadingPrStatus,
+              provider: thread.modelSelection.provider ?? thread.session?.provider,
+              handoffSourceProvider: thread.handoff?.sourceProvider ?? null,
+              handoffTooltip: handoffBadgeLabel,
+              showProviderAvatar: showThreadProviderAvatar,
+            })}
+            <span
+              className={cn(
+                "min-w-0 truncate text-[length:calc(var(--app-font-size-ui,12px)+0.5px)] leading-5",
+                isActive ? "text-foreground" : SIDEBAR_ROW_LABEL_TEXT_CLASS_NAME,
+              )}
+              data-testid={`thread-title-${thread.id}`}
+            >
+              {isSubagentThread ? (
+                <SidebarSubagentLabel
+                  threadId={thread.id}
+                  parentThreadId={thread.parentThreadId}
+                  agentId={thread.subagentAgentId}
+                  nickname={thread.subagentNickname}
+                  role={thread.subagentRole}
+                  title={thread.title}
+                />
+              ) : (
+                thread.title
+              )}
+            </span>
           </div>
           <div className="absolute top-1/2 right-1.5 flex -translate-y-1/2 items-center">
             {renderThreadRowTrailingCluster({
@@ -4630,19 +4435,12 @@ export default function Sidebar() {
     topLevel = false,
     treeConnected = false,
   ) {
-    const threadTerminalState = selectThreadTerminalState(terminalStateByThreadId, thread.id);
-    const threadEntryPoint = threadTerminalState.entryPoint;
     const isActive = visualActiveSidebarThreadId === thread.id;
     const isPinned = pinnedThreadIdSet.has(thread.id);
     const isSelected = selectedThreadIds.has(thread.id);
     const isHighlighted = isActive || isSelected;
     const threadStatus = resolveThreadStatusForSidebar(thread);
     const prStatus = prStatusIndicator(prByThreadId.get(thread.id) ?? null);
-    const terminalStatus = terminalStatusFromThreadState({
-      runningTerminalIds: threadTerminalState.runningTerminalIds,
-      terminalAttentionStatesById: threadTerminalState.terminalAttentionStatesById,
-    });
-    const terminalCount = threadTerminalState.terminalIds.length;
     const secondaryMetaClass = isHighlighted
       ? "text-foreground/54 dark:text-foreground/64"
       : "text-muted-foreground/34";
@@ -4650,9 +4448,7 @@ export default function Sidebar() {
       thread,
       includeHandoffBadge: true,
       handoffShownInAvatar:
-        threadEntryPoint !== "terminal" &&
-        !isGenericChatThreadTitle(thread.title) &&
-        Boolean(thread.handoff?.sourceProvider),
+        !isGenericChatThreadTitle(thread.title) && Boolean(thread.handoff?.sourceProvider),
     });
     const isSubagentThread = Boolean(thread.parentThreadId);
     const isProjectTreeThread = !topLevel && !isSubagentThread;
@@ -4697,20 +4493,12 @@ export default function Sidebar() {
         className={cn(
           "group/thread-row w-full",
           treeConnected &&
-            "before:absolute before:top-4 before:-left-2 before:h-px before:w-2 before:bg-foreground/[0.08]",
+            "before:absolute before:top-4 before:-left-2 before:h-px before:w-2 before:bg-foreground/[0.05]",
         )}
         data-thread-item
       >
-        {leadingPrStatus ? (
-          <ThreadPrStatusBadge
-            prStatus={leadingPrStatus}
-            onOpen={openPrLink}
-            className="pointer-events-auto absolute left-1.5 top-1/2 z-30 size-5 -translate-y-1/2"
-          />
-        ) : null}
         <SidebarMenuSubButton
           render={<div role="button" tabIndex={0} />}
-          data-thread-entry-point={threadEntryPoint}
           size="sm"
           isActive={isActive}
           className={cn(
@@ -4718,8 +4506,8 @@ export default function Sidebar() {
               isActive,
               isSelected,
             }),
-            isProjectTreeThread && "!h-8 !min-h-8 py-0",
-            leadingPrStatus ? "pl-8" : topLevel && !isSubagentThread ? "pl-2" : null,
+            isProjectTreeThread && "!h-7 !min-h-7 py-0",
+            topLevel && !isSubagentThread ? "pl-1.5" : null,
             isSubagentThread
               ? "pr-7.5"
               : resolveThreadRowTrailingReserveClass({
@@ -4791,67 +4579,46 @@ export default function Sidebar() {
                 style={{ backgroundColor: subagentPresentation?.accentColor }}
               />
             </span>
-          ) : threadEntryPoint === "terminal" ? (
-            isProjectTreeThread ? (
-              <span className="inline-flex size-[26px] shrink-0 items-center justify-center text-muted-foreground/85">
-                <SidebarGlyph icon={TerminalIcon} variant="chrome" />
-              </span>
-            ) : (
-              <SidebarGlyph icon={TerminalIcon} variant="chrome" />
-            )
-          ) : showThreadProviderAvatar ? (
-            isProjectTreeThread ? (
-              <span className="inline-flex size-[26px] shrink-0 items-center justify-center text-muted-foreground/85">
-                <ProviderAvatarWithTerminal
-                  provider={thread.modelSelection.provider ?? thread.session?.provider}
-                  handoffSourceProvider={thread.handoff?.sourceProvider ?? null}
-                  handoffTooltip={handoffBadgeLabel}
-                  terminalStatus={terminalStatus}
-                  terminalCount={terminalCount}
-                />
-              </span>
-            ) : (
-              <ProviderAvatarWithTerminal
-                provider={thread.modelSelection.provider ?? thread.session?.provider}
-                handoffSourceProvider={thread.handoff?.sourceProvider ?? null}
-                handoffTooltip={handoffBadgeLabel}
-                terminalStatus={terminalStatus}
-                terminalCount={terminalCount}
-              />
-            )
           ) : null}
           <div
             className={cn(
               "flex min-w-0 flex-1 items-center text-left",
-              isSubagentThread ? "gap-[5px]" : "gap-1.5",
+              isSubagentThread ? "gap-[5px]" : "gap-1",
             )}
           >
-            <div className="flex min-w-0 items-center gap-1.5">
-              <span
-                className={cn(
-                  "min-w-0 flex-1 truncate text-[length:var(--app-font-size-ui,12px)]",
-                  // Inactive thread names share the resting label color with
-                  // project/folder headers; the active row still pops via its
-                  // background + full-foreground color from resolveThreadRowClassName.
-                  isActive ? "text-foreground" : SIDEBAR_ROW_LABEL_TEXT_CLASS_NAME,
-                  isSubagentThread ? "leading-[18px] text-foreground/80" : "leading-5",
-                )}
-              >
-                {isSubagentThread ? (
-                  <SidebarSubagentLabel
-                    threadId={thread.id}
-                    parentThreadId={thread.parentThreadId}
-                    agentId={thread.subagentAgentId}
-                    nickname={thread.subagentNickname}
-                    role={thread.subagentRole}
-                    title={thread.title}
-                    roleClassName="text-muted-foreground/42"
-                  />
-                ) : (
-                  thread.title
-                )}
-              </span>
-            </div>
+            {isSubagentThread
+              ? null
+              : renderThreadIdentityGlyph({
+                  prStatus: leadingPrStatus,
+                  provider: thread.modelSelection.provider ?? thread.session?.provider,
+                  handoffSourceProvider: thread.handoff?.sourceProvider ?? null,
+                  handoffTooltip: handoffBadgeLabel,
+                  showProviderAvatar: showThreadProviderAvatar,
+                })}
+            <span
+              className={cn(
+                "min-w-0 truncate text-[length:var(--app-font-size-ui,12px)]",
+                // Inactive thread names share the resting label color with
+                // project/folder headers; the active row still pops via its
+                // background + full-foreground color from resolveThreadRowClassName.
+                isActive ? "text-foreground" : SIDEBAR_ROW_LABEL_TEXT_CLASS_NAME,
+                isSubagentThread ? "leading-[18px] text-foreground/80" : "leading-5",
+              )}
+            >
+              {isSubagentThread ? (
+                <SidebarSubagentLabel
+                  threadId={thread.id}
+                  parentThreadId={thread.parentThreadId}
+                  agentId={thread.subagentAgentId}
+                  nickname={thread.subagentNickname}
+                  role={thread.subagentRole}
+                  title={thread.title}
+                  roleClassName="text-muted-foreground/42"
+                />
+              ) : (
+                thread.title
+              )}
+            </span>
           </div>
           <div className="ml-auto flex shrink-0 items-center gap-1.5 pr-1">
             {canToggleSubagents ? (
@@ -5039,21 +4806,6 @@ export default function Sidebar() {
             <PinStatusIcon pinned={isProjectPinned} className="size-3.5" />
           </button>
           <SidebarSectionToolbar placement="overlay" revealOnHover>
-            <SidebarIconButton
-              icon={TerminalIcon}
-              label={`Create new terminal thread in ${project.name}`}
-              tooltip={
-                newTerminalThreadShortcutLabel
-                  ? `New terminal thread (${newTerminalThreadShortcutLabel})`
-                  : "New terminal thread"
-              }
-              tooltipSide="top"
-              onClick={(event) => {
-                event.preventDefault();
-                event.stopPropagation();
-                void handleNewThread(project.id, { entryPoint: "terminal" });
-              }}
-            />
             <SidebarIconButton
               icon={NewThreadIcon}
               label={`Create new thread in ${project.name}`}
@@ -5081,7 +4833,7 @@ export default function Sidebar() {
           <div className={DISCLOSURE_INNER_CLASS}>
             <SidebarMenuSub
               className={cn(
-                "my-0 mr-0 ml-2 w-auto translate-x-0 border-l border-foreground/[0.08] py-0 pr-0 pl-2",
+                "my-0 mr-0 ml-2 w-auto translate-x-0 border-l border-foreground/[0.05] py-0 pr-0 pl-2",
                 SIDEBAR_NESTED_LIST_GAP_CLASS_NAME,
                 "!gap-0",
                 disclosureContentClassName(project.expanded),
@@ -5244,7 +4996,6 @@ export default function Sidebar() {
             const nextLabelMap = buildThreadJumpLabelMap({
               keybindings,
               platform: navigator.platform,
-              terminalOpen: shortcutContext.terminalOpen,
               threadJumpCommandByThreadId,
             });
             return threadJumpLabelMapsEqual(current, nextLabelMap) ? current : nextLabelMap;
@@ -5331,7 +5082,6 @@ export default function Sidebar() {
         const nextLabelMap = buildThreadJumpLabelMap({
           keybindings,
           platform: navigator.platform,
-          terminalOpen: shortcutContext.terminalOpen,
           threadJumpCommandByThreadId,
         });
         return threadJumpLabelMapsEqual(current, nextLabelMap) ? current : nextLabelMap;
@@ -5493,7 +5243,6 @@ export default function Sidebar() {
   const newChatShortcutLabel =
     shortcutLabelForCommand(keybindings, "chat.newChat") ??
     shortcutLabelForCommand(keybindings, "chat.newLocal");
-  const newTerminalThreadShortcutLabel = shortcutLabelForCommand(keybindings, "chat.newTerminal");
   const importThreadShortcutLabel =
     shortcutLabelForCommand(keybindings, "sidebar.importThread") ??
     (isMacPlatform(navigator.platform) ? "⌘I" : "Ctrl+I");
@@ -6224,7 +5973,6 @@ export default function Sidebar() {
                     <SidebarLeadingIcon size="sm" tone={SIDEBAR_ROW_LABEL_TEXT_CLASS_NAME}>
                       <SidebarGlyph icon={SettingsIcon} variant="leading" />
                     </SidebarLeadingIcon>
-                    <span>Settings</span>
                   </SidebarMenuButton>
                 )}
                 {showDesktopUpdateButton ? (
diff --git a/apps/web/src/components/SidebarSearchPalette.logic.test.ts b/apps/web/src/components/SidebarSearchPalette.logic.test.ts
index bdc18d7b1..e8389ea72 100644
--- a/apps/web/src/components/SidebarSearchPalette.logic.test.ts
+++ b/apps/web/src/components/SidebarSearchPalette.logic.test.ts
@@ -3,11 +3,9 @@ import { assert, describe, it } from "vitest";
 import {
   matchSidebarSearchActions,
   matchSidebarSearchProjects,
-  matchSidebarSearchThemes,
   matchSidebarSearchThreads,
   type SidebarSearchAction,
   type SidebarSearchProject,
-  type SidebarSearchTheme,
   type SidebarSearchThread,
 } from "./SidebarSearchPalette.logic";
 
@@ -54,47 +52,6 @@ const projects: SidebarSearchProject[] = [
   },
 ];
 
-const themes: SidebarSearchTheme[] = [
-  {
-    id: "theme-mode-system",
-    type: "mode",
-    label: "System",
-    description: "Match your OS appearance setting.",
-    keywords: ["appearance", "theme", "mode", "os"],
-    mode: "system",
-    isActive: true,
-  },
-  {
-    id: "theme-mode-dark",
-    type: "mode",
-    label: "Dark",
-    description: "Always use the dark theme.",
-    keywords: ["appearance", "theme", "mode", "night"],
-    mode: "dark",
-    isActive: false,
-  },
-  {
-    id: "theme-codex-dark",
-    type: "code-theme",
-    label: "Codex",
-    description: "Apply to the current dark theme slot.",
-    keywords: ["appearance", "theme", "dark"],
-    codeThemeId: "codex",
-    variant: "dark",
-    isActive: true,
-  },
-  {
-    id: "theme-linear-dark",
-    type: "code-theme",
-    label: "Linear",
-    description: "Apply to the current dark theme slot.",
-    keywords: ["appearance", "theme", "dark"],
-    codeThemeId: "linear",
-    variant: "dark",
-    isActive: false,
-  },
-];
-
 const threads: SidebarSearchThread[] = [
   {
     id: "thread-alpha-composer",
@@ -166,24 +123,6 @@ describe("SidebarSearchPalette.logic", () => {
     assert.equal(result[0]?.shortcutLabel, "⇧⌘U");
   });
 
-  it("keeps theme entries in source order for an empty query", () => {
-    const result = matchSidebarSearchThemes(themes, "");
-
-    assert.deepEqual(
-      result.map((theme) => theme.id),
-      ["theme-mode-system", "theme-mode-dark", "theme-codex-dark", "theme-linear-dark"],
-    );
-  });
-
-  it("matches themes by query relevance", () => {
-    const result = matchSidebarSearchThemes(themes, "dark");
-
-    assert.deepEqual(
-      result.map((theme) => theme.id),
-      ["theme-mode-dark", "theme-codex-dark", "theme-linear-dark"],
-    );
-  });
-
   it("matches projects by repo name before cwd fragments", () => {
     const result = matchSidebarSearchProjects(projects, "alpha");
 
diff --git a/apps/web/src/components/SidebarSearchPalette.logic.ts b/apps/web/src/components/SidebarSearchPalette.logic.ts
index ade6f1585..7635d77be 100644
--- a/apps/web/src/components/SidebarSearchPalette.logic.ts
+++ b/apps/web/src/components/SidebarSearchPalette.logic.ts
@@ -1,9 +1,8 @@
-// Purpose: Scores sidebar palette results for actions, themes, projects, and chat threads.
+// Purpose: Scores sidebar palette results for actions, projects, and chat threads.
 // Keeps search local and deterministic so the palette can rank title hits above
 // message-content hits while still surfacing a useful snippet for chat matches.
 import type { ProviderKind } from "@t3tools/contracts";
 import { basenameOfPath } from "../file-icons";
-import type { ThemeMode, ThemeVariant } from "../theme/theme.logic";
 
 export interface SidebarSearchAction {
   id: string;
@@ -13,18 +12,6 @@ export interface SidebarSearchAction {
   shortcutLabel?: string | null;
 }
 
-export interface SidebarSearchTheme {
-  id: string;
-  type: "mode" | "code-theme";
-  label: string;
-  description: string;
-  keywords?: readonly string[];
-  mode?: ThemeMode;
-  codeThemeId?: string;
-  variant?: ThemeVariant;
-  isActive: boolean;
-}
-
 export interface SidebarSearchProject {
   id: string;
   name: string;
@@ -193,22 +180,6 @@ function scoreAction(action: SidebarSearchAction, query: string): number | null
   return null;
 }
 
-function scoreTheme(theme: SidebarSearchTheme, query: string): number | null {
-  if (!query) return 0;
-
-  const label = normalizeText(theme.label);
-  const description = normalizeText(theme.description);
-  const keywords = (theme.keywords ?? []).map(normalizeText);
-
-  if (label === query) return 145;
-  if (keywords.some((keyword) => keyword === query)) return 135;
-  if (label.startsWith(query)) return 125;
-  if (label.includes(query)) return 110;
-  if (keywords.some((keyword) => keyword.includes(query))) return 95;
-  if (description.includes(query)) return 75;
-  return null;
-}
-
 function scoreProject(project: SidebarSearchProject, query: string): number | null {
   if (!query) return null;
 
@@ -250,32 +221,6 @@ export function matchSidebarSearchActions(
     .map((candidate) => candidate.action);
 }
 
-export function matchSidebarSearchThemes(
-  themes: readonly SidebarSearchTheme[],
-  query: string,
-): SidebarSearchTheme[] {
-  const normalizedQuery = normalizeText(query);
-  if (!normalizedQuery) {
-    return [...themes];
-  }
-
-  return themes
-    .map((theme, index) => ({
-      theme,
-      index,
-      score: scoreTheme(theme, normalizedQuery),
-    }))
-    .filter((candidate) => candidate.score !== null)
-    .toSorted((left, right) => {
-      if (left.score !== right.score) return (right.score ?? 0) - (left.score ?? 0);
-      if (left.theme.isActive !== right.theme.isActive) {
-        return left.theme.isActive ? -1 : 1;
-      }
-      return left.index - right.index;
-    })
-    .map((candidate) => candidate.theme);
-}
-
 export function matchSidebarSearchProjects(
   projects: readonly SidebarSearchProject[],
   query: string,
diff --git a/apps/web/src/components/SidebarSearchPalette.tsx b/apps/web/src/components/SidebarSearchPalette.tsx
index 87f6e617c..e7e111f35 100644
--- a/apps/web/src/components/SidebarSearchPalette.tsx
+++ b/apps/web/src/components/SidebarSearchPalette.tsx
@@ -4,15 +4,7 @@
  * Keeps the sidebar search UX aligned with the shared command primitives so
  * keyboard navigation and shortcut labels behave like the rest of the app.
  */
-import {
-  CheckIcon,
-  DeviceLaptopIcon,
-  MoonIcon,
-  NewThreadIcon,
-  SearchIcon,
-  SettingsIcon,
-  SunIcon,
-} from "~/lib/icons";
+import { CheckIcon, NewThreadIcon, SearchIcon, SettingsIcon } from "~/lib/icons";
 import {
   type FilesystemBrowseResult,
   type ImportableDesktopThread,
@@ -59,7 +51,6 @@ import {
   matchSidebarSearchProjects,
   matchSidebarSearchThreads,
 } from "./SidebarSearchPalette.logic";
-import { useTheme } from "../hooks/useTheme";
 import {
   Command,
   CommandDialog,
@@ -171,110 +162,6 @@ function PaletteIcon(props: { icon: IconComponent }) {
   );
 }
 
-type ThemeCommandItem = {
-  description: string;
-  id: string;
-  isActive: boolean;
-  label: string;
-  mode: "system" | "light" | "dark";
-};
-
-function queryTokens(query: string): string[] {
-  return query
-    .trim()
-    .toLowerCase()
-    .split(/\s+/)
-    .filter((token) => token.length > 0);
-}
-
-function hasTokenEqual(query: string, token: string): boolean {
-  return queryTokens(query).includes(token);
-}
-
-function createThemeCommandItem(
-  mode: ThemeCommandItem["mode"],
-  activeMode: ThemeCommandItem["mode"],
-): ThemeCommandItem {
-  if (mode === "system") {
-    return {
-      id: "theme-command:system",
-      label: "Follow system appearance",
-      description: "Match your OS appearance setting.",
-      mode,
-      isActive: activeMode === mode,
-    };
-  }
-
-  return {
-    id: `theme-command:${mode}`,
-    label: `Switch to ${mode} theme`,
-    description: mode === "light" ? "Always use the light theme." : "Always use the dark theme.",
-    mode,
-    isActive: activeMode === mode,
-  };
-}
-
-// Treat any token of length >= 2 that is a prefix of `keyword` as a match,
-// so typing `th` / `the` already starts surfacing theme actions.
-function hasTokenPrefixOf(query: string, keyword: string): boolean {
-  return queryTokens(query).some((token) => token.length >= 2 && keyword.startsWith(token));
-}
-
-// Keep the palette quiet by default, then expose focused appearance actions
-// once the user is clearly asking about theme modes.
-function buildThemeCommandItems(input: {
-  query: string;
-  resolvedTheme: "light" | "dark";
-  theme: "system" | "light" | "dark";
-}): ThemeCommandItem[] {
-  const normalizedQuery = input.query.trim().toLowerCase();
-  if (!normalizedQuery) {
-    return [];
-  }
-
-  if (
-    hasTokenEqual(normalizedQuery, "system") ||
-    hasTokenEqual(normalizedQuery, "auto") ||
-    hasTokenEqual(normalizedQuery, "automatic") ||
-    hasTokenEqual(normalizedQuery, "os")
-  ) {
-    return [createThemeCommandItem("system", input.theme)];
-  }
-
-  if (hasTokenEqual(normalizedQuery, "light")) {
-    return [
-      createThemeCommandItem("light", input.theme),
-      createThemeCommandItem("system", input.theme),
-    ];
-  }
-
-  if (hasTokenEqual(normalizedQuery, "dark")) {
-    return [
-      createThemeCommandItem("dark", input.theme),
-      createThemeCommandItem("system", input.theme),
-    ];
-  }
-
-  if (
-    hasTokenPrefixOf(normalizedQuery, "theme") ||
-    hasTokenPrefixOf(normalizedQuery, "appearance")
-  ) {
-    const nextMode = input.resolvedTheme === "dark" ? "light" : "dark";
-    return [
-      createThemeCommandItem(nextMode, input.theme),
-      createThemeCommandItem("system", input.theme),
-    ];
-  }
-
-  return [];
-}
-
-const THEME_MODE_ICONS: Record<"system" | "light" | "dark", IconComponent> = {
-  system: DeviceLaptopIcon,
-  light: SunIcon,
-  dark: MoonIcon,
-};
-
 function ProviderIcon(props: { provider: ProviderKind }) {
   return (
     <div className="flex size-5 shrink-0 items-center justify-center">
@@ -350,7 +237,6 @@ function HighlightedText(props: { text: string; query: string; className?: strin
 }
 
 export function SidebarSearchPalette(props: SidebarSearchPaletteProps) {
-  const { resolvedTheme, setTheme, theme } = useTheme();
   const [query, setQuery] = useState(props.initialBrowseQuery ?? "");
   const [highlightedItemValue, setHighlightedItemValue] = useState<string | null>(null);
   const [importProvider, setImportProvider] = useState<ImportProviderKind>(
@@ -474,16 +360,6 @@ export function SidebarSearchPalette(props: SidebarSearchPaletteProps) {
     () => (isBrowsing ? [] : matchSidebarSearchActions(props.actions, query)),
     [isBrowsing, props.actions, query],
   );
-  const themeCommandItems = useMemo(
-    () =>
-      buildThemeCommandItems({
-        query,
-        resolvedTheme,
-        theme,
-      }),
-    [query, resolvedTheme, theme],
-  );
-  const showThemeSection = !isBrowsing && query.trim().length > 0 && themeCommandItems.length > 0;
   const matchedProjects = useMemo(
     () => (isBrowsing ? [] : matchSidebarSearchProjects(props.projects, query)),
     [isBrowsing, props.projects, query],
@@ -493,10 +369,7 @@ export function SidebarSearchPalette(props: SidebarSearchPaletteProps) {
     [isBrowsing, props.threads, query],
   );
   const hasSearchResults =
-    matchedActions.length > 0 ||
-    themeCommandItems.length > 0 ||
-    matchedProjects.length > 0 ||
-    matchedThreads.length > 0;
+    matchedActions.length > 0 || matchedProjects.length > 0 || matchedThreads.length > 0;
   const importFieldLabel = importProvider === "codex" ? "Thread ID" : "Session ID";
   const importPlaceholder =
     importProvider === "claudeAgent"
@@ -1059,7 +932,7 @@ export function SidebarSearchPalette(props: SidebarSearchPaletteProps) {
 
                   {!isBrowsing &&
                   matchedActions.length > 0 &&
-                  (matchedThreads.length > 0 || matchedProjects.length > 0 || showThemeSection) ? (
+                  (matchedThreads.length > 0 || matchedProjects.length > 0) ? (
                     <CommandSeparator />
                   ) : null}
 
@@ -1129,9 +1002,7 @@ export function SidebarSearchPalette(props: SidebarSearchPaletteProps) {
                     </CommandGroup>
                   ) : null}
 
-                  {!isBrowsing &&
-                  matchedThreads.length > 0 &&
-                  (matchedProjects.length > 0 || showThemeSection) ? (
+                  {!isBrowsing && matchedThreads.length > 0 && matchedProjects.length > 0 ? (
                     <CommandSeparator />
                   ) : null}
 
@@ -1167,46 +1038,6 @@ export function SidebarSearchPalette(props: SidebarSearchPaletteProps) {
                     </CommandGroup>
                   ) : null}
 
-                  {showThemeSection && matchedProjects.length > 0 ? <CommandSeparator /> : null}
-
-                  {showThemeSection ? (
-                    <>
-                      {themeCommandItems.length > 0 ? (
-                        <CommandGroup>
-                          <CommandGroupLabel className="py-1.5 pl-3">Configure</CommandGroupLabel>
-                          {themeCommandItems.map((themeCommandItem) => (
-                            <CommandItem
-                              key={themeCommandItem.id}
-                              value={themeCommandItem.id}
-                              className="cursor-pointer items-center gap-3 rounded-lg px-3 py-1.5"
-                              onMouseDown={(event) => {
-                                event.preventDefault();
-                              }}
-                              onClick={() => {
-                                if (themeCommandItem.isActive) return;
-                                props.onOpenChange(false);
-                                setTheme(themeCommandItem.mode);
-                              }}
-                            >
-                              <PaletteIcon icon={THEME_MODE_ICONS[themeCommandItem.mode]} />
-                              <span className="min-w-0 flex-1 truncate text-[length:var(--app-font-size-ui,14px)] text-foreground">
-                                {themeCommandItem.label}
-                              </span>
-                              <span
-                                className="flex size-3.5 shrink-0 items-center justify-center"
-                                aria-hidden={!themeCommandItem.isActive}
-                              >
-                                {themeCommandItem.isActive ? (
-                                  <CheckIcon className="size-3.5 text-muted-foreground/79" />
-                                ) : null}
-                              </span>
-                            </CommandItem>
-                          ))}
-                        </CommandGroup>
-                      ) : null}
-                    </>
-                  ) : null}
-
                   {!isBrowsing && !hasSearchResults ? (
                     <CommandEmpty className="py-10">
                       <div className="flex flex-col items-center justify-center gap-2 text-center text-sm text-muted-foreground/79">
@@ -1236,7 +1067,7 @@ export function SidebarSearchPalette(props: SidebarSearchPaletteProps) {
                   </>
                 ) : (
                   <>
-                    <span>Jump to threads, projects, actions, or appearance.</span>
+                    <span>Jump to threads, projects, or actions.</span>
                     <span>Enter to open</span>
                   </>
                 )}
diff --git a/apps/web/src/components/TerminalScrollToBottom.tsx b/apps/web/src/components/TerminalScrollToBottom.tsx
deleted file mode 100644
index 4cdd1e68e..000000000
--- a/apps/web/src/components/TerminalScrollToBottom.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-// FILE: TerminalScrollToBottom.tsx
-// Purpose: Shows a floating terminal action when output has scrolled away from the bottom.
-// Layer: Terminal presentation component
-// Exports: TerminalScrollToBottom
-
-import type { Terminal } from "@xterm/xterm";
-import { useCallback, useEffect, useRef, useState } from "react";
-import { IconButton } from "~/components/ui/icon-button";
-import { ArrowDownIcon } from "~/lib/icons";
-import { cn } from "~/lib/utils";
-
-interface TerminalScrollToBottomProps {
-  terminal: Terminal | null;
-}
-
-export function TerminalScrollToBottom({ terminal }: TerminalScrollToBottomProps) {
-  const [isVisible, setIsVisible] = useState(false);
-  const visibilityRafRef = useRef<number | null>(null);
-
-  const checkPosition = useCallback(() => {
-    if (!terminal) return;
-    const buf = terminal.buffer.active;
-    const nextVisible = buf.viewportY < buf.baseY;
-    setIsVisible((current) => (current === nextVisible ? current : nextVisible));
-  }, [terminal]);
-
-  const scheduleVisibilityCheck = useCallback(() => {
-    if (visibilityRafRef.current !== null) {
-      return;
-    }
-    visibilityRafRef.current = window.requestAnimationFrame(() => {
-      visibilityRafRef.current = null;
-      checkPosition();
-    });
-  }, [checkPosition]);
-
-  useEffect(() => {
-    if (!terminal) {
-      setIsVisible(false);
-      return;
-    }
-    scheduleVisibilityCheck();
-    const d1 = terminal.onWriteParsed(scheduleVisibilityCheck);
-    const d2 = terminal.onScroll(scheduleVisibilityCheck);
-    return () => {
-      if (visibilityRafRef.current !== null) {
-        window.cancelAnimationFrame(visibilityRafRef.current);
-        visibilityRafRef.current = null;
-      }
-      d1.dispose();
-      d2.dispose();
-    };
-  }, [terminal, scheduleVisibilityCheck]);
-
-  const handleClick = () => terminal?.scrollToBottom();
-
-  return (
-    <div
-      className={cn(
-        // `translate`, not `transform`: Tailwind v4's `translate-y-*` compiles to the
-        // standalone `translate:` property, which `transition-property: transform` misses.
-        "absolute bottom-4 left-1/2 z-10 -translate-x-1/2 transition-[opacity,translate] duration-menu ease-out motion-reduce:transition-none",
-        isVisible ? "translate-y-0 opacity-100" : "pointer-events-none translate-y-2 opacity-0",
-      )}
-    >
-      <IconButton
-        onClick={handleClick}
-        className="size-7 rounded-full border-panel-border bg-panel text-muted-foreground hover:bg-hover hover:text-foreground sm:size-7"
-        label="Scroll to bottom"
-        size="icon-xs"
-        variant="outline"
-      >
-        <ArrowDownIcon className="size-3.5" />
-      </IconButton>
-    </div>
-  );
-}
diff --git a/apps/web/src/components/TerminalSearch.tsx b/apps/web/src/components/TerminalSearch.tsx
deleted file mode 100644
index 6b73dcd66..000000000
--- a/apps/web/src/components/TerminalSearch.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-// FILE: TerminalSearch.tsx
-// Purpose: Provides the in-terminal find bar and navigation controls.
-// Layer: Terminal presentation component
-// Exports: TerminalSearch
-
-import type { SearchAddon, ISearchOptions } from "@xterm/addon-search";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { IconButton } from "~/components/ui/icon-button";
-import { OVERLAY_SURFACE_CLASS_NAME } from "~/components/ui/surface";
-import { ChevronDownIcon, ChevronUpIcon, XIcon } from "~/lib/icons";
-import { cn } from "~/lib/utils";
-
-interface TerminalSearchProps {
-  searchAddon: SearchAddon | null;
-  isOpen: boolean;
-  onClose: () => void;
-}
-
-const SEARCH_DECORATIONS = {
-  matchBackground: "#515c6a",
-  matchBorder: "#74879f",
-  matchOverviewRuler: "#d186167e",
-  activeMatchBackground: "#515c6a",
-  activeMatchBorder: "#ffd33d",
-  activeMatchColorOverviewRuler: "#ffd33d",
-} satisfies NonNullable<ISearchOptions["decorations"]>;
-const SEARCH_DEBOUNCE_MS = 90;
-
-export function TerminalSearch({ searchAddon, isOpen, onClose }: TerminalSearchProps) {
-  const inputRef = useRef<HTMLInputElement>(null);
-  const searchTimerRef = useRef<number | null>(null);
-  const [query, setQuery] = useState("");
-  const [hasResults, setHasResults] = useState<boolean | null>(null);
-  const [caseSensitive, setCaseSensitive] = useState(false);
-
-  const searchOptions = useMemo(
-    (): ISearchOptions => ({
-      caseSensitive,
-      regex: false,
-      decorations: SEARCH_DECORATIONS as NonNullable<ISearchOptions["decorations"]>,
-    }),
-    [caseSensitive],
-  );
-
-  useEffect(() => {
-    if (isOpen && inputRef.current) {
-      inputRef.current.focus();
-      inputRef.current.select();
-    }
-  }, [isOpen]);
-
-  useEffect(() => {
-    if (!isOpen && searchAddon) {
-      searchAddon.clearDecorations();
-    }
-  }, [isOpen, searchAddon]);
-
-  const handleSearch = useCallback(
-    (direction: "next" | "previous") => {
-      if (!searchAddon || !query) return;
-      if (searchTimerRef.current !== null) {
-        window.clearTimeout(searchTimerRef.current);
-        searchTimerRef.current = null;
-      }
-      const found =
-        direction === "next"
-          ? searchAddon.findNext(query, searchOptions)
-          : searchAddon.findPrevious(query, searchOptions);
-      setHasResults(found);
-    },
-    [searchAddon, query, searchOptions],
-  );
-
-  const clearSearchTimer = useCallback(() => {
-    if (searchTimerRef.current === null) return;
-    window.clearTimeout(searchTimerRef.current);
-    searchTimerRef.current = null;
-  }, []);
-
-  const scheduleSearch = useCallback(
-    (nextQuery: string) => {
-      clearSearchTimer();
-      if (!searchAddon || !nextQuery) {
-        setHasResults(null);
-        searchAddon?.clearDecorations();
-        return;
-      }
-
-      searchTimerRef.current = window.setTimeout(() => {
-        searchTimerRef.current = null;
-        setHasResults(searchAddon.findNext(nextQuery, searchOptions));
-      }, SEARCH_DEBOUNCE_MS);
-    },
-    [clearSearchTimer, searchAddon, searchOptions],
-  );
-
-  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const newQuery = e.target.value;
-    setQuery(newQuery);
-    scheduleSearch(newQuery);
-  };
-
-  // Re-run search when case sensitivity or search addon changes
-  // (but not on query change — handleInputChange handles that).
-  const prevCaseSensitiveRef = useRef(caseSensitive);
-  const prevSearchAddonRef = useRef<SearchAddon | null>(searchAddon);
-  useEffect(() => {
-    const caseSensitivityChanged = prevCaseSensitiveRef.current !== caseSensitive;
-    const searchAddonChanged = prevSearchAddonRef.current !== searchAddon;
-    if (!caseSensitivityChanged && !searchAddonChanged) return;
-
-    prevCaseSensitiveRef.current = caseSensitive;
-    prevSearchAddonRef.current = searchAddon;
-    if (searchAddon && query) {
-      scheduleSearch(query);
-    }
-  }, [searchAddon, query, scheduleSearch, caseSensitive]);
-
-  useEffect(() => () => clearSearchTimer(), [clearSearchTimer]);
-
-  const handleKeyDown = (e: React.KeyboardEvent) => {
-    if (e.key === "Escape") {
-      e.preventDefault();
-      onClose();
-    } else if (e.key === "Enter") {
-      e.preventDefault();
-      handleSearch(e.shiftKey ? "previous" : "next");
-    }
-  };
-
-  const handleClose = () => {
-    setQuery("");
-    setHasResults(null);
-    onClose();
-  };
-
-  if (!isOpen) return null;
-
-  return (
-    <div
-      className={cn(
-        OVERLAY_SURFACE_CLASS_NAME,
-        "absolute right-1 top-1 z-10 flex max-w-[calc(100%-0.5rem)] items-center pl-2 pr-0.5",
-      )}
-    >
-      <input
-        ref={inputRef}
-        type="text"
-        value={query}
-        onChange={handleInputChange}
-        onKeyDown={handleKeyDown}
-        placeholder="Find"
-        className="h-6 w-28 min-w-0 flex-shrink bg-transparent text-sm text-foreground placeholder:text-muted-foreground focus:outline-none"
-      />
-      {hasResults === false && query && (
-        <span className="whitespace-nowrap px-1 text-xs text-muted-foreground">No results</span>
-      )}
-      <div className="flex shrink-0 items-center">
-        <IconButton
-          onClick={() => setCaseSensitive((v) => !v)}
-          label="Match case"
-          className={cn(
-            "size-6 rounded-sm border-transparent bg-transparent shadow-none sm:size-6",
-            caseSensitive
-              ? "bg-primary/20 text-foreground"
-              : "text-muted-foreground hover:bg-muted-foreground/20 hover:text-foreground",
-          )}
-        >
-          <span className="text-[11px] font-bold leading-none">Aa</span>
-        </IconButton>
-        <IconButton
-          onClick={() => handleSearch("previous")}
-          className="size-6 rounded-sm border-transparent bg-transparent text-muted-foreground shadow-none hover:bg-muted-foreground/20 hover:text-foreground sm:size-6"
-          label="Previous match (Shift+Enter)"
-        >
-          <ChevronUpIcon className="size-3.5" />
-        </IconButton>
-        <IconButton
-          onClick={() => handleSearch("next")}
-          className="size-6 rounded-sm border-transparent bg-transparent text-muted-foreground shadow-none hover:bg-muted-foreground/20 hover:text-foreground sm:size-6"
-          label="Next match (Enter)"
-        >
-          <ChevronDownIcon className="size-3.5" />
-        </IconButton>
-        <IconButton
-          onClick={handleClose}
-          className="size-6 rounded-sm border-transparent bg-transparent text-muted-foreground shadow-none hover:bg-muted-foreground/20 hover:text-foreground sm:size-6"
-          label="Close search (Esc)"
-        >
-          <XIcon className="size-3.5" />
-        </IconButton>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/src/components/TerminalWorkspaceTabs.test.tsx b/apps/web/src/components/TerminalWorkspaceTabs.test.tsx
deleted file mode 100644
index f2fa2953e..000000000
--- a/apps/web/src/components/TerminalWorkspaceTabs.test.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-// FILE: TerminalWorkspaceTabs.test.tsx
-// Purpose: Guards the workspace-level terminal/chat tab visibility rules.
-// Layer: Component rendering tests
-// Depends on: TerminalWorkspaceTabs and React server rendering.
-
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it, vi } from "vitest";
-
-import TerminalWorkspaceTabs from "./TerminalWorkspaceTabs";
-
-describe("TerminalWorkspaceTabs", () => {
-  it("hides the workspace switcher in terminal-only mode", () => {
-    const markup = renderToStaticMarkup(
-      <TerminalWorkspaceTabs
-        activeTab="terminal"
-        isWorking={false}
-        terminalHasRunningActivity={false}
-        terminalCount={2}
-        workspaceLayout="terminal-only"
-        onSelectTab={vi.fn()}
-      />,
-    );
-
-    expect(markup).toBe("");
-  });
-
-  it("shows the chat switcher when the workspace still includes chat", () => {
-    const markup = renderToStaticMarkup(
-      <TerminalWorkspaceTabs
-        activeTab="terminal"
-        isWorking={false}
-        terminalHasRunningActivity={false}
-        terminalCount={2}
-        workspaceLayout="both"
-        onSelectTab={vi.fn()}
-      />,
-    );
-
-    expect(markup).toContain("Terminal");
-    expect(markup).toContain("Chat");
-  });
-});
diff --git a/apps/web/src/components/TerminalWorkspaceTabs.tsx b/apps/web/src/components/TerminalWorkspaceTabs.tsx
deleted file mode 100644
index 90a581be2..000000000
--- a/apps/web/src/components/TerminalWorkspaceTabs.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-// FILE: TerminalWorkspaceTabs.tsx
-// Purpose: Renders the top-level workspace switcher between terminal and chat surfaces.
-// Layer: Chat workspace chrome
-// Depends on: terminal workspace store layout state and shared className helpers.
-//
-// Note: the two raw <button>s are intentional — they are quiet workspace tabs,
-// not generic actions from the Button taxonomy.
-
-import { cn } from "~/lib/utils";
-
-import TerminalActivityIndicator from "./terminal/TerminalActivityIndicator";
-import { ThreadRunningSpinner } from "./ThreadRunningSpinner";
-import { type ThreadTerminalWorkspaceLayout, type ThreadTerminalWorkspaceTab } from "../types";
-
-interface TerminalWorkspaceTabsProps {
-  activeTab: ThreadTerminalWorkspaceTab;
-  isWorking: boolean;
-  terminalHasRunningActivity: boolean;
-  terminalCount: number;
-  workspaceLayout: ThreadTerminalWorkspaceLayout;
-  onSelectTab: (tab: ThreadTerminalWorkspaceTab) => void;
-}
-
-export default function TerminalWorkspaceTabs({
-  activeTab,
-  isWorking,
-  terminalHasRunningActivity,
-  terminalCount,
-  workspaceLayout,
-  onSelectTab,
-}: TerminalWorkspaceTabsProps) {
-  // Terminal-only workspaces already expose the per-terminal tab strip below,
-  // so the chat/terminal switcher would only duplicate chrome and reintroduce chat.
-  if (terminalCount <= 1 || workspaceLayout === "terminal-only") {
-    return null;
-  }
-
-  const tabClassName =
-    "group relative inline-flex h-8 shrink-0 items-center rounded-[7px] border border-transparent px-3 text-[13px] transition-[background-color,color,scale] duration-press ease-out active:scale-[0.96]";
-
-  return (
-    <div className="relative px-3 py-1 sm:px-5">
-      <div className="flex min-w-0 items-center gap-1.5 overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
-        <button
-          type="button"
-          className={cn(
-            tabClassName,
-            activeTab === "terminal"
-              ? "bg-selected text-foreground"
-              : "bg-transparent text-muted-foreground hover:bg-hover hover:text-foreground",
-          )}
-          onClick={() => {
-            onSelectTab("terminal");
-          }}
-        >
-          <span>Terminal</span>
-          <span className="ml-1.5 text-[11px] text-muted-foreground tabular-nums">
-            {terminalCount}
-          </span>
-          {terminalHasRunningActivity ? (
-            <TerminalActivityIndicator className="ml-1.5 text-foreground/75" />
-          ) : null}
-        </button>
-        <button
-          type="button"
-          className={cn(
-            tabClassName,
-            activeTab === "chat"
-              ? "bg-selected text-foreground"
-              : "bg-transparent text-muted-foreground hover:bg-hover hover:text-foreground",
-          )}
-          onClick={() => {
-            onSelectTab("chat");
-          }}
-        >
-          <span>Chat</span>
-          {isWorking ? <ThreadRunningSpinner className="ml-1.5 size-3" /> : null}
-        </button>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/web/src/components/ThreadTerminalDrawer.test.ts b/apps/web/src/components/ThreadTerminalDrawer.test.ts
deleted file mode 100644
index 1e998837c..000000000
--- a/apps/web/src/components/ThreadTerminalDrawer.test.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  resolveTerminalSelectionActionPosition,
-  shouldHandleTerminalSelectionMouseUp,
-  terminalSelectionActionDelayForClickCount,
-} from "./terminal/terminalSelectionActions";
-
-describe("resolveTerminalSelectionActionPosition", () => {
-  it("prefers the selection rect over the last pointer position", () => {
-    expect(
-      resolveTerminalSelectionActionPosition({
-        bounds: { left: 100, top: 50, width: 500, height: 220 },
-        selectionRect: { right: 260, bottom: 140 },
-        pointer: { x: 520, y: 200 },
-        viewport: { width: 1024, height: 768 },
-      }),
-    ).toEqual({
-      x: 260,
-      y: 144,
-    });
-  });
-
-  it("falls back to the pointer position when no selection rect is available", () => {
-    expect(
-      resolveTerminalSelectionActionPosition({
-        bounds: { left: 100, top: 50, width: 500, height: 220 },
-        selectionRect: null,
-        pointer: { x: 180, y: 130 },
-        viewport: { width: 1024, height: 768 },
-      }),
-    ).toEqual({
-      x: 180,
-      y: 130,
-    });
-  });
-
-  it("clamps the pointer fallback into the terminal drawer bounds", () => {
-    expect(
-      resolveTerminalSelectionActionPosition({
-        bounds: { left: 100, top: 50, width: 500, height: 220 },
-        selectionRect: null,
-        pointer: { x: 720, y: 340 },
-        viewport: { width: 1024, height: 768 },
-      }),
-    ).toEqual({
-      x: 600,
-      y: 270,
-    });
-
-    expect(
-      resolveTerminalSelectionActionPosition({
-        bounds: { left: 100, top: 50, width: 500, height: 220 },
-        selectionRect: null,
-        pointer: { x: 40, y: 20 },
-        viewport: { width: 1024, height: 768 },
-      }),
-    ).toEqual({
-      x: 100,
-      y: 50,
-    });
-  });
-
-  it("delays multi-click selection actions so triple-click selection can complete", () => {
-    expect(terminalSelectionActionDelayForClickCount(1)).toBe(0);
-    expect(terminalSelectionActionDelayForClickCount(2)).toBe(260);
-    expect(terminalSelectionActionDelayForClickCount(3)).toBe(260);
-  });
-
-  it("only handles mouseup when the selection gesture started in the terminal", () => {
-    expect(shouldHandleTerminalSelectionMouseUp(true, 0)).toBe(true);
-    expect(shouldHandleTerminalSelectionMouseUp(false, 0)).toBe(false);
-    expect(shouldHandleTerminalSelectionMouseUp(true, 1)).toBe(false);
-  });
-});
diff --git a/apps/web/src/components/ThreadTerminalDrawer.tsx b/apps/web/src/components/ThreadTerminalDrawer.tsx
deleted file mode 100644
index 0a7694e16..000000000
--- a/apps/web/src/components/ThreadTerminalDrawer.tsx
+++ /dev/null
@@ -1,779 +0,0 @@
-// FILE: ThreadTerminalDrawer.tsx
-// Purpose: Hosts the terminal drawer/workspace chrome and each xterm viewport for a thread.
-// Layer: Chat terminal workspace UI
-// Depends on: xterm addons, native terminal APIs, and terminal workspace state from ChatView.
-
-import "@xterm/xterm/css/xterm.css";
-import { SearchAddon } from "@xterm/addon-search";
-import {
-  Plus,
-  SquareSplitHorizontal,
-  SquareSplitVertical,
-  Trash2,
-  TriangleAlertIcon,
-} from "~/lib/icons";
-import { type ThreadId } from "@t3tools/contracts";
-import { type TerminalActivityState, type TerminalCliKind } from "@t3tools/shared/terminalThreads";
-import { Terminal } from "@xterm/xterm";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { type TerminalContextSelection } from "~/lib/terminalContext";
-import { readNativeApi } from "~/nativeApi";
-import {
-  MAX_TERMINALS_PER_GROUP,
-  type ThreadTerminalGroup,
-  type ThreadTerminalPresentationMode,
-} from "../types";
-import { cn } from "~/lib/utils";
-import { Spinner } from "./ui/spinner";
-import {
-  type TerminalChromeActionItem,
-  TerminalSidebar,
-  TerminalWorkspaceTabBar,
-} from "./terminal/TerminalChrome";
-import { resolveThreadTerminalLayout } from "./terminal/TerminalLayout";
-import { terminalDrawerShellClassName } from "./terminal/terminalDrawerShell";
-import {
-  resolveTerminalSelectionActionPosition,
-  shouldHandleTerminalSelectionMouseUp,
-  terminalSelectionActionDelayForClickCount,
-} from "./terminal/terminalSelectionActions";
-import {
-  buildTerminalRuntimeKey,
-  terminalRuntimeRegistry,
-} from "./terminal/terminalRuntimeRegistry";
-import { isTerminalRuntimeThreadDisposed } from "./terminal/terminalRuntimeHandle";
-import type {
-  TerminalRuntimeConfig,
-  TerminalRuntimeStatus,
-  TerminalRuntimeViewState,
-} from "./terminal/terminalRuntimeTypes";
-import TerminalViewportPane from "./terminal/TerminalViewportPane";
-import { useTerminalDrawerHeight } from "./terminal/useTerminalDrawerHeight";
-import { TerminalSearch } from "./TerminalSearch";
-import { TerminalScrollToBottom } from "./TerminalScrollToBottom";
-
-function serializeRuntimeEnv(runtimeEnv: Record<string, string> | undefined): string {
-  if (!runtimeEnv) return "";
-  const entries = Object.entries(runtimeEnv);
-  if (entries.length === 0) return "";
-  entries.sort(([left], [right]) => left.localeCompare(right));
-  return JSON.stringify(entries);
-}
-
-function runtimeEnvFromSerialized(
-  serializedRuntimeEnv: string,
-): Record<string, string> | undefined {
-  if (!serializedRuntimeEnv) return undefined;
-  const entries = JSON.parse(serializedRuntimeEnv) as Array<[string, string]>;
-  return Object.fromEntries(entries);
-}
-
-function getTerminalSelectionRect(mountElement: HTMLElement): DOMRect | null {
-  const selection = window.getSelection();
-  if (!selection || selection.rangeCount === 0 || selection.isCollapsed) {
-    return null;
-  }
-
-  const range = selection.getRangeAt(0);
-  const commonAncestor = range.commonAncestorContainer;
-  const selectionRoot =
-    commonAncestor instanceof Element ? commonAncestor : commonAncestor.parentElement;
-  if (!(selectionRoot instanceof Element) || !mountElement.contains(selectionRoot)) {
-    return null;
-  }
-
-  const rects = Array.from(range.getClientRects()).filter(
-    (rect) => rect.width > 0 || rect.height > 0,
-  );
-  if (rects.length > 0) {
-    return rects[rects.length - 1] ?? null;
-  }
-
-  const boundingRect = range.getBoundingClientRect();
-  return boundingRect.width > 0 || boundingRect.height > 0 ? boundingRect : null;
-}
-
-function TerminalRuntimeStatusOverlay({ status }: { status: TerminalRuntimeStatus }) {
-  if (status !== "error" && status !== "connecting") return null;
-
-  return (
-    <div
-      className={cn(
-        "pointer-events-none absolute left-1 top-1 z-10 inline-flex h-6 max-w-[calc(100%-0.5rem)] items-center gap-1.5 rounded border px-2 text-[11px] leading-none",
-        status === "error"
-          ? "border-destructive/30 bg-panel text-destructive"
-          : "border-border bg-panel text-muted-foreground",
-      )}
-    >
-      {status === "error" ? (
-        <>
-          <TriangleAlertIcon className="size-3" />
-          <span className="truncate">Error</span>
-        </>
-      ) : (
-        <>
-          <Spinner className="size-3" />
-          <span className="truncate">Connecting…</span>
-        </>
-      )}
-    </div>
-  );
-}
-
-interface TerminalViewportProps {
-  threadId: ThreadId;
-  terminalId: string;
-  terminalLabel: string;
-  terminalCliKind?: TerminalCliKind | null;
-  cwd: string;
-  runtimeEnv?: Record<string, string>;
-  onSessionExited: () => void;
-  onTerminalMetadataChange: (
-    terminalId: string,
-    metadata: { cliKind: TerminalCliKind | null; label: string },
-  ) => void;
-  onTerminalActivityChange: (
-    terminalId: string,
-    activity: { hasRunningSubprocess: boolean; agentState: TerminalActivityState | null },
-  ) => void;
-  onAddTerminalContext: (selection: TerminalContextSelection) => void;
-  focusRequestId: number;
-  autoFocus: boolean;
-  isVisible: boolean;
-}
-
-function TerminalViewport({
-  threadId,
-  terminalId,
-  terminalLabel,
-  terminalCliKind = null,
-  cwd,
-  runtimeEnv,
-  onSessionExited,
-  onTerminalMetadataChange,
-  onTerminalActivityChange,
-  onAddTerminalContext,
-  focusRequestId,
-  autoFocus,
-  isVisible,
-}: TerminalViewportProps) {
-  const containerRef = useRef<HTMLDivElement>(null);
-  const terminalRef = useRef<Terminal | null>(null);
-  const onAddTerminalContextRef = useRef(onAddTerminalContext);
-  const terminalLabelRef = useRef(terminalLabel);
-  const selectionPointerRef = useRef<{ x: number; y: number } | null>(null);
-  const selectionGestureActiveRef = useRef(false);
-  const selectionActionRequestIdRef = useRef(0);
-  const selectionActionOpenRef = useRef(false);
-  const selectionActionTimerRef = useRef<number | null>(null);
-  const [searchOpen, setSearchOpen] = useState(false);
-  const [terminalInstance, setTerminalInstance] = useState<Terminal | null>(null);
-  const [searchAddonInstance, setSearchAddonInstance] = useState<SearchAddon | null>(null);
-  const [runtimeStatus, setRuntimeStatus] = useState<TerminalRuntimeStatus>("connecting");
-  const runtimeStatusMountedRef = useRef(false);
-  const trimmedCwd = useMemo(() => cwd.trim(), [cwd]);
-  const runtimeCwdReady = trimmedCwd.length > 0;
-  const runtimeKey = useMemo(
-    () => buildTerminalRuntimeKey(threadId, terminalId),
-    [terminalId, threadId],
-  );
-  const runtimeEnvSerialized = useMemo(() => serializeRuntimeEnv(runtimeEnv), [runtimeEnv]);
-  const runtimeEnvPayload = useMemo(
-    () => runtimeEnvFromSerialized(runtimeEnvSerialized),
-    [runtimeEnvSerialized],
-  );
-  const runtimeConfig = useMemo<TerminalRuntimeConfig>(
-    () => ({
-      runtimeKey,
-      threadId,
-      terminalId,
-      terminalLabel,
-      terminalCliKind,
-      cwd,
-      ...(runtimeEnvPayload ? { runtimeEnv: runtimeEnvPayload } : {}),
-      callbacks: {
-        onSessionExited,
-        onTerminalMetadataChange,
-        onTerminalActivityChange,
-        onTerminalRuntimeStatusChange: (changedTerminalId, status) => {
-          if (changedTerminalId === terminalId && runtimeStatusMountedRef.current) {
-            setRuntimeStatus(status);
-          }
-        },
-      },
-    }),
-    [
-      cwd,
-      onSessionExited,
-      onTerminalActivityChange,
-      onTerminalMetadataChange,
-      runtimeEnvPayload,
-      runtimeKey,
-      terminalCliKind,
-      terminalId,
-      terminalLabel,
-      threadId,
-    ],
-  );
-  const runtimeViewState = useMemo<TerminalRuntimeViewState>(
-    () => ({ autoFocus, isVisible }),
-    [autoFocus, isVisible],
-  );
-  const runtimeConfigRef = useRef(runtimeConfig);
-  const runtimeViewStateRef = useRef(runtimeViewState);
-
-  useEffect(() => {
-    onAddTerminalContextRef.current = onAddTerminalContext;
-  }, [onAddTerminalContext]);
-
-  useEffect(() => {
-    runtimeStatusMountedRef.current = true;
-    return () => {
-      runtimeStatusMountedRef.current = false;
-    };
-  }, []);
-
-  useEffect(() => {
-    runtimeConfigRef.current = runtimeConfig;
-  }, [runtimeConfig]);
-
-  useEffect(() => {
-    runtimeViewStateRef.current = runtimeViewState;
-  }, [runtimeViewState]);
-
-  useEffect(() => {
-    terminalLabelRef.current = terminalLabel;
-  }, [terminalLabel]);
-
-  useEffect(() => {
-    const mount = containerRef.current;
-    // This module is lazily loaded, so the thread can be deleted while the chunk
-    // is still in flight. Attaching then would open a PTY for a thread the
-    // server has already torn down, with nothing left to reap it.
-    if (!mount || !runtimeCwdReady || isTerminalRuntimeThreadDisposed(threadId)) {
-      terminalRef.current = null;
-      setTerminalInstance(null);
-      setSearchAddonInstance(null);
-      setRuntimeStatus("connecting");
-      return;
-    }
-    const attachedRuntime = terminalRuntimeRegistry.attach(
-      runtimeConfigRef.current,
-      runtimeViewStateRef.current,
-      mount,
-    );
-
-    terminalRef.current = attachedRuntime.terminal;
-    setTerminalInstance(attachedRuntime.terminal);
-    setSearchAddonInstance(attachedRuntime.searchAddon);
-    setRuntimeStatus(attachedRuntime.runtimeStatus);
-
-    return () => {
-      if (selectionActionTimerRef.current !== null) {
-        window.clearTimeout(selectionActionTimerRef.current);
-        selectionActionTimerRef.current = null;
-      }
-      selectionActionOpenRef.current = false;
-      terminalRuntimeRegistry.detach(runtimeKey);
-      terminalRef.current = null;
-      setTerminalInstance(null);
-      setSearchAddonInstance(null);
-    };
-  }, [runtimeCwdReady, runtimeKey]);
-
-  useEffect(() => {
-    if (!runtimeCwdReady) return;
-    terminalRuntimeRegistry.syncConfig(runtimeKey, runtimeConfig);
-  }, [runtimeConfig, runtimeCwdReady, runtimeKey]);
-
-  useEffect(() => {
-    if (!runtimeCwdReady) return;
-    terminalRuntimeRegistry.setViewState(runtimeKey, runtimeViewState);
-  }, [runtimeCwdReady, runtimeKey, runtimeViewState]);
-
-  useEffect(() => {
-    if (!autoFocus || !runtimeCwdReady) return;
-    terminalRuntimeRegistry.focus(runtimeKey);
-  }, [autoFocus, focusRequestId, runtimeCwdReady, runtimeKey]);
-
-  useEffect(() => {
-    const mount = containerRef.current;
-    if (!mount) return;
-
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (
-        event.key.toLowerCase() === "f" &&
-        (event.metaKey || event.ctrlKey) &&
-        !event.altKey &&
-        !event.shiftKey
-      ) {
-        event.preventDefault();
-        event.stopPropagation();
-        setSearchOpen(true);
-      }
-    };
-
-    mount.addEventListener("keydown", handleKeyDown, true);
-    return () => {
-      mount.removeEventListener("keydown", handleKeyDown, true);
-    };
-  }, []);
-
-  const clearSelectionAction = useCallback(() => {
-    selectionActionRequestIdRef.current += 1;
-    if (selectionActionTimerRef.current !== null) {
-      window.clearTimeout(selectionActionTimerRef.current);
-      selectionActionTimerRef.current = null;
-    }
-  }, []);
-
-  const readSelectionAction = useCallback((): {
-    position: { x: number; y: number };
-    selection: TerminalContextSelection;
-  } | null => {
-    const activeTerminal = terminalRef.current;
-    const mountElement = containerRef.current;
-    if (!activeTerminal || !mountElement || !activeTerminal.hasSelection()) {
-      return null;
-    }
-    const selectionText = activeTerminal.getSelection();
-    const selectionPosition = activeTerminal.getSelectionPosition();
-    const normalizedText = selectionText.replace(/\r\n/g, "\n").replace(/^\n+|\n+$/g, "");
-    if (!selectionPosition || normalizedText.length === 0) {
-      return null;
-    }
-    const lineStart = selectionPosition.start.y + 1;
-    const lineCount = normalizedText.split("\n").length;
-    const lineEnd = Math.max(lineStart, lineStart + lineCount - 1);
-    const bounds = mountElement.getBoundingClientRect();
-    const selectionRect = getTerminalSelectionRect(mountElement);
-    const position = resolveTerminalSelectionActionPosition({
-      bounds,
-      selectionRect:
-        selectionRect === null
-          ? null
-          : { right: selectionRect.right, bottom: selectionRect.bottom },
-      pointer: selectionPointerRef.current,
-    });
-    return {
-      position,
-      selection: {
-        terminalId,
-        terminalLabel: terminalLabelRef.current,
-        lineStart,
-        lineEnd,
-        text: normalizedText,
-      },
-    };
-  }, [terminalId]);
-
-  const showSelectionAction = useCallback(async () => {
-    if (selectionActionOpenRef.current) {
-      return;
-    }
-    const nextAction = readSelectionAction();
-    if (!nextAction) {
-      clearSelectionAction();
-      return;
-    }
-    const api = readNativeApi();
-    if (!api) return;
-    const requestId = ++selectionActionRequestIdRef.current;
-    selectionActionOpenRef.current = true;
-    try {
-      const clicked = await api.contextMenu.show(
-        [{ id: "add-to-chat", label: "Add to chat" }],
-        nextAction.position,
-      );
-      if (requestId !== selectionActionRequestIdRef.current || clicked !== "add-to-chat") {
-        return;
-      }
-      onAddTerminalContextRef.current(nextAction.selection);
-      terminalRef.current?.clearSelection();
-      terminalRuntimeRegistry.focus(runtimeKey);
-    } finally {
-      selectionActionOpenRef.current = false;
-    }
-  }, [clearSelectionAction, readSelectionAction, runtimeKey]);
-
-  useEffect(() => {
-    const terminal = terminalInstance;
-    const mount = containerRef.current;
-    if (!terminal || !mount) return;
-
-    const selectionDisposable = terminal.onSelectionChange(() => {
-      if (terminal.hasSelection()) {
-        return;
-      }
-      clearSelectionAction();
-    });
-
-    const handleMouseUp = (event: MouseEvent) => {
-      const shouldHandle = shouldHandleTerminalSelectionMouseUp(
-        selectionGestureActiveRef.current,
-        event.button,
-      );
-      selectionGestureActiveRef.current = false;
-      if (!shouldHandle) {
-        return;
-      }
-      selectionPointerRef.current = { x: event.clientX, y: event.clientY };
-      const delay = terminalSelectionActionDelayForClickCount(event.detail);
-      selectionActionTimerRef.current = window.setTimeout(() => {
-        selectionActionTimerRef.current = null;
-        window.requestAnimationFrame(() => {
-          void showSelectionAction();
-        });
-      }, delay);
-    };
-
-    const handlePointerDown = (event: PointerEvent) => {
-      clearSelectionAction();
-      selectionGestureActiveRef.current = event.button === 0;
-    };
-
-    window.addEventListener("mouseup", handleMouseUp);
-    mount.addEventListener("pointerdown", handlePointerDown);
-    return () => {
-      selectionDisposable.dispose();
-      window.removeEventListener("mouseup", handleMouseUp);
-      mount.removeEventListener("pointerdown", handlePointerDown);
-      clearSelectionAction();
-      selectionGestureActiveRef.current = false;
-    };
-  }, [clearSelectionAction, showSelectionAction, terminalInstance]);
-
-  return (
-    <div className="h-full min-h-0 w-full bg-[var(--color-background-surface)] p-3">
-      <div className="relative h-full min-h-0 w-full overflow-hidden">
-        <TerminalSearch
-          searchAddon={searchAddonInstance}
-          isOpen={searchOpen}
-          onClose={() => {
-            setSearchOpen(false);
-            terminalRuntimeRegistry.focus(runtimeKey);
-          }}
-        />
-        <TerminalRuntimeStatusOverlay status={runtimeStatus} />
-        <TerminalScrollToBottom terminal={terminalInstance} />
-        <div ref={containerRef} className="h-full w-full" />
-      </div>
-    </div>
-  );
-}
-
-export interface ThreadTerminalDrawerProps {
-  threadId: ThreadId;
-  cwd: string;
-  runtimeEnv?: Record<string, string>;
-  height: number;
-  presentationMode: ThreadTerminalPresentationMode;
-  isVisible?: boolean;
-  terminalIds: string[];
-  terminalLabelsById: Record<string, string>;
-  terminalTitleOverridesById: Record<string, string>;
-  terminalCliKindsById: Record<string, TerminalCliKind>;
-  terminalAttentionStatesById: Record<string, "attention" | "review">;
-  runningTerminalIds: string[];
-  activeTerminalId: string;
-  terminalGroups: ThreadTerminalGroup[];
-  activeTerminalGroupId: string;
-  focusRequestId: number;
-  onSplitTerminal: () => void;
-  onSplitTerminalDown: () => void;
-  onNewTerminal: () => void;
-  onNewTerminalTab: (terminalId: string) => void;
-  onMoveTerminalToGroup: (terminalId: string) => void;
-  splitShortcutLabel?: string | undefined;
-  splitDownShortcutLabel?: string | undefined;
-  newShortcutLabel?: string | undefined;
-  closeShortcutLabel?: string | undefined;
-  workspaceCloseShortcutLabel?: string | undefined;
-  onActiveTerminalChange: (terminalId: string) => void;
-  onCloseTerminal: (terminalId: string) => void;
-  onCloseTerminalGroup: (groupId: string) => void;
-  onHeightChange: (height: number) => void;
-  onResizeTerminalSplit: (groupId: string, splitId: string, weights: number[]) => void;
-  onTerminalMetadataChange: (
-    terminalId: string,
-    metadata: { cliKind: TerminalCliKind | null; label: string },
-  ) => void;
-  onTerminalActivityChange: (
-    terminalId: string,
-    activity: { hasRunningSubprocess: boolean; agentState: TerminalActivityState | null },
-  ) => void;
-  onAddTerminalContext: (selection: TerminalContextSelection) => void;
-  onTogglePresentationMode?: (() => void) | undefined;
-  onTogglePanel?: (() => void) | undefined;
-  isPanelOpen?: boolean | undefined;
-}
-
-export default function ThreadTerminalDrawer({
-  threadId,
-  cwd,
-  runtimeEnv,
-  height,
-  presentationMode,
-  isVisible = true,
-  terminalIds,
-  terminalLabelsById,
-  terminalTitleOverridesById,
-  terminalCliKindsById,
-  terminalAttentionStatesById,
-  runningTerminalIds,
-  activeTerminalId,
-  terminalGroups,
-  activeTerminalGroupId,
-  focusRequestId,
-  onSplitTerminal,
-  onSplitTerminalDown,
-  onNewTerminal,
-  onNewTerminalTab,
-  onMoveTerminalToGroup,
-  splitShortcutLabel,
-  splitDownShortcutLabel,
-  newShortcutLabel,
-  closeShortcutLabel,
-  workspaceCloseShortcutLabel,
-  onActiveTerminalChange,
-  onCloseTerminal,
-  onCloseTerminalGroup,
-  onHeightChange,
-  onResizeTerminalSplit,
-  onTerminalMetadataChange,
-  onTerminalActivityChange,
-  onAddTerminalContext,
-  onTogglePresentationMode,
-  onTogglePanel,
-  isPanelOpen,
-}: ThreadTerminalDrawerProps) {
-  const isWorkspaceMode = presentationMode === "workspace";
-  const previousRuntimeKeysRef = useRef<Set<string>>(new Set());
-  const { drawerHeight, handleResizePointerDown, handleResizePointerMove, handleResizePointerEnd } =
-    useTerminalDrawerHeight({
-      height,
-      onHeightChange,
-      resetKey: threadId,
-    });
-
-  const {
-    normalizedTerminalIds,
-    resolvedActiveTerminalId,
-    resolvedActiveGroupId,
-    resolvedTerminalGroups,
-    activeGroupLayout,
-    hasTerminalSidebar,
-    showGroupHeaders,
-    hasReachedSplitLimit,
-    terminalVisualIdentityById,
-  } = useMemo(
-    () =>
-      resolveThreadTerminalLayout({
-        activeTerminalGroupId,
-        activeTerminalId,
-        runningTerminalIds,
-        terminalAttentionStatesById,
-        terminalCliKindsById,
-        terminalGroups,
-        terminalIds,
-        terminalLabelsById,
-        terminalTitleOverridesById,
-      }),
-    [
-      activeTerminalGroupId,
-      activeTerminalId,
-      runningTerminalIds,
-      terminalAttentionStatesById,
-      terminalCliKindsById,
-      terminalGroups,
-      terminalIds,
-      terminalLabelsById,
-      terminalTitleOverridesById,
-    ],
-  );
-
-  useEffect(() => {
-    const nextRuntimeKeySet = new Set(
-      normalizedTerminalIds.map((terminalId) => buildTerminalRuntimeKey(threadId, terminalId)),
-    );
-    for (const previousRuntimeKey of previousRuntimeKeysRef.current) {
-      if (nextRuntimeKeySet.has(previousRuntimeKey)) {
-        continue;
-      }
-      terminalRuntimeRegistry.dispose(previousRuntimeKey);
-    }
-    previousRuntimeKeysRef.current = nextRuntimeKeySet;
-  }, [normalizedTerminalIds, threadId]);
-
-  const splitTerminalActionLabel = hasReachedSplitLimit
-    ? `Split Terminal (max ${MAX_TERMINALS_PER_GROUP} per group)`
-    : splitShortcutLabel
-      ? `Split Right (${splitShortcutLabel})`
-      : "Split Right";
-  const splitTerminalDownActionLabel = hasReachedSplitLimit
-    ? `Split Down (max ${MAX_TERMINALS_PER_GROUP} per group)`
-    : splitDownShortcutLabel
-      ? `Split Down (${splitDownShortcutLabel})`
-      : "Split Down";
-  const newTerminalActionLabel = newShortcutLabel
-    ? `New Terminal (${newShortcutLabel})`
-    : "New Terminal";
-  const resolvedCloseShortcutLabel = isWorkspaceMode
-    ? (workspaceCloseShortcutLabel ?? closeShortcutLabel)
-    : closeShortcutLabel;
-  const closeTerminalActionLabel = resolvedCloseShortcutLabel
-    ? `Close Terminal (${resolvedCloseShortcutLabel})`
-    : "Close Terminal";
-  const onSplitTerminalAction = useCallback(() => {
-    if (hasReachedSplitLimit) return;
-    onSplitTerminal();
-  }, [hasReachedSplitLimit, onSplitTerminal]);
-  const onSplitTerminalDownAction = useCallback(() => {
-    if (hasReachedSplitLimit) return;
-    onSplitTerminalDown();
-  }, [hasReachedSplitLimit, onSplitTerminalDown]);
-  const onNewTerminalAction = useCallback(() => {
-    onNewTerminal();
-  }, [onNewTerminal]);
-
-  const terminalChromeActions: TerminalChromeActionItem[] = [
-    {
-      label: splitTerminalActionLabel,
-      onClick: onSplitTerminalAction,
-      disabled: hasReachedSplitLimit,
-      children: <SquareSplitHorizontal className="size-3.25" />,
-    },
-    {
-      label: splitTerminalDownActionLabel,
-      onClick: onSplitTerminalDownAction,
-      disabled: hasReachedSplitLimit,
-      children: <SquareSplitVertical className="size-3.25" />,
-    },
-    {
-      label: newTerminalActionLabel,
-      onClick: onNewTerminalAction,
-      children: <Plus className="size-3.25" />,
-    },
-    {
-      label: closeTerminalActionLabel,
-      onClick: () => onCloseTerminal(resolvedActiveTerminalId),
-      children: <Trash2 className="size-3.25" />,
-    },
-  ];
-  const showTerminalGroupTabs = resolvedTerminalGroups.length > 1;
-  const topTabBarActions = terminalChromeActions;
-
-  return (
-    <aside
-      className={terminalDrawerShellClassName(presentationMode)}
-      style={isWorkspaceMode ? undefined : { height: `${drawerHeight}px` }}
-    >
-      {!isWorkspaceMode ? (
-        <div
-          className="absolute inset-x-0 top-0 z-20 h-1.5 cursor-row-resize"
-          onPointerDown={handleResizePointerDown}
-          onPointerMove={handleResizePointerMove}
-          onPointerUp={handleResizePointerEnd}
-          onPointerCancel={handleResizePointerEnd}
-        />
-      ) : null}
-
-      {showTerminalGroupTabs ? (
-        <TerminalWorkspaceTabBar
-          terminalGroups={resolvedTerminalGroups}
-          activeGroupId={resolvedActiveGroupId}
-          terminalVisualIdentityById={terminalVisualIdentityById}
-          actions={topTabBarActions}
-          onActiveGroupChange={(groupId) => {
-            const nextGroup = resolvedTerminalGroups.find((group) => group.id === groupId);
-            if (!nextGroup) return;
-            onActiveTerminalChange(nextGroup.activeTerminalId);
-          }}
-          onCloseGroup={onCloseTerminalGroup}
-        />
-      ) : null}
-
-      <div className="min-h-0 w-full flex-1">
-        <div
-          className={cn(
-            "flex h-full min-h-0",
-            hasTerminalSidebar && !isWorkspaceMode ? "gap-1.5" : "",
-          )}
-        >
-          <div className="min-w-0 flex-1 h-full">
-            <TerminalViewportPane
-              groupId={resolvedActiveGroupId}
-              layout={activeGroupLayout}
-              resolvedActiveTerminalId={resolvedActiveTerminalId}
-              terminalVisualIdentityById={terminalVisualIdentityById}
-              onActiveTerminalChange={onActiveTerminalChange}
-              onResizeSplit={onResizeTerminalSplit}
-              onSplitTerminalRight={
-                hasReachedSplitLimit
-                  ? undefined
-                  : (terminalId) => {
-                      onActiveTerminalChange(terminalId);
-                      onSplitTerminal();
-                    }
-              }
-              onSplitTerminalDown={
-                hasReachedSplitLimit
-                  ? undefined
-                  : (terminalId) => {
-                      onActiveTerminalChange(terminalId);
-                      onSplitTerminalDown();
-                    }
-              }
-              onNewTerminalTab={
-                hasReachedSplitLimit
-                  ? undefined
-                  : (terminalId) => {
-                      onNewTerminalTab(terminalId);
-                    }
-              }
-              onMoveTerminalToGroup={isWorkspaceMode ? onMoveTerminalToGroup : undefined}
-              onCloseTerminal={onCloseTerminal}
-              presentationMode={presentationMode}
-              onTogglePresentationMode={onTogglePresentationMode}
-              onTogglePanel={onTogglePanel}
-              isPanelOpen={isPanelOpen}
-              renderViewport={(terminalId, options) => (
-                <TerminalViewport
-                  key={terminalId}
-                  threadId={threadId}
-                  terminalId={terminalId}
-                  terminalLabel={terminalVisualIdentityById.get(terminalId)?.title ?? "Terminal"}
-                  terminalCliKind={terminalVisualIdentityById.get(terminalId)?.cliKind ?? null}
-                  cwd={cwd}
-                  {...(runtimeEnv ? { runtimeEnv } : {})}
-                  onSessionExited={() => onCloseTerminal(terminalId)}
-                  onTerminalMetadataChange={onTerminalMetadataChange}
-                  onTerminalActivityChange={onTerminalActivityChange}
-                  onAddTerminalContext={onAddTerminalContext}
-                  focusRequestId={focusRequestId}
-                  autoFocus={options.autoFocus}
-                  isVisible={isVisible && options.isVisible}
-                />
-              )}
-            />
-          </div>
-
-          {hasTerminalSidebar && !isWorkspaceMode ? (
-            <TerminalSidebar
-              terminalIds={normalizedTerminalIds}
-              terminalGroups={resolvedTerminalGroups}
-              activeTerminalId={resolvedActiveTerminalId}
-              activeGroupId={resolvedActiveGroupId}
-              showGroupHeaders={showGroupHeaders}
-              closeShortcutLabel={resolvedCloseShortcutLabel}
-              terminalVisualIdentityById={terminalVisualIdentityById}
-              actions={terminalChromeActions}
-              onActiveTerminalChange={onActiveTerminalChange}
-              onCloseTerminal={onCloseTerminal}
-            />
-          ) : null}
-        </div>
-      </div>
-    </aside>
-  );
-}
diff --git a/apps/web/src/components/WorkspaceFilePreview.tsx b/apps/web/src/components/WorkspaceFilePreview.tsx
deleted file mode 100644
index fcb54060e..000000000
--- a/apps/web/src/components/WorkspaceFilePreview.tsx
+++ /dev/null
@@ -1,665 +0,0 @@
-// FILE: WorkspaceFilePreview.tsx
-// Purpose: Shared single-file preview (code with syntax highlighting, parsed
-//          markdown, images) for workspace files plus absolute local
-//          file references reused by editor and right-dock panes. Anything the
-//          file-read RPC rejects as binary (PDFs, archives, executables) falls
-//          back to the shared error state below the header, whose "Open in"
-//          control hands the file to an external app.
-// Layer: Web chat presentation component
-// Exports: WorkspaceFilePreview, isMarkdownPreviewablePath
-
-import { isSupportedLocalImagePath, lowerCaseExtensionOf } from "@t3tools/shared/localPreviewFiles";
-import {
-  isLocalAbsolutePath,
-  isWorkspaceRelativePathSafe,
-  joinWorkspaceRelativePath,
-} from "@t3tools/shared/path";
-import { isScratchWorkspacePath } from "@t3tools/shared/threadWorkspace";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import {
-  Component,
-  Suspense,
-  type MouseEvent as ReactMouseEvent,
-  type ReactNode,
-  memo,
-  use,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
-
-import { basenameOfPath } from "~/file-icons";
-import { useTheme } from "~/hooks/useTheme";
-import { getSelectionWithin, type ChatFileReference } from "~/lib/chatReferences";
-import { resolveDiffThemeName, type DiffThemeName } from "~/lib/diffRendering";
-import { formatFileCommentRange, type FileCommentSelection } from "~/lib/fileComments";
-import { showFileReferenceContextMenu } from "~/lib/fileReferenceContextMenu";
-import { PlusIcon } from "~/lib/icons";
-import { toggleMarkdownTaskMarker } from "~/lib/markdownTaskList";
-import {
-  isLocalPreviewGrantUsable,
-  projectLocalPreviewGrantQueryOptions,
-  projectReadFileQueryOptions,
-} from "~/lib/projectReactQuery";
-import {
-  MAX_SYNTAX_HIGHLIGHT_INPUT_CHARS,
-  cacheSyntaxHighlightedHtml,
-  createSyntaxHighlightCacheKey,
-  getCachedSyntaxHighlightedHtml,
-  getSyntaxHighlighterPromise,
-  getSyntaxLanguageForPath,
-  highlightCodeToHtmlWithFallback,
-} from "~/lib/syntaxHighlighting";
-import { cn } from "~/lib/utils";
-import { readNativeApi } from "~/nativeApi";
-import ChatMarkdown from "./ChatMarkdown";
-import { FileLineCommentBox } from "./chat/FileLineCommentBox";
-import { PanelStateMessage } from "./chat/PanelStateMessage";
-import { useFileLineCommenting } from "./chat/useFileLineCommenting";
-import { WorkspaceFilePreviewHeader } from "./chat/WorkspaceFilePreviewHeader";
-import { TranscriptSelectionAction } from "./chat/TranscriptSelectionAction";
-import { useCodeSelectionAction } from "./chat/useCodeSelectionAction";
-import { LocalImagePreview } from "./LocalImagePreview";
-import { Skeleton } from "./ui/skeleton";
-
-const MARKDOWN_PREVIEW_EXTENSIONS = new Set([".markdown", ".md", ".mdx"]);
-
-export function isMarkdownPreviewablePath(filePath: string): boolean {
-  const extension = lowerCaseExtensionOf(filePath);
-  return extension !== null && MARKDOWN_PREVIEW_EXTENSIONS.has(extension);
-}
-
-function parentDirectoryFromPath(path: string): string | null {
-  const normalized = path.replace(/\\/g, "/");
-  const separatorIndex = normalized.lastIndexOf("/");
-  if (separatorIndex <= 0) {
-    return null;
-  }
-  return normalized.slice(0, separatorIndex);
-}
-
-function markdownPreviewCwd(workspaceRoot: string | null, filePath: string): string | undefined {
-  const parentDirectory = parentDirectoryFromPath(filePath);
-  if (isLocalAbsolutePath(filePath)) {
-    return parentDirectory ?? undefined;
-  }
-  if (!workspaceRoot) {
-    return undefined;
-  }
-  if (!parentDirectory) {
-    return workspaceRoot;
-  }
-  return joinWorkspaceRelativePath(workspaceRoot, parentDirectory);
-}
-
-class FilePreviewHighlightErrorBoundary extends Component<
-  { fallback: ReactNode; children: ReactNode },
-  { hasError: boolean }
-> {
-  constructor(props: { fallback: ReactNode; children: ReactNode }) {
-    super(props);
-    this.state = { hasError: false };
-  }
-
-  static getDerivedStateFromError() {
-    return { hasError: true };
-  }
-
-  override render() {
-    if (this.state.hasError) {
-      return this.props.fallback;
-    }
-    return this.props.children;
-  }
-}
-
-// Above this the plain fallback skips per-line spans (and therefore line
-// numbers) to keep the DOM small for huge files.
-const MAX_PLAIN_NUMBERED_LINES = 20_000;
-
-function escapeHtml(value: string): string {
-  return value
-    .replaceAll("&", "&amp;")
-    .replaceAll("<", "&lt;")
-    .replaceAll(">", "&gt;")
-    .replaceAll('"', "&quot;");
-}
-
-function PlainFileContents(props: { contents: string }) {
-  // Wrap each line in a .line span (mirroring Shiki output) so the CSS
-  // counter gutter applies. Built as an HTML string to avoid per-line React
-  // nodes; the trailing \n stays inside each span so selection math and
-  // clipboard copies keep working.
-  const numberedHtml = useMemo(() => {
-    if (props.contents.length === 0) {
-      return null;
-    }
-    const lines = props.contents.split("\n");
-    if (lines.length > MAX_PLAIN_NUMBERED_LINES) {
-      return null;
-    }
-    return `<code>${lines
-      .map((line, index) =>
-        index === lines.length - 1
-          ? `<span class="line">${escapeHtml(line)}</span>`
-          : `<span class="line">${escapeHtml(line)}\n</span>`,
-      )
-      .join("")}</code>`;
-  }, [props.contents]);
-
-  if (numberedHtml !== null) {
-    return (
-      <pre
-        className="editor-file-viewer__plain"
-        aria-readonly="true"
-        dangerouslySetInnerHTML={{ __html: numberedHtml }}
-      />
-    );
-  }
-
-  return (
-    <pre className="editor-file-viewer__plain" aria-readonly="true">
-      {props.contents}
-    </pre>
-  );
-}
-
-function SyntaxHighlightedFileContents(props: {
-  path: string;
-  contents: string;
-  themeName: DiffThemeName;
-}) {
-  const language = useMemo(() => getSyntaxLanguageForPath(props.path), [props.path]);
-  // The cache key hashes the whole file, so keep it off incidental re-renders
-  // (selection state, diff-warming churn) and only recompute when inputs change.
-  const cacheKey = useMemo(
-    () => createSyntaxHighlightCacheKey(props.contents, language, props.themeName),
-    [props.contents, language, props.themeName],
-  );
-  const cachedHighlightedHtml = getCachedSyntaxHighlightedHtml(cacheKey);
-
-  if (cachedHighlightedHtml != null) {
-    return (
-      <div
-        className="editor-file-viewer__highlight"
-        data-syntax-highlighted="true"
-        dangerouslySetInnerHTML={{ __html: cachedHighlightedHtml }}
-      />
-    );
-  }
-
-  // The uncached path lives in its own component: an early return above must
-  // not change this component's hook order once the cache fills.
-  return (
-    <UncachedSyntaxHighlightedFileContents
-      cacheKey={cacheKey}
-      contents={props.contents}
-      language={language}
-      themeName={props.themeName}
-    />
-  );
-}
-
-function UncachedSyntaxHighlightedFileContents(props: {
-  cacheKey: string;
-  contents: string;
-  language: string;
-  themeName: DiffThemeName;
-}) {
-  const highlighter = use(getSyntaxHighlighterPromise(props.language));
-  const highlightedHtml = useMemo(() => {
-    return highlightCodeToHtmlWithFallback(
-      highlighter,
-      props.contents,
-      props.language,
-      props.themeName,
-    );
-  }, [highlighter, props.contents, props.language, props.themeName]);
-
-  useEffect(() => {
-    cacheSyntaxHighlightedHtml(props.cacheKey, highlightedHtml, props.contents);
-  }, [props.cacheKey, highlightedHtml, props.contents]);
-
-  return (
-    <div
-      className="editor-file-viewer__highlight"
-      data-syntax-highlighted="true"
-      dangerouslySetInnerHTML={{ __html: highlightedHtml }}
-    />
-  );
-}
-
-// Memoized: its inputs (path, contents, themeName) are stable across the
-// preview re-renders triggered by selection state and diff-warming, so the
-// highlighted body (and its cache lookup) is skipped unless the file changes.
-const FileContentsView = memo(function FileContentsView(props: {
-  path: string;
-  contents: string;
-  themeName: DiffThemeName;
-}) {
-  const plain = <PlainFileContents contents={props.contents} />;
-  if (props.contents.length === 0 || props.contents.length > MAX_SYNTAX_HIGHLIGHT_INPUT_CHARS) {
-    return plain;
-  }
-
-  return (
-    <FilePreviewHighlightErrorBoundary key={props.path} fallback={plain}>
-      <Suspense fallback={plain}>
-        <SyntaxHighlightedFileContents
-          path={props.path}
-          contents={props.contents}
-          themeName={props.themeName}
-        />
-      </Suspense>
-    </FilePreviewHighlightErrorBoundary>
-  );
-});
-
-// Mimics indented code lines so the placeholder reads as a file body
-// instead of a generic spinner block.
-const FILE_PREVIEW_SKELETON_LINES = [
-  { indent: 0, width: "w-5/12" },
-  { indent: 0, width: "w-8/12" },
-  { indent: 1, width: "w-10/12" },
-  { indent: 1, width: "w-7/12" },
-  { indent: 2, width: "w-9/12" },
-  { indent: 2, width: "w-4/12" },
-  { indent: 1, width: "w-6/12" },
-  { indent: 0, width: "w-3/12" },
-  { indent: 0, width: "w-7/12" },
-  { indent: 1, width: "w-9/12" },
-  { indent: 1, width: "w-5/12" },
-  { indent: 0, width: "w-2/12" },
-];
-
-function FilePreviewLoadingState() {
-  return (
-    <div
-      className="min-h-0 flex-1 space-y-2.5 overflow-hidden px-3 py-3"
-      role="status"
-      aria-label="Loading file..."
-    >
-      {FILE_PREVIEW_SKELETON_LINES.map((line) => (
-        <div key={`${line.indent}-${line.width}`} className="flex h-3 items-center gap-2">
-          <Skeleton className="h-2.5 w-5 shrink-0 rounded-full opacity-60" />
-          <Skeleton
-            className={cn("h-2.5 rounded-full", line.width)}
-            style={{ marginLeft: `${line.indent * 1}rem` }}
-          />
-        </div>
-      ))}
-      <span className="sr-only">Loading file...</span>
-    </div>
-  );
-}
-
-export interface WorkspaceFilePreviewProps {
-  workspaceRoot: string | null;
-  /**
-   * Workspace-relative path of the previewed file. Image previews may instead
-   * be absolute paths outside the workspace — e.g. a session's scratch
-   * directory — served by the local-image route, which never touches the
-   * workspace-relative file-read RPC.
-   */
-  filePath: string | null;
-  /**
-   * Initial markdown render mode per file: the dock opens markdown already
-   * parsed, the editor surface stays source-first. The header toggle still
-   * lets the user flip either way.
-   */
-  markdownPreviewDefault?: boolean;
-  /** Shown when no file is selected yet. */
-  emptyState?: ReactNode;
-  onReferenceInChat?: ((reference: ChatFileReference) => void) | undefined;
-  onAskWhyInChat?: ((reference: ChatFileReference) => void) | undefined;
-  onCommentInChat?: ((comment: FileCommentSelection) => void) | undefined;
-}
-
-export function WorkspaceFilePreview(props: WorkspaceFilePreviewProps) {
-  const { resolvedTheme } = useTheme();
-  const diffThemeName = resolveDiffThemeName(resolvedTheme);
-  const contentsRef = useRef<HTMLDivElement>(null);
-  const taskWriteQueueRef = useRef<Promise<void>>(Promise.resolve());
-  const latestTaskWriteVersionRef = useRef({ next: 0, byFile: new Map<string, number>() });
-  const { filePath, onAskWhyInChat, onCommentInChat, onReferenceInChat, workspaceRoot } = props;
-  const queryClient = useQueryClient();
-  const markdownPreviewDefault = props.markdownPreviewDefault ?? false;
-  const fileIsImage = filePath !== null && isSupportedLocalImagePath(filePath);
-  const fileIsLocalAbsolute = filePath !== null && isLocalAbsolutePath(filePath);
-  const fileIsWorkspaceRelative = filePath !== null && isWorkspaceRelativePathSafe(filePath);
-  const fileIsScratchImagePreview =
-    filePath !== null && fileIsImage && isScratchWorkspacePath(filePath);
-  const fileNeedsLocalPreviewGrant =
-    filePath !== null && fileIsLocalAbsolute && !fileIsScratchImagePreview;
-  const fileIsMarkdown = filePath !== null && isMarkdownPreviewablePath(filePath);
-  const [markdownPreviewEnabled, setMarkdownPreviewEnabled] = useState(markdownPreviewDefault);
-  const localPreviewGrantQuery = useQuery(
-    projectLocalPreviewGrantQueryOptions({
-      path: filePath,
-      enabled: fileNeedsLocalPreviewGrant,
-    }),
-  );
-  const localPreviewGrant =
-    fileNeedsLocalPreviewGrant && isLocalPreviewGrantUsable(localPreviewGrantQuery.data)
-      ? (localPreviewGrantQuery.data?.grant ?? null)
-      : null;
-  const fileQuery = useQuery(
-    projectReadFileQueryOptions({
-      cwd: props.workspaceRoot,
-      relativePath: filePath,
-      previewGrant: localPreviewGrant,
-      // Images stream through the local-image HTTP route instead of the text
-      // file-read RPC.
-      enabled:
-        filePath !== null &&
-        !fileIsImage &&
-        (props.workspaceRoot !== null || localPreviewGrant !== null),
-    }),
-  );
-  useEffect(() => {
-    setMarkdownPreviewEnabled(markdownPreviewDefault);
-  }, [filePath, markdownPreviewDefault]);
-
-  const fileContents = fileQuery.data?.contents ?? "";
-  const showMarkdownPreview = fileIsMarkdown && markdownPreviewEnabled;
-  const lineCount = useMemo(
-    () => (fileContents.length === 0 ? 0 : fileContents.split("\n").length),
-    [fileContents],
-  );
-  // Highlight -> floating "Add to chat" -> reference that points at exactly what
-  // was selected, mirroring the transcript flow. This is offered only in the
-  // source view, where the DOM mirrors the file's lines/columns 1:1 so a
-  // selection resolves to an exact `line 12:5-12` span. The rendered-markdown
-  // view restructures the source (paragraphs, lists, headings), so a selection
-  // there cannot map back to an exact range — referencing a single word on a
-  // 3000-word line would pull in the whole line. The rendered view therefore
-  // stays read-only for references (browsing + task-list toggles only); use the
-  // Source toggle in the header to get a precise selection reference.
-  const readPreviewSelection = useCallback(
-    (container: HTMLElement): Omit<ChatFileReference, "path"> | null =>
-      showMarkdownPreview ? null : getSelectionWithin(container),
-    [showMarkdownPreview],
-  );
-  const commitPreviewSelection = useCallback(
-    (selection: Omit<ChatFileReference, "path">) => {
-      if (filePath) {
-        onReferenceInChat?.({ path: filePath, ...selection });
-      }
-    },
-    [onReferenceInChat, filePath],
-  );
-  const previewSelectionAction = useCodeSelectionAction({
-    enabled: Boolean(onReferenceInChat && filePath) && !showMarkdownPreview,
-    readSelection: readPreviewSelection,
-    onCommit: commitPreviewSelection,
-  });
-  // Hover "+" gutter affordance + inline "Local comment" box. Offered only in
-  // the source view, where the DOM mirrors the file's lines 1:1 so the hovered
-  // `.line` resolves to an exact line number (the rendered-markdown view
-  // restructures the source and cannot map a row back to a file line).
-  const lineCommentingEnabled = Boolean(onCommentInChat && filePath) && !showMarkdownPreview;
-  const lineCommenting = useFileLineCommenting({
-    enabled: lineCommentingEnabled,
-    resetKey: filePath,
-  });
-  const commitLineComment = useCallback(
-    (selection: Pick<FileCommentSelection, "startLine" | "endLine" | "text">) => {
-      if (filePath) {
-        onCommentInChat?.({ path: filePath, ...selection });
-      }
-    },
-    [filePath, onCommentInChat],
-  );
-  // Right-click references the selected line range in the source view,
-  // otherwise the whole file. The rendered-markdown view yields no selection
-  // (readPreviewSelection returns null there), so it always falls back to the
-  // whole-file reference.
-  const handleContentsContextMenu = useCallback(
-    (event: ReactMouseEvent<HTMLDivElement>) => {
-      if (!filePath) {
-        return;
-      }
-      event.preventDefault();
-      const container = contentsRef.current;
-      const selection = container ? readPreviewSelection(container) : null;
-      void showFileReferenceContextMenu({
-        path: filePath,
-        position: { x: event.clientX, y: event.clientY },
-        selection,
-        onReferenceInChat,
-        onAskWhyInChat,
-      });
-    },
-    [onAskWhyInChat, onReferenceInChat, filePath, readPreviewSelection],
-  );
-  // Clicking a task checkbox in the markdown preview persists the toggle to
-  // disk: optimistic cache update first, ordered write-through after, refetch
-  // on failure so the preview never drifts from the file.
-  const handleTaskToggle = useCallback(
-    ({ sourceLine, checked }: { sourceLine: number; checked: boolean }) => {
-      if (!workspaceRoot || !filePath) {
-        return;
-      }
-      const options = projectReadFileQueryOptions({ cwd: workspaceRoot, relativePath: filePath });
-      const current = queryClient.getQueryData(options.queryKey);
-      if (!current || current.truncated) {
-        return;
-      }
-      const nextContents = toggleMarkdownTaskMarker(current.contents, sourceLine, checked);
-      if (nextContents === null) {
-        return;
-      }
-      // No API means no write can happen — bail before the optimistic update
-      // so the preview never shows a toggle that was silently dropped.
-      const api = readNativeApi();
-      if (!api) {
-        return;
-      }
-      queryClient.setQueryData(options.queryKey, { ...current, contents: nextContents });
-      // The read RPC may have resolved a bare/partial reference (e.g. a clicked
-      // `notes.md`) to its real nested path. Write back to that resolved path,
-      // not the opened reference, so the toggle lands on the file we read from
-      // instead of creating a stray file at the workspace root.
-      const writeRelativePath = current.relativePath;
-      // Writes carry the full file contents, so serialize them: a slower earlier
-      // checkbox write must never land after a newer toggle and erase it.
-      const fileKey = `${workspaceRoot}\0${filePath}`;
-      const writeVersion = latestTaskWriteVersionRef.current.next + 1;
-      latestTaskWriteVersionRef.current.next = writeVersion;
-      latestTaskWriteVersionRef.current.byFile.set(fileKey, writeVersion);
-      taskWriteQueueRef.current = taskWriteQueueRef.current
-        .catch(() => undefined)
-        .then(() =>
-          api.projects.writeFile({
-            cwd: workspaceRoot,
-            relativePath: writeRelativePath,
-            contents: nextContents,
-          }),
-        )
-        .then(() => undefined)
-        .catch(() => {
-          if (latestTaskWriteVersionRef.current.byFile.get(fileKey) !== writeVersion) {
-            return;
-          }
-          void queryClient.invalidateQueries({ queryKey: options.queryKey });
-        });
-      void taskWriteQueueRef.current;
-    },
-    [filePath, queryClient, workspaceRoot],
-  );
-  const handleMarkdownPreviewChange = useCallback((rendered: boolean) => {
-    setMarkdownPreviewEnabled(rendered);
-  }, []);
-  // Toggling a task rewrites the file, so only enable it when the preview
-  // holds the complete contents (writing a truncated read would corrupt it).
-  const canToggleTasks =
-    props.workspaceRoot !== null &&
-    fileIsWorkspaceRelative &&
-    fileQuery.data !== undefined &&
-    !fileQuery.data.truncated;
-
-  if (!props.workspaceRoot && !fileIsLocalAbsolute && !fileIsScratchImagePreview) {
-    return (
-      <PanelStateMessage density="compact" fill="flex">
-        <p>No workspace is attached to this chat.</p>
-      </PanelStateMessage>
-    );
-  }
-
-  if (!filePath) {
-    return (
-      props.emptyState ?? (
-        <PanelStateMessage density="compact" fill="flex">
-          <p>Select a file from the explorer.</p>
-        </PanelStateMessage>
-      )
-    );
-  }
-  if (fileNeedsLocalPreviewGrant && !localPreviewGrant) {
-    if (localPreviewGrantQuery.error) {
-      return (
-        <PanelStateMessage density="compact" fill="flex" className="items-start justify-start p-3">
-          <p className="text-left text-[11px] text-destructive/85">
-            {localPreviewGrantQuery.error instanceof Error
-              ? localPreviewGrantQuery.error.message
-              : "Could not create local file preview grant."}
-          </p>
-        </PanelStateMessage>
-      );
-    }
-    return <FilePreviewLoadingState />;
-  }
-
-  const hoveredCommentLine = lineCommenting.hoveredLine;
-  const activeCommentLine = lineCommenting.activeLine;
-
-  return (
-    <div className="flex h-full min-h-0 min-w-0 flex-1 flex-col bg-[var(--color-background-surface)]">
-      <WorkspaceFilePreviewHeader
-        workspaceRoot={props.workspaceRoot}
-        filePath={filePath}
-        isMarkdown={fileIsMarkdown}
-        markdownPreviewEnabled={showMarkdownPreview}
-        onMarkdownPreviewChange={handleMarkdownPreviewChange}
-        onReferenceInChat={onReferenceInChat}
-        onAskWhyInChat={onAskWhyInChat}
-        truncated={fileQuery.data?.truncated ?? false}
-      />
-      {fileIsImage ? (
-        <div
-          className="editor-file-viewer min-h-0 flex-1 overflow-auto"
-          onContextMenu={handleContentsContextMenu}
-        >
-          <LocalImagePreview
-            src={filePath}
-            cwd={props.workspaceRoot}
-            previewGrant={localPreviewGrant}
-            alt={basenameOfPath(filePath)}
-            className="min-h-full"
-            imageClassName="max-h-[calc(100vh-13rem)]"
-          />
-        </div>
-      ) : fileQuery.isLoading ? (
-        <FilePreviewLoadingState />
-      ) : fileQuery.error ? (
-        <PanelStateMessage density="compact" fill="flex" className="items-start justify-start p-3">
-          <p className="text-left text-[11px] text-destructive/85">
-            {fileQuery.error instanceof Error ? fileQuery.error.message : "Could not read file."}
-          </p>
-        </PanelStateMessage>
-      ) : (
-        <div
-          ref={contentsRef}
-          className={cn(
-            "editor-file-viewer min-h-0 flex-1 overflow-auto",
-            showMarkdownPreview && "editor-file-viewer--markdown-preview",
-          )}
-          onContextMenu={handleContentsContextMenu}
-          onMouseUp={previewSelectionAction.onContainerMouseUp}
-          onMouseMove={lineCommenting.onContainerMouseMove}
-          onMouseLeave={lineCommenting.onContainerMouseLeave}
-        >
-          {showMarkdownPreview ? (
-            <div className="editor-markdown-preview">
-              <ChatMarkdown
-                text={fileContents}
-                cwd={markdownPreviewCwd(props.workspaceRoot, filePath)}
-                isStreaming={false}
-                className="editor-markdown-preview__body text-sm leading-relaxed"
-                {...(canToggleTasks ? { onTaskToggle: handleTaskToggle } : {})}
-              />
-            </div>
-          ) : (
-            <FileContentsView path={filePath} contents={fileContents} themeName={diffThemeName} />
-          )}
-          {!showMarkdownPreview && lineCount > 0 ? (
-            <span className="sr-only">{lineCount} lines</span>
-          ) : null}
-          {previewSelectionAction.pendingAction ? (
-            <TranscriptSelectionAction
-              left={previewSelectionAction.pendingAction.left}
-              top={previewSelectionAction.pendingAction.top}
-              placement={previewSelectionAction.pendingAction.placement}
-              onAddToChat={previewSelectionAction.commit}
-            />
-          ) : null}
-          {lineCommentingEnabled && hoveredCommentLine && !activeCommentLine ? (
-            <button
-              type="button"
-              className="editor-file-viewer__comment-add"
-              style={{
-                top: hoveredCommentLine.top,
-                left: hoveredCommentLine.left,
-                height: hoveredCommentLine.height,
-              }}
-              aria-label={`Comment on line ${hoveredCommentLine.lineNumber}`}
-              title="Comment"
-              onMouseDown={(event) => event.preventDefault()}
-              onClick={(event) => {
-                event.preventDefault();
-                event.stopPropagation();
-                lineCommenting.openComment(hoveredCommentLine);
-              }}
-            >
-              <span className="editor-file-viewer__comment-add-glyph">
-                <PlusIcon className="size-3.5" />
-              </span>
-            </button>
-          ) : null}
-          {lineCommentingEnabled && activeCommentLine ? (
-            <>
-              <div
-                className="editor-file-viewer__comment-line-highlight"
-                style={{ top: activeCommentLine.top, height: activeCommentLine.height }}
-                aria-hidden="true"
-              />
-              <FileLineCommentBox
-                lineLabel={formatFileCommentRange({
-                  startLine: activeCommentLine.lineNumber,
-                  endLine: activeCommentLine.lineNumber,
-                })}
-                top={activeCommentLine.top + activeCommentLine.height}
-                left={activeCommentLine.left}
-                width={Math.max(
-                  240,
-                  Math.min(440, activeCommentLine.containerWidth - activeCommentLine.left - 16),
-                )}
-                onCancel={lineCommenting.closeComment}
-                onSubmit={(text) => {
-                  commitLineComment({
-                    startLine: activeCommentLine.lineNumber,
-                    endLine: activeCommentLine.lineNumber,
-                    text,
-                  });
-                  lineCommenting.closeComment();
-                }}
-              />
-            </>
-          ) : null}
-        </div>
-      )}
-    </div>
-  );
-}
diff --git a/apps/web/src/components/chat/ChatHeader.test.ts b/apps/web/src/components/chat/ChatHeader.test.ts
index 875966bf3..c50e980ed 100644
--- a/apps/web/src/components/chat/ChatHeader.test.ts
+++ b/apps/web/src/components/chat/ChatHeader.test.ts
@@ -8,15 +8,11 @@ import { describe, expect, it } from "vitest";
 import { resolveChatHeaderThreadIconKind } from "./ChatHeader";
 
 describe("resolveChatHeaderThreadIconKind", () => {
-  it("uses the terminal icon for terminal-first threads", () => {
-    expect(resolveChatHeaderThreadIconKind("terminal", "New terminal")).toBe("terminal");
-  });
-
-  it("keeps provider branding for chat-first threads", () => {
-    expect(resolveChatHeaderThreadIconKind("chat", "Fix auth flow")).toBe("provider");
+  it("keeps provider branding for named threads", () => {
+    expect(resolveChatHeaderThreadIconKind("Fix auth flow")).toBe("provider");
   });
 
   it("hides provider branding for untouched new chat threads", () => {
-    expect(resolveChatHeaderThreadIconKind("chat", "New thread")).toBe("none");
+    expect(resolveChatHeaderThreadIconKind("New thread")).toBe("none");
   });
 });
diff --git a/apps/web/src/components/chat/ChatHeader.tsx b/apps/web/src/components/chat/ChatHeader.tsx
index f9ae105a6..daf9f5cd6 100644
--- a/apps/web/src/components/chat/ChatHeader.tsx
+++ b/apps/web/src/components/chat/ChatHeader.tsx
@@ -80,7 +80,6 @@ const HEADER_COMPACT_BREAKPOINT = 700;
 interface ChatHeaderProps {
   activeThreadId: ThreadId;
   activeThreadTitle: string;
-  activeThreadEntryPoint: ThreadPrimarySurface;
   activeProvider: ProviderKind;
   activeProjectName: string | undefined;
   threadBreadcrumbs: ReadonlyArray<{
@@ -106,8 +105,6 @@ interface ChatHeaderProps {
   gitCwd: string | null;
   diffTotals: RepoDiffTotals;
   showGitActions?: boolean;
-  showDiffToggle?: boolean;
-  diffOpen: boolean;
   diffDisabledReason?: string | null;
   surfaceMode?: "single" | "split";
   chatLayoutAction?: {
@@ -137,7 +134,6 @@ interface ChatHeaderProps {
   onAddProjectScript: (input: NewProjectScriptInput) => Promise<void>;
   onUpdateProjectScript: (scriptId: string, input: NewProjectScriptInput) => Promise<void>;
   onDeleteProjectScript: (scriptId: string) => Promise<void>;
-  onToggleDiff: () => void;
   onCreateHandoff: (targetProvider: ProviderKind) => void;
   onNavigateToThread: (threadId: ThreadId) => void;
   onRenameThread: () => void;
@@ -463,22 +459,15 @@ function EditorRailTabs(props: {
   );
 }
 
-export type ChatHeaderThreadIconKind = "none" | "provider" | "terminal";
+export type ChatHeaderThreadIconKind = "none" | "provider";
 
-export function resolveChatHeaderThreadIconKind(
-  entryPoint: ThreadPrimarySurface,
-  title?: string,
-): ChatHeaderThreadIconKind {
-  if (entryPoint === "chat" && isGenericChatThreadTitle(title)) {
-    return "none";
-  }
-  return entryPoint === "terminal" ? "terminal" : "provider";
+export function resolveChatHeaderThreadIconKind(title?: string): ChatHeaderThreadIconKind {
+  return isGenericChatThreadTitle(title) ? "none" : "provider";
 }
 
 export const ChatHeader = memo(function ChatHeader({
   activeThreadId,
   activeThreadTitle,
-  activeThreadEntryPoint,
   activeProvider,
   activeProjectName,
   threadBreadcrumbs,
@@ -501,8 +490,6 @@ export const ChatHeader = memo(function ChatHeader({
   gitCwd,
   diffTotals,
   showGitActions = true,
-  showDiffToggle = true,
-  diffOpen,
   diffDisabledReason = null,
   surfaceMode = "single",
   chatLayoutAction = null,
@@ -512,7 +499,6 @@ export const ChatHeader = memo(function ChatHeader({
   onAddProjectScript,
   onUpdateProjectScript,
   onDeleteProjectScript,
-  onToggleDiff,
   onCreateHandoff,
   onNavigateToThread,
   onRenameThread,
@@ -540,7 +526,7 @@ export const ChatHeader = memo(function ChatHeader({
   // Split-chat creation moved to a shortcut only; the header keeps just the inline
   // "maximize" affordance for an already-split focused pane.
   const inlineChatLayoutAction = chatLayoutAction?.kind === "maximize" ? chatLayoutAction : null;
-  const threadIconKind = resolveChatHeaderThreadIconKind(activeThreadEntryPoint, activeThreadTitle);
+  const threadIconKind = resolveChatHeaderThreadIconKind(activeThreadTitle);
 
   useEffect(() => {
     const el = headerRef.current;
@@ -582,9 +568,6 @@ export const ChatHeader = memo(function ChatHeader({
     if (activeProjectName && showGitActions) {
       available.add("gitActions");
     }
-    if (showDiffToggle) {
-      available.add("diff");
-    }
 
     const hidden = new Set<ChatHeaderControlId>(hiddenChatHeaderControls);
     return DEFAULT_CHAT_HEADER_CONTROL_ORDER.filter(
@@ -598,7 +581,6 @@ export const ChatHeader = memo(function ChatHeader({
     chatHeaderControlOrder,
     hiddenChatHeaderControls,
     hideHandoffControls,
-    showDiffToggle,
     showGitActions,
   ]);
 
@@ -669,48 +651,6 @@ export const ChatHeader = memo(function ChatHeader({
             hideQuickActionLabel={compact}
           />
         );
-      case "diff":
-        return (
-          <Tooltip>
-            <TooltipTrigger
-              render={
-                <Toggle
-                  className={cn(
-                    CHAT_HEADER_TOGGLE_CLASS_NAME,
-                    showDiffTotals ? null : "!size-7 [&_svg,&_[data-slot=central-icon]]:mx-0",
-                  )}
-                  pressed={diffOpen}
-                  onPressedChange={onToggleDiff}
-                  aria-label="Toggle diff panel"
-                  variant="default"
-                  size="xs"
-                  disabled={!isGitRepo || (diffDisabledReason !== null && !diffOpen)}
-                >
-                  {showDiffTotals ? (
-                    <span className="inline-flex items-center gap-1">
-                      <span className="font-system-ui text-[length:var(--app-font-size-ui-sm,13px)] sm:text-[length:var(--app-font-size-ui-xs,12px)] font-normal tracking-normal tabular-nums text-success">
-                        +{diffAdditions}
-                      </span>
-                      <span className="font-system-ui text-[length:var(--app-font-size-ui-sm,13px)] sm:text-[length:var(--app-font-size-ui-xs,12px)] font-normal tracking-normal tabular-nums text-destructive">
-                        -{diffDeletions}
-                      </span>
-                    </span>
-                  ) : null}
-                  <SurfaceChipIcon icon={PanelRightCloseIcon} className="size-4" />
-                </Toggle>
-              }
-            />
-            <TooltipPopup side="bottom">
-              {!isGitRepo
-                ? "Diff panel is unavailable because this project is not a git repository."
-                : diffDisabledReason && !diffOpen
-                  ? diffDisabledReason
-                  : diffToggleShortcutLabel
-                    ? `Toggle diff panel (${diffToggleShortcutLabel})`
-                    : "Toggle diff panel"}
-            </TooltipPopup>
-          </Tooltip>
-        );
     }
   };
 
@@ -757,17 +697,9 @@ export const ChatHeader = memo(function ChatHeader({
                 {threadIconKind === "none" ? null : (
                   <span
                     className="inline-flex size-3.5 shrink-0 items-center justify-center"
-                    title={
-                      threadIconKind === "terminal"
-                        ? "Terminal"
-                        : PROVIDER_DISPLAY_NAMES[activeProvider]
-                    }
+                    title={PROVIDER_DISPLAY_NAMES[activeProvider]}
                   >
-                    {threadIconKind === "terminal" ? (
-                      <TerminalIcon className="size-3.5 text-[var(--color-text-accent)]" />
-                    ) : (
-                      renderProviderIcon(activeProvider, "size-3.5")
-                    )}
+                    {renderProviderIcon(activeProvider, "size-3.5")}
                   </span>
                 )}
                 <h2
diff --git a/apps/web/src/components/chat/ChatTranscriptPane.browser.tsx b/apps/web/src/components/chat/ChatTranscriptPane.browser.tsx
index 560788a5a..07b7cc9af 100644
--- a/apps/web/src/components/chat/ChatTranscriptPane.browser.tsx
+++ b/apps/web/src/components/chat/ChatTranscriptPane.browser.tsx
@@ -114,10 +114,8 @@ function TranscriptPerfHarness(props: { onTranscriptRender: () => void }) {
           onRevertUserMessage={NOOP}
           onScrollToBottom={NOOP}
           onToggleWorkGroup={NOOP}
-          resolvedTheme="dark"
           revertTurnCountByUserMessageId={EMPTY_REVERT_COUNTS}
           scrollButtonVisible={false}
-          terminalWorkspaceTerminalTabActive={false}
           timelineEntries={TIMELINE_ENTRIES}
           timestampFormat="locale"
           turnDiffSummaryByAssistantMessageId={EMPTY_TURN_DIFFS}
@@ -196,10 +194,8 @@ describe("ChatTranscriptPane", () => {
         onOpenThread={NOOP}
         onRevertUserMessage={NOOP}
         onScrollToBottom={NOOP}
-        resolvedTheme="dark"
         revertTurnCountByUserMessageId={EMPTY_REVERT_COUNTS}
         scrollButtonVisible={false}
-        terminalWorkspaceTerminalTabActive={false}
         timelineEntries={[
           {
             id: "user-message-entry",
@@ -275,10 +271,8 @@ describe("ChatTranscriptPane", () => {
         onOpenThread={NOOP}
         onRevertUserMessage={NOOP}
         onScrollToBottom={NOOP}
-        resolvedTheme="dark"
         revertTurnCountByUserMessageId={EMPTY_REVERT_COUNTS}
         scrollButtonVisible={false}
-        terminalWorkspaceTerminalTabActive={false}
         timelineEntries={[
           {
             id: "user-message-entry-1",
diff --git a/apps/web/src/components/chat/ChatTranscriptPane.test.tsx b/apps/web/src/components/chat/ChatTranscriptPane.test.tsx
index ae66754ff..125e83280 100644
--- a/apps/web/src/components/chat/ChatTranscriptPane.test.tsx
+++ b/apps/web/src/components/chat/ChatTranscriptPane.test.tsx
@@ -40,10 +40,8 @@ function renderTranscriptPaneMarkup(
       onOpenThread={(_threadId: ThreadId) => {}}
       onRevertUserMessage={(_messageId: MessageId) => {}}
       onScrollToBottom={() => {}}
-      resolvedTheme="light"
       revertTurnCountByUserMessageId={new Map()}
       scrollButtonVisible
-      terminalWorkspaceTerminalTabActive={false}
       timelineEntries={[]}
       timestampFormat="locale"
       turnDiffSummaryByAssistantMessageId={new Map()}
diff --git a/apps/web/src/components/chat/ChatTranscriptPane.tsx b/apps/web/src/components/chat/ChatTranscriptPane.tsx
index de8c19a7e..49542f209 100644
--- a/apps/web/src/components/chat/ChatTranscriptPane.tsx
+++ b/apps/web/src/components/chat/ChatTranscriptPane.tsx
@@ -34,8 +34,6 @@ import { DISCLOSURE_CONTENT_MOTION_CLASS } from "~/lib/disclosureMotion";
 import { type ExpandedImagePreview } from "./ExpandedImagePreview";
 import { ChatEmptyStateHero } from "./ChatEmptyStateHero";
 import { MessagesTimeline, type MessagesTimelineController } from "./MessagesTimeline";
-import { MessageTrail } from "./MessageTrail";
-import { createActiveTrailStore, deriveMessageTrailItems } from "./messageTrail.logic";
 import { AgentActivityDetailView } from "./AgentActivityDetailView";
 import type { AgentActivityDetail } from "./agentActivity.logic";
 
@@ -84,10 +82,8 @@ interface ChatTranscriptPaneProps {
   onEditUserMessage?: (messageId: MessageId, text: string) => boolean | Promise<boolean>;
   onScrollToBottom: () => void;
   onToggleWorkGroup?: (groupId: string) => void;
-  resolvedTheme: "light" | "dark";
   revertTurnCountByUserMessageId: Map<MessageId, number>;
   scrollButtonVisible: boolean;
-  terminalWorkspaceTerminalTabActive: boolean;
   timelineEntries: ComponentProps<typeof MessagesTimeline>["timelineEntries"];
   timestampFormat: TimestampFormat;
   turnDiffSummaryByAssistantMessageId: Map<MessageId, TurnDiffSummary>;
@@ -140,10 +136,8 @@ export const ChatTranscriptPane = memo(function ChatTranscriptPane({
   onEditUserMessage,
   onScrollToBottom,
   onToggleWorkGroup,
-  resolvedTheme,
   revertTurnCountByUserMessageId,
   scrollButtonVisible,
-  terminalWorkspaceTerminalTabActive,
   timelineEntries,
   timestampFormat,
   turnDiffSummaryByAssistantMessageId,
@@ -154,35 +148,10 @@ export const ChatTranscriptPane = memo(function ChatTranscriptPane({
     ? { paddingRight: contentInsetRightPx }
     : undefined;
 
-  // Left-edge navigation trail: one tick per sent message. Current + visible
-  // highlights are pushed up from MessagesTimeline as the viewport scrolls. They
-  // flow through a stable store (not pane state) so scroll updates re-render only
-  // the trail, not the memoized timeline; reset on thread switch so stale
-  // highlights can't linger.
-  const trailItems = useMemo(() => deriveMessageTrailItems(timelineEntries), [timelineEntries]);
-  const activeTrailStoreRef = useRef<ReturnType<typeof createActiveTrailStore> | null>(null);
-  if (activeTrailStoreRef.current === null) {
-    activeTrailStoreRef.current = createActiveTrailStore();
-  }
-  const activeTrailStore = activeTrailStoreRef.current;
-  useEffect(() => {
-    activeTrailStore.set(null);
-  }, [activeThreadId, activeTrailStore]);
-  const handleTrailSelect = useCallback(
-    (messageId: MessageId) => {
-      timelineControllerRef?.current?.scrollToMessage(messageId);
-    },
-    [timelineControllerRef],
-  );
-
   return (
     <div
       data-chat-transcript-pane="true"
-      aria-hidden={terminalWorkspaceTerminalTabActive}
-      className={cn(
-        "flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden",
-        terminalWorkspaceTerminalTabActive ? "pointer-events-none invisible" : "",
-      )}
+      className={cn("flex min-h-0 min-w-0 flex-1 flex-col overflow-hidden")}
     >
       <div className="relative flex min-h-0 flex-1 flex-col overflow-hidden">
         {agentActivityDetail && onCloseAgentActivityDetail ? (
@@ -225,7 +194,6 @@ export const ChatTranscriptPane = memo(function ChatTranscriptPane({
             onImageExpand={onExpandTimelineImage}
             followLiveOutput={followLiveOutput}
             onIsAtEndChange={onIsAtEndChange}
-            onTrailHighlightsChange={activeTrailStore.set}
             onMessagesScroll={onMessagesScroll}
             onMessagesClickCapture={onMessagesClickCapture}
             onMessagesMouseUp={onMessagesMouseUp}
@@ -237,7 +205,6 @@ export const ChatTranscriptPane = memo(function ChatTranscriptPane({
             onMessagesTouchMove={onMessagesTouchMove}
             onMessagesTouchEnd={onMessagesTouchEnd}
             markdownCwd={markdownCwd}
-            resolvedTheme={resolvedTheme}
             chatFontSizePx={chatFontSizePx}
             timestampFormat={timestampFormat}
             workspaceRoot={workspaceRoot}
@@ -287,14 +254,6 @@ export const ChatTranscriptPane = memo(function ChatTranscriptPane({
             </button>
           </div>
         ) : null}
-
-        {!agentActivityDetail ? (
-          <MessageTrail
-            items={trailItems}
-            activeStore={activeTrailStore}
-            onSelect={handleTrailSelect}
-          />
-        ) : null}
       </div>
     </div>
   );
diff --git a/apps/web/src/components/chat/ComposerChoiceRow.tsx b/apps/web/src/components/chat/ComposerChoiceRow.tsx
index 34162a281..9147883a2 100644
--- a/apps/web/src/components/chat/ComposerChoiceRow.tsx
+++ b/apps/web/src/components/chat/ComposerChoiceRow.tsx
@@ -62,7 +62,7 @@ export function ComposerChoiceRow({
       disabled={disabled}
       onClick={onSelect}
       className={cn(
-        "group flex w-full items-start gap-2.5 rounded-[8px] border border-transparent px-2.5 py-2 text-left transition-[background-color,border-color,scale] duration-press ease-out focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background active:scale-[0.96] motion-reduce:active:scale-100",
+        "group flex w-full items-start gap-2.5 rounded-lg border border-transparent px-2.5 py-2 text-left transition-[background-color,border-color,scale] duration-press ease-out focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background active:scale-[0.96] motion-reduce:active:scale-100",
         selected
           ? "border-[color:color-mix(in_srgb,var(--foreground)_20%,var(--panel-border))] bg-[var(--selected)]"
           : ROW_TONE_CLASS_NAME[tone],
diff --git a/apps/web/src/components/chat/ComposerCommandMenu.tsx b/apps/web/src/components/chat/ComposerCommandMenu.tsx
index a6e486c01..369e98328 100644
--- a/apps/web/src/components/chat/ComposerCommandMenu.tsx
+++ b/apps/web/src/components/chat/ComposerCommandMenu.tsx
@@ -289,7 +289,6 @@ export function groupCommandItems(
 
 export const ComposerCommandMenu = memo(function ComposerCommandMenu(props: {
   items: ComposerCommandItem[];
-  resolvedTheme: "light" | "dark";
   isLoading: boolean;
   triggerKind: ComposerTriggerKind | null;
   groupSlashCommandSections?: boolean;
@@ -340,7 +339,6 @@ export const ComposerCommandMenu = memo(function ComposerCommandMenu(props: {
                   <ComposerCommandMenuItem
                     key={item.id}
                     item={item}
-                    resolvedTheme={props.resolvedTheme}
                     isActive={props.activeItemId === item.id}
                     itemRef={(node) => {
                       itemRefs.current[item.id] = node;
@@ -428,7 +426,7 @@ function commandMenuSlashGlyph(command: string, fallback: LucideIcon): ReactNode
   return <Icon className={COMPOSER_COMMAND_ITEM_GLYPH_CLASSNAME} />;
 }
 
-function commandMenuItemGlyph(item: ComposerCommandItem, theme: "light" | "dark"): ReactNode {
+function commandMenuItemGlyph(item: ComposerCommandItem): ReactNode {
   const cls = COMPOSER_COMMAND_ITEM_GLYPH_CLASSNAME;
   switch (item.type) {
     case "path":
@@ -436,7 +434,6 @@ function commandMenuItemGlyph(item: ComposerCommandItem, theme: "light" | "dark"
         <FileEntryIcon
           pathValue={item.path}
           kind={item.pathKind}
-          theme={theme}
           className={
             item.pathKind === "directory" ? cls : COMPOSER_COMMAND_ITEM_FILE_ICON_CLASSNAME
           }
@@ -478,7 +475,6 @@ function commandMenuItemGlyph(item: ComposerCommandItem, theme: "light" | "dark"
 
 const ComposerCommandItemIcon = memo(function ComposerCommandItemIcon(props: {
   item: ComposerCommandItem;
-  resolvedTheme: "light" | "dark";
   isActive: boolean;
 }) {
   return (
@@ -488,14 +484,13 @@ const ComposerCommandItemIcon = memo(function ComposerCommandItemIcon(props: {
         props.isActive && "text-foreground/70",
       )}
     >
-      {commandMenuItemGlyph(props.item, props.resolvedTheme)}
+      {commandMenuItemGlyph(props.item)}
     </span>
   );
 });
 
 const ComposerCommandMenuItem = memo(function ComposerCommandMenuItem(props: {
   item: ComposerCommandItem;
-  resolvedTheme: "light" | "dark";
   isActive: boolean;
   itemRef: (node: HTMLElement | null) => void;
   onHighlight: (itemId: string | null) => void;
@@ -522,11 +517,7 @@ const ComposerCommandMenuItem = memo(function ComposerCommandMenuItem(props: {
         props.onSelect(props.item);
       }}
     >
-      <ComposerCommandItemIcon
-        item={props.item}
-        resolvedTheme={props.resolvedTheme}
-        isActive={props.isActive}
-      />
+      <ComposerCommandItemIcon item={props.item} isActive={props.isActive} />
       <div className="min-w-0 flex flex-1 items-center gap-3">
         <div className="min-w-0 flex flex-1 items-center gap-1.5 overflow-hidden">
           <span className="shrink-0 text-[11.5px] font-medium text-foreground/80">
diff --git a/apps/web/src/components/chat/ComposerImageAttachmentChip.tsx b/apps/web/src/components/chat/ComposerImageAttachmentChip.tsx
index 53de88fbf..8aed9886d 100644
--- a/apps/web/src/components/chat/ComposerImageAttachmentChip.tsx
+++ b/apps/web/src/components/chat/ComposerImageAttachmentChip.tsx
@@ -51,10 +51,10 @@ export const ComposerImageAttachmentChip = memo(function ComposerImageAttachment
               <img
                 src={image.source.appIconDataUrl}
                 alt=""
-                className="size-5 shrink-0 rounded-[5px]"
+                className="size-5 shrink-0 rounded-md"
               />
             ) : (
-              <span className="flex size-5 shrink-0 items-center justify-center rounded-[5px] bg-muted text-[9px] font-semibold text-muted-foreground">
+              <span className="flex size-5 shrink-0 items-center justify-center rounded-md bg-muted text-[9px] font-semibold text-muted-foreground">
                 {(image.source.appName || "A").slice(0, 1).toUpperCase()}
               </span>
             )}
diff --git a/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx b/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx
index edba54210..28dcf0cda 100644
--- a/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx
+++ b/apps/web/src/components/chat/ComposerPendingApprovalPanel.tsx
@@ -169,7 +169,7 @@ function ApprovalDetail({ parsed }: { parsed: ParsedApproval }) {
   if (code) {
     return (
       <pre
-        className="mt-2.5 overflow-hidden rounded-[8px] bg-[var(--color-background-elevated-secondary)] px-3 py-2 font-mono text-[12px] leading-snug text-foreground/85"
+        className="mt-2.5 overflow-hidden rounded-lg bg-[var(--color-background-elevated-secondary)] px-3 py-2 font-mono text-[12px] leading-snug text-foreground/85"
         title={code}
       >
         <code className="block truncate">{code}</code>
diff --git a/apps/web/src/components/chat/ComposerPendingTerminalContexts.test.tsx b/apps/web/src/components/chat/ComposerPendingTerminalContexts.test.tsx
deleted file mode 100644
index 060f197e9..000000000
--- a/apps/web/src/components/chat/ComposerPendingTerminalContexts.test.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { ThreadId } from "@t3tools/contracts";
-import { renderToStaticMarkup } from "react-dom/server";
-import { describe, expect, it } from "vitest";
-
-import { ComposerPendingTerminalContextChip } from "./ComposerPendingTerminalContexts";
-
-describe("ComposerPendingTerminalContextChip", () => {
-  it("renders expired terminal contexts with error styling", () => {
-    const markup = renderToStaticMarkup(
-      <ComposerPendingTerminalContextChip
-        context={{
-          id: "ctx-expired",
-          threadId: ThreadId.makeUnsafe("thread-1"),
-          terminalId: "default",
-          terminalLabel: "Terminal 1",
-          lineStart: 2,
-          lineEnd: 4,
-          text: "",
-          createdAt: "2026-03-17T18:42:05.449Z",
-        }}
-      />,
-    );
-
-    expect(markup).toContain('data-terminal-context-expired="true"');
-    expect(markup).toContain("border-destructive/35");
-    expect(markup).toContain("Terminal 1 lines 2-4");
-  });
-});
diff --git a/apps/web/src/components/chat/ComposerPendingTerminalContexts.tsx b/apps/web/src/components/chat/ComposerPendingTerminalContexts.tsx
deleted file mode 100644
index 37c05eab2..000000000
--- a/apps/web/src/components/chat/ComposerPendingTerminalContexts.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { cn } from "~/lib/utils";
-import {
-  type TerminalContextDraft,
-  formatTerminalContextLabel,
-  isTerminalContextExpired,
-} from "~/lib/terminalContext";
-import { TerminalContextInlineChip } from "./TerminalContextInlineChip";
-
-interface ComposerPendingTerminalContextsProps {
-  contexts: ReadonlyArray<TerminalContextDraft>;
-  className?: string;
-}
-
-interface ComposerPendingTerminalContextChipProps {
-  context: TerminalContextDraft;
-}
-
-export function ComposerPendingTerminalContextChip({
-  context,
-}: ComposerPendingTerminalContextChipProps) {
-  const label = formatTerminalContextLabel(context);
-  const expired = isTerminalContextExpired(context);
-  const tooltipText = expired
-    ? `Terminal context expired. Remove and re-add ${label} to include it in your message.`
-    : context.text;
-
-  return <TerminalContextInlineChip label={label} tooltipText={tooltipText} expired={expired} />;
-}
-
-export function ComposerPendingTerminalContexts(props: ComposerPendingTerminalContextsProps) {
-  const { contexts, className } = props;
-
-  if (contexts.length === 0) {
-    return null;
-  }
-
-  return (
-    <div className={cn("flex flex-wrap gap-1.5", className)}>
-      {contexts.map((context) => (
-        <ComposerPendingTerminalContextChip key={context.id} context={context} />
-      ))}
-    </div>
-  );
-}
diff --git a/apps/web/src/components/chat/DockExplorerPane.tsx b/apps/web/src/components/chat/DockExplorerPane.tsx
deleted file mode 100644
index f55a6d6f8..000000000
--- a/apps/web/src/components/chat/DockExplorerPane.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-// FILE: DockExplorerPane.tsx
-// Purpose: Right-dock pane that embeds the unified workspace explorer (a fixed
-//          search box over the file tree, switching to file-name results as the
-//          user types) alongside the shared file viewer.
-// Layer: Chat right-dock UI
-// Exports: DockExplorerPane
-
-import { memo, useCallback, useEffect, useState } from "react";
-
-import type { ChatFileReference } from "~/lib/chatReferences";
-import type { FileCommentSelection } from "~/lib/fileComments";
-import { WorkspaceFilePreview } from "../WorkspaceFilePreview";
-import { PanelStateMessage } from "./PanelStateMessage";
-import { WorkspaceExplorerSidebar } from "./workspaceExplorer";
-
-// The dock lays out as a fixed horizontal row, so the shared sidebar takes a
-// full-height fixed-width column (the editor's responsive default would collapse
-// to a stacked block here). With the activity rail gone, the search box sits at
-// the top of this column and the freed width goes to the file viewer.
-const DOCK_EXPLORER_SIDEBAR_CLASS =
-  "flex h-full min-h-0 w-60 shrink-0 flex-col border-r border-border/65 bg-[var(--color-background-surface)]";
-
-export const DockExplorerPane = memo(function DockExplorerPane(props: {
-  workspaceRoot: string | null;
-  initialFilePath?: string | null;
-  onReferenceInChat?: ((reference: ChatFileReference) => void) | undefined;
-  onAskWhyInChat?: ((reference: ChatFileReference) => void) | undefined;
-  onCommentInChat?: ((comment: FileCommentSelection) => void) | undefined;
-}) {
-  const [selectedFilePath, setSelectedFilePath] = useState<string | null>(
-    props.initialFilePath ?? null,
-  );
-  const [expandedDirectories, setExpandedDirectories] = useState<ReadonlySet<string>>(
-    () => new Set<string>(),
-  );
-  const [searchQuery, setSearchQuery] = useState("");
-
-  useEffect(() => {
-    if (props.initialFilePath) setSelectedFilePath(props.initialFilePath);
-  }, [props.initialFilePath]);
-
-  const handleSelectFile = useCallback((path: string) => {
-    setSelectedFilePath(path);
-  }, []);
-
-  const handleToggleDirectory = useCallback((path: string) => {
-    setExpandedDirectories((current) => {
-      const next = new Set(current);
-      if (next.has(path)) {
-        next.delete(path);
-      } else {
-        next.add(path);
-      }
-      return next;
-    });
-  }, []);
-
-  return (
-    <div className="flex h-full min-h-0 w-full">
-      <WorkspaceExplorerSidebar
-        workspaceRoot={props.workspaceRoot}
-        selectedFilePath={selectedFilePath}
-        expandedDirectories={expandedDirectories}
-        query={searchQuery}
-        onQueryChange={setSearchQuery}
-        containerClassName={DOCK_EXPLORER_SIDEBAR_CLASS}
-        onSelectFile={handleSelectFile}
-        onToggleDirectory={handleToggleDirectory}
-        onReferenceInChat={props.onReferenceInChat}
-      />
-      <div className="flex min-h-0 min-w-0 flex-1">
-        <WorkspaceFilePreview
-          workspaceRoot={props.workspaceRoot}
-          filePath={selectedFilePath}
-          emptyState={
-            <PanelStateMessage density="compact" fill="flex">
-              <p>Select a file from the tree to view it.</p>
-            </PanelStateMessage>
-          }
-          onReferenceInChat={props.onReferenceInChat}
-          onAskWhyInChat={props.onAskWhyInChat}
-          onCommentInChat={props.onCommentInChat}
-        />
-      </div>
-    </div>
-  );
-});
diff --git a/apps/web/src/components/chat/DockPaneHeader.tsx b/apps/web/src/components/chat/DockPaneHeader.tsx
deleted file mode 100644
index cfcf8cb05..000000000
--- a/apps/web/src/components/chat/DockPaneHeader.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-// FILE: DockPaneHeader.tsx
-// Purpose: Title bar for lightweight right-dock panes (e.g. source control) — a title,
-//          an optional action cluster, and the standard chrome close affordance.
-//          Shares the standard chrome-bar row (CHAT_SURFACE_HEADER_ROW_CLASS_NAME — height
-//          + bottom hairline) and the chrome button footprint (DOCK_HEADER_ICON_BUTTON_CLASS)
-//          with the tab strip and the DiffPanelShell/BrowserPanel headers so every dock
-//          surface lines up.
-// Layer: Chat right-dock UI primitives
-
-import { type ReactNode } from "react";
-
-import { cn } from "~/lib/utils";
-import { XIcon } from "~/lib/icons";
-import { IconButton } from "../ui/icon-button";
-import {
-  CHAT_SURFACE_HEADER_ROW_CLASS_NAME,
-  DOCK_HEADER_ICON_BUTTON_CLASS,
-} from "./chatHeaderControls";
-
-export function DockPaneHeader(props: {
-  title: ReactNode;
-  actions?: ReactNode;
-  onClose?: (() => void) | undefined;
-  closeLabel?: string;
-}) {
-  return (
-    <header className={cn(CHAT_SURFACE_HEADER_ROW_CLASS_NAME, "gap-1 px-4")}>
-      <span className="text-[13px] font-medium tracking-[-0.01em] text-foreground">
-        {props.title}
-      </span>
-      <div className="ml-auto flex items-center gap-0.5">
-        {props.actions}
-        {props.onClose ? (
-          <IconButton
-            size="icon-xs"
-            variant="chrome"
-            label={props.closeLabel ?? "Close panel"}
-            className={DOCK_HEADER_ICON_BUTTON_CLASS}
-            onClick={props.onClose}
-          >
-            <XIcon className="size-3.5" />
-          </IconButton>
-        ) : null}
-      </div>
-    </header>
-  );
-}
diff --git a/apps/web/src/components/chat/DockTerminalPane.tsx b/apps/web/src/components/chat/DockTerminalPane.tsx
deleted file mode 100644
index 140213274..000000000
--- a/apps/web/src/components/chat/DockTerminalPane.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-// FILE: DockTerminalPane.tsx
-// Purpose: Render an independent terminal workspace inside the right dock for a host thread.
-// Layer: Chat right-dock UI
-// Depends on: useTerminalSurfaceController (shared store wiring), LazyThreadTerminalDrawer.
-//
-// The dock terminal set is isolated from the bottom drawer via a synthetic scope id
-// (dockTerminalThreadId), so the two never share xterm instances. All store wiring is
-// shared with WorkspaceView through useTerminalSurfaceController; only the
-// "ensure a terminal is open" policy is surface-specific (here: a single terminal-only page).
-
-import { type ProjectId, type ThreadId } from "@t3tools/contracts";
-import { useCallback, useEffect, useMemo } from "react";
-
-import { useTerminalSurfaceController } from "~/hooks/useTerminalSurfaceController";
-import { dockTerminalThreadId } from "~/lib/dockTerminalScope";
-import { projectScriptRuntimeEnv } from "~/projectScripts";
-import { useStore } from "~/store";
-import { createProjectSelector, createThreadSelector } from "~/storeSelectors";
-import ThreadTerminalDrawer from "../terminal/LazyThreadTerminalDrawer";
-
-export function DockTerminalPane(props: {
-  hostThreadId: ThreadId;
-  projectId: ProjectId | null;
-  // When false the pane stays mounted but hidden (another dock tab is active),
-  // so the xterm runtime sleeps its visual work without detaching its DOM.
-  isActive?: boolean;
-}) {
-  const scopeId = useMemo(() => dockTerminalThreadId(props.hostThreadId), [props.hostThreadId]);
-  const thread = useStore(
-    useMemo(() => createThreadSelector(props.hostThreadId), [props.hostThreadId]),
-  );
-  const project = useStore(
-    useMemo(() => createProjectSelector(props.projectId), [props.projectId]),
-  );
-  const worktreePath = thread?.worktreePath ?? null;
-  const projectCwd = project?.cwd ?? null;
-  const cwd = worktreePath ?? projectCwd ?? "";
-  const runtimeEnv = useMemo(() => {
-    if (!projectCwd) return {};
-    return projectScriptRuntimeEnv({ project: { cwd: projectCwd }, worktreePath });
-  }, [projectCwd, worktreePath]);
-
-  const terminal = useTerminalSurfaceController(scopeId);
-  const { terminalState, openTerminalThreadPage, bumpFocusRequest, newTerminalGroup } = terminal;
-
-  // A dock terminal pane always shows a live terminal: ensure one is open on mount
-  // and re-open if the user closes the last tab (normalize guarantees a default id).
-  useEffect(() => {
-    if (terminalState.terminalOpen) {
-      return;
-    }
-    openTerminalThreadPage(scopeId, { terminalOnly: true });
-  }, [openTerminalThreadPage, scopeId, terminalState.terminalOpen]);
-
-  const createTerminal = useCallback(() => {
-    if (!terminalState.terminalOpen) {
-      openTerminalThreadPage(scopeId, { terminalOnly: true });
-      bumpFocusRequest();
-      return;
-    }
-    newTerminalGroup();
-  }, [
-    bumpFocusRequest,
-    newTerminalGroup,
-    openTerminalThreadPage,
-    scopeId,
-    terminalState.terminalOpen,
-  ]);
-
-  return (
-    <ThreadTerminalDrawer
-      key={scopeId}
-      threadId={scopeId}
-      cwd={cwd}
-      runtimeEnv={runtimeEnv}
-      height={terminalState.terminalHeight}
-      presentationMode="workspace"
-      isVisible={props.isActive ?? true}
-      terminalIds={terminalState.terminalIds}
-      terminalLabelsById={terminalState.terminalLabelsById}
-      terminalTitleOverridesById={terminalState.terminalTitleOverridesById}
-      terminalCliKindsById={terminalState.terminalCliKindsById}
-      terminalAttentionStatesById={terminalState.terminalAttentionStatesById ?? {}}
-      runningTerminalIds={terminalState.runningTerminalIds}
-      activeTerminalId={terminalState.activeTerminalId}
-      terminalGroups={terminalState.terminalGroups}
-      activeTerminalGroupId={terminalState.activeTerminalGroupId}
-      focusRequestId={terminal.focusRequestId}
-      onSplitTerminal={terminal.splitRight}
-      onSplitTerminalDown={terminal.splitDown}
-      onNewTerminal={createTerminal}
-      onNewTerminalTab={terminal.createTerminalTab}
-      onMoveTerminalToGroup={terminal.moveTerminalToNewGroup}
-      onActiveTerminalChange={terminal.activateTerminal}
-      onCloseTerminal={terminal.closeTerminal}
-      onCloseTerminalGroup={terminal.closeTerminalGroup}
-      onHeightChange={terminal.setTerminalHeight}
-      onResizeTerminalSplit={terminal.resizeTerminalSplit}
-      onTerminalMetadataChange={terminal.setTerminalMetadata}
-      onTerminalActivityChange={terminal.setTerminalActivity}
-      onAddTerminalContext={() => {}}
-    />
-  );
-}
-
-export default DockTerminalPane;
diff --git a/apps/web/src/components/chat/FileDiffView.tsx b/apps/web/src/components/chat/FileDiffView.tsx
index 58f7f5540..66a565c6f 100644
--- a/apps/web/src/components/chat/FileDiffView.tsx
+++ b/apps/web/src/components/chat/FileDiffView.tsx
@@ -9,11 +9,7 @@
 import { FileDiff, type FileDiffMetadata, Virtualizer } from "@pierre/diffs/react";
 import { type ReactNode } from "react";
 
-import {
-  buildDiffPanelUnsafeCSS,
-  resolveDiffThemeName,
-  resolveFileDiffPath,
-} from "~/lib/diffRendering";
+import { buildDiffPanelUnsafeCSS, DIFF_THEME_NAME, resolveFileDiffPath } from "~/lib/diffRendering";
 import { cn } from "~/lib/utils";
 import { FileEntryIcon } from "./FileEntryIcon";
 
@@ -42,7 +38,6 @@ export function FileDiffSurface(props: { className?: string; children: ReactNode
 // themed addition/deletion backgrounds.
 export function FileDiffCard(props: {
   fileDiff: FileDiffMetadata;
-  theme: "light" | "dark";
   diffStyle?: "unified" | "split";
   overflow?: "scroll" | "wrap";
   collapsed?: boolean;
@@ -56,9 +51,9 @@ export function FileDiffCard(props: {
         diffStyle: props.diffStyle ?? "unified",
         lineDiffType: "none",
         overflow: props.overflow ?? "scroll",
-        theme: resolveDiffThemeName(props.theme),
-        themeType: props.theme,
-        unsafeCSS: buildDiffPanelUnsafeCSS(props.theme),
+        theme: DIFF_THEME_NAME,
+        themeType: "dark",
+        unsafeCSS: buildDiffPanelUnsafeCSS(),
         ...(props.collapsed !== undefined ? { collapsed: props.collapsed } : {}),
       }}
       renderHeaderPrefix={() => (
@@ -66,7 +61,6 @@ export function FileDiffCard(props: {
           <FileEntryIcon
             pathValue={filePath}
             kind="file"
-            theme={props.theme}
             className="size-3.5 text-muted-foreground/70"
           />
         </span>
diff --git a/apps/web/src/components/chat/FileEntryIcon.tsx b/apps/web/src/components/chat/FileEntryIcon.tsx
index 64a2aedbc..2c98234be 100644
--- a/apps/web/src/components/chat/FileEntryIcon.tsx
+++ b/apps/web/src/components/chat/FileEntryIcon.tsx
@@ -53,10 +53,6 @@ export const FileEntryIcon = memo(function FileEntryIcon(props: {
   // undefined for source-file surfaces (diff/editor/timeline) that key purely
   // off the path.
   mimeType?: string | null | undefined;
-  // Vestigial: Central icons are `currentColor` glyphs, so theme no longer
-  // affects icon selection. Optional so theme-less surfaces (e.g. markdown
-  // file links, code-block headers) can reuse this same primitive.
-  theme?: "light" | "dark" | undefined;
   className?: string;
   // Timeline changed-file rows pass their own muted color and should not pick
   // up extension-specific colors.
diff --git a/apps/web/src/components/chat/GitPanel.tsx b/apps/web/src/components/chat/GitPanel.tsx
deleted file mode 100644
index 225c9d076..000000000
--- a/apps/web/src/components/chat/GitPanel.tsx
+++ /dev/null
@@ -1,384 +0,0 @@
-// FILE: GitPanel.tsx
-// Purpose: Source-control staging pane for the right dock (staged/unstaged lists + per-file diff).
-// Layer: Chat right-dock UI
-// Depends on: gitReactQuery (diff queries + stage/unstage mutations), diffRendering (patch parsing),
-//             @pierre/diffs FileDiff for the per-file viewer.
-//
-// The pane derives its cwd like DockTerminalPane (thread worktree or project cwd) and reads the
-// staged/unstaged patches, parsing them into file lists. Stage/unstage are index mutations routed
-// through GitCore; on settle we invalidate the per-cwd git caches so both lists stay in sync.
-
-import { type FileDiffMetadata } from "@pierre/diffs/react";
-import { type ProjectId, type ThreadId } from "@t3tools/contracts";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { memo, useCallback, useMemo, useState } from "react";
-
-import { useTheme } from "~/hooks/useTheme";
-import {
-  buildFileDiffRenderKey,
-  getRenderablePatch,
-  resolveFileDiffPath,
-  sortFileDiffsByPath,
-  splitRepoRelativePath,
-  summarizeFileDiffStats,
-} from "~/lib/diffRendering";
-import {
-  gitQueryKeys,
-  gitStageFilesMutationOptions,
-  gitUnstageFilesMutationOptions,
-  gitWorkingTreeDiffQueryOptions,
-} from "~/lib/gitReactQuery";
-import { PlusIcon, RefreshCwIcon, RotateCcwIcon } from "~/lib/icons";
-import { cn } from "~/lib/utils";
-import { useStore } from "~/store";
-import { createProjectSelector, createThreadSelector } from "~/storeSelectors";
-import { Alert } from "../ui/alert";
-import { Button } from "../ui/button";
-import { IconButton } from "../ui/icon-button";
-import { DOCK_HEADER_ICON_BUTTON_CLASS } from "./chatHeaderControls";
-import { DiffStat } from "./DiffStatLabel";
-import { DockPaneHeader } from "./DockPaneHeader";
-import { FileDiffCard, FileDiffSurface } from "./FileDiffView";
-import { FileEntryIcon } from "./FileEntryIcon";
-import { PanelStateMessage } from "./PanelStateMessage";
-
-type GitPanelSection = "staged" | "unstaged";
-
-// Selection is keyed by section + working-tree path (not the content-hashed
-// render key) so it survives a file moving between the staged and unstaged
-// lists after a stage/unstage action.
-interface SelectedFile {
-  section: GitPanelSection;
-  path: string;
-}
-
-function parsePatchToSortedFiles(
-  patch: string | undefined,
-  cacheScope: string,
-): FileDiffMetadata[] {
-  const renderable = getRenderablePatch(patch, cacheScope);
-  return renderable?.kind === "files" ? sortFileDiffsByPath(renderable.files) : [];
-}
-
-// Memoized so a stage/unstage in-flight toggle (which flips `actionDisabled`
-// across siblings) and unrelated parent re-renders stay cheap; the per-row stat
-// is only recomputed when the underlying file diff actually changes.
-const GitFileRow = memo(function GitFileRow(props: {
-  fileDiff: FileDiffMetadata;
-  theme: "light" | "dark";
-  isSelected: boolean;
-  actionLabel: string;
-  actionIcon: "stage" | "unstage";
-  actionDisabled: boolean;
-  onSelect: (file: FileDiffMetadata) => void;
-  onAction: (paths: string[]) => void;
-}) {
-  const filePath = resolveFileDiffPath(props.fileDiff);
-  const { dir, name } = splitRepoRelativePath(filePath);
-  const stat = useMemo(() => summarizeFileDiffStats([props.fileDiff]), [props.fileDiff]);
-  return (
-    <div
-      className={cn(
-        "group flex items-center gap-1.5 rounded-md px-1.5 py-1 text-left",
-        props.isSelected ? "bg-sidebar-accent" : "hover:bg-sidebar-accent/60",
-      )}
-    >
-      <button
-        type="button"
-        className="flex min-w-0 flex-1 items-center gap-1.5"
-        onClick={() => props.onSelect(props.fileDiff)}
-        title={filePath}
-      >
-        <FileEntryIcon pathValue={filePath} kind="file" theme={props.theme} className="size-4" />
-        <span className="min-w-0 truncate text-[12px] text-foreground">
-          {dir ? <span className="text-muted-foreground/70">{dir}</span> : null}
-          <span>{name}</span>
-        </span>
-      </button>
-      <DiffStat
-        additions={stat.additions}
-        deletions={stat.deletions}
-        className="shrink-0 text-[11px]"
-      />
-      <IconButton
-        size="icon-xs"
-        variant="ghost"
-        className="shrink-0 opacity-0 group-hover:opacity-100 data-[disabled]:opacity-40"
-        label={props.actionLabel}
-        tooltip={props.actionLabel}
-        disabled={props.actionDisabled}
-        onClick={() => props.onAction([filePath])}
-      >
-        {props.actionIcon === "stage" ? (
-          <PlusIcon className="size-3.5" />
-        ) : (
-          <RotateCcwIcon className="size-3.5" />
-        )}
-      </IconButton>
-    </div>
-  );
-});
-
-function GitFileSection(props: {
-  title: string;
-  emptyLabel: string;
-  files: FileDiffMetadata[];
-  theme: "light" | "dark";
-  section: GitPanelSection;
-  selectedPath: string | null;
-  actionLabel: string;
-  actionAllLabel: string;
-  actionIcon: "stage" | "unstage";
-  actionDisabled: boolean;
-  onSelect: (file: FileDiffMetadata) => void;
-  onAction: (paths: string[]) => void;
-}) {
-  const stat = useMemo(() => summarizeFileDiffStats(props.files), [props.files]);
-  const allPaths = useMemo(
-    () => props.files.map((file) => resolveFileDiffPath(file)),
-    [props.files],
-  );
-  return (
-    <section className="min-w-0">
-      <header className="flex items-center gap-2 px-1.5 py-1">
-        <span className="text-[11px] font-semibold text-muted-foreground">{props.title}</span>
-        <span className="rounded-full bg-muted px-1.5 text-[11px] font-medium text-muted-foreground">
-          {props.files.length}
-        </span>
-        <DiffStat additions={stat.additions} deletions={stat.deletions} className="text-[11px]" />
-        {props.files.length > 0 ? (
-          <Button
-            type="button"
-            variant="ghost"
-            size="xs"
-            className="ml-auto shrink-0"
-            disabled={props.actionDisabled}
-            onClick={() => props.onAction(allPaths)}
-          >
-            {props.actionAllLabel}
-          </Button>
-        ) : null}
-      </header>
-      {props.files.length === 0 ? (
-        <p className="px-1.5 py-1 text-[11px] text-muted-foreground/70">{props.emptyLabel}</p>
-      ) : (
-        <div className="flex flex-col gap-0.5">
-          {props.files.map((file) => {
-            const key = buildFileDiffRenderKey(file);
-            const filePath = resolveFileDiffPath(file);
-            return (
-              <GitFileRow
-                key={key}
-                fileDiff={file}
-                theme={props.theme}
-                isSelected={props.selectedPath === filePath}
-                actionLabel={props.actionLabel}
-                actionIcon={props.actionIcon}
-                actionDisabled={props.actionDisabled}
-                onSelect={props.onSelect}
-                onAction={props.onAction}
-              />
-            );
-          })}
-        </div>
-      )}
-    </section>
-  );
-}
-
-// Isolated + memoized so the (heavy) diff viewer only re-renders when the
-// selected file or theme changes — not when stage/unstage mutations toggle the
-// pane's pending state.
-const SelectedFileDiff = memo(function SelectedFileDiff(props: {
-  fileDiff: FileDiffMetadata;
-  theme: "light" | "dark";
-}) {
-  return (
-    <FileDiffSurface className="h-full min-h-0 overflow-auto px-2 py-2">
-      <div className="diff-render-file rounded-md">
-        <FileDiffCard fileDiff={props.fileDiff} theme={props.theme} />
-      </div>
-    </FileDiffSurface>
-  );
-});
-
-export function GitPanel(props: {
-  hostThreadId: ThreadId;
-  projectId: ProjectId | null;
-  onClose?: () => void;
-}) {
-  const queryClient = useQueryClient();
-  const { resolvedTheme } = useTheme();
-  const theme = resolvedTheme as "light" | "dark";
-  const thread = useStore(
-    useMemo(() => createThreadSelector(props.hostThreadId), [props.hostThreadId]),
-  );
-  const project = useStore(
-    useMemo(() => createProjectSelector(props.projectId), [props.projectId]),
-  );
-  const cwd = thread?.worktreePath ?? project?.cwd ?? null;
-
-  const [selected, setSelected] = useState<SelectedFile | null>(null);
-
-  // No fixed polling: turn-driven file changes already push-invalidate the
-  // working-tree-diff cache (see __root.tsx), and focus + the Refresh button +
-  // post-mutation invalidation cover the rest. This keeps the pane cheap.
-  const stagedQuery = useQuery(gitWorkingTreeDiffQueryOptions({ cwd, scope: "staged" }));
-  const unstagedQuery = useQuery(gitWorkingTreeDiffQueryOptions({ cwd, scope: "unstaged" }));
-
-  const stagedFiles = useMemo(
-    () => parsePatchToSortedFiles(stagedQuery.data?.patch, `git-pane:staged:${theme}`),
-    [stagedQuery.data?.patch, theme],
-  );
-  const unstagedFiles = useMemo(
-    () => parsePatchToSortedFiles(unstagedQuery.data?.patch, `git-pane:unstaged:${theme}`),
-    [unstagedQuery.data?.patch, theme],
-  );
-
-  const stageMutation = useMutation(gitStageFilesMutationOptions({ cwd, queryClient }));
-  const unstageMutation = useMutation(gitUnstageFilesMutationOptions({ cwd, queryClient }));
-  const mutating = stageMutation.isPending || unstageMutation.isPending;
-
-  const stage = useCallback(
-    (paths: string[]) => {
-      if (!cwd || paths.length === 0) return;
-      stageMutation.mutate(paths);
-    },
-    [cwd, stageMutation],
-  );
-  const unstage = useCallback(
-    (paths: string[]) => {
-      if (!cwd || paths.length === 0) return;
-      unstageMutation.mutate(paths);
-    },
-    [cwd, unstageMutation],
-  );
-
-  const selectStaged = useCallback((file: FileDiffMetadata) => {
-    setSelected({ section: "staged", path: resolveFileDiffPath(file) });
-  }, []);
-  const selectUnstaged = useCallback((file: FileDiffMetadata) => {
-    setSelected({ section: "unstaged", path: resolveFileDiffPath(file) });
-  }, []);
-
-  const refresh = useCallback(() => {
-    if (!cwd) return;
-    void queryClient.invalidateQueries({ queryKey: gitQueryKeys.workingTreeDiff(cwd, "staged") });
-    void queryClient.invalidateQueries({
-      queryKey: gitQueryKeys.workingTreeDiff(cwd, "unstaged"),
-    });
-  }, [cwd, queryClient]);
-
-  // Resolve the selected file by path, preferring its stored section but falling
-  // back to the other list so the diff (and row highlight) follow a file across a
-  // stage/unstage move instead of silently clearing.
-  const selectedResolved = useMemo(() => {
-    if (!selected) return null;
-    const findInSection = (section: GitPanelSection) =>
-      (section === "staged" ? stagedFiles : unstagedFiles).find(
-        (file) => resolveFileDiffPath(file) === selected.path,
-      ) ?? null;
-    const preferred = findInSection(selected.section);
-    if (preferred) {
-      return { section: selected.section, file: preferred };
-    }
-    const otherSection: GitPanelSection = selected.section === "staged" ? "unstaged" : "staged";
-    const fallback = findInSection(otherSection);
-    return fallback ? { section: otherSection, file: fallback } : null;
-  }, [selected, stagedFiles, unstagedFiles]);
-  const selectedFileDiff = selectedResolved?.file ?? null;
-  const selectedPath = selected?.path ?? null;
-
-  const isLoading = stagedQuery.isLoading || unstagedQuery.isLoading;
-  const error =
-    stagedQuery.error instanceof Error
-      ? stagedQuery.error.message
-      : unstagedQuery.error instanceof Error
-        ? unstagedQuery.error.message
-        : null;
-  const hasChanges = stagedFiles.length > 0 || unstagedFiles.length > 0;
-
-  if (!cwd) {
-    return <PanelStateMessage>Source control is unavailable for this thread.</PanelStateMessage>;
-  }
-
-  return (
-    <div className="flex h-full min-h-0 w-full flex-col">
-      <DockPaneHeader
-        title="Source control"
-        onClose={props.onClose}
-        closeLabel="Close source control"
-        actions={
-          <IconButton
-            size="icon-xs"
-            variant="ghost"
-            label="Refresh changes"
-            tooltip="Refresh changes"
-            className={DOCK_HEADER_ICON_BUTTON_CLASS}
-            onClick={refresh}
-          >
-            <RefreshCwIcon className="size-3.5" />
-          </IconButton>
-        }
-      />
-
-      <div className="flex max-h-[48%] min-h-0 shrink-0 flex-col gap-2 overflow-auto px-1.5 py-2">
-        {error ? (
-          <Alert variant="error" size="sm" className="text-destructive">
-            {error}
-          </Alert>
-        ) : null}
-        {!error && isLoading && !hasChanges ? (
-          <p className="px-1.5 py-1 text-[11px] text-muted-foreground/70">Loading changes...</p>
-        ) : null}
-        {!error && !isLoading && !hasChanges ? (
-          <p className="px-1.5 py-2 text-center text-[12px] text-muted-foreground/70">
-            No changes in the working tree.
-          </p>
-        ) : null}
-        {hasChanges ? (
-          <>
-            <GitFileSection
-              title="Staged"
-              emptyLabel="No staged changes."
-              files={stagedFiles}
-              theme={theme}
-              section="staged"
-              selectedPath={selectedResolved?.section === "staged" ? selectedPath : null}
-              actionLabel="Unstage file"
-              actionAllLabel="Unstage all"
-              actionIcon="unstage"
-              actionDisabled={mutating}
-              onSelect={selectStaged}
-              onAction={unstage}
-            />
-            <GitFileSection
-              title="Changes"
-              emptyLabel="No unstaged changes."
-              files={unstagedFiles}
-              theme={theme}
-              section="unstaged"
-              selectedPath={selectedResolved?.section === "unstaged" ? selectedPath : null}
-              actionLabel="Stage file"
-              actionAllLabel="Stage all"
-              actionIcon="stage"
-              actionDisabled={mutating}
-              onSelect={selectUnstaged}
-              onAction={stage}
-            />
-          </>
-        ) : null}
-      </div>
-
-      <div className="diff-panel-viewport min-h-0 min-w-0 flex-1 overflow-hidden border-t border-border/70">
-        {selectedFileDiff ? (
-          <SelectedFileDiff fileDiff={selectedFileDiff} theme={theme} />
-        ) : (
-          <PanelStateMessage density="compact">Select a file to view its diff.</PanelStateMessage>
-        )}
-      </div>
-    </div>
-  );
-}
-
-export default GitPanel;
diff --git a/apps/web/src/components/chat/InlineMentionChip.tsx b/apps/web/src/components/chat/InlineMentionChip.tsx
index 2eaf8bb32..853caa315 100644
--- a/apps/web/src/components/chat/InlineMentionChip.tsx
+++ b/apps/web/src/components/chat/InlineMentionChip.tsx
@@ -22,7 +22,6 @@ import { MentionChipIcon, type MentionChipKind } from "./MentionChipIcon";
 
 interface InlineMentionChipProps {
   path: string;
-  theme: "light" | "dark";
   kind?: MentionChipKind;
   mentionReferences?: ReadonlyArray<ProviderMentionReference>;
   /** Defaults to the path basename (composer-style label). */
@@ -42,7 +41,6 @@ export const InlineMentionChip = memo(function InlineMentionChip(props: InlineMe
       icon={
         <MentionChipIcon
           path={props.path}
-          theme={props.theme}
           {...(props.kind ? { kind: props.kind } : {})}
           {...(props.mentionReferences ? { mentionReferences: props.mentionReferences } : {})}
         />
diff --git a/apps/web/src/components/chat/MentionChipIcon.tsx b/apps/web/src/components/chat/MentionChipIcon.tsx
index 63eeea6c1..6ad6f19f6 100644
--- a/apps/web/src/components/chat/MentionChipIcon.tsx
+++ b/apps/web/src/components/chat/MentionChipIcon.tsx
@@ -26,13 +26,10 @@ function composerMentionChipCentralIconName(path: string, kind: MentionChipKind
   return getFileIconName(path);
 }
 
-// `theme` is retained for call-site compatibility but no longer affects icon
-// selection (Central icons are theme-agnostic `currentColor` glyphs).
 // `className` lets callers size the glyph per surface (composer token vs timeline
 // echo) while keeping the file/folder/plugin selection logic in one place.
 export const MentionChipIcon = memo(function MentionChipIcon(props: {
   path: string;
-  theme: "light" | "dark";
   kind?: MentionChipKind;
   mentionReferences?: ReadonlyArray<ProviderMentionReference>;
   className?: string;
diff --git a/apps/web/src/components/chat/MessageTrail.tsx b/apps/web/src/components/chat/MessageTrail.tsx
deleted file mode 100644
index c5a3bb9ae..000000000
--- a/apps/web/src/components/chat/MessageTrail.tsx
+++ /dev/null
@@ -1,105 +0,0 @@
-// FILE: MessageTrail.tsx
-// Purpose: Quiet, explicit previous/next navigation between sent messages.
-// Layer: Chat transcript shell (presentation)
-// Depends on: the existing active trail store and timeline scroll controller.
-
-import { type MessageId } from "@t3tools/contracts";
-import { useEffect, useMemo, useRef, useState, useSyncExternalStore } from "react";
-
-import { ChevronDownIcon, ChevronUpIcon } from "~/lib/icons";
-import { cn } from "~/lib/utils";
-import { type ActiveTrailStore, type MessageTrailItem } from "./messageTrail.logic";
-
-interface MessageTrailProps {
-  items: readonly MessageTrailItem[];
-  /** Stable holder for current + visible highlights; only this control re-renders on change. */
-  activeStore: ActiveTrailStore;
-  onSelect: (messageId: MessageId) => void;
-}
-
-// Only render beside a transcript column with enough left gutter to avoid covering copy.
-const MIN_PANE_WIDTH_PX = 864;
-
-export function MessageTrail({ items, activeStore, onSelect }: MessageTrailProps) {
-  const rootRef = useRef<HTMLElement | null>(null);
-  const [hasGutter, setHasGutter] = useState(false);
-  const trailSnapshot = useSyncExternalStore(
-    activeStore.subscribe,
-    activeStore.get,
-    activeStore.get,
-  );
-  const currentIndex = useMemo(() => {
-    const directIndex = items.findIndex((item) => item.id === trailSnapshot.currentId);
-    if (directIndex >= 0) return directIndex;
-    const firstVisibleId = trailSnapshot.visibleIds[0];
-    const visibleIndex = items.findIndex((item) => item.id === firstVisibleId);
-    return visibleIndex >= 0 ? visibleIndex : 0;
-  }, [items, trailSnapshot.currentId, trailSnapshot.visibleIds]);
-
-  useEffect(() => {
-    const pane = rootRef.current?.parentElement;
-    if (!pane || typeof ResizeObserver === "undefined") return;
-
-    let frameId: number | null = null;
-    const measure = () => {
-      frameId = null;
-      setHasGutter(pane.clientWidth >= MIN_PANE_WIDTH_PX);
-    };
-    const scheduleMeasure = () => {
-      if (frameId === null) frameId = window.requestAnimationFrame(measure);
-    };
-    scheduleMeasure();
-    const observer = new ResizeObserver(scheduleMeasure);
-    observer.observe(pane);
-    return () => {
-      if (frameId !== null) window.cancelAnimationFrame(frameId);
-      observer.disconnect();
-    };
-  }, []);
-
-  const visible = hasGutter && items.length > 1;
-  const previous = currentIndex > 0 ? items[currentIndex - 1] : undefined;
-  const next = currentIndex < items.length - 1 ? items[currentIndex + 1] : undefined;
-
-  return (
-    <nav
-      ref={rootRef}
-      aria-label="Jump between sent messages"
-      aria-hidden={!visible}
-      data-message-jump-navigation="true"
-      className={cn(
-        "absolute left-2 top-1/2 z-20 hidden -translate-y-1/2 flex-col items-center rounded-lg border border-panel-border bg-panel p-0.5 text-muted-foreground transition-opacity duration-menu ease-out sm:flex motion-reduce:transition-none",
-        visible ? "opacity-100" : "pointer-events-none opacity-0",
-      )}
-    >
-      <button
-        type="button"
-        tabIndex={visible ? 0 : -1}
-        disabled={!previous}
-        aria-label={
-          previous ? `Jump to previous message: ${previous.preview}` : "No previous message"
-        }
-        className="flex size-7 items-center justify-center rounded-md transition-[background-color,color,scale] duration-press ease-out hover:bg-hover hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-25 active:scale-[0.96] motion-reduce:active:scale-100"
-        onClick={() => previous && onSelect(previous.id)}
-      >
-        <ChevronUpIcon className="size-3.5" />
-      </button>
-      <span
-        aria-label={`Message ${currentIndex + 1} of ${items.length}`}
-        className="min-w-7 py-0.5 text-center text-[11px] tabular-nums text-muted-foreground"
-      >
-        {currentIndex + 1}/{items.length}
-      </span>
-      <button
-        type="button"
-        tabIndex={visible ? 0 : -1}
-        disabled={!next}
-        aria-label={next ? `Jump to next message: ${next.preview}` : "No next message"}
-        className="flex size-7 items-center justify-center rounded-md transition-[background-color,color,scale] duration-press ease-out hover:bg-hover hover:text-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-25 active:scale-[0.96] motion-reduce:active:scale-100"
-        onClick={() => next && onSelect(next.id)}
-      >
-        <ChevronDownIcon className="size-3.5" />
-      </button>
-    </nav>
-  );
-}
diff --git a/apps/web/src/components/chat/MessagesTimeline.ledger.browser.tsx b/apps/web/src/components/chat/MessagesTimeline.ledger.browser.tsx
index b51831cf3..5088c13e4 100644
--- a/apps/web/src/components/chat/MessagesTimeline.ledger.browser.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.ledger.browser.tsx
@@ -76,7 +76,6 @@ describe("MessagesTimeline activity trail", () => {
           isRevertingCheckpoint={false}
           onImageExpand={() => {}}
           markdownCwd={undefined}
-          resolvedTheme="dark"
           timestampFormat="locale"
           workspaceRoot={undefined}
         />
diff --git a/apps/web/src/components/chat/MessagesTimeline.markerScroll.browser.tsx b/apps/web/src/components/chat/MessagesTimeline.markerScroll.browser.tsx
deleted file mode 100644
index a23679892..000000000
--- a/apps/web/src/components/chat/MessagesTimeline.markerScroll.browser.tsx
+++ /dev/null
@@ -1,125 +0,0 @@
-// FILE: MessagesTimeline.markerScroll.browser.tsx
-// Purpose: Browser regressions for marker deep-link scrolling in duplicated transcript panes.
-// Layer: Vitest browser tests
-
-import "../../index.css";
-
-import { MessageId, ThreadMarkerId, type ThreadMarker } from "@t3tools/contracts";
-import { createRef, type RefObject } from "react";
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { render } from "vitest-browser-react";
-
-import { MessagesTimeline, type MessagesTimelineController } from "./MessagesTimeline";
-
-const ASSISTANT_MESSAGE_ID = MessageId.makeUnsafe("assistant-shared-marker-message");
-const MARKER_ID = ThreadMarkerId.makeUnsafe("marker-shared-between-panes");
-const MESSAGE_TEXT = "Before the exact marker text and after.";
-const MARKER_TEXT = "exact marker text";
-const MARKER_START_OFFSET = MESSAGE_TEXT.indexOf(MARKER_TEXT);
-
-const marker: ThreadMarker = {
-  id: MARKER_ID,
-  messageId: ASSISTANT_MESSAGE_ID,
-  startOffset: MARKER_START_OFFSET,
-  endOffset: MARKER_START_OFFSET + MARKER_TEXT.length,
-  selectedText: MARKER_TEXT,
-  style: "highlight",
-  color: "yellow",
-  label: null,
-  done: false,
-  createdAt: "2026-06-06T00:00:00.000Z",
-  updatedAt: "2026-06-06T00:00:00.000Z",
-};
-
-function MarkerTimeline({
-  controllerRef,
-}: {
-  controllerRef: RefObject<MessagesTimelineController | null>;
-}) {
-  return (
-    <MessagesTimeline
-      hasMessages
-      isWorking={false}
-      activeTurnInProgress={false}
-      activeTurnStartedAt={null}
-      controllerRef={controllerRef}
-      threadMarkers={[marker]}
-      timelineEntries={[
-        {
-          id: `entry-${ASSISTANT_MESSAGE_ID}`,
-          kind: "message",
-          createdAt: "2026-06-06T00:00:00.000Z",
-          message: {
-            id: ASSISTANT_MESSAGE_ID,
-            role: "assistant",
-            text: MESSAGE_TEXT,
-            createdAt: "2026-06-06T00:00:00.000Z",
-            streaming: false,
-          },
-        },
-      ]}
-      turnDiffSummaryByAssistantMessageId={new Map()}
-      nowIso="2026-06-06T00:00:01.000Z"
-      expandedWorkGroups={{}}
-      onToggleWorkGroup={() => {}}
-      onOpenTurnDiff={() => {}}
-      revertTurnCountByUserMessageId={new Map()}
-      onRevertUserMessage={() => {}}
-      isRevertingCheckpoint={false}
-      onImageExpand={() => {}}
-      markdownCwd={undefined}
-      resolvedTheme="light"
-      timestampFormat="locale"
-      workspaceRoot={undefined}
-    />
-  );
-}
-
-describe("MessagesTimeline marker fine-scroll", () => {
-  afterEach(() => {
-    document.body.innerHTML = "";
-    vi.restoreAllMocks();
-  });
-
-  it("scrolls the marker inside the controller's own timeline pane", async () => {
-    const leftControllerRef = createRef<MessagesTimelineController | null>();
-    const rightControllerRef = createRef<MessagesTimelineController | null>();
-    // Captured via a holder object so the outer-scope reads keep `Element | null` (a bare `let`
-    // assigned only inside the mock callback narrows to `null` at use sites).
-    const scrolled: { element: Element | null } = { element: null };
-    vi.spyOn(Element.prototype, "scrollIntoView").mockImplementation(function scrollIntoViewMock(
-      this: Element,
-      _options?: boolean | ScrollIntoViewOptions,
-    ) {
-      scrolled.element = this;
-    });
-
-    await render(
-      <div
-        style={{
-          display: "grid",
-          gridTemplateColumns: "1fr 1fr",
-          gap: "16px",
-          height: "480px",
-        }}
-      >
-        <section data-pane="left" style={{ minHeight: 0 }}>
-          <MarkerTimeline controllerRef={leftControllerRef} />
-        </section>
-        <section data-pane="right" style={{ minHeight: 0 }}>
-          <MarkerTimeline controllerRef={rightControllerRef} />
-        </section>
-      </div>,
-    );
-
-    await expect.poll(() => rightControllerRef.current !== null).toBe(true);
-    rightControllerRef.current?.scrollToMarker(marker);
-
-    await expect
-      .poll(() => scrolled.element?.closest("[data-pane]")?.getAttribute("data-pane"))
-      .toBe("right");
-    expect(scrolled.element?.getAttribute("data-thread-marker-id")).toBe(MARKER_ID);
-    // The deep-link "active" ring is decorated imperatively (no markdown re-parse) on the jumped span.
-    expect(scrolled.element?.classList.contains("thread-marker-active")).toBe(true);
-  });
-});
diff --git a/apps/web/src/components/chat/MessagesTimeline.messageEnter.browser.tsx b/apps/web/src/components/chat/MessagesTimeline.messageEnter.browser.tsx
index 6adf31afb..9be362a7d 100644
--- a/apps/web/src/components/chat/MessagesTimeline.messageEnter.browser.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.messageEnter.browser.tsx
@@ -67,7 +67,6 @@ function MessageEnterTimeline() {
           isRevertingCheckpoint={false}
           onImageExpand={() => {}}
           markdownCwd={undefined}
-          resolvedTheme="dark"
           timestampFormat="locale"
           workspaceRoot={undefined}
         />
@@ -106,7 +105,6 @@ function HydratingTimeline() {
           isRevertingCheckpoint={false}
           onImageExpand={() => {}}
           markdownCwd={undefined}
-          resolvedTheme="dark"
           timestampFormat="locale"
           workspaceRoot={undefined}
         />
diff --git a/apps/web/src/components/chat/MessagesTimeline.test.tsx b/apps/web/src/components/chat/MessagesTimeline.test.tsx
index dd700b086..e38d1c7df 100644
--- a/apps/web/src/components/chat/MessagesTimeline.test.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.test.tsx
@@ -108,7 +108,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -156,7 +155,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -198,7 +196,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -232,7 +229,6 @@ describe("MessagesTimeline", () => {
       isRevertingCheckpoint: false,
       onImageExpand: () => {},
       markdownCwd: undefined,
-      resolvedTheme: "light" as const,
       timestampFormat: "locale" as const,
       workspaceRoot: undefined,
     };
@@ -355,7 +351,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -413,7 +408,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -461,7 +455,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -507,7 +500,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -550,7 +542,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -608,7 +599,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -650,7 +640,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -696,7 +685,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -706,57 +694,6 @@ describe("MessagesTimeline", () => {
     expect(markup).not.toContain(hiddenTail);
   });
 
-  it("renders inline terminal labels with the composer chip UI", async () => {
-    const { MessagesTimeline } = await import("./MessagesTimeline");
-    const markup = renderToStaticMarkup(
-      <MessagesTimeline
-        hasMessages
-        isWorking={false}
-        activeTurnInProgress={false}
-        activeTurnStartedAt={null}
-        timelineEntries={[
-          {
-            id: "entry-1",
-            kind: "message",
-            createdAt: "2026-03-17T19:12:28.000Z",
-            message: {
-              id: MessageId.makeUnsafe("message-2"),
-              role: "user",
-              text: [
-                "yoo what's @terminal-1:1-5 mean",
-                "",
-                "<terminal_context>",
-                "- Terminal 1 lines 1-5:",
-                "  1 | julius@mac effect-http-ws-cli % bun i",
-                "  2 | bun install v1.3.9 (cf6cdbbb)",
-                "</terminal_context>",
-              ].join("\n"),
-              createdAt: "2026-03-17T19:12:28.000Z",
-              streaming: false,
-            },
-          },
-        ]}
-        turnDiffSummaryByAssistantMessageId={new Map()}
-        nowIso="2026-03-17T19:12:30.000Z"
-        expandedWorkGroups={{}}
-        onToggleWorkGroup={() => {}}
-        onOpenTurnDiff={() => {}}
-        revertTurnCountByUserMessageId={new Map()}
-        onRevertUserMessage={() => {}}
-        isRevertingCheckpoint={false}
-        onImageExpand={() => {}}
-        markdownCwd={undefined}
-        resolvedTheme="light"
-        timestampFormat="locale"
-        workspaceRoot={undefined}
-      />,
-    );
-
-    expect(markup).toContain("Terminal 1 lines 1-5");
-    expect(markup).toContain("/central-icons-reversed/console.svg");
-    expect(markup).toContain("yoo what&#x27;s ");
-  });
-
   it("renders assistant selection chips from hidden prompt markup when attachments are missing", async () => {
     const { MessagesTimeline } = await import("./MessagesTimeline");
     const markup = renderToStaticMarkup(
@@ -796,7 +733,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -839,7 +775,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -882,7 +817,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -927,7 +861,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -968,7 +901,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1023,7 +955,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1082,7 +1013,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1192,7 +1122,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1254,7 +1183,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1306,7 +1234,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1416,7 +1343,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1492,7 +1418,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1595,7 +1520,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="light"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1680,7 +1604,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1734,7 +1657,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1782,7 +1704,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1846,7 +1767,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -1898,7 +1818,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -2038,7 +1957,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -2085,7 +2003,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -2130,7 +2047,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -2175,7 +2091,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -2221,7 +2136,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -2265,7 +2179,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -2348,7 +2261,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -2435,7 +2347,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
@@ -2499,7 +2410,6 @@ describe("MessagesTimeline", () => {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />,
diff --git a/apps/web/src/components/chat/MessagesTimeline.toolDetails.browser.tsx b/apps/web/src/components/chat/MessagesTimeline.toolDetails.browser.tsx
index 04a2dcd67..7ff6e93c1 100644
--- a/apps/web/src/components/chat/MessagesTimeline.toolDetails.browser.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.toolDetails.browser.tsx
@@ -50,7 +50,6 @@ function ToolDetailsTimeline() {
       isRevertingCheckpoint={false}
       onImageExpand={() => {}}
       markdownCwd={undefined}
-      resolvedTheme="dark"
       timestampFormat="locale"
       workspaceRoot={undefined}
     />
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
index ac71958ce..fea376981 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -112,9 +112,7 @@ import { LinkChipIcon } from "../LinkChipIcon";
 import { openWorkspaceFileReference, useWorkspaceFileOpener } from "../../lib/workspaceFileOpener";
 import { isAgentActivityWorkEntry } from "./agentActivity.logic";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
-import { TerminalContextInlineChip } from "./TerminalContextInlineChip";
 import { deriveDisplayedUserMessageState } from "~/lib/composerMessageContext";
-import { type ParsedTerminalContextEntry } from "~/lib/terminalContext";
 import { cn } from "~/lib/utils";
 import {
   DEFAULT_CHAT_FONT_SIZE_PX,
@@ -127,11 +125,6 @@ import {
   ENVIRONMENT_CONTENT_INSET_MOTION_CLASS,
 } from "./composerPickerStyles";
 import { formatShortTimestamp } from "../../timestampFormat";
-import {
-  buildInlineTerminalContextText,
-  formatInlineTerminalContextLabel,
-  textContainsInlineTerminalContextLabels,
-} from "./userMessageTerminalContexts";
 import { splitPromptIntoDisplaySegments } from "~/composer-editor-mentions";
 import {
   getChatMessageFooterTextStyle,
@@ -154,11 +147,6 @@ import {
   summarizeWorkTrail,
   type SequencedWorkTrailEntry,
 } from "./workTrail";
-import {
-  resolveActiveTrailSnapshot,
-  type ActiveTrailSnapshot,
-  type MessageTrailAnchor,
-} from "./messageTrail.logic";
 
 const MAX_VISIBLE_INLINE_TOOL_ENTRIES = 4;
 // Changed-files list in the per-turn card is capped so large turns stay compact;
@@ -193,7 +181,6 @@ const MESSAGE_SEND_ENTER_CLEANUP_BUFFER_MS = 60;
 // Treat any partially visible row (>= 1px) as in view, so the navigation trail's
 // "active" tick tracks the topmost rendered row rather than waiting for a turn to
 // be substantially on-screen.
-const TRAIL_VIEWABILITY_CONFIG = { itemVisiblePercentThreshold: 0 } as const;
 // The deep-link "active" ring is applied imperatively to the rendered marker spans so jumping
 // never re-parses a message's markdown tree (the className is purely a CSS box-shadow).
 const ACTIVE_MARKER_CLASS_NAME = "thread-marker-active";
@@ -449,7 +436,6 @@ interface MessagesTimelineProps {
   onImageExpand: (preview: ExpandedImagePreview) => void;
   onIsAtEndChange?: (isAtEnd: boolean) => void;
   /** Emits current + visible sent-message anchors as the viewport scrolls (drives the trail). */
-  onTrailHighlightsChange?: (snapshot: ActiveTrailSnapshot) => void;
   onMessagesClickCapture?: ComponentProps<typeof LegendList>["onClickCapture"];
   onMessagesMouseUp?: ComponentProps<typeof LegendList>["onMouseUp"];
   onMessagesPointerCancel?: ComponentProps<typeof LegendList>["onPointerCancel"];
@@ -461,7 +447,6 @@ interface MessagesTimelineProps {
   onMessagesTouchStart?: ComponentProps<typeof LegendList>["onTouchStart"];
   onMessagesWheel?: ComponentProps<typeof LegendList>["onWheel"];
   markdownCwd: string | undefined;
-  resolvedTheme: "light" | "dark";
   chatFontSizePx?: number;
   timestampFormat: TimestampFormat;
   workspaceRoot: string | undefined;
@@ -504,7 +489,6 @@ export const MessagesTimeline = memo(function MessagesTimeline({
   isRevertingCheckpoint,
   onImageExpand,
   onIsAtEndChange,
-  onTrailHighlightsChange,
   onMessagesClickCapture,
   onMessagesMouseUp,
   onMessagesPointerCancel,
@@ -516,7 +500,6 @@ export const MessagesTimeline = memo(function MessagesTimeline({
   onMessagesTouchStart,
   onMessagesWheel,
   markdownCwd,
-  resolvedTheme,
   chatFontSizePx = DEFAULT_CHAT_FONT_SIZE_PX,
   timestampFormat,
   workspaceRoot,
@@ -874,72 +857,16 @@ export const MessagesTimeline = memo(function MessagesTimeline({
       window.cancelAnimationFrame(frameId);
     };
   }, [onIsAtEndChange, resolvedListRef, rows.length]);
-  // Sent-message anchors (id + position in the virtualized row list) for the
-  // navigation trail. Held in a ref so the viewability callback stays stable and
-  // doesn't re-subscribe LegendList on every transcript change.
-  const userMessageAnchors = useMemo<MessageTrailAnchor[]>(() => {
-    const anchors: MessageTrailAnchor[] = [];
-    rows.forEach((row, index) => {
-      if (row.kind === "message" && row.message.role === "user") {
-        anchors.push({ id: row.message.id, rowIndex: index });
-      }
-    });
-    return anchors;
-  }, [rows]);
-  const userMessageAnchorsRef = useRef(userMessageAnchors);
-  userMessageAnchorsRef.current = userMessageAnchors;
-  const emitTrailHighlightsForViewport = useCallback(
-    (topRowIndex: number, bottomRowIndex: number) => {
-      if (!onTrailHighlightsChange || !Number.isFinite(topRowIndex)) {
-        return;
-      }
-      onTrailHighlightsChange(
-        resolveActiveTrailSnapshot(userMessageAnchorsRef.current, topRowIndex, bottomRowIndex),
-      );
-    },
-    [onTrailHighlightsChange],
-  );
   const handleListScroll = useCallback<NonNullable<MessagesTimelineProps["onMessagesScroll"]>>(
     (event) => {
       onMessagesScroll?.(event);
       const state = resolvedListRef.current?.getState?.();
       if (state) {
         onIsAtEndChange?.(state.isAtEnd);
-        emitTrailHighlightsForViewport(state.start, state.end);
-      }
-    },
-    [emitTrailHighlightsForViewport, onIsAtEndChange, onMessagesScroll, resolvedListRef],
-  );
-  const handleViewableItemsChanged = useCallback<
-    NonNullable<ComponentProps<typeof LegendList>["onViewableItemsChanged"]>
-  >(
-    ({ viewableItems }) => {
-      let topIndex = Number.POSITIVE_INFINITY;
-      let bottomIndex = Number.NEGATIVE_INFINITY;
-      for (const token of viewableItems) {
-        if (token.isViewable) {
-          topIndex = Math.min(topIndex, token.index);
-          bottomIndex = Math.max(bottomIndex, token.index);
-        }
       }
-      emitTrailHighlightsForViewport(topIndex, bottomIndex);
     },
-    [emitTrailHighlightsForViewport],
+    [onIsAtEndChange, onMessagesScroll, resolvedListRef],
   );
-  useEffect(() => {
-    if (!onTrailHighlightsChange) {
-      return;
-    }
-    const frameId = window.requestAnimationFrame(() => {
-      const state = resolvedListRef.current?.getState?.();
-      if (state) {
-        emitTrailHighlightsForViewport(state.start, state.end);
-      }
-    });
-    return () => {
-      window.cancelAnimationFrame(frameId);
-    };
-  }, [emitTrailHighlightsForViewport, onTrailHighlightsChange, resolvedListRef, rows.length]);
   const toggleFileChangesExpanded = useCallback((turnId: TurnId) => {
     setExpandedFileChangesByTurnId((current) => ({
       ...current,
@@ -1104,7 +1031,6 @@ export const MessagesTimeline = memo(function MessagesTimeline({
                   assistantMessageId: selection.assistantMessageId,
                   text: selection.text,
                 }));
-          const terminalContexts = displayedUserMessage.contexts;
           const renderedFileComments = displayedUserMessage.fileComments;
           const renderedPastedTexts = displayedUserMessage.pastedTexts;
           const userMessagePreview = deriveUserMessagePreviewState(
@@ -1114,11 +1040,9 @@ export const MessagesTimeline = memo(function MessagesTimeline({
             },
           );
           const userMessageExpanded = expandedUserMessagesById[row.message.id] ?? false;
-          const showUserText =
-            userMessagePreview.text.trim().length > 0 || terminalContexts.length > 0;
+          const showUserText = userMessagePreview.text.trim().length > 0;
           const bubbleIsChipOnly =
             showUserText &&
-            terminalContexts.length === 0 &&
             hasOnlyInlineSkillChips(userMessagePreview.text, row.message.mentions ?? []);
           const canRevertAgentWork = typeof row.revertTurnCount === "number";
           const isEditingThisMessage = editingUserMessageId === row.message.id;
@@ -1193,7 +1117,6 @@ export const MessagesTimeline = memo(function MessagesTimeline({
                         onTimelineImageLoad={
                           isTailContentRow ? scrollTailExpansionToEnd : ignoreTimelineImageLoad
                         }
-                        resolvedTheme={resolvedTheme}
                       />
                     ))}
                   </div>
@@ -1220,9 +1143,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
                     <UserMessageBody
                       text={userMessagePreview.text}
                       mentionReferences={row.message.mentions ?? []}
-                      terminalContexts={terminalContexts}
                       chatTypographyStyle={userMessageTypographyStyle}
-                      resolvedTheme={resolvedTheme}
                     />
                     {userMessagePreview.collapsible && (
                       <button
@@ -1663,7 +1584,6 @@ export const MessagesTimeline = memo(function MessagesTimeline({
                       <FileEntryIcon
                         pathValue={file.path}
                         kind="file"
-                        theme={resolvedTheme}
                         colorMode="inherit"
                         className="size-4 shrink-0 text-[var(--color-text-foreground)] opacity-70 dark:opacity-80"
                       />
@@ -1687,7 +1607,7 @@ export const MessagesTimeline = memo(function MessagesTimeline({
                     </button>
                   );
                   return (
-                    <div className="mt-1 mb-4 overflow-hidden rounded-[0.5rem] border border-[color:var(--color-border-light)] dark:border-[color:color-mix(in_srgb,var(--color-border-light)_55%,transparent)]">
+                    <div className="mt-1 mb-4 overflow-hidden rounded-lg border border-[color:var(--color-border-light)] dark:border-[color:color-mix(in_srgb,var(--color-border-light)_55%,transparent)]">
                       <div
                         className={cn(
                           "flex items-center justify-between gap-3 bg-[var(--app-user-message-background)] px-3 py-1.5",
@@ -1887,12 +1807,6 @@ export const MessagesTimeline = memo(function MessagesTimeline({
         onPointerDown={onMessagesPointerDown}
         onPointerUp={onMessagesPointerUp}
         onScroll={handleListScroll}
-        {...(onTrailHighlightsChange
-          ? {
-              onViewableItemsChanged: handleViewableItemsChanged,
-              viewabilityConfig: TRAIL_VIEWABILITY_CONFIG,
-            }
-          : {})}
         onTouchEnd={onMessagesTouchEnd}
         onTouchMove={onMessagesTouchMove}
         onTouchStart={onMessagesTouchStart}
@@ -2276,17 +2190,6 @@ function formatWorkingTimerNow(startIso: string): string {
   return formatWorkingTimer(startIso, new Date().toISOString()) ?? "0s";
 }
 
-const UserMessageTerminalContextInlineLabel = memo(
-  function UserMessageTerminalContextInlineLabel(props: { context: ParsedTerminalContextEntry }) {
-    const tooltipText =
-      props.context.body.length > 0
-        ? `${props.context.header}\n${props.context.body}`
-        : props.context.header;
-
-    return <TerminalContextInlineChip label={props.context.header} tooltipText={tooltipText} />;
-  },
-);
-
 const UserImageAttachmentThumbnail = memo(function UserImageAttachmentThumbnail(props: {
   image: Extract<NonNullable<TimelineMessage["attachments"]>[number], { type: "image" }>;
   userImages: Array<
@@ -2294,7 +2197,6 @@ const UserImageAttachmentThumbnail = memo(function UserImageAttachmentThumbnail(
   >;
   onImageExpand: (preview: ExpandedImagePreview) => void;
   onTimelineImageLoad: () => void;
-  resolvedTheme: "light" | "dark";
 }) {
   return (
     <button
@@ -2318,12 +2220,7 @@ const UserImageAttachmentThumbnail = memo(function UserImageAttachmentThumbnail(
         />
       ) : (
         <div className="flex size-full items-center justify-center">
-          <FileEntryIcon
-            pathValue={props.image.name}
-            kind="file"
-            theme={props.resolvedTheme}
-            className="size-4 opacity-70"
-          />
+          <FileEntryIcon pathValue={props.image.name} kind="file" className="size-4 opacity-70" />
         </div>
       )}
     </button>
@@ -2334,7 +2231,6 @@ const UserImageAttachmentThumbnail = memo(function UserImageAttachmentThumbnail(
 function renderUserMessageInlineText(
   text: string,
   keyPrefix: string,
-  resolvedTheme: "light" | "dark",
   mentionReferences: ReadonlyArray<ProviderMentionReference> = [],
 ): ReactNode[] {
   return splitPromptIntoDisplaySegments(text, mentionReferences).flatMap((segment, index) => {
@@ -2350,7 +2246,6 @@ function renderUserMessageInlineText(
         <InlineMentionChip
           key={`${key}:mention`}
           path={segment.path}
-          theme={resolvedTheme}
           mentionReferences={mentionReferences}
           {...(segment.kind ? { kind: segment.kind } : {})}
         />,
@@ -2485,115 +2380,13 @@ const UserMessageEditForm = memo(function UserMessageEditForm(props: {
 const UserMessageBody = memo(function UserMessageBody(props: {
   text: string;
   mentionReferences: ReadonlyArray<ProviderMentionReference>;
-  terminalContexts: ParsedTerminalContextEntry[];
   chatTypographyStyle: CSSProperties;
-  resolvedTheme: "light" | "dark";
 }) {
-  if (props.terminalContexts.length > 0) {
-    const hasEmbeddedInlineLabels = textContainsInlineTerminalContextLabels(
-      props.text,
-      props.terminalContexts,
-    );
-    const inlinePrefix = buildInlineTerminalContextText(props.terminalContexts);
-    const inlineNodes: ReactNode[] = [];
-
-    if (hasEmbeddedInlineLabels) {
-      let cursor = 0;
-
-      for (const context of props.terminalContexts) {
-        const label = formatInlineTerminalContextLabel(context.header);
-        const matchIndex = props.text.indexOf(label, cursor);
-        if (matchIndex === -1) {
-          inlineNodes.length = 0;
-          break;
-        }
-        if (matchIndex > cursor) {
-          inlineNodes.push(
-            ...renderUserMessageInlineText(
-              props.text.slice(cursor, matchIndex),
-              `user-terminal-context-inline-before:${context.header}:${cursor}`,
-              props.resolvedTheme,
-              props.mentionReferences,
-            ),
-          );
-        }
-        inlineNodes.push(
-          <UserMessageTerminalContextInlineLabel
-            key={`user-terminal-context-inline:${context.header}`}
-            context={context}
-          />,
-        );
-        cursor = matchIndex + label.length;
-      }
-
-      if (inlineNodes.length > 0) {
-        if (cursor < props.text.length) {
-          inlineNodes.push(
-            ...renderUserMessageInlineText(
-              props.text.slice(cursor),
-              `user-message-terminal-context-inline-rest:${cursor}`,
-              props.resolvedTheme,
-              props.mentionReferences,
-            ),
-          );
-        }
-
-        return (
-          <div
-            className="block max-w-full min-w-0 wrap-break-word whitespace-pre-wrap font-system-ui text-foreground"
-            style={props.chatTypographyStyle}
-          >
-            {inlineNodes}
-          </div>
-        );
-      }
-    }
-
-    for (const context of props.terminalContexts) {
-      inlineNodes.push(
-        <UserMessageTerminalContextInlineLabel
-          key={`user-terminal-context-inline:${context.header}`}
-          context={context}
-        />,
-      );
-      inlineNodes.push(
-        <span key={`user-terminal-context-inline-space:${context.header}`} aria-hidden="true">
-          {" "}
-        </span>,
-      );
-    }
-
-    if (props.text.length > 0) {
-      inlineNodes.push(
-        ...renderUserMessageInlineText(
-          props.text,
-          "user-message-terminal-context-inline-text",
-          props.resolvedTheme,
-          props.mentionReferences,
-        ),
-      );
-    } else if (inlinePrefix.length === 0) {
-      return null;
-    }
-
-    return (
-      <div
-        className="block max-w-full min-w-0 wrap-break-word whitespace-pre-wrap font-system-ui text-foreground"
-        style={props.chatTypographyStyle}
-      >
-        {inlineNodes}
-      </div>
-    );
-  }
-
   if (props.text.length === 0) {
     return null;
   }
 
-  if (
-    props.terminalContexts.length === 0 &&
-    hasOnlyInlineSkillChips(props.text, props.mentionReferences)
-  ) {
+  if (hasOnlyInlineSkillChips(props.text, props.mentionReferences)) {
     return (
       <div
         className="flex max-w-full min-w-0 items-center leading-none text-foreground [&>span]:translate-y-0"
@@ -2602,7 +2395,6 @@ const UserMessageBody = memo(function UserMessageBody(props: {
         {renderUserMessageInlineText(
           props.text,
           "user-message-inline-chip-only",
-          props.resolvedTheme,
           props.mentionReferences,
         )}
       </div>
@@ -2614,12 +2406,7 @@ const UserMessageBody = memo(function UserMessageBody(props: {
       className="block max-w-full min-w-0 whitespace-pre-wrap break-words font-system-ui text-foreground"
       style={props.chatTypographyStyle}
     >
-      {renderUserMessageInlineText(
-        props.text,
-        "user-message-inline",
-        props.resolvedTheme,
-        props.mentionReferences,
-      )}
+      {renderUserMessageInlineText(props.text, "user-message-inline", props.mentionReferences)}
     </div>
   );
 });
diff --git a/apps/web/src/components/chat/MessagesTimeline.worktreeSetup.browser.tsx b/apps/web/src/components/chat/MessagesTimeline.worktreeSetup.browser.tsx
index 603509984..d299586b2 100644
--- a/apps/web/src/components/chat/MessagesTimeline.worktreeSetup.browser.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.worktreeSetup.browser.tsx
@@ -85,7 +85,6 @@ function WorktreeSetupTimeline() {
           isRevertingCheckpoint={false}
           onImageExpand={() => {}}
           markdownCwd={undefined}
-          resolvedTheme="dark"
           timestampFormat="locale"
           workspaceRoot={undefined}
         />
@@ -114,7 +113,6 @@ function SetupActionTimeline() {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />
@@ -142,7 +140,6 @@ function FailedSetupWithoutMessagesTimeline() {
         isRevertingCheckpoint={false}
         onImageExpand={() => {}}
         markdownCwd={undefined}
-        resolvedTheme="dark"
         timestampFormat="locale"
         workspaceRoot={undefined}
       />
diff --git a/apps/web/src/components/chat/RightDock.tsx b/apps/web/src/components/chat/RightDock.tsx
deleted file mode 100644
index 9d99d2fa5..000000000
--- a/apps/web/src/components/chat/RightDock.tsx
+++ /dev/null
@@ -1,276 +0,0 @@
-// FILE: RightDock.tsx
-// Purpose: Tabbed right sidebar shell for project exploration, diffs, and terminals.
-// Layer: Chat right-dock UI
-// Depends on: ui/sidebar primitive, right-dock pane metadata, and a caller-provided pane renderer.
-
-import { type CSSProperties, type ReactNode, useEffect, useRef, useState } from "react";
-
-import { cn } from "~/lib/utils";
-import {
-  type DockPaneRuntimeMode,
-  EMPTY_PANE_ID_SET,
-  reconcileKeepMountedPaneIds,
-} from "~/lib/dockPaneActivation";
-import { PanelRightCloseIcon, PlusIcon } from "~/lib/icons";
-import type {
-  RightDockPane,
-  RightDockPaneKind,
-  RightDockThreadState,
-} from "~/rightDockStore.logic";
-import { resolveActivePane } from "~/rightDockStore.logic";
-import { Button } from "../ui/button";
-import { IconButton } from "../ui/icon-button";
-import { Menu, MenuItem, MenuTrigger } from "../ui/menu";
-import { PANEL_SURFACE_CLASS_NAME } from "../ui/surface";
-import {
-  Sidebar,
-  SIDEBAR_OFFCANVAS_MOTION_CLASS,
-  SIDEBAR_OFFCANVAS_MOTION_SUPPRESSED_CLASS,
-  SidebarProvider,
-  SidebarRail,
-} from "../ui/sidebar";
-import { ComposerPickerMenuPopup } from "./ComposerPickerMenuPopup";
-import {
-  CHAT_SURFACE_HEADER_ROW_CLASS_NAME,
-  DOCK_HEADER_ICON_BUTTON_CLASS,
-  SurfaceTabChip,
-} from "./chatHeaderControls";
-import {
-  getRightDockPaneMeta,
-  resolveRightDockPaneIcon,
-  resolveRightDockPaneLabel,
-} from "./rightDockPaneMeta";
-import { useDesktopTopBarWindowControlsGutterClassName } from "~/hooks/useDesktopTopBarGutter";
-
-interface RightDockProps {
-  state: RightDockThreadState;
-  minWidth: number;
-  defaultWidth: string;
-  shouldAcceptWidth: (context: { nextWidth: number; wrapper: HTMLElement }) => boolean;
-  paneLabelOverrides?: Record<string, string | undefined>;
-  addMenuKinds: readonly RightDockPaneKind[];
-  onSelectPane: (paneId: string) => void;
-  onClosePane: (paneId: string) => void;
-  onCollapse: () => void;
-  onOpenChange: (open: boolean) => void;
-  onAddPane: (kind: RightDockPaneKind) => void;
-  motionKey?: string;
-  activePaneRuntimeMode?: DockPaneRuntimeMode;
-  renderPane: (
-    pane: RightDockPane,
-    context: { runtimeMode: DockPaneRuntimeMode; isActive: boolean },
-  ) => ReactNode;
-}
-
-function RightDockTab(props: {
-  pane: RightDockPane;
-  label: string;
-  active: boolean;
-  onSelect: () => void;
-  onClose: () => void;
-}) {
-  return (
-    <SurfaceTabChip
-      active={props.active}
-      title={props.label}
-      label={props.label}
-      labelClassName="max-w-[10rem]"
-      icon={resolveRightDockPaneIcon(props.pane)}
-      closeLabel={`Close ${props.label}`}
-      onSelect={props.onSelect}
-      onClose={props.onClose}
-    />
-  );
-}
-
-// Persist which keep-mounted panes (e.g. terminals) have been activated so they
-// stay in the DOM while another tab is selected, pruned to live panes so closed
-// panes drop out and the set never leaks across thread switches. The set is
-// reconciled during render on purpose: when a kept pane stops being active it
-// must remain in the rendered list on that same render, otherwise it would
-// unmount for a frame and lose the very runtime keep-mount is protecting.
-function useKeepMountedPaneIds(
-  panes: readonly RightDockPane[],
-  activePane: RightDockPane | null,
-): ReadonlySet<string> {
-  const ref = useRef<ReadonlySet<string>>(EMPTY_PANE_ID_SET);
-  ref.current = reconcileKeepMountedPaneIds({
-    previous: ref.current,
-    panes,
-    activePaneId: activePane?.id ?? null,
-    activePaneKind: activePane?.kind ?? null,
-  });
-  return ref.current;
-}
-
-export function RightDock(props: RightDockProps) {
-  const activePane = resolveActivePane(props.state);
-  const activePaneRuntimeMode = props.activePaneRuntimeMode ?? "live";
-  // The dock is the right-most surface when open, so its header sits under the
-  // fixed Windows caption cluster — reserve the same gutter the chat header uses.
-  const desktopTopBarWindowControlsGutterClassName =
-    useDesktopTopBarWindowControlsGutterClassName();
-
-  const keepMountedPaneIds = useKeepMountedPaneIds(props.state.panes, activePane);
-  // The dock must open as an exact 50/50 split of the chat shell. The CSS
-  // default can only approximate half (it cannot observe the resizable left
-  // sidebar), so on every open we measure the shell row hosting chat + dock and
-  // pin the dock width to exactly half of it. Mid-session drags still resize
-  // freely; the next open re-centers the split.
-  const contentRef = useRef<HTMLDivElement | null>(null);
-  const minWidth = props.minWidth;
-  useEffect(() => {
-    if (!props.state.open) {
-      return;
-    }
-    const wrapper = contentRef.current?.closest<HTMLElement>("[data-slot='sidebar-wrapper']");
-    const shell = wrapper?.parentElement;
-    if (!wrapper || !shell) {
-      return;
-    }
-    const halfWidth = Math.round(shell.getBoundingClientRect().width / 2);
-    if (halfWidth > 0) {
-      wrapper.style.setProperty("--sidebar-width", `${Math.max(minWidth, halfWidth)}px`);
-    }
-  }, [props.state.open, minWidth]);
-  const renderedPanes = props.state.panes.filter(
-    (pane) => pane.id === activePane?.id || keepMountedPaneIds.has(pane.id),
-  );
-  const [allowChromeMotion, setAllowChromeMotion] = useState(() => !props.state.open);
-  const [, forceMotionClassRefresh] = useState(0);
-  const previousMotionKeyRef = useRef(props.motionKey);
-  const motionKeyChanged = previousMotionKeyRef.current !== props.motionKey;
-  const shouldSuppressChromeMotion = !allowChromeMotion || motionKeyChanged;
-
-  useEffect(() => {
-    const hadMotionKeyChange = previousMotionKeyRef.current !== props.motionKey;
-    previousMotionKeyRef.current = props.motionKey;
-
-    if (!shouldSuppressChromeMotion) {
-      return;
-    }
-
-    if (!allowChromeMotion) {
-      setAllowChromeMotion(true);
-    }
-    if (hadMotionKeyChange && allowChromeMotion) {
-      forceMotionClassRefresh((version) => version + 1);
-    }
-  }, [allowChromeMotion, props.motionKey, shouldSuppressChromeMotion]);
-
-  // Smooth drawer-style easing for the open/close slide. `ease-linear` (the
-  // sidebar default) reads as stepped/janky on the wide dock; this curve front-
-  // loads motion and settles softly. Applied to both the width gap and the
-  // sliding container so they stay in lockstep.
-  const chromeMotionClass = shouldSuppressChromeMotion
-    ? SIDEBAR_OFFCANVAS_MOTION_SUPPRESSED_CLASS
-    : SIDEBAR_OFFCANVAS_MOTION_CLASS;
-
-  return (
-    <SidebarProvider
-      defaultOpen={false}
-      open={props.state.open}
-      onOpenChange={props.onOpenChange}
-      className="w-auto min-h-0 flex-none bg-transparent"
-      style={{ "--sidebar-width": props.defaultWidth } as CSSProperties}
-    >
-      <Sidebar
-        side="right"
-        variant="floating"
-        collapsible="offcanvas"
-        className={cn("text-foreground", chromeMotionClass)}
-        innerClassName={cn(PANEL_SURFACE_CLASS_NAME, "rounded-xl")}
-        gapClassName={chromeMotionClass}
-        transparentSurface
-        resizable={{
-          minWidth: props.minWidth,
-          shouldAcceptWidth: props.shouldAcceptWidth,
-        }}
-      >
-        <div ref={contentRef} className="flex h-full min-h-0 w-full flex-col">
-          <div
-            className={cn(
-              CHAT_SURFACE_HEADER_ROW_CLASS_NAME,
-              "gap-1 border-b border-panel-border px-1.5",
-              desktopTopBarWindowControlsGutterClassName,
-            )}
-          >
-            <div className="flex min-w-0 flex-1 items-center gap-1 overflow-x-auto">
-              {props.state.panes.map((pane) => (
-                <RightDockTab
-                  key={pane.id}
-                  pane={pane}
-                  label={resolveRightDockPaneLabel(pane, props.paneLabelOverrides)}
-                  active={pane.id === props.state.activePaneId}
-                  onSelect={() => props.onSelectPane(pane.id)}
-                  onClose={() => props.onClosePane(pane.id)}
-                />
-              ))}
-            </div>
-            <Menu modal={false}>
-              <MenuTrigger
-                render={
-                  <Button
-                    variant="chrome"
-                    size="icon-xs"
-                    aria-label="Add panel"
-                    title="Add panel"
-                    className={DOCK_HEADER_ICON_BUTTON_CLASS}
-                  />
-                }
-              >
-                <PlusIcon className="size-3.5" />
-              </MenuTrigger>
-              <ComposerPickerMenuPopup align="end" side="bottom" className="w-44 min-w-44">
-                {props.addMenuKinds.map((kind) => {
-                  const { Icon, label } = getRightDockPaneMeta(kind);
-                  return (
-                    <MenuItem key={kind} onClick={() => props.onAddPane(kind)}>
-                      <Icon className="size-3.5 shrink-0" />
-                      <span>{label}</span>
-                    </MenuItem>
-                  );
-                })}
-              </ComposerPickerMenuPopup>
-            </Menu>
-            <IconButton
-              variant="chrome"
-              size="icon-xs"
-              label="Collapse panel"
-              tooltip="Collapse panel"
-              tooltipSide="bottom"
-              className={DOCK_HEADER_ICON_BUTTON_CLASS}
-              onClick={props.onCollapse}
-            >
-              <PanelRightCloseIcon />
-            </IconButton>
-          </div>
-          <div className="relative min-h-0 flex-1">
-            {renderedPanes.map((pane) => {
-              const isActive = pane.id === activePane?.id;
-              // Keep-mounted panes that are not the active tab are already
-              // hydrated, so they render live (just hidden); the active pane uses
-              // the deferred-aware runtime mode from the activation hook.
-              const runtimeMode: DockPaneRuntimeMode = isActive ? activePaneRuntimeMode : "live";
-              return (
-                <div
-                  key={pane.id}
-                  className={cn(
-                    "absolute inset-0 flex min-h-0 w-full",
-                    isActive ? undefined : "invisible pointer-events-none",
-                  )}
-                  aria-hidden={isActive ? undefined : true}
-                >
-                  {props.renderPane(pane, { runtimeMode, isActive })}
-                </div>
-              );
-            })}
-          </div>
-        </div>
-        <SidebarRail />
-      </Sidebar>
-    </SidebarProvider>
-  );
-}
-
-export default RightDock;
diff --git a/apps/web/src/components/chat/SubagentCardList.tsx b/apps/web/src/components/chat/SubagentCardList.tsx
index 9cb3e6f4d..49c1e64aa 100644
--- a/apps/web/src/components/chat/SubagentCardList.tsx
+++ b/apps/web/src/components/chat/SubagentCardList.tsx
@@ -108,7 +108,7 @@ export const SubagentCardList = memo(function SubagentCardList({
   return (
     <div
       className={cn(
-        "space-y-[5px] rounded-[10px] border border-panel-border bg-panel",
+        "space-y-[5px] rounded-xl border border-panel-border bg-panel",
         compact ? "px-2.5 py-2" : "px-3 py-[9px]",
       )}
     >
diff --git a/apps/web/src/components/chat/TerminalContextInlineChip.tsx b/apps/web/src/components/chat/TerminalContextInlineChip.tsx
deleted file mode 100644
index 2dffae730..000000000
--- a/apps/web/src/components/chat/TerminalContextInlineChip.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { TerminalIcon } from "~/lib/icons";
-
-import { cn } from "~/lib/utils";
-import {
-  COMPOSER_INLINE_CHIP_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-  COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME,
-} from "../composerInlineChip";
-import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
-
-interface TerminalContextInlineChipProps {
-  label: string;
-  tooltipText: string;
-  expired?: boolean;
-}
-
-export function TerminalContextInlineChip(props: TerminalContextInlineChipProps) {
-  const { label, tooltipText, expired = false } = props;
-
-  return (
-    <Tooltip>
-      <TooltipTrigger
-        render={
-          <span
-            className={cn(
-              COMPOSER_INLINE_CHIP_CLASS_NAME,
-              expired && "border-destructive/35 bg-destructive/8 text-destructive",
-            )}
-            data-terminal-context-expired={expired ? "true" : undefined}
-          >
-            <TerminalIcon
-              className={cn(
-                COMPOSER_INLINE_CHIP_ICON_CLASS_NAME,
-                "size-3.5",
-                expired && "opacity-100",
-              )}
-            />
-            <span className={COMPOSER_INLINE_CHIP_LABEL_CLASS_NAME}>{label}</span>
-          </span>
-        }
-      />
-      <TooltipPopup side="top" className="max-w-80 whitespace-pre-wrap leading-tight">
-        {tooltipText}
-      </TooltipPopup>
-    </Tooltip>
-  );
-}
diff --git a/apps/web/src/components/chat/TraitsPicker.browser.tsx b/apps/web/src/components/chat/TraitsPicker.browser.tsx
index 4979a7f8e..802b2a923 100644
--- a/apps/web/src/components/chat/TraitsPicker.browser.tsx
+++ b/apps/web/src/components/chat/TraitsPicker.browser.tsx
@@ -92,7 +92,6 @@ async function mountClaudePicker(props?: {
       nonPersistedImageIds: [],
       persistedAttachments: [],
       assistantSelections: [],
-      terminalContexts: [],
       fileComments: [],
       pastedTexts: [],
       skills: [],
@@ -326,7 +325,6 @@ async function mountCodexPicker(props: { model?: string; options?: CodexModelOpt
       nonPersistedImageIds: [],
       persistedAttachments: [],
       assistantSelections: [],
-      terminalContexts: [],
       fileComments: [],
       pastedTexts: [],
       skills: [],
@@ -661,7 +659,6 @@ async function mountOpenCodePicker(props?: {
       files: [],
       nonPersistedImageIds: [],
       persistedAttachments: [],
-      terminalContexts: [],
       fileComments: [],
       pastedTexts: [],
       skills: [],
diff --git a/apps/web/src/components/chat/chatHeaderControls.tsx b/apps/web/src/components/chat/chatHeaderControls.tsx
index 5d62f104e..adc13df3c 100644
--- a/apps/web/src/components/chat/chatHeaderControls.tsx
+++ b/apps/web/src/components/chat/chatHeaderControls.tsx
@@ -101,7 +101,7 @@ export const CHAT_SURFACE_CONTROL_HOVER_CLASS_NAME =
  */
 export const CHAT_SURFACE_CHIP_CLASS_NAME = cn(
   CHAT_HEADER_CONTROL_CLASS_NAME,
-  "!h-8 gap-1.5 rounded-[7px] border-0 px-2.5 text-[length:var(--app-font-size-ui-sm,13px)] font-normal transition-colors duration-menu ease-out",
+  "!h-8 gap-1.5 rounded-lg border-0 px-2.5 text-[length:var(--app-font-size-ui-sm,13px)] font-normal transition-colors duration-menu ease-out",
   CHAT_SURFACE_CONTROL_IDLE_TEXT_CLASS_NAME,
   CHAT_SURFACE_CONTROL_HOVER_CLASS_NAME,
 );
@@ -136,7 +136,7 @@ export const CHAT_HEADER_TOGGLE_CLASS_NAME = cn(
  *  touch more breathing room than the symmetric chip base. */
 export const DOCK_TAB_CHIP_CLASS_NAME = cn(
   CHAT_SURFACE_CHIP_CLASS_NAME,
-  "inline-flex min-w-0 items-center rounded-[8px] border border-transparent pr-2.5 data-[active=true]:border-panel-border data-[active=true]:bg-panel data-[active=true]:text-foreground",
+  "inline-flex min-w-0 items-center rounded-lg border border-transparent pr-2.5 data-[active=true]:border-panel-border data-[active=true]:bg-panel data-[active=true]:text-foreground",
 );
 
 /** Icon slot for dock tabs — bare larger icon at rest; on hover a circular disc + X appears.
diff --git a/apps/web/src/components/chat/composerPickerStyles.ts b/apps/web/src/components/chat/composerPickerStyles.ts
index df2e0b53a..ef87b0aa8 100644
--- a/apps/web/src/components/chat/composerPickerStyles.ts
+++ b/apps/web/src/components/chat/composerPickerStyles.ts
@@ -46,7 +46,7 @@ export const COMPOSER_PICKER_MODEL_LIST_SCROLL_CLASS_NAME = "composer-picker-scr
 export const COMPOSER_PICKER_RADIUS_CLASS_NAME = "rounded-xl";
 
 /** Tighter corner radius for option rows / selection pills inside picker panels. */
-export const COMPOSER_PICKER_OPTION_RADIUS_CLASS_NAME = "rounded-[0.5rem]";
+export const COMPOSER_PICKER_OPTION_RADIUS_CLASS_NAME = "rounded-lg";
 
 /** Collapsible section headers inside model provider lists. */
 export const COMPOSER_PICKER_MODEL_GROUP_HEADER_CLASS_NAME = `grid w-full grid-cols-[0.75rem_minmax(0,1fr)_2.5rem] items-center gap-x-1.5 ${COMPOSER_PICKER_RADIUS_CLASS_NAME} px-2 py-1 text-left text-[11px] font-medium text-muted-foreground/80 outline-none transition-colors hover:bg-hover focus-visible:ring-0`;
diff --git a/apps/web/src/components/chat/environment/EnvironmentRow.tsx b/apps/web/src/components/chat/environment/EnvironmentRow.tsx
index 2eed06487..30c71302d 100644
--- a/apps/web/src/components/chat/environment/EnvironmentRow.tsx
+++ b/apps/web/src/components/chat/environment/EnvironmentRow.tsx
@@ -24,7 +24,7 @@ import {
  * trigger and a plain button row are visually identical.
  */
 export const ENVIRONMENT_ROW_CLASS_NAME = cn(
-  "flex min-h-[38px] w-full cursor-pointer items-center gap-2 rounded-[8px] px-2.5 py-1 text-left",
+  "flex min-h-[38px] w-full cursor-pointer items-center gap-2 rounded-lg px-2.5 py-1 text-left",
   "text-[length:var(--app-font-size-ui,14px)] font-normal text-[var(--color-text-foreground)]",
   "outline-none transition-colors",
   "hover:bg-[var(--color-background-elevated-secondary)]",
@@ -100,7 +100,7 @@ export function EnvironmentCollapsibleSection({
     <Collapsible open={open} onOpenChange={setOpen} className="flex flex-col">
       <CollapsibleTrigger
         className={cn(
-          "group/section flex min-h-[38px] w-full items-center justify-between gap-2 rounded-[8px] px-2.5 py-1 text-left",
+          "group/section flex min-h-[38px] w-full items-center justify-between gap-2 rounded-lg px-2.5 py-1 text-left",
           "outline-none transition-colors",
           "hover:bg-[var(--color-background-elevated-secondary)]",
           "focus-visible:bg-[var(--color-background-elevated-secondary)]",
diff --git a/apps/web/src/components/chat/messageTrail.logic.test.ts b/apps/web/src/components/chat/messageTrail.logic.test.ts
deleted file mode 100644
index 78281f357..000000000
--- a/apps/web/src/components/chat/messageTrail.logic.test.ts
+++ /dev/null
@@ -1,386 +0,0 @@
-import { MessageId } from "@t3tools/contracts";
-import { describe, expect, it } from "vitest";
-import type { TimelineEntry } from "../../session-logic";
-import {
-  clampNumber,
-  clampTooltipTop,
-  computeFocusedIndex,
-  computeGaussianWeights,
-  computeRestStyles,
-  computeSigma,
-  computeTickStyles,
-  computeTrailGeometry,
-  createActiveTrailStore,
-  deriveMessageTrailItems,
-  resolveActiveTrailMessageId,
-  resolveActiveTrailSnapshot,
-  type MessageTrailAnchor,
-  type TrailGeometry,
-} from "./messageTrail.logic";
-
-function messageEntry(
-  id: string,
-  role: "user" | "assistant" | "system",
-  text: string,
-  attachmentCount = 0,
-): TimelineEntry {
-  return {
-    id,
-    kind: "message",
-    createdAt: "2026-01-01T00:00:00Z",
-    message: {
-      id: MessageId.makeUnsafe(id),
-      role,
-      text,
-      streaming: false,
-      turnId: null,
-      createdAt: "2026-01-01T00:00:00Z",
-      ...(attachmentCount > 0
-        ? { attachments: Array.from({ length: attachmentCount }, () => ({}) as never) }
-        : {}),
-    },
-  } as TimelineEntry;
-}
-
-function workEntry(id: string): TimelineEntry {
-  return {
-    id,
-    kind: "work",
-    createdAt: "2026-01-01T00:00:00Z",
-    entry: {} as never,
-  } as TimelineEntry;
-}
-
-function anchor(id: string, rowIndex: number): MessageTrailAnchor {
-  return { id: MessageId.makeUnsafe(id), rowIndex };
-}
-
-describe("deriveMessageTrailItems", () => {
-  it("keeps only user messages, in order, with sequential ordinals", () => {
-    const items = deriveMessageTrailItems([
-      messageEntry("u1", "user", "first"),
-      messageEntry("a1", "assistant", "reply"),
-      workEntry("w1"),
-      messageEntry("u2", "user", "second"),
-      messageEntry("s1", "system", "system note"),
-    ]);
-
-    expect(items.map((item) => item.id)).toEqual([
-      MessageId.makeUnsafe("u1"),
-      MessageId.makeUnsafe("u2"),
-    ]);
-    expect(items.map((item) => item.ordinal)).toEqual([1, 2]);
-  });
-
-  it("collapses whitespace and caps very long previews", () => {
-    const [single] = deriveMessageTrailItems([
-      messageEntry("u1", "user", "  hello\n\n   world\t! "),
-    ]);
-    expect(single?.preview).toBe("hello world !");
-
-    const long = "x".repeat(400);
-    const [capped] = deriveMessageTrailItems([messageEntry("u2", "user", long)]);
-    expect(capped?.preview.endsWith("…")).toBe(true);
-    expect(capped?.preview.length).toBeLessThanOrEqual(281);
-  });
-
-  it("does not add an ellipsis when the collapsed text lands exactly on the cap", () => {
-    // Long enough to take the bounded-window fast path, but the trailing
-    // whitespace collapses away so the real preview is exactly at the cap and
-    // nothing was actually truncated.
-    const exactlyAtCap = "a".repeat(280) + "\n".repeat(2000);
-    const [item] = deriveMessageTrailItems([messageEntry("u1", "user", exactlyAtCap)]);
-    expect(item?.preview).toBe("a".repeat(280));
-    expect(item?.preview.endsWith("…")).toBe(false);
-  });
-
-  it("matches an unwindowed collapse for whitespace-heavy text past the window", () => {
-    // The fast path's window under-fills here, so it must fall back rather than
-    // return a short preview.
-    const text = `${" ".repeat(3000)}${"z".repeat(50)}`;
-    const [item] = deriveMessageTrailItems([messageEntry("u1", "user", text)]);
-    expect(item?.preview).toBe("z".repeat(50));
-  });
-
-  it("reports attachment counts", () => {
-    const [item] = deriveMessageTrailItems([messageEntry("u1", "user", "look", 3)]);
-    expect(item?.attachmentCount).toBe(3);
-  });
-
-  it("captures the turn's final assistant message (end-of-turn reply, not the preamble)", () => {
-    const items = deriveMessageTrailItems([
-      messageEntry("u1", "user", "first question"),
-      messageEntry("a1", "assistant", "  opening   preamble "),
-      messageEntry("a2", "assistant", "final answer after the work"),
-      messageEntry("u2", "user", "second question"),
-      messageEntry("s1", "system", "system note"),
-      messageEntry("u3", "user", "third question"),
-    ]);
-
-    // Last reply per turn wins (a2, not the a1 preamble); turns with no reply stay empty.
-    expect(items.map((item) => item.responsePreview)).toEqual([
-      "final answer after the work",
-      "",
-      "",
-    ]);
-  });
-
-  it("ignores a trailing empty assistant row so the last real reply stays the end-of-turn text", () => {
-    const [item] = deriveMessageTrailItems([
-      messageEntry("u1", "user", "ask"),
-      messageEntry("a1", "assistant", "preamble"),
-      messageEntry("a2", "assistant", "real final reply"),
-      messageEntry("a3", "assistant", "   "),
-    ]);
-    expect(item?.responsePreview).toBe("real final reply");
-  });
-});
-
-describe("resolveActiveTrailMessageId", () => {
-  const anchors = [anchor("u1", 0), anchor("u2", 4), anchor("u3", 9)];
-
-  it("returns null when there are no anchors", () => {
-    expect(resolveActiveTrailMessageId([], 5)).toBeNull();
-  });
-
-  it("returns the last anchor at or above the topmost visible row", () => {
-    expect(resolveActiveTrailMessageId(anchors, 0)).toBe(MessageId.makeUnsafe("u1"));
-    expect(resolveActiveTrailMessageId(anchors, 3)).toBe(MessageId.makeUnsafe("u1"));
-    expect(resolveActiveTrailMessageId(anchors, 4)).toBe(MessageId.makeUnsafe("u2"));
-    expect(resolveActiveTrailMessageId(anchors, 12)).toBe(MessageId.makeUnsafe("u3"));
-  });
-
-  it("updates in both scroll directions from the current top visible row", () => {
-    const scrollPath = [0, 3, 4, 8, 9, 12, 8, 4, 3, 0];
-
-    expect(scrollPath.map((rowIndex) => resolveActiveTrailMessageId(anchors, rowIndex))).toEqual([
-      MessageId.makeUnsafe("u1"),
-      MessageId.makeUnsafe("u1"),
-      MessageId.makeUnsafe("u2"),
-      MessageId.makeUnsafe("u2"),
-      MessageId.makeUnsafe("u3"),
-      MessageId.makeUnsafe("u3"),
-      MessageId.makeUnsafe("u2"),
-      MessageId.makeUnsafe("u2"),
-      MessageId.makeUnsafe("u1"),
-      MessageId.makeUnsafe("u1"),
-    ]);
-  });
-
-  it("falls back to the first anchor when the viewport sits above it", () => {
-    expect(resolveActiveTrailMessageId([anchor("u1", 2), anchor("u2", 5)], 0)).toBe(
-      MessageId.makeUnsafe("u1"),
-    );
-  });
-});
-
-describe("resolveActiveTrailSnapshot", () => {
-  const anchors = [anchor("u1", 0), anchor("u2", 4), anchor("u3", 9), anchor("u4", 14)];
-
-  it("returns the current anchor plus every sent message visible in the viewport", () => {
-    expect(resolveActiveTrailSnapshot(anchors, 3, 10)).toEqual({
-      currentId: MessageId.makeUnsafe("u1"),
-      visibleIds: [MessageId.makeUnsafe("u2"), MessageId.makeUnsafe("u3")],
-    });
-  });
-
-  it("keeps the current anchor even when no sent-message row is directly visible", () => {
-    expect(resolveActiveTrailSnapshot(anchors, 5, 8)).toEqual({
-      currentId: MessageId.makeUnsafe("u2"),
-      visibleIds: [],
-    });
-  });
-
-  it("tracks visible sent messages as the viewport moves up and down", () => {
-    expect([
-      resolveActiveTrailSnapshot(anchors, 0, 4).visibleIds,
-      resolveActiveTrailSnapshot(anchors, 4, 14).visibleIds,
-      resolveActiveTrailSnapshot(anchors, 0, 4).visibleIds,
-    ]).toEqual([
-      [MessageId.makeUnsafe("u1"), MessageId.makeUnsafe("u2")],
-      [MessageId.makeUnsafe("u2"), MessageId.makeUnsafe("u3"), MessageId.makeUnsafe("u4")],
-      [MessageId.makeUnsafe("u1"), MessageId.makeUnsafe("u2")],
-    ]);
-  });
-});
-
-describe("createActiveTrailStore", () => {
-  it("notifies subscribers only when the value actually changes", () => {
-    const store = createActiveTrailStore();
-    let notifications = 0;
-    const unsubscribe = store.subscribe(() => {
-      notifications += 1;
-    });
-
-    expect(store.get()).toEqual({ currentId: null, visibleIds: [] });
-
-    store.set({
-      currentId: MessageId.makeUnsafe("u1"),
-      visibleIds: [MessageId.makeUnsafe("u1"), MessageId.makeUnsafe("u2")],
-    });
-    store.set({
-      currentId: MessageId.makeUnsafe("u1"),
-      visibleIds: [MessageId.makeUnsafe("u1"), MessageId.makeUnsafe("u2")],
-    }); // duplicate snapshot — no notification
-    expect(store.get()).toEqual({
-      currentId: MessageId.makeUnsafe("u1"),
-      visibleIds: [MessageId.makeUnsafe("u1"), MessageId.makeUnsafe("u2")],
-    });
-    expect(notifications).toBe(1);
-
-    store.set({
-      currentId: MessageId.makeUnsafe("u1"),
-      visibleIds: [MessageId.makeUnsafe("u2")],
-    });
-    expect(notifications).toBe(2);
-
-    store.set(null);
-    expect(store.get()).toEqual({ currentId: null, visibleIds: [] });
-    expect(notifications).toBe(3);
-
-    unsubscribe();
-    store.set({ currentId: MessageId.makeUnsafe("u3"), visibleIds: [] });
-    expect(notifications).toBe(3);
-    expect(store.get()).toEqual({ currentId: MessageId.makeUnsafe("u3"), visibleIds: [] });
-  });
-});
-
-const allFinite = (values: readonly number[]) => values.every((v) => Number.isFinite(v));
-
-describe("computeTrailGeometry", () => {
-  it("returns null for N=0", () => {
-    expect(computeTrailGeometry({ count: 0 })).toBeNull();
-  });
-
-  it("places a single tick at the top padding with no spacing (N=1)", () => {
-    const geom = computeTrailGeometry({ count: 1, paddingPx: 12 });
-    expect(geom).toEqual({ startY: 12, spacing: 0, centerYs: [12], contentHeight: 24 });
-  });
-
-  it("lays ticks out at the fixed spacing from the top padding (N=2)", () => {
-    const geom = computeTrailGeometry({ count: 2, spacingPx: 10, paddingPx: 12 })!;
-    expect(geom.spacing).toBe(10);
-    expect(geom.startY).toBe(12);
-    expect(geom.centerYs).toEqual([12, 22]);
-    expect(geom.contentHeight).toBe(34); // 2*12 + 1*10
-  });
-
-  it("keeps the spacing fixed for many messages and grows the content height", () => {
-    const spacing = 10;
-    const padding = 12;
-    const count = 200;
-    const geom = computeTrailGeometry({ count, spacingPx: spacing, paddingPx: padding })!;
-    expect(geom.spacing).toBe(spacing); // never compressed to fit
-    expect(geom.centerYs[0]).toBe(padding);
-    expect(geom.centerYs[count - 1]).toBe(padding + (count - 1) * spacing);
-    expect(geom.contentHeight).toBe(2 * padding + (count - 1) * spacing);
-    expect(allFinite(geom.centerYs)).toBe(true);
-  });
-});
-
-describe("computeSigma", () => {
-  it("tracks spacing within the density-aware clamp", () => {
-    expect(computeSigma(9)).toBeCloseTo(13.5, 5); // clamp(13.5, min(18,8)=8, 22)
-    expect(computeSigma(2)).toBeCloseTo(4, 5); // clamp(3, min(4,8)=4, 22) -> floor wins
-    expect(computeSigma(0.5)).toBeCloseTo(1, 5); // clamp(0.75, min(1,8)=1, 22) -> 1
-    expect(computeSigma(20)).toBeCloseTo(22, 5); // clamp(30, 8, 22) -> upper cap
-  });
-});
-
-describe("computeGaussianWeights", () => {
-  const centerYs = [0, 10, 20, 30, 40];
-
-  it("peaks at exactly 1 under the pointer and stays within [0,1]", () => {
-    const weights = computeGaussianWeights(centerYs, 20, 7);
-    expect(weights[2]).toBe(1);
-    expect(weights.every((w) => w >= 0 && w <= 1)).toBe(true);
-  });
-
-  it("is symmetric around the pointer", () => {
-    const weights = computeGaussianWeights(centerYs, 20, 7);
-    expect(weights[1]).toBeCloseTo(weights[3]!, 10);
-    expect(weights[0]).toBeCloseTo(weights[4]!, 10);
-  });
-});
-
-describe("computeTickStyles", () => {
-  const baseW = 14;
-  const maxW = 34;
-  const rest = 0.38;
-  const anchor = 0.9;
-
-  it("grows the focused tick to maxW but keeps its rest colour (size changes, not opacity)", () => {
-    const [style] = computeTickStyles([1], null, baseW, maxW, rest, anchor);
-    expect(style!.width).toBeCloseTo(maxW, 5);
-    expect(style!.opacity).toBeCloseTo(rest, 5); // colour never follows the cursor
-  });
-
-  it("keeps opacity fixed per state regardless of weight (anchor dark, others rest)", () => {
-    // Even the magnified anchor (weight 1) stays at anchor opacity, not brighter.
-    const styles = computeTickStyles([1, 0.5, 0], 0, baseW, maxW, rest, anchor);
-    expect(styles.map((s) => s.opacity)).toEqual([anchor, rest, rest]);
-    expect(styles[0]!.width).toBeCloseTo(maxW, 5);
-    expect(styles[2]!.width).toBeCloseTo(baseW, 5);
-  });
-});
-
-describe("computeRestStyles", () => {
-  it("brightens only the anchor tick", () => {
-    const styles = computeRestStyles(3, 1, 14, 0.38, 0.9);
-    expect(styles.map((s) => s.opacity)).toEqual([0.38, 0.9, 0.38]);
-    expect(styles.every((s) => s.width === 14)).toBe(true);
-  });
-
-  it("leaves all ticks at rest when there is no anchor", () => {
-    const styles = computeRestStyles(2, null, 14, 0.38, 0.9);
-    expect(styles.map((s) => s.opacity)).toEqual([0.38, 0.38]);
-  });
-});
-
-describe("computeFocusedIndex", () => {
-  const geom: TrailGeometry = {
-    startY: 100,
-    spacing: 10,
-    centerYs: [100, 110, 120, 130, 140],
-    contentHeight: 264,
-  };
-
-  it("returns 0 for a single/degenerate rail", () => {
-    expect(
-      computeFocusedIndex(999, { startY: 50, spacing: 0, centerYs: [50], contentHeight: 100 }),
-    ).toBe(0);
-  });
-
-  it("maps pointer position to the nearest tick", () => {
-    expect(computeFocusedIndex(100, geom)).toBe(0);
-    expect(computeFocusedIndex(124, geom)).toBe(2);
-    expect(computeFocusedIndex(140, geom)).toBe(4);
-  });
-
-  it("clamps out-of-range pointers to the first/last tick (never negative or N)", () => {
-    expect(computeFocusedIndex(-500, geom)).toBe(0);
-    expect(computeFocusedIndex(99999, geom)).toBe(4);
-  });
-
-  it("is finite-safe for a NaN pointer", () => {
-    expect(computeFocusedIndex(Number.NaN, geom)).toBe(0);
-  });
-});
-
-describe("clampTooltipTop", () => {
-  it("keeps the tooltip on-screen near the edges and untouched in the middle", () => {
-    expect(clampTooltipTop(10, 56, 500, 4)).toBe(32);
-    expect(clampTooltipTop(490, 56, 500, 4)).toBe(468);
-    expect(clampTooltipTop(250, 56, 500, 4)).toBe(250);
-  });
-});
-
-describe("clampNumber", () => {
-  it("clamps, and is finite-safe / range-safe", () => {
-    expect(clampNumber(5, 0, 10)).toBe(5);
-    expect(clampNumber(-1, 0, 10)).toBe(0);
-    expect(clampNumber(11, 0, 10)).toBe(10);
-    expect(clampNumber(Number.NaN, 2, 8)).toBe(2);
-    expect(clampNumber(5, 10, 0)).toBe(10); // inverted range -> min
-  });
-});
diff --git a/apps/web/src/components/chat/messageTrail.logic.ts b/apps/web/src/components/chat/messageTrail.logic.ts
deleted file mode 100644
index b0731880c..000000000
--- a/apps/web/src/components/chat/messageTrail.logic.ts
+++ /dev/null
@@ -1,428 +0,0 @@
-// FILE: messageTrail.logic.ts
-// Purpose: Pure helpers for the left-edge message navigation trail — project the
-//   timeline into one tick per sent message and resolve which tick is active.
-// Layer: Chat transcript shell (presentation-adjacent logic, unit-tested)
-// Depends on: timeline entry shape only — no React, no DOM.
-
-import { type MessageId } from "@t3tools/contracts";
-import { type TimelineEntry } from "../../session-logic";
-
-/** One tick on the navigation trail — a single message the user sent. */
-export interface MessageTrailItem {
-  id: MessageId;
-  /** 1-based position among sent messages, used for labels/aria. */
-  ordinal: number;
-  /** Whitespace-normalized, length-capped text for the hover preview (the sent message). */
-  preview: string;
-  /**
-   * Whitespace-normalized, length-capped start of the turn's final assistant message
-   * — the muted second line in the hover card. This is the end-of-turn reply (the
-   * message that lands after the turn's work), not the opening preamble. Empty when
-   * the turn has produced no assistant text yet.
-   */
-  responsePreview: string;
-  /** Number of attachments on the message (rendered as a small hint). */
-  attachmentCount: number;
-}
-
-/** Hard cap so a pathological paste can't bloat the hover-card payload. */
-const MAX_PREVIEW_LENGTH = 280;
-
-/**
- * How much raw text we collapse before giving up on the fast path. Whitespace
- * runs shrink, so a window can under-fill the cap; 8x leaves room for prose
- * while keeping the regex bounded regardless of message size.
- */
-const PREVIEW_SCAN_WINDOW = MAX_PREVIEW_LENGTH * 8;
-
-function normalizePreview(text: string): string {
-  // The cap is applied *after* collapsing, so a naive implementation scans and
-  // reallocates the entire message body to produce at most 280 characters.
-  // Collapse a bounded window first and only fall back to the full scan when
-  // that window couldn't fill the cap (whitespace-dominated text).
-  if (text.length > PREVIEW_SCAN_WINDOW) {
-    const windowed = text.slice(0, PREVIEW_SCAN_WINDOW).replace(/\s+/g, " ").trim();
-    // Strictly greater, matching the full-scan branch below. At exactly
-    // MAX_PREVIEW_LENGTH the text fits and must NOT get an ellipsis — `>=` here
-    // appended one to any message whose collapsed prefix landed on exactly 280.
-    if (windowed.length > MAX_PREVIEW_LENGTH) {
-      return `${windowed.slice(0, MAX_PREVIEW_LENGTH).trimEnd()}…`;
-    }
-  }
-  const collapsed = text.replace(/\s+/g, " ").trim();
-  return collapsed.length > MAX_PREVIEW_LENGTH
-    ? `${collapsed.slice(0, MAX_PREVIEW_LENGTH).trimEnd()}…`
-    : collapsed;
-}
-
-/**
- * Previews are re-derived on every store flush (10x/second while streaming) for
- * every message in the transcript, so this cache is what keeps the cost bounded
- * to the tail message.
- *
- * Keyed on message id + text, NOT on the message object: two live paths hand us
- * a freshly allocated object every derive — `stripProposedPlanBlocksFromText`
- * spreads every assistant message in a turn that has a proposed plan, and the
- * attachment-preview handoff spreads while in flight — so an identity-keyed
- * WeakMap had a 0% hit rate on exactly the threads that need it most.
- *
- * The text comparison is cheap in the common case: while streaming, the length
- * changes on every delta, so a mismatch is rejected on the length check.
- */
-const MAX_CACHED_PREVIEWS = 1_000;
-const previewByMessageId = new Map<string, { readonly text: string; readonly preview: string }>();
-
-function cachedPreview(messageId: string, text: string): string {
-  const cached = previewByMessageId.get(messageId);
-  if (cached !== undefined && cached.text === text) {
-    return cached.preview;
-  }
-  const preview = normalizePreview(text);
-  // Map iterates in insertion order, so the first key is the oldest.
-  if (!cached && previewByMessageId.size >= MAX_CACHED_PREVIEWS) {
-    const oldest = previewByMessageId.keys().next();
-    if (!oldest.done) previewByMessageId.delete(oldest.value);
-  }
-  previewByMessageId.set(messageId, { text, preview });
-  return preview;
-}
-
-/**
- * Project the timeline into one trail item per user message, in transcript order.
- * Each item also carries the start of its turn's *final* assistant message (the muted
- * second line in the hover card) — the reply that lands after the turn's work, not the
- * opening preamble. System / work rows are skipped, and a turn with no assistant text
- * yet keeps an empty `responsePreview`.
- */
-export function deriveMessageTrailItems(
-  timelineEntries: readonly TimelineEntry[],
-): MessageTrailItem[] {
-  const items: MessageTrailItem[] = [];
-  // Index of the user item whose turn we're inside; every non-empty assistant row
-  // overwrites its response so the last one (the end-of-turn message) wins.
-  let currentTurnIndex = -1;
-  for (const entry of timelineEntries) {
-    if (entry.kind !== "message") {
-      continue;
-    }
-    const { role } = entry.message;
-    if (role === "user") {
-      items.push({
-        id: entry.message.id,
-        ordinal: items.length + 1,
-        preview: cachedPreview(entry.message.id, entry.message.text),
-        responsePreview: "",
-        attachmentCount: entry.message.attachments?.length ?? 0,
-      });
-      currentTurnIndex = items.length - 1;
-    } else if (role === "assistant" && currentTurnIndex >= 0) {
-      const responsePreview = cachedPreview(entry.message.id, entry.message.text);
-      if (responsePreview !== "") {
-        items[currentTurnIndex]!.responsePreview = responsePreview;
-      }
-    }
-  }
-  return items;
-}
-
-/** A sent-message row paired with its index in the virtualized row list. */
-export interface MessageTrailAnchor {
-  id: MessageId;
-  rowIndex: number;
-}
-
-/**
- * Resolve the active trail anchor from the topmost row currently in view.
- *
- * "Active" is the last sent message at or above the top of the viewport — i.e.
- * the turn you are currently reading, even when the user bubble itself has
- * scrolled above the fold beneath a long assistant reply. Anchors must be sorted
- * by ascending `rowIndex` (transcript order); the topmost index is `0`.
- */
-export function resolveActiveTrailMessageId(
-  anchors: readonly MessageTrailAnchor[],
-  topVisibleRowIndex: number,
-): MessageId | null {
-  if (anchors.length === 0) {
-    return null;
-  }
-  // Default to the first anchor so a viewport sitting above the first sent
-  // message (e.g. a leading system bubble) still highlights something sensible.
-  let activeId: MessageId = anchors[0]!.id;
-  for (const anchor of anchors) {
-    if (anchor.rowIndex <= topVisibleRowIndex) {
-      activeId = anchor.id;
-    } else {
-      break;
-    }
-  }
-  return activeId;
-}
-
-/** Current reading anchor plus every sent-message row visible in the viewport. */
-export interface ActiveTrailSnapshot {
-  currentId: MessageId | null;
-  visibleIds: readonly MessageId[];
-}
-
-export const EMPTY_ACTIVE_TRAIL_SNAPSHOT: ActiveTrailSnapshot = {
-  currentId: null,
-  visibleIds: [],
-};
-
-function areMessageIdListsEqual(a: readonly MessageId[], b: readonly MessageId[]): boolean {
-  if (a.length !== b.length) {
-    return false;
-  }
-  for (let i = 0; i < a.length; i += 1) {
-    if (a[i] !== b[i]) {
-      return false;
-    }
-  }
-  return true;
-}
-
-export function areActiveTrailSnapshotsEqual(
-  a: ActiveTrailSnapshot,
-  b: ActiveTrailSnapshot,
-): boolean {
-  return a.currentId === b.currentId && areMessageIdListsEqual(a.visibleIds, b.visibleIds);
-}
-
-/**
- * Resolve both the current reading anchor and the sent messages directly visible
- * inside the viewport range. The current anchor can sit above the viewport during
- * a long assistant reply; visible ids only include user rows within `[top, bottom]`.
- */
-export function resolveActiveTrailSnapshot(
-  anchors: readonly MessageTrailAnchor[],
-  topVisibleRowIndex: number,
-  bottomVisibleRowIndex: number,
-): ActiveTrailSnapshot {
-  if (anchors.length === 0 || !Number.isFinite(topVisibleRowIndex)) {
-    return EMPTY_ACTIVE_TRAIL_SNAPSHOT;
-  }
-  const currentId = resolveActiveTrailMessageId(anchors, topVisibleRowIndex);
-  const bottomRowIndex = Number.isFinite(bottomVisibleRowIndex)
-    ? Math.max(topVisibleRowIndex, bottomVisibleRowIndex)
-    : topVisibleRowIndex;
-  const visibleIds: MessageId[] = [];
-  for (const anchor of anchors) {
-    if (anchor.rowIndex < topVisibleRowIndex) {
-      continue;
-    }
-    if (anchor.rowIndex > bottomRowIndex) {
-      break;
-    }
-    visibleIds.push(anchor.id);
-  }
-  return visibleIds.length === 0 && currentId === null
-    ? EMPTY_ACTIVE_TRAIL_SNAPSHOT
-    : { currentId, visibleIds };
-}
-
-/**
- * A stable subscribable holder for current + visible trail highlights.
- *
- * The producer (MessagesTimeline) and consumer (MessageTrail) are siblings under
- * a memoized transcript pane. Threading this through that pane's state
- * would re-render the heavy timeline on every scroll, so it flows through this
- * store instead: the pane creates it once, hands `set` to the timeline and the
- * whole store to the trail, and only the trail re-renders on change.
- */
-export interface ActiveTrailStore {
-  get: () => ActiveTrailSnapshot;
-  set: (value: ActiveTrailSnapshot | null) => void;
-  subscribe: (listener: () => void) => () => void;
-}
-
-export function createActiveTrailStore(): ActiveTrailStore {
-  let current: ActiveTrailSnapshot = EMPTY_ACTIVE_TRAIL_SNAPSHOT;
-  const listeners = new Set<() => void>();
-  return {
-    get: () => current,
-    set: (value) => {
-      const next = value ?? EMPTY_ACTIVE_TRAIL_SNAPSHOT;
-      if (areActiveTrailSnapshotsEqual(next, current)) {
-        return;
-      }
-      current = next;
-      for (const listener of listeners) {
-        listener();
-      }
-    },
-    subscribe: (listener) => {
-      listeners.add(listener);
-      return () => {
-        listeners.delete(listener);
-      };
-    },
-  };
-}
-
-// ---------------------------------------------------------------------------
-// macOS-Dock-style magnification math
-//
-// The rail magnifies the tick nearest the pointer and tapers neighbours off with
-// a Gaussian falloff. Everything here is pure and finite-safe so the same formula
-// works for 1 message or 1000: the component just feeds it measured geometry and
-// the pointer position. Each function is unit-tested in messageTrail.logic.test.ts.
-// ---------------------------------------------------------------------------
-
-/** Clamp `value` into `[min, max]`, finite-safe (returns `min` if the range is inverted). */
-export function clampNumber(value: number, min: number, max: number): number {
-  if (!Number.isFinite(value)) {
-    return min;
-  }
-  if (max < min) {
-    return min;
-  }
-  return value < min ? min : value > max ? max : value;
-}
-
-/** Fixed vertical layout of the ticks; widths never affect these positions. */
-export interface TrailGeometry {
-  /** Vertical centre (px) of the first tick. */
-  startY: number;
-  /** Centre-to-centre distance (px); 0 when there is a single (or degenerate) tick. */
-  spacing: number;
-  /** Vertical centre (px) of every tick, in order. */
-  centerYs: number[];
-  /**
-   * Total content height (px) the ticks occupy = `2*padding + (count-1)*spacing`.
-   * The rail caps its viewport below this and scrolls; deriving it from the count
-   * (never from the measured viewport) is what keeps geometry free of any
-   * size→layout→size ResizeObserver feedback loop.
-   */
-  contentHeight: number;
-}
-
-/**
- * Lay the ticks out top-down at a fixed `spacingPx`, in their own content space.
- * The layout depends only on the message count — never on the measured viewport —
- * so the rail can cap + scroll its viewport without feeding height back into the
- * layout. Returns `null` for N=0 so the caller can skip all pointer handling.
- */
-export function computeTrailGeometry(input: {
-  count: number;
-  spacingPx?: number;
-  paddingPx?: number;
-}): TrailGeometry | null {
-  const count = input.count;
-  const spacing = count <= 1 ? 0 : (input.spacingPx ?? 10);
-  const padding = input.paddingPx ?? 12;
-  if (count <= 0) {
-    return null;
-  }
-  const centerYs: number[] = [];
-  for (let i = 0; i < count; i += 1) {
-    centerYs.push(padding + i * spacing);
-  }
-  return {
-    startY: padding,
-    spacing,
-    centerYs,
-    contentHeight: 2 * padding + (count - 1) * spacing,
-  };
-}
-
-/**
- * Gaussian sigma tied to tick density so the focus radius stays ~1.5 ticks
- * whether the rail is sparse or dense: `clamp(spacing*1.5, min(spacing*2, 8), 22)`.
- * Irrelevant when `spacing === 0` (single tick) — callers skip the Gaussian then.
- */
-export function computeSigma(spacing: number): number {
-  return clampNumber(spacing * 1.5, Math.min(spacing * 2, 8), 22);
-}
-
-/** Per-tick Gaussian weight in `[0, 1]`; exactly `1` for the tick under the pointer. */
-export function computeGaussianWeights(
-  centerYs: readonly number[],
-  pointerY: number,
-  sigma: number,
-): number[] {
-  if (sigma <= 0) {
-    return centerYs.map((centerY) => (centerY === pointerY ? 1 : 0));
-  }
-  const twoSigmaSquared = 2 * sigma * sigma;
-  return centerYs.map((centerY) => {
-    const distance = centerY - pointerY;
-    return Math.exp(-(distance * distance) / twoSigmaSquared);
-  });
-}
-
-/** Resolved width/opacity for one tick. */
-export interface TickStyle {
-  width: number;
-  opacity: number;
-}
-
-/**
- * Map Gaussian weights to width only — opacity stays a fixed per-state colour.
- * Width lerps `baseW → effectiveMaxW` with the weight (the Dock size effect), but
- * the colour never follows the cursor: each tick keeps its state opacity (anchor
- * dark, everything else at `restOpacity`); the visible-in-viewport mid tone is
- * layered on afterwards by the caller. Only the size changes under the pointer.
- */
-export function computeTickStyles(
-  weights: readonly number[],
-  currentAnchorIndex: number | null,
-  baseW: number,
-  effectiveMaxW: number,
-  restOpacity: number,
-  anchorOpacity: number,
-): TickStyle[] {
-  return weights.map((weight, index) => ({
-    width: baseW + (effectiveMaxW - baseW) * weight,
-    opacity: index === currentAnchorIndex ? anchorOpacity : restOpacity,
-  }));
-}
-
-/** Rest-state styles (pointer away): all `baseW`, anchor brightened. */
-export function computeRestStyles(
-  count: number,
-  currentAnchorIndex: number | null,
-  baseW: number,
-  restOpacity: number,
-  anchorOpacity: number,
-): TickStyle[] {
-  const styles: TickStyle[] = [];
-  for (let i = 0; i < count; i += 1) {
-    styles.push({ width: baseW, opacity: i === currentAnchorIndex ? anchorOpacity : restOpacity });
-  }
-  return styles;
-}
-
-/**
- * Index of the tick nearest `pointerY`. Clamps `pointerY` into the tick range
- * first so positions above/below the rail resolve to the first/last tick rather
- * than out-of-range. Always returns `0` for a single/degenerate rail. Finite-safe.
- */
-export function computeFocusedIndex(pointerY: number, geometry: TrailGeometry): number {
-  const count = geometry.centerYs.length;
-  if (count <= 1 || geometry.spacing === 0) {
-    return 0;
-  }
-  if (!Number.isFinite(pointerY)) {
-    return 0;
-  }
-  const endY = geometry.startY + (count - 1) * geometry.spacing;
-  const clampedY = clampNumber(pointerY, geometry.startY, endY);
-  const raw = Math.round((clampedY - geometry.startY) / geometry.spacing);
-  return clampNumber(raw, 0, count - 1);
-}
-
-/**
- * Keep the focused-message tooltip fully on-screen by clamping its vertical centre
- * into `[tooltipH/2 + margin, railH - tooltipH/2 - margin]` (caller keeps a
- * `translateY(-50%)`). Range-safe when the rail is shorter than the tooltip.
- */
-export function clampTooltipTop(
-  centerY: number,
-  tooltipH: number,
-  railH: number,
-  margin = 4,
-): number {
-  const half = tooltipH / 2 + margin;
-  return clampNumber(centerY, half, Math.max(half, railH - half));
-}
diff --git a/apps/web/src/components/chat/rightDockPaneMeta.tsx b/apps/web/src/components/chat/rightDockPaneMeta.tsx
deleted file mode 100644
index d505259f5..000000000
--- a/apps/web/src/components/chat/rightDockPaneMeta.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-// FILE: rightDockPaneMeta.tsx
-// Purpose: Shared semantic metadata (icon + label) for right-dock pane kinds.
-// Layer: Chat right-dock UI primitives
-// Exports: per-kind meta map, ordered add-menu kinds, and pane label/icon resolvers.
-
-import type { LucideIcon } from "~/lib/icons";
-import { DiffIcon, FoldersIcon, InfoIcon, TerminalIcon } from "~/lib/icons";
-import {
-  RIGHT_DOCK_PANE_KINDS,
-  type RightDockPane,
-  type RightDockPaneKind,
-} from "~/rightDockStore.logic";
-import { SurfaceChipIcon } from "./chatHeaderControls";
-
-export interface RightDockPaneMeta {
-  label: string;
-  Icon: LucideIcon;
-}
-
-export const RIGHT_DOCK_PANE_META: Record<RightDockPaneKind, RightDockPaneMeta> = {
-  diff: { label: "Diff", Icon: DiffIcon },
-  explorer: { label: "Explorer", Icon: FoldersIcon },
-  terminal: { label: "Terminal", Icon: TerminalIcon },
-};
-
-// Neutral fallback for any pane kind we no longer recognize (e.g. stale
-// persisted state). Persisted dock state is sanitized on rehydrate, so this is
-// only a defensive guard to keep a single bad pane from crashing render.
-const FALLBACK_RIGHT_DOCK_PANE_META: RightDockPaneMeta = {
-  label: "Panel",
-  Icon: InfoIcon,
-};
-
-// Always resolve pane meta through this helper instead of indexing the map
-// directly, so an unknown kind degrades gracefully rather than throwing.
-export function getRightDockPaneMeta(kind: RightDockPaneKind): RightDockPaneMeta {
-  return RIGHT_DOCK_PANE_META[kind] ?? FALLBACK_RIGHT_DOCK_PANE_META;
-}
-
-// Add-menu / quick triggers follow the canonical kind order from the single
-// source of truth, so they stay in sync as kinds are added or removed. The
-// "file" kind is intentionally excluded: single-file preview tabs are opened by
-// clicking a file reference in chat, while the add menu offers the richer
-// "explorer" pane (file tree + search + viewer) in its place.
-export const RIGHT_DOCK_ADD_MENU_KINDS: readonly RightDockPaneKind[] = RIGHT_DOCK_PANE_KINDS;
-
-// Resolves a tab label, preferring caller-provided per-pane overrides (e.g. the
-// embedded sidechat thread title) before falling back to the kind label.
-export function resolveRightDockPaneLabel(
-  pane: RightDockPane,
-  overrides?: Record<string, string | undefined>,
-): string {
-  return overrides?.[pane.id] ?? getRightDockPaneMeta(pane.kind).label;
-}
-
-// Resolves a tab glyph: file panes show the per-file-type icon (matching the
-// pane header and explorer rows), every other pane uses its kind icon. The file
-// glyph inherits the tab's muted foreground color (colorMode="inherit") instead
-// of its extension color, so dock tabs read like the changed-file rows rather
-// than carrying a loud per-type tint.
-export function resolveRightDockPaneIcon(pane: RightDockPane) {
-  return <SurfaceChipIcon icon={getRightDockPaneMeta(pane.kind).Icon} />;
-}
diff --git a/apps/web/src/components/chat/userMessageTerminalContexts.test.ts b/apps/web/src/components/chat/userMessageTerminalContexts.test.ts
deleted file mode 100644
index 110119501..000000000
--- a/apps/web/src/components/chat/userMessageTerminalContexts.test.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  buildInlineTerminalContextText,
-  formatInlineTerminalContextLabel,
-  textContainsInlineTerminalContextLabels,
-} from "./userMessageTerminalContexts";
-
-describe("userMessageTerminalContexts", () => {
-  it("builds plain inline terminal text labels", () => {
-    expect(
-      buildInlineTerminalContextText([
-        { header: "Terminal 1 lines 12-13" },
-        { header: "Terminal 2 line 4" },
-      ]),
-    ).toBe("@terminal-1:12-13 @terminal-2:4");
-  });
-
-  it("formats individual inline terminal labels compactly", () => {
-    expect(formatInlineTerminalContextLabel("Terminal 1 lines 12-13")).toBe("@terminal-1:12-13");
-    expect(formatInlineTerminalContextLabel("Terminal 2 line 4")).toBe("@terminal-2:4");
-  });
-
-  it("detects inline terminal labels embedded in user message text", () => {
-    expect(
-      textContainsInlineTerminalContextLabels("yo @terminal-1:12-13 whats up", [
-        { header: "Terminal 1 lines 12-13" },
-      ]),
-    ).toBe(true);
-    expect(
-      textContainsInlineTerminalContextLabels("yo whats up", [
-        { header: "Terminal 1 lines 12-13" },
-      ]),
-    ).toBe(false);
-  });
-});
diff --git a/apps/web/src/components/chat/userMessageTerminalContexts.ts b/apps/web/src/components/chat/userMessageTerminalContexts.ts
deleted file mode 100644
index 978210a53..000000000
--- a/apps/web/src/components/chat/userMessageTerminalContexts.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { formatInlineTerminalContextLabel as formatInlineTerminalContextSelectionLabel } from "~/lib/terminalContext";
-
-const TERMINAL_CONTEXT_HEADER_PATTERN = /^(.*?)\s+line(?:s)?\s+(\d+)(?:-(\d+))?$/i;
-
-export function buildInlineTerminalContextText(
-  contexts: ReadonlyArray<{
-    header: string;
-  }>,
-): string {
-  return contexts
-    .map((context) => context.header.trim())
-    .filter((header) => header.length > 0)
-    .map(formatInlineTerminalContextLabel)
-    .join(" ");
-}
-
-export function formatInlineTerminalContextLabel(header: string): string {
-  const trimmedHeader = header.trim();
-  const match = TERMINAL_CONTEXT_HEADER_PATTERN.exec(trimmedHeader);
-  if (!match) {
-    return `@${trimmedHeader.toLowerCase().replace(/\s+/g, "-")}`;
-  }
-
-  const lineStart = Number.parseInt(match[2] ?? "", 10);
-  const lineEnd = Number.parseInt(match[3] ?? match[2] ?? "", 10);
-  if (!Number.isFinite(lineStart) || !Number.isFinite(lineEnd)) {
-    return `@${trimmedHeader.toLowerCase().replace(/\s+/g, "-")}`;
-  }
-
-  return formatInlineTerminalContextSelectionLabel({
-    terminalLabel: match[1]?.trim() || "terminal",
-    lineStart,
-    lineEnd,
-  });
-}
-
-export function textContainsInlineTerminalContextLabels(
-  text: string,
-  contexts: ReadonlyArray<{
-    header: string;
-  }>,
-): boolean {
-  let searchStartIndex = 0;
-
-  for (const context of contexts) {
-    const label = formatInlineTerminalContextLabel(context.header);
-    const matchIndex = text.indexOf(label, searchStartIndex);
-    if (matchIndex === -1) {
-      return false;
-    }
-    searchStartIndex = matchIndex + label.length;
-  }
-
-  return true;
-}
diff --git a/apps/web/src/components/chat/workspaceExplorer.tsx b/apps/web/src/components/chat/workspaceExplorer.tsx
deleted file mode 100644
index de5f29646..000000000
--- a/apps/web/src/components/chat/workspaceExplorer.tsx
+++ /dev/null
@@ -1,745 +0,0 @@
-// FILE: workspaceExplorer.tsx
-// Purpose: Shared workspace file-tree explorer + file-search building blocks used
-//          by both the full editor view and the right-dock explorer pane.
-// Layer: Chat workspace-browsing UI primitives
-// Exports: WorkspaceFilesSidebar, WorkspaceSearchSidebar, WorkspaceExplorerSidebar,
-//          ExplorerActivityBarButton, useExplorerEntryPrefetch, setFileReferenceDragData.
-
-import type { ProjectEntry, ProjectFileSystemEntry } from "@t3tools/contracts";
-import { useDebouncedValue } from "@tanstack/react-pacer";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import {
-  type ComponentPropsWithoutRef,
-  type DragEvent as ReactDragEvent,
-  type KeyboardEvent as ReactKeyboardEvent,
-  type MouseEvent as ReactMouseEvent,
-  type ReactNode,
-  forwardRef,
-  useCallback,
-} from "react";
-
-import {
-  CHAT_FILE_REFERENCE_DRAG_TYPE,
-  formatChatFileReference,
-  type ChatFileReference,
-} from "~/lib/chatReferences";
-import { splitRepoRelativePath } from "~/lib/diffRendering";
-import { showFileReferenceContextMenu } from "~/lib/fileReferenceContextMenu";
-import {
-  projectListDirectoriesQueryOptions,
-  projectReadFileQueryOptions,
-  projectSearchEntriesQueryOptions,
-} from "~/lib/projectReactQuery";
-import { getSyntaxHighlighterPromise, getSyntaxLanguageForPath } from "~/lib/syntaxHighlighting";
-import { cn } from "~/lib/utils";
-import { Skeleton } from "../ui/skeleton";
-import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from "../ui/collapsible";
-import { DisclosureChevron } from "../ui/DisclosureChevron";
-import { SearchInput } from "../ui/search-input";
-import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
-import { EXPLORER_ROW_PROPS, useExplorerListNavigation } from "./explorerListNavigation";
-import { FileEntryIcon } from "./FileEntryIcon";
-import { fileRowClassName, fileRowIndentStyle } from "./fileRowStyles";
-import { PanelStateMessage } from "./PanelStateMessage";
-
-const EXPLORER_HIDDEN_DIRECTORY_NAMES = new Set([
-  ".cache",
-  ".next",
-  ".nuxt",
-  ".parcel-cache",
-  ".pnpm-store",
-  ".svelte-kit",
-  ".turbo",
-  ".vite",
-  ".yarn",
-  "build",
-  "coverage",
-  "dist",
-  "node_modules",
-  "out",
-  "target",
-]);
-
-// Mirrors the composer mention search: debounce keystrokes so they don't fan
-// out into fuzzy-search RPCs, and cap results to keep the sidebar light.
-const EXPLORER_SEARCH_QUERY_DEBOUNCE_MS = 120;
-const EXPLORER_SEARCH_RESULTS_LIMIT = 80;
-const EMPTY_WORKSPACE_SEARCH_FILE_MATCHES: ReadonlyArray<ProjectEntry> = [];
-
-// Default sidebar shell: a full-height column in the editor's wide row layout
-// that collapses to a stacked block on narrow viewports. Surfaces with a fixed
-// horizontal layout (e.g. the right dock) override this via `containerClassName`.
-const EXPLORER_SIDEBAR_CONTAINER_CLASS =
-  "flex min-h-[11rem] w-full shrink-0 flex-col border-b border-border/65 bg-[var(--color-background-surface)] lg:h-full lg:w-56 lg:border-b-0 lg:border-r";
-
-// Marks the drag payload so the chat composer can accept it as a reference.
-export function setFileReferenceDragData(dataTransfer: DataTransfer, path: string): void {
-  dataTransfer.effectAllowed = "copy";
-  dataTransfer.setData(CHAT_FILE_REFERENCE_DRAG_TYPE, formatChatFileReference({ path }));
-  dataTransfer.setData("text/plain", path);
-}
-
-function shouldShowExplorerEntry(entry: ProjectFileSystemEntry): boolean {
-  if (entry.kind !== "directory") {
-    return true;
-  }
-  if (entry.name.startsWith(".chitauri") || entry.name.startsWith(".synara")) {
-    return false;
-  }
-  return !EXPLORER_HIDDEN_DIRECTORY_NAMES.has(entry.name);
-}
-
-/**
- * Warms caches for an explorer entry before it is clicked: directory listings
- * for folders, file contents plus the matching syntax highlighter for files.
- */
-export function useExplorerEntryPrefetch(cwd: string | null) {
-  const queryClient = useQueryClient();
-  return useCallback(
-    (entry: Pick<ProjectFileSystemEntry, "path" | "kind">) => {
-      if (!cwd) {
-        return;
-      }
-      if (entry.kind === "directory") {
-        void queryClient.prefetchQuery(
-          projectListDirectoriesQueryOptions({
-            cwd,
-            relativePath: entry.path,
-            includeFiles: true,
-          }),
-        );
-        return;
-      }
-      void queryClient.prefetchQuery(
-        projectReadFileQueryOptions({ cwd, relativePath: entry.path }),
-      );
-      void getSyntaxHighlighterPromise(getSyntaxLanguageForPath(entry.path)).catch(() => undefined);
-    },
-    [cwd, queryClient],
-  );
-}
-
-// Forwards its ref and spreads incoming props so directory rows can act as the
-// Collapsible trigger (Base UI injects onClick/aria/data + ref onto this element).
-const ExplorerRow = forwardRef<
-  HTMLButtonElement,
-  {
-    entry: ProjectFileSystemEntry;
-    depth: number;
-    selected: boolean;
-    expanded: boolean;
-    onSelectFile: (path: string) => void;
-    onPrefetchEntry: (entry: ProjectFileSystemEntry) => void;
-    onEntryContextMenu: (entry: ProjectFileSystemEntry, position: { x: number; y: number }) => void;
-  } & ComponentPropsWithoutRef<"button">
->(function ExplorerRow(
-  {
-    entry,
-    depth,
-    selected,
-    expanded,
-    onSelectFile,
-    onPrefetchEntry,
-    onEntryContextMenu,
-    className,
-    onClick,
-    ...rest
-  },
-  ref,
-) {
-  const isDirectory = entry.kind === "directory";
-  // Directory rows are the Collapsible trigger: chain Base UI's injected onClick
-  // (which toggles open/close) and skip file selection. File rows open the preview.
-  const handleClick = useCallback(
-    (event: ReactMouseEvent<HTMLButtonElement>) => {
-      onClick?.(event);
-      if (isDirectory) {
-        return;
-      }
-      onSelectFile(entry.path);
-    },
-    [entry.path, isDirectory, onClick, onSelectFile],
-  );
-  const handlePrefetch = useCallback(() => {
-    onPrefetchEntry(entry);
-  }, [entry, onPrefetchEntry]);
-  const handleContextMenu = useCallback(
-    (event: ReactMouseEvent<HTMLButtonElement>) => {
-      event.preventDefault();
-      onEntryContextMenu(entry, { x: event.clientX, y: event.clientY });
-    },
-    [entry, onEntryContextMenu],
-  );
-  const handleDragStart = useCallback(
-    (event: ReactDragEvent<HTMLButtonElement>) => {
-      setFileReferenceDragData(event.dataTransfer, entry.path);
-    },
-    [entry.path],
-  );
-
-  return (
-    <button
-      {...rest}
-      {...EXPLORER_ROW_PROPS}
-      ref={ref}
-      type="button"
-      className={fileRowClassName(selected, cn("h-7 pr-2", className))}
-      style={fileRowIndentStyle(depth)}
-      title={entry.path}
-      draggable
-      onDragStart={handleDragStart}
-      onClick={handleClick}
-      onPointerEnter={handlePrefetch}
-      onFocus={handlePrefetch}
-      onContextMenu={handleContextMenu}
-    >
-      {isDirectory ? (
-        <DisclosureChevron open={expanded} className="opacity-75" />
-      ) : (
-        <FileEntryIcon
-          pathValue={entry.path}
-          kind={entry.kind}
-          className="size-3.5 shrink-0 opacity-75"
-        />
-      )}
-      <span className="min-w-0 truncate">{entry.name}</span>
-    </button>
-  );
-});
-
-const EXPLORER_SKELETON_ROW_WIDTHS = ["w-9/12", "w-6/12", "w-7/12"];
-
-function ExplorerLoadingRows(props: { depth: number }) {
-  return (
-    <div
-      className="space-y-1.5 py-1.5 pr-2"
-      style={fileRowIndentStyle(props.depth)}
-      role="status"
-      aria-label="Loading directory..."
-    >
-      {EXPLORER_SKELETON_ROW_WIDTHS.map((width) => (
-        <div key={width} className="flex h-5 items-center gap-1.5">
-          <Skeleton className="size-3.5 shrink-0 rounded-sm" />
-          <Skeleton className={cn("h-3 rounded-full", width)} />
-        </div>
-      ))}
-    </div>
-  );
-}
-
-function WorkspaceDirectory(props: {
-  cwd: string;
-  relativePath: string | null;
-  depth: number;
-  selectedFilePath: string | null;
-  expandedDirectories: ReadonlySet<string>;
-  onSelectFile: (path: string) => void;
-  onToggleDirectory: (path: string) => void;
-  onPrefetchEntry: (entry: ProjectFileSystemEntry) => void;
-  onEntryContextMenu: (entry: ProjectFileSystemEntry, position: { x: number; y: number }) => void;
-}) {
-  const query = useQuery(
-    projectListDirectoriesQueryOptions({
-      cwd: props.cwd,
-      relativePath: props.relativePath,
-      includeFiles: true,
-    }),
-  );
-
-  if (query.isLoading && !query.data) {
-    return <ExplorerLoadingRows depth={props.depth} />;
-  }
-
-  if (query.error) {
-    return (
-      <p className="px-3 py-2 text-[11px] text-destructive/80">
-        {query.error instanceof Error ? query.error.message : "Could not load directory."}
-      </p>
-    );
-  }
-
-  return (
-    <>
-      {(query.data?.entries ?? []).filter(shouldShowExplorerEntry).map((entry) => {
-        if (entry.kind !== "directory") {
-          return (
-            <ExplorerRow
-              key={entry.path}
-              entry={entry}
-              depth={props.depth}
-              selected={entry.path === props.selectedFilePath}
-              expanded={false}
-              onSelectFile={props.onSelectFile}
-              onPrefetchEntry={props.onPrefetchEntry}
-              onEntryContextMenu={props.onEntryContextMenu}
-            />
-          );
-        }
-        const expanded = props.expandedDirectories.has(entry.path);
-        return (
-          <Collapsible
-            key={entry.path}
-            open={expanded}
-            onOpenChange={() => props.onToggleDirectory(entry.path)}
-          >
-            <CollapsibleTrigger
-              render={
-                <ExplorerRow
-                  entry={entry}
-                  depth={props.depth}
-                  selected={false}
-                  expanded={expanded}
-                  onSelectFile={props.onSelectFile}
-                  onPrefetchEntry={props.onPrefetchEntry}
-                  onEntryContextMenu={props.onEntryContextMenu}
-                />
-              }
-            />
-            {/* Keep children mounted only while open (plus the closing transition Base UI
-                manages) so the height animation plays and lazy listings stay cached. */}
-            <CollapsiblePanel>
-              <WorkspaceDirectory
-                cwd={props.cwd}
-                relativePath={entry.path}
-                depth={props.depth + 1}
-                selectedFilePath={props.selectedFilePath}
-                expandedDirectories={props.expandedDirectories}
-                onSelectFile={props.onSelectFile}
-                onToggleDirectory={props.onToggleDirectory}
-                onPrefetchEntry={props.onPrefetchEntry}
-                onEntryContextMenu={props.onEntryContextMenu}
-              />
-            </CollapsiblePanel>
-          </Collapsible>
-        );
-      })}
-    </>
-  );
-}
-
-// Opening the file-reference context menu from a tree row (full entry) or a
-// search-result row (path only). Both wrap the same menu, so they live here
-// instead of being re-declared in every sidebar that renders these rows.
-function useTreeEntryContextMenu(
-  onReferenceInChat: ((reference: ChatFileReference) => void) | undefined,
-) {
-  return useCallback(
-    (entry: ProjectFileSystemEntry, position: { x: number; y: number }) => {
-      void showFileReferenceContextMenu({ path: entry.path, position, onReferenceInChat });
-    },
-    [onReferenceInChat],
-  );
-}
-
-function useResultEntryContextMenu(
-  onReferenceInChat: ((reference: ChatFileReference) => void) | undefined,
-) {
-  return useCallback(
-    (path: string, position: { x: number; y: number }) => {
-      void showFileReferenceContextMenu({ path, position, onReferenceInChat });
-    },
-    [onReferenceInChat],
-  );
-}
-
-// Scrollable file-tree body, shared by the standalone files sidebar and the
-// combined explorer sidebar (which shows it whenever the search box is empty).
-function WorkspaceFilesTreeBody(props: {
-  workspaceRoot: string | null;
-  selectedFilePath: string | null;
-  expandedDirectories: ReadonlySet<string>;
-  onSelectFile: (path: string) => void;
-  onToggleDirectory: (path: string) => void;
-  onPrefetchEntry: (entry: ProjectFileSystemEntry) => void;
-  onEntryContextMenu: (entry: ProjectFileSystemEntry, position: { x: number; y: number }) => void;
-}) {
-  return (
-    <div className="min-h-0 flex-1 overflow-auto px-1 py-1">
-      {props.workspaceRoot ? (
-        <WorkspaceDirectory
-          cwd={props.workspaceRoot}
-          relativePath={null}
-          depth={0}
-          selectedFilePath={props.selectedFilePath}
-          expandedDirectories={props.expandedDirectories}
-          onSelectFile={props.onSelectFile}
-          onToggleDirectory={props.onToggleDirectory}
-          onPrefetchEntry={props.onPrefetchEntry}
-          onEntryContextMenu={props.onEntryContextMenu}
-        />
-      ) : (
-        <PanelStateMessage density="compact" fill="flex">
-          <p>No workspace.</p>
-        </PanelStateMessage>
-      )}
-    </div>
-  );
-}
-
-export function WorkspaceFilesSidebar(props: {
-  workspaceRoot: string | null;
-  selectedFilePath: string | null;
-  expandedDirectories: ReadonlySet<string>;
-  containerClassName?: string;
-  onSelectFile: (path: string) => void;
-  onToggleDirectory: (path: string) => void;
-  onReferenceInChat: ((reference: ChatFileReference) => void) | undefined;
-}) {
-  const prefetchEntry = useExplorerEntryPrefetch(props.workspaceRoot);
-  const handleEntryContextMenu = useTreeEntryContextMenu(props.onReferenceInChat);
-  const handleListKeyDown = useExplorerListNavigation();
-  return (
-    <aside
-      className={props.containerClassName ?? EXPLORER_SIDEBAR_CONTAINER_CLASS}
-      onKeyDown={handleListKeyDown}
-    >
-      <WorkspaceFilesTreeBody
-        workspaceRoot={props.workspaceRoot}
-        selectedFilePath={props.selectedFilePath}
-        expandedDirectories={props.expandedDirectories}
-        onSelectFile={props.onSelectFile}
-        onToggleDirectory={props.onToggleDirectory}
-        onPrefetchEntry={prefetchEntry}
-        onEntryContextMenu={handleEntryContextMenu}
-      />
-    </aside>
-  );
-}
-
-function WorkspaceSearchResultRow(props: {
-  entry: ProjectEntry;
-  selected: boolean;
-  onSelectFile: (path: string) => void;
-  onPrefetchEntry: (entry: Pick<ProjectFileSystemEntry, "path" | "kind">) => void;
-  onEntryContextMenu: (path: string, position: { x: number; y: number }) => void;
-}) {
-  const { entry, onEntryContextMenu, onPrefetchEntry, onSelectFile } = props;
-  const { dir, name } = splitRepoRelativePath(entry.path);
-  const handlePrefetch = useCallback(() => {
-    onPrefetchEntry(entry);
-  }, [entry, onPrefetchEntry]);
-
-  return (
-    <button
-      {...EXPLORER_ROW_PROPS}
-      type="button"
-      className={fileRowClassName(props.selected, "h-8 px-2")}
-      title={entry.path}
-      draggable
-      onDragStart={(event) => {
-        setFileReferenceDragData(event.dataTransfer, entry.path);
-      }}
-      onClick={() => onSelectFile(entry.path)}
-      onPointerEnter={handlePrefetch}
-      onFocus={handlePrefetch}
-      onContextMenu={(event) => {
-        event.preventDefault();
-        onEntryContextMenu(entry.path, { x: event.clientX, y: event.clientY });
-      }}
-    >
-      <FileEntryIcon pathValue={entry.path} kind="file" className="size-3.5 shrink-0 opacity-75" />
-      <div className="flex min-w-0 flex-1 items-baseline gap-1.5 overflow-hidden">
-        <span className="shrink-0 truncate font-medium">{name}</span>
-        {dir ? (
-          <span className="min-w-0 truncate text-[11px] text-muted-foreground/55">{dir}</span>
-        ) : null}
-      </div>
-    </button>
-  );
-}
-
-interface WorkspaceFileSearchState {
-  // Trimmed live input — drives the "is the box empty?" decision (tree vs results).
-  inputQuery: string;
-  fileMatches: ReadonlyArray<ProjectEntry>;
-  searchResultsPending: boolean;
-  searchResultsCurrent: boolean;
-  isFetching: boolean;
-  error: Error | null;
-  truncated: boolean;
-}
-
-// Fuzzy file-name search shared by the standalone search sidebar and the
-// combined explorer sidebar: debounce keystrokes, then expose the matches plus
-// the freshness flags both surfaces need to gate selection on stale results.
-function useWorkspaceFileSearch(
-  workspaceRoot: string | null,
-  query: string,
-): WorkspaceFileSearchState {
-  const [debouncedQuery] = useDebouncedValue(query, {
-    wait: EXPLORER_SEARCH_QUERY_DEBOUNCE_MS,
-  });
-  const inputQuery = query.trim();
-  const trimmedQuery = debouncedQuery.trim();
-  const entriesQuery = useQuery(
-    projectSearchEntriesQueryOptions({
-      cwd: workspaceRoot,
-      query: trimmedQuery,
-      kind: "file",
-      limit: EXPLORER_SEARCH_RESULTS_LIMIT,
-    }),
-  );
-  // Results are tied to the debounced query. While the user is ahead of that
-  // query, keep old results non-selectable so Enter cannot open a stale match.
-  const searchResultsPending = inputQuery !== trimmedQuery || entriesQuery.isPlaceholderData;
-  const searchResultsCurrent = !searchResultsPending;
-  const fileMatches = searchResultsCurrent
-    ? (entriesQuery.data?.entries ?? EMPTY_WORKSPACE_SEARCH_FILE_MATCHES)
-    : EMPTY_WORKSPACE_SEARCH_FILE_MATCHES;
-  return {
-    inputQuery,
-    fileMatches,
-    searchResultsPending,
-    searchResultsCurrent,
-    isFetching: entriesQuery.isFetching,
-    error: searchResultsCurrent ? entriesQuery.error : null,
-    truncated: entriesQuery.data?.truncated ?? false,
-  };
-}
-
-// Search-box header: a fixed, full-width input that selects the top match on
-// Enter and clears (returning to the tree, in the combined sidebar) on Escape.
-function WorkspaceSearchInputHeader(props: {
-  query: string;
-  search: WorkspaceFileSearchState;
-  autoFocus?: boolean;
-  onQueryChange: (query: string) => void;
-  onSelectFile: (path: string) => void;
-}) {
-  const { onQueryChange, onSelectFile, query, search } = props;
-  const handleInputKeyDown = useCallback(
-    (event: ReactKeyboardEvent<HTMLInputElement>) => {
-      if (event.key === "Enter") {
-        event.preventDefault();
-        if (!search.searchResultsCurrent) {
-          return;
-        }
-        const topMatch = search.fileMatches[0];
-        if (topMatch) {
-          onSelectFile(topMatch.path);
-        }
-        return;
-      }
-      if (event.key === "Escape" && query.length > 0) {
-        event.stopPropagation();
-        onQueryChange("");
-      }
-    },
-    [onQueryChange, onSelectFile, query.length, search.fileMatches, search.searchResultsCurrent],
-  );
-
-  return (
-    <div className="shrink-0 border-b border-border/65 p-2">
-      <SearchInput
-        value={query}
-        autoFocus={props.autoFocus}
-        spellCheck={false}
-        autoCorrect="off"
-        autoCapitalize="off"
-        placeholder="Search files..."
-        aria-label="Search files"
-        onChange={(event) => onQueryChange(event.target.value)}
-        onKeyDown={handleInputKeyDown}
-      />
-    </div>
-  );
-}
-
-// Scrollable search-results body (matches list + truncation hint). Callers only
-// mount it once the query is non-empty, so the empty-query state lives outside.
-function WorkspaceSearchResultsBody(props: {
-  workspaceRoot: string | null;
-  search: WorkspaceFileSearchState;
-  selectedFilePath: string | null;
-  onSelectFile: (path: string) => void;
-  onPrefetchEntry: (entry: Pick<ProjectFileSystemEntry, "path" | "kind">) => void;
-  onEntryContextMenu: (path: string, position: { x: number; y: number }) => void;
-}) {
-  const { fileMatches } = props.search;
-  return (
-    <>
-      <div
-        className={cn(
-          "min-h-0 flex-1 overflow-auto px-1 py-1",
-          fileMatches.length === 0 && "flex flex-col",
-        )}
-      >
-        {!props.workspaceRoot ? (
-          <PanelStateMessage density="compact" fill="flex">
-            <p>No workspace.</p>
-          </PanelStateMessage>
-        ) : props.search.searchResultsCurrent && props.search.error ? (
-          <PanelStateMessage density="compact" fill="flex">
-            <p className="text-destructive/85">
-              {props.search.error instanceof Error
-                ? props.search.error.message
-                : "Could not search files."}
-            </p>
-          </PanelStateMessage>
-        ) : fileMatches.length === 0 ? (
-          props.search.searchResultsPending || props.search.isFetching ? (
-            <ExplorerLoadingRows depth={0} />
-          ) : (
-            <PanelStateMessage density="compact" fill="flex">
-              <p>No matching files.</p>
-            </PanelStateMessage>
-          )
-        ) : (
-          fileMatches.map((entry) => (
-            <WorkspaceSearchResultRow
-              key={entry.path}
-              entry={entry}
-              selected={entry.path === props.selectedFilePath}
-              onSelectFile={props.onSelectFile}
-              onPrefetchEntry={props.onPrefetchEntry}
-              onEntryContextMenu={props.onEntryContextMenu}
-            />
-          ))
-        )}
-      </div>
-      {fileMatches.length > 0 && props.search.truncated ? (
-        <p className="shrink-0 border-t border-border/45 px-3 py-1.5 text-[11px] text-muted-foreground/70">
-          Showing the top matches. Refine the search to narrow them down.
-        </p>
-      ) : null}
-    </>
-  );
-}
-
-export function WorkspaceSearchSidebar(props: {
-  workspaceRoot: string | null;
-  query: string;
-  onQueryChange: (query: string) => void;
-  selectedFilePath: string | null;
-  containerClassName?: string;
-  onSelectFile: (path: string) => void;
-  onReferenceInChat: ((reference: ChatFileReference) => void) | undefined;
-}) {
-  const prefetchEntry = useExplorerEntryPrefetch(props.workspaceRoot);
-  const handleEntryContextMenu = useResultEntryContextMenu(props.onReferenceInChat);
-  const handleListKeyDown = useExplorerListNavigation();
-  const search = useWorkspaceFileSearch(props.workspaceRoot, props.query);
-
-  return (
-    <aside
-      className={props.containerClassName ?? EXPLORER_SIDEBAR_CONTAINER_CLASS}
-      onKeyDown={handleListKeyDown}
-    >
-      <WorkspaceSearchInputHeader
-        query={props.query}
-        search={search}
-        autoFocus
-        onQueryChange={props.onQueryChange}
-        onSelectFile={props.onSelectFile}
-      />
-      {search.inputQuery.length === 0 ? (
-        <div className="flex min-h-0 flex-1 flex-col px-1 py-1">
-          <PanelStateMessage density="compact" fill="flex">
-            <p>Search files by name or path.</p>
-          </PanelStateMessage>
-        </div>
-      ) : (
-        <WorkspaceSearchResultsBody
-          workspaceRoot={props.workspaceRoot}
-          search={search}
-          selectedFilePath={props.selectedFilePath}
-          onSelectFile={props.onSelectFile}
-          onPrefetchEntry={prefetchEntry}
-          onEntryContextMenu={handleEntryContextMenu}
-        />
-      )}
-    </aside>
-  );
-}
-
-// Combined explorer: one panel with a fixed search box on top that shows the
-// full file tree while empty and switches to fuzzy file-name results as soon as
-// the user types — no separate Files/Search activity rail needed.
-export function WorkspaceExplorerSidebar(props: {
-  workspaceRoot: string | null;
-  selectedFilePath: string | null;
-  expandedDirectories: ReadonlySet<string>;
-  query: string;
-  onQueryChange: (query: string) => void;
-  containerClassName?: string;
-  onSelectFile: (path: string) => void;
-  onToggleDirectory: (path: string) => void;
-  onReferenceInChat: ((reference: ChatFileReference) => void) | undefined;
-}) {
-  const prefetchEntry = useExplorerEntryPrefetch(props.workspaceRoot);
-  const handleTreeEntryContextMenu = useTreeEntryContextMenu(props.onReferenceInChat);
-  const handleResultEntryContextMenu = useResultEntryContextMenu(props.onReferenceInChat);
-  const handleListKeyDown = useExplorerListNavigation();
-  const search = useWorkspaceFileSearch(props.workspaceRoot, props.query);
-
-  return (
-    <aside
-      className={props.containerClassName ?? EXPLORER_SIDEBAR_CONTAINER_CLASS}
-      onKeyDown={handleListKeyDown}
-    >
-      <WorkspaceSearchInputHeader
-        query={props.query}
-        search={search}
-        onQueryChange={props.onQueryChange}
-        onSelectFile={props.onSelectFile}
-      />
-      {search.inputQuery.length === 0 ? (
-        <WorkspaceFilesTreeBody
-          workspaceRoot={props.workspaceRoot}
-          selectedFilePath={props.selectedFilePath}
-          expandedDirectories={props.expandedDirectories}
-          onSelectFile={props.onSelectFile}
-          onToggleDirectory={props.onToggleDirectory}
-          onPrefetchEntry={prefetchEntry}
-          onEntryContextMenu={handleTreeEntryContextMenu}
-        />
-      ) : (
-        <WorkspaceSearchResultsBody
-          workspaceRoot={props.workspaceRoot}
-          search={search}
-          selectedFilePath={props.selectedFilePath}
-          onSelectFile={props.onSelectFile}
-          onPrefetchEntry={prefetchEntry}
-          onEntryContextMenu={handleResultEntryContextMenu}
-        />
-      )}
-    </aside>
-  );
-}
-
-export function ExplorerActivityBarButton(props: {
-  label: string;
-  active: boolean;
-  onClick: () => void;
-  children: ReactNode;
-}) {
-  const button = (
-    <button
-      type="button"
-      className={cn(
-        "relative flex h-12 w-full cursor-pointer items-center justify-center text-muted-foreground/72 transition-colors hover:bg-[var(--color-background-button-secondary-hover)] hover:text-foreground",
-        props.active && "bg-[var(--color-background-button-secondary)] text-foreground",
-      )}
-      aria-label={props.label}
-      aria-pressed={props.active}
-      title={props.label}
-      onClick={props.onClick}
-    >
-      <span
-        className={cn(
-          "absolute left-0 top-1/2 h-6 w-0.5 -translate-y-1/2 rounded-r-full bg-transparent",
-          props.active && "bg-foreground/85",
-        )}
-        aria-hidden="true"
-      />
-      {props.children}
-    </button>
-  );
-
-  return (
-    <Tooltip>
-      <TooltipTrigger render={button} />
-      <TooltipPopup side="right">{props.label}</TooltipPopup>
-    </Tooltip>
-  );
-}
diff --git a/apps/web/src/components/composer-nodes/index.tsx b/apps/web/src/components/composer-nodes/index.tsx
index c1fa09d3c..fa404fc58 100644
--- a/apps/web/src/components/composer-nodes/index.tsx
+++ b/apps/web/src/components/composer-nodes/index.tsx
@@ -6,7 +6,6 @@
  * - ComposerSkillNode: Skill mentions ($skill or /skill)
  * - ComposerSlashCommandNode: app-level slash commands (/automation)
  * - ComposerAgentMentionNode: Agent mentions (@alias(task))
- * - ComposerTerminalContextNode: Terminal context blocks
  */
 
 import {
@@ -22,10 +21,6 @@ import {
 import type { ReactElement } from "react";
 import { renderToStaticMarkup } from "react-dom/server";
 
-import {
-  INLINE_TERMINAL_CONTEXT_PLACEHOLDER,
-  type TerminalContextDraft,
-} from "~/lib/terminalContext";
 import { formatComposerMentionToken } from "~/lib/composerMentions";
 import { basenameOfPath } from "~/file-icons";
 import { createCentralIconElement } from "~/lib/central-icons";
@@ -44,7 +39,6 @@ import {
 import { AGENT_ROBOT_ICON_NAME, ClockIcon } from "~/lib/icons";
 import type { ComposerSlashCommand } from "~/composerSlashCommands";
 import { InlineLinkChip } from "../InlineLinkChip";
-import { ComposerPendingTerminalContextChip } from "../chat/ComposerPendingTerminalContexts";
 import { createMentionChipIconElement, type MentionChipKind } from "../chat/MentionChipIcon";
 
 // ── Serialized Types ──────────────────────────────────────────────────
@@ -96,15 +90,6 @@ export type SerializedComposerLinkNode = Spread<
   SerializedLexicalNode
 >;
 
-export type SerializedComposerTerminalContextNode = Spread<
-  {
-    context: TerminalContextDraft;
-    type: "composer-terminal-context";
-    version: 1;
-  },
-  SerializedLexicalNode
->;
-
 // ── Helper Functions ──────────────────────────────────────────────────
 
 // Shared boilerplate for the imperative Lexical chip hosts: clear prior content
@@ -574,79 +559,12 @@ export function $createComposerLinkNode(url: string): ComposerLinkNode {
   return $applyNodeReplacement(new ComposerLinkNode(url));
 }
 
-// ── ComposerTerminalContextNode ───────────────────────────────────────
-
-function ComposerTerminalContextDecorator(props: { context: TerminalContextDraft }) {
-  return <ComposerPendingTerminalContextChip context={props.context} />;
-}
-
-export class ComposerTerminalContextNode extends DecoratorNode<ReactElement> {
-  __context: TerminalContextDraft;
-
-  static override getType(): string {
-    return "composer-terminal-context";
-  }
-
-  static override clone(node: ComposerTerminalContextNode): ComposerTerminalContextNode {
-    return new ComposerTerminalContextNode(node.__context, node.__key);
-  }
-
-  static override importJSON(
-    serializedNode: SerializedComposerTerminalContextNode,
-  ): ComposerTerminalContextNode {
-    return $createComposerTerminalContextNode(serializedNode.context);
-  }
-
-  constructor(context: TerminalContextDraft, key?: NodeKey) {
-    super(key);
-    this.__context = context;
-  }
-
-  override exportJSON(): SerializedComposerTerminalContextNode {
-    return {
-      ...super.exportJSON(),
-      context: this.__context,
-      type: "composer-terminal-context",
-      version: 1,
-    };
-  }
-
-  override createDOM(): HTMLElement {
-    const dom = document.createElement("span");
-    dom.className = COMPOSER_INLINE_DECORATOR_HOST_CLASS_NAME;
-    return dom;
-  }
-
-  override updateDOM(): false {
-    return false;
-  }
-
-  override getTextContent(): string {
-    return INLINE_TERMINAL_CONTEXT_PLACEHOLDER;
-  }
-
-  override isInline(): true {
-    return true;
-  }
-
-  override decorate(): ReactElement {
-    return <ComposerTerminalContextDecorator context={this.__context} />;
-  }
-}
-
-export function $createComposerTerminalContextNode(
-  context: TerminalContextDraft,
-): ComposerTerminalContextNode {
-  return $applyNodeReplacement(new ComposerTerminalContextNode(context));
-}
-
 // ── Type Guards & Utilities ───────────────────────────────────────────
 
 export type ComposerInlineTokenNode =
   | ComposerMentionNode
   | ComposerSkillNode
   | ComposerSlashCommandNode
-  | ComposerTerminalContextNode
   | ComposerAgentMentionNode
   | ComposerLinkNode;
 
@@ -657,7 +575,6 @@ export function isComposerInlineTokenNode(
     candidate instanceof ComposerMentionNode ||
     candidate instanceof ComposerSkillNode ||
     candidate instanceof ComposerSlashCommandNode ||
-    candidate instanceof ComposerTerminalContextNode ||
     candidate instanceof ComposerAgentMentionNode ||
     candidate instanceof ComposerLinkNode
   );
@@ -668,7 +585,6 @@ export const COMPOSER_NODE_CLASSES = [
   ComposerMentionNode,
   ComposerSkillNode,
   ComposerSlashCommandNode,
-  ComposerTerminalContextNode,
   ComposerAgentMentionNode,
   ComposerLinkNode,
 ] as const;
diff --git a/apps/web/src/components/diffPanelSelectors.ts b/apps/web/src/components/diffPanelSelectors.ts
deleted file mode 100644
index 4ed1e6c10..000000000
--- a/apps/web/src/components/diffPanelSelectors.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-// FILE: diffPanelSelectors.ts
-// Purpose: Lightweight Zustand selectors for the diff panel — avoid subscribing to the
-//          full thread (messages/activities) when only catalog or live-refresh signals change.
-// Layer: Diff panel data
-
-import type { MessageId, ThreadId, TurnId } from "@t3tools/contracts";
-
-import type { AppState } from "../store";
-import { collectByIds } from "../threadDerivation";
-import type { ChatMessage, Thread, ThreadShell, TurnDiffSummary } from "../types";
-import { resolveDiffPanelRepoLiveRefresh } from "./DiffPanel.logic";
-
-const EMPTY_TURN_DIFF_SUMMARIES: TurnDiffSummary[] = [];
-const EMPTY_TURN_DIFF_IDS: TurnId[] = [];
-const EMPTY_TURN_DIFF_MAP: Record<TurnId, TurnDiffSummary> = {};
-const EMPTY_MESSAGES: ChatMessage[] = [];
-const EMPTY_ACTIVITIES: Thread["activities"] = [];
-const EMPTY_MESSAGE_IDS: MessageId[] = [];
-const EMPTY_ACTIVITY_IDS: string[] = [];
-const EMPTY_MESSAGE_MAP: Record<MessageId, ChatMessage> = {};
-const EMPTY_ACTIVITY_MAP: Record<string, Thread["activities"][number]> = {};
-
-export type DiffPanelThreadCatalog = {
-  id: ThreadId;
-  projectId: Thread["projectId"];
-  envMode: Thread["envMode"];
-  worktreePath: string | null;
-  branch: string | null;
-  turnDiffSummaries: TurnDiffSummary[];
-};
-
-export function toDiffPanelThreadCatalog(thread: Thread): DiffPanelThreadCatalog {
-  return {
-    id: thread.id,
-    projectId: thread.projectId,
-    envMode: thread.envMode,
-    worktreePath: thread.worktreePath,
-    branch: thread.branch,
-    turnDiffSummaries: thread.turnDiffSummaries,
-  };
-}
-
-export function createDiffPanelThreadCatalogSelector(
-  threadId: ThreadId | null | undefined,
-): (state: AppState) => DiffPanelThreadCatalog | undefined {
-  let previousShell: ThreadShell | undefined;
-  let previousTurnDiffSummaries: TurnDiffSummary[] | undefined;
-  let previousCatalog: DiffPanelThreadCatalog | undefined;
-
-  return (state) => {
-    if (!threadId) {
-      return undefined;
-    }
-
-    const shell = state.threadShellById?.[threadId];
-    if (!shell) {
-      return undefined;
-    }
-
-    const turnDiffIds = state.turnDiffIdsByThreadId?.[threadId];
-    const turnDiffSummaryById = state.turnDiffSummaryByThreadId?.[threadId];
-    const turnDiffSummaries = collectByIds(
-      turnDiffIds ?? EMPTY_TURN_DIFF_IDS,
-      turnDiffSummaryById ?? EMPTY_TURN_DIFF_MAP,
-      EMPTY_TURN_DIFF_SUMMARIES,
-    );
-
-    if (
-      shell === previousShell &&
-      turnDiffSummaries === previousTurnDiffSummaries &&
-      previousCatalog
-    ) {
-      return previousCatalog;
-    }
-
-    previousShell = shell;
-    previousTurnDiffSummaries = turnDiffSummaries;
-    previousCatalog = {
-      id: shell.id,
-      projectId: shell.projectId,
-      envMode: shell.envMode,
-      worktreePath: shell.worktreePath,
-      branch: shell.branch,
-      turnDiffSummaries,
-    };
-    return previousCatalog;
-  };
-}
-
-function resolveLatestTurnAssistantStreaming(input: {
-  latestTurnId: TurnId | null;
-  latestTurnCompletedAt: string | null | undefined;
-  messageIds: readonly MessageId[] | undefined;
-  messageById: Record<MessageId, ChatMessage> | undefined;
-}): boolean {
-  if (!input.latestTurnId || input.latestTurnCompletedAt != null) {
-    return false;
-  }
-
-  const messageIds = input.messageIds ?? EMPTY_MESSAGE_IDS;
-  const messageById = input.messageById ?? EMPTY_MESSAGE_MAP;
-  for (let index = messageIds.length - 1; index >= 0; index -= 1) {
-    const message = messageById[messageIds[index]!];
-    if (!message || message.turnId !== input.latestTurnId) {
-      continue;
-    }
-    if (message.role === "assistant") {
-      return message.streaming === true;
-    }
-  }
-  return false;
-}
-
-function buildDiffPanelRepoLiveRefreshKey(input: {
-  latestTurn: Thread["latestTurn"];
-  session: Thread["session"];
-  activityIds: readonly string[] | undefined;
-  latestTurnAssistantStreaming: boolean;
-}): string {
-  return [
-    input.latestTurn?.turnId ?? "",
-    input.latestTurn?.startedAt ?? "",
-    input.latestTurn?.completedAt ?? "",
-    input.latestTurn?.state ?? "",
-    input.session?.orchestrationStatus ?? "",
-    input.session?.activeTurnId ?? "",
-    input.activityIds?.length ?? 0,
-    input.activityIds?.at(-1) ?? "",
-    input.latestTurnAssistantStreaming ? "1" : "0",
-  ].join("|");
-}
-
-/** Boolean selector: only re-renders when live repo-diff polling should start or stop. */
-export function createDiffPanelRepoLiveRefreshSelector(
-  threadId: ThreadId | null | undefined,
-): (state: AppState) => boolean {
-  let previousKey: string | undefined;
-  let previousShouldPoll = false;
-
-  return (state) => {
-    if (!threadId) {
-      return false;
-    }
-
-    const turnState = state.threadTurnStateById?.[threadId];
-    const latestTurn = turnState?.latestTurn ?? null;
-    const session = state.threadSessionById?.[threadId] ?? null;
-    const messageIds = state.messageIdsByThreadId?.[threadId];
-    const messageById = state.messageByThreadId?.[threadId];
-    const activityIds = state.activityIdsByThreadId?.[threadId];
-    const latestTurnAssistantStreaming = resolveLatestTurnAssistantStreaming({
-      latestTurnId: latestTurn?.turnId ?? null,
-      latestTurnCompletedAt: latestTurn?.completedAt,
-      messageIds,
-      messageById,
-    });
-    const key = buildDiffPanelRepoLiveRefreshKey({
-      latestTurn,
-      session,
-      activityIds,
-      latestTurnAssistantStreaming,
-    });
-
-    if (key === previousKey) {
-      return previousShouldPoll;
-    }
-
-    previousKey = key;
-    const messages = collectByIds(
-      messageIds ?? EMPTY_MESSAGE_IDS,
-      messageById ?? EMPTY_MESSAGE_MAP,
-      EMPTY_MESSAGES,
-    );
-    const activities = collectByIds(
-      activityIds ?? EMPTY_ACTIVITY_IDS,
-      state.activityByThreadId?.[threadId] ?? EMPTY_ACTIVITY_MAP,
-      EMPTY_ACTIVITIES,
-    );
-    previousShouldPoll = resolveDiffPanelRepoLiveRefresh({
-      latestTurn,
-      session,
-      messages,
-      activities,
-    });
-    return previousShouldPoll;
-  };
-}
diff --git a/apps/web/src/components/research/ResearchDocumentView.tsx b/apps/web/src/components/research/ResearchDocumentView.tsx
index 17a4305b6..e5bec9088 100644
--- a/apps/web/src/components/research/ResearchDocumentView.tsx
+++ b/apps/web/src/components/research/ResearchDocumentView.tsx
@@ -87,7 +87,7 @@ function ReferenceRail({ references }: { references: readonly ResearchReference[
                 key={reference.id}
                 type="button"
                 onClick={() => void openReference(reference)}
-                className="group flex min-h-11 w-full items-start gap-2.5 rounded-[8px] px-2.5 py-2 text-left transition-[background-color,scale] duration-press ease-out hover:bg-hover active:scale-[0.96] motion-reduce:transition-none"
+                className="group flex min-h-11 w-full items-start gap-2.5 rounded-lg px-2.5 py-2 text-left transition-[background-color,scale] duration-press ease-out hover:bg-hover active:scale-[0.96] motion-reduce:transition-none"
               >
                 <span className="mt-0.5 flex size-7 shrink-0 items-center justify-center rounded-lg bg-[var(--color-background-elevated-secondary)] text-muted-foreground">
                   <Icon className="size-3.5" />
diff --git a/apps/web/src/components/settings/SkillsSettingsPanel.tsx b/apps/web/src/components/settings/SkillsSettingsPanel.tsx
deleted file mode 100644
index ae0e391de..000000000
--- a/apps/web/src/components/settings/SkillsSettingsPanel.tsx
+++ /dev/null
@@ -1,204 +0,0 @@
-// FILE: SkillsSettingsPanel.tsx
-// Purpose: Settings → Skills panel. Lists every skill from the unified cross-provider
-// catalog (~/.teacode/skills plus each provider's skills folder), shows which provider
-// a skill comes from, and lets the user enable/disable each one. Disabled skills are
-// hidden from the composer skill picker on every provider.
-
-import type { ProviderKind, ServerSettings } from "@t3tools/contracts";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
-import { useMemo } from "react";
-
-import { ProviderIcon } from "~/components/ProviderIcon";
-import { SettingsRow, SettingsSection } from "~/components/settings/SettingsPanelPrimitives";
-import { Switch } from "~/components/ui/switch";
-import { SkillCubeIcon } from "~/lib/icons";
-import { ensureNativeApi } from "~/nativeApi";
-import {
-  providerDiscoveryQueryKeys,
-  skillsCatalogQueryOptions,
-} from "~/lib/providerDiscoveryReactQuery";
-import { serverQueryKeys, serverSettingsQueryOptions } from "~/lib/serverReactQuery";
-import {
-  buildSettingsSkillGroups,
-  buildSettingsSkillSections,
-  providerDisplayName,
-  settingsSkillNameKey,
-} from "./skillsSettingsModel";
-
-function SkillProviderStack({ providers }: { providers: ReadonlyArray<ProviderKind> }) {
-  if (providers.length === 0) {
-    return null;
-  }
-
-  const label = providers.map(providerDisplayName).join(", ");
-  const stackLabel = `Provider ${providers.length === 1 ? "copy" : "copies"}: ${label}`;
-  return (
-    <span
-      className="inline-flex shrink-0 items-center -space-x-1"
-      aria-label={stackLabel}
-      title={stackLabel}
-    >
-      {providers.map((provider) => (
-        <span
-          key={provider}
-          className="inline-flex size-4 items-center justify-center rounded-full border border-background bg-background"
-        >
-          <ProviderIcon provider={provider} className="size-3" />
-        </span>
-      ))}
-    </span>
-  );
-}
-
-export function SkillsSettingsPanel() {
-  const queryClient = useQueryClient();
-  const catalogQuery = useQuery(skillsCatalogQueryOptions());
-  const serverSettingsQuery = useQuery(serverSettingsQueryOptions());
-
-  const disabledSkillNames = useMemo(
-    () =>
-      new Set(
-        (serverSettingsQuery.data?.skills.disabled ?? []).map((name) => settingsSkillNameKey(name)),
-      ),
-    [serverSettingsQuery.data?.skills.disabled],
-  );
-
-  const skillGroups = useMemo(
-    () => buildSettingsSkillGroups(catalogQuery.data?.skills ?? []),
-    [catalogQuery.data?.skills],
-  );
-  const skillSections = useMemo(() => {
-    return buildSettingsSkillSections(catalogQuery.data?.skills ?? []);
-  }, [catalogQuery.data?.skills]);
-
-  const setSkillEnabled = (skillName: string, enabled: boolean) => {
-    // Read through the query cache (not the render closure) so rapid toggles
-    // build on each other instead of clobbering the previous patch.
-    const latestSettings = queryClient.getQueryData<ServerSettings>(serverQueryKeys.settings());
-    const currentDisabled = latestSettings?.skills.disabled ?? [...disabledSkillNames];
-    const key = settingsSkillNameKey(skillName);
-    const next = new Set(currentDisabled.map((name) => settingsSkillNameKey(name)));
-    if (enabled) {
-      next.delete(key);
-    } else {
-      next.add(key);
-    }
-    const disabled = [...next].sort();
-    if (latestSettings) {
-      // Optimistic flip; a failed patch invalidates back to the server state.
-      queryClient.setQueryData(serverQueryKeys.settings(), {
-        ...latestSettings,
-        skills: { disabled },
-      });
-    }
-    void ensureNativeApi()
-      .server.updateSettings({ skills: { disabled } })
-      .then((nextSettings) => {
-        queryClient.setQueryData(serverQueryKeys.settings(), nextSettings);
-        // Composer skill pickers are served filtered by these toggles.
-        void queryClient.invalidateQueries({ queryKey: providerDiscoveryQueryKeys.all });
-      })
-      .catch(() => {
-        void queryClient.invalidateQueries({ queryKey: serverQueryKeys.settings() });
-      });
-  };
-
-  const totalSkills = skillGroups.length;
-  const enabledSkills = skillGroups.filter((group) => !disabledSkillNames.has(group.key)).length;
-  const chitauriSkillsDir = catalogQuery.data?.chitauriSkillsDir;
-
-  return (
-    <div className="space-y-8">
-      <SettingsSection title="Portable skills">
-        <SettingsRow
-          title="TeaCode skills folder"
-          description="Skills placed here are available on every provider. When a provider already ships its own copy of a skill, that copy is used; otherwise TeaCode's copy is the fallback."
-          status={
-            chitauriSkillsDir ? (
-              <code className="break-all text-[11px] text-muted-foreground">
-                {chitauriSkillsDir}
-              </code>
-            ) : null
-          }
-          control={
-            <span className="text-xs font-medium text-muted-foreground">
-              {catalogQuery.isLoading
-                ? "Scanning…"
-                : `${enabledSkills} of ${totalSkills} skill${totalSkills === 1 ? "" : "s"} enabled`}
-            </span>
-          }
-        />
-      </SettingsSection>
-
-      {catalogQuery.isError ? (
-        <SettingsSection title="Skills">
-          <SettingsRow
-            title="Skill discovery failed"
-            description="TeaCode could not scan the skill folders. Retry after checking that the server is running."
-          />
-        </SettingsSection>
-      ) : null}
-
-      {!catalogQuery.isLoading && !catalogQuery.isError && totalSkills === 0 ? (
-        <SettingsSection title="Skills">
-          <SettingsRow
-            title="No skills found"
-            description="Add a skill folder containing a SKILL.md to the TeaCode skills folder above, or install skills for any supported provider."
-          />
-        </SettingsSection>
-      ) : null}
-
-      {skillSections.map((section) => {
-        return (
-          <SettingsSection key={section.key} title={section.title}>
-            {section.groups.map((group) => {
-              const enabled = !disabledSkillNames.has(group.key);
-              return (
-                <SettingsRow
-                  key={group.key}
-                  title={
-                    <span className="inline-flex min-w-0 items-center gap-1.5">
-                      <SkillCubeIcon
-                        aria-hidden="true"
-                        className="size-3.5 shrink-0 text-muted-foreground"
-                      />
-                      <span className="truncate">{group.displayName}</span>
-                    </span>
-                  }
-                  description={group.description}
-                  status={
-                    <span className="flex min-w-0 flex-col gap-1">
-                      <span className="flex min-w-0 items-center gap-1.5">
-                        <SkillProviderStack providers={group.providers} />
-                        <span className="truncate text-[11px] text-muted-foreground">
-                          {group.sources.map((source) => source.originInfo.label).join(" · ")}
-                        </span>
-                      </span>
-                      {group.sources.map((source) => (
-                        <code
-                          key={source.skill.path}
-                          className="truncate text-[11px] text-muted-foreground"
-                        >
-                          {source.skill.path}
-                        </code>
-                      ))}
-                    </span>
-                  }
-                  control={
-                    <Switch
-                      checked={enabled}
-                      onCheckedChange={(checked) =>
-                        setSkillEnabled(group.primarySkill.name, Boolean(checked))
-                      }
-                      aria-label={`Enable the ${group.displayName} skill`}
-                    />
-                  }
-                />
-              );
-            })}
-          </SettingsSection>
-        );
-      })}
-    </div>
-  );
-}
diff --git a/apps/web/src/components/settings/skillsSettingsModel.test.ts b/apps/web/src/components/settings/skillsSettingsModel.test.ts
deleted file mode 100644
index 8466f04f3..000000000
--- a/apps/web/src/components/settings/skillsSettingsModel.test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// FILE: skillsSettingsModel.test.ts
-// Purpose: Locks down Settings -> Skills grouping for duplicate provider skill copies.
-// Layer: Web settings logic tests
-
-import type { ProviderSkillDescriptor } from "@t3tools/contracts";
-import { describe, expect, it } from "vitest";
-
-import { buildSettingsSkillGroups, buildSettingsSkillSections } from "./skillsSettingsModel";
-
-function skill(partial: Partial<ProviderSkillDescriptor>): ProviderSkillDescriptor {
-  return {
-    name: "example",
-    enabled: true,
-    path: "/tmp/example/SKILL.md",
-    ...partial,
-  };
-}
-
-describe("buildSettingsSkillGroups", () => {
-  it("renders duplicate provider copies as one shared skill group", () => {
-    const groups = buildSettingsSkillGroups([
-      skill({
-        name: "check-code",
-        description: "Codex copy",
-        path: "/Users/test/.codex/skills/check-code/SKILL.md",
-        scope: "codex",
-      }),
-      skill({
-        name: "check-code",
-        description: "Claude copy",
-        path: "/Users/test/.claude/skills/check-code/SKILL.md",
-        scope: "claude",
-      }),
-      skill({
-        name: "cursor-only",
-        path: "/Users/test/.cursor/skills/cursor-only/SKILL.md",
-        scope: "cursor",
-      }),
-    ]);
-
-    const shared = groups.find((group) => group.key === "check-code");
-    expect(shared?.section).toBe("shared");
-    expect(shared?.providers).toEqual(["codex", "claudeAgent"]);
-    expect(shared?.sources.map((source) => source.origin)).toEqual(["codex", "claude"]);
-    expect(shared?.sources.map((source) => source.skill.path)).toEqual([
-      "/Users/test/.codex/skills/check-code/SKILL.md",
-      "/Users/test/.claude/skills/check-code/SKILL.md",
-    ]);
-
-    const cursorOnly = groups.find((group) => group.key === "cursor-only");
-    expect(cursorOnly?.section).toBe("cursor");
-    expect(cursorOnly?.providers).toEqual(["cursor"]);
-  });
-
-  it("does not show provider icons for shared alias-only skills", () => {
-    const groups = buildSettingsSkillGroups([
-      skill({
-        name: "portable-review",
-        description: "Shared standard copy",
-        path: "/Users/test/.agents/skills/portable-review/SKILL.md",
-        scope: "agents",
-      }),
-    ]);
-
-    expect(groups[0]?.providers).toEqual([]);
-    expect(groups[0]?.section).toBe("agents");
-  });
-});
-
-describe("buildSettingsSkillSections", () => {
-  it("places shared skill groups before provider-only sections", () => {
-    const sections = buildSettingsSkillSections([
-      skill({
-        name: "logic-consolidator",
-        path: "/Users/test/.codex/skills/logic-consolidator/SKILL.md",
-        scope: "codex",
-      }),
-      skill({
-        name: "logic-consolidator",
-        path: "/Users/test/.claude/skills/logic-consolidator/SKILL.md",
-        scope: "claude",
-      }),
-      skill({
-        name: "cursor-only",
-        path: "/Users/test/.cursor/skills/cursor-only/SKILL.md",
-        scope: "cursor",
-      }),
-    ]);
-
-    expect(sections.map((section) => section.title)).toEqual(["Shared skills", "From Cursor"]);
-    expect(sections[0]?.groups.map((group) => group.key)).toEqual(["logic-consolidator"]);
-  });
-});
diff --git a/apps/web/src/components/settings/skillsSettingsModel.ts b/apps/web/src/components/settings/skillsSettingsModel.ts
deleted file mode 100644
index e1e4ddc2a..000000000
--- a/apps/web/src/components/settings/skillsSettingsModel.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-// FILE: skillsSettingsModel.ts
-// Purpose: Groups duplicate skill copies for Settings -> Skills so shared names render once.
-// Layer: Settings UI logic
-// Exports: origin metadata, canonical skill grouping, and section ordering helpers.
-
-import type { ProviderKind, ProviderSkillDescriptor } from "@t3tools/contracts";
-import { PROVIDER_DISPLAY_NAMES } from "@t3tools/contracts";
-
-export interface SkillOriginInfo {
-  readonly label: string;
-  readonly provider: ProviderKind | null;
-}
-
-export interface SettingsSkillSource {
-  readonly skill: ProviderSkillDescriptor;
-  readonly origin: string;
-  readonly originInfo: SkillOriginInfo;
-}
-
-export interface SettingsSkillGroup {
-  readonly key: string;
-  readonly displayName: string;
-  readonly description: string;
-  readonly primarySkill: ProviderSkillDescriptor;
-  readonly providers: ReadonlyArray<ProviderKind>;
-  readonly sources: ReadonlyArray<SettingsSkillSource>;
-  readonly section: string;
-}
-
-export interface SettingsSkillSection {
-  readonly key: string;
-  readonly title: string;
-  readonly groups: ReadonlyArray<SettingsSkillGroup>;
-}
-
-const SHARED_SKILLS_SECTION = "shared";
-const PERSONAL_ORIGIN = "personal";
-export const ORIGIN_SECTION_ORDER = [
-  "chitauri",
-  "codex",
-  "claude",
-  "cursor",
-  "grok",
-  "kilo",
-  "opencode",
-  "pi",
-  "agents",
-  "project",
-] as const;
-export const PROVIDER_STACK_ORDER: readonly ProviderKind[] = [
-  "codex",
-  "claudeAgent",
-  "cursor",
-  "grok",
-  "kilo",
-  "opencode",
-  "pi",
-] as const;
-
-export function skillOriginInfo(scope: string | undefined): SkillOriginInfo {
-  switch (scope) {
-    case "chitauri":
-    case "synara":
-      return { label: "TeaCode", provider: null };
-    case "codex":
-      return { label: PROVIDER_DISPLAY_NAMES.codex, provider: "codex" };
-    case "claude":
-      return { label: PROVIDER_DISPLAY_NAMES.claudeAgent, provider: "claudeAgent" };
-    case "cursor":
-      return { label: PROVIDER_DISPLAY_NAMES.cursor, provider: "cursor" };
-    case "grok":
-      return { label: PROVIDER_DISPLAY_NAMES.grok, provider: "grok" };
-    case "kilo":
-      return { label: PROVIDER_DISPLAY_NAMES.kilo, provider: "kilo" };
-    case "opencode":
-      return { label: PROVIDER_DISPLAY_NAMES.opencode, provider: "opencode" };
-    case "pi":
-      return { label: PROVIDER_DISPLAY_NAMES.pi, provider: "pi" };
-    case "agents":
-      return { label: "Shared (.agents)", provider: null };
-    case "project":
-      return { label: "Project", provider: null };
-    default:
-      return { label: scope ?? "Personal", provider: null };
-  }
-}
-
-export function providersForSkillOrigin(origin: string): ProviderKind[] {
-  const provider = skillOriginInfo(origin).provider;
-  return provider ? [provider] : [];
-}
-
-export function settingsSkillNameKey(name: string): string {
-  return name.trim().toLowerCase();
-}
-
-export function skillDisplayName(skill: ProviderSkillDescriptor): string {
-  return skill.interface?.displayName ?? skill.name;
-}
-
-export function providerDisplayName(provider: ProviderKind): string {
-  return PROVIDER_DISPLAY_NAMES[provider];
-}
-
-export function sortProviderStack(providers: ReadonlyArray<ProviderKind>): ProviderKind[] {
-  return [...providers].sort(
-    (left, right) => PROVIDER_STACK_ORDER.indexOf(left) - PROVIDER_STACK_ORDER.indexOf(right),
-  );
-}
-
-function originRank(origin: string): number {
-  const index = (ORIGIN_SECTION_ORDER as readonly string[]).indexOf(origin);
-  return index >= 0 ? index : ORIGIN_SECTION_ORDER.length;
-}
-
-function sourceSortKey(source: SettingsSkillSource): string {
-  return `${originRank(source.origin).toString().padStart(2, "0")}\u0000${source.skill.path}`;
-}
-
-function sectionTitle(section: string): string {
-  if (section === SHARED_SKILLS_SECTION) {
-    return "Shared skills";
-  }
-  return `From ${skillOriginInfo(section).label}`;
-}
-
-function sectionRank(section: string): number {
-  if (section === SHARED_SKILLS_SECTION) {
-    return -1;
-  }
-  return originRank(section);
-}
-
-// Creates one canonical row per normalized skill name. Duplicate provider copies
-// stay visible as sources instead of letting the first origin hide the rest.
-export function buildSettingsSkillGroups(
-  skills: ReadonlyArray<ProviderSkillDescriptor>,
-): SettingsSkillGroup[] {
-  const groups = new Map<string, SettingsSkillSource[]>();
-  for (const skill of skills) {
-    const key = settingsSkillNameKey(skill.name);
-    const origin = skill.scope ?? PERSONAL_ORIGIN;
-    const source: SettingsSkillSource = {
-      skill,
-      origin,
-      originInfo: skillOriginInfo(origin),
-    };
-    groups.set(key, [...(groups.get(key) ?? []), source]);
-  }
-
-  return [...groups.entries()]
-    .map(([key, unsortedSources]): SettingsSkillGroup | null => {
-      const sources = [...unsortedSources].sort((left, right) =>
-        sourceSortKey(left).localeCompare(sourceSortKey(right)),
-      );
-      const primarySkill = sources[0]?.skill;
-      if (!primarySkill) {
-        return null;
-      }
-      const providers = sortProviderStack(
-        sources
-          .flatMap((source) => providersForSkillOrigin(source.origin))
-          .filter((provider, index, all) => all.indexOf(provider) === index),
-      );
-      const section =
-        sources.length > 1 ? SHARED_SKILLS_SECTION : (sources[0]?.origin ?? PERSONAL_ORIGIN);
-      const description =
-        primarySkill.interface?.shortDescription ?? primarySkill.description ?? "No description.";
-      return {
-        key,
-        displayName: skillDisplayName(primarySkill),
-        description,
-        primarySkill,
-        providers,
-        sources,
-        section,
-      } satisfies SettingsSkillGroup;
-    })
-    .filter((group): group is SettingsSkillGroup => group !== null)
-    .sort((left, right) => left.displayName.localeCompare(right.displayName));
-}
-
-export function buildSettingsSkillSections(
-  skills: ReadonlyArray<ProviderSkillDescriptor>,
-): SettingsSkillSection[] {
-  const sections = new Map<string, SettingsSkillGroup[]>();
-  for (const group of buildSettingsSkillGroups(skills)) {
-    sections.set(group.section, [...(sections.get(group.section) ?? []), group]);
-  }
-
-  return [...sections.entries()]
-    .map(([key, groups]) => ({
-      key,
-      title: sectionTitle(key),
-      groups,
-    }))
-    .sort((left, right) => sectionRank(left.key) - sectionRank(right.key));
-}
diff --git a/apps/web/src/components/terminal/LazyThreadTerminalDrawer.tsx b/apps/web/src/components/terminal/LazyThreadTerminalDrawer.tsx
deleted file mode 100644
index 41b62a666..000000000
--- a/apps/web/src/components/terminal/LazyThreadTerminalDrawer.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-// FILE: LazyThreadTerminalDrawer.tsx
-// Purpose: The single code-split boundary for the xterm terminal stack.
-// Layer: Chat terminal workspace UI
-// Exports: LazyThreadTerminalDrawer (default + named)
-//
-// Why: `ThreadTerminalDrawer` statically imports `@xterm/xterm`, seven xterm
-//      addons and `xterm.css` (~794 kB raw). Importing it from ChatView and
-//      DockTerminalPane pinned all of it into the `/_chat/$threadId` static
-//      import closure, so every thread paid for the terminal even when no
-//      terminal was ever opened. Every render site already sits behind a
-//      terminal-open gate, so the drawer is a natural lazy boundary.
-//
-// Safety: terminal runtimes (the xterm instance + its PTY subscription) live in
-//      the module-level `terminalRuntimeRegistry`, not in React state. Unmounting
-//      the drawer calls `detach`, which parks the wrapper element in a hidden
-//      container and keeps the entry alive; only an explicit `dispose` tears a
-//      PTY down. Deferring the mount is therefore state-preserving.
-//
-// No flash: the Suspense fallback renders the drawer's own shell geometry
-//      (`terminalDrawerShellClassName`) at the same height, so the swap to the
-//      real drawer is a pure content replacement with no layout shift.
-
-import { Suspense, lazy } from "react";
-
-// `import type` (never a bare `type` specifier) so the heavy module is fully
-// erased at build time and only the dynamic `import()` below can pull it in.
-import type { ThreadTerminalDrawerProps } from "../ThreadTerminalDrawer";
-import { terminalDrawerShellClassName } from "./terminalDrawerShell";
-import { clampTerminalDrawerHeight } from "./useTerminalDrawerHeight";
-
-const ThreadTerminalDrawer = lazy(() => import("../ThreadTerminalDrawer"));
-
-function ThreadTerminalDrawerFallback({
-  height,
-  presentationMode,
-}: Pick<ThreadTerminalDrawerProps, "height" | "presentationMode">) {
-  return (
-    <aside
-      aria-hidden="true"
-      className={terminalDrawerShellClassName(presentationMode)}
-      style={
-        presentationMode === "workspace"
-          ? undefined
-          : { height: `${clampTerminalDrawerHeight(height)}px` }
-      }
-    />
-  );
-}
-
-/**
- * Drop-in replacement for `ThreadTerminalDrawer` that keeps the terminal stack
- * out of the caller's chunk. Props are forwarded verbatim; the drawer is a plain
- * function component with no imperative handle, so there is no ref to forward.
- */
-export function LazyThreadTerminalDrawer(props: ThreadTerminalDrawerProps) {
-  return (
-    <Suspense
-      fallback={
-        <ThreadTerminalDrawerFallback
-          height={props.height}
-          presentationMode={props.presentationMode}
-        />
-      }
-    >
-      <ThreadTerminalDrawer {...props} />
-    </Suspense>
-  );
-}
-
-export default LazyThreadTerminalDrawer;
diff --git a/apps/web/src/components/terminal/TerminalActivityIndicator.tsx b/apps/web/src/components/terminal/TerminalActivityIndicator.tsx
deleted file mode 100644
index ba7a6fbd9..000000000
--- a/apps/web/src/components/terminal/TerminalActivityIndicator.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-// FILE: TerminalActivityIndicator.tsx
-// Purpose: Compact terminal lifecycle indicator for running, attention, and review states.
-// Layer: Terminal presentation primitive
-
-import type { TerminalVisualState } from "@t3tools/shared/terminalThreads";
-
-import { cn } from "~/lib/utils";
-
-interface TerminalActivityIndicatorProps {
-  className?: string;
-  state?: Exclude<TerminalVisualState, "idle">;
-}
-
-const RUNNING_INDICATOR_OFFSETS_MS = [0, 160, 320, 480] as const;
-
-export default function TerminalActivityIndicator({
-  className,
-  state = "running",
-}: TerminalActivityIndicatorProps) {
-  if (state === "attention" || state === "review") {
-    return (
-      <span
-        aria-hidden="true"
-        className={cn(
-          "inline-flex size-1.5 shrink-0 rounded-full",
-          state === "attention" ? "bg-[var(--info)]" : "bg-success",
-          className,
-        )}
-      />
-    );
-  }
-
-  return (
-    <span
-      aria-hidden="true"
-      className={cn(
-        "inline-grid h-2.5 w-2.5 shrink-0 grid-cols-2 grid-rows-2 gap-px text-current",
-        className,
-      )}
-    >
-      {RUNNING_INDICATOR_OFFSETS_MS.map((delayMs) => (
-        <span
-          // CSS animation keeps busy terminal indicators out of React's render loop.
-          key={delayMs}
-          className="terminal-running-indicator__dot block size-1 rounded-full bg-current"
-          style={{ animationDelay: `${delayMs}ms` }}
-        />
-      ))}
-    </span>
-  );
-}
diff --git a/apps/web/src/components/terminal/TerminalChrome.tsx b/apps/web/src/components/terminal/TerminalChrome.tsx
deleted file mode 100644
index 9a2950f5c..000000000
--- a/apps/web/src/components/terminal/TerminalChrome.tsx
+++ /dev/null
@@ -1,248 +0,0 @@
-// FILE: TerminalChrome.tsx
-// Purpose: Reusable terminal chrome primitives for tab bars, sidebars, and toolbar actions.
-// Layer: Terminal presentation components
-// Depends on: terminal visual identities plus shared popover/button styling.
-//
-// Note: raw <button> usage in this file is intentional. These are tab-strip and
-// list-row affordances (activate tab, close tab, terminal row, group header)
-// rather than generic action buttons, so they live outside the shadcn Button
-// taxonomy. When/if we introduce a shared Tabs primitive, these can migrate.
-
-import type { ReactNode } from "react";
-
-import type { ResolvedTerminalVisualIdentity } from "@t3tools/shared/terminalThreads";
-
-import { IconButton } from "~/components/ui/icon-button";
-import { Popover, PopoverPopup, PopoverTrigger } from "~/components/ui/popover";
-import { XIcon } from "~/lib/icons";
-import { cn } from "~/lib/utils";
-import { selectRepresentativeTerminalVisualIdentity } from "~/terminalVisualIdentity";
-
-import { DOCK_HEADER_ICON_BUTTON_CLASS, SurfaceTabChip } from "../chat/chatHeaderControls";
-import type { ResolvedTerminalGroupLayout } from "./TerminalLayout";
-import TerminalActivityIndicator from "./TerminalActivityIndicator";
-import TerminalIdentityIcon from "./TerminalIdentityIcon";
-
-export interface TerminalChromeActionItem {
-  disabled?: boolean;
-  label: string;
-  onClick: () => void;
-  children: ReactNode;
-}
-
-export function TerminalChromeActions(props: {
-  actions: ReadonlyArray<TerminalChromeActionItem>;
-  variant: "compact" | "workspace" | "sidebar";
-}) {
-  const buttonClassName =
-    props.variant === "sidebar"
-      ? "!size-6 shrink-0 rounded-md [&_svg,&_[data-slot=central-icon]]:mx-0"
-      : DOCK_HEADER_ICON_BUTTON_CLASS;
-
-  return (
-    <div className="inline-flex items-center gap-0.5">
-      {props.actions.map((action) => (
-        <IconButton
-          key={action.label}
-          className={cn(buttonClassName, action.disabled ? "pointer-events-none opacity-45" : "")}
-          label={action.label}
-          tooltip={action.label}
-          tooltipSide="bottom"
-          size="icon-xs"
-          variant="chrome"
-          disabled={action.disabled}
-          onClick={() => {
-            if (action.disabled) return;
-            action.onClick();
-          }}
-        >
-          {action.children}
-        </IconButton>
-      ))}
-    </div>
-  );
-}
-
-export function TerminalWorkspaceTabBar(props: {
-  terminalGroups: ResolvedTerminalGroupLayout[];
-  activeGroupId: string;
-  terminalVisualIdentityById: ReadonlyMap<string, ResolvedTerminalVisualIdentity>;
-  actions: ReadonlyArray<TerminalChromeActionItem>;
-  onActiveGroupChange: (groupId: string) => void;
-  onCloseGroup: (groupId: string) => void;
-}) {
-  const canCloseGroups = props.terminalGroups.length > 1;
-  return (
-    <div className="flex min-h-9 min-w-0 items-center gap-1 bg-[var(--color-background-surface)] px-1.5 py-1">
-      <div className="flex min-w-0 flex-1 items-center gap-1 overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
-        {props.terminalGroups.map((terminalGroup) => {
-          const isActive = terminalGroup.id === props.activeGroupId;
-          const visualIdentity = selectRepresentativeTerminalVisualIdentity({
-            activeTerminalId: terminalGroup.activeTerminalId,
-            terminalIds: terminalGroup.terminalIds,
-            terminalVisualIdentityById: props.terminalVisualIdentityById,
-          })?.identity;
-          const groupTitle = visualIdentity?.title ?? "Terminal";
-          const closeTabLabel = `Close ${visualIdentity?.title ?? "Terminal tab"}`;
-          return (
-            <SurfaceTabChip
-              key={terminalGroup.id}
-              active={isActive}
-              title={groupTitle}
-              label={groupTitle}
-              labelClassName="max-w-40"
-              icon={
-                <TerminalIdentityIcon
-                  className="size-3.5"
-                  iconKey={visualIdentity?.iconKey ?? "terminal"}
-                />
-              }
-              leading={
-                visualIdentity && visualIdentity.state !== "idle" ? (
-                  <TerminalActivityIndicator
-                    className="text-foreground/70"
-                    state={visualIdentity.state}
-                  />
-                ) : null
-              }
-              trailing={
-                terminalGroup.terminalIds.length > 1 ? (
-                  <span className="shrink-0 text-[11px] text-current/55">
-                    {terminalGroup.terminalIds.length}
-                  </span>
-                ) : null
-              }
-              closeLabel={closeTabLabel}
-              onSelect={() => props.onActiveGroupChange(terminalGroup.id)}
-              onClose={canCloseGroups ? () => props.onCloseGroup(terminalGroup.id) : undefined}
-            />
-          );
-        })}
-      </div>
-      <div className="flex shrink-0 items-center">
-        <TerminalChromeActions actions={props.actions} variant="workspace" />
-      </div>
-    </div>
-  );
-}
-
-export function TerminalSidebar(props: {
-  terminalIds: string[];
-  terminalGroups: ResolvedTerminalGroupLayout[];
-  activeTerminalId: string;
-  activeGroupId: string;
-  showGroupHeaders: boolean;
-  closeShortcutLabel?: string | undefined;
-  terminalVisualIdentityById: ReadonlyMap<string, ResolvedTerminalVisualIdentity>;
-  actions: ReadonlyArray<TerminalChromeActionItem>;
-  onActiveTerminalChange: (terminalId: string) => void;
-  onCloseTerminal: (terminalId: string) => void;
-}) {
-  return (
-    <aside className="flex w-36 min-w-36 flex-col border border-border/70 bg-[var(--color-background-surface)]">
-      <div className="flex h-[22px] items-stretch justify-end border-b border-border/70">
-        <TerminalChromeActions actions={props.actions} variant="sidebar" />
-      </div>
-
-      <div className="min-h-0 flex-1 overflow-y-auto px-1 py-1">
-        {props.terminalGroups.map((terminalGroup, groupIndex) => {
-          const isGroupActive = terminalGroup.id === props.activeGroupId;
-          const groupActiveTerminalId = isGroupActive
-            ? props.activeTerminalId
-            : terminalGroup.activeTerminalId;
-          const groupVisualIdentity = props.terminalVisualIdentityById.get(groupActiveTerminalId);
-
-          return (
-            <div key={terminalGroup.id} className="pb-0.5">
-              {props.showGroupHeaders && (
-                <button
-                  type="button"
-                  className={`flex w-full items-center px-1 py-0.5 text-[11px] ${
-                    isGroupActive
-                      ? "bg-[var(--sidebar-accent-active)] text-foreground"
-                      : "text-muted-foreground hover:bg-[var(--sidebar-accent)] hover:text-foreground"
-                  }`}
-                  onClick={() => props.onActiveTerminalChange(groupActiveTerminalId)}
-                >
-                  {groupVisualIdentity?.title ?? `Terminal ${groupIndex + 1}`}
-                  {terminalGroup.terminalIds.length > 1
-                    ? ` (${terminalGroup.terminalIds.length})`
-                    : ""}
-                </button>
-              )}
-
-              <div
-                className={props.showGroupHeaders ? "ml-1 border-l border-border/60 pl-1.5" : ""}
-              >
-                {terminalGroup.terminalIds.map((terminalId) => {
-                  const isActive = terminalId === props.activeTerminalId;
-                  const visualIdentity = props.terminalVisualIdentityById.get(terminalId);
-                  const closeTerminalLabel = `Close ${
-                    visualIdentity?.title ?? "terminal"
-                  }${isActive && props.closeShortcutLabel ? ` (${props.closeShortcutLabel})` : ""}`;
-                  return (
-                    <div
-                      key={terminalId}
-                      className={`group flex items-center gap-1 px-1 py-0.5 text-[11px] ${
-                        isActive
-                          ? "bg-[var(--sidebar-accent-active)] text-foreground"
-                          : "text-muted-foreground hover:bg-[var(--sidebar-accent)] hover:text-foreground"
-                      }`}
-                    >
-                      {props.showGroupHeaders && (
-                        <span className="text-[11px] text-muted-foreground/80">└</span>
-                      )}
-                      <button
-                        type="button"
-                        className="flex min-w-0 flex-1 items-center gap-1 text-left"
-                        onClick={() => props.onActiveTerminalChange(terminalId)}
-                      >
-                        <TerminalIdentityIcon
-                          className="size-3 shrink-0"
-                          iconKey={visualIdentity?.iconKey ?? "terminal"}
-                        />
-                        {visualIdentity && visualIdentity.state !== "idle" ? (
-                          <TerminalActivityIndicator
-                            className="text-foreground/70"
-                            state={visualIdentity.state}
-                          />
-                        ) : null}
-                        <span className="truncate">{visualIdentity?.title ?? "Terminal"}</span>
-                      </button>
-                      {props.terminalIds.length > 1 && (
-                        <Popover>
-                          <PopoverTrigger
-                            openOnHover
-                            render={
-                              <button
-                                type="button"
-                                className="inline-flex size-3.5 items-center justify-center rounded text-xs font-medium leading-none text-muted-foreground opacity-0 transition hover:bg-[var(--sidebar-accent)] hover:text-foreground group-hover:opacity-100"
-                                onClick={() => props.onCloseTerminal(terminalId)}
-                                aria-label={closeTerminalLabel}
-                              />
-                            }
-                          >
-                            <XIcon className="size-2.5" />
-                          </PopoverTrigger>
-                          <PopoverPopup
-                            tooltipStyle
-                            side="bottom"
-                            sideOffset={6}
-                            align="center"
-                            className="pointer-events-none select-none"
-                          >
-                            {closeTerminalLabel}
-                          </PopoverPopup>
-                        </Popover>
-                      )}
-                    </div>
-                  );
-                })}
-              </div>
-            </div>
-          );
-        })}
-      </div>
-    </aside>
-  );
-}
diff --git a/apps/web/src/components/terminal/TerminalIdentityIcon.tsx b/apps/web/src/components/terminal/TerminalIdentityIcon.tsx
deleted file mode 100644
index 4eef03c97..000000000
--- a/apps/web/src/components/terminal/TerminalIdentityIcon.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-// FILE: TerminalIdentityIcon.tsx
-// Purpose: Renders a terminal/provider icon without extra activity chrome.
-// Layer: Terminal presentation primitive
-// Depends on: shared terminal icon keys plus local provider/icon components.
-
-import type { TerminalIconKey } from "@t3tools/shared/terminalThreads";
-
-import { TerminalSquare } from "~/lib/icons";
-import { cn } from "~/lib/utils";
-
-import { ClaudeAI, OpenAI } from "../Icons";
-
-interface TerminalIdentityIconProps {
-  iconKey: TerminalIconKey;
-  className?: string;
-}
-
-// Keep provider branding reusable across every terminal surface.
-export default function TerminalIdentityIcon({ iconKey, className }: TerminalIdentityIconProps) {
-  const IconComponent =
-    iconKey === "openai" ? OpenAI : iconKey === "claude" ? ClaudeAI : TerminalSquare;
-
-  return (
-    <span className={cn("inline-flex shrink-0 items-center justify-center", className)}>
-      <IconComponent className={cn("size-full text-[var(--color-text-foreground)]")} />
-    </span>
-  );
-}
diff --git a/apps/web/src/components/terminal/TerminalLayout.ts b/apps/web/src/components/terminal/TerminalLayout.ts
deleted file mode 100644
index 0eb8fcde3..000000000
--- a/apps/web/src/components/terminal/TerminalLayout.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-// FILE: TerminalLayout.ts
-// Purpose: Pure layout resolution for terminal pane tabs, pane trees, and visual identities.
-// Layer: Terminal view-model helpers
-// Depends on: shared terminal identity logic plus terminal pane-tree helpers.
-
-import {
-  type ResolvedTerminalVisualIdentity,
-  type TerminalCliKind,
-} from "@t3tools/shared/terminalThreads";
-
-import { resolveTerminalVisualIdentityMap } from "../../terminalVisualIdentity";
-import {
-  collectTerminalIdsFromLayout,
-  findFirstTerminalIdInLayout,
-  normalizeTerminalPaneGroup,
-} from "../../terminalPaneLayout";
-import {
-  DEFAULT_THREAD_TERMINAL_ID,
-  MAX_TERMINALS_PER_GROUP,
-  type ThreadTerminalGroup,
-  type ThreadTerminalLayoutNode,
-} from "../../types";
-
-export interface ResolvedTerminalGroupLayout {
-  id: string;
-  activeTerminalId: string;
-  layout: ThreadTerminalLayoutNode;
-  terminalIds: string[];
-}
-
-export interface ResolvedThreadTerminalLayout {
-  normalizedTerminalIds: string[];
-  resolvedActiveTerminalId: string;
-  resolvedActiveGroupId: string;
-  resolvedTerminalGroups: ResolvedTerminalGroupLayout[];
-  activeGroupLayout: ThreadTerminalLayoutNode;
-  visibleTerminalIds: string[];
-  hasTerminalSidebar: boolean;
-  isSplitView: boolean;
-  showGroupHeaders: boolean;
-  hasReachedSplitLimit: boolean;
-  terminalVisualIdentityById: ReadonlyMap<string, ResolvedTerminalVisualIdentity>;
-}
-
-function assignUniqueGroupId(groupId: string, usedGroupIds: Set<string>): string {
-  if (!usedGroupIds.has(groupId)) {
-    usedGroupIds.add(groupId);
-    return groupId;
-  }
-  let suffix = 2;
-  while (usedGroupIds.has(`${groupId}-${suffix}`)) {
-    suffix += 1;
-  }
-  const uniqueGroupId = `${groupId}-${suffix}`;
-  usedGroupIds.add(uniqueGroupId);
-  return uniqueGroupId;
-}
-
-function normalizeTerminalIds(terminalIds: string[]): string[] {
-  const cleaned = [...new Set(terminalIds.map((id) => id.trim()).filter((id) => id.length > 0))];
-  return cleaned.length > 0 ? cleaned : [DEFAULT_THREAD_TERMINAL_ID];
-}
-
-function resolveTerminalGroups(input: {
-  normalizedTerminalIds: string[];
-  terminalGroups: ThreadTerminalGroup[];
-}): ResolvedTerminalGroupLayout[] {
-  const assignedTerminalIds = new Set<string>();
-  const usedGroupIds = new Set<string>();
-  const nextGroups: ResolvedTerminalGroupLayout[] = [];
-
-  for (const terminalGroup of input.terminalGroups) {
-    const normalizedGroup = normalizeTerminalPaneGroup(terminalGroup, input.normalizedTerminalIds);
-    if (!normalizedGroup) continue;
-    const groupTerminalIds = collectTerminalIdsFromLayout(normalizedGroup.layout).filter(
-      (terminalId) => {
-        if (assignedTerminalIds.has(terminalId)) return false;
-        return true;
-      },
-    );
-    if (groupTerminalIds.length === 0) continue;
-    const filteredGroup = normalizeTerminalPaneGroup(normalizedGroup, groupTerminalIds);
-    if (!filteredGroup) continue;
-    const groupId = assignUniqueGroupId(filteredGroup.id, usedGroupIds);
-    collectTerminalIdsFromLayout(filteredGroup.layout).forEach((terminalId) => {
-      assignedTerminalIds.add(terminalId);
-    });
-    nextGroups.push({
-      ...filteredGroup,
-      id: groupId,
-      terminalIds: collectTerminalIdsFromLayout(filteredGroup.layout),
-    });
-  }
-
-  for (const terminalId of input.normalizedTerminalIds) {
-    if (assignedTerminalIds.has(terminalId)) continue;
-    const id = assignUniqueGroupId(`group-${terminalId}`, usedGroupIds);
-    nextGroups.push({
-      id,
-      activeTerminalId: terminalId,
-      layout: {
-        type: "terminal",
-        paneId: `pane-${terminalId}`,
-        terminalIds: [terminalId],
-        activeTerminalId: terminalId,
-      },
-      terminalIds: [terminalId],
-    });
-  }
-
-  if (nextGroups.length > 0) {
-    return nextGroups;
-  }
-
-  return [
-    {
-      id: `group-${DEFAULT_THREAD_TERMINAL_ID}`,
-      activeTerminalId: DEFAULT_THREAD_TERMINAL_ID,
-      layout: {
-        type: "terminal",
-        paneId: `pane-${DEFAULT_THREAD_TERMINAL_ID}`,
-        terminalIds: [DEFAULT_THREAD_TERMINAL_ID],
-        activeTerminalId: DEFAULT_THREAD_TERMINAL_ID,
-      },
-      terminalIds: [DEFAULT_THREAD_TERMINAL_ID],
-    },
-  ];
-}
-
-function resolveActiveGroup(input: {
-  activeTerminalGroupId: string;
-  activeTerminalId: string;
-  resolvedTerminalGroups: ResolvedTerminalGroupLayout[];
-}): ResolvedTerminalGroupLayout {
-  return (
-    input.resolvedTerminalGroups.find(
-      (terminalGroup) => terminalGroup.id === input.activeTerminalGroupId,
-    ) ??
-    input.resolvedTerminalGroups.find((terminalGroup) =>
-      terminalGroup.terminalIds.includes(input.activeTerminalId),
-    ) ??
-    input.resolvedTerminalGroups[0] ?? {
-      id: `group-${DEFAULT_THREAD_TERMINAL_ID}`,
-      activeTerminalId: DEFAULT_THREAD_TERMINAL_ID,
-      layout: {
-        type: "terminal",
-        paneId: `pane-${DEFAULT_THREAD_TERMINAL_ID}`,
-        terminalIds: [DEFAULT_THREAD_TERMINAL_ID],
-        activeTerminalId: DEFAULT_THREAD_TERMINAL_ID,
-      },
-      terminalIds: [DEFAULT_THREAD_TERMINAL_ID],
-    }
-  );
-}
-
-export function resolveThreadTerminalLayout(input: {
-  activeTerminalGroupId: string;
-  activeTerminalId: string;
-  runningTerminalIds: string[];
-  terminalAttentionStatesById: Record<string, "attention" | "review">;
-  terminalCliKindsById: Record<string, TerminalCliKind>;
-  terminalGroups: ThreadTerminalGroup[];
-  terminalIds: string[];
-  terminalLabelsById: Record<string, string>;
-  terminalTitleOverridesById: Record<string, string>;
-}): ResolvedThreadTerminalLayout {
-  const normalizedTerminalIds = normalizeTerminalIds(input.terminalIds);
-  const resolvedTerminalGroups = resolveTerminalGroups({
-    normalizedTerminalIds,
-    terminalGroups: input.terminalGroups,
-  });
-  const activeGroup = resolveActiveGroup({
-    activeTerminalGroupId: input.activeTerminalGroupId,
-    activeTerminalId: input.activeTerminalId,
-    resolvedTerminalGroups,
-  });
-  const resolvedActiveTerminalId = activeGroup.terminalIds.includes(input.activeTerminalId)
-    ? input.activeTerminalId
-    : activeGroup.terminalIds.includes(activeGroup.activeTerminalId)
-      ? activeGroup.activeTerminalId
-      : findFirstTerminalIdInLayout(activeGroup.layout);
-  const visibleTerminalIds = activeGroup.terminalIds;
-  const hasTerminalSidebar = false;
-  const isSplitView = visibleTerminalIds.length > 1;
-  const showGroupHeaders =
-    resolvedTerminalGroups.length > 1 ||
-    resolvedTerminalGroups.some((terminalGroup) => terminalGroup.terminalIds.length > 1);
-  const hasReachedSplitLimit = visibleTerminalIds.length >= MAX_TERMINALS_PER_GROUP;
-  const terminalVisualIdentityById = resolveTerminalVisualIdentityMap({
-    terminalIds: normalizedTerminalIds,
-    runningTerminalIds: input.runningTerminalIds,
-    terminalAttentionStatesById: input.terminalAttentionStatesById,
-    terminalCliKindsById: input.terminalCliKindsById,
-    terminalLabelsById: input.terminalLabelsById,
-    terminalTitleOverridesById: input.terminalTitleOverridesById,
-  });
-
-  return {
-    normalizedTerminalIds,
-    resolvedActiveTerminalId,
-    resolvedActiveGroupId: activeGroup.id,
-    resolvedTerminalGroups,
-    activeGroupLayout: activeGroup.layout,
-    visibleTerminalIds,
-    hasTerminalSidebar,
-    isSplitView,
-    showGroupHeaders,
-    hasReachedSplitLimit,
-    terminalVisualIdentityById,
-  };
-}
diff --git a/apps/web/src/components/terminal/TerminalViewportPane.tsx b/apps/web/src/components/terminal/TerminalViewportPane.tsx
deleted file mode 100644
index cafdb9bb8..000000000
--- a/apps/web/src/components/terminal/TerminalViewportPane.tsx
+++ /dev/null
@@ -1,389 +0,0 @@
-// FILE: TerminalViewportPane.tsx
-// Purpose: Renders the active terminal pane tree with nested splits and pane-local tab strips.
-// Layer: Terminal presentation components
-// Depends on: caller-provided viewport renderer so xterm lifecycle can stay external.
-//
-// Note: pane-tab activate and close buttons are intentionally raw <button>; they
-// are tab-strip affordances, not shadcn Buttons. See TerminalChrome.tsx for the
-// same rationale.
-
-import type { PointerEvent as ReactPointerEvent, ReactNode } from "react";
-
-import type { ResolvedTerminalVisualIdentity } from "@t3tools/shared/terminalThreads";
-
-import { IconButton } from "~/components/ui/icon-button";
-import {
-  Maximize2,
-  Minimize2,
-  PanelRightCloseIcon,
-  Plus,
-  SquareSplitHorizontal,
-  SquareSplitVertical,
-  TerminalSquareIcon,
-  Trash2,
-} from "~/lib/icons";
-import { cn } from "~/lib/utils";
-
-import { DOCK_HEADER_ICON_BUTTON_CLASS, SurfaceTabChip } from "../chat/chatHeaderControls";
-import type {
-  ThreadTerminalLayoutNode,
-  ThreadTerminalPresentationMode,
-  ThreadTerminalSplitNode,
-} from "../../types";
-import TerminalActivityIndicator from "./TerminalActivityIndicator";
-import TerminalIdentityIcon from "./TerminalIdentityIcon";
-
-const MIN_TERMINAL_PANE_SIZE_PX = 180;
-
-interface TerminalViewportPaneProps {
-  groupId: string;
-  layout: ThreadTerminalLayoutNode;
-  resolvedActiveTerminalId: string;
-  terminalVisualIdentityById: ReadonlyMap<string, ResolvedTerminalVisualIdentity>;
-  onActiveTerminalChange: (terminalId: string) => void;
-  onResizeSplit: (groupId: string, splitId: string, weights: number[]) => void;
-  renderViewport: (
-    terminalId: string,
-    options: { autoFocus: boolean; isVisible: boolean },
-  ) => ReactNode;
-  onSplitTerminalRight?: ((terminalId: string) => void) | undefined;
-  onSplitTerminalDown?: ((terminalId: string) => void) | undefined;
-  onNewTerminalTab?: ((terminalId: string) => void) | undefined;
-  onMoveTerminalToGroup?: ((terminalId: string) => void) | undefined;
-  onCloseTerminal?: ((terminalId: string) => void) | undefined;
-  presentationMode: ThreadTerminalPresentationMode;
-  onTogglePresentationMode?: (() => void) | undefined;
-  onTogglePanel?: (() => void) | undefined;
-  isPanelOpen?: boolean | undefined;
-}
-
-function normalizeWeights(weights: number[]): number[] {
-  return weights.map((weight) => (Number.isFinite(weight) && weight > 0 ? weight : 1));
-}
-
-function splitHandleClassName(direction: ThreadTerminalSplitNode["direction"]): string {
-  return direction === "horizontal"
-    ? "shrink-0 w-px cursor-col-resize bg-border/70 hover:bg-[var(--sidebar-accent)]"
-    : "shrink-0 h-px cursor-row-resize bg-border/70 hover:bg-[var(--sidebar-accent)]";
-}
-
-function canMoveTerminalToOwnGroup(node: ThreadTerminalLayoutNode, terminalId: string): boolean {
-  if (node.type === "terminal") {
-    return node.activeTerminalId === terminalId && node.terminalIds.length > 1;
-  }
-
-  return node.children.some((child) => {
-    if (child.type === "terminal") {
-      return child.terminalIds.includes(terminalId);
-    }
-    return canMoveTerminalToOwnGroup(child, terminalId);
-  });
-}
-
-function PaneActionButton(props: { label: string; onClick: () => void; children: ReactNode }) {
-  return (
-    <IconButton
-      className={DOCK_HEADER_ICON_BUTTON_CLASS}
-      onClick={(event) => {
-        event.stopPropagation();
-        props.onClick();
-      }}
-      label={props.label}
-      tooltip={props.label}
-      tooltipSide="bottom"
-      size="icon-xs"
-      variant="chrome"
-    >
-      {props.children}
-    </IconButton>
-  );
-}
-
-export default function TerminalViewportPane({
-  groupId,
-  layout,
-  resolvedActiveTerminalId,
-  terminalVisualIdentityById,
-  onActiveTerminalChange,
-  onResizeSplit,
-  renderViewport,
-  onSplitTerminalRight,
-  onSplitTerminalDown,
-  onNewTerminalTab,
-  onMoveTerminalToGroup,
-  onCloseTerminal,
-  presentationMode,
-  onTogglePresentationMode,
-  onTogglePanel,
-  isPanelOpen,
-}: TerminalViewportPaneProps) {
-  const renderNode = (node: ThreadTerminalLayoutNode): ReactNode => {
-    if (node.type === "terminal") {
-      const activePaneTerminalId = node.terminalIds.includes(node.activeTerminalId)
-        ? node.activeTerminalId
-        : (node.terminalIds[0] ?? resolvedActiveTerminalId);
-      const isFocusedPane = activePaneTerminalId === resolvedActiveTerminalId;
-      const canMoveActiveTerminalToGroup =
-        !!onMoveTerminalToGroup && canMoveTerminalToOwnGroup(layout, activePaneTerminalId);
-      const moveActiveTerminalToGroup = () => {
-        if (!onMoveTerminalToGroup) return;
-        onMoveTerminalToGroup(activePaneTerminalId);
-      };
-
-      return (
-        <div
-          key={node.paneId}
-          className="flex h-full min-h-0 min-w-0 flex-col overflow-hidden bg-[var(--color-background-surface)]"
-          onMouseDown={() => {
-            if (!isFocusedPane) {
-              onActiveTerminalChange(activePaneTerminalId);
-            }
-          }}
-        >
-          <div className="flex min-h-9 items-center gap-1 bg-[var(--color-background-surface)] px-1.5 py-1">
-            <div className="flex min-w-0 flex-1 items-center gap-1 overflow-x-auto [scrollbar-width:none] [&::-webkit-scrollbar]:hidden">
-              {node.terminalIds.map((terminalId) => {
-                const visualIdentity = terminalVisualIdentityById.get(terminalId);
-                const isActiveTab = terminalId === activePaneTerminalId;
-                const tabTitle = visualIdentity?.title ?? "Terminal";
-                const closeTabLabel = `Close ${visualIdentity?.title ?? "terminal"}`;
-
-                return (
-                  <SurfaceTabChip
-                    key={terminalId}
-                    active={isActiveTab}
-                    className={cn(isActiveTab && !isFocusedPane && "opacity-70")}
-                    title={tabTitle}
-                    label={tabTitle}
-                    labelClassName="max-w-40"
-                    icon={
-                      <TerminalIdentityIcon
-                        className="size-3.5"
-                        iconKey={visualIdentity?.iconKey ?? "terminal"}
-                      />
-                    }
-                    leading={
-                      visualIdentity && visualIdentity.state !== "idle" ? (
-                        <TerminalActivityIndicator
-                          className="text-foreground/70"
-                          state={visualIdentity.state}
-                        />
-                      ) : null
-                    }
-                    closeLabel={closeTabLabel}
-                    onSelect={() => onActiveTerminalChange(terminalId)}
-                    onClose={onCloseTerminal ? () => onCloseTerminal(terminalId) : undefined}
-                  />
-                );
-              })}
-
-              {onNewTerminalTab ? (
-                <PaneActionButton
-                  label="New terminal tab"
-                  onClick={() => onNewTerminalTab(activePaneTerminalId)}
-                >
-                  <Plus className="size-3.5" />
-                </PaneActionButton>
-              ) : null}
-            </div>
-
-            <div className="flex shrink-0 items-center gap-0.5">
-              {canMoveActiveTerminalToGroup ? (
-                <PaneActionButton
-                  label="Move to its own terminal tab"
-                  onClick={moveActiveTerminalToGroup}
-                >
-                  <TerminalSquareIcon className="size-3.5" />
-                </PaneActionButton>
-              ) : null}
-              {onSplitTerminalRight ? (
-                <PaneActionButton
-                  label="Split right"
-                  onClick={() => onSplitTerminalRight(activePaneTerminalId)}
-                >
-                  <SquareSplitHorizontal className="size-3.5" />
-                </PaneActionButton>
-              ) : null}
-              {onSplitTerminalDown ? (
-                <PaneActionButton
-                  label="Split down"
-                  onClick={() => onSplitTerminalDown(activePaneTerminalId)}
-                >
-                  <SquareSplitVertical className="size-3.5" />
-                </PaneActionButton>
-              ) : null}
-              {onTogglePresentationMode ? (
-                <PaneActionButton
-                  label={
-                    presentationMode === "workspace"
-                      ? "Collapse terminal into chat drawer"
-                      : "Expand terminal into workspace"
-                  }
-                  onClick={onTogglePresentationMode}
-                >
-                  {presentationMode === "workspace" ? (
-                    <Minimize2 className="size-3.5" />
-                  ) : (
-                    <Maximize2 className="size-3.5" />
-                  )}
-                </PaneActionButton>
-              ) : null}
-              {onTogglePanel ? (
-                <PaneActionButton
-                  label={isPanelOpen ? "Collapse side panel" : "Open side panel"}
-                  onClick={onTogglePanel}
-                >
-                  <PanelRightCloseIcon />
-                </PaneActionButton>
-              ) : null}
-              {onCloseTerminal ? (
-                <PaneActionButton
-                  label="Close active terminal tab"
-                  onClick={() => onCloseTerminal(activePaneTerminalId)}
-                >
-                  <Trash2 className="size-3.5" />
-                </PaneActionButton>
-              ) : null}
-            </div>
-          </div>
-
-          <div className="relative min-h-0 min-w-0 flex-1 bg-[var(--color-background-surface)]">
-            {node.terminalIds.map((terminalId) => {
-              const isActiveTab = terminalId === activePaneTerminalId;
-              return (
-                <div
-                  key={terminalId}
-                  className={cn(
-                    "absolute inset-0 min-h-0 min-w-0 transition-opacity",
-                    isActiveTab ? "z-[1] opacity-100" : "pointer-events-none z-0 opacity-0",
-                  )}
-                >
-                  {renderViewport(terminalId, {
-                    autoFocus: isFocusedPane && isActiveTab,
-                    isVisible: isActiveTab,
-                  })}
-                </div>
-              );
-            })}
-          </div>
-        </div>
-      );
-    }
-
-    const weights = normalizeWeights(node.weights);
-    const totalWeight =
-      weights.reduce((sum, weight) => sum + weight, 0) || node.children.length || 1;
-
-    const beginResize = (
-      splitNode: ThreadTerminalSplitNode,
-      handleIndex: number,
-      event: ReactPointerEvent<HTMLDivElement>,
-    ) => {
-      event.preventDefault();
-      event.stopPropagation();
-      const container = event.currentTarget.parentElement;
-      if (!container) return;
-      const rect = container.getBoundingClientRect();
-      const totalSize = splitNode.direction === "horizontal" ? rect.width : rect.height;
-      if (totalSize <= 0) return;
-
-      const startCoordinate = splitNode.direction === "horizontal" ? event.clientX : event.clientY;
-      const startWeights = normalizeWeights(splitNode.weights);
-      const currentWeight = startWeights[handleIndex] ?? 1;
-      const nextWeight = startWeights[handleIndex + 1] ?? 1;
-      const pairWeight = currentWeight + nextWeight;
-      const minWeight = Math.max((pairWeight * MIN_TERMINAL_PANE_SIZE_PX) / totalSize, 0.1);
-      let resizeFrame = 0;
-      let pendingWeights: number[] | null = null;
-
-      const flushResize = () => {
-        resizeFrame = 0;
-        if (!pendingWeights) return;
-        const nextWeights = pendingWeights;
-        pendingWeights = null;
-        onResizeSplit(groupId, splitNode.id, nextWeights);
-      };
-
-      const onPointerMove = (moveEvent: PointerEvent) => {
-        const currentCoordinate =
-          splitNode.direction === "horizontal" ? moveEvent.clientX : moveEvent.clientY;
-        const delta = currentCoordinate - startCoordinate;
-        const deltaWeight = (delta / totalSize) * totalWeight;
-        const resizedCurrent = Math.min(
-          Math.max(currentWeight + deltaWeight, minWeight),
-          pairWeight - minWeight,
-        );
-        const resizedNext = pairWeight - resizedCurrent;
-        const nextWeights = [...startWeights];
-        nextWeights[handleIndex] = resizedCurrent;
-        nextWeights[handleIndex + 1] = resizedNext;
-        pendingWeights = nextWeights;
-        if (resizeFrame === 0) {
-          resizeFrame = window.requestAnimationFrame(flushResize);
-        }
-      };
-
-      const onPointerUp = () => {
-        if (resizeFrame !== 0) {
-          window.cancelAnimationFrame(resizeFrame);
-          resizeFrame = 0;
-        }
-        if (pendingWeights) {
-          onResizeSplit(groupId, splitNode.id, pendingWeights);
-          pendingWeights = null;
-        }
-        window.removeEventListener("pointermove", onPointerMove);
-        window.removeEventListener("pointerup", onPointerUp);
-      };
-
-      window.addEventListener("pointermove", onPointerMove);
-      window.addEventListener("pointerup", onPointerUp, { once: true });
-    };
-
-    return (
-      <div
-        key={node.id}
-        className={cn(
-          "flex h-full min-h-0 min-w-0 gap-0 overflow-hidden bg-[var(--color-background-surface)]",
-          node.direction === "horizontal" ? "flex-row" : "flex-col",
-        )}
-      >
-        {node.children.map((child, index) => {
-          const childWeight = weights[index] ?? 1;
-          return (
-            <div key={child.type === "split" ? child.id : child.paneId} className="contents">
-              <div
-                className="h-full min-h-0 min-w-0"
-                style={{
-                  flexGrow: childWeight,
-                  flexBasis: 0,
-                }}
-              >
-                {renderNode(child)}
-              </div>
-              {index < node.children.length - 1 ? (
-                <div
-                  className={splitHandleClassName(node.direction)}
-                  onPointerDown={(event) => beginResize(node, index, event)}
-                  onDoubleClick={() =>
-                    onResizeSplit(
-                      groupId,
-                      node.id,
-                      node.children.map(() => 1),
-                    )
-                  }
-                />
-              ) : null}
-            </div>
-          );
-        })}
-      </div>
-    );
-  };
-
-  return (
-    <div className="h-full min-h-0 min-w-0 overflow-hidden bg-[var(--color-background-surface)]">
-      {renderNode(layout)}
-    </div>
-  );
-}
diff --git a/apps/web/src/components/terminal/terminalDrawerShell.ts b/apps/web/src/components/terminal/terminalDrawerShell.ts
deleted file mode 100644
index 40cae9fad..000000000
--- a/apps/web/src/components/terminal/terminalDrawerShell.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// FILE: terminalDrawerShell.ts
-// Purpose: Single source for the terminal drawer's outer shell geometry so the
-//          lazy-loading placeholder occupies exactly the same box as the real
-//          drawer and the swap causes no layout shift.
-// Layer: Terminal presentation primitive
-// Note: Intentionally xterm-free — imported by both the heavy drawer and the
-//       light Suspense boundary in LazyThreadTerminalDrawer.tsx.
-
-import { type ThreadTerminalPresentationMode } from "../../types";
-import { cn } from "~/lib/utils";
-import { PANEL_SURFACE_CLASS_NAME } from "../ui/surface";
-
-export function terminalDrawerShellClassName(
-  presentationMode: ThreadTerminalPresentationMode,
-): string {
-  return cn(
-    PANEL_SURFACE_CLASS_NAME,
-    "thread-terminal-drawer relative flex min-w-0 flex-col",
-    presentationMode === "workspace"
-      ? "m-3 h-[calc(100%_-_1.5rem)] min-h-0 w-[calc(100%_-_1.5rem)]"
-      : "mx-3 mb-3 w-[calc(100%_-_1.5rem)] shrink-0",
-  );
-}
diff --git a/apps/web/src/components/terminal/terminalEventDispatcher.ts b/apps/web/src/components/terminal/terminalEventDispatcher.ts
deleted file mode 100644
index 1dffa5ae8..000000000
--- a/apps/web/src/components/terminal/terminalEventDispatcher.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import type { TerminalEvent } from "@t3tools/contracts";
-
-import { readNativeApi } from "~/nativeApi";
-
-type TerminalEventListener = (event: TerminalEvent) => void;
-
-function terminalEventKey(threadId: string, terminalId: string): string {
-  return `${threadId}::${terminalId}`;
-}
-
-class TerminalEventDispatcher {
-  private listenersByKey = new Map<string, Set<TerminalEventListener>>();
-  private unsubscribeSharedListener: (() => void) | null = null;
-
-  subscribe(threadId: string, terminalId: string, listener: TerminalEventListener): () => void {
-    const key = terminalEventKey(threadId, terminalId);
-    const listeners = this.listenersByKey.get(key) ?? new Set<TerminalEventListener>();
-    listeners.add(listener);
-    this.listenersByKey.set(key, listeners);
-    this.ensureSharedListener();
-
-    return () => {
-      const nextListeners = this.listenersByKey.get(key);
-      if (!nextListeners) return;
-      nextListeners.delete(listener);
-      if (nextListeners.size === 0) {
-        this.listenersByKey.delete(key);
-      }
-      if (this.listenersByKey.size === 0) {
-        this.unsubscribeSharedListener?.();
-        this.unsubscribeSharedListener = null;
-      }
-    };
-  }
-
-  private ensureSharedListener(): void {
-    if (this.unsubscribeSharedListener) return;
-    const api = readNativeApi();
-    if (!api) return;
-
-    this.unsubscribeSharedListener = api.terminal.onEvent((event) => {
-      const listeners = this.listenersByKey.get(terminalEventKey(event.threadId, event.terminalId));
-      if (!listeners) return;
-      for (const listener of listeners) {
-        listener(event);
-      }
-    });
-  }
-}
-
-export const terminalEventDispatcher = new TerminalEventDispatcher();
diff --git a/apps/web/src/components/terminal/terminalFontSettle.ts b/apps/web/src/components/terminal/terminalFontSettle.ts
deleted file mode 100644
index bb5525056..000000000
--- a/apps/web/src/components/terminal/terminalFontSettle.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-// FILE: terminalFontSettle.ts
-// Purpose: Refit xterm after web fonts finish loading so early measurements do not stick.
-// Layer: Terminal runtime utility
-// Exports: waitForTerminalFontReady
-// Depends on: Browser FontFaceSet API
-
-const DEFAULT_FONT_LOAD_TIMEOUT_MS = 2_000;
-
-// Waits for the configured terminal font, but never blocks resize recovery forever.
-export async function waitForTerminalFontReady(input: {
-  fontFamily: string;
-  fontSize: number;
-  timeoutMs?: number;
-}): Promise<void> {
-  if (typeof document === "undefined") return;
-  const fonts = (document as Document & { fonts?: FontFaceSet }).fonts;
-  if (!fonts || typeof fonts.load !== "function") return;
-
-  const fontFamily = input.fontFamily.trim();
-  if (!fontFamily) return;
-
-  let timeoutId: number | null = null;
-  const timeout = new Promise<void>((resolve) => {
-    timeoutId = window.setTimeout(resolve, input.timeoutMs ?? DEFAULT_FONT_LOAD_TIMEOUT_MS);
-  });
-
-  try {
-    await Promise.race([Promise.resolve(fonts.load(`${input.fontSize}px ${fontFamily}`)), timeout]);
-  } catch {
-    // Refit anyway; a bad font spec should not permanently strand terminal dimensions.
-  } finally {
-    if (timeoutId !== null) {
-      window.clearTimeout(timeoutId);
-    }
-  }
-}
diff --git a/apps/web/src/components/terminal/terminalPerformance.ts b/apps/web/src/components/terminal/terminalPerformance.ts
deleted file mode 100644
index 7d23cef00..000000000
--- a/apps/web/src/components/terminal/terminalPerformance.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-// FILE: terminalPerformance.ts
-// Purpose: Lightweight opt-in measurements for terminal output parse latency.
-// Layer: Terminal runtime diagnostics
-// Exports: observeTerminalWriteParsed
-// Depends on: Browser performance APIs and localStorage
-
-interface TerminalWriteSample {
-  runtimeKey: string;
-  bytes: number;
-  latencyMs: number;
-  queuedAt: number;
-  parsedAt: number;
-}
-
-declare global {
-  interface Window {
-    __chitauriTerminalPerf?: {
-      samples: TerminalWriteSample[];
-      reset: () => void;
-    };
-  }
-}
-
-const TERMINAL_PERF_STORAGE_KEY = "teacode:terminal-perf";
-const MAX_TERMINAL_PERF_SAMPLES = 200;
-
-// Resolved once. This gate is checked on every parsed write — roughly 60x/second
-// per streaming terminal — and a synchronous localStorage read at that rate is a
-// real main-thread cost for a debug flag that cannot change without a reload.
-let terminalPerfEnabledCache: boolean | null = null;
-
-function terminalPerfEnabled(): boolean {
-  if (terminalPerfEnabledCache !== null) {
-    return terminalPerfEnabledCache;
-  }
-  try {
-    terminalPerfEnabledCache = window.localStorage.getItem(TERMINAL_PERF_STORAGE_KEY) === "1";
-  } catch {
-    terminalPerfEnabledCache = false;
-  }
-  return terminalPerfEnabledCache;
-}
-
-function getTerminalPerfStore() {
-  window.__chitauriTerminalPerf ??= {
-    samples: [],
-    reset() {
-      this.samples.length = 0;
-    },
-  };
-  return window.__chitauriTerminalPerf;
-}
-
-// Records a write only after xterm reports that its parser consumed the data.
-export function observeTerminalWriteParsed(input: {
-  runtimeKey: string;
-  bytes: number;
-  queuedAt: number;
-}): void {
-  if (!terminalPerfEnabled()) return;
-
-  const parsedAt = performance.now();
-  const sample: TerminalWriteSample = {
-    runtimeKey: input.runtimeKey,
-    bytes: input.bytes,
-    queuedAt: input.queuedAt,
-    parsedAt,
-    latencyMs: parsedAt - input.queuedAt,
-  };
-  const store = getTerminalPerfStore();
-  store.samples.push(sample);
-  if (store.samples.length > MAX_TERMINAL_PERF_SAMPLES) {
-    store.samples.splice(0, store.samples.length - MAX_TERMINAL_PERF_SAMPLES);
-  }
-}
diff --git a/apps/web/src/components/terminal/terminalRuntime.ts b/apps/web/src/components/terminal/terminalRuntime.ts
deleted file mode 100644
index 17ac10fd9..000000000
--- a/apps/web/src/components/terminal/terminalRuntime.ts
+++ /dev/null
@@ -1,1245 +0,0 @@
-// FILE: terminalRuntime.ts
-// Purpose: Own the long-lived xterm runtime lifecycle behind the terminal runtime registry.
-// Layer: Terminal runtime infrastructure
-
-import { ClipboardAddon } from "@xterm/addon-clipboard";
-import { FitAddon } from "@xterm/addon-fit";
-import { ImageAddon } from "@xterm/addon-image";
-import { LigaturesAddon } from "@xterm/addon-ligatures";
-import { SearchAddon } from "@xterm/addon-search";
-import { Unicode11Addon } from "@xterm/addon-unicode11";
-import { WebglAddon } from "@xterm/addon-webgl";
-import {
-  defaultTerminalTitleForCliKind,
-  consumeTerminalIdentityInput,
-} from "@t3tools/shared/terminalThreads";
-import { describeErrorMessage } from "@t3tools/shared/errorMessages";
-import {
-  TERMINAL_MAX_COLS,
-  TERMINAL_MAX_ROWS,
-  TERMINAL_MIN_COLS,
-  TERMINAL_MIN_ROWS,
-} from "@t3tools/contracts";
-import type { TerminalSessionSnapshot } from "@t3tools/contracts";
-import { Terminal } from "@xterm/xterm";
-
-import { readNativeApi } from "~/nativeApi";
-import { suppressQueryResponses } from "~/lib/suppressQueryResponses";
-
-import { openInPreferredEditor } from "../../editorPreferences";
-import { isTerminalClearShortcut, terminalNavigationShortcutData } from "../../keybindings";
-import {
-  collectWrappedTerminalLinkLine,
-  extractTerminalLinks,
-  isTerminalLinkActivation,
-  resolvePathLinkTarget,
-  resolveWrappedTerminalLinkRange,
-  wrappedTerminalLinkRangeIntersectsBufferLine,
-} from "../../terminal-links";
-import { addWsTransportStateListener } from "../../wsTransportEvents";
-import {
-  getTerminalBoldFontWeight,
-  getTerminalFontFamily,
-  getTerminalFontSizePx,
-  getTerminalFontWeight,
-  terminalThemeFromApp,
-  writeSystemMessage,
-} from "./terminalRuntimeAppearance";
-import { terminalEventDispatcher } from "./terminalEventDispatcher";
-import type {
-  TerminalRuntimeConfig,
-  TerminalRuntimeEntry,
-  TerminalRuntimeViewState,
-} from "./terminalRuntimeTypes";
-import { waitForTerminalFontReady } from "./terminalFontSettle";
-import { observeTerminalWriteParsed } from "./terminalPerformance";
-
-const ENABLE_TERMINAL_WEBGL = true;
-const VISUAL_RESIZE_MIN_INTERVAL_MS = 64;
-const BACKEND_RESIZE_DEBOUNCE_MS = 120;
-const WRITE_BATCH_SIZE_LIMIT = 262_144;
-const WRITE_BATCH_MAX_LATENCY_MS = 50;
-const LINK_MATCH_CACHE_LIMIT = 512;
-const OPEN_SNAPSHOT_RECONCILE_DELAY_MS = 250;
-const TERMINAL_TEXT_ENCODER = new TextEncoder();
-const TERMINAL_PARKING_CONTAINER_ID = "chitauri-terminal-parking";
-
-type ChitauriTerminalOptions = NonNullable<ConstructorParameters<typeof Terminal>[0]> & {
-  fontWeight?: string | number;
-  fontWeightBold?: string | number;
-  scrollbar?: { showScrollbar?: boolean };
-  vtExtensions?: { kittyKeyboard?: boolean };
-};
-
-const TERMINAL_CURSOR_STYLE: NonNullable<ChitauriTerminalOptions["cursorStyle"]> = "bar";
-const TERMINAL_INACTIVE_CURSOR_STYLE: NonNullable<ChitauriTerminalOptions["cursorInactiveStyle"]> =
-  "bar";
-const TERMINAL_CURSOR_WIDTH = 1;
-
-// Once WebGL fails, skip it for subsequent terminals in this renderer process.
-let suggestedRendererType: "webgl" | "dom" | undefined;
-
-function terminalByteLength(data: string): number {
-  return TERMINAL_TEXT_ENCODER.encode(data).byteLength;
-}
-
-function acknowledgeParsedOutput(entry: TerminalRuntimeEntry, bytes: number): void {
-  if (bytes <= 0) return;
-  const api = readNativeApi();
-  if (!api) return;
-  const ackOutput = api.terminal.ackOutput;
-  if (typeof ackOutput !== "function") return;
-
-  void ackOutput({
-    threadId: entry.threadId,
-    terminalId: entry.terminalId,
-    bytes,
-  }).catch(() => {
-    // Flow control is best-effort; reconnect/replay will recover from a missed ACK.
-  });
-}
-
-function setRuntimeStatus(
-  entry: TerminalRuntimeEntry,
-  status: TerminalRuntimeEntry["runtimeStatus"],
-) {
-  if (entry.runtimeStatus === status) return;
-  entry.runtimeStatus = status;
-  entry.callbacks.onTerminalRuntimeStatusChange?.(entry.terminalId, status);
-}
-
-function readCachedTerminalLinks(entry: TerminalRuntimeEntry, line: string) {
-  const cached = entry.linkMatchCache.get(line);
-  if (cached) return cached;
-
-  const matches = extractTerminalLinks(line);
-  if (entry.linkMatchCache.size >= LINK_MATCH_CACHE_LIMIT) {
-    entry.linkMatchCache.clear();
-  }
-  entry.linkMatchCache.set(line, matches);
-  return matches;
-}
-
-function getTerminalParkingContainer(): HTMLDivElement {
-  let container = document.getElementById(TERMINAL_PARKING_CONTAINER_ID) as HTMLDivElement | null;
-  if (container) return container;
-
-  container = document.createElement("div");
-  container.id = TERMINAL_PARKING_CONTAINER_ID;
-  container.setAttribute("aria-hidden", "true");
-  container.style.cssText =
-    "position:fixed;width:0;height:0;overflow:hidden;contain:strict;left:-10000px;top:-10000px;";
-  document.body.append(container);
-  return container;
-}
-
-function scheduleFontSettleRefit(entry: TerminalRuntimeEntry): void {
-  const fontFamily = String(entry.terminal.options.fontFamily ?? "").trim();
-  if (!fontFamily) return;
-  const fontSize = Number(entry.terminal.options.fontSize ?? 12);
-  void waitForTerminalFontReady({ fontFamily, fontSize }).then(() => {
-    if (entry.disposed) return;
-    // Rebuild the WebGL glyph atlas: the immediate refit may have cached glyphs in
-    // the fallback font while the requested font was still loading, and a plain
-    // refresh would keep redrawing those stale glyphs.
-    runTerminalResize(entry, { clearTextureAtlas: true, refresh: true });
-  });
-}
-
-function resetForSnapshotReplay(entry: TerminalRuntimeEntry): void {
-  entry.titleInputBuffer = "";
-  entry.linkMatchCache.clear();
-  clearPendingWrites(entry);
-  entry.terminal.write("\u001bc");
-}
-
-function snapshotReplayPayload(snapshot: TerminalSessionSnapshot): string {
-  return `${snapshot.replayPreamble ?? ""}${snapshot.history}`;
-}
-
-function snapshotHasReplayPayload(snapshot: TerminalSessionSnapshot): boolean {
-  return snapshot.history.length > 0 || (snapshot.replayPreamble?.length ?? 0) > 0;
-}
-
-function clamp(value: number, min: number, max: number): number {
-  return Math.min(max, Math.max(min, value));
-}
-
-// Fit xterm to its container, then clamp the result into the PTY contract bounds.
-// An ultrawide viewport at a small font can legitimately propose more than the
-// old 400-column cap, and a fit before fonts settle can momentarily report a
-// glitched (tiny char width -> huge column count) size. Forcing xterm back into
-// range keeps the open/resize payloads valid — so the terminal always opens —
-// and keeps the rendered grid consistent with what the backend PTY believes.
-function fitTerminal(entry: TerminalRuntimeEntry): void {
-  entry.fitAddon.fit();
-  const cols = clamp(entry.terminal.cols, TERMINAL_MIN_COLS, TERMINAL_MAX_COLS);
-  const rows = clamp(entry.terminal.rows, TERMINAL_MIN_ROWS, TERMINAL_MAX_ROWS);
-  if (cols !== entry.terminal.cols || rows !== entry.terminal.rows) {
-    entry.terminal.resize(cols, rows);
-  }
-}
-
-function buildOpenInput(entry: TerminalRuntimeEntry) {
-  return {
-    threadId: entry.threadId,
-    terminalId: entry.terminalId,
-    cwd: entry.cwd,
-    cols: entry.terminal.cols,
-    rows: entry.terminal.rows,
-    ...(entry.runtimeEnv ? { env: entry.runtimeEnv } : {}),
-  };
-}
-
-function replaySnapshot(
-  entry: TerminalRuntimeEntry,
-  snapshot: TerminalSessionSnapshot,
-  onParsed?: () => void,
-): void {
-  resetForSnapshotReplay(entry);
-  const payload = snapshotReplayPayload(snapshot);
-  if (payload.length > 0) {
-    setRuntimeStatus(entry, "replaying");
-    entry.terminal.write(payload, onParsed);
-    return;
-  }
-  onParsed?.();
-}
-
-function clearBackendResizeTimer(entry: TerminalRuntimeEntry): void {
-  if (entry.resizeDispatchTimer !== null) {
-    window.clearTimeout(entry.resizeDispatchTimer);
-    entry.resizeDispatchTimer = null;
-  }
-}
-
-function clearPendingWrites(entry: TerminalRuntimeEntry): void {
-  if (entry.writeRafHandle !== null) {
-    window.cancelAnimationFrame(entry.writeRafHandle);
-    entry.writeRafHandle = null;
-  }
-  if (entry.writeFlushTimeout !== null) {
-    window.clearTimeout(entry.writeFlushTimeout);
-    entry.writeFlushTimeout = null;
-  }
-  if (entry.pendingWriteBytes > 0) {
-    acknowledgeParsedOutput(entry, entry.pendingWriteBytes);
-  }
-  entry.pendingWrites.length = 0;
-  entry.pendingWriteLength = 0;
-  entry.pendingWriteBytes = 0;
-}
-
-function flushPendingWrites(entry: TerminalRuntimeEntry): void {
-  if (entry.writeRafHandle !== null) {
-    window.cancelAnimationFrame(entry.writeRafHandle);
-    entry.writeRafHandle = null;
-  }
-  if (entry.writeFlushTimeout !== null) {
-    window.clearTimeout(entry.writeFlushTimeout);
-    entry.writeFlushTimeout = null;
-  }
-  if (entry.pendingWrites.length === 0) {
-    entry.pendingWriteLength = 0;
-    entry.pendingWriteBytes = 0;
-    return;
-  }
-  const combined = entry.pendingWrites.map((write) => write.data).join("");
-  const byteLength = entry.pendingWriteBytes;
-  const queuedAt = entry.pendingWrites[0]?.queuedAt ?? performance.now();
-  entry.pendingWrites.length = 0;
-  entry.pendingWriteLength = 0;
-  entry.pendingWriteBytes = 0;
-  try {
-    entry.terminal.write(combined, () => {
-      acknowledgeParsedOutput(entry, byteLength);
-      observeTerminalWriteParsed({
-        runtimeKey: entry.runtimeKey,
-        bytes: byteLength,
-        queuedAt,
-      });
-    });
-  } catch {
-    // xterm throws and discards once its internal pending buffer passes 50 MB.
-    // The callback never fires in that case, so the bytes would stay unacked and
-    // the server's flow control would pause this PTY until its 10s watchdog gave
-    // up. Dropped pixels are recoverable (the server keeps scrollback history);
-    // a stalled ACK stream is not, so account for the bytes either way.
-    acknowledgeParsedOutput(entry, byteLength);
-  }
-}
-
-function scheduleWrite(entry: TerminalRuntimeEntry, data: string, byteLength: number): void {
-  entry.pendingWrites.push({
-    data,
-    byteLength,
-    queuedAt: performance.now(),
-  });
-  entry.pendingWriteLength += data.length;
-  entry.pendingWriteBytes += byteLength;
-
-  if (entry.pendingWriteBytes >= WRITE_BATCH_SIZE_LIMIT) {
-    flushPendingWrites(entry);
-    return;
-  }
-
-  if (entry.writeRafHandle === null) {
-    entry.writeRafHandle = window.requestAnimationFrame(() => {
-      entry.writeRafHandle = null;
-      flushPendingWrites(entry);
-    });
-  }
-  if (entry.writeFlushTimeout === null) {
-    entry.writeFlushTimeout = window.setTimeout(() => {
-      entry.writeFlushTimeout = null;
-      flushPendingWrites(entry);
-    }, WRITE_BATCH_MAX_LATENCY_MS);
-  }
-}
-
-function flushPendingResize(entry: TerminalRuntimeEntry): void {
-  const api = readNativeApi();
-  const pendingResize = entry.pendingResize;
-  if (!api || !pendingResize) return;
-
-  entry.pendingResize = null;
-  entry.lastSentResize = pendingResize;
-  void api.terminal
-    .resize({
-      threadId: entry.threadId,
-      terminalId: entry.terminalId,
-      cols: pendingResize.cols,
-      rows: pendingResize.rows,
-    })
-    .catch(() => {
-      const current = entry.lastSentResize;
-      if (current && current.cols === pendingResize.cols && current.rows === pendingResize.rows) {
-        entry.lastSentResize = null;
-      }
-    });
-}
-
-function queueBackendResize(entry: TerminalRuntimeEntry, cols: number, rows: number): void {
-  const lastSentResize = entry.lastSentResize;
-  const pendingResize = entry.pendingResize;
-  if (
-    (lastSentResize && lastSentResize.cols === cols && lastSentResize.rows === rows) ||
-    (pendingResize && pendingResize.cols === cols && pendingResize.rows === rows)
-  ) {
-    return;
-  }
-  entry.pendingResize = { cols, rows };
-  clearBackendResizeTimer(entry);
-  entry.resizeDispatchTimer = window.setTimeout(() => {
-    entry.resizeDispatchTimer = null;
-    flushPendingResize(entry);
-  }, BACKEND_RESIZE_DEBOUNCE_MS);
-}
-
-function runTerminalResize(
-  entry: TerminalRuntimeEntry,
-  options?: { clearTextureAtlas?: boolean; refresh?: boolean; dispatchBackend?: boolean },
-): void {
-  if (!entry.container || !entry.viewState.isVisible) return;
-
-  const { clearTextureAtlas = false, refresh = false, dispatchBackend = true } = options ?? {};
-  const buffer = entry.terminal.buffer.active;
-  const wasAtBottom = buffer.viewportY >= buffer.baseY;
-  const savedViewportY = buffer.viewportY;
-  const previousCols = entry.terminal.cols;
-  const previousRows = entry.terminal.rows;
-
-  if (clearTextureAtlas) {
-    (
-      entry.webglAddon as unknown as {
-        clearTextureAtlas?: () => void;
-      } | null
-    )?.clearTextureAtlas?.();
-  }
-
-  fitTerminal(entry);
-  if (wasAtBottom) {
-    entry.terminal.scrollToBottom();
-  } else {
-    const targetViewportY = Math.min(savedViewportY, entry.terminal.buffer.active.baseY);
-    if (entry.terminal.buffer.active.viewportY !== targetViewportY) {
-      entry.terminal.scrollToLine(targetViewportY);
-    }
-  }
-  const dimensionsChanged =
-    entry.terminal.cols !== previousCols || entry.terminal.rows !== previousRows;
-  if (dispatchBackend && dimensionsChanged) {
-    queueBackendResize(entry, entry.terminal.cols, entry.terminal.rows);
-  }
-  if (refresh) {
-    entry.terminal.refresh(0, Math.max(0, entry.terminal.rows - 1));
-  }
-}
-
-function cancelScheduledVisualResize(entry: TerminalRuntimeEntry): void {
-  if (entry.visualResizeFrame !== null) {
-    window.cancelAnimationFrame(entry.visualResizeFrame);
-    entry.visualResizeFrame = null;
-  }
-  if (entry.visualResizeTimer !== null) {
-    window.clearTimeout(entry.visualResizeTimer);
-    entry.visualResizeTimer = null;
-  }
-}
-
-function scheduleVisualResize(entry: TerminalRuntimeEntry): void {
-  if (!entry.viewState.isVisible || entry.visualResizeTimer !== null) {
-    return;
-  }
-
-  const now = Date.now();
-  const remaining = Math.max(0, VISUAL_RESIZE_MIN_INTERVAL_MS - (now - entry.lastVisualResizeAt));
-
-  const run = () => {
-    entry.visualResizeTimer = null;
-    if (entry.visualResizeFrame !== null) {
-      window.cancelAnimationFrame(entry.visualResizeFrame);
-    }
-    entry.visualResizeFrame = window.requestAnimationFrame(() => {
-      entry.visualResizeFrame = null;
-      entry.lastVisualResizeAt = Date.now();
-      runTerminalResize(entry);
-    });
-  };
-
-  if (remaining === 0) {
-    run();
-    return;
-  }
-
-  entry.visualResizeTimer = window.setTimeout(run, remaining);
-}
-
-function startVisibilityRecovery(entry: TerminalRuntimeEntry): void {
-  if (!entry.container || !entry.viewState.isVisible || entry.visibilityCleanup) {
-    return;
-  }
-
-  let recoveryFrame = 0;
-  let throttleTimer: number | null = null;
-  let lastRunAt = 0;
-  const RECOVERY_THROTTLE_MS = 120;
-
-  const runRecovery = () => {
-    const mount = entry.container;
-    if (!mount) return;
-    if (!mount.isConnected) return;
-
-    const style = window.getComputedStyle(mount);
-    if (style.display === "none" || style.visibility === "hidden") {
-      return;
-    }
-    const rect = mount.getBoundingClientRect();
-    if (rect.width <= 1 || rect.height <= 1) {
-      return;
-    }
-
-    cancelScheduledVisualResize(entry);
-    entry.lastVisualResizeAt = Date.now();
-    runTerminalResize(entry, {
-      clearTextureAtlas: true,
-      refresh: true,
-    });
-  };
-
-  const scheduleRecovery = () => {
-    if (recoveryFrame !== 0) return;
-
-    recoveryFrame = window.requestAnimationFrame(() => {
-      recoveryFrame = 0;
-      const now = Date.now();
-      if (now - lastRunAt < RECOVERY_THROTTLE_MS) {
-        const remaining = RECOVERY_THROTTLE_MS - (now - lastRunAt);
-        if (throttleTimer !== null) {
-          window.clearTimeout(throttleTimer);
-        }
-        throttleTimer = window.setTimeout(() => {
-          throttleTimer = null;
-          scheduleRecovery();
-        }, remaining + 1);
-        return;
-      }
-      lastRunAt = now;
-      runRecovery();
-    });
-  };
-
-  const handleVisibilityChange = () => {
-    if (document.hidden) return;
-    scheduleRecovery();
-  };
-  const handleWindowFocus = () => {
-    scheduleRecovery();
-  };
-
-  document.addEventListener("visibilitychange", handleVisibilityChange);
-  window.addEventListener("focus", handleWindowFocus);
-  entry.visibilityCleanup = () => {
-    document.removeEventListener("visibilitychange", handleVisibilityChange);
-    window.removeEventListener("focus", handleWindowFocus);
-    if (recoveryFrame !== 0) {
-      window.cancelAnimationFrame(recoveryFrame);
-    }
-    if (throttleTimer !== null) {
-      window.clearTimeout(throttleTimer);
-    }
-    entry.visibilityCleanup = null;
-  };
-}
-
-function stopVisibilityRecovery(entry: TerminalRuntimeEntry): void {
-  entry.visibilityCleanup?.();
-  entry.visibilityCleanup = null;
-}
-
-function syncTheme(entry: TerminalRuntimeEntry): void {
-  const nextTheme = terminalThemeFromApp();
-  const nextFontFamily = getTerminalFontFamily();
-  const nextFontSize = getTerminalFontSizePx();
-  const nextFontWeight = getTerminalFontWeight();
-  const nextBoldFontWeight = getTerminalBoldFontWeight();
-  const nextFontKey = JSON.stringify({
-    fontFamily: nextFontFamily,
-    fontSize: nextFontSize,
-    fontWeight: nextFontWeight,
-    fontWeightBold: nextBoldFontWeight,
-  });
-  const nextAppearanceKey = JSON.stringify({
-    fontFamily: nextFontFamily,
-    fontSize: nextFontSize,
-    fontWeight: nextFontWeight,
-    fontWeightBold: nextBoldFontWeight,
-    cursorStyle: TERMINAL_CURSOR_STYLE,
-    cursorInactiveStyle: TERMINAL_INACTIVE_CURSOR_STYLE,
-    cursorWidth: TERMINAL_CURSOR_WIDTH,
-    theme: nextTheme,
-  });
-  const previousAppearanceKey = (entry.wrapper.dataset.themeKey ?? "") as string;
-  if (nextAppearanceKey === previousAppearanceKey) {
-    return;
-  }
-  const shouldClearTextureAtlas = nextFontKey !== (entry.wrapper.dataset.fontKey ?? "");
-  entry.wrapper.dataset.themeKey = nextAppearanceKey;
-  entry.wrapper.dataset.fontKey = nextFontKey;
-  const terminalOptions = entry.terminal.options as ChitauriTerminalOptions;
-  terminalOptions.theme = nextTheme;
-  terminalOptions.fontFamily = nextFontFamily;
-  terminalOptions.fontSize = nextFontSize;
-  terminalOptions.fontWeight = nextFontWeight;
-  terminalOptions.fontWeightBold = nextBoldFontWeight;
-  terminalOptions.cursorStyle = TERMINAL_CURSOR_STYLE;
-  terminalOptions.cursorInactiveStyle = TERMINAL_INACTIVE_CURSOR_STYLE;
-  terminalOptions.cursorWidth = TERMINAL_CURSOR_WIDTH;
-  if (shouldClearTextureAtlas) {
-    scheduleFontSettleRefit(entry);
-  }
-  if (entry.viewState.isVisible) {
-    runTerminalResize(entry, { clearTextureAtlas: shouldClearTextureAtlas, refresh: true });
-  } else {
-    entry.terminal.refresh(0, Math.max(0, entry.terminal.rows - 1));
-  }
-}
-
-function cancelPendingWebglLoad(entry: TerminalRuntimeEntry): void {
-  if (entry.webglLoadFrame !== null) {
-    window.cancelAnimationFrame(entry.webglLoadFrame);
-    entry.webglLoadFrame = null;
-  }
-}
-
-function disposeWebglAddon(entry: TerminalRuntimeEntry): void {
-  cancelPendingWebglLoad(entry);
-  entry.webglAddon?.dispose();
-  entry.webglAddon = null;
-}
-
-function maybeLoadWebglAddon(entry: TerminalRuntimeEntry): void {
-  if (
-    entry.disposed ||
-    !ENABLE_TERMINAL_WEBGL ||
-    suggestedRendererType === "dom" ||
-    entry.webglAddon !== null ||
-    entry.webglLoadFrame !== null ||
-    !entry.viewState.isVisible
-  ) {
-    return;
-  }
-
-  entry.webglLoadFrame = window.requestAnimationFrame(() => {
-    entry.webglLoadFrame = null;
-    if (
-      entry.disposed ||
-      !ENABLE_TERMINAL_WEBGL ||
-      suggestedRendererType === "dom" ||
-      entry.webglAddon !== null ||
-      !entry.viewState.isVisible
-    ) {
-      return;
-    }
-
-    try {
-      const nextWebglAddon = new WebglAddon();
-      nextWebglAddon.onContextLoss(() => {
-        suggestedRendererType = "dom";
-        nextWebglAddon.dispose();
-        if (entry.webglAddon === nextWebglAddon) {
-          entry.webglAddon = null;
-        }
-        entry.terminal.refresh(0, Math.max(0, entry.terminal.rows - 1));
-      });
-      entry.terminal.loadAddon(nextWebglAddon);
-      entry.webglAddon = nextWebglAddon;
-    } catch {
-      suggestedRendererType = "dom";
-      entry.webglAddon = null;
-    }
-  });
-}
-
-function applyInitialVisualResize(entry: TerminalRuntimeEntry): void {
-  if (!entry.viewState.isVisible) return;
-
-  let firstFrame = 0;
-  let secondFrame = 0;
-
-  firstFrame = window.requestAnimationFrame(() => {
-    cancelScheduledVisualResize(entry);
-    entry.lastVisualResizeAt = Date.now();
-    runTerminalResize(entry, {
-      clearTextureAtlas: true,
-      refresh: true,
-    });
-
-    secondFrame = window.requestAnimationFrame(() => {
-      entry.lastVisualResizeAt = Date.now();
-      runTerminalResize(entry, { refresh: true });
-    });
-  });
-
-  entry.attachDisposables.push(() => {
-    if (firstFrame !== 0) {
-      window.cancelAnimationFrame(firstFrame);
-    }
-    if (secondFrame !== 0) {
-      window.cancelAnimationFrame(secondFrame);
-    }
-  });
-}
-
-function ensureResizeObserver(entry: TerminalRuntimeEntry): void {
-  if (!entry.container || !entry.viewState.isVisible || entry.resizeObserver) {
-    return;
-  }
-
-  let frame = 0;
-  const observer = new ResizeObserver((entries) => {
-    if (
-      entries.some(
-        (resizeEntry) => resizeEntry.contentRect.width <= 0 || resizeEntry.contentRect.height <= 0,
-      )
-    ) {
-      cancelScheduledVisualResize(entry);
-      return;
-    }
-    if (frame !== 0) {
-      window.cancelAnimationFrame(frame);
-    }
-    frame = window.requestAnimationFrame(() => {
-      frame = 0;
-      scheduleVisualResize(entry);
-    });
-  });
-
-  observer.observe(entry.container);
-  entry.resizeObserver = observer;
-  entry.attachDisposables.push(() => {
-    observer.disconnect();
-    if (frame !== 0) {
-      window.cancelAnimationFrame(frame);
-    }
-    if (entry.resizeObserver === observer) {
-      entry.resizeObserver = null;
-    }
-  });
-}
-
-function clearAttachDisposables(entry: TerminalRuntimeEntry): void {
-  const disposables = [...entry.attachDisposables];
-  entry.attachDisposables.length = 0;
-  for (const dispose of disposables) {
-    dispose();
-  }
-  entry.resizeObserver = null;
-}
-
-async function sendTerminalInput(
-  entry: TerminalRuntimeEntry,
-  data: string,
-  fallbackError: string,
-): Promise<void> {
-  const api = readNativeApi();
-  if (!api) return;
-  try {
-    await api.terminal.write({ threadId: entry.threadId, terminalId: entry.terminalId, data });
-  } catch (error) {
-    writeSystemMessage(entry.terminal, describeErrorMessage(error, fallbackError));
-  }
-}
-
-function reconcileTerminalSnapshot(entry: TerminalRuntimeEntry): void {
-  if (entry.disposed || !entry.opened || entry.hasHandledExit) return;
-  const api = readNativeApi();
-  if (!api) return;
-
-  const outputEventVersionAtRequest = entry.outputEventVersion;
-  const requestId = ++entry.snapshotReconcileRequestId;
-  setRuntimeStatus(entry, "connecting");
-
-  void api.terminal
-    .open(buildOpenInput(entry))
-    .then((snapshot) => {
-      if (
-        entry.disposed ||
-        !entry.opened ||
-        entry.hasHandledExit ||
-        entry.snapshotReconcileRequestId !== requestId
-      ) {
-        return;
-      }
-
-      if (entry.outputEventVersion !== outputEventVersionAtRequest) {
-        return;
-      }
-
-      if (snapshotHasReplayPayload(snapshot)) {
-        replaySnapshot(entry, snapshot, () => {
-          if (!entry.disposed && entry.snapshotReconcileRequestId === requestId) {
-            setRuntimeStatus(entry, "ready");
-          }
-        });
-        return;
-      }
-
-      setRuntimeStatus(entry, "ready");
-    })
-    .catch((error) => {
-      if (entry.disposed || !entry.opened || entry.snapshotReconcileRequestId !== requestId) {
-        return;
-      }
-      setRuntimeStatus(entry, "error");
-      writeSystemMessage(
-        entry.terminal,
-        error instanceof Error ? error.message : "Failed to reconnect terminal",
-      );
-    });
-}
-
-export function syncRuntimeConfig(
-  entry: TerminalRuntimeEntry,
-  config: TerminalRuntimeConfig,
-): void {
-  entry.runtimeKey = config.runtimeKey;
-  entry.threadId = config.threadId;
-  entry.terminalId = config.terminalId;
-  entry.terminalLabel = config.terminalLabel;
-  entry.terminalCliKind = config.terminalCliKind ?? entry.terminalCliKind ?? null;
-  entry.cwd = config.cwd;
-  if (config.runtimeEnv === undefined) {
-    delete entry.runtimeEnv;
-  } else {
-    entry.runtimeEnv = config.runtimeEnv;
-  }
-  entry.callbacks = config.callbacks;
-}
-
-export function createRuntimeEntry(config: TerminalRuntimeConfig): TerminalRuntimeEntry {
-  const wrapper = document.createElement("div");
-  wrapper.className = "h-full w-full";
-
-  const fitAddon = new FitAddon();
-  const clipboardAddon = new ClipboardAddon();
-  // Defaults are storageLimit 128 MB and pixelLimit 16 MPx *per terminal*, so six
-  // open terminals carry a 768 MB image-cache ceiling. Inline images in a coding
-  // agent's terminal are occasional and small; cap them well below the default.
-  const imageAddon = new ImageAddon({ storageLimit: 16, pixelLimit: 4_194_304 });
-  const searchAddon = new SearchAddon();
-  const unicode11Addon = new Unicode11Addon();
-  const terminalOptions: ChitauriTerminalOptions = {
-    cursorBlink: true,
-    fontSize: getTerminalFontSizePx(),
-    fontWeight: getTerminalFontWeight(),
-    fontWeightBold: getTerminalBoldFontWeight(),
-    scrollback: 5_000,
-    fontFamily: getTerminalFontFamily(),
-    theme: terminalThemeFromApp(),
-    allowProposedApi: true,
-    customGlyphs: true,
-    macOptionIsMeta: false,
-    cursorStyle: TERMINAL_CURSOR_STYLE,
-    cursorInactiveStyle: TERMINAL_INACTIVE_CURSOR_STYLE,
-    cursorWidth: TERMINAL_CURSOR_WIDTH,
-    screenReaderMode: false,
-    allowTransparency: false,
-    vtExtensions: { kittyKeyboard: true },
-    scrollbar: { showScrollbar: false },
-  };
-  const terminal = new Terminal(terminalOptions);
-  terminal.loadAddon(fitAddon);
-  terminal.loadAddon(clipboardAddon);
-  terminal.loadAddon(imageAddon);
-  terminal.loadAddon(searchAddon);
-  terminal.loadAddon(unicode11Addon);
-  terminal.unicode.activeVersion = "11";
-  try {
-    terminal.loadAddon(new LigaturesAddon());
-  } catch {
-    // Keep terminal startup resilient when the active font doesn't support ligatures.
-  }
-  terminal.open(wrapper);
-
-  const entry: TerminalRuntimeEntry = {
-    runtimeKey: config.runtimeKey,
-    threadId: config.threadId,
-    terminalId: config.terminalId,
-    terminalLabel: config.terminalLabel,
-    terminalCliKind: config.terminalCliKind ?? null,
-    cwd: config.cwd,
-    callbacks: config.callbacks,
-    wrapper,
-    container: null,
-    terminal,
-    fitAddon,
-    searchAddon,
-    webglAddon: null,
-    titleInputBuffer: "",
-    hasHandledExit: false,
-    runtimeStatus: "connecting",
-    opened: false,
-    disposed: false,
-    resizeObserver: null,
-    resizeDispatchTimer: null,
-    visualResizeFrame: null,
-    visualResizeTimer: null,
-    lastVisualResizeAt: 0,
-    lastSentResize: null,
-    pendingResize: null,
-    writeRafHandle: null,
-    writeFlushTimeout: null,
-    pendingWrites: [],
-    pendingWriteLength: 0,
-    pendingWriteBytes: 0,
-    linkMatchCache: new Map(),
-    outputEventVersion: 0,
-    snapshotReconcileRequestId: 0,
-    webglLoadFrame: null,
-    themeRefreshFrame: 0,
-    themeObserver: null,
-    visibilityCleanup: null,
-    terminalDisposables: [],
-    attachDisposables: [],
-    persistentDisposables: [],
-    querySuppressionDispose: null,
-    viewState: {
-      autoFocus: false,
-      isVisible: false,
-    },
-    unsubscribeTerminalEvents: null,
-  };
-  if (config.runtimeEnv !== undefined) {
-    entry.runtimeEnv = config.runtimeEnv;
-  }
-
-  scheduleFontSettleRefit(entry);
-  entry.querySuppressionDispose = suppressQueryResponses(terminal);
-
-  const handleCopy = (event: ClipboardEvent) => {
-    const selection = terminal.getSelection();
-    if (!selection) return;
-    const trimmed = selection.replace(/[^\S\n]+$/gm, "");
-    if (trimmed === selection) return;
-
-    if (event.clipboardData) {
-      event.preventDefault();
-      event.clipboardData.setData("text/plain", trimmed);
-      return;
-    }
-
-    void navigator.clipboard?.writeText(trimmed).catch(() => undefined);
-  };
-  wrapper.addEventListener("copy", handleCopy);
-  entry.persistentDisposables.push(() => {
-    wrapper.removeEventListener("copy", handleCopy);
-  });
-
-  const unsubscribeTransportState = addWsTransportStateListener((state) => {
-    if (entry.disposed || !entry.opened || entry.hasHandledExit) return;
-    if (state === "open") {
-      reconcileTerminalSnapshot(entry);
-      return;
-    }
-    if (state === "connecting" || state === "closed") {
-      setRuntimeStatus(entry, "connecting");
-    }
-  });
-  entry.persistentDisposables.push(unsubscribeTransportState);
-
-  terminal.attachCustomKeyEventHandler((event) => {
-    if (
-      event.type === "keydown" &&
-      event.key === "Enter" &&
-      event.shiftKey &&
-      !event.metaKey &&
-      !event.ctrlKey &&
-      !event.altKey
-    ) {
-      event.preventDefault();
-      event.stopPropagation();
-      void sendTerminalInput(entry, "\n", "Failed to insert newline");
-      return false;
-    }
-
-    if (
-      event.type === "keydown" &&
-      event.key.toLowerCase() === "f" &&
-      (event.metaKey || event.ctrlKey) &&
-      !event.altKey &&
-      !event.shiftKey
-    ) {
-      return true;
-    }
-
-    const navigationData = terminalNavigationShortcutData(event);
-    if (navigationData !== null) {
-      event.preventDefault();
-      event.stopPropagation();
-      void sendTerminalInput(entry, navigationData, "Failed to move cursor");
-      return false;
-    }
-
-    if (!isTerminalClearShortcut(event)) return true;
-    event.preventDefault();
-    event.stopPropagation();
-    void sendTerminalInput(entry, "\u000c", "Failed to clear terminal");
-    return false;
-  });
-
-  entry.terminalDisposables.push(
-    terminal.registerLinkProvider({
-      provideLinks: (bufferLineNumber, callback) => {
-        const wrappedLine = collectWrappedTerminalLinkLine(bufferLineNumber, (bufferLineIndex) =>
-          terminal.buffer.active.getLine(bufferLineIndex),
-        );
-        if (!wrappedLine) {
-          callback(undefined);
-          return;
-        }
-
-        const links = readCachedTerminalLinks(entry, wrappedLine.text)
-          .map((match) => ({
-            match,
-            range: resolveWrappedTerminalLinkRange(wrappedLine, match),
-          }))
-          .filter(({ range }) =>
-            wrappedTerminalLinkRangeIntersectsBufferLine(range, bufferLineNumber),
-          );
-        if (links.length === 0) {
-          callback(undefined);
-          return;
-        }
-
-        callback(
-          links.map(({ match, range }) => ({
-            text: match.text,
-            range,
-            activate: (event: MouseEvent) => {
-              if (!isTerminalLinkActivation(event)) return;
-              const api = readNativeApi();
-              if (!api) return;
-
-              if (match.kind === "url") {
-                void api.shell.openExternal(match.text).catch((error) => {
-                  writeSystemMessage(terminal, describeErrorMessage(error, "Unable to open link"));
-                });
-                return;
-              }
-
-              const target = resolvePathLinkTarget(match.text, entry.cwd);
-              void openInPreferredEditor(api, target).catch((error) => {
-                writeSystemMessage(terminal, describeErrorMessage(error, "Unable to open path"));
-              });
-            },
-          })),
-        );
-      },
-    }),
-  );
-
-  entry.terminalDisposables.push(
-    terminal.onData((data) => {
-      const nextIdentityState = consumeTerminalIdentityInput(entry.titleInputBuffer, data);
-      entry.titleInputBuffer = nextIdentityState.buffer;
-      const submittedIdentity = nextIdentityState.identity;
-      if (submittedIdentity && (submittedIdentity.cliKind || entry.terminalCliKind !== null)) {
-        entry.terminalCliKind = submittedIdentity.cliKind;
-        entry.callbacks.onTerminalMetadataChange(entry.terminalId, {
-          cliKind: submittedIdentity.cliKind,
-          label: submittedIdentity.title,
-        });
-      }
-      const api = readNativeApi();
-      if (!api) return;
-      void api.terminal
-        .write({ threadId: entry.threadId, terminalId: entry.terminalId, data })
-        .catch((error) =>
-          writeSystemMessage(terminal, describeErrorMessage(error, "Terminal write failed")),
-        );
-    }),
-  );
-
-  entry.themeObserver = new MutationObserver(() => {
-    if (entry.themeRefreshFrame !== 0) return;
-    entry.themeRefreshFrame = window.requestAnimationFrame(() => {
-      entry.themeRefreshFrame = 0;
-      syncTheme(entry);
-    });
-  });
-  entry.themeObserver.observe(document.documentElement, {
-    attributes: true,
-    attributeFilter: ["class", "style"],
-  });
-
-  entry.unsubscribeTerminalEvents = terminalEventDispatcher.subscribe(
-    entry.threadId,
-    entry.terminalId,
-    (event) => {
-      if (event.type === "output") {
-        setRuntimeStatus(entry, "ready");
-        entry.outputEventVersion += 1;
-        scheduleWrite(entry, event.data, event.byteLength ?? terminalByteLength(event.data));
-        return;
-      }
-
-      if (event.type === "started" || event.type === "restarted") {
-        entry.hasHandledExit = false;
-        const shouldReplaySnapshot =
-          event.type === "restarted" || snapshotHasReplayPayload(event.snapshot);
-        if (shouldReplaySnapshot) {
-          replaySnapshot(entry, event.snapshot, () => setRuntimeStatus(entry, "ready"));
-        } else {
-          setRuntimeStatus(entry, "ready");
-        }
-        return;
-      }
-
-      if (event.type === "cleared") {
-        entry.titleInputBuffer = "";
-        entry.linkMatchCache.clear();
-        clearPendingWrites(entry);
-        terminal.clear();
-        terminal.write("\u001bc");
-        return;
-      }
-
-      if (event.type === "activity") {
-        if (entry.terminalCliKind !== event.cliKind) {
-          entry.terminalCliKind = event.cliKind;
-          entry.callbacks.onTerminalMetadataChange(entry.terminalId, {
-            cliKind: event.cliKind,
-            label: event.cliKind ? defaultTerminalTitleForCliKind(event.cliKind) : "Terminal",
-          });
-        }
-        entry.callbacks.onTerminalActivityChange(entry.terminalId, {
-          hasRunningSubprocess: event.hasRunningSubprocess,
-          agentState: event.agentState,
-        });
-        return;
-      }
-
-      if (event.type === "error") {
-        setRuntimeStatus(entry, "error");
-        writeSystemMessage(terminal, event.message);
-        return;
-      }
-
-      if (event.type === "exited") {
-        flushPendingWrites(entry);
-        const details = [
-          typeof event.exitCode === "number" ? `code ${event.exitCode}` : null,
-          typeof event.exitSignal === "number" ? `signal ${event.exitSignal}` : null,
-        ]
-          .filter((value): value is string => value !== null)
-          .join(", ");
-        writeSystemMessage(
-          terminal,
-          details.length > 0 ? `Process exited (${details})` : "Process exited",
-        );
-        if (entry.hasHandledExit) {
-          return;
-        }
-        entry.hasHandledExit = true;
-        window.setTimeout(() => {
-          if (!entry.hasHandledExit) {
-            return;
-          }
-          entry.callbacks.onSessionExited();
-        }, 0);
-      }
-    },
-  );
-
-  return entry;
-}
-
-function openTerminal(entry: TerminalRuntimeEntry): void {
-  const api = readNativeApi();
-  if (!api || entry.opened) return;
-
-  fitTerminal(entry);
-  entry.lastSentResize = null;
-  entry.opened = true;
-  setRuntimeStatus(entry, "connecting");
-  const outputEventVersionAtOpen = entry.outputEventVersion;
-  const openInput = buildOpenInput(entry);
-
-  void api.terminal
-    .open(openInput)
-    .then((snapshot) => {
-      if (entry.disposed) return;
-      if (
-        snapshotHasReplayPayload(snapshot) &&
-        entry.outputEventVersion === outputEventVersionAtOpen
-      ) {
-        replaySnapshot(entry, snapshot, () => setRuntimeStatus(entry, "ready"));
-      } else if (entry.outputEventVersion === outputEventVersionAtOpen) {
-        setRuntimeStatus(entry, "ready");
-        window.setTimeout(() => {
-          if (
-            entry.disposed ||
-            !entry.opened ||
-            entry.outputEventVersion !== outputEventVersionAtOpen
-          ) {
-            return;
-          }
-          void api.terminal
-            .open(openInput)
-            .then((nextSnapshot) => {
-              if (
-                entry.disposed ||
-                entry.outputEventVersion !== outputEventVersionAtOpen ||
-                !snapshotHasReplayPayload(nextSnapshot)
-              ) {
-                return;
-              }
-              replaySnapshot(entry, nextSnapshot, () => setRuntimeStatus(entry, "ready"));
-            })
-            .catch(() => {
-              // Best-effort recovery only; the original open already succeeded.
-            });
-        }, OPEN_SNAPSHOT_RECONCILE_DELAY_MS);
-      }
-      if (entry.viewState.autoFocus) {
-        window.requestAnimationFrame(() => {
-          entry.terminal.focus();
-        });
-      }
-    })
-    .catch((error) => {
-      if (entry.disposed) return;
-      entry.opened = false;
-      setRuntimeStatus(entry, "error");
-      writeSystemMessage(entry.terminal, describeErrorMessage(error, "Failed to open terminal"));
-    });
-}
-
-export function attachRuntimeToContainer(
-  entry: TerminalRuntimeEntry,
-  viewState: TerminalRuntimeViewState,
-  container: HTMLDivElement,
-): void {
-  if (entry.container !== container) {
-    detachRuntimeFromContainer(entry);
-    entry.container = container;
-    container.append(entry.wrapper);
-  }
-
-  updateRuntimeViewState(entry, viewState);
-  maybeLoadWebglAddon(entry);
-  ensureResizeObserver(entry);
-  startVisibilityRecovery(entry);
-  openTerminal(entry);
-}
-
-export function updateRuntimeViewState(
-  entry: TerminalRuntimeEntry,
-  nextViewState: TerminalRuntimeViewState,
-): void {
-  const wasVisible = entry.viewState.isVisible;
-  entry.viewState = nextViewState;
-
-  if (entry.container) {
-    if (nextViewState.isVisible && !wasVisible) {
-      maybeLoadWebglAddon(entry);
-      applyInitialVisualResize(entry);
-      ensureResizeObserver(entry);
-      startVisibilityRecovery(entry);
-    } else if (!nextViewState.isVisible && wasVisible) {
-      cancelScheduledVisualResize(entry);
-      stopVisibilityRecovery(entry);
-      disposeWebglAddon(entry);
-      clearAttachDisposables(entry);
-    }
-  }
-
-  if (nextViewState.autoFocus) {
-    window.requestAnimationFrame(() => {
-      entry.terminal.focus();
-    });
-  }
-}
-
-export function detachRuntimeFromContainer(entry: TerminalRuntimeEntry): void {
-  cancelScheduledVisualResize(entry);
-  stopVisibilityRecovery(entry);
-  disposeWebglAddon(entry);
-  clearAttachDisposables(entry);
-  clearBackendResizeTimer(entry);
-  entry.pendingResize = null;
-  entry.lastSentResize = null;
-  entry.lastVisualResizeAt = 0;
-  getTerminalParkingContainer().append(entry.wrapper);
-  entry.container = null;
-}
-
-export function disposeRuntimeEntry(entry: TerminalRuntimeEntry): void {
-  detachRuntimeFromContainer(entry);
-  entry.disposed = true;
-  // Closing a terminal should not synchronously paint queued output into a buffer
-  // that is about to be destroyed; acknowledge and drop it to keep close latency low.
-  clearPendingWrites(entry);
-  entry.unsubscribeTerminalEvents?.();
-  entry.unsubscribeTerminalEvents = null;
-  entry.querySuppressionDispose?.();
-  entry.querySuppressionDispose = null;
-  if (entry.themeRefreshFrame !== 0) {
-    window.cancelAnimationFrame(entry.themeRefreshFrame);
-    entry.themeRefreshFrame = 0;
-  }
-  entry.themeObserver?.disconnect();
-  entry.themeObserver = null;
-  for (const disposable of entry.terminalDisposables) {
-    disposable.dispose();
-  }
-  entry.terminalDisposables.length = 0;
-  for (const dispose of entry.persistentDisposables) {
-    dispose();
-  }
-  entry.persistentDisposables.length = 0;
-  disposeWebglAddon(entry);
-  entry.terminal.dispose();
-  entry.wrapper.remove();
-}
diff --git a/apps/web/src/components/terminal/terminalRuntimeAppearance.browser.tsx b/apps/web/src/components/terminal/terminalRuntimeAppearance.browser.tsx
deleted file mode 100644
index bb4719155..000000000
--- a/apps/web/src/components/terminal/terminalRuntimeAppearance.browser.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-// FILE: terminalRuntimeAppearance.browser.ts
-// Purpose: Verifies terminal theme colors resolve from live browser CSS variables.
-// Layer: Browser rendering tests for terminal runtime appearance
-
-import { afterEach, describe, expect, it } from "vitest";
-
-import {
-  getTerminalBoldFontWeight,
-  getTerminalFontWeight,
-  terminalThemeFromApp,
-} from "./terminalRuntimeAppearance";
-
-const root = document.documentElement;
-const originalRootClassName = root.className;
-const originalRootStyle = root.getAttribute("style");
-
-afterEach(() => {
-  root.className = originalRootClassName;
-  if (originalRootStyle === null) {
-    root.removeAttribute("style");
-  } else {
-    root.setAttribute("style", originalRootStyle);
-  }
-});
-
-describe("terminalThemeFromApp", () => {
-  it("uses Codex-style terminal tokens from the active theme pack", () => {
-    root.classList.add("dark");
-    root.style.setProperty("--color-token-terminal-background", "#0f0f11");
-    root.style.setProperty("--color-token-terminal-foreground", "#e3e4e6");
-    root.style.setProperty("--color-token-terminal-ansi-blue", "#606acc");
-    root.style.setProperty("--color-token-terminal-ansi-green", "#56a554");
-    root.style.setProperty("--color-token-terminal-ansi-magenta", "#c2a1ff");
-    root.style.setProperty("--color-token-terminal-ansi-red", "#ff7e78");
-    root.style.setProperty("--color-token-terminal-ansi-yellow", "#f5b44a");
-    root.style.setProperty("--color-text-accent", "#8f96db");
-    root.style.setProperty("--color-token-scrollbar-slider-background", "rgba(255,255,255,0.1)");
-    root.style.setProperty(
-      "--color-token-scrollbar-slider-hover-background",
-      "rgba(255,255,255,0.2)",
-    );
-    root.style.setProperty(
-      "--color-token-scrollbar-slider-active-background",
-      "rgba(255,255,255,0.3)",
-    );
-
-    const theme = terminalThemeFromApp();
-
-    expect(theme.background).toBe("rgb(15, 15, 17)");
-    expect(theme.foreground).toBe("rgb(227, 228, 230)");
-    expect(theme.cursor).toBe("rgb(227, 228, 230)");
-    expect(theme.blue).toBe("rgb(96, 106, 204)");
-    expect(theme.green).toBe("rgb(86, 165, 84)");
-    expect(theme.magenta).toBe("rgb(194, 161, 255)");
-    expect(theme.red).toBe("rgb(255, 126, 120)");
-    expect(theme.yellow).toBe("rgb(245, 180, 74)");
-    expect(theme.selectionBackground).toMatch(/^rgba\(\d+, \d+, \d+, 0\.\d+\)$/);
-  });
-
-  it("keeps terminal text intentionally lighter than bold shell output", () => {
-    expect(getTerminalFontWeight()).toBe(300);
-    expect(getTerminalBoldFontWeight()).toBe(500);
-  });
-});
diff --git a/apps/web/src/components/terminal/terminalRuntimeAppearance.ts b/apps/web/src/components/terminal/terminalRuntimeAppearance.ts
deleted file mode 100644
index 43de89550..000000000
--- a/apps/web/src/components/terminal/terminalRuntimeAppearance.ts
+++ /dev/null
@@ -1,283 +0,0 @@
-// FILE: terminalRuntimeAppearance.ts
-// Purpose: Resolve terminal theme, font, and system-message styling from app chrome tokens.
-// Layer: Terminal runtime infrastructure
-
-import { Terminal, type ITheme } from "@xterm/xterm";
-
-const FALLBACK_MONO_FONT_FAMILY = '"0xProto", monospace';
-const FALLBACK_TERMINAL_FONT_SIZE_PX = 12;
-const TERMINAL_FONT_WEIGHT = 300;
-const TERMINAL_BOLD_FONT_WEIGHT = 500;
-
-const DARK_TERMINAL_THEME_FALLBACK = {
-  background: "rgb(14, 18, 24)",
-  black: "rgb(24, 30, 38)",
-  blue: "rgb(137, 190, 255)",
-  brightBlack: "rgb(110, 120, 136)",
-  brightBlue: "rgb(174, 210, 255)",
-  brightCyan: "rgb(167, 244, 247)",
-  brightGreen: "rgb(176, 245, 186)",
-  brightMagenta: "rgb(229, 203, 255)",
-  brightRed: "rgb(255, 168, 180)",
-  brightWhite: "rgb(244, 247, 252)",
-  brightYellow: "rgb(255, 224, 149)",
-  cursor: "rgb(180, 203, 255)",
-  cyan: "rgb(124, 232, 237)",
-  foreground: "rgb(237, 241, 247)",
-  green: "rgb(134, 231, 149)",
-  magenta: "rgb(208, 176, 255)",
-  red: "rgb(255, 122, 142)",
-  scrollbarSliderActiveBackground: "rgba(255, 255, 255, 0.2)",
-  scrollbarSliderBackground: "rgba(255, 255, 255, 0.07)",
-  scrollbarSliderHoverBackground: "rgba(255, 255, 255, 0.14)",
-  selectionBackground: "rgba(180, 203, 255, 0.25)",
-  white: "rgb(210, 218, 230)",
-  yellow: "rgb(244, 205, 114)",
-} as const satisfies ITheme;
-
-const LIGHT_TERMINAL_THEME_FALLBACK = {
-  background: "rgb(255, 255, 255)",
-  black: "rgb(44, 53, 66)",
-  blue: "rgb(72, 102, 163)",
-  brightBlack: "rgb(112, 123, 140)",
-  brightBlue: "rgb(91, 124, 194)",
-  brightCyan: "rgb(70, 149, 164)",
-  brightGreen: "rgb(85, 148, 111)",
-  brightMagenta: "rgb(153, 107, 172)",
-  brightRed: "rgb(212, 95, 112)",
-  brightWhite: "rgb(236, 240, 246)",
-  brightYellow: "rgb(173, 133, 45)",
-  cursor: "rgb(38, 56, 78)",
-  cyan: "rgb(53, 127, 141)",
-  foreground: "rgb(28, 33, 41)",
-  green: "rgb(60, 126, 86)",
-  magenta: "rgb(132, 86, 149)",
-  red: "rgb(191, 70, 87)",
-  scrollbarSliderActiveBackground: "rgba(0, 0, 0, 0.24)",
-  scrollbarSliderBackground: "rgba(0, 0, 0, 0.1)",
-  scrollbarSliderHoverBackground: "rgba(0, 0, 0, 0.18)",
-  selectionBackground: "rgba(37, 63, 99, 0.2)",
-  white: "rgb(210, 215, 223)",
-  yellow: "rgb(146, 112, 35)",
-} as const satisfies ITheme;
-
-let colorNormalizationContext: CanvasRenderingContext2D | null | undefined;
-
-export function getTerminalFontFamily(): string {
-  if (typeof window === "undefined") {
-    return FALLBACK_MONO_FONT_FAMILY;
-  }
-
-  const configuredFontFamily = getComputedStyle(document.documentElement)
-    .getPropertyValue("--terminal-font-family")
-    .trim();
-  return configuredFontFamily || FALLBACK_MONO_FONT_FAMILY;
-}
-
-export function getTerminalFontSizePx(): number {
-  if (typeof window === "undefined") {
-    return FALLBACK_TERMINAL_FONT_SIZE_PX;
-  }
-
-  const rawValue = getComputedStyle(document.documentElement)
-    .getPropertyValue("--app-font-size-terminal")
-    .trim();
-  const parsedValue = Number.parseFloat(rawValue);
-  return Number.isFinite(parsedValue) && parsedValue > 0
-    ? parsedValue
-    : FALLBACK_TERMINAL_FONT_SIZE_PX;
-}
-
-export function getTerminalFontWeight(): number {
-  return TERMINAL_FONT_WEIGHT;
-}
-
-export function getTerminalBoldFontWeight(): number {
-  return TERMINAL_BOLD_FONT_WEIGHT;
-}
-
-function getColorNormalizationContext(): CanvasRenderingContext2D | null {
-  if (colorNormalizationContext !== undefined) {
-    return colorNormalizationContext;
-  }
-  if (typeof document === "undefined") {
-    colorNormalizationContext = null;
-    return colorNormalizationContext;
-  }
-  const canvas = document.createElement("canvas");
-  canvas.width = 1;
-  canvas.height = 1;
-  colorNormalizationContext = canvas.getContext("2d", { willReadFrequently: true });
-  if (colorNormalizationContext) {
-    colorNormalizationContext.globalCompositeOperation = "copy";
-  }
-  return colorNormalizationContext;
-}
-
-function toLegacyXtermColor(cssColor: string, fallback: string): string {
-  const trimmedCssColor = cssColor.trim();
-  if (!trimmedCssColor) {
-    return fallback;
-  }
-  if (/^#[\da-f]{3,8}$/i.test(trimmedCssColor)) {
-    return trimmedCssColor;
-  }
-  if (/^rgba?\(\s*\d{1,3}\s*,/i.test(trimmedCssColor)) {
-    return trimmedCssColor;
-  }
-
-  const canvasContext = getColorNormalizationContext();
-  if (!canvasContext) {
-    return fallback;
-  }
-
-  canvasContext.clearRect(0, 0, 1, 1);
-  canvasContext.fillStyle = "#000001";
-  canvasContext.fillStyle = trimmedCssColor;
-  if (canvasContext.fillStyle === "#000001" && trimmedCssColor !== "#000001") {
-    return fallback;
-  }
-
-  canvasContext.fillRect(0, 0, 1, 1);
-  const pixel = canvasContext.getImageData(0, 0, 1, 1).data;
-  const red = pixel[0] ?? 0;
-  const green = pixel[1] ?? 0;
-  const blue = pixel[2] ?? 0;
-  const alpha = pixel[3] ?? 255;
-  if (alpha >= 255) {
-    return `rgb(${red}, ${green}, ${blue})`;
-  }
-  return `rgba(${red}, ${green}, ${blue}, ${Number((alpha / 255).toFixed(3))})`;
-}
-
-function resolveTerminalCssColor(
-  cssColor: string,
-  fallback: string,
-  property: "backgroundColor" | "color" = "color",
-): string {
-  if (typeof window === "undefined" || typeof document === "undefined" || !document.body) {
-    return fallback;
-  }
-
-  const probe = document.createElement("div");
-  probe.style.position = "fixed";
-  probe.style.pointerEvents = "none";
-  probe.style.opacity = "0";
-  probe.style[property] = cssColor;
-  document.body.append(probe);
-
-  const resolvedColor = getComputedStyle(probe)[property];
-  probe.remove();
-
-  return toLegacyXtermColor(resolvedColor, fallback);
-}
-
-export function terminalThemeFromApp(): ITheme {
-  const isDark = document.documentElement.classList.contains("dark");
-  const fallbackTheme = isDark ? DARK_TERMINAL_THEME_FALLBACK : LIGHT_TERMINAL_THEME_FALLBACK;
-  const foregroundFallback = fallbackTheme.foreground;
-
-  return {
-    background: resolveTerminalCssColor(
-      "var(--color-token-terminal-background, var(--color-background-surface))",
-      fallbackTheme.background,
-      "backgroundColor",
-    ),
-    black: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-black, var(--color-text-foreground-tertiary))",
-      fallbackTheme.black,
-    ),
-    blue: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-blue, var(--color-accent-blue, var(--color-text-accent)))",
-      fallbackTheme.blue,
-    ),
-    brightBlack: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-bright-black, var(--color-text-foreground-secondary))",
-      fallbackTheme.brightBlack,
-    ),
-    brightBlue: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-bright-blue, var(--color-accent-blue, var(--color-text-accent)))",
-      fallbackTheme.brightBlue,
-    ),
-    brightCyan: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-bright-cyan, var(--color-accent-blue, var(--color-text-accent)))",
-      fallbackTheme.brightCyan,
-    ),
-    brightGreen: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-bright-green, var(--color-decoration-added))",
-      fallbackTheme.brightGreen,
-    ),
-    brightMagenta: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-bright-magenta, var(--color-accent-purple, var(--color-text-accent)))",
-      fallbackTheme.brightMagenta,
-    ),
-    brightRed: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-bright-red, var(--color-decoration-deleted))",
-      fallbackTheme.brightRed,
-    ),
-    brightWhite: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-bright-white, var(--color-text-foreground))",
-      fallbackTheme.brightWhite,
-    ),
-    brightYellow: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-bright-yellow, var(--warning))",
-      fallbackTheme.brightYellow,
-    ),
-    cursor: resolveTerminalCssColor(
-      "var(--color-token-terminal-foreground, var(--color-text-foreground, var(--foreground)))",
-      foregroundFallback,
-    ),
-    cyan: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-cyan, var(--color-accent-blue, var(--color-text-accent)))",
-      fallbackTheme.cyan,
-    ),
-    foreground: resolveTerminalCssColor(
-      "var(--color-token-terminal-foreground, var(--color-text-foreground, var(--foreground)))",
-      fallbackTheme.foreground,
-    ),
-    green: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-green, var(--color-decoration-added))",
-      fallbackTheme.green,
-    ),
-    magenta: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-magenta, var(--color-accent-purple, var(--color-text-accent)))",
-      fallbackTheme.magenta,
-    ),
-    red: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-red, var(--color-decoration-deleted))",
-      fallbackTheme.red,
-    ),
-    scrollbarSliderActiveBackground: resolveTerminalCssColor(
-      "var(--color-token-scrollbar-slider-active-background)",
-      fallbackTheme.scrollbarSliderActiveBackground,
-      "backgroundColor",
-    ),
-    scrollbarSliderBackground: resolveTerminalCssColor(
-      "var(--color-token-scrollbar-slider-background)",
-      fallbackTheme.scrollbarSliderBackground,
-      "backgroundColor",
-    ),
-    scrollbarSliderHoverBackground: resolveTerminalCssColor(
-      "var(--color-token-scrollbar-slider-hover-background)",
-      fallbackTheme.scrollbarSliderHoverBackground,
-      "backgroundColor",
-    ),
-    selectionBackground: resolveTerminalCssColor(
-      "color-mix(in srgb, var(--color-text-accent) 26%, transparent)",
-      fallbackTheme.selectionBackground,
-      "backgroundColor",
-    ),
-    white: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-white, var(--color-text-foreground))",
-      fallbackTheme.white,
-    ),
-    yellow: resolveTerminalCssColor(
-      "var(--color-token-terminal-ansi-yellow, var(--warning))",
-      fallbackTheme.yellow,
-    ),
-  };
-}
-
-export function writeSystemMessage(terminal: Terminal, message: string): void {
-  terminal.write(`\r\n[terminal] ${message}\r\n`);
-}
diff --git a/apps/web/src/components/terminal/terminalRuntimeHandle.ts b/apps/web/src/components/terminal/terminalRuntimeHandle.ts
deleted file mode 100644
index 9ee7c80a8..000000000
--- a/apps/web/src/components/terminal/terminalRuntimeHandle.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-// FILE: terminalRuntimeHandle.ts
-// Purpose: xterm-free entry point for terminal-runtime lifecycle calls made from
-//          modules that must not pull the terminal stack into their chunk.
-// Layer: Terminal runtime infrastructure
-// Exports: disposeTerminalRuntime, disposeTerminalRuntimeThread, registerTerminalRuntimeRegistry
-// Why: `terminalRuntimeRegistry` statically imports `@xterm/xterm` plus seven
-//      addons (~867 kB raw / ~243 kB gzip, including the WebGL and image
-//      addons). A single cleanup call in Sidebar.tsx was enough to pin all of it
-//      into the chat layout chunk, so it downloaded and parsed on every chat
-//      route even for users who never open a terminal.
-//
-//      The registry self-registers here on load. Callers that only need to tear
-//      a thread's runtimes down can therefore go through this module: if the
-//      registry was never loaded there are no runtimes to dispose and the call
-//      is a correct no-op, and if it was loaded the real implementation is
-//      already wired up.
-
-import type { terminalRuntimeRegistry } from "./terminalRuntimeRegistry";
-
-type TerminalRuntimeRegistry = typeof terminalRuntimeRegistry;
-
-let loadedRegistry: TerminalRuntimeRegistry | null = null;
-
-/**
- * Disposals requested while the registry chunk was still loading.
- *
- * "Nothing loaded means nothing to dispose" is only true if no attach can follow.
- * It can: the drawer is lazy now, so deleting a thread whose drawer chunk is
- * still in flight dropped the disposal, and when the chunk resolved the drawer
- * mounted and attached — spawning a fresh PTY for a thread that no longer
- * exists, with no way left to reap it. Replaying on registration closes that
- * window; the registry's own dispose calls are already no-ops for unknown ids.
- */
-const pendingDisposals: Array<(registry: TerminalRuntimeRegistry) => void> = [];
-
-/**
- * Threads torn down while the registry was unloaded.
- *
- * Replaying the queued disposal is not enough on its own: registration happens
- * at module-evaluation time, but the drawer attaches later in a React effect, so
- * the replay runs against an empty registry and the attach still spawns a PTY.
- * Thread ids are never reused, so refusing the attach outright is safe and is
- * the only thing that actually closes the window.
- */
-const disposedThreadIds = new Set<string>();
-
-/** True when this thread was torn down and must not attach a new runtime. */
-export function isTerminalRuntimeThreadDisposed(threadId: string): boolean {
-  return disposedThreadIds.has(threadId);
-}
-
-/** Called by the registry module itself as a side effect of being loaded. */
-export function registerTerminalRuntimeRegistry(registry: TerminalRuntimeRegistry): void {
-  loadedRegistry = registry;
-  const replay = pendingDisposals.splice(0, pendingDisposals.length);
-  for (const disposal of replay) {
-    disposal(registry);
-  }
-}
-
-/** Dispose a single terminal runtime, or queue it if the stack is still loading. */
-export function disposeTerminalRuntime(threadId: string, terminalId: string): void {
-  if (loadedRegistry) {
-    loadedRegistry.disposeTerminal(threadId, terminalId);
-    return;
-  }
-  pendingDisposals.push((registry) => registry.disposeTerminal(threadId, terminalId));
-}
-
-/**
- * Dispose every terminal runtime for a thread. Called when the thread itself is
- * deleted, so the id is also poisoned against any later attach.
- */
-export function disposeTerminalRuntimeThread(threadId: string): void {
-  disposedThreadIds.add(threadId);
-  if (loadedRegistry) {
-    loadedRegistry.disposeThread(threadId);
-    return;
-  }
-  pendingDisposals.push((registry) => registry.disposeThread(threadId));
-}
diff --git a/apps/web/src/components/terminal/terminalRuntimeRegistry.ts b/apps/web/src/components/terminal/terminalRuntimeRegistry.ts
deleted file mode 100644
index 54259e7d1..000000000
--- a/apps/web/src/components/terminal/terminalRuntimeRegistry.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-// FILE: terminalRuntimeRegistry.ts
-// Purpose: Keep a stable runtime map and delegate terminal lifecycle work to terminalRuntime.ts.
-// Layer: Terminal runtime infrastructure
-// Depends on: terminalRuntime.ts for lifecycle, terminalRuntimeTypes.ts for stable ids and contracts.
-
-import { SearchAddon } from "@xterm/addon-search";
-import { Terminal } from "@xterm/xterm";
-
-import { registerTerminalRuntimeRegistry } from "./terminalRuntimeHandle";
-
-import {
-  attachRuntimeToContainer,
-  createRuntimeEntry,
-  detachRuntimeFromContainer,
-  disposeRuntimeEntry,
-  syncRuntimeConfig,
-  updateRuntimeViewState,
-} from "./terminalRuntime";
-import type {
-  TerminalRuntimeConfig,
-  TerminalRuntimeEntry,
-  TerminalRuntimeStatus,
-  TerminalRuntimeViewState,
-} from "./terminalRuntimeTypes";
-import { buildTerminalRuntimeKey } from "./terminalRuntimeTypes";
-
-export { buildTerminalRuntimeKey, type TerminalRuntimeCallbacks } from "./terminalRuntimeTypes";
-
-// --- Registry orchestration -------------------------------------------------
-
-class TerminalRuntimeRegistry {
-  private entries = new Map<string, TerminalRuntimeEntry>();
-
-  attach(
-    config: TerminalRuntimeConfig,
-    viewState: TerminalRuntimeViewState,
-    container: HTMLDivElement,
-  ): { terminal: Terminal; searchAddon: SearchAddon; runtimeStatus: TerminalRuntimeStatus } {
-    let entry = this.entries.get(config.runtimeKey);
-    if (!entry) {
-      entry = createRuntimeEntry(config);
-      this.entries.set(config.runtimeKey, entry);
-    } else {
-      syncRuntimeConfig(entry, config);
-    }
-
-    attachRuntimeToContainer(entry, viewState, container);
-    return {
-      terminal: entry.terminal,
-      searchAddon: entry.searchAddon,
-      runtimeStatus: entry.runtimeStatus,
-    };
-  }
-
-  syncConfig(runtimeKey: string, config: TerminalRuntimeConfig): void {
-    const entry = this.entries.get(runtimeKey);
-    if (!entry) return;
-    syncRuntimeConfig(entry, config);
-  }
-
-  setViewState(runtimeKey: string, viewState: TerminalRuntimeViewState): void {
-    const entry = this.entries.get(runtimeKey);
-    if (!entry) return;
-    updateRuntimeViewState(entry, viewState);
-  }
-
-  detach(runtimeKey: string): void {
-    const entry = this.entries.get(runtimeKey);
-    if (!entry) return;
-    detachRuntimeFromContainer(entry);
-  }
-
-  dispose(runtimeKey: string): void {
-    const entry = this.entries.get(runtimeKey);
-    if (!entry) return;
-    disposeRuntimeEntry(entry);
-    this.entries.delete(runtimeKey);
-  }
-
-  disposeTerminal(threadId: string, terminalId: string): void {
-    this.dispose(buildTerminalRuntimeKey(threadId, terminalId));
-  }
-
-  disposeThread(threadId: string): void {
-    for (const runtimeKey of [...this.entries.keys()]) {
-      if (runtimeKey.startsWith(`${threadId}::`)) {
-        this.dispose(runtimeKey);
-      }
-    }
-  }
-
-  focus(runtimeKey: string): void {
-    this.entries.get(runtimeKey)?.terminal.focus();
-  }
-}
-
-export const terminalRuntimeRegistry = new TerminalRuntimeRegistry();
-
-// Let xterm-free callers reach the registry without importing it (and the ~867 kB
-// terminal stack behind it). See terminalRuntimeHandle.ts.
-registerTerminalRuntimeRegistry(terminalRuntimeRegistry);
diff --git a/apps/web/src/components/terminal/terminalRuntimeTypes.test.ts b/apps/web/src/components/terminal/terminalRuntimeTypes.test.ts
deleted file mode 100644
index 4d6183ce2..000000000
--- a/apps/web/src/components/terminal/terminalRuntimeTypes.test.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// FILE: terminalRuntimeTypes.test.ts
-// Purpose: Cover stable runtime identity helpers without pulling browser-only runtime modules.
-// Layer: Terminal runtime tests
-
-import { describe, expect, it } from "vitest";
-
-import { buildTerminalRuntimeKey } from "./terminalRuntimeTypes";
-
-describe("buildTerminalRuntimeKey", () => {
-  it("builds a thread-scoped runtime key for terminal persistence", () => {
-    expect(buildTerminalRuntimeKey("thread-123", "terminal-abc")).toBe("thread-123::terminal-abc");
-  });
-});
diff --git a/apps/web/src/components/terminal/terminalRuntimeTypes.ts b/apps/web/src/components/terminal/terminalRuntimeTypes.ts
deleted file mode 100644
index 8a1d02d0d..000000000
--- a/apps/web/src/components/terminal/terminalRuntimeTypes.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-// FILE: terminalRuntimeTypes.ts
-// Purpose: Shared types and stable identity helpers for persistent terminal runtimes.
-// Layer: Terminal runtime infrastructure
-
-import { FitAddon } from "@xterm/addon-fit";
-import { SearchAddon } from "@xterm/addon-search";
-import { WebglAddon } from "@xterm/addon-webgl";
-import { type TerminalActivityState, type TerminalCliKind } from "@t3tools/shared/terminalThreads";
-import { Terminal, type IDisposable } from "@xterm/xterm";
-import type { TerminalLinkMatch } from "../../terminal-links";
-
-export interface TerminalRuntimeCallbacks {
-  onSessionExited: () => void;
-  onTerminalMetadataChange: (
-    terminalId: string,
-    metadata: { cliKind: TerminalCliKind | null; label: string },
-  ) => void;
-  onTerminalActivityChange: (
-    terminalId: string,
-    activity: { hasRunningSubprocess: boolean; agentState: TerminalActivityState | null },
-  ) => void;
-  onTerminalRuntimeStatusChange?: (terminalId: string, status: TerminalRuntimeStatus) => void;
-}
-
-export function buildTerminalRuntimeKey(threadId: string, terminalId: string): string {
-  return `${threadId}::${terminalId}`;
-}
-
-export interface TerminalRuntimeConfig {
-  runtimeKey: string;
-  threadId: string;
-  terminalId: string;
-  terminalLabel: string;
-  terminalCliKind?: TerminalCliKind | null;
-  cwd: string;
-  runtimeEnv?: Record<string, string>;
-  callbacks: TerminalRuntimeCallbacks;
-}
-
-export interface TerminalRuntimeViewState {
-  autoFocus: boolean;
-  isVisible: boolean;
-}
-
-export interface TerminalPendingWrite {
-  data: string;
-  byteLength: number;
-  queuedAt: number;
-}
-
-export type TerminalRuntimeStatus = "connecting" | "replaying" | "ready" | "error";
-
-export interface TerminalRuntimeEntry {
-  runtimeKey: string;
-  threadId: string;
-  terminalId: string;
-  terminalLabel: string;
-  terminalCliKind: TerminalCliKind | null;
-  cwd: string;
-  runtimeEnv?: Record<string, string>;
-  callbacks: TerminalRuntimeCallbacks;
-  wrapper: HTMLDivElement;
-  container: HTMLDivElement | null;
-  terminal: Terminal;
-  fitAddon: FitAddon;
-  searchAddon: SearchAddon;
-  webglAddon: WebglAddon | null;
-  titleInputBuffer: string;
-  hasHandledExit: boolean;
-  runtimeStatus: TerminalRuntimeStatus;
-  opened: boolean;
-  disposed: boolean;
-  resizeObserver: ResizeObserver | null;
-  resizeDispatchTimer: number | null;
-  visualResizeFrame: number | null;
-  visualResizeTimer: number | null;
-  lastVisualResizeAt: number;
-  lastSentResize: { cols: number; rows: number } | null;
-  pendingResize: { cols: number; rows: number } | null;
-  writeRafHandle: number | null;
-  writeFlushTimeout: number | null;
-  pendingWrites: TerminalPendingWrite[];
-  pendingWriteLength: number;
-  pendingWriteBytes: number;
-  linkMatchCache: Map<string, TerminalLinkMatch[]>;
-  outputEventVersion: number;
-  snapshotReconcileRequestId: number;
-  webglLoadFrame: number | null;
-  themeRefreshFrame: number;
-  themeObserver: MutationObserver | null;
-  visibilityCleanup: (() => void) | null;
-  terminalDisposables: IDisposable[];
-  attachDisposables: Array<() => void>;
-  persistentDisposables: Array<() => void>;
-  querySuppressionDispose: (() => void) | null;
-  viewState: TerminalRuntimeViewState;
-  unsubscribeTerminalEvents: (() => void) | null;
-}
diff --git a/apps/web/src/components/terminal/terminalSelectionActions.ts b/apps/web/src/components/terminal/terminalSelectionActions.ts
deleted file mode 100644
index 0009488a8..000000000
--- a/apps/web/src/components/terminal/terminalSelectionActions.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-// FILE: terminalSelectionActions.ts
-// Purpose: Keep pure selection-action positioning helpers separate from the browser-heavy drawer.
-// Layer: Chat terminal workspace helpers
-
-const MULTI_CLICK_SELECTION_ACTION_DELAY_MS = 260;
-
-export function resolveTerminalSelectionActionPosition(options: {
-  bounds: { left: number; top: number; width: number; height: number };
-  selectionRect: { right: number; bottom: number } | null;
-  pointer: { x: number; y: number } | null;
-  viewport?: { width: number; height: number } | null;
-}): { x: number; y: number } {
-  const { bounds, selectionRect, pointer, viewport } = options;
-  const viewportWidth =
-    viewport?.width ??
-    (typeof window === "undefined" ? bounds.left + bounds.width + 8 : window.innerWidth);
-  const viewportHeight =
-    viewport?.height ??
-    (typeof window === "undefined" ? bounds.top + bounds.height + 8 : window.innerHeight);
-  const drawerLeft = Math.round(bounds.left);
-  const drawerTop = Math.round(bounds.top);
-  const drawerRight = Math.round(bounds.left + bounds.width);
-  const drawerBottom = Math.round(bounds.top + bounds.height);
-  const preferredX =
-    selectionRect !== null
-      ? Math.round(selectionRect.right)
-      : pointer === null
-        ? Math.round(bounds.left + bounds.width - 140)
-        : Math.max(drawerLeft, Math.min(Math.round(pointer.x), drawerRight));
-  const preferredY =
-    selectionRect !== null
-      ? Math.round(selectionRect.bottom + 4)
-      : pointer === null
-        ? Math.round(bounds.top + 12)
-        : Math.max(drawerTop, Math.min(Math.round(pointer.y), drawerBottom));
-  return {
-    x: Math.max(8, Math.min(preferredX, Math.max(viewportWidth - 8, 8))),
-    y: Math.max(8, Math.min(preferredY, Math.max(viewportHeight - 8, 8))),
-  };
-}
-
-export function terminalSelectionActionDelayForClickCount(clickCount: number): number {
-  return clickCount >= 2 ? MULTI_CLICK_SELECTION_ACTION_DELAY_MS : 0;
-}
-
-export function shouldHandleTerminalSelectionMouseUp(
-  selectionGestureActive: boolean,
-  button: number,
-): boolean {
-  return selectionGestureActive && button === 0;
-}
diff --git a/apps/web/src/components/terminal/terminalSession.ts b/apps/web/src/components/terminal/terminalSession.ts
deleted file mode 100644
index 9f3b0bf29..000000000
--- a/apps/web/src/components/terminal/terminalSession.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-// FILE: terminalSession.ts
-// Purpose: Shared terminal-session primitives reused by every terminal surface
-//          (chat drawer, workspace page, right-dock pane): a stable id factory and
-//          the dispose + server-close + fallback routine that was duplicated verbatim.
-// Layer: Web terminal runtime helpers
-// Depends on: terminalRuntimeHandle (xterm-free registry access), NativeApi terminal channel.
-//
-// Note: this module is imported by light callers (ChatView, useTerminalSurfaceController)
-// that must not pull the ~794 kB xterm stack into their chunk, so it reaches the
-// runtime registry through terminalRuntimeHandle rather than importing it directly.
-
-import { type NativeApi } from "@t3tools/contracts";
-
-import { randomUUID } from "~/lib/utils";
-import { disposeTerminalRuntime } from "./terminalRuntimeHandle";
-
-// Stable, collision-resistant id for a new terminal pane/tab/split.
-export function randomTerminalId(): string {
-  return `terminal-${randomUUID()}`;
-}
-
-// Tear down a terminal everywhere it lives: drop the local xterm instance, then
-// ask the server to close it (deleting history) with a best-effort `exit` write
-// fallback for transports that lack a structured close. `clearHistoryBeforeClose`
-// mirrors the chat surface's behavior when closing the final terminal of a thread.
-export function disposeAndCloseTerminalSession(input: {
-  api: NativeApi | undefined;
-  threadId: string;
-  terminalId: string;
-  clearHistoryBeforeClose?: boolean;
-}): void {
-  const { api, threadId, terminalId } = input;
-  disposeTerminalRuntime(threadId, terminalId);
-
-  const fallbackExitWrite = () =>
-    api?.terminal.write({ threadId, terminalId, data: "exit\n" }).catch(() => undefined);
-
-  if (api && "close" in api.terminal && typeof api.terminal.close === "function") {
-    void (async () => {
-      if (input.clearHistoryBeforeClose) {
-        await api.terminal.clear({ threadId, terminalId }).catch(() => undefined);
-      }
-      await api.terminal.close({ threadId, terminalId, deleteHistory: true });
-    })().catch(() => fallbackExitWrite());
-  } else {
-    void fallbackExitWrite();
-  }
-}
diff --git a/apps/web/src/components/terminal/terminalStress.browser.tsx b/apps/web/src/components/terminal/terminalStress.browser.tsx
deleted file mode 100644
index 7c03e4c8e..000000000
--- a/apps/web/src/components/terminal/terminalStress.browser.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-// FILE: terminalStress.browser.tsx
-// Purpose: Exercise real xterm parsing/rendering in Chromium under large output bursts.
-// Layer: Browser performance test
-// Depends on: @xterm/xterm and the browser Vitest Playwright provider.
-
-import "../../index.css";
-import "@xterm/xterm/css/xterm.css";
-
-import { FitAddon } from "@xterm/addon-fit";
-import { Terminal } from "@xterm/xterm";
-import { afterEach, describe, expect, it } from "vitest";
-
-type ChitauriTerminalOptions = NonNullable<ConstructorParameters<typeof Terminal>[0]> & {
-  vtExtensions?: { kittyKeyboard?: boolean };
-};
-
-function writeTerminal(terminal: Terminal, data: string): Promise<void> {
-  return new Promise((resolve) => {
-    terminal.write(data, resolve);
-  });
-}
-
-function readBufferTail(terminal: Terminal, lineCount: number): string {
-  const buffer = terminal.buffer.active;
-  const start = Math.max(0, buffer.baseY + buffer.cursorY - lineCount);
-  const end = buffer.baseY + buffer.cursorY;
-  const lines: string[] = [];
-  for (let line = start; line <= end; line += 1) {
-    lines.push(buffer.getLine(line)?.translateToString(true) ?? "");
-  }
-  return lines.join("\n");
-}
-
-function canvasHasPaintedPixels(canvas: HTMLCanvasElement): boolean {
-  if (canvas.width === 0 || canvas.height === 0) return false;
-  const context = canvas.getContext("2d", { willReadFrequently: true });
-  if (!context) return false;
-
-  const data = context.getImageData(0, 0, canvas.width, canvas.height).data;
-  for (let index = 3; index < data.length; index += 32) {
-    if (data[index] !== 0) return true;
-  }
-  return false;
-}
-
-function surfaceHasRenderedContent(host: HTMLElement): boolean {
-  if ((host.textContent ?? "").trim().length > 0) return true;
-  return Array.from(host.querySelectorAll("canvas")).some(canvasHasPaintedPixels);
-}
-
-describe("terminal browser stress", () => {
-  afterEach(() => {
-    document.body.innerHTML = "";
-  });
-
-  it("keeps the terminal surface nonblank after a large output burst", async () => {
-    const host = document.createElement("div");
-    host.style.width = "960px";
-    host.style.height = "520px";
-    host.style.position = "relative";
-    document.body.append(host);
-
-    const fitAddon = new FitAddon();
-    const terminalOptions: ChitauriTerminalOptions = {
-      allowProposedApi: true,
-      cols: 120,
-      cursorBlink: false,
-      fontFamily: "monospace",
-      fontSize: 12,
-      rows: 30,
-      scrollback: 5_000,
-      vtExtensions: { kittyKeyboard: true },
-    };
-    const terminal = new Terminal(terminalOptions);
-    terminal.loadAddon(fitAddon);
-    terminal.open(host);
-    fitAddon.fit();
-
-    try {
-      const payload = Array.from({ length: 2_400 }, (_, index) => {
-        const marker = String(index).padStart(4, "0");
-        return `stress-${marker} ${"x".repeat(96)}\r\n`;
-      }).join("");
-
-      const startedAt = performance.now();
-      await writeTerminal(terminal, payload);
-      const elapsedMs = performance.now() - startedAt;
-
-      await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
-      await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()));
-
-      expect(elapsedMs).toBeLessThan(5_000);
-      expect(readBufferTail(terminal, 60)).toContain("stress-2399");
-      expect(surfaceHasRenderedContent(host)).toBe(true);
-    } finally {
-      terminal.dispose();
-    }
-  });
-});
diff --git a/apps/web/src/components/terminal/useTerminalDrawerHeight.ts b/apps/web/src/components/terminal/useTerminalDrawerHeight.ts
deleted file mode 100644
index 4fda5c080..000000000
--- a/apps/web/src/components/terminal/useTerminalDrawerHeight.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-// FILE: useTerminalDrawerHeight.ts
-// Purpose: Encapsulates drawer-height state, clamping, and pointer-driven resize behavior.
-// Layer: Terminal interaction hook
-// Depends on: thread terminal sizing defaults and React pointer lifecycle hooks.
-
-import {
-  type PointerEvent as ReactPointerEvent,
-  useCallback,
-  useEffect,
-  useRef,
-  useState,
-} from "react";
-
-import { DEFAULT_THREAD_TERMINAL_HEIGHT } from "../../types";
-
-const MIN_DRAWER_HEIGHT = 180;
-const MAX_DRAWER_HEIGHT_RATIO = 0.75;
-
-function maxDrawerHeight(): number {
-  if (typeof window === "undefined") return DEFAULT_THREAD_TERMINAL_HEIGHT;
-  return Math.max(MIN_DRAWER_HEIGHT, Math.floor(window.innerHeight * MAX_DRAWER_HEIGHT_RATIO));
-}
-
-export function clampTerminalDrawerHeight(height: number): number {
-  const safeHeight = Number.isFinite(height) ? height : DEFAULT_THREAD_TERMINAL_HEIGHT;
-  const maxHeight = maxDrawerHeight();
-  return Math.min(Math.max(Math.round(safeHeight), MIN_DRAWER_HEIGHT), maxHeight);
-}
-
-export function useTerminalDrawerHeight(options: {
-  height: number;
-  onHeightChange: (height: number) => void;
-  resetKey: string;
-}) {
-  const [drawerHeight, setDrawerHeight] = useState(() => clampTerminalDrawerHeight(options.height));
-  const drawerHeightRef = useRef(drawerHeight);
-  const lastSyncedHeightRef = useRef(clampTerminalDrawerHeight(options.height));
-  const onHeightChangeRef = useRef(options.onHeightChange);
-  const resizeStateRef = useRef<{
-    pointerId: number;
-    startY: number;
-    startHeight: number;
-  } | null>(null);
-  const didResizeDuringDragRef = useRef(false);
-
-  useEffect(() => {
-    onHeightChangeRef.current = options.onHeightChange;
-  }, [options.onHeightChange]);
-
-  useEffect(() => {
-    drawerHeightRef.current = drawerHeight;
-  }, [drawerHeight]);
-
-  const syncHeight = useCallback((nextHeight: number) => {
-    const clampedHeight = clampTerminalDrawerHeight(nextHeight);
-    if (lastSyncedHeightRef.current === clampedHeight) return;
-    lastSyncedHeightRef.current = clampedHeight;
-    onHeightChangeRef.current(clampedHeight);
-  }, []);
-
-  useEffect(() => {
-    const clampedHeight = clampTerminalDrawerHeight(options.height);
-    setDrawerHeight(clampedHeight);
-    drawerHeightRef.current = clampedHeight;
-    lastSyncedHeightRef.current = clampedHeight;
-  }, [options.height, options.resetKey]);
-
-  const handleResizePointerDown = useCallback((event: ReactPointerEvent<HTMLDivElement>) => {
-    if (event.button !== 0) return;
-    event.preventDefault();
-    event.currentTarget.setPointerCapture(event.pointerId);
-    didResizeDuringDragRef.current = false;
-    resizeStateRef.current = {
-      pointerId: event.pointerId,
-      startY: event.clientY,
-      startHeight: drawerHeightRef.current,
-    };
-  }, []);
-
-  const handleResizePointerMove = useCallback((event: ReactPointerEvent<HTMLDivElement>) => {
-    const resizeState = resizeStateRef.current;
-    if (!resizeState || resizeState.pointerId !== event.pointerId) return;
-    event.preventDefault();
-    const clampedHeight = clampTerminalDrawerHeight(
-      resizeState.startHeight + (resizeState.startY - event.clientY),
-    );
-    if (clampedHeight === drawerHeightRef.current) {
-      return;
-    }
-    didResizeDuringDragRef.current = true;
-    drawerHeightRef.current = clampedHeight;
-    setDrawerHeight(clampedHeight);
-  }, []);
-
-  const handleResizePointerEnd = useCallback(
-    (event: ReactPointerEvent<HTMLDivElement>) => {
-      const resizeState = resizeStateRef.current;
-      if (!resizeState || resizeState.pointerId !== event.pointerId) return;
-      resizeStateRef.current = null;
-      if (event.currentTarget.hasPointerCapture(event.pointerId)) {
-        event.currentTarget.releasePointerCapture(event.pointerId);
-      }
-      if (!didResizeDuringDragRef.current) {
-        return;
-      }
-      syncHeight(drawerHeightRef.current);
-    },
-    [syncHeight],
-  );
-
-  useEffect(() => {
-    const onWindowResize = () => {
-      const clampedHeight = clampTerminalDrawerHeight(drawerHeightRef.current);
-      const changed = clampedHeight !== drawerHeightRef.current;
-      if (changed) {
-        setDrawerHeight(clampedHeight);
-        drawerHeightRef.current = clampedHeight;
-      }
-      if (!resizeStateRef.current) {
-        syncHeight(clampedHeight);
-      }
-    };
-    window.addEventListener("resize", onWindowResize);
-    return () => {
-      window.removeEventListener("resize", onWindowResize);
-    };
-  }, [syncHeight]);
-
-  useEffect(() => {
-    return () => {
-      syncHeight(drawerHeightRef.current);
-    };
-  }, [syncHeight]);
-
-  return {
-    drawerHeight,
-    handleResizePointerDown,
-    handleResizePointerMove,
-    handleResizePointerEnd,
-  };
-}
diff --git a/apps/web/src/components/timelineHeight.test.ts b/apps/web/src/components/timelineHeight.test.ts
index 72a2b2167..314985095 100644
--- a/apps/web/src/components/timelineHeight.test.ts
+++ b/apps/web/src/components/timelineHeight.test.ts
@@ -1,8 +1,6 @@
 import { describe, expect, it } from "vitest";
 
 import { appendPastedTextsToPrompt } from "../lib/composerPastedText";
-import { appendTerminalContextsToPrompt } from "../lib/terminalContext";
-import { buildInlineTerminalContextText } from "./chat/userMessageTerminalContexts";
 import {
   estimateChangedFilesSummaryHeight,
   estimateTimelineMessageHeight,
@@ -110,35 +108,6 @@ describe("estimateTimelineMessageHeight", () => {
     ).toBe(165.25);
   });
 
-  it("adds terminal context chrome without counting the hidden block as message text", () => {
-    const prompt = appendTerminalContextsToPrompt("Investigate this", [
-      {
-        terminalId: "default",
-        terminalLabel: "Terminal 1",
-        lineStart: 40,
-        lineEnd: 43,
-        text: [
-          "git status",
-          "M apps/web/src/components/chat/MessagesTimeline.tsx",
-          "?? tmp",
-          "",
-        ].join("\n"),
-      },
-    ]);
-
-    expect(
-      estimateTimelineMessageHeight({
-        role: "user",
-        text: prompt,
-      }),
-    ).toBe(
-      estimateTimelineMessageHeight({
-        role: "user",
-        text: `${buildInlineTerminalContextText([{ header: "Terminal 1 lines 40-43" }])} Investigate this`,
-      }),
-    );
-  });
-
   it("adds pasted text card chrome without counting the hidden block as message text", () => {
     const prompt = appendPastedTextsToPrompt("", [
       {
diff --git a/apps/web/src/components/timelineHeight.ts b/apps/web/src/components/timelineHeight.ts
index facd0d9a6..f95366f55 100644
--- a/apps/web/src/components/timelineHeight.ts
+++ b/apps/web/src/components/timelineHeight.ts
@@ -6,7 +6,6 @@
 import type { TurnDiffFileChange } from "../types";
 import { DEFAULT_CHAT_FONT_SIZE_PX, normalizeChatFontSizePx } from "../appSettings";
 import { deriveDisplayedUserMessageState } from "../lib/composerMessageContext";
-import { buildInlineTerminalContextText } from "./chat/userMessageTerminalContexts";
 import { deriveUserMessagePreviewState } from "./chat/userMessagePreview";
 import { hasLeadingUserMedia, resolveUserTurnMarker } from "./chat/userTurnMarker";
 import {
@@ -281,12 +280,7 @@ export function estimateTimelineMessageHeight(
       hideImageOnlyBootstrapPrompt: (message.attachments?.length ?? 0) > 0,
     });
     const userMessagePreview = deriveUserMessagePreviewState(displayedUserMessage.visibleText);
-    const renderedText =
-      displayedUserMessage.contexts.length > 0
-        ? [buildInlineTerminalContextText(displayedUserMessage.contexts), userMessagePreview.text]
-            .filter((part) => part.length > 0)
-            .join(" ")
-        : userMessagePreview.text;
+    const renderedText = userMessagePreview.text;
     const estimatedLines =
       renderedText.length > 0 ? estimateWrappedLineCount(renderedText, charsPerLine) : 0;
     const imageAttachmentCount =
diff --git a/apps/web/src/components/ui/badge.tsx b/apps/web/src/components/ui/badge.tsx
index 4815f55f0..3079e9fbd 100644
--- a/apps/web/src/components/ui/badge.tsx
+++ b/apps/web/src/components/ui/badge.tsx
@@ -18,7 +18,7 @@ const badgeVariants = cva(
         default:
           "h-5.5 min-w-5.5 px-[calc(--spacing(1)-1px)] text-[length:var(--app-font-size-ui-sm,13px)] sm:h-4.5 sm:min-w-4.5 sm:text-[length:var(--app-font-size-ui-xs,12px)]",
         lg: "h-6.5 min-w-6.5 px-[calc(--spacing(1.5)-1px)] text-[length:var(--app-font-size-ui,14px)] sm:h-5.5 sm:min-w-5.5 sm:text-[length:var(--app-font-size-ui-sm,13px)]",
-        sm: "h-5 min-w-5 rounded-[.25rem] px-[calc(--spacing(1)-1px)] text-[length:var(--app-font-size-ui-xs,12px)] sm:h-4 sm:min-w-4 sm:text-[length:var(--app-font-size-ui-2xs,11px)]",
+        sm: "h-5 min-w-5 rounded-sm px-[calc(--spacing(1)-1px)] text-[length:var(--app-font-size-ui-xs,12px)] sm:h-4 sm:min-w-4 sm:text-[length:var(--app-font-size-ui-2xs,11px)]",
       },
       variant: {
         default: "bg-primary text-primary-foreground [button&,a&]:hover:bg-primary/90",
diff --git a/apps/web/src/components/ui/button.tsx b/apps/web/src/components/ui/button.tsx
index 05f69076b..bec0083e4 100644
--- a/apps/web/src/components/ui/button.tsx
+++ b/apps/web/src/components/ui/button.tsx
@@ -33,7 +33,7 @@ const headerButtonDarkBorderClassName =
 // family stays visually coherent. Prefer adding a variant over passing a
 // className override at the call site.
 //
-// Press feedback (`active:scale-[0.96]`) lives on the BASE, so every variant and size
+// Press feedback (`active:scale-[0.97]`) lives on the BASE, so every variant and size
 // answers a press instantly — that acknowledgement is what makes a control feel like it
 // heard you, and a button that only reacts on release reads as broken. `link` opts out
 // below (it renders as inline text, which shouldn't squash).
@@ -50,7 +50,7 @@ const headerButtonDarkBorderClassName =
 // silently drops the press tween. Prefer a variant over a call-site transition override.
 const buttonVariants = cva(
   extendButtonIconChildSelectors(
-    "[&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded-lg border font-medium text-[length:var(--app-font-size-ui,14px)] outline-none transition-[color,background-color,border-color,scale] duration-press ease-out active:scale-[0.96] motion-reduce:transition-none motion-reduce:active:scale-100 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 sm:text-[length:var(--app-font-size-ui,14px)] [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
+    "[&_svg]:-mx-0.5 relative inline-flex shrink-0 cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded-lg border font-medium text-[length:var(--app-font-size-ui,14px)] outline-none transition-[color,background-color,border-color,scale] duration-press ease-out active:scale-[0.97] motion-reduce:transition-none motion-reduce:active:scale-100 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 sm:text-[length:var(--app-font-size-ui,14px)] [&_svg:not([class*='opacity-'])]:opacity-80 [&_svg:not([class*='size-'])]:size-4.5 sm:[&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
   ),
   {
     defaultVariants: {
@@ -109,7 +109,7 @@ const buttonVariants = cva(
         // landing under rest is what still registers as "pushed" on a touchscreen, where
         // the hover lift never happens.
         prominent:
-          "rounded-full border-transparent bg-foreground text-[#141414] transition-[background-color,scale,opacity] duration-press ease-out hover:bg-white active:scale-[0.96] disabled:opacity-20 disabled:active:scale-100",
+          "border-transparent bg-foreground text-[#141414] transition-[background-color,scale,opacity] duration-press ease-out hover:bg-white active:scale-[0.97] disabled:opacity-20 disabled:active:scale-100",
         secondary:
           "border-transparent bg-hover text-secondary-foreground hover:bg-selected data-pressed:bg-selected",
         "secondary-outline":
diff --git a/apps/web/src/components/ui/checkbox.tsx b/apps/web/src/components/ui/checkbox.tsx
index 843f9d270..34243ced1 100644
--- a/apps/web/src/components/ui/checkbox.tsx
+++ b/apps/web/src/components/ui/checkbox.tsx
@@ -8,14 +8,14 @@ function Checkbox({ className, ...props }: CheckboxPrimitive.Root.Props) {
   return (
     <CheckboxPrimitive.Root
       className={cn(
-        "relative inline-flex size-4.5 shrink-0 items-center justify-center rounded-[.25rem] border border-[color:var(--color-border-light)] bg-background outline-none ring-ring focus-visible:ring-2 focus-visible:ring-offset-1 focus-visible:ring-offset-background aria-invalid:border-destructive/36 focus-visible:aria-invalid:border-destructive/64 focus-visible:aria-invalid:ring-destructive/48 data-disabled:opacity-64 sm:size-4 dark:not-data-checked:bg-input/32 dark:aria-invalid:ring-destructive/24",
+        "relative inline-flex size-4.5 shrink-0 items-center justify-center rounded-sm border border-[color:var(--color-border-light)] bg-background outline-none ring-ring focus-visible:ring-2 focus-visible:ring-offset-1 focus-visible:ring-offset-background aria-invalid:border-destructive/36 focus-visible:aria-invalid:border-destructive/64 focus-visible:aria-invalid:ring-destructive/48 data-disabled:opacity-64 sm:size-4 dark:not-data-checked:bg-input/32 dark:aria-invalid:ring-destructive/24",
         className,
       )}
       data-slot="checkbox"
       {...props}
     >
       <CheckboxPrimitive.Indicator
-        className="-inset-px absolute flex items-center justify-center rounded-[.25rem] text-primary-foreground data-unchecked:hidden data-checked:bg-primary data-indeterminate:text-foreground"
+        className="-inset-px absolute flex items-center justify-center rounded-sm text-primary-foreground data-unchecked:hidden data-checked:bg-primary data-indeterminate:text-foreground"
         data-slot="checkbox-indicator"
         render={(props, state) => (
           <span {...props}>
diff --git a/apps/web/src/components/ui/notificationSurface.ts b/apps/web/src/components/ui/notificationSurface.ts
index 7cbdbcc54..41739c49a 100644
--- a/apps/web/src/components/ui/notificationSurface.ts
+++ b/apps/web/src/components/ui/notificationSurface.ts
@@ -18,8 +18,8 @@ const NOTIFICATION_FOREGROUND_CLASS_NAME =
 // notably the dismiss "X") clickable in the desktop app. Toasts render at the
 // top edge over Electron's draggable titlebar region; without this the OS
 // captures clicks in that band for window dragging and the X stops working.
-export const COMPACT_NOTIFICATION_SURFACE_CLASS_NAME = `${OVERLAY_SURFACE_CLASS_NAME} w-max max-w-[min(calc(100vw-2rem),28rem)] rounded-[8px] dark:bg-[#262626] ${NOTIFICATION_FOREGROUND_CLASS_NAME} before:hidden [-webkit-app-region:no-drag]`;
+export const COMPACT_NOTIFICATION_SURFACE_CLASS_NAME = `${OVERLAY_SURFACE_CLASS_NAME} w-max max-w-[min(calc(100vw-2rem),28rem)] rounded-lg dark:bg-[#262626] ${NOTIFICATION_FOREGROUND_CLASS_NAME} before:hidden [-webkit-app-region:no-drag]`;
 
-export const EXPANDED_NOTIFICATION_SURFACE_CLASS_NAME = `${OVERLAY_SURFACE_CLASS_NAME} w-full rounded-[8px] dark:bg-[#262626] ${NOTIFICATION_FOREGROUND_CLASS_NAME} before:hidden [-webkit-app-region:no-drag]`;
+export const EXPANDED_NOTIFICATION_SURFACE_CLASS_NAME = `${OVERLAY_SURFACE_CLASS_NAME} w-full rounded-lg dark:bg-[#262626] ${NOTIFICATION_FOREGROUND_CLASS_NAME} before:hidden [-webkit-app-region:no-drag]`;
 
 export const NOTIFICATION_ICON_CLASS_NAME = "text-muted-foreground";
diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx
index 8f3907fe3..1c1da20c6 100644
--- a/apps/web/src/components/ui/sidebar.tsx
+++ b/apps/web/src/components/ui/sidebar.tsx
@@ -764,7 +764,7 @@ function SidebarInput({ className, ...props }: React.ComponentProps<typeof Input
 function SidebarHeader({ className, ...props }: React.ComponentProps<"div">) {
   return (
     <div
-      className={cn("flex flex-col gap-2 p-2", className)}
+      className={cn("flex flex-col gap-1.5 p-1.5", className)}
       data-sidebar="header"
       data-slot="sidebar-header"
       {...props}
@@ -775,7 +775,7 @@ function SidebarHeader({ className, ...props }: React.ComponentProps<"div">) {
 function SidebarFooter({ className, ...props }: React.ComponentProps<"div">) {
   return (
     <div
-      className={cn("flex flex-col gap-2 border-t border-sidebar-border p-2", className)}
+      className={cn("flex flex-col gap-1.5 p-1.5", className)}
       data-sidebar="footer"
       data-slot="sidebar-footer"
       {...props}
@@ -799,7 +799,7 @@ function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
     <ScrollArea hideScrollbars scrollFade className="h-auto min-h-0 flex-1">
       <div
         className={cn(
-          "flex w-full min-w-0 flex-col gap-2 group-data-[collapsible=icon]:overflow-hidden",
+          "flex w-full min-w-0 flex-col gap-1.5 group-data-[collapsible=icon]:overflow-hidden",
           className,
         )}
         data-sidebar="content"
@@ -813,7 +813,7 @@ function SidebarContent({ className, ...props }: React.ComponentProps<"div">) {
 function SidebarGroup({ className, ...props }: React.ComponentProps<"div">) {
   return (
     <div
-      className={cn("relative flex w-full min-w-0 flex-col p-2", className)}
+      className={cn("relative flex w-full min-w-0 flex-col p-1.5", className)}
       data-sidebar="group"
       data-slot="sidebar-group"
       {...props}
@@ -893,7 +893,7 @@ function SidebarMenuItem({ className, ...props }: React.ComponentProps<"li">) {
 }
 
 const sidebarMenuButtonVariants = cva(
-  "peer/menu-button flex w-full cursor-pointer items-center gap-2 overflow-hidden rounded-[8px] p-2 text-left text-sm outline-hidden ring-ring/60 transition-[width,height,padding,background-color,color,scale] duration-press ease-out active:scale-[0.96] motion-reduce:active:scale-100 hover:bg-[var(--sidebar-accent)] focus-visible:ring-2 active:bg-[var(--sidebar-accent-active)] active:text-[var(--sidebar-accent-foreground)] disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidebar=menu-action]/menu-item:pe-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-[var(--sidebar-accent-active)] data-[active=true]:font-medium data-[active=true]:text-[var(--sidebar-accent-foreground)] data-[state=open]:hover:bg-[var(--sidebar-accent)] group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! [&>span:last-child]:truncate [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0",
+  "peer/menu-button flex w-full cursor-pointer items-center gap-1.5 overflow-hidden rounded-lg p-1.5 text-left text-sm outline-hidden ring-ring/60 transition-[width,height,padding,background-color,color,scale] duration-press ease-out active:scale-[0.96] motion-reduce:active:scale-100 hover:bg-[var(--sidebar-accent)] focus-visible:ring-2 active:bg-[var(--sidebar-accent-active)] active:text-[var(--sidebar-accent-foreground)] disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidebar=menu-action]/menu-item:pe-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 data-[active=true]:bg-[var(--sidebar-accent-active)] data-[active=true]:font-medium data-[active=true]:text-[var(--sidebar-accent-foreground)] data-[state=open]:hover:bg-[var(--sidebar-accent)] group-data-[collapsible=icon]:size-8! group-data-[collapsible=icon]:p-2! [&>span:last-child]:truncate [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0",
   {
     defaultVariants: {
       size: "default",
@@ -1031,7 +1031,7 @@ function SidebarMenuSkeleton({
 
   return (
     <div
-      className={cn("flex h-8 items-center gap-2 rounded-lg px-2", className)}
+      className={cn("flex h-8 items-center gap-1.5 rounded-lg px-1.5", className)}
       data-sidebar="menu-skeleton"
       data-slot="sidebar-menu-skeleton"
       {...props}
@@ -1054,7 +1054,7 @@ function SidebarMenuSub({ className, ...props }: React.ComponentProps<"ul">) {
   return (
     <ul
       className={cn(
-        "mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-sidebar-border border-l px-2.5 py-0.5",
+        "mx-2.5 flex min-w-0 translate-x-px flex-col gap-0.5 border-sidebar-border border-l px-1.5 py-0.5",
         "group-data-[collapsible=icon]:hidden",
         className,
       )}
@@ -1088,7 +1088,7 @@ function SidebarMenuSubButton({
 }) {
   const defaultProps = {
     className: cn(
-      "-translate-x-px flex h-7 min-w-0 cursor-pointer items-center gap-2 overflow-hidden rounded-lg px-2 text-sidebar-foreground outline-hidden ring-ring/60 hover:bg-[var(--sidebar-accent)] focus-visible:ring-1 active:bg-[var(--sidebar-accent-active)] active:text-[var(--sidebar-accent-foreground)] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0",
+      "-translate-x-px flex h-7 min-w-0 cursor-pointer items-center gap-1.5 overflow-hidden rounded-lg px-1.5 text-sidebar-foreground outline-hidden ring-ring/60 hover:bg-[var(--sidebar-accent)] focus-visible:ring-1 active:bg-[var(--sidebar-accent-active)] active:text-[var(--sidebar-accent-foreground)] disabled:pointer-events-none disabled:opacity-50 aria-disabled:pointer-events-none aria-disabled:opacity-50 [&>span:last-child]:truncate [&>svg:not([class*='size-'])]:size-4 [&>svg]:shrink-0",
       "data-[active=true]:bg-[var(--sidebar-accent-active)] data-[active=true]:text-[var(--sidebar-accent-foreground)]",
       size === "sm" && "text-xs",
       size === "md" && "text-sm",
diff --git a/apps/web/src/components/ui/surface.ts b/apps/web/src/components/ui/surface.ts
index c6186ed3d..b9c435214 100644
--- a/apps/web/src/components/ui/surface.ts
+++ b/apps/web/src/components/ui/surface.ts
@@ -14,7 +14,7 @@ export const PANEL_SECTION_DIVIDER_CLASS_NAME = "border-panel-border";
 
 /** Inset content well used by diffs, code, and grouped content inside a panel. */
 export const INSET_WELL_SURFACE_CLASS_NAME =
-  "overflow-hidden rounded-[8px] border border-panel-border bg-[var(--well)]";
+  "overflow-hidden rounded-lg border border-panel-border bg-[var(--well)]";
 
 /** Transient elevation role. Shadows are reserved for overlays only. */
 export const OVERLAY_SURFACE_CLASS_NAME =
diff --git a/apps/web/src/components/ui/toast.tsx b/apps/web/src/components/ui/toast.tsx
index 90d2f3383..7cae15051 100644
--- a/apps/web/src/components/ui/toast.tsx
+++ b/apps/web/src/components/ui/toast.tsx
@@ -69,7 +69,7 @@ function isArchiveUndoToast(toast: ToastObject<ThreadToastData>): boolean {
 // toast root no-drag so Electron titlebar hit testing cannot swallow clicks.
 const ARCHIVE_UNDO_TOAST_SURFACE_CLASS_NAME = cn(
   APP_TOOLTIP_SURFACE_CLASS_NAME,
-  "absolute w-max max-w-[min(calc(100vw-2rem),28rem)] rounded-[8px] [--notification-fg:var(--popover-foreground)] [-webkit-app-region:no-drag]",
+  "absolute w-max max-w-[min(calc(100vw-2rem),28rem)] rounded-lg [--notification-fg:var(--popover-foreground)] [-webkit-app-region:no-drag]",
 );
 
 const ARCHIVE_UNDO_TOAST_LINK_CLASS_NAME =
diff --git a/apps/web/src/composer-editor-mentions.test.ts b/apps/web/src/composer-editor-mentions.test.ts
index a967642a4..97232498a 100644
--- a/apps/web/src/composer-editor-mentions.test.ts
+++ b/apps/web/src/composer-editor-mentions.test.ts
@@ -6,7 +6,6 @@ import {
   splitPromptIntoComposerSegments,
   splitPromptIntoDisplaySegments,
 } from "./composer-editor-mentions";
-import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";
 
 describe("matchComposerLinkToken", () => {
   it("matches a URL only once a delimiter follows it while typing", () => {
@@ -74,11 +73,9 @@ describe("splitPromptIntoComposerSegments", () => {
 
   it("marks selected provider mention references as plugin mentions", () => {
     expect(
-      splitPromptIntoComposerSegments(
-        "Use @Gmail please",
-        [],
-        [{ name: "gmail", path: "plugin://gmail@openai-curated" }],
-      ),
+      splitPromptIntoComposerSegments("Use @Gmail please", [
+        { name: "gmail", path: "plugin://gmail@openai-curated" },
+      ]),
     ).toEqual([
       { type: "text", text: "Use " },
       { type: "mention", path: "Gmail", kind: "plugin" },
@@ -168,19 +165,6 @@ describe("splitPromptIntoComposerSegments", () => {
     ]);
   });
 
-  it("keeps inline terminal context placeholders at their prompt positions", () => {
-    expect(
-      splitPromptIntoComposerSegments(
-        `Inspect ${INLINE_TERMINAL_CONTEXT_PLACEHOLDER}@AGENTS.md please`,
-      ),
-    ).toEqual([
-      { type: "text", text: "Inspect " },
-      { type: "terminal-context", context: null },
-      { type: "mention", path: "AGENTS.md" },
-      { type: "text", text: " please" },
-    ]);
-  });
-
   it("converts a URL into a link segment once a delimiter follows it", () => {
     expect(
       splitPromptIntoComposerSegments("see https://github.com/openai/codex/pull/1 thanks"),
diff --git a/apps/web/src/composer-editor-mentions.ts b/apps/web/src/composer-editor-mentions.ts
index 9cca76383..6da0d26fb 100644
--- a/apps/web/src/composer-editor-mentions.ts
+++ b/apps/web/src/composer-editor-mentions.ts
@@ -1,8 +1,4 @@
 import { isBuiltInComposerSlashCommand, type ComposerSlashCommand } from "./composerSlashCommands";
-import {
-  INLINE_TERMINAL_CONTEXT_PLACEHOLDER,
-  type TerminalContextDraft,
-} from "./lib/terminalContext";
 import {
   createComposerMentionTokenRegex,
   extractComposerMentionPath,
@@ -36,10 +32,6 @@ export type ComposerPromptSegment =
       type: "slash-command";
       command: ComposerSlashCommand;
     }
-  | {
-      type: "terminal-context";
-      context: TerminalContextDraft | null;
-    }
   | {
       /** Agent mention: @alias - chip for subagent reference (parens are plain text) */
       type: "agent-mention";
@@ -357,48 +349,15 @@ export function splitPromptIntoDisplaySegments(
 
 export function splitPromptIntoComposerSegments(
   prompt: string,
-  terminalContexts: ReadonlyArray<TerminalContextDraft> = [],
   mentionReferences: ReadonlyArray<ProviderMentionReference> = [],
 ): ComposerPromptSegment[] {
   if (!prompt) {
     return [];
   }
 
-  const segments: ComposerPromptSegment[] = [];
-  let textCursor = 0;
-  let terminalContextIndex = 0;
-
-  for (let index = 0; index < prompt.length; index += 1) {
-    if (prompt[index] !== INLINE_TERMINAL_CONTEXT_PLACEHOLDER) {
-      continue;
-    }
-
-    if (index > textCursor) {
-      segments.push(
-        ...splitTextIntoPromptSegments(prompt.slice(textCursor, index), {
-          includeTrailingTokenAtEnd: false,
-          includeSlashCommandChips: true,
-          mentionReferences,
-        }),
-      );
-    }
-    segments.push({
-      type: "terminal-context",
-      context: terminalContexts[terminalContextIndex] ?? null,
-    });
-    terminalContextIndex += 1;
-    textCursor = index + 1;
-  }
-
-  if (textCursor < prompt.length) {
-    segments.push(
-      ...splitTextIntoPromptSegments(prompt.slice(textCursor), {
-        includeTrailingTokenAtEnd: false,
-        includeSlashCommandChips: true,
-        mentionReferences,
-      }),
-    );
-  }
-
-  return segments;
+  return splitTextIntoPromptSegments(prompt, {
+    includeTrailingTokenAtEnd: false,
+    includeSlashCommandChips: true,
+    mentionReferences,
+  });
 }
diff --git a/apps/web/src/composer-logic.test.ts b/apps/web/src/composer-logic.test.ts
index 3a9f69af1..485569393 100644
--- a/apps/web/src/composer-logic.test.ts
+++ b/apps/web/src/composer-logic.test.ts
@@ -10,7 +10,6 @@ import {
   replaceTextRange,
   stripComposerTriggerText,
 } from "./composer-logic";
-import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";
 
 describe("detectComposerTrigger", () => {
   it("detects @mention trigger at cursor", () => {
@@ -409,15 +408,6 @@ describe("isCollapsedCursorAdjacentToInlineToken", () => {
     expect(isCollapsedCursorAdjacentToInlineToken(text, mentionStart - 1, "right")).toBe(false);
   });
 
-  it("treats terminal pills as inline tokens for adjacency checks", () => {
-    const text = `open ${INLINE_TERMINAL_CONTEXT_PLACEHOLDER} next`;
-    const tokenStart = "open ".length;
-    const tokenEnd = tokenStart + 1;
-
-    expect(isCollapsedCursorAdjacentToInlineToken(text, tokenEnd, "left")).toBe(true);
-    expect(isCollapsedCursorAdjacentToInlineToken(text, tokenStart, "right")).toBe(true);
-  });
-
   it("treats /automation as an inline token once it has trailing text", () => {
     const text = "/automation fra 15 secondi";
 
diff --git a/apps/web/src/composer-logic.ts b/apps/web/src/composer-logic.ts
index 46d735ad0..c53785dd0 100644
--- a/apps/web/src/composer-logic.ts
+++ b/apps/web/src/composer-logic.ts
@@ -1,6 +1,5 @@
 import { splitPromptIntoComposerSegments } from "./composer-editor-mentions";
 import { isBuiltInComposerSlashCommand, type ComposerSlashCommand } from "./composerSlashCommands";
-import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "./lib/terminalContext";
 
 export type ComposerTriggerKind = "mention" | "slash-command" | "slash-model" | "skill";
 
@@ -24,7 +23,6 @@ type ComposerSegmentLike =
   | { type: "mention" }
   | { type: "skill" }
   | { type: "slash-command"; command: ComposerSlashCommand }
-  | { type: "terminal-context" }
   | { type: "agent-mention"; alias: string }
   | { type: "link"; url: string };
 
@@ -36,13 +34,7 @@ function clampCursor(text: string, cursor: number): number {
 }
 
 function isWhitespace(char: string): boolean {
-  return (
-    char === " " ||
-    char === "\n" ||
-    char === "\t" ||
-    char === "\r" ||
-    char === INLINE_TERMINAL_CONTEXT_PLACEHOLDER
-  );
+  return char === " " || char === "\n" || char === "\t" || char === "\r";
 }
 
 function tokenStartForCursor(text: string, cursor: number): number {
@@ -128,14 +120,6 @@ export function expandCollapsedComposerCursor(text: string, cursorInput: number)
       expandedCursor += expandedLength;
       continue;
     }
-    if (segment.type === "terminal-context") {
-      if (remaining <= 1) {
-        return expandedCursor + remaining;
-      }
-      remaining -= 1;
-      expandedCursor += 1;
-      continue;
-    }
 
     const segmentLength = segment.text.length;
     if (remaining <= segmentLength) {
@@ -248,14 +232,6 @@ export function collapseExpandedComposerCursor(text: string, cursorInput: number
       collapsedCursor += 1;
       continue;
     }
-    if (segment.type === "terminal-context") {
-      if (remaining <= 1) {
-        return collapsedCursor + remaining;
-      }
-      remaining -= 1;
-      collapsedCursor += 1;
-      continue;
-    }
 
     const segmentLength = segment.text.length;
     if (remaining <= segmentLength) {
diff --git a/apps/web/src/composerDraftStore.test.ts b/apps/web/src/composerDraftStore.test.ts
index b5ba5e639..bd1c0b8eb 100644
--- a/apps/web/src/composerDraftStore.test.ts
+++ b/apps/web/src/composerDraftStore.test.ts
@@ -20,11 +20,6 @@ import {
   useComposerDraftStore,
 } from "./composerDraftStore";
 import { removeLocalStorageItem, setLocalStorageItem } from "./hooks/useLocalStorage";
-import {
-  INLINE_TERMINAL_CONTEXT_PLACEHOLDER,
-  insertInlineTerminalContextPlaceholder,
-  type TerminalContextDraft,
-} from "./lib/terminalContext";
 import { createDebouncedStorage } from "./lib/storage";
 
 function makeImage(input: {
@@ -79,26 +74,6 @@ function makeFile(input: {
   };
 }
 
-function makeTerminalContext(input: {
-  id: string;
-  text?: string;
-  terminalId?: string;
-  terminalLabel?: string;
-  lineStart?: number;
-  lineEnd?: number;
-}): TerminalContextDraft {
-  return {
-    id: input.id,
-    threadId: ThreadId.makeUnsafe("thread-dedupe"),
-    terminalId: input.terminalId ?? "default",
-    terminalLabel: input.terminalLabel ?? "Terminal 1",
-    lineStart: input.lineStart ?? 4,
-    lineEnd: input.lineEnd ?? 5,
-    text: input.text ?? "git status\nOn branch main",
-    createdAt: "2026-03-13T12:00:00.000Z",
-  };
-}
-
 function makeQueuedTurn(id: string): QueuedComposerTurn {
   return {
     id,
@@ -128,7 +103,6 @@ function makeQueuedChatTurn(id: string, image?: ComposerImageAttachment): Queued
     images: image ? [image] : [],
     files: [],
     assistantSelections: [],
-    terminalContexts: [makeTerminalContext({ id: `ctx-${id}` })],
     fileComments: [],
     pastedTexts: [],
     skills: [{ name: "check-code", path: "/skills/check-code" }],
@@ -494,10 +468,6 @@ describe("composerDraftStore prompt history saved draft", () => {
       assistantMessageId: "assistant-1",
       text: "Use this assistant answer",
     };
-    const terminalContext = makeTerminalContext({
-      id: "ctx-history",
-      text: "bun run check",
-    });
     const fileComment = {
       id: "comment-history",
       path: "apps/web/src/App.tsx",
@@ -517,7 +487,6 @@ describe("composerDraftStore prompt history saved draft", () => {
 
     store.setPrompt(threadId, "draft with structured context");
     store.addAssistantSelection(threadId, assistantSelection);
-    store.addTerminalContext(threadId, terminalContext);
     store.addFileComment(threadId, fileComment);
     store.addPastedTexts(threadId, [pastedText]);
     store.setSkills(threadId, [selectedSkill]);
@@ -535,7 +504,6 @@ describe("composerDraftStore prompt history saved draft", () => {
 
     const browsingDraft = useComposerDraftStore.getState().draftsByThreadId[threadId]!;
     expect(browsingDraft.assistantSelections).toHaveLength(0);
-    expect(browsingDraft.terminalContexts).toHaveLength(0);
     expect(browsingDraft.fileComments).toHaveLength(0);
     expect(browsingDraft.pastedTexts).toHaveLength(0);
     expect(browsingDraft.skills).toHaveLength(0);
@@ -543,9 +511,6 @@ describe("composerDraftStore prompt history saved draft", () => {
     expect(
       browsingDraft.promptHistorySavedDraft?.assistantSelections.map((entry) => entry.id),
     ).toEqual(["sel-history"]);
-    expect(
-      browsingDraft.promptHistorySavedDraft?.terminalContexts.map((entry) => entry.id),
-    ).toEqual(["ctx-history"]);
     expect(browsingDraft.promptHistorySavedDraft?.fileComments.map((entry) => entry.id)).toEqual([
       "comment-history",
     ]);
@@ -561,7 +526,6 @@ describe("composerDraftStore prompt history saved draft", () => {
     const restoredDraft = useComposerDraftStore.getState().draftsByThreadId[threadId]!;
     expect(restoredDraft.prompt).toBe(draftBeforeBrowse.prompt);
     expect(restoredDraft.assistantSelections.map((entry) => entry.id)).toEqual(["sel-history"]);
-    expect(restoredDraft.terminalContexts.map((entry) => entry.id)).toEqual(["ctx-history"]);
     expect(restoredDraft.fileComments.map((entry) => entry.id)).toEqual(["comment-history"]);
     expect(restoredDraft.pastedTexts.map((entry) => entry.id)).toEqual(["paste-history"]);
     expect(restoredDraft.skills).toEqual([selectedSkill]);
@@ -578,10 +542,6 @@ describe("composerDraftStore prompt history saved draft", () => {
       sizeBytes: image.sizeBytes,
       dataUrl: "data:image/png;base64,aGk=",
     };
-    const terminalContext = makeTerminalContext({
-      id: "ctx-persist-history",
-      text: "bun run test",
-    });
     const pastedText = {
       id: "paste-persist-history",
       createdAt: "2026-03-13T12:00:00.000Z",
@@ -594,7 +554,6 @@ describe("composerDraftStore prompt history saved draft", () => {
     store.setPrompt(threadId, "persist me before history");
     store.addImage(threadId, image);
     store.syncPersistedAttachments(threadId, [persistedAttachment]);
-    store.addTerminalContext(threadId, terminalContext);
     store.addPastedTexts(threadId, [pastedText]);
     store.setSkills(threadId, [selectedSkill]);
     const draftBeforeBrowse = useComposerDraftStore.getState().draftsByThreadId[threadId]!;
@@ -624,13 +583,6 @@ describe("composerDraftStore prompt history saved draft", () => {
       persistedState.draftsByThreadId?.[threadId]?.promptHistorySavedDraft?.attachments,
     ).toEqual([persistedAttachment]);
     const persistedSnapshot = persistedState.draftsByThreadId?.[threadId]?.promptHistorySavedDraft;
-    const persistedTerminalContexts = persistedSnapshot?.terminalContexts as
-      | Array<Record<string, unknown>>
-      | undefined;
-    expect(persistedTerminalContexts?.[0]).toMatchObject({
-      id: "ctx-persist-history",
-    });
-    expect(persistedTerminalContexts?.[0]).not.toHaveProperty("text");
     expect(persistedSnapshot?.pastedTexts).toEqual([
       {
         id: "paste-persist-history",
@@ -647,12 +599,6 @@ describe("composerDraftStore prompt history saved draft", () => {
 
     expect(restoredSnapshot?.images.map((entry) => entry.id)).toEqual(["img-persist-history"]);
     expect(restoredSnapshot?.files).toEqual([]);
-    expect(restoredSnapshot?.terminalContexts).toEqual([
-      expect.objectContaining({
-        id: "ctx-persist-history",
-        text: "",
-      }),
-    ]);
     expect(restoredSnapshot?.pastedTexts.map((entry) => entry.id)).toEqual([
       "paste-persist-history",
     ]);
@@ -774,18 +720,8 @@ describe("composerDraftStore copyTransferableComposerState", () => {
     resetComposerDraftStore();
   });
 
-  it("copies the prompt and terminal contexts to the target thread", () => {
-    const sourceContext = makeTerminalContext({
-      id: "ctx-source",
-      text: "pnpm lint",
-    });
-    const copiedPrompt = insertInlineTerminalContextPlaceholder(
-      "Please reuse this context",
-      24,
-    ).prompt;
-
-    useComposerDraftStore.getState().setPrompt(sourceThreadId, copiedPrompt);
-    useComposerDraftStore.getState().setTerminalContexts(sourceThreadId, [sourceContext]);
+  it("copies the prompt, skills and mentions to the target thread", () => {
+    useComposerDraftStore.getState().setPrompt(sourceThreadId, "Please reuse this context");
     useComposerDraftStore
       .getState()
       .setSkills(sourceThreadId, [{ name: "check-code", path: "/skills/check-code" }]);
@@ -800,15 +736,6 @@ describe("composerDraftStore copyTransferableComposerState", () => {
 
     expect(targetDraft).toMatchObject({
       prompt: sourceDraft?.prompt,
-      terminalContexts: [
-        expect.objectContaining({
-          id: sourceContext.id,
-          threadId: targetThreadId,
-          terminalId: sourceContext.terminalId,
-          terminalLabel: sourceContext.terminalLabel,
-          text: sourceContext.text,
-        }),
-      ],
       skills: [{ name: "check-code", path: "/skills/check-code" }],
       mentions: [{ name: "linear", path: "plugin://linear" }],
     });
@@ -1010,7 +937,7 @@ describe("composerDraftStore syncPersistedAttachments", () => {
   });
 });
 
-describe("composerDraftStore terminal contexts", () => {
+describe("composerDraftStore persisted draft sanitization", () => {
   const threadId = ThreadId.makeUnsafe("thread-dedupe");
 
   beforeEach(() => {
@@ -1023,136 +950,6 @@ describe("composerDraftStore terminal contexts", () => {
     });
   });
 
-  it("deduplicates identical terminal contexts by selection signature", () => {
-    const first = makeTerminalContext({ id: "ctx-1" });
-    const duplicate = makeTerminalContext({ id: "ctx-2" });
-
-    useComposerDraftStore.getState().addTerminalContexts(threadId, [first, duplicate]);
-
-    const draft = useComposerDraftStore.getState().draftsByThreadId[threadId];
-    expect(draft?.terminalContexts.map((context) => context.id)).toEqual(["ctx-1"]);
-  });
-
-  it("clears terminal contexts when clearing composer content", () => {
-    useComposerDraftStore
-      .getState()
-      .addTerminalContext(threadId, makeTerminalContext({ id: "ctx-1" }));
-
-    useComposerDraftStore.getState().clearComposerContent(threadId);
-
-    expect(useComposerDraftStore.getState().draftsByThreadId[threadId]).toBeUndefined();
-  });
-
-  it("inserts terminal contexts at the requested inline prompt position", () => {
-    const firstInsertion = insertInlineTerminalContextPlaceholder("alpha beta", 6);
-    const secondInsertion = insertInlineTerminalContextPlaceholder(firstInsertion.prompt, 0);
-
-    expect(
-      useComposerDraftStore
-        .getState()
-        .insertTerminalContext(
-          threadId,
-          firstInsertion.prompt,
-          makeTerminalContext({ id: "ctx-1" }),
-          firstInsertion.contextIndex,
-        ),
-    ).toBe(true);
-    expect(
-      useComposerDraftStore.getState().insertTerminalContext(
-        threadId,
-        secondInsertion.prompt,
-        makeTerminalContext({
-          id: "ctx-2",
-          terminalLabel: "Terminal 2",
-          lineStart: 9,
-          lineEnd: 10,
-        }),
-        secondInsertion.contextIndex,
-      ),
-    ).toBe(true);
-
-    const draft = useComposerDraftStore.getState().draftsByThreadId[threadId];
-    expect(draft?.prompt).toBe(
-      `${INLINE_TERMINAL_CONTEXT_PLACEHOLDER} alpha ${INLINE_TERMINAL_CONTEXT_PLACEHOLDER} beta`,
-    );
-    expect(draft?.terminalContexts.map((context) => context.id)).toEqual(["ctx-2", "ctx-1"]);
-  });
-
-  it("omits terminal context text from persisted drafts", () => {
-    useComposerDraftStore
-      .getState()
-      .addTerminalContext(threadId, makeTerminalContext({ id: "ctx-persist" }));
-
-    const persistApi = useComposerDraftStore.persist as unknown as {
-      getOptions: () => {
-        partialize: (state: ReturnType<typeof useComposerDraftStore.getState>) => unknown;
-      };
-    };
-    const persistedState = persistApi.getOptions().partialize(useComposerDraftStore.getState()) as {
-      draftsByThreadId?: Record<string, { terminalContexts?: Array<Record<string, unknown>> }>;
-    };
-
-    expect(
-      persistedState.draftsByThreadId?.[threadId]?.terminalContexts?.[0],
-      "Expected terminal context metadata to be persisted.",
-    ).toMatchObject({
-      id: "ctx-persist",
-      terminalId: "default",
-      terminalLabel: "Terminal 1",
-      lineStart: 4,
-      lineEnd: 5,
-    });
-    expect(
-      persistedState.draftsByThreadId?.[threadId]?.terminalContexts?.[0]?.text,
-    ).toBeUndefined();
-  });
-
-  it("hydrates persisted terminal contexts without in-memory snapshot text", () => {
-    const persistApi = useComposerDraftStore.persist as unknown as {
-      getOptions: () => {
-        merge: (
-          persistedState: unknown,
-          currentState: ReturnType<typeof useComposerDraftStore.getState>,
-        ) => ReturnType<typeof useComposerDraftStore.getState>;
-      };
-    };
-    const mergedState = persistApi.getOptions().merge(
-      {
-        draftsByThreadId: {
-          [threadId]: {
-            prompt: INLINE_TERMINAL_CONTEXT_PLACEHOLDER,
-            attachments: [],
-            terminalContexts: [
-              {
-                id: "ctx-rehydrated",
-                threadId,
-                createdAt: "2026-03-13T12:00:00.000Z",
-                terminalId: "default",
-                terminalLabel: "Terminal 1",
-                lineStart: 4,
-                lineEnd: 5,
-              },
-            ],
-          },
-        },
-        draftThreadsByThreadId: {},
-        projectDraftThreadIdByProjectId: {},
-      },
-      useComposerDraftStore.getInitialState(),
-    );
-
-    expect(mergedState.draftsByThreadId[threadId]?.terminalContexts).toMatchObject([
-      {
-        id: "ctx-rehydrated",
-        terminalId: "default",
-        terminalLabel: "Terminal 1",
-        lineStart: 4,
-        lineEnd: 5,
-        text: "",
-      },
-    ]);
-  });
-
   it("sanitizes malformed persisted drafts during merge", () => {
     const persistApi = useComposerDraftStore.persist as unknown as {
       getOptions: () => {
@@ -1168,7 +965,6 @@ describe("composerDraftStore terminal contexts", () => {
           [threadId]: {
             prompt: "",
             attachments: "not-an-array",
-            terminalContexts: "not-an-array",
             provider: "bogus-provider",
             modelOptions: "not-an-object",
           },
@@ -1250,7 +1046,6 @@ describe("composerDraftStore project draft thread mapping", () => {
     expect(useComposerDraftStore.getState().getDraftThreadByProjectId(projectId)).toEqual({
       threadId,
       projectId,
-      entryPoint: "chat",
       branch: "feature/test",
       worktreePath: "/tmp/worktree-test",
       envMode: "worktree",
@@ -1260,7 +1055,6 @@ describe("composerDraftStore project draft thread mapping", () => {
     });
     expect(useComposerDraftStore.getState().getDraftThread(threadId)).toEqual({
       projectId,
-      entryPoint: "chat",
       branch: "feature/test",
       worktreePath: "/tmp/worktree-test",
       envMode: "worktree",
@@ -1270,31 +1064,6 @@ describe("composerDraftStore project draft thread mapping", () => {
     });
   });
 
-  it("tracks chat and terminal draft threads independently for the same project", () => {
-    const store = useComposerDraftStore.getState();
-    store.setProjectDraftThreadId(projectId, threadId, { entryPoint: "chat" });
-    store.setProjectDraftThreadId(projectId, otherThreadId, { entryPoint: "terminal" });
-
-    expect(
-      useComposerDraftStore.getState().getDraftThreadByProjectId(projectId, "chat"),
-    ).toMatchObject({
-      threadId,
-      projectId,
-      entryPoint: "chat",
-    });
-    expect(
-      useComposerDraftStore.getState().getDraftThreadByProjectId(projectId, "terminal"),
-    ).toMatchObject({
-      threadId: otherThreadId,
-      projectId,
-      entryPoint: "terminal",
-    });
-    expect(useComposerDraftStore.getState().getDraftThread(threadId)?.entryPoint).toBe("chat");
-    expect(useComposerDraftStore.getState().getDraftThread(otherThreadId)?.entryPoint).toBe(
-      "terminal",
-    );
-  });
-
   it("clears only matching project draft mapping entries", () => {
     const store = useComposerDraftStore.getState();
     store.setProjectDraftThreadId(projectId, threadId);
@@ -2053,7 +1822,6 @@ describe("composerDraftStore queued follow-ups", () => {
           threadId: "thread-source-plan",
           planId: "plan-1",
         },
-        terminalContexts: [{ text: "git status\nOn branch main" }],
       },
     ]);
   });
diff --git a/apps/web/src/composerDraftStore.ts b/apps/web/src/composerDraftStore.ts
index f2952d1f8..55703ccbe 100644
--- a/apps/web/src/composerDraftStore.ts
+++ b/apps/web/src/composerDraftStore.ts
@@ -41,13 +41,7 @@ import {
   type ChatAssistantSelectionAttachment,
   type ChatFileAttachment,
   type ChatImageAttachment,
-  type ThreadPrimarySurface,
 } from "./types";
-import {
-  type TerminalContextDraft,
-  ensureInlineTerminalContextPlaceholders,
-  normalizeTerminalContextText,
-} from "./lib/terminalContext";
 import {
   type FileCommentDraft,
   type FileCommentSelection,
@@ -77,7 +71,6 @@ export const COMPOSER_DRAFT_STORAGE_KEY = "teacode:composer-drafts:v1";
 const COMPOSER_DRAFT_STORAGE_VERSION = 6;
 const DraftThreadEnvModeSchema = Schema.Literals(["local", "worktree"]);
 export type DraftThreadEnvMode = typeof DraftThreadEnvModeSchema.Type;
-const DraftThreadEntryPointSchema = Schema.Literals(["chat", "terminal"]);
 const COMPOSER_PROVIDER_KINDS = [
   "codex",
   "claudeAgent",
@@ -91,7 +84,6 @@ const isProviderKind = Schema.is(ProviderKind);
 const GROK_REASONING_EFFORT_SET = new Set<string>(GROK_REASONING_EFFORT_OPTIONS);
 
 const COMPOSER_PERSIST_DEBOUNCE_MS = 300;
-const TERMINAL_DRAFT_THREAD_MAPPING_SUFFIX = "::terminal";
 
 const composerDebouncedStorage = createDebouncedStorage(
   typeof localStorage !== "undefined" ? localStorage : createMemoryStorage(),
@@ -143,7 +135,6 @@ export interface ComposerPromptHistorySavedDraft {
   nonPersistedImageIds: string[];
   persistedAttachments: PersistedComposerImageAttachment[];
   assistantSelections: ComposerAssistantSelectionAttachment[];
-  terminalContexts: TerminalContextDraft[];
   fileComments: FileCommentDraft[];
   pastedTexts: PastedTextDraft[];
   skills: ProviderSkillReference[];
@@ -161,7 +152,6 @@ export interface QueuedComposerChatTurn {
   images: ComposerImageAttachment[];
   files: ComposerFileAttachment[];
   assistantSelections: ComposerAssistantSelectionAttachment[];
-  terminalContexts: TerminalContextDraft[];
   fileComments: FileCommentDraft[];
   pastedTexts: PastedTextDraft[];
   skills: ProviderSkillReference[];
@@ -200,29 +190,6 @@ export interface QueuedComposerPlanFollowUp {
 
 export type QueuedComposerTurn = QueuedComposerChatTurn | QueuedComposerPlanFollowUp;
 
-const PersistedTerminalContextDraft = Schema.Struct({
-  id: Schema.String,
-  threadId: ThreadId,
-  createdAt: Schema.String,
-  terminalId: Schema.String,
-  terminalLabel: Schema.String,
-  lineStart: Schema.Number,
-  lineEnd: Schema.Number,
-});
-type PersistedTerminalContextDraft = typeof PersistedTerminalContextDraft.Type;
-
-const PersistedQueuedTerminalContextDraft = Schema.Struct({
-  id: Schema.String,
-  threadId: ThreadId,
-  createdAt: Schema.String,
-  terminalId: Schema.String,
-  terminalLabel: Schema.String,
-  lineStart: Schema.Number,
-  lineEnd: Schema.Number,
-  text: Schema.String,
-});
-type PersistedQueuedTerminalContextDraft = typeof PersistedQueuedTerminalContextDraft.Type;
-
 // File comments always carry their authored text (no live source to re-derive
 // from), so a single schema covers both live drafts and queued turns.
 const PersistedFileCommentDraft = Schema.Struct({
@@ -270,7 +237,6 @@ const PersistedQueuedComposerChatTurn = Schema.Struct({
   prompt: Schema.String,
   images: Schema.Array(PersistedComposerImageAttachment),
   assistantSelections: Schema.optionalKey(Schema.Array(PersistedAssistantSelectionDraft)),
-  terminalContexts: Schema.Array(PersistedQueuedTerminalContextDraft),
   fileComments: Schema.optionalKey(Schema.Array(PersistedFileCommentDraft)),
   pastedTexts: Schema.optionalKey(Schema.Array(PersistedPastedTextDraft)),
   skills: Schema.Array(ProviderSkillReference),
@@ -314,7 +280,6 @@ const PersistedComposerPromptHistorySavedDraft = Schema.Union([
     prompt: Schema.String,
     attachments: Schema.optionalKey(Schema.Array(PersistedComposerImageAttachment)),
     assistantSelections: Schema.optionalKey(Schema.Array(PersistedAssistantSelectionDraft)),
-    terminalContexts: Schema.optionalKey(Schema.Array(PersistedTerminalContextDraft)),
     fileComments: Schema.optionalKey(Schema.Array(PersistedFileCommentDraft)),
     pastedTexts: Schema.optionalKey(Schema.Array(PersistedPastedTextDraft)),
     skills: Schema.optionalKey(Schema.Array(ProviderSkillReference)),
@@ -339,7 +304,6 @@ const PersistedComposerThreadDraftState = Schema.Struct({
       }),
     ),
   ),
-  terminalContexts: Schema.optionalKey(Schema.Array(PersistedTerminalContextDraft)),
   fileComments: Schema.optionalKey(Schema.Array(PersistedFileCommentDraft)),
   pastedTexts: Schema.optionalKey(Schema.Array(PersistedPastedTextDraft)),
   skills: Schema.optionalKey(Schema.Array(ProviderSkillReference)),
@@ -398,7 +362,6 @@ const PersistedDraftThreadState = Schema.Struct({
   projectId: ProjectId,
   createdAt: Schema.String,
   runtimeMode: RuntimeMode,
-  entryPoint: DraftThreadEntryPointSchema.pipe(Schema.withDecodingDefault(() => "chat")),
   branch: Schema.NullOr(Schema.String),
   worktreePath: Schema.NullOr(Schema.String),
   lastKnownPr: Schema.optionalKey(Schema.NullOr(OrchestrationThreadPullRequest)),
@@ -435,7 +398,6 @@ export interface ComposerThreadDraftState {
   nonPersistedImageIds: string[];
   persistedAttachments: PersistedComposerImageAttachment[];
   assistantSelections: ComposerAssistantSelectionAttachment[];
-  terminalContexts: TerminalContextDraft[];
   fileComments: FileCommentDraft[];
   pastedTexts: PastedTextDraft[];
   skills: ProviderSkillReference[];
@@ -451,7 +413,6 @@ export interface DraftThreadState {
   projectId: ProjectId;
   createdAt: string;
   runtimeMode: RuntimeMode;
-  entryPoint: ThreadPrimarySurface;
   branch: string | null;
   worktreePath: string | null;
   lastKnownPr?: OrchestrationThreadPullRequest | null;
@@ -466,7 +427,6 @@ interface DraftThreadMutationOptions {
   createdAt?: string;
   envMode?: DraftThreadEnvMode;
   runtimeMode?: RuntimeMode;
-  entryPoint?: ThreadPrimarySurface;
 }
 
 type DraftThreadCreatedAtMode = "accept-empty" | "preserve-existing-on-empty";
@@ -481,10 +441,7 @@ export interface ComposerDraftStoreState {
   projectDraftThreadIdByProjectId: Record<string, ThreadId>;
   stickyModelSelectionByProvider: Partial<Record<ProviderKind, ModelSelection>>;
   stickyActiveProvider: ProviderKind | null;
-  getDraftThreadByProjectId: (
-    projectId: ProjectId,
-    entryPoint?: ThreadPrimarySurface,
-  ) => ProjectDraftThread | null;
+  getDraftThreadByProjectId: (projectId: ProjectId) => ProjectDraftThread | null;
   getDraftThread: (threadId: ThreadId) => DraftThreadState | null;
   setProjectDraftThreadId: (
     projectId: ProjectId,
@@ -522,7 +479,7 @@ export interface ComposerDraftStoreState {
     projectId: ProjectId,
     options?: DraftThreadMutationOptions,
   ) => void;
-  clearProjectDraftThreadId: (projectId: ProjectId, entryPoint?: ThreadPrimarySurface) => void;
+  clearProjectDraftThreadId: (projectId: ProjectId) => void;
   clearProjectDraftThreads: (projectId: ProjectId) => void;
   clearProjectDraftThreadById: (projectId: ProjectId, threadId: ThreadId) => void;
   markDraftThreadPromoting: (threadId: ThreadId, promotedTo?: ThreadId) => void;
@@ -540,7 +497,6 @@ export interface ComposerDraftStoreState {
     threadId: ThreadId,
     attachments: PersistedComposerImageAttachment[],
   ) => Promise<ComposerAttachmentPersistenceResult>;
-  setTerminalContexts: (threadId: ThreadId, contexts: TerminalContextDraft[]) => void;
   setSkills: (threadId: ThreadId, skills: ProviderSkillReference[]) => void;
   setMentions: (threadId: ThreadId, mentions: ProviderMentionReference[]) => void;
   setModelSelection: (
@@ -583,16 +539,6 @@ export interface ComposerDraftStoreState {
   addPastedTexts: (threadId: ThreadId, pastedTexts: PastedTextDraft[]) => void;
   removePastedText: (threadId: ThreadId, pastedTextId: string) => void;
   clearPastedTexts: (threadId: ThreadId) => void;
-  insertTerminalContext: (
-    threadId: ThreadId,
-    prompt: string,
-    context: TerminalContextDraft,
-    index: number,
-  ) => boolean;
-  addTerminalContext: (threadId: ThreadId, context: TerminalContextDraft) => void;
-  addTerminalContexts: (threadId: ThreadId, contexts: TerminalContextDraft[]) => void;
-  removeTerminalContext: (threadId: ThreadId, contextId: string) => void;
-  clearTerminalContexts: (threadId: ThreadId) => void;
   clearPersistedAttachments: (threadId: ThreadId) => void;
   syncPersistedAttachments: (
     threadId: ThreadId,
@@ -670,27 +616,6 @@ const EMPTY_PERSISTED_DRAFT_STORE_STATE = Object.freeze<PersistedComposerDraftSt
   stickyActiveProvider: null,
 });
 
-function projectDraftThreadMappingKey(
-  projectId: ProjectId,
-  entryPoint: ThreadPrimarySurface = "chat",
-): string {
-  return entryPoint === "terminal"
-    ? `${projectId}${TERMINAL_DRAFT_THREAD_MAPPING_SUFFIX}`
-    : projectId;
-}
-
-function projectDraftThreadEntryPointFromKey(key: string): ThreadPrimarySurface {
-  return key.endsWith(TERMINAL_DRAFT_THREAD_MAPPING_SUFFIX) ? "terminal" : "chat";
-}
-
-function projectIdFromDraftThreadMappingKey(key: string): ProjectId {
-  return (
-    key.endsWith(TERMINAL_DRAFT_THREAD_MAPPING_SUFFIX)
-      ? key.slice(0, -TERMINAL_DRAFT_THREAD_MAPPING_SUFFIX.length)
-      : key
-  ) as ProjectId;
-}
-
 function resolveDraftThreadCreatedAt(input: {
   createdAt: string | undefined;
   existingThread: DraftThreadState | undefined;
@@ -716,10 +641,6 @@ function buildDraftThreadState(input: {
     options?.worktreePath === undefined
       ? (existingThread?.worktreePath ?? null)
       : (options.worktreePath ?? null);
-  const nextEntryPoint = normalizeDraftThreadEntryPoint(
-    options?.entryPoint,
-    existingThread?.entryPoint ?? "chat",
-  );
   const nextPromotedTo = existingThread?.promotedTo;
 
   return {
@@ -730,7 +651,6 @@ function buildDraftThreadState(input: {
       mode: input.createdAtMode,
     }),
     runtimeMode: options?.runtimeMode ?? existingThread?.runtimeMode ?? DEFAULT_RUNTIME_MODE,
-    entryPoint: nextEntryPoint,
     branch:
       options?.branch === undefined ? (existingThread?.branch ?? null) : (options.branch ?? null),
     worktreePath: nextWorktreePath,
@@ -756,7 +676,6 @@ function draftThreadStatesEqual(
     left.projectId === right.projectId &&
     left.createdAt === right.createdAt &&
     left.runtimeMode === right.runtimeMode &&
-    left.entryPoint === right.entryPoint &&
     left.branch === right.branch &&
     left.worktreePath === right.worktreePath &&
     Equal.equals(left.lastKnownPr ?? null, right.lastKnownPr ?? null) &&
@@ -824,7 +743,6 @@ const EMPTY_IMAGES: ComposerImageAttachment[] = [];
 const EMPTY_FILES: ComposerFileAttachment[] = [];
 const EMPTY_IDS: string[] = [];
 const EMPTY_PERSISTED_ATTACHMENTS: PersistedComposerImageAttachment[] = [];
-const EMPTY_TERMINAL_CONTEXTS: TerminalContextDraft[] = [];
 const EMPTY_PASTED_TEXTS: PastedTextDraft[] = [];
 const EMPTY_SKILLS: ProviderSkillReference[] = [];
 const EMPTY_MENTIONS: ProviderMentionReference[] = [];
@@ -848,7 +766,6 @@ const EMPTY_THREAD_DRAFT = Object.freeze<ComposerThreadDraftState>({
   nonPersistedImageIds: EMPTY_IDS,
   persistedAttachments: EMPTY_PERSISTED_ATTACHMENTS,
   assistantSelections: [],
-  terminalContexts: EMPTY_TERMINAL_CONTEXTS,
   fileComments: [],
   pastedTexts: EMPTY_PASTED_TEXTS,
   skills: EMPTY_SKILLS,
@@ -869,7 +786,6 @@ function createEmptyThreadDraft(): ComposerThreadDraftState {
     nonPersistedImageIds: [],
     persistedAttachments: [],
     assistantSelections: [],
-    terminalContexts: [],
     fileComments: [],
     pastedTexts: [],
     skills: [],
@@ -892,10 +808,6 @@ function composerFileDedupKey(file: ComposerFileAttachment): string {
   return `${file.mimeType}\u0000${file.sizeBytes}\u0000${file.name}`;
 }
 
-function terminalContextDedupKey(context: TerminalContextDraft): string {
-  return `${context.terminalId}\u0000${context.lineStart}\u0000${context.lineEnd}`;
-}
-
 function assistantSelectionDedupKey(
   selection: Pick<ComposerAssistantSelectionAttachment, "assistantMessageId" | "text">,
 ): string {
@@ -1019,53 +931,6 @@ function hydratePastedTextsFromPersisted(
   return normalizePastedTexts(persisted.map((entry) => createPastedTextDraft(entry)));
 }
 
-function normalizeTerminalContextForThread(
-  threadId: ThreadId,
-  context: TerminalContextDraft,
-): TerminalContextDraft | null {
-  const terminalId = context.terminalId.trim();
-  const terminalLabel = context.terminalLabel.trim();
-  if (terminalId.length === 0 || terminalLabel.length === 0) {
-    return null;
-  }
-  const lineStart = Math.max(1, Math.floor(context.lineStart));
-  const lineEnd = Math.max(lineStart, Math.floor(context.lineEnd));
-  return {
-    ...context,
-    threadId,
-    terminalId,
-    terminalLabel,
-    lineStart,
-    lineEnd,
-    text: normalizeTerminalContextText(context.text),
-  };
-}
-
-function normalizeTerminalContextsForThread(
-  threadId: ThreadId,
-  contexts: ReadonlyArray<TerminalContextDraft>,
-): TerminalContextDraft[] {
-  const existingIds = new Set<string>();
-  const existingDedupKeys = new Set<string>();
-  const normalizedContexts: TerminalContextDraft[] = [];
-
-  for (const context of contexts) {
-    const normalizedContext = normalizeTerminalContextForThread(threadId, context);
-    if (!normalizedContext) {
-      continue;
-    }
-    const dedupKey = terminalContextDedupKey(normalizedContext);
-    if (existingIds.has(normalizedContext.id) || existingDedupKeys.has(dedupKey)) {
-      continue;
-    }
-    normalizedContexts.push(normalizedContext);
-    existingIds.add(normalizedContext.id);
-    existingDedupKeys.add(dedupKey);
-  }
-
-  return normalizedContexts;
-}
-
 // Moves all sendable composer content into a hidden draft while history text is being browsed.
 export function captureComposerPromptHistorySavedDraft(input: {
   threadId: ThreadId;
@@ -1081,7 +946,6 @@ export function captureComposerPromptHistorySavedDraft(input: {
     nonPersistedImageIds: [...draft.nonPersistedImageIds],
     persistedAttachments: [...draft.persistedAttachments],
     assistantSelections: normalizeAssistantSelections(draft.assistantSelections),
-    terminalContexts: normalizeTerminalContextsForThread(threadId, draft.terminalContexts),
     fileComments: normalizeFileComments(draft.fileComments),
     pastedTexts: normalizePastedTexts(draft.pastedTexts),
     skills: [...draft.skills],
@@ -1108,10 +972,6 @@ function buildTransferredComposerDraft(input: {
     nonPersistedImageIds: [...sourceDraft.nonPersistedImageIds],
     persistedAttachments: [...sourceDraft.persistedAttachments],
     assistantSelections: normalizeAssistantSelections(sourceDraft.assistantSelections),
-    terminalContexts: normalizeTerminalContextsForThread(
-      targetThreadId,
-      sourceDraft.terminalContexts,
-    ),
     fileComments: normalizeFileComments(sourceDraft.fileComments),
     pastedTexts: normalizePastedTexts(sourceDraft.pastedTexts),
     skills: [...sourceDraft.skills],
@@ -1134,10 +994,6 @@ function clonePromptHistorySavedDraft(
     nonPersistedImageIds: [...savedDraft.nonPersistedImageIds],
     persistedAttachments: [...savedDraft.persistedAttachments],
     assistantSelections: normalizeAssistantSelections(savedDraft.assistantSelections),
-    terminalContexts: normalizeTerminalContextsForThread(
-      targetThreadId,
-      savedDraft.terminalContexts,
-    ),
     fileComments: normalizeFileComments(savedDraft.fileComments),
     pastedTexts: normalizePastedTexts(savedDraft.pastedTexts),
     skills: [...savedDraft.skills],
@@ -1153,7 +1009,6 @@ function shouldRemoveDraft(draft: ComposerThreadDraftState): boolean {
     draft.files.length === 0 &&
     draft.persistedAttachments.length === 0 &&
     draft.assistantSelections.length === 0 &&
-    draft.terminalContexts.length === 0 &&
     draft.fileComments.length === 0 &&
     draft.pastedTexts.length === 0 &&
     draft.skills.length === 0 &&
@@ -1635,7 +1490,7 @@ export function deriveEffectiveComposerModelState(input: {
 }
 
 // Resolve the model we should persist for a draft-backed thread promotion.
-// This keeps terminal-first thread creation aligned with the composer precedence.
+// This keeps draft-backed thread creation aligned with the composer precedence.
 export function resolvePreferredComposerModelSelection(input: {
   draft:
     | Pick<ComposerThreadDraftState, "modelSelectionByProvider" | "activeProvider">
@@ -1808,12 +1663,6 @@ function normalizePersistedPromptHistorySavedDraft(
         return normalized ? [normalized] : [];
       })
     : [];
-  const terminalContexts = Array.isArray(candidate.terminalContexts)
-    ? candidate.terminalContexts.flatMap((entry) => {
-        const normalized = normalizePersistedTerminalContextDraft(entry);
-        return normalized ? [normalized] : [];
-      })
-    : [];
   const fileComments = Array.isArray(candidate.fileComments)
     ? candidate.fileComments.flatMap((entry) => {
         const normalized = normalizePersistedFileCommentDraft(entry);
@@ -1836,7 +1685,6 @@ function normalizePersistedPromptHistorySavedDraft(
     prompt,
     attachments,
     ...(assistantSelections.length > 0 ? { assistantSelections } : {}),
-    ...(terminalContexts.length > 0 ? { terminalContexts } : {}),
     ...(fileComments.length > 0 ? { fileComments } : {}),
     ...(pastedTexts.length > 0 ? { pastedTexts } : {}),
     ...(skills.length > 0 ? { skills } : {}),
@@ -1844,70 +1692,6 @@ function normalizePersistedPromptHistorySavedDraft(
   };
 }
 
-function normalizePersistedTerminalContextDraft(
-  value: unknown,
-): PersistedTerminalContextDraft | null {
-  if (!value || typeof value !== "object") {
-    return null;
-  }
-  const candidate = value as Record<string, unknown>;
-  const id = candidate.id;
-  const threadId = candidate.threadId;
-  const createdAt = candidate.createdAt;
-  const lineStart = candidate.lineStart;
-  const lineEnd = candidate.lineEnd;
-  if (
-    typeof id !== "string" ||
-    id.length === 0 ||
-    typeof threadId !== "string" ||
-    threadId.length === 0 ||
-    typeof createdAt !== "string" ||
-    createdAt.length === 0 ||
-    typeof lineStart !== "number" ||
-    !Number.isFinite(lineStart) ||
-    typeof lineEnd !== "number" ||
-    !Number.isFinite(lineEnd)
-  ) {
-    return null;
-  }
-  const terminalId = typeof candidate.terminalId === "string" ? candidate.terminalId.trim() : "";
-  const terminalLabel =
-    typeof candidate.terminalLabel === "string" ? candidate.terminalLabel.trim() : "";
-  if (terminalId.length === 0 || terminalLabel.length === 0) {
-    return null;
-  }
-  const normalizedLineStart = Math.max(1, Math.floor(lineStart));
-  const normalizedLineEnd = Math.max(normalizedLineStart, Math.floor(lineEnd));
-  return {
-    id,
-    threadId: threadId as ThreadId,
-    createdAt,
-    terminalId,
-    terminalLabel,
-    lineStart: normalizedLineStart,
-    lineEnd: normalizedLineEnd,
-  };
-}
-
-function normalizePersistedQueuedTerminalContextDraft(
-  value: unknown,
-): PersistedQueuedTerminalContextDraft | null {
-  if (!value || typeof value !== "object") {
-    return null;
-  }
-  const candidate = value as Record<string, unknown>;
-  const base = normalizePersistedTerminalContextDraft(candidate);
-  if (!base) {
-    return null;
-  }
-  const text =
-    typeof candidate.text === "string" ? normalizeTerminalContextText(candidate.text) : "";
-  return {
-    ...base,
-    text,
-  };
-}
-
 function normalizePersistedAssistantSelection(
   value: unknown,
 ): { id: string; assistantMessageId: string; text: string } | null {
@@ -2060,12 +1844,6 @@ function normalizePersistedQueuedTurns(
             return normalized ? [normalized] : [];
           })
         : [];
-      const terminalContexts = Array.isArray(candidate.terminalContexts)
-        ? candidate.terminalContexts.flatMap((context) => {
-            const normalized = normalizePersistedQueuedTerminalContextDraft(context);
-            return normalized ? [normalized] : [];
-          })
-        : [];
       const assistantSelections = Array.isArray(candidate.assistantSelections)
         ? candidate.assistantSelections.flatMap((selection) => {
             const normalized = normalizePersistedAssistantSelection(selection);
@@ -2105,7 +1883,6 @@ function normalizePersistedQueuedTurns(
         prompt,
         images,
         ...(assistantSelections.length > 0 ? { assistantSelections } : {}),
-        terminalContexts,
         ...(fileComments.length > 0 ? { fileComments } : {}),
         ...(pastedTexts.length > 0 ? { pastedTexts } : {}),
         skills: [...skills],
@@ -2160,10 +1937,6 @@ function normalizeDraftThreadEnvMode(
   return fallbackWorktreePath ? "worktree" : "local";
 }
 
-function normalizeDraftThreadEntryPoint(value: unknown, fallback: ThreadPrimarySurface = "chat") {
-  return value === "terminal" || value === "chat" ? value : fallback;
-}
-
 function normalizePersistedDraftThreads(
   rawDraftThreadsByThreadId: unknown,
   rawProjectDraftThreadIdByProjectId: unknown,
@@ -2220,7 +1993,6 @@ function normalizePersistedDraftThreads(
           candidateDraftThread.runtimeMode === "full-access"
             ? candidateDraftThread.runtimeMode
             : DEFAULT_RUNTIME_MODE,
-        entryPoint: normalizeDraftThreadEntryPoint(candidateDraftThread.entryPoint),
         branch: typeof branch === "string" ? branch : null,
         worktreePath: normalizedWorktreePath,
         ...(lastKnownPr ? { lastKnownPr } : {}),
@@ -2238,8 +2010,7 @@ function normalizePersistedDraftThreads(
     for (const [mappingKey, threadId] of Object.entries(
       rawProjectDraftThreadIdByProjectId as Record<string, unknown>,
     )) {
-      const projectId = projectIdFromDraftThreadMappingKey(mappingKey);
-      const entryPoint = projectDraftThreadEntryPointFromKey(mappingKey);
+      const projectId = mappingKey as ProjectId;
       if (
         typeof projectId === "string" &&
         projectId.length > 0 &&
@@ -2252,7 +2023,6 @@ function normalizePersistedDraftThreads(
             projectId: projectId as ProjectId,
             createdAt: new Date().toISOString(),
             runtimeMode: DEFAULT_RUNTIME_MODE,
-            entryPoint,
             branch: null,
             worktreePath: null,
             envMode: "local",
@@ -2262,11 +2032,6 @@ function normalizePersistedDraftThreads(
             ...draftThreadsByThreadId[threadId as ThreadId]!,
             projectId: projectId as ProjectId,
           };
-        } else if (draftThreadsByThreadId[threadId as ThreadId]?.entryPoint !== entryPoint) {
-          draftThreadsByThreadId[threadId as ThreadId] = {
-            ...draftThreadsByThreadId[threadId as ThreadId]!,
-            entryPoint,
-          };
         }
       }
     }
@@ -2302,12 +2067,6 @@ function normalizePersistedDraftsByThreadId(
           return normalized ? [normalized] : [];
         })
       : [];
-    const terminalContexts = Array.isArray(draftCandidate.terminalContexts)
-      ? draftCandidate.terminalContexts.flatMap((entry) => {
-          const normalized = normalizePersistedTerminalContextDraft(entry);
-          return normalized ? [normalized] : [];
-        })
-      : [];
     const assistantSelections = Array.isArray(draftCandidate.assistantSelections)
       ? draftCandidate.assistantSelections.flatMap((entry) => {
           const normalized = normalizePersistedAssistantSelection(entry);
@@ -2338,10 +2097,6 @@ function normalizePersistedDraftsByThreadId(
       draftCandidate.runtimeMode === "full-access"
         ? draftCandidate.runtimeMode
         : null;
-    const prompt = ensureInlineTerminalContextPlaceholders(
-      promptCandidate,
-      terminalContexts.length,
-    );
     // If the draft already has the v3 shape, use it directly
     const legacyDraftCandidate = draftValue as LegacyPersistedComposerThreadDraftState;
     let modelSelectionByProvider: Partial<Record<ProviderKind, ModelSelection>> = {};
@@ -2402,7 +2157,6 @@ function normalizePersistedDraftsByThreadId(
       promptCandidate.length === 0 &&
       promptHistorySavedDraft === null &&
       attachments.length === 0 &&
-      terminalContexts.length === 0 &&
       assistantSelections.length === 0 &&
       fileComments.length === 0 &&
       pastedTexts.length === 0 &&
@@ -2415,11 +2169,10 @@ function normalizePersistedDraftsByThreadId(
       continue;
     }
     nextDraftsByThreadId[threadId as ThreadId] = {
-      prompt,
+      prompt: promptCandidate,
       ...(promptHistorySavedDraft !== null ? { promptHistorySavedDraft } : {}),
       attachments,
       ...(assistantSelections.length > 0 ? { assistantSelections } : {}),
-      ...(terminalContexts.length > 0 ? { terminalContexts } : {}),
       ...(fileComments.length > 0 ? { fileComments } : {}),
       ...(pastedTexts.length > 0 ? { pastedTexts } : {}),
       ...(skills.length > 0 ? { skills } : {}),
@@ -2478,16 +2231,6 @@ function partializeComposerDraftStoreState(
             assistantMessageId: selection.assistantMessageId,
             text: selection.text,
           })),
-          terminalContexts: queuedTurn.terminalContexts.map((context) => ({
-            id: context.id,
-            threadId: context.threadId,
-            createdAt: context.createdAt,
-            terminalId: context.terminalId,
-            terminalLabel: context.terminalLabel,
-            lineStart: context.lineStart,
-            lineEnd: context.lineEnd,
-            text: context.text,
-          })),
           ...(queuedTurn.fileComments.length > 0
             ? {
                 fileComments: queuedTurn.fileComments.map((comment) => ({
@@ -2551,7 +2294,6 @@ function partializeComposerDraftStoreState(
       draft.promptHistorySavedDraft === null &&
       draft.persistedAttachments.length === 0 &&
       draft.assistantSelections.length === 0 &&
-      draft.terminalContexts.length === 0 &&
       draft.fileComments.length === 0 &&
       draft.pastedTexts.length === 0 &&
       !hasReferenceData &&
@@ -2580,21 +2322,6 @@ function partializeComposerDraftStoreState(
                     ),
                   }
                 : {}),
-              ...(draft.promptHistorySavedDraft.terminalContexts.length > 0
-                ? {
-                    terminalContexts: draft.promptHistorySavedDraft.terminalContexts.map(
-                      (context) => ({
-                        id: context.id,
-                        threadId: context.threadId,
-                        createdAt: context.createdAt,
-                        terminalId: context.terminalId,
-                        terminalLabel: context.terminalLabel,
-                        lineStart: context.lineStart,
-                        lineEnd: context.lineEnd,
-                      }),
-                    ),
-                  }
-                : {}),
               ...(draft.promptHistorySavedDraft.fileComments.length > 0
                 ? {
                     fileComments: draft.promptHistorySavedDraft.fileComments.map((comment) => ({
@@ -2634,19 +2361,6 @@ function partializeComposerDraftStoreState(
             })),
           }
         : {}),
-      ...(draft.terminalContexts.length > 0
-        ? {
-            terminalContexts: draft.terminalContexts.map((context) => ({
-              id: context.id,
-              threadId: context.threadId,
-              createdAt: context.createdAt,
-              terminalId: context.terminalId,
-              terminalLabel: context.terminalLabel,
-              lineStart: context.lineStart,
-              lineEnd: context.lineEnd,
-            })),
-          }
-        : {}),
       ...(draft.fileComments.length > 0
         ? {
             fileComments: draft.fileComments.map((comment) => ({
@@ -3030,7 +2744,6 @@ function hydrateQueuedTurnsFromPersisted(
         images: hydrateImagesFromPersisted(queuedTurn.images),
         files: [],
         assistantSelections: normalizeAssistantSelections(queuedTurn.assistantSelections ?? []),
-        terminalContexts: normalizeTerminalContextsForThread(threadId, queuedTurn.terminalContexts),
         fileComments: normalizeFileComments(queuedTurn.fileComments ?? []),
         pastedTexts: hydratePastedTextsFromPersisted(queuedTurn.pastedTexts),
         skills: [...queuedTurn.skills],
@@ -3055,7 +2768,6 @@ function hydratePromptHistorySavedDraft(
       nonPersistedImageIds: [],
       persistedAttachments: [],
       assistantSelections: [],
-      terminalContexts: [],
       fileComments: [],
       pastedTexts: [],
       skills: [],
@@ -3070,11 +2782,6 @@ function hydratePromptHistorySavedDraft(
     nonPersistedImageIds: [],
     persistedAttachments: [...attachments],
     assistantSelections: normalizeAssistantSelections(savedDraft.assistantSelections ?? []),
-    terminalContexts:
-      savedDraft.terminalContexts?.map((context) => ({
-        ...context,
-        text: "",
-      })) ?? [],
     fileComments: normalizeFileComments(savedDraft.fileComments ?? []),
     pastedTexts: hydratePastedTextsFromPersisted(savedDraft.pastedTexts),
     skills: [...(savedDraft.skills ?? [])],
@@ -3099,11 +2806,6 @@ function toHydratedThreadDraft(
     nonPersistedImageIds: [],
     persistedAttachments: [...persistedDraft.attachments],
     assistantSelections: normalizeAssistantSelections(persistedDraft.assistantSelections ?? []),
-    terminalContexts:
-      persistedDraft.terminalContexts?.map((context) => ({
-        ...context,
-        text: "",
-      })) ?? [],
     fileComments: normalizeFileComments(persistedDraft.fileComments ?? []),
     pastedTexts: hydratePastedTextsFromPersisted(persistedDraft.pastedTexts),
     skills: [...(persistedDraft.skills ?? [])],
@@ -3124,14 +2826,11 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
       projectDraftThreadIdByProjectId: {},
       stickyModelSelectionByProvider: {},
       stickyActiveProvider: null,
-      getDraftThreadByProjectId: (projectId, entryPoint = "chat") => {
+      getDraftThreadByProjectId: (projectId) => {
         if (projectId.length === 0) {
           return null;
         }
-        const threadId =
-          get().projectDraftThreadIdByProjectId[
-            projectDraftThreadMappingKey(projectId, entryPoint)
-          ];
+        const threadId = get().projectDraftThreadIdByProjectId[projectId];
         if (!threadId) {
           return null;
         }
@@ -3139,7 +2838,6 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
         if (
           !draftThread ||
           draftThread.projectId !== projectId ||
-          normalizeDraftThreadEntryPoint(draftThread.entryPoint) !== entryPoint ||
           draftThread.promotedTo !== undefined
         ) {
           return null;
@@ -3167,7 +2865,7 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
             options,
             createdAtMode: "accept-empty",
           });
-          const mappingKey = projectDraftThreadMappingKey(projectId, nextDraftThread.entryPoint);
+          const mappingKey = projectId as string;
           const previousThreadIdForProject = state.projectDraftThreadIdByProjectId[mappingKey];
           const hasSameProjectMapping = previousThreadIdForProject === threadId;
           if (hasSameProjectMapping && draftThreadStatesEqual(existingThread, nextDraftThread)) {
@@ -3213,7 +2911,6 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
             projectId: options.projectId,
             createdAt: options.createdAt ?? new Date().toISOString(),
             runtimeMode: options.runtimeMode ?? DEFAULT_RUNTIME_MODE,
-            entryPoint: "chat",
             branch: options.branch ?? null,
             worktreePath,
             lastKnownPr: null,
@@ -3251,7 +2948,7 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
           }
           const nextProjectDraftThreadIdByProjectId: Record<string, ThreadId> = {
             ...removeProjectDraftMappingsForThread(state.projectDraftThreadIdByProjectId, threadId),
-            [projectDraftThreadMappingKey(nextProjectId, nextDraftThread.entryPoint)]: threadId,
+            [nextProjectId]: threadId,
           };
           return {
             draftThreadsByThreadId: {
@@ -3277,10 +2974,7 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
             options,
             createdAtMode: "preserve-existing-on-empty",
           });
-          const targetMappingKey = projectDraftThreadMappingKey(
-            projectId,
-            nextDraftThread.entryPoint,
-          );
+          const targetMappingKey = projectId as string;
           const previousThreadIdForProject =
             state.projectDraftThreadIdByProjectId[targetMappingKey];
           const hasOnlyTargetMapping = Object.entries(state.projectDraftThreadIdByProjectId).every(
@@ -3324,12 +3018,12 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
           };
         });
       },
-      clearProjectDraftThreadId: (projectId, entryPoint = "chat") => {
+      clearProjectDraftThreadId: (projectId) => {
         if (projectId.length === 0) {
           return;
         }
         set((state) => {
-          const mappingKey = projectDraftThreadMappingKey(projectId, entryPoint);
+          const mappingKey = projectId as string;
           const threadId = state.projectDraftThreadIdByProjectId[mappingKey];
           if (threadId === undefined) {
             return state;
@@ -3360,7 +3054,7 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
           for (const [mappingKey, threadId] of Object.entries(
             state.projectDraftThreadIdByProjectId,
           )) {
-            if (projectIdFromDraftThreadMappingKey(mappingKey) === projectId) {
+            if ((mappingKey as ProjectId) === projectId) {
               removedThreadIds.add(threadId);
               continue;
             }
@@ -3395,8 +3089,7 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
         set((state) => {
           const matchingMappingKey = Object.entries(state.projectDraftThreadIdByProjectId).find(
             ([mappingKey, mappedThreadId]) =>
-              projectIdFromDraftThreadMappingKey(mappingKey) === projectId &&
-              mappedThreadId === threadId,
+              (mappingKey as ProjectId) === projectId && mappedThreadId === threadId,
           )?.[0];
           if (!matchingMappingKey) {
             return state;
@@ -3582,7 +3275,6 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
                   nonPersistedImageIds: [],
                   persistedAttachments: [],
                   assistantSelections: [],
-                  terminalContexts: [],
                   fileComments: [],
                   pastedTexts: [],
                   skills: [],
@@ -3624,10 +3316,6 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
             nonPersistedImageIds: [...savedDraft.nonPersistedImageIds],
             persistedAttachments: [...savedDraft.persistedAttachments],
             assistantSelections: normalizeAssistantSelections(savedDraft.assistantSelections),
-            terminalContexts: normalizeTerminalContextsForThread(
-              threadId,
-              savedDraft.terminalContexts,
-            ),
             fileComments: normalizeFileComments(savedDraft.fileComments),
             pastedTexts: normalizePastedTexts(savedDraft.pastedTexts),
             skills: [...savedDraft.skills],
@@ -3720,30 +3408,6 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
           ),
         );
       },
-      setTerminalContexts: (threadId, contexts) => {
-        if (threadId.length === 0) {
-          return;
-        }
-        const normalizedContexts = normalizeTerminalContextsForThread(threadId, contexts);
-        set((state) => {
-          const existing = state.draftsByThreadId[threadId] ?? createEmptyThreadDraft();
-          const nextDraft: ComposerThreadDraftState = {
-            ...existing,
-            prompt: ensureInlineTerminalContextPlaceholders(
-              existing.prompt,
-              normalizedContexts.length,
-            ),
-            terminalContexts: normalizedContexts,
-          };
-          const nextDraftsByThreadId = { ...state.draftsByThreadId };
-          if (shouldRemoveDraft(nextDraft)) {
-            delete nextDraftsByThreadId[threadId];
-          } else {
-            nextDraftsByThreadId[threadId] = nextDraft;
-          }
-          return { draftsByThreadId: nextDraftsByThreadId };
-        });
-      },
       setSkills: (threadId, skills) => {
         if (threadId.length === 0) {
           return;
@@ -4520,124 +4184,6 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
           return { draftsByThreadId: nextDraftsByThreadId };
         });
       },
-      insertTerminalContext: (threadId, prompt, context, index) => {
-        if (threadId.length === 0) {
-          return false;
-        }
-        let inserted = false;
-        set((state) => {
-          const existing = state.draftsByThreadId[threadId] ?? createEmptyThreadDraft();
-          const normalizedContext = normalizeTerminalContextForThread(threadId, context);
-          if (!normalizedContext) {
-            return state;
-          }
-          const dedupKey = terminalContextDedupKey(normalizedContext);
-          if (
-            existing.terminalContexts.some((entry) => entry.id === normalizedContext.id) ||
-            existing.terminalContexts.some((entry) => terminalContextDedupKey(entry) === dedupKey)
-          ) {
-            return state;
-          }
-          inserted = true;
-          const boundedIndex = Math.max(0, Math.min(existing.terminalContexts.length, index));
-          const nextDraft: ComposerThreadDraftState = {
-            ...existing,
-            prompt,
-            terminalContexts: [
-              ...existing.terminalContexts.slice(0, boundedIndex),
-              normalizedContext,
-              ...existing.terminalContexts.slice(boundedIndex),
-            ],
-          };
-          return {
-            draftsByThreadId: {
-              ...state.draftsByThreadId,
-              [threadId]: nextDraft,
-            },
-          };
-        });
-        return inserted;
-      },
-      addTerminalContext: (threadId, context) => {
-        if (threadId.length === 0) {
-          return;
-        }
-        get().addTerminalContexts(threadId, [context]);
-      },
-      addTerminalContexts: (threadId, contexts) => {
-        if (threadId.length === 0 || contexts.length === 0) {
-          return;
-        }
-        set((state) => {
-          const existing = state.draftsByThreadId[threadId] ?? createEmptyThreadDraft();
-          const acceptedContexts = normalizeTerminalContextsForThread(threadId, [
-            ...existing.terminalContexts,
-            ...contexts,
-          ]).slice(existing.terminalContexts.length);
-          if (acceptedContexts.length === 0) {
-            return state;
-          }
-          return {
-            draftsByThreadId: {
-              ...state.draftsByThreadId,
-              [threadId]: {
-                ...existing,
-                prompt: ensureInlineTerminalContextPlaceholders(
-                  existing.prompt,
-                  existing.terminalContexts.length + acceptedContexts.length,
-                ),
-                terminalContexts: [...existing.terminalContexts, ...acceptedContexts],
-              },
-            },
-          };
-        });
-      },
-      removeTerminalContext: (threadId, contextId) => {
-        if (threadId.length === 0 || contextId.length === 0) {
-          return;
-        }
-        set((state) => {
-          const current = state.draftsByThreadId[threadId];
-          if (!current) {
-            return state;
-          }
-          const nextDraft: ComposerThreadDraftState = {
-            ...current,
-            terminalContexts: current.terminalContexts.filter(
-              (context) => context.id !== contextId,
-            ),
-          };
-          const nextDraftsByThreadId = { ...state.draftsByThreadId };
-          if (shouldRemoveDraft(nextDraft)) {
-            delete nextDraftsByThreadId[threadId];
-          } else {
-            nextDraftsByThreadId[threadId] = nextDraft;
-          }
-          return { draftsByThreadId: nextDraftsByThreadId };
-        });
-      },
-      clearTerminalContexts: (threadId) => {
-        if (threadId.length === 0) {
-          return;
-        }
-        set((state) => {
-          const current = state.draftsByThreadId[threadId];
-          if (!current || current.terminalContexts.length === 0) {
-            return state;
-          }
-          const nextDraft: ComposerThreadDraftState = {
-            ...current,
-            terminalContexts: [],
-          };
-          const nextDraftsByThreadId = { ...state.draftsByThreadId };
-          if (shouldRemoveDraft(nextDraft)) {
-            delete nextDraftsByThreadId[threadId];
-          } else {
-            nextDraftsByThreadId[threadId] = nextDraft;
-          }
-          return { draftsByThreadId: nextDraftsByThreadId };
-        });
-      },
       clearPersistedAttachments: (threadId) => {
         if (threadId.length === 0) {
           return;
@@ -4778,7 +4324,6 @@ export const useComposerDraftStore = create<ComposerDraftStoreState>()(
             nonPersistedImageIds: [],
             persistedAttachments: [],
             assistantSelections: [],
-            terminalContexts: [],
             fileComments: [],
             pastedTexts: [],
             skills: [],
diff --git a/apps/web/src/confirmDialogFallback.ts b/apps/web/src/confirmDialogFallback.ts
index 89c70ee47..a0ce04066 100644
--- a/apps/web/src/confirmDialogFallback.ts
+++ b/apps/web/src/confirmDialogFallback.ts
@@ -22,7 +22,7 @@ export function showConfirmDialogFallback(message: string): Promise<boolean> {
     // Popup
     const popup = document.createElement("div");
     popup.className =
-      "flex w-full max-w-[22rem] flex-col rounded-[10px] border border-panel-border bg-panel text-[var(--color-text-foreground)] shadow-[0_16px_44px_rgba(0,0,0,0.5)]";
+      "flex w-full max-w-[22rem] flex-col rounded-xl border border-panel-border bg-panel text-[var(--color-text-foreground)] shadow-[0_16px_44px_rgba(0,0,0,0.5)]";
     popup.style.cssText = "animation:scaleIn .15s ease-out";
 
     // Header
diff --git a/apps/web/src/contextMenuFallback.ts b/apps/web/src/contextMenuFallback.ts
index 54dd60bbe..70917463a 100644
--- a/apps/web/src/contextMenuFallback.ts
+++ b/apps/web/src/contextMenuFallback.ts
@@ -19,7 +19,7 @@ export function showContextMenuFallback<T extends string>(
 
     const menu = document.createElement("div");
     menu.className =
-      "fixed z-[10000] min-w-[180px] rounded-[10px] border border-panel-border bg-panel shadow-[0_16px_44px_rgba(0,0,0,0.5)] animate-in fade-in zoom-in-95";
+      "fixed z-[10000] min-w-[180px] rounded-xl border border-panel-border bg-panel shadow-[0_16px_44px_rgba(0,0,0,0.5)] animate-in fade-in zoom-in-95";
 
     const x = position?.x ?? 0;
     const y = position?.y ?? 0;
diff --git a/apps/web/src/hooks/useAppDensity.ts b/apps/web/src/hooks/useAppDensity.ts
deleted file mode 100644
index 67c036e86..000000000
--- a/apps/web/src/hooks/useAppDensity.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useEffect } from "react";
-
-import {
-  normalizeUiDensity,
-  getDensityCssVariables,
-  type DensityCssVariable,
-} from "../lib/appDensity";
-import { useAppSettings } from "../appSettings";
-
-const DENSITY_CSS_VARIABLES = Object.keys(
-  getDensityCssVariables(),
-) as readonly DensityCssVariable[];
-
-export function useAppDensity() {
-  const { settings } = useAppSettings();
-  const uiDensity = normalizeUiDensity(settings.uiDensity);
-
-  useEffect(() => {
-    const root = document.documentElement;
-    const rootStyle = root.style;
-    const variableValues = getDensityCssVariables(uiDensity);
-
-    for (const cssVariable of DENSITY_CSS_VARIABLES) {
-      rootStyle.setProperty(cssVariable, variableValues[cssVariable]);
-    }
-    root.dataset.uiDensity = uiDensity;
-
-    return () => {
-      for (const cssVariable of DENSITY_CSS_VARIABLES) {
-        rootStyle.removeProperty(cssVariable);
-      }
-      delete root.dataset.uiDensity;
-    };
-  }, [uiDensity]);
-}
diff --git a/apps/web/src/hooks/useDiffRouteSearch.ts b/apps/web/src/hooks/useDiffRouteSearch.ts
deleted file mode 100644
index 7653a7b98..000000000
--- a/apps/web/src/hooks/useDiffRouteSearch.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-// FILE: useDiffRouteSearch.ts
-// Purpose: Stable router-search hook for the normalized chat/diff route state.
-// Layer: Web routing hook
-// Exports: useDiffRouteSearch
-
-import { useSearch } from "@tanstack/react-router";
-
-import { type DiffRouteSearch, parseDiffRouteSearch } from "../diffRouteSearch";
-
-function diffRouteSearchEquals(left: DiffRouteSearch, right: DiffRouteSearch): boolean {
-  return (
-    left.panel === right.panel &&
-    left.diff === right.diff &&
-    left.diffTurnId === right.diffTurnId &&
-    left.diffFilePath === right.diffFilePath
-  );
-}
-
-function createStableDiffRouteSearchSelector() {
-  let previous: DiffRouteSearch | null = null;
-  return (search: Record<string, unknown>): DiffRouteSearch => {
-    const next = parseDiffRouteSearch(search);
-    if (previous && diffRouteSearchEquals(previous, next)) {
-      return previous;
-    }
-    previous = next;
-    return next;
-  };
-}
-
-const selectStableDiffRouteSearch = createStableDiffRouteSearchSelector();
-
-// `parseDiffRouteSearch` returns a new object. Keep one stable selector instance
-// so unchanged search values reuse the previous snapshot. TanStack structural
-// sharing is not usable here because `TurnId` is an Effect-branded string.
-export function useDiffRouteSearch() {
-  return useSearch({
-    strict: false,
-    select: selectStableDiffRouteSearch,
-  });
-}
diff --git a/apps/web/src/hooks/useDockPaneRuntimeActivation.ts b/apps/web/src/hooks/useDockPaneRuntimeActivation.ts
deleted file mode 100644
index 7b0dd123c..000000000
--- a/apps/web/src/hooks/useDockPaneRuntimeActivation.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-// FILE: useDockPaneRuntimeActivation.ts
-// Purpose: React lifecycle wrapper for right-dock runtime hydration (preview vs live).
-// Layer: Web UI hook
-// Depends on: dockPaneActivation pure policy and rightDockStore pane metadata.
-
-import type { ThreadId } from "@t3tools/contracts";
-import { useCallback, useLayoutEffect, useMemo, useRef, useState } from "react";
-
-import {
-  DOCK_PANE_DEFERRED_HYDRATION_FRAMES,
-  dockPaneActivationKey,
-  resolveDockPaneRuntimeMode,
-  type DockPaneRuntimeMode,
-} from "~/lib/dockPaneActivation";
-import type { RightDockPane, RightDockPaneKind } from "~/rightDockStore.logic";
-
-export function useDockPaneRuntimeActivation(input: {
-  threadId: ThreadId;
-  activePane: RightDockPane | null;
-}) {
-  const immediateHydrationKindRef = useRef<RightDockPaneKind | "any" | null>(null);
-  const [hydratedPaneKey, setHydratedPaneKey] = useState<string | null>(null);
-
-  const activePaneKey = useMemo(
-    () =>
-      input.activePane
-        ? dockPaneActivationKey({
-            threadId: input.threadId,
-            paneId: input.activePane.id,
-            kind: input.activePane.kind,
-          })
-        : null,
-    [input.activePane, input.threadId],
-  );
-
-  const activePaneRuntimeMode: DockPaneRuntimeMode =
-    input.activePane && activePaneKey
-      ? resolveDockPaneRuntimeMode({
-          kind: input.activePane.kind,
-          reason:
-            immediateHydrationKindRef.current === "any" ||
-            immediateHydrationKindRef.current === input.activePane.kind
-              ? "explicit"
-              : "restore",
-          hydrated: hydratedPaneKey === activePaneKey,
-        })
-      : "live";
-
-  // The request callbacks read the committed active pane through a ref so their
-  // identity stays stable across pane switches. Handlers built on top of them
-  // (and the workspace file opener context value) would otherwise be recreated
-  // on every dock tab change, re-rendering every context subscriber in the
-  // chat transcript. Event handlers always fire after commit, so the ref is
-  // current by the time either callback runs.
-  const activePaneRef = useRef<{ key: string | null; kind: RightDockPaneKind | null }>({
-    key: null,
-    kind: null,
-  });
-  useLayoutEffect(() => {
-    activePaneRef.current = {
-      key: activePaneKey,
-      kind: input.activePane?.kind ?? null,
-    };
-  }, [activePaneKey, input.activePane]);
-
-  const requestImmediateHydration = useCallback((kind?: RightDockPaneKind) => {
-    immediateHydrationKindRef.current = kind ?? "any";
-    const active = activePaneRef.current;
-    if (active.key && (!kind || active.kind === kind)) {
-      setHydratedPaneKey(active.key);
-    }
-  }, []);
-
-  const requestActivePaneLive = useCallback(() => {
-    const active = activePaneRef.current;
-    immediateHydrationKindRef.current = active.kind ?? "any";
-    if (active.key) {
-      setHydratedPaneKey(active.key);
-    }
-  }, []);
-
-  useLayoutEffect(() => {
-    if (!input.activePane || !activePaneKey) {
-      immediateHydrationKindRef.current = null;
-      setHydratedPaneKey(null);
-      return;
-    }
-
-    const reason =
-      immediateHydrationKindRef.current === "any" ||
-      immediateHydrationKindRef.current === input.activePane.kind
-        ? "explicit"
-        : "restore";
-    if (reason === "explicit") {
-      immediateHydrationKindRef.current = null;
-    }
-
-    const nextRuntimeMode = resolveDockPaneRuntimeMode({
-      kind: input.activePane.kind,
-      reason,
-      hydrated: hydratedPaneKey === activePaneKey,
-    });
-
-    if (nextRuntimeMode === "live") {
-      setHydratedPaneKey(activePaneKey);
-      return;
-    }
-
-    setHydratedPaneKey((current) => (current === activePaneKey ? current : null));
-    let cancelled = false;
-    let frameId: number | null = null;
-    let framesRemaining = DOCK_PANE_DEFERRED_HYDRATION_FRAMES;
-
-    const tick = () => {
-      framesRemaining -= 1;
-      if (cancelled) {
-        return;
-      }
-      if (framesRemaining <= 0) {
-        setHydratedPaneKey(activePaneKey);
-        return;
-      }
-      frameId = window.requestAnimationFrame(tick);
-    };
-
-    frameId = window.requestAnimationFrame(tick);
-    return () => {
-      cancelled = true;
-      if (frameId !== null) {
-        window.cancelAnimationFrame(frameId);
-      }
-    };
-  }, [activePaneKey, hydratedPaneKey, input.activePane]);
-
-  return {
-    activePaneRuntimeMode,
-    requestActivePaneLive,
-    requestImmediateHydration,
-  };
-}
diff --git a/apps/web/src/hooks/useHandleNewThread.ts b/apps/web/src/hooks/useHandleNewThread.ts
index 498583234..1a73b0ff0 100644
--- a/apps/web/src/hooks/useHandleNewThread.ts
+++ b/apps/web/src/hooks/useHandleNewThread.ts
@@ -14,16 +14,12 @@ import {
   createActiveThreadSnapshot,
   createFreshDraftThreadSeed,
   isConsumedDraftThread,
-  resolveTerminalThreadCreationState,
   resolveThreadBootstrapPlan,
   type NewThreadOptions,
 } from "../lib/threadBootstrap";
-import { promoteThreadCreate } from "../lib/threadCreatePromotion";
-import { newCommandId, newThreadId } from "../lib/utils";
-import { readNativeApi } from "../nativeApi";
+import { newThreadId } from "../lib/utils";
 import { useFocusedChatContext } from "../focusedChatContext";
 import { useStore } from "../store";
-import { useTerminalStateStore } from "../terminalStateStore";
 
 export interface NewThreadNavigationOptions {
   /**
@@ -42,8 +38,6 @@ export function useHandleNewThread() {
   const navigate = useNavigate();
   const { activeDraftThread, activeProjectId, activeThread, focusedThreadId, routeThreadId } =
     useFocusedChatContext();
-  const openChatThreadPage = useTerminalStateStore((store) => store.openChatThreadPage);
-  const openTerminalThreadPage = useTerminalStateStore((store) => store.openTerminalThreadPage);
 
   const handleNewThread = useCallback(
     (
@@ -51,7 +45,6 @@ export function useHandleNewThread() {
       options?: NewThreadOptions,
       navigation?: NewThreadNavigationOptions,
     ): Promise<ThreadId> => {
-      const entryPoint = options?.entryPoint ?? "chat";
       const navigateToThread = (threadId: ThreadId) =>
         navigation?.navigate
           ? navigation.navigate(threadId)
@@ -92,13 +85,6 @@ export function useHandleNewThread() {
           };
         });
       };
-      const activateThreadEntryPoint = (threadId: ThreadId) => {
-        if (entryPoint === "terminal") {
-          openTerminalThreadPage(threadId, { terminalOnly: true });
-          return;
-        }
-        openChatThreadPage(threadId);
-      };
       const {
         clearProjectDraftThreadId,
         getDraftThread,
@@ -111,7 +97,7 @@ export function useHandleNewThread() {
       const shouldForceFreshThread = options?.fresh === true;
 
       if (shouldForceFreshThread) {
-        clearProjectDraftThreadId(projectId, entryPoint);
+        clearProjectDraftThreadId(projectId);
       }
 
       // Read the live store: a draft whose thread has since been promoted (sent) is no longer a
@@ -119,19 +105,18 @@ export function useHandleNewThread() {
       const isDraftThreadConsumed = (candidateThreadId: ThreadId): boolean => {
         const store = useStore.getState();
         return isConsumedDraftThread({
-          entryPoint,
           hasLatestTurn: store.sidebarThreadSummaryById[candidateThreadId]?.latestTurn != null,
           hasServerThread: store.threads.some((thread) => thread.id === candidateThreadId),
         });
       };
 
-      const storedDraftThreadCandidateRaw = getDraftThreadByProjectId(projectId, entryPoint);
+      const storedDraftThreadCandidateRaw = getDraftThreadByProjectId(projectId);
       let storedDraftThreadCandidate = storedDraftThreadCandidateRaw;
       if (
         storedDraftThreadCandidateRaw &&
         isDraftThreadConsumed(storedDraftThreadCandidateRaw.threadId)
       ) {
-        clearProjectDraftThreadId(projectId, entryPoint);
+        clearProjectDraftThreadId(projectId);
         storedDraftThreadCandidate = null;
       }
       const latestActiveDraftThreadCandidate: DraftThreadState | null =
@@ -145,7 +130,6 @@ export function useHandleNewThread() {
       const bootstrapPlan = resolveThreadBootstrapPlan({
         storedDraftThread,
         latestActiveDraftThread,
-        entryPoint,
         projectId,
         routeThreadId: focusedThreadId,
       });
@@ -153,128 +137,39 @@ export function useHandleNewThread() {
       const projectDefaultModelSelection =
         useStore.getState().projects.find((project) => project.id === projectId)
           ?.defaultModelSelection ?? null;
-      const activeThreadSnapshot = createActiveThreadSnapshot(activeThread, projectId);
-      const activeDraftThreadSnapshot = createActiveDraftThreadSnapshot(
-        activeDraftThread,
-        projectId,
-      );
-      const resolveCreationState = (
-        targetThreadId: ThreadId,
-        draftThread: DraftThreadState | null,
-        creationOptions: NewThreadOptions | undefined,
-      ) =>
-        resolveTerminalThreadCreationState({
-          activeDraftThread: activeDraftThreadSnapshot,
-          activeThread: activeThreadSnapshot,
-          defaultProvider: options?.provider ?? settings.defaultProvider,
-          draftComposerState:
-            useComposerDraftStore.getState().draftsByThreadId[targetThreadId] ?? null,
-          draftThread,
-          options: {
-            ...creationOptions,
-            runtimeMode: creationOptions?.runtimeMode ?? settings.defaultRuntimeMode,
-          },
-          projectDefaultModelSelection,
-          projectId,
-        });
-      // Terminal-first threads need a real orchestration thread immediately so
-      // the sidebar can render them as durable rows instead of draft-only routes.
-      const createTerminalThread = async (
-        threadId: ThreadId,
-        creationState: ReturnType<typeof resolveCreationState>,
-      ): Promise<void> => {
-        const api = readNativeApi();
-        if (!api) {
-          return;
-        }
-        await promoteThreadCreate(
-          {
-            type: "thread.create",
-            commandId: newCommandId(),
-            threadId,
-            projectId,
-            title: "New terminal",
-            modelSelection: creationState.modelSelection,
-            runtimeMode: creationState.runtimeMode,
-            envMode: creationState.envMode,
-            branch: creationState.branch,
-            worktreePath: creationState.worktreePath,
-            lastKnownPr: creationState.lastKnownPr,
-            createdAt: new Date().toISOString(),
-          },
-          api,
-        );
-      };
       if (bootstrapPlan.kind === "stored") {
         return (async (): Promise<ThreadId> => {
           const preservedComposerDraft =
             useComposerDraftStore.getState().draftsByThreadId[bootstrapPlan.threadId] ?? null;
-          let resolvedStoredDraftThread: DraftThreadState | null = bootstrapPlan.draftThread;
-          const shouldPreserveStoredTerminalContext =
-            entryPoint === "terminal" && bootstrapPlan.draftThread.entryPoint === "terminal";
-          const draftContextPatch = shouldPreserveStoredTerminalContext
-            ? null
-            : buildDraftThreadContextPatch(entryPoint, options);
-          const creationOptions = shouldPreserveStoredTerminalContext ? undefined : options;
+          const draftContextPatch = buildDraftThreadContextPatch(options);
           if (draftContextPatch) {
             setDraftThreadContext(bootstrapPlan.threadId, draftContextPatch);
-            resolvedStoredDraftThread = getDraftThread(bootstrapPlan.threadId);
           }
           applyProviderOverride(bootstrapPlan.threadId);
-          setProjectDraftThreadId(projectId, bootstrapPlan.threadId, { entryPoint });
+          setProjectDraftThreadId(projectId, bootstrapPlan.threadId);
           restoreComposerDraft(bootstrapPlan.threadId, preservedComposerDraft);
-          activateThreadEntryPoint(bootstrapPlan.threadId);
           if (focusedThreadId === bootstrapPlan.threadId) {
-            if (entryPoint === "terminal") {
-              await createTerminalThread(
-                bootstrapPlan.threadId,
-                resolveCreationState(
-                  bootstrapPlan.threadId,
-                  resolvedStoredDraftThread,
-                  creationOptions,
-                ),
-              );
-            }
             return bootstrapPlan.threadId;
           }
           await navigateToThread(bootstrapPlan.threadId);
           restoreComposerDraft(bootstrapPlan.threadId, preservedComposerDraft);
-          if (entryPoint === "terminal") {
-            await createTerminalThread(
-              bootstrapPlan.threadId,
-              resolveCreationState(
-                bootstrapPlan.threadId,
-                resolvedStoredDraftThread,
-                creationOptions,
-              ),
-            );
-          }
           return bootstrapPlan.threadId;
         })();
       }
 
-      clearProjectDraftThreadId(projectId, entryPoint);
+      clearProjectDraftThreadId(projectId);
 
       if (bootstrapPlan.kind === "route") {
         return (async (): Promise<ThreadId> => {
           const preservedComposerDraft =
             useComposerDraftStore.getState().draftsByThreadId[bootstrapPlan.threadId] ?? null;
-          let resolvedActiveDraftThread: DraftThreadState | null = bootstrapPlan.draftThread;
-          const draftContextPatch = buildDraftThreadContextPatch(entryPoint, options);
+          const draftContextPatch = buildDraftThreadContextPatch(options);
           if (draftContextPatch) {
             setDraftThreadContext(bootstrapPlan.threadId, draftContextPatch);
-            resolvedActiveDraftThread = getDraftThread(bootstrapPlan.threadId);
           }
           applyProviderOverride(bootstrapPlan.threadId);
-          setProjectDraftThreadId(projectId, bootstrapPlan.threadId, { entryPoint });
+          setProjectDraftThreadId(projectId, bootstrapPlan.threadId);
           restoreComposerDraft(bootstrapPlan.threadId, preservedComposerDraft);
-          activateThreadEntryPoint(bootstrapPlan.threadId);
-          if (entryPoint === "terminal") {
-            await createTerminalThread(
-              bootstrapPlan.threadId,
-              resolveCreationState(bootstrapPlan.threadId, resolvedActiveDraftThread, options),
-            );
-          }
           return bootstrapPlan.threadId;
         })();
       }
@@ -285,37 +180,20 @@ export function useHandleNewThread() {
         setProjectDraftThreadId(projectId, threadId, {
           ...createFreshDraftThreadSeed({
             createdAt,
-            entryPoint,
             options: {
               ...options,
               runtimeMode: options?.runtimeMode ?? settings.defaultRuntimeMode,
             },
           }),
         });
-        activateThreadEntryPoint(threadId);
         applyStickyState(threadId);
         applyProviderOverride(threadId);
 
         await navigateToThread(threadId);
-        if (entryPoint === "terminal") {
-          await createTerminalThread(
-            threadId,
-            resolveCreationState(threadId, getDraftThread(threadId), options),
-          );
-        }
         return threadId;
       })();
     },
-    [
-      activeDraftThread,
-      activeThread,
-      navigate,
-      openChatThreadPage,
-      openTerminalThreadPage,
-      focusedThreadId,
-      settings.defaultProvider,
-      settings.defaultRuntimeMode,
-    ],
+    [navigate, focusedThreadId, settings.defaultRuntimeMode],
   );
 
   return {
diff --git a/apps/web/src/hooks/useTerminalSurfaceController.ts b/apps/web/src/hooks/useTerminalSurfaceController.ts
deleted file mode 100644
index f85fdc19a..000000000
--- a/apps/web/src/hooks/useTerminalSurfaceController.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-// FILE: useTerminalSurfaceController.ts
-// Purpose: Shared terminal-store controller for non-chat terminal surfaces
-//          (right-dock terminal pane + workspace page). Owns the store selector
-//          slice, the focus-request bump, and the standard create/split/tab/move/
-//          activate/close handlers that were duplicated across those surfaces.
-// Layer: Web terminal UI hook
-// Note: ChatView is intentionally NOT a consumer — it adds split limits, placeholder
-//       thread cleanup, and split-view navigation, so it shares only the lower-level
-//       terminalSession helpers instead of this controller.
-
-import { type ThreadId } from "@t3tools/contracts";
-import { type TerminalCliKind } from "@t3tools/shared/terminalThreads";
-import { useCallback, useState } from "react";
-
-import { useAppSettings } from "~/appSettings";
-import {
-  confirmTerminalTabClose,
-  resolveTerminalCloseTitle,
-  shouldPromptForTerminalClose,
-} from "~/lib/terminalCloseConfirmation";
-import { readNativeApi } from "~/nativeApi";
-import { selectThreadTerminalState, useTerminalStateStore } from "~/terminalStateStore";
-import {
-  disposeAndCloseTerminalSession,
-  randomTerminalId,
-} from "~/components/terminal/terminalSession";
-
-type TerminalMetadata = { cliKind: TerminalCliKind | null; label: string };
-type TerminalActivity = {
-  hasRunningSubprocess: boolean;
-  agentState: "running" | "attention" | "review" | null;
-};
-
-export function useTerminalSurfaceController(threadId: ThreadId) {
-  const { settings } = useAppSettings();
-  const terminalState = useTerminalStateStore((state) =>
-    selectThreadTerminalState(state.terminalStateByThreadId, threadId),
-  );
-  const openTerminalThreadPage = useTerminalStateStore((s) => s.openTerminalThreadPage);
-  const applyWorkspaceLayoutPreset = useTerminalStateStore((s) => s.applyWorkspaceLayoutPreset);
-  const newTerminal = useTerminalStateStore((s) => s.newTerminal);
-  const newTerminalTab = useTerminalStateStore((s) => s.newTerminalTab);
-  const splitTerminalRightStore = useTerminalStateStore((s) => s.splitTerminalRight);
-  const splitTerminalDownStore = useTerminalStateStore((s) => s.splitTerminalDown);
-  const setActiveTerminalStore = useTerminalStateStore((s) => s.setActiveTerminal);
-  const closeTerminalStore = useTerminalStateStore((s) => s.closeTerminal);
-  const closeTerminalGroupStore = useTerminalStateStore((s) => s.closeTerminalGroup);
-  const setTerminalHeightStore = useTerminalStateStore((s) => s.setTerminalHeight);
-  const resizeTerminalSplitStore = useTerminalStateStore((s) => s.resizeTerminalSplit);
-  const setTerminalMetadataStore = useTerminalStateStore((s) => s.setTerminalMetadata);
-  const setTerminalActivityStore = useTerminalStateStore((s) => s.setTerminalActivity);
-
-  const [focusRequestId, setFocusRequestId] = useState(0);
-  const bumpFocusRequest = useCallback(() => setFocusRequestId((value) => value + 1), []);
-
-  const newTerminalGroup = useCallback(() => {
-    newTerminal(threadId, randomTerminalId());
-    bumpFocusRequest();
-  }, [bumpFocusRequest, newTerminal, threadId]);
-
-  const splitRight = useCallback(() => {
-    splitTerminalRightStore(threadId, randomTerminalId());
-    bumpFocusRequest();
-  }, [bumpFocusRequest, splitTerminalRightStore, threadId]);
-
-  const splitDown = useCallback(() => {
-    splitTerminalDownStore(threadId, randomTerminalId());
-    bumpFocusRequest();
-  }, [bumpFocusRequest, splitTerminalDownStore, threadId]);
-
-  const createTerminalTab = useCallback(
-    (targetTerminalId: string) => {
-      newTerminalTab(threadId, targetTerminalId, randomTerminalId());
-      bumpFocusRequest();
-    },
-    [bumpFocusRequest, newTerminalTab, threadId],
-  );
-
-  const moveTerminalToNewGroup = useCallback(
-    (terminalId: string) => {
-      newTerminal(threadId, terminalId);
-      bumpFocusRequest();
-    },
-    [bumpFocusRequest, newTerminal, threadId],
-  );
-
-  const activateTerminal = useCallback(
-    (terminalId: string) => {
-      setActiveTerminalStore(threadId, terminalId);
-      bumpFocusRequest();
-    },
-    [bumpFocusRequest, setActiveTerminalStore, threadId],
-  );
-
-  const closeTerminal = useCallback(
-    async (terminalId: string) => {
-      const api = readNativeApi();
-      const confirmed = await confirmTerminalTabClose({
-        api,
-        enabled: shouldPromptForTerminalClose({
-          confirmationEnabled: settings.confirmTerminalTabClose,
-          runningTerminalIds: terminalState.runningTerminalIds,
-          terminalAttentionStatesById: terminalState.terminalAttentionStatesById,
-          terminalId,
-        }),
-        terminalTitle: resolveTerminalCloseTitle({
-          terminalId,
-          terminalLabelsById: terminalState.terminalLabelsById,
-          terminalTitleOverridesById: terminalState.terminalTitleOverridesById,
-        }),
-      });
-      if (!confirmed) {
-        return;
-      }
-      disposeAndCloseTerminalSession({ api, threadId, terminalId });
-      closeTerminalStore(threadId, terminalId);
-      bumpFocusRequest();
-    },
-    [
-      bumpFocusRequest,
-      closeTerminalStore,
-      settings.confirmTerminalTabClose,
-      terminalState.runningTerminalIds,
-      terminalState.terminalAttentionStatesById,
-      terminalState.terminalLabelsById,
-      terminalState.terminalTitleOverridesById,
-      threadId,
-    ],
-  );
-
-  const closeTerminalGroup = useCallback(
-    (groupId: string) => closeTerminalGroupStore(threadId, groupId),
-    [closeTerminalGroupStore, threadId],
-  );
-
-  const setTerminalHeight = useCallback(
-    (height: number) => setTerminalHeightStore(threadId, height),
-    [setTerminalHeightStore, threadId],
-  );
-
-  const resizeTerminalSplit = useCallback(
-    (groupId: string, splitId: string, weights: number[]) =>
-      resizeTerminalSplitStore(threadId, groupId, splitId, weights),
-    [resizeTerminalSplitStore, threadId],
-  );
-
-  const setTerminalMetadata = useCallback(
-    (terminalId: string, metadata: TerminalMetadata) =>
-      setTerminalMetadataStore(threadId, terminalId, metadata),
-    [setTerminalMetadataStore, threadId],
-  );
-
-  const setTerminalActivity = useCallback(
-    (terminalId: string, activity: TerminalActivity) =>
-      setTerminalActivityStore(threadId, terminalId, activity),
-    [setTerminalActivityStore, threadId],
-  );
-
-  return {
-    terminalState,
-    focusRequestId,
-    bumpFocusRequest,
-    openTerminalThreadPage,
-    applyWorkspaceLayoutPreset,
-    newTerminalGroup,
-    splitRight,
-    splitDown,
-    createTerminalTab,
-    moveTerminalToNewGroup,
-    activateTerminal,
-    closeTerminal,
-    closeTerminalGroup,
-    setTerminalHeight,
-    resizeTerminalSplit,
-    setTerminalMetadata,
-    setTerminalActivity,
-  };
-}
diff --git a/apps/web/src/hooks/useTheme.ts b/apps/web/src/hooks/useTheme.ts
index 014ed651e..02430150b 100644
--- a/apps/web/src/hooks/useTheme.ts
+++ b/apps/web/src/hooks/useTheme.ts
@@ -1,34 +1,76 @@
 // FILE: useTheme.ts
-// Purpose: Persists the appearance mode and projects the fixed Claude palette into DOM CSS variables.
+// Purpose: Persists the theme state and projects it into DOM CSS variables.
 // Layer: Web appearance state hook
-// Exports: useTheme for the system, light, and dark appearance modes.
+// Exports: useTheme for keeping the DOM synced with the persisted (and cross-tab) theme state.
 
-import { useCallback, useEffect, useSyncExternalStore } from "react";
+import { useEffect, useSyncExternalStore } from "react";
 import { isElectron } from "../env";
 import { isMacPlatform } from "../lib/utils";
 import {
   DEFAULT_THEME_STATE,
-  type ThemeMode,
   type ThemeState,
+  type ThemeVariant,
   buildThemeCssVariables,
   parseStoredThemeState,
-  resolveThemePack,
-  resolveThemeVariant,
+  resolveThemePackForVariant,
   serializeThemeState,
 } from "../theme/theme.logic";
 
-type ThemeSnapshot = {
-  state: ThemeState;
-  systemDark: boolean;
-};
-
 const STORAGE_KEY = "teacode:theme";
-const MEDIA_QUERY = "(prefers-color-scheme: dark)";
+const APPEARANCE_MODE_KEY = "teacode:appearance-mode";
 
 let listeners: Array<() => void> = [];
-let lastSnapshot: ThemeSnapshot | null = null;
+let lastSnapshot: ThemeState | null = null;
 let lastSnapshotKey = "";
-let lastDesktopTheme: ThemeMode | null = null;
+let desktopThemeSynced = false;
+let lastSyncedVariant: ThemeVariant | null = null;
+
+// ─── Appearance mode (system / light / dark) ─────────────────────────────
+
+export type AppearanceMode = "system" | ThemeVariant;
+
+function readAppearanceMode(): AppearanceMode {
+  if (typeof localStorage === "undefined") return "dark";
+  const raw = localStorage.getItem(APPEARANCE_MODE_KEY);
+  if (raw === "light" || raw === "dark" || raw === "system") return raw;
+  return "dark";
+}
+
+function writeAppearanceMode(mode: AppearanceMode): void {
+  try {
+    localStorage.setItem(APPEARANCE_MODE_KEY, mode);
+  } catch {
+    /* noop */
+  }
+}
+
+const systemDarkQuery =
+  typeof window !== "undefined" ? window.matchMedia("(prefers-color-scheme: dark)") : null;
+
+function resolveVariant(mode: AppearanceMode): ThemeVariant {
+  if (mode === "light") return "light";
+  if (mode === "dark") return "dark";
+  // system: follow OS preference, default dark
+  return systemDarkQuery?.matches !== false ? "dark" : "light";
+}
+
+let systemModeListeners: Array<() => void> = [];
+
+function onSystemColorSchemeChange() {
+  if (readAppearanceMode() !== "system") return;
+  for (const listener of systemModeListeners) listener();
+}
+
+if (systemDarkQuery) {
+  systemDarkQuery.addEventListener("change", onSystemColorSchemeChange);
+}
+
+function subscribeSystemMode(listener: () => void): () => void {
+  systemModeListeners.push(listener);
+  return () => {
+    systemModeListeners = systemModeListeners.filter((l) => l !== listener);
+  };
+}
 
 // ─── Store wiring ─────────────────────────────────────────────────────────
 
@@ -42,51 +84,34 @@ function hasThemeStorage(): boolean {
   return typeof window !== "undefined" && typeof localStorage !== "undefined";
 }
 
-function getSystemDark(): boolean {
-  return typeof window !== "undefined" && window.matchMedia(MEDIA_QUERY).matches;
-}
-
 function readStoredThemeState(): ThemeState {
   if (!hasThemeStorage()) {
     return DEFAULT_THEME_STATE;
   }
 
   try {
-    return parseStoredThemeState(localStorage.getItem(STORAGE_KEY));
+    const base = parseStoredThemeState(localStorage.getItem(STORAGE_KEY));
+    const mode = readAppearanceMode();
+    const variant = resolveVariant(mode);
+    return { ...base, variant };
   } catch {
     return DEFAULT_THEME_STATE;
   }
 }
 
-function writeStoredThemeState(state: ThemeState) {
-  if (!hasThemeStorage()) {
-    return;
-  }
-
-  localStorage.setItem(STORAGE_KEY, serializeThemeState(state));
-}
-
-function getSnapshot(): ThemeSnapshot {
+function getSnapshot(): ThemeState {
   const state = readStoredThemeState();
-  const systemDark = state.mode === "system" ? getSystemDark() : false;
-  const snapshotKey = `${serializeThemeState(state)}|${systemDark ? "dark" : "light"}`;
+  const snapshotKey = serializeThemeState(state);
 
   if (lastSnapshot && lastSnapshotKey === snapshotKey) {
     return lastSnapshot;
   }
 
   lastSnapshotKey = snapshotKey;
-  lastSnapshot = { state, systemDark };
+  lastSnapshot = state;
   return lastSnapshot;
 }
 
-function updateStoredThemeState(update: (state: ThemeState) => ThemeState) {
-  const nextState = update(readStoredThemeState());
-  writeStoredThemeState(nextState);
-  applyThemeState(nextState, true);
-  emitChange();
-}
-
 function subscribe(listener: () => void): () => void {
   if (typeof window === "undefined") {
     return () => {};
@@ -94,29 +119,25 @@ function subscribe(listener: () => void): () => void {
 
   listeners.push(listener);
 
-  const mediaQuery = window.matchMedia(MEDIA_QUERY);
-  const handleMediaChange = () => {
-    const state = readStoredThemeState();
-    if (state.mode === "system") {
-      applyThemeState(state, true);
-    }
-    emitChange();
-  };
+  // Another tab/window persisted a theme change; re-apply and notify.
   const handleStorage = (event: StorageEvent) => {
-    if (event.key !== STORAGE_KEY) {
+    if (event.key !== STORAGE_KEY && event.key !== APPEARANCE_MODE_KEY) {
       return;
     }
     applyThemeState(readStoredThemeState(), true);
     emitChange();
   };
 
-  mediaQuery.addEventListener("change", handleMediaChange);
   window.addEventListener("storage", handleStorage);
+  const unsubSystem = subscribeSystemMode(() => {
+    applyThemeState(readStoredThemeState(), true);
+    emitChange();
+  });
 
   return () => {
     listeners = listeners.filter((currentListener) => currentListener !== listener);
-    mediaQuery.removeEventListener("change", handleMediaChange);
     window.removeEventListener("storage", handleStorage);
+    unsubSystem();
   };
 }
 
@@ -130,7 +151,7 @@ function applyThemeState(state: ThemeState, suppressTransitions = false) {
   const root = document.documentElement;
   // Some server-rendered tests stub only the tiny DOM surface they need.
   if (
-    typeof root.classList?.toggle !== "function" ||
+    typeof root.classList?.add !== "function" ||
     typeof root.style?.setProperty !== "function" ||
     typeof root.style?.removeProperty !== "function"
   ) {
@@ -141,18 +162,24 @@ function applyThemeState(state: ThemeState, suppressTransitions = false) {
     root.classList.add("no-transitions");
   }
 
-  const variant = resolveThemeVariant(state.mode, getSystemDark());
-  const activeTheme = resolveThemePack(state, variant);
-  const cssVariableBuild = buildThemeCssVariables(activeTheme, variant, {
+  const variant = state.variant;
+  const activeTheme = resolveThemePackForVariant(state);
+  const cssVariableBuild = buildThemeCssVariables(activeTheme, {
     electron: isElectron,
     isMac: isMacPlatform(typeof navigator === "undefined" ? "" : navigator.platform),
+    variant,
   });
 
-  root.classList.toggle("dark", variant === "dark");
+  // Tailwind's `dark:` utilities key off this class everywhere.
+  if (variant === "dark") {
+    root.classList.add("dark");
+  } else {
+    root.classList.remove("dark");
+  }
   root.setAttribute("data-code-theme-id", activeTheme.codeThemeId);
-  root.setAttribute("data-theme-mode", state.mode);
   root.setAttribute("data-theme-variant", variant);
   root.setAttribute("data-window-material", cssVariableBuild.material);
+  root.style.setProperty("color-scheme", variant);
 
   for (const [name, value] of Object.entries(cssVariableBuild.variables)) {
     if (value.trim().length === 0) {
@@ -162,7 +189,7 @@ function applyThemeState(state: ThemeState, suppressTransitions = false) {
     root.style.setProperty(name, value);
   }
 
-  syncDesktopTheme(state.mode);
+  syncDesktopTheme(variant);
 
   if (suppressTransitions) {
     // Force a reflow so the no-transitions class takes effect before removal.
@@ -174,21 +201,25 @@ function applyThemeState(state: ThemeState, suppressTransitions = false) {
   }
 }
 
-function syncDesktopTheme(theme: ThemeMode) {
+function syncDesktopTheme(variant: ThemeVariant) {
   if (typeof window === "undefined") {
     return;
   }
 
   const bridge = window.desktopBridge;
-  if (!bridge || lastDesktopTheme === theme) {
+  if (!bridge) {
     return;
   }
 
-  lastDesktopTheme = theme;
-  void bridge.setTheme(theme).catch(() => {
-    if (lastDesktopTheme === theme) {
-      lastDesktopTheme = null;
-    }
+  if (desktopThemeSynced && lastSyncedVariant === variant) {
+    return;
+  }
+
+  desktopThemeSynced = true;
+  lastSyncedVariant = variant;
+  void bridge.setTheme(variant).catch(() => {
+    desktopThemeSynced = false;
+    lastSyncedVariant = null;
   });
 }
 
@@ -199,31 +230,29 @@ if (typeof document !== "undefined") {
 
 // ─── Public hook ──────────────────────────────────────────────────────────
 
-export function useTheme() {
-  const snapshot = useSyncExternalStore(subscribe, getSnapshot, () => ({
-    state: DEFAULT_THEME_STATE,
-    systemDark: false,
-  }));
-  const theme = snapshot.state.mode;
-  const resolvedTheme = resolveThemeVariant(theme, snapshot.systemDark);
-
-  const setTheme = useCallback((nextTheme: ThemeMode) => {
-    updateStoredThemeState((state) => ({
-      ...state,
-      mode: nextTheme,
-    }));
-  }, []);
-
-  // Keep the DOM synced if something bypassed the immediate module-load apply.
+/**
+ * Keeps the DOM theme projection in sync with the persisted theme state,
+ * including cross-tab updates via the "storage" event. The initial apply
+ * already happens at module load, so this is a no-op unless something else
+ * changes the persisted state out from under the current tab.
+ */
+export function useTheme(): void {
+  const state = useSyncExternalStore(subscribe, getSnapshot, () => DEFAULT_THEME_STATE);
+
   useEffect(() => {
-    applyThemeState(snapshot.state);
-  }, [snapshot.state]);
+    applyThemeState(state);
+  }, [state]);
+}
 
-  return {
-    resolvedTheme,
-    setTheme,
-    theme,
-  } as const;
+// ─── Public helpers for settings UI ───────────────────────────────────────
+
+export function getAppearanceMode(): AppearanceMode {
+  return readAppearanceMode();
 }
 
-export type { ThemeMode };
+export function setAppearanceMode(mode: AppearanceMode): void {
+  writeAppearanceMode(mode);
+  // Trigger re-evaluation for the current tab.
+  applyThemeState(readStoredThemeState(), true);
+  emitChange();
+}
diff --git a/apps/web/src/hooks/useThreadActivationController.ts b/apps/web/src/hooks/useThreadActivationController.ts
index a8e959aef..33106d1a5 100644
--- a/apps/web/src/hooks/useThreadActivationController.ts
+++ b/apps/web/src/hooks/useThreadActivationController.ts
@@ -3,17 +3,13 @@ import type { useNavigate } from "@tanstack/react-router";
 import type { ThreadId } from "@t3tools/contracts";
 
 import type { LastThreadRoute } from "../chatRouteRestore";
-import { selectThreadTerminalState } from "../terminalStateStore";
 import type { SidebarThreadSummary } from "../types";
 
 type Navigate = ReturnType<typeof useNavigate>;
-type ThreadTerminalStateById = Parameters<typeof selectThreadTerminalState>[0];
 
 export type ThreadActivationControllerInput = {
   clearSelection: () => void;
   navigate: Navigate;
-  openChatThreadPage: (threadId: ThreadId) => void;
-  openTerminalThreadPage: (threadId: ThreadId) => void;
   prewarmThreadDetailForIntent: (threadId: ThreadId) => void;
   rememberLastThreadRouteNow: (nextLastThreadRoute: LastThreadRoute) => void;
   routeThreadId: ThreadId | null | undefined;
@@ -23,7 +19,6 @@ export type ThreadActivationControllerInput = {
   sidebarThreadSummaryById: Readonly<
     Partial<Record<ThreadId, Pick<SidebarThreadSummary, "id" | "projectId">>>
   >;
-  terminalStateByThreadId: ThreadTerminalStateById;
 };
 
 export function activateThreadFromSidebarIntent(
@@ -42,13 +37,6 @@ export function activateThreadFromSidebarIntent(
   input.setSelectionAnchor(threadId);
   input.rememberLastThreadRouteNow({ threadId });
 
-  const entryPoint = selectThreadTerminalState(input.terminalStateByThreadId, threadId).entryPoint;
-  if (entryPoint === "terminal") {
-    input.openTerminalThreadPage(threadId);
-  } else {
-    input.openChatThreadPage(threadId);
-  }
-
   void input.navigate({
     to: "/$threadId",
     params: { threadId },
diff --git a/apps/web/src/hooks/useWindowTransparency.ts b/apps/web/src/hooks/useWindowTransparency.ts
new file mode 100644
index 000000000..507735ac6
--- /dev/null
+++ b/apps/web/src/hooks/useWindowTransparency.ts
@@ -0,0 +1,31 @@
+// FILE: useWindowTransparency.ts
+// Purpose: Publishes the window-transparency setting as a CSS variable on the root.
+// Layer: Web appearance hook
+// Exports: useWindowTransparency
+
+import { useEffect } from "react";
+import { normalizeWindowTransparency, useAppSettings } from "../appSettings";
+
+const WINDOW_TRANSPARENCY_CSS_VARIABLE = "--app-window-transparency";
+
+/**
+ * The glass canvas reads `--app-window-transparency` as the share of the desktop
+ * that shows through (see the liquid-glass block in index.css). It only has an
+ * effect while the window material is translucent; on an opaque window the shell
+ * paints a solid canvas and the variable is inert.
+ */
+export function useWindowTransparency() {
+  const { settings } = useAppSettings();
+
+  useEffect(() => {
+    const rootStyle = document.documentElement.style;
+    rootStyle.setProperty(
+      WINDOW_TRANSPARENCY_CSS_VARIABLE,
+      `${normalizeWindowTransparency(settings.windowTransparency)}%`,
+    );
+
+    return () => {
+      rootStyle.removeProperty(WINDOW_TRANSPARENCY_CSS_VARIABLE);
+    };
+  }, [settings.windowTransparency]);
+}
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 5e6270305..10801edb8 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -89,13 +89,18 @@
   --color-chart-3: var(--chart-3);
   --color-chart-4: var(--chart-4);
   --color-chart-5: var(--chart-5);
-  --radius-sm: calc(var(--radius) * 0.6);
-  --radius-md: calc(var(--radius) * 0.8);
+  /* Corner ladder anchored on BONSAI-DESIGN-SYSTEM `WindowChrome.radius = 14`:
+     `--radius` IS the chrome radius, so `rounded-lg` — the default for buttons,
+     rows and chips — lands exactly on it. The rest of the scale steps off that
+     anchor by fixed offsets rather than multipliers, so tuning the one knob
+     shifts the whole family without the ends drifting into slabs or circles. */
+  --radius-sm: calc(var(--radius) - 8px);
+  --radius-md: calc(var(--radius) - 4px);
   --radius-lg: var(--radius);
-  --radius-xl: calc(var(--radius) * 1.4);
-  --radius-2xl: calc(var(--radius) * 1.8);
-  --radius-3xl: calc(var(--radius) * 2.2);
-  --radius-4xl: calc(var(--radius) * 2.6);
+  --radius-xl: calc(var(--radius) + 2px);
+  --radius-2xl: calc(var(--radius) + 6px);
+  --radius-3xl: calc(var(--radius) + 10px);
+  --radius-4xl: calc(var(--radius) + 14px);
   @keyframes skeleton {
     to {
       background-position: -200% 0;
@@ -138,7 +143,7 @@
      The namespace must be `--transition-duration-*`: that is what backs the `duration-*`
      utilities. A `--duration-*` token compiles clean and silently generates nothing, so
      every `duration-press` would quietly fall back to --default-transition-duration. */
-  --transition-duration-press: 140ms;
+  --transition-duration-press: 120ms;
   --transition-duration-tooltip: 160ms;
   --transition-duration-menu: 200ms;
   --transition-duration-disclosure: 220ms;
@@ -168,6 +173,59 @@
      gradients, glass, or a second content-card shadow competing for attention. */
   .chitauri-anthropic-shell {
     --app-content-card-radius: 0px;
+    /* One canvas for the whole window: the sidebar and the chat column are both
+       transparent, so a background image runs continuously across the seam
+       instead of stopping at the panel edge. */
+    background: var(--background);
+  }
+
+  /* ── Liquid glass ────────────────────────────────────────────────────────
+     macOS backs the window with an "under-window" vibrancy material (see
+     getWindowMaterialOptions in the desktop main process). When the active theme
+     is non-opaque, `useTheme` stamps data-window-material="translucent" and every
+     persistent chrome surface switches from a solid fill to a tint + blur so the
+     desktop shows through.
+
+     ONE recipe (BONSAI-DESIGN-SYSTEM §5): a single blur/saturate pair, and each
+     surface differs only by how much tint it carries. No per-surface frosts —
+     that is how blur radii drift apart. Each blurred layer is its own compositor
+     pass, so the recipe stays limited to the shell, the sidebar, the composer,
+     and buttons. */
+  :root {
+    --app-glass-filter: blur(20px) saturate(140%);
+  }
+
+  :root[data-window-material="translucent"] body {
+    background: transparent;
+  }
+
+  :root[data-window-material="translucent"] .chitauri-anthropic-shell,
+  :root[data-window-material="translucent"] .app-sidebar-surface,
+  :root[data-window-material="translucent"] .chat-composer-surface,
+  :root[data-window-material="translucent"] .chat-composer-shell,
+  :root[data-window-material="translucent"] .chat-composer-stacked-top,
+  :root[data-window-material="translucent"] .chat-composer-surface-banner,
+  :root[data-window-material="translucent"] [data-slot="button"]:not(.bg-transparent) {
+    backdrop-filter: var(--app-glass-filter);
+    -webkit-backdrop-filter: var(--app-glass-filter);
+  }
+
+  :root[data-window-material="translucent"] .chitauri-anthropic-shell {
+    background: color-mix(
+      in srgb,
+      var(--background) calc(100% - var(--app-window-transparency, 20%)),
+      transparent
+    );
+  }
+
+  /* The sidebar carries no material of its own — it is the composer surface,
+     verbatim, so the two read as the same pane of glass. */
+  :root[data-window-material="translucent"] .app-sidebar-surface,
+  :root[data-window-material="translucent"] .chat-composer-surface,
+  :root[data-window-material="translucent"] .chat-composer-shell,
+  :root[data-window-material="translucent"] .chat-composer-stacked-top,
+  :root[data-window-material="translucent"] .chat-composer-surface-banner {
+    background: color-mix(in srgb, var(--composer-surface) 55%, transparent);
   }
 
   .sidebar-icon-button {
@@ -183,7 +241,9 @@
      It runs full height and meets the canvas on a single hairline, so the only
      border is on the seam side — no card radius, no surrounding inset. */
   .app-sidebar-surface {
-    --app-sidebar-surface: var(--panel);
+    /* Transparent, not `--panel`: the shell paints the canvas (colour or image)
+       for both docks, and the sidebar reads as part of it. */
+    --app-sidebar-surface: transparent;
     /* Row metrics come from the density scale (`getDensityCssVariables`) so the
        sidebar honors the UI density setting instead of pinning its own height. */
     overflow: hidden;
@@ -205,14 +265,13 @@
 
   .app-sidebar-surface [data-slot="sidebar-footer"] {
     flex: none;
-    border-top: 1px solid var(--sidebar-border);
     padding: 0.625rem 0.75rem;
   }
 
   .app-sidebar-surface [data-slot="sidebar-menu-button"],
   .app-sidebar-surface [data-slot="sidebar-menu-sub-button"],
   .app-sidebar-surface [data-thread-item] {
-    border-radius: 8px;
+    border-radius: var(--radius-lg);
     transition-duration: 140ms;
   }
 
@@ -225,7 +284,7 @@
 
   /* Small icon badges inherit the persistent panel language. */
   .sidebar-icon-chip {
-    background: var(--app-sidebar-surface, var(--panel));
+    background: var(--panel);
     border: 1px solid var(--panel-border);
     box-shadow: none;
   }
@@ -353,9 +412,27 @@
 }
 
 :root {
-  color-scheme: light;
-  --radius: 0.5rem;
+  --radius: 0.75rem;
   --radius-user-message: var(--radius-2xl);
+
+  /* Fixed spacing scale for rows, chat gutters and the composer. These were once
+     driven by a user-facing "UI density" setting; density is a design decision,
+     not a preference, so the values are constants and the runtime writes nothing
+     to the document root. The `--app-density-*` names are kept because they are
+     referenced from Tailwind arbitrary values across the app. */
+  --app-density-row-height: 1.875rem;
+  --app-density-row-padding-y: 0.125rem;
+  --app-density-row-gap: 0.25rem;
+  --app-density-settings-row-padding-y: 0.625rem;
+  --app-density-chat-gutter-x: 0.75rem;
+  --app-density-chat-gutter-x-lg: 1.25rem;
+  --app-density-composer-editor-min-height: 2lh;
+  --app-density-composer-editor-padding-top: 0.75rem;
+  --app-density-composer-editor-padding-bottom: 0.5rem;
+  --app-density-composer-editor-padding-x: 0.75rem;
+  --app-density-composer-editor-padding-x-end: 0.875rem;
+  --app-density-composer-footer-padding: 0.375rem;
+  --app-density-composer-footer-padding-end: 0.5rem;
   --font-ui-family: "Inter", sans-serif;
   --font-mono-family: "0xProto", monospace;
   --font-chat-code-family: "0xProto", monospace;
@@ -363,14 +440,15 @@
   --app-sidebar-backdrop-filter: none;
   --app-sidebar-shadow: none;
   --app-sidebar-surface: var(--panel);
-  --background: #ffffff;
-  --foreground: #111318;
-  --panel: #f7f8fa;
-  --panel-border: #e5e7eb;
-  --hover: rgba(17, 19, 24, 0.05);
-  --selected: rgba(17, 19, 24, 0.08);
+  color-scheme: dark;
+  --background: #090909;
+  --foreground: #f7f8fa;
+  --panel: #141414;
+  --panel-border: rgba(255, 255, 255, 0.08);
+  --hover: rgba(255, 255, 255, 0.05);
+  --selected: rgba(255, 255, 255, 0.08);
   --faint: color-mix(in srgb, var(--foreground) 45%, transparent);
-  --well: #f2f2f4;
+  --well: color-mix(in srgb, #141414 55%, #090909);
   --card: var(--panel);
   --card-foreground: var(--foreground);
   --popover: var(--panel);
@@ -380,13 +458,13 @@
   --secondary: var(--hover);
   --secondary-foreground: var(--foreground);
   --muted: var(--hover);
-  --muted-foreground: #6b7280;
+  --muted-foreground: #9aa1ad;
   --accent: var(--hover);
   --accent-foreground: var(--foreground);
   --danger: #e94b4b;
   --destructive: var(--danger);
   --border: var(--panel-border);
-  --input: #f7f8fa;
+  --input: #141414;
   --ring: #3b82f6;
   --destructive-foreground: color-mix(in srgb, var(--danger) 60%, var(--foreground));
   --chart-1: oklch(0.87 0 0);
@@ -397,7 +475,7 @@
   --info: #3b82f6;
   --info-foreground: #3b82f6;
   --success: #4cb782;
-  --success-foreground: #27694c;
+  --success-foreground: #a5d6b7;
   --sidebar: var(--card);
   --sidebar-foreground: var(--foreground);
   --sidebar-primary: var(--primary);
@@ -407,6 +485,9 @@
   --sidebar-accent-foreground: var(--color-text-foreground, var(--foreground));
   --sidebar-border: var(--border);
   --sidebar-ring: var(--ring);
+  --app-sidebar-backdrop-filter: none;
+  --app-sidebar-shadow: none;
+  --app-sidebar-surface: var(--panel);
   --color-background-button-secondary-hover: var(--secondary);
   --color-background-button-secondary-active: var(--selected);
   --color-background-elevated-secondary: var(--secondary);
@@ -416,66 +497,6 @@
   --color-text-foreground-tertiary: var(--faint);
   --warning: var(--danger);
   --warning-foreground: color-mix(in srgb, var(--danger) 60%, var(--foreground));
-
-  @variant dark {
-    color-scheme: dark;
-    --background: #111318;
-    --foreground: #f7f8fa;
-    --panel: color-mix(in srgb, #ffffff 4%, #111318);
-    --panel-border: rgba(255, 255, 255, 0.08);
-    --hover: rgba(255, 255, 255, 0.05);
-    --selected: rgba(255, 255, 255, 0.08);
-    --faint: color-mix(in srgb, var(--foreground) 45%, transparent);
-    --well: color-mix(in srgb, #ffffff 2%, #111318);
-    --card: var(--panel);
-    --card-foreground: var(--foreground);
-    --popover: var(--panel);
-    --popover-foreground: var(--foreground);
-    --primary: var(--foreground);
-    --primary-foreground: var(--panel);
-    --secondary: var(--hover);
-    --secondary-foreground: var(--foreground);
-    --muted: var(--hover);
-    --muted-foreground: #9aa1ad;
-    --accent: var(--hover);
-    --accent-foreground: var(--foreground);
-    --danger: #e94b4b;
-    --destructive: var(--danger);
-    --border: var(--panel-border);
-    --input: color-mix(in srgb, #ffffff 5%, #111318);
-    --ring: #3b82f6;
-    --destructive-foreground: color-mix(in srgb, var(--danger) 60%, var(--foreground));
-    --chart-1: oklch(0.87 0 0);
-    --chart-2: oklch(0.556 0 0);
-    --chart-3: oklch(0.439 0 0);
-    --chart-4: oklch(0.371 0 0);
-    --chart-5: oklch(0.269 0 0);
-    --info: #3b82f6;
-    --info-foreground: #3b82f6;
-    --success: #4cb782;
-    --success-foreground: #a5d6b7;
-    --sidebar: var(--card);
-    --sidebar-foreground: var(--foreground);
-    --sidebar-primary: var(--primary);
-    --sidebar-primary-foreground: var(--primary-foreground);
-    --sidebar-accent: var(--secondary);
-    --sidebar-accent-active: var(--selected);
-    --sidebar-accent-foreground: var(--color-text-foreground, var(--foreground));
-    --sidebar-border: var(--border);
-    --sidebar-ring: var(--ring);
-    --app-sidebar-backdrop-filter: none;
-    --app-sidebar-shadow: none;
-    --app-sidebar-surface: var(--panel);
-    --color-background-button-secondary-hover: var(--secondary);
-    --color-background-button-secondary-active: var(--selected);
-    --color-background-elevated-secondary: var(--secondary);
-    --color-border: var(--border);
-    --color-text-foreground: var(--foreground);
-    --color-text-foreground-secondary: var(--muted-foreground);
-    --color-text-foreground-tertiary: var(--faint);
-    --warning: var(--danger);
-    --warning-foreground: color-mix(in srgb, var(--danger) 60%, var(--foreground));
-  }
 }
 
 body {
@@ -534,16 +555,9 @@ textarea:focus-visible {
    0.75rem right/top/bottom padding dated from the floating content card and now
    only leaves a frame of canvas showing around an opaque sheet. */
 .claude-main-shell {
-  background: var(--background);
-}
-
-/* Decorative canvas image (Settings → Appearance → Background). The inline style
-   supplies `background-image`; sizing/attachment live here so the flat default
-   stays a single solid paint with no extra layers. */
-.claude-main-shell[data-app-background="image"] {
-  background-size: cover;
-  background-position: center;
-  background-repeat: no-repeat;
+  /* The canvas — flat colour or the Settings → Appearance background image — is
+     painted once by `.chitauri-anthropic-shell` so it spans the sidebar too. */
+  background: transparent;
 }
 
 /* `.chat-content-card` is a marker class only (route-shell tests key off it); the
@@ -849,7 +863,7 @@ label:has(> select#reasoning-effort) select {
 }
 
 .chat-markdown :not(pre) > code {
-  border-radius: 0.4rem;
+  border-radius: var(--radius-md);
   background: var(--app-user-message-background);
   padding: 0.1rem 0.35rem;
   color: var(--foreground);
@@ -889,7 +903,7 @@ label:has(> select#reasoning-effort) select {
 .chat-markdown pre {
   max-width: 100%;
   overflow-x: auto;
-  border-radius: 0.75rem;
+  border-radius: var(--radius-2xl);
   background: var(--app-chat-code-surface);
   padding: 0.5rem 0.6rem;
   font-family: var(--font-chat-code-family);
@@ -907,7 +921,7 @@ label:has(> select#reasoning-effort) select {
 .chat-markdown .chat-markdown-codeblock {
   margin: 0.65rem 0;
   overflow: hidden;
-  border-radius: 0.5rem;
+  border-radius: var(--radius-lg);
   background: var(--app-chat-code-surface);
 }
 
@@ -1116,7 +1130,7 @@ label:has(> select#reasoning-effort) select {
   justify-content: center;
   width: 1.125rem;
   height: 1.125rem;
-  border-radius: 0.3125rem;
+  border-radius: var(--radius-md);
   background: var(--color-background-button-secondary);
   color: color-mix(in srgb, var(--color-text-foreground) 70%, transparent);
   transition:
@@ -1150,7 +1164,7 @@ label:has(> select#reasoning-effort) select {
   gap: 0.5rem;
   padding: 0.75rem 0.875rem;
   border: 1px solid color-mix(in srgb, var(--color-border) 65%, transparent);
-  border-radius: 0.625rem;
+  border-radius: var(--radius-xl);
   background: var(--panel);
   /* The box lives inside the file viewer, which sets the monospace code font on
      its content; reset to the normal UI font so the comment chrome reads as app
@@ -1167,7 +1181,7 @@ label:has(> select#reasoning-effort) select {
   justify-content: center;
   width: 1.25rem;
   height: 1.25rem;
-  border-radius: 0.4375rem;
+  border-radius: var(--radius-lg);
   border: 1px solid color-mix(in srgb, var(--color-border) 75%, transparent);
   background: var(--color-background-surface);
 }
@@ -1319,7 +1333,7 @@ label:has(> select#reasoning-effort) select {
   display: block;
   max-width: 100%;
   object-fit: contain;
-  border-radius: 0.35rem;
+  border-radius: var(--radius-md);
   user-select: none;
   -webkit-user-drag: none;
 }
@@ -1344,7 +1358,7 @@ label:has(> select#reasoning-effort) select {
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  border-radius: 0.45rem;
+  border-radius: var(--radius-lg);
   border: 1px solid color-mix(in srgb, var(--border) 80%, transparent);
   background: color-mix(in srgb, var(--background) 88%, transparent);
   color: var(--foreground);
@@ -1390,7 +1404,7 @@ label:has(> select#reasoning-effort) select {
   min-height: 0;
   gap: 0.6rem;
   padding: 0.6rem 0.75rem;
-  border-radius: 0.5rem;
+  border-radius: var(--radius-lg);
   border: 1px solid color-mix(in srgb, var(--border) 80%, transparent);
   background: color-mix(in srgb, var(--muted) 35%, transparent);
 }
@@ -1408,7 +1422,7 @@ label:has(> select#reasoning-effort) select {
   flex: 0 0 auto;
   align-items: center;
   justify-content: center;
-  border-radius: 0.45rem;
+  border-radius: var(--radius-lg);
   background: color-mix(in srgb, var(--destructive) 18%, transparent);
   color: var(--destructive);
 }
@@ -1460,7 +1474,7 @@ label:has(> select#reasoning-effort) select {
   margin: 0;
   border: 0;
   padding: 0;
-  border-radius: 0.625rem;
+  border-radius: var(--radius-xl);
   overflow: hidden;
   background: color-mix(in srgb, var(--muted) 55%, transparent);
   cursor: zoom-in;
@@ -2176,7 +2190,7 @@ diffs-container {
 
 .diff-render-file {
   border: 1px solid var(--border);
-  border-radius: 0.5rem;
+  border-radius: var(--radius-lg);
   overflow: clip;
   background: color-mix(in srgb, var(--card) 92%, var(--background));
 }
diff --git a/apps/web/src/keybindings.test.ts b/apps/web/src/keybindings.test.ts
index 99889ffe6..12cda94ba 100644
--- a/apps/web/src/keybindings.test.ts
+++ b/apps/web/src/keybindings.test.ts
@@ -14,15 +14,9 @@ import {
   isDiffToggleShortcut,
   isOpenFavoriteEditorShortcut,
   isSidebarToggleShortcut,
-  isTerminalClearShortcut,
-  isTerminalCloseShortcut,
-  isTerminalNewShortcut,
-  isTerminalSplitShortcut,
-  isTerminalToggleShortcut,
   resolveShortcutCommand,
   shouldShowThreadJumpHints,
   shortcutLabelForCommand,
-  terminalNavigationShortcutData,
   threadJumpCommandForIndex,
   threadJumpIndexFromCommand,
   type ShortcutEventLike,
@@ -109,301 +103,87 @@ function compile(bindings: TestBinding[]): ResolvedKeybindingsConfig {
 
 // Mirror the server defaults here so frontend shortcut resolution stays aligned.
 const DEFAULT_BINDINGS = compile([
-  {
-    shortcut: modShortcut("b"),
-    command: "sidebar.toggle",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
-  },
-  {
-    shortcut: modShortcut("b", { altKey: true }),
-    command: "rightPanel.toggle",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
-  },
+  { shortcut: modShortcut("b"), command: "sidebar.toggle" },
+  { shortcut: modShortcut("b", { altKey: true }), command: "rightPanel.toggle" },
   { shortcut: modShortcut("k"), command: "sidebar.search" },
-  { shortcut: modShortcut("j"), command: "terminal.toggle" },
-  {
-    shortcut: modShortcut("d"),
-    command: "terminal.split",
-    whenAst: whenIdentifier("terminalFocus"),
-  },
-  {
-    shortcut: modShortcut("t"),
-    command: "terminal.new",
-    whenAst: whenIdentifier("terminalFocus"),
-  },
-  {
-    shortcut: modShortcut("w"),
-    command: "terminal.close",
-    whenAst: whenIdentifier("terminalFocus"),
-  },
-  {
-    shortcut: modShortcut("j", { shiftKey: true }),
-    command: "terminal.workspace.newFullWidth",
-  },
-  {
-    shortcut: modShortcut("w"),
-    command: "terminal.workspace.closeActive",
-    whenAst: whenIdentifier("terminalWorkspaceOpen"),
-  },
-  {
-    shortcut: modShortcut("1"),
-    command: "terminal.workspace.terminal",
-    whenAst: whenIdentifier("terminalWorkspaceOpen"),
-  },
-  {
-    shortcut: modShortcut("2"),
-    command: "terminal.workspace.chat",
-    whenAst: whenIdentifier("terminalWorkspaceOpen"),
-  },
-  {
-    shortcut: modShortcut("d"),
-    command: "diff.toggle",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
-  },
-  {
-    shortcut: modShortcut("b", { shiftKey: true }),
-    command: "browser.toggle",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
-  },
-  {
-    shortcut: modShortcut("m", { shiftKey: true }),
-    command: "modelPicker.toggle",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
-  },
-  {
-    shortcut: modShortcut("e", { shiftKey: true }),
-    command: "traitsPicker.toggle",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
-  },
+  { shortcut: modShortcut("o", { shiftKey: true }), command: "sidebar.addProject" },
+  { shortcut: modShortcut("i"), command: "sidebar.importThread" },
+  { shortcut: modShortcut("b", { shiftKey: true }), command: "browser.toggle" },
+  { shortcut: modShortcut("d"), command: "diff.toggle" },
   {
     shortcut: modShortcut("l", { metaKey: true, modKey: false }),
     command: "composer.focus.toggle",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
-  },
-  {
-    shortcut: modShortcut("u", { shiftKey: true }),
-    command: "settings.usage",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
-  },
-  {
-    shortcut: modShortcut("o", { shiftKey: true }),
-    command: "sidebar.addProject",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
-  },
-  {
-    shortcut: modShortcut("i"),
-    command: "sidebar.importThread",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
-  },
-  {
-    shortcut: modShortcut("n"),
-    command: "chat.new",
-    whenAst: whenCreationAllowed,
-  },
-  {
-    shortcut: modShortcut("n", { shiftKey: true }),
-    command: "chat.newLatestProject",
-    whenAst: whenCreationAllowed,
-  },
-  {
-    shortcut: modShortcut("n", { altKey: true }),
-    command: "chat.newChat",
-    whenAst: whenCreationAllowed,
-  },
-  {
-    shortcut: modShortcut("t", { shiftKey: true }),
-    command: "chat.newTerminal",
-    whenAst: whenCreationAllowed,
-  },
-  {
-    shortcut: modShortcut("c", { altKey: true }),
-    command: "chat.newClaude",
-    whenAst: whenCreationAllowed,
-  },
-  {
-    shortcut: modShortcut("x", { altKey: true }),
-    command: "chat.newCodex",
-    whenAst: whenCreationAllowed,
-  },
-  {
-    shortcut: modShortcut("r", { altKey: true }),
-    command: "chat.newCursor",
-    whenAst: whenCreationAllowed,
-  },
-  {
-    shortcut: modShortcut("1"),
-    command: "thread.jump.1",
-    whenAst: whenAnd(
-      whenNot(whenIdentifier("terminalFocus")),
-      whenNot(whenIdentifier("terminalWorkspaceOpen")),
-    ),
-  },
-  {
-    shortcut: modShortcut("2"),
-    command: "thread.jump.2",
-    whenAst: whenAnd(
-      whenNot(whenIdentifier("terminalFocus")),
-      whenNot(whenIdentifier("terminalWorkspaceOpen")),
-    ),
-  },
-  {
-    shortcut: modShortcut("3"),
-    command: "thread.jump.3",
-    whenAst: whenAnd(
-      whenNot(whenIdentifier("terminalFocus")),
-      whenNot(whenIdentifier("terminalWorkspaceOpen")),
-    ),
-  },
-  {
-    shortcut: modShortcut("4"),
-    command: "thread.jump.4",
-    whenAst: whenAnd(
-      whenNot(whenIdentifier("terminalFocus")),
-      whenNot(whenIdentifier("terminalWorkspaceOpen")),
-    ),
-  },
-  {
-    shortcut: modShortcut("5"),
-    command: "thread.jump.5",
-    whenAst: whenAnd(
-      whenNot(whenIdentifier("terminalFocus")),
-      whenNot(whenIdentifier("terminalWorkspaceOpen")),
-    ),
-  },
-  {
-    shortcut: modShortcut("6"),
-    command: "thread.jump.6",
-    whenAst: whenAnd(
-      whenNot(whenIdentifier("terminalFocus")),
-      whenNot(whenIdentifier("terminalWorkspaceOpen")),
-    ),
-  },
-  {
-    shortcut: modShortcut("7"),
-    command: "thread.jump.7",
-    whenAst: whenAnd(
-      whenNot(whenIdentifier("terminalFocus")),
-      whenNot(whenIdentifier("terminalWorkspaceOpen")),
-    ),
-  },
-  {
-    shortcut: modShortcut("8"),
-    command: "thread.jump.8",
-    whenAst: whenAnd(
-      whenNot(whenIdentifier("terminalFocus")),
-      whenNot(whenIdentifier("terminalWorkspaceOpen")),
-    ),
-  },
-  {
-    shortcut: modShortcut("9"),
-    command: "thread.jump.9",
-    whenAst: whenAnd(
-      whenNot(whenIdentifier("terminalFocus")),
-      whenNot(whenIdentifier("terminalWorkspaceOpen")),
-    ),
-  },
-  {
-    shortcut: modShortcut("]", { shiftKey: true }),
-    command: "chat.visible.next",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
-  },
-  {
-    shortcut: modShortcut("[", { shiftKey: true }),
-    command: "chat.visible.previous",
-    whenAst: whenNot(whenIdentifier("terminalFocus")),
   },
+  { shortcut: modShortcut("m", { shiftKey: true }), command: "modelPicker.toggle" },
+  { shortcut: modShortcut("e", { shiftKey: true }), command: "traitsPicker.toggle" },
+  { shortcut: modShortcut("u", { shiftKey: true }), command: "settings.usage" },
+  { shortcut: modShortcut("n"), command: "chat.new" },
+  { shortcut: modShortcut("n", { shiftKey: true }), command: "chat.newLatestProject" },
+  { shortcut: modShortcut("n", { altKey: true }), command: "chat.newChat" },
+  { shortcut: modShortcut("c", { altKey: true }), command: "chat.newClaude" },
+  { shortcut: modShortcut("x", { altKey: true }), command: "chat.newCodex" },
+  { shortcut: modShortcut("r", { altKey: true }), command: "chat.newCursor" },
+  { shortcut: modShortcut("\\"), command: "chat.split" },
+  { shortcut: modShortcut("1"), command: "thread.jump.1" },
+  { shortcut: modShortcut("2"), command: "thread.jump.2" },
+  { shortcut: modShortcut("3"), command: "thread.jump.3" },
+  { shortcut: modShortcut("4"), command: "thread.jump.4" },
+  { shortcut: modShortcut("5"), command: "thread.jump.5" },
+  { shortcut: modShortcut("6"), command: "thread.jump.6" },
+  { shortcut: modShortcut("7"), command: "thread.jump.7" },
+  { shortcut: modShortcut("8"), command: "thread.jump.8" },
+  { shortcut: modShortcut("9"), command: "thread.jump.9" },
+  { shortcut: modShortcut("]", { shiftKey: true }), command: "chat.visible.next" },
+  { shortcut: modShortcut("[", { shiftKey: true }), command: "chat.visible.previous" },
   { shortcut: modShortcut("o"), command: "editor.openFavorite" },
 ]);
 
-describe("isTerminalToggleShortcut", () => {
-  it("matches Cmd+J on macOS", () => {
-    assert.isTrue(
-      isTerminalToggleShortcut(event({ metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-      }),
-    );
-  });
-
-  it("matches Ctrl+J on non-macOS", () => {
-    assert.isTrue(
-      isTerminalToggleShortcut(event({ ctrlKey: true }), DEFAULT_BINDINGS, { platform: "Win32" }),
-    );
-  });
-});
-
-describe("split/new/close terminal shortcuts", () => {
-  it("requires terminalFocus for default split/new/close bindings", () => {
-    assert.isFalse(
-      isTerminalSplitShortcut(event({ key: "d", metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalFocus: false },
-      }),
-    );
-    assert.isFalse(
-      isTerminalNewShortcut(event({ key: "t", ctrlKey: true }), DEFAULT_BINDINGS, {
-        platform: "Linux",
-        context: { terminalFocus: false },
-      }),
-    );
-    assert.isFalse(
-      isTerminalCloseShortcut(event({ key: "w", ctrlKey: true }), DEFAULT_BINDINGS, {
-        platform: "Linux",
-        context: { terminalFocus: false },
-      }),
-    );
-  });
+describe("when expressions", () => {
+  it("supports and/not compositions", () => {
+    const keybindings = compile([
+      {
+        shortcut: modShortcut("\\"),
+        command: "chat.split",
+        whenAst: whenAnd(whenIdentifier("chatOpen"), whenNot(whenIdentifier("composerFocus"))),
+      },
+    ]);
 
-  it("matches split/new when terminalFocus is true", () => {
-    assert.isTrue(
-      isTerminalSplitShortcut(event({ key: "d", metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalFocus: true },
+    assert.strictEqual(
+      resolveShortcutCommand(event({ key: "\\", ctrlKey: true }), keybindings, {
+        platform: "Win32",
+        context: { chatOpen: true, composerFocus: false },
       }),
+      "chat.split",
     );
-    assert.isTrue(
-      isTerminalNewShortcut(event({ key: "t", ctrlKey: true }), DEFAULT_BINDINGS, {
-        platform: "Linux",
-        context: { terminalFocus: true },
+    assert.isNull(
+      resolveShortcutCommand(event({ key: "\\", ctrlKey: true }), keybindings, {
+        platform: "Win32",
+        context: { chatOpen: false, composerFocus: false },
       }),
     );
-    assert.isTrue(
-      isTerminalCloseShortcut(event({ key: "w", ctrlKey: true }), DEFAULT_BINDINGS, {
-        platform: "Linux",
-        context: { terminalFocus: true },
+    assert.isNull(
+      resolveShortcutCommand(event({ key: "\\", ctrlKey: true }), keybindings, {
+        platform: "Win32",
+        context: { chatOpen: true, composerFocus: true },
       }),
     );
   });
 
-  it("supports when expressions", () => {
+  it("supports when boolean literals", () => {
     const keybindings = compile([
-      {
-        shortcut: modShortcut("\\"),
-        command: "terminal.split",
-        whenAst: whenAnd(whenIdentifier("terminalOpen"), whenNot(whenIdentifier("terminalFocus"))),
-      },
-      {
-        shortcut: modShortcut("n", { shiftKey: true }),
-        command: "terminal.new",
-        whenAst: whenAnd(whenIdentifier("terminalOpen"), whenNot(whenIdentifier("terminalFocus"))),
-      },
-      { shortcut: modShortcut("j"), command: "terminal.toggle" },
+      { shortcut: modShortcut("n"), command: "chat.new", whenAst: whenIdentifier("true") },
+      { shortcut: modShortcut("m"), command: "chat.newChat", whenAst: whenIdentifier("false") },
     ]);
-    assert.isTrue(
-      isTerminalSplitShortcut(event({ key: "\\", ctrlKey: true }), keybindings, {
-        platform: "Win32",
-        context: { terminalOpen: true, terminalFocus: false },
-      }),
-    );
-    assert.isFalse(
-      isTerminalSplitShortcut(event({ key: "\\", ctrlKey: true }), keybindings, {
-        platform: "Win32",
-        context: { terminalOpen: false, terminalFocus: false },
+
+    assert.strictEqual(
+      resolveShortcutCommand(event({ key: "n", ctrlKey: true }), keybindings, {
+        platform: "Linux",
       }),
+      "chat.new",
     );
-    assert.isTrue(
-      isTerminalNewShortcut(event({ key: "n", ctrlKey: true, shiftKey: true }), keybindings, {
-        platform: "Win32",
-        context: { terminalOpen: true, terminalFocus: false },
+    assert.isNull(
+      resolveShortcutCommand(event({ key: "m", ctrlKey: true }), keybindings, {
+        platform: "Linux",
       }),
     );
   });
@@ -417,12 +197,9 @@ describe("split/new/close terminal shortcuts", () => {
           ctrlKey: true,
         }),
         DEFAULT_BINDINGS,
-        {
-          platform: "Win32",
-          context: { terminalWorkspaceOpen: true },
-        },
+        { platform: "Win32" },
       ),
-      "terminal.workspace.terminal",
+      "thread.jump.1",
     );
   });
 
@@ -431,7 +208,6 @@ describe("split/new/close terminal shortcuts", () => {
       {
         shortcut: modShortcut("[", { shiftKey: true }),
         command: "chat.visible.previous",
-        whenAst: whenNot(whenIdentifier("terminalFocus")),
       },
     ]);
 
@@ -444,74 +220,38 @@ describe("split/new/close terminal shortcuts", () => {
           shiftKey: true,
         }),
         keybindings,
-        {
-          platform: "Win32",
-          context: { terminalFocus: false },
-        },
+        { platform: "Win32" },
       ),
       "chat.visible.previous",
     );
   });
-
-  it("supports when boolean literals", () => {
-    const keybindings = compile([
-      { shortcut: modShortcut("n"), command: "terminal.new", whenAst: whenIdentifier("true") },
-      { shortcut: modShortcut("m"), command: "terminal.new", whenAst: whenIdentifier("false") },
-    ]);
-
-    assert.isTrue(
-      isTerminalNewShortcut(event({ key: "n", ctrlKey: true }), keybindings, {
-        platform: "Linux",
-      }),
-    );
-    assert.isFalse(
-      isTerminalNewShortcut(event({ key: "m", ctrlKey: true }), keybindings, {
-        platform: "Linux",
-      }),
-    );
-  });
 });
 
 describe("settings shortcuts", () => {
-  it("opens usage settings with Cmd+Shift+U outside terminal focus", () => {
+  it("opens usage settings with Cmd+Shift+U", () => {
     assert.equal(
       resolveShortcutCommand(event({ key: "u", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
       }),
       "settings.usage",
     );
-    assert.isNull(
-      resolveShortcutCommand(event({ key: "u", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalFocus: true },
-      }),
-    );
   });
 });
 
 describe("composer focus shortcuts", () => {
-  it("toggles composer focus with Cmd+L outside terminal focus", () => {
+  it("toggles composer focus with Cmd+L", () => {
     assert.equal(
       resolveShortcutCommand(event({ key: "l", metaKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
       }),
       "composer.focus.toggle",
     );
-    assert.isNull(
-      resolveShortcutCommand(event({ key: "l", metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalFocus: true },
-      }),
-    );
   });
 
   it("does not treat Ctrl+L as the composer focus shortcut on non-macOS", () => {
     assert.isNull(
       resolveShortcutCommand(event({ key: "l", ctrlKey: true }), DEFAULT_BINDINGS, {
         platform: "Linux",
-        context: { terminalFocus: false },
       }),
     );
   });
@@ -526,177 +266,74 @@ describe("thread jump shortcuts", () => {
     assert.isNull(threadJumpIndexFromCommand("chat.new"));
   });
 
-  it("resolves numbered thread jumps when the terminal workspace is closed", () => {
+  it("resolves numbered thread jumps", () => {
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "3", metaKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false, terminalWorkspaceOpen: false },
       }),
       "thread.jump.3",
     );
   });
 
-  it("preserves terminal workspace shortcuts when the workspace is open", () => {
-    assert.strictEqual(
-      resolveShortcutCommand(event({ key: "1", metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalFocus: false, terminalWorkspaceOpen: true },
-      }),
-      "terminal.workspace.terminal",
-    );
-  });
-
   it("shows thread jump hints only while a numbered jump modifier combo is active", () => {
     assert.isTrue(
       shouldShowThreadJumpHints(event({ key: "Meta", metaKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalWorkspaceOpen: false },
       }),
     );
     assert.isTrue(
       shouldShowThreadJumpHints(event({ key: "Control", ctrlKey: true }), DEFAULT_BINDINGS, {
         platform: "Linux",
-        context: { terminalWorkspaceOpen: false },
       }),
     );
     assert.isFalse(
-      shouldShowThreadJumpHints(event({ key: "Meta", metaKey: true }), DEFAULT_BINDINGS, {
+      shouldShowThreadJumpHints(event({ key: "Shift", shiftKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalWorkspaceOpen: true },
       }),
     );
   });
 });
 
-describe("workspace terminal tab shortcuts", () => {
-  it("resolves the full-width terminal shortcut", () => {
-    assert.strictEqual(
-      resolveShortcutCommand(event({ key: "j", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-      }),
-      "terminal.workspace.newFullWidth",
-    );
-  });
-
-  it("resolves the active workspace close shortcut only while the terminal workspace is open", () => {
-    assert.strictEqual(
-      resolveShortcutCommand(event({ key: "w", metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalWorkspaceOpen: true, terminalFocus: true },
-      }),
-      "terminal.workspace.closeActive",
-    );
-    assert.isNull(
-      resolveShortcutCommand(event({ key: "w", metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalWorkspaceOpen: false, terminalFocus: false },
-      }),
-    );
-  });
-
-  it("prefers workspace tab shortcuts while open and thread jumps otherwise", () => {
-    assert.strictEqual(
-      resolveShortcutCommand(event({ key: "1", metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalWorkspaceOpen: true },
-      }),
-      "terminal.workspace.terminal",
-    );
-    assert.strictEqual(
-      resolveShortcutCommand(event({ key: "2", ctrlKey: true }), DEFAULT_BINDINGS, {
-        platform: "Linux",
-        context: { terminalWorkspaceOpen: true },
-      }),
-      "terminal.workspace.chat",
-    );
-    assert.strictEqual(
-      resolveShortcutCommand(event({ key: "1", metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalWorkspaceOpen: false },
-      }),
-      "thread.jump.1",
-    );
-  });
-
-  it("falls back to workspace defaults when the runtime config is missing them", () => {
-    const legacyBindings = DEFAULT_BINDINGS.filter(
-      (binding) =>
-        binding.command !== "terminal.workspace.newFullWidth" &&
-        binding.command !== "terminal.workspace.closeActive" &&
-        binding.command !== "terminal.workspace.terminal" &&
-        binding.command !== "terminal.workspace.chat",
-    );
-
-    assert.strictEqual(
-      resolveShortcutCommand(event({ key: "j", metaKey: true, shiftKey: true }), legacyBindings, {
-        platform: "MacIntel",
-      }),
-      "terminal.workspace.newFullWidth",
-    );
-    assert.strictEqual(
-      resolveShortcutCommand(event({ key: "w", metaKey: true }), legacyBindings, {
-        platform: "MacIntel",
-        context: { terminalWorkspaceOpen: true },
-      }),
-      "terminal.workspace.closeActive",
-    );
-    assert.strictEqual(
-      resolveShortcutCommand(event({ key: "1", metaKey: true }), legacyBindings, {
-        platform: "MacIntel",
-        context: { terminalWorkspaceOpen: true },
-      }),
-      "terminal.workspace.terminal",
-    );
-    assert.strictEqual(
-      shortcutLabelForCommand(legacyBindings, "terminal.workspace.chat", "Linux"),
-      "Ctrl+2",
-    );
-  });
-});
-
 describe("shortcutLabelForCommand", () => {
   it("returns the most recent binding label", () => {
     const bindings = compile([
       {
         shortcut: modShortcut("\\"),
-        command: "terminal.split",
-        whenAst: whenIdentifier("terminalFocus"),
+        command: "chat.split",
+        whenAst: whenIdentifier("composerFocus"),
       },
       {
         shortcut: modShortcut("\\", { shiftKey: true }),
-        command: "terminal.split",
-        whenAst: whenNot(whenIdentifier("terminalFocus")),
+        command: "chat.split",
+        whenAst: whenNot(whenIdentifier("composerFocus")),
       },
     ]);
-    assert.strictEqual(
-      shortcutLabelForCommand(bindings, "terminal.split", "Linux"),
-      "Ctrl+Shift+\\",
-    );
+    assert.strictEqual(shortcutLabelForCommand(bindings, "chat.split", "Linux"), "Ctrl+Shift+\\");
   });
 
   it("respects explicit context when resolving conflicting labels", () => {
     const bindings = compile([
       {
         shortcut: modShortcut("\\"),
-        command: "terminal.split",
-        whenAst: whenIdentifier("terminalFocus"),
+        command: "chat.split",
+        whenAst: whenIdentifier("composerFocus"),
       },
       {
         shortcut: modShortcut("\\", { shiftKey: true }),
-        command: "terminal.split",
-        whenAst: whenNot(whenIdentifier("terminalFocus")),
+        command: "chat.split",
+        whenAst: whenNot(whenIdentifier("composerFocus")),
       },
     ]);
     assert.strictEqual(
-      shortcutLabelForCommand(bindings, "terminal.split", {
+      shortcutLabelForCommand(bindings, "chat.split", {
         platform: "Linux",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "Ctrl+Shift+\\",
     );
   });
 
-  it("returns labels for non-terminal commands", () => {
+  it("returns labels for chrome and creation commands", () => {
     assert.strictEqual(
       shortcutLabelForCommand(DEFAULT_BINDINGS, "sidebar.addProject", "MacIntel"),
       "⇧⌘O",
@@ -710,11 +347,6 @@ describe("shortcutLabelForCommand", () => {
       shortcutLabelForCommand(DEFAULT_BINDINGS, "chat.newChat", "MacIntel"),
       "⌥⌘N",
     );
-    assert.strictEqual(shortcutLabelForCommand(DEFAULT_BINDINGS, "terminal.new", "MacIntel"), "⌘T");
-    assert.strictEqual(
-      shortcutLabelForCommand(DEFAULT_BINDINGS, "chat.newTerminal", "MacIntel"),
-      "⇧⌘T",
-    );
     assert.strictEqual(shortcutLabelForCommand(DEFAULT_BINDINGS, "diff.toggle", "Linux"), "Ctrl+D");
     assert.strictEqual(
       shortcutLabelForCommand(DEFAULT_BINDINGS, "sidebar.toggle", "MacIntel"),
@@ -741,15 +373,11 @@ describe("shortcutLabelForCommand", () => {
       "⌘L",
     );
     assert.strictEqual(
-      shortcutLabelForCommand(DEFAULT_BINDINGS, "terminal.workspace.terminal", "MacIntel"),
+      shortcutLabelForCommand(DEFAULT_BINDINGS, "thread.jump.1", "MacIntel"),
       "⌘1",
     );
     assert.strictEqual(
-      shortcutLabelForCommand(DEFAULT_BINDINGS, "terminal.workspace.newFullWidth", "MacIntel"),
-      "⇧⌘J",
-    );
-    assert.strictEqual(
-      shortcutLabelForCommand(DEFAULT_BINDINGS, "terminal.workspace.chat", "Linux"),
+      shortcutLabelForCommand(DEFAULT_BINDINGS, "thread.jump.2", "Linux"),
       "Ctrl+2",
     );
     assert.strictEqual(
@@ -779,21 +407,6 @@ describe("chat/editor shortcuts", () => {
         platform: "Linux",
       }),
     );
-    // macOS: Cmd+N still creates a new chat even from terminal focus — xterm never
-    // forwards the Cmd-chord to the shell, so the old `!terminalFocus` block just lost it.
-    assert.isTrue(
-      isChatNewShortcut(event({ key: "n", metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalFocus: true },
-      }),
-    );
-    // Linux/Windows: Ctrl+N is real shell input, so terminal focus must still block it.
-    assert.isFalse(
-      isChatNewShortcut(event({ key: "n", ctrlKey: true }), DEFAULT_BINDINGS, {
-        platform: "Linux",
-        context: { terminalFocus: true },
-      }),
-    );
   });
 
   it("matches chat.newChat shortcut", () => {
@@ -813,14 +426,14 @@ describe("chat/editor shortcuts", () => {
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "n", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.newLatestProject",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "n", ctrlKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
         platform: "Linux",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.newLatestProject",
     );
@@ -830,48 +443,38 @@ describe("chat/editor shortcuts", () => {
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "o", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "sidebar.addProject",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "o", ctrlKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
         platform: "Linux",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "sidebar.addProject",
     );
   });
 
-  it("resolves chat.newTerminal shortcut", () => {
-    assert.strictEqual(
-      resolveShortcutCommand(event({ key: "t", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalFocus: false },
-      }),
-      "chat.newTerminal",
-    );
-  });
-
   it("resolves provider-specific new chat shortcuts", () => {
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "c", metaKey: true, altKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.newClaude",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "x", metaKey: true, altKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.newCodex",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "r", metaKey: true, altKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.newCursor",
     );
@@ -881,7 +484,7 @@ describe("chat/editor shortcuts", () => {
         DEFAULT_BINDINGS,
         {
           platform: "MacIntel",
-          context: { terminalFocus: false },
+          context: { composerFocus: false },
         },
       ),
       "chat.newClaude",
@@ -892,7 +495,7 @@ describe("chat/editor shortcuts", () => {
         DEFAULT_BINDINGS,
         {
           platform: "MacIntel",
-          context: { terminalFocus: false },
+          context: { composerFocus: false },
         },
       ),
       "chat.newCodex",
@@ -903,110 +506,42 @@ describe("chat/editor shortcuts", () => {
         DEFAULT_BINDINGS,
         {
           platform: "MacIntel",
-          context: { terminalFocus: false },
+          context: { composerFocus: false },
         },
       ),
       "chat.newCursor",
     );
   });
 
-  it("resolves new-surface chords from terminal focus on macOS but not on other platforms", () => {
-    const macTerminal = { platform: "MacIntel", context: { terminalFocus: true } } as const;
-    const linuxTerminal = { platform: "Linux", context: { terminalFocus: true } } as const;
-
-    // macOS: Cmd-chords never reach the shell, so creating a new surface still works.
-    assert.strictEqual(
-      resolveShortcutCommand(
-        event({ key: "t", metaKey: true, shiftKey: true }),
-        DEFAULT_BINDINGS,
-        macTerminal,
-      ),
-      "chat.newTerminal",
-    );
-    assert.strictEqual(
-      resolveShortcutCommand(
-        event({ key: "n", metaKey: true, shiftKey: true }),
-        DEFAULT_BINDINGS,
-        macTerminal,
-      ),
-      "chat.newLatestProject",
-    );
-    assert.strictEqual(
-      resolveShortcutCommand(
-        event({ key: "n", metaKey: true, altKey: true }),
-        DEFAULT_BINDINGS,
-        macTerminal,
-      ),
-      "chat.newChat",
-    );
-    assert.strictEqual(
-      resolveShortcutCommand(
-        event({ key: "c", metaKey: true, altKey: true }),
-        DEFAULT_BINDINGS,
-        macTerminal,
-      ),
-      "chat.newClaude",
-    );
-
-    // Linux/Windows: the same chords are real shell input, so terminal focus blocks them.
-    assert.isNull(
-      resolveShortcutCommand(
-        event({ key: "t", ctrlKey: true, shiftKey: true }),
-        DEFAULT_BINDINGS,
-        linuxTerminal,
-      ),
-    );
-    assert.isNull(
-      resolveShortcutCommand(
-        event({ key: "c", ctrlKey: true, altKey: true }),
-        DEFAULT_BINDINGS,
-        linuxTerminal,
-      ),
-    );
-    assert.isNull(
-      resolveShortcutCommand(
-        event({ key: "n", ctrlKey: true, altKey: true }),
-        DEFAULT_BINDINGS,
-        linuxTerminal,
-      ),
-    );
-  });
-
   it("resolves visible chat cycle shortcuts", () => {
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "]", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.visible.next",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "[", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.visible.previous",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "}", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.visible.next",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "{", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.visible.previous",
     );
-    assert.isNull(
-      resolveShortcutCommand(event({ key: "]", metaKey: true, shiftKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalFocus: true },
-      }),
-    );
   });
 
   it("matches editor.openFavorite shortcut", () => {
@@ -1022,87 +557,55 @@ describe("chat/editor shortcuts", () => {
     );
   });
 
-  it("matches diff.toggle shortcut outside terminal focus", () => {
+  it("matches diff.toggle shortcut", () => {
     assert.isTrue(
       isDiffToggleShortcut(event({ key: "d", metaKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
-      }),
-    );
-    assert.isFalse(
-      isDiffToggleShortcut(event({ key: "d", metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalFocus: true },
       }),
     );
   });
 
-  it("matches sidebar.toggle shortcut outside terminal focus", () => {
+  it("matches sidebar.toggle shortcut", () => {
     assert.isTrue(
       isSidebarToggleShortcut(event({ key: "b", metaKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
-      }),
-    );
-    assert.isFalse(
-      isSidebarToggleShortcut(event({ key: "b", metaKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalFocus: true },
       }),
     );
   });
 
-  it("resolves rightPanel.toggle outside terminal focus", () => {
+  it("resolves rightPanel.toggle", () => {
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "b", metaKey: true, altKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
       }),
       "rightPanel.toggle",
     );
-    assert.isNull(
-      resolveShortcutCommand(event({ key: "b", metaKey: true, altKey: true }), DEFAULT_BINDINGS, {
-        platform: "MacIntel",
-        context: { terminalFocus: true },
-      }),
-    );
   });
 
-  it("resolves sidebar.search regardless of terminal focus", () => {
+  it("resolves sidebar.search regardless of composer focus", () => {
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "k", metaKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "sidebar.search",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "k", metaKey: true }), DEFAULT_BINDINGS, {
         platform: "MacIntel",
-        context: { terminalFocus: true },
+        context: { composerFocus: true },
       }),
       "sidebar.search",
     );
   });
 
-  it("matches browser.toggle shortcut outside terminal focus", () => {
+  it("matches browser.toggle shortcut", () => {
     assert.isTrue(
       isBrowserToggleShortcut(
         event({ key: "b", metaKey: true, shiftKey: true }),
         DEFAULT_BINDINGS,
         {
           platform: "MacIntel",
-          context: { terminalFocus: false },
-        },
-      ),
-    );
-    assert.isFalse(
-      isBrowserToggleShortcut(
-        event({ key: "b", metaKey: true, shiftKey: true }),
-        DEFAULT_BINDINGS,
-        {
-          platform: "MacIntel",
-          context: { terminalFocus: true },
         },
       ),
     );
@@ -1115,33 +618,33 @@ describe("cross-command precedence", () => {
       { shortcut: modShortcut("n"), command: "chat.new" },
       {
         shortcut: modShortcut("n"),
-        command: "terminal.new",
-        whenAst: whenIdentifier("terminalFocus"),
+        command: "chat.newChat",
+        whenAst: whenIdentifier("composerFocus"),
       },
     ]);
 
     assert.isTrue(
-      isTerminalNewShortcut(event({ key: "n", metaKey: true }), keybindings, {
+      isChatNewChatShortcut(event({ key: "n", metaKey: true }), keybindings, {
         platform: "MacIntel",
-        context: { terminalFocus: true },
+        context: { composerFocus: true },
       }),
     );
     assert.isFalse(
       isChatNewShortcut(event({ key: "n", metaKey: true }), keybindings, {
         platform: "MacIntel",
-        context: { terminalFocus: true },
+        context: { composerFocus: true },
       }),
     );
     assert.isFalse(
-      isTerminalNewShortcut(event({ key: "n", metaKey: true }), keybindings, {
+      isChatNewChatShortcut(event({ key: "n", metaKey: true }), keybindings, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
     );
     assert.isTrue(
       isChatNewShortcut(event({ key: "n", metaKey: true }), keybindings, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
     );
   });
@@ -1150,22 +653,22 @@ describe("cross-command precedence", () => {
     const keybindings = compile([
       {
         shortcut: modShortcut("n"),
-        command: "terminal.new",
-        whenAst: whenIdentifier("terminalFocus"),
+        command: "chat.newChat",
+        whenAst: whenIdentifier("composerFocus"),
       },
       { shortcut: modShortcut("n"), command: "chat.new" },
     ]);
 
     assert.isFalse(
-      isTerminalNewShortcut(event({ key: "n", ctrlKey: true }), keybindings, {
+      isChatNewChatShortcut(event({ key: "n", ctrlKey: true }), keybindings, {
         platform: "Linux",
-        context: { terminalFocus: true },
+        context: { composerFocus: true },
       }),
     );
     assert.isTrue(
       isChatNewShortcut(event({ key: "n", ctrlKey: true }), keybindings, {
         platform: "Linux",
-        context: { terminalFocus: true },
+        context: { composerFocus: true },
       }),
     );
   });
@@ -1188,33 +691,33 @@ describe("resolveShortcutCommand", () => {
       {
         shortcut: modShortcut("m", { altKey: true }),
         command: "modelPicker.toggle",
-        whenAst: whenNot(whenIdentifier("terminalFocus")),
+        whenAst: whenNot(whenIdentifier("composerFocus")),
       },
       {
         shortcut: modShortcut("e", { altKey: true }),
         command: "traitsPicker.toggle",
-        whenAst: whenNot(whenIdentifier("terminalFocus")),
+        whenAst: whenNot(whenIdentifier("composerFocus")),
       },
     ]);
 
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "m", metaKey: true, altKey: true }), keybindings, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "modelPicker.toggle",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "e", metaKey: true, altKey: true }), keybindings, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "traitsPicker.toggle",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "m", metaKey: true, altKey: true }), keybindings, {
         platform: "MacIntel",
-        context: { terminalFocus: true },
+        context: { composerFocus: true },
       }),
       null,
     );
@@ -1229,40 +732,33 @@ describe("resolveShortcutCommand", () => {
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "m", metaKey: true, shiftKey: true }), legacyBindings, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "modelPicker.toggle",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "e", metaKey: true, shiftKey: true }), legacyBindings, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "traitsPicker.toggle",
     );
   });
 
-  it("falls back to creation defaults with the macOS terminal-focus escape hatch", () => {
-    const legacyBindings = DEFAULT_BINDINGS.filter(
-      (binding) => binding.command !== "chat.new" && binding.command !== "chat.newTerminal",
-    );
-    const macTerminal = { platform: "MacIntel", context: { terminalFocus: true } } as const;
-    const linuxTerminal = { platform: "Linux", context: { terminalFocus: true } } as const;
+  it("falls back to creation defaults when the runtime config is missing them", () => {
+    const legacyBindings = DEFAULT_BINDINGS.filter((binding) => binding.command !== "chat.new");
 
     assert.strictEqual(
-      resolveShortcutCommand(event({ key: "n", metaKey: true }), legacyBindings, macTerminal),
+      resolveShortcutCommand(event({ key: "n", metaKey: true }), legacyBindings, {
+        platform: "MacIntel",
+      }),
       "chat.new",
     );
     assert.strictEqual(
-      resolveShortcutCommand(
-        event({ key: "t", metaKey: true, shiftKey: true }),
-        legacyBindings,
-        macTerminal,
-      ),
-      "chat.newTerminal",
-    );
-    assert.isNull(
-      resolveShortcutCommand(event({ key: "n", ctrlKey: true }), legacyBindings, linuxTerminal),
+      resolveShortcutCommand(event({ key: "n", ctrlKey: true }), legacyBindings, {
+        platform: "Linux",
+      }),
+      "chat.new",
     );
   });
 
@@ -1274,7 +770,7 @@ describe("resolveShortcutCommand", () => {
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "l", metaKey: true }), legacyBindings, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "composer.focus.toggle",
     );
@@ -1291,21 +787,21 @@ describe("resolveShortcutCommand", () => {
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "c", metaKey: true, altKey: true }), legacyBindings, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.newClaude",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "x", metaKey: true, altKey: true }), legacyBindings, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.newCodex",
     );
     assert.strictEqual(
       resolveShortcutCommand(event({ key: "r", metaKey: true, altKey: true }), legacyBindings, {
         platform: "MacIntel",
-        context: { terminalFocus: false },
+        context: { composerFocus: false },
       }),
       "chat.newCursor",
     );
@@ -1315,7 +811,7 @@ describe("resolveShortcutCommand", () => {
         legacyBindings,
         {
           platform: "MacIntel",
-          context: { terminalFocus: false },
+          context: { composerFocus: false },
         },
       ),
       "chat.newClaude",
@@ -1326,7 +822,7 @@ describe("resolveShortcutCommand", () => {
         legacyBindings,
         {
           platform: "MacIntel",
-          context: { terminalFocus: false },
+          context: { composerFocus: false },
         },
       ),
       "chat.newCodex",
@@ -1337,7 +833,7 @@ describe("resolveShortcutCommand", () => {
         legacyBindings,
         {
           platform: "MacIntel",
-          context: { terminalFocus: false },
+          context: { composerFocus: false },
         },
       ),
       "chat.newCursor",
@@ -1366,90 +862,16 @@ describe("formatShortcutLabel", () => {
   });
 });
 
-describe("isTerminalClearShortcut", () => {
-  it("matches Ctrl+L on all platforms", () => {
-    assert.isTrue(isTerminalClearShortcut(event({ key: "l", ctrlKey: true }), "Linux"));
-    assert.isTrue(isTerminalClearShortcut(event({ key: "l", ctrlKey: true }), "MacIntel"));
-  });
-
-  it("does not match Cmd+K (reserved for sidebar search)", () => {
-    assert.isFalse(isTerminalClearShortcut(event({ key: "k", metaKey: true }), "MacIntel"));
-  });
-
-  it("ignores non-keydown events", () => {
-    assert.isFalse(
-      isTerminalClearShortcut(event({ type: "keyup", key: "l", ctrlKey: true }), "Linux"),
-    );
-  });
-});
-
-describe("terminalNavigationShortcutData", () => {
-  it("maps Option+Arrow on macOS to word movement", () => {
-    assert.strictEqual(
-      terminalNavigationShortcutData(event({ key: "ArrowLeft", altKey: true }), "MacIntel"),
-      "\u001bb",
-    );
-    assert.strictEqual(
-      terminalNavigationShortcutData(event({ key: "ArrowRight", altKey: true }), "MacIntel"),
-      "\u001bf",
-    );
-  });
-
-  it("maps Cmd+Arrow on macOS to line movement", () => {
-    assert.strictEqual(
-      terminalNavigationShortcutData(event({ key: "ArrowLeft", metaKey: true }), "MacIntel"),
-      "\u0001",
-    );
-    assert.strictEqual(
-      terminalNavigationShortcutData(event({ key: "ArrowRight", metaKey: true }), "MacIntel"),
-      "\u0005",
-    );
-  });
-
-  it("maps Ctrl+Arrow on non-macOS to word movement", () => {
-    assert.strictEqual(
-      terminalNavigationShortcutData(event({ key: "ArrowLeft", ctrlKey: true }), "Win32"),
-      "\u001bb",
-    );
-    assert.strictEqual(
-      terminalNavigationShortcutData(event({ key: "ArrowRight", ctrlKey: true }), "Linux"),
-      "\u001bf",
-    );
-  });
-
-  it("rejects unsupported combinations", () => {
-    assert.isNull(
-      terminalNavigationShortcutData(
-        event({ key: "ArrowLeft", shiftKey: true, altKey: true }),
-        "MacIntel",
-      ),
-    );
-    assert.isNull(
-      terminalNavigationShortcutData(event({ key: "ArrowLeft", metaKey: true }), "Linux"),
-    );
-    assert.isNull(terminalNavigationShortcutData(event({ key: "a", altKey: true }), "MacIntel"));
-  });
-
-  it("ignores non-keydown events", () => {
-    assert.isNull(
-      terminalNavigationShortcutData(
-        event({ type: "keyup", key: "ArrowLeft", altKey: true }),
-        "MacIntel",
-      ),
-    );
-  });
-});
-
 describe("plus key parsing", () => {
   it("matches the plus key shortcut", () => {
-    const plusBindings = compile([{ shortcut: modShortcut("+"), command: "terminal.toggle" }]);
+    const plusBindings = compile([{ shortcut: modShortcut("+"), command: "sidebar.toggle" }]);
     assert.isTrue(
-      isTerminalToggleShortcut(event({ key: "+", metaKey: true }), plusBindings, {
+      isSidebarToggleShortcut(event({ key: "+", metaKey: true }), plusBindings, {
         platform: "MacIntel",
       }),
     );
     assert.isTrue(
-      isTerminalToggleShortcut(event({ key: "+", ctrlKey: true }), plusBindings, {
+      isSidebarToggleShortcut(event({ key: "+", ctrlKey: true }), plusBindings, {
         platform: "Linux",
       }),
     );
diff --git a/apps/web/src/keybindings.ts b/apps/web/src/keybindings.ts
index f89735bb3..07dcf5fb3 100644
--- a/apps/web/src/keybindings.ts
+++ b/apps/web/src/keybindings.ts
@@ -20,8 +20,6 @@ export interface ShortcutEventLike {
 }
 
 export interface ShortcutMatchContext {
-  terminalFocus: boolean;
-  terminalOpen: boolean;
   [key: string]: boolean;
 }
 
@@ -65,166 +63,102 @@ function whenOr(left: KeybindingWhenNode, right: KeybindingWhenNode): Keybinding
   return { type: "or", left, right };
 }
 
-const whenNotTerminalFocus = whenNot(whenIdentifier("terminalFocus"));
-const whenThreadJumpAvailable = whenAnd(
-  whenNotTerminalFocus,
-  whenNot(whenIdentifier("terminalWorkspaceOpen")),
-);
-// New-surface creation chords (new chat/terminal/provider chat/split) bind to `mod`,
-// which is Cmd on macOS. xterm never forwards a Cmd-chord to the PTY, so a bare
-// `!terminalFocus` guard silently dropped these chords whenever the terminal had focus
-// — the chord did nothing instead of creating anything. `|| isMac` lets them fire from
-// the terminal on macOS while still yielding the chord to the shell on Linux/Windows,
-// where `mod` is Ctrl and keys like Ctrl+N are real shell input that must pass through.
-const whenCreationAllowed = whenOr(whenNotTerminalFocus, whenIdentifier("isMac"));
-
 export const DEFAULT_SHORTCUT_FALLBACKS: ResolvedKeybindingsConfig = [
   {
     command: "sidebar.addProject",
     shortcut: commandShortcut("o", { shiftKey: true }),
-    whenAst: whenNotTerminalFocus,
   },
   {
     command: "rightPanel.toggle",
     shortcut: commandShortcut("b", { altKey: true }),
-    whenAst: whenNotTerminalFocus,
   },
   {
     command: "sidebar.importThread",
     shortcut: commandShortcut("i"),
-    whenAst: whenNotTerminalFocus,
   },
   {
     command: "chat.new",
     shortcut: commandShortcut("n"),
-    whenAst: whenCreationAllowed,
   },
   {
     command: "chat.newLatestProject",
     shortcut: commandShortcut("n", { shiftKey: true }),
-    whenAst: whenCreationAllowed,
   },
   {
     command: "chat.newClaude",
     shortcut: commandShortcut("c", { altKey: true }),
-    whenAst: whenCreationAllowed,
   },
   {
     command: "chat.newChat",
     shortcut: commandShortcut("n", { altKey: true }),
-    whenAst: whenCreationAllowed,
-  },
-  {
-    command: "chat.newTerminal",
-    shortcut: commandShortcut("t", { shiftKey: true }),
-    whenAst: whenCreationAllowed,
   },
   {
     command: "chat.newCodex",
     shortcut: commandShortcut("x", { altKey: true }),
-    whenAst: whenCreationAllowed,
   },
   {
     command: "chat.newCursor",
     shortcut: commandShortcut("r", { altKey: true }),
-    whenAst: whenCreationAllowed,
   },
   {
     command: "chat.split",
     shortcut: commandShortcut("\\"),
-    whenAst: whenCreationAllowed,
   },
   {
     command: "modelPicker.toggle",
     shortcut: commandShortcut("m", { shiftKey: true }),
-    whenAst: whenNotTerminalFocus,
   },
   {
     command: "traitsPicker.toggle",
     shortcut: commandShortcut("e", { shiftKey: true }),
-    whenAst: whenNotTerminalFocus,
   },
   // Cmd-only instead of mod so Ctrl+L remains available to shells on non-macOS.
   {
     command: "composer.focus.toggle",
     shortcut: commandShortcut("l", { metaKey: true, modKey: false }),
-    whenAst: whenNotTerminalFocus,
   },
   {
     command: "settings.usage",
     shortcut: commandShortcut("u", { shiftKey: true }),
-    whenAst: whenNotTerminalFocus,
   },
   {
     command: "thread.jump.1",
     shortcut: commandShortcut("1"),
-    whenAst: whenThreadJumpAvailable,
   },
   {
     command: "thread.jump.2",
     shortcut: commandShortcut("2"),
-    whenAst: whenThreadJumpAvailable,
   },
   {
     command: "thread.jump.3",
     shortcut: commandShortcut("3"),
-    whenAst: whenThreadJumpAvailable,
   },
   {
     command: "thread.jump.4",
     shortcut: commandShortcut("4"),
-    whenAst: whenThreadJumpAvailable,
   },
   {
     command: "thread.jump.5",
     shortcut: commandShortcut("5"),
-    whenAst: whenThreadJumpAvailable,
   },
   {
     command: "thread.jump.6",
     shortcut: commandShortcut("6"),
-    whenAst: whenThreadJumpAvailable,
   },
   {
     command: "thread.jump.7",
     shortcut: commandShortcut("7"),
-    whenAst: whenThreadJumpAvailable,
   },
   {
     command: "thread.jump.8",
     shortcut: commandShortcut("8"),
-    whenAst: whenThreadJumpAvailable,
   },
   {
     command: "thread.jump.9",
     shortcut: commandShortcut("9"),
-    whenAst: whenThreadJumpAvailable,
-  },
-  {
-    command: "terminal.workspace.newFullWidth",
-    shortcut: commandShortcut("j", { shiftKey: true }),
-  },
-  {
-    command: "terminal.workspace.closeActive",
-    shortcut: commandShortcut("w"),
-    whenAst: whenIdentifier("terminalWorkspaceOpen"),
-  },
-  {
-    command: "terminal.workspace.terminal",
-    shortcut: commandShortcut("1"),
-    whenAst: whenIdentifier("terminalWorkspaceOpen"),
-  },
-  {
-    command: "terminal.workspace.chat",
-    shortcut: commandShortcut("2"),
-    whenAst: whenIdentifier("terminalWorkspaceOpen"),
   },
 ];
 
-const TERMINAL_WORD_BACKWARD = "\u001bb";
-const TERMINAL_WORD_FORWARD = "\u001bf";
-const TERMINAL_LINE_START = "\u0001";
-const TERMINAL_LINE_END = "\u0005";
 const EVENT_CODE_KEY_ALIASES: Readonly<Record<string, readonly string[]>> = {
   BracketLeft: ["["],
   BracketRight: ["]"],
@@ -316,11 +250,9 @@ function resolvePlatform(options: ShortcutMatchOptions | undefined): string {
 
 function resolveContext(options: ShortcutMatchOptions | undefined): ShortcutMatchContext {
   // `isMac` is derived from the resolved platform so `when` clauses can gate on it
-  // (e.g. `whenCreationAllowed`) without every dispatch site having to thread the flag
+  // (e.g. platform-gated chords) without every dispatch site having to thread the flag
   // through `context`. An explicit `context.isMac` still wins via the spread below.
   return {
-    terminalFocus: false,
-    terminalOpen: false,
     isMac: isMacPlatform(resolvePlatform(options)),
     ...options?.context,
   };
@@ -570,38 +502,6 @@ export function shouldShowThreadJumpHints(
   return false;
 }
 
-export function isTerminalToggleShortcut(
-  event: ShortcutEventLike,
-  keybindings: ResolvedKeybindingsConfig,
-  options?: ShortcutMatchOptions,
-): boolean {
-  return matchesCommandShortcut(event, keybindings, "terminal.toggle", options);
-}
-
-export function isTerminalSplitShortcut(
-  event: ShortcutEventLike,
-  keybindings: ResolvedKeybindingsConfig,
-  options?: ShortcutMatchOptions,
-): boolean {
-  return matchesCommandShortcut(event, keybindings, "terminal.split", options);
-}
-
-export function isTerminalNewShortcut(
-  event: ShortcutEventLike,
-  keybindings: ResolvedKeybindingsConfig,
-  options?: ShortcutMatchOptions,
-): boolean {
-  return matchesCommandShortcut(event, keybindings, "terminal.new", options);
-}
-
-export function isTerminalCloseShortcut(
-  event: ShortcutEventLike,
-  keybindings: ResolvedKeybindingsConfig,
-  options?: ShortcutMatchOptions,
-): boolean {
-  return matchesCommandShortcut(event, keybindings, "terminal.close", options);
-}
-
 export function isSidebarToggleShortcut(
   event: ShortcutEventLike,
   keybindings: ResolvedKeybindingsConfig,
@@ -686,55 +586,3 @@ export function isOpenFavoriteEditorShortcut(
 ): boolean {
   return matchesCommandShortcut(event, keybindings, "editor.openFavorite", options);
 }
-
-export function isTerminalClearShortcut(
-  event: ShortcutEventLike,
-  platform = navigator.platform,
-): boolean {
-  if (event.type !== undefined && event.type !== "keydown") {
-    return false;
-  }
-
-  const key = event.key.toLowerCase();
-
-  return key === "l" && event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey;
-}
-
-export function terminalNavigationShortcutData(
-  event: ShortcutEventLike,
-  platform = navigator.platform,
-): string | null {
-  if (event.type !== undefined && event.type !== "keydown") {
-    return null;
-  }
-
-  if (event.shiftKey) return null;
-
-  const key = normalizeEventKey(event.key);
-  if (key !== "arrowleft" && key !== "arrowright") {
-    return null;
-  }
-
-  const moveWord = key === "arrowleft" ? TERMINAL_WORD_BACKWARD : TERMINAL_WORD_FORWARD;
-  const moveLine = key === "arrowleft" ? TERMINAL_LINE_START : TERMINAL_LINE_END;
-
-  if (isMacPlatform(platform)) {
-    if (event.altKey && !event.metaKey && !event.ctrlKey) {
-      return moveWord;
-    }
-    if (event.metaKey && !event.altKey && !event.ctrlKey) {
-      return moveLine;
-    }
-    return null;
-  }
-
-  if (event.ctrlKey && !event.metaKey && !event.altKey) {
-    return moveWord;
-  }
-
-  if (event.altKey && !event.metaKey && !event.ctrlKey) {
-    return moveWord;
-  }
-
-  return null;
-}
diff --git a/apps/web/src/lib/appBackgrounds.ts b/apps/web/src/lib/appBackgrounds.ts
deleted file mode 100644
index 42e019b68..000000000
--- a/apps/web/src/lib/appBackgrounds.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-// FILE: appBackgrounds.ts
-// Purpose: Resolve the optional decorative canvas image behind the main chat view.
-// Layer: Web shell chrome
-// Exports: APP_BACKGROUND_LABELS, appBackgroundImageCss
-// Why: The images are imported as URL modules, so Vite emits each as its own
-//      hashed asset and the browser only fetches one once it is actually applied
-//      as a background-image. Selecting "none" downloads nothing.
-
-import londonUrl from "~/assets/backgrounds/london.webp";
-import rioUrl from "~/assets/backgrounds/rio.webp";
-import sfUrl from "~/assets/backgrounds/sf.webp";
-import tokyoUrl from "~/assets/backgrounds/tokyo.webp";
-
-import type { AppBackground } from "~/appSettings";
-
-const APP_BACKGROUND_URLS: Record<Exclude<AppBackground, "none">, string> = {
-  london: londonUrl,
-  rio: rioUrl,
-  sf: sfUrl,
-  tokyo: tokyoUrl,
-};
-
-export const APP_BACKGROUND_LABELS: Record<AppBackground, string> = {
-  none: "None",
-  london: "London",
-  rio: "Rio",
-  sf: "San Francisco",
-  tokyo: "Tokyo",
-};
-
-/**
- * The `background-image` value for the canvas, or `null` for the flat surface.
- *
- * A scrim of the theme background is layered over the photo so foreground text
- * keeps its contrast in both light and dark mode — the image is chrome, and
- * chrome must never win against content (Design.md §1).
- */
-export function appBackgroundImageCss(background: AppBackground): string | null {
-  if (background === "none") return null;
-  const url = APP_BACKGROUND_URLS[background];
-  const scrim = "color-mix(in srgb, var(--background) 86%, transparent)";
-  return `linear-gradient(${scrim}, ${scrim}), url("${url}")`;
-}
diff --git a/apps/web/src/lib/appDensity.test.ts b/apps/web/src/lib/appDensity.test.ts
deleted file mode 100644
index fcf98d4bb..000000000
--- a/apps/web/src/lib/appDensity.test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  DEFAULT_UI_DENSITY,
-  getDensityCssVariables,
-  getDensityScale,
-  normalizeUiDensity,
-} from "./appDensity";
-
-describe("appDensity", () => {
-  it("normalizes unknown values to the default density", () => {
-    expect(normalizeUiDensity("spacious")).toBe("spacious");
-    expect(normalizeUiDensity("invalid")).toBe(DEFAULT_UI_DENSITY);
-    expect(normalizeUiDensity(undefined)).toBe(DEFAULT_UI_DENSITY);
-  });
-
-  it("maps density modes to scale factors", () => {
-    expect(getDensityScale("compact")).toBe(0.85);
-    expect(getDensityScale("comfortable")).toBe(1);
-    expect(getDensityScale("spacious")).toBe(1.15);
-  });
-
-  it("derives scaled spacing variables from the active density", () => {
-    const compact = getDensityCssVariables("compact");
-    const comfortable = getDensityCssVariables("comfortable");
-
-    expect(compact["--density-scale"]).toBe("0.85");
-    expect(comfortable["--density-scale"]).toBe("1");
-    expect(compact["--app-density-row-height"]).toBe("1.59375rem");
-    expect(comfortable["--app-density-row-height"]).toBe("1.875rem");
-    expect(compact["--app-density-composer-editor-min-height"]).toBe("calc(2lh * 0.85)");
-    expect(comfortable["--app-density-composer-footer-padding-end"]).toBe("0.5rem");
-  });
-});
diff --git a/apps/web/src/lib/appDensity.ts b/apps/web/src/lib/appDensity.ts
deleted file mode 100644
index ed4a1e25e..000000000
--- a/apps/web/src/lib/appDensity.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-export const UI_DENSITY_MODES = ["compact", "comfortable", "spacious"] as const;
-export type UiDensity = (typeof UI_DENSITY_MODES)[number];
-
-export const DEFAULT_UI_DENSITY: UiDensity = "comfortable";
-
-const DENSITY_SCALE_BY_MODE: Record<UiDensity, number> = {
-  compact: 0.85,
-  comfortable: 1,
-  spacious: 1.15,
-};
-
-const BASE_ROW_HEIGHT_REM = 1.875;
-const BASE_ROW_PADDING_Y_REM = 0.125;
-const BASE_ROW_GAP_REM = 0.5;
-const BASE_SETTINGS_ROW_PADDING_Y_REM = 0.625;
-const BASE_CHAT_GUTTER_X_REM = 0.75;
-const BASE_CHAT_GUTTER_X_LG_REM = 1.25;
-const BASE_COMPOSER_EDITOR_PADDING_TOP_REM = 0.75;
-const BASE_COMPOSER_EDITOR_PADDING_BOTTOM_REM = 0.5;
-const BASE_COMPOSER_EDITOR_PADDING_X_REM = 0.75;
-const BASE_COMPOSER_EDITOR_PADDING_X_END_REM = 0.875;
-const BASE_COMPOSER_FOOTER_PADDING_REM = 0.375;
-const BASE_COMPOSER_FOOTER_PADDING_END_REM = 0.5;
-
-function scaleRem(baseRem: number, scale: number): string {
-  return `${baseRem * scale}rem`;
-}
-
-export function isUiDensity(value: unknown): value is UiDensity {
-  return typeof value === "string" && (UI_DENSITY_MODES as readonly string[]).includes(value);
-}
-
-export function normalizeUiDensity(value: unknown, fallback = DEFAULT_UI_DENSITY): UiDensity {
-  return isUiDensity(value) ? value : fallback;
-}
-
-export function getDensityScale(mode: UiDensity = DEFAULT_UI_DENSITY): number {
-  return DENSITY_SCALE_BY_MODE[mode];
-}
-
-export function getDensityCssVariables(mode: UiDensity = DEFAULT_UI_DENSITY) {
-  const scale = getDensityScale(mode);
-
-  return {
-    "--density-scale": String(scale),
-    "--app-density-row-height": scaleRem(BASE_ROW_HEIGHT_REM, scale),
-    "--app-density-row-padding-y": scaleRem(BASE_ROW_PADDING_Y_REM, scale),
-    "--app-density-row-gap": scaleRem(BASE_ROW_GAP_REM, scale),
-    "--app-density-settings-row-padding-y": scaleRem(BASE_SETTINGS_ROW_PADDING_Y_REM, scale),
-    "--app-density-chat-gutter-x": scaleRem(BASE_CHAT_GUTTER_X_REM, scale),
-    "--app-density-chat-gutter-x-lg": scaleRem(BASE_CHAT_GUTTER_X_LG_REM, scale),
-    "--app-density-composer-editor-min-height": `calc(2lh * ${scale})`,
-    "--app-density-composer-editor-padding-top": scaleRem(
-      BASE_COMPOSER_EDITOR_PADDING_TOP_REM,
-      scale,
-    ),
-    "--app-density-composer-editor-padding-bottom": scaleRem(
-      BASE_COMPOSER_EDITOR_PADDING_BOTTOM_REM,
-      scale,
-    ),
-    "--app-density-composer-editor-padding-x": scaleRem(BASE_COMPOSER_EDITOR_PADDING_X_REM, scale),
-    "--app-density-composer-editor-padding-x-end": scaleRem(
-      BASE_COMPOSER_EDITOR_PADDING_X_END_REM,
-      scale,
-    ),
-    "--app-density-composer-footer-padding": scaleRem(BASE_COMPOSER_FOOTER_PADDING_REM, scale),
-    "--app-density-composer-footer-padding-end": scaleRem(
-      BASE_COMPOSER_FOOTER_PADDING_END_REM,
-      scale,
-    ),
-  } as const;
-}
-
-export type DensityCssVariable = keyof ReturnType<typeof getDensityCssVariables>;
diff --git a/apps/web/src/lib/composerMessageContext.test.ts b/apps/web/src/lib/composerMessageContext.test.ts
index c4c920fd7..efdbe4bd2 100644
--- a/apps/web/src/lib/composerMessageContext.test.ts
+++ b/apps/web/src/lib/composerMessageContext.test.ts
@@ -19,18 +19,6 @@ describe("composerMessageContext", () => {
           text: "Selected answer",
         },
       ],
-      terminalContexts: [
-        {
-          id: "terminal",
-          threadId: ThreadId.makeUnsafe("thread-context-order"),
-          terminalId: "default",
-          terminalLabel: "Terminal",
-          lineStart: 1,
-          lineEnd: 1,
-          text: "bun lint",
-          createdAt: "2026-07-17T00:00:00.000Z",
-        },
-      ],
       fileComments: [
         {
           id: "comment",
@@ -50,13 +38,12 @@ describe("composerMessageContext", () => {
         },
       ],
     });
-    const blockNames = ["assistant_selection", "terminal_context", "file_comments", "pasted_text"];
+    const blockNames = ["assistant_selection", "file_comments", "pasted_text"];
     const blockPositions = blockNames.map((name) => serialized.indexOf(`<${name}`));
     expect(blockPositions).toEqual(blockPositions.toSorted((left, right) => left - right));
     expect(deriveDisplayedUserMessageState(serialized)).toMatchObject({
       visibleText: "Build this",
       copyText: "Build this",
-      contextCount: 1,
       assistantSelections: [{ text: "Selected answer" }],
       fileComments: [{ text: "Keep this typed." }],
       pastedTexts: [{ text: "large pasted text" }],
@@ -67,7 +54,6 @@ describe("composerMessageContext", () => {
     const originalPrompt = appendComposerMessageContext({
       prompt: "Before",
       assistantSelections: [],
-      terminalContexts: [],
       fileComments: [],
       pastedTexts: [
         {
diff --git a/apps/web/src/lib/composerMessageContext.ts b/apps/web/src/lib/composerMessageContext.ts
index 5a875b8cf..25af1fd56 100644
--- a/apps/web/src/lib/composerMessageContext.ts
+++ b/apps/web/src/lib/composerMessageContext.ts
@@ -21,27 +21,19 @@ import {
   type ParsedFileCommentEntry,
 } from "./fileComments";
 import {
-  appendTerminalContextsToPrompt,
-  extractTrailingTerminalContexts,
   IMAGE_ONLY_BOOTSTRAP_PROMPT,
   IMAGE_ONLY_VISIBLE_PLACEHOLDER,
-  type ParsedTerminalContextEntry,
-  type TerminalContextDraft,
-} from "./terminalContext";
+} from "./composerPlaceholders";
 
 const TRAILING_SERIALIZED_COMPOSER_BLOCK_PATTERNS = [
   /\n*(<pasted_text>\n[\s\S]*?\n<\/pasted_text>)\s*$/u,
   /\n*(<file_comments>\n[\s\S]*?\n<\/file_comments>)\s*$/u,
-  /\n*(<terminal_context>\n[\s\S]*?\n<\/terminal_context>)\s*$/u,
   /\n*(<assistant_selection>\n[\s\S]*?\n<\/assistant_selection>)\s*$/u,
 ] as const;
 
 export interface DisplayedUserMessageState {
   visibleText: string;
   copyText: string;
-  contextCount: number;
-  previewTitle: string | null;
-  contexts: ParsedTerminalContextEntry[];
   assistantSelections: ParsedAssistantSelectionEntry[];
   fileComments: ParsedFileCommentEntry[];
   pastedTexts: ParsedPastedTextEntry[];
@@ -50,16 +42,12 @@ export interface DisplayedUserMessageState {
 export function appendComposerMessageContext(input: {
   prompt: string;
   assistantSelections: ReadonlyArray<ComposerAssistantSelectionAttachment>;
-  terminalContexts: ReadonlyArray<TerminalContextDraft>;
   fileComments: ReadonlyArray<FileCommentDraft>;
   pastedTexts: ReadonlyArray<PastedTextDraft>;
 }): string {
   return appendPastedTextsToPrompt(
     appendFileCommentsToPrompt(
-      appendTerminalContextsToPrompt(
-        appendAssistantSelectionsToPrompt(input.prompt, input.assistantSelections),
-        input.terminalContexts,
-      ),
+      appendAssistantSelectionsToPrompt(input.prompt, input.assistantSelections),
       input.fileComments,
     ),
     input.pastedTexts,
@@ -97,9 +85,8 @@ export function deriveDisplayedUserMessageState(
 ): DisplayedUserMessageState {
   const extractedPastedTexts = extractTrailingPastedTexts(prompt);
   const extractedFileComments = extractTrailingFileComments(extractedPastedTexts.promptText);
-  const extractedContexts = extractTrailingTerminalContexts(extractedFileComments.promptText);
   const extractedAssistantSelections = extractTrailingAssistantSelections(
-    extractedContexts.promptText,
+    extractedFileComments.promptText,
   );
   const hidePrompt =
     options?.hideImageOnlyBootstrapPrompt === true &&
@@ -109,9 +96,6 @@ export function deriveDisplayedUserMessageState(
       ? IMAGE_ONLY_VISIBLE_PLACEHOLDER
       : extractedAssistantSelections.promptText,
     copyText: hidePrompt ? "" : extractedAssistantSelections.promptText,
-    contextCount: extractedContexts.contextCount,
-    previewTitle: extractedContexts.previewTitle,
-    contexts: extractedContexts.contexts,
     assistantSelections: extractedAssistantSelections.selections,
     fileComments: extractedFileComments.comments,
     pastedTexts: extractedPastedTexts.pastedTexts,
diff --git a/apps/web/src/lib/composerPlaceholders.ts b/apps/web/src/lib/composerPlaceholders.ts
new file mode 100644
index 000000000..222cb56dc
--- /dev/null
+++ b/apps/web/src/lib/composerPlaceholders.ts
@@ -0,0 +1,9 @@
+// FILE: composerPlaceholders.ts
+// Purpose: Placeholder sentinels the composer uses for image-only turns.
+// Layer: Web lib
+// Exports: IMAGE_ONLY_BOOTSTRAP_PROMPT, IMAGE_ONLY_VISIBLE_PLACEHOLDER.
+
+export const IMAGE_ONLY_BOOTSTRAP_PROMPT =
+  "[User attached one or more images without additional text. Respond using the conversation context and the attached image(s).]";
+
+export const IMAGE_ONLY_VISIBLE_PLACEHOLDER = "(No Content)";
diff --git a/apps/web/src/lib/diffRendering.ts b/apps/web/src/lib/diffRendering.ts
index b38edc6ea..08b640353 100644
--- a/apps/web/src/lib/diffRendering.ts
+++ b/apps/web/src/lib/diffRendering.ts
@@ -8,30 +8,23 @@ import type { FileDiffMetadata } from "@pierre/diffs/react";
 
 export type FileDiffStat = { additions: number; deletions: number };
 
-export const DIFF_THEME_NAMES = {
-  // Keep diff syntax highlighting on the bundled GitHub themes for better parity with git tooling.
-  light: "github-light",
-  dark: "github-dark",
-} as const;
+// Keep diff syntax highlighting on the bundled GitHub theme for better parity
+// with git tooling.
+export const DIFF_THEME_NAME = "github-dark" as const;
 
-export type DiffThemeName = (typeof DIFF_THEME_NAMES)[keyof typeof DIFF_THEME_NAMES];
+export type DiffThemeName = typeof DIFF_THEME_NAME;
 
-export function resolveDiffThemeName(theme: "light" | "dark"): DiffThemeName {
-  return theme === "dark" ? DIFF_THEME_NAMES.dark : DIFF_THEME_NAMES.light;
-}
-
-// The `unsafeCSS` payload is identical per theme and only ever has two values,
-// so cache it instead of rebuilding the (large) template string per file/render.
-const diffPanelUnsafeCssCache = new Map<"light" | "dark", string>();
+// The `unsafeCSS` payload never varies, so build the (large) template string
+// once instead of per file/render.
+let diffPanelUnsafeCss: string | null = null;
 
 // Themed CSS injected into the @pierre/diffs shadow markup so the diff viewer
 // adopts the app's chat code font and themed addition/deletion backgrounds.
 // Shared by every diff surface (turn diffs, repo diffs, the git pane) so they
 // render consistently — previously the git pane omitted this entirely.
-export function buildDiffPanelUnsafeCSS(theme: "light" | "dark"): string {
-  const cached = diffPanelUnsafeCssCache.get(theme);
-  if (cached) {
-    return cached;
+export function buildDiffPanelUnsafeCSS(): string {
+  if (diffPanelUnsafeCss !== null) {
+    return diffPanelUnsafeCss;
   }
   const css = `
 :host {
@@ -152,7 +145,7 @@ export function buildDiffPanelUnsafeCSS(theme: "light" | "dark"): string {
   font-variant-numeric: tabular-nums !important;
 }
 `;
-  diffPanelUnsafeCssCache.set(theme, css);
+  diffPanelUnsafeCss = css;
   return css;
 }
 
diff --git a/apps/web/src/lib/dockPaneActivation.ts b/apps/web/src/lib/dockPaneActivation.ts
deleted file mode 100644
index f30937761..000000000
--- a/apps/web/src/lib/dockPaneActivation.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-// FILE: dockPaneActivation.ts
-// Purpose: Decide when a persisted right-dock pane should hydrate its expensive runtime.
-// Layer: Web UI lifecycle helper
-// Depends on: rightDockStore pane kind taxonomy
-
-import type { ThreadId } from "@t3tools/contracts";
-
-import type { RightDockPaneKind } from "~/rightDockStore.logic";
-
-export type DockPaneActivationReason = "explicit" | "restore";
-export type DockPaneRuntimeMode = "live" | "preview";
-
-export const DOCK_PANE_DEFERRED_HYDRATION_FRAMES = 2;
-
-const DEFERRED_RUNTIME_PANE_KINDS: ReadonlySet<RightDockPaneKind> = new Set<RightDockPaneKind>([
-  "terminal",
-]);
-
-// Pane kinds whose React subtree must stay mounted while inactive instead of
-// being torn down when another tab is selected. Unmounting a terminal detaches
-// its xterm DOM (terminalRuntime.detach -> wrapper.remove) and re-running attach
-// triggers a double FitAddon pass, which the user sees as a slow open plus a
-// multi-line reflow flicker. Keeping it mounted and toggling visibility makes
-// tab switches instant and flicker-free while preserving scrollback/runtime.
-// The explorer pane keeps its browse state (selected file, expanded directories,
-// search query, sidebar visibility) in local component state, so keep it mounted
-// while another tab is active — otherwise switching tabs would tear the subtree
-// down and reset the explorer to its workspace root on return.
-const KEEP_MOUNTED_PANE_KINDS: ReadonlySet<RightDockPaneKind> = new Set<RightDockPaneKind>([
-  "terminal",
-  "explorer",
-]);
-
-export function dockPaneActivationKey(input: {
-  threadId: ThreadId;
-  paneId: string;
-  kind: RightDockPaneKind;
-}): string {
-  return `${input.threadId}\u0000${input.paneId}\u0000${input.kind}`;
-}
-
-export function isDeferredRuntimePaneKind(kind: RightDockPaneKind): boolean {
-  return DEFERRED_RUNTIME_PANE_KINDS.has(kind);
-}
-
-export function isKeepMountedPaneKind(kind: RightDockPaneKind): boolean {
-  return KEEP_MOUNTED_PANE_KINDS.has(kind);
-}
-
-export const EMPTY_PANE_ID_SET: ReadonlySet<string> = new Set<string>();
-
-// Compute the next set of pane ids that must stay mounted in the dock: every
-// previously kept-mounted pane that still exists, plus the active pane when it is
-// a keep-mounted kind. Pure (no React) so the keep-mount policy is unit-testable
-// and the caller can persist the result across renders via a ref.
-export function reconcileKeepMountedPaneIds(input: {
-  previous: ReadonlySet<string>;
-  panes: readonly { id: string; kind: RightDockPaneKind }[];
-  activePaneId: string | null;
-  activePaneKind: RightDockPaneKind | null;
-}): ReadonlySet<string> {
-  const livePaneIds = new Set(input.panes.map((pane) => pane.id));
-  const next = new Set<string>();
-  for (const paneId of input.previous) {
-    if (livePaneIds.has(paneId)) {
-      next.add(paneId);
-    }
-  }
-  if (
-    input.activePaneId !== null &&
-    input.activePaneKind !== null &&
-    isKeepMountedPaneKind(input.activePaneKind) &&
-    livePaneIds.has(input.activePaneId)
-  ) {
-    next.add(input.activePaneId);
-  }
-  return next;
-}
-
-export function resolveDockPaneRuntimeMode(input: {
-  kind: RightDockPaneKind;
-  reason: DockPaneActivationReason;
-  hydrated: boolean;
-}): DockPaneRuntimeMode {
-  if (!isDeferredRuntimePaneKind(input.kind)) {
-    return "live";
-  }
-  if (input.reason === "explicit" || input.hydrated) {
-    return "live";
-  }
-  return "preview";
-}
diff --git a/apps/web/src/lib/dockTerminalScope.ts b/apps/web/src/lib/dockTerminalScope.ts
deleted file mode 100644
index 604d60df3..000000000
--- a/apps/web/src/lib/dockTerminalScope.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// FILE: dockTerminalScope.ts
-// Purpose: Derive a stable, isolated terminal scope id for right-dock terminals.
-// Layer: Terminal scope helpers
-// Exports: dock terminal scope prefix + id factory shared by the dock pane and cleanup.
-
-import type { ThreadId } from "@t3tools/contracts";
-
-// Right-dock terminals run as an independent session set from the bottom drawer.
-// They reuse the per-thread terminal store/runtime keyed by this synthetic scope so
-// xterm instances never collide with the host thread's drawer terminals.
-export const DOCK_TERMINAL_SCOPE_PREFIX = "dock-terminal:";
-
-export function dockTerminalThreadId(hostThreadId: ThreadId): ThreadId {
-  return `${DOCK_TERMINAL_SCOPE_PREFIX}${hostThreadId}` as ThreadId;
-}
diff --git a/apps/web/src/lib/fileDiffTree.test.ts b/apps/web/src/lib/fileDiffTree.test.ts
deleted file mode 100644
index a8a7f774f..000000000
--- a/apps/web/src/lib/fileDiffTree.test.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-// FILE: fileDiffTree.test.ts
-// Purpose: Guards flat-to-tree conversion, single-chain compression, ordering,
-//          and the search → tree pipeline used by the review file tree panel.
-// Layer: Web diff utilities tests
-
-import type { FileDiffMetadata } from "@pierre/diffs/react";
-import { describe, expect, it } from "vitest";
-
-import { filterRenderableFilesForSearch } from "~/components/DiffPanel.logic";
-import {
-  buildFileDiffTree,
-  collectFileDiffTreeDirectoryPaths,
-  type FileDiffTreeDirectoryNode,
-  type FileDiffTreeNode,
-} from "./fileDiffTree";
-
-function createFileDiff(path: string): FileDiffMetadata {
-  return {
-    cacheKey: path,
-    name: path,
-    prevName: path,
-    hunks: [{ additionLines: 1, deletionLines: 0 }],
-  } as FileDiffMetadata;
-}
-
-function asDirectory(node: FileDiffTreeNode | undefined): FileDiffTreeDirectoryNode {
-  if (!node || node.kind !== "directory") {
-    throw new Error(`Expected a directory node, received ${node?.kind ?? "undefined"}`);
-  }
-  return node;
-}
-
-function names(nodes: ReadonlyArray<FileDiffTreeNode>): string[] {
-  return nodes.map((node) => node.name);
-}
-
-describe("buildFileDiffTree", () => {
-  it("returns an empty tree for no files", () => {
-    expect(buildFileDiffTree([])).toEqual([]);
-  });
-
-  it("groups files into nested directories with directories before files", () => {
-    const tree = buildFileDiffTree([
-      createFileDiff("apps/server/src/a.ts"),
-      createFileDiff("apps/server/src/b.ts"),
-      createFileDiff("apps/web/src/c.tsx"),
-      createFileDiff("README.md"),
-    ]);
-
-    // Top level: directory "apps" sorts before the root-level file.
-    expect(names(tree)).toEqual(["apps", "README.md"]);
-
-    const apps = asDirectory(tree[0]);
-    // "server" and "web" each have a single child "src", so they compress.
-    expect(names(apps.children)).toEqual(["server/src", "web/src"]);
-
-    const serverSrc = asDirectory(apps.children[0]);
-    expect(serverSrc.name).toBe("server/src");
-    expect(serverSrc.path).toBe("apps/server/src");
-    expect(names(serverSrc.children)).toEqual(["a.ts", "b.ts"]);
-  });
-
-  it("compresses a fully unbranched chain into a single directory row", () => {
-    const tree = buildFileDiffTree([createFileDiff("components/ui/widgets/button.tsx")]);
-    expect(tree).toHaveLength(1);
-
-    const compressed = asDirectory(tree[0]);
-    expect(compressed.name).toBe("components/ui/widgets");
-    expect(compressed.path).toBe("components/ui/widgets");
-    expect(names(compressed.children)).toEqual(["button.tsx"]);
-  });
-
-  it("stops compression at branch points", () => {
-    const tree = buildFileDiffTree([
-      createFileDiff("src/feature/one.ts"),
-      createFileDiff("src/feature/nested/two.ts"),
-    ]);
-
-    // "src/feature" compresses (single child until the branch), then forks.
-    const root = asDirectory(tree[0]);
-    expect(root.name).toBe("src/feature");
-    expect(names(root.children)).toEqual(["nested", "one.ts"]);
-  });
-
-  it("keeps a same-named file and directory as distinct sibling nodes", () => {
-    // A diff that deletes file `foo` while adding `foo/bar.ts` yields a directory
-    // and a file that share the path "foo"; both must survive as siblings so the
-    // replacement renders faithfully (the panel disambiguates their React keys
-    // by node kind).
-    const tree = buildFileDiffTree([createFileDiff("foo"), createFileDiff("foo/bar.ts")]);
-    expect(tree).toHaveLength(2);
-
-    const directory = tree.find((node) => node.kind === "directory");
-    const file = tree.find((node) => node.kind === "file");
-    expect(directory?.path).toBe("foo");
-    expect(file?.path).toBe("foo");
-    expect(names(asDirectory(directory).children)).toEqual(["bar.ts"]);
-  });
-
-  it("sorts entries with natural, case-insensitive ordering", () => {
-    const tree = buildFileDiffTree([
-      createFileDiff("file10.ts"),
-      createFileDiff("file2.ts"),
-      createFileDiff("File1.ts"),
-    ]);
-    expect(names(tree)).toEqual(["File1.ts", "file2.ts", "file10.ts"]);
-  });
-
-  it("collects every directory path", () => {
-    const tree = buildFileDiffTree([
-      createFileDiff("apps/server/a.ts"),
-      createFileDiff("apps/web/b.ts"),
-    ]);
-    expect(collectFileDiffTreeDirectoryPaths(tree).toSorted()).toEqual([
-      "apps",
-      "apps/server",
-      "apps/web",
-    ]);
-  });
-});
-
-describe("search → tree pipeline", () => {
-  const files = [
-    createFileDiff("apps/server/src/codex.ts"),
-    createFileDiff("apps/web/src/ChatView.tsx"),
-    createFileDiff("packages/shared/src/model.ts"),
-  ];
-
-  it("filters files by path substring before building the tree", () => {
-    const tree = buildFileDiffTree(filterRenderableFilesForSearch(files, "web"));
-    expect(names(tree)).toEqual(["apps/web/src"]);
-
-    const matched = asDirectory(tree[0]);
-    expect(names(matched.children)).toEqual(["ChatView.tsx"]);
-  });
-
-  it("returns an empty tree when nothing matches", () => {
-    expect(buildFileDiffTree(filterRenderableFilesForSearch(files, "no-such-file"))).toEqual([]);
-  });
-});
diff --git a/apps/web/src/lib/fileDiffTree.ts b/apps/web/src/lib/fileDiffTree.ts
deleted file mode 100644
index e976697b3..000000000
--- a/apps/web/src/lib/fileDiffTree.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-// FILE: fileDiffTree.ts
-// Purpose: Build a nested, path-compressed folder/file tree from a flat list of
-//          parsed file diffs so review surfaces can render a compact explorer
-//          without each one re-implementing flat-to-tree conversion. The editor
-//          explorer lazy-fetches one directory level at a time from the backend,
-//          so it never needed this; in-memory diff lists do.
-// Layer: Web diff utilities
-// Depends on: diffRendering path helpers.
-
-import type { FileDiffMetadata } from "@pierre/diffs/react";
-
-import { resolveFileDiffPath } from "./diffRendering";
-
-export interface FileDiffTreeFileNode {
-  kind: "file";
-  /** Leaf name (the final path segment). */
-  name: string;
-  /** Full repo-relative path, used as the selection id and React key. */
-  path: string;
-  fileDiff: FileDiffMetadata;
-}
-
-export interface FileDiffTreeDirectoryNode {
-  kind: "directory";
-  /** Display name; compressed chains render as `parent/child`. */
-  name: string;
-  /** Full repo-relative directory path (no trailing slash), used as the key. */
-  path: string;
-  children: FileDiffTreeNode[];
-}
-
-export type FileDiffTreeNode = FileDiffTreeDirectoryNode | FileDiffTreeFileNode;
-
-interface MutableDirectory {
-  name: string;
-  path: string;
-  directories: Map<string, MutableDirectory>;
-  files: FileDiffTreeFileNode[];
-}
-
-function createDirectory(name: string, path: string): MutableDirectory {
-  return { name, path, directories: new Map(), files: [] };
-}
-
-// Natural-order, case-insensitive comparison so the tree stays human-friendly
-// and stable (mirrors compareFileDiffByPath in diffRendering).
-function compareNodeName(left: string, right: string): number {
-  return left.localeCompare(right, undefined, { numeric: true, sensitivity: "base" });
-}
-
-// Collapse single-child directory chains (e.g. `server` → `src` becomes
-// `server/src`) so deep, unbranched paths stay compact — the same affordance
-// VS Code and GitHub use. Children are already finalized, so a single merge per
-// level is sufficient; the loop is defensive.
-function compressDirectory(node: FileDiffTreeDirectoryNode): FileDiffTreeDirectoryNode {
-  let current = node;
-  while (current.children.length === 1) {
-    const onlyChild = current.children[0];
-    if (!onlyChild || onlyChild.kind !== "directory") {
-      break;
-    }
-    current = {
-      kind: "directory",
-      name: `${current.name}/${onlyChild.name}`,
-      path: onlyChild.path,
-      children: onlyChild.children,
-    };
-  }
-  return current;
-}
-
-function finalizeDirectory(directory: MutableDirectory): FileDiffTreeNode[] {
-  const directories: FileDiffTreeDirectoryNode[] = [];
-  for (const child of directory.directories.values()) {
-    directories.push(
-      compressDirectory({
-        kind: "directory",
-        name: child.name,
-        path: child.path,
-        children: finalizeDirectory(child),
-      }),
-    );
-  }
-  // Directories first, then files, matching the editor explorer ordering.
-  const sortedDirectories = directories.toSorted((left, right) =>
-    compareNodeName(left.name, right.name),
-  );
-  const sortedFiles = directory.files.toSorted((left, right) =>
-    compareNodeName(left.name, right.name),
-  );
-  return [...sortedDirectories, ...sortedFiles];
-}
-
-/**
- * Convert a flat list of parsed file diffs into a sorted, path-compressed tree
- * of directory and file nodes. Pure and side-effect free.
- */
-export function buildFileDiffTree(files: ReadonlyArray<FileDiffMetadata>): FileDiffTreeNode[] {
-  const root = createDirectory("", "");
-  for (const fileDiff of files) {
-    const path = resolveFileDiffPath(fileDiff);
-    const segments = path.split("/").filter((segment) => segment.length > 0);
-    if (segments.length === 0) {
-      continue;
-    }
-    const fileName = segments[segments.length - 1] as string;
-    let directory = root;
-    for (let index = 0; index < segments.length - 1; index += 1) {
-      const segment = segments[index] as string;
-      const childPath = directory.path ? `${directory.path}/${segment}` : segment;
-      let child = directory.directories.get(segment);
-      if (!child) {
-        child = createDirectory(segment, childPath);
-        directory.directories.set(segment, child);
-      }
-      directory = child;
-    }
-    directory.files.push({ kind: "file", name: fileName, path, fileDiff });
-  }
-  return finalizeDirectory(root);
-}
-
-/** Collect every directory path in the tree (useful for expand/collapse-all). */
-export function collectFileDiffTreeDirectoryPaths(
-  nodes: ReadonlyArray<FileDiffTreeNode>,
-): string[] {
-  const paths: string[] = [];
-  const walk = (current: ReadonlyArray<FileDiffTreeNode>) => {
-    for (const node of current) {
-      if (node.kind === "directory") {
-        paths.push(node.path);
-        walk(node.children);
-      }
-    }
-  };
-  walk(nodes);
-  return paths;
-}
diff --git a/apps/web/src/lib/pathLinks.ts b/apps/web/src/lib/pathLinks.ts
new file mode 100644
index 000000000..57d33c1d0
--- /dev/null
+++ b/apps/web/src/lib/pathLinks.ts
@@ -0,0 +1,92 @@
+// FILE: pathLinks.ts
+// Purpose: Resolve a raw `path[:line[:col]]` reference against a working directory,
+//          handling `~/`, relative paths, and Windows path styles.
+// Layer: Web lib
+// Exports: resolvePathLinkTarget.
+
+function isWindowsAbsolutePath(value: string): boolean {
+  return /^[A-Za-z]:[\\/]/.test(value) || value.startsWith("\\\\");
+}
+
+function isAbsolutePath(value: string): boolean {
+  return value.startsWith("/") || isWindowsAbsolutePath(value);
+}
+
+function isWindowsPathStyle(value: string): boolean {
+  return isWindowsAbsolutePath(value) || /[A-Za-z]:\\/.test(value);
+}
+
+function joinPath(base: string, next: string, separator: "/" | "\\"): string {
+  const cleanBase = base.replace(/[\\/]+$/, "");
+  if (separator === "\\") {
+    return `${cleanBase}\\${next.replaceAll("/", "\\")}`;
+  }
+  return `${cleanBase}/${next.replace(/^\/+/, "")}`;
+}
+
+function inferHomeFromCwd(cwd: string): string | undefined {
+  const posixUser = cwd.match(/^\/Users\/([^/]+)/);
+  if (posixUser?.[1]) {
+    return `/Users/${posixUser[1]}`;
+  }
+
+  const posixHome = cwd.match(/^\/home\/([^/]+)/);
+  if (posixHome?.[1]) {
+    return `/home/${posixHome[1]}`;
+  }
+
+  const windowsUser = cwd.match(/^([A-Za-z]:\\Users\\[^\\]+)/);
+  if (windowsUser?.[1]) {
+    return windowsUser[1];
+  }
+
+  return undefined;
+}
+
+function splitPathAndPosition(value: string): {
+  path: string;
+  line: string | undefined;
+  column: string | undefined;
+} {
+  let path = value;
+  let column: string | undefined;
+  let line: string | undefined;
+
+  const columnMatch = path.match(/:(\d+)$/);
+  if (!columnMatch?.[1]) {
+    return { path, line: undefined, column: undefined };
+  }
+
+  column = columnMatch[1];
+  path = path.slice(0, -columnMatch[0].length);
+
+  const lineMatch = path.match(/:(\d+)$/);
+  if (lineMatch?.[1]) {
+    line = lineMatch[1];
+    path = path.slice(0, -lineMatch[0].length);
+  } else {
+    line = column;
+    column = undefined;
+  }
+
+  return { path, line, column };
+}
+
+export function resolvePathLinkTarget(rawPath: string, cwd: string): string {
+  const { path, line, column } = splitPathAndPosition(rawPath);
+
+  let resolvedPath = path;
+  if (path.startsWith("~/")) {
+    const home = inferHomeFromCwd(cwd);
+    if (home) {
+      const separator: "/" | "\\" = isWindowsPathStyle(home) ? "\\" : "/";
+      resolvedPath = joinPath(home, path.slice(2), separator);
+    }
+  } else if (!isAbsolutePath(path)) {
+    const separator: "/" | "\\" = isWindowsPathStyle(cwd) ? "\\" : "/";
+    resolvedPath = joinPath(cwd, path, separator);
+  }
+
+  if (!line) return resolvedPath;
+  return `${resolvedPath}:${line}${column ? `:${column}` : ""}`;
+}
diff --git a/apps/web/src/lib/syntaxHighlighting.ts b/apps/web/src/lib/syntaxHighlighting.ts
index bc6142135..6fa6a198a 100644
--- a/apps/web/src/lib/syntaxHighlighting.ts
+++ b/apps/web/src/lib/syntaxHighlighting.ts
@@ -11,7 +11,7 @@ import {
 } from "@pierre/diffs";
 
 import { basenameOfPath } from "../file-icons";
-import { fnv1a32, resolveDiffThemeName, type DiffThemeName } from "./diffRendering";
+import { fnv1a32, DIFF_THEME_NAME, type DiffThemeName } from "./diffRendering";
 import { LRUCache } from "./lruCache";
 
 const MAX_HIGHLIGHT_CACHE_ENTRIES = 500;
@@ -62,7 +62,7 @@ export function getSyntaxHighlighterPromise(language: string): Promise<DiffsHigh
   if (cached) return cached;
 
   const promise = getSharedHighlighter({
-    themes: [resolveDiffThemeName("dark"), resolveDiffThemeName("light")],
+    themes: [DIFF_THEME_NAME],
     langs: [language as SupportedLanguages],
     preferredHighlighter: "shiki-js",
   }).catch((err) => {
diff --git a/apps/web/src/lib/terminalCloseConfirmation.test.ts b/apps/web/src/lib/terminalCloseConfirmation.test.ts
deleted file mode 100644
index 6fc563b66..000000000
--- a/apps/web/src/lib/terminalCloseConfirmation.test.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-// FILE: terminalCloseConfirmation.test.ts
-// Purpose: Verifies shared terminal close confirmation copy and dialog behavior.
-// Layer: UI logic helper tests
-// Depends on: terminalCloseConfirmation helpers and Vitest mocks.
-
-import { describe, expect, it, vi } from "vitest";
-
-import {
-  buildTerminalCloseConfirmationMessage,
-  confirmTerminalTabClose,
-  resolveTerminalCloseTitle,
-  shouldPromptForTerminalClose,
-} from "./terminalCloseConfirmation";
-
-describe("resolveTerminalCloseTitle", () => {
-  it("prefers explicit title overrides over generated labels", () => {
-    expect(
-      resolveTerminalCloseTitle({
-        terminalId: "terminal-1",
-        terminalLabelsById: { "terminal-1": "Codex 1" },
-        terminalTitleOverridesById: { "terminal-1": "Deploy shell" },
-      }),
-    ).toBe("Deploy shell");
-  });
-
-  it("falls back to the stored label when no override exists", () => {
-    expect(
-      resolveTerminalCloseTitle({
-        terminalId: "terminal-1",
-        terminalLabelsById: { "terminal-1": "Codex 1" },
-        terminalTitleOverridesById: {},
-      }),
-    ).toBe("Codex 1");
-  });
-});
-
-describe("buildTerminalCloseConfirmationMessage", () => {
-  it("uses the visible terminal title in the confirmation copy", () => {
-    expect(
-      buildTerminalCloseConfirmationMessage({
-        terminalTitle: "Deploy shell",
-        willDeleteThread: false,
-      }),
-    ).toBe(
-      [
-        'Close terminal "Deploy shell"?',
-        "This permanently clears the terminal history for this tab.",
-      ].join("\n"),
-    );
-  });
-
-  it("warns when closing the last placeholder terminal also deletes the thread", () => {
-    expect(
-      buildTerminalCloseConfirmationMessage({
-        terminalTitle: "Codex 1",
-        willDeleteThread: true,
-      }),
-    ).toBe(
-      [
-        'Close terminal "Codex 1"?',
-        "This permanently clears the terminal history for this tab and deletes the empty terminal thread.",
-      ].join("\n"),
-    );
-  });
-});
-
-describe("confirmTerminalTabClose", () => {
-  it("short-circuits when confirmations are disabled", async () => {
-    const confirm = vi.fn();
-
-    await expect(
-      confirmTerminalTabClose({
-        api: { dialogs: { confirm, pickFolder: vi.fn() } },
-        enabled: false,
-        terminalTitle: "Deploy shell",
-      }),
-    ).resolves.toBe(true);
-    expect(confirm).not.toHaveBeenCalled();
-  });
-
-  it("delegates to the shared dialog when confirmations are enabled", async () => {
-    const confirm = vi.fn().mockResolvedValue(true);
-
-    await expect(
-      confirmTerminalTabClose({
-        api: { dialogs: { confirm, pickFolder: vi.fn() } },
-        enabled: true,
-        terminalTitle: "Deploy shell",
-        willDeleteThread: true,
-      }),
-    ).resolves.toBe(true);
-    expect(confirm).toHaveBeenCalledWith(
-      [
-        'Close terminal "Deploy shell"?',
-        "This permanently clears the terminal history for this tab and deletes the empty terminal thread.",
-      ].join("\n"),
-    );
-  });
-});
-
-describe("shouldPromptForTerminalClose", () => {
-  it("skips confirmation for idle terminals", () => {
-    expect(
-      shouldPromptForTerminalClose({
-        confirmationEnabled: true,
-        runningTerminalIds: [],
-        terminalAttentionStatesById: {},
-        terminalId: "terminal-1",
-      }),
-    ).toBe(false);
-  });
-
-  it("requires confirmation for terminals with active subprocesses", () => {
-    expect(
-      shouldPromptForTerminalClose({
-        confirmationEnabled: true,
-        runningTerminalIds: ["terminal-1"],
-        terminalAttentionStatesById: {},
-        terminalId: "terminal-1",
-      }),
-    ).toBe(true);
-  });
-
-  it("requires confirmation for terminals waiting for agent attention", () => {
-    expect(
-      shouldPromptForTerminalClose({
-        confirmationEnabled: true,
-        runningTerminalIds: [],
-        terminalAttentionStatesById: { "terminal-1": "review" },
-        terminalId: "terminal-1",
-      }),
-    ).toBe(true);
-  });
-
-  it("does not prompt just because an idle placeholder terminal thread will be deleted", () => {
-    expect(
-      shouldPromptForTerminalClose({
-        confirmationEnabled: true,
-        runningTerminalIds: [],
-        terminalAttentionStatesById: {},
-        terminalId: "terminal-1",
-      }),
-    ).toBe(false);
-  });
-
-  it("respects the global confirmation preference", () => {
-    expect(
-      shouldPromptForTerminalClose({
-        confirmationEnabled: false,
-        runningTerminalIds: ["terminal-1"],
-        terminalAttentionStatesById: { "terminal-1": "review" },
-        terminalId: "terminal-1",
-      }),
-    ).toBe(false);
-  });
-});
diff --git a/apps/web/src/lib/terminalCloseConfirmation.ts b/apps/web/src/lib/terminalCloseConfirmation.ts
deleted file mode 100644
index 18cdc407d..000000000
--- a/apps/web/src/lib/terminalCloseConfirmation.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// FILE: terminalCloseConfirmation.ts
-// Purpose: Shares terminal-tab close confirmation copy and dialog plumbing across chat and workspace surfaces.
-// Layer: UI logic helper
-// Depends on: Native dialog contract from the app shell.
-
-import type { NativeApi } from "@t3tools/contracts";
-
-function formatTerminalCloseSubject(terminalTitle: string | null | undefined): string {
-  const trimmedTitle = terminalTitle?.trim();
-  return trimmedTitle && trimmedTitle.length > 0 ? `terminal "${trimmedTitle}"` : "this terminal";
-}
-
-// Prefer title overrides, then persisted labels, so confirmation copy matches visible tab names.
-export function resolveTerminalCloseTitle(options: {
-  terminalId: string;
-  terminalLabelsById: Record<string, string>;
-  terminalTitleOverridesById: Record<string, string>;
-}): string {
-  return (
-    options.terminalTitleOverridesById[options.terminalId]?.trim() ||
-    options.terminalLabelsById[options.terminalId]?.trim() ||
-    "Terminal"
-  );
-}
-
-export function buildTerminalCloseConfirmationMessage(options: {
-  terminalTitle: string | null | undefined;
-  willDeleteThread: boolean;
-}): string {
-  return [
-    `Close ${formatTerminalCloseSubject(options.terminalTitle)}?`,
-    options.willDeleteThread
-      ? "This permanently clears the terminal history for this tab and deletes the empty terminal thread."
-      : "This permanently clears the terminal history for this tab.",
-  ].join("\n");
-}
-
-export function shouldPromptForTerminalClose(options: {
-  confirmationEnabled: boolean;
-  runningTerminalIds: readonly string[];
-  terminalAttentionStatesById: Record<string, unknown>;
-  terminalId: string;
-}): boolean {
-  if (!options.confirmationEnabled) {
-    return false;
-  }
-  return (
-    options.runningTerminalIds.includes(options.terminalId) ||
-    options.terminalAttentionStatesById[options.terminalId] !== undefined
-  );
-}
-
-export async function confirmTerminalTabClose(options: {
-  api: Pick<NativeApi, "dialogs"> | null | undefined;
-  enabled: boolean;
-  terminalTitle: string | null | undefined;
-  willDeleteThread?: boolean;
-}): Promise<boolean> {
-  if (!options.enabled || !options.api) {
-    return true;
-  }
-
-  return options.api.dialogs.confirm(
-    buildTerminalCloseConfirmationMessage({
-      terminalTitle: options.terminalTitle,
-      willDeleteThread: options.willDeleteThread ?? false,
-    }),
-  );
-}
diff --git a/apps/web/src/lib/terminalContext.test.ts b/apps/web/src/lib/terminalContext.test.ts
deleted file mode 100644
index 449cb342a..000000000
--- a/apps/web/src/lib/terminalContext.test.ts
+++ /dev/null
@@ -1,378 +0,0 @@
-import { ThreadId } from "@t3tools/contracts";
-import { describe, expect, it } from "vitest";
-
-import {
-  appendTerminalContextsToPrompt,
-  buildTerminalContextPreviewTitle,
-  buildTerminalContextBlock,
-  countInlineTerminalContextPlaceholders,
-  ensureInlineTerminalContextPlaceholders,
-  extractTrailingTerminalContexts,
-  filterTerminalContextsWithText,
-  formatInlineTerminalContextLabel,
-  formatTerminalContextLabel,
-  hasTerminalContextText,
-  IMAGE_ONLY_BOOTSTRAP_PROMPT,
-  IMAGE_ONLY_VISIBLE_PLACEHOLDER,
-  INLINE_TERMINAL_CONTEXT_PLACEHOLDER,
-  insertInlineTerminalContextPlaceholder,
-  isTerminalContextExpired,
-  materializeInlineTerminalContextPrompt,
-  removeInlineTerminalContextPlaceholder,
-  stripInlineTerminalContextPlaceholders,
-  type TerminalContextDraft,
-} from "./terminalContext";
-import {
-  appendOriginalComposerPromptBlocks,
-  deriveDisplayedUserMessageState,
-} from "./composerMessageContext";
-import { appendAssistantSelectionsToPrompt } from "./assistantSelections";
-import { appendPastedTextsToPrompt, createPastedTextDraft } from "./composerPastedText";
-import { appendFileCommentsToPrompt } from "./fileComments";
-
-function makeContext(overrides?: Partial<TerminalContextDraft>): TerminalContextDraft {
-  return {
-    id: "context-1",
-    threadId: ThreadId.makeUnsafe("thread-1"),
-    terminalId: "default",
-    terminalLabel: "Terminal 1",
-    lineStart: 12,
-    lineEnd: 13,
-    text: "git status\nOn branch main",
-    createdAt: "2026-03-13T12:00:00.000Z",
-    ...overrides,
-  };
-}
-
-describe("terminalContext", () => {
-  it("formats terminal labels with line ranges", () => {
-    expect(formatTerminalContextLabel(makeContext())).toBe("Terminal 1 lines 12-13");
-    expect(
-      formatTerminalContextLabel(
-        makeContext({
-          lineStart: 9,
-          lineEnd: 9,
-        }),
-      ),
-    ).toBe("Terminal 1 line 9");
-  });
-
-  it("builds a numbered terminal context block", () => {
-    expect(buildTerminalContextBlock([makeContext()])).toBe(
-      [
-        "<terminal_context>",
-        "- Terminal 1 lines 12-13:",
-        "  12 | git status",
-        "  13 | On branch main",
-        "</terminal_context>",
-      ].join("\n"),
-    );
-  });
-
-  it("appends terminal context blocks after prompt text", () => {
-    expect(appendTerminalContextsToPrompt("Investigate this", [makeContext()])).toBe(
-      [
-        "Investigate this",
-        "",
-        "<terminal_context>",
-        "- Terminal 1 lines 12-13:",
-        "  12 | git status",
-        "  13 | On branch main",
-        "</terminal_context>",
-      ].join("\n"),
-    );
-  });
-
-  it("preserves the original terminal context block when editing display text", () => {
-    const originalPrompt = appendTerminalContextsToPrompt("Investigate this", [makeContext()]);
-    expect(
-      appendOriginalComposerPromptBlocks({
-        editedPrompt: "Investigate this edited",
-        originalPrompt,
-      }),
-    ).toBe(
-      [
-        "Investigate this edited",
-        "",
-        "<terminal_context>",
-        "- Terminal 1 lines 12-13:",
-        "  12 | git status",
-        "  13 | On branch main",
-        "</terminal_context>",
-      ].join("\n"),
-    );
-  });
-
-  it("preserves all hidden composer blocks when editing display text", () => {
-    const assistantSelections = [{ assistantMessageId: "msg-1", text: "selected line" }];
-    const contexts = [makeContext()];
-    const fileComments = [
-      { path: "src/app.ts", startLine: 3, endLine: 5, text: "rename this helper" },
-    ];
-    const pastedTexts = [
-      createPastedTextDraft({
-        id: "paste-1",
-        createdAt: "2026-06-15T00:00:00.000Z",
-        text: ["before", "</pasted_text>", "after"].join("\n"),
-      }),
-    ];
-    const originalPrompt = appendPastedTextsToPrompt(
-      appendFileCommentsToPrompt(
-        appendTerminalContextsToPrompt(
-          appendAssistantSelectionsToPrompt("Investigate this", assistantSelections),
-          contexts,
-        ),
-        fileComments,
-      ),
-      pastedTexts,
-    );
-
-    expect(
-      appendOriginalComposerPromptBlocks({
-        editedPrompt: "Investigate this edited",
-        originalPrompt,
-      }),
-    ).toBe(
-      appendPastedTextsToPrompt(
-        appendFileCommentsToPrompt(
-          appendTerminalContextsToPrompt(
-            appendAssistantSelectionsToPrompt("Investigate this edited", assistantSelections),
-            contexts,
-          ),
-          fileComments,
-        ),
-        pastedTexts,
-      ),
-    );
-  });
-
-  it("replaces inline placeholders with inline terminal labels before appending context blocks", () => {
-    expect(
-      appendTerminalContextsToPrompt(
-        `Investigate ${INLINE_TERMINAL_CONTEXT_PLACEHOLDER} carefully`,
-        [makeContext()],
-      ),
-    ).toBe(
-      [
-        "Investigate @terminal-1:12-13 carefully",
-        "",
-        "<terminal_context>",
-        "- Terminal 1 lines 12-13:",
-        "  12 | git status",
-        "  13 | On branch main",
-        "</terminal_context>",
-      ].join("\n"),
-    );
-  });
-
-  it("extracts terminal context blocks from message text", () => {
-    const prompt = appendTerminalContextsToPrompt("Investigate this", [makeContext()]);
-    expect(extractTrailingTerminalContexts(prompt)).toEqual({
-      promptText: "Investigate this",
-      contextCount: 1,
-      previewTitle: "Terminal 1 lines 12-13\n12 | git status\n13 | On branch main",
-      contexts: [
-        {
-          header: "Terminal 1 lines 12-13",
-          body: "12 | git status\n13 | On branch main",
-        },
-      ],
-    });
-  });
-
-  it("derives displayed user message state from terminal context prompts", () => {
-    const prompt = appendTerminalContextsToPrompt("Investigate this", [makeContext()]);
-    expect(deriveDisplayedUserMessageState(prompt)).toEqual({
-      visibleText: "Investigate this",
-      copyText: "Investigate this",
-      contextCount: 1,
-      previewTitle: "Terminal 1 lines 12-13\n12 | git status\n13 | On branch main",
-      contexts: [
-        {
-          header: "Terminal 1 lines 12-13",
-          body: "12 | git status\n13 | On branch main",
-        },
-      ],
-      assistantSelections: [],
-      fileComments: [],
-      pastedTexts: [],
-    });
-  });
-
-  it("strips assistant selection transport markup from displayed and copied text", () => {
-    const prompt = appendAssistantSelectionsToPrompt("Investigate this", [
-      {
-        assistantMessageId: "msg-1",
-        text: "selected line",
-      },
-    ]);
-    expect(deriveDisplayedUserMessageState(prompt)).toEqual({
-      visibleText: "Investigate this",
-      copyText: "Investigate this",
-      contextCount: 0,
-      previewTitle: null,
-      contexts: [],
-      assistantSelections: [{ assistantMessageId: "msg-1", text: "selected line" }],
-      fileComments: [],
-      pastedTexts: [],
-    });
-  });
-
-  it("keeps assistant selections and terminal context separate from the copied bubble text", () => {
-    const prompt = appendTerminalContextsToPrompt(
-      appendAssistantSelectionsToPrompt("Investigate this", [
-        {
-          assistantMessageId: "msg-1",
-          text: "selected line",
-        },
-      ]),
-      [makeContext()],
-    );
-
-    expect(deriveDisplayedUserMessageState(prompt)).toEqual({
-      visibleText: "Investigate this",
-      copyText: "Investigate this",
-      contextCount: 1,
-      previewTitle: "Terminal 1 lines 12-13\n12 | git status\n13 | On branch main",
-      contexts: [
-        {
-          header: "Terminal 1 lines 12-13",
-          body: "12 | git status\n13 | On branch main",
-        },
-      ],
-      assistantSelections: [{ assistantMessageId: "msg-1", text: "selected line" }],
-      fileComments: [],
-      pastedTexts: [],
-    });
-  });
-
-  it("separates file comments, terminal context, and assistant selections in display state", () => {
-    // Mirror the composer send path: assistant selections, then terminal
-    // contexts, then file comments (outermost).
-    const prompt = appendFileCommentsToPrompt(
-      appendTerminalContextsToPrompt(
-        appendAssistantSelectionsToPrompt("Investigate this", [
-          { assistantMessageId: "msg-1", text: "selected line" },
-        ]),
-        [makeContext()],
-      ),
-      [{ path: "src/app.ts", startLine: 3, endLine: 5, text: "rename this helper" }],
-    );
-
-    expect(deriveDisplayedUserMessageState(prompt)).toEqual({
-      visibleText: "Investigate this",
-      copyText: "Investigate this",
-      contextCount: 1,
-      previewTitle: "Terminal 1 lines 12-13\n12 | git status\n13 | On branch main",
-      contexts: [
-        {
-          header: "Terminal 1 lines 12-13",
-          body: "12 | git status\n13 | On branch main",
-        },
-      ],
-      assistantSelections: [{ assistantMessageId: "msg-1", text: "selected line" }],
-      fileComments: [{ path: "src/app.ts", startLine: 3, endLine: 5, text: "rename this helper" }],
-      pastedTexts: [],
-    });
-  });
-
-  it("preserves prompt text when no trailing terminal context block exists", () => {
-    expect(extractTrailingTerminalContexts("No attached context")).toEqual({
-      promptText: "No attached context",
-      contextCount: 0,
-      previewTitle: null,
-      contexts: [],
-    });
-  });
-
-  it("hides the image-only bootstrap prompt when requested for transcript display", () => {
-    expect(
-      deriveDisplayedUserMessageState(IMAGE_ONLY_BOOTSTRAP_PROMPT, {
-        hideImageOnlyBootstrapPrompt: true,
-      }),
-    ).toEqual({
-      visibleText: IMAGE_ONLY_VISIBLE_PLACEHOLDER,
-      copyText: "",
-      contextCount: 0,
-      previewTitle: null,
-      contexts: [],
-      assistantSelections: [],
-      fileComments: [],
-      pastedTexts: [],
-    });
-  });
-
-  it("returns null preview title when every context is invalid", () => {
-    expect(
-      buildTerminalContextPreviewTitle([
-        makeContext({
-          terminalId: "   ",
-        }),
-        makeContext({
-          id: "context-2",
-          text: "\n\n",
-        }),
-      ]),
-    ).toBeNull();
-  });
-
-  it("tracks inline terminal context placeholders in prompt text", () => {
-    const placeholder = INLINE_TERMINAL_CONTEXT_PLACEHOLDER;
-    expect(countInlineTerminalContextPlaceholders(`a${placeholder}b${placeholder}`)).toBe(2);
-    expect(ensureInlineTerminalContextPlaceholders("Investigate this", 2)).toBe(
-      `${placeholder}${placeholder}Investigate this`,
-    );
-    expect(insertInlineTerminalContextPlaceholder("abc", 1)).toEqual({
-      prompt: `a ${placeholder} bc`,
-      cursor: 4,
-      contextIndex: 0,
-    });
-    expect(removeInlineTerminalContextPlaceholder(`a${placeholder}b${placeholder}c`, 1)).toEqual({
-      prompt: `a${placeholder}bc`,
-      cursor: 3,
-    });
-    expect(stripInlineTerminalContextPlaceholders(`a${placeholder}b`)).toBe("ab");
-  });
-
-  it("inserts a placeholder after a file mention when given the expanded prompt cursor", () => {
-    const placeholder = INLINE_TERMINAL_CONTEXT_PLACEHOLDER;
-    expect(insertInlineTerminalContextPlaceholder("Inspect @package.json ", 22)).toEqual({
-      prompt: `Inspect @package.json ${placeholder} `,
-      cursor: 24,
-      contextIndex: 0,
-    });
-  });
-
-  it("adds a trailing space and consumes an existing trailing space at the insertion point", () => {
-    const placeholder = INLINE_TERMINAL_CONTEXT_PLACEHOLDER;
-    expect(insertInlineTerminalContextPlaceholder("yo whats", 3)).toEqual({
-      prompt: `yo ${placeholder} whats`,
-      cursor: 5,
-      contextIndex: 0,
-    });
-  });
-
-  it("marks contexts without snapshot text as expired and filters them from sendable contexts", () => {
-    const liveContext = makeContext();
-    const expiredContext = makeContext({
-      id: "context-2",
-      text: "",
-    });
-
-    expect(hasTerminalContextText(liveContext)).toBe(true);
-    expect(isTerminalContextExpired(liveContext)).toBe(false);
-    expect(hasTerminalContextText(expiredContext)).toBe(false);
-    expect(isTerminalContextExpired(expiredContext)).toBe(true);
-    expect(filterTerminalContextsWithText([expiredContext, liveContext])).toEqual([liveContext]);
-  });
-
-  it("formats and materializes inline terminal labels from placeholder positions", () => {
-    expect(formatInlineTerminalContextLabel(makeContext())).toBe("@terminal-1:12-13");
-    expect(
-      materializeInlineTerminalContextPrompt(
-        `Investigate ${INLINE_TERMINAL_CONTEXT_PLACEHOLDER} carefully`,
-        [makeContext()],
-      ),
-    ).toBe("Investigate @terminal-1:12-13 carefully");
-  });
-});
diff --git a/apps/web/src/lib/terminalContext.ts b/apps/web/src/lib/terminalContext.ts
deleted file mode 100644
index 39a5ffb01..000000000
--- a/apps/web/src/lib/terminalContext.ts
+++ /dev/null
@@ -1,339 +0,0 @@
-import { type ThreadId } from "@t3tools/contracts";
-
-export interface TerminalContextSelection {
-  terminalId: string;
-  terminalLabel: string;
-  lineStart: number;
-  lineEnd: number;
-  text: string;
-}
-
-export interface TerminalContextDraft extends TerminalContextSelection {
-  id: string;
-  threadId: ThreadId;
-  createdAt: string;
-}
-
-export interface ExtractedTerminalContexts {
-  promptText: string;
-  contextCount: number;
-  previewTitle: string | null;
-  contexts: ParsedTerminalContextEntry[];
-}
-
-export interface ParsedTerminalContextEntry {
-  header: string;
-  body: string;
-}
-
-export const INLINE_TERMINAL_CONTEXT_PLACEHOLDER = "\uFFFC";
-export const IMAGE_ONLY_BOOTSTRAP_PROMPT =
-  "[User attached one or more images without additional text. Respond using the conversation context and the attached image(s).]";
-export const IMAGE_ONLY_VISIBLE_PLACEHOLDER = "(No Content)";
-
-const TRAILING_TERMINAL_CONTEXT_BLOCK_PATTERN =
-  /\n*<terminal_context>\n([\s\S]*?)\n<\/terminal_context>\s*$/;
-export function normalizeTerminalContextText(text: string): string {
-  return text.replace(/\r\n/g, "\n").replace(/^\n+|\n+$/g, "");
-}
-
-export function hasTerminalContextText(context: { text: string }): boolean {
-  return normalizeTerminalContextText(context.text).length > 0;
-}
-
-export function isTerminalContextExpired(context: { text: string }): boolean {
-  return !hasTerminalContextText(context);
-}
-
-export function filterTerminalContextsWithText<T extends { text: string }>(
-  contexts: ReadonlyArray<T>,
-): T[] {
-  return contexts.filter((context) => hasTerminalContextText(context));
-}
-
-function previewTerminalContextText(text: string): string {
-  const normalized = normalizeTerminalContextText(text);
-  if (normalized.length === 0) {
-    return "";
-  }
-  const lines = normalized.split("\n");
-  const visibleLines = lines.slice(0, 3);
-  if (lines.length > 3) {
-    visibleLines.push("...");
-  }
-  const preview = visibleLines.join("\n");
-  return preview.length > 180 ? `${preview.slice(0, 177)}...` : preview;
-}
-
-export function normalizeTerminalContextSelection(
-  selection: TerminalContextSelection,
-): TerminalContextSelection | null {
-  const text = normalizeTerminalContextText(selection.text);
-  const terminalId = selection.terminalId.trim();
-  const terminalLabel = selection.terminalLabel.trim();
-  if (text.length === 0 || terminalId.length === 0 || terminalLabel.length === 0) {
-    return null;
-  }
-  const lineStart = Math.max(1, Math.floor(selection.lineStart));
-  const lineEnd = Math.max(lineStart, Math.floor(selection.lineEnd));
-  return {
-    terminalId,
-    terminalLabel,
-    lineStart,
-    lineEnd,
-    text,
-  };
-}
-
-export function formatTerminalContextRange(selection: {
-  lineStart: number;
-  lineEnd: number;
-}): string {
-  return selection.lineStart === selection.lineEnd
-    ? `line ${selection.lineStart}`
-    : `lines ${selection.lineStart}-${selection.lineEnd}`;
-}
-
-export function formatTerminalContextLabel(selection: {
-  terminalLabel: string;
-  lineStart: number;
-  lineEnd: number;
-}): string {
-  return `${selection.terminalLabel} ${formatTerminalContextRange(selection)}`;
-}
-
-export function formatInlineTerminalContextLabel(selection: {
-  terminalLabel: string;
-  lineStart: number;
-  lineEnd: number;
-}): string {
-  const terminalLabel = selection.terminalLabel.trim().toLowerCase().replace(/\s+/g, "-");
-  const range =
-    selection.lineStart === selection.lineEnd
-      ? `${selection.lineStart}`
-      : `${selection.lineStart}-${selection.lineEnd}`;
-  return `@${terminalLabel}:${range}`;
-}
-
-export function buildTerminalContextPreviewTitle(
-  contexts: ReadonlyArray<TerminalContextSelection>,
-): string | null {
-  if (contexts.length === 0) {
-    return null;
-  }
-  const previews = contexts
-    .map((context) => {
-      const normalized = normalizeTerminalContextSelection(context);
-      if (!normalized) {
-        return null;
-      }
-      const preview = previewTerminalContextText(normalized.text);
-      return preview.length > 0
-        ? `${formatTerminalContextLabel(normalized)}\n${preview}`
-        : formatTerminalContextLabel(normalized);
-    })
-    .filter((value): value is string => value !== null)
-    .join("\n\n");
-  return previews.length > 0 ? previews : null;
-}
-
-function buildTerminalContextBodyLines(selection: TerminalContextSelection): string[] {
-  return normalizeTerminalContextText(selection.text)
-    .split("\n")
-    .map((line, index) => `  ${selection.lineStart + index} | ${line}`);
-}
-
-export function buildTerminalContextBlock(
-  contexts: ReadonlyArray<TerminalContextSelection>,
-): string {
-  const normalizedContexts = contexts
-    .map((context) => normalizeTerminalContextSelection(context))
-    .filter((context): context is TerminalContextSelection => context !== null);
-  if (normalizedContexts.length === 0) {
-    return "";
-  }
-  const lines: string[] = [];
-  for (let index = 0; index < normalizedContexts.length; index += 1) {
-    const context = normalizedContexts[index]!;
-    lines.push(`- ${formatTerminalContextLabel(context)}:`);
-    lines.push(...buildTerminalContextBodyLines(context));
-    if (index < normalizedContexts.length - 1) {
-      lines.push("");
-    }
-  }
-  return ["<terminal_context>", ...lines, "</terminal_context>"].join("\n");
-}
-
-export function materializeInlineTerminalContextPrompt(
-  prompt: string,
-  contexts: ReadonlyArray<{
-    terminalLabel: string;
-    lineStart: number;
-    lineEnd: number;
-  }>,
-): string {
-  let nextContextIndex = 0;
-  let result = "";
-
-  for (const char of prompt) {
-    if (char !== INLINE_TERMINAL_CONTEXT_PLACEHOLDER) {
-      result += char;
-      continue;
-    }
-    const context = contexts[nextContextIndex] ?? null;
-    nextContextIndex += 1;
-    if (!context) {
-      continue;
-    }
-    result += formatInlineTerminalContextLabel(context);
-  }
-
-  return result;
-}
-
-export function appendTerminalContextsToPrompt(
-  prompt: string,
-  contexts: ReadonlyArray<TerminalContextSelection>,
-): string {
-  const trimmedPrompt = materializeInlineTerminalContextPrompt(prompt, contexts).trim();
-  const contextBlock = buildTerminalContextBlock(contexts);
-  if (contextBlock.length === 0) {
-    return trimmedPrompt;
-  }
-  return trimmedPrompt.length > 0 ? `${trimmedPrompt}\n\n${contextBlock}` : contextBlock;
-}
-
-export function extractTrailingTerminalContexts(prompt: string): ExtractedTerminalContexts {
-  const match = TRAILING_TERMINAL_CONTEXT_BLOCK_PATTERN.exec(prompt);
-  if (!match) {
-    return {
-      promptText: prompt,
-      contextCount: 0,
-      previewTitle: null,
-      contexts: [],
-    };
-  }
-  const promptText = prompt.slice(0, match.index).replace(/\n+$/, "");
-  const parsedContexts = parseTerminalContextEntries(match[1] ?? "");
-  return {
-    promptText,
-    contextCount: parsedContexts.length,
-    previewTitle:
-      parsedContexts.length > 0
-        ? parsedContexts
-            .map(({ header, body }) => (body.length > 0 ? `${header}\n${body}` : header))
-            .join("\n\n")
-        : null,
-    contexts: parsedContexts,
-  };
-}
-
-function parseTerminalContextEntries(block: string): ParsedTerminalContextEntry[] {
-  const entries: ParsedTerminalContextEntry[] = [];
-  let current: { header: string; bodyLines: string[] } | null = null;
-
-  const commitCurrent = () => {
-    if (!current) {
-      return;
-    }
-    entries.push({
-      header: current.header,
-      body: current.bodyLines.join("\n").trimEnd(),
-    });
-    current = null;
-  };
-
-  for (const rawLine of block.split("\n")) {
-    const headerMatch = /^- (.+):$/.exec(rawLine);
-    if (headerMatch) {
-      commitCurrent();
-      current = {
-        header: headerMatch[1]!,
-        bodyLines: [],
-      };
-      continue;
-    }
-    if (!current) {
-      continue;
-    }
-    if (rawLine.startsWith("  ")) {
-      current.bodyLines.push(rawLine.slice(2));
-      continue;
-    }
-    if (rawLine.length === 0) {
-      current.bodyLines.push("");
-    }
-  }
-
-  commitCurrent();
-  return entries;
-}
-
-export function countInlineTerminalContextPlaceholders(prompt: string): number {
-  let count = 0;
-  for (const char of prompt) {
-    if (char === INLINE_TERMINAL_CONTEXT_PLACEHOLDER) {
-      count += 1;
-    }
-  }
-  return count;
-}
-
-export function ensureInlineTerminalContextPlaceholders(
-  prompt: string,
-  terminalContextCount: number,
-): string {
-  const missingCount = terminalContextCount - countInlineTerminalContextPlaceholders(prompt);
-  if (missingCount <= 0) {
-    return prompt;
-  }
-  return `${INLINE_TERMINAL_CONTEXT_PLACEHOLDER.repeat(missingCount)}${prompt}`;
-}
-
-function isInlineTerminalContextBoundaryWhitespace(char: string | undefined): boolean {
-  return char === undefined || char === " " || char === "\n" || char === "\t" || char === "\r";
-}
-
-export function insertInlineTerminalContextPlaceholder(
-  prompt: string,
-  cursorInput: number,
-): { prompt: string; cursor: number; contextIndex: number } {
-  const cursor = Math.max(0, Math.min(prompt.length, Math.floor(cursorInput)));
-  const needsLeadingSpace = !isInlineTerminalContextBoundaryWhitespace(prompt[cursor - 1]);
-  const replacement = `${needsLeadingSpace ? " " : ""}${INLINE_TERMINAL_CONTEXT_PLACEHOLDER} `;
-  const rangeEnd = prompt[cursor] === " " ? cursor + 1 : cursor;
-  return {
-    prompt: `${prompt.slice(0, cursor)}${replacement}${prompt.slice(rangeEnd)}`,
-    cursor: cursor + replacement.length,
-    contextIndex: countInlineTerminalContextPlaceholders(prompt.slice(0, cursor)),
-  };
-}
-
-export function stripInlineTerminalContextPlaceholders(prompt: string): string {
-  return prompt.replaceAll(INLINE_TERMINAL_CONTEXT_PLACEHOLDER, "");
-}
-
-export function removeInlineTerminalContextPlaceholder(
-  prompt: string,
-  contextIndex: number,
-): { prompt: string; cursor: number } {
-  if (contextIndex < 0) {
-    return { prompt, cursor: prompt.length };
-  }
-
-  let placeholderIndex = 0;
-  for (let index = 0; index < prompt.length; index += 1) {
-    if (prompt[index] !== INLINE_TERMINAL_CONTEXT_PLACEHOLDER) {
-      continue;
-    }
-    if (placeholderIndex === contextIndex) {
-      return {
-        prompt: prompt.slice(0, index) + prompt.slice(index + 1),
-        cursor: index,
-      };
-    }
-    placeholderIndex += 1;
-  }
-
-  return { prompt, cursor: prompt.length };
-}
diff --git a/apps/web/src/lib/terminalFocus.test.ts b/apps/web/src/lib/terminalFocus.test.ts
deleted file mode 100644
index 832324ff1..000000000
--- a/apps/web/src/lib/terminalFocus.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { afterEach, describe, expect, it } from "vitest";
-
-import { isTerminalFocused } from "./terminalFocus";
-
-class MockHTMLElement {
-  isConnected = false;
-  className = "";
-
-  readonly classList = {
-    contains: (value: string) => this.className.split(/\s+/).includes(value),
-  };
-
-  closest(selector: string): MockHTMLElement | null {
-    return selector === ".thread-terminal-drawer .xterm" && this.isConnected ? this : null;
-  }
-}
-
-const originalDocument = globalThis.document;
-const originalHTMLElement = globalThis.HTMLElement;
-
-afterEach(() => {
-  if (originalDocument === undefined) {
-    delete (globalThis as { document?: Document }).document;
-  } else {
-    globalThis.document = originalDocument;
-  }
-
-  if (originalHTMLElement === undefined) {
-    delete (globalThis as { HTMLElement?: typeof HTMLElement }).HTMLElement;
-  } else {
-    globalThis.HTMLElement = originalHTMLElement;
-  }
-});
-
-describe("isTerminalFocused", () => {
-  it("returns false for detached xterm helper textareas", () => {
-    const detached = new MockHTMLElement();
-    detached.className = "xterm-helper-textarea";
-
-    globalThis.HTMLElement = MockHTMLElement as unknown as typeof HTMLElement;
-    globalThis.document = { activeElement: detached } as Document;
-
-    expect(isTerminalFocused()).toBe(false);
-  });
-
-  it("returns true for connected xterm helper textareas", () => {
-    const attached = new MockHTMLElement();
-    attached.className = "xterm-helper-textarea";
-    attached.isConnected = true;
-
-    globalThis.HTMLElement = MockHTMLElement as unknown as typeof HTMLElement;
-    globalThis.document = { activeElement: attached } as Document;
-
-    expect(isTerminalFocused()).toBe(true);
-  });
-});
diff --git a/apps/web/src/lib/terminalFocus.ts b/apps/web/src/lib/terminalFocus.ts
deleted file mode 100644
index d4edd9b14..000000000
--- a/apps/web/src/lib/terminalFocus.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export function isTerminalFocused(): boolean {
-  const activeElement = document.activeElement;
-  if (!(activeElement instanceof HTMLElement)) return false;
-  if (!activeElement.isConnected) return false;
-  if (activeElement.classList.contains("xterm-helper-textarea")) return true;
-  return activeElement.closest(".thread-terminal-drawer .xterm") !== null;
-}
diff --git a/apps/web/src/lib/terminalNewAction.test.ts b/apps/web/src/lib/terminalNewAction.test.ts
deleted file mode 100644
index 35db39154..000000000
--- a/apps/web/src/lib/terminalNewAction.test.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { createTerminalGroup } from "../terminalPaneLayout";
-import type { ThreadTerminalGroup } from "../types";
-import { resolveTerminalNewAction } from "./terminalNewAction";
-
-describe("resolveTerminalNewAction", () => {
-  it("creates a new group when the terminal UI is closed", () => {
-    expect(
-      resolveTerminalNewAction({
-        terminalOpen: false,
-        activeTerminalId: "terminal-2",
-        activeTerminalGroupId: "group-terminal-2",
-        terminalGroups: [createTerminalGroup("group-terminal-2", "terminal-2")],
-      }),
-    ).toEqual({ kind: "new-group" });
-  });
-
-  it("adds a tab to the active terminal group when one is open", () => {
-    const activeGroup: ThreadTerminalGroup = {
-      id: "group-terminal-2",
-      activeTerminalId: "terminal-3",
-      layout: {
-        type: "terminal",
-        paneId: "pane-terminal-2",
-        terminalIds: ["terminal-2", "terminal-3"],
-        activeTerminalId: "terminal-3",
-      },
-    };
-
-    expect(
-      resolveTerminalNewAction({
-        terminalOpen: true,
-        activeTerminalId: "terminal-2",
-        activeTerminalGroupId: activeGroup.id,
-        terminalGroups: [activeGroup],
-      }),
-    ).toEqual({ kind: "new-tab", targetTerminalId: "terminal-3" });
-  });
-
-  it("falls back to the active terminal when the active group id is stale", () => {
-    expect(
-      resolveTerminalNewAction({
-        terminalOpen: true,
-        activeTerminalId: "terminal-9",
-        activeTerminalGroupId: "missing-group",
-        terminalGroups: [createTerminalGroup("group-terminal-9", "terminal-9")],
-      }),
-    ).toEqual({ kind: "new-tab", targetTerminalId: "terminal-9" });
-  });
-});
diff --git a/apps/web/src/lib/terminalNewAction.ts b/apps/web/src/lib/terminalNewAction.ts
deleted file mode 100644
index 7d4e8a02b..000000000
--- a/apps/web/src/lib/terminalNewAction.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { collectTerminalIdsFromLayout } from "../terminalPaneLayout";
-import type { ThreadTerminalGroup } from "../types";
-
-export interface ResolveTerminalNewActionInput {
-  terminalOpen: boolean;
-  activeTerminalId: string;
-  activeTerminalGroupId: string;
-  terminalGroups: ThreadTerminalGroup[];
-}
-
-export type TerminalNewAction =
-  | { kind: "new-group" }
-  | { kind: "new-tab"; targetTerminalId: string };
-
-function resolveActiveTerminalGroup(
-  input: ResolveTerminalNewActionInput,
-): ThreadTerminalGroup | null {
-  return (
-    input.terminalGroups.find((group) => group.id === input.activeTerminalGroupId) ??
-    input.terminalGroups.find((group) =>
-      collectTerminalIdsFromLayout(group.layout).includes(input.activeTerminalId),
-    ) ??
-    input.terminalGroups[0] ??
-    null
-  );
-}
-
-export function resolveTerminalNewAction(input: ResolveTerminalNewActionInput): TerminalNewAction {
-  if (!input.terminalOpen) {
-    return { kind: "new-group" };
-  }
-
-  const activeGroup = resolveActiveTerminalGroup(input);
-  const activeGroupTerminalIds = activeGroup
-    ? collectTerminalIdsFromLayout(activeGroup.layout)
-    : [];
-  const normalizedActiveTerminalId = input.activeTerminalId.trim();
-
-  if (activeGroup && activeGroupTerminalIds.includes(activeGroup.activeTerminalId)) {
-    return {
-      kind: "new-tab",
-      targetTerminalId: activeGroup.activeTerminalId,
-    };
-  }
-
-  if (activeGroupTerminalIds.includes(normalizedActiveTerminalId)) {
-    return {
-      kind: "new-tab",
-      targetTerminalId: normalizedActiveTerminalId,
-    };
-  }
-
-  if (activeGroupTerminalIds[0]) {
-    return {
-      kind: "new-tab",
-      targetTerminalId: activeGroupTerminalIds[0],
-    };
-  }
-
-  if (normalizedActiveTerminalId.length > 0) {
-    return {
-      kind: "new-tab",
-      targetTerminalId: normalizedActiveTerminalId,
-    };
-  }
-
-  return { kind: "new-group" };
-}
diff --git a/apps/web/src/lib/terminalStateCleanup.test.ts b/apps/web/src/lib/terminalStateCleanup.test.ts
deleted file mode 100644
index fee0b6ffa..000000000
--- a/apps/web/src/lib/terminalStateCleanup.test.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { ThreadId } from "@t3tools/contracts";
-import { describe, expect, it } from "vitest";
-
-import { collectActiveTerminalThreadIds } from "./terminalStateCleanup";
-
-const threadId = (id: string): ThreadId => ThreadId.makeUnsafe(id);
-
-describe("collectActiveTerminalThreadIds", () => {
-  it("retains non-deleted server threads", () => {
-    const activeThreadIds = collectActiveTerminalThreadIds({
-      snapshotThreads: [
-        { id: threadId("server-1"), deletedAt: null, archivedAt: null },
-        { id: threadId("server-2"), deletedAt: null, archivedAt: null },
-      ],
-      draftThreadIds: [],
-    });
-
-    expect(activeThreadIds).toEqual(new Set([threadId("server-1"), threadId("server-2")]));
-  });
-
-  it("ignores deleted server threads and keeps local draft threads", () => {
-    const activeThreadIds = collectActiveTerminalThreadIds({
-      snapshotThreads: [
-        { id: threadId("server-active"), deletedAt: null, archivedAt: null },
-        {
-          id: threadId("server-deleted"),
-          deletedAt: "2026-03-05T08:00:00.000Z",
-          archivedAt: null,
-        },
-      ],
-      draftThreadIds: [threadId("local-draft")],
-    });
-
-    expect(activeThreadIds).toEqual(new Set([threadId("server-active"), threadId("local-draft")]));
-  });
-
-  it("retains synthetic workspace terminal scopes", () => {
-    const activeThreadIds = collectActiveTerminalThreadIds({
-      snapshotThreads: [],
-      draftThreadIds: [],
-      retainedThreadIds: [threadId("workspace:alpha"), threadId("workspace:beta")],
-    });
-
-    expect(activeThreadIds).toEqual(
-      new Set([threadId("workspace:alpha"), threadId("workspace:beta")]),
-    );
-  });
-
-  it("ignores archived server threads", () => {
-    const activeThreadIds = collectActiveTerminalThreadIds({
-      snapshotThreads: [
-        { id: threadId("server-active"), deletedAt: null, archivedAt: null },
-        {
-          id: threadId("server-archived"),
-          deletedAt: null,
-          archivedAt: "2026-03-05T09:00:00.000Z",
-        },
-      ],
-      draftThreadIds: [],
-    });
-
-    expect(activeThreadIds).toEqual(new Set([threadId("server-active")]));
-  });
-
-  it("does not retain draft-linked state for archived server threads", () => {
-    const activeThreadIds = collectActiveTerminalThreadIds({
-      snapshotThreads: [
-        {
-          id: threadId("server-archived"),
-          deletedAt: null,
-          archivedAt: "2026-03-05T09:00:00.000Z",
-        },
-      ],
-      draftThreadIds: [threadId("server-archived"), threadId("local-draft")],
-    });
-
-    expect(activeThreadIds).toEqual(new Set([threadId("local-draft")]));
-  });
-});
diff --git a/apps/web/src/lib/terminalStateCleanup.ts b/apps/web/src/lib/terminalStateCleanup.ts
deleted file mode 100644
index 4fc70f211..000000000
--- a/apps/web/src/lib/terminalStateCleanup.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import type { ThreadId } from "@t3tools/contracts";
-
-interface TerminalRetentionThread {
-  id: ThreadId;
-  deletedAt: string | null;
-  archivedAt: string | null;
-}
-
-interface CollectActiveTerminalThreadIdsInput {
-  snapshotThreads: readonly TerminalRetentionThread[];
-  draftThreadIds: Iterable<ThreadId>;
-  retainedThreadIds?: Iterable<ThreadId>;
-}
-
-export function collectActiveTerminalThreadIds(
-  input: CollectActiveTerminalThreadIdsInput,
-): Set<ThreadId> {
-  const activeThreadIds = new Set<ThreadId>();
-  const snapshotThreadById = new Map(input.snapshotThreads.map((thread) => [thread.id, thread]));
-  for (const thread of input.snapshotThreads) {
-    if (thread.deletedAt !== null) continue;
-    if (thread.archivedAt !== null) continue;
-    activeThreadIds.add(thread.id);
-  }
-  for (const draftThreadId of input.draftThreadIds) {
-    const snapshotThread = snapshotThreadById.get(draftThreadId);
-    if (
-      snapshotThread &&
-      (snapshotThread.deletedAt !== null || snapshotThread.archivedAt !== null)
-    ) {
-      continue;
-    }
-    activeThreadIds.add(draftThreadId);
-  }
-  for (const retainedThreadId of input.retainedThreadIds ?? []) {
-    activeThreadIds.add(retainedThreadId);
-  }
-  return activeThreadIds;
-}
diff --git a/apps/web/src/lib/threadBootstrap.test.ts b/apps/web/src/lib/threadBootstrap.test.ts
index 135f5165f..cd7d5b633 100644
--- a/apps/web/src/lib/threadBootstrap.test.ts
+++ b/apps/web/src/lib/threadBootstrap.test.ts
@@ -9,7 +9,7 @@ import {
   hasDraftContextOverrides,
   isConsumedDraftThread,
   resolveInheritedThreadContext,
-  resolveTerminalThreadCreationState,
+  resolveThreadCreationState,
   resolveThreadBootstrapPlan,
   shouldReuseActiveDraftThread,
 } from "./threadBootstrap";
@@ -34,7 +34,6 @@ function makeDraftThread(partial?: Partial<DraftThreadState>): DraftThreadState
     projectId: PROJECT_ID,
     createdAt: "2026-04-05T10:00:00.000Z",
     runtimeMode: "approval-required",
-    entryPoint: "terminal",
     branch: "feature/terminal-bootstrap",
     worktreePath: "/repo/.worktrees/terminal-bootstrap",
     envMode: "worktree",
@@ -53,7 +52,6 @@ function makeComposerDraftState(
     nonPersistedImageIds: [],
     persistedAttachments: [],
     assistantSelections: [],
-    terminalContexts: [],
     fileComments: [],
     pastedTexts: [],
     skills: [],
@@ -75,25 +73,23 @@ describe("threadBootstrap", () => {
   });
 
   it("builds a draft patch only when overrides are provided", () => {
-    expect(buildDraftThreadContextPatch("terminal")).toBeNull();
+    expect(buildDraftThreadContextPatch()).toBeNull();
     expect(
-      buildDraftThreadContextPatch("terminal", {
+      buildDraftThreadContextPatch({
         branch: "feature/new-branch",
         worktreePath: "/repo/.worktrees/new-branch",
       }),
     ).toEqual({
       branch: "feature/new-branch",
       worktreePath: "/repo/.worktrees/new-branch",
-      entryPoint: "terminal",
     });
     expect(
-      buildDraftThreadContextPatch("terminal", {
+      buildDraftThreadContextPatch({
         envMode: "local",
       }),
     ).toEqual({
       envMode: "local",
       worktreePath: null,
-      entryPoint: "terminal",
     });
   });
 
@@ -101,38 +97,23 @@ describe("threadBootstrap", () => {
     expect(
       shouldReuseActiveDraftThread({
         draftThread: makeDraftThread(),
-        entryPoint: "terminal",
         projectId: PROJECT_ID,
         routeThreadId: THREAD_ID,
       }),
     ).toBe(true);
     expect(
       shouldReuseActiveDraftThread({
-        draftThread: makeDraftThread({ entryPoint: "chat" }),
-        entryPoint: "terminal",
+        draftThread: makeDraftThread(),
         projectId: PROJECT_ID,
-        routeThreadId: THREAD_ID,
+        routeThreadId: null,
       }),
     ).toBe(false);
   });
 
-  it("treats promoted chat drafts as consumed but keeps empty terminal drafts reusable", () => {
-    expect(
-      isConsumedDraftThread({ entryPoint: "chat", hasLatestTurn: false, hasServerThread: true }),
-    ).toBe(true);
-    expect(
-      isConsumedDraftThread({ entryPoint: "chat", hasLatestTurn: false, hasServerThread: false }),
-    ).toBe(false);
-    expect(
-      isConsumedDraftThread({
-        entryPoint: "terminal",
-        hasLatestTurn: false,
-        hasServerThread: true,
-      }),
-    ).toBe(false);
-    expect(
-      isConsumedDraftThread({ entryPoint: "terminal", hasLatestTurn: true, hasServerThread: true }),
-    ).toBe(true);
+  it("treats promoted drafts as consumed", () => {
+    expect(isConsumedDraftThread({ hasLatestTurn: false, hasServerThread: true })).toBe(true);
+    expect(isConsumedDraftThread({ hasLatestTurn: true, hasServerThread: false })).toBe(true);
+    expect(isConsumedDraftThread({ hasLatestTurn: false, hasServerThread: false })).toBe(false);
   });
 
   it("resolves bootstrap precedence as route draft, then stored draft, then fresh", () => {
@@ -140,7 +121,6 @@ describe("threadBootstrap", () => {
       resolveThreadBootstrapPlan({
         storedDraftThread: { threadId: ThreadId.makeUnsafe("stored-thread"), ...makeDraftThread() },
         latestActiveDraftThread: makeDraftThread({ branch: "feature/route-draft" }),
-        entryPoint: "terminal",
         projectId: PROJECT_ID,
         routeThreadId: THREAD_ID,
       }),
@@ -149,7 +129,6 @@ describe("threadBootstrap", () => {
       resolveThreadBootstrapPlan({
         storedDraftThread: { threadId: THREAD_ID, ...makeDraftThread() },
         latestActiveDraftThread: null,
-        entryPoint: "terminal",
         projectId: PROJECT_ID,
         routeThreadId: null,
       }),
@@ -158,7 +137,6 @@ describe("threadBootstrap", () => {
       resolveThreadBootstrapPlan({
         storedDraftThread: null,
         latestActiveDraftThread: null,
-        entryPoint: "terminal",
         projectId: PROJECT_ID,
         routeThreadId: null,
       }),
@@ -251,7 +229,6 @@ describe("threadBootstrap", () => {
     expect(
       createFreshDraftThreadSeed({
         createdAt: "2026-04-05T10:00:00.000Z",
-        entryPoint: "terminal",
         options: {
           branch: "feature/new-terminal",
           worktreePath: "/repo/.worktrees/new-terminal",
@@ -266,7 +243,6 @@ describe("threadBootstrap", () => {
       envMode: "worktree",
       runtimeMode: "approval-required",
       lastKnownPr: null,
-      entryPoint: "terminal",
     });
   });
 
@@ -274,7 +250,6 @@ describe("threadBootstrap", () => {
     expect(
       createFreshDraftThreadSeed({
         createdAt: "2026-04-05T10:00:00.000Z",
-        entryPoint: "chat",
         options: undefined,
       }),
     ).toMatchObject({ envMode: "worktree", branch: null, worktreePath: null });
@@ -284,7 +259,6 @@ describe("threadBootstrap", () => {
     expect(
       createFreshDraftThreadSeed({
         createdAt: "2026-04-05T10:00:00.000Z",
-        entryPoint: "chat",
         options: { envMode: "local" },
       }),
     ).toMatchObject({ envMode: "local" });
@@ -294,15 +268,14 @@ describe("threadBootstrap", () => {
     expect(
       createFreshDraftThreadSeed({
         createdAt: "2026-04-05T10:00:00.000Z",
-        entryPoint: "chat",
         options: { branch: "pr-42", worktreePath: "/repo/.worktrees/pr-42" },
       }),
     ).toMatchObject({ envMode: "worktree", worktreePath: "/repo/.worktrees/pr-42" });
   });
 
-  it("prefers draft state when resolving terminal creation payloads", () => {
+  it("prefers draft state when resolving creation payloads", () => {
     expect(
-      resolveTerminalThreadCreationState({
+      resolveThreadCreationState({
         activeDraftThread: null,
         activeThread: {
           projectId: PROJECT_ID,
@@ -329,7 +302,7 @@ describe("threadBootstrap", () => {
 
   it("clears inherited worktree state when an explicit local env override is requested", () => {
     expect(
-      resolveTerminalThreadCreationState({
+      resolveThreadCreationState({
         activeDraftThread: null,
         activeThread: {
           projectId: PROJECT_ID,
diff --git a/apps/web/src/lib/threadBootstrap.ts b/apps/web/src/lib/threadBootstrap.ts
index 6bf830d2f..bd4b39fc6 100644
--- a/apps/web/src/lib/threadBootstrap.ts
+++ b/apps/web/src/lib/threadBootstrap.ts
@@ -1,7 +1,7 @@
 // FILE: threadBootstrap.ts
-// Purpose: Pure helpers for draft reuse and terminal-thread promotion payloads.
+// Purpose: Pure helpers for draft reuse and thread promotion payloads.
 // Layer: Web bootstrap/domain helpers
-// Exports: draft patching, reuse checks, and terminal creation state resolution.
+// Exports: draft patching, reuse checks, and thread creation state resolution.
 
 import {
   DEFAULT_RUNTIME_MODE,
@@ -20,7 +20,7 @@ import {
   type DraftThreadState,
   resolvePreferredComposerModelSelection,
 } from "../composerDraftStore";
-import { type Thread, type ThreadPrimarySurface } from "../types";
+import { type Thread } from "../types";
 
 export interface NewThreadOptions {
   branch?: string | null;
@@ -28,7 +28,6 @@ export interface NewThreadOptions {
   envMode?: DraftThreadEnvMode;
   runtimeMode?: RuntimeMode;
   lastKnownPr?: OrchestrationThreadPullRequest | null;
-  entryPoint?: ThreadPrimarySurface;
   provider?: ProviderKind;
   fresh?: boolean;
 }
@@ -100,7 +99,7 @@ export interface DraftReusePlanFresh {
 
 export type ThreadBootstrapPlan = DraftReusePlanStored | DraftReusePlanRoute | DraftReusePlanFresh;
 
-interface ResolveTerminalThreadCreationStateInput {
+interface ResolveThreadCreationStateInput {
   activeDraftThread: DraftThreadState | null;
   activeThread: ActiveThreadSnapshot | null;
   defaultProvider?: ProviderKind | null | undefined;
@@ -111,7 +110,7 @@ interface ResolveTerminalThreadCreationStateInput {
   projectId: ProjectId;
 }
 
-export interface TerminalThreadCreationState {
+export interface ThreadCreationState {
   branch: string | null;
   envMode: DraftThreadEnvMode;
   lastKnownPr: OrchestrationThreadPullRequest | null;
@@ -158,7 +157,6 @@ export function createActiveDraftThreadSnapshot(
     projectId: activeDraftThread.projectId,
     createdAt: activeDraftThread.createdAt,
     runtimeMode: activeDraftThread.runtimeMode,
-    entryPoint: activeDraftThread.entryPoint,
     branch: activeDraftThread.branch,
     worktreePath: activeDraftThread.worktreePath,
     lastKnownPr: activeDraftThread.lastKnownPr ?? null,
@@ -170,24 +168,16 @@ export function createActiveDraftThreadSnapshot(
  * Promotion (first send) does not erase the project's draft-thread mapping, so a thread that has
  * already started running still looks like a reusable draft. Reusing it makes "New thread" navigate
  * to the thread you are already on — a dead button. Treat such a draft as consumed.
- *
- * Terminal-first drafts intentionally own a server thread before their first turn, so server
- * existence alone must not disqualify them.
  */
 export function isConsumedDraftThread(input: {
-  entryPoint: ThreadPrimarySurface;
   hasLatestTurn: boolean;
   hasServerThread: boolean;
 }): boolean {
-  if (input.hasLatestTurn) {
-    return true;
-  }
-  return input.entryPoint === "terminal" ? false : input.hasServerThread;
+  return input.hasLatestTurn || input.hasServerThread;
 }
 
 // Decide whether we should reuse a stored draft, the current route draft, or create a fresh one.
 export function resolveThreadBootstrapPlan(input: {
-  entryPoint: ThreadPrimarySurface;
   latestActiveDraftThread: DraftThreadState | null;
   projectId: ProjectId;
   routeThreadId: ThreadId | null;
@@ -196,7 +186,6 @@ export function resolveThreadBootstrapPlan(input: {
   if (
     shouldReuseActiveDraftThread({
       draftThread: input.latestActiveDraftThread,
-      entryPoint: input.entryPoint,
       projectId: input.projectId,
       routeThreadId: input.routeThreadId,
     })
@@ -220,7 +209,6 @@ export function resolveThreadBootstrapPlan(input: {
 // Build the initial draft-thread metadata for a brand new thread bootstrap.
 export function createFreshDraftThreadSeed(input: {
   createdAt: string;
-  entryPoint: ThreadPrimarySurface;
   options: NewThreadOptions | undefined;
 }): Omit<DraftThreadState, "projectId"> {
   return {
@@ -234,7 +222,6 @@ export function createFreshDraftThreadSeed(input: {
       (input.options?.worktreePath ? "worktree" : DEFAULT_NEW_THREAD_ENV_MODE),
     runtimeMode: input.options?.runtimeMode ?? DEFAULT_RUNTIME_MODE,
     lastKnownPr: input.options?.lastKnownPr ?? null,
-    entryPoint: input.entryPoint,
   };
 }
 
@@ -250,12 +237,8 @@ export function hasDraftContextOverrides(options?: NewThreadOptions): boolean {
 }
 
 // Build the exact patch we should apply to an existing draft before reusing it.
-export function buildDraftThreadContextPatch(
-  entryPoint: ThreadPrimarySurface,
-  options?: NewThreadOptions,
-): {
+export function buildDraftThreadContextPatch(options?: NewThreadOptions): {
   branch?: string | null;
-  entryPoint: ThreadPrimarySurface;
   envMode?: DraftThreadEnvMode;
   lastKnownPr?: OrchestrationThreadPullRequest | null;
   runtimeMode?: RuntimeMode;
@@ -274,34 +257,28 @@ export function buildDraftThreadContextPatch(
     ...(options?.envMode !== undefined ? { envMode: options.envMode } : {}),
     ...(options?.runtimeMode !== undefined ? { runtimeMode: options.runtimeMode } : {}),
     ...(options?.lastKnownPr !== undefined ? { lastKnownPr: options.lastKnownPr } : {}),
-    entryPoint,
   };
 }
 
-// Reuse only when the active route draft already belongs to the target project and surface.
+// Reuse only when the active route draft already belongs to the target project.
 export function shouldReuseActiveDraftThread(input: {
   draftThread: DraftThreadState | null;
-  entryPoint: ThreadPrimarySurface;
   projectId: ProjectId;
   routeThreadId: ThreadId | null;
 }): input is {
   draftThread: DraftThreadState;
-  entryPoint: ThreadPrimarySurface;
   projectId: ProjectId;
   routeThreadId: ThreadId;
 } {
   return Boolean(
-    input.draftThread &&
-    input.routeThreadId &&
-    input.draftThread.projectId === input.projectId &&
-    input.draftThread.entryPoint === input.entryPoint,
+    input.draftThread && input.routeThreadId && input.draftThread.projectId === input.projectId,
   );
 }
 
-// Resolve the durable thread payload for terminal-first promotion from the most specific state.
-export function resolveTerminalThreadCreationState(
-  input: ResolveTerminalThreadCreationStateInput,
-): TerminalThreadCreationState {
+// Resolve the durable thread payload for promotion from the most specific state.
+export function resolveThreadCreationState(
+  input: ResolveThreadCreationStateInput,
+): ThreadCreationState {
   const hasExplicitEnvModeOverride =
     input.options !== undefined && Object.hasOwn(input.options, "envMode");
   const explicitEnvMode: DraftThreadEnvMode | undefined = hasExplicitEnvModeOverride
diff --git a/apps/web/src/markdown-links.ts b/apps/web/src/markdown-links.ts
index b5dcab010..a6f5e1f6d 100644
--- a/apps/web/src/markdown-links.ts
+++ b/apps/web/src/markdown-links.ts
@@ -1,4 +1,4 @@
-import { resolvePathLinkTarget } from "./terminal-links";
+import { resolvePathLinkTarget } from "./lib/pathLinks";
 
 const WINDOWS_DRIVE_PATH_PATTERN = /^[A-Za-z]:[\\/]/;
 const WINDOWS_UNC_PATH_PATTERN = /^\\\\/;
diff --git a/apps/web/src/notifications/taskCompletion.logic.ts b/apps/web/src/notifications/taskCompletion.logic.ts
index e00de0bc3..2efe37613 100644
--- a/apps/web/src/notifications/taskCompletion.logic.ts
+++ b/apps/web/src/notifications/taskCompletion.logic.ts
@@ -3,11 +3,6 @@
 // Layer: Notification logic
 // Exports: lifecycle detection helpers and notification copy helpers
 
-import {
-  defaultTerminalTitleForCliKind,
-  type TerminalCliKind,
-  type TerminalVisualState,
-} from "@t3tools/shared/terminalThreads";
 import type { Thread, ThreadSession } from "../types";
 import {
   derivePendingApprovals,
@@ -34,29 +29,6 @@ export interface ThreadAttentionCandidate {
   summary?: string;
 }
 
-interface TerminalNotificationThreadState {
-  runningTerminalIds: string[];
-  terminalAttentionStatesById: Record<string, "attention" | "review">;
-  terminalCliKindsById: Record<string, TerminalCliKind>;
-  terminalIds: string[];
-  terminalLabelsById: Record<string, string>;
-  terminalTitleOverridesById: Record<string, string>;
-}
-
-export interface CompletedTerminalCandidate {
-  cliKind: TerminalCliKind | null;
-  terminalId: string;
-  threadId: Thread["id"];
-  title: string;
-}
-
-export interface TerminalAttentionCandidate {
-  cliKind: TerminalCliKind | null;
-  terminalId: string;
-  threadId: Thread["id"];
-  title: string;
-}
-
 type ThreadSessionStatus = ThreadSession["status"];
 
 // Thread completion toasts are for off-screen work; visible threads already show the result inline.
@@ -186,71 +158,6 @@ export function collectCompletedThreadCandidates(
 
   return candidates;
 }
-function resolveTerminalNotificationState(
-  threadState: TerminalNotificationThreadState | undefined,
-  terminalId: string,
-): TerminalVisualState {
-  if (!threadState) {
-    return "idle";
-  }
-  if (threadState.terminalAttentionStatesById?.[terminalId] === "attention") {
-    return "attention";
-  }
-  if ((threadState.runningTerminalIds ?? []).includes(terminalId)) {
-    return "running";
-  }
-  if (threadState.terminalAttentionStatesById?.[terminalId] === "review") {
-    return "review";
-  }
-  return "idle";
-}
-
-function resolveTerminalNotificationTitle(
-  threadState: TerminalNotificationThreadState | undefined,
-  terminalId: string,
-): { cliKind: TerminalCliKind | null; title: string } {
-  const cliKind = threadState?.terminalCliKindsById?.[terminalId] ?? null;
-  const title =
-    threadState?.terminalTitleOverridesById?.[terminalId]?.trim() ||
-    threadState?.terminalLabelsById?.[terminalId]?.trim() ||
-    (cliKind ? defaultTerminalTitleForCliKind(cliKind) : "Terminal");
-  return { cliKind, title };
-}
-
-export function collectCompletedTerminalCandidates(
-  previousByThreadId: Record<string, TerminalNotificationThreadState>,
-  nextByThreadId: Record<string, TerminalNotificationThreadState>,
-): CompletedTerminalCandidate[] {
-  const threadIds = new Set([...Object.keys(previousByThreadId), ...Object.keys(nextByThreadId)]);
-  const candidates: CompletedTerminalCandidate[] = [];
-
-  for (const threadId of threadIds) {
-    const previousThreadState = previousByThreadId[threadId];
-    const nextThreadState = nextByThreadId[threadId];
-    const terminalIds = new Set([
-      ...(previousThreadState?.terminalIds ?? []),
-      ...(nextThreadState?.terminalIds ?? []),
-    ]);
-
-    for (const terminalId of terminalIds) {
-      const previousState = resolveTerminalNotificationState(previousThreadState, terminalId);
-      const nextState = resolveTerminalNotificationState(nextThreadState, terminalId);
-      if (nextState !== "review" || previousState === "review") {
-        continue;
-      }
-      const { cliKind, title } = resolveTerminalNotificationTitle(nextThreadState, terminalId);
-      candidates.push({
-        threadId: threadId as Thread["id"],
-        terminalId,
-        cliKind,
-        title,
-      });
-    }
-  }
-
-  return candidates;
-}
-
 function approvalSummary(requestKind: "command" | "file-read" | "file-change"): string {
   switch (requestKind) {
     case "command":
@@ -316,40 +223,6 @@ export function collectThreadAttentionCandidates(
   return candidates.toSorted((left, right) => left.createdAt.localeCompare(right.createdAt));
 }
 
-export function collectTerminalAttentionCandidates(
-  previousByThreadId: Record<string, TerminalNotificationThreadState>,
-  nextByThreadId: Record<string, TerminalNotificationThreadState>,
-): TerminalAttentionCandidate[] {
-  const threadIds = new Set([...Object.keys(previousByThreadId), ...Object.keys(nextByThreadId)]);
-  const candidates: TerminalAttentionCandidate[] = [];
-
-  for (const threadId of threadIds) {
-    const previousThreadState = previousByThreadId[threadId];
-    const nextThreadState = nextByThreadId[threadId];
-    const terminalIds = new Set([
-      ...(previousThreadState?.terminalIds ?? []),
-      ...(nextThreadState?.terminalIds ?? []),
-    ]);
-
-    for (const terminalId of terminalIds) {
-      const previousState = resolveTerminalNotificationState(previousThreadState, terminalId);
-      const nextState = resolveTerminalNotificationState(nextThreadState, terminalId);
-      if (nextState !== "attention" || previousState === "attention") {
-        continue;
-      }
-      const { cliKind, title } = resolveTerminalNotificationTitle(nextThreadState, terminalId);
-      candidates.push({
-        threadId: threadId as Thread["id"],
-        terminalId,
-        cliKind,
-        title,
-      });
-    }
-  }
-
-  return candidates;
-}
-
 // Keep toast and OS notification copy aligned across browser and desktop surfaces.
 export function buildTaskCompletionCopy(candidate: CompletedThreadCandidate): {
   title: string;
@@ -382,28 +255,6 @@ export function buildThreadAttentionCopy(candidate: ThreadAttentionCandidate): {
   };
 }
 
-export function buildTerminalCompletionCopy(candidate: CompletedTerminalCandidate): {
-  title: string;
-  body: string;
-} {
-  const terminalLabel = candidate.title.trim() || "Terminal";
-  return {
-    title: "Terminal task completed",
-    body: `${terminalLabel} finished working.`,
-  };
-}
-
-export function buildTerminalAttentionCopy(candidate: TerminalAttentionCandidate): {
-  title: string;
-  body: string;
-} {
-  const terminalLabel = candidate.title.trim() || "Terminal";
-  return {
-    title: "Terminal input needed",
-    body: `${terminalLabel} needs your attention.`,
-  };
-}
-
 export function shouldSuppressVisibleThreadNotification(input: {
   threadId: Thread["id"];
   visibleThreadIds: ReadonlySet<Thread["id"]>;
diff --git a/apps/web/src/notifications/taskCompletion.tsx b/apps/web/src/notifications/taskCompletion.tsx
index 2417414c4..5c41c5d0e 100644
--- a/apps/web/src/notifications/taskCompletion.tsx
+++ b/apps/web/src/notifications/taskCompletion.tsx
@@ -12,17 +12,12 @@ import { useAppSettings } from "../appSettings";
 import { isElectron } from "../env";
 import { useStore } from "../store";
 import { createAllThreadsSelector } from "../storeSelectors";
-import { useTerminalStateStore } from "../terminalStateStore";
 import type { Thread } from "../types";
 import {
-  buildTerminalAttentionCopy,
-  buildTerminalCompletionCopy,
   buildInputNeededCopy,
   buildTaskCompletionCopy,
   collectCompletedThreadCandidates,
-  collectCompletedTerminalCandidates,
   collectInputNeededThreadCandidates,
-  collectTerminalAttentionCandidates,
   isNotificationRuntimeFreshTimestamp,
   shouldShowThreadNotificationToast,
 } from "./taskCompletion.logic";
@@ -144,12 +139,10 @@ export function TaskCompletionNotifications() {
   });
   const threads = useStore(useRef(createAllThreadsSelector()).current);
   const threadsHydrated = useStore((store) => store.threadsHydrated);
-  const terminalStateByThreadId = useTerminalStateStore((store) => store.terminalStateByThreadId);
   const visibleThreadIds = useMemo(() => {
     return resolveVisibleToastThreadIds({ activeThreadId });
   }, [activeThreadId]);
   const previousThreadsRef = useRef<readonly Thread[]>([]);
-  const previousTerminalStateRef = useRef(terminalStateByThreadId);
   const runtimeStartedAtMsRef = useRef(Date.now());
   const readyRef = useRef(false);
 
@@ -183,7 +176,6 @@ export function TaskCompletionNotifications() {
 
     if (!readyRef.current) {
       previousThreadsRef.current = threads;
-      previousTerminalStateRef.current = terminalStateByThreadId;
       readyRef.current = true;
       return;
     }
@@ -194,29 +186,15 @@ export function TaskCompletionNotifications() {
     ).filter((candidate) =>
       isNotificationRuntimeFreshTimestamp(candidate.completedAt, runtimeStartedAtMsRef.current),
     );
-    const terminalCompletions = collectCompletedTerminalCandidates(
-      previousTerminalStateRef.current,
-      terminalStateByThreadId,
-    );
     const inputNeededCandidates = collectInputNeededThreadCandidates(
       previousThreadsRef.current,
       threads,
     ).filter((candidate) =>
       isNotificationRuntimeFreshTimestamp(candidate.createdAt, runtimeStartedAtMsRef.current),
     );
-    const terminalAttentionCandidates = collectTerminalAttentionCandidates(
-      previousTerminalStateRef.current,
-      terminalStateByThreadId,
-    );
     previousThreadsRef.current = threads;
-    previousTerminalStateRef.current = terminalStateByThreadId;
 
-    if (
-      completions.length === 0 &&
-      inputNeededCandidates.length === 0 &&
-      terminalCompletions.length === 0 &&
-      terminalAttentionCandidates.length === 0
-    ) {
+    if (completions.length === 0 && inputNeededCandidates.length === 0) {
       return;
     }
 
@@ -257,45 +235,10 @@ export function TaskCompletionNotifications() {
         void showSystemThreadNotification(copy, candidate.threadId, navigate);
       }
     }
-
-    for (const completion of terminalCompletions) {
-      const copy = buildTerminalCompletionCopy(completion);
-      if (
-        settings.enableTaskCompletionToasts &&
-        shouldShowThreadNotificationToast({
-          threadId: completion.threadId,
-          visibleThreadIds,
-        })
-      ) {
-        showThreadToast(copy, completion.threadId, "success", navigate);
-      }
-
-      if (shouldAttemptSystemNotification) {
-        void showSystemThreadNotification(copy, completion.threadId, navigate);
-      }
-    }
-
-    for (const candidate of terminalAttentionCandidates) {
-      const copy = buildTerminalAttentionCopy(candidate);
-      if (
-        settings.enableTaskCompletionToasts &&
-        shouldShowThreadNotificationToast({
-          threadId: candidate.threadId,
-          visibleThreadIds,
-        })
-      ) {
-        showThreadToast(copy, candidate.threadId, "warning", navigate);
-      }
-
-      if (shouldAttemptSystemNotification) {
-        void showSystemThreadNotification(copy, candidate.threadId, navigate);
-      }
-    }
   }, [
     navigate,
     settings.enableSystemTaskCompletionNotifications,
     settings.enableTaskCompletionToasts,
-    terminalStateByThreadId,
     threads,
     threadsHydrated,
     visibleThreadIds,
@@ -320,6 +263,6 @@ export function buildNotificationSettingsSupportText(
     case "unsupported":
       return "This browser does not support desktop notifications.";
     case "default":
-      return "Allow browser notifications to get alerts when chats or terminal agents finish or need input in the background.";
+      return "Allow browser notifications to get alerts when chats finish or need input in the background.";
   }
 }
diff --git a/apps/web/src/projectTerminalRunner.test.ts b/apps/web/src/projectTerminalRunner.test.ts
deleted file mode 100644
index c9b357422..000000000
--- a/apps/web/src/projectTerminalRunner.test.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-
-import { runProjectCommandInTerminal } from "./projectTerminalRunner";
-
-describe("runProjectCommandInTerminal", () => {
-  it("opens a terminal with project env and writes the command", async () => {
-    const open = vi.fn().mockResolvedValue({
-      threadId: "thread-1",
-      terminalId: "terminal-1",
-      cwd: "/repo/apps/web",
-      status: "running",
-      pid: 1234,
-      history: "",
-      exitCode: null,
-      exitSignal: null,
-      updatedAt: "2026-01-01T00:00:00.000Z",
-    });
-    const write = vi.fn().mockResolvedValue(undefined);
-
-    const result = await runProjectCommandInTerminal({
-      api: {
-        terminal: {
-          open,
-          write,
-        },
-      } as never,
-      threadId: "thread-1" as never,
-      terminalId: "terminal-1",
-      project: { cwd: "/repo" },
-      cwd: "/repo/apps/web",
-      command: "pnpm run dev",
-      worktreePath: "/repo-worktree",
-      env: { EXTRA: "1" },
-    });
-
-    expect(open).toHaveBeenCalledWith({
-      threadId: "thread-1",
-      terminalId: "terminal-1",
-      cwd: "/repo/apps/web",
-      env: {
-        CHITAURI_PROJECT_ROOT: "/repo",
-        CHITAURI_WORKTREE_PATH: "/repo-worktree",
-        EXTRA: "1",
-      },
-      cols: 120,
-      rows: 30,
-    });
-    expect(write).toHaveBeenCalledWith({
-      threadId: "thread-1",
-      terminalId: "terminal-1",
-      data: "pnpm run dev\r",
-    });
-    expect(result.snapshot.pid).toBe(1234);
-  });
-});
diff --git a/apps/web/src/projectTerminalRunner.ts b/apps/web/src/projectTerminalRunner.ts
deleted file mode 100644
index 4ec7420d0..000000000
--- a/apps/web/src/projectTerminalRunner.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// FILE: projectTerminalRunner.ts
-// Purpose: Shared helper for launching project commands in managed terminal sessions.
-// Layer: Web terminal orchestration helper
-// Exports: runProjectCommandInTerminal and default dimensions for script terminals.
-
-import type { NativeApi, TerminalSessionSnapshot, ThreadId } from "@t3tools/contracts";
-import {
-  deriveTerminalCommandIdentity,
-  type TerminalCliKind,
-} from "@t3tools/shared/terminalThreads";
-
-import { projectScriptRuntimeEnv } from "./projectScripts";
-
-export const PROJECT_COMMAND_TERMINAL_COLS = 120;
-export const PROJECT_COMMAND_TERMINAL_ROWS = 30;
-
-export interface ProjectCommandTerminalMetadata {
-  cliKind: TerminalCliKind | null;
-  label: string;
-}
-
-export async function runProjectCommandInTerminal(input: {
-  api: NativeApi;
-  threadId: ThreadId;
-  terminalId: string;
-  project: { cwd: string };
-  cwd: string;
-  command: string;
-  worktreePath?: string | null;
-  env?: Record<string, string>;
-}): Promise<{
-  snapshot: TerminalSessionSnapshot;
-  metadata: ProjectCommandTerminalMetadata | null;
-}> {
-  const runtimeEnv = projectScriptRuntimeEnv({
-    project: {
-      cwd: input.project.cwd,
-    },
-    worktreePath: input.worktreePath ?? null,
-    ...(input.env ? { extraEnv: input.env } : {}),
-  });
-  const terminalCommandIdentity = deriveTerminalCommandIdentity(input.command);
-  const snapshot = await input.api.terminal.open({
-    threadId: input.threadId,
-    terminalId: input.terminalId,
-    cwd: input.cwd,
-    env: runtimeEnv,
-    cols: PROJECT_COMMAND_TERMINAL_COLS,
-    rows: PROJECT_COMMAND_TERMINAL_ROWS,
-  });
-  await input.api.terminal.write({
-    threadId: input.threadId,
-    terminalId: input.terminalId,
-    data: `${input.command}\r`,
-  });
-
-  return {
-    snapshot,
-    metadata: terminalCommandIdentity
-      ? {
-          cliKind: terminalCommandIdentity.cliKind,
-          label: terminalCommandIdentity.title,
-        }
-      : null,
-  };
-}
diff --git a/apps/web/src/rightDockStore.logic.ts b/apps/web/src/rightDockStore.logic.ts
deleted file mode 100644
index a65f93351..000000000
--- a/apps/web/src/rightDockStore.logic.ts
+++ /dev/null
@@ -1,272 +0,0 @@
-// FILE: rightDockStore.logic.ts
-// Purpose: Pure, testable transitions for the right dock (tabbed multi-pane right sidebar).
-// Layer: UI state helpers
-// Exports: dock pane types, default-state factory, and immutable open/close/activate helpers.
-
-import type { TurnId } from "@t3tools/contracts";
-import { isPlainObject, sanitizeStringKeyedRecord } from "./persistedRecord";
-
-// Single source of truth for the dock pane kinds. The union type, the runtime
-// validator, the per-kind metadata map, and the add-menu order are all derived
-// from this list so they can never drift apart.
-export const RIGHT_DOCK_PANE_KINDS = ["diff", "explorer", "terminal"] as const;
-
-export type RightDockPaneKind = (typeof RIGHT_DOCK_PANE_KINDS)[number];
-
-const RIGHT_DOCK_PANE_KIND_SET: ReadonlySet<string> = new Set(RIGHT_DOCK_PANE_KINDS);
-
-export interface RightDockPane {
-  id: string;
-  kind: RightDockPaneKind;
-  // diff panes remember which turn/file they were opened on.
-  diffTurnId: TurnId | null;
-  diffFilePath: string | null;
-  // Explorer panes remember the file selected from chat or the tree.
-  filePath: string | null;
-}
-
-export interface RightDockThreadState {
-  open: boolean;
-  panes: RightDockPane[];
-  activePaneId: string | null;
-}
-
-export const SINGLETON_PANE_KINDS: ReadonlySet<RightDockPaneKind> = new Set(RIGHT_DOCK_PANE_KINDS);
-
-export function isSingletonPaneKind(kind: RightDockPaneKind): boolean {
-  return SINGLETON_PANE_KINDS.has(kind);
-}
-
-export function createDefaultRightDockState(): RightDockThreadState {
-  return {
-    open: false,
-    panes: [],
-    activePaneId: null,
-  };
-}
-
-export function isRightDockPaneKind(value: unknown): value is RightDockPaneKind {
-  return typeof value === "string" && RIGHT_DOCK_PANE_KIND_SET.has(value);
-}
-
-// Persisted dock state predates the current pane-kind union, so a stale entry
-// (e.g. a kind that was renamed or removed) can crash the dock during render.
-// Drop any pane we no longer understand and keep the active tab pointing at a
-// surviving pane.
-function sanitizePersistedPane(value: unknown): RightDockPane | null {
-  if (!isPlainObject(value)) {
-    return null;
-  }
-  const candidate = value;
-  if (typeof candidate.id !== "string" || !isRightDockPaneKind(candidate.kind)) {
-    return null;
-  }
-  return {
-    id: candidate.id,
-    kind: candidate.kind,
-    diffTurnId: typeof candidate.diffTurnId === "string" ? (candidate.diffTurnId as TurnId) : null,
-    diffFilePath: typeof candidate.diffFilePath === "string" ? candidate.diffFilePath : null,
-    filePath: typeof candidate.filePath === "string" ? candidate.filePath : null,
-  };
-}
-
-export function sanitizeRightDockThreadState(value: unknown): RightDockThreadState {
-  if (!isPlainObject(value)) {
-    return createDefaultRightDockState();
-  }
-  const candidate = value;
-  const panes = Array.isArray(candidate.panes)
-    ? candidate.panes
-        .map(sanitizePersistedPane)
-        .filter((pane): pane is RightDockPane => pane !== null)
-    : [];
-  const activePaneId =
-    typeof candidate.activePaneId === "string" &&
-    panes.some((pane) => pane.id === candidate.activePaneId)
-      ? candidate.activePaneId
-      : (panes[0]?.id ?? null);
-  return {
-    open: panes.length > 0 && candidate.open === true,
-    panes,
-    activePaneId,
-  };
-}
-
-export function sanitizeRightDockStateByThreadId(
-  value: unknown,
-): Record<string, RightDockThreadState> {
-  return sanitizeStringKeyedRecord(value, (raw) =>
-    raw === undefined ? null : sanitizeRightDockThreadState(raw),
-  );
-}
-
-export interface OpenPaneInput {
-  paneId: string;
-  kind: RightDockPaneKind;
-  diffTurnId?: TurnId | null;
-  diffFilePath?: string | null;
-  filePath?: string | null;
-}
-
-function createPane(input: OpenPaneInput): RightDockPane {
-  return {
-    id: input.paneId,
-    kind: input.kind,
-    diffTurnId: input.diffTurnId ?? null,
-    diffFilePath: input.diffFilePath ?? null,
-    filePath: input.filePath ?? null,
-  };
-}
-
-// Payload to merge into an existing singleton pane when re-opening it. Only
-// overwrite content metadata when the caller explicitly targets new content,
-// so a bare re-open/toggle keeps the pane focused on what it currently shows.
-function singletonPaneReopenPatch(input: OpenPaneInput): Partial<RightDockPane> | null {
-  if (
-    input.kind === "diff" &&
-    (input.diffTurnId !== undefined || input.diffFilePath !== undefined)
-  ) {
-    return { diffTurnId: input.diffTurnId ?? null, diffFilePath: input.diffFilePath ?? null };
-  }
-  if (input.kind === "explorer" && input.filePath !== undefined) {
-    return { filePath: input.filePath ?? null };
-  }
-  return null;
-}
-
-function findSingletonPane(
-  state: RightDockThreadState,
-  kind: RightDockPaneKind,
-): RightDockPane | undefined {
-  return state.panes.find((pane) => pane.kind === kind);
-}
-
-// Opens (or focuses) a pane and makes the dock visible. Singleton kinds reuse
-// the existing pane and merge diff metadata; multi-instance kinds add a new
-// pane unless one already shows the same content (thread / file).
-export function openPaneInState(
-  state: RightDockThreadState,
-  input: OpenPaneInput,
-): RightDockThreadState {
-  const existing = findSingletonPane(state, input.kind);
-  if (existing) {
-    const patch = singletonPaneReopenPatch(input);
-    const nextPanes = patch
-      ? state.panes.map((pane) => (pane.id === existing.id ? { ...pane, ...patch } : pane))
-      : state.panes;
-    return { open: true, panes: nextPanes, activePaneId: existing.id };
-  }
-
-  const pane = createPane(input);
-  return {
-    open: true,
-    panes: [...state.panes, pane],
-    activePaneId: pane.id,
-  };
-}
-
-function resolveActiveAfterRemoval(
-  panes: RightDockPane[],
-  removedIndex: number,
-  previousActiveId: string | null,
-  removedId: string,
-): string | null {
-  if (previousActiveId !== removedId) {
-    return previousActiveId;
-  }
-  if (panes.length === 0) {
-    return null;
-  }
-  const neighborIndex = Math.min(removedIndex, panes.length - 1);
-  return panes[neighborIndex]?.id ?? null;
-}
-
-export function closePaneInState(
-  state: RightDockThreadState,
-  paneId: string,
-): RightDockThreadState {
-  const removedIndex = state.panes.findIndex((pane) => pane.id === paneId);
-  if (removedIndex === -1) {
-    return state;
-  }
-  const nextPanes = state.panes.filter((pane) => pane.id !== paneId);
-  const nextActiveId = resolveActiveAfterRemoval(
-    nextPanes,
-    removedIndex,
-    state.activePaneId,
-    paneId,
-  );
-  return {
-    open: nextPanes.length > 0 ? state.open : false,
-    panes: nextPanes,
-    activePaneId: nextActiveId,
-  };
-}
-
-export function setActivePaneInState(
-  state: RightDockThreadState,
-  paneId: string,
-): RightDockThreadState {
-  if (!state.panes.some((pane) => pane.id === paneId)) {
-    return state;
-  }
-  return { ...state, open: true, activePaneId: paneId };
-}
-
-export function setDockOpenInState(
-  state: RightDockThreadState,
-  open: boolean,
-): RightDockThreadState {
-  if (open && state.panes.length === 0) {
-    return state;
-  }
-  if (state.open === open) {
-    return state;
-  }
-  return { ...state, open };
-}
-
-export function updatePaneInState(
-  state: RightDockThreadState,
-  paneId: string,
-  patch: Partial<Pick<RightDockPane, "diffTurnId" | "diffFilePath" | "filePath">>,
-): RightDockThreadState {
-  let changed = false;
-  const nextPanes = state.panes.map((pane) => {
-    if (pane.id !== paneId) {
-      return pane;
-    }
-    const nextPane = { ...pane, ...patch };
-    if (
-      nextPane.diffTurnId !== pane.diffTurnId ||
-      nextPane.diffFilePath !== pane.diffFilePath ||
-      nextPane.filePath !== pane.filePath
-    ) {
-      changed = true;
-      return nextPane;
-    }
-    return pane;
-  });
-  return changed ? { ...state, panes: nextPanes } : state;
-}
-
-// Header toggles behave like a visibility switch for a singleton kind: if that
-// kind is the active visible pane, collapse the dock (preserving tabs);
-// otherwise open/focus it.
-export function toggleSingletonPaneInState(
-  state: RightDockThreadState,
-  input: OpenPaneInput,
-): RightDockThreadState {
-  const existing = findSingletonPane(state, input.kind);
-  if (existing && state.open && state.activePaneId === existing.id) {
-    return { ...state, open: false };
-  }
-  return openPaneInState(state, input);
-}
-
-export function resolveActivePane(state: RightDockThreadState): RightDockPane | null {
-  if (!state.open || state.activePaneId === null) {
-    return null;
-  }
-  return state.panes.find((pane) => pane.id === state.activePaneId) ?? null;
-}
diff --git a/apps/web/src/rightDockStore.ts b/apps/web/src/rightDockStore.ts
deleted file mode 100644
index ca9491d89..000000000
--- a/apps/web/src/rightDockStore.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-// FILE: rightDockStore.ts
-// Purpose: Persist the tabbed right-dock state (open panes + active tab) per host thread.
-// Layer: UI state store
-// Exports: dock store hook, per-thread selector, and stable default snapshot.
-
-import type { ThreadId } from "@t3tools/contracts";
-import { create } from "zustand";
-import { createJSONStorage, persist } from "zustand/middleware";
-
-import { randomUUID } from "./lib/utils";
-import {
-  type OpenPaneInput,
-  type RightDockPane,
-  type RightDockThreadState,
-  closePaneInState,
-  createDefaultRightDockState,
-  openPaneInState,
-  sanitizeRightDockStateByThreadId,
-  setActivePaneInState,
-  setDockOpenInState,
-  toggleSingletonPaneInState,
-  updatePaneInState,
-} from "./rightDockStore.logic";
-
-const RIGHT_DOCK_STORAGE_KEY = "teacode:right-dock-state:v1";
-
-interface RightDockStore {
-  dockStateByThreadId: Record<string, RightDockThreadState | undefined>;
-  openPane: (
-    threadId: ThreadId,
-    input: Omit<OpenPaneInput, "paneId"> & { paneId?: string },
-  ) => void;
-  toggleSingletonPane: (
-    threadId: ThreadId,
-    input: Omit<OpenPaneInput, "paneId"> & { paneId?: string },
-  ) => void;
-  closePane: (threadId: ThreadId, paneId: string) => void;
-  setActivePane: (threadId: ThreadId, paneId: string) => void;
-  setDockOpen: (threadId: ThreadId, open: boolean) => void;
-  updatePane: (
-    threadId: ThreadId,
-    paneId: string,
-    patch: Partial<Pick<RightDockPane, "diffTurnId" | "diffFilePath" | "filePath">>,
-  ) => void;
-  clearThreadDockState: (threadId: ThreadId) => void;
-}
-
-// Frozen shared snapshot: it is handed back from `selectRightDockState` for any
-// thread without persisted dock state, so it must stay a stable, immutable
-// reference (transitions always build new objects rather than mutating it).
-const DEFAULT_RIGHT_DOCK_STATE = createDefaultRightDockState();
-Object.freeze(DEFAULT_RIGHT_DOCK_STATE);
-Object.freeze(DEFAULT_RIGHT_DOCK_STATE.panes);
-
-function commit(
-  set: (fn: (store: RightDockStore) => Partial<RightDockStore>) => void,
-  threadId: ThreadId,
-  transform: (state: RightDockThreadState) => RightDockThreadState,
-): void {
-  set((store) => {
-    const previous = store.dockStateByThreadId[threadId] ?? DEFAULT_RIGHT_DOCK_STATE;
-    const next = transform(previous);
-    if (next === previous) {
-      return {};
-    }
-    return {
-      dockStateByThreadId: {
-        ...store.dockStateByThreadId,
-        [threadId]: next,
-      },
-    };
-  });
-}
-
-export const useRightDockStore = create<RightDockStore>()(
-  persist(
-    (set) => ({
-      dockStateByThreadId: {},
-      openPane: (threadId, input) =>
-        commit(set, threadId, (state) =>
-          openPaneInState(state, { ...input, paneId: input.paneId ?? randomUUID() }),
-        ),
-      toggleSingletonPane: (threadId, input) =>
-        commit(set, threadId, (state) =>
-          toggleSingletonPaneInState(state, { ...input, paneId: input.paneId ?? randomUUID() }),
-        ),
-      closePane: (threadId, paneId) =>
-        commit(set, threadId, (state) => closePaneInState(state, paneId)),
-      setActivePane: (threadId, paneId) =>
-        commit(set, threadId, (state) => setActivePaneInState(state, paneId)),
-      setDockOpen: (threadId, open) =>
-        commit(set, threadId, (state) => setDockOpenInState(state, open)),
-      updatePane: (threadId, paneId, patch) =>
-        commit(set, threadId, (state) => updatePaneInState(state, paneId, patch)),
-      clearThreadDockState: (threadId) =>
-        set((store) => {
-          if (!Object.hasOwn(store.dockStateByThreadId, threadId)) {
-            return {};
-          }
-          const next = { ...store.dockStateByThreadId };
-          delete next[threadId];
-          return { dockStateByThreadId: next };
-        }),
-    }),
-    {
-      name: RIGHT_DOCK_STORAGE_KEY,
-      storage: createJSONStorage(() => localStorage),
-      // Validate persisted panes on rehydrate so a stale/unknown pane kind from
-      // an older app version can never crash the dock during render.
-      merge: (persisted, current) => ({
-        ...current,
-        dockStateByThreadId: sanitizeRightDockStateByThreadId(
-          (persisted as { dockStateByThreadId?: unknown } | undefined)?.dockStateByThreadId,
-        ),
-      }),
-    },
-  ),
-);
-
-export function selectRightDockState(threadId: ThreadId) {
-  // Keep the fallback snapshot stable so React does not observe phantom store
-  // changes while mounting a thread that has no persisted dock state yet.
-  return (store: RightDockStore) => store.dockStateByThreadId[threadId] ?? DEFAULT_RIGHT_DOCK_STATE;
-}
diff --git a/apps/web/src/routes/-chatThreadRoute.logic.ts b/apps/web/src/routes/-chatThreadRoute.logic.ts
deleted file mode 100644
index e8756825f..000000000
--- a/apps/web/src/routes/-chatThreadRoute.logic.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-// FILE: chatThreadRoute.logic.ts
-// Purpose: Keep route-level chat panel state transitions and fallbacks deterministic.
-// Layer: Route UI logic helpers.
-// Exports: thread title fallback, deep-link bootstrap replay handling, and panel toggle helpers.
-
-import type { ThreadEnvironmentMode, TurnId } from "@t3tools/contracts";
-import { resolveThreadWorkspaceCwd } from "@t3tools/shared/threadEnvironment";
-
-import type { ChatRightPanel, DiffRouteSearch } from "../diffRouteSearch";
-
-export interface ChatPanelStateSnapshot {
-  panel: ChatRightPanel | null;
-  diffTurnId: TurnId | null;
-  diffFilePath: string | null;
-}
-
-export interface ChatPanelStatePatch {
-  panel?: ChatRightPanel | null;
-  diffTurnId?: TurnId | null;
-  diffFilePath?: string | null;
-}
-
-export interface RoutePanelBootstrapResult {
-  nextAppliedSearchKey: string | null;
-  panelPatch: ChatPanelStatePatch | null;
-}
-
-// File previews follow the thread runtime cwd so worktree chats open the files they actually edit.
-export function resolveFilePreviewWorkspaceRoot(input: {
-  projectCwd?: string | null | undefined;
-  threadEnvMode?: ThreadEnvironmentMode | null | undefined;
-  threadWorktreePath?: string | null | undefined;
-}): string | null {
-  return resolveThreadWorkspaceCwd({
-    projectCwd: input.projectCwd,
-    envMode: input.threadEnvMode,
-    worktreePath: input.threadWorktreePath,
-  });
-}
-
-function createRoutePanelSearchKey(input: {
-  scopeId: string;
-  search: DiffRouteSearch;
-}): string | null {
-  const { scopeId, search } = input;
-  if (
-    search.panel === undefined &&
-    search.diff === undefined &&
-    search.diffTurnId === undefined &&
-    search.diffFilePath === undefined
-  ) {
-    return null;
-  }
-
-  return JSON.stringify({
-    scopeId,
-    panel: search.panel ?? (search.diff ? "diff" : null),
-    diffTurnId: search.diffTurnId ?? null,
-    diffFilePath: search.diffFilePath ?? null,
-  });
-}
-
-export function resolveRoutePanelBootstrap(input: {
-  scopeId: string;
-  search: DiffRouteSearch;
-  lastAppliedSearchKey: string | null;
-}): RoutePanelBootstrapResult {
-  const nextAppliedSearchKey = createRoutePanelSearchKey({
-    scopeId: input.scopeId,
-    search: input.search,
-  });
-
-  if (nextAppliedSearchKey === null) {
-    return {
-      nextAppliedSearchKey: null,
-      panelPatch: null,
-    };
-  }
-
-  if (input.lastAppliedSearchKey === nextAppliedSearchKey) {
-    return {
-      nextAppliedSearchKey,
-      panelPatch: null,
-    };
-  }
-
-  return {
-    nextAppliedSearchKey,
-    panelPatch: {
-      panel: input.search.panel ?? (input.search.diff ? "diff" : null),
-      diffTurnId: input.search.diffTurnId ?? null,
-      diffFilePath: input.search.diffFilePath ?? null,
-    },
-  };
-}
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index 35616196c..28007f52e 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -8,7 +8,6 @@ import {
   type ServerConfig,
   type ServerProviderStatus,
 } from "@t3tools/contracts";
-import { defaultTerminalTitleForCliKind } from "@t3tools/shared/terminalThreads";
 import {
   Outlet,
   createRootRouteWithContext,
@@ -30,7 +29,6 @@ import ShortcutsDialog from "../components/ShortcutsDialog";
 import WhatsNewDialog from "../components/WhatsNewDialog";
 import { useWhatsNew } from "../whatsNew/useWhatsNew";
 import { WhatsNewPopoutCard } from "../whatsNew/WhatsNewPopoutCard";
-import { shouldRenderTerminalWorkspace } from "../components/ChatView.logic";
 import { Button, dialogActionButtonClassName } from "../components/ui/button";
 import { OVERLAY_SURFACE_CLASS_NAME } from "../components/ui/surface";
 import { AnchoredToastProvider, ToastProvider, toastManager } from "../components/ui/toast";
@@ -38,7 +36,6 @@ import { useGitProgressToastPreview } from "../components/useGitProgressToastPre
 import { resolveAndPersistPreferredEditor } from "../editorPreferences";
 import { useFeatureFlags } from "../featureFlags";
 import { useFocusedChatContext } from "../focusedChatContext";
-import { isTerminalFocused } from "../lib/terminalFocus";
 import {
   serverConfigQueryOptions,
   serverQueryKeys,
@@ -51,8 +48,6 @@ import {
   useComposerDraftStore,
 } from "../composerDraftStore";
 import { useStore } from "../store";
-import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
-import { terminalActivityFromEvent } from "../terminalActivity";
 import {
   onServerConfigUpdated,
   onServerProviderStatusesUpdated,
@@ -61,9 +56,7 @@ import {
 } from "../wsNativeApi";
 import { providerQueryKeys } from "../lib/providerReactQuery";
 import { invalidateProjectFileQueriesForCwds, projectQueryKeys } from "../lib/projectReactQuery";
-import { collectActiveTerminalThreadIds } from "../lib/terminalStateCleanup";
 import { useProjectRunStore } from "../projectRunStore";
-import { dockTerminalThreadId } from "../lib/dockTerminalScope";
 import { TaskCompletionNotifications } from "../notifications/taskCompletion";
 import { useWorkspaceStore } from "../workspaceStore";
 import {
@@ -71,8 +64,8 @@ import {
   useRetainedThreadDetailIds,
 } from "../threadDetailSubscriptionRetention";
 import { getThreadFromState } from "../threadDerivation";
-import { useAppDensity } from "../hooks/useAppDensity";
 import { useAppTypography } from "../hooks/useAppTypography";
+import { useWindowTransparency } from "../hooks/useWindowTransparency";
 import { usePreloadSettingsRoute } from "../hooks/usePreloadSettingsRoute";
 import { useSyncDesktopTopBarTrafficLightGutterZoom } from "../hooks/useDesktopTopBarGutter";
 import { useTheme } from "../hooks/useTheme";
@@ -147,7 +140,7 @@ export const Route = createRootRouteWithContext<{
 
 function RootRouteView() {
   useAppTypography();
-  useAppDensity();
+  useWindowTransparency();
   usePreloadSettingsRoute();
   useNativeFontSmoothing();
   useSyncDesktopTopBarTrafficLightGutterZoom();
@@ -499,16 +492,6 @@ function GlobalShortcutsDialog() {
   const serverConfigQuery = useQuery(serverConfigQueryOptions());
   const keybindings = serverConfigQuery.data?.keybindings ?? [];
   const platform = typeof navigator === "undefined" ? "" : navigator.platform;
-  const activeThreadTerminalState = useTerminalStateStore((state) =>
-    focusedThreadId
-      ? selectThreadTerminalState(state.terminalStateByThreadId, focusedThreadId)
-      : null,
-  );
-  const terminalOpen = activeThreadTerminalState?.terminalOpen ?? false;
-  const terminalWorkspaceOpen = shouldRenderTerminalWorkspace({
-    presentationMode: activeThreadTerminalState?.presentationMode ?? "drawer",
-    terminalOpen,
-  });
 
   useEffect(() => {
     const onMenuAction = window.desktopBridge?.onMenuAction;
@@ -534,11 +517,6 @@ function GlobalShortcutsDialog() {
       keybindings={keybindings}
       projectScripts={activeProject?.kind === "project" ? activeProject.scripts : []}
       platform={platform}
-      context={{
-        terminalFocus: isTerminalFocused(),
-        terminalOpen,
-        terminalWorkspaceOpen,
-      }}
     />
   );
 }
@@ -777,9 +755,6 @@ function EventRouter() {
     (store) => store.applyOrchestrationEventsHotPath,
   );
   const setProjectExpanded = useStore((store) => store.setProjectExpanded);
-  const removeOrphanedTerminalStates = useTerminalStateStore(
-    (store) => store.removeOrphanedTerminalStates,
-  );
   const setServerWorkspacePaths = useWorkspaceStore((store) => store.setServerWorkspacePaths);
   const serverThreads = useStore((store) => store.threads);
   const queryClient = useQueryClient();
@@ -962,7 +937,6 @@ function EventRouter() {
       shellSnapshotSequence = snapshot.snapshotSequence;
       syncServerShellSnapshot(snapshot);
       reconcilePromotedDraftsFromShellThreads(snapshot.threads);
-      removeOrphanedTerminalsForCurrentState();
       flushShellBuffer(snapshot.snapshotSequence);
     };
 
@@ -977,28 +951,6 @@ function EventRouter() {
       await enqueueThreadSubscriptionReconcile(visibleThreadIdsRef.current);
     };
 
-    const removeOrphanedTerminalsForCurrentState = () => {
-      const draftThreadIds = Object.keys(
-        useComposerDraftStore.getState().draftThreadsByThreadId,
-      ) as ThreadId[];
-      const activeThreadIds = collectActiveTerminalThreadIds({
-        snapshotThreads: useStore.getState().threads.map((thread) => ({
-          id: thread.id,
-          deletedAt: null,
-          archivedAt: thread.archivedAt ?? null,
-        })),
-        draftThreadIds,
-        retainedThreadIds: [],
-      });
-      // Right-dock terminals live under a synthetic scope derived from each active
-      // thread; retain those scopes so docked terminals are not pruned mid-session.
-      // Snapshot first: we mutate the set while iterating its prior membership.
-      for (const activeThreadId of Array.from(activeThreadIds)) {
-        activeThreadIds.add(dockTerminalThreadId(activeThreadId));
-      }
-      removeOrphanedTerminalStates(activeThreadIds);
-    };
-
     const flushPendingDomainEvents = () => {
       if (pendingDomainEvents.length > 0) {
         applyOrchestrationEventsHotPath(coalesceOrchestrationUiEvents(pendingDomainEvents));
@@ -1193,7 +1145,6 @@ function EventRouter() {
         shellSnapshotSequence = item.snapshot.snapshotSequence;
         syncServerShellSnapshot(item.snapshot);
         reconcilePromotedDraftsFromShellThreads(item.snapshot.threads);
-        removeOrphanedTerminalsForCurrentState();
         flushShellBuffer(item.snapshot.snapshotSequence);
         return;
       }
@@ -1237,32 +1188,9 @@ function EventRouter() {
       threadSnapshotSequenceById.set(threadId, item.event.sequence);
       queueDomainEvent(item.event);
     });
-    const unsubTerminalEvent = api.terminal.onEvent((event) => {
-      const terminalThreadId = ThreadId.makeUnsafe(event.threadId);
-      if (event.type === "activity") {
-        const terminalStore = useTerminalStateStore.getState();
-        const currentCliKind =
-          selectThreadTerminalState(terminalStore.terminalStateByThreadId, terminalThreadId)
-            .terminalCliKindsById[event.terminalId] ?? null;
-        if (event.cliKind || currentCliKind !== null) {
-          terminalStore.setTerminalMetadata(terminalThreadId, event.terminalId, {
-            cliKind: event.cliKind,
-            label: event.cliKind ? defaultTerminalTitleForCliKind(event.cliKind) : "Terminal",
-          });
-        }
-      }
-      const activity = terminalActivityFromEvent(event);
-      if (activity === null) {
-        return;
-      }
-      useTerminalStateStore.getState().setTerminalActivity(terminalThreadId, event.terminalId, {
-        hasRunningSubprocess: activity.hasRunningSubprocess,
-        agentState: activity.agentState,
-      });
-    });
     // Dev servers are first-class server processes; mirror their lifecycle into the
     // client store so the sidebar indicator survives reconnects and stays consistent
-    // across tabs without owning any thread/terminal state.
+    // across tabs without owning any thread state.
     const invalidateLocalServers = () => {
       void queryClient.invalidateQueries({ queryKey: serverQueryKeys.localServers() });
     };
@@ -1449,7 +1377,6 @@ function EventRouter() {
       unsubscribeRetainedThreadIdChanges();
       unsubShellEvent();
       unsubThreadEvent();
-      unsubTerminalEvent();
       unsubDevServerEvent();
       unsubWelcome();
       unsubServerConfigUpdated();
@@ -1461,7 +1388,6 @@ function EventRouter() {
     applyShellEvents,
     navigate,
     queryClient,
-    removeOrphanedTerminalStates,
     setProjectExpanded,
     setServerWorkspacePaths,
     syncServerShellSnapshot,
diff --git a/apps/web/src/routes/_chat.$threadId.tsx b/apps/web/src/routes/_chat.$threadId.tsx
index 4133cf5eb..ff38305ff 100644
--- a/apps/web/src/routes/_chat.$threadId.tsx
+++ b/apps/web/src/routes/_chat.$threadId.tsx
@@ -1,45 +1,14 @@
 // FILE: _chat.$threadId.tsx
-// Purpose: Resolves the active thread route into the chat and its focused project tools.
+// Purpose: Resolves the active thread route into its chat surface.
 // Layer: Route container
-// Depends on: ChatView, editor view, and the Explorer/Diff/Terminal right dock.
+// Depends on: ChatView and the thread-route restore helpers.
 
-import {
-  type ProjectId,
-  ThreadId,
-  type ThreadId as ThreadIdType,
-  type TurnId,
-} from "@t3tools/contracts";
-import type { FileDiffMetadata } from "@pierre/diffs/react";
-import { isWorkspaceRelativePathSafe } from "@t3tools/shared/path";
-import { useQueryClient } from "@tanstack/react-query";
+import { type ProjectId, ThreadId } from "@t3tools/contracts";
 import { createFileRoute, useNavigate } from "@tanstack/react-router";
-import {
-  Suspense,
-  lazy,
-  type ReactNode,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import ChatView from "../components/ChatView";
 import { ProjectSurfaceFrame } from "../components/ProjectSurfaceFrame";
-import { EditorWorkspaceView } from "../components/EditorWorkspaceView";
-import { DiffWorkerPoolProvider } from "../components/DiffWorkerPoolProvider";
-import {
-  DiffPanelHeaderSkeleton,
-  DiffPanelLoadingState,
-  DiffPanelShell,
-  type DiffPanelMode,
-} from "../components/DiffPanelShell";
 import { useComposerDraftStore } from "../composerDraftStore";
-import { useDockPaneRuntimeActivation } from "../hooks/useDockPaneRuntimeActivation";
-import {
-  type DiffRouteSearch,
-  parseDiffRouteSearch,
-  stripDiffSearchParams,
-} from "../diffRouteSearch";
 import {
   type EmptyRouteRestoreRecoveryState,
   shouldHoldMissingThreadRouteFallback,
@@ -49,60 +18,10 @@ import {
   refreshEmptyRouteRestoreSnapshot,
   waitForEmptyRouteRestoreFallbackDelay,
 } from "../chatRouteRecovery";
-import { useHandleNewThread } from "../hooks/useHandleNewThread";
-import type { ChatPanelState } from "../chatPanelState";
-import { selectRightDockState, useRightDockStore } from "../rightDockStore";
-import {
-  type RightDockPane,
-  type RightDockPaneKind,
-  resolveActivePane,
-} from "../rightDockStore.logic";
-import { RightDock } from "../components/chat/RightDock";
-import { DockTerminalPane } from "../components/chat/DockTerminalPane";
-import { PanelStateMessage } from "../components/chat/PanelStateMessage";
-import { RIGHT_DOCK_ADD_MENU_KINDS } from "../components/chat/rightDockPaneMeta";
-import { DockExplorerPane } from "../components/chat/DockExplorerPane";
-import { readEditorViewState, storeEditorViewState } from "../editorViewState";
-import {
-  addChatFileComment,
-  appendChatFileReference,
-  appendComposerPromptText,
-  buildWhyLinesPrompt,
-  type ChatFileReference,
-} from "../lib/chatReferences";
-import type { FileCommentSelection } from "../lib/fileComments";
-import { type DockPaneRuntimeMode } from "../lib/dockPaneActivation";
-import { projectListDirectoriesQueryOptions } from "../lib/projectReactQuery";
-import {
-  WorkspaceFileOpenerContext,
-  prefetchWorkspaceFile,
-  resolveDockFileOpenTarget,
-  resolveWorkspaceFileOpenTarget,
-  type WorkspaceFileOpener,
-} from "../lib/workspaceFileOpener";
-import {
-  canComposerHandlePanelWidth,
-  createPanelResizeOverlay,
-  removePanelResizeOverlay,
-} from "../lib/panelResize";
-import { EDITOR_CHAT_PANE_SCOPE_ID, SINGLE_CHAT_PANE_SCOPE_ID } from "../lib/chatPaneScope";
-import { toastManager } from "../components/ui/toast";
-import { useAppSettings } from "../appSettings";
+import { SINGLE_CHAT_PANE_SCOPE_ID } from "../lib/chatPaneScope";
 import { useStore } from "../store";
 import { readNativeApi } from "../nativeApi";
-import {
-  createProjectSelector,
-  createSidebarThreadSummariesSelector,
-  createThreadExistsSelector,
-  createThreadProjectIdSelector,
-  createThreadWorkspaceMetadataSelector,
-} from "../storeSelectors";
-import { sortThreadsForSidebar } from "../components/Sidebar.logic";
-import {
-  resolveFilePreviewWorkspaceRoot,
-  resolveRoutePanelBootstrap,
-} from "./-chatThreadRoute.logic";
-import { getLocalStorageItem, setLocalStorageItem } from "~/hooks/useLocalStorage";
+import { createThreadExistsSelector, createThreadProjectIdSelector } from "../storeSelectors";
 import {
   CHAT_SURFACE_TRANSPARENT_CLASS_NAME,
   CHAT_MAIN_CONTENT_SURFACE_CLASS_NAME,
@@ -110,92 +29,6 @@ import {
 } from "../components/chat/composerPickerStyles";
 import { cn } from "~/lib/utils";
 import { RouteInsetSurface } from "~/components/RouteInsetSurface";
-import { SidebarInset } from "~/components/ui/sidebar";
-
-const DiffPanel = lazy(() => import("../components/DiffPanel"));
-// Pre-measure approximation of the dock's 50/50 split (half the viewport minus
-// half a 16rem left sidebar). RightDock measures the actual shell on open and
-// pins the width to exactly half; this only covers the first paint before that
-// effect runs. `max()` keeps a sane minimum on narrow screens.
-const DIFF_INLINE_DEFAULT_WIDTH = "max(28rem, calc(50vw - 8rem))";
-const SINGLE_PANEL_MIN_WIDTH = 26 * 16;
-const DiffLoadingFallback = (props: { mode: DiffPanelMode; hideHeader?: boolean }) => {
-  return (
-    <DiffPanelShell
-      mode={props.mode}
-      header={props.hideHeader ? null : <DiffPanelHeaderSkeleton />}
-    >
-      <DiffPanelLoadingState label="Loading diff viewer..." />
-    </DiffPanelShell>
-  );
-};
-
-const LazyDiffPanel = (props: {
-  mode: DiffPanelMode;
-  threadId?: ThreadIdType | null;
-  panelState?: Pick<ChatPanelState, "panel" | "diffTurnId" | "diffFilePath">;
-  onUpdatePanelState?: (
-    patch: Partial<Pick<ChatPanelState, "panel" | "diffTurnId" | "diffFilePath">>,
-  ) => void;
-  onClosePanel?: () => void;
-  liveRefreshEnabled?: boolean;
-  queriesEnabled?: boolean;
-  hideHeader?: boolean;
-  onRenderableFilesChange?: (files: ReadonlyArray<FileDiffMetadata>, isLoading: boolean) => void;
-  onEditorDiffOptionsChange?: (control: ReactNode | null) => void;
-}) => {
-  return (
-    <DiffWorkerPoolProvider>
-      <Suspense
-        fallback={
-          <DiffLoadingFallback
-            mode={props.mode}
-            {...(props.hideHeader !== undefined ? { hideHeader: props.hideHeader } : {})}
-          />
-        }
-      >
-        <DiffPanel
-          mode={props.mode}
-          {...(props.threadId !== undefined ? { threadId: props.threadId } : {})}
-          {...(props.panelState ? { panelState: props.panelState } : {})}
-          {...(props.onUpdatePanelState ? { onUpdatePanelState: props.onUpdatePanelState } : {})}
-          {...(props.onClosePanel ? { onClosePanel: props.onClosePanel } : {})}
-          {...(props.liveRefreshEnabled !== undefined
-            ? { liveRefreshEnabled: props.liveRefreshEnabled }
-            : {})}
-          {...(props.queriesEnabled !== undefined ? { queriesEnabled: props.queriesEnabled } : {})}
-          {...(props.hideHeader !== undefined ? { hideHeader: props.hideHeader } : {})}
-          {...(props.onRenderableFilesChange
-            ? { onRenderableFilesChange: props.onRenderableFilesChange }
-            : {})}
-          {...(props.onEditorDiffOptionsChange
-            ? { onEditorDiffOptionsChange: props.onEditorDiffOptionsChange }
-            : {})}
-        />
-      </Suspense>
-    </DiffWorkerPoolProvider>
-  );
-};
-
-function stripEditorViewSearchParams<T extends Record<string, unknown>>(
-  params: T,
-): Omit<T, "view" | "editorFilePath"> {
-  const { view: _view, editorFilePath: _editorFilePath, ...rest } = params;
-  return rest as Omit<T, "view" | "editorFilePath">;
-}
-
-function collectParentDirectoryPaths(filePath: string): string[] {
-  const segments = filePath.split("/").filter(Boolean);
-  if (segments.length <= 1) {
-    return [];
-  }
-
-  const parents: string[] = [];
-  for (let index = 1; index < segments.length; index += 1) {
-    parents.push(segments.slice(0, index).join("/"));
-  }
-  return parents;
-}
 
 function resolveSingleProjectId(input: {
   threadProjectId: ProjectId | null;
@@ -204,597 +37,9 @@ function resolveSingleProjectId(input: {
   return input.threadProjectId ?? input.draftProjectId ?? null;
 }
 
-function SingleChatSurface(props: {
-  threadId: ThreadIdType;
-  search: DiffRouteSearch;
-  projectId: ProjectId | null;
-}) {
-  const navigate = useNavigate();
-  const dockState = useRightDockStore(selectRightDockState(props.threadId));
-  const openPane = useRightDockStore((store) => store.openPane);
-  const toggleSingletonPane = useRightDockStore((store) => store.toggleSingletonPane);
-  const closePane = useRightDockStore((store) => store.closePane);
-  const setActivePane = useRightDockStore((store) => store.setActivePane);
-  const setDockOpen = useRightDockStore((store) => store.setDockOpen);
-  const updatePane = useRightDockStore((store) => store.updatePane);
-  const activeProject = useStore(
-    useMemo(() => createProjectSelector(props.projectId), [props.projectId]),
-  );
-  const threadWorkspaceMetadata = useStore(
-    useMemo(() => createThreadWorkspaceMetadataSelector(props.threadId), [props.threadId]),
-  );
-  const draftThread = useComposerDraftStore(
-    (store) => store.draftThreadsByThreadId[props.threadId] ?? null,
-  );
-  // File preview must follow the same runtime cwd as chat markdown, diffs, and git:
-  // worktree-backed threads resolve links against their materialized worktree.
-  const workspaceRoot = resolveFilePreviewWorkspaceRoot({
-    projectCwd: activeProject?.cwd ?? null,
-    threadEnvMode: threadWorkspaceMetadata.envMode ?? draftThread?.envMode ?? null,
-    threadWorktreePath: threadWorkspaceMetadata.worktreePath ?? draftThread?.worktreePath ?? null,
-  });
-  const projects = useStore((store) => store.projects);
-  const { settings: appSettings } = useAppSettings();
-  const { handleNewThread } = useHandleNewThread();
-  const queryClient = useQueryClient();
-  const lastAppliedRoutePanelSearchKeyRef = useRef<string | null>(null);
-  const [editorExpandedDirectories, setEditorExpandedDirectories] = useState<ReadonlySet<string>>(
-    () => new Set(readEditorViewState(props.threadId)?.expandedDirectories ?? []),
-  );
-  const [editorCenterMode, setEditorCenterMode] = useState<"file" | "diff">(() =>
-    props.search.editorFilePath
-      ? "file"
-      : (readEditorViewState(props.threadId)?.centerMode ?? "diff"),
-  );
-  // This route component is reused across thread navigations; reload the
-  // persisted editor view state when the thread changes.
-  const editorViewStateThreadIdRef = useRef(props.threadId);
-  useEffect(() => {
-    if (editorViewStateThreadIdRef.current === props.threadId) {
-      return;
-    }
-    editorViewStateThreadIdRef.current = props.threadId;
-    const persisted = readEditorViewState(props.threadId);
-    setEditorExpandedDirectories(new Set(persisted?.expandedDirectories ?? []));
-    setEditorCenterMode(props.search.editorFilePath ? "file" : (persisted?.centerMode ?? "diff"));
-  }, [props.search.editorFilePath, props.threadId]);
-  const editorViewActive = props.search.view === "editor";
-  useEffect(() => {
-    if (!editorViewActive) {
-      return;
-    }
-    storeEditorViewState(props.threadId, {
-      expandedDirectories: [...editorExpandedDirectories],
-      centerMode: editorCenterMode,
-    });
-  }, [editorCenterMode, editorExpandedDirectories, editorViewActive, props.threadId]);
-  const [editorDiffPanelState, setEditorDiffPanelState] = useState<
-    Pick<ChatPanelState, "panel" | "diffTurnId" | "diffFilePath">
-  >({
-    panel: "diff",
-    diffTurnId: props.search.diffTurnId ?? null,
-    diffFilePath: props.search.diffFilePath ?? null,
-  });
-  const [editorDiffFiles, setEditorDiffFiles] = useState<ReadonlyArray<FileDiffMetadata>>([]);
-  const [editorDiffFilesLoading, setEditorDiffFilesLoading] = useState(false);
-  const [editorDiffOptionsControl, setEditorDiffOptionsControl] = useState<ReactNode | null>(null);
-
-  const activePane = resolveActivePane(dockState);
-  const { activePaneRuntimeMode, requestImmediateHydration: requestImmediateDockHydration } =
-    useDockPaneRuntimeActivation({
-      threadId: props.threadId,
-      activePane,
-    });
-
-  const chatPanelState = useMemo<ChatPanelState>(
-    () => ({
-      panel: activePane?.kind === "diff" ? "diff" : null,
-      diffTurnId: activePane?.kind === "diff" ? activePane.diffTurnId : null,
-      diffFilePath: activePane?.kind === "diff" ? activePane.diffFilePath : null,
-      hasOpenedPanel: dockState.panes.length > 0,
-      lastOpenPanel: "diff",
-    }),
-    [activePane, dockState.panes.length],
-  );
-
-  const handleToggleDiff = useCallback(() => {
-    requestImmediateDockHydration("diff");
-    toggleSingletonPane(props.threadId, { kind: "diff" });
-  }, [props.threadId, requestImmediateDockHydration, toggleSingletonPane]);
-  const handleOpenTurnDiff = useCallback(
-    (turnId: TurnId, filePath?: string) => {
-      requestImmediateDockHydration("diff");
-      openPane(props.threadId, {
-        kind: "diff",
-        diffTurnId: turnId,
-        diffFilePath: filePath ?? null,
-      });
-    },
-    [openPane, props.threadId, requestImmediateDockHydration],
-  );
-
-  const handleOpenEditorView = useCallback(() => {
-    void navigate({
-      to: "/$threadId",
-      params: { threadId: props.threadId },
-      search: (previous) => ({
-        ...stripDiffSearchParams(previous),
-        view: "editor",
-        ...(props.search.editorFilePath ? { editorFilePath: props.search.editorFilePath } : {}),
-      }),
-    });
-  }, [navigate, props.search.editorFilePath, props.threadId]);
-
-  const handleCloseEditorView = useCallback(() => {
-    void navigate({
-      to: "/$threadId",
-      params: { threadId: props.threadId },
-      search: (previous) => ({
-        ...stripEditorViewSearchParams(stripDiffSearchParams(previous)),
-        view: undefined,
-        editorFilePath: undefined,
-      }),
-    });
-  }, [navigate, props.threadId]);
-
-  const handleSelectEditorFile = useCallback(
-    (filePath: string) => {
-      setEditorCenterMode("file");
-      void navigate({
-        to: "/$threadId",
-        params: { threadId: props.threadId },
-        replace: true,
-        search: (previous) => ({
-          ...stripDiffSearchParams(previous),
-          view: "editor",
-          editorFilePath: filePath,
-        }),
-      });
-    },
-    [navigate, props.threadId],
-  );
-
-  const handleToggleEditorDirectory = useCallback((directoryPath: string) => {
-    setEditorExpandedDirectories((previous) => {
-      const next = new Set(previous);
-      if (next.has(directoryPath)) {
-        next.delete(directoryPath);
-      } else {
-        next.add(directoryPath);
-      }
-      return next;
-    });
-  }, []);
-
-  const handleEditorToggleDiff = useCallback(() => {
-    setEditorCenterMode((current) =>
-      current === "diff" && props.search.editorFilePath ? "file" : "diff",
-    );
-  }, [props.search.editorFilePath]);
-
-  const handleEditorOpenTurnDiff = useCallback((turnId: TurnId, filePath?: string) => {
-    setEditorCenterMode("diff");
-    setEditorDiffPanelState({
-      panel: "diff",
-      diffTurnId: turnId,
-      diffFilePath: filePath ?? null,
-    });
-  }, []);
-
-  const handleUpdateEditorDiffPanelState = useCallback(
-    (patch: Partial<Pick<ChatPanelState, "panel" | "diffTurnId" | "diffFilePath">>) => {
-      setEditorDiffPanelState((previous) => ({
-        panel: "diff",
-        diffTurnId: "diffTurnId" in patch ? (patch.diffTurnId ?? null) : previous.diffTurnId,
-        diffFilePath:
-          "diffFilePath" in patch ? (patch.diffFilePath ?? null) : previous.diffFilePath,
-      }));
-    },
-    [],
-  );
-  const handleEditorDiffFilesChange = useCallback(
-    (files: ReadonlyArray<FileDiffMetadata>, isLoading: boolean) => {
-      setEditorDiffFiles(files);
-      setEditorDiffFilesLoading(isLoading);
-    },
-    [],
-  );
-  const handleSelectEditorDiffFile = useCallback((filePath: string) => {
-    setEditorCenterMode("diff");
-    setEditorDiffPanelState((previous) => ({
-      ...previous,
-      panel: "diff",
-      diffFilePath: filePath,
-    }));
-  }, []);
-  const handleEditorDiffOptionsChange = useCallback((control: ReactNode | null) => {
-    setEditorDiffOptionsControl(control);
-  }, []);
-  const handleReferenceInChat = useCallback(
-    (reference: ChatFileReference) => {
-      appendChatFileReference(props.threadId, reference);
-    },
-    [props.threadId],
-  );
-  const handleAskWhyInChat = useCallback(
-    (reference: ChatFileReference) => {
-      appendComposerPromptText(props.threadId, buildWhyLinesPrompt(reference));
-    },
-    [props.threadId],
-  );
-  const handleCommentInChat = useCallback(
-    (comment: FileCommentSelection) => {
-      addChatFileComment(props.threadId, comment);
-    },
-    [props.threadId],
-  );
-
-  // Hover warm-up shared by both surfaces' file openers: file contents land in
-  // the React Query cache and the matching Shiki highlighter loads, so the
-  // preview paints instantly on click.
-  const prefetchOpenerFile = useCallback(
-    (path: string) => {
-      if (!workspaceRoot) {
-        return;
-      }
-      const relativePath = resolveWorkspaceFileOpenTarget(path, workspaceRoot);
-      if (relativePath) {
-        prefetchWorkspaceFile(queryClient, workspaceRoot, relativePath);
-      }
-    },
-    [queryClient, workspaceRoot],
-  );
-  // Chat surface: file references open in the right-dock file pane. References
-  // outside the workspace report unhandled so chips fall back to the external
-  // editor.
-  const dockFileOpener = useMemo<WorkspaceFileOpener>(
-    () => ({
-      openFile: (path) => {
-        // In-workspace references map to relative paths for the file-read RPC;
-        // binary previews in a session's scratch workspace (outside the chat
-        // workspace) open by absolute path through the local-image route.
-        const targetPath = resolveDockFileOpenTarget(path, workspaceRoot);
-        if (!targetPath) {
-          return false;
-        }
-        requestImmediateDockHydration("explorer");
-        openPane(props.threadId, { kind: "explorer", filePath: targetPath });
-        return true;
-      },
-      prefetchFile: prefetchOpenerFile,
-    }),
-    [openPane, prefetchOpenerFile, props.threadId, requestImmediateDockHydration, workspaceRoot],
-  );
-  // Editor surface: the center file pane is already the file viewer, so file
-  // references select into it instead of opening a dock pane.
-  const editorFileOpener = useMemo<WorkspaceFileOpener>(
-    () => ({
-      openFile: (path) => {
-        if (!workspaceRoot) {
-          return false;
-        }
-        const relativePath = resolveWorkspaceFileOpenTarget(path, workspaceRoot);
-        if (!relativePath) {
-          return false;
-        }
-        handleSelectEditorFile(relativePath);
-        return true;
-      },
-      prefetchFile: prefetchOpenerFile,
-    }),
-    [handleSelectEditorFile, prefetchOpenerFile, workspaceRoot],
-  );
-
-  useEffect(() => {
-    const { nextAppliedSearchKey, panelPatch } = resolveRoutePanelBootstrap({
-      scopeId: props.threadId,
-      search: props.search,
-      lastAppliedSearchKey: lastAppliedRoutePanelSearchKeyRef.current,
-    });
-
-    lastAppliedRoutePanelSearchKeyRef.current = nextAppliedSearchKey;
-    if (!panelPatch) {
-      return;
-    }
-
-    if (panelPatch.panel === "diff") {
-      requestImmediateDockHydration("diff");
-      openPane(props.threadId, {
-        kind: "diff",
-        diffTurnId: panelPatch.diffTurnId ?? null,
-        diffFilePath: panelPatch.diffFilePath ?? null,
-      });
-    } else {
-      setDockOpen(props.threadId, false);
-    }
-    void navigate({
-      to: "/$threadId",
-      params: { threadId: props.threadId },
-      replace: true,
-      search: (previous) => stripDiffSearchParams(previous),
-    });
-  }, [
-    navigate,
-    openPane,
-    props.search,
-    props.threadId,
-    requestImmediateDockHydration,
-    setDockOpen,
-  ]);
-
-  const editorProjectOptions = useMemo(
-    () =>
-      projects.flatMap((project) =>
-        project.kind === "project" ? [{ id: project.id, name: project.name }] : [],
-      ),
-    [projects],
-  );
-  const threadSummaries = useStore(useMemo(() => createSidebarThreadSummariesSelector(), []));
-  const openEditorProject = useCallback(
-    async (projectId: ProjectId) => {
-      const latestThread = sortThreadsForSidebar(
-        threadSummaries.filter((thread) => thread.projectId === projectId),
-        appSettings.sidebarThreadSortOrder,
-      )[0];
-
-      if (latestThread) {
-        await navigate({
-          to: "/$threadId",
-          params: { threadId: latestThread.id },
-          search: (previous) => ({
-            ...stripEditorViewSearchParams(stripDiffSearchParams(previous)),
-            view: "editor",
-          }),
-        });
-        return;
-      }
-
-      await handleNewThread(projectId, undefined, {
-        search: (previous) => ({
-          ...stripEditorViewSearchParams(stripDiffSearchParams(previous)),
-          view: "editor",
-        }),
-      });
-    },
-    [appSettings.sidebarThreadSortOrder, handleNewThread, navigate, threadSummaries],
-  );
-  const handleSelectEditorProject = useCallback(
-    (projectId: ProjectId) => {
-      void openEditorProject(projectId).catch((error: unknown) => {
-        toastManager.add({
-          type: "error",
-          title: "Unable to open project",
-          description: error instanceof Error ? error.message : "The project could not be opened.",
-        });
-      });
-    },
-    [openEditorProject],
-  );
-  const shouldAcceptDockWidth = useCallback(
-    ({ nextWidth, wrapper }: { nextWidth: number; wrapper: HTMLElement }) => {
-      const previousSidebarWidth = wrapper.style.getPropertyValue("--sidebar-width");
-      return canComposerHandlePanelWidth({
-        nextWidth,
-        // Scope the width probe to the main composer.
-        paneScopeId: SINGLE_CHAT_PANE_SCOPE_ID,
-        applyWidth: (width) => {
-          wrapper.style.setProperty("--sidebar-width", `${width}px`);
-        },
-        resetWidth: () => {
-          if (previousSidebarWidth.length > 0) {
-            wrapper.style.setProperty("--sidebar-width", previousSidebarWidth);
-          } else {
-            wrapper.style.removeProperty("--sidebar-width");
-          }
-        },
-      });
-    },
-    [],
-  );
-
-  const handleAddDockPane = useCallback(
-    (kind: RightDockPaneKind) => {
-      requestImmediateDockHydration(kind);
-      openPane(props.threadId, { kind });
-    },
-    [openPane, props.threadId, requestImmediateDockHydration],
-  );
-
-  const renderDockPane = useCallback(
-    (
-      pane: RightDockPane,
-      context: { runtimeMode: DockPaneRuntimeMode; isActive: boolean },
-    ): ReactNode => {
-      switch (pane.kind) {
-        case "diff":
-          return (
-            <LazyDiffPanel
-              mode="sidebar"
-              threadId={props.threadId}
-              panelState={{
-                panel: "diff",
-                diffTurnId: pane.diffTurnId,
-                diffFilePath: pane.diffFilePath,
-              }}
-              onUpdatePanelState={(patch) =>
-                updatePane(props.threadId, pane.id, {
-                  diffTurnId: patch.diffTurnId ?? null,
-                  diffFilePath: patch.diffFilePath ?? null,
-                })
-              }
-              onClosePanel={() => closePane(props.threadId, pane.id)}
-              liveRefreshEnabled={context.isActive && dockState.open}
-              queriesEnabled={context.isActive && dockState.open}
-            />
-          );
-        case "terminal":
-          if (context.runtimeMode === "preview") {
-            return <PanelStateMessage>Terminal is sleeping. Restoring shortly.</PanelStateMessage>;
-          }
-          return (
-            <DockTerminalPane
-              hostThreadId={props.threadId}
-              projectId={props.projectId}
-              isActive={context.isActive && dockState.open}
-            />
-          );
-        case "explorer":
-          return (
-            <DockExplorerPane
-              workspaceRoot={workspaceRoot}
-              initialFilePath={pane.filePath}
-              onReferenceInChat={handleReferenceInChat}
-              onAskWhyInChat={handleAskWhyInChat}
-              onCommentInChat={handleCommentInChat}
-            />
-          );
-      }
-    },
-    [
-      closePane,
-      dockState.open,
-      handleAskWhyInChat,
-      handleCommentInChat,
-      handleReferenceInChat,
-      props.projectId,
-      props.threadId,
-      updatePane,
-      workspaceRoot,
-    ],
-  );
-
-  const handleSelectDockPane = useCallback(
-    (paneId: string) => {
-      requestImmediateDockHydration(dockState.panes.find((pane) => pane.id === paneId)?.kind);
-      setActivePane(props.threadId, paneId);
-    },
-    [dockState.panes, props.threadId, requestImmediateDockHydration, setActivePane],
-  );
-  // The editor file path arrives via the URL, so an attacker-crafted link can
-  // carry traversal segments ("../../etc"). Treat unsafe values as no selection
-  // so neither the ancestor prefetch nor the preview ever queries them.
-  const rawEditorFilePath = props.search.editorFilePath ?? null;
-  const selectedEditorFilePath =
-    rawEditorFilePath !== null && isWorkspaceRelativePathSafe(rawEditorFilePath)
-      ? rawEditorFilePath
-      : null;
-  useEffect(() => {
-    if (!selectedEditorFilePath) {
-      return;
-    }
-
-    const parentPaths = collectParentDirectoryPaths(selectedEditorFilePath);
-    if (parentPaths.length === 0) {
-      return;
-    }
-
-    // Prefetch every ancestor listing in parallel: the explorer renders one
-    // directory level at a time, so without this each depth waits for the
-    // previous level's response (a per-level request waterfall).
-    if (workspaceRoot) {
-      for (const parentPath of parentPaths) {
-        void queryClient.prefetchQuery(
-          projectListDirectoriesQueryOptions({
-            cwd: workspaceRoot,
-            relativePath: parentPath,
-            includeFiles: true,
-          }),
-        );
-      }
-    }
-
-    setEditorExpandedDirectories((previous) => {
-      let changed = false;
-      const next = new Set(previous);
-      for (const parentPath of parentPaths) {
-        if (!next.has(parentPath)) {
-          next.add(parentPath);
-          changed = true;
-        }
-      }
-      return changed ? next : previous;
-    });
-  }, [workspaceRoot, queryClient, selectedEditorFilePath]);
-
-  const editorChatPanelState = useMemo<ChatPanelState>(
-    () => ({
-      panel: editorCenterMode === "diff" ? "diff" : null,
-      diffTurnId: editorDiffPanelState.diffTurnId,
-      diffFilePath: editorDiffPanelState.diffFilePath,
-      hasOpenedPanel: true,
-      lastOpenPanel: "diff",
-    }),
-    [editorCenterMode, editorDiffPanelState.diffFilePath, editorDiffPanelState.diffTurnId],
-  );
-
-  if (props.search.view === "editor") {
-    const editorSurface = (
-      <WorkspaceFileOpenerContext.Provider value={editorFileOpener}>
-        <div
-          className={cn(CHAT_MAIN_VIEWPORT_SHELL_CLASS_NAME, CHAT_MAIN_CONTENT_SURFACE_CLASS_NAME)}
-        >
-          <EditorWorkspaceView
-            workspaceRoot={workspaceRoot}
-            projectName={activeProject?.name ?? null}
-            currentProjectId={activeProject?.id ?? null}
-            projectOptions={editorProjectOptions}
-            selectedFilePath={selectedEditorFilePath}
-            expandedDirectories={editorExpandedDirectories}
-            centerMode={editorCenterMode}
-            diffFiles={editorDiffFiles}
-            diffFilesLoading={editorDiffFilesLoading}
-            selectedDiffFilePath={editorDiffPanelState.diffFilePath ?? null}
-            diffOptionsControl={editorDiffOptionsControl}
-            onSelectDiffFile={handleSelectEditorDiffFile}
-            onSelectFile={handleSelectEditorFile}
-            onToggleDirectory={handleToggleEditorDirectory}
-            onCenterModeChange={setEditorCenterMode}
-            onExitEditorView={handleCloseEditorView}
-            onReferenceInChat={handleReferenceInChat}
-            onAskWhyInChat={handleAskWhyInChat}
-            onCommentInChat={handleCommentInChat}
-            onSelectProject={handleSelectEditorProject}
-            diffPanel={
-              <LazyDiffPanel
-                mode="sidebar"
-                threadId={props.threadId}
-                panelState={editorDiffPanelState}
-                onUpdatePanelState={handleUpdateEditorDiffPanelState}
-                liveRefreshEnabled={editorCenterMode === "diff"}
-                // Keep diff data warm while browsing files so switching to the
-                // diff tab renders instantly instead of cold-fetching.
-                queriesEnabled
-                hideHeader
-                onRenderableFilesChange={handleEditorDiffFilesChange}
-                onEditorDiffOptionsChange={handleEditorDiffOptionsChange}
-              />
-            }
-            chatPanel={
-              <SidebarInset
-                className="min-h-0 min-w-0 overflow-hidden overscroll-y-none text-foreground"
-                surfaceClassName={CHAT_SURFACE_TRANSPARENT_CLASS_NAME}
-              >
-                <ChatView
-                  threadId={props.threadId}
-                  paneScopeId={EDITOR_CHAT_PANE_SCOPE_ID}
-                  surfaceMode="split"
-                  presentationMode="editor"
-                  isFocusedPane={true}
-                  panelState={editorChatPanelState}
-                  onToggleDiffPanel={handleEditorToggleDiff}
-                  onOpenTurnDiffPanel={handleEditorOpenTurnDiff}
-                />
-              </SidebarInset>
-            }
-          />
-        </div>
-      </WorkspaceFileOpenerContext.Provider>
-    );
-    return <ProjectSurfaceFrame>{editorSurface}</ProjectSurfaceFrame>;
-  }
-
-  const chatSurface = (
-    <WorkspaceFileOpenerContext.Provider value={dockFileOpener}>
+function SingleChatSurface(props: { threadId: ThreadId }) {
+  return (
+    <ProjectSurfaceFrame>
       <div
         className={cn(CHAT_MAIN_VIEWPORT_SHELL_CLASS_NAME, CHAT_MAIN_CONTENT_SURFACE_CLASS_NAME)}
       >
@@ -804,35 +49,11 @@ function SingleChatSurface(props: {
             paneScopeId={SINGLE_CHAT_PANE_SCOPE_ID}
             surfaceMode="single"
             isFocusedPane={true}
-            panelState={chatPanelState}
-            onToggleDiffPanel={handleToggleDiff}
-            onOpenTurnDiffPanel={handleOpenTurnDiff}
-            viewModeAction={{
-              label: "Editor view",
-              active: false,
-              onClick: handleOpenEditorView,
-            }}
           />
         </RouteInsetSurface>
-        <RightDock
-          state={dockState}
-          minWidth={SINGLE_PANEL_MIN_WIDTH}
-          defaultWidth={DIFF_INLINE_DEFAULT_WIDTH}
-          shouldAcceptWidth={shouldAcceptDockWidth}
-          addMenuKinds={RIGHT_DOCK_ADD_MENU_KINDS}
-          motionKey={props.threadId}
-          activePaneRuntimeMode={activePaneRuntimeMode}
-          onSelectPane={handleSelectDockPane}
-          onClosePane={(paneId) => closePane(props.threadId, paneId)}
-          onCollapse={() => setDockOpen(props.threadId, false)}
-          onOpenChange={(open) => setDockOpen(props.threadId, open)}
-          onAddPane={handleAddDockPane}
-          renderPane={renderDockPane}
-        />
       </div>
-    </WorkspaceFileOpenerContext.Provider>
+    </ProjectSurfaceFrame>
   );
-  return <ProjectSurfaceFrame>{chatSurface}</ProjectSurfaceFrame>;
 }
 
 function ChatThreadRouteView() {
@@ -843,7 +64,6 @@ function ChatThreadRouteView() {
   const threadId = Route.useParams({
     select: (params) => ThreadId.makeUnsafe(params.threadId),
   });
-  const search = Route.useSearch();
   const threadProjectIdSelector = useMemo(
     () => createThreadProjectIdSelector(threadId),
     [threadId],
@@ -856,7 +76,9 @@ function ChatThreadRouteView() {
   );
   const draftThreadExists = draftThreadState !== null;
   const routeThreadExists = threadExists || draftThreadExists;
-  const activeProjectId = resolveSingleProjectId({
+  // Resolved for parity with the previous route shape; kept so future surfaces can
+  // scope to the thread's project without re-deriving it here.
+  void resolveSingleProjectId({
     threadProjectId,
     draftProjectId: draftThreadState?.projectId ?? null,
   });
@@ -948,10 +170,9 @@ function ChatThreadRouteView() {
     return null;
   }
 
-  return <SingleChatSurface threadId={threadId} search={search} projectId={activeProjectId} />;
+  return <SingleChatSurface threadId={threadId} />;
 }
 
 export const Route = createFileRoute("/_chat/$threadId")({
-  validateSearch: (search) => parseDiffRouteSearch(search),
   component: ChatThreadRouteView,
 });
diff --git a/apps/web/src/routes/_chat.github.tsx b/apps/web/src/routes/_chat.github.tsx
index 8f78d3877..d8c49da8a 100644
--- a/apps/web/src/routes/_chat.github.tsx
+++ b/apps/web/src/routes/_chat.github.tsx
@@ -56,7 +56,6 @@ import {
 } from "~/githubWorkbench.logic";
 import { useHandleNewThread } from "~/hooks/useHandleNewThread";
 import { useLatestProjectStore } from "~/latestProjectStore";
-import { useTheme } from "~/hooks/useTheme";
 import { formatRelativeTime } from "~/lib/relativeTime";
 import {
   githubConnectionQueryOptions,
@@ -552,7 +551,6 @@ function TimelineView({ detail, cwd }: { detail: GitHubWorkItemDetail; cwd: stri
 }
 
 function CodeView({ detail, cwd }: { detail: GitHubWorkItemDetail; cwd: string | null }) {
-  const { resolvedTheme } = useTheme();
   const diffInput = {
     cwd,
     repository: detail.item.repository.nameWithOwner,
@@ -586,7 +584,6 @@ function CodeView({ detail, cwd }: { detail: GitHubWorkItemDetail; cwd: string |
       <DiffPanelPatchViewport
         renderablePatch={renderablePatch}
         renderableFiles={files}
-        resolvedTheme={resolvedTheme}
         diffRenderMode="stacked"
         diffWordWrap={false}
         workspaceRoot={cwd}
diff --git a/apps/web/src/routes/_chat.index.tsx b/apps/web/src/routes/_chat.index.tsx
index 9bdd1f225..e6c24d0bd 100644
--- a/apps/web/src/routes/_chat.index.tsx
+++ b/apps/web/src/routes/_chat.index.tsx
@@ -24,13 +24,12 @@ function ChatIndexRouteView() {
 
   // Fresh unsent chats have a route id but no persisted sidebar summary yet, so the thread-id
   // list never contains them. Include plain, still-unsent chat drafts so a cold start on "/"
-  // can restore one instead of always minting a new one. A
-  // non-"chat" entry point isn't a home-chat draft, and `promotedTo` means the draft already
+  // can restore one instead of always minting a new one. `promotedTo` means the draft already
   // became a real thread, so its stale id is no longer a valid restore target.
   const draftThreadIds = useMemo(() => {
     const draftThreadIds = new Set<string>();
     for (const [threadId, draft] of Object.entries(draftThreadsByThreadId)) {
-      if (draft.entryPoint === "chat" && draft.promotedTo === undefined) {
+      if (draft.promotedTo === undefined) {
         draftThreadIds.add(threadId);
       }
     }
diff --git a/apps/web/src/routes/_chat.settings.tsx b/apps/web/src/routes/_chat.settings.tsx
index 4d10571f3..106507298 100644
--- a/apps/web/src/routes/_chat.settings.tsx
+++ b/apps/web/src/routes/_chat.settings.tsx
@@ -43,25 +43,24 @@ import {
 import { restrictToVerticalAxis } from "@dnd-kit/modifiers";
 import { CSS } from "@dnd-kit/utilities";
 import {
-  type AppBackground,
   type AppSettings,
   type TaskListDisplayMode,
-  DEFAULT_UI_DENSITY,
-  type UiDensity,
   MAX_CHAT_FONT_SIZE_PX,
   MAX_TERMINAL_FONT_SIZE_PX,
   getCustomModelsForProvider,
   getGitTextGenerationModelOptions,
   MAX_CUSTOM_MODEL_LENGTH,
+  MAX_WINDOW_TRANSPARENCY,
   MIN_CHAT_FONT_SIZE_PX,
+  MIN_WINDOW_TRANSPARENCY,
   MIN_TERMINAL_FONT_SIZE_PX,
   MODEL_PROVIDER_SETTINGS,
   normalizeChatFontSizePx,
+  normalizeWindowTransparency,
   normalizeTerminalFontSizePx,
   patchCustomModels,
   useAppSettings,
 } from "../appSettings";
-import { APP_BACKGROUND_LABELS } from "../lib/appBackgrounds";
 import { APP_VERSION } from "../branding";
 import { useDesktopTopBarTrafficLightGutterClassName } from "../hooks/useDesktopTopBarGutter";
 import { useProviderModelCatalog } from "../hooks/useProviderModelCatalog";
@@ -88,7 +87,6 @@ import {
 import { ProviderUsageSettingsPanel } from "../components/settings/ProviderUsageSettingsPanel";
 import { ProfileSettingsPanel } from "../components/settings/ProfileSettingsPanel";
 import { KeyboardShortcutsSettingsPanel } from "../components/settings/KeyboardShortcutsSettingsPanel";
-import { SkillsSettingsPanel } from "../components/settings/SkillsSettingsPanel";
 import {
   CHAT_CONTENT_CARD_CLASS_NAME,
   CHAT_MAIN_VIEWPORT_SHELL_CLASS_NAME,
@@ -101,8 +99,6 @@ import { SidebarHeaderNavigationControls } from "../components/SidebarHeaderNavi
 import { RouteInsetSurface } from "../components/RouteInsetSurface";
 import { resolveAndPersistPreferredEditor } from "../editorPreferences";
 import { isElectron } from "../env";
-import { useTheme } from "../hooks/useTheme";
-import { isUiDensity } from "../lib/appDensity";
 import { CentralIcon } from "../lib/central-icons";
 import { gitRemoveWorktreeMutationOptions } from "../lib/gitReactQuery";
 import {
@@ -112,14 +108,11 @@ import {
 import {
   ArchiveIcon,
   ChevronDownIcon,
-  DeviceLaptopIcon,
   DownloadIcon,
   ExternalLinkIcon,
   Loader2Icon,
-  MoonIcon,
   PlusIcon,
   RotateCcwIcon,
-  SunIcon,
   XIcon,
 } from "../lib/icons";
 import {
@@ -171,31 +164,10 @@ import {
   getVisibleProviderUpdateStatuses,
   shouldShowProviderUpdateStatus,
 } from "../providerUpdates";
+import { getAppearanceMode, setAppearanceMode, type AppearanceMode } from "../hooks/useTheme";
 
 // ── Settings taxonomy ──────────────────────────────────────────────────────
 
-const UI_DENSITY_OPTIONS = [
-  {
-    value: "compact",
-    label: "Compact",
-    description: "Tighter spacing in the sidebar, composer, and settings rows.",
-  },
-  {
-    value: "comfortable",
-    label: "Comfortable",
-    description: "Balanced spacing for everyday use.",
-  },
-  {
-    value: "spacious",
-    label: "Spacious",
-    description: "More breathing room across the main workspace surfaces.",
-  },
-] as const satisfies ReadonlyArray<{
-  value: UiDensity;
-  label: string;
-  description: string;
-}>;
-
 const PERMISSIONS_MODE_OPTIONS = [
   {
     value: "full-access",
@@ -209,27 +181,6 @@ const PERMISSIONS_MODE_OPTIONS = [
   activeClassName?: string;
 }>;
 
-const THEME_OPTIONS = [
-  {
-    value: "system",
-    label: "Follow System",
-    description: "Match your OS appearance setting.",
-    icon: <DeviceLaptopIcon />,
-  },
-  {
-    value: "light",
-    label: "Light",
-    description: "Always use the light theme.",
-    icon: <SunIcon />,
-  },
-  {
-    value: "dark",
-    label: "Dark",
-    description: "Always use the dark theme.",
-    icon: <MoonIcon />,
-  },
-] as const;
-
 function HighlightColorSwatch({ color }: { color: string }) {
   return (
     <span
@@ -265,6 +216,15 @@ const HIGHLIGHT_COLOR_OPTIONS: ReadonlyArray<{
   },
 ];
 
+const APPEARANCE_MODE_OPTIONS: ReadonlyArray<{
+  value: AppearanceMode;
+  label: string;
+}> = [
+  { value: "system", label: "Follow System" },
+  { value: "light", label: "Light" },
+  { value: "dark", label: "Dark" },
+];
+
 const TASK_LIST_DISPLAY_OPTIONS = [
   {
     value: "sidebar",
@@ -311,14 +271,6 @@ const SIDEBAR_POSITION_LABELS = {
   right: "Right",
 } as const;
 
-const APP_BACKGROUND_OPTIONS = [
-  "none",
-  "london",
-  "rio",
-  "sf",
-  "tokyo",
-] as const satisfies ReadonlyArray<AppBackground>;
-
 type InstallBinarySettingsKey =
   | "claudeBinaryPath"
   | "codexBinaryPath"
@@ -751,7 +703,6 @@ function SettingsRouteView() {
   const settingsTarget = typeof routeSearch.target === "string" ? routeSearch.target : null;
   const activeSectionItem = SETTINGS_NAV_ITEMS.find((item) => item.id === activeSection)!;
 
-  const { theme, setTheme } = useTheme();
   const { settings, defaults, updateSettings, resetSettings } = useAppSettings();
   const [appSnapState, setAppSnapState] = useState<DesktopAppSnapState | null>(null);
   const appSnapRequestGuardRef = useRef(createLatestAppSnapRequestGuard());
@@ -1110,7 +1061,6 @@ function SettingsRouteView() {
     settings.piBinaryPath !== defaults.piBinaryPath ||
     settings.piAgentDir !== defaults.piAgentDir;
   const changedSettingLabels = [
-    ...(theme !== "system" ? ["Theme"] : []),
     ...(settings.defaultProvider !== defaults.defaultProvider ? ["Default provider"] : []),
     ...(settings.sidebarProjectSortOrder !== defaults.sidebarProjectSortOrder
       ? ["Project sort order"]
@@ -1119,9 +1069,7 @@ function SettingsRouteView() {
       ? ["Thread sort order"]
       : []),
     ...(settings.sidebarPosition !== defaults.sidebarPosition ? ["Sidebar position"] : []),
-    ...(settings.appBackground !== defaults.appBackground ? ["Background"] : []),
     ...(settings.showChatsSection !== defaults.showChatsSection ? ["Chats section"] : []),
-    ...(settings.uiDensity !== defaults.uiDensity ? ["UI density"] : []),
     ...(settings.highlightColor !== defaults.highlightColor ? ["Highlight color"] : []),
     ...(settings.chatFontSizePx !== defaults.chatFontSizePx ? ["Base font size"] : []),
     ...(settings.terminalFontSizePx !== defaults.terminalFontSizePx ? ["Terminal font size"] : []),
@@ -1366,7 +1314,6 @@ function SettingsRouteView() {
     );
     if (!confirmed) return;
 
-    setTheme("system");
     resetSettings();
     setOpenInstallProviders({
       codex: false,
@@ -1966,37 +1913,6 @@ function SettingsRouteView() {
           }
         />
 
-        <SettingsRow
-          title="Background"
-          description="Optional image behind the chat canvas. The theme colour is layered over it so text keeps its contrast."
-          resetAction={
-            settings.appBackground !== defaults.appBackground ? (
-              <SettingResetButton
-                label="background"
-                onClick={() => updateSettings({ appBackground: defaults.appBackground })}
-              />
-            ) : null
-          }
-          control={
-            <SettingsSelectControl
-              value={settings.appBackground}
-              onValueChange={(value) => {
-                const next = APP_BACKGROUND_OPTIONS.find((option) => option === value);
-                if (!next) return;
-                updateSettings({ appBackground: next });
-              }}
-              ariaLabel="Canvas background"
-              valueContent={APP_BACKGROUND_LABELS[settings.appBackground]}
-            >
-              {APP_BACKGROUND_OPTIONS.map((option) => (
-                <SelectItem hideIndicator key={option} value={option}>
-                  {APP_BACKGROUND_LABELS[option]}
-                </SelectItem>
-              ))}
-            </SettingsSelectControl>
-          }
-        />
-
         <SettingsRow
           title="Sidebar position"
           description="Which side of the window the main sidebar docks against."
@@ -2078,76 +1994,72 @@ function SettingsRouteView() {
         <h2 className={SETTINGS_SECTION_LABEL_CLASS_NAME}>Theme and typography</h2>
         <SettingsCard>
           <SettingsRow
-            title="Theme"
-            description="Choose how TeaCode looks across the app."
-            resetAction={
-              theme !== "system" ? (
-                <SettingResetButton label="theme" onClick={() => setTheme("system")} />
-              ) : null
-            }
+            title="Appearance"
+            description="Choose how TeaCode looks. Follow System will match your operating system preference."
             control={
               <SettingsSegmentedControl
-                value={theme}
-                onValueChange={(value) => {
-                  if (value !== "system" && value !== "light" && value !== "dark") return;
-                  setTheme(value);
-                }}
-                ariaLabel="Theme preference"
-                options={THEME_OPTIONS}
+                value={getAppearanceMode()}
+                onValueChange={(value) => setAppearanceMode(value)}
+                ariaLabel="Appearance mode"
+                options={APPEARANCE_MODE_OPTIONS}
               />
             }
           />
-        </SettingsCard>
 
-        <SettingsCard>
           <SettingsRow
-            title="UI density"
-            description="Control spacing in the sidebar, composer, chat gutters, and settings rows without changing font size."
+            title="Highlight color"
+            description="Color used when you highlight selected text in a chat transcript."
             resetAction={
-              settings.uiDensity !== defaults.uiDensity ? (
+              settings.highlightColor !== defaults.highlightColor ? (
                 <SettingResetButton
-                  label="UI density"
-                  onClick={() =>
-                    updateSettings({
-                      uiDensity: DEFAULT_UI_DENSITY,
-                    })
-                  }
+                  label="highlight color"
+                  onClick={() => updateSettings({ highlightColor: defaults.highlightColor })}
                 />
               ) : null
             }
             control={
               <SettingsSegmentedControl
-                value={settings.uiDensity}
-                onValueChange={(value) => {
-                  if (!isUiDensity(value)) {
-                    return;
-                  }
-                  updateSettings({ uiDensity: value });
-                }}
-                ariaLabel="UI density"
-                options={UI_DENSITY_OPTIONS}
+                value={settings.highlightColor}
+                onValueChange={(value) => updateSettings({ highlightColor: value })}
+                ariaLabel="Highlight color"
+                options={HIGHLIGHT_COLOR_OPTIONS}
               />
             }
           />
 
           <SettingsRow
-            title="Highlight color"
-            description="Color used when you highlight selected text in a chat transcript."
+            title="Window transparency"
+            description="How much of the desktop shows through the window. Only applies to the translucent macOS window material; the composer keeps its own surface."
             resetAction={
-              settings.highlightColor !== defaults.highlightColor ? (
+              settings.windowTransparency !== defaults.windowTransparency ? (
                 <SettingResetButton
-                  label="highlight color"
-                  onClick={() => updateSettings({ highlightColor: defaults.highlightColor })}
+                  label="window transparency"
+                  onClick={() =>
+                    updateSettings({ windowTransparency: defaults.windowTransparency })
+                  }
                 />
               ) : null
             }
             control={
-              <SettingsSegmentedControl
-                value={settings.highlightColor}
-                onValueChange={(value) => updateSettings({ highlightColor: value })}
-                ariaLabel="Highlight color"
-                options={HIGHLIGHT_COLOR_OPTIONS}
-              />
+              <div className="flex w-full items-center justify-end gap-3 sm:w-auto">
+                <input
+                  type="range"
+                  className="theme-slider h-1 w-full cursor-pointer appearance-none rounded-full bg-[var(--selected)] sm:w-40"
+                  min={MIN_WINDOW_TRANSPARENCY}
+                  max={MAX_WINDOW_TRANSPARENCY}
+                  step={1}
+                  value={settings.windowTransparency}
+                  onChange={(event) => {
+                    updateSettings({
+                      windowTransparency: normalizeWindowTransparency(Number(event.target.value)),
+                    });
+                  }}
+                  aria-label="Window transparency"
+                />
+                <span className="w-10 text-right text-xs tabular-nums text-muted-foreground">
+                  {settings.windowTransparency}%
+                </span>
+              </div>
             }
           />
 
@@ -3638,7 +3550,6 @@ function SettingsRouteView() {
           <>
             {renderModelsPanel()}
             {renderProvidersPanel()}
-            <SkillsSettingsPanel />
             <ProviderUsageSettingsPanel />
           </>
         );
diff --git a/apps/web/src/routes/_chat.tsx b/apps/web/src/routes/_chat.tsx
index c28a4fb87..4072f427c 100644
--- a/apps/web/src/routes/_chat.tsx
+++ b/apps/web/src/routes/_chat.tsx
@@ -9,9 +9,7 @@ import {
   resolveAppNavigationState,
 } from "../appNavigation";
 import { useAppSettings } from "../appSettings";
-import { appBackgroundImageCss } from "../lib/appBackgrounds";
 import ShortcutsDialog from "../components/ShortcutsDialog";
-import { shouldRenderTerminalWorkspace } from "../components/ChatView.logic";
 import ThreadSidebar from "../components/Sidebar";
 import { isElectron } from "../env";
 import { useHandleNewChat } from "../hooks/useHandleNewChat";
@@ -23,11 +21,9 @@ import {
   resolveNewThreadTarget,
 } from "../lib/projectShortcutTargets";
 import { resolveInheritedThreadContext } from "../lib/threadBootstrap";
-import { isTerminalFocused } from "../lib/terminalFocus";
 import { serverConfigQueryOptions } from "../lib/serverReactQuery";
 import { resolveShortcutCommand } from "../keybindings";
 import { useStore } from "../store";
-import { selectThreadTerminalState, useTerminalStateStore } from "../terminalStateStore";
 import { useThreadSelectionStore } from "../threadSelectionStore";
 import { onServerMaintenanceUpdated } from "../wsNativeApi";
 import { useProviderStatusesForLocalConfig } from "~/hooks/useProviderStatusesForLocalConfig";
@@ -196,7 +192,6 @@ function ChatRouteGlobalShortcuts() {
   const [shortcutsDialogOpen, setShortcutsDialogOpen] = useState(false);
   const clearSelection = useThreadSelectionStore((state) => state.clearSelection);
   const selectedThreadIdsSize = useThreadSelectionStore((state) => state.selectedThreadIds.size);
-  const terminalStateByThreadId = useTerminalStateStore((state) => state.terminalStateByThreadId);
   const {
     activeContextThreadId,
     activeDraftThread,
@@ -215,19 +210,11 @@ function ChatRouteGlobalShortcuts() {
   const platform = typeof navigator === "undefined" ? "" : navigator.platform;
   const providerStatuses = useProviderStatusesForLocalConfig();
   const refreshProviderStatuses = useRefreshProviderStatusesNow();
-  const activeThreadTerminalState = activeContextThreadId
-    ? selectThreadTerminalState(terminalStateByThreadId, activeContextThreadId)
-    : null;
-  const terminalOpen = activeThreadTerminalState?.terminalOpen ?? false;
   const activeProject =
     activeProjectId !== null
       ? (projects.find((project) => project.id === activeProjectId) ?? null)
       : null;
   const activeProjectScripts = activeProject?.kind === "project" ? activeProject.scripts : [];
-  const terminalWorkspaceOpen = shouldRenderTerminalWorkspace({
-    presentationMode: activeThreadTerminalState?.presentationMode ?? "drawer",
-    terminalOpen,
-  });
   const currentProjectId = resolveCurrentProjectTargetId(projects, activeProject?.id ?? null);
   const latestUsableProjectId = resolveLatestProjectTargetId(projects, latestProjectId);
 
@@ -247,11 +234,7 @@ function ChatRouteGlobalShortcuts() {
   useEffect(() => {
     const onWindowKeyDown = (event: KeyboardEvent) => {
       if (event.defaultPrevented) return;
-      const shortcutContext = {
-        terminalFocus: isTerminalFocused(),
-        terminalOpen,
-        terminalWorkspaceOpen,
-      };
+      const shortcutContext = {};
 
       const isShortcutsHelpShortcut =
         (event.metaKey || event.ctrlKey) &&
@@ -313,20 +296,6 @@ function ChatRouteGlobalShortcuts() {
         return;
       }
 
-      if (command === "chat.newTerminal") {
-        const target = resolveNewThreadTarget({ currentProjectId, latestUsableProjectId });
-        if (!target) return;
-        event.preventDefault();
-        event.stopPropagation();
-        void handleNewThread(target.projectId, {
-          ...(target.inheritContext
-            ? resolveInheritedThreadContext({ activeThread, activeDraftThread })
-            : {}),
-          entryPoint: "terminal",
-        });
-        return;
-      }
-
       if (
         command === "chat.newClaude" ||
         command === "chat.newCodex" ||
@@ -399,8 +368,6 @@ function ChatRouteGlobalShortcuts() {
     providerStatuses,
     refreshProviderStatuses,
     selectedThreadIdsSize,
-    terminalOpen,
-    terminalWorkspaceOpen,
     toggleSidebar,
   ]);
 
@@ -432,11 +399,6 @@ function ChatRouteGlobalShortcuts() {
         keybindings={keybindings}
         projectScripts={activeProjectScripts}
         platform={platform}
-        context={{
-          terminalFocus: isTerminalFocused(),
-          terminalOpen,
-          terminalWorkspaceOpen,
-        }}
       />
     </>
   );
@@ -477,20 +439,10 @@ function ChatRouteLayout() {
     </Sidebar>
   );
 
-  // Optional decorative canvas image. Applied here (not on <body>) so it stays
-  // behind the chat column only and never runs under the docked sidebar.
-  const canvasBackgroundImage = appBackgroundImageCss(settings.appBackground);
-
   // The resize rail sits on the seam between the sidebar and the main canvas.
   // It is interaction-only and paints no divider, so it has to follow the side.
   const mainContentShell = (
-    <div
-      className="claude-main-shell relative flex h-svh min-h-0 min-w-0 flex-1"
-      data-app-background={settings.appBackground === "none" ? undefined : "image"}
-      {...(canvasBackgroundImage
-        ? { style: { backgroundImage: canvasBackgroundImage } as CSSProperties }
-        : {})}
-    >
+    <div className="claude-main-shell relative flex h-svh min-h-0 min-w-0 flex-1">
       {isEditorView ? null : (
         <SidebarInstanceProvider side={sidebarSide} resizable={THREAD_SIDEBAR_RESIZABLE}>
           <SidebarRail placement="content-seam" />
@@ -507,7 +459,11 @@ function ChatRouteLayout() {
       onOpenChange={setSidebarOpen}
       className="chitauri-anthropic-shell isolate overflow-hidden"
       data-sidebar-side={sidebarSide}
-      style={{ "--sidebar-width": `${THREAD_SIDEBAR_DEFAULT_WIDTH}px` } as CSSProperties}
+      style={
+        {
+          "--sidebar-width": `${THREAD_SIDEBAR_DEFAULT_WIDTH}px`,
+        } as CSSProperties
+      }
     >
       {isElectron ? <div aria-hidden="true" className="desktop-window-drag-strip" /> : null}
       <ThreadRetentionMaintenanceToast />
diff --git a/apps/web/src/settingsNavigation.ts b/apps/web/src/settingsNavigation.ts
index 03c82474e..7cc466b30 100644
--- a/apps/web/src/settingsNavigation.ts
+++ b/apps/web/src/settingsNavigation.ts
@@ -69,7 +69,7 @@ export const SETTINGS_NAV_ITEMS: readonly SettingsNavItem[] = [
     id: "agents",
     group: "app",
     label: "Agents",
-    description: "Models, providers, orchestration, skills, and usage.",
+    description: "Models, providers, orchestration, and usage.",
     icon: "agent-network",
     eyebrow: "Agent configuration",
   },
@@ -98,7 +98,7 @@ export function normalizeSettingsSection(value: unknown): SettingsSectionId {
   if (SETTINGS_SECTION_IDS.some((candidate) => candidate === value)) {
     return value as SettingsSectionId;
   }
-  if (["models", "providers", "skills", "usage"].includes(value)) {
+  if (["models", "providers", "usage"].includes(value)) {
     return "agents";
   }
   if (["shortcuts", "worktrees", "archived"].includes(value)) {
diff --git a/apps/web/src/settingsPanelStyles.ts b/apps/web/src/settingsPanelStyles.ts
index 13b631ff2..27f2cd3a8 100644
--- a/apps/web/src/settingsPanelStyles.ts
+++ b/apps/web/src/settingsPanelStyles.ts
@@ -10,7 +10,7 @@ import { PANEL_SURFACE_CLASS_NAME } from "./components/ui/surface";
 export const SETTINGS_RADIUS_CLASS_NAME = "rounded-xl";
 
 /** Select triggers, segmented chips, inputs, and menu options (one step above app defaults). */
-export const SETTINGS_CONTROL_RADIUS_CLASS_NAME = "!rounded-[8px]";
+export const SETTINGS_CONTROL_RADIUS_CLASS_NAME = "!rounded-lg";
 
 /** Same border token as Button `outline` / `chrome-outline` variants. */
 export const SETTINGS_CONTROL_BORDER_CLASS_NAME = "border border-[color:var(--color-border)]";
diff --git a/apps/web/src/shortcutsSheet.test.ts b/apps/web/src/shortcutsSheet.test.ts
index c0fdf4991..aaab3ec70 100644
--- a/apps/web/src/shortcutsSheet.test.ts
+++ b/apps/web/src/shortcutsSheet.test.ts
@@ -53,33 +53,8 @@ describe("buildShortcutSheetSections", () => {
         (entry) => entry.id === "composer.focus.toggle" && entry.shortcutLabel === "⌘L",
       ),
     ).toBe(true);
-    expect(sections[1]?.title).toBe("In workspace mode");
-    expect(sections[2]?.entries[0]?.shortcutLabel).toBe("⌘R");
-  });
-
-  it("switches to workspace shortcuts when the workspace is open", () => {
-    const sections = buildShortcutSheetSections({
-      keybindings: [],
-      projectScripts: [],
-      platform: "Linux",
-      context: {
-        terminalFocus: false,
-        terminalOpen: true,
-        terminalWorkspaceOpen: true,
-      },
-    });
-
-    expect(
-      sections[0]?.entries.some(
-        (entry) => entry.id === "terminal.workspace.terminal" && entry.shortcutLabel === "Ctrl+1",
-      ),
-    ).toBe(true);
-    expect(sections[1]?.title).toBe("Outside workspace mode");
-    expect(
-      sections[1]?.entries.some(
-        (entry) => entry.id === "thread.jump.1" && entry.shortcutLabel === "Ctrl+1",
-      ),
-    ).toBe(true);
+    expect(sections[1]?.title).toBe("Project scripts");
+    expect(sections[1]?.entries[0]?.shortcutLabel).toBe("⌘R");
   });
 
   it("falls back to the legacy new-chat alias when needed", () => {
diff --git a/apps/web/src/shortcutsSheet.ts b/apps/web/src/shortcutsSheet.ts
index e55fad6d5..7b789a269 100644
--- a/apps/web/src/shortcutsSheet.ts
+++ b/apps/web/src/shortcutsSheet.ts
@@ -10,9 +10,6 @@ import { commandForProjectScript } from "./projectScripts";
 import type { ProjectScript } from "./types";
 
 export interface ShortcutSheetContext {
-  terminalFocus: boolean;
-  terminalOpen: boolean;
-  terminalWorkspaceOpen: boolean;
   [key: string]: boolean;
 }
 
@@ -75,11 +72,6 @@ const AVAILABLE_NOW_DEFINITIONS: readonly ShortcutDefinition[] = [
     label: "New chat",
     description: "Open the empty chat landing view.",
   },
-  {
-    command: "chat.newTerminal",
-    label: "New terminal thread",
-    description: "Create a thread that opens directly into terminal mode.",
-  },
   {
     command: "chat.newClaude",
     label: "New Claude thread",
@@ -115,11 +107,6 @@ const AVAILABLE_NOW_DEFINITIONS: readonly ShortcutDefinition[] = [
     label: "Focus composer",
     description: "Focus or blur the chat prompt composer.",
   },
-  {
-    command: "terminal.toggle",
-    label: "Toggle terminal",
-    description: "Show or hide the terminal surface for the active thread.",
-  },
   {
     command: "diff.toggle",
     label: "Toggle diff",
@@ -161,29 +148,6 @@ const THREAD_JUMP_DEFINITIONS: readonly ShortcutDefinition[] = Array.from(
   }),
 );
 
-const WORKSPACE_DEFINITIONS: readonly ShortcutDefinition[] = [
-  {
-    command: "terminal.workspace.newFullWidth",
-    label: "Open full-width terminal workspace",
-    description: "Expand the active thread into the workspace terminal layout.",
-  },
-  {
-    command: "terminal.workspace.terminal",
-    label: "Focus terminal tab",
-    description: "Switch the workspace to the terminal tab.",
-  },
-  {
-    command: "terminal.workspace.chat",
-    label: "Focus chat tab",
-    description: "Switch the workspace back to the chat tab.",
-  },
-  {
-    command: "terminal.workspace.closeActive",
-    label: "Close active workspace panel",
-    description: "Close the currently focused workspace panel or tab.",
-  },
-] as const;
-
 function modSlashLabel(platform: string): string {
   return isMacPlatform(platform) ? "⌘/" : "Ctrl+/";
 }
@@ -256,57 +220,20 @@ export function buildShortcutSheetSections(
     currentEntries.splice(1, 0, sidebarToggle);
   }
 
-  const currentNavigationEntries = options.context.terminalWorkspaceOpen
-    ? definitionsToEntries(
-        WORKSPACE_DEFINITIONS,
-        options.keybindings,
-        options.platform,
-        options.context,
-      )
-    : definitionsToEntries(
-        THREAD_JUMP_DEFINITIONS,
-        options.keybindings,
-        options.platform,
-        options.context,
-      );
+  const currentNavigationEntries = definitionsToEntries(
+    THREAD_JUMP_DEFINITIONS,
+    options.keybindings,
+    options.platform,
+    options.context,
+  );
 
   sections.push({
     id: "available-now",
     title: "Available now",
-    description: options.context.terminalWorkspaceOpen
-      ? "These reflect the active workspace-terminal context."
-      : "These reflect the current chat and sidebar context.",
+    description: "These reflect the current chat and sidebar context.",
     entries: [...currentEntries, ...currentNavigationEntries],
   });
 
-  const alternateContext: ShortcutSheetContext = options.context.terminalWorkspaceOpen
-    ? { ...options.context, terminalWorkspaceOpen: false }
-    : {
-        ...options.context,
-        terminalOpen: true,
-        terminalWorkspaceOpen: true,
-      };
-  const alternateDefinitions = options.context.terminalWorkspaceOpen
-    ? THREAD_JUMP_DEFINITIONS
-    : WORKSPACE_DEFINITIONS;
-  const alternateEntries = definitionsToEntries(
-    alternateDefinitions,
-    options.keybindings,
-    options.platform,
-    alternateContext,
-  );
-  if (alternateEntries.length > 0) {
-    sections.push({
-      id: "alternate-context",
-      title: options.context.terminalWorkspaceOpen ? "Outside workspace mode" : "In workspace mode",
-      description: options.context.terminalWorkspaceOpen
-        ? "Number-row jumps return when the terminal workspace is closed."
-        : "These bindings take over when the terminal switches into workspace mode.",
-      tone: "muted",
-      entries: alternateEntries,
-    });
-  }
-
   const projectScriptEntries = options.projectScripts
     .map((script) => {
       const shortcutLabel = shortcutLabelForCommand(
@@ -340,7 +267,7 @@ export function buildShortcutSheetSections(
 
 // Match a single entry against a free-text query on the human-readable label, the
 // description, and the rendered shortcut label, so a user can search by action name
-// ("terminal"), intent ("split"), or even the key combo itself ("⌘N" / "ctrl+n").
+// (a surface name), intent ("split"), or even the key combo itself ("⌘N" / "ctrl+n").
 function shortcutSheetEntryMatchesQuery(entry: ShortcutSheetEntry, needle: string): boolean {
   return (
     entry.label.toLowerCase().includes(needle) ||
diff --git a/apps/web/src/sidebarRowStyles.ts b/apps/web/src/sidebarRowStyles.ts
index 952329c53..d7737ce24 100644
--- a/apps/web/src/sidebarRowStyles.ts
+++ b/apps/web/src/sidebarRowStyles.ts
@@ -7,9 +7,10 @@
 export const SIDEBAR_ROW_HEIGHT_CLASS_NAME =
   "min-h-[var(--app-density-row-height,1.75rem)] h-[var(--app-density-row-height,1.75rem)]";
 
-export const SIDEBAR_ROW_RADIUS_CLASS_NAME = "rounded-[8px]";
+export const SIDEBAR_ROW_RADIUS_CLASS_NAME = "rounded-lg";
 
-export const SIDEBAR_ROW_PADDING_CLASS_NAME = "px-2 py-[var(--app-density-row-padding-y,0.125rem)]";
+export const SIDEBAR_ROW_PADDING_CLASS_NAME =
+  "px-1.5 py-[var(--app-density-row-padding-y,0.125rem)]";
 
 export const SIDEBAR_ROW_GAP_CLASS_NAME = "gap-[var(--app-density-row-gap,0.5rem)]";
 
@@ -24,7 +25,7 @@ export const SIDEBAR_ROW_HOVER_CLASS_NAME =
 export const SIDEBAR_ROW_ACTIVE_CLASS_NAME =
   "bg-[var(--sidebar-accent-active)] text-[var(--sidebar-accent-foreground)] hover:bg-[var(--sidebar-accent-active)] hover:text-[var(--sidebar-accent-foreground)]";
 
-export const SIDEBAR_ROW_IDLE_TEXT_CLASS_NAME = "text-[#c2c0bc]";
+export const SIDEBAR_ROW_IDLE_TEXT_CLASS_NAME = "text-[var(--color-text-foreground-secondary)]";
 
 /**
  * Resting foreground for primary sidebar item labels and their accompanying
@@ -32,14 +33,14 @@ export const SIDEBAR_ROW_IDLE_TEXT_CLASS_NAME = "text-[#c2c0bc]";
  * glyphs). Sits just below the full-foreground active row so resting items read
  * clearly without competing with the selected thread.
  */
-export const SIDEBAR_ROW_LABEL_TEXT_CLASS_NAME = "text-[#c2c0bc]";
+export const SIDEBAR_ROW_LABEL_TEXT_CLASS_NAME = "text-[var(--color-text-foreground-secondary)]";
 
 /** Dimmer idle label color shared by project header rows, thread rows, and settings nav rows. */
-export const SIDEBAR_ROW_MUTED_TEXT_CLASS_NAME = "text-muted-foreground/79";
+export const SIDEBAR_ROW_MUTED_TEXT_CLASS_NAME = "text-muted-foreground/60";
 
 /** Section label ("Threads"/"Pinned"/"Workspace" and settings "App"/"Chitauri"). */
 export const SIDEBAR_SECTION_LABEL_CLASS_NAME =
-  "sidebar-section-label text-[12.5px] font-normal text-muted-foreground";
+  "sidebar-section-label text-[12.5px] font-normal text-muted-foreground/70";
 
 /** Project/chat/settings header rows and settings sidebar nav items. */
 export const SIDEBAR_HEADER_ROW_CLASS_NAME = [
@@ -55,17 +56,16 @@ export const SIDEBAR_HEADER_ROW_CLASS_NAME = [
 /**
  * Thread rows nested under a project.
  *
- * The left gutter is one step (8px) in from the project header's own `px-2`, so a
- * thread's leading avatar sits just right of the folder glyph and its name just
- * right of the project name — a readable stair-step that still leaves the row's
- * width to the title. Callers widen it only when something occupies the gutter
- * (the absolutely-positioned PR badge) and narrow it for flush top-level rows.
+ * The left gutter is one step (6px) in from the project header's own `px-1.5`, so a
+ * thread's title sits just right of the project name — a readable stair-step that
+ * leaves the rest of the row's width to the title itself. Callers narrow it for
+ * flush top-level rows.
  */
 export const SIDEBAR_THREAD_ROW_BASE_CLASS_NAME = [
   "w-full translate-x-0 cursor-pointer justify-start text-left select-none",
   SIDEBAR_ROW_HEIGHT_CLASS_NAME,
   SIDEBAR_ROW_RADIUS_CLASS_NAME,
-  "pl-4 text-[13.5px]",
+  "pl-3 text-[13.5px]",
   SIDEBAR_ROW_FOCUS_CLASS_NAME,
 ].join(" ");
 
diff --git a/apps/web/src/singleChatPanelStore.ts b/apps/web/src/singleChatPanelStore.ts
deleted file mode 100644
index 7e8227f26..000000000
--- a/apps/web/src/singleChatPanelStore.ts
+++ /dev/null
@@ -1,125 +0,0 @@
-// FILE: singleChatPanelStore.ts
-// Purpose: Persist right-panel state for single-thread chat surfaces.
-// Layer: UI state store
-// Exports: single-surface panel store, default-state helpers, and selectors.
-
-import type { ThreadId, TurnId } from "@t3tools/contracts";
-import { create } from "zustand";
-import { createJSONStorage, persist } from "zustand/middleware";
-import type { ChatRightPanel } from "./diffRouteSearch";
-import { isPlainObject, sanitizeStringKeyedRecord } from "./persistedRecord";
-
-export interface SingleChatPanelState {
-  panel: ChatRightPanel | null;
-  diffTurnId: TurnId | null;
-  diffFilePath: string | null;
-  hasOpenedPanel: boolean;
-  lastOpenPanel: ChatRightPanel;
-}
-
-interface SingleChatPanelStore {
-  panelStateByThreadId: Record<string, SingleChatPanelState | undefined>;
-  setThreadPanelState: (threadId: ThreadId, patch: Partial<SingleChatPanelState>) => void;
-  clearThreadPanelState: (threadId: ThreadId) => void;
-}
-
-const SINGLE_CHAT_PANEL_STORAGE_KEY = "teacode:single-chat-panel-state:v1";
-
-export function createDefaultSingleChatPanelState(): SingleChatPanelState {
-  return {
-    panel: null,
-    diffTurnId: null,
-    diffFilePath: null,
-    hasOpenedPanel: false,
-    lastOpenPanel: "diff",
-  };
-}
-
-const DEFAULT_SINGLE_CHAT_PANEL_STATE = createDefaultSingleChatPanelState();
-
-function getDefaultSingleChatPanelState(): SingleChatPanelState {
-  return DEFAULT_SINGLE_CHAT_PANEL_STATE;
-}
-
-function isChatRightPanel(value: unknown): value is ChatRightPanel {
-  return value === "diff";
-}
-
-function sanitizeSingleChatPanelState(rawState: unknown): SingleChatPanelState | null {
-  if (!isPlainObject(rawState)) {
-    return null;
-  }
-  const { panel, diffTurnId, diffFilePath, hasOpenedPanel, lastOpenPanel } = rawState;
-  return {
-    panel: isChatRightPanel(panel) ? panel : null,
-    diffTurnId: typeof diffTurnId === "string" ? (diffTurnId as TurnId) : null,
-    diffFilePath: typeof diffFilePath === "string" ? diffFilePath : null,
-    hasOpenedPanel: hasOpenedPanel === true,
-    lastOpenPanel: isChatRightPanel(lastOpenPanel) ? lastOpenPanel : "diff",
-  };
-}
-
-// Validates persisted per-thread panel state so an unknown panel kind or a
-// malformed entry degrades to defaults instead of flowing into the UI.
-export function sanitizePanelStateByThreadId(value: unknown): Record<string, SingleChatPanelState> {
-  return sanitizeStringKeyedRecord(value, sanitizeSingleChatPanelState);
-}
-
-export const useSingleChatPanelStore = create<SingleChatPanelStore>()(
-  persist(
-    (set) => ({
-      panelStateByThreadId: {},
-      setThreadPanelState: (threadId, patch) =>
-        set((state) => {
-          const previous = state.panelStateByThreadId[threadId] ?? getDefaultSingleChatPanelState();
-          const next = {
-            ...previous,
-            ...patch,
-          };
-          if (
-            previous.panel === next.panel &&
-            previous.diffTurnId === next.diffTurnId &&
-            previous.diffFilePath === next.diffFilePath &&
-            previous.hasOpenedPanel === next.hasOpenedPanel &&
-            previous.lastOpenPanel === next.lastOpenPanel
-          ) {
-            return state;
-          }
-          return {
-            panelStateByThreadId: {
-              ...state.panelStateByThreadId,
-              [threadId]: next,
-            },
-          };
-        }),
-      clearThreadPanelState: (threadId) =>
-        set((state) => {
-          if (!Object.hasOwn(state.panelStateByThreadId, threadId)) {
-            return state;
-          }
-          const nextPanelStateByThreadId = { ...state.panelStateByThreadId };
-          delete nextPanelStateByThreadId[threadId];
-          return {
-            panelStateByThreadId: nextPanelStateByThreadId,
-          };
-        }),
-    }),
-    {
-      name: SINGLE_CHAT_PANEL_STORAGE_KEY,
-      storage: createJSONStorage(() => localStorage),
-      merge: (persisted, current) => ({
-        ...current,
-        panelStateByThreadId: sanitizePanelStateByThreadId(
-          (persisted as { panelStateByThreadId?: unknown } | undefined)?.panelStateByThreadId,
-        ),
-      }),
-    },
-  ),
-);
-
-export function selectSingleChatPanelState(threadId: ThreadId) {
-  return (store: SingleChatPanelStore) =>
-    // Keep the fallback snapshot stable so React does not observe a phantom store change
-    // while mounting a thread that has no persisted panel state yet.
-    store.panelStateByThreadId[threadId] ?? getDefaultSingleChatPanelState();
-}
diff --git a/apps/web/src/storageKeyMigration.test.ts b/apps/web/src/storageKeyMigration.test.ts
index ed48e1731..9353194b8 100644
--- a/apps/web/src/storageKeyMigration.test.ts
+++ b/apps/web/src/storageKeyMigration.test.ts
@@ -89,13 +89,13 @@ describe("storageKeyMigration", () => {
 
   it("does not overwrite an existing TeaCode value when legacy keys still hold data", async () => {
     globalThis.localStorage.setItem("t3code:theme", "dark");
-    globalThis.localStorage.setItem("dpcode:theme", "light");
+    globalThis.localStorage.setItem("dpcode:theme", "stale");
     globalThis.localStorage.setItem("teacode:theme", "current");
 
     await importMigrationFresh();
 
     expect(globalThis.localStorage.getItem("teacode:theme")).toBe("current");
-    expect(globalThis.localStorage.getItem("dpcode:theme")).toBe("light");
+    expect(globalThis.localStorage.getItem("dpcode:theme")).toBe("stale");
     expect(globalThis.localStorage.getItem("t3code:theme")).toBe("dark");
   });
 
diff --git a/apps/web/src/terminal-links.test.ts b/apps/web/src/terminal-links.test.ts
deleted file mode 100644
index 140c6907a..000000000
--- a/apps/web/src/terminal-links.test.ts
+++ /dev/null
@@ -1,211 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  collectWrappedTerminalLinkLine,
-  extractTerminalLinks,
-  isTerminalLinkActivation,
-  resolvePathLinkTarget,
-  resolveWrappedTerminalLinkRange,
-  wrappedTerminalLinkRangeIntersectsBufferLine,
-  type TerminalBufferLineLike,
-} from "./terminal-links";
-
-function createBufferLine(text: string, isWrapped = false): TerminalBufferLineLike {
-  return {
-    isWrapped,
-    translateToString: (trimRight = false) => (trimRight ? text.replace(/\s+$/u, "") : text),
-  };
-}
-
-describe("extractTerminalLinks", () => {
-  it("finds http urls and path tokens", () => {
-    const line =
-      "failed at https://example.com/docs and src/components/ThreadTerminalDrawer.tsx:42";
-    expect(extractTerminalLinks(line)).toEqual([
-      {
-        kind: "url",
-        text: "https://example.com/docs",
-        start: 10,
-        end: 34,
-      },
-      {
-        kind: "path",
-        text: "src/components/ThreadTerminalDrawer.tsx:42",
-        start: 39,
-        end: 81,
-      },
-    ]);
-  });
-
-  it("trims trailing punctuation from links", () => {
-    const line = "(https://example.com/docs), ./src/main.ts:12.";
-    expect(extractTerminalLinks(line)).toEqual([
-      {
-        kind: "url",
-        text: "https://example.com/docs",
-        start: 1,
-        end: 25,
-      },
-      {
-        kind: "path",
-        text: "./src/main.ts:12",
-        start: 28,
-        end: 44,
-      },
-    ]);
-  });
-});
-
-describe("resolvePathLinkTarget", () => {
-  it("resolves relative paths against cwd", () => {
-    expect(
-      resolvePathLinkTarget(
-        "src/components/ThreadTerminalDrawer.tsx:42:7",
-        "/Users/julius/project",
-      ),
-    ).toBe("/Users/julius/project/src/components/ThreadTerminalDrawer.tsx:42:7");
-  });
-
-  it("keeps absolute paths unchanged", () => {
-    expect(
-      resolvePathLinkTarget("/Users/julius/project/src/main.ts:12", "/Users/julius/project"),
-    ).toBe("/Users/julius/project/src/main.ts:12");
-  });
-});
-
-describe("collectWrappedTerminalLinkLine", () => {
-  it("reconstructs a wrapped line from any physical row", () => {
-    const firstSegment = "see https://example.com/a";
-    const secondSegment = "/bc?x=1";
-    const lines = [
-      createBufferLine("prompt> "),
-      createBufferLine(firstSegment),
-      createBufferLine(secondSegment, true),
-      createBufferLine("done"),
-    ];
-
-    const fromFirstRow = collectWrappedTerminalLinkLine(2, (index) => lines[index]);
-    const fromWrappedRow = collectWrappedTerminalLinkLine(3, (index) => lines[index]);
-
-    expect(fromFirstRow).toEqual({
-      text: `${firstSegment}${secondSegment}`,
-      segments: [
-        {
-          bufferLineNumber: 2,
-          text: firstSegment,
-          startIndex: 0,
-          endIndex: firstSegment.length,
-        },
-        {
-          bufferLineNumber: 3,
-          text: secondSegment,
-          startIndex: firstSegment.length,
-          endIndex: firstSegment.length + secondSegment.length,
-        },
-      ],
-    });
-    expect(fromWrappedRow).toEqual(fromFirstRow);
-  });
-
-  it("preserves trailing spaces on continued segments for downstream offsets", () => {
-    const firstSegment = "prefix   ";
-    const secondSegment = "https://example.com/path";
-    const lines = [createBufferLine(firstSegment), createBufferLine(secondSegment, true)];
-
-    const wrappedLine = collectWrappedTerminalLinkLine(2, (index) => lines[index]);
-
-    expect(wrappedLine?.text).toBe(`${firstSegment}${secondSegment}`);
-    expect(extractTerminalLinks(wrappedLine?.text ?? "")).toEqual([
-      {
-        kind: "url",
-        text: secondSegment,
-        start: firstSegment.length,
-        end: firstSegment.length + secondSegment.length,
-      },
-    ]);
-  });
-});
-
-describe("resolveWrappedTerminalLinkRange", () => {
-  it("maps wrapped URL matches back to the correct buffer rows", () => {
-    const prefix = "see ";
-    const firstSegment = `${prefix}https://example.com/a`;
-    const secondSegment = "/bc?x=1";
-    const lines = [
-      createBufferLine("prompt> "),
-      createBufferLine(firstSegment),
-      createBufferLine(secondSegment, true),
-    ];
-    const wrappedLine = collectWrappedTerminalLinkLine(2, (index) => lines[index]);
-
-    expect(wrappedLine).not.toBeNull();
-    if (!wrappedLine) {
-      throw new Error("Expected wrapped terminal line to be present.");
-    }
-
-    const [match] = extractTerminalLinks(wrappedLine.text);
-    expect(match).toEqual({
-      kind: "url",
-      text: "https://example.com/a/bc?x=1",
-      start: prefix.length,
-      end: firstSegment.length + secondSegment.length,
-    });
-    if (!match) {
-      throw new Error("Expected wrapped URL match to be present.");
-    }
-
-    const range = resolveWrappedTerminalLinkRange(wrappedLine, match);
-
-    expect(range).toEqual({
-      start: { x: prefix.length + 1, y: 2 },
-      end: { x: secondSegment.length, y: 3 },
-    });
-    expect(wrappedTerminalLinkRangeIntersectsBufferLine(range, 2)).toBe(true);
-    expect(wrappedTerminalLinkRangeIntersectsBufferLine(range, 3)).toBe(true);
-    expect(wrappedTerminalLinkRangeIntersectsBufferLine(range, 4)).toBe(false);
-  });
-});
-
-describe("isTerminalLinkActivation", () => {
-  it("requires cmd on macOS", () => {
-    expect(
-      isTerminalLinkActivation(
-        {
-          metaKey: true,
-          ctrlKey: false,
-        },
-        "MacIntel",
-      ),
-    ).toBe(true);
-    expect(
-      isTerminalLinkActivation(
-        {
-          metaKey: false,
-          ctrlKey: true,
-        },
-        "MacIntel",
-      ),
-    ).toBe(false);
-  });
-
-  it("requires ctrl on non-macOS", () => {
-    expect(
-      isTerminalLinkActivation(
-        {
-          metaKey: false,
-          ctrlKey: true,
-        },
-        "Win32",
-      ),
-    ).toBe(true);
-    expect(
-      isTerminalLinkActivation(
-        {
-          metaKey: true,
-          ctrlKey: false,
-        },
-        "Linux",
-      ),
-    ).toBe(false);
-  });
-});
diff --git a/apps/web/src/terminal-links.ts b/apps/web/src/terminal-links.ts
deleted file mode 100644
index b14d57276..000000000
--- a/apps/web/src/terminal-links.ts
+++ /dev/null
@@ -1,286 +0,0 @@
-import { isMacPlatform } from "./lib/utils";
-
-export type TerminalLinkKind = "url" | "path";
-
-export interface TerminalLinkMatch {
-  kind: TerminalLinkKind;
-  text: string;
-  start: number;
-  end: number;
-}
-
-export interface TerminalLinkBufferPosition {
-  x: number;
-  y: number;
-}
-
-export interface TerminalLinkBufferRange {
-  start: TerminalLinkBufferPosition;
-  end: TerminalLinkBufferPosition;
-}
-
-export interface TerminalBufferLineLike {
-  readonly isWrapped?: boolean;
-  translateToString(trimRight?: boolean): string;
-}
-
-export interface WrappedTerminalLinkLineSegment {
-  bufferLineNumber: number;
-  text: string;
-  startIndex: number;
-  endIndex: number;
-}
-
-export interface WrappedTerminalLinkLine {
-  text: string;
-  segments: ReadonlyArray<WrappedTerminalLinkLineSegment>;
-}
-
-const URL_PATTERN = /https?:\/\/[^\s"'`<>]+/g;
-const FILE_PATH_PATTERN =
-  /(?:~\/|\.{1,2}\/|\/|[A-Za-z]:\\|\\\\)[^\s"'`<>]+|[A-Za-z0-9._-]+(?:\/[A-Za-z0-9._-]+)+(?::\d+){0,2}/g;
-const TRAILING_PUNCTUATION_PATTERN = /[.,;!?]+$/;
-
-function trimClosingDelimiters(value: string): string {
-  let output = value.replace(TRAILING_PUNCTUATION_PATTERN, "");
-  if (output.length === 0) return output;
-
-  const trimUnbalanced = (open: string, close: string) => {
-    while (output.endsWith(close)) {
-      const opens = output.split(open).length - 1;
-      const closes = output.split(close).length - 1;
-      if (opens >= closes) return;
-      output = output.slice(0, -1);
-    }
-  };
-
-  trimUnbalanced("(", ")");
-  trimUnbalanced("[", "]");
-  trimUnbalanced("{", "}");
-  return output;
-}
-
-function overlaps(a: { start: number; end: number }, b: { start: number; end: number }): boolean {
-  return a.start < b.end && b.start < a.end;
-}
-
-function collectMatches(
-  line: string,
-  kind: TerminalLinkKind,
-  pattern: RegExp,
-  existing: TerminalLinkMatch[],
-): TerminalLinkMatch[] {
-  const matches: TerminalLinkMatch[] = [];
-  pattern.lastIndex = 0;
-
-  for (const rawMatch of line.matchAll(pattern)) {
-    const raw = rawMatch[0];
-    const start = rawMatch.index ?? -1;
-    if (start < 0 || raw.length === 0) continue;
-
-    const trimmed = trimClosingDelimiters(raw);
-    if (trimmed.length === 0) continue;
-    if (kind === "path" && /^https?:\/\//i.test(trimmed)) continue;
-
-    const candidate: TerminalLinkMatch = {
-      kind,
-      text: trimmed,
-      start,
-      end: start + trimmed.length,
-    };
-
-    const collides = [...existing, ...matches].some((other) => overlaps(candidate, other));
-    if (collides) continue;
-
-    matches.push(candidate);
-  }
-
-  return matches;
-}
-
-function isWindowsAbsolutePath(value: string): boolean {
-  return /^[A-Za-z]:[\\/]/.test(value) || value.startsWith("\\\\");
-}
-
-function isAbsolutePath(value: string): boolean {
-  return value.startsWith("/") || isWindowsAbsolutePath(value);
-}
-
-function isWindowsPathStyle(value: string): boolean {
-  return isWindowsAbsolutePath(value) || /[A-Za-z]:\\/.test(value);
-}
-
-function joinPath(base: string, next: string, separator: "/" | "\\"): string {
-  const cleanBase = base.replace(/[\\/]+$/, "");
-  if (separator === "\\") {
-    return `${cleanBase}\\${next.replaceAll("/", "\\")}`;
-  }
-  return `${cleanBase}/${next.replace(/^\/+/, "")}`;
-}
-
-function inferHomeFromCwd(cwd: string): string | undefined {
-  const posixUser = cwd.match(/^\/Users\/([^/]+)/);
-  if (posixUser?.[1]) {
-    return `/Users/${posixUser[1]}`;
-  }
-
-  const posixHome = cwd.match(/^\/home\/([^/]+)/);
-  if (posixHome?.[1]) {
-    return `/home/${posixHome[1]}`;
-  }
-
-  const windowsUser = cwd.match(/^([A-Za-z]:\\Users\\[^\\]+)/);
-  if (windowsUser?.[1]) {
-    return windowsUser[1];
-  }
-
-  return undefined;
-}
-
-function splitPathAndPosition(value: string): {
-  path: string;
-  line: string | undefined;
-  column: string | undefined;
-} {
-  let path = value;
-  let column: string | undefined;
-  let line: string | undefined;
-
-  const columnMatch = path.match(/:(\d+)$/);
-  if (!columnMatch?.[1]) {
-    return { path, line: undefined, column: undefined };
-  }
-
-  column = columnMatch[1];
-  path = path.slice(0, -columnMatch[0].length);
-
-  const lineMatch = path.match(/:(\d+)$/);
-  if (lineMatch?.[1]) {
-    line = lineMatch[1];
-    path = path.slice(0, -lineMatch[0].length);
-  } else {
-    line = column;
-    column = undefined;
-  }
-
-  return { path, line, column };
-}
-
-export function extractTerminalLinks(line: string): TerminalLinkMatch[] {
-  const urlMatches = collectMatches(line, "url", URL_PATTERN, []);
-  const pathMatches = collectMatches(line, "path", FILE_PATH_PATTERN, urlMatches);
-  return [...urlMatches, ...pathMatches].toSorted((a, b) => a.start - b.start);
-}
-
-export function collectWrappedTerminalLinkLine(
-  bufferLineNumber: number,
-  getLine: (bufferLineIndex: number) => TerminalBufferLineLike | null | undefined,
-): WrappedTerminalLinkLine | null {
-  const anchorLine = getLine(bufferLineNumber - 1);
-  if (!anchorLine) return null;
-
-  let startBufferLineNumber = bufferLineNumber;
-  let startLine = anchorLine;
-
-  while (startBufferLineNumber > 1 && startLine.isWrapped) {
-    const previousLine = getLine(startBufferLineNumber - 2);
-    if (!previousLine) return null;
-    startBufferLineNumber -= 1;
-    startLine = previousLine;
-  }
-
-  const segments: WrappedTerminalLinkLineSegment[] = [];
-  let nextStartIndex = 0;
-  let currentBufferLineNumber = startBufferLineNumber;
-
-  while (true) {
-    const currentLine = getLine(currentBufferLineNumber - 1);
-    if (!currentLine) break;
-
-    const nextLine = getLine(currentBufferLineNumber);
-    const hasWrappedContinuation = nextLine?.isWrapped === true;
-    const text = currentLine.translateToString(!hasWrappedContinuation);
-
-    segments.push({
-      bufferLineNumber: currentBufferLineNumber,
-      text,
-      startIndex: nextStartIndex,
-      endIndex: nextStartIndex + text.length,
-    });
-    nextStartIndex += text.length;
-
-    if (!hasWrappedContinuation) break;
-    currentBufferLineNumber += 1;
-  }
-
-  return {
-    text: segments.map((segment) => segment.text).join(""),
-    segments,
-  };
-}
-
-function resolveCharacterPosition(
-  segments: ReadonlyArray<WrappedTerminalLinkLineSegment>,
-  characterIndex: number,
-): TerminalLinkBufferPosition {
-  for (const segment of segments) {
-    if (characterIndex < segment.endIndex) {
-      return {
-        x: characterIndex - segment.startIndex + 1,
-        y: segment.bufferLineNumber,
-      };
-    }
-  }
-
-  const lastSegment = segments[segments.length - 1];
-  return {
-    x: Math.max(lastSegment?.text.length ?? 0, 1),
-    y: lastSegment?.bufferLineNumber ?? 1,
-  };
-}
-
-export function resolveWrappedTerminalLinkRange(
-  wrappedLine: WrappedTerminalLinkLine,
-  match: Pick<TerminalLinkMatch, "start" | "end">,
-): TerminalLinkBufferRange {
-  return {
-    start: resolveCharacterPosition(wrappedLine.segments, match.start),
-    end: resolveCharacterPosition(wrappedLine.segments, match.end - 1),
-  };
-}
-
-export function wrappedTerminalLinkRangeIntersectsBufferLine(
-  range: TerminalLinkBufferRange,
-  bufferLineNumber: number,
-): boolean {
-  return range.start.y <= bufferLineNumber && bufferLineNumber <= range.end.y;
-}
-
-export function isTerminalLinkActivation(
-  event: Pick<MouseEvent, "metaKey" | "ctrlKey">,
-  platform = typeof navigator === "undefined" ? "" : navigator.platform,
-): boolean {
-  if (platform.length === 0) return false;
-  return isMacPlatform(platform)
-    ? event.metaKey && !event.ctrlKey
-    : event.ctrlKey && !event.metaKey;
-}
-
-export function resolvePathLinkTarget(rawPath: string, cwd: string): string {
-  const { path, line, column } = splitPathAndPosition(rawPath);
-
-  let resolvedPath = path;
-  if (path.startsWith("~/")) {
-    const home = inferHomeFromCwd(cwd);
-    if (home) {
-      const separator: "/" | "\\" = isWindowsPathStyle(home) ? "\\" : "/";
-      resolvedPath = joinPath(home, path.slice(2), separator);
-    }
-  } else if (!isAbsolutePath(path)) {
-    const separator: "/" | "\\" = isWindowsPathStyle(cwd) ? "\\" : "/";
-    resolvedPath = joinPath(cwd, path, separator);
-  }
-
-  if (!line) return resolvedPath;
-  return `${resolvedPath}:${line}${column ? `:${column}` : ""}`;
-}
diff --git a/apps/web/src/terminalActivity.test.ts b/apps/web/src/terminalActivity.test.ts
deleted file mode 100644
index b2d1c007d..000000000
--- a/apps/web/src/terminalActivity.test.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import type { TerminalEvent, TerminalSessionSnapshot } from "@t3tools/contracts";
-import { terminalActivityFromEvent } from "./terminalActivity";
-
-const snapshot: TerminalSessionSnapshot = {
-  threadId: "thread-1",
-  terminalId: "default",
-  cwd: "/tmp",
-  status: "running",
-  pid: 1234,
-  history: "",
-  exitCode: null,
-  exitSignal: null,
-  updatedAt: "2026-01-01T00:00:00.000Z",
-};
-
-function eventBase() {
-  return {
-    threadId: "thread-1",
-    terminalId: "default",
-    createdAt: "2026-01-01T00:00:00.000Z",
-  };
-}
-
-describe("terminalActivityFromEvent", () => {
-  it("returns lifecycle state for terminal activity events", () => {
-    const active = terminalActivityFromEvent({
-      ...eventBase(),
-      type: "activity",
-      cliKind: "codex",
-      agentState: "running",
-      hasRunningSubprocess: true,
-    });
-    const attention = terminalActivityFromEvent({
-      ...eventBase(),
-      type: "activity",
-      cliKind: "claude",
-      agentState: "attention",
-      hasRunningSubprocess: true,
-    });
-
-    expect(active).toEqual({
-      hasRunningSubprocess: true,
-      agentState: "running",
-    });
-    expect(attention).toEqual({
-      hasRunningSubprocess: true,
-      agentState: "attention",
-    });
-  });
-
-  it("clears lifecycle state when a terminal session starts/restarts/exits", () => {
-    const events: TerminalEvent[] = [
-      { ...eventBase(), type: "started", snapshot },
-      { ...eventBase(), type: "restarted", snapshot },
-      { ...eventBase(), type: "exited", exitCode: 0, exitSignal: null },
-    ];
-
-    for (const event of events) {
-      expect(terminalActivityFromEvent(event)).toEqual({
-        hasRunningSubprocess: false,
-        agentState: null,
-      });
-    }
-  });
-
-  it("ignores non-activity terminal events", () => {
-    expect(
-      terminalActivityFromEvent({
-        ...eventBase(),
-        type: "output",
-        data: "hello",
-      }),
-    ).toBeNull();
-    expect(
-      terminalActivityFromEvent({
-        ...eventBase(),
-        type: "error",
-        message: "oops",
-      }),
-    ).toBeNull();
-  });
-});
diff --git a/apps/web/src/terminalActivity.ts b/apps/web/src/terminalActivity.ts
deleted file mode 100644
index fc5e413fa..000000000
--- a/apps/web/src/terminalActivity.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type { TerminalEvent } from "@t3tools/contracts";
-import type { TerminalActivityState } from "@t3tools/shared/terminalThreads";
-
-export interface TerminalActivityUpdate {
-  agentState: TerminalActivityState | null;
-  hasRunningSubprocess: boolean;
-}
-
-export function terminalActivityFromEvent(event: TerminalEvent): TerminalActivityUpdate | null {
-  switch (event.type) {
-    case "activity":
-      return {
-        hasRunningSubprocess: event.hasRunningSubprocess,
-        agentState: event.agentState,
-      };
-    case "started":
-    case "restarted":
-    case "exited":
-      return {
-        hasRunningSubprocess: false,
-        agentState: null,
-      };
-    default:
-      return null;
-  }
-}
diff --git a/apps/web/src/terminalPaneLayout.ts b/apps/web/src/terminalPaneLayout.ts
deleted file mode 100644
index d5cec3a7d..000000000
--- a/apps/web/src/terminalPaneLayout.ts
+++ /dev/null
@@ -1,582 +0,0 @@
-// FILE: terminalPaneLayout.ts
-// Purpose: Pure helpers for terminal pane-tree normalization and split mutations.
-// Layer: Terminal domain helpers
-// Depends on: terminal layout types shared by the store and terminal UI.
-
-import {
-  DEFAULT_THREAD_TERMINAL_ID,
-  type ThreadTerminalGroup,
-  type ThreadTerminalLayoutNode,
-  type ThreadTerminalSplitDirection,
-  type ThreadTerminalSplitNode,
-  type ThreadTerminalSplitPosition,
-} from "./types";
-
-type RawTerminalGroup = Partial<ThreadTerminalGroup> & {
-  terminalIds?: string[] | undefined;
-  layout?: ThreadTerminalLayoutNode | undefined;
-  activeTerminalId?: string | undefined;
-};
-
-type RawTerminalLeafNode = Partial<Extract<ThreadTerminalLayoutNode, { type: "terminal" }>> & {
-  terminalId?: string | undefined;
-};
-
-function normalizePaneTerminalIds(
-  terminalIds: Array<string | undefined> | undefined,
-  validTerminalIdSet?: ReadonlySet<string>,
-): string[] {
-  return [...new Set((terminalIds ?? []).map((terminalId) => terminalId?.trim() ?? ""))]
-    .filter((terminalId) => terminalId.length > 0)
-    .filter((terminalId) => (validTerminalIdSet ? validTerminalIdSet.has(terminalId) : true));
-}
-
-function resolveLeafTerminalIds(
-  node: RawTerminalLeafNode | null | undefined,
-  validTerminalIdSet?: ReadonlySet<string>,
-): string[] {
-  const terminalIds = normalizePaneTerminalIds(node?.terminalIds, validTerminalIdSet);
-  if (terminalIds.length > 0) {
-    return terminalIds;
-  }
-  return normalizePaneTerminalIds([node?.terminalId], validTerminalIdSet);
-}
-
-function createTerminalLeaf(
-  terminalId: string,
-  paneId = `pane-${terminalId}`,
-): ThreadTerminalLayoutNode {
-  return {
-    type: "terminal",
-    paneId,
-    terminalIds: [terminalId],
-    activeTerminalId: terminalId,
-  };
-}
-
-export function isTerminalSplitNode(
-  node: ThreadTerminalLayoutNode,
-): node is ThreadTerminalSplitNode {
-  return node.type === "split";
-}
-
-function normalizedWeight(weight: number | undefined): number {
-  return Number.isFinite(weight) && weight && weight > 0 ? weight : 1;
-}
-
-function normalizeSplitWeights(childrenCount: number, weights: number[] | undefined): number[] {
-  const nextWeights = Array.from({ length: childrenCount }, (_, index) =>
-    normalizedWeight(weights?.[index]),
-  );
-  return nextWeights.length > 0 ? nextWeights : [1];
-}
-
-function flattenSplitChildren(
-  direction: ThreadTerminalSplitDirection,
-  children: ThreadTerminalLayoutNode[],
-  weights: number[],
-): { children: ThreadTerminalLayoutNode[]; weights: number[] } {
-  const nextChildren: ThreadTerminalLayoutNode[] = [];
-  const nextWeights: number[] = [];
-
-  children.forEach((child, index) => {
-    const childWeight = normalizedWeight(weights[index]);
-    if (isTerminalSplitNode(child) && child.direction === direction) {
-      const totalChildWeight = child.weights.reduce(
-        (sum, weight) => sum + normalizedWeight(weight),
-        0,
-      );
-      const safeTotal = totalChildWeight > 0 ? totalChildWeight : child.children.length;
-      child.children.forEach((nestedChild, nestedIndex) => {
-        nextChildren.push(nestedChild);
-        nextWeights.push((childWeight * normalizedWeight(child.weights[nestedIndex])) / safeTotal);
-      });
-      return;
-    }
-    nextChildren.push(child);
-    nextWeights.push(childWeight);
-  });
-
-  return { children: nextChildren, weights: nextWeights };
-}
-
-function sanitizeLayoutNode(
-  node: ThreadTerminalLayoutNode | null | undefined,
-  validTerminalIdSet: ReadonlySet<string>,
-): ThreadTerminalLayoutNode | null {
-  if (!node) return null;
-  if (node.type === "terminal") {
-    const terminalIds = resolveLeafTerminalIds(node, validTerminalIdSet);
-    if (terminalIds.length === 0) {
-      return null;
-    }
-    const activeTerminalId = terminalIds.includes(node.activeTerminalId?.trim() ?? "")
-      ? (node.activeTerminalId?.trim() ?? terminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID)
-      : (terminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID);
-    return {
-      type: "terminal",
-      paneId: node.paneId?.trim() || `pane-${activeTerminalId}`,
-      terminalIds,
-      activeTerminalId,
-    };
-  }
-
-  const sanitizedChildren = node.children
-    .map((child) => sanitizeLayoutNode(child, validTerminalIdSet))
-    .filter((child): child is ThreadTerminalLayoutNode => child !== null);
-
-  if (sanitizedChildren.length === 0) return null;
-  if (sanitizedChildren.length === 1) return sanitizedChildren[0] ?? null;
-
-  const flattened = flattenSplitChildren(
-    node.direction,
-    sanitizedChildren,
-    normalizeSplitWeights(sanitizedChildren.length, node.weights),
-  );
-
-  return {
-    type: "split",
-    id: node.id,
-    direction: node.direction,
-    children: flattened.children,
-    weights: normalizeSplitWeights(flattened.children.length, flattened.weights),
-  };
-}
-
-function buildLegacyLayout(terminalIds: string[]): ThreadTerminalLayoutNode {
-  if (terminalIds.length <= 1) {
-    return createTerminalLeaf(terminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID);
-  }
-
-  return {
-    type: "split",
-    id: `split-${terminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID}`,
-    direction: "horizontal",
-    children: terminalIds.map((terminalId) => createTerminalLeaf(terminalId)),
-    weights: terminalIds.map(() => 1),
-  };
-}
-
-export function collectTerminalIdsFromLayout(node: ThreadTerminalLayoutNode): string[] {
-  if (node.type === "terminal") {
-    const terminalIds = normalizePaneTerminalIds((node as RawTerminalLeafNode).terminalIds);
-    if (terminalIds.length > 0) {
-      return terminalIds;
-    }
-    return normalizePaneTerminalIds([(node as RawTerminalLeafNode).terminalId]);
-  }
-  return node.children.flatMap((child) => collectTerminalIdsFromLayout(child));
-}
-
-export function findAdjacentTerminalId(
-  node: ThreadTerminalLayoutNode,
-  terminalId: string,
-): string | null {
-  if (node.type === "terminal") {
-    return null;
-  }
-  const ids = collectTerminalIdsFromLayout(node);
-  const index = ids.indexOf(terminalId);
-  if (index < 0) return null;
-  if (index + 1 < ids.length) return ids[index + 1] ?? null;
-  if (index - 1 >= 0) return ids[index - 1] ?? null;
-  return null;
-}
-
-export function findFirstTerminalIdInLayout(node: ThreadTerminalLayoutNode): string {
-  if (node.type === "terminal") {
-    const terminalIds = collectTerminalIdsFromLayout(node);
-    const activeTerminalId =
-      "activeTerminalId" in node ? (node.activeTerminalId?.trim() ?? "") : "";
-    return terminalIds.includes(activeTerminalId)
-      ? activeTerminalId
-      : (terminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID);
-  }
-  return findFirstTerminalIdInLayout(
-    node.children[0] ?? createTerminalLeaf(DEFAULT_THREAD_TERMINAL_ID),
-  );
-}
-
-export function layoutContainsTerminalId(
-  node: ThreadTerminalLayoutNode,
-  terminalId: string,
-): boolean {
-  if (node.type === "terminal") {
-    return collectTerminalIdsFromLayout(node).includes(terminalId);
-  }
-  return node.children.some((child) => layoutContainsTerminalId(child, terminalId));
-}
-
-export function normalizeTerminalPaneGroup(
-  group: RawTerminalGroup,
-  validTerminalIds: string[],
-): ThreadTerminalGroup | null {
-  const validTerminalIdSet = new Set(validTerminalIds);
-  const legacyTerminalIds = [
-    ...new Set((group.terminalIds ?? []).map((id) => id.trim()).filter(Boolean)),
-  ].filter((terminalId) => validTerminalIdSet.has(terminalId));
-  const fallbackLayout = legacyTerminalIds.length > 0 ? buildLegacyLayout(legacyTerminalIds) : null;
-  const sanitizedLayout = sanitizeLayoutNode(group.layout ?? fallbackLayout, validTerminalIdSet);
-  if (!sanitizedLayout) return null;
-
-  const terminalIds = collectTerminalIdsFromLayout(sanitizedLayout);
-  const activeTerminalId = terminalIds.includes(group.activeTerminalId?.trim() ?? "")
-    ? (group.activeTerminalId?.trim() ?? terminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID)
-    : (terminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID);
-
-  return {
-    id: group.id?.trim() || `group-${activeTerminalId}`,
-    activeTerminalId,
-    layout: sanitizedLayout,
-  };
-}
-
-function splitDirectionForPosition(
-  position: ThreadTerminalSplitPosition,
-): ThreadTerminalSplitDirection {
-  return position === "left" || position === "right" ? "horizontal" : "vertical";
-}
-
-function shouldInsertBefore(position: ThreadTerminalSplitPosition): boolean {
-  return position === "left" || position === "top";
-}
-
-function splitWeightEvenly(weight: number, parts: number): number[] {
-  const safeWeight = normalizedWeight(weight);
-  return Array.from({ length: parts }, () => safeWeight / parts);
-}
-
-function splitLayoutNode(input: {
-  node: ThreadTerminalLayoutNode;
-  targetTerminalId: string;
-  newTerminalId: string;
-  position: ThreadTerminalSplitPosition;
-  splitId: string;
-}): { node: ThreadTerminalLayoutNode; didSplit: boolean; mergeIntoParent: boolean } {
-  const direction = splitDirectionForPosition(input.position);
-  const insertBefore = shouldInsertBefore(input.position);
-
-  if (input.node.type === "terminal") {
-    if (!input.node.terminalIds.includes(input.targetTerminalId)) {
-      return { node: input.node, didSplit: false, mergeIntoParent: false };
-    }
-    return {
-      node: {
-        type: "split",
-        id: input.splitId,
-        direction,
-        children: insertBefore
-          ? [createTerminalLeaf(input.newTerminalId), input.node]
-          : [input.node, createTerminalLeaf(input.newTerminalId)],
-        weights: [1, 1],
-      },
-      didSplit: true,
-      mergeIntoParent: true,
-    };
-  }
-
-  const childIndex = input.node.children.findIndex((child) =>
-    layoutContainsTerminalId(child, input.targetTerminalId),
-  );
-  if (childIndex < 0) {
-    return { node: input.node, didSplit: false, mergeIntoParent: false };
-  }
-
-  const child = input.node.children[childIndex];
-  if (!child) {
-    return { node: input.node, didSplit: false, mergeIntoParent: false };
-  }
-
-  const childResult = splitLayoutNode({
-    ...input,
-    node: child,
-  });
-  if (!childResult.didSplit) {
-    return { node: input.node, didSplit: false, mergeIntoParent: false };
-  }
-
-  const nextChildren = [...input.node.children];
-  const nextWeights = normalizeSplitWeights(nextChildren.length, input.node.weights);
-  const targetWeight = nextWeights[childIndex] ?? 1;
-
-  if (
-    input.node.direction === direction &&
-    childResult.mergeIntoParent &&
-    isTerminalSplitNode(childResult.node) &&
-    childResult.node.direction === direction
-  ) {
-    const mergedChildren = childResult.node.children;
-    const mergedWeights = splitWeightEvenly(targetWeight, mergedChildren.length);
-    nextChildren.splice(childIndex, 1, ...mergedChildren);
-    nextWeights.splice(childIndex, 1, ...mergedWeights);
-    return {
-      node: {
-        ...input.node,
-        children: nextChildren,
-        weights: nextWeights,
-      },
-      didSplit: true,
-      mergeIntoParent: false,
-    };
-  }
-
-  nextChildren[childIndex] = childResult.node;
-  return {
-    node: {
-      ...input.node,
-      children: nextChildren,
-      weights: nextWeights,
-    },
-    didSplit: true,
-    mergeIntoParent: false,
-  };
-}
-
-export function splitTerminalGroupLayout(input: {
-  group: ThreadTerminalGroup;
-  targetTerminalId: string;
-  newTerminalId: string;
-  position: ThreadTerminalSplitPosition;
-  splitId: string;
-}): ThreadTerminalGroup {
-  const result = splitLayoutNode({
-    node: input.group.layout,
-    targetTerminalId: input.targetTerminalId,
-    newTerminalId: input.newTerminalId,
-    position: input.position,
-    splitId: input.splitId,
-  });
-  if (!result.didSplit) {
-    return input.group;
-  }
-  return {
-    ...input.group,
-    activeTerminalId: input.newTerminalId,
-    layout: result.node,
-  };
-}
-
-function removeTerminalFromLayoutNode(
-  node: ThreadTerminalLayoutNode,
-  terminalId: string,
-): { node: ThreadTerminalLayoutNode | null; removed: boolean } {
-  if (node.type === "terminal") {
-    if (!node.terminalIds.includes(terminalId)) {
-      return { node, removed: false };
-    }
-    const nextTerminalIds = node.terminalIds.filter(
-      (currentTerminalId) => currentTerminalId !== terminalId,
-    );
-    if (nextTerminalIds.length === 0) {
-      return { node: null, removed: true };
-    }
-    const nextActiveTerminalId = nextTerminalIds.includes(node.activeTerminalId)
-      ? node.activeTerminalId
-      : (nextTerminalIds[
-          Math.min(node.terminalIds.indexOf(terminalId), nextTerminalIds.length - 1)
-        ] ??
-        nextTerminalIds[0] ??
-        DEFAULT_THREAD_TERMINAL_ID);
-    return {
-      node: {
-        ...node,
-        terminalIds: nextTerminalIds,
-        activeTerminalId: nextActiveTerminalId,
-      },
-      removed: true,
-    };
-  }
-
-  let removed = false;
-  const nextChildren: ThreadTerminalLayoutNode[] = [];
-  const nextWeights: number[] = [];
-  const weights = normalizeSplitWeights(node.children.length, node.weights);
-
-  node.children.forEach((child, index) => {
-    const result = removeTerminalFromLayoutNode(child, terminalId);
-    if (result.removed) {
-      removed = true;
-    }
-    if (result.node) {
-      nextChildren.push(result.node);
-      nextWeights.push(weights[index] ?? 1);
-    }
-  });
-
-  if (!removed) {
-    return { node, removed: false };
-  }
-  if (nextChildren.length === 0) {
-    return { node: null, removed: true };
-  }
-  if (nextChildren.length === 1) {
-    return { node: nextChildren[0] ?? null, removed: true };
-  }
-  return {
-    node: {
-      ...node,
-      children: nextChildren,
-      weights: normalizeSplitWeights(nextChildren.length, nextWeights),
-    },
-    removed: true,
-  };
-}
-
-export function removeTerminalFromGroupLayout(
-  group: ThreadTerminalGroup,
-  terminalId: string,
-): ThreadTerminalGroup | null {
-  // Compute the adjacent terminal BEFORE removal so the neighbor lookup uses the original tree.
-  const adjacentId = findAdjacentTerminalId(group.layout, terminalId);
-
-  const result = removeTerminalFromLayoutNode(group.layout, terminalId);
-  if (!result.removed) {
-    return group;
-  }
-  if (!result.node) {
-    return null;
-  }
-  const terminalIds = collectTerminalIdsFromLayout(result.node);
-  return {
-    ...group,
-    activeTerminalId: terminalIds.includes(group.activeTerminalId)
-      ? group.activeTerminalId
-      : (adjacentId ?? terminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID),
-    layout: result.node,
-  };
-}
-
-function updateLeafNode(
-  node: ThreadTerminalLayoutNode,
-  terminalId: string,
-  updater: (
-    node: Extract<ThreadTerminalLayoutNode, { type: "terminal" }>,
-  ) => ThreadTerminalLayoutNode,
-): { node: ThreadTerminalLayoutNode; updated: boolean } {
-  if (node.type === "terminal") {
-    if (!node.terminalIds.includes(terminalId)) {
-      return { node, updated: false };
-    }
-    return { node: updater(node), updated: true };
-  }
-
-  let updated = false;
-  const nextChildren = node.children.map((child) => {
-    const result = updateLeafNode(child, terminalId, updater);
-    if (result.updated) {
-      updated = true;
-    }
-    return result.node;
-  });
-
-  return updated ? { node: { ...node, children: nextChildren }, updated } : { node, updated };
-}
-
-export function addTerminalTabToGroupLayout(
-  group: ThreadTerminalGroup,
-  targetTerminalId: string,
-  newTerminalId: string,
-): ThreadTerminalGroup {
-  const result = updateLeafNode(group.layout, targetTerminalId, (node) => ({
-    ...node,
-    terminalIds: [...node.terminalIds, newTerminalId],
-    activeTerminalId: newTerminalId,
-  }));
-  if (!result.updated) {
-    return group;
-  }
-  return {
-    ...group,
-    activeTerminalId: newTerminalId,
-    layout: result.node,
-  };
-}
-
-export function setActiveTerminalInGroupLayout(
-  group: ThreadTerminalGroup,
-  terminalId: string,
-): ThreadTerminalGroup {
-  const result = updateLeafNode(group.layout, terminalId, (node) =>
-    node.activeTerminalId === terminalId ? node : { ...node, activeTerminalId: terminalId },
-  );
-  if (!result.updated) {
-    return group;
-  }
-  return group.activeTerminalId === terminalId && result.node === group.layout
-    ? group
-    : {
-        ...group,
-        activeTerminalId: terminalId,
-        layout: result.node,
-      };
-}
-
-function resizeSplitNode(
-  node: ThreadTerminalLayoutNode,
-  splitId: string,
-  weights: number[],
-): { node: ThreadTerminalLayoutNode; didResize: boolean } {
-  if (node.type === "terminal") {
-    return { node, didResize: false };
-  }
-  if (node.id === splitId) {
-    return {
-      node: {
-        ...node,
-        weights: normalizeSplitWeights(node.children.length, weights),
-      },
-      didResize: true,
-    };
-  }
-
-  let didResize = false;
-  const nextChildren = node.children.map((child) => {
-    const result = resizeSplitNode(child, splitId, weights);
-    if (result.didResize) {
-      didResize = true;
-    }
-    return result.node;
-  });
-
-  return didResize
-    ? {
-        node: {
-          ...node,
-          children: nextChildren,
-        },
-        didResize,
-      }
-    : { node, didResize };
-}
-
-export function resizeTerminalGroupLayout(
-  group: ThreadTerminalGroup,
-  splitId: string,
-  weights: number[],
-): ThreadTerminalGroup {
-  const result = resizeSplitNode(group.layout, splitId, weights);
-  return result.didResize ? { ...group, layout: result.node } : group;
-}
-
-function equalizeLayoutNode(node: ThreadTerminalLayoutNode): ThreadTerminalLayoutNode {
-  if (node.type === "terminal") {
-    return node;
-  }
-  return {
-    ...node,
-    children: node.children.map(equalizeLayoutNode),
-    weights: node.children.map(() => 1),
-  };
-}
-
-export function equalizeTerminalGroupLayout(group: ThreadTerminalGroup): ThreadTerminalGroup {
-  return { ...group, layout: equalizeLayoutNode(group.layout) };
-}
-
-export function createTerminalGroup(groupId: string, terminalId: string): ThreadTerminalGroup {
-  return {
-    id: groupId,
-    activeTerminalId: terminalId,
-    layout: createTerminalLeaf(terminalId),
-  };
-}
diff --git a/apps/web/src/terminalStateStore.test.ts b/apps/web/src/terminalStateStore.test.ts
deleted file mode 100644
index 1e01cdbcc..000000000
--- a/apps/web/src/terminalStateStore.test.ts
+++ /dev/null
@@ -1,408 +0,0 @@
-import { ThreadId } from "@t3tools/contracts";
-import { beforeEach, describe, expect, it } from "vitest";
-
-import { collectTerminalIdsFromLayout } from "./terminalPaneLayout";
-import {
-  sanitizePersistedTerminalStateByThreadId,
-  selectThreadTerminalState,
-  useTerminalStateStore,
-} from "./terminalStateStore";
-
-const THREAD_ID = ThreadId.makeUnsafe("thread-1");
-
-function summarizeTerminalGroups(
-  terminalGroups: ReturnType<typeof selectThreadTerminalState>["terminalGroups"],
-) {
-  return terminalGroups.map((group) => ({
-    id: group.id,
-    activeTerminalId: group.activeTerminalId,
-    terminalIds: collectTerminalIdsFromLayout(group.layout),
-  }));
-}
-
-describe("terminalStateStore actions", () => {
-  beforeEach(() => {
-    useTerminalStateStore.setState({ terminalStateByThreadId: {} });
-  });
-
-  it("returns a closed default terminal state for unknown threads", () => {
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState).toMatchObject({
-      entryPoint: "chat",
-      terminalOpen: false,
-      presentationMode: "drawer",
-      workspaceLayout: "both",
-      workspaceActiveTab: "terminal",
-      terminalHeight: 280,
-      terminalIds: ["default"],
-      terminalLabelsById: { default: "Terminal 1" },
-      terminalTitleOverridesById: {},
-      terminalCliKindsById: {},
-      terminalAttentionStatesById: {},
-      runningTerminalIds: [],
-      activeTerminalId: "default",
-      activeTerminalGroupId: "group-default",
-    });
-    expect(summarizeTerminalGroups(terminalState.terminalGroups)).toEqual([
-      {
-        id: "group-default",
-        activeTerminalId: "default",
-        terminalIds: ["default"],
-      },
-    ]);
-  });
-
-  it("marks chat-first threads without forcing open terminal UI", () => {
-    const store = useTerminalStateStore.getState();
-    store.openTerminalThreadPage(THREAD_ID, { terminalOnly: true });
-    store.openChatThreadPage(THREAD_ID);
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.entryPoint).toBe("chat");
-    expect(terminalState.workspaceLayout).toBe("both");
-    expect(terminalState.workspaceActiveTab).toBe("chat");
-  });
-
-  it("opens terminal-first threads in the workspace terminal tab", () => {
-    const store = useTerminalStateStore.getState();
-    store.openTerminalThreadPage(THREAD_ID, { terminalOnly: true });
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.entryPoint).toBe("terminal");
-    expect(terminalState.terminalOpen).toBe(true);
-    expect(terminalState.presentationMode).toBe("workspace");
-    expect(terminalState.workspaceLayout).toBe("terminal-only");
-    expect(terminalState.workspaceActiveTab).toBe("terminal");
-  });
-
-  it("opens and splits terminals into the active group", () => {
-    const store = useTerminalStateStore.getState();
-    store.setTerminalOpen(THREAD_ID, true);
-    store.splitTerminal(THREAD_ID, "terminal-2");
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.terminalOpen).toBe(true);
-    expect(terminalState.terminalIds).toEqual(["default", "terminal-2"]);
-    expect(terminalState.activeTerminalId).toBe("terminal-2");
-    expect(summarizeTerminalGroups(terminalState.terminalGroups)).toEqual([
-      {
-        id: "group-default",
-        activeTerminalId: "terminal-2",
-        terminalIds: ["default", "terminal-2"],
-      },
-    ]);
-  });
-
-  it("restores the last-used presentation mode when reopened", () => {
-    const store = useTerminalStateStore.getState();
-    store.setTerminalPresentationMode(THREAD_ID, "workspace");
-    store.setTerminalOpen(THREAD_ID, false);
-    store.setTerminalOpen(THREAD_ID, true);
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.terminalOpen).toBe(true);
-    expect(terminalState.presentationMode).toBe("workspace");
-  });
-
-  it("enters workspace mode on the terminal tab by default", () => {
-    const store = useTerminalStateStore.getState();
-    store.setTerminalPresentationMode(THREAD_ID, "workspace");
-    store.setTerminalWorkspaceTab(THREAD_ID, "chat");
-    store.setTerminalPresentationMode(THREAD_ID, "drawer");
-    store.setTerminalPresentationMode(THREAD_ID, "workspace");
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.presentationMode).toBe("workspace");
-    expect(terminalState.workspaceActiveTab).toBe("terminal");
-  });
-
-  it("opens a new full-width terminal in terminal-only workspace mode", () => {
-    const store = useTerminalStateStore.getState();
-    store.openNewFullWidthTerminal(THREAD_ID, "terminal-2");
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.terminalOpen).toBe(true);
-    expect(terminalState.presentationMode).toBe("workspace");
-    expect(terminalState.workspaceLayout).toBe("terminal-only");
-    expect(terminalState.workspaceActiveTab).toBe("terminal");
-    expect(terminalState.activeTerminalId).toBe("terminal-2");
-    expect(terminalState.terminalIds).toEqual(["default", "terminal-2"]);
-  });
-
-  it("restores chat when selecting the chat workspace tab from terminal-only mode", () => {
-    const store = useTerminalStateStore.getState();
-    store.openNewFullWidthTerminal(THREAD_ID, "terminal-2");
-    store.setTerminalWorkspaceTab(THREAD_ID, "chat");
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.workspaceLayout).toBe("both");
-    expect(terminalState.workspaceActiveTab).toBe("chat");
-  });
-
-  it("closes workspace chat into terminal-only mode without closing terminals", () => {
-    const store = useTerminalStateStore.getState();
-    store.setTerminalPresentationMode(THREAD_ID, "workspace");
-    store.setTerminalWorkspaceTab(THREAD_ID, "chat");
-    store.closeWorkspaceChat(THREAD_ID);
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.terminalOpen).toBe(true);
-    expect(terminalState.presentationMode).toBe("workspace");
-    expect(terminalState.workspaceLayout).toBe("terminal-only");
-    expect(terminalState.workspaceActiveTab).toBe("terminal");
-    expect(terminalState.terminalIds).toEqual(["default"]);
-  });
-
-  it("preserves terminal-only workspace layout when collapsing to drawer and reopening", () => {
-    const store = useTerminalStateStore.getState();
-    store.openNewFullWidthTerminal(THREAD_ID, "terminal-2");
-    store.setTerminalPresentationMode(THREAD_ID, "drawer");
-    store.setTerminalPresentationMode(THREAD_ID, "workspace");
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.presentationMode).toBe("workspace");
-    expect(terminalState.workspaceLayout).toBe("terminal-only");
-    expect(terminalState.workspaceActiveTab).toBe("terminal");
-  });
-
-  it("keeps split terminals in the same group up to the current group limit", () => {
-    const store = useTerminalStateStore.getState();
-    store.splitTerminal(THREAD_ID, "terminal-2");
-    store.splitTerminal(THREAD_ID, "terminal-3");
-    store.splitTerminal(THREAD_ID, "terminal-4");
-    store.splitTerminal(THREAD_ID, "terminal-5");
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.terminalIds).toEqual([
-      "default",
-      "terminal-2",
-      "terminal-3",
-      "terminal-4",
-      "terminal-5",
-    ]);
-    expect(summarizeTerminalGroups(terminalState.terminalGroups)).toEqual([
-      {
-        id: "group-default",
-        activeTerminalId: "terminal-5",
-        terminalIds: ["default", "terminal-2", "terminal-3", "terminal-4", "terminal-5"],
-      },
-    ]);
-  });
-
-  it("creates new terminals in a separate group", () => {
-    useTerminalStateStore.getState().newTerminal(THREAD_ID, "terminal-2");
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.terminalIds).toEqual(["default", "terminal-2"]);
-    expect(terminalState.activeTerminalId).toBe("terminal-2");
-    expect(terminalState.activeTerminalGroupId).toBe("group-terminal-2");
-    expect(summarizeTerminalGroups(terminalState.terminalGroups)).toEqual([
-      { id: "group-default", activeTerminalId: "default", terminalIds: ["default"] },
-      { id: "group-terminal-2", activeTerminalId: "terminal-2", terminalIds: ["terminal-2"] },
-    ]);
-  });
-
-  it("stores terminal labels and removes them when a terminal closes", () => {
-    const store = useTerminalStateStore.getState();
-    store.newTerminal(THREAD_ID, "terminal-2");
-    store.setTerminalMetadata(THREAD_ID, "terminal-2", {
-      cliKind: "codex",
-      label: "Codex CLI",
-    });
-
-    let terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.terminalLabelsById).toEqual({
-      default: "Terminal 1",
-      "terminal-2": "Codex 1",
-    });
-    expect(terminalState.terminalCliKindsById).toEqual({ "terminal-2": "codex" });
-
-    store.closeTerminal(THREAD_ID, "terminal-2");
-
-    terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.terminalLabelsById).toEqual({ default: "Terminal 1" });
-    expect(terminalState.terminalCliKindsById).toEqual({});
-  });
-
-  it("clears terminal provider identity when metadata cliKind is null", () => {
-    const store = useTerminalStateStore.getState();
-    store.newTerminal(THREAD_ID, "terminal-2");
-    store.setTerminalMetadata(THREAD_ID, "terminal-2", {
-      cliKind: "codex",
-      label: "Codex CLI",
-    });
-    store.setTerminalMetadata(THREAD_ID, "terminal-2", {
-      cliKind: null,
-      label: "bun dev",
-    });
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.terminalLabelsById["terminal-2"]).toBe("bun dev");
-    expect(terminalState.terminalCliKindsById).toEqual({});
-  });
-
-  it("allows unlimited groups while keeping each group capped at four terminals", () => {
-    const store = useTerminalStateStore.getState();
-    store.splitTerminal(THREAD_ID, "terminal-2");
-    store.splitTerminal(THREAD_ID, "terminal-3");
-    store.splitTerminal(THREAD_ID, "terminal-4");
-    store.newTerminal(THREAD_ID, "terminal-5");
-    store.newTerminal(THREAD_ID, "terminal-6");
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.terminalIds).toEqual([
-      "default",
-      "terminal-2",
-      "terminal-3",
-      "terminal-4",
-      "terminal-5",
-      "terminal-6",
-    ]);
-    expect(summarizeTerminalGroups(terminalState.terminalGroups)).toEqual([
-      {
-        id: "group-default",
-        activeTerminalId: "terminal-4",
-        terminalIds: ["default", "terminal-2", "terminal-3", "terminal-4"],
-      },
-      { id: "group-terminal-5", activeTerminalId: "terminal-5", terminalIds: ["terminal-5"] },
-      { id: "group-terminal-6", activeTerminalId: "terminal-6", terminalIds: ["terminal-6"] },
-    ]);
-  });
-
-  it("tracks and clears terminal subprocess activity", () => {
-    const store = useTerminalStateStore.getState();
-    store.splitTerminal(THREAD_ID, "terminal-2");
-    store.setTerminalActivity(THREAD_ID, "terminal-2", {
-      hasRunningSubprocess: true,
-      agentState: null,
-    });
-    expect(
-      selectThreadTerminalState(useTerminalStateStore.getState().terminalStateByThreadId, THREAD_ID)
-        .runningTerminalIds,
-    ).toEqual(["terminal-2"]);
-
-    store.setTerminalActivity(THREAD_ID, "terminal-2", {
-      hasRunningSubprocess: false,
-      agentState: null,
-    });
-    expect(
-      selectThreadTerminalState(useTerminalStateStore.getState().terminalStateByThreadId, THREAD_ID)
-        .runningTerminalIds,
-    ).toEqual([]);
-  });
-
-  it("strips volatile runtime flags from persisted terminal state", () => {
-    const store = useTerminalStateStore.getState();
-    store.splitTerminal(THREAD_ID, "terminal-2");
-    store.setTerminalTitleOverride(THREAD_ID, "terminal-2", "New keybinds set");
-    store.setTerminalActivity(THREAD_ID, "terminal-2", {
-      hasRunningSubprocess: false,
-      agentState: "attention",
-    });
-
-    const sanitized = sanitizePersistedTerminalStateByThreadId(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-    );
-
-    expect(sanitized[THREAD_ID]?.terminalTitleOverridesById).toEqual({
-      "terminal-2": "New keybinds set",
-    });
-    expect(sanitized[THREAD_ID]?.terminalAttentionStatesById).toEqual({});
-    expect(sanitized[THREAD_ID]?.runningTerminalIds).toEqual([]);
-  });
-
-  it("resets to default and clears persisted entry when closing the last terminal", () => {
-    const store = useTerminalStateStore.getState();
-    store.closeTerminal(THREAD_ID, "default");
-
-    expect(useTerminalStateStore.getState().terminalStateByThreadId[THREAD_ID]).toBeUndefined();
-    expect(
-      selectThreadTerminalState(useTerminalStateStore.getState().terminalStateByThreadId, THREAD_ID)
-        .terminalIds,
-    ).toEqual(["default"]);
-  });
-
-  it("keeps terminal-first threads terminal-first after closing the last terminal", () => {
-    const store = useTerminalStateStore.getState();
-    store.openTerminalThreadPage(THREAD_ID, { terminalOnly: true });
-    store.closeTerminal(THREAD_ID, "default");
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(useTerminalStateStore.getState().terminalStateByThreadId[THREAD_ID]).toBeDefined();
-    expect(terminalState.entryPoint).toBe("terminal");
-    expect(terminalState.terminalOpen).toBe(false);
-    expect(terminalState.terminalIds).toEqual(["default"]);
-  });
-
-  it("keeps a valid active terminal after closing an active split terminal", () => {
-    const store = useTerminalStateStore.getState();
-    store.splitTerminal(THREAD_ID, "terminal-2");
-    store.splitTerminal(THREAD_ID, "terminal-3");
-    store.closeTerminal(THREAD_ID, "terminal-3");
-
-    const terminalState = selectThreadTerminalState(
-      useTerminalStateStore.getState().terminalStateByThreadId,
-      THREAD_ID,
-    );
-    expect(terminalState.activeTerminalId).toBe("terminal-2");
-    expect(terminalState.terminalIds).toEqual(["default", "terminal-2"]);
-    expect(summarizeTerminalGroups(terminalState.terminalGroups)).toEqual([
-      {
-        id: "group-default",
-        activeTerminalId: "terminal-2",
-        terminalIds: ["default", "terminal-2"],
-      },
-    ]);
-  });
-});
diff --git a/apps/web/src/terminalStateStore.ts b/apps/web/src/terminalStateStore.ts
deleted file mode 100644
index aa17c954e..000000000
--- a/apps/web/src/terminalStateStore.ts
+++ /dev/null
@@ -1,1409 +0,0 @@
-/**
- * Single Zustand store for terminal UI state keyed by threadId.
- *
- * Terminal transition helpers are intentionally private to keep the public
- * API constrained to store actions/selectors.
- */
-
-import { type TerminalActivityState, type TerminalCliKind } from "@t3tools/shared/terminalThreads";
-import type { ThreadId } from "@t3tools/contracts";
-import { create } from "zustand";
-import { createJSONStorage, persist } from "zustand/middleware";
-import {
-  DEFAULT_THREAD_TERMINAL_HEIGHT,
-  DEFAULT_THREAD_TERMINAL_ID,
-  MAX_TERMINALS_PER_GROUP,
-  type ThreadPrimarySurface,
-  type ThreadTerminalGroup,
-  type ThreadTerminalSplitPosition,
-  type ThreadTerminalPresentationMode,
-  type ThreadTerminalWorkspaceLayout,
-  type ThreadTerminalWorkspaceTab,
-} from "./types";
-import {
-  addTerminalTabToGroupLayout,
-  collectTerminalIdsFromLayout,
-  createTerminalGroup,
-  normalizeTerminalPaneGroup,
-  removeTerminalFromGroupLayout,
-  resizeTerminalGroupLayout,
-  setActiveTerminalInGroupLayout,
-  splitTerminalGroupLayout,
-} from "./terminalPaneLayout";
-import {
-  createWorkspaceTerminalGroupFromPreset,
-  type WorkspaceLayoutPresetId,
-} from "./workspaceTerminalLayoutPresets";
-
-export interface ThreadTerminalState {
-  entryPoint: ThreadPrimarySurface;
-  terminalOpen: boolean;
-  presentationMode: ThreadTerminalPresentationMode;
-  workspaceLayout: ThreadTerminalWorkspaceLayout;
-  workspaceActiveTab: ThreadTerminalWorkspaceTab;
-  terminalHeight: number;
-  terminalIds: string[];
-  terminalLabelsById: Record<string, string>;
-  terminalTitleOverridesById: Record<string, string>;
-  terminalCliKindsById: Record<string, TerminalCliKind>;
-  terminalAttentionStatesById: Record<string, "attention" | "review">;
-  runningTerminalIds: string[];
-  activeTerminalId: string;
-  terminalGroups: ThreadTerminalGroup[];
-  activeTerminalGroupId: string;
-}
-
-const TERMINAL_STATE_STORAGE_KEY = "teacode:terminal-state:v1";
-
-function normalizeTerminalIds(terminalIds: string[]): string[] {
-  const ids = [...new Set(terminalIds.map((id) => id.trim()).filter((id) => id.length > 0))];
-  return ids.length > 0 ? ids : [DEFAULT_THREAD_TERMINAL_ID];
-}
-
-function normalizeRunningTerminalIds(
-  runningTerminalIds: string[],
-  terminalIds: string[],
-): string[] {
-  if (runningTerminalIds.length === 0) return [];
-  const validTerminalIdSet = new Set(terminalIds);
-  return [...new Set(runningTerminalIds)]
-    .map((id) => id.trim())
-    .filter((id) => id.length > 0 && validTerminalIdSet.has(id));
-}
-
-function normalizeTerminalLabels(
-  terminalLabelsById: Record<string, string> | null | undefined,
-  terminalIds: string[],
-): Record<string, string> {
-  const validTerminalIdSet = new Set(terminalIds);
-  const normalizedEntries = Object.entries(terminalLabelsById ?? {})
-    .map(([terminalId, label]) => [terminalId.trim(), label.trim()] as const)
-    .filter(([terminalId, label]) => terminalId.length > 0 && label.length > 0)
-    .filter(([terminalId]) => validTerminalIdSet.has(terminalId))
-    .toSorted(([leftId], [rightId]) => leftId.localeCompare(rightId));
-  return Object.fromEntries(normalizedEntries);
-}
-
-function normalizeTerminalTitleOverrides(
-  terminalTitleOverridesById: Record<string, string> | null | undefined,
-  terminalIds: string[],
-): Record<string, string> {
-  const validTerminalIdSet = new Set(terminalIds);
-  const normalizedEntries = Object.entries(terminalTitleOverridesById ?? {})
-    .map(([terminalId, titleOverride]) => [terminalId.trim(), titleOverride.trim()] as const)
-    .filter(
-      ([terminalId, titleOverride]) =>
-        terminalId.length > 0 && titleOverride.length > 0 && validTerminalIdSet.has(terminalId),
-    )
-    .toSorted(([leftId], [rightId]) => leftId.localeCompare(rightId));
-  return Object.fromEntries(normalizedEntries);
-}
-
-function normalizeTerminalCliKinds(
-  terminalCliKindsById: Record<string, TerminalCliKind> | null | undefined,
-  terminalIds: string[],
-): Record<string, TerminalCliKind> {
-  const validTerminalIdSet = new Set(terminalIds);
-  const normalizedEntries = Object.entries(terminalCliKindsById ?? {})
-    .map(([terminalId, cliKind]) => [terminalId.trim(), cliKind] as const)
-    .filter(
-      ([terminalId, cliKind]) =>
-        terminalId.length > 0 && (cliKind === "codex" || cliKind === "claude"),
-    )
-    .filter(([terminalId]) => validTerminalIdSet.has(terminalId))
-    .toSorted(([leftId], [rightId]) => leftId.localeCompare(rightId));
-  return Object.fromEntries(normalizedEntries);
-}
-
-function normalizeTerminalAttentionStates(
-  terminalAttentionStatesById: Record<string, "attention" | "review"> | null | undefined,
-  terminalIds: string[],
-): Record<string, "attention" | "review"> {
-  const validTerminalIdSet = new Set(terminalIds);
-  const normalizedEntries = Object.entries(terminalAttentionStatesById ?? {})
-    .map(([terminalId, state]) => [terminalId.trim(), state] as const)
-    .filter(
-      ([terminalId, state]) =>
-        terminalId.length > 0 && (state === "attention" || state === "review"),
-    )
-    .filter(([terminalId]) => validTerminalIdSet.has(terminalId))
-    .toSorted(([leftId], [rightId]) => leftId.localeCompare(rightId));
-  return Object.fromEntries(normalizedEntries);
-}
-
-function clearTerminalReviewState(
-  terminalAttentionStatesById: Record<string, "attention" | "review">,
-  terminalId: string,
-): Record<string, "attention" | "review"> {
-  if (terminalAttentionStatesById[terminalId] !== "review") {
-    return terminalAttentionStatesById;
-  }
-  const nextAttentionStatesById = { ...terminalAttentionStatesById };
-  delete nextAttentionStatesById[terminalId];
-  return nextAttentionStatesById;
-}
-
-function generatedTerminalTitleBase(cliKind: TerminalCliKind | null): string {
-  if (cliKind === "codex") return "Codex";
-  if (cliKind === "claude") return "Claude";
-  return "Terminal";
-}
-
-function resolveTerminalDisplayTitle(options: {
-  terminalId: string;
-  terminalLabelsById: Record<string, string>;
-  terminalTitleOverridesById: Record<string, string>;
-}): string {
-  return (
-    options.terminalTitleOverridesById[options.terminalId]?.trim() ||
-    options.terminalLabelsById[options.terminalId]?.trim() ||
-    ""
-  );
-}
-
-function createUniqueTerminalTitle(options: {
-  cliKind: TerminalCliKind | null;
-  excludeTerminalId?: string | undefined;
-  terminalLabelsById: Record<string, string>;
-  terminalTitleOverridesById?: Record<string, string> | undefined;
-}): string {
-  const baseTitle = generatedTerminalTitleBase(options.cliKind);
-  const takenTitles = new Set(
-    Object.keys(options.terminalLabelsById)
-      .filter((terminalId) => terminalId !== options.excludeTerminalId)
-      .map((terminalId) =>
-        resolveTerminalDisplayTitle({
-          terminalId,
-          terminalLabelsById: options.terminalLabelsById,
-          terminalTitleOverridesById: options.terminalTitleOverridesById ?? {},
-        }),
-      )
-      .filter((title) => title.length > 0),
-  );
-  let index = 1;
-  while (true) {
-    const candidate = `${baseTitle} ${index}`;
-    if (!takenTitles.has(candidate)) {
-      return candidate;
-    }
-    index += 1;
-  }
-}
-
-function ensureTerminalLabels(options: {
-  terminalCliKindsById: Record<string, TerminalCliKind>;
-  terminalIds: string[];
-  terminalLabelsById: Record<string, string>;
-  terminalTitleOverridesById: Record<string, string>;
-}): Record<string, string> {
-  const nextLabelsById = { ...options.terminalLabelsById };
-  for (const terminalId of options.terminalIds) {
-    const existingLabel = nextLabelsById[terminalId]?.trim();
-    if (existingLabel && existingLabel.length > 0) {
-      continue;
-    }
-    nextLabelsById[terminalId] = createUniqueTerminalTitle({
-      cliKind: options.terminalCliKindsById[terminalId] ?? null,
-      excludeTerminalId: terminalId,
-      terminalLabelsById: nextLabelsById,
-      terminalTitleOverridesById: options.terminalTitleOverridesById,
-    });
-  }
-  return nextLabelsById;
-}
-
-function fallbackGroupId(terminalId: string): string {
-  return `group-${terminalId}`;
-}
-
-function assignUniqueGroupId(baseId: string, usedGroupIds: Set<string>): string {
-  let candidate = baseId;
-  let index = 2;
-  while (usedGroupIds.has(candidate)) {
-    candidate = `${baseId}-${index}`;
-    index += 1;
-  }
-  usedGroupIds.add(candidate);
-  return candidate;
-}
-
-function findGroupIndexByTerminalId(
-  terminalGroups: ThreadTerminalGroup[],
-  terminalId: string,
-): number {
-  return terminalGroups.findIndex((group) =>
-    collectTerminalIdsFromLayout(group.layout).includes(terminalId),
-  );
-}
-
-function normalizeTerminalGroups(
-  terminalGroups: ThreadTerminalGroup[],
-  terminalIds: string[],
-): ThreadTerminalGroup[] {
-  const nextGroups: ThreadTerminalGroup[] = [];
-  const assignedTerminalIds = new Set<string>();
-  const usedGroupIds = new Set<string>();
-
-  for (const group of terminalGroups) {
-    const normalizedGroup = normalizeTerminalPaneGroup(group, terminalIds);
-    if (!normalizedGroup) continue;
-    const unassignedTerminalIds = collectTerminalIdsFromLayout(normalizedGroup.layout).filter(
-      (terminalId) => {
-        if (assignedTerminalIds.has(terminalId)) return false;
-        return true;
-      },
-    );
-    if (unassignedTerminalIds.length === 0) continue;
-    const normalizedUnassignedGroup = normalizeTerminalPaneGroup(
-      {
-        ...normalizedGroup,
-        layout: normalizedGroup.layout,
-      },
-      unassignedTerminalIds,
-    );
-    if (!normalizedUnassignedGroup) continue;
-    collectTerminalIdsFromLayout(normalizedUnassignedGroup.layout).forEach((terminalId) => {
-      assignedTerminalIds.add(terminalId);
-    });
-    nextGroups.push({
-      ...normalizedUnassignedGroup,
-      id: assignUniqueGroupId(
-        normalizedUnassignedGroup.id.trim() ||
-          fallbackGroupId(unassignedTerminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID),
-        usedGroupIds,
-      ),
-    });
-  }
-
-  for (const terminalId of terminalIds) {
-    if (assignedTerminalIds.has(terminalId)) continue;
-    nextGroups.push(
-      createTerminalGroup(
-        assignUniqueGroupId(fallbackGroupId(terminalId), usedGroupIds),
-        terminalId,
-      ),
-    );
-  }
-
-  if (nextGroups.length === 0) {
-    return [
-      createTerminalGroup(fallbackGroupId(DEFAULT_THREAD_TERMINAL_ID), DEFAULT_THREAD_TERMINAL_ID),
-    ];
-  }
-
-  return nextGroups;
-}
-
-function arraysEqual(a: string[], b: string[]): boolean {
-  if (a.length !== b.length) return false;
-  for (let index = 0; index < a.length; index += 1) {
-    if (a[index] !== b[index]) return false;
-  }
-  return true;
-}
-
-function terminalGroupsEqual(left: ThreadTerminalGroup[], right: ThreadTerminalGroup[]): boolean {
-  if (left.length !== right.length) return false;
-  for (let index = 0; index < left.length; index += 1) {
-    const leftGroup = left[index];
-    const rightGroup = right[index];
-    if (!leftGroup || !rightGroup) return false;
-    if (leftGroup.id !== rightGroup.id) return false;
-    if (leftGroup.activeTerminalId !== rightGroup.activeTerminalId) return false;
-    if (JSON.stringify(leftGroup.layout) !== JSON.stringify(rightGroup.layout)) return false;
-  }
-  return true;
-}
-
-function threadTerminalStateEqual(left: ThreadTerminalState, right: ThreadTerminalState): boolean {
-  return (
-    left.entryPoint === right.entryPoint &&
-    left.terminalOpen === right.terminalOpen &&
-    left.presentationMode === right.presentationMode &&
-    left.workspaceLayout === right.workspaceLayout &&
-    left.workspaceActiveTab === right.workspaceActiveTab &&
-    left.terminalHeight === right.terminalHeight &&
-    left.activeTerminalId === right.activeTerminalId &&
-    left.activeTerminalGroupId === right.activeTerminalGroupId &&
-    arraysEqual(left.terminalIds, right.terminalIds) &&
-    JSON.stringify(left.terminalLabelsById) === JSON.stringify(right.terminalLabelsById) &&
-    JSON.stringify(left.terminalTitleOverridesById) ===
-      JSON.stringify(right.terminalTitleOverridesById) &&
-    JSON.stringify(left.terminalCliKindsById) === JSON.stringify(right.terminalCliKindsById) &&
-    JSON.stringify(left.terminalAttentionStatesById) ===
-      JSON.stringify(right.terminalAttentionStatesById) &&
-    arraysEqual(left.runningTerminalIds, right.runningTerminalIds) &&
-    terminalGroupsEqual(left.terminalGroups, right.terminalGroups)
-  );
-}
-
-const DEFAULT_THREAD_TERMINAL_STATE: ThreadTerminalState = Object.freeze({
-  entryPoint: "chat",
-  terminalOpen: false,
-  presentationMode: "drawer",
-  workspaceLayout: "both",
-  workspaceActiveTab: "terminal",
-  terminalHeight: DEFAULT_THREAD_TERMINAL_HEIGHT,
-  terminalIds: [DEFAULT_THREAD_TERMINAL_ID],
-  terminalLabelsById: { [DEFAULT_THREAD_TERMINAL_ID]: "Terminal 1" },
-  terminalTitleOverridesById: {},
-  terminalCliKindsById: {},
-  terminalAttentionStatesById: {},
-  runningTerminalIds: [],
-  activeTerminalId: DEFAULT_THREAD_TERMINAL_ID,
-  terminalGroups: [
-    createTerminalGroup(fallbackGroupId(DEFAULT_THREAD_TERMINAL_ID), DEFAULT_THREAD_TERMINAL_ID),
-  ],
-  activeTerminalGroupId: fallbackGroupId(DEFAULT_THREAD_TERMINAL_ID),
-});
-
-function createDefaultThreadTerminalState(): ThreadTerminalState {
-  return {
-    ...DEFAULT_THREAD_TERMINAL_STATE,
-    terminalIds: [...DEFAULT_THREAD_TERMINAL_STATE.terminalIds],
-    terminalLabelsById: { ...DEFAULT_THREAD_TERMINAL_STATE.terminalLabelsById },
-    terminalTitleOverridesById: { ...DEFAULT_THREAD_TERMINAL_STATE.terminalTitleOverridesById },
-    terminalCliKindsById: { ...DEFAULT_THREAD_TERMINAL_STATE.terminalCliKindsById },
-    terminalAttentionStatesById: { ...DEFAULT_THREAD_TERMINAL_STATE.terminalAttentionStatesById },
-    runningTerminalIds: [...DEFAULT_THREAD_TERMINAL_STATE.runningTerminalIds],
-    terminalGroups: copyTerminalGroups(DEFAULT_THREAD_TERMINAL_STATE.terminalGroups),
-  };
-}
-
-function getDefaultThreadTerminalState(): ThreadTerminalState {
-  return DEFAULT_THREAD_TERMINAL_STATE;
-}
-
-function normalizeThreadTerminalState(state: ThreadTerminalState): ThreadTerminalState {
-  const terminalIds = normalizeTerminalIds(state.terminalIds);
-  const nextTerminalIds = terminalIds.length > 0 ? terminalIds : [DEFAULT_THREAD_TERMINAL_ID];
-  const terminalLabelsById = normalizeTerminalLabels(
-    (state as Partial<ThreadTerminalState>).terminalLabelsById,
-    nextTerminalIds,
-  );
-  const terminalTitleOverridesById = normalizeTerminalTitleOverrides(
-    (state as Partial<ThreadTerminalState>).terminalTitleOverridesById,
-    nextTerminalIds,
-  );
-  const terminalCliKindsById = normalizeTerminalCliKinds(
-    (state as Partial<ThreadTerminalState>).terminalCliKindsById,
-    nextTerminalIds,
-  );
-  const terminalAttentionStatesById = normalizeTerminalAttentionStates(
-    (state as Partial<ThreadTerminalState>).terminalAttentionStatesById,
-    nextTerminalIds,
-  );
-  const ensuredTerminalLabelsById = ensureTerminalLabels({
-    terminalCliKindsById,
-    terminalIds: nextTerminalIds,
-    terminalLabelsById,
-    terminalTitleOverridesById,
-  });
-  const runningTerminalIds = normalizeRunningTerminalIds(state.runningTerminalIds, nextTerminalIds);
-  const activeTerminalId = nextTerminalIds.includes(state.activeTerminalId)
-    ? state.activeTerminalId
-    : (nextTerminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID);
-  const terminalGroups = normalizeTerminalGroups(state.terminalGroups, nextTerminalIds);
-  const activeGroupIdFromState = terminalGroups.some(
-    (group) => group.id === state.activeTerminalGroupId,
-  )
-    ? state.activeTerminalGroupId
-    : null;
-  const activeGroupIdFromTerminal =
-    terminalGroups.find((group) =>
-      collectTerminalIdsFromLayout(group.layout).includes(activeTerminalId),
-    )?.id ?? null;
-  const resolvedActiveTerminalGroupId =
-    activeGroupIdFromState ??
-    activeGroupIdFromTerminal ??
-    terminalGroups[0]?.id ??
-    fallbackGroupId(DEFAULT_THREAD_TERMINAL_ID);
-  const syncedTerminalGroups = terminalGroups.map((group) =>
-    group.id === resolvedActiveTerminalGroupId &&
-    collectTerminalIdsFromLayout(group.layout).includes(activeTerminalId) &&
-    group.activeTerminalId !== activeTerminalId
-      ? setActiveTerminalInGroupLayout(group, activeTerminalId)
-      : group,
-  );
-
-  const normalized: ThreadTerminalState = {
-    entryPoint: state.entryPoint === "terminal" ? "terminal" : "chat",
-    terminalOpen: state.terminalOpen,
-    presentationMode: state.presentationMode === "workspace" ? "workspace" : "drawer",
-    workspaceLayout: state.workspaceLayout === "terminal-only" ? "terminal-only" : "both",
-    workspaceActiveTab: state.workspaceActiveTab === "chat" ? "chat" : "terminal",
-    terminalHeight:
-      Number.isFinite(state.terminalHeight) && state.terminalHeight > 0
-        ? state.terminalHeight
-        : DEFAULT_THREAD_TERMINAL_HEIGHT,
-    terminalIds: nextTerminalIds,
-    terminalLabelsById: ensuredTerminalLabelsById,
-    terminalTitleOverridesById,
-    terminalCliKindsById,
-    terminalAttentionStatesById,
-    runningTerminalIds,
-    activeTerminalId,
-    terminalGroups: syncedTerminalGroups,
-    activeTerminalGroupId: resolvedActiveTerminalGroupId,
-  };
-  return threadTerminalStateEqual(state, normalized) ? state : normalized;
-}
-
-function isDefaultThreadTerminalState(state: ThreadTerminalState): boolean {
-  const normalized = normalizeThreadTerminalState(state);
-  return threadTerminalStateEqual(normalized, DEFAULT_THREAD_TERMINAL_STATE);
-}
-
-function stripVolatileTerminalRuntimeState(state: ThreadTerminalState): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (
-    normalized.runningTerminalIds.length === 0 &&
-    Object.keys(normalized.terminalAttentionStatesById).length === 0
-  ) {
-    return normalized;
-  }
-  // Runtime activity is replayed by live terminal events after startup; persisting
-  // it would make old attention states look like fresh notifications.
-  return {
-    ...normalized,
-    terminalAttentionStatesById: {},
-    runningTerminalIds: [],
-  };
-}
-
-export function sanitizePersistedTerminalStateByThreadId(
-  terminalStateByThreadId: Record<ThreadId, ThreadTerminalState> | null | undefined,
-): Record<ThreadId, ThreadTerminalState> {
-  const next: Record<ThreadId, ThreadTerminalState> = {};
-  for (const [threadId, state] of Object.entries(terminalStateByThreadId ?? {})) {
-    const sanitized = stripVolatileTerminalRuntimeState(state);
-    if (!isDefaultThreadTerminalState(sanitized)) {
-      next[threadId as ThreadId] = sanitized;
-    }
-  }
-  return next;
-}
-
-function isValidTerminalId(terminalId: string): boolean {
-  return terminalId.trim().length > 0;
-}
-
-function copyTerminalGroups(groups: ThreadTerminalGroup[]): ThreadTerminalGroup[] {
-  return groups.map((group) => ({
-    ...group,
-    layout: JSON.parse(JSON.stringify(group.layout)),
-  }));
-}
-
-function upsertTerminalIntoGroups(
-  state: ThreadTerminalState,
-  terminalId: string,
-  mode: "split" | "new",
-  position: ThreadTerminalSplitPosition = "right",
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (!isValidTerminalId(terminalId)) {
-    return normalized;
-  }
-
-  const isNewTerminal = !normalized.terminalIds.includes(terminalId);
-  const terminalIds = isNewTerminal
-    ? [...normalized.terminalIds, terminalId]
-    : normalized.terminalIds;
-  const terminalGroups = copyTerminalGroups(normalized.terminalGroups);
-
-  const existingGroupIndex = findGroupIndexByTerminalId(terminalGroups, terminalId);
-  if (existingGroupIndex >= 0) {
-    const existingGroup = terminalGroups[existingGroupIndex];
-    if (existingGroup) {
-      const nextExistingGroup = removeTerminalFromGroupLayout(existingGroup, terminalId);
-      if (nextExistingGroup) {
-        terminalGroups[existingGroupIndex] = nextExistingGroup;
-      } else {
-        terminalGroups.splice(existingGroupIndex, 1);
-      }
-    }
-  }
-
-  if (mode === "new") {
-    const usedGroupIds = new Set(terminalGroups.map((group) => group.id));
-    const nextGroupId = assignUniqueGroupId(fallbackGroupId(terminalId), usedGroupIds);
-    terminalGroups.push(createTerminalGroup(nextGroupId, terminalId));
-    return normalizeThreadTerminalState({
-      ...normalized,
-      terminalOpen: true,
-      terminalIds,
-      activeTerminalId: terminalId,
-      terminalGroups,
-      activeTerminalGroupId: nextGroupId,
-    });
-  }
-
-  let activeGroupIndex = terminalGroups.findIndex(
-    (group) => group.id === normalized.activeTerminalGroupId,
-  );
-  if (activeGroupIndex < 0) {
-    activeGroupIndex = findGroupIndexByTerminalId(terminalGroups, normalized.activeTerminalId);
-  }
-  if (activeGroupIndex < 0) {
-    const usedGroupIds = new Set(terminalGroups.map((group) => group.id));
-    const nextGroupId = assignUniqueGroupId(
-      fallbackGroupId(normalized.activeTerminalId),
-      usedGroupIds,
-    );
-    terminalGroups.push(createTerminalGroup(nextGroupId, normalized.activeTerminalId));
-    activeGroupIndex = terminalGroups.length - 1;
-  }
-
-  const destinationGroup = terminalGroups[activeGroupIndex];
-  if (!destinationGroup) {
-    return normalized;
-  }
-  const destinationTerminalIds = collectTerminalIdsFromLayout(destinationGroup.layout);
-
-  if (
-    isNewTerminal &&
-    !destinationTerminalIds.includes(terminalId) &&
-    destinationTerminalIds.length >= MAX_TERMINALS_PER_GROUP
-  ) {
-    return normalized;
-  }
-
-  if (!destinationTerminalIds.includes(terminalId)) {
-    terminalGroups[activeGroupIndex] = splitTerminalGroupLayout({
-      group: destinationGroup,
-      targetTerminalId: normalized.activeTerminalId,
-      newTerminalId: terminalId,
-      position,
-      splitId: `split-${terminalId}`,
-    });
-  }
-
-  return normalizeThreadTerminalState({
-    ...normalized,
-    terminalOpen: true,
-    terminalIds,
-    activeTerminalId: terminalId,
-    terminalGroups,
-    activeTerminalGroupId: terminalGroups[activeGroupIndex]?.id ?? destinationGroup.id,
-  });
-}
-
-function setThreadTerminalOpen(state: ThreadTerminalState, open: boolean): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (normalized.terminalOpen === open) return normalized;
-  return { ...normalized, terminalOpen: open };
-}
-
-function openThreadChatPage(state: ThreadTerminalState): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  const nextWorkspaceState =
-    normalized.terminalOpen && normalized.presentationMode === "workspace"
-      ? {
-          workspaceLayout: "both" as const,
-          workspaceActiveTab: "chat" as const,
-        }
-      : null;
-  if (normalized.entryPoint === "chat" && nextWorkspaceState === null) {
-    return normalized;
-  }
-  if (nextWorkspaceState === null) {
-    return {
-      ...normalized,
-      entryPoint: "chat",
-    };
-  }
-  return {
-    ...normalized,
-    entryPoint: "chat",
-    ...nextWorkspaceState,
-  };
-}
-
-function openThreadTerminalPage(
-  state: ThreadTerminalState,
-  options?: { terminalOnly?: boolean },
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  const shouldUseTerminalOnlyLayout =
-    options?.terminalOnly ??
-    (normalized.entryPoint === "terminal" ? normalized.workspaceLayout === "terminal-only" : true);
-  const nextWorkspaceLayout = shouldUseTerminalOnlyLayout
-    ? "terminal-only"
-    : normalized.workspaceLayout;
-  if (
-    normalized.entryPoint === "terminal" &&
-    normalized.terminalOpen &&
-    normalized.presentationMode === "workspace" &&
-    normalized.workspaceActiveTab === "terminal" &&
-    normalized.workspaceLayout === nextWorkspaceLayout
-  ) {
-    return normalized;
-  }
-  return {
-    ...normalized,
-    entryPoint: "terminal",
-    terminalOpen: true,
-    presentationMode: "workspace",
-    workspaceLayout: nextWorkspaceLayout,
-    workspaceActiveTab: "terminal",
-    terminalAttentionStatesById: clearTerminalReviewState(
-      normalized.terminalAttentionStatesById,
-      normalized.activeTerminalId,
-    ),
-  };
-}
-
-function setThreadTerminalPresentationMode(
-  state: ThreadTerminalState,
-  mode: ThreadTerminalPresentationMode,
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (normalized.presentationMode === mode) {
-    return normalized;
-  }
-  return {
-    ...normalized,
-    terminalOpen: true,
-    presentationMode: mode,
-    workspaceLayout: normalized.workspaceLayout,
-    workspaceActiveTab: mode === "workspace" ? "terminal" : normalized.workspaceActiveTab,
-  };
-}
-
-function setThreadTerminalWorkspaceTab(
-  state: ThreadTerminalState,
-  tab: ThreadTerminalWorkspaceTab,
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  const nextWorkspaceLayout = tab === "chat" ? "both" : normalized.workspaceLayout;
-  if (normalized.workspaceActiveTab === tab && normalized.workspaceLayout === nextWorkspaceLayout) {
-    return normalized;
-  }
-  return {
-    ...normalized,
-    workspaceLayout: nextWorkspaceLayout,
-    workspaceActiveTab: tab,
-    terminalAttentionStatesById:
-      tab === "terminal"
-        ? clearTerminalReviewState(
-            normalized.terminalAttentionStatesById,
-            normalized.activeTerminalId,
-          )
-        : normalized.terminalAttentionStatesById,
-  };
-}
-
-function setThreadTerminalWorkspaceLayout(
-  state: ThreadTerminalState,
-  layout: ThreadTerminalWorkspaceLayout,
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  const nextActiveTab =
-    layout === "terminal-only"
-      ? "terminal"
-      : normalized.workspaceActiveTab === "chat"
-        ? "chat"
-        : "terminal";
-  if (normalized.workspaceLayout === layout && normalized.workspaceActiveTab === nextActiveTab) {
-    return normalized;
-  }
-  return {
-    ...normalized,
-    workspaceLayout: layout,
-    workspaceActiveTab: nextActiveTab,
-  };
-}
-
-function setThreadTerminalHeight(state: ThreadTerminalState, height: number): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (!Number.isFinite(height) || height <= 0 || normalized.terminalHeight === height) {
-    return normalized;
-  }
-  return { ...normalized, terminalHeight: height };
-}
-
-// Persist terminal identity without renaming tabs on every command; titles stay stable once assigned.
-function setThreadTerminalMetadata(
-  state: ThreadTerminalState,
-  terminalId: string,
-  metadata: {
-    cliKind: TerminalCliKind | null;
-    label: string;
-  },
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (!normalized.terminalIds.includes(terminalId)) {
-    return normalized;
-  }
-  const currentLabel = normalized.terminalLabelsById[terminalId] ?? "";
-  const currentTitleOverride = normalized.terminalTitleOverridesById[terminalId]?.trim() ?? "";
-  const currentCliKind = normalized.terminalCliKindsById[terminalId] ?? null;
-  const nextCliKind = metadata.cliKind;
-  const nextLabel =
-    currentTitleOverride.length > 0
-      ? currentLabel
-      : nextCliKind !== null
-        ? createUniqueTerminalTitle({
-            cliKind: nextCliKind,
-            excludeTerminalId: terminalId,
-            terminalLabelsById: normalized.terminalLabelsById,
-            terminalTitleOverridesById: normalized.terminalTitleOverridesById,
-          })
-        : metadata.label.trim().length > 0
-          ? metadata.label.trim()
-          : currentLabel;
-  if (currentLabel === nextLabel && currentCliKind === nextCliKind) {
-    return normalized;
-  }
-  const nextCliKindsById = { ...normalized.terminalCliKindsById };
-  if (nextCliKind === null) {
-    delete nextCliKindsById[terminalId];
-  } else {
-    nextCliKindsById[terminalId] = nextCliKind;
-  }
-  return {
-    ...normalized,
-    terminalLabelsById: {
-      ...normalized.terminalLabelsById,
-      [terminalId]: nextLabel,
-    },
-    terminalCliKindsById: nextCliKindsById,
-  };
-}
-
-function setThreadTerminalCliKind(
-  state: ThreadTerminalState,
-  terminalId: string,
-  cliKind: TerminalCliKind | null,
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (!normalized.terminalIds.includes(terminalId)) {
-    return normalized;
-  }
-  const currentCliKind = normalized.terminalCliKindsById[terminalId] ?? null;
-  if (currentCliKind === cliKind) {
-    return normalized;
-  }
-
-  const nextCliKindsById = { ...normalized.terminalCliKindsById };
-  if (cliKind === null) {
-    delete nextCliKindsById[terminalId];
-  } else {
-    nextCliKindsById[terminalId] = cliKind;
-  }
-
-  const currentLabel = normalized.terminalLabelsById[terminalId] ?? "";
-  const currentTitleOverride = normalized.terminalTitleOverridesById[terminalId]?.trim() ?? "";
-  const terminalLabelsById =
-    cliKind !== null && currentTitleOverride.length === 0
-      ? {
-          ...normalized.terminalLabelsById,
-          [terminalId]: createUniqueTerminalTitle({
-            cliKind,
-            excludeTerminalId: terminalId,
-            terminalLabelsById: normalized.terminalLabelsById,
-            terminalTitleOverridesById: normalized.terminalTitleOverridesById,
-          }),
-        }
-      : normalized.terminalLabelsById;
-
-  return {
-    ...normalized,
-    terminalLabelsById,
-    terminalCliKindsById: nextCliKindsById,
-  };
-}
-
-function setThreadTerminalTitleOverride(
-  state: ThreadTerminalState,
-  terminalId: string,
-  titleOverride: string | null | undefined,
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (!normalized.terminalIds.includes(terminalId)) {
-    return normalized;
-  }
-  const normalizedTitleOverride = titleOverride?.trim() ?? "";
-  const currentTitleOverride = normalized.terminalTitleOverridesById[terminalId] ?? "";
-  if (currentTitleOverride === normalizedTitleOverride) {
-    return normalized;
-  }
-  const nextTitleOverridesById = { ...normalized.terminalTitleOverridesById };
-  if (normalizedTitleOverride.length === 0) {
-    delete nextTitleOverridesById[terminalId];
-  } else {
-    nextTitleOverridesById[terminalId] = normalizedTitleOverride;
-  }
-  return {
-    ...normalized,
-    terminalTitleOverridesById: nextTitleOverridesById,
-  };
-}
-
-function splitThreadTerminal(state: ThreadTerminalState, terminalId: string): ThreadTerminalState {
-  return upsertTerminalIntoGroups(state, terminalId, "split", "right");
-}
-
-function splitThreadTerminalLeft(
-  state: ThreadTerminalState,
-  terminalId: string,
-): ThreadTerminalState {
-  return upsertTerminalIntoGroups(state, terminalId, "split", "left");
-}
-
-function splitThreadTerminalDown(
-  state: ThreadTerminalState,
-  terminalId: string,
-): ThreadTerminalState {
-  return upsertTerminalIntoGroups(state, terminalId, "split", "bottom");
-}
-
-function splitThreadTerminalUp(
-  state: ThreadTerminalState,
-  terminalId: string,
-): ThreadTerminalState {
-  return upsertTerminalIntoGroups(state, terminalId, "split", "top");
-}
-
-function newThreadTerminal(state: ThreadTerminalState, terminalId: string): ThreadTerminalState {
-  return upsertTerminalIntoGroups(state, terminalId, "new");
-}
-
-function newThreadTerminalTab(
-  state: ThreadTerminalState,
-  targetTerminalId: string,
-  terminalId: string,
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (!isValidTerminalId(terminalId) || normalized.terminalIds.includes(terminalId)) {
-    return normalized;
-  }
-
-  const terminalGroups = copyTerminalGroups(normalized.terminalGroups);
-  let activeGroupIndex = terminalGroups.findIndex((group) =>
-    collectTerminalIdsFromLayout(group.layout).includes(targetTerminalId),
-  );
-  if (activeGroupIndex < 0) {
-    activeGroupIndex = findGroupIndexByTerminalId(terminalGroups, normalized.activeTerminalId);
-  }
-  if (activeGroupIndex < 0) {
-    return newThreadTerminal(normalized, terminalId);
-  }
-
-  const destinationGroup = terminalGroups[activeGroupIndex];
-  if (!destinationGroup) {
-    return normalized;
-  }
-  const destinationTerminalIds = collectTerminalIdsFromLayout(destinationGroup.layout);
-  if (destinationTerminalIds.length >= MAX_TERMINALS_PER_GROUP) {
-    return normalized;
-  }
-
-  terminalGroups[activeGroupIndex] = addTerminalTabToGroupLayout(
-    destinationGroup,
-    targetTerminalId,
-    terminalId,
-  );
-
-  return normalizeThreadTerminalState({
-    ...normalized,
-    terminalOpen: true,
-    terminalIds: [...normalized.terminalIds, terminalId],
-    activeTerminalId: terminalId,
-    terminalGroups,
-    activeTerminalGroupId: terminalGroups[activeGroupIndex]?.id ?? destinationGroup.id,
-  });
-}
-
-function setThreadActiveTerminal(
-  state: ThreadTerminalState,
-  terminalId: string,
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (!normalized.terminalIds.includes(terminalId)) {
-    return normalized;
-  }
-  const activeTerminalGroupId =
-    normalized.terminalGroups.find((group) =>
-      collectTerminalIdsFromLayout(group.layout).includes(terminalId),
-    )?.id ?? normalized.activeTerminalGroupId;
-  const terminalGroups = normalized.terminalGroups.map((group) =>
-    group.id === activeTerminalGroupId ? setActiveTerminalInGroupLayout(group, terminalId) : group,
-  );
-  if (
-    normalized.activeTerminalId === terminalId &&
-    normalized.activeTerminalGroupId === activeTerminalGroupId &&
-    terminalGroupsEqual(terminalGroups, normalized.terminalGroups) &&
-    normalized.terminalAttentionStatesById[terminalId] !== "review"
-  ) {
-    return normalized;
-  }
-  return {
-    ...normalized,
-    activeTerminalId: terminalId,
-    terminalGroups,
-    activeTerminalGroupId,
-    terminalAttentionStatesById: clearTerminalReviewState(
-      normalized.terminalAttentionStatesById,
-      terminalId,
-    ),
-  };
-}
-
-function closeThreadTerminal(state: ThreadTerminalState, terminalId: string): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (!normalized.terminalIds.includes(terminalId)) {
-    return normalized;
-  }
-
-  const remainingTerminalIds = normalized.terminalIds.filter((id) => id !== terminalId);
-  if (remainingTerminalIds.length === 0) {
-    if (normalized.entryPoint === "terminal") {
-      return normalizeThreadTerminalState({
-        ...createDefaultThreadTerminalState(),
-        entryPoint: "terminal",
-        terminalOpen: false,
-        presentationMode: normalized.presentationMode,
-        workspaceLayout: normalized.workspaceLayout,
-        workspaceActiveTab: "terminal",
-        terminalHeight: normalized.terminalHeight,
-      });
-    }
-    return createDefaultThreadTerminalState();
-  }
-
-  const sourceGroupId =
-    normalized.terminalGroups.find((group) =>
-      collectTerminalIdsFromLayout(group.layout).includes(terminalId),
-    )?.id ?? normalized.activeTerminalGroupId;
-
-  const terminalGroups = normalized.terminalGroups
-    .map((group) => removeTerminalFromGroupLayout(group, terminalId))
-    .filter((group): group is ThreadTerminalGroup => group !== null);
-
-  const closedTerminalIndex = normalized.terminalIds.indexOf(terminalId);
-  const nextActiveTerminalId =
-    normalized.activeTerminalId === terminalId
-      ? (terminalGroups.find((group) => group.id === sourceGroupId)?.activeTerminalId ??
-        remainingTerminalIds[Math.min(closedTerminalIndex, remainingTerminalIds.length - 1)] ??
-        remainingTerminalIds[0] ??
-        DEFAULT_THREAD_TERMINAL_ID)
-      : normalized.activeTerminalId;
-
-  const nextActiveTerminalGroupId =
-    terminalGroups.find((group) =>
-      collectTerminalIdsFromLayout(group.layout).includes(nextActiveTerminalId),
-    )?.id ??
-    terminalGroups[0]?.id ??
-    fallbackGroupId(nextActiveTerminalId);
-
-  return normalizeThreadTerminalState({
-    entryPoint: normalized.entryPoint,
-    terminalOpen: normalized.terminalOpen,
-    presentationMode: normalized.presentationMode,
-    workspaceLayout: normalized.workspaceLayout,
-    workspaceActiveTab: normalized.workspaceActiveTab,
-    terminalHeight: normalized.terminalHeight,
-    terminalIds: remainingTerminalIds,
-    terminalLabelsById: Object.fromEntries(
-      Object.entries(normalized.terminalLabelsById).filter(([id]) => id !== terminalId),
-    ),
-    terminalTitleOverridesById: Object.fromEntries(
-      Object.entries(normalized.terminalTitleOverridesById).filter(([id]) => id !== terminalId),
-    ),
-    terminalCliKindsById: Object.fromEntries(
-      Object.entries(normalized.terminalCliKindsById).filter(([id]) => id !== terminalId),
-    ),
-    terminalAttentionStatesById: Object.fromEntries(
-      Object.entries(normalized.terminalAttentionStatesById).filter(([id]) => id !== terminalId),
-    ),
-    runningTerminalIds: normalized.runningTerminalIds.filter((id) => id !== terminalId),
-    activeTerminalId: nextActiveTerminalId,
-    terminalGroups,
-    activeTerminalGroupId: nextActiveTerminalGroupId,
-  });
-}
-
-function closeThreadTerminalGroup(
-  state: ThreadTerminalState,
-  groupId: string,
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  const group = normalized.terminalGroups.find((entry) => entry.id === groupId);
-  if (!group) {
-    return normalized;
-  }
-  const terminalIds = collectTerminalIdsFromLayout(group.layout);
-  return terminalIds.reduce(
-    (nextState, terminalId) => closeThreadTerminal(nextState, terminalId),
-    normalized,
-  );
-}
-
-function resizeThreadTerminalSplit(
-  state: ThreadTerminalState,
-  groupId: string,
-  splitId: string,
-  weights: number[],
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  const groupIndex = normalized.terminalGroups.findIndex((group) => group.id === groupId);
-  if (groupIndex < 0) {
-    return normalized;
-  }
-  const group = normalized.terminalGroups[groupIndex];
-  if (!group) {
-    return normalized;
-  }
-  const nextGroup = resizeTerminalGroupLayout(group, splitId, weights);
-  if (nextGroup === group) {
-    return normalized;
-  }
-  const terminalGroups = copyTerminalGroups(normalized.terminalGroups);
-  terminalGroups[groupIndex] = nextGroup;
-  return normalizeThreadTerminalState({
-    ...normalized,
-    terminalGroups,
-  });
-}
-
-function openThreadTerminalFullWidth(
-  state: ThreadTerminalState,
-  terminalId: string,
-): ThreadTerminalState {
-  const nextState = newThreadTerminal(state, terminalId);
-  return normalizeThreadTerminalState({
-    ...nextState,
-    terminalOpen: true,
-    presentationMode: "workspace",
-    workspaceLayout: "terminal-only",
-    workspaceActiveTab: "terminal",
-    activeTerminalId: terminalId,
-  });
-}
-
-function closeThreadWorkspaceChat(state: ThreadTerminalState): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (normalized.workspaceLayout === "terminal-only") {
-    return normalized;
-  }
-  return {
-    ...normalized,
-    workspaceLayout: "terminal-only",
-    workspaceActiveTab: "terminal",
-  };
-}
-
-function setThreadTerminalActivity(
-  state: ThreadTerminalState,
-  terminalId: string,
-  activity: { agentState: TerminalActivityState | null; hasRunningSubprocess: boolean },
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  if (!normalized.terminalIds.includes(terminalId)) {
-    return normalized;
-  }
-  const alreadyRunning = normalized.runningTerminalIds.includes(terminalId);
-  const nextTerminalAttentionState =
-    activity.agentState === "attention" || activity.agentState === "review"
-      ? activity.agentState
-      : null;
-  const currentTerminalAttentionState = normalized.terminalAttentionStatesById[terminalId] ?? null;
-  if (
-    activity.hasRunningSubprocess === alreadyRunning &&
-    nextTerminalAttentionState === currentTerminalAttentionState
-  ) {
-    return normalized;
-  }
-  const runningTerminalIds = new Set(normalized.runningTerminalIds);
-  if (activity.hasRunningSubprocess) {
-    runningTerminalIds.add(terminalId);
-  } else {
-    runningTerminalIds.delete(terminalId);
-  }
-  const terminalAttentionStatesById = { ...normalized.terminalAttentionStatesById };
-  if (nextTerminalAttentionState === null) {
-    delete terminalAttentionStatesById[terminalId];
-  } else {
-    terminalAttentionStatesById[terminalId] = nextTerminalAttentionState;
-  }
-  return {
-    ...normalized,
-    terminalAttentionStatesById,
-    runningTerminalIds: [...runningTerminalIds],
-  };
-}
-
-function applyThreadWorkspaceLayoutPreset(
-  state: ThreadTerminalState,
-  presetId: WorkspaceLayoutPresetId,
-  terminalIds: readonly string[],
-): ThreadTerminalState {
-  const normalized = normalizeThreadTerminalState(state);
-  const nextTerminalIds = normalizeTerminalIds([...terminalIds]);
-  const activeTerminalId = nextTerminalIds.includes(normalized.activeTerminalId)
-    ? normalized.activeTerminalId
-    : (nextTerminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID);
-  const terminalLabelsById = ensureTerminalLabels({
-    terminalCliKindsById: normalizeTerminalCliKinds(
-      normalized.terminalCliKindsById,
-      nextTerminalIds,
-    ),
-    terminalIds: nextTerminalIds,
-    terminalLabelsById: normalizeTerminalLabels(normalized.terminalLabelsById, nextTerminalIds),
-    terminalTitleOverridesById: normalizeTerminalTitleOverrides(
-      normalized.terminalTitleOverridesById,
-      nextTerminalIds,
-    ),
-  });
-  const terminalTitleOverridesById = normalizeTerminalTitleOverrides(
-    normalized.terminalTitleOverridesById,
-    nextTerminalIds,
-  );
-  const terminalCliKindsById = normalizeTerminalCliKinds(
-    normalized.terminalCliKindsById,
-    nextTerminalIds,
-  );
-  const terminalGroup = createWorkspaceTerminalGroupFromPreset({
-    presetId,
-    terminalIds: nextTerminalIds,
-    activeTerminalId,
-  });
-
-  return normalizeThreadTerminalState({
-    ...normalized,
-    terminalOpen: true,
-    presentationMode: "workspace",
-    workspaceLayout: "terminal-only",
-    workspaceActiveTab: "terminal",
-    terminalIds: nextTerminalIds,
-    terminalLabelsById,
-    terminalTitleOverridesById,
-    terminalCliKindsById,
-    terminalAttentionStatesById: normalizeTerminalAttentionStates(
-      normalized.terminalAttentionStatesById,
-      nextTerminalIds,
-    ),
-    runningTerminalIds: normalizeRunningTerminalIds(normalized.runningTerminalIds, nextTerminalIds),
-    activeTerminalId,
-    terminalGroups: [terminalGroup],
-    activeTerminalGroupId: terminalGroup.id,
-  });
-}
-
-export function selectThreadTerminalState(
-  terminalStateByThreadId: Record<ThreadId, ThreadTerminalState>,
-  threadId: ThreadId,
-): ThreadTerminalState {
-  if (threadId.length === 0) {
-    return getDefaultThreadTerminalState();
-  }
-  return terminalStateByThreadId[threadId] ?? getDefaultThreadTerminalState();
-}
-
-function updateTerminalStateByThreadId(
-  terminalStateByThreadId: Record<ThreadId, ThreadTerminalState>,
-  threadId: ThreadId,
-  updater: (state: ThreadTerminalState) => ThreadTerminalState,
-): Record<ThreadId, ThreadTerminalState> {
-  if (threadId.length === 0) {
-    return terminalStateByThreadId;
-  }
-
-  const current = selectThreadTerminalState(terminalStateByThreadId, threadId);
-  const next = updater(current);
-  if (next === current) {
-    return terminalStateByThreadId;
-  }
-
-  if (isDefaultThreadTerminalState(next)) {
-    if (terminalStateByThreadId[threadId] === undefined) {
-      return terminalStateByThreadId;
-    }
-    const { [threadId]: _removed, ...rest } = terminalStateByThreadId;
-    return rest as Record<ThreadId, ThreadTerminalState>;
-  }
-
-  return {
-    ...terminalStateByThreadId,
-    [threadId]: next,
-  };
-}
-
-interface TerminalStateStoreState {
-  terminalStateByThreadId: Record<ThreadId, ThreadTerminalState>;
-  openChatThreadPage: (threadId: ThreadId) => void;
-  openTerminalThreadPage: (threadId: ThreadId, options?: { terminalOnly?: boolean }) => void;
-  setTerminalOpen: (threadId: ThreadId, open: boolean) => void;
-  setTerminalPresentationMode: (threadId: ThreadId, mode: ThreadTerminalPresentationMode) => void;
-  setTerminalWorkspaceLayout: (threadId: ThreadId, layout: ThreadTerminalWorkspaceLayout) => void;
-  setTerminalWorkspaceTab: (threadId: ThreadId, tab: ThreadTerminalWorkspaceTab) => void;
-  setTerminalHeight: (threadId: ThreadId, height: number) => void;
-  setTerminalMetadata: (
-    threadId: ThreadId,
-    terminalId: string,
-    metadata: { cliKind: TerminalCliKind | null; label: string },
-  ) => void;
-  setTerminalCliKind: (
-    threadId: ThreadId,
-    terminalId: string,
-    cliKind: TerminalCliKind | null,
-  ) => void;
-  setTerminalTitleOverride: (
-    threadId: ThreadId,
-    terminalId: string,
-    titleOverride: string | null | undefined,
-  ) => void;
-  splitTerminal: (threadId: ThreadId, terminalId: string) => void;
-  splitTerminalLeft: (threadId: ThreadId, terminalId: string) => void;
-  splitTerminalRight: (threadId: ThreadId, terminalId: string) => void;
-  splitTerminalDown: (threadId: ThreadId, terminalId: string) => void;
-  splitTerminalUp: (threadId: ThreadId, terminalId: string) => void;
-  newTerminal: (threadId: ThreadId, terminalId: string) => void;
-  newTerminalTab: (threadId: ThreadId, targetTerminalId: string, terminalId: string) => void;
-  openNewFullWidthTerminal: (threadId: ThreadId, terminalId: string) => void;
-  closeWorkspaceChat: (threadId: ThreadId) => void;
-  setActiveTerminal: (threadId: ThreadId, terminalId: string) => void;
-  closeTerminal: (threadId: ThreadId, terminalId: string) => void;
-  closeTerminalGroup: (threadId: ThreadId, groupId: string) => void;
-  resizeTerminalSplit: (
-    threadId: ThreadId,
-    groupId: string,
-    splitId: string,
-    weights: number[],
-  ) => void;
-  setTerminalActivity: (
-    threadId: ThreadId,
-    terminalId: string,
-    activity: { agentState: TerminalActivityState | null; hasRunningSubprocess: boolean },
-  ) => void;
-  applyWorkspaceLayoutPreset: (
-    threadId: ThreadId,
-    presetId: WorkspaceLayoutPresetId,
-    terminalIds: readonly string[],
-  ) => void;
-  clearTerminalState: (threadId: ThreadId) => void;
-  removeOrphanedTerminalStates: (activeThreadIds: Set<ThreadId>) => void;
-}
-
-export const useTerminalStateStore = create<TerminalStateStoreState>()(
-  persist(
-    (set) => {
-      const updateTerminal = (
-        threadId: ThreadId,
-        updater: (state: ThreadTerminalState) => ThreadTerminalState,
-      ) => {
-        set((state) => {
-          const nextTerminalStateByThreadId = updateTerminalStateByThreadId(
-            state.terminalStateByThreadId,
-            threadId,
-            updater,
-          );
-          if (nextTerminalStateByThreadId === state.terminalStateByThreadId) {
-            return state;
-          }
-          return {
-            terminalStateByThreadId: nextTerminalStateByThreadId,
-          };
-        });
-      };
-
-      return {
-        terminalStateByThreadId: {},
-        openChatThreadPage: (threadId) =>
-          updateTerminal(threadId, (state) => openThreadChatPage(state)),
-        openTerminalThreadPage: (threadId, options) =>
-          updateTerminal(threadId, (state) => openThreadTerminalPage(state, options)),
-        setTerminalOpen: (threadId, open) =>
-          updateTerminal(threadId, (state) => setThreadTerminalOpen(state, open)),
-        setTerminalPresentationMode: (threadId, mode) =>
-          updateTerminal(threadId, (state) => setThreadTerminalPresentationMode(state, mode)),
-        setTerminalWorkspaceLayout: (threadId, layout) =>
-          updateTerminal(threadId, (state) => setThreadTerminalWorkspaceLayout(state, layout)),
-        setTerminalWorkspaceTab: (threadId, tab) =>
-          updateTerminal(threadId, (state) => setThreadTerminalWorkspaceTab(state, tab)),
-        setTerminalHeight: (threadId, height) =>
-          updateTerminal(threadId, (state) => setThreadTerminalHeight(state, height)),
-        setTerminalMetadata: (threadId, terminalId, metadata) =>
-          updateTerminal(threadId, (state) =>
-            setThreadTerminalMetadata(state, terminalId, metadata),
-          ),
-        setTerminalCliKind: (threadId, terminalId, cliKind) =>
-          updateTerminal(threadId, (state) => setThreadTerminalCliKind(state, terminalId, cliKind)),
-        setTerminalTitleOverride: (threadId, terminalId, titleOverride) =>
-          updateTerminal(threadId, (state) =>
-            setThreadTerminalTitleOverride(state, terminalId, titleOverride),
-          ),
-        splitTerminal: (threadId, terminalId) =>
-          updateTerminal(threadId, (state) => splitThreadTerminal(state, terminalId)),
-        splitTerminalLeft: (threadId, terminalId) =>
-          updateTerminal(threadId, (state) => splitThreadTerminalLeft(state, terminalId)),
-        splitTerminalRight: (threadId, terminalId) =>
-          updateTerminal(threadId, (state) => splitThreadTerminal(state, terminalId)),
-        splitTerminalDown: (threadId, terminalId) =>
-          updateTerminal(threadId, (state) => splitThreadTerminalDown(state, terminalId)),
-        splitTerminalUp: (threadId, terminalId) =>
-          updateTerminal(threadId, (state) => splitThreadTerminalUp(state, terminalId)),
-        newTerminal: (threadId, terminalId) =>
-          updateTerminal(threadId, (state) => newThreadTerminal(state, terminalId)),
-        newTerminalTab: (threadId, targetTerminalId, terminalId) =>
-          updateTerminal(threadId, (state) =>
-            newThreadTerminalTab(state, targetTerminalId, terminalId),
-          ),
-        openNewFullWidthTerminal: (threadId, terminalId) =>
-          updateTerminal(threadId, (state) => openThreadTerminalFullWidth(state, terminalId)),
-        closeWorkspaceChat: (threadId) =>
-          updateTerminal(threadId, (state) => closeThreadWorkspaceChat(state)),
-        setActiveTerminal: (threadId, terminalId) =>
-          updateTerminal(threadId, (state) => setThreadActiveTerminal(state, terminalId)),
-        closeTerminal: (threadId, terminalId) =>
-          updateTerminal(threadId, (state) => closeThreadTerminal(state, terminalId)),
-        closeTerminalGroup: (threadId, groupId) =>
-          updateTerminal(threadId, (state) => closeThreadTerminalGroup(state, groupId)),
-        resizeTerminalSplit: (threadId, groupId, splitId, weights) =>
-          updateTerminal(threadId, (state) =>
-            resizeThreadTerminalSplit(state, groupId, splitId, weights),
-          ),
-        setTerminalActivity: (threadId, terminalId, activity) =>
-          updateTerminal(threadId, (state) =>
-            setThreadTerminalActivity(state, terminalId, activity),
-          ),
-        applyWorkspaceLayoutPreset: (threadId, presetId, terminalIds) =>
-          updateTerminal(threadId, (state) =>
-            applyThreadWorkspaceLayoutPreset(state, presetId, terminalIds),
-          ),
-        clearTerminalState: (threadId) =>
-          updateTerminal(threadId, () => createDefaultThreadTerminalState()),
-        removeOrphanedTerminalStates: (activeThreadIds) =>
-          set((state) => {
-            const orphanedIds = Object.keys(state.terminalStateByThreadId).filter(
-              (id) => !activeThreadIds.has(id as ThreadId),
-            );
-            if (orphanedIds.length === 0) return state;
-            const next = { ...state.terminalStateByThreadId };
-            for (const id of orphanedIds) {
-              delete next[id as ThreadId];
-            }
-            return { terminalStateByThreadId: next };
-          }),
-      };
-    },
-    {
-      name: TERMINAL_STATE_STORAGE_KEY,
-      version: 1,
-      storage: createJSONStorage(() => localStorage),
-      partialize: (state) => ({
-        terminalStateByThreadId: sanitizePersistedTerminalStateByThreadId(
-          state.terminalStateByThreadId,
-        ),
-      }),
-      merge: (persistedState, currentState) => ({
-        ...currentState,
-        terminalStateByThreadId: sanitizePersistedTerminalStateByThreadId(
-          (persistedState as Partial<TerminalStateStoreState> | undefined)?.terminalStateByThreadId,
-        ),
-      }),
-    },
-  ),
-);
diff --git a/apps/web/src/terminalVisualIdentity.test.ts b/apps/web/src/terminalVisualIdentity.test.ts
deleted file mode 100644
index 0e916198d..000000000
--- a/apps/web/src/terminalVisualIdentity.test.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-// FILE: terminalVisualIdentity.test.ts
-// Purpose: Verifies shared terminal visual identity rules used by chrome and recent views.
-// Layer: UI state logic test
-
-import { describe, expect, it } from "vitest";
-
-import {
-  resolveTerminalVisualIdentityMap,
-  resolveTerminalVisualState,
-  selectRepresentativeTerminalVisualIdentity,
-} from "./terminalVisualIdentity";
-
-describe("terminal visual identity", () => {
-  it("resolves terminal icon, title, and activity state from shared metadata", () => {
-    const identities = resolveTerminalVisualIdentityMap({
-      terminalIds: ["terminal-1", "terminal-2"],
-      runningTerminalIds: [" terminal-1 "],
-      terminalAttentionStatesById: { "terminal-2": "attention" },
-      terminalCliKindsById: { "terminal-1": "codex" },
-      terminalLabelsById: { "terminal-1": "Codex 1", "terminal-2": "bun dev" },
-      terminalTitleOverridesById: { "terminal-2": "Dev server" },
-    });
-
-    expect(identities.get("terminal-1")).toMatchObject({
-      cliKind: "codex",
-      iconKey: "openai",
-      state: "running",
-      title: "Codex 1",
-    });
-    expect(identities.get("terminal-2")).toMatchObject({
-      cliKind: null,
-      iconKey: "terminal",
-      state: "attention",
-      title: "Dev server",
-    });
-  });
-
-  it("does not infer provider icons from stale provider-looking labels", () => {
-    const identities = resolveTerminalVisualIdentityMap({
-      terminalIds: ["terminal-1"],
-      runningTerminalIds: [],
-      terminalAttentionStatesById: {},
-      terminalCliKindsById: {},
-      terminalLabelsById: { "terminal-1": "Codex 1" },
-      terminalTitleOverridesById: {},
-    });
-
-    expect(identities.get("terminal-1")).toMatchObject({
-      cliKind: null,
-      iconKey: "terminal",
-      title: "Codex 1",
-    });
-  });
-
-  it("selects the highest-priority terminal identity while preserving active-tab ties", () => {
-    const identities = resolveTerminalVisualIdentityMap({
-      terminalIds: ["terminal-1", "terminal-2"],
-      runningTerminalIds: ["terminal-1"],
-      terminalAttentionStatesById: { "terminal-2": "attention" },
-      terminalCliKindsById: { "terminal-1": "codex" },
-      terminalLabelsById: { "terminal-1": "Codex 1", "terminal-2": "bun dev" },
-      terminalTitleOverridesById: {},
-    });
-
-    expect(
-      selectRepresentativeTerminalVisualIdentity({
-        activeTerminalId: "terminal-1",
-        terminalIds: ["terminal-1", "terminal-2"],
-        terminalVisualIdentityById: identities,
-      }),
-    ).toMatchObject({
-      terminalId: "terminal-2",
-      identity: { iconKey: "terminal", state: "attention" },
-    });
-
-    const idleIdentities = resolveTerminalVisualIdentityMap({
-      terminalIds: ["terminal-1", "terminal-2"],
-      runningTerminalIds: [],
-      terminalAttentionStatesById: {},
-      terminalCliKindsById: { "terminal-1": "codex" },
-      terminalLabelsById: { "terminal-1": "Codex 1", "terminal-2": "bun dev" },
-      terminalTitleOverridesById: {},
-    });
-
-    expect(
-      selectRepresentativeTerminalVisualIdentity({
-        activeTerminalId: "terminal-1",
-        terminalIds: ["terminal-1", "terminal-2"],
-        terminalVisualIdentityById: idleIdentities,
-      }),
-    ).toMatchObject({
-      terminalId: "terminal-1",
-      identity: { iconKey: "openai", state: "idle" },
-    });
-  });
-
-  it("keeps attention ahead of running when resolving a single terminal state", () => {
-    expect(
-      resolveTerminalVisualState({
-        runningTerminalIds: ["terminal-1"],
-        terminalAttentionStatesById: { "terminal-1": "attention" },
-        terminalId: "terminal-1",
-      }),
-    ).toBe("attention");
-  });
-});
diff --git a/apps/web/src/terminalVisualIdentity.ts b/apps/web/src/terminalVisualIdentity.ts
deleted file mode 100644
index cb43914b1..000000000
--- a/apps/web/src/terminalVisualIdentity.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-// FILE: terminalVisualIdentity.ts
-// Purpose: Centralizes terminal icon/title/activity view-model rules for every web surface.
-// Layer: UI state logic
-// Exports: terminal identity map resolution plus representative-terminal selection.
-
-import {
-  type ResolvedTerminalVisualIdentity,
-  resolveTerminalVisualIdentity,
-  type TerminalCliKind,
-  type TerminalVisualState,
-} from "@t3tools/shared/terminalThreads";
-
-export interface RepresentativeTerminalVisualIdentity {
-  terminalId: string;
-  identity: ResolvedTerminalVisualIdentity;
-}
-
-function terminalVisualStatePriority(state: TerminalVisualState): number {
-  switch (state) {
-    case "attention":
-      return 4;
-    case "running":
-      return 3;
-    case "review":
-      return 2;
-    case "idle":
-      return 1;
-  }
-}
-
-export function resolveTerminalVisualState(input: {
-  runningTerminalIds: readonly string[];
-  terminalAttentionStatesById: Record<string, "attention" | "review">;
-  terminalId: string;
-}): TerminalVisualState {
-  const runningTerminalIdSet = new Set(
-    input.runningTerminalIds.map((id) => id.trim()).filter((id) => id.length > 0),
-  );
-  return resolveTerminalVisualStateFromSet({
-    runningTerminalIdSet,
-    terminalAttentionStatesById: input.terminalAttentionStatesById,
-    terminalId: input.terminalId,
-  });
-}
-
-function resolveTerminalVisualStateFromSet(input: {
-  runningTerminalIdSet: ReadonlySet<string>;
-  terminalAttentionStatesById: Record<string, "attention" | "review">;
-  terminalId: string;
-}): TerminalVisualState {
-  const attentionState = input.terminalAttentionStatesById[input.terminalId] ?? null;
-  if (attentionState === "attention") {
-    return "attention";
-  }
-  if (input.runningTerminalIdSet.has(input.terminalId)) {
-    return "running";
-  }
-  if (attentionState === "review") {
-    return "review";
-  }
-  return "idle";
-}
-
-export function resolveTerminalVisualIdentityMap(input: {
-  runningTerminalIds: readonly string[];
-  terminalAttentionStatesById: Record<string, "attention" | "review">;
-  terminalCliKindsById: Record<string, TerminalCliKind>;
-  terminalIds: readonly string[];
-  terminalLabelsById: Record<string, string>;
-  terminalTitleOverridesById: Record<string, string>;
-}): ReadonlyMap<string, ResolvedTerminalVisualIdentity> {
-  const runningTerminalIdSet = new Set(
-    input.runningTerminalIds.map((id) => id.trim()).filter((id) => id.length > 0),
-  );
-
-  return new Map(
-    input.terminalIds.map((terminalId, index) => [
-      terminalId,
-      resolveTerminalVisualIdentity({
-        cliKind: input.terminalCliKindsById[terminalId] ?? null,
-        fallbackTitle: `Terminal ${index + 1}`,
-        state: resolveTerminalVisualStateFromSet({
-          runningTerminalIdSet,
-          terminalAttentionStatesById: input.terminalAttentionStatesById,
-          terminalId,
-        }),
-        title: input.terminalTitleOverridesById[terminalId] ?? input.terminalLabelsById[terminalId],
-      }),
-    ]),
-  );
-}
-
-// Picks the terminal identity to represent a multi-terminal group or thread.
-export function selectRepresentativeTerminalVisualIdentity(input: {
-  activeTerminalId?: string | null | undefined;
-  terminalIds: readonly string[];
-  terminalVisualIdentityById: ReadonlyMap<string, ResolvedTerminalVisualIdentity>;
-}): RepresentativeTerminalVisualIdentity | null {
-  const fallbackTerminalId =
-    input.activeTerminalId && input.terminalIds.includes(input.activeTerminalId)
-      ? input.activeTerminalId
-      : (input.terminalIds[0] ?? null);
-  if (!fallbackTerminalId) {
-    return null;
-  }
-
-  let representativeTerminalId = fallbackTerminalId;
-  for (const terminalId of input.terminalIds) {
-    const currentPriority = terminalVisualStatePriority(
-      input.terminalVisualIdentityById.get(representativeTerminalId)?.state ?? "idle",
-    );
-    const nextPriority = terminalVisualStatePriority(
-      input.terminalVisualIdentityById.get(terminalId)?.state ?? "idle",
-    );
-    if (nextPriority > currentPriority) {
-      representativeTerminalId = terminalId;
-    }
-  }
-
-  const identity = input.terminalVisualIdentityById.get(representativeTerminalId);
-  return identity ? { terminalId: representativeTerminalId, identity } : null;
-}
diff --git a/apps/web/src/theme/theme.logic.test.ts b/apps/web/src/theme/theme.logic.test.ts
index bc7456ace..4a4ad9b6f 100644
--- a/apps/web/src/theme/theme.logic.test.ts
+++ b/apps/web/src/theme/theme.logic.test.ts
@@ -5,7 +5,7 @@
 
 import { describe, expect, it } from "vitest";
 import {
-  DEFAULT_CHROME_THEME_BY_VARIANT,
+  DEFAULT_CHROME_THEME,
   DEFAULT_THEME_STATE,
   buildResolvedThemeTokens,
   buildThemeCssVariables,
@@ -15,7 +15,6 @@ import {
   normalizeThemeState,
   parseStoredThemeState,
   parseThemeShareString,
-  parseThemeShareStringForVariant,
   resolveThemePack,
   setThemeCodeThemeId,
   updateThemePackFromShareString,
@@ -26,14 +25,36 @@ const PROVIDED_THEME_STRING =
   'codex-theme-v1:{"codeThemeId":"linear","theme":{"accent":"#606acc","contrast":30,"fonts":{"code":"\\"Jetbrains Mono\\"","ui":"Inter"},"ink":"#e3e4e6","opaqueWindows":true,"semanticColors":{"diffAdded":"#69c967","diffRemoved":"#ff7e78","skill":"#c2a1ff"},"surface":"#0f0f11"},"variant":"dark"}';
 
 describe("parseStoredThemeState", () => {
-  it("migrates the legacy mode-only value into the new theme store", () => {
-    expect(parseStoredThemeState("dark")).toEqual({
-      ...DEFAULT_THEME_STATE,
-      mode: "dark",
-    });
+  it("tolerates a legacy bare mode string without throwing", () => {
+    expect(parseStoredThemeState("dark")).toEqual(DEFAULT_THEME_STATE);
+    expect(parseStoredThemeState("light")).toEqual(DEFAULT_THEME_STATE);
+    expect(parseStoredThemeState("system")).toEqual(DEFAULT_THEME_STATE);
+  });
+
+  it("returns the default state for null, undefined, and empty storage", () => {
+    expect(parseStoredThemeState(null)).toEqual(DEFAULT_THEME_STATE);
+    expect(parseStoredThemeState(undefined)).toEqual(DEFAULT_THEME_STATE);
+    expect(parseStoredThemeState("")).toEqual(DEFAULT_THEME_STATE);
+  });
+
+  it("returns the default state for malformed JSON instead of throwing", () => {
+    expect(parseStoredThemeState("{not json")).toEqual(DEFAULT_THEME_STATE);
+  });
+
+  it("reads the current chromeTheme/codeThemeId shape", () => {
+    const parsed = parseStoredThemeState(
+      JSON.stringify({
+        chromeTheme: { accent: "#339cff", surface: "#000000" },
+        codeThemeId: "linear",
+      }),
+    );
+
+    expect(parsed.codeThemeId).toBe("linear");
+    expect(parsed.chromeTheme.accent).toBe("#339cff");
+    expect(parsed.chromeTheme.surface).toBe("#000000");
   });
 
-  it("preserves stored custom themes and code theme selections", () => {
+  it("preserves the stored dark theme and code theme id from the legacy per-variant shape", () => {
     const parsed = parseStoredThemeState(
       JSON.stringify({
         mode: "dark",
@@ -45,15 +66,12 @@ describe("parseStoredThemeState", () => {
       }),
     );
 
-    expect(parsed.mode).toBe("dark");
-    expect(parsed.codeThemeIds).toEqual({ dark: "linear", light: "github" });
-    expect(parsed.chromeThemes.dark.accent).toBe("#339cff");
-    expect(parsed.chromeThemes.dark.surface).toBe("#000000");
-    expect(parsed.chromeThemes.light.accent).toBe("#ff00aa");
-    expect(parsed.chromeThemes.light.surface).toBe("#ffffff");
+    expect(parsed.codeThemeId).toBe("linear");
+    expect(parsed.chromeTheme.accent).toBe("#339cff");
+    expect(parsed.chromeTheme.surface).toBe("#000000");
   });
 
-  it("migrates only the legacy built-in palette while preserving fonts and code themes", () => {
+  it("migrates only the legacy built-in palette while preserving fonts and the code theme", () => {
     const parsed = parseStoredThemeState(
       JSON.stringify({
         mode: "dark",
@@ -72,29 +90,17 @@ describe("parseStoredThemeState", () => {
             },
             surface: "#18181b",
           },
-          light: {
-            accent: "#fb923c",
-            contrast: 45,
-            fonts: { code: null, ui: null },
-            ink: "#18181b",
-            opaqueWindows: true,
-            semanticColors: {
-              diffAdded: "#4ade80",
-              diffRemoved: "#f43f5e",
-              skill: "#3b82f6",
-            },
-            surface: "#f4f4f5",
-          },
         },
       }),
     );
 
-    expect(parsed.codeThemeIds).toEqual({ dark: "linear", light: "github" });
-    expect(parsed.chromeThemes.dark).toMatchObject({
-      ...DEFAULT_CHROME_THEME_BY_VARIANT.dark,
+    expect(parsed.codeThemeId).toBe("linear");
+    expect(parsed.chromeTheme).toMatchObject({
+      ...DEFAULT_CHROME_THEME,
       fonts: { code: "0xProto", ui: "Inter" },
+      // The migration keeps the user's window-material choice; only the palette moves.
+      opaqueWindows: true,
     });
-    expect(parsed.chromeThemes.light).toEqual(DEFAULT_CHROME_THEME_BY_VARIANT.light);
   });
 
   it("migrates retired accents even when the rest of the palette was customized", () => {
@@ -115,30 +121,15 @@ describe("parseStoredThemeState", () => {
             },
             surface: "#101013",
           },
-          light: {
-            accent: "#a96f35",
-            contrast: 45,
-            fonts: { code: null, ui: null },
-            ink: "#18181b",
-            opaqueWindows: true,
-            semanticColors: {
-              diffAdded: "#4ade80",
-              diffRemoved: "#f43f5e",
-              skill: "#3b82f6",
-            },
-            surface: "#fffdf8",
-          },
         },
       }),
     );
 
     // The retired accent migrates to the default; the customization survives.
-    expect(parsed.chromeThemes.dark.accent).toBe(DEFAULT_CHROME_THEME_BY_VARIANT.dark.accent);
-    expect(parsed.chromeThemes.dark.contrast).toBe(80);
-    expect(parsed.chromeThemes.dark.opaqueWindows).toBe(false);
-    expect(parsed.chromeThemes.dark.surface).toBe("#101013");
-    expect(parsed.chromeThemes.light.accent).toBe(DEFAULT_CHROME_THEME_BY_VARIANT.light.accent);
-    expect(parsed.chromeThemes.light.surface).toBe("#fffdf8");
+    expect(parsed.chromeTheme.accent).toBe(DEFAULT_CHROME_THEME.accent);
+    expect(parsed.chromeTheme.contrast).toBe(80);
+    expect(parsed.chromeTheme.opaqueWindows).toBe(false);
+    expect(parsed.chromeTheme.surface).toBe("#101013");
   });
 
   it("keeps deliberately chosen non-legacy accents untouched", () => {
@@ -151,39 +142,22 @@ describe("parseStoredThemeState", () => {
       }),
     );
 
-    expect(parsed.chromeThemes.dark.accent).toBe("#606acc");
+    expect(parsed.chromeTheme.accent).toBe("#606acc");
   });
 
-  it("normalizes partial stored packs against the per-variant defaults", () => {
+  it("normalizes a partial stored chrome theme against the default", () => {
     expect(
       normalizeThemeState({
-        mode: "light",
-        codeThemeIds: {
-          dark: "linear",
-        },
-        chromeThemes: {
-          dark: {
-            accent: "#606acc",
-          },
-        },
+        codeThemeIds: { dark: "linear" },
+        chromeThemes: { dark: { accent: "#606acc" } },
       }),
     ).toMatchObject({
-      chromeThemes: {
-        dark: {
-          accent: "#606acc",
-          contrast: 60,
-        },
-        light: DEFAULT_THEME_STATE.chromeThemes.light,
-      },
-      codeThemeIds: {
-        dark: "linear",
-        light: DEFAULT_THEME_STATE.codeThemeIds.light,
-      },
-      mode: "light",
+      chromeTheme: { accent: "#606acc", contrast: 60 },
+      codeThemeId: "linear",
     });
   });
 
-  it("migrates the legacy packs shape into split codeThemeId and chromeTheme stores", () => {
+  it("migrates the legacy packs shape into the chromeTheme/codeThemeId store", () => {
     const migrated = normalizeThemeState({
       mode: "dark",
       packs: {
@@ -196,41 +170,33 @@ describe("parseStoredThemeState", () => {
       },
     });
 
-    expect(migrated.mode).toBe("dark");
-    expect(migrated.codeThemeIds.dark).toBe("linear");
-    expect(migrated.chromeThemes.dark.accent).toBe("#606acc");
+    expect(migrated.codeThemeId).toBe("linear");
+    expect(migrated.chromeTheme.accent).toBe("#606acc");
   });
 
   it("keeps normalization useful for legacy share payloads before storage migration", () => {
-    const customDark = { ...getCodeThemeSeed("codex", "dark"), accent: "#ff00aa" };
+    const customDark = { ...getCodeThemeSeed("codex"), accent: "#ff00aa" };
     const normalized = normalizeThemeState({
-      codeThemeIds: { dark: "codex", light: "codex" },
-      chromeThemes: {
-        dark: customDark,
-        light: getCodeThemeSeed("codex", "light"),
-      },
+      codeThemeIds: { dark: "codex" },
+      chromeThemes: { dark: customDark },
     });
 
-    expect(normalized.chromeThemes.dark).toEqual(customDark);
-    expect(normalized.chromeThemes.light).toEqual(getCodeThemeSeed("codex", "light"));
+    expect(normalized.chromeTheme).toEqual(customDark);
   });
 });
 
 describe("theme share strings", () => {
   it("round-trips a normalized pack through the share-string format", () => {
-    const shareString = createThemeShareString(
-      "dark",
-      resolveThemePack(DEFAULT_THEME_STATE, "dark"),
-    );
+    const shareString = createThemeShareString(resolveThemePack(DEFAULT_THEME_STATE));
 
+    expect(shareString).not.toContain('"variant"');
     expect(parseThemeShareString(shareString)).toEqual({
       codeThemeId: "codex",
-      theme: resolveThemePack(DEFAULT_THEME_STATE, "dark").theme,
-      variant: "dark",
+      theme: resolveThemePack(DEFAULT_THEME_STATE).theme,
     });
   });
 
-  it("parses the provided dark Linear theme and preserves its normalized values", () => {
+  it("parses a legacy payload that explicitly marks itself dark", () => {
     expect(parseThemeShareString(PROVIDED_THEME_STRING)).toEqual({
       codeThemeId: "linear",
       theme: {
@@ -249,31 +215,27 @@ describe("theme share strings", () => {
         },
         surface: "#0f0f11",
       },
-      variant: "dark",
     });
   });
 
-  it("rejects a share string whose variant does not match the target editor variant", () => {
-    expect(() => parseThemeShareStringForVariant(PROVIDED_THEME_STRING, "light")).toThrow(
-      /variant mismatch/i,
-    );
+  it("rejects a legacy payload saved from light mode", () => {
+    const lightPayload =
+      'codex-theme-v1:{"codeThemeId":"linear","theme":{"accent":"#5e6ad2","contrast":30,"fonts":{"code":null,"ui":"Inter"},"ink":"#1b1b1b","opaqueWindows":true,"semanticColors":{"diffAdded":"#52a450","diffRemoved":"#c94446","skill":"#8160d8"},"surface":"#fcfcfd"},"variant":"light"}';
+
+    expect(() => parseThemeShareString(lightPayload)).toThrow(/light mode/i);
   });
 
-  it("updates only the matching variant pack when importing", () => {
-    const nextState = updateThemePackFromShareString(
-      DEFAULT_THEME_STATE,
-      PROVIDED_THEME_STRING,
-      "dark",
-    );
+  it("updates the chrome theme and code theme id when importing", () => {
+    const nextState = updateThemePackFromShareString(DEFAULT_THEME_STATE, PROVIDED_THEME_STRING);
 
-    expect(nextState.codeThemeIds.dark).toBe("linear");
-    expect(nextState.chromeThemes.light).toEqual(DEFAULT_THEME_STATE.chromeThemes.light);
+    expect(nextState.codeThemeId).toBe("linear");
+    expect(nextState.chromeTheme).toEqual(parseThemeShareString(PROVIDED_THEME_STRING).theme);
   });
 });
 
 describe("code theme seeds", () => {
   it("loads the exact normalized seed for a bundled code theme", () => {
-    expect(getCodeThemeSeed("linear", "dark")).toEqual({
+    expect(getCodeThemeSeed("linear")).toEqual({
       accent: "#606acc",
       contrast: 60,
       fonts: {
@@ -292,7 +254,7 @@ describe("code theme seeds", () => {
   });
 
   it("exposes only the raw seed fields that Codex merges on theme switching", () => {
-    expect(getCodeThemeSeedPatch("linear", "dark")).toEqual({
+    expect(getCodeThemeSeedPatch("linear")).toEqual({
       accent: "#606acc",
       fonts: {
         ui: "Inter",
@@ -312,25 +274,21 @@ describe("code theme seeds", () => {
     const nextState = setThemeCodeThemeId(
       {
         ...DEFAULT_THEME_STATE,
-        chromeThemes: {
-          ...DEFAULT_THEME_STATE.chromeThemes,
-          dark: {
-            ...DEFAULT_THEME_STATE.chromeThemes.dark,
-            fonts: {
-              code: '"JetBrains Mono"',
-              ui: "Old UI",
-            },
-            accent: "#ff00aa",
-            contrast: 12,
-            opaqueWindows: false,
+        chromeTheme: {
+          ...DEFAULT_THEME_STATE.chromeTheme,
+          fonts: {
+            code: '"JetBrains Mono"',
+            ui: "Old UI",
           },
+          accent: "#ff00aa",
+          contrast: 12,
+          opaqueWindows: false,
         },
       },
-      "dark",
       "linear",
     );
 
-    expect(resolveThemePack(nextState, "dark")).toEqual({
+    expect(resolveThemePack(nextState)).toEqual({
       codeThemeId: "linear",
       theme: {
         accent: "#606acc",
@@ -355,37 +313,33 @@ describe("code theme seeds", () => {
     const nextState = setThemeCodeThemeId(
       {
         ...DEFAULT_THEME_STATE,
-        chromeThemes: {
-          ...DEFAULT_THEME_STATE.chromeThemes,
-          dark: {
-            ...DEFAULT_THEME_STATE.chromeThemes.dark,
-            fonts: {
-              code: '"JetBrains Mono"',
-              ui: "Current UI",
-            },
-            contrast: 22,
-            opaqueWindows: true,
+        chromeTheme: {
+          ...DEFAULT_THEME_STATE.chromeTheme,
+          fonts: {
+            code: '"JetBrains Mono"',
+            ui: "Current UI",
           },
+          contrast: 22,
+          opaqueWindows: true,
         },
       },
-      "dark",
       "lobster",
     );
 
-    expect(resolveThemePack(nextState, "dark")).toEqual({
+    expect(resolveThemePack(nextState)).toEqual({
       codeThemeId: "lobster",
       theme: {
-        ...DEFAULT_THEME_STATE.chromeThemes.dark,
-        accent: getCodeThemeSeed("lobster", "dark").accent,
+        ...DEFAULT_THEME_STATE.chromeTheme,
+        accent: getCodeThemeSeed("lobster").accent,
         contrast: 22,
         fonts: {
           code: '"JetBrains Mono"',
           ui: "Satoshi",
         },
-        ink: getCodeThemeSeed("lobster", "dark").ink,
+        ink: getCodeThemeSeed("lobster").ink,
         opaqueWindows: true,
-        semanticColors: getCodeThemeSeed("lobster", "dark").semanticColors,
-        surface: getCodeThemeSeed("lobster", "dark").surface,
+        semanticColors: getCodeThemeSeed("lobster").semanticColors,
+        surface: getCodeThemeSeed("lobster").surface,
       },
     });
   });
@@ -394,21 +348,17 @@ describe("code theme seeds", () => {
     const nextState = setThemeCodeThemeId(
       {
         ...DEFAULT_THEME_STATE,
-        chromeThemes: {
-          ...DEFAULT_THEME_STATE.chromeThemes,
-          dark: {
-            ...DEFAULT_THEME_STATE.chromeThemes.dark,
-            contrast: 12,
-          },
+        chromeTheme: {
+          ...DEFAULT_THEME_STATE.chromeTheme,
+          contrast: 12,
         },
       },
-      "dark",
       "vercel",
     );
 
-    expect(resolveThemePack(nextState, "dark")).toEqual({
+    expect(resolveThemePack(nextState)).toEqual({
       codeThemeId: "vercel",
-      theme: getCodeThemeSeed("vercel", "dark"),
+      theme: getCodeThemeSeed("vercel"),
     });
   });
 });
@@ -421,7 +371,6 @@ describe("buildThemeCssVariables", () => {
         codeThemeId: importedTheme.codeThemeId,
         theme: importedTheme.theme,
       },
-      importedTheme.variant,
       { electron: true },
     );
 
@@ -450,13 +399,10 @@ describe("buildThemeCssVariables", () => {
 
   it("exposes a structured derived-token surface for retrieving non-stored colors", () => {
     const importedTheme = parseThemeShareString(PROVIDED_THEME_STRING);
-    const tokens = buildResolvedThemeTokens(
-      {
-        codeThemeId: importedTheme.codeThemeId,
-        theme: importedTheme.theme,
-      },
-      importedTheme.variant,
-    );
+    const tokens = buildResolvedThemeTokens({
+      codeThemeId: importedTheme.codeThemeId,
+      theme: importedTheme.theme,
+    });
 
     expect(tokens.computed.surfaceUnder).toBe("#070708");
     expect(tokens.computed.panel).toBe("#0f0f11");
@@ -489,113 +435,68 @@ describe("buildThemeCssVariables", () => {
   });
 
   it("derives the fixed dark appearance palette", () => {
-    const variables = buildThemeCssVariables(
-      {
-        codeThemeId: "codex",
-        theme: DEFAULT_CHROME_THEME_BY_VARIANT.dark,
-      },
-      "dark",
-    ).variables;
-    const tokens = buildResolvedThemeTokens(
-      {
-        codeThemeId: "codex",
-        theme: DEFAULT_CHROME_THEME_BY_VARIANT.dark,
-      },
-      "dark",
-    );
+    const variables = buildThemeCssVariables({
+      codeThemeId: "codex",
+      theme: DEFAULT_CHROME_THEME,
+    }).variables;
+    const tokens = buildResolvedThemeTokens({
+      codeThemeId: "codex",
+      theme: DEFAULT_CHROME_THEME,
+    });
 
-    expect(tokens.derived.controlBackgroundOpaque).toBe("rgb(47, 48, 53)");
-    expect(tokens.aliases["--color-token-dropdown-background"]).toBe("rgb(47, 48, 53)");
-    expect(tokens.computed.surfaceUnder).toBe("#111318");
-    expect(tokens.derived.textForegroundSecondary).toBe("#9aa1ad");
-    expect(tokens.derived.textForegroundTertiary).toBe("#797a7e");
-    expect(variables["--background"]).toBe("#111318");
-    expect(variables["--panel"]).toBe("#1b1c21");
-    expect(variables["--foreground"]).toBe("#f7f8fa");
+    expect(tokens.derived.controlBackgroundOpaque).toBe("rgb(39, 39, 38)");
+    expect(tokens.aliases["--color-token-dropdown-background"]).toBe("rgb(39, 39, 38)");
+    expect(tokens.computed.surfaceUnder).toBe("#090909");
+    expect(tokens.derived.textForegroundSecondary).toBe("#807f7c");
+    expect(tokens.derived.textForegroundTertiary).toBe("#585856");
+    expect(variables["--background"]).toBe("#090909");
+    expect(variables["--panel"]).toBe("#141414");
+    expect(variables["--foreground"]).toBe("#e3e2dd");
     expect(variables["--accent"]).toBe("#3b82f6");
     // The retired brand tokens are no longer emitted at all.
     expect(variables["--claude"]).toBeUndefined();
     expect(variables["--gold"]).toBeUndefined();
-    expect(variables["--composer-surface"]).toBe("#16181d");
-    expect(variables["--app-user-message-background"]).toBe("#1d1f24");
+    expect(variables["--composer-surface"]).toBe("#141414");
+    expect(variables["--app-user-message-background"]).toBe("#141414");
     expect(variables["--vscode-terminal-ansiBlue"]).toBe("#75a7e0");
     expect(variables["--vscode-terminal-ansiCyan"]).toBe("#66b8b0");
     expect(variables["--vscode-terminal-ansiMagenta"]).toBe("#b99ad6");
   });
 
-  it("projects the requested semantic colors and light canvas", () => {
-    const darkVariables = buildThemeCssVariables(
-      resolveThemePack(DEFAULT_THEME_STATE, "dark"),
-      "dark",
-    ).variables;
-    const lightTokens = buildResolvedThemeTokens(
-      resolveThemePack(DEFAULT_THEME_STATE, "light"),
-      "light",
-    );
+  it("projects the requested semantic colors and default dark canvas", () => {
+    const darkVariables = buildThemeCssVariables(resolveThemePack(DEFAULT_THEME_STATE)).variables;
+    const darkTokens = buildResolvedThemeTokens(resolveThemePack(DEFAULT_THEME_STATE));
 
     expect(darkVariables["--destructive"]).toBe("#e94b4b");
     expect(darkVariables["--success"]).toBe("#4cb782");
     expect(darkVariables["--warning"]).toBe("#e94b4b");
     expect(darkVariables["--info"]).toBe("#3b82f6");
-    expect(lightTokens.computed.surfaceUnder).toBe("#ffffff");
-  });
-
-  it("matches Codex's light composer surface token path", () => {
-    const cssVariables = buildThemeCssVariables(
-      {
-        codeThemeId: "absolutely",
-        theme: getCodeThemeSeed("absolutely", "light"),
-      },
-      "light",
-      { electron: true },
-    );
-
-    expect(cssVariables.variables["--composer-surface"]).toBe(
-      "color-mix(in oklab, var(--color-background-control) 90%, transparent)",
-    );
-    expect(cssVariables.variables["--color-background-control"]).toBe("rgba(250, 250, 248, 0.96)");
+    expect(darkTokens.computed.surfaceUnder).toBe("#090909");
   });
 
-  it("uses the light-theme foreground color for the primary button background", () => {
-    const tokens = buildResolvedThemeTokens(
-      {
-        codeThemeId: "codex",
-        theme: DEFAULT_THEME_STATE.chromeThemes.light,
-      },
-      "light",
-    );
-
-    expect(tokens.derived.buttonPrimaryBackground).toBe(DEFAULT_THEME_STATE.chromeThemes.light.ink);
-    expect(tokens.derived.textButtonPrimary).toBe(DEFAULT_THEME_STATE.chromeThemes.light.surface);
-    expect(tokens.derived.textButtonPrimary).not.toBe(tokens.derived.buttonPrimaryBackground);
-  });
-
-  it("uses the dark-theme foreground color for the primary button background", () => {
-    const tokens = buildResolvedThemeTokens(
-      {
-        codeThemeId: "codex",
-        theme: DEFAULT_THEME_STATE.chromeThemes.dark,
-      },
-      "dark",
-    );
+  it("uses the dark theme foreground color for the primary button background", () => {
+    const tokens = buildResolvedThemeTokens({
+      codeThemeId: "codex",
+      theme: DEFAULT_THEME_STATE.chromeTheme,
+    });
 
-    // Dark mode mirrors light mode's high-contrast primary: bg = ink (white),
-    // label = surface (dark), so the primary action reads as a filled button.
-    expect(tokens.derived.buttonPrimaryBackground).toBe(DEFAULT_THEME_STATE.chromeThemes.dark.ink);
-    expect(tokens.derived.textButtonPrimary).toBe(DEFAULT_THEME_STATE.chromeThemes.dark.surface);
+    // Dark mode's high-contrast primary: bg = ink (white), label = surface
+    // (dark), so the primary action reads as a filled button.
+    expect(tokens.derived.buttonPrimaryBackground).toBe(DEFAULT_THEME_STATE.chromeTheme.ink);
+    expect(tokens.derived.textButtonPrimary).toBe(DEFAULT_THEME_STATE.chromeTheme.surface);
     expect(tokens.derived.textButtonPrimary).not.toBe(tokens.derived.buttonPrimaryBackground);
   });
 
   it("shares the user message bubble background with the chat code-block surface", () => {
     const pack = {
-      codeThemeId: "custom-light",
+      codeThemeId: "custom-dark",
       theme: {
-        ...DEFAULT_THEME_STATE.chromeThemes.light,
-        ink: "#2d2d2b",
-        surface: "#f8f8f6",
+        ...DEFAULT_THEME_STATE.chromeTheme,
+        ink: "#f2f2f0",
+        surface: "#101013",
       },
     };
-    const cssVariables = buildThemeCssVariables(pack, "light");
+    const cssVariables = buildThemeCssVariables(pack);
 
     expect(cssVariables.variables["--app-chat-code-surface"]).toBe(
       cssVariables.variables["--app-user-message-background"],
diff --git a/apps/web/src/theme/theme.logic.ts b/apps/web/src/theme/theme.logic.ts
index 2795c16f6..0b6a35d72 100644
--- a/apps/web/src/theme/theme.logic.ts
+++ b/apps/web/src/theme/theme.logic.ts
@@ -9,8 +9,8 @@ import {
   normalizeMonospaceFontFamilyCssValue,
 } from "../lib/fontFamily";
 
-export type ThemeMode = "light" | "dark" | "system";
 export type ThemeVariant = "light" | "dark";
+export type ThemeMode = ThemeVariant | "system";
 export type WindowMaterial = "opaque" | "translucent";
 
 export interface ThemeFonts {
@@ -40,21 +40,19 @@ export interface ThemePack {
 }
 
 export interface ThemeState {
-  chromeThemes: Record<ThemeVariant, ChromeTheme>;
-  codeThemeIds: Record<ThemeVariant, string>;
-  mode: ThemeMode;
+  chromeTheme: ChromeTheme;
+  codeThemeId: string;
+  variant: ThemeVariant;
 }
 
 export interface CodeThemeOption {
   id: string;
   label: string;
-  variants: readonly ThemeVariant[];
 }
 
 export interface ThemeSharePayload {
   codeThemeId: string;
   theme: ChromeTheme;
-  variant: ThemeVariant;
 }
 
 export interface ThemeCssVariableBuild {
@@ -132,254 +130,144 @@ type RgbColor = {
   blue: number;
 };
 
-const BLACK: RgbColor = { blue: 0, green: 0, red: 0 };
 const WHITE: RgbColor = { blue: 255, green: 255, red: 255 };
 const HEX_COLOR_RE = /^#[0-9a-fA-F]{6}$/;
 const THEME_SHARE_PREFIX = "codex-theme-v1:";
 const CONTRAST_CURVE_BELOW_BASELINE = 0.7;
 const CONTRAST_CURVE_ABOVE_BASELINE = 2;
-const SURFACE_UNDER_BASE_ALPHA: Record<ThemeVariant, number> = {
-  // The shell deliberately separates the flat window canvas from the one
-  // elevated panel layer.
-  dark: 0.565,
-  light: 0.04,
-};
-const SURFACE_UNDER_CONTRAST_STEP: Record<ThemeVariant, number> = {
-  dark: 0.001,
-  light: 0.0012,
-};
-const CANVAS_COLOR_BY_VARIANT: Record<ThemeVariant, string> = {
-  dark: "#111318",
-  light: "#ffffff",
-};
-// Info is the single indication blue; identical in both variants per the mono
-// design (dark may only lighten via mix, never a new hue).
-const INFO_COLOR_BY_VARIANT: Record<ThemeVariant, string> = {
-  dark: "#3b82f6",
-  light: "#3b82f6",
-};
+// The shell deliberately separates the flat window canvas from the one
+// elevated panel layer.
+const SURFACE_UNDER_BASE_ALPHA = 0.565;
+const SURFACE_UNDER_CONTRAST_STEP = 0.001;
+const CANVAS_COLOR = "#090909";
+const INFO_COLOR = "#3b82f6";
 // "Warning" no longer has its own hue: it collapses onto the danger red so old
 // call sites stay legible until they migrate to the semantic tokens.
-const WARNING_COLOR_BY_VARIANT: Record<ThemeVariant, string> = {
-  dark: "#e94b4b",
-  light: "#e94b4b",
-};
-const MUTED_COLOR_BY_VARIANT: Record<ThemeVariant, string> = {
-  dark: "#9aa1ad",
-  light: "#6b7280",
-};
-const FAINT_COLOR_BY_VARIANT: Record<ThemeVariant, string> = {
-  dark: "#797a7e",
-  light: "#949597",
+const WARNING_COLOR = "#e94b4b";
+const MUTED_COLOR = "#807f7c";
+const FAINT_COLOR = "#585856";
+const SUCCESS_FOREGROUND = "#a5d6b7";
+const DESTRUCTIVE_FOREGROUND = "#ef9091";
+const WARNING_FOREGROUND = "#ef9091";
+const TERMINAL_ANSI: { blue: string; cyan: string; magenta: string } = {
+  blue: "#75a7e0",
+  cyan: "#66b8b0",
+  magenta: "#b99ad6",
 };
-const SUCCESS_FOREGROUND_BY_VARIANT: Record<ThemeVariant, string> = {
-  dark: "#a5d6b7",
-  light: "#27694c",
-};
-const DESTRUCTIVE_FOREGROUND_BY_VARIANT: Record<ThemeVariant, string> = {
-  dark: "#ef9091",
-  light: "#933537",
-};
-const WARNING_FOREGROUND_BY_VARIANT: Record<ThemeVariant, string> = {
-  dark: "#ef9091",
-  light: "#933537",
-};
-const TERMINAL_ANSI_BY_VARIANT: Record<
-  ThemeVariant,
-  { blue: string; cyan: string; magenta: string }
-> = {
-  dark: { blue: "#75a7e0", cyan: "#66b8b0", magenta: "#b99ad6" },
-  light: { blue: "#326aa5", cyan: "#2f7f79", magenta: "#76508f" },
-};
-const COMPOSER_SURFACE_BY_VARIANT: Record<ThemeVariant, string> = {
-  dark: "#16181d",
-  light: "#f2f2f4",
-};
-const INPUT_SURFACE_BY_VARIANT: Record<ThemeVariant, string> = {
-  dark: "#1d1f24",
-  light: "#f2f2f4",
-};
-const PANEL_BASE_ALPHA: Record<ThemeVariant, number> = {
-  dark: 0,
-  light: 0.18,
-};
-const PANEL_CONTRAST_STEP: Record<ThemeVariant, number> = {
-  dark: 0,
-  light: 0.008,
-};
-const CODE_THEME_SEED_PATCH_METADATA: Partial<
-  Record<string, Partial<Record<ThemeVariant, CodeThemeSeedPatchMetadata>>>
-> = {
-  linear: {
-    dark: { fonts: { ui: true }, opaqueWindows: true },
-    light: { fonts: { ui: true }, opaqueWindows: true },
-  },
-  lobster: {
-    dark: { fonts: { ui: true } },
-  },
-  matrix: {
-    dark: { fonts: { code: true, ui: true }, opaqueWindows: true },
-  },
-  notion: {
-    dark: { fonts: { code: true, ui: true }, opaqueWindows: true },
-    light: { fonts: { code: true, ui: true }, opaqueWindows: true },
-  },
-  proof: {
-    light: { fonts: { code: true, ui: true }, opaqueWindows: true },
-  },
-  raycast: {
-    dark: { fonts: { code: true, ui: true }, opaqueWindows: true },
-    light: { fonts: { code: true, ui: true }, opaqueWindows: true },
-  },
-  sentry: {
-    dark: { fonts: { code: true, ui: true } },
-  },
-  vercel: {
-    dark: { contrast: true, fonts: { code: true, ui: true }, opaqueWindows: true },
-    light: { contrast: true, fonts: { code: true, ui: true }, opaqueWindows: true },
-  },
-  "dp-code": {
-    dark: { contrast: true },
-    light: { contrast: true },
-  },
+const COMPOSER_SURFACE = "#141414";
+const INPUT_SURFACE = "#141414";
+const LIGHT_COMPOSER_SURFACE = "#E8E7E2";
+const LIGHT_INPUT_SURFACE = "#E8E7E2";
+const LIGHT_CANVAS_COLOR = "#F5F4EF";
+const CODE_THEME_SEED_PATCH_METADATA: Partial<Record<string, CodeThemeSeedPatchMetadata>> = {
+  linear: { fonts: { ui: true }, opaqueWindows: true },
+  lobster: { fonts: { ui: true } },
+  matrix: { fonts: { code: true, ui: true }, opaqueWindows: true },
+  notion: { fonts: { code: true, ui: true }, opaqueWindows: true },
+  raycast: { fonts: { code: true, ui: true }, opaqueWindows: true },
+  sentry: { fonts: { code: true, ui: true } },
+  vercel: { contrast: true, fonts: { code: true, ui: true }, opaqueWindows: true },
+  "dp-code": { contrast: true },
 };
 
 // Mirror the packaged Codex catalog closely enough that share-string validation
-// can preserve the "known theme + variant availability" behavior.
+// can preserve the "known theme" behavior.
 export const CODE_THEME_OPTIONS: readonly CodeThemeOption[] = [
-  { id: "absolutely", label: "Absolutely", variants: ["light", "dark"] },
-  { id: "ayu", label: "Ayu", variants: ["dark"] },
-  { id: "catppuccin", label: "Catppuccin", variants: ["light", "dark"] },
-  { id: "codex", label: "Codex", variants: ["light", "dark"] },
-  { id: "dp-code", label: "TeaCode", variants: ["light", "dark"] },
-  { id: "dracula", label: "Dracula", variants: ["dark"] },
-  { id: "everforest", label: "Everforest", variants: ["light", "dark"] },
-  { id: "github", label: "GitHub", variants: ["light", "dark"] },
-  { id: "gruvbox", label: "Gruvbox", variants: ["light", "dark"] },
-  { id: "linear", label: "Linear", variants: ["light", "dark"] },
-  { id: "lobster", label: "Lobster", variants: ["dark"] },
-  { id: "material", label: "Material", variants: ["dark"] },
-  { id: "matrix", label: "Matrix", variants: ["dark"] },
-  { id: "monokai", label: "Monokai", variants: ["dark"] },
-  { id: "night-owl", label: "Night Owl", variants: ["dark"] },
-  { id: "nord", label: "Nord", variants: ["dark"] },
-  { id: "notion", label: "Notion", variants: ["light", "dark"] },
-  { id: "one", label: "One", variants: ["light", "dark"] },
-  { id: "oscurange", label: "Oscurange", variants: ["dark"] },
-  { id: "proof", label: "Proof", variants: ["light"] },
-  { id: "raycast", label: "Raycast", variants: ["light", "dark"] },
-  { id: "rose-pine", label: "Rose Pine", variants: ["light", "dark"] },
-  { id: "sentry", label: "Sentry", variants: ["dark"] },
-  { id: "solarized", label: "Solarized", variants: ["light", "dark"] },
-  { id: "temple", label: "Temple", variants: ["dark"] },
-  { id: "tokyo-night", label: "Tokyo Night", variants: ["dark"] },
-  { id: "vercel", label: "Vercel", variants: ["light", "dark"] },
-  { id: "vscode-plus", label: "VS Code Plus", variants: ["light", "dark"] },
+  { id: "absolutely", label: "Absolutely" },
+  { id: "ayu", label: "Ayu" },
+  { id: "catppuccin", label: "Catppuccin" },
+  { id: "codex", label: "Codex" },
+  { id: "dp-code", label: "TeaCode" },
+  { id: "dracula", label: "Dracula" },
+  { id: "everforest", label: "Everforest" },
+  { id: "github", label: "GitHub" },
+  { id: "gruvbox", label: "Gruvbox" },
+  { id: "linear", label: "Linear" },
+  { id: "lobster", label: "Lobster" },
+  { id: "material", label: "Material" },
+  { id: "matrix", label: "Matrix" },
+  { id: "monokai", label: "Monokai" },
+  { id: "night-owl", label: "Night Owl" },
+  { id: "nord", label: "Nord" },
+  { id: "notion", label: "Notion" },
+  { id: "one", label: "One" },
+  { id: "oscurange", label: "Oscurange" },
+  { id: "raycast", label: "Raycast" },
+  { id: "rose-pine", label: "Rose Pine" },
+  { id: "sentry", label: "Sentry" },
+  { id: "solarized", label: "Solarized" },
+  { id: "temple", label: "Temple" },
+  { id: "tokyo-night", label: "Tokyo Night" },
+  { id: "vercel", label: "Vercel" },
+  { id: "vscode-plus", label: "VS Code Plus" },
 ] as const;
 
-export const DEFAULT_CHROME_THEME_BY_VARIANT: Record<ThemeVariant, ChromeTheme> = {
-  dark: {
-    accent: "#3b82f6",
-    contrast: 60,
-    fonts: { code: null, ui: null },
-    ink: "#f7f8fa",
-    opaqueWindows: true,
-    semanticColors: {
-      diffAdded: "#4cb782",
-      diffRemoved: "#e94b4b",
-      skill: "#9aa1ad",
-    },
-    surface: "#1b1c21",
-  },
-  light: {
-    accent: "#3b82f6",
-    contrast: 45,
-    fonts: { code: null, ui: null },
-    ink: "#111318",
-    opaqueWindows: true,
-    semanticColors: {
-      diffAdded: "#4cb782",
-      diffRemoved: "#e94b4b",
-      skill: "#6b7280",
-    },
-    surface: "#f7f8fa",
+export const DEFAULT_CHROME_THEME: ChromeTheme = {
+  accent: "#3b82f6",
+  contrast: 60,
+  fonts: { code: null, ui: null },
+  ink: "#e3e2dd",
+  opaqueWindows: false,
+  semanticColors: {
+    diffAdded: "#4cb782",
+    diffRemoved: "#e94b4b",
+    skill: "#9aa1ad",
   },
+  surface: "#141414",
 };
 
-const LEGACY_DEFAULT_CHROME_THEME_BY_VARIANT: Record<ThemeVariant, ChromeTheme> = {
-  dark: {
-    accent: "#fb923c",
-    contrast: 60,
-    fonts: { code: null, ui: null },
-    ink: "#f4f4f5",
-    opaqueWindows: true,
-    semanticColors: {
-      diffAdded: "#4ade80",
-      diffRemoved: "#f43f5e",
-      skill: "#3b82f6",
-    },
-    surface: "#18181b",
+export const DEFAULT_LIGHT_CHROME_THEME: ChromeTheme = {
+  accent: "#5A7FA8",
+  contrast: 60,
+  fonts: { code: null, ui: null },
+  ink: "#575757",
+  opaqueWindows: false,
+  semanticColors: {
+    diffAdded: "#6E9B5C",
+    diffRemoved: "#C25A50",
+    skill: "#8A6BAA",
   },
-  light: {
-    accent: "#fb923c",
-    contrast: 45,
-    fonts: { code: null, ui: null },
-    ink: "#18181b",
-    opaqueWindows: true,
-    semanticColors: {
-      diffAdded: "#4ade80",
-      diffRemoved: "#f43f5e",
-      skill: "#3b82f6",
-    },
-    surface: "#f4f4f5",
+  surface: "#F5F4EF",
+};
+
+const LEGACY_DEFAULT_CHROME_THEME: ChromeTheme = {
+  accent: "#fb923c",
+  contrast: 60,
+  fonts: { code: null, ui: null },
+  ink: "#f4f4f5",
+  opaqueWindows: true,
+  semanticColors: {
+    diffAdded: "#4ade80",
+    diffRemoved: "#f43f5e",
+    skill: "#3b82f6",
   },
+  surface: "#18181b",
 };
 
 export const DEFAULT_THEME_STATE: ThemeState = {
-  chromeThemes: {
-    dark: DEFAULT_CHROME_THEME_BY_VARIANT.dark,
-    light: DEFAULT_CHROME_THEME_BY_VARIANT.light,
-  },
-  codeThemeIds: {
-    dark: "codex",
-    light: "codex",
-  },
-  mode: "system",
+  chromeTheme: DEFAULT_CHROME_THEME,
+  codeThemeId: "codex",
+  variant: "dark",
 };
 
 // ─── Theme catalog helpers ────────────────────────────────────────────────
 
-export function isThemeMode(value: unknown): value is ThemeMode {
-  return value === "light" || value === "dark" || value === "system";
-}
-
-export function isThemeVariant(value: unknown): value is ThemeVariant {
-  return value === "light" || value === "dark";
-}
-
 export function getThemeSharePrefix(): string {
   return THEME_SHARE_PREFIX;
 }
 
-export function getAvailableCodeThemes(variant: ThemeVariant): readonly CodeThemeOption[] {
-  return CODE_THEME_OPTIONS.filter((option) => option.variants.includes(variant));
-}
-
-export function isCodeThemeAvailable(codeThemeId: string, variant: ThemeVariant): boolean {
+export function isCodeThemeAvailable(codeThemeId: string): boolean {
   const normalizedCodeThemeId = codeThemeId.trim().toLowerCase();
-  return CODE_THEME_OPTIONS.some(
-    (option) => option.id === normalizedCodeThemeId && option.variants.includes(variant),
-  );
+  return CODE_THEME_OPTIONS.some((option) => option.id === normalizedCodeThemeId);
 }
 
 export function normalizeCodeThemeId(
   codeThemeId: unknown,
-  variant: ThemeVariant,
-  fallback = DEFAULT_THEME_STATE.codeThemeIds[variant],
+  fallback = DEFAULT_THEME_STATE.codeThemeId,
 ): string {
   const normalizedCodeThemeId =
     typeof codeThemeId === "string" ? codeThemeId.trim().toLowerCase() : "";
-  return isCodeThemeAvailable(normalizedCodeThemeId, variant) ? normalizedCodeThemeId : fallback;
+  return isCodeThemeAvailable(normalizedCodeThemeId) ? normalizedCodeThemeId : fallback;
 }
 
 // ─── Theme normalization ──────────────────────────────────────────────────
@@ -404,8 +292,8 @@ export function normalizeSemanticColors(
   };
 }
 
-export function normalizeChromeTheme(value: unknown, variant: ThemeVariant): ChromeTheme {
-  const fallback = DEFAULT_CHROME_THEME_BY_VARIANT[variant];
+export function normalizeChromeTheme(value: unknown): ChromeTheme {
+  const fallback = DEFAULT_CHROME_THEME;
   const theme = isRecord(value) ? value : {};
 
   return {
@@ -422,11 +310,11 @@ export function normalizeChromeTheme(value: unknown, variant: ThemeVariant): Chr
   };
 }
 
-export function normalizeThemePack(value: unknown, variant: ThemeVariant): ThemePack {
+export function normalizeThemePack(value: unknown): ThemePack {
   const pack = isRecord(value) ? value : {};
   return {
-    codeThemeId: normalizeCodeThemeId(pack.codeThemeId, variant),
-    theme: normalizeChromeTheme(pack.theme, variant),
+    codeThemeId: normalizeCodeThemeId(pack.codeThemeId),
+    theme: normalizeChromeTheme(pack.theme),
   };
 }
 
@@ -445,10 +333,10 @@ function haveSameChromePalette(left: ChromeTheme, right: ChromeTheme): boolean {
 /** Accents retired by the monochrome design system (Design.md §2): orange, coral, gold. */
 const LEGACY_ACCENT_COLORS: ReadonlySet<string> = new Set(["#fb923c", "#d97757", "#a96f35"]);
 
-function migrateLegacyDefaultChromeTheme(theme: ChromeTheme, variant: ThemeVariant): ChromeTheme {
-  if (haveSameChromePalette(theme, LEGACY_DEFAULT_CHROME_THEME_BY_VARIANT[variant])) {
+function migrateLegacyDefaultChromeTheme(theme: ChromeTheme): ChromeTheme {
+  if (haveSameChromePalette(theme, LEGACY_DEFAULT_CHROME_THEME)) {
     return {
-      ...DEFAULT_CHROME_THEME_BY_VARIANT[variant],
+      ...DEFAULT_CHROME_THEME,
       fonts: theme.fonts,
       opaqueWindows: theme.opaqueWindows,
     };
@@ -460,7 +348,7 @@ function migrateLegacyDefaultChromeTheme(theme: ChromeTheme, variant: ThemeVaria
   if (LEGACY_ACCENT_COLORS.has(theme.accent)) {
     return {
       ...theme,
-      accent: DEFAULT_CHROME_THEME_BY_VARIANT[variant].accent,
+      accent: DEFAULT_CHROME_THEME.accent,
     };
   }
 
@@ -469,53 +357,49 @@ function migrateLegacyDefaultChromeTheme(theme: ChromeTheme, variant: ThemeVaria
 
 export function normalizeThemeState(value: unknown): ThemeState {
   const state = isRecord(value) ? value : {};
-  const codeThemeIds = isRecord(state.codeThemeIds) ? state.codeThemeIds : {};
   const chromeThemes = isRecord(state.chromeThemes) ? state.chromeThemes : {};
+  const codeThemeIds = isRecord(state.codeThemeIds) ? state.codeThemeIds : {};
   const packs = isRecord(state.packs) ? state.packs : {};
-  const legacyDarkPack = normalizeThemePack(packs.dark, "dark");
-  const legacyLightPack = normalizeThemePack(packs.light, "light");
-  const normalizedState: ThemeState = {
-    chromeThemes: {
-      dark: isRecord(chromeThemes.dark)
-        ? normalizeChromeTheme(chromeThemes.dark, "dark")
-        : isRecord(packs.dark)
-          ? legacyDarkPack.theme
-          : DEFAULT_THEME_STATE.chromeThemes.dark,
-      light: isRecord(chromeThemes.light)
-        ? normalizeChromeTheme(chromeThemes.light, "light")
-        : isRecord(packs.light)
-          ? legacyLightPack.theme
-          : DEFAULT_THEME_STATE.chromeThemes.light,
-    },
-    codeThemeIds: {
-      dark: normalizeCodeThemeId(codeThemeIds.dark ?? legacyDarkPack.codeThemeId, "dark"),
-      light: normalizeCodeThemeId(codeThemeIds.light ?? legacyLightPack.codeThemeId, "light"),
-    },
-    mode: isThemeMode(state.mode) ? state.mode : DEFAULT_THEME_STATE.mode,
-  };
+  const legacyDarkPack = normalizeThemePack(packs.dark);
+
+  // Prefer the current-format fields; fall back through the legacy per-variant
+  // shapes (`chromeThemes`/`codeThemeIds`, then the even older `packs` shape),
+  // always reading the dark side and ignoring anything light-specific.
+  const chromeTheme = isRecord(state.chromeTheme)
+    ? normalizeChromeTheme(state.chromeTheme)
+    : isRecord(chromeThemes.dark)
+      ? normalizeChromeTheme(chromeThemes.dark)
+      : isRecord(packs.dark)
+        ? legacyDarkPack.theme
+        : DEFAULT_THEME_STATE.chromeTheme;
+
+  const codeThemeId = normalizeCodeThemeId(
+    state.codeThemeId ?? codeThemeIds.dark ?? legacyDarkPack.codeThemeId,
+  );
 
-  return normalizedState;
+  const variant: ThemeVariant =
+    state.variant === "light" || state.variant === "dark"
+      ? state.variant
+      : DEFAULT_THEME_STATE.variant;
+
+  return { chromeTheme, codeThemeId, variant };
 }
 
 export function parseStoredThemeState(rawValue: string | null | undefined): ThemeState {
   if (!rawValue) {
     return DEFAULT_THEME_STATE;
   }
-  if (isThemeMode(rawValue)) {
-    return {
-      ...DEFAULT_THEME_STATE,
-      mode: rawValue,
-    };
+  // Very old storage held a bare mode string ("light" | "dark" | "system")
+  // instead of JSON. Appearance is dark-only now, so just fall back to default.
+  if (rawValue === "light" || rawValue === "dark" || rawValue === "system") {
+    return DEFAULT_THEME_STATE;
   }
 
   try {
     const storedState = normalizeThemeState(JSON.parse(rawValue));
     return {
       ...storedState,
-      chromeThemes: {
-        dark: migrateLegacyDefaultChromeTheme(storedState.chromeThemes.dark, "dark"),
-        light: migrateLegacyDefaultChromeTheme(storedState.chromeThemes.light, "light"),
-      },
+      chromeTheme: migrateLegacyDefaultChromeTheme(storedState.chromeTheme),
     };
   } catch {
     return DEFAULT_THEME_STATE;
@@ -528,11 +412,10 @@ export function serializeThemeState(state: ThemeState): string {
 
 // ─── Share-string import / export ─────────────────────────────────────────
 
-export function createThemeShareString(variant: ThemeVariant, pack: ThemePack): string {
+export function createThemeShareString(pack: ThemePack): string {
   return `${THEME_SHARE_PREFIX}${JSON.stringify({
     codeThemeId: pack.codeThemeId,
     theme: pack.theme,
-    variant,
   })}`;
 }
 
@@ -552,68 +435,38 @@ export function parseThemeShareString(rawValue: string): ThemeSharePayload {
   }
 
   const themeShare = parseThemeSharePayload(payload);
-  if (!isCodeThemeAvailable(themeShare.codeThemeId, themeShare.variant)) {
-    throw new Error(
-      `Code theme "${themeShare.codeThemeId}" is not available for ${themeShare.variant}.`,
-    );
+  if (!isCodeThemeAvailable(themeShare.codeThemeId)) {
+    throw new Error(`Code theme "${themeShare.codeThemeId}" is not available.`);
   }
 
   return {
     codeThemeId: themeShare.codeThemeId,
-    theme: normalizeChromeTheme(themeShare.theme, themeShare.variant),
-    variant: themeShare.variant,
+    theme: normalizeChromeTheme(themeShare.theme),
   };
 }
 
-export function canParseThemeShareString(value: string, targetVariant?: ThemeVariant): boolean {
+export function canParseThemeShareString(value: string): boolean {
   try {
-    parseThemeShareStringForVariant(value, targetVariant);
+    parseThemeShareString(value);
     return true;
   } catch {
     return false;
   }
 }
 
-export function parseThemeShareStringForVariant(
-  value: string,
-  targetVariant?: ThemeVariant,
-): ThemeSharePayload {
+export function updateThemePackFromShareString(state: ThemeState, value: string): ThemeState {
   const payload = parseThemeShareString(value);
-  if (targetVariant && payload.variant !== targetVariant) {
-    throw new Error(
-      `Theme variant mismatch. Expected ${targetVariant}, received ${payload.variant}.`,
-    );
-  }
-  return payload;
-}
-
-export function updateThemePackFromShareString(
-  state: ThemeState,
-  value: string,
-  targetVariant: ThemeVariant,
-): ThemeState {
-  const payload = parseThemeShareStringForVariant(value, targetVariant);
   return {
     ...state,
-    chromeThemes: {
-      ...state.chromeThemes,
-      [targetVariant]: payload.theme,
-    },
-    codeThemeIds: {
-      ...state.codeThemeIds,
-      [targetVariant]: payload.codeThemeId,
-    },
+    chromeTheme: payload.theme,
+    codeThemeId: payload.codeThemeId,
   };
 }
 
 // ─── Granular pack mutators ───────────────────────────────────────────────
 
-export function updateChromeTheme(
-  state: ThemeState,
-  variant: ThemeVariant,
-  patch: Partial<ChromeTheme>,
-): ThemeState {
-  const previousTheme = state.chromeThemes[variant];
+export function updateChromeTheme(state: ThemeState, patch: Partial<ChromeTheme>): ThemeState {
+  const previousTheme = state.chromeTheme;
   const nextPatch: ChromeThemeSeedPatch = { ...patch };
   if (patch.fonts) {
     nextPatch.fonts = patch.fonts;
@@ -623,57 +476,40 @@ export function updateChromeTheme(
   }
   return {
     ...state,
-    chromeThemes: {
-      ...state.chromeThemes,
-      [variant]: normalizeChromeTheme(mergeThemeSeedPatch(previousTheme, nextPatch), variant),
-    },
+    chromeTheme: normalizeChromeTheme(mergeThemeSeedPatch(previousTheme, nextPatch)),
   };
 }
 
-export function setThemeCodeThemeId(
-  state: ThemeState,
-  variant: ThemeVariant,
-  codeThemeId: string,
-): ThemeState {
-  const normalized = normalizeCodeThemeId(codeThemeId, variant);
-  const previousTheme = resolveThemePack(state, variant).theme;
+export function setThemeCodeThemeId(state: ThemeState, codeThemeId: string): ThemeState {
+  const normalized = normalizeCodeThemeId(codeThemeId);
+  const previousTheme = resolveThemePack(state).theme;
   const nextTheme = normalizeChromeTheme(
-    mergeThemeSeedPatch(previousTheme, getCodeThemeSeedPatch(normalized, variant)),
-    variant,
+    mergeThemeSeedPatch(previousTheme, getCodeThemeSeedPatch(normalized)),
   );
   return {
     ...state,
-    chromeThemes: {
-      ...state.chromeThemes,
-      [variant]: nextTheme,
-    },
-    codeThemeIds: {
-      ...state.codeThemeIds,
-      [variant]: normalized,
-    },
+    chromeTheme: nextTheme,
+    codeThemeId: normalized,
   };
 }
 
-export function getCodeThemeSeed(codeThemeId: string, variant: ThemeVariant): ChromeTheme {
-  const fallback = DEFAULT_CHROME_THEME_BY_VARIANT[variant];
+export function getCodeThemeSeed(codeThemeId: string): ChromeTheme {
+  const fallback = DEFAULT_CHROME_THEME;
   if (codeThemeId === "codex") {
     return fallback;
   }
-  const themeSeed = THEME_SEED_CATALOG[codeThemeId]?.[variant];
-  return themeSeed ? normalizeChromeTheme(themeSeed, variant) : fallback;
+  const themeSeed = THEME_SEED_CATALOG[codeThemeId];
+  return themeSeed ? normalizeChromeTheme(themeSeed) : fallback;
 }
 
-export function getCodeThemeSeedPatch(
-  codeThemeId: string,
-  variant: ThemeVariant,
-): ChromeThemeSeedPatch {
-  const themeSeed = THEME_SEED_CATALOG[codeThemeId]?.[variant];
+export function getCodeThemeSeedPatch(codeThemeId: string): ChromeThemeSeedPatch {
+  const themeSeed = THEME_SEED_CATALOG[codeThemeId];
   if (!themeSeed) {
     return {};
   }
 
-  const normalizedSeed = normalizeChromeTheme(themeSeed, variant);
-  const metadata = CODE_THEME_SEED_PATCH_METADATA[codeThemeId]?.[variant];
+  const normalizedSeed = normalizeChromeTheme(themeSeed);
+  const metadata = CODE_THEME_SEED_PATCH_METADATA[codeThemeId];
   const patch: ChromeThemeSeedPatch = {
     accent: normalizedSeed.accent,
     ink: normalizedSeed.ink,
@@ -719,45 +555,54 @@ function mergeThemeSeedPatch(
   };
 }
 
-export function setThemeFonts(
-  state: ThemeState,
-  variant: ThemeVariant,
-  patch: Partial<ThemeFonts>,
-): ThemeState {
-  const previousTheme = state.chromeThemes[variant];
+export function setThemeFonts(state: ThemeState, patch: Partial<ThemeFonts>): ThemeState {
+  const previousTheme = state.chromeTheme;
   return {
     ...state,
-    chromeThemes: {
-      ...state.chromeThemes,
-      [variant]: normalizeChromeTheme(
-        {
-          ...previousTheme,
-          fonts: { ...previousTheme.fonts, ...patch },
-        },
-        variant,
-      ),
-    },
+    chromeTheme: normalizeChromeTheme({
+      ...previousTheme,
+      fonts: { ...previousTheme.fonts, ...patch },
+    }),
   };
 }
 
-export function resetThemeVariant(state: ThemeState, variant: ThemeVariant): ThemeState {
+export function resetTheme(state: ThemeState): ThemeState {
   return {
     ...state,
-    chromeThemes: {
-      ...state.chromeThemes,
-      [variant]: DEFAULT_THEME_STATE.chromeThemes[variant],
-    },
-    codeThemeIds: {
-      ...state.codeThemeIds,
-      [variant]: DEFAULT_THEME_STATE.codeThemeIds[variant],
-    },
+    chromeTheme: DEFAULT_THEME_STATE.chromeTheme,
+    codeThemeId: DEFAULT_THEME_STATE.codeThemeId,
   };
 }
 
-export function resolveThemePack(state: ThemeState, variant: ThemeVariant): ThemePack {
+export function resolveThemePack(state: ThemeState): ThemePack {
   return {
-    codeThemeId: normalizeCodeThemeId(state.codeThemeIds[variant], variant),
-    theme: normalizeChromeTheme(state.chromeThemes[variant], variant),
+    codeThemeId: normalizeCodeThemeId(state.codeThemeId),
+    theme: normalizeChromeTheme(state.chromeTheme),
+  };
+}
+
+/**
+ * The chrome palette is stored once and shared by both variants, so a state that
+ * still carries a shipped default must be flipped to the sibling default that
+ * matches the active variant. Without this, light mode renders the dark palette's
+ * near-white ink over a washed-out dark surface. Custom palettes are left alone —
+ * the derivation already has a non-default branch for them.
+ */
+export function resolveThemePackForVariant(state: ThemeState): ThemePack {
+  const pack = resolveThemePack(state);
+  const wantsLight = state.variant === "light";
+  const sibling = wantsLight ? DEFAULT_CHROME_THEME : DEFAULT_LIGHT_CHROME_THEME;
+  if (!haveSameChromePalette(pack.theme, sibling)) {
+    return pack;
+  }
+  const target = wantsLight ? DEFAULT_LIGHT_CHROME_THEME : DEFAULT_CHROME_THEME;
+  return {
+    ...pack,
+    theme: {
+      ...target,
+      fonts: pack.theme.fonts,
+      opaqueWindows: pack.theme.opaqueWindows,
+    },
   };
 }
 
@@ -779,54 +624,46 @@ export function areThemePacksEqual(left: ThemePack, right: ThemePack): boolean {
 
 // ─── Theme derivation ─────────────────────────────────────────────────────
 
-export function resolveThemeVariant(mode: ThemeMode, systemDark: boolean): ThemeVariant {
-  if (mode === "system") {
-    return systemDark ? "dark" : "light";
-  }
-  return mode;
-}
-
 export function buildThemeCssVariables(
   pack: ThemePack,
-  variant: ThemeVariant,
-  options?: { electron?: boolean; isMac?: boolean },
+  options?: { electron?: boolean; isMac?: boolean; variant?: ThemeVariant },
 ): ThemeCssVariableBuild {
+  const variant = options?.variant ?? "dark";
   const resolvedTokens = buildResolvedThemeTokens(pack, variant);
   const codexVariables = resolvedTokens.codexVariables;
   const readCodexVariable = (name: string) => getRequiredVariable(codexVariables, name);
-  // The theme model still reports the platform material for compatibility with
-  // desktop settings, but the Claude shell paints an opaque canvas and panel.
-  // Vibrancy no longer supplies persistent-surface depth.
+  // On macOS the window is created over an "under-window" vibrancy material, so a
+  // non-opaque theme lets the shell tint that glass instead of painting over it.
   const material: WindowMaterial =
     options?.electron === true && options?.isMac === true && !pack.theme.opaqueWindows
       ? "translucent"
       : "opaque";
-  const warningColor = WARNING_COLOR_BY_VARIANT[variant];
-  const isDefaultTheme = haveSameChromePalette(
-    pack.theme,
-    DEFAULT_CHROME_THEME_BY_VARIANT[variant],
-  );
+  const isDefaultDarkTheme = haveSameChromePalette(pack.theme, DEFAULT_CHROME_THEME);
+  const isDefaultLightTheme = haveSameChromePalette(pack.theme, DEFAULT_LIGHT_CHROME_THEME);
+  const isDefaultTheme = isDefaultDarkTheme || isDefaultLightTheme;
   // The sidebar is the single persistent panel layer; the main transcript uses
   // the darker under-surface directly as its flat canvas.
   const sidebarSurface = readCodexVariable("--color-background-surface");
   const settingsSurface = readCodexVariable("--color-background-surface-under");
   const composerSurface = isDefaultTheme
-    ? COMPOSER_SURFACE_BY_VARIANT[variant]
-    : variant === "dark"
-      ? mixHex(pack.theme.surface, resolvedTokens.computed.surfaceUnder, 0.23)
-      : "color-mix(in oklab, var(--color-background-control) 90%, transparent)";
+    ? variant === "light"
+      ? LIGHT_COMPOSER_SURFACE
+      : COMPOSER_SURFACE
+    : mixHex(pack.theme.surface, resolvedTokens.computed.surfaceUnder, 0.23);
   const composerPickerMenuSurface = sidebarSurface;
   const composerFocusBorder = buildComposerFocusBorder(
     pack,
-    variant,
     resolvedTokens.computed.panel,
+    variant,
   );
   // Shared surface for the user message bubble and fenced code blocks so both
   // read as the same "input/source" affordance inside the transcript. Sourced
   // from the user-message token so code blocks pick up the bubble's color.
   const chatCodeSurface = isDefaultTheme
-    ? INPUT_SURFACE_BY_VARIANT[variant]
-    : mixHex(pack.theme.surface, pack.theme.ink, variant === "dark" ? 0.04 : 0.05);
+    ? variant === "light"
+      ? LIGHT_INPUT_SURFACE
+      : INPUT_SURFACE
+    : mixHex(pack.theme.surface, pack.theme.ink, 0.04);
   const appVariables: Record<string, string> = {
     "--accent": pack.theme.accent,
     "--accent-foreground": readCodexVariable("--color-text-foreground"),
@@ -851,13 +688,15 @@ export function buildThemeCssVariables(
     "--composer-surface": composerSurface,
     "--destructive": pack.theme.semanticColors.diffRemoved,
     "--destructive-foreground": isDefaultTheme
-      ? DESTRUCTIVE_FOREGROUND_BY_VARIANT[variant]
+      ? variant === "light"
+        ? pack.theme.semanticColors.diffRemoved
+        : DESTRUCTIVE_FOREGROUND
       : pack.theme.semanticColors.diffRemoved,
     "--foreground": readCodexVariable("--color-text-foreground"),
     "--faint": readCodexVariable("--color-text-foreground-tertiary"),
     "--hover": readCodexVariable("--color-background-button-secondary-hover"),
-    "--info": INFO_COLOR_BY_VARIANT[variant],
-    "--info-foreground": INFO_COLOR_BY_VARIANT[variant],
+    "--info": INFO_COLOR,
+    "--info-foreground": INFO_COLOR,
     "--input": readCodexVariable("--color-background-control-opaque"),
     "--muted": readCodexVariable("--color-background-elevated-secondary"),
     "--muted-foreground": readCodexVariable("--color-text-foreground-secondary"),
@@ -879,12 +718,14 @@ export function buildThemeCssVariables(
     "--sidebar-foreground": readCodexVariable("--color-text-foreground"),
     "--success": pack.theme.semanticColors.diffAdded,
     "--success-foreground": isDefaultTheme
-      ? SUCCESS_FOREGROUND_BY_VARIANT[variant]
+      ? variant === "light"
+        ? pack.theme.semanticColors.diffAdded
+        : SUCCESS_FOREGROUND
       : pack.theme.semanticColors.diffAdded,
     "--theme-font-code-family": normalizeMonospaceFontFamilyCssValue(pack.theme.fonts.code) ?? "",
     "--theme-font-ui-family": normalizeFontFamilyCssValue(pack.theme.fonts.ui) ?? "",
-    "--warning": warningColor,
-    "--warning-foreground": isDefaultTheme ? WARNING_FOREGROUND_BY_VARIANT[variant] : warningColor,
+    "--warning": WARNING_COLOR,
+    "--warning-foreground": isDefaultTheme ? WARNING_FOREGROUND : WARNING_COLOR,
     "--well": composerSurface,
   };
 
@@ -900,15 +741,12 @@ export function buildThemeCssVariables(
 
 export function buildResolvedThemeTokens(
   pack: ThemePack,
-  variant: ThemeVariant,
+  variant: ThemeVariant = "dark",
 ): ResolvedThemeTokens {
   const computedTheme = buildComputedTheme(pack.theme, variant);
-  const derived =
-    variant === "light"
-      ? buildLightDerivedTokens(computedTheme)
-      : buildDarkDerivedTokens(computedTheme);
+  const derived = buildDerivedTokens(computedTheme, variant);
   const panel = buildPanelBackground(computedTheme);
-  const codexVariables = buildCodexCssVariables(computedTheme, derived, panel);
+  const codexVariables = buildCodexCssVariables(computedTheme, derived, panel, variant);
 
   return {
     aliases: buildThemeTokenAliases(codexVariables),
@@ -923,36 +761,31 @@ export function buildResolvedThemeTokens(
   };
 }
 
-function buildComputedTheme(theme: ChromeTheme, variant: ThemeVariant) {
-  const contrast = normalizeContrastStrength(theme.contrast, variant);
+function buildComputedTheme(theme: ChromeTheme, variant: ThemeVariant = "dark") {
+  const contrast = normalizeContrastStrength(theme.contrast);
   const surface = parseHexColor(theme.surface);
   const ink = parseHexColor(theme.ink);
 
   return {
     accent: parseHexColor(theme.accent),
     contrast,
-    editorBackground:
-      variant === "light" ? mixRgb(surface, WHITE, 0.12) : mixRgb(surface, ink, 0.07),
+    editorBackground: variant === "light" ? mixRgb(surface, ink, 0.03) : mixRgb(surface, ink, 0.07),
     ink,
     surface,
-    surfaceUnder: buildSurfaceUnder(theme, surface, ink, variant),
+    surfaceUnder: buildSurfaceUnder(theme, surface, variant),
     theme,
-    variant,
   };
 }
 
 function buildCodexCssVariables(
   theme: ReturnType<typeof buildComputedTheme>,
-  derivedTokens:
-    | ReturnType<typeof buildLightDerivedTokens>
-    | ReturnType<typeof buildDarkDerivedTokens>,
+  derivedTokens: ReturnType<typeof buildDerivedTokens>,
   panelBackground: string,
+  variant: ThemeVariant = "dark",
 ) {
-  const isDefaultTheme = haveSameChromePalette(
-    theme.theme,
-    DEFAULT_CHROME_THEME_BY_VARIANT[theme.variant],
-  );
-  const terminalAnsi = TERMINAL_ANSI_BY_VARIANT[theme.variant];
+  const isDefaultDarkTheme = haveSameChromePalette(theme.theme, DEFAULT_CHROME_THEME);
+  const isDefaultLightTheme = haveSameChromePalette(theme.theme, DEFAULT_LIGHT_CHROME_THEME);
+  const isDefaultTheme = isDefaultDarkTheme || isDefaultLightTheme;
   const terminalAnsiGreen = buildTerminalAnsiGreen(theme.theme.semanticColors.diffAdded);
 
   return {
@@ -964,7 +797,7 @@ function buildCodexCssVariables(
     "--color-accent-green": theme.theme.semanticColors.diffAdded,
     "--color-accent-red": theme.theme.semanticColors.diffRemoved,
     "--color-accent-purple": theme.theme.semanticColors.skill,
-    "--color-accent-yellow": WARNING_COLOR_BY_VARIANT[theme.variant],
+    "--color-accent-yellow": WARNING_COLOR,
     "--color-background-accent": derivedTokens.accentBackground,
     "--color-background-accent-active": derivedTokens.accentBackgroundActive,
     "--color-background-accent-hover": derivedTokens.accentBackgroundHover,
@@ -998,13 +831,10 @@ function buildCodexCssVariables(
     "--color-border-light": derivedTokens.borderLight,
     "--color-decoration-added": theme.theme.semanticColors.diffAdded,
     "--color-decoration-deleted": theme.theme.semanticColors.diffRemoved,
-    "--color-editor-added": formatRgba(
-      parseHexColor(theme.theme.semanticColors.diffAdded),
-      theme.variant === "light" ? 0.15 : 0.23,
-    ),
+    "--color-editor-added": formatRgba(parseHexColor(theme.theme.semanticColors.diffAdded), 0.23),
     "--color-editor-deleted": formatRgba(
       parseHexColor(theme.theme.semanticColors.diffRemoved),
-      theme.variant === "light" ? 0.15 : 0.23,
+      0.23,
     ),
     "--color-icon-accent": derivedTokens.iconAccent,
     "--color-icon-primary": derivedTokens.iconPrimary,
@@ -1019,25 +849,25 @@ function buildCodexCssVariables(
     "--color-text-foreground-secondary": derivedTokens.textForegroundSecondary,
     "--color-text-foreground-tertiary": derivedTokens.textForegroundTertiary,
     "--vscode-terminal-ansiBlack": derivedTokens.textForegroundTertiary,
-    "--vscode-terminal-ansiBlue": isDefaultTheme ? terminalAnsi.blue : theme.theme.accent,
+    "--vscode-terminal-ansiBlue": isDefaultTheme ? TERMINAL_ANSI.blue : theme.theme.accent,
     "--vscode-terminal-ansiBrightBlack": derivedTokens.textForegroundSecondary,
-    "--vscode-terminal-ansiBrightBlue": isDefaultTheme ? terminalAnsi.blue : theme.theme.accent,
-    "--vscode-terminal-ansiBrightCyan": isDefaultTheme ? terminalAnsi.cyan : theme.theme.accent,
+    "--vscode-terminal-ansiBrightBlue": isDefaultTheme ? TERMINAL_ANSI.blue : theme.theme.accent,
+    "--vscode-terminal-ansiBrightCyan": isDefaultTheme ? TERMINAL_ANSI.cyan : theme.theme.accent,
     "--vscode-terminal-ansiBrightGreen": terminalAnsiGreen,
     "--vscode-terminal-ansiBrightMagenta": isDefaultTheme
-      ? terminalAnsi.magenta
+      ? TERMINAL_ANSI.magenta
       : theme.theme.semanticColors.skill,
     "--vscode-terminal-ansiBrightRed": theme.theme.semanticColors.diffRemoved,
     "--vscode-terminal-ansiBrightWhite": derivedTokens.textForeground,
-    "--vscode-terminal-ansiBrightYellow": WARNING_COLOR_BY_VARIANT[theme.variant],
-    "--vscode-terminal-ansiCyan": isDefaultTheme ? terminalAnsi.cyan : theme.theme.accent,
+    "--vscode-terminal-ansiBrightYellow": WARNING_COLOR,
+    "--vscode-terminal-ansiCyan": isDefaultTheme ? TERMINAL_ANSI.cyan : theme.theme.accent,
     "--vscode-terminal-ansiGreen": terminalAnsiGreen,
     "--vscode-terminal-ansiMagenta": isDefaultTheme
-      ? terminalAnsi.magenta
+      ? TERMINAL_ANSI.magenta
       : theme.theme.semanticColors.skill,
     "--vscode-terminal-ansiRed": theme.theme.semanticColors.diffRemoved,
     "--vscode-terminal-ansiWhite": derivedTokens.textForeground,
-    "--vscode-terminal-ansiYellow": WARNING_COLOR_BY_VARIANT[theme.variant],
+    "--vscode-terminal-ansiYellow": WARNING_COLOR,
     "--vscode-terminal-background": theme.theme.surface,
     "--vscode-terminal-border": derivedTokens.border,
     "--vscode-terminal-foreground": derivedTokens.textForeground,
@@ -1156,78 +986,15 @@ function getRequiredVariable(variables: Record<string, string>, name: string): s
   return value;
 }
 
-function buildLightDerivedTokens(theme: ReturnType<typeof buildComputedTheme>) {
-  // Retains the established light-theme derivation while the default seed supplies
-  // the neutral monochrome palette.
-  const isDefaultTheme = haveSameChromePalette(theme.theme, DEFAULT_CHROME_THEME_BY_VARIANT.light);
-  const quietInk = isDefaultTheme ? BLACK : theme.ink;
-  const controlBase = mixRgb(theme.surface, WHITE, 0.09 + theme.contrast * 0.04);
-  const elevatedSecondaryBase = mixRgb(theme.surface, WHITE, 0.08 + theme.contrast * 0.08);
-  const elevatedPrimaryBase = mixRgb(theme.surface, WHITE, 0.16 + theme.contrast * 0.12);
-
-  return {
-    accentBackground: mixHex(theme.theme.surface, theme.theme.accent, 0.11 + theme.contrast * 0.04),
-    accentBackgroundActive: mixHex(
-      theme.theme.surface,
-      theme.theme.accent,
-      0.13 + theme.contrast * 0.05,
-    ),
-    accentBackgroundHover: mixHex(
-      theme.theme.surface,
-      theme.theme.accent,
-      0.12 + theme.contrast * 0.045,
-    ),
-    // Light borders stay slightly stronger so structural panel edges remain legible
-    // on the warm canvas. Keep the bump small; don't exceed borderHeavy.
-    border: formatRgba(theme.ink, 0.09 + theme.contrast * 0.04),
-    borderFocus: theme.theme.accent,
-    borderHeavy: formatRgba(theme.ink, 0.09 + theme.contrast * 0.06),
-    borderLight: formatRgba(theme.ink, 0.07 + theme.contrast * 0.02),
-    buttonPrimaryBackground: theme.theme.ink,
-    buttonPrimaryBackgroundActive: formatRgba(theme.ink, 0.1 + theme.contrast * 0.12),
-    buttonPrimaryBackgroundHover: formatRgba(theme.ink, 0.05 + theme.contrast * 0.06),
-    buttonPrimaryBackgroundInactive: formatRgba(theme.ink, 0.18 + theme.contrast * 0.14),
-    buttonSecondaryBackground: formatRgba(quietInk, 0.04),
-    buttonSecondaryBackgroundActive: formatRgba(quietInk, 0.03 + theme.contrast * 0.02),
-    buttonSecondaryBackgroundHover: formatRgba(quietInk, 0.032 + theme.contrast * 0.012),
-    buttonSecondaryBackgroundInactive: formatRgba(quietInk, 0.01 + theme.contrast * 0.02),
-    buttonTertiaryBackground: formatRgba(quietInk, 0),
-    buttonTertiaryBackgroundActive: formatRgba(quietInk, 0.16 + theme.contrast * 0.08),
-    buttonTertiaryBackgroundHover: formatRgba(quietInk, 0.08 + theme.contrast * 0.04),
-    controlBackground: formatRgba(controlBase, 0.96),
-    controlBackgroundOpaque: formatOpaqueRgb(controlBase),
-    elevatedPrimary: formatRgba(elevatedPrimaryBase, 0.96),
-    elevatedPrimaryOpaque: formatOpaqueRgb(elevatedPrimaryBase),
-    elevatedSecondary: formatRgba(theme.ink, 0.04),
-    elevatedSecondaryOpaque: formatOpaqueRgb(elevatedSecondaryBase),
-    iconAccent: theme.theme.accent,
-    iconPrimary: theme.theme.ink,
-    iconSecondary: isDefaultTheme
-      ? MUTED_COLOR_BY_VARIANT.light
-      : formatRgba(theme.ink, 0.65 + theme.contrast * 0.1),
-    iconTertiary: isDefaultTheme
-      ? FAINT_COLOR_BY_VARIANT.light
-      : formatRgba(theme.ink, 0.45 + theme.contrast * 0.1),
-    simpleScrim: formatRgba(BLACK, 0.08 + theme.contrast * 0.04),
-    textAccent: theme.theme.accent,
-    textButtonPrimary: theme.theme.surface,
-    textButtonSecondary: theme.theme.ink,
-    textButtonTertiary: isDefaultTheme
-      ? FAINT_COLOR_BY_VARIANT.light
-      : formatRgba(theme.ink, 0.45 + theme.contrast * 0.1),
-    textForeground: theme.theme.ink,
-    textForegroundSecondary: isDefaultTheme
-      ? MUTED_COLOR_BY_VARIANT.light
-      : formatRgba(theme.ink, 0.65 + theme.contrast * 0.1),
-    textForegroundTertiary: isDefaultTheme
-      ? FAINT_COLOR_BY_VARIANT.light
-      : formatRgba(theme.ink, 0.45 + theme.contrast * 0.1),
-  };
-}
-
-function buildDarkDerivedTokens(theme: ReturnType<typeof buildComputedTheme>) {
+function buildDerivedTokens(
+  theme: ReturnType<typeof buildComputedTheme>,
+  variant: ThemeVariant = "dark",
+) {
+  if (variant === "light") {
+    return buildLightDerivedTokens(theme);
+  }
   // Dark chrome uses one restrained panel layer over a flat canvas.
-  const isDefaultTheme = haveSameChromePalette(theme.theme, DEFAULT_CHROME_THEME_BY_VARIANT.dark);
+  const isDefaultTheme = haveSameChromePalette(theme.theme, DEFAULT_CHROME_THEME);
   const quietInk = isDefaultTheme ? WHITE : theme.ink;
   const controlBase = mixRgb(theme.surface, theme.ink, 0.06 + theme.contrast * 0.05);
   const elevatedPrimaryBase = mixRgb(theme.surface, theme.ink, 0.08 + theme.contrast * 0.08);
@@ -1265,66 +1032,120 @@ function buildDarkDerivedTokens(theme: ReturnType<typeof buildComputedTheme>) {
     ),
     iconAccent: theme.theme.accent,
     iconPrimary: formatRgba(theme.ink, 0.82 + theme.contrast * 0.14),
-    iconSecondary: isDefaultTheme ? MUTED_COLOR_BY_VARIANT.dark : formatRgba(theme.ink, 0.66),
-    iconTertiary: isDefaultTheme ? FAINT_COLOR_BY_VARIANT.dark : formatRgba(theme.ink, 0.44),
+    iconSecondary: isDefaultTheme ? MUTED_COLOR : formatRgba(theme.ink, 0.66),
+    iconTertiary: isDefaultTheme ? FAINT_COLOR : formatRgba(theme.ink, 0.44),
     simpleScrim: formatRgba(theme.ink, 0.08 + theme.contrast * 0.04),
     textAccent: theme.theme.accent,
     textButtonPrimary: theme.theme.surface,
     textButtonSecondary: mixHex(theme.theme.ink, theme.theme.surface, 0.7 + theme.contrast * 0.1),
     textButtonTertiary: isDefaultTheme
-      ? FAINT_COLOR_BY_VARIANT.dark
+      ? FAINT_COLOR
       : formatRgba(theme.ink, 0.45 + theme.contrast * 0.1),
     textForeground: theme.theme.ink,
-    textForegroundSecondary: isDefaultTheme
-      ? MUTED_COLOR_BY_VARIANT.dark
-      : formatRgba(theme.ink, 0.66),
-    textForegroundTertiary: isDefaultTheme
-      ? FAINT_COLOR_BY_VARIANT.dark
-      : formatRgba(theme.ink, 0.44),
+    textForegroundSecondary: isDefaultTheme ? MUTED_COLOR : formatRgba(theme.ink, 0.66),
+    textForegroundTertiary: isDefaultTheme ? FAINT_COLOR : formatRgba(theme.ink, 0.44),
+  };
+}
+
+function buildLightDerivedTokens(theme: ReturnType<typeof buildComputedTheme>): ThemeDerivedTokens {
+  const isDefaultTheme = haveSameChromePalette(theme.theme, DEFAULT_LIGHT_CHROME_THEME);
+  const darkInk = isDefaultTheme ? parseHexColor("#575757") : theme.ink;
+  const surface = theme.surface;
+  const BLACK = { blue: 0, green: 0, red: 0 };
+  const controlBase = mixRgb(surface, theme.ink, 0.04 + theme.contrast * 0.03);
+  const elevatedPrimaryBase = mixRgb(surface, theme.ink, 0.06 + theme.contrast * 0.06);
+
+  return {
+    accentBackground: mixHex("#ffffff", theme.theme.accent, 0.12 + theme.contrast * 0.06),
+    accentBackgroundActive: mixHex("#ffffff", theme.theme.accent, 0.14 + theme.contrast * 0.08),
+    accentBackgroundHover: mixHex("#ffffff", theme.theme.accent, 0.13 + theme.contrast * 0.07),
+    border: formatRgba(BLACK, 0.08 + theme.contrast / 40),
+    borderFocus: theme.theme.accent,
+    borderHeavy: formatRgba(BLACK, 0.12 + theme.contrast * 0.04),
+    borderLight: formatRgba(BLACK, 0.05 + theme.contrast * 0.02),
+    buttonPrimaryBackground: theme.theme.ink,
+    buttonPrimaryBackgroundActive: formatRgba(theme.ink, 0.12 + theme.contrast * 0.06),
+    buttonPrimaryBackgroundHover: formatRgba(theme.ink, 0.08 + theme.contrast * 0.04),
+    buttonPrimaryBackgroundInactive: formatRgba(theme.ink, 0.04 + theme.contrast * 0.03),
+    buttonSecondaryBackground: formatRgba(darkInk, 0.05),
+    buttonSecondaryBackgroundActive: formatRgba(darkInk, 0.1),
+    buttonSecondaryBackgroundHover: formatRgba(darkInk, 0.07),
+    buttonSecondaryBackgroundInactive: formatRgba(darkInk, 0.03 + theme.contrast * 0.02),
+    buttonTertiaryBackground: formatRgba(darkInk, 0.03 + theme.contrast * 0.01),
+    buttonTertiaryBackgroundActive: formatRgba(darkInk, 0.09 + theme.contrast * 0.04),
+    buttonTertiaryBackgroundHover: formatRgba(darkInk, 0.06 + theme.contrast * 0.03),
+    controlBackground: formatOpaqueRgb(controlBase),
+    controlBackgroundOpaque: formatOpaqueRgb(controlBase),
+    elevatedPrimary: formatOpaqueRgb(elevatedPrimaryBase),
+    elevatedPrimaryOpaque: formatOpaqueRgb(elevatedPrimaryBase),
+    elevatedSecondary: formatRgba(darkInk, 0.03 + theme.contrast * 0.02),
+    elevatedSecondaryOpaque: mixHex(
+      theme.theme.surface,
+      theme.theme.ink,
+      0.05 + theme.contrast * 0.04,
+    ),
+    iconAccent: theme.theme.accent,
+    iconPrimary: formatRgba(theme.ink, 0.88 + theme.contrast * 0.1),
+    iconSecondary: isDefaultTheme ? "#9B9B96" : formatRgba(theme.ink, 0.6),
+    iconTertiary: isDefaultTheme ? "#ACACA6" : formatRgba(theme.ink, 0.4),
+    simpleScrim: formatRgba(theme.ink, 0.05 + theme.contrast * 0.03),
+    textAccent: theme.theme.accent,
+    textButtonPrimary: theme.theme.surface,
+    textButtonSecondary: mixHex(theme.theme.ink, theme.theme.surface, 0.65 + theme.contrast * 0.1),
+    textButtonTertiary: isDefaultTheme
+      ? "#757272"
+      : formatRgba(theme.ink, 0.5 + theme.contrast * 0.1),
+    textForeground: theme.theme.ink,
+    textForegroundSecondary: isDefaultTheme ? "#6B6B69" : formatRgba(theme.ink, 0.6),
+    textForegroundTertiary: isDefaultTheme ? "#757272" : formatRgba(theme.ink, 0.42),
   };
 }
 
 function buildSurfaceUnder(
   theme: ChromeTheme,
   surface: RgbColor,
-  ink: RgbColor,
-  variant: ThemeVariant,
+  variant: ThemeVariant = "dark",
 ): string {
-  if (haveSameChromePalette(theme, DEFAULT_CHROME_THEME_BY_VARIANT[variant])) {
-    return CANVAS_COLOR_BY_VARIANT[variant];
+  if (variant === "light") {
+    if (haveSameChromePalette(theme, DEFAULT_LIGHT_CHROME_THEME)) {
+      return LIGHT_CANVAS_COLOR;
+    }
+    const baseline = DEFAULT_LIGHT_CHROME_THEME.contrast;
+    const mixAmount =
+      SURFACE_UNDER_BASE_ALPHA + (theme.contrast - baseline) * SURFACE_UNDER_CONTRAST_STEP;
+    return mixHex(formatHex(surface), "#ffffff", mixAmount);
   }
-  const baseline = DEFAULT_CHROME_THEME_BY_VARIANT[variant].contrast;
+  if (haveSameChromePalette(theme, DEFAULT_CHROME_THEME)) {
+    return CANVAS_COLOR;
+  }
+  const baseline = DEFAULT_CHROME_THEME.contrast;
   const mixAmount =
-    SURFACE_UNDER_BASE_ALPHA[variant] +
-    (theme.contrast - baseline) * SURFACE_UNDER_CONTRAST_STEP[variant];
-  return variant === "light"
-    ? mixHex(formatHex(surface), formatHex(ink), mixAmount)
-    : mixHex(formatHex(surface), "#000000", mixAmount);
+    SURFACE_UNDER_BASE_ALPHA + (theme.contrast - baseline) * SURFACE_UNDER_CONTRAST_STEP;
+  return mixHex(formatHex(surface), "#000000", mixAmount);
 }
 
 function buildPanelBackground(theme: ReturnType<typeof buildComputedTheme>): string {
-  const anchor = theme.variant === "light" ? WHITE : theme.ink;
-  return mixHex(
-    theme.theme.surface,
-    formatHex(anchor),
-    PANEL_BASE_ALPHA[theme.variant] + theme.contrast * PANEL_CONTRAST_STEP[theme.variant],
-  );
+  // The dark panel is a single flat layer sourced directly from the theme
+  // surface; it does not shift with contrast.
+  return theme.theme.surface;
 }
 
 function buildComposerFocusBorder(
   pack: ThemePack,
-  variant: ThemeVariant,
   panelBackground: string,
+  variant: ThemeVariant = "dark",
 ): string {
   const panel = parseHexColor(panelBackground);
-  const anchor = variant === "dark" ? WHITE : parseHexColor(pack.theme.ink);
-  const contrast = normalizeContrastStrength(pack.theme.contrast, variant);
-  const mixAmount = variant === "dark" ? 0.12 + contrast * 0.06 : 0.1 + contrast * 0.05;
-  return mixHex(formatHex(panel), formatHex(anchor), mixAmount);
+  const contrast = normalizeContrastStrength(pack.theme.contrast);
+  const mixAmount = 0.12 + contrast * 0.06;
+  // Lift away from the surface: toward white on dark chrome, toward black on
+  // light chrome — a white mix over a light panel would be invisible.
+  const lift = variant === "light" ? "#000000" : formatHex(WHITE);
+  return mixHex(formatHex(panel), lift, mixAmount);
 }
 
-function normalizeContrastStrength(value: number, variant: ThemeVariant): number {
-  const baseline = DEFAULT_CHROME_THEME_BY_VARIANT[variant].contrast;
+function normalizeContrastStrength(value: number): number {
+  const baseline = DEFAULT_CHROME_THEME.contrast;
   const baselineRatio = baseline / 100;
   const curvedValue = value / 100 + ((value - baseline) / 60) * CONTRAST_CURVE_BELOW_BASELINE;
 
@@ -1343,16 +1164,20 @@ function parseThemeSharePayload(value: unknown): ThemeSharePayload {
   }
 
   const codeThemeId = normalizeRequiredString(value.codeThemeId, "Theme share codeThemeId");
+  // Legacy payloads carried a `variant` field. Tolerate it if it says "dark";
+  // a payload saved from light mode can no longer be imported.
   const variant = value.variant;
-  if (!isThemeVariant(variant)) {
-    throw new Error("Theme share variant must be either light or dark.");
+  if (variant === "light") {
+    throw new Error("This theme was saved from light mode, which TeaCode no longer supports.");
+  }
+  if (variant !== undefined && variant !== "dark") {
+    throw new Error("Theme share variant must be dark.");
   }
 
   const theme = parseStrictChromeTheme(value.theme);
   return {
     codeThemeId: codeThemeId.toLowerCase(),
     theme,
-    variant,
   };
 }
 
diff --git a/apps/web/src/theme/theme.seed.generated.ts b/apps/web/src/theme/theme.seed.generated.ts
index a35781b24..99b83d36f 100644
--- a/apps/web/src/theme/theme.seed.generated.ts
+++ b/apps/web/src/theme/theme.seed.generated.ts
@@ -2,752 +2,442 @@
 // Purpose: Stores the exact normalized theme seeds extracted from the packaged Codex theme assets.
 // Layer: Web appearance generated catalog
 // Exports: THEME_SEED_CATALOG for code-theme seed lookup.
+// Note: This catalog is dark-only. It has no checked-in generator; it was hand-reduced from the
+// original per-variant catalog by dropping every `light` seed and flattening the `dark` seed.
 
-import type { ChromeTheme, ThemeVariant } from "./theme.logic";
+import type { ChromeTheme } from "./theme.logic";
 
-export const THEME_SEED_CATALOG: Record<string, Partial<Record<ThemeVariant, ChromeTheme>>> = {
+export const THEME_SEED_CATALOG: Record<string, ChromeTheme> = {
   absolutely: {
-    dark: {
-      accent: "#cc7d5e",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#f9f9f7",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#00c853",
-        diffRemoved: "#ff5f38",
-        skill: "#cc7d5e",
-      },
-      surface: "#2d2d2b",
-    },
-    light: {
-      accent: "#cc7d5e",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#2d2d2b",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#00c853",
-        diffRemoved: "#ff5f38",
-        skill: "#cc7d5e",
-      },
-      surface: "#f9f9f7",
-    },
+    accent: "#cc7d5e",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#f9f9f7",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#00c853",
+      diffRemoved: "#ff5f38",
+      skill: "#cc7d5e",
+    },
+    surface: "#2d2d2b",
   },
   ayu: {
-    dark: {
-      accent: "#e6b450",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#bfbdb6",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#7fd962",
-        diffRemoved: "#ea6c73",
-        skill: "#cda1fa",
-      },
-      surface: "#0b0e14",
-    },
+    accent: "#e6b450",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#bfbdb6",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#7fd962",
+      diffRemoved: "#ea6c73",
+      skill: "#cda1fa",
+    },
+    surface: "#0b0e14",
   },
   catppuccin: {
-    dark: {
-      accent: "#cba6f7",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#cdd6f4",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#a6e3a1",
-        diffRemoved: "#f38ba8",
-        skill: "#cba6f7",
-      },
-      surface: "#1e1e2e",
-    },
-    light: {
-      accent: "#8839ef",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#4c4f69",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#40a02b",
-        diffRemoved: "#d20f39",
-        skill: "#8839ef",
-      },
-      surface: "#eff1f5",
-    },
+    accent: "#cba6f7",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#cdd6f4",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#a6e3a1",
+      diffRemoved: "#f38ba8",
+      skill: "#cba6f7",
+    },
+    surface: "#1e1e2e",
   },
   codex: {
-    dark: {
-      accent: "#0169cc",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#fcfcfc",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#00a240",
-        diffRemoved: "#e02e2a",
-        skill: "#b06dff",
-      },
-      surface: "#111111",
-    },
-    light: {
-      accent: "#0169cc",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#0d0d0d",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#00a240",
-        diffRemoved: "#e02e2a",
-        skill: "#751ed9",
-      },
-      surface: "#ffffff",
-    },
+    accent: "#0169cc",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#fcfcfc",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#00a240",
+      diffRemoved: "#e02e2a",
+      skill: "#b06dff",
+    },
+    surface: "#111111",
   },
   "dp-code": {
-    dark: {
-      accent: "#6073cc",
-      contrast: 75,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#f5f5f5",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#40c977",
-        diffRemoved: "#fa423e",
-        skill: "#ad7bf9",
-      },
-      surface: "#0e0e0e",
-    },
-    light: {
-      accent: "#526fff",
-      contrast: 65,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#262626",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#00a240",
-        diffRemoved: "#ba2623",
-        skill: "#924ff7",
-      },
-      surface: "#fcfcfc",
-    },
+    accent: "#6073cc",
+    contrast: 75,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#f5f5f5",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#40c977",
+      diffRemoved: "#fa423e",
+      skill: "#ad7bf9",
+    },
+    surface: "#0e0e0e",
   },
   dracula: {
-    dark: {
-      accent: "#ff79c6",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#f8f8f2",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#50fa7b",
-        diffRemoved: "#ff5555",
-        skill: "#ff79c6",
-      },
-      surface: "#282a36",
-    },
+    accent: "#ff79c6",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#f8f8f2",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#50fa7b",
+      diffRemoved: "#ff5555",
+      skill: "#ff79c6",
+    },
+    surface: "#282a36",
   },
   everforest: {
-    dark: {
-      accent: "#a7c080",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#d3c6aa",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#a7c080",
-        diffRemoved: "#e67e80",
-        skill: "#d699b6",
-      },
-      surface: "#2d353b",
-    },
-    light: {
-      accent: "#93b259",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#5c6a72",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#8da101",
-        diffRemoved: "#f85552",
-        skill: "#df69ba",
-      },
-      surface: "#fdf6e3",
-    },
+    accent: "#a7c080",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#d3c6aa",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#a7c080",
+      diffRemoved: "#e67e80",
+      skill: "#d699b6",
+    },
+    surface: "#2d353b",
   },
   github: {
-    dark: {
-      accent: "#1f6feb",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#e6edf3",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#3fb950",
-        diffRemoved: "#f85149",
-        skill: "#bc8cff",
-      },
-      surface: "#0d1117",
-    },
-    light: {
-      accent: "#0969da",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#1f2328",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#1a7f37",
-        diffRemoved: "#cf222e",
-        skill: "#8250df",
-      },
-      surface: "#ffffff",
-    },
+    accent: "#1f6feb",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#e6edf3",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#3fb950",
+      diffRemoved: "#f85149",
+      skill: "#bc8cff",
+    },
+    surface: "#0d1117",
   },
   gruvbox: {
-    dark: {
-      accent: "#458588",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#ebdbb2",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#ebdbb2",
-        diffRemoved: "#cc241d",
-        skill: "#b16286",
-      },
-      surface: "#282828",
-    },
-    light: {
-      accent: "#458588",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#3c3836",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#3c3836",
-        diffRemoved: "#cc241d",
-        skill: "#b16286",
-      },
-      surface: "#fbf1c7",
-    },
+    accent: "#458588",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#ebdbb2",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#ebdbb2",
+      diffRemoved: "#cc241d",
+      skill: "#b16286",
+    },
+    surface: "#282828",
   },
   linear: {
-    dark: {
-      accent: "#606acc",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: "Inter",
-      },
-      ink: "#e3e4e6",
-      opaqueWindows: true,
-      semanticColors: {
-        diffAdded: "#69c967",
-        diffRemoved: "#ff7e78",
-        skill: "#c2a1ff",
-      },
-      surface: "#0f0f11",
-    },
-    light: {
-      accent: "#5e6ad2",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: "Inter",
-      },
-      ink: "#1b1b1b",
-      opaqueWindows: true,
-      semanticColors: {
-        diffAdded: "#52a450",
-        diffRemoved: "#c94446",
-        skill: "#8160d8",
-      },
-      surface: "#fcfcfd",
-    },
+    accent: "#606acc",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: "Inter",
+    },
+    ink: "#e3e4e6",
+    opaqueWindows: true,
+    semanticColors: {
+      diffAdded: "#69c967",
+      diffRemoved: "#ff7e78",
+      skill: "#c2a1ff",
+    },
+    surface: "#0f0f11",
   },
   lobster: {
-    dark: {
-      accent: "#ff5c5c",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: "Satoshi",
-      },
-      ink: "#e4e4e7",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#22c55e",
-        diffRemoved: "#ff5c5c",
-        skill: "#3b82f6",
-      },
-      surface: "#111827",
-    },
+    accent: "#ff5c5c",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: "Satoshi",
+    },
+    ink: "#e4e4e7",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#22c55e",
+      diffRemoved: "#ff5c5c",
+      skill: "#3b82f6",
+    },
+    surface: "#111827",
   },
   material: {
-    dark: {
-      accent: "#80cbc4",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#eeffff",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#c3e88d",
-        diffRemoved: "#f07178",
-        skill: "#c792ea",
-      },
-      surface: "#212121",
-    },
+    accent: "#80cbc4",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#eeffff",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#c3e88d",
+      diffRemoved: "#f07178",
+      skill: "#c792ea",
+    },
+    surface: "#212121",
   },
   matrix: {
-    dark: {
-      accent: "#1eff5a",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: 'ui-monospace, "SFMono-Regular", "SF Mono", Menlo, Consolas, "Liberation Mono", monospace',
-      },
-      ink: "#b8ffca",
-      opaqueWindows: true,
-      semanticColors: {
-        diffAdded: "#1eff5a",
-        diffRemoved: "#fa423e",
-        skill: "#1eff5a",
-      },
-      surface: "#040805",
-    },
+    accent: "#1eff5a",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: 'ui-monospace, "SFMono-Regular", "SF Mono", Menlo, Consolas, "Liberation Mono", monospace',
+    },
+    ink: "#b8ffca",
+    opaqueWindows: true,
+    semanticColors: {
+      diffAdded: "#1eff5a",
+      diffRemoved: "#fa423e",
+      skill: "#1eff5a",
+    },
+    surface: "#040805",
   },
   monokai: {
-    dark: {
-      accent: "#99947c",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#f8f8f2",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#86b42b",
-        diffRemoved: "#c4265e",
-        skill: "#8c6bc8",
-      },
-      surface: "#272822",
-    },
+    accent: "#99947c",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#f8f8f2",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#86b42b",
+      diffRemoved: "#c4265e",
+      skill: "#8c6bc8",
+    },
+    surface: "#272822",
   },
   "night-owl": {
-    dark: {
-      accent: "#44596b",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#d6deeb",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#c5e478",
-        diffRemoved: "#ef5350",
-        skill: "#c792ea",
-      },
-      surface: "#011627",
-    },
+    accent: "#44596b",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#d6deeb",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#c5e478",
+      diffRemoved: "#ef5350",
+      skill: "#c792ea",
+    },
+    surface: "#011627",
   },
   nord: {
-    dark: {
-      accent: "#88c0d0",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#d8dee9",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#a3be8c",
-        diffRemoved: "#bf616a",
-        skill: "#b48ead",
-      },
-      surface: "#2e3440",
-    },
+    accent: "#88c0d0",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#d8dee9",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#a3be8c",
+      diffRemoved: "#bf616a",
+      skill: "#b48ead",
+    },
+    surface: "#2e3440",
   },
   notion: {
-    dark: {
-      accent: "#3183d8",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#d9d9d8",
-      opaqueWindows: true,
-      semanticColors: {
-        diffAdded: "#4ec9b0",
-        diffRemoved: "#fa423e",
-        skill: "#3183d8",
-      },
-      surface: "#191919",
-    },
-    light: {
-      accent: "#3183d8",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#37352f",
-      opaqueWindows: true,
-      semanticColors: {
-        diffAdded: "#008000",
-        diffRemoved: "#a31515",
-        skill: "#0000ff",
-      },
-      surface: "#ffffff",
-    },
+    accent: "#3183d8",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#d9d9d8",
+    opaqueWindows: true,
+    semanticColors: {
+      diffAdded: "#4ec9b0",
+      diffRemoved: "#fa423e",
+      skill: "#3183d8",
+    },
+    surface: "#191919",
   },
   one: {
-    dark: {
-      accent: "#4d78cc",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#abb2bf",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#8cc265",
-        diffRemoved: "#e05561",
-        skill: "#c162de",
-      },
-      surface: "#282c34",
-    },
-    light: {
-      accent: "#526fff",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#383a42",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#3bba54",
-        diffRemoved: "#e45649",
-        skill: "#526fff",
-      },
-      surface: "#fafafa",
-    },
+    accent: "#4d78cc",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#abb2bf",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#8cc265",
+      diffRemoved: "#e05561",
+      skill: "#c162de",
+    },
+    surface: "#282c34",
   },
   oscurange: {
-    dark: {
-      accent: "#f9b98c",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#e6e6e6",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#40c977",
-        diffRemoved: "#fa423e",
-        skill: "#479ffa",
-      },
-      surface: "#0b0b0f",
-    },
-  },
-  proof: {
-    light: {
-      accent: "#3d755d",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#2f312d",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#3d755d",
-        diffRemoved: "#ba2623",
-        skill: "#5f6ac2",
-      },
-      surface: "#f5f3ed",
-    },
+    accent: "#f9b98c",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#e6e6e6",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#40c977",
+      diffRemoved: "#fa423e",
+      skill: "#479ffa",
+    },
+    surface: "#0b0b0f",
   },
   raycast: {
-    dark: {
-      accent: "#ff6363",
-      contrast: 60,
-      fonts: {
-        code: '"Jetbrains Mono"',
-        ui: "Inter",
-      },
-      ink: "#fefefe",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#59d499",
-        diffRemoved: "#ff6363",
-        skill: "#cf2f98",
-      },
-      surface: "#101010",
-    },
-    light: {
-      accent: "#ff6363",
-      contrast: 45,
-      fonts: {
-        code: '"Jetbrains Mono"',
-        ui: "Inter",
-      },
-      ink: "#030303",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#006b4f",
-        diffRemoved: "#b12424",
-        skill: "#9a1b6e",
-      },
-      surface: "#ffffff",
-    },
+    accent: "#ff6363",
+    contrast: 60,
+    fonts: {
+      code: '"Jetbrains Mono"',
+      ui: "Inter",
+    },
+    ink: "#fefefe",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#59d499",
+      diffRemoved: "#ff6363",
+      skill: "#cf2f98",
+    },
+    surface: "#101010",
   },
   "rose-pine": {
-    dark: {
-      accent: "#ea9a97",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#e0def4",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#9ccfd8",
-        diffRemoved: "#908caa",
-        skill: "#c4a7e7",
-      },
-      surface: "#232136",
-    },
-    light: {
-      accent: "#d7827e",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#575279",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#56949f",
-        diffRemoved: "#797593",
-        skill: "#907aa9",
-      },
-      surface: "#faf4ed",
-    },
+    accent: "#ea9a97",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#e0def4",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#9ccfd8",
+      diffRemoved: "#908caa",
+      skill: "#c4a7e7",
+    },
+    surface: "#232136",
   },
   sentry: {
-    dark: {
-      accent: "#7055f6",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#e6dff9",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#8ee6d7",
-        diffRemoved: "#fa423e",
-        skill: "#7055f6",
-      },
-      surface: "#2d2935",
-    },
+    accent: "#7055f6",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#e6dff9",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#8ee6d7",
+      diffRemoved: "#fa423e",
+      skill: "#7055f6",
+    },
+    surface: "#2d2935",
   },
   solarized: {
-    dark: {
-      accent: "#d30102",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#839496",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#859900",
-        diffRemoved: "#dc322f",
-        skill: "#d33682",
-      },
-      surface: "#002b36",
-    },
-    light: {
-      accent: "#b58900",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#657b83",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#859900",
-        diffRemoved: "#dc322f",
-        skill: "#d33682",
-      },
-      surface: "#fdf6e3",
-    },
+    accent: "#d30102",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#839496",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#859900",
+      diffRemoved: "#dc322f",
+      skill: "#d33682",
+    },
+    surface: "#002b36",
   },
   temple: {
-    dark: {
-      accent: "#e4f222",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#c7e6da",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#40c977",
-        diffRemoved: "#fa423e",
-        skill: "#e4f222",
-      },
-      surface: "#02120c",
-    },
+    accent: "#e4f222",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#c7e6da",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#40c977",
+      diffRemoved: "#fa423e",
+      skill: "#e4f222",
+    },
+    surface: "#02120c",
   },
   "tokyo-night": {
-    dark: {
-      accent: "#3d59a1",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#a9b1d6",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#449dab",
-        diffRemoved: "#914c54",
-        skill: "#9d7cd8",
-      },
-      surface: "#1a1b26",
-    },
+    accent: "#3d59a1",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#a9b1d6",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#449dab",
+      diffRemoved: "#914c54",
+      skill: "#9d7cd8",
+    },
+    surface: "#1a1b26",
   },
   vercel: {
-    dark: {
-      accent: "#006efe",
-      contrast: 50,
-      fonts: {
-        code: '"Geist Mono", ui-monospace, "SFMono-Regular"',
-        ui: "Geist, Inter",
-      },
-      ink: "#ededed",
-      opaqueWindows: true,
-      semanticColors: {
-        diffAdded: "#00ad3a",
-        diffRemoved: "#f13342",
-        skill: "#9540d5",
-      },
-      surface: "#000000",
-    },
-    light: {
-      accent: "#006aff",
-      contrast: 40,
-      fonts: {
-        code: '"Geist Mono", ui-monospace, "SFMono-Regular"',
-        ui: "Geist, Inter",
-      },
-      ink: "#171717",
-      opaqueWindows: true,
-      semanticColors: {
-        diffAdded: "#28a948",
-        diffRemoved: "#eb001d",
-        skill: "#a100f8",
-      },
-      surface: "#ffffff",
-    },
+    accent: "#006efe",
+    contrast: 50,
+    fonts: {
+      code: '"Geist Mono", ui-monospace, "SFMono-Regular"',
+      ui: "Geist, Inter",
+    },
+    ink: "#ededed",
+    opaqueWindows: true,
+    semanticColors: {
+      diffAdded: "#00ad3a",
+      diffRemoved: "#f13342",
+      skill: "#9540d5",
+    },
+    surface: "#000000",
   },
   "vscode-plus": {
-    dark: {
-      accent: "#007acc",
-      contrast: 60,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#d4d4d4",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#369432",
-        diffRemoved: "#f44747",
-        skill: "#000080",
-      },
-      surface: "#1e1e1e",
-    },
-    light: {
-      accent: "#007acc",
-      contrast: 45,
-      fonts: {
-        code: null,
-        ui: null,
-      },
-      ink: "#000000",
-      opaqueWindows: false,
-      semanticColors: {
-        diffAdded: "#008000",
-        diffRemoved: "#ee0000",
-        skill: "#0000ff",
-      },
-      surface: "#ffffff",
-    },
+    accent: "#007acc",
+    contrast: 60,
+    fonts: {
+      code: null,
+      ui: null,
+    },
+    ink: "#d4d4d4",
+    opaqueWindows: false,
+    semanticColors: {
+      diffAdded: "#369432",
+      diffRemoved: "#f44747",
+      skill: "#000080",
+    },
+    surface: "#1e1e1e",
   },
 } as const;
diff --git a/apps/web/src/workspaceTerminalLayoutPresets.ts b/apps/web/src/workspaceTerminalLayoutPresets.ts
deleted file mode 100644
index cb4df424b..000000000
--- a/apps/web/src/workspaceTerminalLayoutPresets.ts
+++ /dev/null
@@ -1,231 +0,0 @@
-// FILE: workspaceTerminalLayoutPresets.ts
-// Purpose: Define reusable workspace terminal layout presets and map them to pane trees.
-// Layer: Workspace terminal domain helpers
-
-import {
-  DEFAULT_THREAD_TERMINAL_ID,
-  type ThreadTerminalGroup,
-  type ThreadTerminalLayoutNode,
-} from "./types";
-
-export type WorkspaceLayoutPresetId =
-  | "single"
-  | "two-columns"
-  | "two-rows"
-  | "top-main"
-  | "left-main"
-  | "quad";
-
-export interface WorkspaceLayoutPresetDefinition {
-  id: WorkspaceLayoutPresetId;
-  title: string;
-  description: string;
-  slotCount: number;
-}
-
-export const DEFAULT_WORKSPACE_LAYOUT_PRESET_ID: WorkspaceLayoutPresetId = "single";
-
-export const WORKSPACE_LAYOUT_PRESETS: readonly WorkspaceLayoutPresetDefinition[] = [
-  {
-    id: "single",
-    title: "Single",
-    description: "One focused terminal.",
-    slotCount: 1,
-  },
-  {
-    id: "two-columns",
-    title: "Two Columns",
-    description: "Two terminals side by side.",
-    slotCount: 2,
-  },
-  {
-    id: "two-rows",
-    title: "Two Rows",
-    description: "Two terminals stacked vertically.",
-    slotCount: 2,
-  },
-  {
-    id: "top-main",
-    title: "Top + Bottom",
-    description: "One large terminal above two smaller panes.",
-    slotCount: 3,
-  },
-  {
-    id: "left-main",
-    title: "Left + Stack",
-    description: "One large pane on the left and two stacked on the right.",
-    slotCount: 3,
-  },
-  {
-    id: "quad",
-    title: "Quad",
-    description: "Four equally visible terminals.",
-    slotCount: 4,
-  },
-] as const;
-
-function normalizeTerminalIds(terminalIds: readonly string[]): string[] {
-  const ids = [...new Set(terminalIds.map((terminalId) => terminalId.trim()).filter(Boolean))];
-  return ids.length > 0 ? ids : [DEFAULT_THREAD_TERMINAL_ID];
-}
-
-function createTerminalLeaf(
-  terminalIds: readonly string[],
-  paneId: string,
-  activeTerminalId: string,
-): ThreadTerminalLayoutNode {
-  const normalizedTerminalIds = normalizeTerminalIds(terminalIds);
-  const resolvedActiveTerminalId = normalizedTerminalIds.includes(activeTerminalId)
-    ? activeTerminalId
-    : (normalizedTerminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID);
-  return {
-    type: "terminal",
-    paneId,
-    terminalIds: normalizedTerminalIds,
-    activeTerminalId: resolvedActiveTerminalId,
-  };
-}
-
-function createSplit(
-  id: string,
-  direction: "horizontal" | "vertical",
-  children: readonly ThreadTerminalLayoutNode[],
-): ThreadTerminalLayoutNode {
-  return {
-    type: "split",
-    id,
-    direction,
-    children: [...children],
-    weights: children.map(() => 1),
-  };
-}
-
-function normalizePresetId(presetId: WorkspaceLayoutPresetId | string): WorkspaceLayoutPresetId {
-  return (
-    WORKSPACE_LAYOUT_PRESETS.find((preset) => preset.id === presetId)?.id ??
-    DEFAULT_WORKSPACE_LAYOUT_PRESET_ID
-  );
-}
-
-export function getWorkspaceLayoutPreset(
-  presetId: WorkspaceLayoutPresetId | string,
-): WorkspaceLayoutPresetDefinition {
-  const normalizedPresetId = normalizePresetId(presetId);
-  const preset = WORKSPACE_LAYOUT_PRESETS.find((entry) => entry.id === normalizedPresetId);
-  if (preset) {
-    return preset;
-  }
-  return {
-    id: DEFAULT_WORKSPACE_LAYOUT_PRESET_ID,
-    title: "Single",
-    description: "One focused terminal.",
-    slotCount: 1,
-  };
-}
-
-export function getWorkspaceLayoutPresetSlotCount(
-  presetId: WorkspaceLayoutPresetId | string,
-): number {
-  return getWorkspaceLayoutPreset(presetId).slotCount;
-}
-
-export function ensureTerminalIdsForPreset(
-  terminalIds: readonly string[],
-  presetId: WorkspaceLayoutPresetId | string,
-  createTerminalId: () => string,
-): string[] {
-  const normalizedTerminalIds = normalizeTerminalIds(terminalIds);
-  const requiredSlotCount = getWorkspaceLayoutPresetSlotCount(presetId);
-  const nextTerminalIds = [...normalizedTerminalIds];
-  while (nextTerminalIds.length < requiredSlotCount) {
-    const nextTerminalId = createTerminalId().trim();
-    if (nextTerminalId.length === 0 || nextTerminalIds.includes(nextTerminalId)) {
-      continue;
-    }
-    nextTerminalIds.push(nextTerminalId);
-  }
-  return nextTerminalIds;
-}
-
-function distributeTerminalIdsAcrossSlots(
-  terminalIds: readonly string[],
-  slotCount: number,
-): string[][] {
-  const normalizedTerminalIds = normalizeTerminalIds(terminalIds);
-  const nextSlots = Array.from({ length: Math.max(1, slotCount) }, () => [] as string[]);
-
-  normalizedTerminalIds.forEach((terminalId, index) => {
-    const slotIndex = index < nextSlots.length ? index : index % nextSlots.length;
-    nextSlots[slotIndex]?.push(terminalId);
-  });
-
-  return nextSlots.map((slotTerminalIds, index) =>
-    slotTerminalIds.length > 0
-      ? slotTerminalIds
-      : [normalizedTerminalIds[index] ?? normalizedTerminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID],
-  );
-}
-
-function buildPresetLayout(input: {
-  presetId: WorkspaceLayoutPresetId;
-  terminalIds: readonly string[];
-  activeTerminalId: string;
-}): ThreadTerminalLayoutNode {
-  const slots = distributeTerminalIdsAcrossSlots(
-    input.terminalIds,
-    getWorkspaceLayoutPresetSlotCount(input.presetId),
-  );
-  const leaf = (slotIndex: number) =>
-    createTerminalLeaf(
-      slots[slotIndex] ?? [DEFAULT_THREAD_TERMINAL_ID],
-      `pane-${input.presetId}-${slotIndex + 1}`,
-      input.activeTerminalId,
-    );
-
-  switch (input.presetId) {
-    case "two-columns":
-      return createSplit(`workspace-${input.presetId}-root`, "horizontal", [leaf(0), leaf(1)]);
-    case "two-rows":
-      return createSplit(`workspace-${input.presetId}-root`, "vertical", [leaf(0), leaf(1)]);
-    case "top-main":
-      return createSplit(`workspace-${input.presetId}-root`, "vertical", [
-        leaf(0),
-        createSplit(`workspace-${input.presetId}-bottom`, "horizontal", [leaf(1), leaf(2)]),
-      ]);
-    case "left-main":
-      return createSplit(`workspace-${input.presetId}-root`, "horizontal", [
-        leaf(0),
-        createSplit(`workspace-${input.presetId}-right`, "vertical", [leaf(1), leaf(2)]),
-      ]);
-    case "quad":
-      return createSplit(`workspace-${input.presetId}-root`, "vertical", [
-        createSplit(`workspace-${input.presetId}-top`, "horizontal", [leaf(0), leaf(1)]),
-        createSplit(`workspace-${input.presetId}-bottom`, "horizontal", [leaf(2), leaf(3)]),
-      ]);
-    case "single":
-    default:
-      return leaf(0);
-  }
-}
-
-export function createWorkspaceTerminalGroupFromPreset(input: {
-  presetId: WorkspaceLayoutPresetId | string;
-  terminalIds: readonly string[];
-  activeTerminalId?: string | null | undefined;
-}): ThreadTerminalGroup {
-  const normalizedPresetId = normalizePresetId(input.presetId);
-  const normalizedTerminalIds = normalizeTerminalIds(input.terminalIds);
-  const resolvedActiveTerminalId = normalizedTerminalIds.includes(input.activeTerminalId ?? "")
-    ? (input.activeTerminalId ?? normalizedTerminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID)
-    : (normalizedTerminalIds[0] ?? DEFAULT_THREAD_TERMINAL_ID);
-
-  return {
-    id: `workspace-group-${normalizedPresetId}`,
-    activeTerminalId: resolvedActiveTerminalId,
-    layout: buildPresetLayout({
-      presetId: normalizedPresetId,
-      terminalIds: normalizedTerminalIds,
-      activeTerminalId: resolvedActiveTerminalId,
-    }),
-  };
-}
diff --git a/apps/web/src/wsNativeApi.test.ts b/apps/web/src/wsNativeApi.test.ts
index 9c3b741d3..01ddf8000 100644
--- a/apps/web/src/wsNativeApi.test.ts
+++ b/apps/web/src/wsNativeApi.test.ts
@@ -325,27 +325,16 @@ describe("wsNativeApi", () => {
     expect(lateListener).toHaveBeenCalledWith(payload);
   });
 
-  it("forwards valid terminal and orchestration events", async () => {
+  it("forwards valid orchestration events", async () => {
     const { createWsNativeApi } = await import("./wsNativeApi");
 
     const api = createWsNativeApi();
-    const onTerminalEvent = vi.fn();
     const onDomainEvent = vi.fn();
     const onActionProgress = vi.fn();
 
-    api.terminal.onEvent(onTerminalEvent);
     api.orchestration.onDomainEvent(onDomainEvent);
     api.git.onActionProgress(onActionProgress);
 
-    const terminalEvent = {
-      threadId: "thread-1",
-      terminalId: "terminal-1",
-      createdAt: "2026-02-24T00:00:00.000Z",
-      type: "output",
-      data: "hello",
-    } as const;
-    emitPush(WS_CHANNELS.terminalEvent, terminalEvent);
-
     const orchestrationEvent = {
       sequence: 1,
       eventId: EventId.makeUnsafe("event-1"),
@@ -378,8 +367,6 @@ describe("wsNativeApi", () => {
       label: "Committing...",
     });
 
-    expect(onTerminalEvent).toHaveBeenCalledTimes(1);
-    expect(onTerminalEvent).toHaveBeenCalledWith(terminalEvent);
     expect(onDomainEvent).toHaveBeenCalledTimes(1);
     expect(onDomainEvent).toHaveBeenCalledWith(orchestrationEvent);
     expect(onActionProgress).toHaveBeenCalledTimes(1);
@@ -418,17 +405,6 @@ describe("wsNativeApi", () => {
     });
   });
 
-  it("forwards terminal output ACKs to the websocket transport", async () => {
-    requestMock.mockResolvedValue(undefined);
-    const { createWsNativeApi } = await import("./wsNativeApi");
-
-    const api = createWsNativeApi();
-    const input = { threadId: "thread-1", terminalId: "default", bytes: 4096 };
-    await api.terminal.ackOutput(input);
-
-    expect(requestMock).toHaveBeenCalledWith(WS_METHODS.terminalAckOutput, input);
-  });
-
   it("omits null user-input answers before dispatching to orchestration", async () => {
     requestMock.mockResolvedValue(undefined);
     const { createWsNativeApi } = await import("./wsNativeApi");
diff --git a/apps/web/src/wsNativeApi.ts b/apps/web/src/wsNativeApi.ts
index 31d05bb11..eeff74b89 100644
--- a/apps/web/src/wsNativeApi.ts
+++ b/apps/web/src/wsNativeApi.ts
@@ -23,7 +23,6 @@ import {
   type ServerProviderStatusesUpdatedPayload,
   type ServerLifecycleStreamEvent,
   type ServerSettingsUpdatedPayload,
-  type TerminalEvent,
   ORCHESTRATION_WS_CHANNELS,
   ORCHESTRATION_WS_METHODS,
   type ContextMenuItem,
@@ -65,7 +64,6 @@ function omitNullUserInputAnswers(
     ),
   };
 }
-const terminalEventListeners = new Set<(payload: TerminalEvent) => void>();
 const projectDevServerEventListeners = new Set<(payload: ProjectDevServerEvent) => void>();
 const orchestrationDomainEventListeners = new Set<(payload: OrchestrationEvent) => void>();
 /**
@@ -289,16 +287,6 @@ export function createWsNativeApi(): NativeApi {
       }
     }
   });
-  transport.subscribe(WS_CHANNELS.terminalEvent, (message) => {
-    const payload = message.data;
-    for (const listener of terminalEventListeners) {
-      try {
-        listener(payload);
-      } catch {
-        // Swallow listener errors
-      }
-    }
-  });
   transport.subscribe(WS_CHANNELS.projectDevServerEvent, (message) => {
     const payload = message.data;
     for (const listener of projectDevServerEventListeners) {
@@ -357,21 +345,6 @@ export function createWsNativeApi(): NativeApi {
         return showConfirmDialogFallback(message);
       },
     },
-    terminal: {
-      open: (input) => transport.request(WS_METHODS.terminalOpen, input),
-      write: (input) => transport.request(WS_METHODS.terminalWrite, input),
-      ackOutput: (input) => transport.request(WS_METHODS.terminalAckOutput, input),
-      resize: (input) => transport.request(WS_METHODS.terminalResize, input),
-      clear: (input) => transport.request(WS_METHODS.terminalClear, input),
-      restart: (input) => transport.request(WS_METHODS.terminalRestart, input),
-      close: (input) => transport.request(WS_METHODS.terminalClose, input),
-      onEvent: (callback) => {
-        terminalEventListeners.add(callback);
-        return () => {
-          terminalEventListeners.delete(callback);
-        };
-      },
-    },
     projects: {
       discoverScripts: (input) => transport.request(WS_METHODS.projectsDiscoverScripts, input),
       listDirectories: (input) => transport.request(WS_METHODS.projectsListDirectories, input),
@@ -643,7 +616,6 @@ export function resetWsNativeApiForTest(): void {
   serverMaintenanceUpdatedListeners.clear();
   serverSettingsUpdatedListeners.clear();
   gitActionProgressListeners.clear();
-  terminalEventListeners.clear();
   projectDevServerEventListeners.clear();
   orchestrationDomainEventUnsubscribe = null;
   orchestrationDomainEventListeners.clear();
@@ -660,7 +632,6 @@ if (import.meta.hot) {
     serverProviderStatusesUpdatedListeners.clear();
     serverSettingsUpdatedListeners.clear();
     gitActionProgressListeners.clear();
-    terminalEventListeners.clear();
     projectDevServerEventListeners.clear();
     orchestrationDomainEventUnsubscribe = null;
     orchestrationDomainEventListeners.clear();
diff --git a/apps/web/src/wsTransport.ts b/apps/web/src/wsTransport.ts
index d41e9b601..53c057a84 100644
--- a/apps/web/src/wsTransport.ts
+++ b/apps/web/src/wsTransport.ts
@@ -19,7 +19,6 @@ import {
   type ServerLifecycleStreamEvent,
   type ServerProviderStatusesUpdatedPayload,
   type ServerSettingsUpdatedPayload,
-  type TerminalEvent,
   type WsPush,
   type WsPushChannel,
   type WsPushMessage,
@@ -411,13 +410,6 @@ export class WsTransport {
               this.emit(WS_CHANNELS.serverSettingsUpdated, payload),
             restartChannel,
           );
-        } else if (channel === WS_CHANNELS.terminalEvent) {
-          this.startStream(
-            "terminal.events",
-            client[WS_METHODS.subscribeTerminalEvents]({}),
-            (event: TerminalEvent) => this.emit(WS_CHANNELS.terminalEvent, event),
-            restartChannel,
-          );
         } else if (channel === WS_CHANNELS.projectDevServerEvent) {
           this.startStream(
             "project.devServers",
@@ -449,7 +441,6 @@ export class WsTransport {
     else if (channel === WS_CHANNELS.serverProviderStatusesUpdated)
       this.stopStream("server.providers");
     else if (channel === WS_CHANNELS.serverSettingsUpdated) this.stopStream("server.settings");
-    else if (channel === WS_CHANNELS.terminalEvent) this.stopStream("terminal.events");
     else if (channel === WS_CHANNELS.projectDevServerEvent) this.stopStream("project.devServers");
     else if (channel === ORCHESTRATION_WS_CHANNELS.domainEvent)
       this.stopStream("orchestration.domain");
diff --git a/bun.lock b/bun.lock
index 076a083e5..1a1598eaa 100644
--- a/bun.lock
+++ b/bun.lock
@@ -14,7 +14,7 @@
     },
     "apps/desktop": {
       "name": "@t3tools/desktop",
-      "version": "0.9.2",
+      "version": "0.9.3",
       "dependencies": {
         "effect": "catalog:",
         "electron": "40.6.0",
@@ -43,7 +43,7 @@
     },
     "apps/server": {
       "name": "t3",
-      "version": "0.9.2",
+      "version": "0.9.3",
       "bin": {
         "t3": "./dist/index.mjs",
       },
@@ -83,7 +83,7 @@
     },
     "apps/web": {
       "name": "@t3tools/web",
-      "version": "0.9.2",
+      "version": "0.9.3",
       "dependencies": {
         "@base-ui/react": "^1.5.0",
         "@dnd-kit/core": "^6.3.1",
@@ -149,7 +149,7 @@
     },
     "packages/contracts": {
       "name": "@t3tools/contracts",
-      "version": "0.9.2",
+      "version": "0.9.3",
       "dependencies": {
         "effect": "catalog:",
       },
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index f4e17fe6c..fb6887ced 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@t3tools/contracts",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "private": true,
   "files": [
     "dist"
diff --git a/packages/contracts/src/ipc.ts b/packages/contracts/src/ipc.ts
index 3e60c8c94..625f379ca 100644
--- a/packages/contracts/src/ipc.ts
+++ b/packages/contracts/src/ipc.ts
@@ -144,17 +144,6 @@ import type {
   ServerUpsertKeybindingResult,
 } from "./server";
 import type { PerformanceGetSnapshotInput, PerformanceGetSnapshotResult } from "./performance";
-import type {
-  TerminalAckOutputInput,
-  TerminalClearInput,
-  TerminalCloseInput,
-  TerminalEvent,
-  TerminalOpenInput,
-  TerminalResizeInput,
-  TerminalRestartInput,
-  TerminalSessionSnapshot,
-  TerminalWriteInput,
-} from "./terminal";
 import type {
   ClientOrchestrationCommand,
   OrchestrationGetFullThreadDiffInput,
@@ -375,16 +364,6 @@ export interface NativeApi {
     }) => Promise<string | null>;
     confirm: (message: string) => Promise<boolean>;
   };
-  terminal: {
-    open: (input: TerminalOpenInput) => Promise<TerminalSessionSnapshot>;
-    write: (input: TerminalWriteInput) => Promise<void>;
-    ackOutput: (input: TerminalAckOutputInput) => Promise<void>;
-    resize: (input: TerminalResizeInput) => Promise<void>;
-    clear: (input: TerminalClearInput) => Promise<void>;
-    restart: (input: TerminalRestartInput) => Promise<TerminalSessionSnapshot>;
-    close: (input: TerminalCloseInput) => Promise<void>;
-    onEvent: (callback: (event: TerminalEvent) => void) => () => void;
-  };
   projects: {
     discoverScripts: (input: ProjectDiscoverScriptsInput) => Promise<ProjectDiscoverScriptsResult>;
     listDirectories: (input: ProjectListDirectoriesInput) => Promise<ProjectListDirectoriesResult>;
diff --git a/packages/contracts/src/keybindings.test.ts b/packages/contracts/src/keybindings.test.ts
index 2d7bef79a..ab949b4db 100644
--- a/packages/contracts/src/keybindings.test.ts
+++ b/packages/contracts/src/keybindings.test.ts
@@ -47,41 +47,11 @@ it.effect("parses keybinding rules", () =>
     });
     assert.strictEqual(parsedAddProject.command, "sidebar.addProject");
 
-    const parsedTerminalToggle = yield* decode(KeybindingRule, {
-      key: "mod+j",
-      command: "terminal.toggle",
+    const parsedImportThread = yield* decode(KeybindingRule, {
+      key: "mod+shift+i",
+      command: "sidebar.importThread",
     });
-    assert.strictEqual(parsedTerminalToggle.command, "terminal.toggle");
-
-    const parsedClose = yield* decode(KeybindingRule, {
-      key: "mod+w",
-      command: "terminal.close",
-    });
-    assert.strictEqual(parsedClose.command, "terminal.close");
-
-    const parsedWorkspaceNew = yield* decode(KeybindingRule, {
-      key: "mod+shift+j",
-      command: "terminal.workspace.newFullWidth",
-    });
-    assert.strictEqual(parsedWorkspaceNew.command, "terminal.workspace.newFullWidth");
-
-    const parsedWorkspaceClose = yield* decode(KeybindingRule, {
-      key: "mod+w",
-      command: "terminal.workspace.closeActive",
-    });
-    assert.strictEqual(parsedWorkspaceClose.command, "terminal.workspace.closeActive");
-
-    const parsedWorkspaceTerminal = yield* decode(KeybindingRule, {
-      key: "mod+1",
-      command: "terminal.workspace.terminal",
-    });
-    assert.strictEqual(parsedWorkspaceTerminal.command, "terminal.workspace.terminal");
-
-    const parsedWorkspaceChat = yield* decode(KeybindingRule, {
-      key: "mod+2",
-      command: "terminal.workspace.chat",
-    });
-    assert.strictEqual(parsedWorkspaceChat.command, "terminal.workspace.chat");
+    assert.strictEqual(parsedImportThread.command, "sidebar.importThread");
 
     const parsedDiffToggle = yield* decode(KeybindingRule, {
       key: "mod+d",
@@ -131,12 +101,6 @@ it.effect("parses keybinding rules", () =>
     });
     assert.strictEqual(parsedLegacyLocal.command, "chat.newLocal");
 
-    const parsedTerminal = yield* decode(KeybindingRule, {
-      key: "mod+shift+t",
-      command: "chat.newTerminal",
-    });
-    assert.strictEqual(parsedTerminal.command, "chat.newTerminal");
-
     const parsedCursor = yield* decode(KeybindingRule, {
       key: "mod+alt+r",
       command: "chat.newCursor",
@@ -188,8 +152,8 @@ it.effect("accepts dynamic script run commands", () =>
 it.effect("parses keybindings array payload", () =>
   Effect.gen(function* () {
     const parsed = yield* decode(KeybindingsConfig, [
-      { key: "mod+j", command: "terminal.toggle" },
-      { key: "mod+d", command: "terminal.split", when: "terminalFocus" },
+      { key: "mod+j", command: "sidebar.toggle" },
+      { key: "mod+d", command: "diff.toggle", when: "chatFocus" },
     ]);
     assert.lengthOf(parsed, 2);
   }),
@@ -198,7 +162,7 @@ it.effect("parses keybindings array payload", () =>
 it.effect("parses resolved keybinding rules", () =>
   Effect.gen(function* () {
     const parsed = yield* decode(ResolvedKeybindingRule, {
-      command: "terminal.split",
+      command: "diff.toggle",
       shortcut: {
         key: "d",
         metaKey: false,
@@ -209,10 +173,10 @@ it.effect("parses resolved keybinding rules", () =>
       },
       whenAst: {
         type: "and",
-        left: { type: "identifier", name: "terminalOpen" },
+        left: { type: "identifier", name: "sidebarOpen" },
         right: {
           type: "not",
-          node: { type: "identifier", name: "terminalFocus" },
+          node: { type: "identifier", name: "composerFocus" },
         },
       },
     });
@@ -224,7 +188,7 @@ it.effect("parses resolved keybindings arrays", () =>
   Effect.gen(function* () {
     const parsed = yield* decode(ResolvedKeybindingsConfig, [
       {
-        command: "terminal.toggle",
+        command: "sidebar.toggle",
         shortcut: {
           key: "j",
           metaKey: false,
@@ -241,7 +205,7 @@ it.effect("parses resolved keybindings arrays", () =>
 
 it.effect("drops unknown fields in resolved keybinding rules", () =>
   decodeResolvedRule({
-    command: "terminal.toggle",
+    command: "sidebar.toggle",
     shortcut: {
       key: "j",
       metaKey: false,
@@ -255,7 +219,7 @@ it.effect("drops unknown fields in resolved keybinding rules", () =>
     Effect.map((parsed) => {
       const view = parsed as Record<string, unknown>;
       assert.strictEqual("key" in view, false);
-      assert.strictEqual(view.command, "terminal.toggle");
+      assert.strictEqual(view.command, "sidebar.toggle");
     }),
   ),
 );
diff --git a/packages/contracts/src/keybindings.ts b/packages/contracts/src/keybindings.ts
index d585a93af..acb5d7e1b 100644
--- a/packages/contracts/src/keybindings.ts
+++ b/packages/contracts/src/keybindings.ts
@@ -13,18 +13,6 @@ const STATIC_KEYBINDING_COMMANDS = [
   "sidebar.search",
   "sidebar.addProject",
   "sidebar.importThread",
-  "terminal.toggle",
-  "terminal.split",
-  "terminal.splitRight",
-  "terminal.splitLeft",
-  "terminal.splitDown",
-  "terminal.splitUp",
-  "terminal.new",
-  "terminal.close",
-  "terminal.workspace.newFullWidth",
-  "terminal.workspace.closeActive",
-  "terminal.workspace.terminal",
-  "terminal.workspace.chat",
   "browser.toggle",
   "diff.toggle",
   "composer.focus.toggle",
@@ -35,7 +23,6 @@ const STATIC_KEYBINDING_COMMANDS = [
   "chat.newLatestProject",
   "chat.newChat",
   "chat.newLocal",
-  "chat.newTerminal",
   "chat.newClaude",
   "chat.newCodex",
   "chat.newCursor",
diff --git a/packages/contracts/src/rpc.ts b/packages/contracts/src/rpc.ts
index 9c8c6cdd3..8f78dd29d 100644
--- a/packages/contracts/src/rpc.ts
+++ b/packages/contracts/src/rpc.ts
@@ -168,17 +168,6 @@ import {
   ServerUpdateSettingsResult,
   ServerUpsertKeybindingResult,
 } from "./server";
-import {
-  TerminalAckOutputInput,
-  TerminalClearInput,
-  TerminalCloseInput,
-  TerminalEvent,
-  TerminalOpenInput,
-  TerminalResizeInput,
-  TerminalRestartInput,
-  TerminalSessionSnapshot,
-  TerminalWriteInput,
-} from "./terminal";
 import {
   StatsGetProfileStatsInput,
   StatsGetProfileStatsResult,
@@ -597,55 +586,6 @@ export const WsGitHubWorkItemActionRpc = Rpc.make(WS_METHODS.githubWorkItemActio
   error: WsRpcError,
 });
 
-export const WsTerminalOpenRpc = Rpc.make(WS_METHODS.terminalOpen, {
-  payload: TerminalOpenInput,
-  success: TerminalSessionSnapshot,
-  error: WsRpcError,
-});
-
-export const WsTerminalWriteRpc = Rpc.make(WS_METHODS.terminalWrite, {
-  payload: TerminalWriteInput,
-  success: Schema.Void,
-  error: WsRpcError,
-});
-
-export const WsTerminalAckOutputRpc = Rpc.make(WS_METHODS.terminalAckOutput, {
-  payload: TerminalAckOutputInput,
-  success: Schema.Void,
-  error: WsRpcError,
-});
-
-export const WsTerminalResizeRpc = Rpc.make(WS_METHODS.terminalResize, {
-  payload: TerminalResizeInput,
-  success: Schema.Void,
-  error: WsRpcError,
-});
-
-export const WsTerminalClearRpc = Rpc.make(WS_METHODS.terminalClear, {
-  payload: TerminalClearInput,
-  success: Schema.Void,
-  error: WsRpcError,
-});
-
-export const WsTerminalRestartRpc = Rpc.make(WS_METHODS.terminalRestart, {
-  payload: TerminalRestartInput,
-  success: TerminalSessionSnapshot,
-  error: WsRpcError,
-});
-
-export const WsTerminalCloseRpc = Rpc.make(WS_METHODS.terminalClose, {
-  payload: TerminalCloseInput,
-  success: Schema.Void,
-  error: WsRpcError,
-});
-
-export const WsSubscribeTerminalEventsRpc = Rpc.make(WS_METHODS.subscribeTerminalEvents, {
-  payload: Schema.Struct({}),
-  success: TerminalEvent,
-  error: WsRpcError,
-  stream: true,
-});
-
 export const WsServerGetConfigRpc = Rpc.make(WS_METHODS.serverGetConfig, {
   payload: Schema.Struct({}),
   success: ServerConfig,
@@ -965,14 +905,6 @@ export const WsRpcGroup = RpcGroup.make(
   WsGitHubWorkItemDetailRpc,
   WsGitHubPullRequestDiffRpc,
   WsGitHubWorkItemActionRpc,
-  WsTerminalOpenRpc,
-  WsTerminalWriteRpc,
-  WsTerminalAckOutputRpc,
-  WsTerminalResizeRpc,
-  WsTerminalClearRpc,
-  WsTerminalRestartRpc,
-  WsTerminalCloseRpc,
-  WsSubscribeTerminalEventsRpc,
   WsServerGetConfigRpc,
   WsServerGetEnvironmentRpc,
   WsServerGetSettingsRpc,
diff --git a/packages/contracts/src/terminal.test.ts b/packages/contracts/src/terminal.test.ts
deleted file mode 100644
index 0d9b26882..000000000
--- a/packages/contracts/src/terminal.test.ts
+++ /dev/null
@@ -1,269 +0,0 @@
-import { Schema } from "effect";
-import { describe, expect, it } from "vitest";
-
-import {
-  DEFAULT_TERMINAL_ID,
-  TerminalAckOutputInput,
-  TerminalClearInput,
-  TerminalCloseInput,
-  TerminalEvent,
-  TerminalOpenInput,
-  TerminalResizeInput,
-  TerminalSessionSnapshot,
-  TerminalThreadInput,
-  TerminalWriteInput,
-} from "./terminal";
-
-function decodeSync<S extends Schema.Top>(schema: S, input: unknown): Schema.Schema.Type<S> {
-  return Schema.decodeUnknownSync(schema as never)(input) as Schema.Schema.Type<S>;
-}
-
-function decodes<S extends Schema.Top>(schema: S, input: unknown): boolean {
-  try {
-    Schema.decodeUnknownSync(schema as never)(input);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-describe("TerminalOpenInput", () => {
-  it("accepts valid open input", () => {
-    expect(
-      decodes(TerminalOpenInput, {
-        threadId: "thread-1",
-        cwd: "/tmp/project",
-        cols: 120,
-        rows: 40,
-      }),
-    ).toBe(true);
-  });
-
-  it("rejects invalid bounds", () => {
-    expect(
-      decodes(TerminalOpenInput, {
-        threadId: "thread-1",
-        cwd: "/tmp/project",
-        cols: 10,
-        rows: 2,
-      }),
-    ).toBe(false);
-  });
-
-  it("accepts ultrawide column counts", () => {
-    // Regression: a fit on a wide viewport at a small font legitimately exceeds
-    // the old 400-column cap (e.g. 436), which must not fail the terminal open.
-    expect(
-      decodes(TerminalOpenInput, {
-        threadId: "thread-1",
-        cwd: "/tmp/project",
-        cols: 436,
-        rows: 40,
-      }),
-    ).toBe(true);
-  });
-
-  it("rejects dimensions beyond the PTY ceiling", () => {
-    expect(
-      decodes(TerminalOpenInput, {
-        threadId: "thread-1",
-        cwd: "/tmp/project",
-        cols: 2001,
-        rows: 40,
-      }),
-    ).toBe(false);
-  });
-
-  it("defaults terminalId when missing", () => {
-    const parsed = decodeSync(TerminalOpenInput, {
-      threadId: "thread-1",
-      cwd: "/tmp/project",
-      cols: 100,
-      rows: 24,
-    });
-    expect(parsed.terminalId).toBe(DEFAULT_TERMINAL_ID);
-  });
-
-  it("accepts optional env overrides", () => {
-    const parsed = decodeSync(TerminalOpenInput, {
-      threadId: "thread-1",
-      cwd: "/tmp/project",
-      cols: 100,
-      rows: 24,
-      env: {
-        CHITAURI_PROJECT_ROOT: "/tmp/project",
-        CUSTOM_FLAG: "1",
-      },
-    });
-    expect(parsed.env).toMatchObject({
-      CHITAURI_PROJECT_ROOT: "/tmp/project",
-      CUSTOM_FLAG: "1",
-    });
-  });
-
-  it("rejects invalid env keys", () => {
-    expect(
-      decodes(TerminalOpenInput, {
-        threadId: "thread-1",
-        cwd: "/tmp/project",
-        cols: 100,
-        rows: 24,
-        env: {
-          "bad-key": "1",
-        },
-      }),
-    ).toBe(false);
-  });
-});
-
-describe("TerminalWriteInput", () => {
-  it("accepts non-empty data", () => {
-    expect(
-      decodes(TerminalWriteInput, {
-        threadId: "thread-1",
-        data: "echo hello\n",
-      }),
-    ).toBe(true);
-  });
-
-  it("rejects empty data", () => {
-    expect(
-      decodes(TerminalWriteInput, {
-        threadId: "thread-1",
-        data: "",
-      }),
-    ).toBe(false);
-  });
-});
-
-describe("TerminalAckOutputInput", () => {
-  it("accepts positive parsed byte counts", () => {
-    expect(
-      decodes(TerminalAckOutputInput, {
-        threadId: "thread-1",
-        bytes: 4096,
-      }),
-    ).toBe(true);
-  });
-
-  it("rejects empty ACKs", () => {
-    expect(
-      decodes(TerminalAckOutputInput, {
-        threadId: "thread-1",
-        bytes: 0,
-      }),
-    ).toBe(false);
-  });
-});
-
-describe("TerminalThreadInput", () => {
-  it("trims thread ids", () => {
-    const parsed = decodeSync(TerminalThreadInput, { threadId: " thread-1 " });
-    expect(parsed.threadId).toBe("thread-1");
-  });
-});
-
-describe("TerminalResizeInput", () => {
-  it("accepts valid size", () => {
-    expect(
-      decodes(TerminalResizeInput, {
-        threadId: "thread-1",
-        cols: 80,
-        rows: 24,
-      }),
-    ).toBe(true);
-  });
-});
-
-describe("TerminalClearInput", () => {
-  it("defaults terminal id", () => {
-    const parsed = decodeSync(TerminalClearInput, {
-      threadId: "thread-1",
-    });
-    expect(parsed.terminalId).toBe(DEFAULT_TERMINAL_ID);
-  });
-});
-
-describe("TerminalCloseInput", () => {
-  it("accepts optional deleteHistory", () => {
-    expect(
-      decodes(TerminalCloseInput, {
-        threadId: "thread-1",
-        deleteHistory: true,
-      }),
-    ).toBe(true);
-  });
-});
-
-describe("TerminalSessionSnapshot", () => {
-  it("accepts running snapshots", () => {
-    expect(
-      decodes(TerminalSessionSnapshot, {
-        threadId: "thread-1",
-        terminalId: DEFAULT_TERMINAL_ID,
-        cwd: "/tmp/project",
-        status: "running",
-        pid: 1234,
-        history: "hello\n",
-        replayPreamble: "\u001b[?2004h\u001b[=7;1u",
-        exitCode: null,
-        exitSignal: null,
-        updatedAt: new Date().toISOString(),
-      }),
-    ).toBe(true);
-  });
-});
-
-describe("TerminalEvent", () => {
-  it("accepts output events", () => {
-    expect(
-      decodes(TerminalEvent, {
-        type: "output",
-        threadId: "thread-1",
-        terminalId: DEFAULT_TERMINAL_ID,
-        createdAt: new Date().toISOString(),
-        data: "line\n",
-      }),
-    ).toBe(true);
-  });
-
-  it("accepts output events with byte length", () => {
-    expect(
-      decodes(TerminalEvent, {
-        type: "output",
-        threadId: "thread-1",
-        terminalId: DEFAULT_TERMINAL_ID,
-        createdAt: new Date().toISOString(),
-        data: "line\n",
-        byteLength: 5,
-      }),
-    ).toBe(true);
-  });
-
-  it("accepts exited events", () => {
-    expect(
-      decodes(TerminalEvent, {
-        type: "exited",
-        threadId: "thread-1",
-        terminalId: DEFAULT_TERMINAL_ID,
-        createdAt: new Date().toISOString(),
-        exitCode: 0,
-        exitSignal: null,
-      }),
-    ).toBe(true);
-  });
-
-  it("accepts activity events", () => {
-    expect(
-      decodes(TerminalEvent, {
-        type: "activity",
-        threadId: "thread-1",
-        terminalId: DEFAULT_TERMINAL_ID,
-        createdAt: new Date().toISOString(),
-        hasRunningSubprocess: true,
-        cliKind: "codex",
-        agentState: "running",
-      }),
-    ).toBe(true);
-  });
-});
diff --git a/packages/contracts/src/ws.ts b/packages/contracts/src/ws.ts
index 86e528232..5fa47360c 100644
--- a/packages/contracts/src/ws.ts
+++ b/packages/contracts/src/ws.ts
@@ -66,16 +66,6 @@ import {
   GitHubWorkItemDetailInput,
   GitHubWorkListInput,
 } from "./github";
-import {
-  TerminalAckOutputInput,
-  TerminalClearInput,
-  TerminalCloseInput,
-  TerminalEvent,
-  TerminalOpenInput,
-  TerminalResizeInput,
-  TerminalRestartInput,
-  TerminalWriteInput,
-} from "./terminal";
 import { KeybindingRule } from "./keybindings";
 import {
   ProjectCreateLocalFilePreviewGrantInput,
@@ -185,15 +175,6 @@ export const WS_METHODS = {
   githubPullRequestDiff: "github.pullRequestDiff",
   githubWorkItemAction: "github.workItemAction",
 
-  // Terminal methods
-  terminalOpen: "terminal.open",
-  terminalWrite: "terminal.write",
-  terminalAckOutput: "terminal.ackOutput",
-  terminalResize: "terminal.resize",
-  terminalClear: "terminal.clear",
-  terminalRestart: "terminal.restart",
-  terminalClose: "terminal.close",
-
   // Server meta
   serverGetConfig: "server.getConfig",
   serverGetEnvironment: "server.getEnvironment",
@@ -219,7 +200,6 @@ export const WS_METHODS = {
   subscribeServerSettings: "server.subscribeSettings",
 
   // Streaming subscriptions
-  subscribeTerminalEvents: "terminal.subscribeEvents",
   subscribeOrchestrationDomainEvents: "orchestration.subscribeDomainEvents",
   subscribeGitActionProgress: "git.subscribeActionProgress",
 
@@ -251,7 +231,6 @@ export const WS_METHODS = {
 export const WS_CHANNELS = {
   automationEvent: "automation.event",
   gitActionProgress: "git.actionProgress",
-  terminalEvent: "terminal.event",
   projectDevServerEvent: "project.devServerEvent",
   serverWelcome: "server.welcome",
   serverMaintenanceUpdated: "server.maintenanceUpdated",
@@ -364,15 +343,6 @@ const WebSocketRequestBody = Schema.Union([
     Tuple.map(Schema.fieldsAssign({ _tag: Schema.tag(WS_METHODS.githubWorkItemAction) })),
   ).members,
 
-  // Terminal methods
-  tagRequestBody(WS_METHODS.terminalOpen, TerminalOpenInput),
-  tagRequestBody(WS_METHODS.terminalWrite, TerminalWriteInput),
-  tagRequestBody(WS_METHODS.terminalAckOutput, TerminalAckOutputInput),
-  tagRequestBody(WS_METHODS.terminalResize, TerminalResizeInput),
-  tagRequestBody(WS_METHODS.terminalClear, TerminalClearInput),
-  tagRequestBody(WS_METHODS.terminalRestart, TerminalRestartInput),
-  tagRequestBody(WS_METHODS.terminalClose, TerminalCloseInput),
-
   // Server meta
   tagRequestBody(WS_METHODS.serverGetConfig, Schema.Struct({})),
   tagRequestBody(WS_METHODS.serverGetEnvironment, Schema.Struct({})),
@@ -454,7 +424,6 @@ export interface WsPushPayloadByChannel {
   readonly [WS_CHANNELS.serverSettingsUpdated]: typeof ServerSettingsUpdatedPayload.Type;
   readonly [WS_CHANNELS.automationEvent]: typeof AutomationStreamEvent.Type;
   readonly [WS_CHANNELS.gitActionProgress]: typeof GitActionProgressEvent.Type;
-  readonly [WS_CHANNELS.terminalEvent]: typeof TerminalEvent.Type;
   readonly [WS_CHANNELS.projectDevServerEvent]: typeof ProjectDevServerEvent.Type;
   readonly [ORCHESTRATION_WS_CHANNELS.domainEvent]: OrchestrationEvent;
   readonly [ORCHESTRATION_WS_CHANNELS.shellEvent]: OrchestrationShellStreamItem;
@@ -500,7 +469,6 @@ export const WsPushGitActionProgress = makeWsPushSchema(
   WS_CHANNELS.gitActionProgress,
   GitActionProgressEvent,
 );
-export const WsPushTerminalEvent = makeWsPushSchema(WS_CHANNELS.terminalEvent, TerminalEvent);
 export const WsPushProjectDevServerEvent = makeWsPushSchema(
   WS_CHANNELS.projectDevServerEvent,
   ProjectDevServerEvent,
@@ -526,7 +494,6 @@ export const WsPushChannelSchema = Schema.Literals([
   WS_CHANNELS.serverProviderStatusesUpdated,
   WS_CHANNELS.serverSettingsUpdated,
   WS_CHANNELS.automationEvent,
-  WS_CHANNELS.terminalEvent,
   WS_CHANNELS.projectDevServerEvent,
   ORCHESTRATION_WS_CHANNELS.domainEvent,
   ORCHESTRATION_WS_CHANNELS.shellEvent,
@@ -542,7 +509,6 @@ export const WsPush = Schema.Union([
   WsPushServerSettingsUpdated,
   WsPushAutomationEvent,
   WsPushGitActionProgress,
-  WsPushTerminalEvent,
   WsPushProjectDevServerEvent,
   WsPushOrchestrationDomainEvent,
   WsPushOrchestrationShellEvent,