@code-yeongyu/senpi 2026.5.18 → 2026.5.20-2

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

@@ -61,7 +61,7 @@ import { UserMessageSelectorComponent } from "./components/user-message-selector
 import { formatSessionInfo } from "./session-info-format.js";
 import { resolveStartupToolPaths } from "./startup-tools.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setRegisteredThemes, setTheme, setThemeInstance, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
-import { blendWorkingStatusShimmerRgbColor, formatWorkingStatusMessageFrame, } from "./working-status.js";
+import { blendWorkingStatusShimmerRgbColor, formatToolHookStatusMessageFrame, formatWorkingStatusMessageFrame, } from "./working-status.js";
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
@@ -149,12 +149,13 @@ export function isApiKeyLoginProvider(providerId, oauthProviderIds, builtInProvi
     return !oauthProviderIds.has(providerId);
 }
 export class InteractiveMode {
-    options;
     runtimeHost;
+    options;
     ui;
     chatContainer;
     pendingMessagesContainer;
     statusContainer;
+    hookStatusContainer;
     defaultEditor;
     editor;
     editorComponentFactory;
@@ -178,6 +179,8 @@ export class InteractiveMode {
     defaultWorkingMessage = "Working";
     defaultHiddenThinkingLabel = "Thinking...";
     hiddenThinkingLabel = this.defaultHiddenThinkingLabel;
+    activeToolHooks = new Map();
+    hookStatusIntervalId = undefined;
     lastSigintTime = 0;
     lastEscapeTime = 0;
     changelogMarkdown = undefined;
@@ -243,9 +246,6 @@ export class InteractiveMode {
     get session() {
         return this.runtimeHost.session;
     }
-    get agent() {
-        return this.session.agent;
-    }
     get sessionManager() {
         return this.session.sessionManager;
     }
@@ -253,8 +253,8 @@ export class InteractiveMode {
         return this.session.settingsManager;
     }
     constructor(runtimeHost, options = {}) {
-        this.options = options;
         this.runtimeHost = runtimeHost;
+        this.options = options;
         this.runtimeHost.setBeforeSessionInvalidate(() => {
             this.resetExtensionUI();
         });
@@ -268,6 +268,7 @@ export class InteractiveMode {
         this.chatContainer = new Container();
         this.pendingMessagesContainer = new Container();
         this.statusContainer = new Container();
+        this.hookStatusContainer = new Container();
         this.widgetContainerAbove = new Container();
         this.widgetContainerBelow = new Container();
         this.keybindings = KeybindingsManager.create();
@@ -502,6 +503,7 @@ export class InteractiveMode {
         this.ui.addChild(this.chatContainer);
         this.ui.addChild(this.pendingMessagesContainer);
         this.ui.addChild(this.statusContainer);
+        this.ui.addChild(this.hookStatusContainer);
         this.renderWidgets(); // Initialize with default spacer
         this.ui.addChild(this.widgetContainerAbove);
         this.ui.addChild(this.editorContainer);
@@ -552,7 +554,7 @@ export class InteractiveMode {
         // Start version check asynchronously
         checkForNewPiVersion(this.version).then((newVersion) => {
             if (newVersion) {
-                this.showNewVersionNotification(newVersion);
+                this.showNewVersionNotification(newVersion.version);
             }
         });
         // Start package update check asynchronously
@@ -1267,6 +1269,7 @@ export class InteractiveMode {
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
         this.pendingTools.clear();
+        this.clearToolHookStatuses();
         this.renderInitialMessages();
     }
     /**
@@ -1363,6 +1366,56 @@ export class InteractiveMode {
             this.workingElapsedIntervalId = undefined;
         }
     }
+    startToolHookStatusTimer() {
+        if (this.hookStatusIntervalId) {
+            return;
+        }
+        this.hookStatusIntervalId = setInterval(() => {
+            this.refreshToolHookStatuses();
+        }, DEFAULT_WORKING_STATUS_MESSAGE_ANIMATION_INTERVAL_MS);
+    }
+    stopToolHookStatusTimer() {
+        if (this.hookStatusIntervalId) {
+            clearInterval(this.hookStatusIntervalId);
+            this.hookStatusIntervalId = undefined;
+        }
+    }
+    refreshToolHookStatuses() {
+        this.hookStatusContainer.clear();
+        if (this.activeToolHooks.size === 0) {
+            this.stopToolHookStatusTimer();
+            this.ui.requestRender();
+            return;
+        }
+        const now = Date.now();
+        for (const hook of this.activeToolHooks.values()) {
+            const elapsedMs = Math.max(0, now - hook.startedAt);
+            const elapsedSeconds = Math.floor(elapsedMs / 1000);
+            this.hookStatusContainer.addChild(new Text(formatToolHookStatusMessageFrame(hook.hookName, hook.statusMessage, elapsedSeconds, elapsedMs, {
+                base: (text) => theme.fg("dim", text),
+                glow: (text) => theme.fg("text", text),
+                highlight: (text) => theme.bold(theme.fg("text", text)),
+                shimmer: formatWorkingStatusShimmerText,
+                suffix: (text) => theme.fg("dim", text),
+            }), 1, 0));
+        }
+        this.ui.requestRender();
+    }
+    handleToolHookStatusEvent(event) {
+        if (event.phase === "start") {
+            this.activeToolHooks.set(event.hookRunId, event);
+            this.startToolHookStatusTimer();
+            this.refreshToolHookStatuses();
+            return;
+        }
+        this.activeToolHooks.delete(event.hookRunId);
+        this.refreshToolHookStatuses();
+    }
+    clearToolHookStatuses() {
+        this.activeToolHooks.clear();
+        this.hookStatusContainer.clear();
+        this.stopToolHookStatusTimer();
+    }
     getWorkingIndicatorOptions() {
         return (this.workingIndicatorOptions ?? {
             frames: [theme.fg("accent", "•")],
@@ -1496,6 +1549,7 @@ export class InteractiveMode {
         this.setWorkingIndicator();
         this.refreshWorkingLoaderMessage();
         this.setHiddenThinkingLabel();
+        this.clearToolHookStatuses();
     }
     // Maximum total widget lines to prevent viewport overflow
     static MAX_WIDGET_LINES = 10;
@@ -2221,6 +2275,7 @@ export class InteractiveMode {
         switch (event.type) {
             case "agent_start":
                 this.pendingTools.clear();
+                this.clearToolHookStatuses();
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
                 }
@@ -2361,6 +2416,9 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             }
+            case "tool_hook_status":
+                this.handleToolHookStatusEvent(event);
+                break;
             case "tool_execution_update": {
                 const component = this.pendingTools.get(event.toolCallId);
                 if (component) {
@@ -2383,6 +2441,7 @@ export class InteractiveMode {
                     this.ui.terminal.setProgress(false);
                 }
                 this.stopWorkingLoader();
+                this.clearToolHookStatuses();
                 if (this.streamingComponent) {
                     this.chatContainer.removeChild(this.streamingComponent);
                     this.streamingComponent = undefined;
@@ -2989,7 +3048,7 @@ export class InteractiveMode {
         }
         this.showStatus(`Thinking blocks: ${this.hideThinkingBlock ? "hidden" : "visible"}`);
     }
-    openExternalEditor() {
+    async openExternalEditor() {
         // Determine editor (respect $VISUAL, then $EDITOR)
         const editorCmd = process.env.VISUAL || process.env.EDITOR;
         if (!editorCmd) {
@@ -3005,13 +3064,20 @@ export class InteractiveMode {
             this.ui.stop();
             // Split by space to support editor arguments (e.g., "code --wait")
             const [editor, ...editorArgs] = editorCmd.split(" ");
-            // Spawn editor synchronously with inherited stdio for interactive editing
-            const result = spawnSync(editor, [...editorArgs, tmpFile], {
-                stdio: "inherit",
-                shell: process.platform === "win32",
+            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));
             });
             // On successful exit (status 0), replace editor content
-            if (result.status === 0) {
+            if (status === 0) {
                 const newContent = fs.readFileSync(tmpFile, "utf-8").replace(/\n$/, "");
                 this.editor.setText(newContent);
             }
@@ -4722,6 +4788,7 @@ export class InteractiveMode {
             this.ui.terminal.setProgress(false);
         }
         this.stopWorkingLoader();
+        this.clearToolHookStatuses();
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();
         this.footerDataProvider.dispose();