@mariozechner/pi-coding-agent 0.38.0 → 0.39.1

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

@@ -9,11 +9,10 @@ import * as path from "node:path";
 import { getOAuthProviders, } from "@mariozechner/pi-ai";
 import { CombinedAutocompleteProvider, Container, getEditorKeybindings, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, Text, TruncatedText, TUI, visibleWidth, } from "@mariozechner/pi-tui";
 import { spawn, spawnSync } from "child_process";
-import { APP_NAME, getAuthPath, getDebugLogPath, VERSION } from "../../config.js";
+import { APP_NAME, getAuthPath, getDebugLogPath, isBunBinary, VERSION } from "../../config.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { SessionManager } from "../../core/session-manager.js";
-import { loadSkills } from "../../core/skills.js";
 import { loadProjectContextFiles } from "../../core/system-prompt.js";
 import { allTools } from "../../core/tools/index.js";
 import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
@@ -42,7 +41,7 @@ import { ToolExecutionComponent } from "./components/tool-execution.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
-import { getAvailableThemes, getEditorTheme, getMarkdownTheme, onThemeChange, setTheme, theme, } from "./theme/theme.js";
+import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setTheme, setThemeInstance, Theme, theme, } from "./theme/theme.js";
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
@@ -137,6 +136,8 @@ export class InteractiveMode {
         this.footer.setAutoCompactEnabled(session.autoCompactionEnabled);
         // Load hide thinking block setting
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+        // Initialize theme with watcher for interactive mode
+        initTheme(this.settingsManager.getTheme(), true);
     }
     setupAutocomplete(fdPath) {
         // Define commands for autocomplete
@@ -426,23 +427,19 @@ export class InteractiveMode {
             this.chatContainer.addChild(new Text(theme.fg("muted", "Loaded context:\n") + contextList, 0, 0));
             this.chatContainer.addChild(new Spacer(1));
         }
-        // Show loaded skills
-        const skillsSettings = this.session.skillsSettings;
-        if (skillsSettings?.enabled !== false) {
-            const { skills, warnings: skillWarnings } = loadSkills(skillsSettings ?? {});
-            if (skills.length > 0) {
-                const skillList = skills.map((s) => theme.fg("dim", `  ${s.filePath}`)).join("\n");
-                this.chatContainer.addChild(new Text(theme.fg("muted", "Loaded skills:\n") + skillList, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
-            }
-            // Show skill warnings if any
-            if (skillWarnings.length > 0) {
-                const warningList = skillWarnings
-                    .map((w) => theme.fg("warning", `  ${w.skillPath}: ${w.message}`))
-                    .join("\n");
-                this.chatContainer.addChild(new Text(theme.fg("warning", "Skill warnings:\n") + warningList, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
-            }
+        // Show loaded skills (already discovered by SDK)
+        const skills = this.session.skills;
+        if (skills.length > 0) {
+            const skillList = skills.map((s) => theme.fg("dim", `  ${s.filePath}`)).join("\n");
+            this.chatContainer.addChild(new Text(theme.fg("muted", "Loaded skills:\n") + skillList, 0, 0));
+            this.chatContainer.addChild(new Spacer(1));
+        }
+        // Show skill warnings if any
+        const skillWarnings = this.session.skillWarnings;
+        if (skillWarnings.length > 0) {
+            const warningList = skillWarnings.map((w) => theme.fg("warning", `  ${w.skillPath}: ${w.message}`)).join("\n");
+            this.chatContainer.addChild(new Text(theme.fg("warning", "Skill warnings:\n") + warningList, 0, 0));
+            this.chatContainer.addChild(new Spacer(1));
         }
         const extensionRunner = this.session.extensionRunner;
         if (!extensionRunner) {
@@ -746,7 +743,7 @@ export class InteractiveMode {
             setFooter: (factory) => this.setExtensionFooter(factory),
             setHeader: (factory) => this.setExtensionHeader(factory),
             setTitle: (title) => this.ui.terminal.setTitle(title),
-            custom: (factory) => this.showExtensionCustom(factory),
+            custom: (factory, options) => this.showExtensionCustom(factory, options),
             setEditorText: (text) => this.editor.setText(text),
             getEditorText: () => this.editor.getText(),
             editor: (title, prefill) => this.showExtensionEditor(title, prefill),
@@ -754,6 +751,20 @@ export class InteractiveMode {
             get theme() {
                 return theme;
             },
+            getAllThemes: () => getAvailableThemesWithPaths(),
+            getTheme: (name) => getThemeByName(name),
+            setTheme: (themeOrName) => {
+                if (themeOrName instanceof Theme) {
+                    setThemeInstance(themeOrName);
+                    this.ui.requestRender();
+                    return { success: true };
+                }
+                const result = setTheme(themeOrName, true);
+                if (result.success) {
+                    this.ui.requestRender();
+                }
+                return result;
+            },
         };
     }
     /**
@@ -933,28 +944,59 @@ export class InteractiveMode {
             this.showStatus(message);
         }
     }
-    /**
-     * Show a custom component with keyboard focus.
-     */
-    async showExtensionCustom(factory) {
+    /** Show a custom component with keyboard focus. Overlay mode renders on top of existing content. */
+    async showExtensionCustom(factory, options) {
         const savedText = this.editor.getText();
-        return new Promise((resolve) => {
+        const isOverlay = options?.overlay ?? false;
+        const restoreEditor = () => {
+            this.editorContainer.clear();
+            this.editorContainer.addChild(this.editor);
+            this.editor.setText(savedText);
+            this.ui.setFocus(this.editor);
+            this.ui.requestRender();
+        };
+        return new Promise((resolve, reject) => {
             let component;
+            let closed = false;
             const close = (result) => {
-                component.dispose?.();
-                this.editorContainer.clear();
-                this.editorContainer.addChild(this.editor);
-                this.editor.setText(savedText);
-                this.ui.setFocus(this.editor);
-                this.ui.requestRender();
+                if (closed)
+                    return;
+                closed = true;
+                if (isOverlay)
+                    this.ui.hideOverlay();
+                else
+                    restoreEditor();
+                // Note: both branches above already call requestRender
                 resolve(result);
+                try {
+                    component?.dispose?.();
+                }
+                catch {
+                    /* ignore dispose errors */
+                }
             };
-            Promise.resolve(factory(this.ui, theme, this.keybindings, close)).then((c) => {
+            Promise.resolve(factory(this.ui, theme, this.keybindings, close))
+                .then((c) => {
+                if (closed)
+                    return;
                 component = c;
-                this.editorContainer.clear();
-                this.editorContainer.addChild(component);
-                this.ui.setFocus(component);
-                this.ui.requestRender();
+                if (isOverlay) {
+                    const w = component.width;
+                    this.ui.showOverlay(component, w ? { width: w } : undefined);
+                }
+                else {
+                    this.editorContainer.clear();
+                    this.editorContainer.addChild(component);
+                    this.ui.setFocus(component);
+                    this.ui.requestRender();
+                }
+            })
+                .catch((err) => {
+                if (closed)
+                    return;
+                if (!isOverlay)
+                    restoreEditor();
+                reject(err);
             });
         });
     }
@@ -1224,6 +1266,16 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
+                // Restore main escape handler if retry handler is still active
+                // (retry success event fires later, but we need main handler now)
+                if (this.retryEscapeHandler) {
+                    this.defaultEditor.onEscape = this.retryEscapeHandler;
+                    this.retryEscapeHandler = undefined;
+                }
+                if (this.retryLoader) {
+                    this.retryLoader.stop();
+                    this.retryLoader = undefined;
+                }
                 if (this.loadingAnimation) {
                     this.loadingAnimation.stop();
                 }
@@ -1281,11 +1333,20 @@ export class InteractiveMode {
                     break;
                 if (this.streamingComponent && event.message.role === "assistant") {
                     this.streamingMessage = event.message;
+                    let errorMessage;
+                    if (this.streamingMessage.stopReason === "aborted") {
+                        const retryAttempt = this.session.retryAttempt;
+                        errorMessage =
+                            retryAttempt > 0
+                                ? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
+                                : "Operation aborted";
+                        this.streamingMessage.errorMessage = errorMessage;
+                    }
                     this.streamingComponent.updateContent(this.streamingMessage);
                     if (this.streamingMessage.stopReason === "aborted" || this.streamingMessage.stopReason === "error") {
-                        const errorMessage = this.streamingMessage.stopReason === "aborted"
-                            ? "Operation aborted"
-                            : this.streamingMessage.errorMessage || "Error";
+                        if (!errorMessage) {
+                            errorMessage = this.streamingMessage.errorMessage || "Error";
+                        }
                         for (const [, component] of this.pendingTools.entries()) {
                             component.updateResult({
                                 content: [{ type: "text", text: errorMessage }],
@@ -1545,7 +1606,17 @@ export class InteractiveMode {
                         component.setExpanded(this.toolOutputExpanded);
                         this.chatContainer.addChild(component);
                         if (message.stopReason === "aborted" || message.stopReason === "error") {
-                            const errorMessage = message.stopReason === "aborted" ? "Operation aborted" : message.errorMessage || "Error";
+                            let errorMessage;
+                            if (message.stopReason === "aborted") {
+                                const retryAttempt = this.session.retryAttempt;
+                                errorMessage =
+                                    retryAttempt > 0
+                                        ? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
+                                        : "Operation aborted";
+                            }
+                            else {
+                                errorMessage = message.errorMessage || "Error";
+                            }
                             component.updateResult({ content: [{ type: "text", text: errorMessage }], isError: true });
                         }
                         else {
@@ -1803,12 +1874,14 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     showNewVersionNotification(newVersion) {
+        const updateInstruction = isBunBinary
+            ? theme.fg("muted", `New version ${newVersion} is available. Download from: `) +
+                theme.fg("accent", "https://github.com/badlogic/pi-mono/releases/latest")
+            : theme.fg("muted", `New version ${newVersion} is available. Run: `) +
+                theme.fg("accent", "npm install -g @mariozechner/pi-coding-agent");
         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", "Update Available")) +
-            "\n" +
-            theme.fg("muted", `New version ${newVersion} is available. Run: `) +
-            theme.fg("accent", "npm install -g @mariozechner/pi-coding-agent"), 1, 0));
+        this.chatContainer.addChild(new Text(`${theme.bold(theme.fg("warning", "Update Available"))}\n${updateInstruction}`, 1, 0));
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
         this.ui.requestRender();
     }
@@ -2632,6 +2705,40 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     async handleBashCommand(command, excludeFromContext = false) {
+        const extensionRunner = this.session.extensionRunner;
+        // Emit user_bash event to let extensions intercept
+        const eventResult = extensionRunner
+            ? await extensionRunner.emitUserBash({
+                type: "user_bash",
+                command,
+                excludeFromContext,
+                cwd: process.cwd(),
+            })
+            : undefined;
+        // If extension returned a full result, use it directly
+        if (eventResult?.result) {
+            const result = eventResult.result;
+            // Create UI component for display
+            this.bashComponent = new BashExecutionComponent(command, this.ui, excludeFromContext);
+            if (this.session.isStreaming) {
+                this.pendingMessagesContainer.addChild(this.bashComponent);
+                this.pendingBashComponents.push(this.bashComponent);
+            }
+            else {
+                this.chatContainer.addChild(this.bashComponent);
+            }
+            // Show output and complete
+            if (result.output) {
+                this.bashComponent.appendOutput(result.output);
+            }
+            this.bashComponent.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true, content: result.output } : undefined, result.fullOutputPath);
+            // Record the result in session
+            this.session.recordBashResult(command, result, { excludeFromContext });
+            this.bashComponent = undefined;
+            this.ui.requestRender();
+            return;
+        }
+        // Normal execution path (possibly with custom operations)
         const isDeferred = this.session.isStreaming;
         this.bashComponent = new BashExecutionComponent(command, this.ui, excludeFromContext);
         if (isDeferred) {
@@ -2650,7 +2757,7 @@ export class InteractiveMode {
                     this.bashComponent.appendOutput(chunk);
                     this.ui.requestRender();
                 }
-            }, { excludeFromContext });
+            }, { excludeFromContext, operations: eventResult?.operations });
             if (this.bashComponent) {
                 this.bashComponent.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true, content: result.output } : undefined, result.fullOutputPath);
             }