@agi-fans/dsh-tui 0.23.1 → 0.24.1

package/lib/runtime/provider-local.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,
@@ -414,6 +415,9 @@ export class LocalTui {
     #mermaidMode = 'auto';
     /** Transcript collapses every thought to one line; Ctrl+T flips it. */
     #hideThinking = true;
+    #showFileChanges = true;
+    #workspaceReview;
+    #workspacePress;
     #mouseInteraction = 'auto';
     #tmuxMouseEnabled;
     #disclosurePress;
@@ -598,6 +602,7 @@ export class LocalTui {
                 // live window so it stays anchored at the bottom.
                 this.#selection.clear();
                 this.#mouseActionPress = undefined;
+                this.#workspacePress = undefined;
                 this.#jumpPress = undefined;
                 this.#disclosurePress = undefined;
                 const repaint = () => {
@@ -859,6 +864,7 @@ export class LocalTui {
             && this.#inspected?.writable === inspected?.writable)
             return;
         if (this.#inspected?.id !== inspected?.id) {
+            this.#workspacePress = undefined;
             this.#fileReviewAbort?.abort();
             this.#closeFileBrowser();
         }
@@ -884,8 +890,10 @@ export class LocalTui {
             this.#render();
     }
     async reviewFiles(request) {
+        this.#cancelPaste();
         if (!this.#tty || this.#disposed || request.signal.aborted)
             return;
+        this.#workspacePress = undefined;
         this.#flushPasteBurst(true);
         this.#pasteBurst.clear();
         this.#finishPrompt(null);
@@ -1220,7 +1228,8 @@ export class LocalTui {
         const browserState = promptBrowserState(request);
         request = localizePrompt(request, resolveUiLanguage(this.#uiLanguage));
         // Background approvals take the terminal from a user-opened file reader.
-        if (this.#fileReviewAbort !== undefined && request.signal !== this.#fileReviewAbort.signal)
+        if (this.#fileReviewAbort !== undefined && request.signal !== this.#fileReviewAbort.signal
+            && request.signal !== this.#fileBrowser?.request.signal)
             this.#fileReviewAbort.abort();
         if (this.#disposed || request.signal?.aborted === true)
             return Promise.resolve(null);
@@ -1237,6 +1246,7 @@ 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) {
@@ -1251,6 +1261,7 @@ export class LocalTui {
         this.#promptChoicePress = undefined;
         this.#disclosurePress = undefined;
         this.#mouseActionPress = undefined;
+        this.#workspacePress = undefined;
         this.#jumpPress = undefined;
         this.#wheelGesture = IDLE_WHEEL;
         const savedInput = this.#editor.snapshot();
@@ -1341,6 +1352,7 @@ export class LocalTui {
         });
     }
     replaceSession(events, presentations, status = 'idle', reason = 'open') {
+        this.#workspacePress = undefined;
         if (reason !== 'refresh') {
             this.#fileReviewAbort?.abort();
             this.#closeFileBrowser();
@@ -1372,6 +1384,7 @@ export class LocalTui {
     }
     setSession(info) {
         if (info.id !== this.#sessionId) {
+            this.#workspacePress = undefined;
             this.#fileReviewAbort?.abort();
             this.#closeFileBrowser();
         }
@@ -1456,6 +1469,7 @@ export class LocalTui {
             mathMode: this.#mathMode,
             mermaidMode: this.#mermaidMode,
             hideThinking: this.#hideThinking,
+            showFileChanges: this.#showFileChanges,
             editor: this.#externalEditor,
             terminalTitle: this.#terminalTitle,
             terminalState: this.#terminalState,
@@ -1596,8 +1610,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 ?? []));
@@ -1743,6 +1757,15 @@ export class LocalTui {
         return pending.queued.length === 0 && pending.sending.size === 0
             && this.#state.nextTurnInbox.length === 0 && !this.#state.nextStepInbox.some(message => message.source.kind === 'user');
     }
+    setWorkspaceReviewHandler(handler) {
+        this.#workspaceReview = handler;
+        return () => {
+            if (this.#workspaceReview === handler) {
+                this.#workspaceReview = undefined;
+                this.#workspacePress = undefined;
+            }
+        };
+    }
     setGoalHandler(handler) {
         this.#goalHandler = handler;
         this.#syncSettingsActions();
@@ -1822,6 +1845,7 @@ export class LocalTui {
         this.#flushDraft();
         this.#pendingInputs.flush(this.#pendingScope());
         this.#disposed = true;
+        this.#cancelPaste();
         this.#imagePreviewAbort?.abort();
         this.#fileReviewAbort?.abort();
         this.#closeFileBrowser();
@@ -2029,11 +2053,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;
     }
@@ -2097,6 +2121,7 @@ export class LocalTui {
     #switchDraft(id) {
         if (id === this.#draftScope)
             return;
+        this.#cancelPaste();
         this.#goalAbort?.abort();
         this.#goalAbort = undefined;
         this.#queueHotkeyAbort?.abort();
@@ -2161,6 +2186,7 @@ export class LocalTui {
                 mathMode: this.#mathMode,
                 mermaidMode: this.#mermaidMode,
                 hideThinking: true,
+                showFileChanges: this.#showFileChanges,
                 height: this.#term.height(),
                 model: this.#model,
                 ...(this.#reasoningEffort === undefined ? {} : { reasoningEffort: this.#reasoningEffort }),
@@ -2286,7 +2312,8 @@ export class LocalTui {
         return Math.max(1, this.#scrollBudget > 2 ? this.#scrollBudget - 2 : 1);
     }
     #scrollBy(delta) {
-        if (this.#follow && delta > 0)
+        this.#workspacePress = undefined;
+        if (this.#follow && (delta > 0 || this.#maxStart === 0))
             return;
         if (delta === 0 && this.#maxStart === 0)
             return;
@@ -2349,6 +2376,7 @@ export class LocalTui {
         enabled = enabled && this.#mouseInteraction !== 'native'
             && (this.#mouseInteraction === 'tui' || this.#tmuxMouseEnabled !== false);
         if (!enabled) {
+            this.#workspacePress = undefined;
             this.#mouseActionPress = undefined;
             this.#selection.clear();
             this.#jumpPress = undefined;
@@ -2486,14 +2514,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]);
@@ -2504,7 +2544,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;
@@ -2532,42 +2575,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();
@@ -2575,29 +2626,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) {
@@ -2689,6 +2728,18 @@ export class LocalTui {
             return { row, column: tool.actionColumn, width: tool.key.startsWith('output:') ? 6 : 5, key: tool.key, action: 'tool', block: tool.block };
         return undefined;
     }
+    #fileRegionAt(row) {
+        const document = this.#renderer.documentRowAt(row);
+        const frame = this.#fileActionFrame;
+        const source = frame?.documentRows;
+        const region = document === undefined ? undefined : frame?.transcript?.fileRegions?.find(region => document >= region.start && document < region.end);
+        const expected = document === undefined || source === undefined || source === null ? undefined
+            : frame?.lines[source.frameStart + document - source.documentStart];
+        const actual = this.#renderer.viewport()[row];
+        // Committed native history can differ from the live document after a reflow.
+        return expected !== undefined && actual !== undefined
+            && stripAnsi(sanitizeDisplayLine(expected)).trimEnd() === stripAnsi(actual).trimEnd() ? region : undefined;
+    }
     #handleMouse(event) {
         if (!this.#mouseTracking || this.#paste || this.#pasteInFlight > 0)
             return;
@@ -2765,6 +2816,7 @@ export class LocalTui {
             const target = this.#mouseActionAt(event.row, event.column);
             if (event.action === 'release') {
                 this.#mouseActionPress = undefined;
+                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);
@@ -2795,21 +2847,14 @@ export class LocalTui {
         }
         const inside = (target) => event.row === target.row && event.column >= target.column && event.column < target.column + target.width;
         if (event.button === 'right') {
+            this.#workspacePress = undefined;
             this.#disclosurePress = undefined;
             if (event.action === 'press') {
                 if (this.#selection.active)
                     void this.#copySelection(true);
                 else {
-                    const document = this.#renderer.documentRowAt(event.row);
-                    const frame = this.#fileActionFrame;
-                    const source = frame?.documentRows;
-                    const region = document === undefined ? undefined : frame?.transcript?.fileRegions?.find(region => document >= region.start && document < region.end);
-                    const expected = document === undefined || source === undefined || source === null ? undefined
-                        : frame?.lines[source.frameStart + document - source.documentStart];
-                    const actual = this.#renderer.viewport()[event.row];
-                    // Native-history snapshots may differ from the current document. Do
-                    // not reinterpret their old text as another file after a reflow.
-                    if (region !== undefined && expected !== undefined && actual !== undefined && stripAnsi(sanitizeDisplayLine(expected)).trimEnd() === stripAnsi(actual).trimEnd()) {
+                    const region = this.#fileRegionAt(event.row);
+                    if (region !== undefined) {
                         const block = this.#state.blocks[region.block];
                         const action = block === undefined ? undefined : blockFileAction(block);
                         if (action !== undefined)
@@ -2820,6 +2865,10 @@ export class LocalTui {
             return;
         }
         if (event.action === 'press') {
+            const region = !event.shift && this.#workspaceReview !== undefined ? this.#fileRegionAt(event.row) : undefined;
+            const source = region === undefined ? undefined : this.#state.blocks[region.block];
+            this.#workspacePress = source?.kind === 'workspace' && region !== undefined
+                ? { row: event.row, column: event.column, block: region.block, source, ...(region.file === undefined ? {} : { file: region.file }) } : undefined;
             const disclosure = event.shift ? undefined : this.#disclosureAt(event.row, event.column);
             this.#disclosurePress = disclosure === undefined ? undefined : { target: disclosure, row: event.row, column: event.column };
             const target = this.#jumpToLatest;
@@ -2841,6 +2890,9 @@ export class LocalTui {
             }
         }
         else if (event.action === 'drag') {
+            const pressed = this.#workspacePress;
+            if (pressed !== undefined && (event.shift || event.row !== pressed.row || Math.abs(event.column - pressed.column) > 1))
+                this.#workspacePress = undefined;
             // Motion confined to the empty gutter is click jitter. Once it leaves,
             // selection owns the gesture even if the pointer returns to the arrow.
             if (event.shift || this.#pressedDisclosureAt(event.row, event.column) === undefined) {
@@ -2849,6 +2901,15 @@ export class LocalTui {
             }
         }
         else {
+            const pressed = this.#workspacePress;
+            this.#workspacePress = undefined;
+            const region = pressed === undefined ? undefined : this.#fileRegionAt(event.row);
+            if (!event.shift && pressed !== undefined && event.row === pressed.row && Math.abs(event.column - pressed.column) <= 1
+                && region?.block === pressed.block && region.file === pressed.file && this.#state.blocks[pressed.block] === pressed.source) {
+                this.#selection.clear();
+                this.#openWorkspaceReview(pressed.source, pressed.file);
+                return;
+            }
             const target = this.#pressedDisclosureAt(event.row, event.column);
             this.#disclosurePress = undefined;
             if (!event.shift && target !== undefined) {
@@ -3041,6 +3102,20 @@ export class LocalTui {
                 this.#fileReviewAbort = undefined;
         }
     }
+    #openWorkspaceReview(block, file) {
+        const handler = this.#workspaceReview;
+        const sessionId = this.#inspected?.id ?? this.#sessionId;
+        if (handler === undefined || sessionId === undefined || block.kind !== 'workspace' || !this.#tty || this.#disposed
+            || this.#prompt !== null || this.#fileReviewAbort !== undefined)
+            return;
+        const abort = new AbortController();
+        this.#fileReviewAbort = abort;
+        void handler({ sessionId, turn: block.turn, ...(file === undefined ? {} : { file }), signal: abort.signal })
+            .catch(error => { if (!abort.signal.aborted && !this.#disposed)
+            this.notice(error instanceof Error ? error.message : String(error), { level: 'error' }); })
+            .finally(() => { if (this.#fileReviewAbort === abort)
+            this.#fileReviewAbort = undefined; });
+    }
     #openFileAction(action, initial) {
         if (!this.#tty || this.#disposed || this.#prompt !== null || this.#fileReviewAbort !== undefined)
             return;
@@ -3092,6 +3167,7 @@ export class LocalTui {
         this.#jumpPress = undefined;
         this.#disclosurePress = undefined;
         this.#mouseActionPress = undefined;
+        this.#workspacePress = 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);
@@ -3148,6 +3224,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;
@@ -3158,7 +3236,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')
@@ -3922,6 +4000,7 @@ export class LocalTui {
         const previous = options.persist ? this.prefs() : undefined;
         const version = this.#prefsVersion;
         const previousMotion = this.#motion;
+        this.#workspacePress = undefined;
         this.#uiLanguage = prefs.uiLanguage ?? 'auto';
         if (this.#prompt !== null)
             this.#prompt = { ...this.#prompt, request: localizePrompt(this.#prompt.sourceRequest, resolveUiLanguage(this.#uiLanguage)) };
@@ -3940,6 +4019,7 @@ export class LocalTui {
         this.#mathMode = prefs.mathMode ?? 'auto';
         this.#mermaidMode = prefs.mermaidMode ?? 'auto';
         this.#hideThinking = prefs.hideThinking !== false;
+        this.#showFileChanges = prefs.showFileChanges !== false;
         this.#mouseInteraction = prefs.mouseInteraction ?? 'auto';
         this.#checkUpdates = prefs.checkUpdates ?? true;
         this.#startupChangelog = prefs.startupChangelog ?? 'summary';
@@ -4544,11 +4624,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 {
@@ -4767,6 +4856,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);
@@ -4917,23 +5007,24 @@ 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();
     }
     #settingsActions() {
         const runtimeActions = [
-            { id: 'command:model', behavior: 'Session + Profile · Choose scope in Model', group: 'Models', label: 'Model and reasoning', description: 'Open /model; changes the current selection and saves the default route.', value: [this.#model, this.#reasoningEffort].filter(Boolean).join(' · '), values: [], action: 'model' },
-            { id: 'command:permission', behavior: 'Current session · Applies now', group: 'General', label: 'Current session access', description: 'Changes only this session. Default access controls future sessions.', value: this.#sessionControls?.permission ?? 'Choose', values: [], action: 'permission' },
-            { id: 'command:agent', behavior: 'Current session · Before the first prompt', group: 'Agent presets', label: 'Current session preset', description: 'Choose before the first prompt; does not change the new-session default.', value: this.#sessionControls?.agentPreset === undefined ? 'Choose' : formatAgentPreset(this.#sessionControls.agentPreset), values: [], action: 'agent' },
-            { id: 'command:login', behavior: 'Provider credentials', group: 'Models', label: 'Provider credentials', description: 'Sign in or configure a provider. Does not change the selected model.', value: 'Configure', values: [], action: 'login' },
-            { id: 'command:logout', behavior: 'Provider credentials', group: 'Models', label: 'Sign out', description: 'Remove saved provider credentials; environment credentials remain available.', value: 'Choose provider', values: [], action: 'logout' },
-            { id: 'command:plugins', group: 'Plugins', label: 'Manage plugins', description: 'Inspect installed entries, enable bundles, discover plugins or start Creator.', value: 'Open', values: [], action: 'plugins' },
+            { id: 'command:model', behavior: 'Session + Profile · Choose scope in Model', group: 'Models', subgroup: 'Model selection', label: 'Model and reasoning', description: 'Choose the current model and reasoning effort. Save as the default or use for this session.', value: [this.#model, this.#reasoningEffort].filter(Boolean).join(' · '), values: [], action: 'model' },
+            { id: 'command:permission', behavior: 'Current session · Applies now', group: 'General', subgroup: 'Session controls', label: 'Current session access', description: 'Changes only this session. Default access controls future sessions.', value: this.#sessionControls?.permission ?? 'Choose', values: [], action: 'permission' },
+            { id: 'command:agent', behavior: 'Current session · Before the first prompt', group: 'Agent presets', subgroup: 'Current session', label: 'Current session preset', description: 'Choose before the first prompt; does not change the new-session default.', value: this.#sessionControls?.agentPreset === undefined ? 'Choose' : formatAgentPreset(this.#sessionControls.agentPreset), values: [], action: 'agent' },
+            { id: 'command:login', behavior: 'Accounts and API keys', group: 'Models', subgroup: 'Accounts and API keys', label: 'Sign in / add API key', description: 'Sign in to a provider account or save an API key.', keywords: ['Provider credentials', 'login', 'API key', 'OAuth'], value: 'Choose provider', values: [], action: 'login' },
+            { id: 'command:logout', behavior: 'Accounts and API keys', group: 'Models', subgroup: 'Accounts and API keys', label: 'Sign out / remove key', description: 'Choose a provider or account to sign out or remove locally saved credentials.', keywords: ['logout', 'credentials'], value: 'Choose provider', values: [], action: 'logout' },
+            { id: 'command:plugins', group: 'Plugins', subgroup: 'Plugin management', label: 'Manage plugins', description: 'Inspect installed entries, enable bundles, discover plugins or start Creator.', value: 'Open', values: [], action: 'plugins' },
         ].filter(item => this.#runtimeCommands.some(command => command.name === item.action));
         const customBindings = Object.entries(this.#keybindings).filter(([key, action]) => DEFAULT_KEYBINDINGS[key] !== action).length;
         return [
             ...runtimeActions,
-            ...(this.#goalHandler === undefined ? [] : [{ id: 'action:goal', behavior: 'Current session · Applies now', group: 'General', label: 'Current goal', description: 'Edit, pause, resume or clear this session’s goal.', value: 'Open', values: [], action: 'manage-goal' }]),
+            ...(this.#goalHandler === undefined ? [] : [{ id: 'action:goal', behavior: 'Current session · Applies now', group: 'General', subgroup: 'Session controls', label: 'Current goal', description: 'Edit, pause, resume or clear this session’s goal.', value: 'Open', values: [], action: 'manage-goal' }]),
             ...(this.#keybindingsPath === undefined ? [] : [{
                     id: 'action:keybindings',
                     label: 'Keybindings',
@@ -5329,7 +5420,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.
@@ -5345,7 +5436,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();
             });
         }
@@ -5852,6 +5944,7 @@ export class LocalTui {
             toolsExpanded: this.#toolsExpanded,
             expandedOutputs: this.#expandedOutputs,
             hideThinking: true,
+            showFileChanges: this.#showFileChanges,
             expandedTools: this.#detailedToolIds(),
             expandedReasoning: this.#visibleReasoning(),
             ...(this.#openedGroups === undefined ? {} : { openedGroups: this.#openedGroups }),
@@ -5962,6 +6055,7 @@ export function apply(ctx, config) {
             motion: config.motion.get(),
             mathMode: config.mathMode.get(),
             mermaidMode: config.mermaidMode.get(),
+            showFileChanges: config.showFileChanges.get(),
             editor: config.editor.get(),
             terminalTitle: config.terminalTitle.get(),
             terminalState: config.terminalState.get(),