@astralyn/pi 0.81.1-1 → 0.82.0

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

@@ -58,10 +58,12 @@ import { SettingsSelectorComponent } from "./components/settings-selector.js";
 import { SkillInvocationMessageComponent } from "./components/skill-invocation-message.js";
 import { BranchSummaryStatusIndicator, CompactionStatusIndicator, IdleStatus, RetryStatusIndicator, WorkingStatusIndicator, } from "./components/status-indicator.js";
 import { ToolExecutionComponent } from "./components/tool-execution.js";
+import { ToolGroupComponent } from "./components/tool-group.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { TrustSelectorComponent } from "./components/trust-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
+import { editInExternalEditor } from "./external-editor.js";
 import { getModelSearchText } from "./model-search.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, onThemeChange, setRegisteredThemes, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
 import { InteractiveThemeController } from "./theme/theme-controller.js";
@@ -270,7 +272,7 @@ export class InteractiveMode {
             await this.rebindCurrentSession({ renderBeforeBind: true });
         });
         this.version = VERSION;
-        this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
+        this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor(), getAgentDir());
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
         this.headerContainer = new Container();
         this.loadedResourcesContainer = new Container();
@@ -777,8 +779,15 @@ export class InteractiveMode {
      * Get a short path relative to the package root for display.
      */
     getShortPath(fullPath, sourceInfo) {
+        const normalizedFullPath = fullPath.replace(/\\/g, "/");
         const baseDir = sourceInfo?.baseDir;
         if (baseDir && this.isPackageSource(sourceInfo)) {
+            const normalizedBaseDir = baseDir.replace(/\\/g, "/");
+            const npmRootMatch = normalizedBaseDir.match(/^(.*\/node_modules)\/(@?[^/]+(?:\/[^/]+)?)$/);
+            // If fullPath is under the same node_modules root as baseDir, preserve that relative topology.
+            if (npmRootMatch?.[1] && normalizedFullPath.startsWith(`${npmRootMatch[1]}/`)) {
+                return path.posix.relative(normalizedBaseDir, normalizedFullPath);
+            }
             const relativePath = path.relative(path.resolve(baseDir), path.resolve(fullPath));
             if (relativePath &&
                 relativePath !== "." &&
@@ -789,11 +798,11 @@ export class InteractiveMode {
             }
         }
         const source = sourceInfo?.source ?? "";
-        const npmMatch = fullPath.match(/node_modules\/(@?[^/]+(?:\/[^/]+)?)\/(.*)/);
+        const npmMatch = normalizedFullPath.match(/node_modules\/(@?[^/]+(?:\/[^/]+)?)\/(.*)/);
         if (npmMatch && source.startsWith("npm:")) {
             return npmMatch[2];
         }
-        const gitMatch = fullPath.match(/git\/[^/]+\/[^/]+\/(.*)/);
+        const gitMatch = normalizedFullPath.match(/git\/[^/]+\/[^/]+\/(.*)/);
         if (gitMatch && source.startsWith("git:")) {
             return gitMatch[1];
         }
@@ -1317,6 +1326,34 @@ export class InteractiveMode {
     getRegisteredToolDefinition(toolName) {
         return this.session.getToolDefinition(toolName);
     }
+    createToolExecutionComponent(toolName, toolCallId, args) {
+        const component = new ToolExecutionComponent(toolName, toolCallId, args, {
+            showImages: this.settingsManager.getShowImages(),
+            imageWidthCells: this.settingsManager.getImageWidthCells(),
+        }, this.getRegisteredToolDefinition(toolName), this.ui, this.sessionManager.getCwd());
+        component.setExpanded(this.toolOutputExpanded);
+        return component;
+    }
+    appendToolExecutionComponent(component) {
+        const toolGroup = component.toolGroup?.trim();
+        if (!toolGroup) {
+            this.chatContainer.addChild(component);
+            return;
+        }
+        const children = this.chatContainer.children;
+        const lastChild = children[children.length - 1];
+        if (lastChild instanceof ToolGroupComponent && lastChild.toolGroup === toolGroup) {
+            lastChild.addTool(component);
+            return;
+        }
+        if (lastChild instanceof ToolExecutionComponent && lastChild.toolGroup?.trim() === toolGroup) {
+            const group = new ToolGroupComponent(toolGroup, [lastChild, component]);
+            group.setExpanded(this.toolOutputExpanded);
+            children[children.length - 1] = group;
+            return;
+        }
+        this.chatContainer.addChild(component);
+    }
     /**
      * Set up keyboard shortcuts registered by extensions.
      */
@@ -1333,6 +1370,7 @@ export class InteractiveMode {
             sessionManager: this.sessionManager,
             modelRegistry: extensionRunner.getModelRegistry(),
             model: this.session.model,
+            thinkingLevel: this.session.thinkingLevel,
             isIdle: () => this.session.isIdle,
             isProjectTrusted: () => this.settingsManager.isProjectTrusted(),
             signal: this.session.agent.signal,
@@ -2018,7 +2056,7 @@ export class InteractiveMode {
         this.defaultEditor.onAction("app.model.select", () => this.showModelSelector());
         this.defaultEditor.onAction("app.tools.expand", () => this.toggleToolOutputExpansion());
         this.defaultEditor.onAction("app.thinking.toggle", () => this.toggleThinkingBlockVisibility());
-        this.defaultEditor.onAction("app.editor.external", () => this.openExternalEditor());
+        this.defaultEditor.onAction("app.editor.external", () => void this.handleOpenExternalEditor());
         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());
@@ -2321,12 +2359,8 @@ export class InteractiveMode {
                     for (const content of this.streamingMessage.content) {
                         if (content.type === "toolCall") {
                             if (!this.pendingTools.has(content.id)) {
-                                const component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
-                                    showImages: this.settingsManager.getShowImages(),
-                                    imageWidthCells: this.settingsManager.getImageWidthCells(),
-                                }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
-                                component.setExpanded(this.toolOutputExpanded);
-                                this.chatContainer.addChild(component);
+                                const component = this.createToolExecutionComponent(content.name, content.id, content.arguments);
+                                this.appendToolExecutionComponent(component);
                                 this.pendingTools.set(content.id, component);
                             }
                             else {
@@ -2380,15 +2414,14 @@ export class InteractiveMode {
                 }
                 this.ui.requestRender();
                 break;
+            case "bash_execution_update":
+                // The bash execution callback handles TUI output rendering.
+                break;
             case "tool_execution_start": {
                 let component = this.pendingTools.get(event.toolCallId);
                 if (!component) {
-                    component = new ToolExecutionComponent(event.toolName, event.toolCallId, event.args, {
-                        showImages: this.settingsManager.getShowImages(),
-                        imageWidthCells: this.settingsManager.getImageWidthCells(),
-                    }, this.getRegisteredToolDefinition(event.toolName), this.ui, this.sessionManager.getCwd());
-                    component.setExpanded(this.toolOutputExpanded);
-                    this.chatContainer.addChild(component);
+                    component = this.createToolExecutionComponent(event.toolName, event.toolCallId, event.args);
+                    this.appendToolExecutionComponent(component);
                     this.pendingTools.set(event.toolCallId, component);
                 }
                 component.markExecutionStarted();
@@ -2677,12 +2710,8 @@ export class InteractiveMode {
                 // Render tool call components
                 for (const content of message.content) {
                     if (content.type === "toolCall") {
-                        const component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
-                            showImages: this.settingsManager.getShowImages(),
-                            imageWidthCells: this.settingsManager.getImageWidthCells(),
-                        }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
-                        component.setExpanded(this.toolOutputExpanded);
-                        this.chatContainer.addChild(component);
+                        const component = this.createToolExecutionComponent(content.name, content.id, content.arguments);
+                        this.appendToolExecutionComponent(component);
                         if (message.stopReason === "aborted" || message.stopReason === "error") {
                             let errorMessage;
                             if (message.stopReason === "aborted") {
@@ -3102,51 +3131,21 @@ export class InteractiveMode {
         }
         this.showStatus(`Thinking blocks: ${this.hideThinkingBlock ? "hidden" : "visible"}`);
     }
-    async openExternalEditor() {
+    async handleOpenExternalEditor() {
         const editorCmd = this.settingsManager.getExternalEditorCommand();
-        if (!editorCmd) {
-            this.showWarning("No editor configured. Set externalEditor in settings.json or $VISUAL/$EDITOR.");
-            return;
-        }
-        const currentText = this.editor.getExpandedText?.() ?? this.editor.getText();
-        const tmpFile = path.join(os.tmpdir(), `pi-editor-${Date.now()}.pi.md`);
+        const content = this.editor.getExpandedText?.() ?? this.editor.getText();
+        this.ui.stop();
         try {
-            // Write current content to temp file
-            fs.writeFileSync(tmpFile, currentText, "utf-8");
-            // Stop TUI to release terminal
-            this.ui.stop();
-            // Split by space to support editor arguments (e.g., "code --wait")
-            const [editor, ...editorArgs] = editorCmd.split(" ");
-            process.stdout.write(`Launching external editor: ${editorCmd}\nPi will resume when the editor exits.\n`);
-            // Do not use spawnSync here. On Windows, synchronous child_process calls can keep
-            // Node/libuv's console input read active after ui.stop() pauses stdin, racing
-            // vim/nvim for the console input buffer until Ctrl+C cancels the pending read.
-            const status = await new Promise((resolve) => {
-                const child = spawn(editor, [...editorArgs, tmpFile], {
-                    stdio: "inherit",
-                    shell: process.platform === "win32",
-                });
-                child.on("error", () => resolve(null));
-                child.on("close", (code) => resolve(code));
+            const result = await editInExternalEditor({
+                command: editorCmd,
+                content,
             });
-            // On successful exit (status 0), replace editor content
-            if (status === 0) {
-                const newContent = fs.readFileSync(tmpFile, "utf-8").replace(/\n$/, "");
-                this.editor.setText(newContent);
+            if (result.status === "complete") {
+                this.editor.setText(result.content);
             }
-            // On non-zero exit, keep original text (no action needed)
         }
         finally {
-            // Clean up temp file
-            try {
-                fs.unlinkSync(tmpFile);
-            }
-            catch {
-                // Ignore cleanup errors
-            }
-            // Restart TUI
             this.ui.start();
-            // Force full re-render since external editor uses alternate screen
             this.ui.requestRender(true);
         }
     }
@@ -3422,7 +3421,7 @@ export class InteractiveMode {
                 onShowImagesChange: (enabled) => {
                     this.settingsManager.setShowImages(enabled);
                     for (const child of this.chatContainer.children) {
-                        if (child instanceof ToolExecutionComponent) {
+                        if (child instanceof ToolExecutionComponent || child instanceof ToolGroupComponent) {
                             child.setShowImages(enabled);
                         }
                     }
@@ -3430,7 +3429,7 @@ export class InteractiveMode {
                 onImageWidthCellsChange: (width) => {
                     this.settingsManager.setImageWidthCells(width);
                     for (const child of this.chatContainer.children) {
-                        if (child instanceof ToolExecutionComponent) {
+                        if (child instanceof ToolExecutionComponent || child instanceof ToolGroupComponent) {
                             child.setImageWidthCells(width);
                         }
                     }