@ashx-j/lunr-dev 0.2.13-dev.3.1 → 0.2.13-dev.4.1

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

@@ -200,6 +200,11 @@ function formatLoginProviderCompletionDescription(provider) {
     const authTypes = provider.authTypes.map(formatAuthSelectorProviderType).join("/");
     return provider.name === provider.id ? authTypes : `${provider.name} · ${authTypes}`;
 }
+export async function startInteractiveToolInstalls(currentFdPath, onFdInstalled, installer = ensureTool) {
+    const [fdPath] = await Promise.all([installer("fd", true), installer("rg", true)]);
+    if (fdPath && fdPath !== currentFdPath)
+        onFdInstalled(fdPath);
+}
 export class InteractiveMode {
     runtimeHost;
     ui;
@@ -555,11 +560,9 @@ export class InteractiveMode {
         this.fdPath = getToolPath("fd") ?? undefined;
         const toolMaintenance = startupBenchmark
             ? Promise.resolve()
-            : Promise.all([ensureTool("fd"), ensureTool("rg")]).then(([fdPath]) => {
-                if (fdPath && fdPath !== this.fdPath) {
-                    this.fdPath = fdPath;
-                    this.setupAutocompleteProvider();
-                }
+            : startInteractiveToolInstalls(this.fdPath, (fdPath) => {
+                this.fdPath = fdPath;
+                this.setupAutocompleteProvider();
             });
         time("ensureTools");
         if (this.session.scopedModels.length > 0 && (this.options.verbose || !this.settingsManager.getQuietStartup())) {
@@ -2024,9 +2027,6 @@ export class InteractiveMode {
                 if (!customEditor.onCtrlD) {
                     customEditor.onCtrlD = () => this.defaultEditor.onCtrlD?.();
                 }
-                if (!customEditor.onPasteImage) {
-                    customEditor.onPasteImage = () => this.defaultEditor.onPasteImage?.();
-                }
                 if (!customEditor.onExtensionShortcut) {
                     customEditor.onExtensionShortcut = (data) => this.defaultEditor.onExtensionShortcut?.(data);
                 }
@@ -2208,6 +2208,7 @@ export class InteractiveMode {
         // lunr: tool/thinking expand is per-item click; ctrl+o is not bound (tree filter still uses ctrl+o).
         this.defaultEditor.onAction("app.thinking.toggle", () => this.toggleThinkingBlockVisibility());
         this.defaultEditor.onAction("app.editor.external", () => this.openExternalEditor());
+        this.defaultEditor.onAction("app.clipboard.pasteImage", () => void this.handleClipboardPaste());
         this.defaultEditor.onAction("app.message.copy", () => void this.handleCopyCommand());
         this.defaultEditor.onAction("app.message.followUp", () => this.handleFollowUp());
         this.defaultEditor.onAction("app.message.dequeue", () => this.handleDequeue());
@@ -2222,12 +2223,6 @@ export class InteractiveMode {
                 this.updateEditorBorderColor();
             }
         };
-        // Handle clipboard paste (keybinding: app.clipboard.pasteImage, Alt+V on Windows —
-        // 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();
-        };
         this.ui.addInputListener((data) => {
             if (!this.ui.isPinned())
                 return;
@@ -2349,7 +2344,7 @@ export class InteractiveMode {
     restoreEditorFromTreeResult(result) {
         this.restoreEditorDraft(result.editorText ?? "", result.editorImages);
     }
-    async handleClipboardPaste() {
+    async handleClipboardPaste(options = {}) {
         try {
             const image = await readClipboardImage();
             if (image) {
@@ -2359,13 +2354,15 @@ export class InteractiveMode {
                 this.showStatus(`Pasted ${formatImageMarker(id)}`);
                 return;
             }
-            const text = await readClipboardText();
-            if (text) {
-                this.editor.insertTextAtCursor?.(text);
-                this.ui.requestRender();
-                return;
+            if (options.textFallback !== false) {
+                const text = await readClipboardText();
+                if (text) {
+                    this.editor.insertTextAtCursor?.(text);
+                    this.ui.requestRender();
+                    return;
+                }
             }
-            this.showStatus("Clipboard contains no image or text");
+            this.showStatus(options.textFallback === false ? "Clipboard contains no image" : "Clipboard contains no image or text");
         }
         catch (err) {
             this.showStatus(`Clipboard paste failed: ${err instanceof Error ? err.message : String(err)}`);
@@ -2382,6 +2379,11 @@ export class InteractiveMode {
             this.activateDeferredStartupEditor();
             this.ui.setChatScroll(0);
             // Handle commands
+            if (text === "/paste-image") {
+                this.editor.setText("");
+                await this.handleClipboardPaste({ textFallback: false });
+                return;
+            }
             if (text === "/settings") {
                 void this.showSettingsSelector();
                 this.editor.setText("");
@@ -2801,7 +2803,7 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
-                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.settingsManager.getGutterRail(), this.thinkingCollapse);
+                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.thinkingCollapse);
                     // lunr: collapsible reasoning — fresh timing array for this message.
                     this.thinkingRunTimings = [];
                     this.streamingComponent.setThinkingTimings(this.thinkingRunTimings);
@@ -3149,12 +3151,12 @@ export class InteractiveMode {
                         // Render user message separately if present
                         if (skillBlock.userMessage) {
                             this.chatContainer.addChild(new Spacer(1));
-                            const userComponent = new UserMessageComponent(skillBlock.userMessage, this.getMarkdownThemeWithSettings(), this.outputPad, this.settingsManager.getGutterRail());
+                            const userComponent = new UserMessageComponent(skillBlock.userMessage, this.getMarkdownThemeWithSettings(), this.outputPad);
                             this.chatContainer.addChild(userComponent);
                         }
                     }
                     else {
-                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), this.outputPad, this.settingsManager.getGutterRail());
+                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), this.outputPad);
                         this.chatContainer.addChild(userComponent);
                     }
                     if (options?.populateHistory) {
@@ -3164,7 +3166,7 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.settingsManager.getGutterRail(), this.thinkingCollapse);
+                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.thinkingCollapse);
                 // lunr: collapsible reasoning — re-attach live timings when this
                 // message was streamed in this session (undefined = history).
                 assistantComponent.setThinkingTimings(this.thinkingTimingsByMessage.get(message));
@@ -3993,8 +3995,6 @@ export class InteractiveMode {
                 memoryCharCap: this.settingsManager.getMemoryCharCap(),
                 searchCurator: getSearchCuratorSetting(),
                 // lunr: TUI customize settings
-                gutterRail: this.settingsManager.getGutterRail(),
-                promptSymbol: this.settingsManager.getPromptSymbol(),
                 footerMcp: this.settingsManager.getFooterMcp(),
                 footerLsp: this.settingsManager.getFooterLsp(),
                 footerContext: this.settingsManager.getFooterContext(),
@@ -4196,12 +4196,6 @@ export class InteractiveMode {
                     }
                 },
                 // lunr: TUI customize callbacks
-                onGutterRailChange: (enabled) => {
-                    this.settingsManager.setGutterRail(enabled);
-                },
-                onPromptSymbolChange: (enabled) => {
-                    this.settingsManager.setPromptSymbol(enabled);
-                },
                 onFooterMcpChange: (enabled) => {
                     this.settingsManager.setFooterMcp(enabled);
                 },
@@ -6464,7 +6458,7 @@ export class InteractiveMode {
     // the result text the model sees. Esc/close counts as Decline.
     showPlanInChat(summary) {
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new PlanMessageComponent(summary, this.getMarkdownThemeWithSettings(), this.outputPad, this.settingsManager.getGutterRail()));
+        this.chatContainer.addChild(new PlanMessageComponent(summary, this.getMarkdownThemeWithSettings(), this.outputPad));
         this.ui.requestRender();
     }
     async showPlanApprovalDialog(summary) {
@@ -6678,6 +6672,7 @@ ${cycleThinkingLevel ? `| \`${cycleThinkingLevel}\` | Cycle thinking level |\n`
 | \`${followUp}\` | Queue follow-up message |
 | \`${dequeue}\` | Restore queued messages |
 | \`${pasteImage}\` | Paste image or text from clipboard |
+| \`/paste-image\` | Paste image without a terminal shortcut |
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |
 | \`!!\` | Run bash command (excluded from context) |