@averyyy/pi-coding-agent 0.81.1-piclient.1 → 0.82.0-piclient.1

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

@@ -65,6 +65,7 @@ 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";
@@ -273,7 +274,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();
@@ -798,8 +799,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 !== "." &&
@@ -810,11 +818,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];
         }
@@ -1354,6 +1362,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,
@@ -2039,7 +2048,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());
@@ -2407,6 +2416,9 @@ 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) {
@@ -3129,51 +3141,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);
         }
     }