@leanandmean/coding-agent 0.74.1-scramjet.72 → 0.74.1-scramjet.74

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

@@ -11,7 +11,7 @@ import { getProviders, } from "@leanandmean/ai";
 import { CombinedAutocompleteProvider, Container, fuzzyFilter, isKeyRelease, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, TUI_KEYBINDINGS, visibleWidth, } from "@leanandmean/tui";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, APP_TITLE, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, VERSION } from "../../config.js";
-import { parseSkillBlock } from "../../core/agent-session.js";
+import { parseSkillBlock, } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
@@ -130,6 +130,7 @@ export class InteractiveMode {
     version;
     isInitialized = false;
     onInputCallback;
+    promptSubmission;
     loadingAnimation = undefined;
     workingMessage = undefined;
     workingVisible = true;
@@ -877,7 +878,7 @@ export class InteractiveMode {
         // Process initial messages
         if (initialMessage) {
             try {
-                await this.session.prompt(initialMessage, { images: initialImages });
+                await this.promptInteractive(initialMessage, initialImages);
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
@@ -887,7 +888,7 @@ export class InteractiveMode {
         if (initialMessages) {
             for (const message of initialMessages) {
                 try {
-                    await this.session.prompt(message);
+                    await this.promptInteractive(message);
                 }
                 catch (error) {
                     const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
@@ -899,7 +900,7 @@ export class InteractiveMode {
         while (true) {
             const userInput = await this.getUserInput();
             try {
-                await this.session.prompt(userInput);
+                await this.promptInteractive(userInput);
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
@@ -907,6 +908,71 @@ export class InteractiveMode {
             }
         }
     }
+    // SCRAMJET-DIVERGENCE: native consumers retain invocation identity through recovery.
+    async promptInteractive(text, images) {
+        const submission = { session: this.session, retried: false };
+        this.promptSubmission = submission;
+        const draftGeneration = this.clipboardPasteGeneration;
+        try {
+            await submission.session.prompt(text, {
+                images,
+                onRunSettlement: (settlement) => {
+                    submission.settlement = settlement;
+                    void settlement.catch(() => { });
+                },
+            });
+            const outcome = submission.settlement ? await submission.settlement : undefined;
+            if (this.promptSubmission !== submission || this.session !== submission.session)
+                return;
+            if (outcome?.status === "cancelled") {
+                this.showStatus("Execution cancelled. Review interrupted work before submitting a new prompt.");
+            }
+            else if (outcome?.status === "failed") {
+                const retryRecord = submission.session.sessionManager
+                    .getBranch()
+                    .reverse()
+                    .find((entry) => entry.type === "custom" && entry.customType === "coding-agent:auto-retry");
+                const exhausted = submission.retryFailure &&
+                    retryRecord?.type === "custom" &&
+                    retryRecord.data?.outcome === "exhausted";
+                const prefix = exhausted ? "Recovery exhausted" : "Execution failed";
+                this.showError(`${prefix}: ${outcome.errorMessage}. Review the failure before trying again.`);
+            }
+            else if (outcome?.status === "completed" && submission.retried) {
+                this.showStatus("Execution recovered and continued.");
+            }
+        }
+        catch (error) {
+            if (this.promptSubmission !== submission || this.session !== submission.session)
+                return;
+            if (!this.editor.getText() && this.clipboardPasteGeneration === draftGeneration)
+                this.editor.setText(text);
+            this.showError(`${error instanceof Error ? error.message : String(error)}. Review the failure before trying again.`);
+        }
+        finally {
+            if (this.promptSubmission === submission && this.session === submission.session) {
+                this.promptSubmission = undefined;
+                this.clearRetryControls();
+                this.stopWorkingLoader();
+                if (this.settingsManager.getShowTerminalProgress())
+                    this.ui.terminal.setProgress(false);
+                this.ui.requestRender();
+            }
+        }
+    }
+    clearRetryControls() {
+        if (this.retryEscapeHandler) {
+            this.defaultEditor.onEscape = this.retryEscapeHandler;
+            this.retryEscapeHandler = undefined;
+        }
+        this.retryCountdown?.dispose();
+        this.retryCountdown = undefined;
+        if (this.retryLoader) {
+            this.statusContainer.removeChild(this.retryLoader);
+            this.retryLoader.stop();
+            this.retryLoader = undefined;
+        }
+    }
     async checkForPackageUpdates() {
         // SCRAMJET-DIVERGENCE: prefer SCRAMJET_OFFLINE, fall back to PI_OFFLINE.
         if (process.env.SCRAMJET_OFFLINE || process.env.PI_OFFLINE) {
@@ -1513,6 +1579,13 @@ export class InteractiveMode {
         }
     }
     async rebindCurrentSession() {
+        if (this.promptSubmission && this.promptSubmission.session !== this.session) {
+            this.promptSubmission = undefined;
+            this.clearRetryControls();
+            this.stopWorkingLoader();
+            if (this.settingsManager.getShowTerminalProgress())
+                this.ui.terminal.setProgress(false);
+        }
         this.unsubscribe?.();
         this.unsubscribe = undefined;
         this.applyRuntimeSettings();
@@ -2366,7 +2439,7 @@ export class InteractiveMode {
                 this.pendingSelectorOpenGeneration = undefined;
                 return;
             }
-            if (this.session.isStreaming) {
+            if (this.promptSubmission?.session === this.session || this.session.isStreaming || this.session.isRetrying) {
                 this.restoreQueuedMessagesToEditor({ abort: true });
             }
             else if (this.session.isBashRunning) {
@@ -2608,11 +2681,16 @@ export class InteractiveMode {
             if (this.session.isStreaming) {
                 this.editor.addToHistory?.(text);
                 this.editor.setText("");
-                await this.session.prompt(text, { streamingBehavior: "steer" });
+                await this.submitQueuedPrompt(text, "steer");
                 this.updatePendingMessagesDisplay();
                 this.ui.requestRender();
                 return;
             }
+            if (!this.onInputCallback) {
+                this.editor.setText(text);
+                this.showWarning("Execution is still settling or recovering. Wait, or press Esc to cancel before submitting again.");
+                return;
+            }
             // Normal message submission
             // First, move any pending bash components to chat
             this.flushPendingBashComponents();
@@ -2823,10 +2901,10 @@ export class InteractiveMode {
                 await Promise.all(pendingToolFinalizations);
                 if (runGeneration !== this.agentRunGeneration || pendingToolFinalizations !== this.pendingToolFinalizations)
                     break;
-                if (this.settingsManager.getShowTerminalProgress()) {
+                if (this.promptSubmission?.session !== this.session && this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
                 }
-                if (this.loadingAnimation) {
+                if (this.loadingAnimation && this.promptSubmission?.session !== this.session) {
                     this.loadingAnimation.stop();
                     this.loadingAnimation = undefined;
                     this.statusContainer.clear();
@@ -2853,8 +2931,14 @@ export class InteractiveMode {
                 }
                 // Keep editor active; submissions are queued during compaction.
                 this.autoCompactionEscapeHandler = this.defaultEditor.onEscape;
+                const compactingSession = this.session;
                 this.defaultEditor.onEscape = () => {
-                    this.session.abortCompaction();
+                    if (this.session !== compactingSession)
+                        return;
+                    if (this.promptSubmission?.session === compactingSession)
+                        compactingSession.abortRetry();
+                    else
+                        compactingSession.abortCompaction();
                 };
                 this.statusContainer.clear();
                 const cancelHint = `(${keyText("app.interrupt")} to cancel)`;
@@ -2867,7 +2951,7 @@ export class InteractiveMode {
                 break;
             }
             case "compaction_end": {
-                if (this.settingsManager.getShowTerminalProgress()) {
+                if (this.promptSubmission?.session !== this.session && this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(false);
                 }
                 if (this.autoCompactionEscapeHandler) {
@@ -2908,9 +2992,14 @@ export class InteractiveMode {
             }
             case "auto_retry_start": {
                 // Set up escape to abort retry
+                if (this.promptSubmission?.session === this.session)
+                    this.promptSubmission.retried = true;
+                this.clearRetryControls();
                 this.retryEscapeHandler = this.defaultEditor.onEscape;
+                const retrySession = this.session;
                 this.defaultEditor.onEscape = () => {
-                    this.session.abortRetry();
+                    if (this.session === retrySession)
+                        this.restoreQueuedMessagesToEditor({ abort: true });
                 };
                 // Show retry indicator
                 this.statusContainer.clear();
@@ -2949,8 +3038,11 @@ export class InteractiveMode {
                     this.statusContainer.clear();
                 }
                 // Show error only on final failure (success shows normal response)
-                if (!event.success) {
-                    this.showError(`Retry failed after ${event.attempt} attempts: ${event.finalError || "Unknown error"}`);
+                if (!event.success && this.promptSubmission?.session === this.session) {
+                    this.promptSubmission.retryFailure = event.finalError;
+                }
+                else if (!event.success) {
+                    this.showStatus("Recovery stopped. Review interrupted work before submitting a new prompt.");
                 }
                 this.ui.requestRender();
                 break;
@@ -3265,21 +3357,25 @@ export class InteractiveMode {
         if (this.isShuttingDown)
             return;
         this.isShuttingDown = true;
-        this.unregisterSignalHandlers();
-        // 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);
-        await this.settingsManager.flush();
         let exitCode = 0;
         try {
-            this.stop({ retainContent: this.settingsManager.getRetainTranscriptOnExit() });
+            await this.ui.terminal.drainInput(1000);
+            await this.settingsManager.flush();
+            try {
+                this.stop({ retainContent: this.settingsManager.getRetainTranscriptOnExit() });
+            }
+            catch (error) {
+                await this.ui.terminal.flush?.();
+                throw error;
+            }
+            await this.ui.terminal.flush?.();
         }
         catch (error) {
             exitCode = 1;
-            console.error(`Could not retain terminal history: ${error instanceof Error ? error.message : String(error)}`);
+            console.error(`Could not stop terminal safely: ${error instanceof Error ? error.message : String(error)}`);
         }
-        await this.ui.terminal.flush?.();
         await this.runtimeHost.dispose();
+        this.unregisterSignalHandlers();
         process.exit(exitCode);
     }
     emergencyTerminalExit() {
@@ -3317,7 +3413,9 @@ export class InteractiveMode {
         try {
             this.ui.stop();
         }
-        catch { }
+        catch (releaseError) {
+            console.error("Terminal release failed; exiting without restart:", releaseError);
+        }
         console.error("pi exiting due to uncaughtException:");
         console.error(error);
         process.exit(1);
@@ -3384,12 +3482,13 @@ export class InteractiveMode {
         const ignoreSigint = () => { };
         process.on("SIGINT", ignoreSigint);
         // Set up handler to restore TUI when resumed
-        process.once("SIGCONT", () => {
+        const resume = () => {
             clearInterval(suspendKeepAlive);
             process.removeListener("SIGINT", ignoreSigint);
             this.ui.start();
             this.ui.rebuild();
-        });
+        };
+        process.once("SIGCONT", resume);
         try {
             // SCRAMJET-DIVERGENCE: drain releases before handing keyboard ownership back to the shell.
             await this.ui.terminal.drainInput();
@@ -3400,9 +3499,24 @@ export class InteractiveMode {
         catch (error) {
             clearInterval(suspendKeepAlive);
             process.removeListener("SIGINT", ignoreSigint);
+            process.removeListener("SIGCONT", resume);
             throw error;
         }
     }
+    async submitQueuedPrompt(text, streamingBehavior) {
+        const session = this.session;
+        const generation = this.clipboardPasteGeneration;
+        try {
+            await session.prompt(text, { streamingBehavior });
+        }
+        catch (error) {
+            if (this.session !== session)
+                return;
+            if (!this.editor.getText() && generation === this.clipboardPasteGeneration)
+                this.editor.setText(text);
+            this.showError(`${error instanceof Error ? error.message : String(error)}. Wait or cancel recovery before submitting again.`);
+        }
+    }
     async handleFollowUp() {
         const text = (this.editor.getExpandedText?.() ?? this.editor.getText()).trim();
         if (!text)
@@ -3425,14 +3539,14 @@ export class InteractiveMode {
         if (this.session.isStreaming) {
             this.editor.addToHistory?.(text);
             this.editor.setText("");
-            await this.session.prompt(text, { streamingBehavior: "followUp" });
+            await this.submitQueuedPrompt(text, "followUp");
             this.updatePendingMessagesDisplay();
             this.ui.requestRender();
         }
         // If not streaming, Alt+Enter acts like regular Enter (trigger onSubmit)
         else if (this.editor.onSubmit) {
             this.editor.setText("");
-            this.editor.onSubmit(text);
+            await this.editor.onSubmit(text);
         }
     }
     handleDequeue() {
@@ -3523,12 +3637,14 @@ export class InteractiveMode {
         }
         const currentText = this.editor.getExpandedText?.() ?? this.editor.getText();
         const tmpFile = path.join(os.tmpdir(), `pi-editor-${Date.now()}.pi.md`);
+        let released = false;
         try {
             // Write current content to temp file
             fs.writeFileSync(tmpFile, currentText, "utf-8");
             // SCRAMJET-DIVERGENCE: the editor must not inherit the key release that opened it.
             await this.ui.terminal.drainInput();
             this.ui.stop();
+            released = true;
             // 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
@@ -3551,9 +3667,11 @@ export class InteractiveMode {
             catch {
                 // Ignore cleanup errors
             }
-            // Restart TUI
-            this.ui.start();
-            this.ui.rebuild();
+            // SCRAMJET-DIVERGENCE: failed release is not permission to reacquire inherited stdin.
+            if (released) {
+                this.ui.start();
+                this.ui.rebuild();
+            }
         }
     }
     // =========================================================================
@@ -3647,7 +3765,7 @@ export class InteractiveMode {
         if (allQueued.length === 0) {
             this.updatePendingMessagesDisplay();
             if (options?.abort) {
-                this.agent.abort();
+                this.session.abortRetry();
             }
             return 0;
         }
@@ -3657,7 +3775,7 @@ export class InteractiveMode {
         this.editor.setText(combinedText);
         this.updatePendingMessagesDisplay();
         if (options?.abort) {
-            this.agent.abort();
+            this.session.abortRetry();
         }
         return allQueued.length;
     }
@@ -5223,17 +5341,20 @@ export class InteractiveMode {
         }
     }
     stop(options) {
+        let released = false;
         try {
             if (this.isInitialized) {
-                this.isInitialized = false;
                 this.ui.stop(options);
+                this.isInitialized = false;
             }
+            released = true;
         }
         finally {
             this.selectorOpenGeneration++;
             this.pendingSelectorOpenGeneration = undefined;
-            this.unregisterSignalHandlers();
-            if (this.settingsManager.getShowTerminalProgress()) {
+            if (!this.isShuttingDown)
+                this.unregisterSignalHandlers();
+            if (released && this.settingsManager.getShowTerminalProgress()) {
                 this.ui.terminal.setProgress(false);
             }
             if (this.loadingAnimation) {