@codex-infinity/pi-infinity 0.52.4 → 0.60.1

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

@@ -6,15 +6,15 @@ 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 { getOAuthProviders, } from "@mariozechner/pi-ai";
 import { CombinedAutocompleteProvider, Container, fuzzyFilter, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, Text, TruncatedText, TUI, visibleWidth, } from "@mariozechner/pi-tui";
 import { spawn, spawnSync } from "child_process";
-import { APP_NAME, getAuthPath, getDebugLogPath, getShareViewerUrl, getUpdateInstruction, VERSION, } from "../../config.js";
+import { APP_NAME, getAgentDir, getAuthPath, getDebugLogPath, getShareViewerUrl, getUpdateInstruction, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
-import { resolveModelScope } from "../../core/model-resolver.js";
+import { findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
+import { DefaultPackageManager } from "../../core/package-manager.js";
 import { SessionManager } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
@@ -312,13 +312,13 @@ export class InteractiveMode {
         this.ui.setFocus(this.editor);
         this.setupKeyHandlers();
         this.setupEditorSubmitHandler();
+        // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
+        this.ui.start();
+        this.isInitialized = true;
         // Initialize extensions first so resources are shown before messages
         await this.initExtensions();
         // Render initial messages AFTER showing loaded resources
         this.renderInitialMessages();
-        // Start the UI
-        this.ui.start();
-        this.isInitialized = true;
         // Set terminal title
         this.updateTerminalTitle();
         // Subscribe to agent events
@@ -361,6 +361,18 @@ export class InteractiveMode {
                 this.showNewVersionNotification(newVersion);
             }
         });
+        // Start package update check asynchronously
+        this.checkForPackageUpdates().then((updates) => {
+            if (updates.length > 0) {
+                this.showPackageUpdateNotification(updates);
+            }
+        });
+        // Check tmux keyboard setup asynchronously
+        this.checkTmuxKeyboardSetup().then((warning) => {
+            if (warning) {
+                this.showWarning(warning);
+            }
+        });
         // Show startup warnings
         const { migratedProviders, modelFallbackMessage, initialMessage, initialImages, initialMessages } = this.options;
         if (migratedProviders && migratedProviders.length > 0) {
@@ -410,10 +422,12 @@ export class InteractiveMode {
      * Check npm registry for a newer version.
      */
     async checkForNewVersion() {
-        if (process.env.PI_SKIP_VERSION_CHECK)
+        if (process.env.PI_SKIP_VERSION_CHECK || process.env.PI_OFFLINE)
             return undefined;
         try {
-            const response = await fetch("https://registry.npmjs.org/@mariozechner/pi-coding-agent/latest");
+            const response = await fetch("https://registry.npmjs.org/@mariozechner/pi-coding-agent/latest", {
+                signal: AbortSignal.timeout(10000),
+            });
             if (!response.ok)
                 return undefined;
             const data = (await response.json());
@@ -427,6 +441,64 @@ export class InteractiveMode {
             return undefined;
         }
     }
+    async checkForPackageUpdates() {
+        if (process.env.PI_OFFLINE) {
+            return [];
+        }
+        try {
+            const packageManager = new DefaultPackageManager({
+                cwd: process.cwd(),
+                agentDir: getAgentDir(),
+                settingsManager: this.settingsManager,
+            });
+            const updates = await packageManager.checkForAvailableUpdates();
+            return updates.map((update) => update.displayName);
+        }
+        catch {
+            return [];
+        }
+    }
+    async checkTmuxKeyboardSetup() {
+        if (!process.env.TMUX)
+            return undefined;
+        const runTmuxShow = (option) => {
+            return new Promise((resolve) => {
+                const proc = spawn("tmux", ["show", "-gv", option], {
+                    stdio: ["ignore", "pipe", "ignore"],
+                });
+                let stdout = "";
+                const timer = setTimeout(() => {
+                    proc.kill();
+                    resolve(undefined);
+                }, 2000);
+                proc.stdout?.on("data", (data) => {
+                    stdout += data.toString();
+                });
+                proc.on("error", () => {
+                    clearTimeout(timer);
+                    resolve(undefined);
+                });
+                proc.on("close", (code) => {
+                    clearTimeout(timer);
+                    resolve(code === 0 ? stdout.trim() : undefined);
+                });
+            });
+        };
+        const [extendedKeys, extendedKeysFormat] = await Promise.all([
+            runTmuxShow("extended-keys"),
+            runTmuxShow("extended-keys-format"),
+        ]);
+        // If we couldn't query tmux (timeout, sandbox, etc.), don't warn
+        if (extendedKeys === undefined)
+            return undefined;
+        if (extendedKeys !== "on" && extendedKeys !== "always") {
+            return "tmux extended-keys is off. Modified Enter keys may not work. Add `set -g extended-keys on` to ~/.tmux.conf and restart tmux.";
+        }
+        if (extendedKeysFormat === "xterm") {
+            return "tmux extended-keys-format is xterm. Pi works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
+        }
+        return undefined;
+    }
     /**
      * Get changelog entries to display on startup.
      * Only shows new entries since last seen version, skips for resumed sessions.
@@ -540,7 +612,7 @@ export class InteractiveMode {
                 group.paths.push(p);
             }
         }
-        return [groups.user, groups.project, groups.path].filter((group) => group.paths.length > 0 || group.packages.size > 0);
+        return [groups.project, groups.user, groups.path].filter((group) => group.paths.length > 0 || group.packages.size > 0);
     }
     formatScopeGroups(groups, options) {
         const lines = [];
@@ -1115,7 +1187,7 @@ export class InteractiveMode {
             custom: (factory, options) => this.showExtensionCustom(factory, options),
             pasteToEditor: (text) => this.editor.handleInput(`\x1b[200~${text}\x1b[201~`),
             setEditorText: (text) => this.editor.setText(text),
-            getEditorText: () => this.editor.getText(),
+            getEditorText: () => this.editor.getExpandedText?.() ?? this.editor.getText(),
             editor: (title, prefill) => this.showExtensionEditor(title, prefill),
             setEditorComponent: (factory) => this.setCustomEditorComponent(factory),
             get theme() {
@@ -1131,6 +1203,9 @@ export class InteractiveMode {
                 }
                 const result = setTheme(themeOrName, true);
                 if (result.success) {
+                    if (this.settingsManager.getTheme() !== themeOrName) {
+                        this.settingsManager.setTheme(themeOrName);
+                    }
                     this.ui.requestRender();
                 }
                 return result;
@@ -1285,10 +1360,18 @@ export class InteractiveMode {
             // Use duck typing since instanceof fails across jiti module boundaries
             const customEditor = newEditor;
             if ("actionHandlers" in customEditor && customEditor.actionHandlers instanceof Map) {
-                customEditor.onEscape = () => this.defaultEditor.onEscape?.();
-                customEditor.onCtrlD = () => this.defaultEditor.onCtrlD?.();
-                customEditor.onPasteImage = () => this.defaultEditor.onPasteImage?.();
-                customEditor.onExtensionShortcut = (data) => this.defaultEditor.onExtensionShortcut?.(data);
+                if (!customEditor.onEscape) {
+                    customEditor.onEscape = () => this.defaultEditor.onEscape?.();
+                }
+                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);
+                }
                 // Copy action handlers (clear, suspend, model switching, etc.)
                 for (const [action, handler] of this.defaultEditor.actionHandlers) {
                     customEditor.actionHandlers.set(action, handler);
@@ -1720,7 +1803,6 @@ export class InteractiveMode {
                     for (const content of this.streamingMessage.content) {
                         if (content.type === "toolCall") {
                             if (!this.pendingTools.has(content.id)) {
-                                this.chatContainer.addChild(new Text("", 0, 0));
                                 const component = new ToolExecutionComponent(content.name, content.arguments, {
                                     showImages: this.settingsManager.getShowImages(),
                                 }, this.getRegisteredToolDefinition(content.name), this.ui);
@@ -2153,8 +2235,13 @@ export class InteractiveMode {
         await this.shutdown();
     }
     handleCtrlZ() {
+        // Ignore SIGINT while suspended so Ctrl+C in the terminal does not
+        // kill the backgrounded process. The handler is removed on resume.
+        const ignoreSigint = () => { };
+        process.on("SIGINT", ignoreSigint);
         // Set up handler to restore TUI when resumed
         process.once("SIGCONT", () => {
+            process.removeListener("SIGINT", ignoreSigint);
             this.ui.start();
             this.ui.requestRender(true);
         });
@@ -2286,6 +2373,7 @@ export class InteractiveMode {
             // Spawn editor synchronously with inherited stdio for interactive editing
             const result = spawnSync(editor, [...editorArgs, tmpFile], {
                 stdio: "inherit",
+                shell: process.platform === "win32",
             });
             // On successful exit (status 0), replace editor content
             if (result.status === 0) {
@@ -2336,6 +2424,16 @@ export class InteractiveMode {
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
         this.ui.requestRender();
     }
+    showPackageUpdateNotification(packages) {
+        const action = theme.fg("accent", `${APP_NAME} update`);
+        const updateInstruction = theme.fg("muted", "Package updates are available. Run ") + action;
+        const packageLines = packages.map((pkg) => `- ${pkg}`).join("\n");
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
+        this.chatContainer.addChild(new Text(`${theme.bold(theme.fg("warning", "Package Updates Available"))}\n${updateInstruction}\n${theme.fg("muted", "Packages:")}\n${packageLines}`, 1, 0));
+        this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
+        this.ui.requestRender();
+    }
     /**
      * Get all queued messages (read-only).
      * Combines session queue and compaction queue.
@@ -2539,6 +2637,7 @@ export class InteractiveMode {
                 hideThinkingBlock: this.hideThinkingBlock,
                 collapseChangelog: this.settingsManager.getCollapseChangelog(),
                 doubleEscapeAction: this.settingsManager.getDoubleEscapeAction(),
+                treeFilterMode: this.settingsManager.getTreeFilterMode(),
                 showHardwareCursor: this.settingsManager.getShowHardwareCursor(),
                 editorPaddingX: this.settingsManager.getEditorPaddingX(),
                 autocompleteMaxVisible: this.settingsManager.getAutocompleteMaxVisible(),
@@ -2617,6 +2716,9 @@ export class InteractiveMode {
                 onDoubleEscapeActionChange: (action) => {
                     this.settingsManager.setDoubleEscapeAction(action);
                 },
+                onTreeFilterModeChange: (mode) => {
+                    this.settingsManager.setTreeFilterMode(mode);
+                },
                 onShowHardwareCursorChange: (enabled) => {
                     this.settingsManager.setShowHardwareCursor(enabled);
                     this.ui.setShowHardwareCursor(enabled);
@@ -2669,28 +2771,8 @@ export class InteractiveMode {
         this.showModelSelector(searchTerm);
     }
     async findExactModelMatch(searchTerm) {
-        const term = searchTerm.trim();
-        if (!term)
-            return undefined;
-        let targetProvider;
-        let targetModelId = "";
-        if (term.includes("/")) {
-            const parts = term.split("/", 2);
-            targetProvider = parts[0]?.trim().toLowerCase();
-            targetModelId = parts[1]?.trim().toLowerCase() ?? "";
-        }
-        else {
-            targetModelId = term.toLowerCase();
-        }
-        if (!targetModelId)
-            return undefined;
         const models = await this.getModelCandidates();
-        const exactMatches = models.filter((item) => {
-            const idMatch = item.id.toLowerCase() === targetModelId;
-            const providerMatch = !targetProvider || item.provider.toLowerCase() === targetProvider;
-            return idMatch && providerMatch;
-        });
-        return exactMatches.length === 1 ? exactMatches[0] : undefined;
+        return findExactModelReferenceMatch(searchTerm, models);
     }
     async getModelCandidates() {
         if (this.session.scopedModels.length > 0) {
@@ -2770,12 +2852,10 @@ export class InteractiveMode {
         // Helper to update session's scoped models (session-only, no persist)
         const updateSessionModels = async (enabledIds) => {
             if (enabledIds.size > 0 && enabledIds.size < allModels.length) {
-                // Use current session thinking level, not settings default
-                const currentThinkingLevel = this.session.thinkingLevel;
                 const newScopedModels = await resolveModelScope(Array.from(enabledIds), this.session.modelRegistry);
                 this.session.setScopedModels(newScopedModels.map((sm) => ({
                     model: sm.model,
-                    thinkingLevel: sm.thinkingLevel ?? currentThinkingLevel,
+                    thinkingLevel: sm.thinkingLevel,
                 })));
             }
             else {
@@ -2872,6 +2952,7 @@ export class InteractiveMode {
     showTreeSelector(initialSelectedId) {
         const tree = this.sessionManager.getTree();
         const realLeafId = this.sessionManager.getLeafId();
+        const initialFilterMode = this.settingsManager.getTreeFilterMode();
         if (tree.length === 0) {
             this.showStatus("No entries in session");
             return;
@@ -2889,27 +2970,30 @@ export class InteractiveMode {
                 // Loop until user makes a complete choice or cancels to tree
                 let wantsSummary = false;
                 let customInstructions;
-                while (true) {
-                    const summaryChoice = await this.showExtensionSelector("Summarize branch?", [
-                        "No summary",
-                        "Summarize",
-                        "Summarize with custom prompt",
-                    ]);
-                    if (summaryChoice === undefined) {
-                        // User pressed escape - re-show tree selector with same selection
-                        this.showTreeSelector(entryId);
-                        return;
-                    }
-                    wantsSummary = summaryChoice !== "No summary";
-                    if (summaryChoice === "Summarize with custom prompt") {
-                        customInstructions = await this.showExtensionEditor("Custom summarization instructions");
-                        if (customInstructions === undefined) {
-                            // User cancelled - loop back to summary selector
-                            continue;
+                // Check if we should skip the prompt (user preference to always default to no summary)
+                if (!this.settingsManager.getBranchSummarySkipPrompt()) {
+                    while (true) {
+                        const summaryChoice = await this.showExtensionSelector("Summarize branch?", [
+                            "No summary",
+                            "Summarize",
+                            "Summarize with custom prompt",
+                        ]);
+                        if (summaryChoice === undefined) {
+                            // User pressed escape - re-show tree selector with same selection
+                            this.showTreeSelector(entryId);
+                            return;
                         }
+                        wantsSummary = summaryChoice !== "No summary";
+                        if (summaryChoice === "Summarize with custom prompt") {
+                            customInstructions = await this.showExtensionEditor("Custom summarization instructions");
+                            if (customInstructions === undefined) {
+                                // User cancelled - loop back to summary selector
+                                continue;
+                            }
+                        }
+                        // User made a complete choice
+                        break;
                     }
-                    // User made a complete choice
-                    break;
                 }
                 // Set up escape handler and loader if summarizing
                 let summaryLoader;
@@ -2962,7 +3046,7 @@ export class InteractiveMode {
             }, (entryId, label) => {
                 this.sessionManager.appendLabelChange(entryId, label);
                 this.ui.requestRender();
-            }, initialSelectedId);
+            }, initialSelectedId, initialFilterMode);
             return { component: selector, focus: selector };
         });
     }
@@ -3027,7 +3111,9 @@ export class InteractiveMode {
                 }
                 else {
                     // Logout flow
-                    const providerInfo = getOAuthProviders().find((p) => p.id === providerId);
+                    const providerInfo = this.session.modelRegistry.authStorage
+                        .getOAuthProviders()
+                        .find((p) => p.id === providerId);
                     const providerName = providerInfo?.name || providerId;
                     try {
                         this.session.modelRegistry.authStorage.logout(providerId);
@@ -3047,7 +3133,7 @@ export class InteractiveMode {
         });
     }
     async showLoginDialog(providerId) {
-        const providerInfo = getOAuthProviders().find((p) => p.id === providerId);
+        const providerInfo = this.session.modelRegistry.authStorage.getOAuthProviders().find((p) => p.id === providerId);
         const providerName = providerInfo?.name || providerId;
         // Providers that use callback servers (can paste redirect URL)
         const usesCallbackServer = providerInfo?.usesCallbackServer ?? false;
@@ -3137,7 +3223,7 @@ export class InteractiveMode {
             return;
         }
         this.resetExtensionUI();
-        const loader = new BorderedLoader(this.ui, theme, "Reloading extensions, skills, prompts, themes...", {
+        const loader = new BorderedLoader(this.ui, theme, "Reloading keybindings, extensions, skills, prompts, themes...", {
             cancellable: false,
         });
         const previousEditor = this.editor;
@@ -3154,6 +3240,7 @@ export class InteractiveMode {
         };
         try {
             await this.session.reload();
+            this.keybindings.reload();
             setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
             this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
             const themeName = this.settingsManager.getTheme();
@@ -3187,7 +3274,7 @@ export class InteractiveMode {
             if (modelsJsonError) {
                 this.showError(`models.json error: ${modelsJsonError}`);
             }
-            this.showStatus("Reloaded extensions, skills, prompts, themes");
+            this.showStatus("Reloaded keybindings, extensions, skills, prompts, themes");
         }
         catch (error) {
             dismissLoader(previousEditor);
@@ -3402,6 +3489,10 @@ export class InteractiveMode {
     }
     handleHotkeysCommand() {
         // Navigation keybindings
+        const cursorUp = this.getEditorKeyDisplay("cursorUp");
+        const cursorDown = this.getEditorKeyDisplay("cursorDown");
+        const cursorLeft = this.getEditorKeyDisplay("cursorLeft");
+        const cursorRight = this.getEditorKeyDisplay("cursorRight");
         const cursorWordLeft = this.getEditorKeyDisplay("cursorWordLeft");
         const cursorWordRight = this.getEditorKeyDisplay("cursorWordRight");
         const cursorLineStart = this.getEditorKeyDisplay("cursorLineStart");
@@ -3432,13 +3523,15 @@ export class InteractiveMode {
         const expandTools = this.getAppKeyDisplay("expandTools");
         const toggleThinking = this.getAppKeyDisplay("toggleThinking");
         const externalEditor = this.getAppKeyDisplay("externalEditor");
+        const cycleModelBackward = this.getAppKeyDisplay("cycleModelBackward");
         const followUp = this.getAppKeyDisplay("followUp");
         const dequeue = this.getAppKeyDisplay("dequeue");
+        const pasteImage = this.getAppKeyDisplay("pasteImage");
         let hotkeys = `
 **Navigation**
 | Key | Action |
 |-----|--------|
-| \`Arrow keys\` | Move cursor / browse history (Up when empty) |
+| \`${cursorUp}\` / \`${cursorDown}\` / \`${cursorLeft}\` / \`${cursorRight}\` | Move cursor / browse history (Up when empty) |
 | \`${cursorWordLeft}\` / \`${cursorWordRight}\` | Move by word |
 | \`${cursorLineStart}\` | Start of line |
 | \`${cursorLineEnd}\` | End of line |
@@ -3468,14 +3561,14 @@ export class InteractiveMode {
 | \`${exit}\` | Exit (when editor is empty) |
 | \`${suspend}\` | Suspend to background |
 | \`${cycleThinkingLevel}\` | Cycle thinking level |
-| \`${cycleModelForward}\` | Cycle models |
+| \`${cycleModelForward}\` / \`${cycleModelBackward}\` | Cycle models |
 | \`${selectModel}\` | Open model selector |
 | \`${expandTools}\` | Toggle tool output expansion |
 | \`${toggleThinking}\` | Toggle thinking block visibility |
 | \`${externalEditor}\` | Edit message in external editor |
 | \`${followUp}\` | Queue follow-up message |
 | \`${dequeue}\` | Restore queued messages |
-| \`Ctrl+V\` | Paste image from clipboard |
+| \`${pasteImage}\` | Paste image from clipboard |
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |
 | \`!!\` | Run bash command (excluded from context) |
@@ -3515,6 +3608,7 @@ export class InteractiveMode {
         // New session via session (emits extension session events)
         await this.session.newSession();
         // Clear UI state
+        this.headerContainer.clear();
         this.chatContainer.clear();
         this.pendingMessagesContainer.clear();
         this.compactionQueuedMessages = [];