@agi-fans/dsh-tui 0.20.0 → 0.22.0

package/lib/runtime/provider-local.js

@@ -2,7 +2,7 @@
  * TUI capability seam — local terminal provider.
 
  * Owns the tty: raw-mode key input (editing, history, slash/tab
- * autocomplete, /settings overlay, /copy picker, Ctrl-R history search, PgUp/PgDn
+ * autocomplete, /settings overlay, Ctrl-R history search, PgUp/PgDn
  * and Shift+Up/Down transcript scroll, Ctrl-O tool
  * expand, bracketed paste, double-Escape conversation rewind, double Ctrl-C exit, Ctrl-D quit),
  * SIGWINCH reflow, and the differential renderer. In non-tty mode
@@ -10,7 +10,11 @@
  * printing of settled blocks.
  * @module @agi-fans/dsh-tui
  */
-import { TerminalNotificationController, TerminalNotificationQueue, terminalNotificationSequence, terminalProgressSequence, } from "./terminal-notifications.js";
+import { TerminalNotificationController, TerminalNotificationQueue, terminalNotificationSequence, } from "./terminal-notifications.js";
+import { PROGRAM_STATUS_QUERY, programStatusSequence, terminalTitle } from "./terminal-state.js";
+import { TerminalSession } from "./terminal-session.js";
+import { BRACKETED_PASTE, FOCUS_REPORTING, MOUSE_TRACKING, } from "./terminal-modes.js";
+import { IDLE_WHEEL, terminalAcceleratesWheel, wheelStep } from "../input/wheel-scroll.js";
 import { HerdrAgentReporter } from "./herdr-agent.js";
 import { imageProtocol } from "../chrome/terminal-images.js";
 import { previewImages } from "./image-preview.js";
@@ -31,43 +35,65 @@ import { TUI_SERVICE, } from "../definition.js";
 import { applySlashCompletion, formatHelpText, parseSlashInput, resolveSlashCommand, slashSuggestions, BUILTIN_SLASH_COMMANDS, } from "../views/autocomplete.js";
 import { applyPathCompletion, defaultPathSource, editorLineAt, findPathToken, parsePathPrefix, pathSuggestions, searchPathSuggestions, } from "../views/path-complete.js";
 import { activeAtToken } from '@deepseek-ai/dsh-file-reference/grammar';
-import { nextSelectableAutocompleteIndex, searchAtSuggestions, } from "../views/at-complete.js";
+import { matchesAtShortcutQuery, nextSelectableAutocompleteIndex, searchAtSuggestions, } from "../views/at-complete.js";
 import { readTmuxMouseEnabled } from "../input/mouse-policy.js";
 import { TextSelection } from "../input/text-selection.js";
 import { copyToClipboard, readFromClipboard } from "../input/clipboard.js";
-import { applyCopySelectorEvent, createCopySelector, } from "../views/copy-selector.js";
-import { buildCopyTargets, extractCopyTarget, parseCopyKind } from "../views/copy-targets.js";
+import { buildCopyTargets } from "../views/copy-targets.js";
 import { applyHistorySearchEvent, createHistorySearch, } from "../views/history-search.js";
 import { InputEditor, lineEnd, lineStart } from "../input/editor.js";
-import { applySettingsEvent, createSettings, } from "../views/settings-list.js";
-import { editPluginSettings, pluginSettingsEntries } from "./plugin-settings.js";
+import { applySettingsEvent, createSettings, refreshSettings, tuiSettingItems, } from "../views/settings-list.js";
+import { editSettingsEntry, pluginSettingsEntries, resetSettingsControl, setSettingsEntry, showSettingsError } from "./plugin-settings.js";
+import { preferenceChanges } from "./settings-preferences.js";
 import { appendTrajectoryEvent, applyTrajectoryEvent, createTrajectory, trajectoryDetailMetrics, trajectoryListMetrics, } from "../views/trajectory.js";
-import { applyAgentHubEvent, createAgentHub, updateAgentHub, } from "../views/agent-hub.js";
-import { applyEvent, applyStreamChunk, blockSearchText, initialTranscript, replayEvents, renderView, turnGroups, transcriptSeam, TRANSCRIPT_FAST_SCROLL, withWorkspaceSummary, } from "../views/event-views.js";
-import { applyTranscriptSearchEvent, createTranscriptSearch, searchBlockIndexes, } from "../views/transcript-search.js";
+import { applyEvent, applyStreamChunk, renderedBlocks, formatAgentElapsed, subagentPreviewStart, initialTranscript, replayEvents, renderView, turnGroups, transcriptSeam, TRANSCRIPT_FAST_SCROLL, withWorkspaceSummary, } from "../views/event-views.js";
+import { applyTranscriptSearchEvent, createTranscriptSearch, searchMatches, } from "../views/transcript-search.js";
 import { nextRevealStep, revealStreamingAssistant, streamingAssistantKey, streamingAssistantUnits, } from "../views/streaming-reveal.js";
 import { flushPending, parseKeys } from "../input/keys.js";
+import { sanitizeDisplayLine } from "../chrome/renderer.js";
+import { blockFileAction } from "../views/file-actions.js";
+import { fileDocument, reviewFiles } from "./file-review.js";
+import { stripAnsi } from "../chrome/width.js";
 import { MainScreenRenderer } from "../chrome/main-screen-renderer.js";
-import { colorDisabledByEnv, createTheme, detectTrueColor } from "../chrome/theme.js";
+import { colorDisabledByEnv, createTheme, detectColorDepth } from "../chrome/theme.js";
+import { formatToolsText } from "../chrome/tools-list.js";
 import { renderTool } from "../chrome/tool-renderers.js";
-import { TUI_SETTINGS_ENTRY, TUI_SETTINGS_FIELDS } from "../session/tui-settings.js";
-import { defaultStatusBarConfig, resolveStatusBarConfig } from "../chrome/status-config.js";
+import { NOTIFICATION_THRESHOLD_MS, resolveNotificationMode, TUI_SETTINGS_ENTRY, TUI_SETTINGS_FIELDS, } from "../session/tui-settings.js";
+import { DEFAULT_STATUS_DENSITY, resolveStatusBarConfig, statusBarDocument } from "../chrome/status-config.js";
 import { HistoryStore } from "../session/history-store.js";
 import { PasteBurst } from "../input/paste-burst.js";
-import { loadKeybindings } from "../input/keybindings-config.js";
+import { DEFAULT_KEYBINDINGS, loadKeybindings, saveKeybindings, TUI_ACTION_LABELS, TUI_ACTIONS } from "../input/keybindings-config.js";
 import { discoverEditors } from "../input/editor-discovery.js";
 import { editExternally, editFileExternally } from "../input/external-editor.js";
 import z from '@deepseek-ai/schemastery';
-import { movePromptSelection, movePromptTree, searchPromptSelection, filteredPromptOptions, refreshPromptOptions, promptTreePageSize, selectedPromptAnswer, selectedFilteredPromptAnswer, togglePromptSelection, } from "../views/prompt-selector.js";
-import { refreshProjectContext, resolveProjectContext } from "../session/project-context.js";
-import { pickWelcomeTips } from "../chrome/welcome-tips.js";
+import { movePromptSelection, movePromptTree, searchPromptSelection, filteredPromptOptions, refreshPromptOptions, promptTreePageSize, selectedPromptAnswer, selectedFilteredPromptAnswer, togglePromptSelection, documentRows, findInRows, } from "../views/prompt-selector.js";
+import { edgeIndex, listNavigation, navigateIndex } from "../views/list-navigation.js";
+import { refreshProjectContext, resolveGitStatusFiles, resolveProjectContext } from "../session/project-context.js";
+import { modelRouteReady } from "../session/model-readiness.js";
 import { formatEssentialHotkeysText, formatHotkeysText, hotkeyCount, keysForAction } from "../views/hotkeys.js";
-import { imagePathCandidates, stripComposerImageMarkers, readImageFile, readImageFromClipboard, readMacClipboardFiles, } from "../input/image-paste.js";
-import { APP_NAME, APP_VERSION } from "../session/package-metadata.js";
+import { imagePathCandidates, splitComposerImageMarkers, stripComposerImageMarkers, readImageFile, readImageFromClipboard, readMacClipboardFiles, } from "../input/image-paste.js";
+import { APP_DISPLAY_NAME, APP_NAME, APP_VERSION } from "../session/package-metadata.js";
 const DOUBLE_CTRL_C_MS = 500;
+/**
+ * Whether an open completion menu still speaks for the `@` token being typed.
+ *
+ * A `@` menu is built for a prefix, and the reader extends that prefix one
+ * keystroke at a time while the search for the new one is still running. The
+ * rows on screen describe a token this one extends, so they stay. Anything else
+ * — a new `@`, a different path, a token that was never recorded — describes
+ * nothing on screen and must not be reused.
+ */
+export function completionDescribes(described, current) {
+    if (described === undefined)
+        return false;
+    return current.startsWith(described) || described.startsWith(current);
+}
+/** How long a confirmation stays on the composer's border before it fades. */
+const TRANSIENT_STATUS_MS = 3_000;
+/** Shortest interval between repaints while a Shell command writes. */
+const SHELL_PAINT_INTERVAL_MS = 80;
 const DOUBLE_ESCAPE_MS = 500;
 const STREAMING_REVEAL_MS = 1000 / 30;
-const TERMINAL_PROGRESS_KEEPALIVE_MS = 1_000;
 /**
  * Durable settlement events that arrive in bursts while a turn runs. Renders
  * for these are coalesced through the stream-render timer; rarer control
@@ -91,19 +117,6 @@ function shortenPath(cwd) {
         return '~' + cwd.slice(home.length);
     return cwd;
 }
-/** Maximum code points written into the OSC 2 window title. */
-const WINDOW_TITLE_MAX = 120;
-/**
- * Make a session title safe for an OSC 2 write: control characters are
- * replaced so a title cannot terminate or inject the escape sequence, and the
- * payload is bounded without splitting a surrogate pair.
- */
-function windowTitleText(title) {
-    if (title === undefined)
-        return '';
-    const cleaned = title.replace(/[\u0000-\u001f\u007f-\u009f]/gu, ' ').replace(/\s+/gu, ' ').trim();
-    return [...cleaned].slice(0, WINDOW_TITLE_MAX).join('');
-}
 export const name = 'omdsh-tui';
 /**
  * Row schema. The durable preferences ride as volatile fields, so a settings
@@ -111,7 +124,7 @@ export const name = 'omdsh-tui';
  * `loader/volatile-update` without remounting the terminal provider.
  */
 export const Config = z.object({
-    model: z.string(),
+    model: z.string().default(''),
     historyPath: z.string(),
     keybindingsPath: z.string(),
     dshHome: z.string(),
@@ -163,24 +176,19 @@ export class LocalTui {
         if (!this.#tty)
             throw new Error('Opening an editor requires an interactive terminal.');
         try {
-            this.#setMouseTracking(false);
-            this.#term.output.write('\x1b[?1004l');
-            this.#term.input.setRawMode?.(false);
-            editFileExternally(path, this.#externalEditor);
+            this.#handTerminal(() => { editFileExternally(path, this.#externalEditor); });
         }
         finally {
-            if (!this.#disposed) {
-                this.#term.input.setRawMode?.(true);
-                this.#term.output.write('\x1b[?1004h');
-                this.#renderer.reset();
+            if (!this.#disposed)
                 this.#render();
-            }
         }
     }
     #deferInitialRender = false;
     #imageProtocol;
     #imageCellSize = { width: 9, height: 18 };
     #imagePreviewAbort;
+    #fileReviewAbort;
+    #fileActionFrame;
     #imageTemporary = new Set();
     #terminalProfile;
     #resizeDebounceMs;
@@ -189,6 +197,8 @@ export class LocalTui {
     #streamRenderTimer = null;
     #term;
     #model;
+    /** Optimistic until the credential seams answer; false points at /login. */
+    #modelReady = true;
     #reasoningEffort;
     #colors;
     #themeName;
@@ -198,6 +208,21 @@ export class LocalTui {
     #editor = new InputEditor();
     #files = new ComposerFiles({ text: () => this.#editor.text,
         append: marker => { this.#editor.setCursor(this.#editor.text.length); this.#editor.handle({ type: 'text', value: (this.#editor.text === '' ? '' : ' ') + marker }); } });
+    insertText(text) {
+        if (text === '')
+            return;
+        const before = this.#editor.text.slice(0, this.#editor.cursor);
+        const after = this.#editor.text.slice(this.#editor.cursor);
+        const prefix = before !== '' && !/\s$/u.test(before) ? ' ' : '';
+        const suffix = (after !== '' && !/^\s/u.test(after)) || (text.startsWith('@') && after === '') ? ' ' : '';
+        this.#editor.handle({ type: 'text', value: prefix + text + suffix });
+        this.#refreshAutocomplete();
+        if (this.#tty)
+            this.#render();
+    }
+    async copyText(text, label = 'text') {
+        await this.#copyPicked(text, label);
+    }
     stageFileAttachment(file) {
         this.#files.add(file);
         this.#refreshAutocomplete();
@@ -209,6 +234,8 @@ export class LocalTui {
     #literalInput = false;
     #draft = '';
     #historyDraft;
+    #clearedDraft;
+    #stashedDrafts = new Map();
     #draftStore;
     #draftScope;
     #draftFingerprint = '';
@@ -216,17 +243,19 @@ export class LocalTui {
     #draftTimer;
     #unsavedDrafts = new Map();
     #draftError = false;
+    /**
+     * The open completion menu. `query` is the `@` prefix the rows were built for,
+     * so the next keystroke can tell "that token, extended" from "a different one".
+     */
     #ac = null;
     #search = null;
     #transcriptSearch = null;
     #settings = null;
     /** Optional-feature state read from the Profile patch this process booted with. */
     #features;
-    /** Profile patch the Features section writes; absent hides that section. */
+    /** Profile patch the Tools feature controls write; absent hides those controls. */
     #featurePatch;
-    #copySelector = null;
     #trajectory = null;
-    #agentHub = null;
     #pending = null;
     #queuedSubmissions = [];
     /** Newer queue entries temporarily detached while Up browses backward. */
@@ -289,16 +318,41 @@ export class LocalTui {
     #focusBlockEdge;
     #motion = 'full';
     #externalEditor = 'auto';
-    #terminalProgress = false;
-    #terminalProgressActive = false;
-    #terminalProgressTick = null;
+    #terminalTitle = 'status';
+    #terminalState = 'auto';
+    #programSupported = false;
+    #programQuerySent = false;
+    /** What the terminal reported about its own colors; empty until (and unless) it answers. */
+    get #terminalColors() { return this.#session.colors; }
+    /** Capability probe, reported colors, keyboard protocol, and every terminal mode this session turned on. */
+    #session = new TerminalSession({
+        write: bytes => { this.#term.output.write(bytes); },
+        alternateActive: () => this.#renderer?.alternateActive ?? false,
+        setAlternateScreenModes: modes => { this.#renderer?.setAlternateScreenModes(modes); },
+        deferUntilMainScreen: bytes => { this.#renderer?.deferUntilMainScreen(bytes); },
+        colorsChanged: () => { this.#render(); },
+        probeSettled: () => {
+            this.#probeGate = false;
+            if (!this.#disposed && !this.#deferInitialRender)
+                this.#render();
+        },
+    });
+    #offExit;
+    /** Accumulated wheel gesture, so fast spins move further than one notch. */
+    #wheelGesture = IDLE_WHEEL;
+    #wheelAccelerates;
+    /** When the pending provider retry fires, so the working row can count down. */
+    #retryDeadline;
+    /** When the running compaction started. */
+    #compactionStartedAt;
+    #readImageInput;
+    #writtenProgramState;
     #checkUpdates = true;
     #startupChangelog = 'summary';
     #notifications = new TerminalNotificationController();
     #notificationQueue = new TerminalNotificationQueue();
     #notificationTimer;
     #terminalFocused;
-    #notificationFocus = 'unfocused';
     /**
      * Herdr lifecycle authority for this pane. The plugin entry injects the
      * environment-aware reporter; a directly constructed instance is inert so
@@ -306,9 +360,10 @@ export class LocalTui {
      */
     #herdr;
     #notificationPolicy = 'off';
-    #notificationThreshold = '30s';
-    #statusBar = defaultStatusBarConfig();
+    #statusBar = resolveStatusBarConfig({ density: DEFAULT_STATUS_DENSITY, hidden: [] });
     #toolsExpanded = false;
+    /** Command outputs the reader opened; the rest fold after their preview. */
+    #expandedOutputs = new Set();
     /**
      * The reader opened something with Ctrl+O or Alt+O and is reading it.
      *
@@ -327,11 +382,31 @@ export class LocalTui {
     #copyOnSelect = true;
     #mathMode = 'auto';
     #mermaidMode = 'auto';
+    /** Transcript collapses every thought to one line; Ctrl+T flips it. */
+    #hideThinking = false;
     #mouseInteraction = 'auto';
     #tmuxMouseEnabled;
     #jumpPress;
     #jumpToLatest;
     #openedGroups = new Set();
+    /** Side-conversation pane; owned here so Esc can close it from any state. */
+    #aside;
+    /** Set while the pane is open, so closing it stops the work it was showing. */
+    #asideAbort;
+    /** Thoughts a reader opened individually, addressed by reasoning identity. */
+    #expandedReasoning = new Set();
+    /**
+     * The last action's confirmation, drawn on the composer's bottom border.
+     *
+     * A status that reports what a key just did is not part of the conversation,
+     * so it never enters the block list: it replaces itself, and it is dropped by
+     * the next keystroke. Writing it into the transcript would put chatter into
+     * native scrollback, which cannot be taken back.
+     */
+    #transientStatus;
+    #transientTimer = null;
+    /** Aborts the live Shell card, so Ctrl+C interrupts the command it belongs to. */
+    #shellAbort;
     /** Turn scopes whose tools stay detailed as new calls arrive during inspection. */
     #detailedTurns = new Set();
     #tools = [];
@@ -347,8 +422,6 @@ export class LocalTui {
      * when the prompt settles.
      */
     #promptDisplaced = null;
-    #recentSessions = [];
-    #welcomeTips;
     #sessionId;
     #sessionTitle;
     #writtenWindowTitle;
@@ -356,7 +429,13 @@ export class LocalTui {
     #sessionControls;
     #loopStatus;
     #subagents;
-    #subagentLauncherFocused = false;
+    /**
+     * The roster row the reader is pointing at, or `undefined` when the composer
+     * owns the keyboard. `↓` on an empty composer enters the bar; `Enter` opens the
+     * child. The bar is the roster now — the full-screen hub it used to open was a
+     * second stop on the way to the same transcript.
+     */
+    #subagentSelection;
     #inspected;
     #promptDocument;
     /**
@@ -364,7 +443,9 @@ export class LocalTui {
      * preference changes so a session that starts colorless can still enable
      * hexadecimal palettes without a restart.
      */
-    #trueColor = false;
+    #colorDepth = 'ansi16';
+    /** Hold the first frame until the capability probe settles; scrollback rows are immutable, so the first real paint must use the reported colors. */
+    #probeGate = false;
     #copy;
     #copyTask = Promise.resolve();
     #readClipboard;
@@ -372,6 +453,7 @@ export class LocalTui {
     #readClipboardFiles;
     #readImagePath;
     #historyStore;
+    #keybindingsPath;
     #keybindings;
     #cwd;
     #projectRoot;
@@ -382,6 +464,10 @@ export class LocalTui {
     #searchSessions;
     #autocompleteDebounceMs;
     #persistPrefs = null;
+    #catalogVersion = 0;
+    #prefsSaveTask;
+    #disposeTask;
+    #prefsVersion = 0;
     #agentBehavior;
     #updateAgentBehavior;
     #offAgentBehaviorWatch;
@@ -406,6 +492,7 @@ export class LocalTui {
         this.#readClipboardFiles = paths.readClipboardFiles ?? readMacClipboardFiles;
         this.#historyStore = paths.historyPath === undefined ? undefined : new HistoryStore(paths.historyPath);
         this.#history = this.#historyStore?.load() ?? [];
+        this.#keybindingsPath = paths.keybindingsPath;
         this.#keybindings = loadKeybindings(paths.keybindingsPath);
         this.#featurePatch = paths.featurePatch;
         if (paths.featurePatch !== undefined) {
@@ -429,25 +516,27 @@ export class LocalTui {
         this.#searchFileMentions = paths.searchFileMentions;
         this.#searchSessions = paths.searchSessions;
         this.#autocompleteDebounceMs = Math.max(0, paths.autocompleteDebounceMs ?? 100);
-        this.#welcomeTips = pickWelcomeTips();
         this.#deferInitialRender = paths.deferInitialRender === true;
         this.#terminalProfile = paths.terminalProfile ?? detectTerminalProfile();
         this.#imageProtocol = this.#terminalProfile !== 'direct' || paths.imageProtocol === 'none' ? undefined : paths.imageProtocol ?? imageProtocol(process.env);
+        this.#readImageInput = paths.readImageInput;
         this.#resizeDebounceMs = Math.max(0, paths.resizeDebounceMs ?? 120);
         this.#streamRenderMs = Math.max(0, paths.streamRenderMs ?? 8);
+        this.#wheelAccelerates = paths.wheelAcceleration ?? !terminalAcceleratesWheel();
         this.#herdr = paths.herdrReporter ?? new HerdrAgentReporter({ env: {} });
-        this.#syncTrueColor();
-        this.#tty = term.input.isTTY === true;
+        this.#syncColorDepth();
+        this.#tty = term.input.isTTY === true && term.output.isTTY === true;
         this.#draftStore = this.#tty && paths.draftsPath !== undefined ? new ComposerDraftStore(paths.draftsPath) : undefined;
         this.#plain = new PlainTui({
             term,
             blocks: () => this.#state.blocks,
             mathMode: () => this.#mathMode,
             mermaidMode: () => this.#mermaidMode,
+            hideThinking: () => this.#hideThinking,
             promptRequest: () => this.#prompt?.request,
             finishPrompt: answer => { this.#finishPrompt(answer); },
         });
-        this.#pwd = shortenPath(project.root);
+        this.#pwd = shortenPath(this.#cwd);
         this.#branch = project.gitLabel;
         this.#renderer = new MainScreenRenderer({ write: (chunk) => { this.#term.output.write(chunk); } }, {
             width: this.#term.width(),
@@ -485,24 +574,54 @@ export class LocalTui {
                     if (this.#disposed)
                         return;
                     this.#terminalFocused = undefined;
-                    this.#term.output.write('\x1b[?1004h');
+                    this.#writtenWindowTitle = undefined;
+                    this.#writtenProgramState = undefined;
+                    this.#programQuerySent = false;
+                    this.#programSupported = false;
+                    this.#syncWindowTitle();
+                    this.#session.takeBack();
                     this.#renderer.reset();
                     this.#render();
                 };
                 process.on('SIGCONT', resume);
                 this.#offResume = () => { process.off('SIGCONT', resume); };
             }
-            term.output.write('\x1b[?2004h\x1b[?1004h');
+            this.#session.setMode('paste', BRACKETED_PASTE, true);
+            this.#session.setMode('focus', FOCUS_REPORTING, true);
+            this.#probeGate = this.#deferInitialRender;
+            // A crash or `process.exit` skips dispose; the shell must still get its
+            // terminal back rather than a stuck alternate screen or key encoding.
+            const onExit = () => { this.#restoreTerminalOnExit(); };
+            process.once('exit', onExit);
+            this.#offExit = () => { process.off('exit', onExit); };
+            this.#session.start();
         }
         this.#render();
         this.#herdr.start();
+        if (paths.deferInitialRender !== true)
+            this.#syncWindowTitle();
+    }
+    /** Follow the viewed Session without replacing its transcript or native history. */
+    setWorkingDirectory(cwd) {
+        if (cwd === this.#cwd && cwd === this.#projectRoot)
+            return;
+        this.#cwd = cwd;
+        const project = resolveProjectContext(cwd);
+        this.#projectRoot = cwd;
+        this.#pwd = shortenPath(cwd);
+        this.#branch = project.gitLabel;
+        this.#refreshAutocomplete();
+        this.#syncWindowTitle();
+        if (this.#tty)
+            this.#render();
     }
-    /** Refresh Git workspace metadata after a turn; the footer shows realtime branch/dirty state. */
+    /** Refresh Git metadata without changing the Session's effective directory. */
     #refreshProjectContext() {
         const branch = refreshProjectContext(this.#cwd).gitLabel;
         if (branch === this.#branch)
             return;
         this.#branch = branch;
+        this.#syncWindowTitle();
         if (this.#tty)
             this.#render();
     }
@@ -514,7 +633,20 @@ export class LocalTui {
             this.#syncStreamingReveal(undefined);
             this.#render();
         }
+        if (event.type === 'llm/retry')
+            this.#retryDeadline = Date.now() + event.data.delayMs;
+        if (event.type === 'llm/retry-started' || event.type === 'turn/end')
+            this.#retryDeadline = undefined;
         this.#state = applyEvent(this.#state, event, presentation, workspace);
+        const compacting = this.#state.status === 'compacting';
+        if (compacting && this.#compactionStartedAt === undefined)
+            this.#compactionStartedAt = Date.now();
+        else if (!compacting)
+            this.#compactionStartedAt = undefined;
+        if (event.type === 'turn/end' && this.#inspected === undefined) {
+            this.#herdr.settled(event.data.reason.kind);
+            this.#syncWindowTitle();
+        }
         this.#emitNotification(this.#notifications.event({
             type: event.type,
             time: event.time,
@@ -574,8 +706,12 @@ export class LocalTui {
     }
     setStatus(status, options = {}) {
         // Parent lifecycle remains authoritative while the child owns the visible view.
-        if (options.root === true || this.#inspected === undefined)
+        if (options.root === true || this.#inspected === undefined) {
             this.#herdr.setRunning(status === 'running');
+            if (options.outcome !== undefined)
+                this.#herdr.settled(options.outcome);
+            this.#syncWindowTitle();
+        }
         if (options.root === true && this.#inspected !== undefined)
             return;
         if (this.#state.status === 'compacting')
@@ -585,9 +721,19 @@ export class LocalTui {
         if (this.#tty)
             this.#render();
     }
+    /** Update first-run model readiness without touching the model label. */
+    setModelReady(ready) {
+        if (this.#modelReady === ready)
+            return;
+        this.#modelReady = ready;
+        if (this.#tty)
+            this.#render();
+    }
     setModel(model, reasoningEffort) {
         this.#model = model;
         this.#reasoningEffort = reasoningEffort;
+        this.#syncSettingsActions();
+        this.#refreshSettingsCatalog();
         if (this.#tty)
             this.#render();
     }
@@ -609,13 +755,7 @@ export class LocalTui {
             ? undefined
             : { agents: roster.agents.map(agent => ({ ...agent, activity: [...agent.activity] })) };
         if ((this.#subagents?.agents.length ?? 0) === 0)
-            this.#subagentLauncherFocused = false;
-        if (this.#agentHub !== null) {
-            if (this.#subagents === undefined)
-                this.#agentHub = null;
-            else
-                this.#agentHub = updateAgentHub(this.#agentHub, this.#subagents);
-        }
+            this.#subagentSelection = undefined;
         const inspected = this.#inspected;
         if (inspected !== undefined) {
             const current = this.#subagents?.agents.find(agent => agent.id === inspected.id);
@@ -629,7 +769,7 @@ export class LocalTui {
                 };
             }
         }
-        if (!statusChanged && this.#agentHub === null)
+        if (!statusChanged)
             return;
         this.#syncTick();
         if (this.#tty)
@@ -644,7 +784,7 @@ export class LocalTui {
         this.#inspected = inspected === undefined ? undefined : { ...inspected };
         if (inspected !== undefined) {
             this.#inspectEscapeFenceUntil = 0;
-            this.#subagentLauncherFocused = false;
+            this.#subagentSelection = undefined;
         }
         this.#syncTick();
         if (this.#tty)
@@ -659,6 +799,7 @@ export class LocalTui {
             description: command.description,
             ...(command.inputHint === undefined ? {} : { inputHint: command.inputHint }),
         }));
+        this.#syncSettingsActions();
         this.#refreshAutocomplete();
         if (this.#tty)
             this.#render();
@@ -668,9 +809,7 @@ export class LocalTui {
             return false;
         this.#finishPrompt(null);
         this.#trajectory = createTrajectory(events);
-        this.#agentHub = null;
         this.#settings = null;
-        this.#copySelector = null;
         this.#search = null;
         this.#ac = null;
         this.#render();
@@ -695,9 +834,7 @@ export class LocalTui {
         const block = this.#state.blocks.findLast(candidate => candidate.kind === 'tool' && String(candidate.callId) === callId);
         if (block?.kind !== 'tool')
             return undefined;
-        // Reuse the card renderer so a decision explains the call the same way the
-        // transcript already does. The approval prompt renders its detail on one
-        // line, so the parts are joined here rather than handed over as rows.
+        // Keep the provider-owned presentation and input intact in the approval reader.
         const view = renderTool({
             name: block.name,
             arguments: block.args,
@@ -706,15 +843,9 @@ export class LocalTui {
             expanded: false,
             ...(block.presentation === undefined ? {} : { presentation: block.presentation }),
         });
-        const detail = view.summary === undefined || view.summary === ''
-            ? view.input.join(' ').replace(/\s+/gu, ' ').trim()
-            : '';
-        // A card with a summary already says what the call is. Without one the raw
-        // argument text is all there is, and its pretty-printed form would reduce to
-        // a lone brace on a single row, so the whole body is folded into one line.
-        return [view.title, view.summary, detail === '' ? undefined : detail]
+        return [view.title, view.summary, ...view.input]
             .filter((part) => part !== undefined && part !== '')
-            .join(' · ');
+            .join('\n');
     }
     notice(text, options = {}) {
         const merged = options.job === undefined ? undefined : mergeJobSettlement(this.#state, options.job);
@@ -757,7 +888,202 @@ export class LocalTui {
         else
             this.#plain.print();
     }
+    /**
+     * Run a Shell line as a live card that streams in place.
+     *
+     * The card is appended before the command starts and updated as it writes, so
+     * the reader watches their own command rather than switching to another
+     * surface and coming back. It never waits for an exit gesture: when the
+     * command finishes the card is finished too, exactly like a tool call.
+     */
+    async shellCommand(request) {
+        const block = { kind: 'shell', command: request.command, output: '', status: 'running' };
+        this.#insertShellBlock(block);
+        // Ctrl+C belongs to the running command while its card is alive, the same
+        // way it belongs to an active turn. The caller decides what to do with the
+        // abort; the provider only routes the key.
+        this.#shellAbort = request.abort;
+        let lastPaint = 0;
+        let pending = '';
+        let pendingPaint;
+        const cancelPending = () => { if (pendingPaint !== undefined) {
+            clearTimeout(pendingPaint);
+            pendingPaint = undefined;
+        } };
+        const paint = () => { if (this.#tty && !this.#disposed)
+            this.#render(); };
+        // Output can arrive faster than a frame is worth; coalescing keeps a chatty
+        // command from spending the whole turn in the renderer.
+        const append = (output) => {
+            pending = output;
+            const now = Date.now();
+            if (now - lastPaint < SHELL_PAINT_INTERVAL_MS) {
+                cancelPending();
+                pendingPaint = setTimeout(paint, SHELL_PAINT_INTERVAL_MS - (now - lastPaint));
+                return;
+            }
+            lastPaint = now;
+            this.#updateShellBlock(request.command, current => ({ ...current, output: pending }));
+            paint();
+        };
+        let result;
+        try {
+            result = await request.run(append, request.signal);
+        }
+        catch (error) {
+            this.#updateShellBlock(request.command, current => ({ ...current, status: 'error' }));
+            paint();
+            throw error;
+        }
+        finally {
+            cancelPending();
+            if (this.#shellAbort === request.abort)
+                this.#shellAbort = undefined;
+        }
+        const failed = result.interrupted === true || (result.code !== undefined && result.code !== 0);
+        this.#updateShellBlock(request.command, current => ({
+            ...current,
+            output: result.output === '' ? current.output : result.output,
+            status: failed ? 'error' : 'ok',
+            ...(result.code === undefined ? {} : { code: result.code }),
+            ...(request.share === true ? { shared: true } : {}),
+        }));
+        paint();
+        return result;
+    }
+    /**
+     * A side question, streamed into its own transcript block.
+     *
+     * Modelled on `shellCommand` rather than on `commandOutput`: the answer arrives
+     * over time, and the reader should watch it arrive where it will stay. Coalesced
+     * the same way, because a chatty stream would otherwise spend the turn in the
+     * renderer.
+     */
+    /** Navigation belongs to the pane only when nothing else is claiming it. */
+    #asideOwnsKeys() {
+        return this.#editor.text === '' && this.#ac === null && this.#prompt === null;
+    }
+    /**
+     * Leaving the pane stops the consultation.
+     *
+     * Without this the request kept running invisibly and its answer was dropped,
+     * so the reader could neither read it nor stop paying for it.
+     */
+    #closeAside() {
+        const aside = this.#aside;
+        this.#asideAbort?.abort();
+        this.#asideAbort = undefined;
+        this.#aside = undefined;
+        /**
+         * A finished answer collapses into one line rather than disappearing.
+         *
+         * The pane is above the composer, so closing it was the only way to get the
+         * screen height back — and that cost the text. Keeping the exchange as a
+         * folded block means the reader can always close the pane. A consultation
+         * still running records nothing: the reader left before there was an answer.
+         */
+        if (aside !== undefined && aside.status !== 'running' && aside.text.trim() !== '') {
+            this.#state = { ...this.#state, blocks: [...this.#state.blocks, { kind: 'aside', question: aside.question, text: aside.text }] };
+            this.#followTail();
+        }
+        this.#render();
+    }
+    /**
+     * A side question, streamed into its own pane above the composer.
+     *
+     * Not a transcript block: the exchange belongs to a conversation that is not
+     * this one, so it gets its own pane rather than a row in the conversation the
+     * reader is working in. The pane is docked, `Esc` closes it, and the session
+     * looks exactly as it did. Coalesced the same way a Shell card is, because a
+     * chatty stream would otherwise spend the turn in the renderer.
+     */
+    async asideQuestion(request) {
+        this.#asideAbort?.abort();
+        const abort = new AbortController();
+        this.#asideAbort = abort;
+        // Leaving the pane and losing the session both stop the consultation.
+        if (request.signal.aborted)
+            abort.abort();
+        else
+            request.signal.addEventListener('abort', () => abort.abort(), { once: true });
+        this.#aside = { question: request.question, text: '', status: 'running', scroll: 0 };
+        this.#render();
+        let lastPaint = 0;
+        let pending = '';
+        let pendingPaint;
+        const paint = () => { if (this.#tty && !this.#disposed)
+            this.#render(); };
+        const show = (change) => {
+            if (this.#aside !== undefined)
+                this.#aside = { ...this.#aside, ...change };
+        };
+        /**
+         * The pending text is applied by the paint, not merely followed by one: a
+         * chunk that arrives inside the throttle window used to schedule a repaint of
+         * the *old* text, so the last words before a pause never appeared.
+         */
+        const flush = () => {
+            if (pendingPaint !== undefined) {
+                clearTimeout(pendingPaint);
+                pendingPaint = undefined;
+            }
+            lastPaint = Date.now();
+            show({ text: pending });
+            paint();
+        };
+        const stream = (text) => {
+            pending = text;
+            const wait = SHELL_PAINT_INTERVAL_MS - (Date.now() - lastPaint);
+            if (wait <= 0) {
+                flush();
+                return;
+            }
+            if (pendingPaint !== undefined)
+                clearTimeout(pendingPaint);
+            pendingPaint = setTimeout(flush, wait);
+        };
+        try {
+            const result = await request.run(stream, abort.signal);
+            show({
+                text: result.text,
+                status: result.failed === true ? 'error' : 'done',
+                ...(result.detail === undefined ? {} : { detail: result.detail }),
+            });
+        }
+        catch (error) {
+            if (!abort.signal.aborted)
+                show({ status: 'error', detail: error instanceof Error ? error.message : String(error) });
+        }
+        finally {
+            if (pendingPaint !== undefined)
+                clearTimeout(pendingPaint);
+            if (this.#asideAbort === abort)
+                this.#asideAbort = undefined;
+            paint();
+        }
+    }
+    /** Append a Shell card and follow it, so the reader sees it start. */
+    #insertShellBlock(block) {
+        this.#state = { ...this.#state, blocks: [...this.#state.blocks, block] };
+        this.#followTail();
+        if (this.#tty)
+            this.#render();
+        else
+            this.#plain.print();
+    }
+    /** Replace the newest Shell card for `command`; a card is identified by its position. */
+    #updateShellBlock(command, update) {
+        const at = this.#state.blocks.findLastIndex(block => block.kind === 'shell' && block.command === command);
+        if (at < 0)
+            return;
+        const next = this.#state.blocks.slice();
+        next[at] = update(next[at]);
+        this.#state = { ...this.#state, blocks: next };
+    }
     prompt(request) {
+        // Background approvals take the terminal from a user-opened file reader.
+        if (this.#fileReviewAbort !== undefined && request.signal !== this.#fileReviewAbort.signal)
+            this.#fileReviewAbort.abort();
         if (this.#disposed || request.signal?.aborted === true)
             return Promise.resolve(null);
         if (this.#prompt !== null) {
@@ -775,18 +1101,21 @@ export class LocalTui {
         }
         this.#flushPasteBurst(true);
         this.#pasteBurst.clear();
-        if (request.notify !== false)
+        if (request.notify !== false) {
             this.#emitNotification(this.#notifications.humanPrompt());
-        this.#herdr.prompt(request.title);
+            this.#herdr.prompt(request.title);
+            this.#syncWindowTitle();
+        }
         if (this.#tty && request.documentImage !== undefined && this.#imageProtocol !== undefined)
             this.#term.output.write('\x1b[16t');
         const savedInput = this.#editor.snapshot();
-        this.#editor.setText(request.options?.length || request.allowCustom === false ? '' : request.initialInput ?? '');
+        this.#editor.setText(request.allowCustom === false || request.filterable === true || (request.options?.length && request.initialInput === undefined) ? '' : request.initialInput ?? '');
         this.#ac = null;
         const displaced = this.#displaceSurface();
         return new Promise((resolve) => {
             const selected = Math.max(0, filteredPromptOptions(request, '').findIndex(option => (option.value ?? option.label) === request.initialValue) ?? 0);
-            const pending = { request, selected, checked: new Set(), resolve, savedInput,
+            const pending = { request, selected, checked: new Set((request.options ?? []).flatMap((option, index) => request.initialValues?.includes(option.value ?? option.label) ? [index] : [])), resolve, savedInput,
+                ...(request.armMs !== undefined && request.armMs > 0 ? { armedUntil: Date.now() + request.armMs } : {}),
                 ...(request.documentPosition === undefined ? {} : { documentAnchor: request.documentPosition, documentQuery: request.documentPosition.query,
                     documentWordWrap: request.documentPosition.wordWrap, documentColumn: request.documentPosition.column }),
                 ...(request.documentTail === true && request.documentPosition?.following !== false ? { documentScroll: Number.POSITIVE_INFINITY } : {}) };
@@ -864,11 +1193,13 @@ export class LocalTui {
         });
     }
     replaceSession(events, presentations, status = 'idle', reason = 'open') {
+        if (reason !== 'refresh')
+            this.#fileReviewAbort?.abort();
         this.#trajectory = null;
         const state = replayEvents(events, presentations);
-        // Notices and tool catalogs do not turn a blank session into a document
-        // that /new needs to separate. Refreshes are the same document.
-        const boundary = reason === 'open' || (reason === 'new' && this.#state.blocks.some(block => block.kind !== 'notice' && block.kind !== 'toolCatalog'));
+        // A notice does not turn a blank session into a document that /new needs
+        // to separate. Refreshes are the same document.
+        const boundary = reason === 'open' || (reason === 'new' && this.#state.blocks.some(block => block.kind !== 'notice'));
         const blocks = boundary ? [transcriptSeam('session-opened'), ...state.blocks] : state.blocks;
         this.#state = { ...state, status, compactCommandId: undefined, blocks };
         this.#plain.resetPrinted();
@@ -881,12 +1212,13 @@ export class LocalTui {
             this.#plain.print();
     }
     setSession(info) {
+        if (info.id !== this.#sessionId)
+            this.#fileReviewAbort?.abort();
         this.#switchDraft(this.#inspected?.id ?? info.id);
         this.#sessionId = info.id;
         this.#herdr.setSession(info.id);
         const title = info.title?.trim();
         this.#sessionTitle = title === undefined || title === '' ? undefined : title;
-        this.#recentSessions = info.recent.map((session) => ({ ...session }));
         this.#sessionStats = info.stats === undefined ? undefined : { ...info.stats };
         this.#sessionControls = info.controls === undefined
             ? undefined
@@ -894,6 +1226,7 @@ export class LocalTui {
                 ...info.controls,
                 ...(info.controls.plan === undefined ? {} : { plan: { ...info.controls.plan } }),
             };
+        this.#syncSettingsActions();
         if (!this.#tty)
             return;
         this.#syncWindowTitle();
@@ -904,30 +1237,50 @@ export class LocalTui {
         else
             this.#render();
     }
-    /**
-     * Mirror the folded session title into the terminal's own window/tab title.
-     * Control characters are stripped so a title can never inject an escape
-     * sequence, and the payload is bounded to keep tab strips readable.
-     */
+    /** Only the foreground terminal owner emits title and program-state sequences. */
     #syncWindowTitle() {
-        const title = windowTitleText(this.#sessionTitle);
-        if (title === this.#writtenWindowTitle)
+        if (!this.#tty || this.#disposed)
+            return;
+        const status = this.#herdr.programStatus;
+        const title = terminalTitle(this.#terminalTitle, status, this.#sessionTitle, this.#cwd, this.#branch);
+        if (title !== this.#writtenWindowTitle && !(this.#terminalTitle === 'off' && this.#writtenWindowTitle === undefined)) {
+            this.#writtenWindowTitle = title;
+            this.#term.output.write(`\x1b]2;${title}\x07`);
+        }
+        if (this.#terminalState === 'auto' && !this.#programQuerySent) {
+            this.#programQuerySent = true;
+            this.#term.output.write(PROGRAM_STATUS_QUERY);
+        }
+        const enabled = this.#terminalState === 'on' || this.#terminalState === 'auto' && this.#programSupported;
+        if (!enabled) {
+            if (this.#writtenProgramState !== undefined)
+                this.#term.output.write(programStatusSequence('clear'));
+            this.#writtenProgramState = undefined;
+            return;
+        }
+        // Only the session name is exported as metadata; prompt bodies and errors stay in the TUI.
+        const sequence = programStatusSequence({ state: status.state, ...(this.#sessionTitle === undefined ? {} : { message: this.#sessionTitle }) });
+        if (sequence === this.#writtenProgramState)
             return;
-        this.#writtenWindowTitle = title;
-        this.#term.output.write(`\x1b]2;${title}\x07`);
+        this.#writtenProgramState = sequence;
+        this.#term.output.write(sequence);
     }
     /**
-     * Re-derive the 24-bit switch from the active color preference. Every path
+     * Re-derive the color depth from the active color preference. Every path
      * that changes `#colors` calls this so `/settings` takes effect immediately.
      */
-    #syncTrueColor() {
-        this.#trueColor = this.#colors && detectTrueColor();
+    #syncColorDepth() {
+        this.#colorDepth = this.#colors ? detectColorDepth() : 'ansi16';
     }
     /** Apply prefs loaded from this entry's config (does not persist). */
     applyStoredPrefs(prefs) {
+        if (this.#disposed)
+            return;
+        this.#prefsVersion++;
         this.#applyPrefs(prefs, { persist: false, forceToolsSync: true });
         if (this.#settings !== null)
             this.#settings = { ...this.#settings, prefs };
+        this.#refreshSettingsCatalog();
         if (this.#tty)
             this.#render();
     }
@@ -939,32 +1292,27 @@ export class LocalTui {
             motion: this.#motion,
             mathMode: this.#mathMode,
             mermaidMode: this.#mermaidMode,
+            hideThinking: this.#hideThinking,
             editor: this.#externalEditor,
-            terminalProgress: this.#terminalProgress,
+            terminalTitle: this.#terminalTitle,
+            terminalState: this.#terminalState,
             copyOnSelect: this.#copyOnSelect,
             mouseInteraction: this.#mouseInteraction,
             pasteProtection: this.#pasteProtection,
             checkUpdates: this.#checkUpdates,
             startupChangelog: this.#startupChangelog,
             notifications: this.#notificationPolicy,
-            notificationThreshold: this.#notificationThreshold,
-            notificationFocus: this.#notificationFocus,
-            statusBar: {
-                ...this.#statusBar,
-                groups: [...this.#statusBar.groups],
-                ...(this.#statusBar.order === undefined ? {} : { order: [...this.#statusBar.order] }),
-                ...(this.#statusBar.meta === undefined ? {} : { meta: [...this.#statusBar.meta] }),
-                ...(this.#statusBar.metaOrder === undefined ? {} : { metaOrder: [...this.#statusBar.metaOrder] }),
-                ...(this.#statusBar.colors === undefined ? {} : { colors: { ...this.#statusBar.colors } }),
-                ...(this.#statusBar.sides === undefined ? {} : { sides: { ...this.#statusBar.sides } }),
-            },
+            // The whole document, not the density alone: a projection that dropped the
+            // narrowing made every later re-read of the preferences show the parts the
+            // reader had just hidden.
+            statusBar: statusBarDocument(this.#statusBar),
         };
     }
     /** Called after a live `/settings` change. */
     setPrefsPersist(persist) {
         this.#persistPrefs = persist;
     }
-    /** Bind the native Plugins section; unbinding cancels and drains its active form. */
+    /** Bind product configuration and Advanced forms; unbinding cancels and drains its active form. */
     bindPluginSettings(binding) {
         if (this.#pluginSettings !== undefined)
             throw new Error('omdsh-tui: Plugin settings are already bound');
@@ -975,8 +1323,7 @@ export class LocalTui {
             this.#pluginSettings = undefined;
             this.#pluginSettingsAbort?.abort();
             await this.#pluginSettingsTask;
-            if (this.#settings !== null)
-                this.#settings = createSettings(this.prefs(), undefined, this.#agentBehavior, this.#features, undefined, discoverEditors(this.#externalEditor));
+            this.#rebuildSettings([]);
             if (this.#tty && !this.#disposed)
                 this.#render();
         };
@@ -998,8 +1345,7 @@ export class LocalTui {
             this.#updateAgentBehavior = undefined;
             this.#agentBehavior = undefined;
             this.#agentBehaviorPending = false;
-            if (this.#settings !== null)
-                this.#settings = createSettings(this.prefs(), undefined, this.#agentBehavior, this.#features, this.#pluginSettings?.entries(), discoverEditors(this.#externalEditor));
+            this.#rebuildSettings(this.#pluginSettings?.entries() ?? []);
             if (this.#tty && !this.#disposed)
                 this.#render();
         };
@@ -1163,14 +1509,31 @@ export class LocalTui {
         return () => { if (this.#steerHandler === handler)
             this.#steerHandler = undefined; };
     }
+    /**
+     * Last-resort restore for a process that exits without disposing: leave the
+     * alternate screen, give every mode back and show the cursor. Writes to a TTY
+     * are synchronous, so this completes before the process ends.
+     */
+    #restoreTerminalOnExit() {
+        if (this.#disposed || !this.#tty)
+            return;
+        try {
+            this.#renderer.finish();
+        }
+        catch { /* best effort while exiting */ }
+        this.#session.release();
+        this.#term.output.write('\x1b[?25h');
+    }
     dispose() {
         if (this.#disposed)
-            return this.#herdr.release();
+            return this.#disposeTask ?? this.#herdr.release();
         this.#flushPasteBurst(true);
         this.#flushDraft();
         this.#disposed = true;
         this.#steerHandler = undefined;
         this.#imagePreviewAbort?.abort();
+        this.#fileReviewAbort?.abort();
+        this.#asideAbort?.abort();
         for (const directory of this.#imageTemporary) {
             try {
                 rmSync(directory, { recursive: true, force: true });
@@ -1200,7 +1563,6 @@ export class LocalTui {
             this.#tick = null;
         }
         this.#stopRevealTick();
-        this.#setTerminalProgress(false);
         if (this.#loopTick !== null) {
             clearInterval(this.#loopTick);
             this.#loopTick = null;
@@ -1220,7 +1582,13 @@ export class LocalTui {
                 this.#term.output.write('\x1b]2;\x07');
                 this.#writtenWindowTitle = undefined;
             }
-            this.#term.output.write('\x1b[?2004l\x1b[?1004l\x1b[?25h\r\n');
+            if (this.#writtenProgramState !== undefined)
+                this.#term.output.write(programStatusSequence('clear'));
+            this.#writtenProgramState = undefined;
+            this.#offExit?.();
+            this.#offExit = undefined;
+            this.#session.dispose();
+            this.#term.output.write('\x1b[?25h\r\n');
             if (this.#resumeHintRequested && this.#sessionId !== undefined) {
                 this.#term.output.write(`\r\nResume this session with ${APP_NAME} --resume ${this.#sessionId}\r\n`);
             }
@@ -1230,6 +1598,10 @@ export class LocalTui {
         }
         if (this.#escapeTimer !== null)
             clearTimeout(this.#escapeTimer);
+        if (this.#transientTimer !== null) {
+            clearTimeout(this.#transientTimer);
+            this.#transientTimer = null;
+        }
         if (this.#autocompleteTimer !== null)
             clearTimeout(this.#autocompleteTimer);
         this.#autocompleteAbort?.abort();
@@ -1240,7 +1612,8 @@ export class LocalTui {
         this.#offAgentBehaviorWatch = undefined;
         this.#settlePending(null);
         this.#finishPrompt(null);
-        return this.#herdr.release();
+        this.#disposeTask = Promise.all([this.#herdr.release(), this.#prefsSaveTask]).then(() => { });
+        return this.#disposeTask;
     }
     /** Settle one pending read, detaching its abort listener. */
     #settlePending(submission) {
@@ -1262,11 +1635,30 @@ export class LocalTui {
             return true;
         return this.#subagents?.agents.some(agent => agent.phase === 'running' || agent.phase === 'starting') === true;
     }
+    /** Countdown shown on the working row while a retry or a compaction is pending. */
+    #workingLabel() {
+        if (this.#retryDeadline !== undefined) {
+            return `Retrying in ${Math.max(0, Math.ceil((this.#retryDeadline - Date.now()) / 1000))}s`;
+        }
+        if (this.#state.status === 'compacting' && this.#compactionStartedAt !== undefined) {
+            return `Compacting ${Math.max(0, Math.floor((Date.now() - this.#compactionStartedAt) / 1000))}s`;
+        }
+        return undefined;
+    }
+    /** The newest image the transcript carries, whichever side produced it. */
+    #latestImageRef() {
+        for (let index = this.#state.blocks.length - 1; index >= 0; index -= 1) {
+            const block = this.#state.blocks[index];
+            const image = block.kind === 'tool' || block.kind === 'user' ? block.image : undefined;
+            if (image !== undefined)
+                return image;
+        }
+        return undefined;
+    }
     #syncTick() {
         if (!this.#tty)
             return;
         const busy = this.#busy();
-        this.#setTerminalProgress(this.#terminalProgress && busy);
         if (busy && this.#motion !== 'off') {
             if (this.#tick === null) {
                 this.#tick = setInterval(() => {
@@ -1323,31 +1715,6 @@ export class LocalTui {
         clearInterval(this.#revealTick);
         this.#revealTick = null;
     }
-    #setTerminalProgress(active) {
-        if (!this.#tty)
-            return;
-        if (active) {
-            if (this.#terminalProgressActive)
-                return;
-            this.#terminalProgressActive = true;
-            this.#term.output.write(terminalProgressSequence(true));
-            this.#terminalProgressTick = setInterval(() => {
-                if (!this.#disposed && this.#terminalProgressActive) {
-                    this.#term.output.write(terminalProgressSequence(true));
-                }
-            }, TERMINAL_PROGRESS_KEEPALIVE_MS);
-            this.#terminalProgressTick.unref?.();
-            return;
-        }
-        if (this.#terminalProgressTick !== null) {
-            clearInterval(this.#terminalProgressTick);
-            this.#terminalProgressTick = null;
-        }
-        if (!this.#terminalProgressActive)
-            return;
-        this.#terminalProgressActive = false;
-        this.#term.output.write(terminalProgressSequence(false));
-    }
     #syncLoopTick() {
         if (!this.#tty)
             return;
@@ -1466,10 +1833,14 @@ export class LocalTui {
         }
         if (this.#deferInitialRender)
             return;
+        // Rows committed to scrollback are immutable; the first real paint waits for the probe so it already uses the reported colors.
+        if (this.#probeGate)
+            return;
         const width = this.#term.width();
         const renderState = this.#reveal === undefined
             ? this.#state
             : revealStreamingAssistant(this.#state, this.#reveal.revealed);
+        const workingLabel = this.#workingLabel();
         const frame = this.#tty
             ? renderView(renderState, {
                 width,
@@ -1477,6 +1848,7 @@ export class LocalTui {
                 imageCellSize: this.#imageCellSize,
                 mathMode: this.#mathMode,
                 mermaidMode: this.#mermaidMode,
+                hideThinking: this.#hideThinking,
                 height: this.#term.height(),
                 model: this.#model,
                 ...(this.#reasoningEffort === undefined ? {} : { reasoningEffort: this.#reasoningEffort }),
@@ -1492,46 +1864,47 @@ export class LocalTui {
                 ...(this.#sessionTitle === undefined ? {} : { sessionTitle: this.#sessionTitle }),
                 version: APP_VERSION,
                 appName: APP_NAME,
+                displayName: APP_DISPLAY_NAME,
                 spinnerFrame: this.#spinner,
                 motion: this.#motion,
-                trueColor: this.#trueColor,
+                colorDepth: this.#colorDepth,
                 themeName: this.#themeName,
+                terminal: this.#terminalColors,
+                ...(workingLabel === undefined ? {} : { workingLabel }),
+                ...(this.#transientStatus === undefined ? {} : { transientStatus: this.#transientStatus }),
                 scrollStart: this.#follow ? Number.POSITIVE_INFINITY : this.#scrollStart,
                 ...(this.#focusBlock === undefined ? {} : { focusBlock: this.#focusBlock, focusBlockEdge: this.#focusBlockEdge ?? 'start' }),
                 ...(this.#transcriptSearch === null ? {} : {
                     transcriptSearch: {
                         query: this.#transcriptSearch.query,
-                        matches: searchBlockIndexes(this.#state.blocks.map(blockSearchText), this.#transcriptSearch.query),
                         focus: this.#transcriptSearch.focus,
                         editing: this.#transcriptSearch.editing,
                     },
                 }),
                 toolsExpanded: this.#toolsExpanded,
+                expandedOutputs: this.#expandedOutputs,
                 expandedTools: this.#detailedToolIds(),
                 toolDetailsKey: keysForAction(this.#keybindings, 'toggle-tool-details'),
                 turnDetailsKey: keysForAction(this.#keybindings, 'toggle-tools'),
                 ...(this.#steerHandler === undefined ? {} : { steerKey: keysForAction(this.#keybindings, 'steer-turn') }),
                 openedGroups: this.#openedGroups,
                 commands: this.#commands(),
-                recentSessions: this.#recentSessions,
-                welcomeTips: this.#welcomeTips,
+                modelReady: this.#modelReady,
                 ...(this.#sessionStats === undefined ? {} : { sessionStats: this.#sessionStats }),
                 ...(this.#sessionControls === undefined ? {} : { sessionControls: this.#sessionControls }),
                 ...(this.#loopStatus === undefined ? {} : { loopStatus: this.#loopStatus }),
                 ...(this.#subagents === undefined ? {} : { subagents: this.#subagents }),
-                subagentLauncherFocused: this.#subagentLauncherFocused,
+                ...(this.#subagentSelection === undefined ? {} : { subagentSelection: this.#subagentSelection }),
                 ...(this.#inspected === undefined ? {} : { inspected: this.#inspected }),
                 ...(this.#trajectory === null ? {} : { trajectory: this.#trajectory }),
-                ...(this.#agentHub === null ? {} : { agentHub: this.#agentHub }),
+                ...(this.#aside === undefined ? {} : { aside: this.#aside }),
                 statusBar: this.#statusBar,
                 ...(this.#prompt === null ? {} : { promptSelector: this.#prompt }),
                 ...(this.#settings !== null
                     ? { settings: this.#settings }
-                    : this.#copySelector !== null
-                        ? { copySelector: this.#copySelector }
-                        : this.#search !== null
-                            ? { historySearch: this.#search }
-                            : this.#ac !== null ? { autocomplete: this.#ac } : {}),
+                    : this.#search !== null
+                        ? { historySearch: this.#search }
+                        : this.#ac !== null ? { autocomplete: this.#ac } : {}),
             })
             : { lines: [] };
         this.#focusBlock = undefined;
@@ -1542,8 +1915,9 @@ export class LocalTui {
         }
         this.#syncScroll(frame.transcript);
         this.#jumpToLatest = frame.jumpToLatest;
+        this.#fileActionFrame = frame.transcript === undefined || frame.transientSurface === 'overlay' ? undefined : frame;
         this.#setMouseTracking(frame.transcript !== undefined && frame.transientSurface !== 'overlay'
-            && (this.#inspecting || this.#maxStart > 0));
+            && (this.#inspecting || this.#maxStart > 0 || (frame.transcript.fileRegions?.length ?? 0) > 0));
         // A run opening or folding reshapes rows above the screen in place; the
         // renderer's frozen boundary is a row index and has to be told, or a fold
         // blanks the screen and a large one replays the transcript into history.
@@ -1634,7 +2008,27 @@ export class LocalTui {
         if (!this.#tty || enabled === this.#mouseTracking)
             return;
         this.#mouseTracking = enabled;
-        this.#term.output.write(enabled ? '\x1b[?1000h\x1b[?1002h\x1b[?1006h' : '\x1b[?1006l\x1b[?1002l\x1b[?1000l');
+        this.#session.setMode('mouse', MOUSE_TRACKING, enabled);
+    }
+    /** Give every terminal mode back before the terminal is lent out (Ctrl+Z, external editor). */
+    #handOffTerminal() {
+        this.#setMouseTracking(false);
+        this.#session.handOff();
+    }
+    /** Run `run` with the terminal handed off; take it back and repaint afterwards. */
+    #handTerminal(run) {
+        this.#handOffTerminal();
+        this.#term.input.setRawMode?.(false);
+        try {
+            return run();
+        }
+        finally {
+            if (!this.#disposed) {
+                this.#term.input.setRawMode?.(true);
+                this.#session.takeBack();
+                this.#renderer.reset();
+            }
+        }
     }
     /**
      * After a Ctrl+O toggle: read what is open in a browsing frame at `target`,
@@ -1680,14 +2074,14 @@ export class LocalTui {
                     this.#routeInput(event);
             }, 80);
         }
-        else if (rest.length > 32) {
+        else if (rest.length > 32 && !rest.startsWith('\x1b]')) {
             this.#pendingKeys = '';
         }
     }
     #routeInputBatch(events) {
         if (this.#pasteProtection && this.#state.status !== 'compacting' && !this.#paste && this.#pasteInFlight === 0
-            && this.#prompt === null && this.#settings === null && this.#copySelector === null
-            && this.#search === null && this.#trajectory === null && this.#agentHub === null && this.#transcriptSearch === null
+            && this.#prompt === null && this.#settings === null
+            && this.#search === null && this.#trajectory === null && this.#transcriptSearch === null
             && events.every(event => event.type === 'text' || (event.type === 'key' && ['enter', 'ctrl+j', 'tab'].includes(event.id)))) {
             if (this.#pasteBurstTimer !== undefined)
                 clearTimeout(this.#pasteBurstTimer);
@@ -1710,8 +2104,8 @@ export class LocalTui {
             this.#dispatch(event);
             return;
         }
-        const composer = this.#state.status !== 'compacting' && this.#prompt === null && this.#settings === null && this.#copySelector === null
-            && this.#search === null && this.#trajectory === null && this.#agentHub === null && this.#transcriptSearch === null;
+        const composer = this.#state.status !== 'compacting' && this.#prompt === null && this.#settings === null
+            && this.#search === null && this.#trajectory === null && this.#transcriptSearch === null;
         if (this.#paste || this.#pasteInFlight > 0 || !this.#pasteProtection || !composer
             || event.type === 'paste-start' || event.type === 'paste-end') {
             this.#flushPasteBurst(true);
@@ -1728,6 +2122,7 @@ export class LocalTui {
     }
     #deliverPasteEmission(event) {
         if (event.type === 'paste') {
+            this.#literalInput ||= this.#editor.cursor === 0 && event.value.startsWith('!');
             this.#editor.paste(event.value.replaceAll('\r\n', '\n').replaceAll('\r', '\n'));
             this.#refreshAutocomplete();
             this.#render();
@@ -1763,7 +2158,7 @@ export class LocalTui {
     async #acceptPastedText(text) {
         if (this.#prompt !== null) {
             const prompt = this.#prompt;
-            if (prompt.request.documentSource !== undefined && prompt.documentInput !== undefined) {
+            if (prompt.documentInput !== undefined) {
                 this.#handleDocumentReader({ type: 'text', value: text }, prompt);
                 return;
             }
@@ -1776,7 +2171,7 @@ export class LocalTui {
             this.#render();
             return;
         }
-        if (this.#settings !== null || this.#copySelector !== null)
+        if (this.#settings !== null)
             return;
         if (this.#search !== null) {
             this.#applySearch({ type: 'text', value: text });
@@ -1810,12 +2205,13 @@ export class LocalTui {
                 return;
             }
         }
+        this.#literalInput ||= this.#editor.cursor === 0 && text.startsWith('!');
         this.#editor.paste(text);
         this.#refreshAutocomplete();
         this.#render();
     }
     async #pasteClipboard() {
-        if (this.#search === null && this.#settings === null && this.#copySelector === null) {
+        if (this.#search === null && this.#settings === null) {
             const image = await this.#readClipboardImage();
             if (image !== null) {
                 if (await this.#images.admit(image)) {
@@ -1863,8 +2259,27 @@ export class LocalTui {
             return;
         const inside = (target) => event.row === target.row && event.column >= target.column && event.column < target.column + target.width;
         if (event.button === 'right') {
-            if (event.action === 'press')
-                void this.#copySelection();
+            if (event.action === 'press') {
+                if (this.#selection.active)
+                    void this.#copySelection();
+                else {
+                    const document = this.#renderer.documentRowAt(event.row);
+                    const frame = this.#fileActionFrame;
+                    const source = frame?.documentRows;
+                    const region = document === undefined ? undefined : frame?.transcript?.fileRegions?.find(region => document >= region.start && document < region.end);
+                    const expected = document === undefined || source === undefined || source === null ? undefined
+                        : frame?.lines[source.frameStart + document - source.documentStart];
+                    const actual = this.#renderer.viewport()[event.row];
+                    // Native-history snapshots may differ from the current document. Do
+                    // not reinterpret their old text as another file after a reflow.
+                    if (region !== undefined && expected !== undefined && actual !== undefined && stripAnsi(sanitizeDisplayLine(expected)).trimEnd() === stripAnsi(actual).trimEnd()) {
+                        const block = this.#state.blocks[region.block];
+                        const action = block === undefined ? undefined : blockFileAction(block);
+                        if (action !== undefined)
+                            this.#openFileAction(action, region.file);
+                    }
+                }
+            }
             return;
         }
         if (event.action === 'press') {
@@ -1921,16 +2336,45 @@ export class LocalTui {
                 this.notice('Could not copy selection to the clipboard.', { level: 'error' });
         }
     }
+    #openFileAction(action, initial) {
+        if (!this.#tty || this.#disposed || this.#prompt !== null || this.#fileReviewAbort !== undefined)
+            return;
+        const abort = new AbortController();
+        this.#fileReviewAbort = abort;
+        this.#selection.clear();
+        const surface = {
+            prompt: (request) => this.prompt({ ...request, onSuperseded: () => { abort.abort(); } }),
+            notice: (text, options) => { this.notice(text, options); },
+            openFileInEditor: (path) => { this.openFileInEditor(path); },
+            insertText: (text) => { this.insertText(text); },
+        };
+        void reviewFiles(surface, action.title, action.cwd, action.files, index => fileDocument(action.files[index].path, abort.signal), abort.signal, initial ?? (action.files.length === 1 ? 0 : undefined), false)
+            .catch(error => { if (!abort.signal.aborted && !this.#disposed)
+            this.notice(`Could not preview file: ${error instanceof Error ? error.message : String(error)}`, { level: 'error' }); })
+            .finally(() => { if (this.#fileReviewAbort === abort)
+            this.#fileReviewAbort = undefined; });
+    }
     #dispatch(event) {
+        // Any input makes the last confirmation stale; a note that survives typing
+        // starts competing with the command the reader is writing.
+        if (event.type === 'key' || event.type === 'text')
+            this.#clearTransientStatus();
         if (event.type === 'cell-size') {
             this.#imageCellSize = { width: event.width, height: event.height };
             if (this.#prompt?.request.documentImage !== undefined)
                 this.#render();
             return;
         }
+        if (event.type === 'program-status-support') {
+            this.#programSupported = true;
+            this.#syncWindowTitle();
+            return;
+        }
+        if (this.#session.handle(event))
+            return;
         if (event.type === 'focus') {
             this.#terminalFocused = event.focused;
-            if (event.focused && this.#notificationFocus === 'unfocused')
+            if (event.focused && this.#notificationPolicy === 'unfocused')
                 this.#notificationQueue.clear();
             return;
         }
@@ -1954,7 +2398,10 @@ export class LocalTui {
         if (event.type === 'wheel') {
             this.#jumpPress = undefined;
             if (this.#mouseTracking && !this.#paste && this.#pasteInFlight === 0) {
-                this.#scrollBy(event.direction === 'up' ? -3 : 3);
+                const step = wheelStep(this.#wheelGesture, Date.now(), event.direction === 'up' ? -1 : 1, !this.#wheelAccelerates);
+                this.#wheelGesture = step.gesture;
+                if (step.lines !== 0)
+                    this.#scrollBy(step.lines);
             }
             return;
         }
@@ -2020,7 +2467,7 @@ export class LocalTui {
         if (this.#handlePrompt(event))
             return;
         if (this.#trajectory !== null) {
-            const { pageSize } = trajectoryListMetrics(this.#trajectory, this.#term.height());
+            const { pageSize } = trajectoryListMetrics(this.#trajectory, this.#term.height(), this.#term.width());
             const { pageLines } = trajectoryDetailMetrics(this.#trajectory, this.#term.height());
             const command = applyTrajectoryEvent(this.#trajectory, event, { pageSize, detailPageLines: pageLines });
             if ('close' in command)
@@ -2030,25 +2477,12 @@ export class LocalTui {
             this.#render();
             return;
         }
-        if (this.#agentHub !== null) {
-            const command = applyAgentHubEvent(this.#agentHub, event);
-            if ('close' in command)
-                this.#agentHub = null;
-            else if ('open' in command) {
-                this.#agentHub = null;
-                this.#openInspect(command.open);
-            }
-            else
-                this.#agentHub = command.state;
-            this.#render();
-            return;
-        }
         if (this.#transcriptSearch !== null) {
             this.#applyTranscriptSearch(event);
             return;
         }
         if (event.type === 'key' && event.id === 'end' && this.#jumpToLatest !== undefined
-            && this.#settings === null && this.#copySelector === null && this.#search === null) {
+            && this.#settings === null && this.#search === null) {
             this.#followTail();
             this.#render();
             return;
@@ -2059,60 +2493,31 @@ export class LocalTui {
                 return;
         }
         if (this.#inspected !== undefined && this.#inspected.writable !== true && event.type === 'text'
-            && this.#prompt === null && this.#settings === null && this.#copySelector === null && this.#search === null) {
-            return;
-        }
-        if (event.type === 'key' && event.id === 'ctrl+c') {
-            if (this.#prompt !== null) {
-                this.#finishPrompt(null);
-                this.#editor.setText('');
-                this.#render();
-                return;
-            }
-            if (this.#settings !== null) {
-                this.#settings = null;
-                this.#render();
-                return;
-            }
-            if (this.#copySelector !== null) {
-                this.#copySelector = null;
-                this.#render();
-                return;
-            }
-            if (this.#search !== null) {
-                this.#search = null;
-                this.#render();
-                return;
-            }
-            const now = Date.now();
-            if (now - this.#lastSigintTime < DOUBLE_CTRL_C_MS) {
-                this.#lastSigintTime = 0;
-                this.#quit();
-                return;
-            }
-            this.#lastSigintTime = now;
-            if (this.#state.status !== 'idle') {
-                for (const listener of this.#interrupts)
-                    listener();
-            }
-            else {
-                this.#literalInput = false;
-                this.#editor.clear();
-                this.#images.clear();
-                this.#files.clear();
-                this.#historyIndex = 0;
-                this.#clearDraft();
-                this.#ac = null;
-                this.#render();
-            }
+            && this.#prompt === null && this.#settings === null && this.#search === null) {
             return;
         }
         if (this.#settings !== null) {
             this.#applySettings(event);
             return;
         }
-        if (this.#copySelector !== null) {
-            this.#applyCopySelector(event);
+        /**
+         * The side pane is a companion, not a mode: it answers where the reader is
+         * already working, so it must not take keys the composer is using. It reads
+         * navigation only while the composer is empty and nothing else is offering a
+         * choice — a draft, an autocomplete list, or historical recall all keep their
+         * arrows, and Escape keeps closing whatever is actually on top.
+         */
+        if (this.#aside !== undefined && this.#asideOwnsKeys() && event.type === 'key'
+            && (event.id === 'up' || event.id === 'down' || event.id === 'pageUp' || event.id === 'pageDown')) {
+            const step = event.id === 'pageUp' || event.id === 'pageDown' ? 6 : 1;
+            const delta = event.id === 'up' || event.id === 'pageUp' ? -step : step;
+            this.#aside = { ...this.#aside, scroll: Math.max(0, this.#aside.scroll + delta) };
+            this.#render();
+            return;
+        }
+        if (this.#aside !== undefined && event.type === 'key' && event.id === 'escape'
+            && this.#editor.text === '' && this.#ac === null) {
+            this.#closeAside();
             return;
         }
         if (this.#search !== null) {
@@ -2126,92 +2531,210 @@ export class LocalTui {
         }
         if (this.#handleSubagentLauncher(event))
             return;
-        if (event.type === 'key' && event.id === 'escape') {
-            if (this.#inspected !== undefined) {
-                if (this.#inspected.writable === true && (this.#editor.text !== '' || this.#images.count > 0)) {
-                    this.#editor.clear();
-                    this.#images.clear();
-                    this.#files.clear();
-                    this.#historyIndex = 0;
-                    this.#literalInput = false;
-                    this.#clearDraft();
-                    this.#ac = null;
-                    this.#render();
-                    return;
-                }
-                this.#closeInspect();
-                return;
-            }
-            if (this.#state.status !== 'idle' || this.#pending === null
-                || this.#editor.text !== '' || this.#images.count > 0) {
-                this.#lastEscapeTime = 0;
-            }
-            else {
-                const now = Date.now();
-                if (now - this.#lastEscapeTime < DOUBLE_ESCAPE_MS) {
-                    this.#lastEscapeTime = 0;
-                    for (const listener of this.#rewinds)
-                        listener();
-                }
-                else {
-                    this.#lastEscapeTime = now;
-                }
-                return;
-            }
-        }
+        // Escape is the one key that gives back exactly one layer, so it is resolved
+        // here — after the overlays and the autocomplete have had their turn — and
+        // not with the other actions above.
+        if (event.type === 'key' && this.#boundAction(event.id) === 'interrupt' && this.#runInterrupt())
+            return;
         if (event.type === 'key' && (event.id === 'backspace' || event.id === 'delete')
             && this.#images.removeAtCursor(event.id)) {
             this.#refreshAutocomplete();
             this.#render();
             return;
         }
+        if (event.type === 'key' && (event.id === 'ctrl+-' || event.id === 'ctrl+_')
+            && this.#clearedDraft !== undefined && this.#clearedDraft.revision === this.#editor.revision
+            && !this.#hasComposerContent()) {
+            const cleared = this.#clearedDraft.draft;
+            this.#clearedDraft = undefined;
+            this.#restoreDraft(cleared);
+            this.#historyIndex = 0;
+            this.#refreshAutocomplete();
+            this.#render();
+            return;
+        }
         this.#applyCommand(this.#editor.handle(event));
     }
-    #handlePrompt(event) {
-        let prompt = this.#prompt;
-        if (prompt === null)
-            return false;
-        if (event.type === 'key' && event.id === 'ctrl+c' && prompt.request.interrupt !== undefined) {
-            this.#lastSigintTime = Date.now();
-            prompt.request.interrupt();
+    /**
+     * Resolve `interrupt` against whatever currently owns the screen.
+     *
+     * One action, one meaning — cancel what is happening — but the thing that is
+     * happening depends on how deep the reader is. The order runs from the most
+     * transient surface to the least, so Escape always gives back exactly one
+     * layer instead of dropping the reader somewhere unrelated.
+     */
+    #runInterrupt() {
+        if (this.#prompt !== null) {
+            if (this.#prompt.request.presentation === 'progress' || this.#prompt.request.interrupt === undefined) {
+                this.#finishPrompt(null);
+                return true;
+            }
+            const handled = this.#prompt.request.interrupt();
             this.#finishPrompt(null);
-            if (this.#state.status !== 'idle')
+            if (handled !== true && this.#state.status !== 'idle')
                 for (const listener of this.#interrupts)
                     listener();
-            this.#render();
             return true;
         }
-        if (event.type === 'key' && event.id === 'ctrl+s' && prompt.request.skippable === true) {
-            this.#editor.setText('');
-            this.#finishPrompt('');
-            this.#render();
+        // Escaping a child transcript returns to the parent, and a writable child
+        // with a draft clears it first — the same order the reader expects from
+        // any other depth.
+        if (this.#inspected !== undefined) {
+            if (this.#inspected.writable === true && this.#hasComposerContent()) {
+                this.#clearComposerWithUndo();
+                return true;
+            }
+            this.#closeInspect();
             return true;
         }
-        const takeTime = event.type === 'key' && event.id === 'ctrl+t';
-        const editing = event.type === 'text' || (event.type === 'key'
-            && ['backspace', 'delete', 'up', 'down', 'tab', 'shift+tab'].includes(event.id));
-        if (prompt.request.wait !== undefined && prompt.waitHeld !== true && (takeTime || editing)) {
-            prompt.request.wait.hold();
-            prompt.offTick?.();
-            prompt = { ...prompt, waitHeld: true };
-            this.#prompt = prompt;
-            this.#render();
-        }
-        if (takeTime && prompt.request.wait !== undefined)
+        if (this.#state.status !== 'idle') {
+            // Aborting a turn would strand whatever the user queued behind it. Pi
+            // hands those drafts back first, so nothing typed during the turn is lost
+            // to the abort that ends it.
+            this.#restoreQueuedBeforeAbort();
+            for (const listener of this.#interrupts)
+                listener();
             return true;
-        if (prompt.request.presentation === 'plan-review' || prompt.request.presentation === 'document')
-            return this.#handlePlanReview(event, prompt);
+        }
+        if (!this.#hasComposerContent()) {
+            // Nothing to cancel and nothing typed: the second Escape opens the session
+            // tree, which is where a reader goes when they want to leave this point.
+            const now = Date.now();
+            if (now - this.#lastEscapeTime < DOUBLE_ESCAPE_MS) {
+                this.#lastEscapeTime = 0;
+                for (const listener of this.#rewinds)
+                    listener();
+            }
+            else {
+                this.#lastEscapeTime = now;
+            }
+            return true;
+        }
+        // Something is typed: Escape is not a no-op, but it also has nothing to
+        // cancel, so the editor keeps the keystroke.
+        return false;
+    }
+    /**
+     * Empty the composer, or exit on a second press.
+     *
+     * Ctrl+C is a composer gesture everywhere else on a terminal; keeping
+     * interrupt on Escape leaves this to do exactly one job.
+     */
+    #runClearComposer() {
+        if (this.#prompt !== null) {
+            this.#finishPrompt(null);
+            this.#editor.setText('');
+            this.#render();
+            return true;
+        }
+        // A running Shell line owns Ctrl+C before the composer does: the reader is
+        // watching a command, and the key they press to stop it is the same one.
+        if (this.#shellAbort !== undefined && !this.#hasComposerContent()) {
+            this.#shellAbort();
+            return true;
+        }
+        if (this.#settings !== null) {
+            this.#settings = null;
+            this.#render();
+            return true;
+        }
+        if (this.#search !== null) {
+            this.#search = null;
+            this.#render();
+            return true;
+        }
+        if (this.#transcriptSearch !== null) {
+            this.#transcriptSearch = null;
+            this.#render();
+            return true;
+        }
+        const now = Date.now();
+        if (now - this.#lastSigintTime < DOUBLE_CTRL_C_MS) {
+            this.#lastSigintTime = 0;
+            this.#quit();
+            return true;
+        }
+        this.#lastSigintTime = now;
+        // A running turn keeps Ctrl+C as the familiar abort while the composer is
+        // empty; Escape already covers it, and refusing the reflex would be worse.
+        if (this.#state.status !== 'idle' && !this.#hasComposerContent()) {
+            this.#restoreQueuedBeforeAbort();
+            for (const listener of this.#interrupts)
+                listener();
+            return true;
+        }
+        this.#clearComposerWithUndo();
+        return true;
+    }
+    /**
+     * Hand durable follow-ups back to the composer before a turn is abandoned.
+     *
+     * The queued messages would otherwise be delivered to a turn that will never
+     * produce the step they were aimed at, which silently loses them.
+     */
+    #restoreQueuedBeforeAbort() {
+        if (!this.#state.nextTurnInbox.some(message => message.source.kind === 'user'))
+            return;
+        if (this.#hasComposerContent())
+            return;
+        for (const listener of this.#queueEdits)
+            listener();
+    }
+    #handlePrompt(event) {
+        let prompt = this.#prompt;
+        if (prompt === null)
+            return false;
+        const disarmed = prompt.armedUntil !== undefined && Date.now() < prompt.armedUntil;
+        if (event.type === 'key' && event.id === 'ctrl+c' && prompt.request.interrupt !== undefined) {
+            this.#lastSigintTime = Date.now();
+            const handled = prompt.request.interrupt();
+            this.#finishPrompt(null);
+            if (handled !== true && this.#state.status !== 'idle')
+                for (const listener of this.#interrupts)
+                    listener();
+            this.#render();
+            return true;
+        }
+        if (event.type === 'key' && event.id === 'ctrl+s' && prompt.request.skippable === true) {
+            this.#editor.setText('');
+            this.#finishPrompt('');
+            this.#render();
+            return true;
+        }
+        if (prompt.request.presentation === 'progress') {
+            if (event.type === 'key' && (event.id === 'escape' || event.id === 'ctrl+c')) {
+                this.#finishPrompt(null);
+                this.#render();
+            }
+            return true;
+        }
+        const takeTime = event.type === 'key' && event.id === 'ctrl+t';
+        const editing = event.type === 'text' || (event.type === 'key'
+            && ['backspace', 'delete', 'up', 'down', 'tab', 'shift+tab'].includes(event.id));
+        if (prompt.request.wait !== undefined && prompt.waitHeld !== true && (takeTime || editing)) {
+            prompt.request.wait.hold();
+            prompt.offTick?.();
+            prompt = { ...prompt, waitHeld: true };
+            this.#prompt = prompt;
+            this.#render();
+        }
+        if (takeTime && prompt.request.wait !== undefined)
+            return true;
+        if (prompt.request.presentation === 'plan-review' || prompt.request.presentation === 'document')
+            return this.#handlePlanReview(event, prompt);
         if (event.type === 'text' && this.#editor.text === '') {
             const action = prompt.request.actions?.find(item => item.key === event.value);
             const selected = filteredPromptOptions(prompt.request, '', prompt.collapsed)[prompt.selected];
             if (action !== undefined && (action.scope === 'list' || selected !== undefined)) {
-                this.#finishPrompt(action.valuePrefix + (action.scope === 'list' ? '' : selected.value ?? selected.label));
-                this.#render();
+                if (!disarmed) {
+                    this.#finishPrompt(action.valuePrefix + (action.scope === 'list' ? '' : selected.value ?? selected.label));
+                    this.#render();
+                }
                 return true;
             }
         }
-        if (event.type === 'text' && event.value === ' ' && prompt.request.multiSelect === true && this.#editor.text === '') {
-            this.#prompt = togglePromptSelection(prompt);
+        if (event.type === 'text' && event.value === ' ' && prompt.request.multiSelect === true) {
+            this.#prompt = togglePromptSelection(prompt, this.#editor.text);
             this.#render();
             return true;
         }
@@ -2227,38 +2750,56 @@ export class LocalTui {
             return true;
         if (event.type !== 'key')
             return false;
+        if (disarmed && (event.id === 'enter' || event.id === 'ctrl+j'))
+            return true;
         const filtered = filteredPromptOptions(prompt.request, this.#editor.text, prompt.collapsed);
         const count = filtered.length;
-        if (prompt.request.presentation === 'fullscreen-tree' || prompt.request.presentation === 'fullscreen-list') {
-            const action = prompt.request.actions?.find(item => item.key.toLowerCase() === event.id);
-            const selected = filtered[prompt.selected];
-            if (action !== undefined) {
-                if (action.scope === 'list' || selected !== undefined) {
-                    this.#finishPrompt(action.valuePrefix + (action.scope === 'list' ? '' : selected.value ?? selected.label));
+        const keyAction = prompt.request.actions?.find(item => item.key.toLowerCase() === event.id.toLowerCase());
+        if (keyAction !== undefined && (keyAction.scope === 'list'
+            || prompt.request.presentation === 'tree'
+            || prompt.request.presentation === 'card')) {
+            if (!disarmed) {
+                const selected = filtered[prompt.selected];
+                if (keyAction.scope === 'list' || selected !== undefined) {
+                    this.#editor.setText('');
+                    this.#finishPrompt(keyAction.valuePrefix + (keyAction.scope === 'list' ? '' : selected.value ?? selected.label));
                     this.#render();
                 }
-                return true;
             }
+            return true;
         }
         if (event.id === 'escape' || event.id === 'ctrl+c') {
-            if (event.id === 'escape' && prompt.request.presentation === 'fullscreen-tree' && this.#editor.text !== '') {
-                const selected = filtered[prompt.selected]?.value;
+            /**
+             * Escape gives back one layer: an active filter clears before the card
+             * closes.
+             *
+             * Only the tree used to do this, so a filtered `/model` or `/copy` closed
+             * outright and a reader who wanted their list back had to reopen it.
+             */
+            if (event.id === 'escape' && prompt.request.filterable === true && this.#editor.text !== '') {
+                const selected = filtered[prompt.selected]?.value ?? filtered[prompt.selected]?.label;
                 this.#editor.setText('');
-                this.#prompt = { ...prompt, collapsed: new Set(), selected: Math.max(0, filteredPromptOptions(prompt.request, '').findIndex(option => option.value === selected)), previewScroll: 0 };
+                const restored = filteredPromptOptions(prompt.request, '', prompt.collapsed);
+                const at = restored.findIndex(option => (option.value ?? option.label) === selected);
+                this.#prompt = {
+                    ...prompt,
+                    ...(prompt.request.presentation === 'tree' ? { collapsed: new Set() } : {}),
+                    selected: Math.max(0, at),
+                    previewScroll: 0,
+                };
                 this.#render();
                 return true;
             }
-            this.#editor.setText('');
             this.#finishPrompt(null);
             this.#render();
             return true;
         }
-        if (prompt.request.presentation === 'fullscreen-tree' && (event.id === 'left' || event.id === 'right')) {
+        if (prompt.request.presentation === 'tree' && (event.id === 'left' || event.id === 'right')) {
             this.#prompt = movePromptTree(prompt, event.id, this.#editor.text);
             this.#render();
             return true;
         }
-        if (prompt.request.presentation === 'fullscreen-tree' && (event.id === 'ctrl+up' || event.id === 'ctrl+down')) {
+        if (prompt.request.presentation === 'tree' && (event.id === 'ctrl+up' || event.id === 'ctrl+down')) {
             const start = this.#promptDocument?.start ?? prompt.previewScroll ?? 0;
             this.#prompt = { ...prompt, previewScroll: Math.max(0, Math.min(start + (event.id === 'ctrl+up' ? -1 : 1), this.#promptDocument?.maxStart ?? 0)) };
             this.#render();
@@ -2276,29 +2817,30 @@ export class LocalTui {
             }
             return true;
         }
-        let next;
-        const page = prompt.request.presentation === 'fullscreen-tree'
+        // Movement comes from the shared reading, so this selector cannot drift from
+        // the other lists about what `tab` or `pageUp` means. `enter` stays below
+        // because what it submits depends on the editor and on multi-select.
+        const page = prompt.request.presentation === 'tree'
             ? promptTreePageSize(prompt.request, this.#term.width(), this.#term.height()) : 10;
-        if (event.id === 'up' || event.id === 'shift+tab')
-            next = prompt.selected - 1;
-        else if (event.id === 'down' || event.id === 'tab')
-            next = prompt.selected + 1;
-        else if (event.id === 'pageUp')
-            next = prompt.request.presentation === 'fullscreen-tree' ? Math.max(0, prompt.selected - page) : prompt.selected - page;
-        else if (event.id === 'pageDown')
-            next = prompt.request.presentation === 'fullscreen-tree' ? Math.min(count - 1, prompt.selected + page) : prompt.selected + page;
-        else if (event.id === 'home')
-            next = 0;
-        else if (event.id === 'end')
-            next = count - 1;
-        if (next !== undefined) {
-            this.#prompt = movePromptSelection(prompt, next, count);
+        const navigation = listNavigation(event);
+        if (navigation.kind === 'move' || navigation.kind === 'page') {
+            // The tree clamps: its rows are a structure, and wrapping past the last
+            // branch lands the reader somewhere unrelated to the one they left.
+            const wrap = prompt.request.presentation !== 'tree';
+            this.#prompt = movePromptSelection(prompt, navigateIndex(navigation, prompt.selected, count, page, { wrap }), count);
+            this.#render();
+            return true;
+        }
+        if (navigation.kind === 'edge') {
+            this.#prompt = movePromptSelection(prompt, edgeIndex(navigation, count), count);
             this.#render();
             return true;
         }
-        if (event.id === 'enter' && this.#editor.text === '') {
+        if (event.id === 'enter' && (this.#editor.text === '' || prompt.request.multiSelect === true)) {
             const answer = selectedPromptAnswer(prompt);
-            if (prompt.request.multiSelect === true && answer === null)
+            // A disabled row and an empty multi-select both swallow Enter: nothing is
+            // being answered, so the surface stays where the reader is.
+            if (answer === null)
                 return true;
             this.#finishPrompt(answer);
             this.#render();
@@ -2306,6 +2848,10 @@ export class LocalTui {
         }
         if (event.id === 'enter' && prompt.request.filterable === true) {
             const answer = selectedFilteredPromptAnswer(prompt, this.#editor.text);
+            // A heading under a filter is still a heading: clearing the query and
+            // closing on it would lose both the list and the filter.
+            if (answer === null)
+                return true;
             this.#editor.setText('');
             this.#finishPrompt(answer);
             this.#render();
@@ -2323,19 +2869,25 @@ export class LocalTui {
     }
     #handlePlanReview(event, prompt) {
         const document = prompt.request.presentation === 'document';
+        const disarmed = prompt.armedUntil !== undefined && Date.now() < prompt.armedUntil;
         if (document && prompt.request.documentSource !== undefined && this.#handleDocumentReader(event, prompt))
             return true;
+        if (document && prompt.request.documentSource === undefined && this.#handleRenderedDocument(event, prompt))
+            return true;
         if (document && event.type === 'text') {
             const action = prompt.request.actions?.find(item => item.key.toLowerCase() === event.value.toLowerCase());
-            if (action !== undefined) {
+            if (action !== undefined && !disarmed) {
                 this.#finishPrompt(action.valuePrefix);
                 this.#render();
             }
             return true;
         }
+        if (!document && event.type === 'key' && (event.id === 'ctrl+x' || this.#boundAction(event.id) === 'external-editor')) {
+            this.#openPlanFeedbackEditor(prompt);
+            return true;
+        }
         if (prompt.feedback === true) {
             if (event.type === 'key' && event.id === 'ctrl+c') {
-                this.#editor.setText('');
                 this.#finishPrompt(null);
                 this.#render();
                 return true;
@@ -2347,6 +2899,8 @@ export class LocalTui {
                 return true;
             }
             if (event.type === 'key' && (event.id === 'enter' || event.id === 'ctrl+j')) {
+                if (disarmed)
+                    return true;
                 const feedback = this.#editor.text.trim();
                 this.#editor.setText('');
                 this.#finishPrompt(feedback === '' ? selectedPromptAnswer(prompt) : feedback);
@@ -2362,8 +2916,16 @@ export class LocalTui {
             return true;
         if (event.type !== 'key')
             return false;
+        const keyAction = prompt.request.actions?.find(item => item.key.toLowerCase() === event.id.toLowerCase() && item.scope === 'list');
+        if (keyAction !== undefined) {
+            if (!disarmed) {
+                this.#editor.setText('');
+                this.#finishPrompt(keyAction.valuePrefix);
+                this.#render();
+            }
+            return true;
+        }
         if (event.id === 'escape' || event.id === 'ctrl+c') {
-            this.#editor.setText('');
             this.#finishPrompt(null);
             this.#render();
             return true;
@@ -2403,6 +2965,8 @@ export class LocalTui {
             return true;
         }
         if (event.id === 'enter') {
+            if (disarmed)
+                return true;
             const answer = selectedPromptAnswer(prompt);
             if (answer === null)
                 return true;
@@ -2420,9 +2984,78 @@ export class LocalTui {
         }
         return true;
     }
+    /**
+     * Find in a rendered document.
+     *
+     * The source reader searches its model; a rendered page is its rows, so the
+     * search runs over exactly what the reader is looking at. Without this, `/help`
+     * — sixty rows of grouped commands — was the one surface with no way to look
+     * something up in it.
+     */
+    #handleRenderedDocument(event, prompt) {
+        const rows = () => documentRows(prompt.request, createTheme(this.#colors, this.#colorDepth, this.#themeName, this.#terminalColors), Math.max(1, this.#term.width() - 6));
+        // Always build on the newest state: typing updates the query while the find
+        // is open, and jumping from a stale copy would drop it again.
+        const jumpTo = (row) => {
+            this.#prompt = { ...(this.#prompt ?? prompt), documentScroll: Math.max(0, row - 1), documentTarget: row, documentAnchor: undefined };
+        };
+        if (prompt.documentInput !== undefined) {
+            if (event.type === 'key' && (event.id === 'escape' || event.id === 'ctrl+c')) {
+                this.#editor.setText('');
+                this.#prompt = { ...prompt, documentInput: undefined, documentQuery: prompt.documentOriginalQuery ?? '', documentError: undefined };
+                this.#render();
+                return true;
+            }
+            if (event.type === 'key' && (event.id === 'enter' || event.id === 'ctrl+j')) {
+                const query = this.#editor.text.trim();
+                this.#prompt = { ...(this.#prompt ?? prompt), documentInput: undefined, documentQuery: query, documentError: undefined };
+                const matches = findInRows(rows(), query);
+                if (matches.length > 0)
+                    jumpTo(matches[0].row);
+                else
+                    this.#prompt = { ...(this.#prompt ?? prompt), documentTarget: undefined };
+                this.#render();
+                return true;
+            }
+            // Typing narrows the query as it is entered, so the count is live.
+            if (event.type === 'text') {
+                this.#editor.handle(event);
+                this.#prompt = { ...(this.#prompt ?? prompt), documentQuery: this.#editor.text };
+                this.#render();
+                return true;
+            }
+            if (event.type === 'key') {
+                this.#editor.handle(event);
+                this.#prompt = { ...(this.#prompt ?? prompt), documentQuery: this.#editor.text };
+                this.#render();
+                return true;
+            }
+            return false;
+        }
+        const search = event.type === 'key' && event.id === 'ctrl+f' || event.type === 'text' && event.value === '/';
+        if (search) {
+            this.#editor.setText(prompt.documentQuery ?? '');
+            this.#prompt = { ...prompt, documentInput: 'search', documentOriginalQuery: prompt.documentQuery ?? '', documentError: undefined };
+            this.#render();
+            return true;
+        }
+        if (event.type === 'key' && (event.id === 'ctrl+n' || event.id === 'ctrl+p')) {
+            const matches = findInRows(rows(), prompt.documentQuery ?? '');
+            if (matches.length === 0)
+                return true;
+            const current = prompt.documentTarget ?? prompt.documentScroll ?? 0;
+            const from = event.id === 'ctrl+n'
+                ? (matches.findIndex(match => match.row > current) + matches.length) % matches.length
+                : (matches.findLastIndex(match => match.row < current) + matches.length) % matches.length;
+            jumpTo(matches[from].row);
+            this.#render();
+            return true;
+        }
+        return false;
+    }
     #handleDocumentReader(event, prompt) {
         const source = prompt.request.documentSource;
-        const layout = documentLayout(source, createTheme(this.#colors, this.#trueColor, this.#themeName), Math.max(1, this.#term.width() - 6), {
+        const layout = documentLayout(source, createTheme(this.#colors, this.#colorDepth, this.#themeName, this.#terminalColors), Math.max(1, this.#term.width() - 6), {
             wordWrap: prompt.documentWordWrap ?? true, column: prompt.documentColumn ?? 0,
         });
         const start = this.#promptDocument?.start ?? 0;
@@ -2504,37 +3137,72 @@ export class LocalTui {
             listener(id);
     }
     #handleSubagentLauncher(event) {
-        const hasAgents = (this.#subagents?.agents.length ?? 0) > 0;
-        if (this.#subagentLauncherFocused) {
-            if (!hasAgents) {
-                this.#subagentLauncherFocused = false;
+        const agents = this.#subagents?.agents ?? [];
+        if (this.#subagentSelection !== undefined) {
+            if (agents.length === 0) {
+                this.#subagentSelection = undefined;
                 return false;
             }
+            const at = Math.min(this.#subagentSelection, agents.length - 1);
             if (event.type === 'key' && event.id === 'enter') {
-                this.#subagentLauncherFocused = false;
-                void this.#pickSubagent();
+                this.#subagentSelection = undefined;
+                this.#openSelectedSubagent(agents[at]);
                 return true;
             }
-            if (event.type === 'key' && (event.id === 'escape' || event.id === 'up')) {
-                this.#subagentLauncherFocused = false;
+            if (event.type === 'key' && event.id === 'escape') {
+                this.#subagentSelection = undefined;
                 this.#render();
                 return true;
             }
-            if (event.type === 'key' && event.id === 'down')
+            if (event.type === 'key' && (event.id === 'up' || event.id === 'down')) {
+                const delta = event.id === 'up' ? -1 : 1;
+                // `up` from the first row leaves the bar; `down` stops at the last one.
+                if (at + delta < 0)
+                    this.#subagentSelection = undefined;
+                else
+                    this.#subagentSelection = Math.min(agents.length - 1, at + delta);
+                this.#render();
                 return true;
-            this.#subagentLauncherFocused = false;
-            return false;
+            }
+            return true;
         }
-        if (!hasAgents || event.type !== 'key' || event.id !== 'down')
+        if (agents.length === 0 || event.type !== 'key' || event.id !== 'down')
             return false;
         if (this.#editor.text !== '' || this.#images.count > 0 || this.#historyIndex !== 0 || this.#ac !== null)
             return false;
         if (this.#queuedSubmissions.length > 0 || this.#queueEditNewer !== null || this.#queueEditPending)
             return false;
-        this.#subagentLauncherFocused = true;
+        this.#subagentSelection = Math.min(agents.length - 1, Math.max(0, subagentPreviewStart(agents)));
         this.#render();
         return true;
     }
+    /**
+     * Open what the selected row has.
+     *
+     * A local child has a transcript to read, so `Enter` swaps the view. An external
+     * child has none by construction — its results land in the parent session — so
+     * `Enter` prints its status and recent activity as a fold-able transcript
+     * result instead of opening a surface for it.
+     */
+    #openSelectedSubagent(agent) {
+        if (agent.mode === 'external') {
+            this.commandOutput(`Agent · ${agent.label}`, [
+                `${agent.phase === 'completed' ? 'Completed' : agent.phase === 'error' ? 'Failed' : 'Running'} · ${formatAgentElapsed(agent)}`,
+                '',
+                `Mode: ${agent.mode}`,
+                `Session: ${agent.id}`,
+                `Parent: ${agent.parentId ?? 'root session'}`,
+                `Depth: ${agent.depth}`,
+                ...(agent.workflow === undefined ? [] : [`Workflow: ${agent.workflow.name}`, `Phase: ${agent.workflow.phase ?? '—'}`]),
+                ...(agent.activity.length === 0 ? [] : ['', 'Recent activity', ...agent.activity.map(item => `${item.status.padEnd(8)} ${item.text}`)]),
+                '',
+                'An external agent keeps no local transcript; its results arrive in this session.',
+            ].join('\n'));
+            return;
+        }
+        this.#openInspect(agent.id);
+        this.#render();
+    }
     #closeInspect() {
         if (this.#inspected === undefined)
             return;
@@ -2544,41 +3212,28 @@ export class LocalTui {
         for (const listener of this.#inspectCloses)
             listener();
     }
-    #pickSubagent() {
-        this.#subagentLauncherFocused = false;
-        const agents = this.#subagents?.agents ?? [];
-        if (agents.length === 0 && !this.#subagents?.workflows?.length) {
-            this.notice('No subagents are available in this session.');
-            return;
-        }
-        this.#prompt = null;
-        this.#settings = null;
-        this.#copySelector = null;
-        this.#search = null;
-        this.#trajectory = null;
-        this.#ac = null;
-        this.#agentHub = createAgentHub(this.#subagents ?? { agents });
-        this.#render();
-    }
     #applyPrefs(prefs, options) {
+        const previous = options.persist ? this.prefs() : undefined;
+        const version = this.#prefsVersion;
         const previousMotion = this.#motion;
         this.#themeName = prefs.theme;
         this.#colors = prefs.colors;
-        this.#syncTrueColor();
+        this.#syncColorDepth();
         this.#motion = prefs.motion ?? 'full';
         this.#flushPasteBurst(true);
         this.#pasteProtection = prefs.pasteProtection !== false;
         this.#externalEditor = prefs.editor ?? 'auto';
-        this.#terminalProgress = prefs.terminalProgress ?? false;
+        this.#terminalTitle = prefs.terminalTitle ?? 'status';
+        this.#terminalState = prefs.terminalState ?? 'auto';
+        this.#syncWindowTitle();
         this.#copyOnSelect = prefs.copyOnSelect ?? true;
         this.#mathMode = prefs.mathMode ?? 'auto';
         this.#mermaidMode = prefs.mermaidMode ?? 'auto';
+        this.#hideThinking = prefs.hideThinking === true;
         this.#mouseInteraction = prefs.mouseInteraction ?? 'auto';
         this.#checkUpdates = prefs.checkUpdates ?? true;
         this.#startupChangelog = prefs.startupChangelog ?? 'summary';
-        this.#notificationPolicy = prefs.notifications ?? 'off';
-        this.#notificationThreshold = prefs.notificationThreshold ?? '30s';
-        this.#notificationFocus = prefs.notificationFocus ?? 'unfocused';
+        this.#notificationPolicy = resolveNotificationMode(prefs.notifications, prefs.notificationFocus);
         if (this.#notificationPolicy === 'off')
             this.#notificationQueue.clear();
         this.#configureNotifications();
@@ -2590,8 +3245,33 @@ export class LocalTui {
             this.#reveal = undefined;
         }
         this.#syncTick();
-        if (options.persist)
-            this.#persistPrefs?.(prefs);
+        if (options.persist && this.#persistPrefs !== null) {
+            const failed = async (error) => {
+                if (this.#disposed)
+                    return;
+                if (this.#prefsVersion === version && previous !== undefined)
+                    this.applyStoredPrefs(previous);
+                await this.#settingsError(`Settings were not saved: ${error instanceof Error ? error.message : String(error)}`);
+            };
+            try {
+                const changes = previous === undefined ? [] : preferenceChanges(previous, prefs);
+                const result = changes.length === 0 ? undefined : this.#persistPrefs(prefs, changes);
+                if (result !== undefined && result !== null && typeof result === 'object' && typeof result.then === 'function') {
+                    this.#prefsSaveTask = Promise.resolve(result).catch(failed).finally(() => { this.#prefsSaveTask = undefined; });
+                }
+            }
+            catch (error) {
+                this.#prefsSaveTask = failed(error).finally(() => { this.#prefsSaveTask = undefined; });
+            }
+        }
+    }
+    async #settingsError(detail) {
+        if (this.#disposed)
+            return;
+        if (this.#settings === null)
+            this.notice(detail, { level: 'error' });
+        else
+            await showSettingsError(this, detail);
     }
     #applyStoredAgentBehavior(next) {
         this.#agentBehavior = { language: next.language };
@@ -2613,7 +3293,7 @@ export class LocalTui {
             if (this.#settings !== null && this.#agentBehavior !== undefined) {
                 this.#settings = { ...this.#settings, agent: { ...this.#agentBehavior } };
             }
-            this.notice(`Could not save Agent language: ${error instanceof Error ? error.message : String(error)}`, { level: 'error' });
+            await this.#settingsError(`Could not save Agent language: ${error instanceof Error ? error.message : String(error)}`);
         }
         finally {
             this.#agentBehaviorPending = false;
@@ -2622,34 +3302,28 @@ export class LocalTui {
         }
     }
     /**
-     * Write the Features section's state into the Profile patch.
+     * Write the Tools feature controls' state into the Profile patch.
      *
      * `disabled` is a Loader option rather than plugin config, so the settings
      * service cannot express it; the Profile patch is the documented surface
      * that can, and the Harness reads it while composing the tree. Only the
      * managed block is rewritten, so hand-authored rows and comments survive.
-     * A failure is reported and the overlay keeps the value it shows.
+     * The displayed feature state changes only after the patch is written.
      */
-    #writeFeaturePatch() {
+    #writeFeaturePatch(features) {
         const path = this.#featurePatch;
-        const features = this.#features;
-        if (path === undefined || features === undefined)
+        if (path === undefined)
             return;
+        let current = '';
         try {
-            let current = '';
-            try {
-                current = readFileSync(path, 'utf8');
-            }
-            catch {
-                current = '';
-            }
-            mkdirSync(dirname(path), { recursive: true });
-            writeFileSync(path, replaceFeatureBlock(current, renderFeatureBlock(features)), 'utf8');
+            current = readFileSync(path, 'utf8');
         }
         catch (error) {
-            this.notice(`Feature toggles were not saved: ${error instanceof Error ? error.message : String(error)}`);
-            this.#render();
+            if (error.code !== 'ENOENT')
+                throw error;
         }
+        mkdirSync(dirname(path), { recursive: true });
+        writeFileSync(path, replaceFeatureBlock(current, renderFeatureBlock(features)), 'utf8');
     }
     #applySettings(event) {
         if (this.#settings === null)
@@ -2657,8 +3331,36 @@ export class LocalTui {
         if (this.#pluginSettingsTask !== undefined)
             return;
         const command = applySettingsEvent(this.#settings, event);
+        if (command.kind === 'open-command') {
+            if (this.#prefsSaveTask !== undefined)
+                return;
+            if (command.name === 'keybindings') {
+                void this.#editKeybindings();
+                return;
+            }
+            this.#runSlash(command.name);
+            return;
+        }
+        if (command.kind === 'reset') {
+            if (this.#prefsSaveTask !== undefined)
+                return;
+            if (this.#pluginSettings?.reset === undefined) {
+                void this.#settingsError('Restoring inheritance requires a writable Profile settings service.');
+                return;
+            }
+            this.#runPluginSettings((binding, signal) => binding.reset(command.id, command.entry, signal, command.label));
+            return;
+        }
         if (command.kind === 'open-plugin') {
-            this.#openPluginSettings(command.id);
+            if (this.#prefsSaveTask !== undefined)
+                return;
+            this.#runPluginSettings((binding, signal) => binding.edit(command.id, signal));
+            return;
+        }
+        if (command.kind === 'set-plugin') {
+            if (this.#prefsSaveTask !== undefined)
+                return;
+            this.#runPluginSettings(async (binding, signal) => { await binding.set?.(command.entry, command.value, signal); });
             return;
         }
         if (command.kind === 'update') {
@@ -2667,13 +3369,21 @@ export class LocalTui {
             return;
         }
         if (command.kind === 'apply') {
+            if (this.#prefsSaveTask !== undefined)
+                return;
             if (command.domain === 'features') {
                 if (command.state.features === undefined)
                     return;
+                try {
+                    this.#writeFeaturePatch(command.state.features);
+                }
+                catch (error) {
+                    void this.#settingsError(`Feature toggles were not saved: ${error instanceof Error ? error.message : String(error)}`);
+                    return;
+                }
                 this.#settings = command.state;
                 this.#features = command.state.features;
                 this.#render();
-                this.#writeFeaturePatch();
                 return;
             }
             if (command.domain === 'agent') {
@@ -2695,56 +3405,40 @@ export class LocalTui {
             this.#render();
         }
     }
-    #openPluginSettings(id) {
+    #runPluginSettings(operation) {
         const binding = this.#pluginSettings;
         if (binding === undefined)
             return;
         const closing = new AbortController();
+        const selected = this.#settings === null ? undefined : tuiSettingItems(this.#settings.prefs, this.#settings.agent, this.#settings.features, this.#settings.plugins, this.#settings.editors, this.#settings.actions)[this.#settings.selected]?.id;
+        this.#catalogVersion++;
         this.#pluginSettingsAbort = closing;
-        this.#pluginSettingsTask = Promise.resolve().then(() => binding.edit(id, closing.signal)).catch((error) => {
-            if (!closing.signal.aborted && !this.#disposed)
-                this.notice(error instanceof Error ? error.message : String(error), { level: 'error' });
-        }).finally(() => {
+        this.#pluginSettingsTask = Promise.resolve().then(() => operation(binding, closing.signal)).catch(async (error) => {
+            if (closing.signal.aborted || this.#disposed)
+                return;
+            const detail = error instanceof Error ? error.message : String(error);
+            await showSettingsError(this, detail, closing.signal);
+        }).finally(async () => {
+            const entries = await this.#pluginSettings?.refresh?.().catch(() => this.#pluginSettings?.entries() ?? []) ?? this.#pluginSettings?.entries() ?? [];
             this.#pluginSettingsAbort = undefined;
             this.#pluginSettingsTask = undefined;
-            if (this.#settings !== null)
-                this.#settings = { ...this.#settings, prefs: this.prefs(),
-                    ...(this.#agentBehavior === undefined ? {} : { agent: this.#agentBehavior }),
-                    ...(this.#features === undefined ? {} : { features: this.#features }), plugins: this.#pluginSettings?.entries() ?? [] };
+            if (!this.#disposed)
+                this.#rebuildSettings(entries, selected);
             if (this.#tty && !this.#disposed)
                 this.#render();
         });
     }
-    #applyCopySelector(event) {
-        if (this.#copySelector === null)
-            return;
-        const command = applyCopySelectorEvent(this.#copySelector, event);
-        if (command.kind === 'update') {
-            this.#copySelector = command.state;
-            this.#render();
-            return;
-        }
-        if (command.kind === 'pick') {
-            this.#copySelector = null;
-            void this.#copyPicked(command.item.text, command.item.copyMessage);
-            return;
-        }
-        if (command.kind === 'close') {
-            this.#copySelector = null;
-            this.#render();
-        }
-    }
     async #copyPicked(text, label) {
         try {
             const delivery = await this.#deliverCopy(text);
             if (this.#disposed)
                 return;
-            this.#notice(delivery === 'requested' ? 'Sent ' + label + ' to the terminal clipboard' : 'Copied ' + label);
+            this.#showTransientStatus(delivery === 'requested' ? 'Sent ' + label + ' to the terminal clipboard' : 'Copied ' + label);
         }
         catch {
             if (this.#disposed)
                 return;
-            this.#notice('Copy failed');
+            this.#showTransientStatus('Copy failed');
         }
         this.#render();
     }
@@ -2838,13 +3532,26 @@ export class LocalTui {
         const atPrefix = at?.query.replaceAll('\\', '/')
             ?? (token?.kind === 'at' ? parsePathPrefix(token.prefix).raw.replaceAll('\\', '/') : '');
         const fuzzyAt = (at !== undefined || token?.kind === 'at') && atPrefix !== '' && !atPrefix.endsWith('/');
+        const shortcutAt = at !== undefined && matchesAtShortcutQuery(at.query, at.quoted);
         const harnessAt = at !== undefined
             && (this.#searchFileMentions !== undefined || this.#searchSessions !== undefined);
-        if (fuzzyAt || harnessAt) {
-            if (harnessAt && !fuzzyAt) {
-                this.#setAutocomplete(pathSuggestions(this.#editor.text, this.#editor.cursor, pathOptions, commands));
+        if (fuzzyAt || harnessAt || shortcutAt) {
+            // A `@` query is answered by a debounced search, so almost every keystroke
+            // lands before an answer exists. Clearing the menu here emptied the screen
+            // for the whole debounce-plus-search interval and refilled it afterwards —
+            // one flash per character, and the same again on every delete.
+            //
+            // The rows already on screen still describe the token this keystroke is
+            // extending, so they stay until a real result replaces them. A genuinely
+            // different token closes the menu, because those rows no longer apply.
+            if ((harnessAt || shortcutAt) && !fuzzyAt) {
+                const listing = pathSuggestions(this.#editor.text, this.#editor.cursor, pathOptions, commands);
+                if (listing !== null)
+                    this.#setAutocomplete(listing, atPrefix);
+                else if (!this.#acDescribes(atPrefix))
+                    this.#ac = null;
             }
-            else {
+            else if (!this.#acDescribes(atPrefix)) {
                 this.#ac = null;
             }
             const text = this.#editor.text;
@@ -2855,7 +3562,7 @@ export class LocalTui {
                     return;
                 const controller = new AbortController();
                 this.#autocompleteAbort = controller;
-                const search = this.#searchFileMentions === undefined && this.#searchSessions === undefined
+                const search = this.#searchFileMentions === undefined && this.#searchSessions === undefined && !shortcutAt
                     ? searchPathSuggestions(text, cursor, {
                         ...pathOptions,
                         searchFiles: this.#searchFiles,
@@ -2866,13 +3573,20 @@ export class LocalTui {
                         searchFiles: this.#searchFiles,
                         ...(this.#searchFileMentions === undefined ? {} : { searchFileMentions: this.#searchFileMentions }),
                         ...(this.#searchSessions === undefined ? {} : { searchSessions: this.#searchSessions }),
+                        ...(shortcutAt ? { gitContext: resolveGitStatusFiles(this.#cwd) } : {}),
                         signal: controller.signal,
                     }, commands);
                 void search.then((result) => {
                     if (this.#disposed || controller.signal.aborted || requestId !== this.#autocompleteRequestId)
                         return;
                     this.#autocompleteAbort = null;
-                    this.#setAutocomplete(result);
+                    // An empty answer for a `@` query means "nothing matched yet", not
+                    // "close the menu": keeping the live list is what stops the flash when
+                    // a prefix has no rows of its own.
+                    if (result !== null)
+                        this.#setAutocomplete(result, atPrefix);
+                    else if (!this.#acDescribes(atPrefix))
+                        this.#setAutocomplete(null);
                     this.#render();
                 }).catch((error) => {
                     if (controller.signal.aborted || requestId !== this.#autocompleteRequestId)
@@ -2888,7 +3602,16 @@ export class LocalTui {
         const result = pathSuggestions(this.#editor.text, this.#editor.cursor, pathOptions, commands);
         this.#setAutocomplete(result);
     }
-    #setAutocomplete(result) {
+    /**
+     * Whether the open menu still speaks for the `@` token being typed.
+     *
+     * A menu with no token recorded belongs to a slash or path completion and is
+     * never reused across an `@` keystroke.
+     */
+    #acDescribes(atPrefix) {
+        return completionDescribes(this.#ac?.query, atPrefix);
+    }
+    #setAutocomplete(result, query) {
         if (result === null) {
             this.#ac = null;
             return;
@@ -2900,7 +3623,7 @@ export class LocalTui {
             if (idx >= 0)
                 selected = idx;
         }
-        this.#ac = { items: result.items, selected };
+        this.#ac = { items: result.items, selected, ...(query === undefined ? {} : { query }) };
     }
     #moveAutocomplete(dir) {
         if (this.#ac === null || this.#ac.items.length === 0)
@@ -2948,50 +3671,69 @@ export class LocalTui {
             this.#historyNext();
             return;
         }
-        if (command.kind === 'interrupt') {
-            if (this.#state.status === 'running') {
-                for (const listener of this.#interrupts)
-                    listener();
-            }
-            return;
-        }
-        if (command.kind === 'clear') {
-            this.#literalInput = false;
-            this.#editor.clear();
-            this.#images.clear();
-            this.#files.clear();
-            this.#queueEditNewer = null;
-            this.#queueEditPending = false;
-            this.#historyIndex = 0;
-            this.#clearDraft();
-            this.#ac = null;
-            this.#search = null;
-            this.#render();
-            return;
-        }
-        if (command.kind === 'quit') {
-            this.#quit();
+    }
+    /**
+     * Show a one-line confirmation that goes away on its own.
+     *
+     * Replaced, never appended: two presses in a row leave one line saying what
+     * the second one did, which is what the reader is looking for.
+     */
+    #showTransientStatus(text, ttlMs = TRANSIENT_STATUS_MS) {
+        this.#transientStatus = text;
+        if (this.#transientTimer !== null)
+            clearTimeout(this.#transientTimer);
+        this.#transientTimer = setTimeout(() => {
+            this.#transientTimer = null;
+            if (this.#transientStatus !== text)
+                return;
+            this.#transientStatus = undefined;
+            if (!this.#disposed && this.#tty)
+                this.#render();
+        }, ttlMs);
+        this.#transientTimer.unref?.();
+        this.#render();
+    }
+    /** Any keystroke makes the last confirmation stale. */
+    #clearTransientStatus() {
+        if (this.#transientStatus === undefined)
             return;
+        this.#transientStatus = undefined;
+        if (this.#transientTimer !== null) {
+            clearTimeout(this.#transientTimer);
+            this.#transientTimer = null;
         }
-        if (command.kind === 'suspend') {
-            if (process.platform !== 'win32') {
-                if (this.#inspecting) {
-                    this.#followTail();
-                    this.#render();
-                }
-                this.#setMouseTracking(false);
-                this.#term.output.write('\x1b[?1004l');
-                try {
-                    process.kill(process.pid, 'SIGTSTP');
-                }
-                catch { /* no controlling tty */ }
-            }
+    }
+    /**
+     * Show or hide thinking across the whole transcript, and remember the choice.
+     *
+     * A revealed transcript is one where no thought is folded, so the per-thought
+     * openings a reader made are dropped at the same time; keeping them would
+     * leave a thought open inside a transcript that claims to show everything.
+     */
+    #toggleThinking() {
+        const next = !this.#hideThinking;
+        this.#hideThinking = next;
+        if (!next)
+            this.#expandedReasoning.clear();
+        const persist = this.#persistPrefs;
+        if (persist !== null)
+            void persist(this.prefs(), [{ op: 'set', path: ['hideThinking'], value: next }]);
+        this.#showTransientStatus(next ? 'Thinking: hidden' : 'Thinking: shown');
+    }
+    /** Hand the terminal to the shell and stop until SIGCONT brings it back. */
+    #suspend() {
+        if (process.platform === 'win32')
             return;
-        }
-        if (command.kind === 'resetDisplay') {
-            this.#renderer.reset();
+        if (this.#inspecting) {
+            this.#followTail();
             this.#render();
         }
+        // The shell that takes over gets every mode back; SIGCONT takes them again.
+        this.#handOffTerminal();
+        try {
+            process.kill(process.pid, 'SIGTSTP');
+        }
+        catch { /* no controlling tty */ }
     }
     #historyPrev() {
         if (this.#images.count > 0)
@@ -3007,7 +3749,7 @@ export class LocalTui {
         this.#refreshAutocomplete();
         this.#render();
     }
-    #restoreLatestQueuedSubmission() {
+    #restoreLatestQueuedSubmission(allowNonEmpty = false) {
         if (this.#queueEditPending)
             return true;
         if (this.#queueEditNewer !== null) {
@@ -3025,11 +3767,14 @@ export class LocalTui {
                 listener();
             return true;
         }
-        if (this.#editor.text !== '' || this.#images.count > 0 || this.#historyIndex !== 0)
+        if (this.#historyIndex !== 0)
+            return false;
+        const hasDraft = this.#hasComposerContent();
+        if (!allowNonEmpty && hasDraft)
             return false;
         const submission = this.#queuedSubmissions.pop();
         if (submission !== undefined) {
-            this.#queueEditNewer = [];
+            this.#queueEditNewer = hasDraft ? [this.#currentSubmission()] : [];
             this.#replaceInput(submission);
             return true;
         }
@@ -3069,23 +3814,47 @@ export class LocalTui {
             this.#quitRequested = true;
         }
     }
+    /**
+     * Turn composer text into a submission, shared by the main and inspected
+     * composers.
+     *
+     * The composer marker is a draft affordance, not something the reader said,
+     * so it leaves the text; it still records where the picture sat, so the
+     * segments keep that order.
+     */
+    #buildSubmission(text) {
+        const images = this.#images.copies();
+        const files = this.#files.copies();
+        const typedText = this.#files.text(images.length > 0 ? text.trim() : text);
+        const segments = images.length === 0 ? [] : splitComposerImageMarkers(typedText, images);
+        // Stripping a marker that sat on its own line leaves that line break behind.
+        const submittedText = images.length > 0 ? stripComposerImageMarkers(typedText, images).trim() : typedText;
+        const literal = text === this.#editor.expandedText && (this.#literalInput || this.#editor.startsWithPaste);
+        const historyText = submittedText.replace(/[ \t]{2,}/gu, ' ').trim();
+        return {
+            submission: {
+                text: submittedText,
+                images,
+                ...(segments.length === 0 ? {} : { segments }),
+                ...(files.length === 0 ? {} : { files }),
+                ...(literal ? { literal: true } : {}),
+            },
+            historyText,
+        };
+    }
     #submit(text) {
         if (this.#prompt !== null) {
+            if (this.#prompt.request.presentation === 'progress')
+                return;
             this.#editor.setText('');
             const answer = this.#prompt.request.preserveWhitespace === true ? text : text.trim();
             this.#finishPrompt(answer.trim() === '' ? null : answer);
             this.#render();
             return;
         }
-        const images = this.#images.copies();
-        const files = this.#files.copies();
-        const submittedText = this.#files.text(images.length > 0 ? text.trim() : text);
-        const literal = text === this.#editor.expandedText && (this.#literalInput || this.#editor.startsWithPaste);
-        const submission = { text: submittedText, images, ...(files.length === 0 ? {} : { files }), ...(literal ? { literal: true } : {}) };
+        const { submission, historyText } = this.#buildSubmission(text);
+        const { images, files = [], literal = false, text: submittedText } = submission;
         const queueEditNewer = this.#queueEditNewer;
-        const historyText = stripComposerImageMarkers(submittedText, images)
-            .replace(/[ \t]{2,}/gu, ' ')
-            .trim();
         if (historyText !== '' && this.#history[this.#history.length - 1] !== historyText) {
             this.#history.push(historyText);
             this.#historyStore?.add(historyText);
@@ -3102,9 +3871,7 @@ export class LocalTui {
         this.#ac = null;
         this.#search = null;
         this.#settings = null;
-        this.#copySelector = null;
         this.#trajectory = null;
-        this.#agentHub = null;
         // Image placeholders are TUI-owned. Mixed image+slash drafts stay a
         // submission so restore can keep the original markers; the runner strips
         // them only to detect and execute Harness commands.
@@ -3131,16 +3898,14 @@ export class LocalTui {
             if (queueEditNewer !== null)
                 this.#queuedSubmissions.push(...queueEditNewer);
         }
+        if (submittedText !== '' || images.length > 0 || files.length > 0) {
+            this.#popStashedDraft();
+        }
         this.#render();
     }
     #submitInspect(text) {
-        const literal = text === this.#editor.expandedText && (this.#literalInput || this.#editor.startsWithPaste);
-        const images = this.#images.copies();
-        const files = this.#files.copies();
-        const submittedText = this.#files.text(images.length > 0 ? text.trim() : text);
-        const historyText = stripComposerImageMarkers(submittedText, images)
-            .replace(/[ \t]{2,}/gu, ' ')
-            .trim();
+        const { submission, historyText } = this.#buildSubmission(text);
+        const { images, files = [], literal = false, text: submittedText } = submission;
         if (historyText !== '' && this.#history[this.#history.length - 1] !== historyText) {
             this.#history.push(historyText);
             this.#historyStore?.add(historyText);
@@ -3164,8 +3929,10 @@ export class LocalTui {
             this.#render();
             return;
         }
+        const { literal: _literal, ...inspectSubmission } = submission;
         for (const listener of this.#inspectSubmits)
-            listener({ text: submittedText, images, ...(files.length === 0 ? {} : { files }) });
+            listener(inspectSubmission);
+        this.#popStashedDraft();
         this.#render();
     }
     #runSlash(name, args = '') {
@@ -3228,8 +3995,7 @@ export class LocalTui {
             return;
         }
         if (command.name === 'tools') {
-            this.#toolCatalog();
-            this.#render();
+            this.#runTools();
             return;
         }
         if (args !== '' && args !== 'full') {
@@ -3237,28 +4003,7 @@ export class LocalTui {
             this.#render();
             return;
         }
-        const full = args === 'full';
-        this.#state = {
-            ...this.#state,
-            blocks: [...this.#state.blocks, {
-                    kind: 'commandOutput',
-                    command: 'help',
-                    text: [
-                        formatHelpText(this.#commands()),
-                        '',
-                        full
-                            ? `**Keyboard Shortcuts · ${hotkeyCount(this.#keybindings)} shortcuts**`
-                            : '**Essential Shortcuts**',
-                        '',
-                        full
-                            ? formatHotkeysText(this.#keybindings)
-                            : formatEssentialHotkeysText(this.#keybindings),
-                        ...(full ? [] : ['', 'Use `/help full` to view every keyboard shortcut.']),
-                    ].join('\n'),
-                }],
-        };
-        this.#focusLatestBlock();
-        this.#render();
+        this.#runHelp(args === 'full');
     }
     #commands() {
         const localNames = new Set(BUILTIN_SLASH_COMMANDS.flatMap((command) => [command.name, ...(command.aliases ?? [])]));
@@ -3268,6 +4013,7 @@ export class LocalTui {
             name: command.name,
             description: command.description,
             ...(command.inputHint === undefined ? {} : { inputHint: command.inputHint }),
+            ...(command.complete === undefined ? {} : { complete: command.complete }),
         }));
         return [...BUILTIN_SLASH_COMMANDS, ...runtime];
     }
@@ -3276,10 +4022,24 @@ export class LocalTui {
         if (pending === null)
             return;
         this.#prompt = null;
-        this.#herdr.promptResolved();
+        if (pending.request.notify !== false) {
+            this.#herdr.promptResolved();
+            this.#syncWindowTitle();
+        }
         pending.offAbort?.();
         pending.offTick?.();
+        const canceledDraft = answer === null && pending.request.onCancelDraft !== undefined
+            ? this.#editor.expandedText
+            : '';
         this.#editor.restore(pending.savedInput);
+        if (canceledDraft.trim() !== '') {
+            try {
+                pending.request.onCancelDraft?.(canceledDraft);
+            }
+            catch (error) {
+                this.notice(error instanceof Error ? error.message : String(error), { level: 'error' });
+            }
+        }
         this.#draftFingerprint = this.#draftKey();
         pending.resolve(answer);
         this.#restoreDisplacedSurface();
@@ -3296,17 +4056,11 @@ export class LocalTui {
     #displaceSurface() {
         const displaced = this.#trajectory !== null
             ? { kind: 'trajectory', state: this.#trajectory }
-            : this.#agentHub !== null
-                ? { kind: 'agentHub', state: this.#agentHub }
-                : this.#settings !== null
-                    ? { kind: 'settings', state: this.#settings }
-                    : this.#copySelector !== null
-                        ? { kind: 'copySelector', state: this.#copySelector }
-                        : this.#search !== null ? { kind: 'search', state: this.#search } : null;
+            : this.#settings !== null
+                ? { kind: 'settings', state: this.#settings }
+                : this.#search !== null ? { kind: 'search', state: this.#search } : null;
         this.#trajectory = null;
-        this.#agentHub = null;
         this.#settings = null;
-        this.#copySelector = null;
         this.#search = null;
         return displaced;
     }
@@ -3318,43 +4072,71 @@ export class LocalTui {
             return;
         if (displaced.kind === 'trajectory')
             this.#trajectory = displaced.state;
-        else if (displaced.kind === 'agentHub')
-            this.#agentHub = displaced.state;
-        else if (displaced.kind === 'settings')
+        else if (displaced.kind === 'settings') {
             this.#settings = displaced.state;
-        else if (displaced.kind === 'copySelector')
-            this.#copySelector = displaced.state;
+            this.#rebuildSettings(this.#pluginSettings?.entries() ?? []);
+            this.#refreshSettingsCatalog();
+        }
         else
             this.#search = displaced.state;
     }
+    /** The pane's answer, offered to `/copy` while it is on screen and finished. */
+    #copyableAside() {
+        if (this.#aside === undefined || this.#aside.status === 'running' || this.#aside.text.trim() === '')
+            return undefined;
+        return { question: this.#aside.question, text: this.#aside.text };
+    }
+    /**
+     * Copy something out of the transcript.
+     *
+     * There used to be four kinds — `text`, `code`, `cmd`, `output` — and each one
+     * asked the reader to remember a word to skip a keystroke in the picker. A kind
+     * that means "the default" is a no-op, and the other three name a row the picker
+     * already shows with its content, its language and its size. One command, one
+     * list: the choice is made by looking, not by recalling.
+     */
     async #runCopy(args) {
-        if (args.trim() === '') {
-            const items = buildCopyTargets(this.#state.blocks);
-            if (items.length === 0) {
-                this.#notice('Nothing to copy.');
-                this.#render();
-                return;
-            }
-            this.#search = null;
-            this.#ac = null;
-            this.#settings = null;
-            this.#copySelector = createCopySelector(items);
+        if (args.trim() !== '') {
+            this.#notice('Usage: /copy');
             this.#render();
             return;
         }
-        const kind = parseCopyKind(args);
-        if (kind === undefined) {
-            this.#notice('Usage: /copy [code|cmd]');
+        const items = buildCopyTargets(this.#state.blocks, undefined, this.#copyableAside());
+        if (items.length === 0) {
+            this.#notice('Nothing to copy.');
             this.#render();
             return;
         }
-        const target = extractCopyTarget(this.#state.blocks, kind);
-        if (target === undefined) {
-            this.#notice(kind === 'code' ? 'No code block to copy.' : kind === 'cmd' ? 'No command to copy.' : 'Nothing to copy.');
-            this.#render();
+        /**
+         * The same card as every other list.
+         *
+         * This used to be a bespoke overlay with its own key model: a filter that
+         * stayed inactive until `/` — so typing a letter did nothing and Space
+         * copied — and a nine-row hotkey table of its own. It was the last surface
+         * that did not answer to the shared list vocabulary, which is exactly the
+         * inconsistency the reader noticed.
+         */
+        const answer = await this.prompt({
+            title: 'Copy',
+            question: items.length === 1 ? 'One thing to copy' : 'Choose what to copy',
+            filterable: true,
+            allowCustom: false,
+            notify: false,
+            options: items.map(item => ({
+                label: item.label,
+                value: item.id,
+                ...(item.hint === '' ? {} : { description: item.hint }),
+                // The preview is the payload: choosing blind is what the row labels
+                // cannot prevent when two replies open with the same words.
+                preview: item.text,
+            })),
+        });
+        if (answer === null)
             return;
-        }
-        await this.#copyPicked(target.text, target.label);
+        const picked = items.find(item => item.id === answer);
+        if (picked === undefined)
+            return;
+        void this.#copyPicked(picked.text, picked.copyMessage);
     }
     #runSettings(args) {
         if (args.trim() !== '') {
@@ -3364,9 +4146,60 @@ export class LocalTui {
         }
         this.#search = null;
         this.#ac = null;
-        this.#settings = createSettings(this.prefs(), undefined, this.#agentBehavior, this.#features, this.#pluginSettings?.entries(), discoverEditors(this.#externalEditor));
+        this.#settings = createSettings(this.prefs(), undefined, this.#agentBehavior, this.#features, this.#pluginSettings?.entries(), discoverEditors(this.#externalEditor), this.#settingsActions());
+        this.#refreshSettingsCatalog();
         this.#render();
     }
+    #settingsActions() {
+        const runtimeActions = [
+            { id: 'command:model', label: 'Model and reasoning', description: 'Open /model; changes the current selection and saves the default route.', value: [this.#model, this.#reasoningEffort].filter(Boolean).join(' · '), values: [], action: 'model' },
+            { id: 'command:permission', label: 'Access', description: 'Open /permission to choose access for this session.', value: this.#sessionControls?.permission ?? 'Choose', values: [], action: 'permission' },
+            { id: 'command:agent', label: 'Agent preset', description: 'Open /agent to choose the session Agent preset.', value: this.#sessionControls?.agentPreset ?? 'Choose', values: [], action: 'agent' },
+        ].filter(item => this.#runtimeCommands.some(command => command.name === item.action));
+        const customBindings = Object.entries(this.#keybindings).filter(([key, action]) => DEFAULT_KEYBINDINGS[key] !== action).length;
+        return [
+            ...runtimeActions,
+            ...(this.#keybindingsPath === undefined ? [] : [{
+                    id: 'action:keybindings',
+                    label: 'Keybindings',
+                    description: 'Remap keyboard shortcuts and save to keybindings.json.',
+                    value: customBindings === 0 ? 'Default' : `${customBindings} custom`,
+                    values: [],
+                    action: 'keybindings',
+                    group: 'Input',
+                }]),
+        ];
+    }
+    #refreshSettingsCatalog() {
+        const binding = this.#pluginSettings;
+        if (this.#settings === null || binding?.refresh === undefined || this.#disposed)
+            return;
+        const version = ++this.#catalogVersion;
+        void binding.refresh().then(entries => {
+            if (version !== this.#catalogVersion || binding !== this.#pluginSettings || this.#settings === null || this.#disposed)
+                return;
+            this.#rebuildSettings(entries);
+            this.#render();
+        }).catch(() => { });
+    }
+    #rebuildSettings(entries, focus) {
+        if (this.#settings === null || this.#disposed)
+            return;
+        this.#settings = refreshSettings(this.#settings, createSettings(this.prefs(), focus, this.#agentBehavior, this.#features, entries, discoverEditors(this.#externalEditor), this.#settingsActions()));
+    }
+    #syncSettingsActions() {
+        if (this.#disposed)
+            return;
+        const entries = this.#pluginSettings?.entries() ?? [];
+        if (this.#settings !== null)
+            this.#rebuildSettings(entries);
+        if (this.#promptDisplaced?.kind === 'settings') {
+            this.#promptDisplaced = {
+                kind: 'settings',
+                state: refreshSettings(this.#promptDisplaced.state, createSettings(this.prefs(), undefined, this.#agentBehavior, this.#features, entries, discoverEditors(this.#externalEditor), this.#settingsActions())),
+            };
+        }
+    }
     #notice(text) {
         this.#state = {
             ...this.#state,
@@ -3374,40 +4207,59 @@ export class LocalTui {
         };
     }
     #configureNotifications() {
-        const thresholds = { '15s': 15_000, '30s': 30_000, '1m': 60_000, '2m': 120_000 };
         this.#notifications.configure({
             policy: this.#notificationPolicy,
-            thresholdMs: thresholds[this.#notificationThreshold],
+            thresholdMs: NOTIFICATION_THRESHOLD_MS,
         });
     }
     #emitNotification(notification) {
         if (notification === undefined || !this.#tty || this.#disposed)
             return;
-        if (this.#notificationFocus === 'unfocused' && this.#terminalFocused === true)
+        if (this.#notificationPolicy === 'unfocused' && this.#terminalFocused === true)
             return;
         this.#notificationQueue.offer(notification);
         if (this.#notificationTimer !== undefined)
             return;
         this.#notificationTimer = setTimeout(() => {
             this.#notificationTimer = undefined;
-            const pending = this.#notificationQueue.take(this.#notificationFocus, this.#terminalFocused);
+            const pending = this.#notificationQueue.take();
             if (pending === undefined || this.#disposed || this.#notificationPolicy === 'off')
                 return;
+            // Re-read focus at delivery time: the reader may have come back inside the
+            // coalescing window, and a turn finishing while they watch is not news.
+            if (this.#notificationPolicy === 'unfocused' && this.#terminalFocused === true)
+                return;
             const sequence = terminalNotificationSequence(pending);
             if (sequence !== '')
                 this.#term.output.write(sequence);
         }, 25);
     }
-    #toolCatalog() {
-        this.#state = {
-            ...this.#state,
-            blocks: [...this.#state.blocks, { kind: 'toolCatalog', tools: this.#tools }],
-        };
-        this.#focusLatestBlock();
+    /**
+     * Help is reference, not conversation: 60 rows of it pushed into immutable
+     * scrollback and vanished on resume, so the reader paid for it twice. It opens
+     * in the reading surface instead, where it can be searched and left with Esc.
+     */
+    #runHelp(full) {
+        const text = [
+            formatHelpText(this.#commands()),
+            '',
+            full
+                ? `**Keyboard Shortcuts · ${hotkeyCount(this.#keybindings)} shortcuts**`
+                : '**Essential Shortcuts**',
+            '',
+            full ? formatHotkeysText(this.#keybindings) : formatEssentialHotkeysText(this.#keybindings),
+            ...(full ? [] : ['', 'Use `/help full` to view every keyboard shortcut.']),
+        ].join('\n');
+        this.commandOutput('help', text, { focus: true });
     }
-    #focusLatestBlock() {
-        this.#follow = false;
-        this.#focusBlock = Math.max(0, this.#state.blocks.length - 1);
+    /**
+     * Tools are reference, like the command list: a table of names and
+     * descriptions the reader consults and dismisses, not a step of the work.
+     */
+    #runTools() {
+        // The first row of a command result is its heading, so a table needs one.
+        const heading = `Tools · ${this.#tools.length} active`;
+        this.commandOutput('tools', `${heading}\n\n${formatToolsText(this.#tools)}`, { focus: true });
     }
     /** Resolve a configured action for one key id, tolerating camelCase ids. */
     #boundAction(id) {
@@ -3415,13 +4267,75 @@ export class LocalTui {
     }
     /** Run one configured action; returns true when the event was consumed. */
     #runAction(action) {
-        if (this.#prompt !== null || this.#settings !== null || this.#copySelector !== null)
+        // `interrupt` is resolved further down, after every surface that wants to
+        // interpret Escape itself — a settings search clears before the overlay
+        // closes. Claiming it here would skip that layering.
+        if (action === 'interrupt')
+            return false;
+        if (action === 'clear-composer')
+            return this.#runClearComposer();
+        if (action === 'quit') {
+            if (this.#hasComposerContent() || this.#editor.text !== '')
+                return false;
+            this.#quit();
+            return true;
+        }
+        if (action === 'suspend') {
+            this.#suspend();
+            return true;
+        }
+        if (action === 'reset-display') {
+            this.#renderer.reset();
+            this.#render();
+            return true;
+        }
+        if (this.#prompt !== null || this.#settings !== null)
             return false;
+        if (action === 'select-model') {
+            this.#submit('/model');
+            return true;
+        }
+        if (action === 'cycle-thinking') {
+            this.#submit('/model reasoning');
+            return true;
+        }
+        if (action === 'toggle-thinking') {
+            this.#toggleThinking();
+            return true;
+        }
+        if (action === 'dequeue')
+            return this.#restoreLatestQueuedSubmission(true);
+        if (action === 'stash-draft') {
+            if (this.#search !== null)
+                return false;
+            this.#stashOrRestoreDraft();
+            return true;
+        }
         if (action === 'preview-images') {
             if (this.#search !== null || this.#inspected !== undefined)
                 return false;
-            if (this.#images.count === 0)
-                this.notice('Paste an image before opening its preview.');
+            if (this.#images.count === 0) {
+                // No draft image: preview the newest image the conversation carries,
+                // which is the only way a settled card can still show its picture.
+                const ref = this.#latestImageRef();
+                if (ref === undefined)
+                    this.notice('Paste an image before opening its preview.');
+                else if (this.#readImageInput === undefined)
+                    this.notice('This deployment cannot reopen that image.');
+                else if (this.#imagePreviewAbort === undefined) {
+                    const abort = new AbortController();
+                    this.#imagePreviewAbort = abort;
+                    void this.#readImageInput(ref, abort.signal)
+                        .then(image => image === undefined
+                        ? this.notice('That image could not be read back for a preview.', { level: 'error' })
+                        : previewImages(this, [image], abort.signal))
+                        .catch((error) => { if (!abort.signal.aborted && !this.#disposed)
+                        this.notice(error instanceof Error ? error.message : String(error), { level: 'error' }); })
+                        .finally(() => { if (this.#imagePreviewAbort === abort)
+                        this.#imagePreviewAbort = undefined; });
+                }
+                return true;
+            }
             else if (this.#imagePreviewAbort === undefined) {
                 const abort = new AbortController();
                 const revision = this.#images.revision;
@@ -3496,10 +4410,27 @@ export class LocalTui {
             return true;
         }
         if (action === 'review-changes') {
-            const anchor = this.#viewportBlock() ?? this.#state.blocks.length - 1;
-            const nextUser = this.#state.blocks.findIndex((block, index) => index > anchor && block.kind === 'user');
-            const workspace = this.#state.blocks.slice(0, nextUser < 0 ? undefined : nextUser).findLast(block => block.kind === 'workspace');
-            this.#runSlash('diff', workspace?.kind === 'workspace' ? `turn ${workspace.turn}` : '');
+            // The keyboard twin of right-clicking a tool's path: open the files the
+            // tool under the viewport declared. It shares the mouse path's region
+            // lookup, so the two can never disagree about which call is under the
+            // reader's eye.
+            //
+            // This used to also derive the turn under the viewport and forward
+            // `/diff turn N` when no tool was there — twenty lines of anchor
+            // backtracking to reach what `/diff` already asks for on its own. A
+            // reader who wants this turn's changes types `/diff`.
+            const rows = this.#renderer.viewport().map((_, row) => this.#renderer.documentRowAt(row)).filter((row) => row !== undefined);
+            const top = this.#follow ? undefined : rows[0];
+            const regions = this.#fileActionFrame?.transcript?.fileRegions ?? [];
+            const region = (top === undefined ? undefined : regions.find(region => top >= region.start && top < region.end))
+                ?? (this.#inspecting ? regions.find(region => this.#state.blocks[region.block]?.kind === 'tool' && rows.some(row => row >= region.start && row < region.end)) : undefined);
+            const block = this.#state.blocks[region?.block ?? (this.#viewportBlock() ?? this.#state.blocks.length - 1)];
+            const files = block?.kind === 'tool' ? blockFileAction(block) : undefined;
+            if (files === undefined) {
+                this.#showTransientStatus('No tool files here · use /diff', 4_000);
+                return true;
+            }
+            this.#openFileAction(files);
             return true;
         }
         if (action === 'scroll-page-up') {
@@ -3558,10 +4489,6 @@ export class LocalTui {
             this.#render();
             return true;
         }
-        if (action === 'inspect-subagent') {
-            void this.#pickSubagent();
-            return true;
-        }
         if (action === 'retry') {
             this.#submit('/retry');
             return true;
@@ -3574,10 +4501,6 @@ export class LocalTui {
             this.#submit('/model previous');
             return true;
         }
-        if (action === 'cycle-reasoning') {
-            this.#submit('/model reasoning');
-            return true;
-        }
         if (action === 'copy-prompt') {
             void this.#copyPicked(this.#editor.expandedText, 'current prompt');
             return true;
@@ -3591,29 +4514,212 @@ export class LocalTui {
             this.#startAsyncPaste(this.#pasteClipboard());
             return true;
         }
+        // A queued follow-up is the one action that must still work while the turn
+        // it belongs to is running; Enter is which-turn, this is after-this-turn.
+        if (action === 'follow-up') {
+            if (this.#editor.expandedText.trim() === '')
+                return false;
+            this.#submit(this.#editor.expandedText);
+            return true;
+        }
+        if (action !== 'external-editor')
+            return false;
         try {
-            this.#setMouseTracking(false);
-            this.#term.output.write('\x1b[?1004l');
-            this.#term.input.setRawMode?.(false);
-            this.#literalInput ||= this.#editor.startsWithPaste;
-            const text = editExternally(this.#editor.expandedText, this.#externalEditor);
-            this.#editor.setText(text);
-            this.#images.reconcile();
+            this.#handTerminal(() => {
+                this.#literalInput ||= this.#editor.startsWithPaste;
+                const text = editExternally(this.#editor.expandedText, this.#externalEditor);
+                this.#editor.setText(text);
+                this.#images.reconcile();
+            });
         }
         catch (error) {
             this.notice(error instanceof Error ? error.message : String(error), { level: 'error' });
         }
         finally {
             if (!this.#disposed) {
-                this.#term.input.setRawMode?.(true);
-                this.#term.output.write('\x1b[?1004h');
-                this.#renderer.reset();
                 this.#refreshAutocomplete();
                 this.#render();
             }
         }
         return true;
     }
+    #openPlanFeedbackEditor(prompt) {
+        try {
+            this.#handTerminal(() => {
+                const initial = prompt.feedback === true ? this.#editor.expandedText : '';
+                const text = editExternally(initial, this.#externalEditor);
+                this.#editor.setText(text);
+                this.#prompt = { ...prompt, feedback: true };
+            });
+        }
+        catch (error) {
+            this.notice(error instanceof Error ? error.message : String(error), { level: 'error' });
+        }
+        finally {
+            if (!this.#disposed)
+                this.#render();
+        }
+    }
+    #hasComposerContent() {
+        return this.#editor.text !== '' || this.#images.count > 0 || this.#files.copies().length > 0;
+    }
+    #stashScope() {
+        return this.#inspected?.id ?? this.#sessionId ?? '__default__';
+    }
+    #clearComposerWithUndo(options = {}) {
+        const hadContent = this.#hasComposerContent();
+        const snapshot = hadContent ? this.#captureDraft() : undefined;
+        this.#literalInput = false;
+        this.#editor.clear();
+        this.#images.clear();
+        this.#files.clear();
+        if (options.clearQueueEdit) {
+            this.#queueEditNewer = null;
+            this.#queueEditPending = false;
+        }
+        if (options.closeSearch)
+            this.#search = null;
+        this.#historyIndex = 0;
+        this.#clearDraft();
+        this.#ac = null;
+        if (snapshot !== undefined) {
+            this.#clearedDraft = { draft: snapshot, revision: this.#editor.revision };
+        }
+        this.#render();
+    }
+    #stashOrRestoreDraft() {
+        const scope = this.#stashScope();
+        const stashed = this.#stashedDrafts.get(scope);
+        if (this.#hasComposerContent()) {
+            const current = this.#captureDraft();
+            this.#stashedDrafts.set(scope, current);
+            if (stashed !== undefined) {
+                this.#restoreDraft(stashed);
+                this.notice('Swapped composer draft with stashed draft.');
+            }
+            else {
+                this.#literalInput = false;
+                this.#editor.setText('');
+                this.#images.clear();
+                this.#files.clear();
+                this.#clearDraft();
+                this.notice('Stashed composer draft. Send a message or press Ctrl+S again to restore.');
+            }
+            this.#historyIndex = 0;
+            this.#ac = null;
+            this.#render();
+            return;
+        }
+        if (stashed !== undefined) {
+            this.#stashedDrafts.delete(scope);
+            this.#restoreDraft(stashed);
+            this.#historyIndex = 0;
+            this.#refreshAutocomplete();
+            this.notice('Restored stashed draft.');
+            this.#render();
+            return;
+        }
+        this.notice('Nothing to stash.');
+    }
+    #popStashedDraft() {
+        if (this.#hasComposerContent())
+            return;
+        const scope = this.#stashScope();
+        const stashed = this.#stashedDrafts.get(scope);
+        if (stashed === undefined)
+            return;
+        this.#stashedDrafts.delete(scope);
+        this.#restoreDraft(stashed);
+        this.#historyIndex = 0;
+        this.#refreshAutocomplete();
+    }
+    async #editKeybindings() {
+        if (this.#keybindingsPath === undefined)
+            return;
+        while (!this.#disposed) {
+            const options = [
+                ...TUI_ACTIONS.map(action => {
+                    const keys = keysForAction(this.#keybindings, action);
+                    const defaultKeys = keysForAction(DEFAULT_KEYBINDINGS, action);
+                    return {
+                        label: `${TUI_ACTION_LABELS[action]} · ${keys}`,
+                        value: action,
+                        description: keys === defaultKeys ? `Action: ${action}` : `Action: ${action} (default: ${defaultKeys})`,
+                    };
+                }),
+                {
+                    label: 'Reset all keybindings to defaults',
+                    value: '__reset_all__',
+                    description: 'Restore default shortcuts in keybindings.json',
+                },
+            ];
+            const choice = await this.prompt({
+                title: 'Keybindings',
+                question: 'Choose an action to remap, or Esc to return to /settings.',
+                options,
+                filterable: true,
+                allowCustom: false,
+                notify: false,
+            });
+            if (choice === null || this.#disposed)
+                break;
+            if (choice === '__reset_all__') {
+                try {
+                    saveKeybindings(this.#keybindingsPath, DEFAULT_KEYBINDINGS);
+                    this.#keybindings = loadKeybindings(this.#keybindingsPath);
+                    if (this.#settings !== null)
+                        this.#rebuildSettings(this.#pluginSettings?.entries() ?? [], 'action:keybindings');
+                    this.notice('Reset keybindings to defaults.');
+                }
+                catch (error) {
+                    this.notice(`Could not save keybindings: ${error instanceof Error ? error.message : String(error)}`, { level: 'error' });
+                }
+                continue;
+            }
+            const action = choice;
+            if (!TUI_ACTIONS.includes(action))
+                continue;
+            const currentRawKeys = Object.entries(this.#keybindings).filter(([, bound]) => bound === action).map(([key]) => key);
+            const defaultKeys = keysForAction(DEFAULT_KEYBINDINGS, action);
+            const entered = await this.prompt({
+                title: `Remap ${TUI_ACTION_LABELS[action]}`,
+                question: `Enter key chord (e.g. ctrl+s, alt+k), "default" (${defaultKeys}), or "none" to unbind.`,
+                initialInput: currentRawKeys[0] ?? '',
+                allowCustom: true,
+                notify: false,
+            });
+            if (entered === null || this.#disposed)
+                continue;
+            const normalized = entered.trim().toLowerCase();
+            if (normalized === '')
+                continue;
+            const next = { ...this.#keybindings };
+            for (const [key, bound] of Object.entries(next)) {
+                if (bound === action)
+                    delete next[key];
+            }
+            if (normalized === 'default') {
+                for (const [key, bound] of Object.entries(DEFAULT_KEYBINDINGS)) {
+                    if (bound === action)
+                        next[key] = action;
+                }
+            }
+            else if (normalized !== 'none' && normalized !== 'unbind') {
+                next[normalized] = action;
+            }
+            try {
+                saveKeybindings(this.#keybindingsPath, next);
+                this.#keybindings = loadKeybindings(this.#keybindingsPath);
+                if (this.#settings !== null)
+                    this.#rebuildSettings(this.#pluginSettings?.entries() ?? [], 'action:keybindings');
+            }
+            catch (error) {
+                this.notice(`Could not save keybindings: ${error instanceof Error ? error.message : String(error)}`, { level: 'error' });
+            }
+        }
+        if (this.#tty && !this.#disposed)
+            this.#render();
+    }
     /**
      * Block index the reader is looking at: the first one that starts at or below
      * the top of the transcript window. A collapsed row has to stay reachable
@@ -3643,6 +4749,22 @@ export class LocalTui {
             return;
         }
         const anchor = this.#viewportBlock();
+        /**
+         * A long command result and a collapsed side answer fold the same way, and
+         * this is the key that opens either. It is answered before the run lookup
+         * because neither is a run: the reader aimed at those rows, not at the run
+         * above them.
+         */
+        const anchored = anchor === undefined ? undefined : this.#state.blocks[anchor];
+        if (anchor !== undefined && (anchored?.kind === 'commandOutput' || anchored?.kind === 'aside')) {
+            if (this.#expandedOutputs.has(anchored))
+                this.#expandedOutputs.delete(anchored);
+            else
+                this.#expandedOutputs.add(anchored);
+            this.#inspect(anchor);
+            this.#render();
+            return;
+        }
         const groups = turnGroups(this.#state).filter(item => !item.live);
         // The answer, changed-file record, and following notices still address
         // their turn when the reader is following the tail.
@@ -3671,11 +4793,6 @@ export class LocalTui {
             this.#render();
             return;
         }
-        if (anchor !== undefined && this.#state.blocks[anchor]?.kind === 'toolCatalog') {
-            this.#toolsExpanded = !this.#toolsExpanded;
-            this.#inspect(anchor);
-            this.#render();
-        }
         // A live turn already has the process presentation; Alt+O owns tool details.
     }
     #detailScope(group) {
@@ -3738,20 +4855,47 @@ export class LocalTui {
         else
             set.add(key);
     }
+    /**
+     * Every occurrence of the active query, in reading order.
+     *
+     * Stepping needs the same list the painter uses, so it asks the renderer rather
+     * than scanning source text: a hit inside a folded row or a wrapped Markdown
+     * table exists only in the rendered rows.
+     */
+    #searchOccurrences() {
+        const search = this.#transcriptSearch;
+        if (search === null || search.query.trim() === '')
+            return [];
+        const options = {
+            width: this.#term.width(),
+            colors: this.#colors,
+            themeName: this.#themeName,
+            ...(this.#colorDepth === undefined ? {} : { colorDepth: this.#colorDepth }),
+            mathMode: this.#mathMode,
+            toolsExpanded: this.#toolsExpanded,
+            expandedOutputs: this.#expandedOutputs,
+            hideThinking: this.#hideThinking,
+            expandedTools: this.#detailedToolIds(),
+            ...(this.#openedGroups === undefined ? {} : { openedGroups: this.#openedGroups }),
+        };
+        return searchMatches(renderedBlocks(this.#state, options), search.query);
+    }
     /** Fold one event into the active transcript search. */
     #applyTranscriptSearch(event) {
         const state = this.#transcriptSearch;
         if (state === null)
             return;
-        const command = applyTranscriptSearchEvent(state, event, this.#state.blocks.map(blockSearchText));
+        const command = applyTranscriptSearchEvent(state, event, this.#searchOccurrences());
         if (command.kind === 'close') {
             this.#transcriptSearch = null;
             this.#render();
             return;
         }
         this.#transcriptSearch = command.state;
-        if (command.kind === 'focus')
-            this.#focusBlock = command.block;
+        if (command.kind === 'focus') {
+            this.#focusBlock = command.match.block;
+            this.#focusBlockEdge = 'start';
+        }
         this.#render();
     }
 }
@@ -3775,6 +4919,21 @@ export function apply(ctx, config) {
     };
     const tui = new LocalTui(term, config.model, config.colors.get(), config.theme.get(), copyToClipboard, {
         deferInitialRender: true,
+        readImageInput: async (ref, signal) => {
+            const attachments = ctx.get('attachments');
+            if (attachments === undefined)
+                return undefined;
+            const stored = await attachments.readImage(ref, signal);
+            if (stored === undefined)
+                return undefined;
+            return {
+                data: stored.data,
+                mediaType: stored.ref.mediaType,
+                ...(stored.ref.name === undefined ? {} : { name: stored.ref.name }),
+                width: stored.ref.width,
+                height: stored.ref.height,
+            };
+        },
         terminalProfile,
         alternateScreenOverlays: terminalProfile === 'direct',
         herdrReporter: new HerdrAgentReporter({ interactive: term.input.isTTY === true && term.output.isTTY === true }),
@@ -3788,6 +4947,31 @@ export function apply(ctx, config) {
     });
     ctx.provide(TUI_SERVICE, tui);
     ctx.effect(() => () => tui.dispose());
+    // A missing route must be visible without turning the startup header into a
+    // credential check: the seams answer optimistically when they cannot tell.
+    ctx.inject(['settings', 'credentials'], readyCtx => {
+        const refreshModelReady = () => {
+            void modelRouteReady(readyCtx).then(ready => tui.setModelReady(ready)).catch(() => { });
+        };
+        refreshModelReady();
+        readyCtx.effect(() => {
+            const disposers = [
+                readyCtx.on('credentials/reference-updated', refreshModelReady),
+                readyCtx.on('credentials/record-updated', refreshModelReady),
+                readyCtx.on('authorization/settled', refreshModelReady),
+            ];
+            // The account service and the credential backend may activate just after
+            // this injection; re-read once the composition has settled so an existing
+            // grant is reflected in the live placeholder without a credential event.
+            const timers = [setTimeout(refreshModelReady, 250), setTimeout(refreshModelReady, 1_500)];
+            return () => {
+                for (const dispose of disposers)
+                    dispose();
+                for (const timer of timers)
+                    clearTimeout(timer);
+            };
+        }, 'omdsh model readiness');
+    });
     // Preferences are this entry's own volatile config: the initial read applies
     // them without persisting, a committed form edit dispatches a volatile update
     // to this fiber only, and an in-app `/settings` change writes back through the
@@ -3800,14 +4984,14 @@ export function apply(ctx, config) {
             mathMode: config.mathMode.get(),
             mermaidMode: config.mermaidMode.get(),
             editor: config.editor.get(),
-            terminalProgress: config.terminalProgress.get(),
+            terminalTitle: config.terminalTitle.get(),
+            terminalState: config.terminalState.get(),
             copyOnSelect: config.copyOnSelect.get(),
             mouseInteraction: config.mouseInteraction.get(),
             pasteProtection: config.pasteProtection.get(),
             checkUpdates: config.checkUpdates.get(),
             startupChangelog: config.startupChangelog.get(),
             notifications: config.notifications.get(),
-            notificationThreshold: config.notificationThreshold.get(),
             notificationFocus: config.notificationFocus.get(),
         };
         const statusBar = config.statusBar.get();
@@ -3825,17 +5009,32 @@ export function apply(ctx, config) {
     // Persistence needs the settings service; without one the provider still runs
     // and an in-app change stays session-local, as it did before.
     ctx.inject(['settings'], (settingsCtx) => {
-        tui.setPrefsPersist((prefs) => {
-            const ops = Object.entries(prefs).map(([key, value]) => ({ op: 'set', path: [key], value }));
-            void settingsCtx.settings.mutate(TUI_SETTINGS_ENTRY, ops)
-                .catch((error) => { settingsCtx.logger.warn(error); });
+        tui.setPrefsPersist((_prefs, changes) => {
+            return settingsCtx.settings.mutate(TUI_SETTINGS_ENTRY, [...changes ?? []])
+                .catch((error) => { tui.applyStoredPrefs(storedPrefs()); throw error; });
         });
     });
     ctx.inject(['settings', 'credentials'], (settingsCtx) => {
-        settingsCtx.effect(() => tui.bindPluginSettings({
-            entries: () => pluginSettingsEntries(settingsCtx),
-            edit: (id, signal) => editPluginSettings(settingsCtx, id, signal),
-        }));
+        settingsCtx.effect(() => {
+            let bundles;
+            let inventoryVersion = 0;
+            return tui.bindPluginSettings({
+                entries: () => pluginSettingsEntries(settingsCtx, bundles),
+                refresh: async () => {
+                    const version = ++inventoryVersion;
+                    const fresh = await settingsCtx.get('pluginManager')?.listBundles();
+                    if (version === inventoryVersion)
+                        bundles = fresh;
+                    return pluginSettingsEntries(settingsCtx, fresh);
+                },
+                edit: (id, signal) => editSettingsEntry(settingsCtx, id, signal),
+                set: (entry, value, signal) => setSettingsEntry(settingsCtx, entry, value, signal),
+                reset: async (id, entry, signal, label) => {
+                    await resetSettingsControl(settingsCtx, id, entry, signal, label);
+                    tui.applyStoredPrefs(storedPrefs());
+                },
+            });
+        });
     });
 }
 //# sourceMappingURL=provider-local.js.map