@earendil-works/pi-coding-agent 0.74.0 → 0.74.1

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

@@ -7,7 +7,7 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { getProviders, } from "@earendil-works/pi-ai";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, APP_TITLE, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
@@ -26,6 +26,7 @@ import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/cha
 import { copyToClipboard } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
+import { getCwdRelativePath } from "../../utils/paths.js";
 import { getPiUserAgent } from "../../utils/pi-user-agent.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
 import { ensureTool } from "../../utils/tools-manager.js";
@@ -46,7 +47,7 @@ import { ExtensionEditorComponent } from "./components/extension-editor.js";
 import { ExtensionInputComponent } from "./components/extension-input.js";
 import { ExtensionSelectorComponent } from "./components/extension-selector.js";
 import { FooterComponent } from "./components/footer.js";
-import { keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
+import { formatKeyText, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 import { LoginDialogComponent } from "./components/login-dialog.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
 import { OAuthSelectorComponent } from "./components/oauth-selector.js";
@@ -388,6 +389,19 @@ export class InteractiveMode {
         // Both are needed: fd for autocomplete, rg for grep tool and bash commands
         const [fdPath] = await Promise.all([ensureTool("fd"), ensureTool("rg")]);
         this.fdPath = fdPath;
+        if (this.session.scopedModels.length > 0 && (this.options.verbose || !this.settingsManager.getQuietStartup())) {
+            const modelList = this.session.scopedModels
+                .map((sm) => {
+                const thinkingStr = sm.thinkingLevel ? `:${sm.thinkingLevel}` : "";
+                return `${sm.model.id}${thinkingStr}`;
+            })
+                .join(", ");
+            const cycleKeys = this.keybindings.getKeys("app.model.cycleForward");
+            const cycleHint = cycleKeys.length > 0
+                ? theme.fg("muted", ` (${formatKeyText(cycleKeys.join("/"), { capitalize: true })} to cycle)`)
+                : "";
+            console.log(theme.fg("dim", `Model scope: ${modelList}${cycleHint}`));
+        }
         // Add header container as first child
         this.ui.addChild(this.headerContainer);
         // Add header with keybindings from config (unless silenced)
@@ -676,13 +690,9 @@ export class InteractiveMode {
     formatContextPath(p) {
         const cwd = path.resolve(this.sessionManager.getCwd());
         const absolutePath = path.isAbsolute(p) ? path.resolve(p) : path.resolve(cwd, p);
-        const relativePath = path.relative(cwd, absolutePath);
-        const isInsideCwd = relativePath === "" ||
-            (!relativePath.startsWith("..") &&
-                !relativePath.startsWith(`..${path.sep}`) &&
-                !path.isAbsolute(relativePath));
-        if (isInsideCwd) {
-            return relativePath || ".";
+        const relativePath = getCwdRelativePath(absolutePath, cwd);
+        if (relativePath !== undefined) {
+            return relativePath;
         }
         return this.formatDisplayPath(absolutePath);
     }
@@ -1591,7 +1601,7 @@ export class InteractiveMode {
                 opts?.signal?.removeEventListener("abort", onAbort);
                 this.hideExtensionSelector();
                 resolve(undefined);
-            }, { tui: this.ui, timeout: opts?.timeout });
+            }, { tui: this.ui, timeout: opts?.timeout, onToggleToolsExpanded: () => this.toggleToolOutputExpansion() });
             this.editorContainer.clear();
             this.editorContainer.addChild(this.extensionSelector);
             this.ui.setFocus(this.extensionSelector);
@@ -2646,6 +2656,38 @@ export class InteractiveMode {
         // extension cleanup can write restore sequences and re-trigger EIO.
         process.exit(129);
     }
+    /**
+     * Last-resort handler for uncaught exceptions. The TUI puts stdin into raw
+     * mode and hides the cursor; without this handler, an uncaught throw from
+     * anywhere (e.g. an extension's async `ChildProcess.on("exit")` callback)
+     * tears down the process while leaving the terminal in raw mode with no
+     * cursor, requiring `stty sane && reset` to recover.
+     *
+     * Unlike emergencyTerminalExit, the terminal is still alive here, so we
+     * call ui.stop() to restore cooked mode, the cursor, and disable bracketed
+     * paste / Kitty / modifyOtherKeys sequences.
+     */
+    uncaughtCrash(error) {
+        if (this.isShuttingDown) {
+            process.exit(1);
+        }
+        this.isShuttingDown = true;
+        try {
+            this.unregisterSignalHandlers();
+        }
+        catch { }
+        try {
+            killTrackedDetachedChildren();
+        }
+        catch { }
+        try {
+            this.ui.stop();
+        }
+        catch { }
+        console.error("pi exiting due to uncaughtException:");
+        console.error(error);
+        process.exit(1);
+    }
     /**
      * Check if shutdown was requested and perform shutdown if so.
      */
@@ -2681,6 +2723,12 @@ export class InteractiveMode {
         process.stderr.on("error", terminalErrorHandler);
         this.signalCleanupHandlers.push(() => process.stdout.off("error", terminalErrorHandler));
         this.signalCleanupHandlers.push(() => process.stderr.off("error", terminalErrorHandler));
+        // Restore the terminal before the process dies on any uncaught throw.
+        // Without this, an unhandled exception from extension code (or anywhere
+        // in pi) leaves the terminal in raw mode with no cursor.
+        const uncaughtExceptionHandler = (error) => this.uncaughtCrash(error);
+        process.prependListener("uncaughtException", uncaughtExceptionHandler);
+        this.signalCleanupHandlers.push(() => process.off("uncaughtException", uncaughtExceptionHandler));
     }
     unregisterSignalHandlers() {
         for (const cleanup of this.signalCleanupHandlers) {
@@ -2882,6 +2930,7 @@ export class InteractiveMode {
     showError(errorMessage) {
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("error", `Error: ${errorMessage}`), 1, 0));
+        this.chatContainer.addChild(new Spacer(1));
         this.ui.requestRender();
     }
     showWarning(warningMessage) {
@@ -2892,8 +2941,11 @@ export class InteractiveMode {
     showNewVersionNotification(newVersion) {
         const action = theme.fg("accent", `${APP_NAME} update`);
         const updateInstruction = theme.fg("muted", `New version ${newVersion} is available. Run `) + action;
-        const changelogUrl = theme.fg("accent", "https://github.com/earendil-works/pi-mono/blob/main/packages/coding-agent/CHANGELOG.md");
-        const changelogLine = theme.fg("muted", "Changelog: ") + changelogUrl;
+        const changelogUrl = "https://github.com/earendil-works/pi-mono/blob/main/packages/coding-agent/CHANGELOG.md";
+        const changelogLink = getCapabilities().hyperlinks
+            ? hyperlink(theme.fg("accent", "open changelog"), changelogUrl)
+            : theme.fg("accent", changelogUrl);
+        const changelogLine = theme.fg("muted", "Changelog: ") + changelogLink;
         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${updateInstruction}\n${changelogLine}`, 1, 0));
@@ -4277,29 +4329,17 @@ export class InteractiveMode {
         this.chatContainer.addChild(new DynamicBorder());
         this.ui.requestRender();
     }
-    /**
-     * Capitalize keybinding for display (e.g., "ctrl+c" -> "Ctrl+C").
-     */
-    capitalizeKey(key) {
-        return key
-            .split("/")
-            .map((k) => k
-            .split("+")
-            .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
-            .join("+"))
-            .join("/");
-    }
     /**
      * Get capitalized display string for an app keybinding action.
      */
     getAppKeyDisplay(action) {
-        return this.capitalizeKey(keyText(action));
+        return keyDisplayText(action);
     }
     /**
      * Get capitalized display string for an editor keybinding action.
      */
     getEditorKeyDisplay(action) {
-        return this.capitalizeKey(keyText(action));
+        return keyDisplayText(action);
     }
     handleHotkeysCommand() {
         // Navigation keybindings
@@ -4398,7 +4438,7 @@ export class InteractiveMode {
 `;
             for (const [key, shortcut] of shortcuts) {
                 const description = shortcut.description ?? shortcut.extensionPath;
-                const keyDisplay = key.replace(/\b\w/g, (c) => c.toUpperCase());
+                const keyDisplay = formatKeyText(key, { capitalize: true });
                 hotkeys += `| \`${keyDisplay}\` | ${description} |\n`;
             }
         }