@agi-fans/dsh-tui 0.25.0 → 0.26.1

package/lib/runtime/provider-local.js

@@ -64,11 +64,11 @@ import { appendTrajectoryEvent, applyTrajectoryEvent, createTrajectory, trajecto
 import { applyEvent, applyStreamChunk, renderedBlocks, formatAgentElapsed, rosterPreviewStart, 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 { flushPending, normalizeKeyId, 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 { indexAtCell, stripAnsi } from "../chrome/width.js";
 import { MainScreenRenderer } from "../chrome/main-screen-renderer.js";
 import { supportsHyperlinks } from "./terminal-probe.js";
 import { colorDisabledByEnv, createTheme, detectColorDepth } from "../chrome/theme.js";
@@ -207,6 +207,8 @@ export class LocalTui {
     #keyTest;
     #mouseActionPress;
     #fileActionFrame;
+    #inputFrame;
+    #inputPress;
     #imageTemporary = new Set();
     #terminalProfile;
     #resizeDebounceMs;
@@ -227,7 +229,7 @@ export class LocalTui {
     #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 === '')
+        if (text === '' || this.#inspected?.writable === false)
             return;
         const before = this.#editor.text.slice(0, this.#editor.cursor);
         const after = this.#editor.text.slice(this.#editor.cursor);
@@ -289,6 +291,7 @@ export class LocalTui {
     #resumeHintRequested = false;
     #lastSigintTime = 0;
     #lastEscapeTime = 0;
+    #receivedModifiedEnter = new Set();
     #inspectEscapeFenceUntil = 0;
     #interrupts = new Set();
     #queueEdits = new Set();
@@ -436,6 +439,8 @@ export class LocalTui {
     #expandedReasoning = new Set();
     #expandedToolRows = new Set();
     #processSelection;
+    #promptAnchor;
+    #transcriptScopeChanged = false;
     #closedReasoning = new Set();
     /**
      * The last action's confirmation, drawn on the composer's bottom border.
@@ -505,6 +510,7 @@ export class LocalTui {
     #keybindingsPath;
     #keybindings;
     #cwd;
+    #rootDirectory;
     #projectRoot;
     #home;
     #listDir;
@@ -559,6 +565,7 @@ export class LocalTui {
         this.#cwd = paths.cwd ?? fallback.cwd;
         this.#readImagePath = paths.readImagePath ?? (path => readImageFile(path, this.#cwd));
         const project = resolveProjectContext(this.#cwd);
+        this.#rootDirectory = { cwd: this.#cwd, branch: project.gitLabel };
         this.#projectRoot = paths.projectRoot ?? project.root;
         this.#home = paths.home ?? fallback.home;
         this.#listDir = paths.listDir ?? fallback.listDir;
@@ -606,6 +613,7 @@ export class LocalTui {
                 // live window so it stays anchored at the bottom.
                 this.#selection.clear();
                 this.#mouseActionPress = undefined;
+                this.#inputPress = undefined;
                 this.#workspacePress = undefined;
                 this.#jumpPress = undefined;
                 this.#disclosurePress = undefined;
@@ -649,23 +657,38 @@ export class LocalTui {
             this.#syncWindowTitle();
     }
     /** Follow the viewed Session without replacing its transcript or native history. */
-    setWorkingDirectory(cwd) {
+    setWorkingDirectory(cwd, options = {}) {
+        const root = options.root ?? this.#inspected === undefined;
+        const project = resolveProjectContext(cwd);
+        if (root) {
+            this.#rootDirectory = { cwd, branch: project.gitLabel };
+            this.#syncWindowTitle();
+            if (this.#inspected !== undefined)
+                return;
+        }
         if (cwd === this.#cwd && cwd === this.#projectRoot)
             return;
-        this.#cwd = cwd;
+        this.#setViewedDirectory(cwd);
+        this.#syncWindowTitle();
+        if (this.#tty)
+            this.#render();
+    }
+    #setViewedDirectory(cwd) {
         const project = resolveProjectContext(cwd);
+        this.#cwd = cwd;
         this.#projectRoot = cwd;
         this.#pwd = shortenPath(cwd);
         this.#branch = project.gitLabel;
         this.#refreshAutocomplete();
-        this.#syncWindowTitle();
-        if (this.#tty)
-            this.#render();
     }
     /** Refresh Git metadata without changing the Session's effective directory. */
     #refreshProjectContext() {
         const branch = refreshProjectContext(this.#cwd).gitLabel;
-        if (branch === this.#branch)
+        const rootBranch = this.#rootDirectory.cwd === this.#cwd ? branch : refreshProjectContext(this.#rootDirectory.cwd).gitLabel;
+        const rootChanged = rootBranch !== this.#rootDirectory.branch;
+        if (rootChanged)
+            this.#rootDirectory = { ...this.#rootDirectory, branch: rootBranch };
+        if (branch === this.#branch && !rootChanged)
             return;
         this.#branch = branch;
         this.#syncWindowTitle();
@@ -712,9 +735,19 @@ export class LocalTui {
             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();
+        if (this.#inspected === undefined) {
+            if (event.type === 'compaction/start') {
+                this.#herdr.compactionStart(event.data.compactionId);
+                this.#syncWindowTitle();
+            }
+            else if (event.type === 'compaction/end') {
+                this.#herdr.compactionEnd(event.data.compactionId, event.data.error);
+                this.#syncWindowTitle();
+            }
+            else if (event.type === 'turn/end') {
+                this.#herdr.settled(event.data.reason.kind);
+                this.#syncWindowTitle();
+            }
         }
         this.#emitNotification(this.#notifications.event({
             type: event.type,
@@ -777,6 +810,12 @@ export class LocalTui {
         // Parent lifecycle remains authoritative while the child owns the visible view.
         if (options.root === true || this.#inspected === undefined) {
             this.#herdr.setRunning(status === 'running');
+            if (options.compaction?.phase === 'start') {
+                this.#herdr.compactionStart(options.compaction.id);
+            }
+            else if (options.compaction?.phase === 'end') {
+                this.#herdr.compactionEnd(options.compaction.id, options.compaction.error);
+            }
             if (options.outcome !== undefined)
                 this.#herdr.settled(options.outcome);
             this.#syncWindowTitle();
@@ -842,6 +881,7 @@ export class LocalTui {
             const current = this.#subagents?.agents.find(agent => agent.id === inspected.id);
             if (current !== undefined) {
                 this.#inspected = {
+                    ...inspected,
                     id: current.id,
                     label: current.label,
                     phase: current.phase,
@@ -860,15 +900,25 @@ export class LocalTui {
     setInspectedSubagent(inspected) {
         if (this.#inspected?.id === inspected?.id && this.#inspected?.label === inspected?.label
             && this.#inspected?.phase === inspected?.phase && this.#inspected?.needsApproval === inspected?.needsApproval && this.#inspected?.mode === inspected?.mode
-            && this.#inspected?.writable === inspected?.writable)
+            && this.#inspected?.writable === inspected?.writable && this.#inspected?.model === inspected?.model
+            && this.#inspected?.reasoningEffort === inspected?.reasoningEffort && this.#inspected?.stats === inspected?.stats
+            && this.#inspected?.controls === inspected?.controls)
             return;
         if (this.#inspected?.id !== inspected?.id) {
+            this.#transcriptScopeChanged = true;
             this.#workspacePress = undefined;
             this.#fileReviewAbort?.abort();
             this.#closeFileBrowser();
+            this.#transcriptSearch = null;
+            this.#followTail();
         }
-        this.#switchDraft(inspected?.id ?? this.#sessionId);
+        const leaving = this.#inspected !== undefined && inspected === undefined;
         this.#inspected = inspected === undefined ? undefined : { ...inspected };
+        if (leaving) {
+            this.#setViewedDirectory(this.#rootDirectory.cwd);
+            this.#syncWindowTitle();
+        }
+        this.#switchDraft(inspected?.id ?? this.#sessionId);
         this.#drainPendingInput();
         if (inspected !== undefined) {
             this.#inspectEscapeFenceUntil = 0;
@@ -902,7 +952,7 @@ export class LocalTui {
         this.#settings = null;
         this.#search = null;
         this.#ac = null;
-        const browser = new FileBrowser(request, () => { if (!this.#disposed)
+        const browser = new FileBrowser({ ...request, canQuote: request.canQuote && (this.#inspected === undefined || this.#inspected.writable) }, () => { if (!this.#disposed)
             this.#render(); }, () => {
             if (this.#fileBrowser === browser)
                 this.#fileBrowser = null;
@@ -1249,9 +1299,9 @@ export class LocalTui {
         this.#flushPasteBurst(true);
         this.#pasteBurst.clear();
         if (request.notify !== false) {
-            this.#emitNotification(this.#notifications.humanPrompt());
             this.#herdr.prompt(request.title, request.attentionKind);
             this.#syncWindowTitle();
+            this.#emitNotification(this.#notifications.humanPrompt());
         }
         if (this.#tty && request.documentImage !== undefined && this.#imageProtocol !== undefined)
             this.#term.output.write('\x1b[16t');
@@ -1370,10 +1420,23 @@ export class LocalTui {
         // 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;
+        const refreshing = reason === 'refresh' && !this.#transcriptScopeChanged;
+        this.#transcriptScopeChanged = false;
+        const seam = refreshing && this.#state.blocks[0]?.kind === 'notice' && this.#state.blocks[0].boundary === true
+            ? this.#state.blocks[0] : undefined;
+        const blocks = boundary ? [transcriptSeam('session-opened'), ...state.blocks] : seam === undefined ? state.blocks : [seam, ...state.blocks];
         this.#state = { ...state, status, compactCommandId: undefined, blocks };
         this.#plain.resetPrinted();
-        this.#followTail();
+        this.#promptAnchor = undefined;
+        if (!refreshing) {
+            this.#transcriptSearch = null;
+            this.#followTail();
+        }
+        else if (this.#transcriptSearch !== null) {
+            const match = this.#searchOccurrences()[this.#transcriptSearch.focus];
+            if (match !== undefined)
+                this.#focusSearchMatch(match);
+        }
         this.#deferInitialRender = false;
         this.#renderer.startEpoch({ replay: reason === 'refresh' ? 'viewport' : status === 'idle' ? 'full' : 'pinned' });
         if (this.#tty)
@@ -1383,6 +1446,7 @@ export class LocalTui {
     }
     setSession(info) {
         if (info.id !== this.#sessionId) {
+            this.#transcriptScopeChanged = true;
             this.#workspacePress = undefined;
             this.#fileReviewAbort?.abort();
             this.#closeFileBrowser();
@@ -1414,14 +1478,15 @@ export class LocalTui {
             this.#render();
     }
     /** Only the foreground terminal owner emits title and program-state sequences. */
-    #syncWindowTitle(notify = false) {
+    #syncWindowTitle() {
         if (!this.#tty || this.#disposed || this.#session.handedOff)
             return;
         const status = this.#herdr.programStatus;
         this.#writeWorkingDirectory(this.#cwd);
         this.#syncProgress(status.state);
-        const title = terminalTitle(this.#terminalTitle, status, this.#sessionTitle, this.#cwd, this.#branch);
-        if (title !== this.#writtenWindowTitle && !(this.#terminalTitle === 'off' && this.#writtenWindowTitle === undefined)) {
+        const nativeStatus = this.#reportsProgramState;
+        const title = terminalTitle(this.#terminalTitle, status, this.#sessionTitle, this.#rootDirectory.cwd, this.#rootDirectory.branch, nativeStatus);
+        if (title !== this.#writtenWindowTitle && !(title === '' && this.#writtenWindowTitle === undefined)) {
             this.#writtenWindowTitle = title;
             this.#term.output.write(`\x1b]2;${title}\x07`);
         }
@@ -1429,7 +1494,7 @@ export class LocalTui {
             this.#programQuerySent = true;
             this.#term.output.write(PROGRAM_STATUS_QUERY);
         }
-        if (!this.#reportsProgramState) {
+        if (!nativeStatus) {
             if (this.#writtenProgramState !== undefined)
                 this.#term.output.write(programStatusSequence('clear'));
             this.#writtenProgramState = undefined;
@@ -1438,17 +1503,8 @@ export class LocalTui {
         // Only the session name is exported as metadata; prompt bodies and errors stay in the TUI.
         const sequence = programStatusSequence({ state: status.state,
             ...(status.kind === undefined ? {} : { kind: status.kind }),
-            ...(this.#sessionTitle === undefined ? {} : { message: this.#sessionTitle }),
+            ...(this.#sessionTitle === undefined ? {} : { title: this.#sessionTitle }),
         });
-        // Supporting terminals can turn these states into desktop notifications.
-        // New attention reports use the same coalescing and focus gate as OSC 9.
-        if (programStatusNeedsAttention(status.state)
-            && (this.#notificationPolicy === 'off' || !notify && sequence !== this.#writtenProgramState)) {
-            if (this.#writtenProgramState !== undefined)
-                this.#term.output.write(programStatusSequence('clear'));
-            this.#writtenProgramState = undefined;
-            return;
-        }
         if (sequence === this.#writtenProgramState)
             return;
         this.#writtenProgramState = sequence;
@@ -2005,6 +2061,19 @@ export class LocalTui {
     refresh() {
         this.#render();
     }
+    searchTranscript(query) {
+        if (!this.#tty || this.#disposed || query.trim() === '')
+            return;
+        // Commit the resumed document before moving its live viewport into history.
+        this.#render();
+        this.#transcriptSearch = { query, editing: false, focus: 0 };
+        this.#promptAnchor = undefined;
+        this.#ac = null;
+        const match = this.#searchOccurrences()[0];
+        if (match !== undefined)
+            this.#focusSearchMatch(match);
+        this.#render();
+    }
     #busy() {
         if (this.#state.status !== 'idle')
             return true;
@@ -2230,6 +2299,13 @@ export class LocalTui {
         if (this.#probeGate)
             return;
         const width = this.#term.width();
+        const alternateSendKey = keysForAction(Object.fromEntries(Object.entries(this.#keybindings).filter(([key]) => {
+            if (key === 'super+enter')
+                return this.#receivedModifiedEnter.has(key);
+            if (key === 'ctrl+enter')
+                return this.#session.keyboardProtocol === 'kitty' || this.#receivedModifiedEnter.has(key);
+            return true;
+        })), 'alternate-send');
         const renderState = this.#reveal === undefined
             ? this.#state
             : revealStreamingAssistant(this.#state, this.#reveal.revealed);
@@ -2288,6 +2364,7 @@ export class LocalTui {
                 toolDetailsKey: keysForAction(this.#keybindings, 'toggle-tool-details'),
                 turnDetailsKey: keysForAction(this.#keybindings, 'toggle-tools'),
                 busyEnter: this.#queueEditNewer !== null || this.#queueEditPending ? 'queue' : this.#busyEnter,
+                ...(this.#queueEditNewer !== null || this.#queueEditPending || alternateSendKey === 'Disabled' ? {} : { alternateSendKey }),
                 steerKey: keysForAction(this.#keybindings, 'steer-turn'),
                 queueKey: keysForAction(this.#keybindings, 'follow-up'),
                 openedGroups: this.#openedGroups,
@@ -2323,7 +2400,8 @@ export class LocalTui {
         this.#syncScroll(frame.transcript);
         this.#jumpToLatest = frame.jumpToLatest;
         this.#fileActionFrame = frame.transcript === undefined || frame.transientSurface === 'overlay' ? undefined : frame;
-        this.#setMouseTracking(this.#fileBrowser !== null || this.#trajectory !== null || this.#documentMouseEnabled() || this.#promptChoices.length > 0 || this.#promptActions.length > 0 || (frame.transcript !== undefined && frame.transientSurface !== 'overlay'
+        this.#inputFrame = frame.inputRows === undefined ? undefined : frame;
+        this.#setMouseTracking(this.#inputFrame !== undefined || this.#fileBrowser !== null || this.#trajectory !== null || this.#documentMouseEnabled() || this.#promptChoices.length > 0 || this.#promptActions.length > 0 || (frame.transcript !== undefined && frame.transientSurface !== 'overlay'
             && (this.#inspecting || this.#maxStart > 0 || (frame.transcript.fileRegions?.length ?? 0) > 0 || (frame.transcript.disclosures?.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
@@ -2369,6 +2447,7 @@ export class LocalTui {
     }
     #scrollBy(delta) {
         this.#workspacePress = undefined;
+        this.#promptAnchor = undefined;
         if (this.#follow && (delta > 0 || this.#maxStart === 0))
             return;
         if (delta === 0 && this.#maxStart === 0)
@@ -2392,6 +2471,7 @@ export class LocalTui {
         this.#render();
     }
     #followTail() {
+        this.#promptAnchor = undefined;
         this.#follow = true;
         this.#scrollStart = this.#maxStart;
         this.#endInspection();
@@ -2479,6 +2559,7 @@ export class LocalTui {
      * or go back to the live tail once nothing is open any more.
      */
     #inspect(target) {
+        this.#promptAnchor = undefined;
         const open = this.#toolsExpanded || this.#openedGroups.size > 0 || this.#expandedOutputs.size > 0;
         if (!open) {
             this.#inspecting = false;
@@ -2814,6 +2895,40 @@ export class LocalTui {
             this.#handleTrajectoryMouse(event);
             return;
         }
+        const frameRow = this.#renderer.frameRowAt(event.row);
+        const inputRow = this.#inputFrame?.inputRows?.find(row => row.row === frameRow);
+        const completionRow = this.#inputFrame?.autocompleteRows?.find(row => row.row === frameRow);
+        if (event.button === 'left') {
+            const pressed = this.#inputPress;
+            if (event.action === 'press' && !event.shift && (inputRow !== undefined || completionRow !== undefined)) {
+                const completion = completionRow === undefined ? undefined : this.#ac?.items[completionRow.index];
+                this.#inputPress = { row: event.row, column: event.column, text: this.#editor.text,
+                    ...(inputRow === undefined ? {} : { cursor: inputRow.start + indexAtCell(inputRow.text, Math.max(0, event.column - inputRow.column)) }),
+                    ...(completion === undefined ? {} : { completion }) };
+            }
+            else if (event.action === 'drag')
+                this.#inputPress = undefined;
+            else if (event.action === 'release') {
+                this.#inputPress = undefined;
+                if (pressed !== undefined && !event.shift && pressed.row === event.row && pressed.column === event.column && pressed.text === this.#editor.text) {
+                    this.#selection.clear();
+                    this.#processSelection = undefined;
+                    this.#subagentSelection = undefined;
+                    this.#transcriptSearch = null;
+                    if (pressed.completion !== undefined && this.#ac !== null && completionRow !== undefined && this.#ac.items[completionRow.index] === pressed.completion) {
+                        this.#ac.selected = completionRow.index;
+                        this.#applySelectedCompletion();
+                    }
+                    else if (pressed.cursor !== undefined && inputRow !== undefined
+                        && pressed.cursor === inputRow.start + indexAtCell(inputRow.text, Math.max(0, event.column - inputRow.column))) {
+                        this.#editor.setCursor(pressed.cursor);
+                        this.#refreshAutocomplete();
+                    }
+                    this.#render();
+                    return;
+                }
+            }
+        }
         const promptAction = this.#promptActions.find(action => event.row === action.row && event.column >= action.column && event.column < action.column + action.width);
         if (this.#promptActionPress !== undefined) {
             const pressed = this.#promptActionPress;
@@ -3085,15 +3200,20 @@ export class LocalTui {
         }
     }
     #canQuoteSelection() {
-        return this.#prompt === null && this.#settings === null && this.#trajectory === null && this.#fileBrowser === null && this.#search === null
+        return this.#prompt === null && this.#settings === null && this.#trajectory === null && (this.#fileBrowser === null || this.#fileBrowser.state.canQuote && !this.#fileBrowserOwnsInput()) && this.#search === null
             && this.#transcriptSearch === null && (this.#inspected === undefined || this.#inspected.writable === true);
     }
+    #fileBrowserOwnsInput() {
+        const state = this.#fileBrowser?.state;
+        return state !== undefined && (state.editing !== undefined || state.help || state.menu !== undefined);
+    }
     #quoteSelection() {
         if (!this.#canQuoteSelection())
             return;
         const text = this.#selection.valid(this.#renderer.viewport()) ? this.#selection.text() : undefined;
         this.#selection.clear();
         if (text !== undefined) {
+            this.#closeFileBrowser();
             this.#appendQuote(text.split('\n').map(line => '> ' + line).join('\n'));
         }
         this.#render();
@@ -3216,6 +3336,9 @@ export class LocalTui {
         }
         if (this.#session.handle(event))
             return;
+        if (!this.#paste && event.type === 'key' && (event.id === 'ctrl+enter' || event.id === 'super+enter')) {
+            this.#receivedModifiedEnter.add(event.id);
+        }
         if (event.type === 'focus') {
             this.#terminalFocused = event.focused;
             if (event.focused && this.#notificationPolicy === 'unfocused')
@@ -3232,17 +3355,22 @@ export class LocalTui {
         this.#disclosurePress = undefined;
         this.#mouseActionPress = undefined;
         this.#workspacePress = undefined;
+        this.#inputPress = undefined;
         if (this.#keyTest !== undefined && this.#prompt?.request.signal === this.#keyTest.signal
             && (event.type === 'text' || event.type === 'paste-start' || event.type === 'paste-end' || event.type === 'key' && !['escape', 'ctrl+c'].includes(event.id))) {
             this.#keyTest.observe(event);
             return;
         }
         if (this.#selection.active) {
-            if (event.type === 'key' && this.#boundAction(event.id) === 'quote-selection') {
+            if (event.type === 'key' && this.#boundAction(event.id) === 'quote-selection' && this.#canQuoteSelection()) {
+                this.#quoteSelection();
+                return;
+            }
+            if (this.#fileBrowser !== null && event.type === 'text' && event.value.toLowerCase() === 'q' && this.#canQuoteSelection()) {
                 this.#quoteSelection();
                 return;
             }
-            if (event.type === 'key' && (['super+c', 'enter'].includes(event.id) || this.#boundAction(event.id) === 'copy-prompt')) {
+            if (event.type === 'key' && (event.id === 'super+c' || event.id === 'enter' && !this.#fileBrowserOwnsInput() || this.#boundAction(event.id) === 'copy-prompt')) {
                 void this.#copySelection();
                 return;
             }
@@ -3262,6 +3390,11 @@ export class LocalTui {
                 this.#applyTrajectoryInput(event);
                 return;
             }
+            if (this.#ac !== null && this.#inputFrame?.autocompleteRows?.some(row => row.row === this.#renderer.frameRowAt(event.row ?? -1))) {
+                this.#ac.selected = nextSelectableAutocompleteIndex(this.#ac.items, this.#ac.selected + (event.direction === 'up' ? -1 : 1), event.direction === 'up' ? -1 : 1);
+                this.#render();
+                return;
+            }
             this.#jumpPress = undefined;
             if (this.#mouseTracking && !this.#paste && this.#pasteInFlight === 0) {
                 const step = wheelStep(this.#wheelGesture, Date.now(), event.direction === 'up' ? -1 : 1, !this.#wheelAccelerates);
@@ -3408,7 +3541,7 @@ export class LocalTui {
             this.#render();
             return;
         }
-        if (event.type === 'key' && (event.id === 'ctrl+-' || event.id === 'ctrl+_')
+        if (event.type === 'key' && (event.id === 'ctrl+-' || event.id === 'ctrl+_' || event.id === 'super+z')
             && this.#clearedDraft !== undefined && this.#clearedDraft.revision === this.#editor.revision
             && !this.#hasComposerContent()) {
             const cleared = this.#clearedDraft.draft;
@@ -4737,6 +4870,11 @@ export class LocalTui {
             this.#queuedSubmissions.push(submission);
         this.#pendingInputs.flush(this.#pendingScope());
     }
+    #resolveDelivery(delivery) {
+        if (delivery === 'alternate')
+            return this.#busyEnter === 'queue' ? 'steer' : 'queue';
+        return delivery ?? this.#busyEnter;
+    }
     #submit(text, delivery) {
         if (this.#prompt !== null) {
             if (this.#prompt.request.presentation === 'progress')
@@ -4758,7 +4896,7 @@ export class LocalTui {
             submission.literal = true;
         const command = !submission.literal && (submittedText.trimStart().startsWith('/') || (images.length === 0 && files.length === 0 && submittedText.startsWith('!')));
         if (!command && this.#state.status === 'running') {
-            submission.delivery = queueEditNewer !== null || this.#queueEditPending ? 'queue' : delivery ?? this.#busyEnter;
+            submission.delivery = queueEditNewer !== null || this.#queueEditPending ? 'queue' : this.#resolveDelivery(delivery);
         }
         if (historyText !== '' && this.#history[this.#history.length - 1] !== historyText) {
             this.#history.push(historyText);
@@ -4806,7 +4944,7 @@ export class LocalTui {
         const newer = this.#queueEditNewer;
         if (delivery === 'steer')
             submission.literal = true;
-        submission.delivery = newer !== null || this.#queueEditPending ? 'queue' : this.#state.status === 'running' ? delivery ?? this.#busyEnter : 'queue';
+        submission.delivery = newer !== null || this.#queueEditPending || this.#state.status !== 'running' ? 'queue' : this.#resolveDelivery(delivery);
         const { images, files = [], literal = false, text: submittedText } = submission;
         if (historyText !== '' && this.#history[this.#history.length - 1] !== historyText) {
             this.#history.push(historyText);
@@ -5151,6 +5289,8 @@ export class LocalTui {
     #emitNotification(notification) {
         if (notification === undefined || !this.#tty || this.#disposed)
             return;
+        if (this.#reportsProgramState && notification.programState !== undefined && programStatusNeedsAttention(notification.programState))
+            return;
         if (this.#notificationPolicy === 'unfocused' && this.#terminalFocused === true)
             return;
         this.#notificationQueue.offer(notification);
@@ -5169,20 +5309,19 @@ export class LocalTui {
                 return;
             if (pending.programState !== undefined && pending.programState !== this.#herdr.programStatus.state)
                 return;
-            if (this.#reportsProgramState && programStatusNeedsAttention(this.#herdr.programStatus.state)) {
-                this.#syncWindowTitle(true);
+            if (this.#reportsProgramState && pending.programState !== undefined && programStatusNeedsAttention(pending.programState))
                 return;
-            }
             const sequence = terminalNotificationSequence(pending);
             if (sequence !== '')
                 this.#term.output.write(sequence);
         }, 25);
     }
     #runHelp(full) {
+        const enhancedKeys = this.#session.keyboardProtocol === 'kitty';
         if (!this.#tty) {
-            this.commandOutput('help', ['Help', '', '## Essential Shortcuts', '', formatEssentialHotkeysText(this.#keybindings),
+            this.commandOutput('help', ['Help', '', '## Essential Shortcuts', '', formatEssentialHotkeysText(this.#keybindings, enhancedKeys),
                 '', formatHelpText(this.#commands(), resolveUiLanguage(this.#uiLanguage)),
-                ...(full ? ['', formatHotkeysText(this.#keybindings)] : ['', 'Use `/help full` to view every keyboard shortcut.'])].join('\n'));
+                ...(full ? ['', formatHotkeysText(this.#keybindings, enhancedKeys)] : ['', 'Use `/help full` to view every keyboard shortcut.'])].join('\n'));
             return;
         }
         if (this.#fileReviewAbort !== undefined || this.#prompt !== null)
@@ -5194,7 +5333,7 @@ export class LocalTui {
             copyText: (text, label) => this.copyText(text, label),
             insertText: (text) => this.insertText(text),
         };
-        void browseHelp(surface, this.#commands(), this.#keybindings, resolveUiLanguage(this.#uiLanguage), full, abort.signal)
+        void browseHelp(surface, this.#commands(), this.#keybindings, resolveUiLanguage(this.#uiLanguage), full, abort.signal, enhancedKeys)
             .catch(error => { if (!abort.signal.aborted && !this.#disposed)
             this.notice(String(error), { level: 'error' }); })
             .finally(() => { if (this.#fileReviewAbort === abort)
@@ -5250,6 +5389,19 @@ export class LocalTui {
         // closes. Claiming it here would skip that layering.
         if (action === 'interrupt')
             return false;
+        if (action === 'alternate-send') {
+            if (this.#settings !== null || this.#search !== null)
+                return false;
+            if (this.#inspected !== undefined && !this.#inspected.writable)
+                return true;
+            if (this.#handleAutocomplete({ type: 'key', id: 'enter' }))
+                return true;
+            if (this.#hasComposerContent())
+                this.#submit(this.#editor.expandedText, 'alternate');
+            else
+                this.#render();
+            return true;
+        }
         if (action === 'clear-composer')
             return this.#runClearComposer();
         if (action === 'quit') {
@@ -5416,6 +5568,33 @@ export class LocalTui {
             this.#scrollBy(-this.#pageSize());
             return true;
         }
+        if (action === 'previous-turn' || action === 'next-turn') {
+            if (this.#search !== null)
+                return false;
+            const prompts = this.#state.blocks.flatMap((block, index) => block.kind === 'user' ? [index] : []);
+            const anchor = this.#promptAnchor === undefined ? -1 : this.#state.blocks.indexOf(this.#promptAnchor);
+            const top = this.#follow
+                ? this.#renderer.viewport().map((_, row) => this.#renderer.documentRowAt(row)).find(row => row !== undefined) ?? this.#scrollStart
+                : this.#scrollStart;
+            const target = action === 'previous-turn'
+                ? prompts.findLast(index => anchor >= 0 ? index < anchor : (this.#blockStarts[index] ?? 0) < top)
+                : prompts.find(index => anchor >= 0 ? index > anchor : (this.#blockStarts[index] ?? 0) > top);
+            this.#processSelection = undefined;
+            this.#ac = null;
+            if (target === undefined) {
+                if (action === 'next-turn')
+                    this.#followTail();
+            }
+            else {
+                this.#promptAnchor = this.#state.blocks[target];
+                this.#inspecting = true;
+                this.#follow = false;
+                this.#focusBlock = target;
+                this.#focusBlockEdge = 'start';
+            }
+            this.#render();
+            return true;
+        }
         if (action === 'scroll-page-down') {
             if (this.#search !== null)
                 return false;
@@ -5711,7 +5890,7 @@ export class LocalTui {
             });
             if (entered === null || this.#disposed)
                 continue;
-            const normalized = entered.trim().toLowerCase();
+            const normalized = normalizeKeyId(entered);
             if (normalized === '')
                 continue;
             const next = { ...this.#keybindings };
@@ -5846,6 +6025,7 @@ export class LocalTui {
             return true;
         }
         if (event.id === 'home') {
+            this.#promptAnchor = undefined;
             const current = this.#fileActionFrame?.transcript?.disclosures?.findLast(target => target.detailEnd !== undefined && this.#scrollStart > target.row && this.#scrollStart < target.detailEnd);
             this.#processSelection = current?.block ?? selected;
             this.#focusBlock = this.#processSelection;
@@ -5854,6 +6034,7 @@ export class LocalTui {
             return true;
         }
         if (event.id === 'up' || event.id === 'down') {
+            this.#promptAnchor = undefined;
             const rows = this.#processRows();
             const at = Math.max(0, rows.indexOf(selected));
             const next = rows[Math.max(0, Math.min(rows.length - 1, at + (event.id === 'up' ? -1 : 1)))];
@@ -6040,12 +6221,18 @@ export class LocalTui {
             return;
         }
         this.#transcriptSearch = command.state;
-        if (command.kind === 'focus') {
-            this.#focusBlock = command.match.block;
-            this.#focusBlockEdge = 'start';
-        }
+        if (command.kind === 'focus')
+            this.#focusSearchMatch(command.match);
         this.#render();
     }
+    #focusSearchMatch(match) {
+        this.#promptAnchor = undefined;
+        this.#processSelection = undefined;
+        this.#inspecting = true;
+        this.#follow = false;
+        this.#focusBlock = match.block;
+        this.#focusBlockEdge = 'start';
+    }
 }
 /**
  * Mount the local terminal provider as the tui service.
@@ -6084,7 +6271,16 @@ export function apply(ctx, config) {
         },
         terminalProfile,
         alternateScreenOverlays: terminalProfile === 'direct',
-        herdrReporter: new HerdrAgentReporter({ interactive: term.input.isTTY === true && term.output.isTTY === true }),
+        herdrReporter: (() => {
+            const interactive = term.input.isTTY === true && term.output.isTTY === true;
+            const reporter = new HerdrAgentReporter({ interactive });
+            if (interactive && process.env.OMDSH === undefined) {
+                process.env.OMDSH = '1';
+                ctx.effect(() => () => { if (process.env.OMDSH === '1')
+                    delete process.env.OMDSH; });
+            }
+            return reporter;
+        })(),
         historyPath: config.historyPath ?? join(dshHome, 'omdsh', 'history.jsonl'),
         draftsPath: join(config.dshHome ?? dshHome, 'omdsh', 'drafts'),
         keybindingsPath: config.keybindingsPath ?? join(dshHome, 'omdsh', 'keybindings.json'),