@agi-fans/dsh-tui 0.16.0 → 0.17.0

package/lib/runtime/provider-local.js

@@ -11,9 +11,11 @@
  * @module @agi-fans/dsh-tui
  */
 import { TerminalNotificationController, terminalNotificationSequence, terminalProgressSequence, } from "./terminal-notifications.js";
+import { HerdrAgentReporter } from "./herdr-agent.js";
+import { ComposerImages } from "./composer-images.js";
+import { PlainTui } from "./plain-tui.js";
 import { homedir } from 'node:os';
 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";
@@ -28,28 +30,42 @@ import { InputEditor, lineEnd, lineStart } from "../input/editor.js";
 import { applySettingsEvent, createSettings, } from "../views/settings-list.js";
 import { appendTrajectoryEvent, applyTrajectoryEvent, createTrajectory, trajectoryDetailMetrics, trajectoryListMetrics, } from "../views/trajectory.js";
 import { applyAgentHubEvent, createAgentHub, updateAgentHub, } from "../views/agent-hub.js";
-import { applyEvent, applyStreamChunk, blockLines, blockSearchText, initialTranscript, replayEvents, renderView, TRANSCRIPT_FAST_SCROLL, } from "../views/event-views.js";
+import { applyEvent, applyStreamChunk, 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 { colorDisabledByEnv, createTheme, detectTrueColor, parseThemeName } from "../chrome/theme.js";
+import { colorDisabledByEnv, 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 { HistoryStore } from "../session/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 { 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";
+import { imagePathCandidates, stripComposerImageMarkers, readImageFile, readImageFromClipboard, readMacClipboardFiles, } from "../input/image-paste.js";
 import { APP_NAME, APP_VERSION } from "../session/package-metadata.js";
 const DOUBLE_CTRL_C_MS = 500;
 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
+ * events (command lifecycle, inbox splices, titles, notices) render at once.
+ */
+const BURST_EVENT_TYPES = new Set([
+    'step/start',
+    'step/end',
+    'tool/call',
+    'tool/result',
+    'assistant/message',
+    'assistant/attempt',
+    'llm/retry',
+]);
 function shortenPath(cwd) {
     const home = homedir();
     if (cwd === home)
@@ -146,11 +162,11 @@ export class LocalTui {
     #pasteBuf = '';
     #pasteInFlight = 0;
     #deferredPasteEvents = [];
-    #images = [];
-    #lineReader = null;
-    #plainPending = null;
-    #plainClosed = false;
-    #plainPrinted = 0;
+    #images = new ComposerImages({
+        editor: this.#editor,
+        notice: text => { this.notice(text, { level: 'error' }); },
+    });
+    #plain;
     #offData = null;
     #offResize = null;
     #pwd;
@@ -173,6 +189,12 @@ export class LocalTui {
     #checkUpdates = true;
     #startupChangelog = 'summary';
     #notifications = new TerminalNotificationController();
+    /**
+     * Herdr lifecycle authority for this pane. The plugin entry injects the
+     * environment-aware reporter; a directly constructed instance is inert so
+     * tests running inside a Herdr pane cannot report against the live server.
+     */
+    #herdr;
     #notificationPolicy = 'off';
     #notificationThreshold = '30s';
     #statusBar = defaultStatusBarConfig();
@@ -220,7 +242,6 @@ export class LocalTui {
     #searchFiles;
     #searchFileMentions;
     #searchSessions;
-    #validateImageDraft;
     #autocompleteDebounceMs;
     #persistPrefs = null;
     #agentBehavior;
@@ -264,8 +285,15 @@ 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.#herdr = paths.herdrReporter ?? new HerdrAgentReporter({ env: {} });
         this.#syncTrueColor();
         this.#tty = term.input.isTTY === true;
+        this.#plain = new PlainTui({
+            term,
+            blocks: () => this.#state.blocks,
+            promptRequest: () => this.#prompt?.request,
+            finishPrompt: answer => { this.#finishPrompt(answer); },
+        });
         this.#pwd = shortenPath(project.root);
         this.#branch = project.gitLabel;
         this.#renderer = new MainScreenRenderer({ write: (chunk) => { this.#term.output.write(chunk); } }, {
@@ -301,6 +329,7 @@ export class LocalTui {
             term.output.write('\x1b[?2004h');
         }
         this.#render();
+        this.#herdr.start();
     }
     /** Refresh Git workspace metadata after a turn; the footer shows realtime branch/dirty state. */
     #refreshProjectContext() {
@@ -325,10 +354,18 @@ export class LocalTui {
         this.#syncStreamingReveal(undefined);
         this.#syncTick();
         if (this.#tty) {
-            this.#render();
+            // Settlement events arrive in bursts (parallel tool calls, in-process
+            // subagent settlements); coalesce them like setSession. Control events
+            // (user echo, command lifecycle, inbox splices) stay immediate.
+            if (this.#streamRenderMs > 0 && this.#busy() && BURST_EVENT_TYPES.has(event.type)) {
+                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();
+            this.#plain.print();
         }
     }
     /**
@@ -353,6 +390,10 @@ export class LocalTui {
         }
     }
     setStatus(status) {
+        // Only the displayed top-level agent drives the Herdr pane state; an
+        // inspected child must not, and closing the inspector re-syncs the root.
+        if (this.#inspected === undefined)
+            this.#herdr.setRunning(status === 'running');
         if (this.#state.status === 'compacting')
             return;
         this.#state = { ...this.#state, status };
@@ -463,7 +504,7 @@ export class LocalTui {
             this.#render();
     }
     setImageValidator(validate) {
-        this.#validateImageDraft = validate;
+        this.#images.setValidator(validate);
     }
     toolCallContext(callId) {
         const block = this.#state.blocks.findLast(candidate => candidate.kind === 'tool' && String(candidate.callId) === callId);
@@ -501,14 +542,14 @@ export class LocalTui {
         if (this.#tty)
             this.#render();
         else
-            this.#printPlain();
+            this.#plain.print();
     }
     commandOutput(command, text) {
         this.#state = { ...this.#state, blocks: [...this.#state.blocks, { kind: 'commandOutput', command, text }] };
         if (this.#tty)
             this.#render();
         else
-            this.#printPlain();
+            this.#plain.print();
     }
     prompt(request) {
         if (this.#prompt !== null)
@@ -516,6 +557,7 @@ export class LocalTui {
         if (this.#disposed || request.signal?.aborted === true)
             return Promise.resolve(null);
         this.#emitNotification(this.#notifications.humanPrompt());
+        this.#herdr.prompt(request.title);
         this.#editor.setText('');
         this.#ac = null;
         const displaced = this.#displaceSurface();
@@ -552,17 +594,18 @@ export class LocalTui {
         this.#trajectory = null;
         const state = replayEvents(events, presentations);
         this.#state = { ...state, status, compactCommandId: undefined };
-        this.#plainPrinted = 0;
+        this.#plain.resetPrinted();
         this.#followTail();
         this.#deferInitialRender = false;
         this.#renderer.startEpoch({ replay: status === 'idle' ? 'full' : 'pinned' });
         if (this.#tty)
             this.#render();
         else
-            this.#printPlain();
+            this.#plain.print();
     }
     setSession(info) {
         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 }));
@@ -604,25 +647,7 @@ export class LocalTui {
     }
     /** 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;
-        this.#checkUpdates = prefs.checkUpdates ?? true;
-        this.#startupChangelog = prefs.startupChangelog ?? 'summary';
-        this.#notificationPolicy = prefs.notifications ?? 'off';
-        this.#notificationThreshold = prefs.notificationThreshold ?? '30s';
-        this.#configureNotifications();
-        this.#statusBar = resolveStatusBarConfig(prefs.statusBar, prefs.statusPreset);
-        this.#toolsExpanded = prefs.expandTools;
-        if (previousMotion !== this.#motion) {
-            this.#stopRevealTick();
-            this.#reveal = undefined;
-        }
-        this.#syncTick();
+        this.#applyPrefs(prefs, { persist: false, forceToolsSync: true });
         if (this.#settings !== null)
             this.#settings = { ...this.#settings, prefs };
         if (this.#tty)
@@ -667,7 +692,7 @@ export class LocalTui {
             return Promise.resolve(null);
         }
         if (!this.#tty)
-            return this.#readlinePlain(signal);
+            return this.#plain.readline(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();
@@ -695,16 +720,7 @@ export class LocalTui {
         return (await this.readInput())?.text ?? null;
     }
     restoreInput(submission) {
-        const currentText = this.#editor.text;
-        const currentImages = this.#images;
-        let rebasedCurrent = currentText;
-        for (let index = currentImages.length - 1; index >= 0; index -= 1) {
-            const image = currentImages[index];
-            rebasedCurrent = rebasedCurrent.replaceAll(imageMarker(index, image), imageMarker(index + submission.images.length, image));
-        }
-        const separator = submission.text !== '' && rebasedCurrent !== '' ? '\n' : '';
-        this.#images = [...submission.images.map(image => ({ ...image })), ...currentImages];
-        this.#editor.setText(submission.text + separator + rebasedCurrent);
+        this.#images.restore(submission);
         this.#refreshAutocomplete();
         if (this.#tty)
             this.#render();
@@ -714,14 +730,14 @@ export class LocalTui {
             return;
         this.#queueEditPending = false;
         if (submission === null) {
-            if (this.#editor.text === '' && this.#images.length === 0 && this.#queueEditNewer?.length === 0) {
+            if (this.#editor.text === '' && this.#images.count === 0 && this.#queueEditNewer?.length === 0) {
                 this.#queueEditNewer = null;
             }
             return;
         }
         if (this.#queueEditNewer === null)
             this.#queueEditNewer = [];
-        if (this.#editor.text !== '' || this.#images.length > 0) {
+        if (this.#editor.text !== '' || this.#images.count > 0) {
             this.#queueEditNewer.unshift(this.#currentSubmission());
         }
         this.#replaceInput(submission);
@@ -729,12 +745,11 @@ export class LocalTui {
     #currentSubmission() {
         return {
             text: this.#editor.text,
-            images: this.#images.map(image => ({ ...image })),
+            images: this.#images.copies(),
         };
     }
     #replaceInput(submission) {
-        this.#images = submission.images.map(image => ({ ...image }));
-        this.#editor.setText(submission.text);
+        this.#images.replace(submission);
         this.#historyIndex = 0;
         this.#refreshAutocomplete();
         if (this.#tty)
@@ -814,11 +829,12 @@ export class LocalTui {
         this.#autocompleteAbort?.abort();
         this.#autocompleteTimer = null;
         this.#autocompleteAbort = null;
-        this.#lineReader?.close();
+        this.#plain.dispose();
         this.#offAgentBehaviorWatch?.();
         this.#offAgentBehaviorWatch = undefined;
         this.#settlePending(null);
         this.#finishPrompt(null);
+        this.#herdr.release();
     }
     /** Settle one pending read, detaching its abort listener. */
     #settlePending(submission) {
@@ -833,96 +849,6 @@ export class LocalTui {
     refresh() {
         this.#render();
     }
-    #readlinePlain(signal) {
-        return new Promise((resolve) => {
-            if (this.#lineReader === null) {
-                this.#lineReader = createInterface({ input: this.#term.input });
-                // Permanent listeners: once() handlers would auto-pause the input
-                // stream after one line and miss the EOF close.
-                this.#lineReader.on('line', (line) => { this.#plainResolve(line); });
-                this.#lineReader.on('close', () => {
-                    this.#plainClosed = true;
-                    this.#plainResolve(null);
-                });
-            }
-            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.#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();
-            if (value === '') {
-                this.#finishPrompt(null);
-            }
-            else if (this.#prompt.request.allowCustom === false) {
-                const options = this.#prompt.request.options ?? [];
-                const numeric = /^\d+$/u.test(value) ? Number(value) - 1 : -1;
-                const option = numeric >= 0
-                    ? options[numeric]
-                    : options.find(item => item.label.toLowerCase() === value.toLowerCase());
-                this.#finishPrompt(option?.value ?? option?.label ?? null);
-            }
-            else {
-                this.#finishPrompt(value);
-            }
-            return;
-        }
-        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;
-        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() {
-        const theme = createTheme(false, false);
-        const width = this.#term.width();
-        const fresh = this.#state.blocks.slice(this.#plainPrinted);
-        let out = '';
-        for (const block of fresh) {
-            // Pipe / CI output is not a viewport: print the full tool body.
-            for (const line of blockLines(block, theme, width, 0, true))
-                out += line + '\n';
-        }
-        this.#plainPrinted = this.#state.blocks.length;
-        if (out !== '')
-            this.#term.output.write(out);
-    }
     #busy() {
         if (this.#state.status !== 'idle')
             return true;
@@ -1048,7 +974,7 @@ export class LocalTui {
                 ...(this.#reasoningEffort === undefined ? {} : { reasoningEffort: this.#reasoningEffort }),
                 input: this.#editor.text,
                 inputCursor: this.#editor.cursor,
-                inputImages: this.#images.length,
+                inputImages: this.#images.count,
                 queuedSubmissions: this.#queueEditNewer === null
                     ? this.#queuedSubmissions
                     : [...this.#queuedSubmissions, ...this.#queueEditNewer],
@@ -1143,7 +1069,6 @@ export class LocalTui {
         this.#scrollStart = this.#maxStart;
     }
     #utf8 = new StringDecoder('utf8');
-    #plainQueue = [];
     #onData(chunk) {
         // Decode bytes across the whole stream so a multi-byte UTF-8 character
         // split between data events is never corrupted into replacement chars.
@@ -1204,8 +1129,8 @@ export class LocalTui {
             if (images.every((image) => image !== null)) {
                 let inserted = false;
                 for (const image of images) {
-                    if (await this.#admitImage(image)) {
-                        this.#insertImageDraft(image);
+                    if (await this.#images.admit(image)) {
+                        this.#images.insert(image);
                         inserted = true;
                     }
                 }
@@ -1220,7 +1145,7 @@ export class LocalTui {
             // image instead of leaking that stale path into the prompt.
             const clipboardImage = await this.#readClipboardImage();
             if (clipboardImage !== null) {
-                this.#insertImageDraft(clipboardImage);
+                this.#images.insert(clipboardImage);
                 this.#refreshAutocomplete();
                 this.#render();
                 return;
@@ -1234,8 +1159,8 @@ export class LocalTui {
         if (this.#search === null && this.#settings === null && this.#copySelector === null) {
             const image = await this.#readClipboardImage();
             if (image !== null) {
-                if (await this.#admitImage(image)) {
-                    this.#insertImageDraft(image);
+                if (await this.#images.admit(image)) {
+                    this.#images.insert(image);
                     this.#refreshAutocomplete();
                     this.#render();
                 }
@@ -1249,8 +1174,8 @@ export class LocalTui {
                 if (images.length > 0) {
                     let inserted = false;
                     for (const candidate of images) {
-                        if (await this.#admitImage(candidate)) {
-                            this.#insertImageDraft(candidate);
+                        if (await this.#images.admit(candidate)) {
+                            this.#images.insert(candidate);
                             inserted = true;
                         }
                     }
@@ -1266,98 +1191,6 @@ export class LocalTui {
         if (text !== '')
             await this.#acceptPastedText(text);
     }
-    /**
-     * Run the Harness image-admission check for one paste candidate. A refusal
-     * becomes an error notice and skips the draft, instead of failing the whole
-     * submission after the user has typed a prompt around it.
-     */
-    async #admitImage(image) {
-        if (this.#validateImageDraft === undefined)
-            return true;
-        try {
-            await this.#validateImageDraft(image);
-            return true;
-        }
-        catch (error) {
-            this.notice(error instanceof Error ? error.message : String(error), { level: 'error' });
-            return false;
-        }
-    }
-    #insertImageDraft(input) {
-        const size = input.width === undefined || input.height === undefined
-            ? probeImageDimensions(input.data, input.mediaType)
-            : undefined;
-        const image = {
-            ...input,
-            ...(input.width === undefined && size !== undefined ? { width: size.width } : {}),
-            ...(input.height === undefined && size !== undefined ? { height: size.height } : {}),
-        };
-        const marker = imageMarker(this.#images.length, image);
-        const before = this.#editor.cursor > 0 && !/\s/u.test(this.#editor.text[this.#editor.cursor - 1] ?? '') ? ' ' : '';
-        const after = this.#editor.cursor >= this.#editor.text.length || !/\s/u.test(this.#editor.text[this.#editor.cursor] ?? '')
-            ? ' '
-            : '';
-        this.#images.push(image);
-        this.#editor.handle({ type: 'text', value: before + marker + after });
-    }
-    #removeImageAtCursor(key) {
-        const cursor = this.#editor.cursor;
-        for (let index = 0; index < this.#images.length; index += 1) {
-            const image = this.#images[index];
-            const marker = imageMarker(index, image);
-            const start = this.#editor.text.indexOf(marker);
-            if (start < 0)
-                continue;
-            let from = start;
-            let to = start + marker.length;
-            const touches = key === 'backspace'
-                ? cursor > start && cursor <= to
-                : cursor >= start && cursor < to;
-            if (!touches)
-                continue;
-            if (this.#editor.text[to] === ' ')
-                to += 1;
-            else if (from > 0 && this.#editor.text[from - 1] === ' ')
-                from -= 1;
-            const oldImages = this.#images;
-            let text = this.#editor.text.slice(0, from) + this.#editor.text.slice(to);
-            const nextImages = oldImages.filter((_, oldIndex) => oldIndex !== index);
-            let nextIndex = 0;
-            for (let oldIndex = 0; oldIndex < oldImages.length; oldIndex += 1) {
-                if (oldIndex === index)
-                    continue;
-                const remaining = oldImages[oldIndex];
-                text = text.replaceAll(imageMarker(oldIndex, remaining), imageMarker(nextIndex, remaining));
-                nextIndex += 1;
-            }
-            this.#images = nextImages;
-            this.#editor.setText(text, Math.min(from, text.length));
-            this.#refreshAutocomplete();
-            this.#render();
-            return true;
-        }
-        return false;
-    }
-    #reconcileImageDrafts() {
-        if (this.#images.length === 0)
-            return;
-        const oldImages = this.#images;
-        const retained = oldImages.filter((image, index) => this.#editor.text.includes(imageMarker(index, image)));
-        if (retained.length === oldImages.length)
-            return;
-        let text = this.#editor.text;
-        let nextIndex = 0;
-        for (let oldIndex = 0; oldIndex < oldImages.length; oldIndex += 1) {
-            const image = oldImages[oldIndex];
-            const oldMarker = imageMarker(oldIndex, image);
-            if (!text.includes(oldMarker))
-                continue;
-            text = text.replaceAll(oldMarker, imageMarker(nextIndex, image));
-            nextIndex += 1;
-        }
-        this.#images = retained;
-        this.#editor.setText(text, Math.min(this.#editor.cursor, text.length));
-    }
     #dispatch(event) {
         if (this.#state.status === 'compacting') {
             if (event.type === 'key' && event.id === 'pageUp') {
@@ -1483,7 +1316,7 @@ export class LocalTui {
             }
             else {
                 this.#editor.clear();
-                this.#images = [];
+                this.#images.clear();
                 this.#historyIndex = 0;
                 this.#ac = null;
                 this.#render();
@@ -1511,9 +1344,9 @@ export class LocalTui {
             return;
         if (event.type === 'key' && event.id === 'escape') {
             if (this.#inspected !== undefined) {
-                if (this.#inspected.writable === true && (this.#editor.text !== '' || this.#images.length > 0)) {
+                if (this.#inspected.writable === true && (this.#editor.text !== '' || this.#images.count > 0)) {
                     this.#editor.clear();
-                    this.#images = [];
+                    this.#images.clear();
                     this.#ac = null;
                     this.#render();
                     return;
@@ -1522,7 +1355,7 @@ export class LocalTui {
                 return;
             }
             if (this.#state.status !== 'idle' || this.#pending === null
-                || this.#editor.text !== '' || this.#images.length > 0) {
+                || this.#editor.text !== '' || this.#images.count > 0) {
                 this.#lastEscapeTime = 0;
             }
             else {
@@ -1539,8 +1372,11 @@ export class LocalTui {
             }
         }
         if (event.type === 'key' && (event.id === 'backspace' || event.id === 'delete')
-            && this.#removeImageAtCursor(event.id))
+            && this.#images.removeAtCursor(event.id)) {
+            this.#refreshAutocomplete();
+            this.#render();
             return;
+        }
         this.#applyCommand(this.#editor.handle(event));
     }
     #handlePrompt(event) {
@@ -1751,7 +1587,7 @@ export class LocalTui {
         }
         if (!hasAgents || event.type !== 'key' || event.id !== 'down')
             return false;
-        if (this.#editor.text !== '' || this.#images.length > 0 || this.#historyIndex !== 0 || this.#ac !== null)
+        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;
@@ -1806,12 +1642,12 @@ export class LocalTui {
             },
         };
     }
-    #applyPrefs(prefs) {
+    #applyPrefs(prefs, options) {
+        const previousMotion = this.#motion;
         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;
         this.#expandTools = prefs.expandTools;
@@ -1821,14 +1657,15 @@ export class LocalTui {
         this.#notificationThreshold = prefs.notificationThreshold ?? '30s';
         this.#configureNotifications();
         this.#statusBar = resolveStatusBarConfig(prefs.statusBar, prefs.statusPreset);
-        if (expandChanged)
+        if (options.forceToolsSync || expandChanged)
             this.#toolsExpanded = prefs.expandTools;
         if (previousMotion !== this.#motion) {
             this.#stopRevealTick();
             this.#reveal = undefined;
         }
         this.#syncTick();
-        this.#persistPrefs?.(prefs);
+        if (options.persist)
+            this.#persistPrefs?.(prefs);
     }
     #applyStoredAgentBehavior(next) {
         this.#agentBehavior = { language: next.language };
@@ -1878,7 +1715,7 @@ export class LocalTui {
                 return;
             }
             this.#settings = command.state;
-            this.#applyPrefs(command.state.prefs);
+            this.#applyPrefs(command.state.prefs, { persist: true, forceToolsSync: false });
             this.#render();
             return;
         }
@@ -2090,7 +1927,7 @@ export class LocalTui {
     }
     #applyCommand(command) {
         if (command.kind === 'changed') {
-            this.#reconcileImageDrafts();
+            this.#images.reconcile();
             if (command.edited === true)
                 this.#historyIndex = 0;
             this.#refreshAutocomplete();
@@ -2125,7 +1962,7 @@ export class LocalTui {
         }
         if (command.kind === 'clear') {
             this.#editor.clear();
-            this.#images = [];
+            this.#images.clear();
             this.#queueEditNewer = null;
             this.#queueEditPending = false;
             this.#historyIndex = 0;
@@ -2153,7 +1990,7 @@ export class LocalTui {
         }
     }
     #historyPrev() {
-        if (this.#images.length > 0)
+        if (this.#images.count > 0)
             return;
         if (this.#history.length === 0 || this.#historyIndex >= this.#history.length)
             return;
@@ -2182,7 +2019,7 @@ export class LocalTui {
                 listener();
             return true;
         }
-        if (this.#editor.text !== '' || this.#images.length > 0 || this.#historyIndex !== 0)
+        if (this.#editor.text !== '' || this.#images.count > 0 || this.#historyIndex !== 0)
             return false;
         const submission = this.#queuedSubmissions.pop();
         if (submission !== undefined) {
@@ -2200,7 +2037,7 @@ export class LocalTui {
         return true;
     }
     #historyNext() {
-        if (this.#images.length > 0)
+        if (this.#images.count > 0)
             return;
         if (this.#historyIndex === 0)
             return;
@@ -2228,7 +2065,7 @@ export class LocalTui {
             this.#render();
             return;
         }
-        const images = this.#images.map(image => ({ ...image }));
+        const images = this.#images.copies();
         const submittedText = images.length > 0 ? text.trim() : text;
         const queueEditNewer = this.#queueEditNewer;
         const historyText = stripComposerImageMarkers(submittedText, images)
@@ -2243,7 +2080,7 @@ export class LocalTui {
         this.#queueEditNewer = null;
         this.#queueEditPending = false;
         this.#editor.setText('');
-        this.#images = [];
+        this.#images.clear();
         this.#ac = null;
         this.#search = null;
         this.#settings = null;
@@ -2279,7 +2116,7 @@ export class LocalTui {
         this.#render();
     }
     #submitInspect(text) {
-        const images = this.#images.map(image => ({ ...image }));
+        const images = this.#images.copies();
         const submittedText = images.length > 0 ? text.trim() : text;
         const historyText = stripComposerImageMarkers(submittedText, images)
             .replace(/[ \t]{2,}/gu, ' ')
@@ -2291,7 +2128,7 @@ export class LocalTui {
         this.#historyIndex = 0;
         this.#draft = '';
         this.#editor.setText('');
-        this.#images = [];
+        this.#images.clear();
         this.#ac = null;
         this.#search = null;
         this.#followTail();
@@ -2410,6 +2247,7 @@ export class LocalTui {
         if (pending === null)
             return;
         this.#prompt = null;
+        this.#herdr.promptResolved();
         pending.offAbort?.();
         pending.resolve(answer);
         this.#restoreDisplacedSurface();
@@ -2559,7 +2397,7 @@ export class LocalTui {
             return true;
         }
         if (action === 'search-history') {
-            if (this.#images.length > 0)
+            if (this.#images.count > 0)
                 return false;
             this.#search = createHistorySearch(this.#history);
             this.#ac = null;
@@ -2571,7 +2409,7 @@ export class LocalTui {
             // 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)
+            if (this.#editor.text !== '' || this.#images.count > 0)
                 return false;
             this.#transcriptSearch = createTranscriptSearch();
             this.#ac = null;
@@ -2615,7 +2453,7 @@ export class LocalTui {
             this.#term.input.setRawMode?.(false);
             const text = editExternally(this.#editor.text);
             this.#editor.setText(text);
-            this.#reconcileImageDrafts();
+            this.#images.reconcile();
         }
         catch (error) {
             this.notice(error instanceof Error ? error.message : String(error), { level: 'error' });
@@ -2687,6 +2525,7 @@ export function apply(ctx, config) {
         deferInitialRender: true,
         terminalProfile,
         alternateScreenOverlays: terminalProfile === 'direct',
+        herdrReporter: new HerdrAgentReporter(),
         historyPath: config.historyPath ?? join(dshHome, 'omdsh', 'history.jsonl'),
         keybindingsPath: config.keybindingsPath ?? join(dshHome, 'omdsh', 'keybindings.json'),
     });