@agi-fans/dsh-tui 0.24.0 → 0.24.1

package/lib/runtime/composer-images.js

@@ -7,22 +7,25 @@
  * decoding, and the prompt/settings/search branches that decide whether a
  * paste is an image at all stay in the provider.
  */
-import { imageMarker, probeImageDimensions, submissionDraftText } from "../input/image-paste.js";
+import { imageMarker, probeImageDimensions, submissionDraft } from "../input/image-paste.js";
 export class ComposerImages {
     #deps;
-    #images = [];
+    #images = new Map();
+    #next = 0;
     #revision = 0;
     #validate;
     constructor(deps) {
         this.#deps = deps;
     }
     get count() {
-        return this.#images.length;
+        return this.#active().length;
     }
     get revision() { return this.#revision; }
     /** Fresh copies for a submission snapshot. */
-    copies() {
-        return this.#images.map(image => ({ ...image }));
+    copies(snapshot) {
+        if (snapshot === undefined)
+            this.reconcile();
+        return this.#active(snapshot).map(marker => ({ ...this.#images.get(marker.id) }));
     }
     setValidator(validate) {
         this.#validate = validate;
@@ -32,127 +35,133 @@ export class ComposerImages {
      * becomes an error notice and skips the draft, instead of failing the whole
      * submission after the user has typed a prompt around it.
      */
-    async admit(image) {
+    async admit(image, signal) {
+        if (signal?.aborted === true)
+            return false;
         if (this.#validate === undefined)
             return true;
         try {
             await this.#validate(image);
-            return true;
+            return !signal?.aborted;
         }
         catch (error) {
-            this.#deps.notice(error instanceof Error ? error.message : String(error));
+            if (!signal?.aborted)
+                this.#deps.notice(error instanceof Error ? error.message : String(error));
             return false;
         }
     }
-    /** Insert an `[Image #n]` marker at the cursor, padded with spaces. */
+    #active(snapshot) {
+        return (snapshot === undefined ? this.#deps.editor.markers() : snapshot.markers ?? []).filter(marker => this.#images.has(marker.id));
+    }
+    /** Expanded-text positions of the owned image markers, including their separators. */
+    ranges() {
+        const editor = this.#deps.editor;
+        return this.#active().map((marker, index) => ({ kind: 'image', index,
+            start: editor.textRange(0, marker.start).length, end: editor.textRange(0, marker.end).length }));
+    }
+    /** Insert an image as one undoable owned marker. */
     insert(input) {
-        this.#revision++;
-        const size = input.width === undefined || input.height === undefined
-            ? probeImageDimensions(input.data, input.mediaType)
-            : undefined;
-        const image = {
-            ...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);
+            ...(input.height === undefined && size !== undefined ? { height: size.height } : {}) };
         const editor = this.#deps.editor;
-        const before = editor.cursor > 0 && !/\s/u.test(editor.text[editor.cursor - 1] ?? '') ? ' ' : '';
-        const after = editor.cursor >= editor.text.length || !/\s/u.test(editor.text[editor.cursor] ?? '')
-            ? ' '
-            : '';
-        this.#images.push(image);
-        editor.handle({ type: 'text', value: before + marker + after });
+        const start = editor.cursor;
+        const before = start > 0 && !/\s/u.test(editor.text[start - 1] ?? '') ? ' ' : '';
+        const after = start >= editor.text.length || !/\s/u.test(editor.text[start] ?? '') ? ' ' : '';
+        const text = before + imageMarker(this.count, image) + after;
+        editor.splice(start, start, text);
+        const id = `image:${++this.#next}`;
+        editor.mark(id, start, start + text.length);
+        this.#images.set(id, image);
+        this.#revision++;
+        this.reconcile();
     }
-    /**
-     * Delete the image whose marker touches the cursor, renumbering the rest.
-     * Returns true when a draft was removed; the caller repaints.
-     */
     removeAtCursor(key) {
         const editor = this.#deps.editor;
-        const cursor = editor.cursor;
-        for (let index = 0; index < this.#images.length; index += 1) {
-            const image = this.#images[index];
-            const marker = imageMarker(index, image);
-            const start = 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 (editor.text[to] === ' ')
-                to += 1;
-            else if (from > 0 && editor.text[from - 1] === ' ')
-                from -= 1;
-            const oldImages = this.#images;
-            let text = editor.text.slice(0, from) + 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;
+        const marker = this.#active().find(marker => key === 'backspace'
+            ? editor.cursor > marker.start && editor.cursor <= marker.end
+            : editor.cursor >= marker.start && editor.cursor < marker.end);
+        if (marker === undefined)
+            return false;
+        editor.splice(marker.start, marker.end, '');
+        this.reconcile();
+        return true;
+    }
+    /** Keep payloads referenced by current text or undo history, and relabel active images. */
+    reconcile() {
+        const editor = this.#deps.editor;
+        const retained = editor.retainedMarkerIds();
+        for (const id of this.#images.keys()) {
+            if (!retained.has(id)) {
+                this.#images.delete(id);
+                this.#revision++;
             }
-            this.#images = nextImages;
-            this.#revision++;
-            editor.replaceText(text, Math.min(from, text.length));
-            return true;
         }
-        return false;
+        for (const [index, { id }] of this.#active().entries()) {
+            const marker = editor.markers().find(marker => marker.id === id);
+            const current = editor.text.slice(marker.start, marker.end);
+            const text = (current.match(/^\s*/u)?.[0] ?? '') + imageMarker(index, this.#images.get(marker.id)) + (current.match(/\s*$/u)?.[0] ?? '');
+            if (text !== current)
+                editor.rewriteMarker(marker.id, text);
+        }
     }
-    /** Drop drafts whose marker left the text, renumbering the survivors. */
-    reconcile() {
-        if (this.#images.length === 0)
-            return;
+    /** Bind persisted payloads to the editor's saved marker identities. */
+    restoreSnapshot(images) {
+        this.#images.clear();
         const editor = this.#deps.editor;
-        const oldImages = this.#images;
-        const retained = oldImages.filter((image, index) => editor.text.includes(imageMarker(index, image)));
-        if (retained.length === oldImages.length)
-            return;
-        let text = 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;
+        let markers = editor.markers().filter(marker => marker.id.startsWith('image:'));
+        if (markers.length === 0) {
+            // Drafts saved before marker ranges were recorded retain their old labels.
+            let cursor = 0;
+            for (const [index, image] of images.entries()) {
+                const label = imageMarker(index, image);
+                const start = editor.text.indexOf(label, cursor);
+                if (start < 0)
+                    continue;
+                cursor = start + label.length;
+                editor.mark(`image:${++this.#next}`, start, cursor);
+            }
+            markers = editor.markers().filter(marker => marker.id.startsWith('image:'));
+        }
+        for (const [index, marker] of markers.entries()) {
+            this.#next = Math.max(this.#next, Number(marker.id.slice('image:'.length)) || 0);
+            if (images[index] !== undefined)
+                this.#images.set(marker.id, { ...images[index] });
         }
-        this.#images = retained;
         this.#revision++;
-        editor.replaceText(text, Math.min(editor.cursor, text.length));
     }
-    /** Prepend a queued submission's drafts, rebasing the current markers. */
+    /** Prepend restored input with an exact edit so repeated paste labels keep their payloads. */
     restore(submission, fileMarkers) {
-        this.#revision++;
         const editor = this.#deps.editor;
-        const currentImages = this.#images;
-        let rebasedCurrent = editor.text;
-        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 draft = submissionDraft(submission, fileMarkers);
+        const separator = draft.text !== '' && editor.text !== '' ? '\n' : '';
+        editor.splice(0, 0, draft.text + separator, draft.text.length + separator.length + editor.text.length);
+        const last = draft.ranges.at(-1);
+        if (submission.text === '' && last?.kind === 'image' && last.end === draft.text.length)
+            last.end += separator.length;
+        for (const range of draft.ranges) {
+            if (range.kind !== 'image')
+                continue;
+            const id = `image:${++this.#next}`;
+            editor.mark(id, range.start, range.end);
+            this.#images.set(id, { ...submission.images[range.index] });
         }
-        const restored = submissionDraftText(submission, fileMarkers);
-        const separator = restored !== '' && rebasedCurrent !== '' ? '\n' : '';
-        this.#images = [...submission.images.map(image => ({ ...image })), ...currentImages];
-        editor.replaceText(restored + separator + rebasedCurrent);
+        this.#revision++;
+        this.reconcile();
     }
-    /** Replace drafts and text with a queued/edited submission. */
     replace(submission, fileMarkers) {
-        this.#revision++;
-        this.#images = submission.images.map(image => ({ ...image }));
-        this.#deps.editor.setText(submissionDraftText(submission, fileMarkers));
+        const draft = submissionDraft(submission, fileMarkers);
+        this.#deps.editor.setText(draft.text);
+        for (const range of draft.ranges) {
+            if (range.kind === 'image')
+                this.#deps.editor.mark(`image:${++this.#next}`, range.start, range.end);
+        }
+        this.restoreSnapshot(submission.images);
     }
     clear() {
         this.#revision++;
-        this.#images = [];
+        this.#images.clear();
     }
 }
 //# sourceMappingURL=composer-images.js.map

package/lib/runtime/composer-images.js.map

@@ -1 +1 @@
-{"version":3,"file":"composer-images.js","sourceRoot":"","sources":["../../src/runtime/composer-images.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"composer-images.js","sourceRoot":"","sources":["../../src/runtime/composer-images.ts"],"names":[],"mappings":"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"}

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,
@@ -889,6 +890,7 @@ export class LocalTui {
             this.#render();
     }
     async reviewFiles(request) {
+        this.#cancelPaste();
         if (!this.#tty || this.#disposed || request.signal.aborted)
             return;
         this.#workspacePress = undefined;
@@ -1244,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) {
@@ -1607,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 ?? []));
@@ -1842,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();
@@ -2049,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;
     }
@@ -2117,6 +2121,7 @@ export class LocalTui {
     #switchDraft(id) {
         if (id === this.#draftScope)
             return;
+        this.#cancelPaste();
         this.#goalAbort?.abort();
         this.#goalAbort = undefined;
         this.#queueHotkeyAbort?.abort();
@@ -2509,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]);
@@ -2527,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;
@@ -2555,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();
@@ -2598,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) {
@@ -3208,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;
@@ -3218,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')
@@ -4606,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 {
@@ -4829,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);
@@ -4979,6 +5007,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();
@@ -5391,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.
@@ -5407,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();
             });
         }