@ashx-j/lunr 0.2.9 → 0.2.11

package/dist/modes/interactive/interactive-mode.js

@@ -7,7 +7,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { getSupportedThinkingLevels, } from "@ashx-j/lunr-ai/compat";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, isFocusable, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@ashx-j/lunr-tui";
+import { collectImageMarkerIds, CombinedAutocompleteProvider, Container, formatImageMarker, fuzzyFilter, isFocusable, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@ashx-j/lunr-tui";
 import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, APP_TITLE, appendDebugLog, CONFIG_DIR_NAME, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
@@ -49,6 +49,7 @@ import { modelToUserEntry } from "../../core/user-models.js";
 import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
+import { processImage } from "../../utils/image-process.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
 import { ensureTool, getToolPath } from "../../utils/tools-manager.js";
@@ -236,6 +237,8 @@ export class InteractiveMode {
     isInitialized = false;
     onInputCallback;
     pendingUserInputs = [];
+    stagedSubmitImages;
+    fallbackImageAttachments = new Map();
     activeStatusIndicator = undefined;
     idleStatus = new IdleStatus();
     workingMessage = undefined;
@@ -605,7 +608,7 @@ export class InteractiveMode {
                 const decision = typeof resp === "string" ? resp : resp.decision;
                 if (decision !== "reject") {
                     this.swarmMode = true;
-                    this.setExtensionStatus("swarm", "swarm ● active");
+                    this.setExtensionStatus("swarm", "swarm");
                 }
                 return resp;
             }
@@ -768,7 +771,7 @@ export class InteractiveMode {
         while (true) {
             const userInput = await this.getUserInput();
             try {
-                await this.promptAfterDeferredBuiltins(userInput);
+                await this.promptAfterDeferredBuiltins(userInput.text, { images: userInput.images });
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
@@ -1342,7 +1345,7 @@ export class InteractiveMode {
                     this.chatContainer.clear();
                     this.renderInitialMessages();
                     if (result.editorText && !this.editor.getText().trim()) {
-                        this.editor.setText(result.editorText);
+                        this.restoreEditorFromTreeResult(result);
                     }
                     this.showStatus("Navigated to selected point");
                     void this.flushCompactionQueue({ willRetry: false });
@@ -2173,8 +2176,8 @@ export class InteractiveMode {
             }
         };
         // Handle clipboard paste (keybinding: app.clipboard.pasteImage, Alt+V on Windows —
-        // Ctrl+V is owned by the terminal and never reaches us). Images are attached by path;
-        // otherwise, paste plain text from the system clipboard.
+        // Ctrl+V is owned by the terminal and never reaches us). Images become `[image_n]`
+        // chips; otherwise, paste plain text from the system clipboard.
         this.defaultEditor.onPasteImage = () => {
             void this.handleClipboardPaste();
         };
@@ -2209,18 +2212,104 @@ export class InteractiveMode {
             }
         });
     }
+    writeClipboardImageFile(image) {
+        const ext = extensionForImageMimeType(image.mimeType) ?? "png";
+        const fileName = `pi-clipboard-${crypto.randomUUID()}.${ext}`;
+        const filePath = path.join(os.tmpdir(), fileName);
+        fs.writeFileSync(filePath, Buffer.from(image.bytes));
+        return { path: filePath, mimeType: image.mimeType };
+    }
+    insertImageChip(attachment) {
+        if (this.editor.insertImageMarker) {
+            return this.editor.insertImageMarker(attachment);
+        }
+        const existing = collectImageMarkerIds(this.editor.getText());
+        const used = new Set([...existing, ...this.fallbackImageAttachments.keys()]);
+        let id = 1;
+        while (used.has(id))
+            id++;
+        this.fallbackImageAttachments.set(id, { id, path: attachment.path, mimeType: attachment.mimeType });
+        this.editor.insertTextAtCursor?.(formatImageMarker(id));
+        return id;
+    }
+    takeSubmittedImages(submittedText) {
+        if (this.editor.takePendingImages) {
+            this.fallbackImageAttachments.clear();
+            return this.editor.takePendingImages();
+        }
+        if (this.editor.getPendingImages) {
+            this.fallbackImageAttachments.clear();
+            return this.editor.getPendingImages();
+        }
+        const pending = [];
+        for (const id of collectImageMarkerIds(submittedText ?? this.editor.getText())) {
+            const attachment = this.fallbackImageAttachments.get(id);
+            if (attachment)
+                pending.push(attachment);
+        }
+        this.fallbackImageAttachments.clear();
+        return pending;
+    }
+    consumeStagedSubmitImages() {
+        const staged = this.stagedSubmitImages;
+        this.stagedSubmitImages = undefined;
+        return staged;
+    }
+    async loadImageAttachments(attachments) {
+        if (attachments.length === 0)
+            return undefined;
+        const images = [];
+        const autoResizeImages = this.settingsManager.getImageAutoResize();
+        for (const attachment of attachments) {
+            try {
+                const bytes = fs.readFileSync(attachment.path);
+                const processed = await processImage(bytes, attachment.mimeType, { autoResizeImages });
+                if (!processed.ok) {
+                    this.showStatus(processed.message);
+                    continue;
+                }
+                images.push({
+                    type: "image",
+                    mimeType: processed.mimeType,
+                    data: processed.data,
+                });
+            }
+            catch (err) {
+                this.showStatus(`Could not attach ${formatImageMarker(attachment.id)}: ${err instanceof Error ? err.message : String(err)}`);
+            }
+        }
+        return images.length > 0 ? images : undefined;
+    }
+    restoreEditorDraft(text, images) {
+        this.editor.setText(text);
+        if (!images || images.length === 0)
+            return;
+        const ids = collectImageMarkerIds(text);
+        if (ids.length === 0 || !this.editor.restoreImageMarkers)
+            return;
+        const attachments = [];
+        for (let i = 0; i < Math.min(ids.length, images.length); i++) {
+            const id = ids[i];
+            const image = images[i];
+            const saved = this.writeClipboardImageFile({
+                bytes: Buffer.from(image.data, "base64"),
+                mimeType: image.mimeType,
+            });
+            attachments.push({ id, path: saved.path, mimeType: saved.mimeType });
+        }
+        this.editor.restoreImageMarkers(attachments);
+    }
+    restoreEditorFromTreeResult(result) {
+        this.restoreEditorDraft(result.editorText ?? "", result.editorImages);
+    }
     async handleClipboardPaste() {
         try {
             const image = await readClipboardImage();
             if (image) {
-                const tmpDir = os.tmpdir();
-                const ext = extensionForImageMimeType(image.mimeType) ?? "png";
-                const fileName = `pi-clipboard-${crypto.randomUUID()}.${ext}`;
-                const filePath = path.join(tmpDir, fileName);
-                fs.writeFileSync(filePath, Buffer.from(image.bytes));
-                this.editor.insertTextAtCursor?.(filePath);
+                const saved = this.writeClipboardImageFile(image);
+                const id = this.insertImageChip(saved);
                 this.ui.requestRender();
-                this.showStatus(`Pasted clipboard image → ${fileName}`);
+                this.showStatus(`Pasted ${formatImageMarker(id)}`);
                 return;
             }
             const text = await readClipboardText();
@@ -2238,8 +2327,11 @@ export class InteractiveMode {
     setupEditorSubmitHandler() {
         this.defaultEditor.onSubmit = async (text) => {
             text = text.trim();
-            if (!text)
+            if (!text) {
+                this.takeSubmittedImages(text);
                 return;
+            }
+            const images = this.consumeStagedSubmitImages() ?? (await this.loadImageAttachments(this.takeSubmittedImages(text)));
             this.ui.setChatScroll(0);
             // Handle commands
             if (text === "/settings") {
@@ -2460,7 +2552,7 @@ export class InteractiveMode {
                     await this.promptAfterDeferredBuiltins(text);
                 }
                 else {
-                    this.queueCompactionMessage(text, "steer");
+                    this.queueCompactionMessage(text, "steer", images);
                 }
                 return;
             }
@@ -2469,7 +2561,7 @@ export class InteractiveMode {
             if (this.session.isStreaming) {
                 this.editor.addToHistory?.(text);
                 this.editor.setText("");
-                await this.promptAfterDeferredBuiltins(text, { streamingBehavior: "steer" });
+                await this.promptAfterDeferredBuiltins(text, { streamingBehavior: "steer", images });
                 this.updatePendingMessagesDisplay();
                 this.ui.requestRender();
                 return;
@@ -2478,10 +2570,10 @@ export class InteractiveMode {
             // First, move any pending bash components to chat
             this.flushPendingBashComponents();
             if (this.onInputCallback) {
-                this.onInputCallback(text);
+                this.onInputCallback({ text, images });
             }
             else {
-                this.pendingUserInputs.push(text);
+                this.pendingUserInputs.push({ text, images });
             }
             this.editor.addToHistory?.(text);
         };
@@ -3194,9 +3286,9 @@ export class InteractiveMode {
             return queuedInput;
         }
         return new Promise((resolve) => {
-            this.onInputCallback = (text) => {
+            this.onInputCallback = (input) => {
                 this.onInputCallback = undefined;
-                resolve(text);
+                resolve(input);
             };
         });
     }
@@ -3429,21 +3521,25 @@ export class InteractiveMode {
                 await this.promptAfterDeferredBuiltins(text);
             }
             else {
-                this.queueCompactionMessage(text, "followUp");
+                const images = await this.loadImageAttachments(this.takeSubmittedImages(text));
+                this.queueCompactionMessage(text, "followUp", images);
             }
             return;
         }
         // Alt+Enter queues a follow-up message (waits until agent finishes)
         // This handles extension commands (execute immediately), prompt template expansion, and queueing
         if (this.session.isStreaming) {
+            const images = await this.loadImageAttachments(this.takeSubmittedImages(text));
             this.editor.addToHistory?.(text);
             this.editor.setText("");
-            await this.promptAfterDeferredBuiltins(text, { streamingBehavior: "followUp" });
+            await this.promptAfterDeferredBuiltins(text, { streamingBehavior: "followUp", images });
             this.updatePendingMessagesDisplay();
             this.ui.requestRender();
         }
         // If not streaming, Alt+Enter acts like regular Enter (trigger onSubmit)
         else if (this.editor.onSubmit) {
+            const images = await this.loadImageAttachments(this.takeSubmittedImages(text));
+            this.stagedSubmitImages = images;
             this.editor.setText("");
             this.editor.onSubmit(text);
         }
@@ -3695,8 +3791,8 @@ export class InteractiveMode {
         }
         return allQueued.length;
     }
-    queueCompactionMessage(text, mode) {
-        this.compactionQueuedMessages.push({ text, mode });
+    queueCompactionMessage(text, mode, images) {
+        this.compactionQueuedMessages.push({ text, mode, images });
         this.editor.addToHistory?.(text);
         this.editor.setText("");
         this.updatePendingMessagesDisplay();
@@ -3731,10 +3827,10 @@ export class InteractiveMode {
                         await this.promptAfterDeferredBuiltins(message.text);
                     }
                     else if (message.mode === "followUp") {
-                        await this.session.followUp(message.text);
+                        await this.session.followUp(message.text, message.images);
                     }
                     else {
-                        await this.session.steer(message.text);
+                        await this.session.steer(message.text, message.images);
                     }
                 }
                 this.updatePendingMessagesDisplay();
@@ -3757,7 +3853,9 @@ export class InteractiveMode {
                 await this.promptAfterDeferredBuiltins(message.text);
             }
             // Send first prompt (starts streaming)
-            const promptPromise = this.promptAfterDeferredBuiltins(firstPrompt.text).catch((error) => {
+            const promptPromise = this.promptAfterDeferredBuiltins(firstPrompt.text, {
+                images: firstPrompt.images,
+            }).catch((error) => {
                 restoreQueue(error);
             });
             // Queue remaining messages
@@ -3766,10 +3864,10 @@ export class InteractiveMode {
                     await this.promptAfterDeferredBuiltins(message.text);
                 }
                 else if (message.mode === "followUp") {
-                    await this.session.followUp(message.text);
+                    await this.session.followUp(message.text, message.images);
                 }
                 else {
-                    await this.session.steer(message.text);
+                    await this.session.steer(message.text, message.images);
                 }
             }
             this.updatePendingMessagesDisplay();
@@ -3853,6 +3951,7 @@ export class InteractiveMode {
                 footerLsp: this.settingsManager.getFooterLsp(),
                 footerContext: this.settingsManager.getFooterContext(),
                 footerTokens: this.settingsManager.getFooterTokens(),
+                footerTps: this.settingsManager.getFooterTps(),
                 footerStatuses: this.settingsManager.getFooterStatuses(),
                 footerGit: this.settingsManager.getFooterGit(),
                 footerPlan: this.settingsManager.getFooterPlan(),
@@ -4067,6 +4166,9 @@ export class InteractiveMode {
                 onFooterTokensChange: (enabled) => {
                     this.settingsManager.setFooterTokens(enabled);
                 },
+                onFooterTpsChange: (enabled) => {
+                    this.settingsManager.setFooterTps(enabled);
+                },
                 onFooterStatusesChange: (enabled) => {
                     this.settingsManager.setFooterStatuses(enabled);
                 },
@@ -4685,7 +4787,7 @@ export class InteractiveMode {
                     this.chatContainer.clear();
                     this.renderInitialMessages();
                     if (result.editorText && !this.editor.getText().trim()) {
-                        this.editor.setText(result.editorText);
+                        this.restoreEditorFromTreeResult(result);
                     }
                     this.showStatus("Navigated to selected point");
                     void this.flushCompactionQueue({ willRetry: false });
@@ -5504,7 +5606,7 @@ export class InteractiveMode {
             return;
         }
         this.swarmMode = true;
-        this.setExtensionStatus("swarm", "swarm ● active");
+        this.setExtensionStatus("swarm", "swarm");
         await this.sendUserMessageAfterDeferredBuiltins(buildSwarmPrompt(task));
     }
     async handleResearchCommand(args) {
@@ -5602,7 +5704,7 @@ export class InteractiveMode {
             this.chatContainer.clear();
             this.renderInitialMessages();
             void this.flushCompactionQueue({ willRetry: false });
-            return { editorText: result.editorText };
+            return { editorText: result.editorText, editorImages: result.editorImages };
         }
         catch (error) {
             this.showError(error instanceof Error ? error.message : String(error));
@@ -5619,7 +5721,10 @@ export class InteractiveMode {
         const result = await this.rewindLastTurn("edit");
         if (!result)
             return;
-        this.editor.setText(result.editorText ?? "");
+        this.restoreEditorFromTreeResult({
+            editorText: result.editorText ?? "",
+            editorImages: result.editorImages,
+        });
         this.showStatus("Editing last message. /redo to restore.");
     }
     async handleRedoCommand() {
@@ -5642,7 +5747,7 @@ export class InteractiveMode {
             this.chatContainer.clear();
             this.renderInitialMessages();
             if (result.editorText && !this.editor.getText().trim()) {
-                this.editor.setText(result.editorText);
+                this.restoreEditorFromTreeResult(result);
             }
             this.showStatus("Redone");
             void this.flushCompactionQueue({ willRetry: false });