@ashx-j/lunr 0.2.8 → 0.2.10

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

@@ -6,12 +6,14 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, isFocusable, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@ashx-j/lunr-tui";
+import { getSupportedThinkingLevels, } from "@ashx-j/lunr-ai/compat";
+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";
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
+import { applyBehaviorPreset, reconcileBehaviorPreset } from "../../core/behavior-preset.js";
 import { CACHE_TTL_MS, collectCacheMisses, computeCacheWaste, detectCacheMiss, } from "../../core/cache-stats.js";
 import { formatCatalogRefreshSummary } from "../../core/catalog-merge.js";
 import { computeContextBreakdown } from "../../core/context-breakdown.js";
@@ -26,6 +28,8 @@ import { isValidProviderBaseUrl, parseModelIds, slugifyProviderId, upsertCustomP
 import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
 import { refreshModelCandidatesForInit } from "../../core/model-runtime.js";
 import { getModelTiersBridge } from "../../core/model-tiers.js";
+import { checkForUpdate, markUpdateNotified } from "../../core/update-check.js";
+import { getUsageServiceBridge } from "../../core/usage-service.js";
 import { registerPermissionModeBridge } from "../../core/permission-mode.js";
 import { nextModeForGoal, registerPermissionModeControlBridge } from "../../core/permission-mode-control.js";
 import { AUTO_MODE_ADDENDUM, getPermissionMode, nextPermissionMode, registerApprovalHandler, resetPermissions, restorePermissionModeAfterPlan, setPermissionMode, } from "../../core/permissions.js";
@@ -45,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";
@@ -232,6 +237,8 @@ export class InteractiveMode {
     isInitialized = false;
     onInputCallback;
     pendingUserInputs = [];
+    stagedSubmitImages;
+    fallbackImageAttachments = new Map();
     activeStatusIndicator = undefined;
     idleStatus = new IdleStatus();
     workingMessage = undefined;
@@ -589,6 +596,8 @@ export class InteractiveMode {
         this.ui.start();
         this.isInitialized = true;
         time("ui.start");
+        void this.maybeNotifyCliUpdate();
+        this.startPlanUsagePolling();
         // lunr: register the permission approval dialog handler so manual mode can prompt.
         registerApprovalHandler(async (req) => {
             // lunr: auto-activated agent swarms get their own dialog; on approval the
@@ -599,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;
             }
@@ -665,6 +674,38 @@ export class InteractiveMode {
             await this.deferredBuiltinAttachPromise;
         }
     }
+    planUsageTimer;
+    startPlanUsagePolling() {
+        const bridge = getUsageServiceBridge();
+        if (!bridge)
+            return;
+        bridge.setOnUpdate(() => this.ui.requestRender());
+        const tick = () => {
+            const provider = this.session.model?.provider;
+            if (provider)
+                bridge.prefetch(provider);
+        };
+        tick();
+        this.planUsageTimer = setInterval(tick, 60_000);
+        this.planUsageTimer.unref?.();
+    }
+    /** Background npm version check. Never blocks first paint. Workspace installs skip. */
+    async maybeNotifyCliUpdate() {
+        try {
+            const result = await checkForUpdate({
+                currentVersion: VERSION,
+                agentDir: getAgentDir(),
+                offline: process.env.PI_OFFLINE === "1",
+            });
+            if (!result?.notice)
+                return;
+            this.showStatus(result.notice);
+            markUpdateNotified(getAgentDir(), result.latest);
+        }
+        catch {
+            // Version check is best-effort.
+        }
+    }
     /**
      * Update terminal title with session name and cwd.
      */
@@ -730,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";
@@ -1304,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 });
@@ -2117,7 +2158,7 @@ export class InteractiveMode {
         // Global debug handler on TUI (works regardless of focus)
         this.ui.onDebug = () => this.handleDebugCommand();
         this.defaultEditor.onAction("app.model.select", () => void this.showModelSelector());
-        this.defaultEditor.onAction("app.tools.expand", () => this.toggleToolOutputExpansion());
+        // 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.message.copy", () => void this.handleCopyCommand());
@@ -2135,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();
         };
@@ -2171,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();
@@ -2200,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") {
@@ -2422,7 +2552,7 @@ export class InteractiveMode {
                     await this.promptAfterDeferredBuiltins(text);
                 }
                 else {
-                    this.queueCompactionMessage(text, "steer");
+                    this.queueCompactionMessage(text, "steer", images);
                 }
                 return;
             }
@@ -2431,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;
@@ -2440,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);
         };
@@ -3156,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);
             };
         });
     }
@@ -3194,6 +3324,11 @@ export class InteractiveMode {
             return;
         this.isShuttingDown = true;
         this.stopSmoothStreaming();
+        if (this.planUsageTimer) {
+            clearInterval(this.planUsageTimer);
+            this.planUsageTimer = undefined;
+        }
+        getUsageServiceBridge()?.setOnUpdate(undefined);
         // Keep signal handlers registered until terminal cleanup has completed.
         // `signal-exit` checks the listener list during the same SIGTERM/SIGHUP
         // dispatch and re-sends the signal if only its own listeners remain.
@@ -3386,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);
         }
@@ -3652,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();
@@ -3688,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();
@@ -3714,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
@@ -3723,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();
@@ -3801,6 +3942,7 @@ export class InteractiveMode {
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
                 modelTiers: this.settingsManager.getModelTiers(),
                 memoryCharCap: this.settingsManager.getMemoryCharCap(),
+                behaviorPreset: reconcileBehaviorPreset(this.settingsManager),
                 searchCurator: getSearchCuratorSetting(),
                 // lunr: TUI customize settings
                 gutterRail: this.settingsManager.getGutterRail(),
@@ -3809,7 +3951,12 @@ 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(),
+                footerPlanBar: this.settingsManager.getFooterPlanBar(),
+                planUsageWindow: this.settingsManager.getPlanUsageWindow(),
                 defaultPermissionMode: this.settingsManager.getDefaultPermissionMode(),
                 rollbackEnabled: this.settingsManager.getRollbackEnabled(),
                 rollbackTurns: this.settingsManager.getRollbackTurns(),
@@ -3973,9 +4120,28 @@ export class InteractiveMode {
                 onModelTierModelChange: (tier, model) => {
                     this.settingsManager.setTierModel(tier, model);
                 },
+                onModelTierThinkingChange: (tier, level) => {
+                    this.settingsManager.setTierThinking(tier, level);
+                },
+                getTierThinkingLevels: (tier) => {
+                    const model = this.resolveModelReference(this.settingsManager.getTierModel(tier));
+                    if (model)
+                        return getSupportedThinkingLevels(model);
+                    return this.session.getAvailableThinkingLevels();
+                },
                 onMemoryCharCapChange: (cap) => {
                     this.settingsManager.setMemoryCharCap(cap);
                 },
+                onBehaviorPresetChange: (preset) => {
+                    const result = applyBehaviorPreset(this.settingsManager, preset, getAgentDir(), {
+                        overwrite: true,
+                    });
+                    if (result.ok) {
+                        this.showStatus(preset === "custom"
+                            ? "Behavior preset: custom (file is source of truth)"
+                            : `Behavior preset: ${preset}`);
+                    }
+                },
                 onSearchCuratorChange: (setting) => {
                     if (!setSearchCuratorSetting(setting)) {
                         this.showError("pi-web-access is not loaded; curator setting unavailable.");
@@ -4000,9 +4166,24 @@ export class InteractiveMode {
                 onFooterTokensChange: (enabled) => {
                     this.settingsManager.setFooterTokens(enabled);
                 },
+                onFooterTpsChange: (enabled) => {
+                    this.settingsManager.setFooterTps(enabled);
+                },
                 onFooterStatusesChange: (enabled) => {
                     this.settingsManager.setFooterStatuses(enabled);
                 },
+                onFooterGitChange: (enabled) => {
+                    this.settingsManager.setFooterGit(enabled);
+                },
+                onFooterPlanChange: (enabled) => {
+                    this.settingsManager.setFooterPlan(enabled);
+                },
+                onFooterPlanBarChange: (enabled) => {
+                    this.settingsManager.setFooterPlanBar(enabled);
+                },
+                onPlanUsageWindowChange: (window) => {
+                    this.settingsManager.setPlanUsageWindow(window);
+                },
                 onDefaultPermissionModeChange: (mode) => {
                     this.settingsManager.setDefaultPermissionMode(mode);
                 },
@@ -4606,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 });
@@ -5425,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) {
@@ -5523,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));
@@ -5540,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() {
@@ -5563,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 });
@@ -6419,7 +6603,7 @@ export class InteractiveMode {
         const cyclePermissionMode = this.getAppKeyDisplay("app.mode.cycle");
         const cycleModelForward = this.getAppKeyDisplay("app.model.cycleForward");
         const selectModel = this.getAppKeyDisplay("app.model.select");
-        const expandTools = this.getAppKeyDisplay("app.tools.expand");
+        const expandTools = "click";
         const toggleThinking = this.getAppKeyDisplay("app.thinking.toggle");
         const externalEditor = this.getAppKeyDisplay("app.editor.external");
         const cycleModelBackward = this.getAppKeyDisplay("app.model.cycleBackward");
@@ -6464,7 +6648,7 @@ export class InteractiveMode {
 | \`${cyclePermissionMode}\` | Cycle permission mode |
 ${cycleThinkingLevel ? `| \`${cycleThinkingLevel}\` | Cycle thinking level |\n` : ""}| \`${cycleModelForward}\` / \`${cycleModelBackward}\` | Cycle models |
 | \`${selectModel}\` | Open model selector |
-| \`${expandTools}\` | Toggle tool output expansion |
+| \`${expandTools}\` | Expand or collapse a thinking/tool card |
 | \`${toggleThinking}\` | Toggle thinking block visibility |
 | \`${externalEditor}\` | Edit message in external editor |
 | \`${copyMessage}\` | Copy last assistant message |