@averyyy/pi-coding-agent 0.85.1-piclient.1 → 0.85.1-piclient.3

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

@@ -254,6 +254,8 @@ export class InteractiveMode {
     // Agent subscription unsubscribe function
     unsubscribe;
     signalCleanupHandlers = [];
+    abortInputListenerCleanup;
+    abortingStatusActive = false;
     // Track if editor is in bash mode (text starts with !)
     isBashMode = false;
     // Track current bash execution component
@@ -296,6 +298,9 @@ export class InteractiveMode {
     get session() {
         return this.runtimeHost.session;
     }
+    get sessionAbortError() {
+        return this.session.abortError;
+    }
     get agent() {
         return this.session.agent;
     }
@@ -582,6 +587,7 @@ export class InteractiveMode {
         }
         this.renderer = nextUi;
         this.options.tuiMode = mode;
+        this.bindAbortInputListener();
         this.mountInteractiveTui(nextUi, components);
         nextUi.invalidate();
         nextUi.setFocus(focus);
@@ -648,6 +654,7 @@ export class InteractiveMode {
         this.ui.setFocus(this.editor);
         // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
         this.ui.start();
+        this.bindAbortInputListener();
         this.isInitialized = true;
         await this.themeController.applyFromSettings();
         // Add header with keybindings from config (unless silenced)
@@ -836,7 +843,7 @@ export class InteractiveMode {
         while (true) {
             const userInput = await this.getUserInput();
             try {
-                await this.session.prompt(userInput);
+                await this.session.prompt(userInput, this.session.isStreaming || this.session.isAborting ? { streamingBehavior: "steer" } : undefined);
             }
             catch (error) {
                 const errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
@@ -1618,14 +1625,14 @@ export class InteractiveMode {
         this.footerDataProvider.setExtensionStatus(key, text);
         this.ui.requestRender();
     }
-    setEditorWorkingStatusIndicator(indicator) {
-        this.defaultEditor.setWorkingStatusIndicator(undefined);
-        if (!isWorkingStatusEditor(this.editor))
-            return false;
-        this.editor.setWorkingStatusIndicator(indicator);
-        return true;
-    }
-    showStatusIndicator(indicator) {
+    showStatusIndicator(indicator, force = false) {
+        if (this.session.isAborting && !force) {
+            indicator.dispose();
+            if (!this.abortingStatusActive) {
+                this.showAbortingStatusIndicator();
+            }
+            return;
+        }
         this.activeStatusIndicator?.dispose();
         this.activeStatusIndicator = indicator;
         this.activeWorkingIndicatorEmbedded = false;
@@ -1637,12 +1644,38 @@ export class InteractiveMode {
         }
         this.statusContainer.addChild(indicator);
     }
-    clearStatusIndicator(kind) {
+    setEditorWorkingStatusIndicator(indicator) {
+        this.defaultEditor.setWorkingStatusIndicator(undefined);
+        if (!isWorkingStatusEditor(this.editor))
+            return false;
+        this.editor.setWorkingStatusIndicator(indicator);
+        return true;
+    }
+    showAbortingStatusIndicator() {
+        if (this.sessionAbortError) {
+            this.showCancellationFailedStatusIndicator();
+            return;
+        }
+        this.abortingStatusActive = true;
+        this.showStatusIndicator(new WorkingStatusIndicator(this.ui, "Aborting..."), true);
+        this.ui.requestRender();
+    }
+    showCancellationFailedStatusIndicator() {
+        this.abortingStatusActive = true;
+        this.showStatusIndicator(new WorkingStatusIndicator(this.ui, `Cancellation not confirmed (${keyText("app.interrupt")} to retry)`), true);
+        this.ui.requestRender();
+    }
+    clearStatusIndicator(kind, force = false) {
+        if (this.session.isAborting && !force) {
+            this.showAbortingStatusIndicator();
+            return;
+        }
         if (kind && this.activeStatusIndicator?.kind !== kind) {
             return;
         }
         const clearedIndicator = this.activeStatusIndicator;
         const clearedIndicatorWasEmbedded = clearedIndicator?.kind === "working" && this.activeWorkingIndicatorEmbedded;
+        this.abortingStatusActive = false;
         clearedIndicator?.dispose();
         this.activeStatusIndicator = undefined;
         this.activeWorkingIndicatorEmbedded = false;
@@ -1674,6 +1707,10 @@ export class InteractiveMode {
     }
     setWorkingVisible(visible) {
         this.workingVisible = visible;
+        if (this.session.isAborting) {
+            this.showAbortingStatusIndicator();
+            return;
+        }
         if (!visible) {
             this.clearStatusIndicator("working");
             this.ui.requestRender();
@@ -1684,6 +1721,22 @@ export class InteractiveMode {
         }
         this.ui.requestRender();
     }
+    refreshStatusIndicator() {
+        if (this.session.isAborting) {
+            this.showAbortingStatusIndicator();
+            return;
+        }
+        if (this.session.isStreaming) {
+            if (this.workingVisible) {
+                this.showStatusIndicator(new WorkingStatusIndicator(this.ui, this.workingMessage ?? this.defaultWorkingMessage, this.workingIndicatorOptions));
+            }
+            else {
+                this.clearStatusIndicator(undefined, true);
+            }
+            return;
+        }
+        this.clearStatusIndicator(undefined, true);
+    }
     setWorkingIndicator(options) {
         this.workingIndicatorOptions = options;
         if (this.activeStatusIndicator?.kind === "working") {
@@ -1776,7 +1829,7 @@ export class InteractiveMode {
         this.workingMessage = undefined;
         this.workingVisible = true;
         this.setWorkingIndicator();
-        if (this.activeStatusIndicator?.kind === "working") {
+        if (this.activeStatusIndicator?.kind === "working" && !this.session.isAborting) {
             this.activeStatusIndicator.setMessage(`${this.defaultWorkingMessage} (${keyText("app.interrupt")} to interrupt)`);
         }
         this.setHiddenThinkingLabel();
@@ -1884,6 +1937,23 @@ export class InteractiveMode {
             subscription.unsubscribe = this.ui.addInputListener(subscription.handler);
         }
     }
+    /**
+     * Keep repeated interrupts from reaching editors or extension input handlers
+     * while the session is completing an abort. Other input remains available so
+     * prompts submitted during this window can be queued by AgentSession.
+     */
+    bindAbortInputListener() {
+        this.abortInputListenerCleanup?.();
+        this.abortInputListenerCleanup = this.ui.addInputListener((data) => {
+            if (this.session.isAborting && this.keybindings.matches(data, "app.interrupt")) {
+                if (this.sessionAbortError) {
+                    this.requestAbort();
+                }
+                return { consume: true };
+            }
+            return undefined;
+        });
+    }
     clearExtensionTerminalInputListeners() {
         for (const subscription of this.extensionTerminalInputSubscriptions)
             subscription.unsubscribe();
@@ -1916,7 +1986,7 @@ export class InteractiveMode {
             setStatus: (key, text) => this.setExtensionStatus(key, text),
             setWorkingMessage: (message) => {
                 this.workingMessage = message;
-                if (this.activeStatusIndicator?.kind === "working") {
+                if (this.activeStatusIndicator?.kind === "working" && !this.session.isAborting) {
                     this.activeStatusIndicator.setMessage(message ?? this.defaultWorkingMessage);
                 }
             },
@@ -2259,10 +2329,31 @@ export class InteractiveMode {
     // =========================================================================
     // Key Handlers
     // =========================================================================
+    requestAbort() {
+        if (this.session.isAborting && !this.sessionAbortError) {
+            return;
+        }
+        this.showAbortingStatusIndicator();
+        void this.session.abort().catch((error) => {
+            if (!this.sessionAbortError) {
+                this.showAbortError(error instanceof Error ? error.message : String(error));
+            }
+            this.refreshStatusIndicator();
+        });
+    }
+    showAbortError(message) {
+        this.showError(`Cancellation not confirmed: ${message}. Press ${keyText("app.interrupt")} to retry.`);
+    }
     setupKeyHandlers() {
         // Set up handlers on defaultEditor - they use this.editor for text access
         // so they work correctly regardless of which editor is active
         this.defaultEditor.onEscape = () => {
+            if (this.session.isAborting) {
+                if (this.sessionAbortError) {
+                    this.requestAbort();
+                }
+                return;
+            }
             if (this.session.isStreaming) {
                 this.restoreQueuedMessagesToEditor({ abort: true });
             }
@@ -2310,10 +2401,22 @@ export class InteractiveMode {
         this.defaultEditor.onAction("app.message.copy", () => void this.handleCopyCommand({ flashConfirmation: true, preferSelection: true }));
         this.defaultEditor.onAction("app.message.followUp", () => this.handleFollowUp());
         this.defaultEditor.onAction("app.message.dequeue", () => this.handleDequeue());
-        this.defaultEditor.onAction("app.session.new", () => this.handleClearCommand());
-        this.defaultEditor.onAction("app.session.tree", () => this.showTreeSelector());
-        this.defaultEditor.onAction("app.session.fork", () => this.showUserMessageSelector());
-        this.defaultEditor.onAction("app.session.resume", () => this.showSessionSelector());
+        this.defaultEditor.onAction("app.session.new", () => {
+            if (!this.session.isAborting)
+                void this.handleClearCommand();
+        });
+        this.defaultEditor.onAction("app.session.tree", () => {
+            if (!this.session.isAborting)
+                this.showTreeSelector();
+        });
+        this.defaultEditor.onAction("app.session.fork", () => {
+            if (!this.session.isAborting)
+                this.showUserMessageSelector();
+        });
+        this.defaultEditor.onAction("app.session.resume", () => {
+            if (!this.session.isAborting)
+                this.showSessionSelector();
+        });
         this.defaultEditor.onChange = (text) => {
             const wasBashMode = this.isBashMode;
             this.isBashMode = text.trimStart().startsWith("!");
@@ -2370,11 +2473,37 @@ export class InteractiveMode {
         this.editor.setText(text);
         this.showStatus("Startup is still in progress");
     }
+    async submitStreamingMessage(text, streamingBehavior) {
+        this.editor.addToHistory?.(text);
+        this.editor.setText("");
+        try {
+            await this.session.prompt(text, { streamingBehavior });
+            this.updatePendingMessagesDisplay();
+            this.ui.requestRender();
+        }
+        catch (error) {
+            const currentText = this.editor.getText().trim();
+            this.editor.setText([text, currentText].filter((value) => value.length > 0).join("\n\n"));
+            this.showError(`Failed to queue message: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
     setupEditorSubmitHandler() {
         this.defaultEditor.onSubmit = async (text) => {
             text = text.trim();
             if (!text)
                 return;
+            // AgentSession owns the post-abort queue. Ordinary prompts can be queued
+            // while cancellation is in flight, but commands must wait so their TUI
+            // semantics are not changed into provider prompt text.
+            if (this.session.isAborting) {
+                if (this.isInteractiveCommand(text)) {
+                    this.editor.setText(text);
+                    this.showStatus("Wait for cancellation to finish before running commands.");
+                    return;
+                }
+                await this.submitStreamingMessage(text, "steer");
+                return;
+            }
             // Handle commands
             if (text === "/settings") {
                 this.showSettingsSelector();
@@ -2542,11 +2671,7 @@ export class InteractiveMode {
             // If streaming, use prompt() with steer behavior
             // This handles extension commands (execute immediately), prompt template expansion, and queueing
             if (this.session.isStreaming) {
-                this.editor.addToHistory?.(text);
-                this.editor.setText("");
-                await this.session.prompt(text, { streamingBehavior: "steer" });
-                this.updatePendingMessagesDisplay();
-                this.ui.requestRender();
+                await this.submitStreamingMessage(text, "steer");
                 return;
             }
             // Normal message submission
@@ -2580,21 +2705,47 @@ export class InteractiveMode {
                     this.defaultEditor.onEscape = this.retryEscapeHandler;
                     this.retryEscapeHandler = undefined;
                 }
+                if (this.session.isAborting) {
+                    this.showAbortingStatusIndicator();
+                }
+                else if (this.workingVisible) {
+                    this.showWorkingStatusIndicator();
+                }
+                else {
+                    this.clearStatusIndicator();
+                }
+                this.ui.requestRender();
                 break;
             case "turn_start":
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
                 }
-                if (this.workingVisible) {
-                    if (this.activeStatusIndicator?.kind !== "working") {
-                        this.showWorkingStatusIndicator();
-                    }
+                if (this.workingVisible && this.activeStatusIndicator?.kind !== "working") {
+                    this.showWorkingStatusIndicator();
                 }
-                else {
+                else if (!this.workingVisible) {
                     this.clearStatusIndicator();
                 }
                 this.ui.requestRender();
                 break;
+            case "abort_start":
+                this.showAbortingStatusIndicator();
+                if (this.settingsManager.getShowTerminalProgress()) {
+                    this.ui.terminal.setProgress(true);
+                }
+                break;
+            case "abort_error":
+                this.showAbortError(event.errorMessage);
+                this.showCancellationFailedStatusIndicator();
+                this.ui.requestRender();
+                break;
+            case "abort_end":
+                this.refreshStatusIndicator();
+                if (!this.session.isStreaming && !this.session.isCompacting && !this.session.isRetrying) {
+                    this.ui.terminal.setProgress(false);
+                }
+                this.ui.requestRender();
+                break;
             case "queue_update":
                 this.updatePendingMessagesDisplay();
                 this.ui.requestRender();
@@ -2744,10 +2895,18 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             case "agent_settled":
-                if (this.settingsManager.getShowTerminalProgress()) {
-                    this.ui.terminal.setProgress(false);
+                if (this.session.isAborting) {
+                    this.showAbortingStatusIndicator();
+                }
+                else if (this.session.isStreaming) {
+                    this.refreshStatusIndicator();
+                }
+                else if (!this.session.isCompacting && !this.session.isRetrying) {
+                    if (this.settingsManager.getShowTerminalProgress()) {
+                        this.ui.terminal.setProgress(false);
+                    }
+                    this.clearStatusIndicator("working", true);
                 }
-                this.clearStatusIndicator("working");
                 await this.checkShutdownRequested();
                 break;
             case "compaction_start": {
@@ -2757,7 +2916,7 @@ export class InteractiveMode {
                 // Keep editor active; submissions are queued during compaction.
                 this.autoCompactionEscapeHandler = this.defaultEditor.onEscape;
                 this.defaultEditor.onEscape = () => {
-                    this.session.abortCompaction();
+                    this.restoreQueuedMessagesToEditor({ abort: true });
                 };
                 this.showStatusIndicator(new CompactionStatusIndicator(this.ui, event.reason));
                 this.ui.requestRender();
@@ -2807,8 +2966,15 @@ export class InteractiveMode {
                         this.chatContainer.addChild(new Text(theme.fg("error", event.errorMessage), 1, 0));
                     }
                 }
-                this.restoreWorkingStatusIndicatorIfStreaming();
-                void this.flushCompactionQueue({ willRetry: event.willRetry });
+                if (this.session.isAborting) {
+                    this.showAbortingStatusIndicator();
+                }
+                else if (this.session.isStreaming) {
+                    this.restoreWorkingStatusIndicatorIfStreaming();
+                }
+                if (!event.aborted && !this.session.isAborting) {
+                    void this.flushCompactionQueue({ willRetry: event.willRetry });
+                }
                 this.ui.requestRender();
                 break;
             }
@@ -2816,7 +2982,7 @@ export class InteractiveMode {
                 // Set up escape to abort retry
                 this.retryEscapeHandler = this.defaultEditor.onEscape;
                 this.defaultEditor.onEscape = () => {
-                    this.session.abortRetry();
+                    this.restoreQueuedMessagesToEditor({ abort: true });
                 };
                 this.showStatusIndicator(new RetryStatusIndicator(this.ui, event.attempt, event.maxAttempts, event.delayMs));
                 this.ui.requestRender();
@@ -2833,7 +2999,12 @@ export class InteractiveMode {
                 if (!event.success) {
                     this.showError(`Retry failed after ${event.attempt} attempts: ${event.finalError || "Unknown error"}`);
                 }
-                this.restoreWorkingStatusIndicatorIfStreaming();
+                if (this.session.isAborting) {
+                    this.showAbortingStatusIndicator();
+                }
+                else if (this.session.isStreaming) {
+                    this.restoreWorkingStatusIndicatorIfStreaming();
+                }
                 this.ui.requestRender();
                 break;
             }
@@ -2856,6 +3027,9 @@ export class InteractiveMode {
             }
             case "summarization_retry_finished": {
                 this.clearStatusIndicator("retry");
+                if (this.session.isAborting) {
+                    this.showAbortingStatusIndicator();
+                }
                 this.ui.requestRender();
                 break;
             }
@@ -3392,6 +3566,14 @@ export class InteractiveMode {
         const text = (this.editor.getExpandedText?.() ?? this.editor.getText()).trim();
         if (!text)
             return;
+        if (this.session.isAborting) {
+            if (this.isInteractiveCommand(text)) {
+                this.showStatus("Wait for cancellation to finish before running commands.");
+                return;
+            }
+            await this.submitStreamingMessage(text, "followUp");
+            return;
+        }
         // Queue input during compaction (extension commands execute immediately)
         if (this.session.isCompacting) {
             if (this.isExtensionCommand(text)) {
@@ -3407,16 +3589,12 @@ export class InteractiveMode {
         // Alt+Enter queues a follow-up message (waits until agent finishes)
         // This handles extension commands (execute immediately), prompt template expansion, and queueing
         if (this.session.isStreaming) {
-            this.editor.addToHistory?.(text);
-            this.editor.setText("");
-            await this.session.prompt(text, { streamingBehavior: "followUp" });
-            this.updatePendingMessagesDisplay();
-            this.ui.requestRender();
+            await this.submitStreamingMessage(text, "followUp");
         }
         // 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() {
@@ -3627,12 +3805,15 @@ export class InteractiveMode {
         }
     }
     restoreQueuedMessagesToEditor(options) {
+        if (options?.abort && this.session.isAborting) {
+            return 0;
+        }
         const { steering, followUp } = this.clearAllQueues();
         const allQueued = [...steering, ...followUp];
         if (allQueued.length === 0) {
             this.updatePendingMessagesDisplay();
             if (options?.abort) {
-                this.agent.abort();
+                this.requestAbort();
             }
             return 0;
         }
@@ -3642,7 +3823,7 @@ export class InteractiveMode {
         this.editor.setText(combinedText);
         this.updatePendingMessagesDisplay();
         if (options?.abort) {
-            this.agent.abort();
+            this.requestAbort();
         }
         return allQueued.length;
     }
@@ -3661,6 +3842,15 @@ export class InteractiveMode {
         const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
         return !!extensionRunner.getCommand(commandName);
     }
+    isInteractiveCommand(text) {
+        if (text.startsWith("!"))
+            return true;
+        if (!text.startsWith("/"))
+            return false;
+        const spaceIndex = text.indexOf(" ");
+        const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
+        return BUILTIN_SLASH_COMMANDS.some((command) => command.name === commandName) || this.isExtensionCommand(text);
+    }
     async flushCompactionQueue(options) {
         if (this.compactionQueuedMessages.length === 0) {
             return;
@@ -4424,7 +4614,7 @@ export class InteractiveMode {
                 const originalOnEscape = this.defaultEditor.onEscape;
                 if (wantsSummary) {
                     this.defaultEditor.onEscape = () => {
-                        this.session.abortBranchSummary();
+                        this.restoreQueuedMessagesToEditor({ abort: true });
                     };
                     this.chatContainer.addChild(new Spacer(1));
                     this.showStatusIndicator(new BranchSummaryStatusIndicator(this.ui));
@@ -5543,8 +5733,10 @@ export class InteractiveMode {
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
         }
-        this.clearStatusIndicator();
+        this.clearStatusIndicator(undefined, true);
         this.themeController.disableAutoSync();
+        this.abortInputListenerCleanup?.();
+        this.abortInputListenerCleanup = undefined;
         this.clearExtensionTerminalInputListeners();
         this.footer.dispose();
         this.footerDataProvider.dispose();