@earendil-works/pi-coding-agent 0.76.0 → 0.78.0

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

@@ -8,6 +8,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { getProviders, } from "@earendil-works/pi-ai";
 import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, visibleWidth, } from "@earendil-works/pi-tui";
+import chalk from "chalk";
 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";
@@ -91,6 +92,27 @@ function isAnthropicSubscriptionAuthKey(apiKey) {
 function isUnknownModel(model) {
     return !!model && model.provider === "unknown" && model.id === "unknown" && model.api === "unknown";
 }
+function quoteIfNeeded(value) {
+    if (value.length > 0 && !/[^a-zA-Z0-9_\-./~:@]/.test(value)) {
+        return value;
+    }
+    return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+export function formatResumeCommand(sessionManager) {
+    if (!process.stdout.isTTY)
+        return undefined;
+    if (!sessionManager.isPersisted())
+        return undefined;
+    const sessionFile = sessionManager.getSessionFile();
+    if (!sessionFile || !fs.existsSync(sessionFile))
+        return undefined;
+    const args = [APP_NAME];
+    if (!sessionManager.usesDefaultSessionDir()) {
+        args.push("--session-dir", quoteIfNeeded(sessionManager.getSessionDir()));
+    }
+    args.push("--session", sessionManager.getSessionId());
+    return args.join(" ");
+}
 function hasDefaultModelProvider(providerId) {
     return providerId in defaultModelPerProvider;
 }
@@ -125,6 +147,7 @@ export class InteractiveMode {
     version;
     isInitialized = false;
     onInputCallback;
+    pendingUserInputs = [];
     loadingAnimation = undefined;
     workingMessage = undefined;
     workingVisible = true;
@@ -2130,6 +2153,9 @@ export class InteractiveMode {
             if (this.onInputCallback) {
                 this.onInputCallback(text);
             }
+            else {
+                this.pendingUserInputs.push(text);
+            }
             this.editor.addToHistory?.(text);
         };
     }
@@ -2608,6 +2634,10 @@ export class InteractiveMode {
         }
     }
     async getUserInput() {
+        const queuedInput = this.pendingUserInputs.shift();
+        if (queuedInput !== undefined) {
+            return queuedInput;
+        }
         return new Promise((resolve) => {
             this.onInputCallback = (text) => {
                 this.onInputCallback = undefined;
@@ -2643,16 +2673,36 @@ export class InteractiveMode {
      * repaint the final frame while the process is exiting.
      */
     isShuttingDown = false;
-    async shutdown() {
+    async shutdown(options) {
         if (this.isShuttingDown)
             return;
         this.isShuttingDown = true;
         this.unregisterSignalHandlers();
+        if (options?.fromSignal) {
+            // Signal-triggered shutdown (SIGTERM/SIGHUP). Emit extension cleanup
+            // (session_shutdown) BEFORE touching the terminal. Extension teardown
+            // such as removing sockets does not write to the tty, so it must not be
+            // skipped if a later terminal-restore write fails on a dead or stalled
+            // terminal. If the terminal is gone, the restore writes below emit EIO,
+            // which the stdout/stderr error handler turns into emergencyTerminalExit;
+            // the render loop is already idle, so this cannot hot-spin (see #4144).
+            await this.runtimeHost.dispose();
+            await this.ui.terminal.drainInput(1000);
+            this.stop();
+            process.exit(0);
+        }
+        // Interactive quit (Ctrl+D, Ctrl+C, /quit, extension shutdown()). Stop the
+        // TUI before emitting shutdown events so extension UI cleanup cannot repaint
+        // the final frame while the process is exiting.
         // Drain any in-flight Kitty key release events before stopping.
         // This prevents escape sequences from leaking to the parent shell over slow SSH.
         await this.ui.terminal.drainInput(1000);
         this.stop();
         await this.runtimeHost.dispose();
+        const resumeCommand = formatResumeCommand(this.sessionManager);
+        if (resumeCommand) {
+            process.stdout.write(`${chalk.dim("To resume this session:")} ${resumeCommand}\n`);
+        }
         process.exit(0);
     }
     emergencyTerminalExit() {
@@ -2711,11 +2761,12 @@ export class InteractiveMode {
         }
         for (const signal of signals) {
             const handler = () => {
-                if (signal === "SIGHUP") {
-                    this.emergencyTerminalExit();
-                }
+                // SIGHUP no longer hard-exits: graceful shutdown emits session_shutdown
+                // first, then attempts terminal restore. A genuinely dead terminal
+                // surfaces as an EIO on the restore writes, which the stdout/stderr
+                // error handler converts into emergencyTerminalExit (see #4144, #5080).
                 killTrackedDetachedChildren();
-                void this.shutdown();
+                void this.shutdown({ fromSignal: true });
             };
             process.prependListener(signal, handler);
             this.signalCleanupHandlers.push(() => process.off(signal, handler));
@@ -3642,7 +3693,9 @@ export class InteractiveMode {
     }
     showSessionSelector() {
         this.showSelector((done) => {
-            const selector = new SessionSelectorComponent((onProgress) => SessionManager.list(this.sessionManager.getCwd(), this.sessionManager.getSessionDir(), onProgress), SessionManager.listAll, async (sessionPath) => {
+            const selector = new SessionSelectorComponent((onProgress) => SessionManager.list(this.sessionManager.getCwd(), this.sessionManager.getSessionDir(), onProgress), (onProgress) => this.sessionManager.usesDefaultSessionDir()
+                ? SessionManager.listAll(onProgress)
+                : SessionManager.listAll(this.sessionManager.getSessionDir(), onProgress), async (sessionPath) => {
                 done();
                 await this.handleResumeSession(sessionPath);
             }, () => {