@agi-fans/dsh-tui 0.24.0 → 0.25.0

package/lib/runtime/provider-local.js

@@ -23,7 +23,7 @@ import { localizePrompt } from "../locale/prompt.js";
 import { resolveUiLanguage, uiText } from "../locale/index.js";
 import { formatAgentPreset } from "../session/session-configuration.js";
 import { TerminalNotificationController, TerminalNotificationQueue, terminalNotificationSequence, } from "./terminal-notifications.js";
-import { PROGRAM_STATUS_QUERY, programStatusSequence, terminalTitle } from "./terminal-state.js";
+import { PROGRAM_STATUS_QUERY, programStatusNeedsAttention, programStatusSequence, terminalProgressSequence, terminalTitle, workingDirectorySequence, } from "./terminal-state.js";
 import { TerminalSession } from "./terminal-session.js";
 import { BRACKETED_PASTE, FOCUS_REPORTING, MOUSE_TRACKING, } from "./terminal-modes.js";
 import { IDLE_WHEEL, terminalAcceleratesWheel, wheelStep } from "../input/wheel-scroll.js";
@@ -87,7 +87,7 @@ import { edgeIndex, listNavigation, navigateIndex } from "../views/list-navigati
 import { refreshProjectContext, resolveGitStatusFiles, resolveProjectContext } from "../session/project-context.js";
 import { modelRouteReady } from "../session/model-readiness.js";
 import { formatEssentialHotkeysText, formatHotkeysText, keysForAction } from "../views/hotkeys.js";
-import { imagePathCandidates, splitComposerAttachmentMarkers, stripComposerImageMarkers, readImageFile, readImageFromClipboard, readMacClipboardFiles, } from "../input/image-paste.js";
+import { imagePathCandidates, splitComposerAttachmentMarkers, readImageFile, readImageFromClipboard, readMacClipboardFiles, } from "../input/image-paste.js";
 import { APP_DISPLAY_NAME, APP_NAME, APP_VERSION } from "../session/package-metadata.js";
 const DOUBLE_CTRL_C_MS = 500;
 /**
@@ -316,6 +316,7 @@ export class LocalTui {
     #paste = false;
     #pasteBuf = '';
     #pasteInFlight = 0;
+    #pasteAbort;
     #deferredPasteEvents = [];
     #images = new ComposerImages({
         editor: this.#editor,
@@ -377,6 +378,10 @@ export class LocalTui {
     #compactionStartedAt;
     #readImageInput;
     #writtenProgramState;
+    #writtenDirectory;
+    #launchDirectory = process.cwd();
+    #writtenProgress;
+    #progressTimer;
     #checkUpdates = true;
     #startupChangelog = 'summary';
     #notifications = new TerminalNotificationController();
@@ -622,14 +627,7 @@ export class LocalTui {
                 const resume = () => {
                     if (this.#disposed)
                         return;
-                    this.#terminalFocused = undefined;
-                    this.#writtenWindowTitle = undefined;
-                    this.#writtenProgramState = undefined;
-                    this.#programQuerySent = false;
-                    this.#programSupported = false;
-                    this.#syncWindowTitle();
-                    this.#session.takeBack();
-                    this.#renderer.reset();
+                    this.#takeBackTerminal();
                     this.#render();
                 };
                 process.on('SIGCONT', resume);
@@ -704,6 +702,8 @@ export class LocalTui {
         else if (event.type === 'session/end-seed')
             this.#directInputIds.clear();
         this.#state = applyEvent(this.#state, event, presentation, workspace);
+        if (event.type === 'turn/start' && this.#herdr.programStatus.state !== 'blocked')
+            this.#notificationQueue.clear();
         if (claimedHumanInput && this.#tty && event.type === 'agent/inbox/spliced') {
             this.#showTransientStatus(event.data.target === 'next-step' ? 'Steer taken for the next step' : 'Queue taken for the next turn');
         }
@@ -889,6 +889,7 @@ export class LocalTui {
             this.#render();
     }
     async reviewFiles(request) {
+        this.#cancelPaste();
         if (!this.#tty || this.#disposed || request.signal.aborted)
             return;
         this.#workspacePress = undefined;
@@ -1244,11 +1245,12 @@ export class LocalTui {
                 this.notice(error instanceof Error ? error.message : String(error), { level: 'error' });
             }
         }
+        this.#cancelPaste();
         this.#flushPasteBurst(true);
         this.#pasteBurst.clear();
         if (request.notify !== false) {
             this.#emitNotification(this.#notifications.humanPrompt());
-            this.#herdr.prompt(request.title);
+            this.#herdr.prompt(request.title, request.attentionKind);
             this.#syncWindowTitle();
         }
         if (this.#tty && request.documentImage !== undefined && this.#imageProtocol !== undefined)
@@ -1384,6 +1386,8 @@ export class LocalTui {
             this.#workspacePress = undefined;
             this.#fileReviewAbort?.abort();
             this.#closeFileBrowser();
+            this.#notificationQueue.clear();
+            this.#notifications.reset();
         }
         this.#switchDraft(this.#inspected?.id ?? info.id);
         this.#sessionId = info.id;
@@ -1410,10 +1414,12 @@ export class LocalTui {
             this.#render();
     }
     /** Only the foreground terminal owner emits title and program-state sequences. */
-    #syncWindowTitle() {
-        if (!this.#tty || this.#disposed)
+    #syncWindowTitle(notify = false) {
+        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)) {
             this.#writtenWindowTitle = title;
@@ -1423,20 +1429,78 @@ export class LocalTui {
             this.#programQuerySent = true;
             this.#term.output.write(PROGRAM_STATUS_QUERY);
         }
-        const enabled = this.#terminalState === 'on' || this.#terminalState === 'auto' && this.#programSupported;
-        if (!enabled) {
+        if (!this.#reportsProgramState) {
             if (this.#writtenProgramState !== undefined)
                 this.#term.output.write(programStatusSequence('clear'));
             this.#writtenProgramState = undefined;
             return;
         }
         // Only the session name is exported as metadata; prompt bodies and errors stay in the TUI.
-        const sequence = programStatusSequence({ state: status.state, ...(this.#sessionTitle === undefined ? {} : { message: this.#sessionTitle }) });
+        const sequence = programStatusSequence({ state: status.state,
+            ...(status.kind === undefined ? {} : { kind: status.kind }),
+            ...(this.#sessionTitle === undefined ? {} : { message: 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;
         this.#term.output.write(sequence);
     }
+    get #reportsProgramState() {
+        return this.#terminalState === 'on' || this.#terminalState === 'auto' && this.#programSupported;
+    }
+    #writeWorkingDirectory(cwd) {
+        const sequence = workingDirectorySequence(cwd);
+        if (sequence === this.#writtenDirectory)
+            return;
+        this.#term.output.write(sequence);
+        this.#writtenDirectory = sequence;
+    }
+    #syncProgress(state) {
+        const sequence = this.#terminalState === 'off' ? terminalProgressSequence('clear') : terminalProgressSequence(state);
+        const active = sequence !== terminalProgressSequence('clear');
+        if (sequence !== this.#writtenProgress && (active || this.#writtenProgress !== undefined))
+            this.#term.output.write(sequence);
+        this.#writtenProgress = active ? sequence : undefined;
+        if (this.#progressTimer !== undefined && (state !== 'working' || this.#terminalState === 'off')) {
+            clearInterval(this.#progressTimer);
+            this.#progressTimer = undefined;
+        }
+        // Some terminals expire indeterminate progress without a heartbeat.
+        if (state === 'working' && this.#terminalState !== 'off' && this.#progressTimer === undefined) {
+            this.#progressTimer = setInterval(() => {
+                if (!this.#disposed && !this.#session.handedOff && this.#writtenProgress !== undefined)
+                    this.#term.output.write(this.#writtenProgress);
+            }, 1000);
+            this.#progressTimer.unref?.();
+        }
+    }
+    /** Give shell/editor ownership back without retaining omdsh metadata. */
+    #releaseTerminalMetadata() {
+        if (this.#progressTimer !== undefined)
+            clearInterval(this.#progressTimer);
+        this.#progressTimer = undefined;
+        if (this.#writtenProgress !== undefined)
+            this.#term.output.write(terminalProgressSequence('clear'));
+        this.#writtenProgress = undefined;
+        if (this.#writtenProgramState !== undefined)
+            this.#term.output.write(programStatusSequence('clear'));
+        this.#writtenProgramState = undefined;
+        if (this.#writtenWindowTitle !== undefined && this.#writtenWindowTitle !== '')
+            this.#term.output.write('\x1b]2;\x07');
+        this.#writtenWindowTitle = undefined;
+        if (this.#writtenDirectory !== undefined)
+            this.#writeWorkingDirectory(this.#launchDirectory);
+        this.#writtenDirectory = undefined;
+    }
     /**
      * Re-derive the color depth from the active color preference. Every path
      * that changes `#colors` calls this so `/settings` takes effect immediately.
@@ -1607,8 +1671,8 @@ export class LocalTui {
                 this.#reportDraftError('restore', error);
             }
             if (existing !== undefined) {
-                images.replace({ text: existing.editor.text, images: existing.images });
                 editor.restore(existing.editor);
+                images.restoreSnapshot(existing.images);
                 files.restoreSnapshot(existing.files);
             }
             images.restore(submission, files.adopt(submission.files ?? []));
@@ -1832,7 +1896,9 @@ export class LocalTui {
             this.#renderer.finish();
         }
         catch { /* best effort while exiting */ }
+        this.#releaseTerminalMetadata();
         this.#session.release();
+        this.#term.input.setRawMode?.(false);
         this.#term.output.write('\x1b[?25h');
     }
     dispose() {
@@ -1842,6 +1908,7 @@ export class LocalTui {
         this.#flushDraft();
         this.#pendingInputs.flush(this.#pendingScope());
         this.#disposed = true;
+        this.#cancelPaste();
         this.#imagePreviewAbort?.abort();
         this.#fileReviewAbort?.abort();
         this.#closeFileBrowser();
@@ -1894,14 +1961,7 @@ 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;
-            }
-            if (this.#writtenProgramState !== undefined)
-                this.#term.output.write(programStatusSequence('clear'));
-            this.#writtenProgramState = undefined;
+            this.#releaseTerminalMetadata();
             this.#offExit?.();
             this.#offExit = undefined;
             this.#session.dispose();
@@ -2049,11 +2109,11 @@ export class LocalTui {
         if (this.#historyIndex > 0 && this.#historyDraft !== undefined)
             return this.#historyDraft;
         const editor = this.#prompt?.savedInput ?? this.#editor.snapshot();
-        return { editor, images: this.#images.copies(), files: this.#files.snapshot(editor.text), literal: this.#literalInput };
+        return { editor, images: this.#images.copies(editor), files: this.#files.snapshot(editor.text), literal: this.#literalInput };
     }
     #restoreDraft(draft) {
-        this.#images.replace({ text: draft.editor.text, images: draft.images });
         this.#editor.restore(draft.editor);
+        this.#images.restoreSnapshot(draft.images);
         this.#files.restoreSnapshot(draft.files);
         this.#literalInput = draft.literal;
     }
@@ -2117,6 +2177,7 @@ export class LocalTui {
     #switchDraft(id) {
         if (id === this.#draftScope)
             return;
+        this.#cancelPaste();
         this.#goalAbort?.abort();
         this.#goalAbort = undefined;
         this.#queueHotkeyAbort?.abort();
@@ -2206,9 +2267,9 @@ export class LocalTui {
                 themeName: this.#themeName,
                 terminal: this.#terminalColors,
                 ...(workingLabel === undefined ? {} : { workingLabel }),
+                ...(this.#selection.active ? { selectionActions: this.#canQuoteSelection() ? 'copy-quote' : 'copy' } : {}),
                 ...(this.#transientStatus !== undefined ? { transientStatus: uiText(resolveUiLanguage(this.#uiLanguage), this.#transientStatus) }
-                    : this.#selection.active ? { selectionActions: this.#canQuoteSelection() ? 'copy-quote' : 'copy' }
-                        : this.#processSelection !== undefined ? { transientStatus: uiText(resolveUiLanguage(this.#uiLanguage), 'Process · ↑↓ select · Enter toggle · {key} actions · Home title · Esc return', { key: keysForAction(this.#keybindings, 'tool-actions') }) } : {}),
+                    : !this.#selection.active && this.#processSelection !== undefined ? { transientStatus: uiText(resolveUiLanguage(this.#uiLanguage), 'Process · ↑↓ select · Enter toggle · {key} actions · Home title · Esc return', { key: keysForAction(this.#keybindings, 'tool-actions') }) } : {}),
                 scrollStart: this.#follow ? Number.POSITIVE_INFINITY : this.#scrollStart,
                 ...(this.#focusBlock === undefined ? {} : { focusBlock: this.#focusBlock, focusBlockEdge: this.#focusBlockEdge ?? 'start', ...(this.#focusBlockOffset === undefined ? {} : { focusBlockOffset: this.#focusBlockOffset }) }),
                 ...(this.#transcriptSearch === null ? {} : {
@@ -2385,20 +2446,31 @@ export class LocalTui {
     /** Give every terminal mode back before the terminal is lent out (Ctrl+Z, external editor). */
     #handOffTerminal() {
         this.#setMouseTracking(false);
+        this.#releaseTerminalMetadata();
         this.#session.handOff();
+        this.#term.input.setRawMode?.(false);
+    }
+    #takeBackTerminal() {
+        this.#session.takeBack();
+        this.#term.input.setRawMode?.(true);
+        this.#terminalFocused = undefined;
+        this.#writtenWindowTitle = undefined;
+        this.#writtenProgramState = undefined;
+        this.#writtenDirectory = undefined;
+        this.#programQuerySent = false;
+        this.#programSupported = false;
+        this.#syncWindowTitle();
+        this.#renderer.reset();
     }
     /** Run `run` with the terminal handed off; take it back and repaint afterwards. */
     #handTerminal(run) {
         this.#handOffTerminal();
-        this.#term.input.setRawMode?.(false);
         try {
             return run();
         }
         finally {
             if (!this.#disposed) {
-                this.#term.input.setRawMode?.(true);
-                this.#session.takeBack();
-                this.#renderer.reset();
+                this.#takeBackTerminal();
             }
         }
     }
@@ -2509,14 +2581,26 @@ export class LocalTui {
         for (const event of this.#pasteBurst.flush(Date.now(), force))
             this.#deliverPasteEmission(event);
     }
+    #cancelPaste() {
+        this.#pasteAbort?.abort();
+        this.#pasteAbort = undefined;
+        this.#pasteInFlight = 0;
+        this.#deferredPasteEvents = [];
+        this.#paste = false;
+        this.#pasteBuf = '';
+    }
     #startAsyncPaste(operation) {
-        this.#pasteInFlight += 1;
-        void operation.catch((error) => {
-            this.notice('Paste failed: ' + (error instanceof Error ? error.message : String(error)), { level: 'error' });
+        const abort = new AbortController();
+        this.#pasteAbort = abort;
+        this.#pasteInFlight = 1;
+        void operation(abort.signal).catch((error) => {
+            if (!abort.signal.aborted)
+                this.notice('Paste failed: ' + (error instanceof Error ? error.message : String(error)), { level: 'error' });
         }).finally(() => {
-            this.#pasteInFlight = Math.max(0, this.#pasteInFlight - 1);
-            if (this.#pasteInFlight !== 0 || this.#deferredPasteEvents.length === 0)
+            if (this.#pasteAbort !== abort)
                 return;
+            this.#pasteAbort = undefined;
+            this.#pasteInFlight = 0;
             const deferred = this.#deferredPasteEvents.splice(0);
             for (let index = 0; index < deferred.length; index += 1) {
                 this.#dispatch(deferred[index]);
@@ -2527,7 +2611,10 @@ export class LocalTui {
             }
         });
     }
-    async #acceptPastedText(text) {
+    async #acceptPastedText(text, signal) {
+        if (signal.aborted)
+            return;
+        text = text.replaceAll('\r\n', '\n').replaceAll('\r', '\n');
         if (this.#fileBrowser !== null) {
             this.#applyFileBrowserInput({ type: 'text', value: text });
             return;
@@ -2555,42 +2642,50 @@ export class LocalTui {
         }
         const paths = imagePathCandidates(text);
         if (paths.length > 0) {
-            const images = await Promise.all(paths.map(path => this.#readImagePath(path)));
-            if (images.every((image) => image !== null)) {
-                let inserted = false;
-                for (const image of images) {
-                    if (await this.#images.admit(image)) {
-                        this.#images.insert(image);
-                        inserted = true;
-                    }
+            const images = await Promise.all(paths.map(async (path) => {
+                try {
+                    return await this.#readImagePath(path);
                 }
-                if (inserted) {
-                    this.#refreshAutocomplete();
-                    this.#render();
+                catch {
+                    return null;
                 }
+            }));
+            if (signal.aborted)
                 return;
+            let inserted = false;
+            for (const [index, image] of images.entries()) {
+                if (image === null) {
+                    this.notice(uiText(resolveUiLanguage(this.#uiLanguage), 'Could not read image {path}', { path: paths[index] }), { level: 'error' });
+                    continue;
+                }
+                const admitted = await this.#images.admit(image, signal);
+                if (signal.aborted)
+                    return;
+                if (admitted) {
+                    this.#images.insert(image);
+                    inserted = true;
+                }
             }
-            // Screenshot tools sometimes paste a transient cache path and remove
-            // it before Node reads it. OMP falls back to the still-live clipboard
-            // image instead of leaking that stale path into the prompt.
-            const clipboardImage = await this.#readClipboardImage();
-            if (clipboardImage !== null) {
-                this.#images.insert(clipboardImage);
+            if (inserted)
                 this.#refreshAutocomplete();
-                this.#render();
-                return;
-            }
+            this.#render();
+            return;
         }
         this.#literalInput ||= this.#editor.cursor === 0 && text.startsWith('!');
         this.#editor.paste(text);
         this.#refreshAutocomplete();
         this.#render();
     }
-    async #pasteClipboard() {
-        if (this.#search === null && this.#settings === null) {
+    async #pasteClipboard(signal) {
+        if (this.#prompt === null && this.#search === null && this.#settings === null) {
             const image = await this.#readClipboardImage();
+            if (signal.aborted)
+                return;
             if (image !== null) {
-                if (await this.#images.admit(image)) {
+                const admitted = await this.#images.admit(image, signal);
+                if (signal.aborted)
+                    return;
+                if (admitted) {
                     this.#images.insert(image);
                     this.#refreshAutocomplete();
                     this.#render();
@@ -2598,29 +2693,17 @@ export class LocalTui {
                 return;
             }
             const files = await this.#readClipboardFiles();
+            if (signal.aborted)
+                return;
             const imagePaths = files.filter(path => imagePathCandidates(path).length === 1);
             if (imagePaths.length > 0) {
-                const images = (await Promise.all(imagePaths.map(path => this.#readImagePath(path))))
-                    .filter((candidate) => candidate !== null);
-                if (images.length > 0) {
-                    let inserted = false;
-                    for (const candidate of images) {
-                        if (await this.#images.admit(candidate)) {
-                            this.#images.insert(candidate);
-                            inserted = true;
-                        }
-                    }
-                    if (inserted) {
-                        this.#refreshAutocomplete();
-                        this.#render();
-                    }
-                    return;
-                }
+                await this.#acceptPastedText(imagePaths.join('\n'), signal);
+                return;
             }
         }
         const text = await this.#readClipboard();
-        if (text !== '')
-            await this.#acceptPastedText(text);
+        if (text !== '' && !signal.aborted)
+            await this.#acceptPastedText(text, signal);
     }
     /** Resolve one bounded tmux probe without overwriting an explicit preference. */
     setTmuxMouseEnabled(enabled) {
@@ -2803,7 +2886,7 @@ export class LocalTui {
                 this.#workspacePress = undefined;
                 if (event.button === 'left' && !event.shift && target?.key === pressedAction.key && target.row === pressedAction.row && target.column === pressedAction.column) {
                     if (target.action === 'copy')
-                        void this.#copySelection(true);
+                        void this.#copySelection();
                     else if (target.action === 'quote')
                         this.#quoteSelection();
                     else {
@@ -2835,7 +2918,7 @@ export class LocalTui {
             this.#disclosurePress = undefined;
             if (event.action === 'press') {
                 if (this.#selection.active)
-                    void this.#copySelection(true);
+                    void this.#copySelection();
                 else {
                     const region = this.#fileRegionAt(event.row);
                     if (region !== undefined) {
@@ -2910,7 +2993,7 @@ export class LocalTui {
     #handleTrajectoryMouse(event) {
         if (event.button === 'right') {
             if (event.action === 'press' && this.#selection.active)
-                void this.#copySelection(true);
+                void this.#copySelection();
             return;
         }
         if (event.action === 'press') {
@@ -2982,7 +3065,7 @@ export class LocalTui {
         this.#copyTask = task.catch(() => { });
         return task;
     }
-    async #copySelection(explicit = false) {
+    async #copySelection() {
         if (!this.#selection.valid(this.#renderer.viewport())) {
             this.#selection.clear();
             return;
@@ -2992,16 +3075,13 @@ export class LocalTui {
             return;
         try {
             const delivery = await this.#deliverCopy(text);
-            if (explicit && !this.#disposed) {
+            if (!this.#disposed && this.#selection.text() === text) {
                 this.#showTransientStatus(delivery === 'requested' ? 'Selection sent to terminal clipboard' : 'Copied selection');
-                this.#render();
             }
         }
         catch {
-            if (!this.#disposed) {
+            if (!this.#disposed && this.#selection.text() === text)
                 this.#showTransientStatus('Copy failed');
-                this.#render();
-            }
         }
     }
     #canQuoteSelection() {
@@ -3163,7 +3243,7 @@ export class LocalTui {
                 return;
             }
             if (event.type === 'key' && (['super+c', 'enter'].includes(event.id) || this.#boundAction(event.id) === 'copy-prompt')) {
-                void this.#copySelection(true);
+                void this.#copySelection();
                 return;
             }
             this.#selection.clear();
@@ -3208,6 +3288,8 @@ export class LocalTui {
         // Clipboard image inspection is asynchronous. Preserve the exact key
         // order so a fast Ctrl+V, Enter submits the finished image draft rather
         // than an empty prompt.
+        if (this.#pasteInFlight > 0 && event.type === 'key' && (event.id === 'ctrl+c' || event.id === 'escape'))
+            this.#cancelPaste();
         if (this.#pasteInFlight > 0) {
             this.#deferredPasteEvents.push(event);
             return;
@@ -3218,7 +3300,7 @@ export class LocalTui {
                 const text = this.#pasteBuf.replaceAll('\r\n', '\n').replaceAll('\r', '\n');
                 this.#pasteBuf = '';
                 if (text !== '')
-                    this.#startAsyncPaste(this.#acceptPastedText(text));
+                    this.#startAsyncPaste(signal => this.#acceptPastedText(text, signal));
                 return;
             }
             if (event.type === 'text')
@@ -3996,7 +4078,6 @@ export class LocalTui {
         this.#externalEditor = prefs.editor ?? 'auto';
         this.#terminalTitle = prefs.terminalTitle ?? 'status';
         this.#terminalState = prefs.terminalState ?? 'auto';
-        this.#syncWindowTitle();
         this.#copyOnSelect = prefs.copyOnSelect ?? true;
         this.#mathMode = prefs.mathMode ?? 'auto';
         this.#mermaidMode = prefs.mermaidMode ?? 'auto';
@@ -4009,6 +4090,7 @@ export class LocalTui {
         if (this.#notificationPolicy === 'off')
             this.#notificationQueue.clear();
         this.#configureNotifications();
+        this.#syncWindowTitle();
         this.#statusBar = resolveStatusBarConfig(prefs.statusBar, prefs.statusPreset);
         if (options.forceToolsSync)
             this.#toolsExpanded = false;
@@ -4504,7 +4586,10 @@ export class LocalTui {
         try {
             process.kill(process.pid, 'SIGTSTP');
         }
-        catch { /* no controlling tty */ }
+        catch {
+            this.#takeBackTerminal();
+            this.#render();
+        }
     }
     #historyPrev() {
         if (this.#images.count > 0)
@@ -4606,11 +4691,20 @@ export class LocalTui {
     #buildSubmission(text) {
         const images = this.#images.copies();
         const files = this.#files.copies();
-        const typedText = this.#files.text(images.length > 0 ? text.trim() : text);
+        const markers = this.#files.snapshot(this.#editor.text).entries.map(item => item.marker);
+        const ranges = this.#images.ranges();
+        for (const [index, marker] of markers.entries()) {
+            const start = text.indexOf(marker);
+            if (start < 0)
+                continue;
+            const end = start + marker.length;
+            ranges.push({ kind: 'file', index, start: start > 0 && text[start - 1] === ' ' ? start - 1 : start,
+                end: text[end] === ' ' ? end + 1 : end });
+        }
         const segments = images.length === 0 && files.length === 0 ? []
-            : splitComposerAttachmentMarkers(text.trim(), images, this.#files.snapshot(text).entries.map(item => item.marker));
-        // Stripping a marker that sat on its own line leaves that line break behind.
-        const submittedText = images.length > 0 ? stripComposerImageMarkers(typedText, images).trim() : typedText;
+            : splitComposerAttachmentMarkers(text, images, markers, images.length > 0 && text === this.#editor.expandedText ? ranges : undefined);
+        const submittedText = images.length === 0 ? this.#files.text(text)
+            : segments.flatMap(segment => segment.kind === 'text' ? [segment.text] : []).join('');
         const literal = text === this.#editor.expandedText && (this.#literalInput || this.#editor.startsWithPaste);
         const historyText = submittedText.replace(/[ \t]{2,}/gu, ' ').trim();
         return {
@@ -4829,6 +4923,7 @@ export class LocalTui {
         const pending = this.#prompt;
         if (pending === null)
             return;
+        this.#cancelPaste();
         const draft = structuredPromptAnswer(pending, this.#editor.expandedText);
         try {
             pending.request.onAnswerDraft?.(draft);
@@ -4852,6 +4947,8 @@ export class LocalTui {
         this.#wheelGesture = IDLE_WHEEL;
         if (pending.request.notify !== false) {
             this.#herdr.promptResolved();
+            if (this.#herdr.programStatus.state !== 'blocked')
+                this.#notificationQueue.clear('blocked');
             this.#syncWindowTitle();
         }
         pending.offAbort?.();
@@ -4979,6 +5076,7 @@ export class LocalTui {
         }
         this.#search = null;
         this.#ac = null;
+        this.#cancelPaste();
         this.#settings = createSettings(this.prefs(), undefined, this.#agentBehavior, this.#features, this.#pluginSettings?.entries(), discoverEditors(this.#externalEditor), this.#settingsActions());
         this.#refreshSettingsCatalog();
         this.#render();
@@ -5063,10 +5161,18 @@ export class LocalTui {
             const pending = this.#notificationQueue.take();
             if (pending === undefined || this.#disposed || this.#notificationPolicy === 'off')
                 return;
+            if (this.#session.handedOff)
+                return;
             // Re-read focus at delivery time: the reader may have come back inside the
             // coalescing window, and a turn finishing while they watch is not news.
             if (this.#notificationPolicy === 'unfocused' && this.#terminalFocused === true)
                 return;
+            if (pending.programState !== undefined && pending.programState !== this.#herdr.programStatus.state)
+                return;
+            if (this.#reportsProgramState && programStatusNeedsAttention(this.#herdr.programStatus.state)) {
+                this.#syncWindowTitle(true);
+                return;
+            }
             const sequence = terminalNotificationSequence(pending);
             if (sequence !== '')
                 this.#term.output.write(sequence);
@@ -5391,7 +5497,7 @@ export class LocalTui {
             return true;
         }
         if (action === 'paste-clipboard') {
-            this.#startAsyncPaste(this.#pasteClipboard());
+            this.#startAsyncPaste(signal => this.#pasteClipboard(signal));
             return true;
         }
         // Explicit queue delivery is independent of the busy-Enter preference.
@@ -5407,7 +5513,8 @@ export class LocalTui {
             this.#handTerminal(() => {
                 this.#literalInput ||= this.#editor.startsWithPaste;
                 const text = editExternally(this.#editor.expandedText, this.#externalEditor);
-                this.#editor.setText(text);
+                while (this.#editor.expandPaste()) { /* Keep marker positions aligned with expanded source. */ }
+                this.#editor.replaceText(text);
                 this.#images.reconcile();
             });
         }