@agi-fans/dsh-tui 0.14.0 → 0.16.0

package/lib/runtime/provider-local.js

@@ -12,8 +12,9 @@
  */
 import { TerminalNotificationController, terminalNotificationSequence, terminalProgressSequence, } from "./terminal-notifications.js";
 import { homedir } from 'node:os';
-import { join } from 'node:path';
+import { join, sep } from 'node:path';
 import { createInterface } from 'node:readline';
+import { StringDecoder } from 'node:string_decoder';
 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";
@@ -25,20 +26,22 @@ import { buildCopyTargets, extractCopyTarget, parseCopyKind } from "../views/cop
 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 { appendTrajectoryEvent, applyTrajectoryEvent, createTrajectory, } from "../views/trajectory.js";
+import { appendTrajectoryEvent, applyTrajectoryEvent, createTrajectory, trajectoryDetailMetrics, trajectoryListMetrics, } from "../views/trajectory.js";
 import { applyAgentHubEvent, createAgentHub, updateAgentHub, } from "../views/agent-hub.js";
-import { applyEvent, blockLines, initialTranscript, replayEvents, renderView, TRANSCRIPT_FAST_SCROLL, } from "../views/event-views.js";
+import { applyEvent, applyStreamChunk, blockLines, blockSearchText, initialTranscript, replayEvents, renderView, TRANSCRIPT_FAST_SCROLL, } from "../views/event-views.js";
+import { applyTranscriptSearchEvent, createTranscriptSearch, searchBlockIndexes, } from "../views/transcript-search.js";
 import { nextRevealStep, revealStreamingAssistant, streamingAssistantKey, streamingAssistantUnits, } from "../views/streaming-reveal.js";
 import { flushPending, parseKeys } from "../input/keys.js";
 import { MainScreenRenderer } from "../chrome/main-screen-renderer.js";
-import { createTheme, detectTrueColor, parseThemeName } from "../chrome/theme.js";
+import { colorDisabledByEnv, createTheme, detectTrueColor, parseThemeName } from "../chrome/theme.js";
+import { renderTool } from "../chrome/tool-renderers.js";
 import { TUI_SETTINGS_NAMESPACE, TuiSettingsSchema } from "../session/tui-settings.js";
 import { defaultStatusBarConfig, resolveStatusBarConfig } from "../chrome/status-config.js";
 import { HistoryStore } from "../views/history-store.js";
 import { loadKeybindings } from "../input/keybindings-config.js";
 import { editExternally } from "../input/external-editor.js";
 import { movePromptSelection, filteredPromptOptions, selectedPromptAnswer, selectedFilteredPromptAnswer, togglePromptSelection, } from "../views/prompt-selector.js";
-import { resolveProjectContext } from "../session/project-context.js";
+import { refreshProjectContext, resolveProjectContext } from "../session/project-context.js";
 import { pickWelcomeTips } from "../chrome/welcome-tips.js";
 import { formatEssentialHotkeysText, formatHotkeysText, hotkeyCount } from "../views/hotkeys.js";
 import { imageMarker, imagePathCandidates, probeImageDimensions, stripComposerImageMarkers, readImageFile, readImageFromClipboard, readMacClipboardFiles, } from "../input/image-paste.js";
@@ -51,10 +54,24 @@ function shortenPath(cwd) {
     const home = homedir();
     if (cwd === home)
         return '~';
-    if (cwd.startsWith(home + '/'))
+    // Windows separates with `\`, so the home prefix check follows the host.
+    if (cwd.startsWith(home + sep))
         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';
 /**
  * Local terminal presentation service.
@@ -65,6 +82,18 @@ function detectTerminalProfile() {
     }
     return process.platform === 'win32' ? 'conpty' : 'direct';
 }
+/**
+ * Decide whether SGR is emitted. An explicit preference — plugin config or a
+ * value the user picked in `/settings` — always wins, so a non-empty `NO_COLOR`
+ * can never block someone who asked for color. Without a preference, a
+ * non-empty `NO_COLOR` or `FORCE_COLOR=0` suppresses color and the output
+ * stream's tty-ness decides.
+ */
+function resolveColors(preference, isTty) {
+    if (preference !== undefined)
+        return preference;
+    return isTty && !colorDisabledByEnv();
+}
 export class LocalTui {
     #deferInitialRender = false;
     #terminalProfile;
@@ -86,6 +115,7 @@ export class LocalTui {
     #draft = '';
     #ac = null;
     #search = null;
+    #transcriptSearch = null;
     #settings = null;
     #copySelector = null;
     #trajectory = null;
@@ -151,9 +181,18 @@ export class LocalTui {
     #tools = [];
     #runtimeCommands = [];
     #prompt = null;
+    /**
+     * The overlay surface displaced by an in-flight prompt: while a human
+     * prompt owns the keyboard, its screen must not compete with a stale
+     * trajectory/hub surface that accepts invisible confirmations. Restored
+     * when the prompt settles.
+     */
+    #promptDisplaced = null;
     #recentSessions = [];
     #welcomeTips;
     #sessionId;
+    #sessionTitle;
+    #writtenWindowTitle;
     #sessionStats;
     #sessionControls;
     #loopStatus;
@@ -161,7 +200,12 @@ export class LocalTui {
     #subagentLauncherFocused = false;
     #inspected;
     #promptDocument;
-    #trueColor;
+    /**
+     * 24-bit switch for the current color preference, re-derived whenever that
+     * preference changes so a session that starts colorless can still enable
+     * hexadecimal palettes without a restart.
+     */
+    #trueColor = false;
     #copy;
     #readClipboard;
     #readClipboardImage;
@@ -186,7 +230,8 @@ export class LocalTui {
     /**
      * @param term - terminal surface (injectable for tests).
      * @param model - model label for the status line.
-     * @param colors - SGR styling switch.
+     * @param colors - SGR styling switch; `undefined` derives one from the
+     * output stream's tty-ness and the environment.
      * @param themeName - shipped palette.
      * @param copy - clipboard writer (defaults to the platform tool).
      * @param paths - cwd/home/listing used by `@` and path autocomplete.
@@ -194,7 +239,7 @@ export class LocalTui {
     constructor(term, model, colors, themeName = 'dark', copy = copyToClipboard, paths = {}) {
         this.#term = term;
         this.#model = model;
-        this.#colors = colors;
+        this.#colors = resolveColors(colors, term.output.isTTY === true);
         this.#themeName = themeName;
         this.#copy = copy;
         this.#readClipboard = paths.readClipboard ?? readFromClipboard;
@@ -219,7 +264,7 @@ export class LocalTui {
         this.#terminalProfile = paths.terminalProfile ?? detectTerminalProfile();
         this.#resizeDebounceMs = Math.max(0, paths.resizeDebounceMs ?? 120);
         this.#streamRenderMs = Math.max(0, paths.streamRenderMs ?? 8);
-        this.#trueColor = colors && detectTrueColor();
+        this.#syncTrueColor();
         this.#tty = term.input.isTTY === true;
         this.#pwd = shortenPath(project.root);
         this.#branch = project.gitLabel;
@@ -257,6 +302,15 @@ export class LocalTui {
         }
         this.#render();
     }
+    /** Refresh Git workspace metadata after a turn; the footer shows realtime branch/dirty state. */
+    #refreshProjectContext() {
+        const branch = refreshProjectContext(this.#cwd).gitLabel;
+        if (branch === this.#branch)
+            return;
+        this.#branch = branch;
+        if (this.#tty)
+            this.#render();
+    }
     event(event, presentation) {
         this.#state = applyEvent(this.#state, event, presentation);
         this.#emitNotification(this.#notifications.event({
@@ -266,22 +320,37 @@ export class LocalTui {
         }));
         if (this.#trajectory !== null)
             this.#trajectory = appendTrajectoryEvent(this.#trajectory, event);
-        const smoothStream = this.#syncStreamingReveal(event);
+        if (event.type === 'turn/end')
+            this.#refreshProjectContext();
+        this.#syncStreamingReveal(undefined);
+        this.#syncTick();
+        if (this.#tty) {
+            this.#render();
+        }
+        else if (event.type === 'user/message' || event.type === 'assistant/message' || event.type === 'tool/result' || event.type === 'turn/end') {
+            this.#printPlain();
+        }
+    }
+    /**
+     * Fold one live `agent/assistant-stream` chunk into the transcript and
+     * schedule the streaming reveal. Durable settlement follows on the session
+     * log as `assistant/message` or `assistant/attempt`.
+     */
+    streamDelta(delta) {
+        this.#state = applyStreamChunk(this.#state, delta);
+        const smoothStream = this.#syncStreamingReveal(delta);
         this.#syncTick();
         if (this.#tty) {
             if (smoothStream) {
                 // The 30 fps reveal clock owns presentation for textual deltas.
             }
-            else if (event.type === 'assistant/chunk' && this.#streamRenderMs > 0) {
+            else if (this.#streamRenderMs > 0) {
                 this.#scheduleStreamRender();
             }
             else {
                 this.#render();
             }
         }
-        else if (event.type === 'user/message' || event.type === 'assistant/message' || event.type === 'tool/result' || event.type === 'turn/end') {
-            this.#printPlain();
-        }
     }
     setStatus(status) {
         if (this.#state.status === 'compacting')
@@ -304,6 +373,13 @@ export class LocalTui {
             this.#render();
     }
     setSubagents(roster) {
+        const previous = this.#subagents?.agents ?? [];
+        const incoming = roster?.agents ?? [];
+        const statusChanged = previous.length !== incoming.length || incoming.some((agent, index) => {
+            const before = previous[index];
+            return before === undefined || before.id !== agent.id || before.label !== agent.label
+                || before.phase !== agent.phase || before.depth !== agent.depth || before.mode !== agent.mode;
+        });
         this.#subagents = roster === undefined
             ? undefined
             : { agents: roster.agents.map(agent => ({ ...agent, activity: [...agent.activity] })) };
@@ -328,11 +404,17 @@ export class LocalTui {
                 };
             }
         }
+        if (!statusChanged && this.#agentHub === null)
+            return;
         this.#syncTick();
         if (this.#tty)
-            this.#render();
+            this.#scheduleStreamRender();
     }
     setInspectedSubagent(inspected) {
+        if (this.#inspected?.id === inspected?.id && this.#inspected?.label === inspected?.label
+            && this.#inspected?.phase === inspected?.phase && this.#inspected?.mode === inspected?.mode
+            && this.#inspected?.writable === inspected?.writable)
+            return;
         this.#inspected = inspected === undefined ? undefined : { ...inspected };
         if (inspected !== undefined) {
             this.#inspectEscapeFenceUntil = 0;
@@ -358,9 +440,9 @@ export class LocalTui {
     openTrajectory(events) {
         if (!this.#tty)
             return false;
+        this.#finishPrompt(null);
         this.#trajectory = createTrajectory(events);
         this.#agentHub = null;
-        this.#prompt = null;
         this.#settings = null;
         this.#copySelector = null;
         this.#search = null;
@@ -383,6 +465,31 @@ export class LocalTui {
     setImageValidator(validate) {
         this.#validateImageDraft = validate;
     }
+    toolCallContext(callId) {
+        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.
+        const view = renderTool({
+            name: block.name,
+            arguments: block.args,
+            output: block.output,
+            status: block.status,
+            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]
+            .filter((part) => part !== undefined && part !== '')
+            .join(' · ');
+    }
     notice(text, options = {}) {
         const block = {
             kind: 'notice',
@@ -411,6 +518,7 @@ export class LocalTui {
         this.#emitNotification(this.#notifications.humanPrompt());
         this.#editor.setText('');
         this.#ac = null;
+        const displaced = this.#displaceSurface();
         return new Promise((resolve) => {
             const selected = Math.max(0, request.options?.findIndex(option => (option.value ?? option.label) === request.initialValue) ?? 0);
             const pending = { request, selected, checked: new Set(), resolve };
@@ -420,6 +528,7 @@ export class LocalTui {
                 pending.offAbort = () => { request.signal?.removeEventListener('abort', onAbort); };
             }
             this.#prompt = pending;
+            this.#promptDisplaced = displaced;
             if (this.#tty) {
                 this.#render();
             }
@@ -454,6 +563,8 @@ export class LocalTui {
     }
     setSession(info) {
         this.#sessionId = 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
@@ -464,6 +575,7 @@ export class LocalTui {
             };
         if (!this.#tty)
             return;
+        this.#syncWindowTitle();
         if (this.#reveal !== undefined && this.#motion !== 'off')
             return;
         if (this.#streamRenderMs > 0 && this.#busy())
@@ -471,11 +583,31 @@ 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.
+     */
+    #syncWindowTitle() {
+        const title = windowTitleText(this.#sessionTitle);
+        if (title === this.#writtenWindowTitle)
+            return;
+        this.#writtenWindowTitle = title;
+        this.#term.output.write(`\x1b]2;${title}\x07`);
+    }
+    /**
+     * Re-derive the 24-bit switch from the active color preference. Every path
+     * that changes `#colors` calls this so `/settings` takes effect immediately.
+     */
+    #syncTrueColor() {
+        this.#trueColor = this.#colors && detectTrueColor();
+    }
     /** Apply prefs loaded from the settings document (does not persist). */
     applyStoredPrefs(prefs) {
         const previousMotion = this.#motion;
         this.#themeName = prefs.theme;
         this.#colors = prefs.colors;
+        this.#syncTrueColor();
         this.#motion = prefs.motion ?? 'full';
         this.#terminalProgress = prefs.terminalProgress ?? false;
         this.#expandTools = prefs.expandTools;
@@ -523,10 +655,10 @@ export class LocalTui {
                 this.#render();
         };
     }
-    readInput() {
+    readInput(signal) {
         if (this.#pending !== null)
             return Promise.reject(new Error('omdsh-tui: input read already in flight'));
-        if (this.#disposed)
+        if (this.#disposed || signal?.aborted === true)
             return Promise.resolve(null);
         // A Ctrl-D pressed while the previous turn was still settling lands here
         // (no pending readline existed to resolve); honor it now.
@@ -535,7 +667,7 @@ export class LocalTui {
             return Promise.resolve(null);
         }
         if (!this.#tty)
-            return this.#readlinePlain();
+            return this.#readlinePlain(signal);
         // Lines submitted while a turn was still running were queued instead of
         // dropped; serve the oldest before waiting for fresh input.
         const queued = this.#queuedSubmissions.shift();
@@ -544,7 +676,18 @@ export class LocalTui {
             return Promise.resolve(queued);
         }
         return new Promise((resolve) => {
-            this.#pending = { resolve };
+            const pending = { resolve, signal: signal ?? null };
+            this.#pending = pending;
+            if (signal !== undefined) {
+                const onAbort = () => {
+                    if (this.#pending !== pending)
+                        return;
+                    this.#pending = null;
+                    resolve(null);
+                };
+                signal.addEventListener('abort', onAbort, { once: true });
+                pending.offAbort = () => { signal.removeEventListener('abort', onAbort); };
+            }
         });
     }
     /** Compatibility helper for provider-level text editing tests and embedders. */
@@ -651,6 +794,11 @@ export class LocalTui {
             // prompt does not overwrite the transcript. Disable bracketed paste
             // and restore the cursor.
             this.#renderer.finish();
+            // Clear the session title we owned so the shell's own title returns.
+            if (this.#writtenWindowTitle !== undefined && this.#writtenWindowTitle !== '') {
+                this.#term.output.write('\x1b]2;\x07');
+                this.#writtenWindowTitle = undefined;
+            }
             this.#term.output.write('\x1b[?2004l\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`);
@@ -669,15 +817,23 @@ export class LocalTui {
         this.#lineReader?.close();
         this.#offAgentBehaviorWatch?.();
         this.#offAgentBehaviorWatch = undefined;
-        this.#pending?.resolve(null);
-        this.#pending = null;
+        this.#settlePending(null);
         this.#finishPrompt(null);
     }
+    /** Settle one pending read, detaching its abort listener. */
+    #settlePending(submission) {
+        const pending = this.#pending;
+        if (pending === null)
+            return;
+        pending.offAbort?.();
+        this.#pending = null;
+        pending.resolve(submission);
+    }
     /** Re-render the current frame (resize reflow). */
     refresh() {
         this.#render();
     }
-    #readlinePlain() {
+    #readlinePlain(signal) {
         return new Promise((resolve) => {
             if (this.#lineReader === null) {
                 this.#lineReader = createInterface({ input: this.#term.input });
@@ -689,13 +845,26 @@ export class LocalTui {
                     this.#plainResolve(null);
                 });
             }
-            if (this.#plainClosed) {
-                resolve(null);
-                return;
+            const pending = { resolve, signal: signal ?? null };
+            this.#plainPending = pending;
+            if (signal !== undefined) {
+                const onAbort = () => {
+                    if (this.#plainPending !== pending)
+                        return;
+                    this.#plainPending = null;
+                    resolve(null);
+                };
+                signal.addEventListener('abort', onAbort, { once: true });
+                pending.offAbort = () => { signal.removeEventListener('abort', onAbort); };
             }
-            this.#plainPending = { resolve };
+            this.#pumpPlain();
         });
     }
+    /**
+     * Queue one readline delivery, then drain. A single stream chunk can carry
+     * several lines; every line is buffered until the runner asks for the next
+     * read, and EOF waits for the queue before closing the reader.
+     */
     #plainResolve(line) {
         if (this.#prompt !== null && line !== null) {
             const value = line.trim();
@@ -717,9 +886,27 @@ export class LocalTui {
         }
         if (this.#prompt !== null)
             this.#finishPrompt(null);
+        if (line !== null)
+            this.#plainQueue.push(line);
+        this.#pumpPlain();
+    }
+    /** Resolve the pending plain read from the queue, or close it after EOF drained. */
+    #pumpPlain() {
         const pending = this.#plainPending;
-        this.#plainPending = null;
-        pending?.resolve(line === null ? null : { text: line, images: [] });
+        if (pending === null)
+            return;
+        const line = this.#plainQueue.shift();
+        if (line !== undefined) {
+            pending.offAbort?.();
+            this.#plainPending = null;
+            pending.resolve({ text: line, images: [] });
+            return;
+        }
+        if (this.#plainClosed) {
+            pending.offAbort?.();
+            this.#plainPending = null;
+            pending.resolve(null);
+        }
     }
     /** Print plain-mode blocks that settled since the last flush. */
     #printPlain() {
@@ -761,9 +948,9 @@ export class LocalTui {
             this.#tick = null;
         }
     }
-    #syncStreamingReveal(event) {
-        const textualDelta = event.type === 'assistant/chunk'
-            && (event.data.chunk.type === 'text-delta' || event.data.chunk.type === 'reasoning-delta');
+    #syncStreamingReveal(delta) {
+        const textualDelta = delta !== undefined
+            && (delta.chunk.type === 'text-delta' || delta.chunk.type === 'reasoning-delta');
         const key = streamingAssistantKey(this.#state);
         if (!textualDelta || this.#motion === 'off' || key === undefined) {
             this.#stopRevealTick();
@@ -868,6 +1055,7 @@ export class LocalTui {
                 colors: this.#colors,
                 pwd: this.#pwd,
                 ...(this.#branch !== undefined ? { branch: this.#branch } : {}),
+                ...(this.#sessionTitle === undefined ? {} : { sessionTitle: this.#sessionTitle }),
                 version: APP_VERSION,
                 appName: APP_NAME,
                 spinnerFrame: this.#spinner,
@@ -876,6 +1064,14 @@ export class LocalTui {
                 themeName: this.#themeName,
                 scrollStart: this.#follow ? Number.POSITIVE_INFINITY : this.#scrollStart,
                 ...(this.#focusBlock === undefined ? {} : { focusBlock: this.#focusBlock }),
+                ...(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,
                 expandedTools: this.#expandedToolCalls,
                 commands: this.#commands(),
@@ -946,8 +1142,13 @@ export class LocalTui {
         this.#follow = true;
         this.#scrollStart = this.#maxStart;
     }
+    #utf8 = new StringDecoder('utf8');
+    #plainQueue = [];
     #onData(chunk) {
-        const { events, rest } = parseKeys(this.#pendingKeys + chunk.toString('utf8'));
+        // Decode bytes across the whole stream so a multi-byte UTF-8 character
+        // split between data events is never corrupted into replacement chars.
+        const text = this.#utf8.write(chunk);
+        const { events, rest } = parseKeys(this.#pendingKeys + text);
         this.#pendingKeys = rest;
         if (this.#escapeTimer !== null) {
             clearTimeout(this.#escapeTimer);
@@ -1211,7 +1412,9 @@ export class LocalTui {
         if (this.#handlePrompt(event))
             return;
         if (this.#trajectory !== null) {
-            const command = applyTrajectoryEvent(this.#trajectory, event);
+            const { pageSize } = trajectoryListMetrics(this.#trajectory, this.#term.height());
+            const { pageLines } = trajectoryDetailMetrics(this.#trajectory, this.#term.height());
+            const command = applyTrajectoryEvent(this.#trajectory, event, { pageSize, detailPageLines: pageLines });
             if ('close' in command)
                 this.#trajectory = null;
             else
@@ -1232,12 +1435,14 @@ export class LocalTui {
             this.#render();
             return;
         }
+        if (this.#transcriptSearch !== null) {
+            this.#applyTranscriptSearch(event);
+            return;
+        }
         if (event.type === 'key') {
-            const action = this.#keybindings[event.id];
-            if (action !== undefined) {
-                this.#runAction(action);
+            const action = this.#boundAction(event.id);
+            if (action !== undefined && this.#runAction(action))
                 return;
-            }
         }
         if (this.#inspected !== undefined && this.#inspected.writable !== true && event.type === 'text'
             && this.#prompt === null && this.#settings === null && this.#copySelector === null && this.#search === null) {
@@ -1293,14 +1498,6 @@ export class LocalTui {
             this.#applyCopySelector(event);
             return;
         }
-        if (event.type === 'key' && event.id === 'ctrl+r') {
-            if (this.#images.length > 0)
-                return;
-            this.#search = createHistorySearch(this.#history);
-            this.#ac = null;
-            this.#render();
-            return;
-        }
         if (this.#search !== null) {
             this.#applySearch(event);
             return;
@@ -1344,44 +1541,6 @@ export class LocalTui {
         if (event.type === 'key' && (event.id === 'backspace' || event.id === 'delete')
             && this.#removeImageAtCursor(event.id))
             return;
-        if (event.type === 'key') {
-            if (event.id === 'pageUp') {
-                this.#scrollBy(-this.#pageSize());
-                return;
-            }
-            if (event.id === 'pageDown') {
-                this.#scrollBy(this.#pageSize());
-                return;
-            }
-            if (event.id === 'shift+up') {
-                this.#scrollBy(-TRANSCRIPT_FAST_SCROLL);
-                return;
-            }
-            if (event.id === 'shift+down') {
-                this.#scrollBy(TRANSCRIPT_FAST_SCROLL);
-                return;
-            }
-            if (event.id === 'ctrl+o') {
-                const last = this.#state.blocks.at(-1);
-                const tool = last?.kind === 'toolCatalog'
-                    ? undefined
-                    : this.#state.blocks.findLast(block => block.kind === 'tool');
-                if (last?.kind === 'toolCatalog') {
-                    this.#toolsExpanded = !this.#toolsExpanded;
-                }
-                else if (tool?.kind === 'tool') {
-                    if (this.#expandedToolCalls.has(tool.callId))
-                        this.#expandedToolCalls.delete(tool.callId);
-                    else
-                        this.#expandedToolCalls.add(tool.callId);
-                }
-                else {
-                    this.#toolsExpanded = !this.#toolsExpanded;
-                }
-                this.#render();
-                return;
-            }
-        }
         this.#applyCommand(this.#editor.handle(event));
     }
     #handlePrompt(event) {
@@ -1651,6 +1810,7 @@ export class LocalTui {
         const expandChanged = prefs.expandTools !== this.#expandTools;
         this.#themeName = prefs.theme;
         this.#colors = prefs.colors;
+        this.#syncTrueColor();
         const previousMotion = this.#motion;
         this.#motion = prefs.motion ?? 'full';
         this.#terminalProgress = prefs.terminalProgress ?? false;
@@ -2053,6 +2213,7 @@ export class LocalTui {
         this.#resumeHintRequested = true;
         if (this.#pending !== null) {
             const pending = this.#pending;
+            pending.offAbort?.();
             this.#pending = null;
             pending.resolve(null);
         }
@@ -2102,6 +2263,7 @@ export class LocalTui {
         }
         const pending = this.#pending;
         if (pending !== null) {
+            pending.offAbort?.();
             this.#pending = null;
             pending.resolve({ text: submittedText, images });
             if (queueEditNewer !== null)
@@ -2163,7 +2325,10 @@ export class LocalTui {
             return;
         }
         if (command.name === 'clear') {
-            this.#state = initialTranscript();
+            // Presentation-only reset: the agent may still own an active turn with
+            // live status, todos, and queued inbox state. Clearing those would make
+            // the next Ctrl-C (or follow-up) behave as if the session had finished.
+            this.#state = { ...this.#state, blocks: [] };
             this.#followTail();
             this.#renderer.startEpoch();
             this.#render();
@@ -2191,6 +2356,7 @@ export class LocalTui {
             const raw = '/' + name + (args === '' ? '' : ' ' + args);
             const pending = this.#pending;
             if (pending !== null) {
+                pending.offAbort?.();
                 this.#pending = null;
                 pending.resolve({ text: raw, images: [] });
             }
@@ -2215,7 +2381,7 @@ export class LocalTui {
                         formatHelpText(this.#commands()),
                         '',
                         full
-                            ? `**Keyboard Shortcuts · ${hotkeyCount(this.#keybindings)} bindings**`
+                            ? `**Keyboard Shortcuts · ${hotkeyCount(this.#keybindings)} shortcuts**`
                             : '**Essential Shortcuts**',
                         '',
                         full
@@ -2246,6 +2412,42 @@ export class LocalTui {
         this.#prompt = null;
         pending.offAbort?.();
         pending.resolve(answer);
+        this.#restoreDisplacedSurface();
+    }
+    /** Save and close the visible overlay so a prompt owns both input and screen. */
+    #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.#trajectory = null;
+        this.#agentHub = null;
+        this.#settings = null;
+        this.#copySelector = null;
+        this.#search = null;
+        return displaced;
+    }
+    /** Restore the surface displaced by the settled prompt, if one existed. */
+    #restoreDisplacedSurface() {
+        const displaced = this.#promptDisplaced;
+        this.#promptDisplaced = null;
+        if (displaced === null)
+            return;
+        if (displaced.kind === 'trajectory')
+            this.#trajectory = displaced.state;
+        else if (displaced.kind === 'agentHub')
+            this.#agentHub = displaced.state;
+        else if (displaced.kind === 'settings')
+            this.#settings = displaced.state;
+        else if (displaced.kind === 'copySelector')
+            this.#copySelector = displaced.state;
+        else
+            this.#search = displaced.state;
     }
     async #runCopy(args) {
         if (args.trim() === '') {
@@ -2318,41 +2520,96 @@ export class LocalTui {
         this.#follow = false;
         this.#focusBlock = Math.max(0, this.#state.blocks.length - 1);
     }
+    /** Resolve a configured action for one key id, tolerating camelCase ids. */
+    #boundAction(id) {
+        return this.#keybindings[id] ?? this.#keybindings[id.toLowerCase()];
+    }
+    /** Run one configured action; returns true when the event was consumed. */
     #runAction(action) {
         if (this.#prompt !== null || this.#settings !== null || this.#copySelector !== null)
-            return;
+            return false;
+        if (action === 'scroll-page-up') {
+            if (this.#search !== null)
+                return false;
+            this.#scrollBy(-this.#pageSize());
+            return true;
+        }
+        if (action === 'scroll-page-down') {
+            if (this.#search !== null)
+                return false;
+            this.#scrollBy(this.#pageSize());
+            return true;
+        }
+        if (action === 'scroll-fast-up') {
+            if (this.#search !== null)
+                return false;
+            this.#scrollBy(-TRANSCRIPT_FAST_SCROLL);
+            return true;
+        }
+        if (action === 'scroll-fast-down') {
+            if (this.#search !== null)
+                return false;
+            this.#scrollBy(TRANSCRIPT_FAST_SCROLL);
+            return true;
+        }
+        if (action === 'toggle-tools') {
+            if (this.#search !== null)
+                return false;
+            this.#toggleToolExpansion();
+            return true;
+        }
+        if (action === 'search-history') {
+            if (this.#images.length > 0)
+                return false;
+            this.#search = createHistorySearch(this.#history);
+            this.#ac = null;
+            this.#render();
+            return true;
+        }
+        if (action === 'search-transcript') {
+            // An empty composer has no forward-char target, so Ctrl+F searches the
+            // transcript there; a non-empty draft keeps the editor's own binding.
+            if (this.#search !== null)
+                return false;
+            if (this.#editor.text !== '' || this.#images.length > 0)
+                return false;
+            this.#transcriptSearch = createTranscriptSearch();
+            this.#ac = null;
+            this.#render();
+            return true;
+        }
         if (action === 'inspect-subagent') {
             void this.#pickSubagent();
-            return;
+            return true;
         }
         if (action === 'retry') {
             this.#submit('/retry');
-            return;
+            return true;
         }
         if (action === 'cycle-model-forward') {
             this.#submit('/model next');
-            return;
+            return true;
         }
         if (action === 'cycle-model-backward') {
             this.#submit('/model previous');
-            return;
+            return true;
         }
         if (action === 'cycle-reasoning') {
             this.#submit('/model reasoning');
-            return;
+            return true;
         }
         if (action === 'copy-prompt') {
             void this.#copyPicked(this.#editor.text, 'current prompt');
-            return;
+            return true;
         }
         if (action === 'copy-line') {
             const text = this.#editor.text.slice(lineStart(this.#editor.text, this.#editor.cursor), lineEnd(this.#editor.text, this.#editor.cursor));
             void this.#copyPicked(text, 'current line');
-            return;
+            return true;
         }
         if (action === 'paste-clipboard') {
             this.#startAsyncPaste(this.#pasteClipboard());
-            return;
+            return true;
         }
         try {
             this.#term.input.setRawMode?.(false);
@@ -2369,6 +2626,43 @@ export class LocalTui {
             this.#refreshAutocomplete();
             this.#render();
         }
+        return true;
+    }
+    /** Expand or collapse the newest tool card, or the whole tool catalog. */
+    #toggleToolExpansion() {
+        const last = this.#state.blocks.at(-1);
+        const tool = last?.kind === 'toolCatalog'
+            ? undefined
+            : this.#state.blocks.findLast(block => block.kind === 'tool');
+        if (last?.kind === 'toolCatalog') {
+            this.#toolsExpanded = !this.#toolsExpanded;
+        }
+        else if (tool?.kind === 'tool') {
+            if (this.#expandedToolCalls.has(tool.callId))
+                this.#expandedToolCalls.delete(tool.callId);
+            else
+                this.#expandedToolCalls.add(tool.callId);
+        }
+        else {
+            this.#toolsExpanded = !this.#toolsExpanded;
+        }
+        this.#render();
+    }
+    /** 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));
+        if (command.kind === 'close') {
+            this.#transcriptSearch = null;
+            this.#render();
+            return;
+        }
+        this.#transcriptSearch = command.state;
+        if (command.kind === 'focus')
+            this.#focusBlock = command.block;
+        this.#render();
     }
 }
 /**
@@ -2389,7 +2683,7 @@ export function apply(ctx, config) {
             return () => { process.stdout.removeListener('resize', listener); };
         },
     };
-    const tui = new LocalTui(term, config.model, config.colors ?? term.output.isTTY === true, parseThemeName(config.theme), copyToClipboard, {
+    const tui = new LocalTui(term, config.model, config.colors, parseThemeName(config.theme), copyToClipboard, {
         deferInitialRender: true,
         terminalProfile,
         alternateScreenOverlays: terminalProfile === 'direct',
@@ -2399,7 +2693,7 @@ export function apply(ctx, config) {
     ctx.provide(TUI_SERVICE, tui);
     ctx.effect(() => () => { tui.dispose(); });
     ctx.inject(['settings'], (settingsCtx) => {
-        const scope = settingsCtx.settings.register(TUI_SETTINGS_NAMESPACE, TuiSettingsSchema, { base: { theme: parseThemeName(config.theme), colors: config.colors ?? term.output.isTTY === true, expandTools: false } });
+        const scope = settingsCtx.settings.register(TUI_SETTINGS_NAMESPACE, TuiSettingsSchema, { base: { theme: parseThemeName(config.theme), colors: resolveColors(config.colors, term.output.isTTY === true), expandTools: false } });
         tui.applyStoredPrefs(scope.get());
         tui.setPrefsPersist((prefs) => { void scope.update(prefs); });
         scope.watch((next) => { tui.applyStoredPrefs(next); });