@openeryc/pi-coding-agent 0.75.53 → 0.75.55

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

@@ -153,6 +153,8 @@ export class InteractiveMode {
     hideThinkingBlock = false;
     // Skill commands: command name -> skill file path
     skillCommands = new Map();
+    /** Slash command dispatch map */
+    commands = new Map();
     // Agent subscription unsubscribe function
     unsubscribe;
     signalCleanupHandlers = [];
@@ -478,6 +480,7 @@ export class InteractiveMode {
         this.ui.setFocus(this.editor);
         this.setupKeyHandlers();
         this.setupEditorSubmitHandler();
+        this.initCommands();
         // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
         this.ui.start();
         this.isInitialized = true;
@@ -528,23 +531,29 @@ export class InteractiveMode {
             await this.goalRunnerContinuationLoop(resumedGoal);
         }
         // Start version check asynchronously
-        checkForNewPiVersion(this.version).then((newRelease) => {
+        checkForNewPiVersion(this.version)
+            .then((newRelease) => {
             if (newRelease) {
                 this.showNewVersionNotification(newRelease);
             }
-        });
+        })
+            .catch(() => { });
         // Start package update check asynchronously
-        this.checkForPackageUpdates().then((updates) => {
+        this.checkForPackageUpdates()
+            .then((updates) => {
             if (updates.length > 0) {
                 this.showPackageUpdateNotification(updates);
             }
-        });
+        })
+            .catch(() => { });
         // Check tmux keyboard setup asynchronously
-        this.checkTmuxKeyboardSetup().then((warning) => {
+        this.checkTmuxKeyboardSetup()
+            .then((warning) => {
             if (warning) {
                 this.showWarning(warning);
             }
-        });
+        })
+            .catch(() => { });
         // Show startup warnings
         const { migratedProviders, modelFallbackMessage, initialMessage, initialImages, initialMessages } = this.options;
         if (migratedProviders && migratedProviders.length > 0) {
@@ -1999,6 +2008,60 @@ export class InteractiveMode {
             // Silently ignore clipboard errors (may not have permission, etc.)
         }
     }
+    initCommands() {
+        const noArg = (fn) => async (_text) => {
+            this.editor.setText("");
+            await fn();
+        };
+        this.commands.set("/settings", noArg(() => this.showSettingsSelector()));
+        this.commands.set("/scoped-models", noArg(() => this.showModelsSelector()));
+        this.commands.set("/model", async (text) => {
+            const s = text.startsWith("/model ") ? text.slice(7).trim() : undefined;
+            this.editor.setText("");
+            await this.handleModelCommand(s);
+        });
+        this.commands.set("/export", async (text) => {
+            await this.handleExportCommand(text);
+            this.editor.setText("");
+        });
+        this.commands.set("/import", async (text) => {
+            await this.handleImportCommand(text);
+            this.editor.setText("");
+        });
+        this.commands.set("/share", noArg(() => this.handleShareCommand()));
+        this.commands.set("/copy", noArg(() => this.handleCopyCommand()));
+        this.commands.set("/name", async (text) => {
+            this.handleNameCommand(text);
+            this.editor.setText("");
+        });
+        this.commands.set("/session", noArg(() => this.handleSessionCommand()));
+        this.commands.set("/mcp", noArg(() => this.showMcpSelector()));
+        this.commands.set("/skills", noArg(() => this.showSkillsSelector()));
+        this.commands.set("/usage", noArg(() => this.handleUsageCommand()));
+        this.commands.set("/memory", noArg(() => this.handleMemoryCommand()));
+        this.commands.set("/changelog", noArg(() => this.handleChangelogCommand()));
+        this.commands.set("/hotkeys", noArg(() => this.handleHotkeysCommand()));
+        this.commands.set("/fork", noArg(() => this.showUserMessageSelector()));
+        this.commands.set("/clone", noArg(() => this.handleCloneCommand()));
+        this.commands.set("/tree", noArg(() => this.showTreeSelector()));
+        this.commands.set("/login", noArg(() => this.showOAuthSelector("login")));
+        this.commands.set("/logout", noArg(() => this.showOAuthSelector("logout")));
+        this.commands.set("/new", noArg(() => this.handleClearCommand()));
+        this.commands.set("/compact", async (text) => {
+            const ci = text.startsWith("/compact ") ? text.slice(9).trim() : undefined;
+            this.editor.setText("");
+            await this.handleCompactCommand(ci);
+        });
+        this.commands.set("/cleanup", noArg(() => this.handleCleanupCommand()));
+        this.commands.set("/reload", noArg(() => this.handleReloadCommand()));
+        this.commands.set("/debug", noArg(() => this.handleDebugCommand()));
+        this.commands.set("/arminsayshi", noArg(() => this.handleArminSaysHi()));
+        this.commands.set("/dementedelves", noArg(() => this.handleDementedDelves()));
+        this.commands.set("/daxnuts", noArg(() => this.handleDaxnuts()));
+        this.commands.set("/resume", noArg(() => this.showSessionSelector()));
+        this.commands.set("/update", noArg(() => this.handleUpdateCommand()));
+        this.commands.set("/quit", noArg(() => this.shutdown()));
+    }
     setupEditorSubmitHandler() {
         this.defaultEditor.onSubmit = async (text) => {
             text = text.trim();
@@ -2006,171 +2069,22 @@ export class InteractiveMode {
                 return;
             // Add to history before handling (so up/down can recall commands too)
             this.editor.addToHistory?.(text);
-            // Handle commands
-            if (text === "/settings") {
-                this.showSettingsSelector();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/scoped-models") {
-                this.editor.setText("");
-                await this.showModelsSelector();
-                return;
-            }
-            if (text === "/model" || text.startsWith("/model ")) {
-                const searchTerm = text.startsWith("/model ") ? text.slice(7).trim() : undefined;
-                this.editor.setText("");
-                await this.handleModelCommand(searchTerm);
-                return;
-            }
-            if (text === "/export" || text.startsWith("/export ")) {
-                await this.handleExportCommand(text);
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/import" || text.startsWith("/import ")) {
-                await this.handleImportCommand(text);
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/share") {
-                await this.handleShareCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/copy") {
-                await this.handleCopyCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/name" || text.startsWith("/name ")) {
-                this.handleNameCommand(text);
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/goal" || text.startsWith("/goal ")) {
+            // Handle commands (with special case for /goal which continues to submit)
+            if (text.startsWith("/goal")) {
                 const goal = text.replace(/^\/goal\s*/, "").trim();
                 this.handleGoalCommand(text);
-                if (goal)
-                    text = goal; // Submit goal text as the user message, not /goal prefix
-                // Don't return — let the normal submit flow run so the agent starts working
-            }
-            if (text === "/session") {
-                this.handleSessionCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/mcp") {
-                this.editor.setText("");
-                this.showMcpSelector();
-                return;
-            }
-            if (text.startsWith("/mcp ")) {
-                const name = text.slice(5).trim();
-                this.editor.setText("");
-                this.showMcpSelector(name);
-                return;
-            }
-            if (text === "/skills") {
-                this.editor.setText("");
-                this.showSkillsSelector();
-                return;
-            }
-            if (text === "/usage") {
-                this.editor.setText("");
-                await this.handleUsageCommand();
-                return;
-            }
-            if (text === "/memory") {
-                this.handleMemoryCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/changelog") {
-                this.handleChangelogCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/hotkeys") {
-                this.handleHotkeysCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/fork") {
-                this.showUserMessageSelector();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/clone") {
-                this.editor.setText("");
-                await this.handleCloneCommand();
-                return;
-            }
-            if (text === "/tree") {
-                this.showTreeSelector();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/login") {
-                this.showOAuthSelector("login");
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/logout") {
-                this.showOAuthSelector("logout");
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/new") {
                 this.editor.setText("");
-                await this.handleClearCommand();
-                return;
-            }
-            if (text === "/compact" || text.startsWith("/compact ")) {
-                const customInstructions = text.startsWith("/compact ") ? text.slice(9).trim() : undefined;
-                this.editor.setText("");
-                await this.handleCompactCommand(customInstructions);
-                return;
-            }
-            if (text === "/cleanup") {
-                this.editor.setText("");
-                await this.handleCleanupCommand();
-                return;
-            }
-            if (text === "/reload") {
-                this.editor.setText("");
-                await this.handleReloadCommand();
-                return;
-            }
-            if (text === "/debug") {
-                this.handleDebugCommand();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/arminsayshi") {
-                this.handleArminSaysHi();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/dementedelves") {
-                this.handleDementedDelves();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/resume") {
-                this.showSessionSelector();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/update") {
-                this.editor.setText("");
-                await this.handleUpdateCommand();
-                return;
+                if (goal)
+                    text = goal;
             }
-            if (text === "/quit") {
-                this.editor.setText("");
-                await this.shutdown();
-                return;
+            else {
+                const spaceIdx = text.indexOf(" ");
+                const cmd = spaceIdx === -1 ? text : text.slice(0, spaceIdx);
+                const handler = this.commands.get(cmd);
+                if (handler) {
+                    await handler(text);
+                    return;
+                }
             }
             // Handle bash command (! for normal, !! for excluded from context)
             if (text.startsWith("!")) {
@@ -2232,280 +2146,299 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
-                this.pendingTools.clear();
-                if (this.settingsManager.getShowTerminalProgress()) {
-                    this.ui.terminal.setProgress(true);
-                }
-                // Restore main escape handler if retry handler is still active
-                // (retry success event fires later, but we need main handler now)
-                if (this.retryEscapeHandler) {
-                    this.defaultEditor.onEscape = this.retryEscapeHandler;
-                    this.retryEscapeHandler = undefined;
-                }
-                if (this.retryCountdown) {
-                    this.retryCountdown.dispose();
-                    this.retryCountdown = undefined;
-                }
-                if (this.retryLoader) {
-                    this.retryLoader.stop();
-                    this.retryLoader = undefined;
-                }
-                this.stopWorkingLoader();
-                if (this.workingVisible) {
-                    this.loadingAnimation = this.createWorkingLoader();
-                    this.statusContainer.addChild(this.loadingAnimation);
-                }
-                this.ui.requestRender();
+                this._handleAgentStart();
                 break;
             case "queue_update":
-                this.updatePendingMessagesDisplay();
-                this.ui.requestRender();
+                this._handleQueueUpdate();
                 break;
             case "session_info_changed":
-                this.updateTerminalTitle();
-                this.footer.invalidate();
-                this.ui.requestRender();
+                this._handleSessionInfoChanged();
                 break;
             case "thinking_level_changed":
-                this.footer.invalidate();
-                this.updateEditorBorderColor();
+                this._handleThinkingLevelChanged();
                 break;
             case "message_start":
-                if (event.message.role === "custom") {
-                    this.addMessageToChat(event.message);
-                    this.ui.requestRender();
-                }
-                else if (event.message.role === "user") {
-                    this.addMessageToChat(event.message);
-                    this.updatePendingMessagesDisplay();
-                    this.ui.requestRender();
-                }
-                else if (event.message.role === "assistant") {
-                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel);
-                    this.streamingMessage = event.message;
-                    this.chatContainer.addChild(this.streamingComponent);
-                    this.streamingComponent.updateContent(this.streamingMessage);
-                    this.ui.requestRender();
-                }
+                this._handleMessageStart(event);
                 break;
             case "message_update":
-                if (this.streamingComponent && event.message.role === "assistant") {
-                    this.streamingMessage = event.message;
-                    this.streamingComponent.updateContent(this.streamingMessage);
-                    for (const content of this.streamingMessage.content) {
-                        if (content.type === "toolCall") {
-                            if (!this.pendingTools.has(content.id)) {
-                                const component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
-                                    showImages: this.settingsManager.getShowImages(),
-                                    imageWidthCells: this.settingsManager.getImageWidthCells(),
-                                }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
-                                component.setExpanded(this.toolOutputExpanded);
-                                this.chatContainer.addChild(component);
-                                this.pendingTools.set(content.id, component);
-                            }
-                            else {
-                                const component = this.pendingTools.get(content.id);
-                                if (component) {
-                                    component.updateArgs(content.arguments);
-                                }
-                            }
-                        }
-                    }
-                    this.ui.requestRender();
-                }
+                this._handleMessageUpdate(event);
                 break;
             case "message_end":
-                if (event.message.role === "user")
-                    break;
-                if (this.streamingComponent && event.message.role === "assistant") {
-                    this.streamingMessage = event.message;
-                    let errorMessage;
-                    if (this.streamingMessage.stopReason === "aborted") {
-                        const retryAttempt = this.session.retryAttempt;
-                        errorMessage =
-                            retryAttempt > 0
-                                ? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
-                                : "Operation aborted";
-                        this.streamingMessage.errorMessage = errorMessage;
-                    }
-                    this.streamingComponent.updateContent(this.streamingMessage);
-                    if (this.streamingMessage.stopReason === "aborted" || this.streamingMessage.stopReason === "error") {
-                        if (!errorMessage) {
-                            errorMessage = this.streamingMessage.errorMessage || "Error";
-                        }
-                        for (const [, component] of this.pendingTools.entries()) {
-                            component.updateResult({
-                                content: [{ type: "text", text: errorMessage }],
-                                isError: true,
-                            });
-                        }
-                        this.pendingTools.clear();
-                    }
-                    else {
-                        // Args are now complete - trigger diff computation for edit tools
-                        for (const [, component] of this.pendingTools.entries()) {
-                            component.setArgsComplete();
-                        }
-                    }
-                    this.streamingComponent = undefined;
-                    this.streamingMessage = undefined;
-                    this.footer.invalidate();
-                }
-                this.ui.requestRender();
+                this._handleMessageEnd(event);
                 break;
-            case "tool_execution_start": {
-                let component = this.pendingTools.get(event.toolCallId);
-                if (!component) {
-                    component = new ToolExecutionComponent(event.toolName, event.toolCallId, event.args, {
-                        showImages: this.settingsManager.getShowImages(),
-                        imageWidthCells: this.settingsManager.getImageWidthCells(),
-                    }, this.getRegisteredToolDefinition(event.toolName), this.ui, this.sessionManager.getCwd());
-                    component.setExpanded(this.toolOutputExpanded);
-                    this.chatContainer.addChild(component);
-                    this.pendingTools.set(event.toolCallId, component);
-                }
-                component.markExecutionStarted();
-                this.ui.requestRender();
+            case "tool_execution_start":
+                this._handleToolExecutionStart(event);
                 break;
-            }
-            case "tool_execution_update": {
-                const component = this.pendingTools.get(event.toolCallId);
-                if (component) {
-                    component.updateResult({ ...event.partialResult, isError: false }, true);
-                    this.ui.requestRender();
-                }
+            case "tool_execution_update":
+                this._handleToolExecutionUpdate(event);
                 break;
-            }
-            case "tool_execution_end": {
-                const component = this.pendingTools.get(event.toolCallId);
-                if (component) {
-                    component.updateResult({ ...event.result, isError: event.isError });
-                    this.pendingTools.delete(event.toolCallId);
-                    this.ui.requestRender();
-                }
+            case "tool_execution_end":
+                this._handleToolExecutionEnd(event);
                 break;
-            }
             case "agent_end":
-                if (this.settingsManager.getShowTerminalProgress()) {
-                    this.ui.terminal.setProgress(false);
-                }
-                if (this.loadingAnimation) {
-                    this.loadingAnimation.stop();
-                    this.loadingAnimation = undefined;
-                    this.statusContainer.clear();
-                }
-                if (this.streamingComponent) {
-                    this.chatContainer.removeChild(this.streamingComponent);
-                    this.streamingComponent = undefined;
-                    this.streamingMessage = undefined;
-                }
-                this.pendingTools.clear();
-                await this.checkShutdownRequested();
-                this.ui.requestRender();
+                await this._handleAgentEnd();
                 break;
-            case "compaction_start": {
-                if (this.settingsManager.getShowTerminalProgress()) {
-                    this.ui.terminal.setProgress(true);
-                }
-                // Keep editor active; submissions are queued during compaction.
-                this.autoCompactionEscapeHandler = this.defaultEditor.onEscape;
-                this.defaultEditor.onEscape = () => {
-                    this.session.abortCompaction();
-                };
-                this.statusContainer.clear();
-                const cancelHint = `(${keyText("app.interrupt")} to cancel)`;
-                const label = event.reason === "manual"
-                    ? `Compacting context... ${cancelHint}`
-                    : `${event.reason === "overflow" ? "Context overflow detected, " : ""}Auto-compacting... ${cancelHint}`;
-                this.autoCompactionLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), label);
-                this.statusContainer.addChild(this.autoCompactionLoader);
-                this.ui.requestRender();
+            case "compaction_start":
+                this._handleCompactionStart(event);
                 break;
-            }
-            case "compaction_end": {
-                if (this.settingsManager.getShowTerminalProgress()) {
-                    this.ui.terminal.setProgress(false);
-                }
-                if (this.autoCompactionEscapeHandler) {
-                    this.defaultEditor.onEscape = this.autoCompactionEscapeHandler;
-                    this.autoCompactionEscapeHandler = undefined;
-                }
-                if (this.autoCompactionLoader) {
-                    this.autoCompactionLoader.stop();
-                    this.autoCompactionLoader = undefined;
-                    this.statusContainer.clear();
-                }
-                if (event.aborted) {
-                    if (event.reason === "manual") {
-                        this.showError("Compaction cancelled");
-                    }
-                    else {
-                        this.showStatus("Auto-compaction cancelled");
-                    }
-                }
-                else if (event.result) {
-                    this.chatContainer.clear();
-                    this.rebuildChatFromMessages();
-                    this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString()));
-                    this.footer.invalidate();
-                }
-                else if (event.errorMessage) {
-                    if (event.reason === "manual") {
-                        this.showError(event.errorMessage);
-                    }
-                    else {
-                        this.chatContainer.addChild(new Spacer(1));
-                        this.chatContainer.addChild(new Text(theme.fg("error", event.errorMessage), 1, 0));
-                    }
-                }
-                void this.flushCompactionQueue({ willRetry: event.willRetry });
-                this.ui.requestRender();
+            case "compaction_end":
+                this._handleCompactionEnd(event);
                 break;
-            }
-            case "auto_retry_start": {
-                // Set up escape to abort retry
-                this.retryEscapeHandler = this.defaultEditor.onEscape;
-                this.defaultEditor.onEscape = () => {
-                    this.session.abortRetry();
-                };
-                // Show retry indicator
-                this.statusContainer.clear();
-                this.retryCountdown?.dispose();
-                const retryMessage = (seconds) => `Retrying (${event.attempt}/${event.maxAttempts}) in ${seconds}s... (${keyText("app.interrupt")} to cancel)`;
-                this.retryLoader = new Loader(this.ui, (spinner) => theme.fg("warning", spinner), (text) => theme.fg("muted", text), retryMessage(Math.ceil(event.delayMs / 1000)));
-                this.retryCountdown = new CountdownTimer(event.delayMs, this.ui, (seconds) => {
-                    this.retryLoader?.setMessage(retryMessage(seconds));
-                }, () => {
-                    this.retryCountdown = undefined;
-                });
-                this.statusContainer.addChild(this.retryLoader);
-                this.ui.requestRender();
+            case "auto_retry_start":
+                this._handleAutoRetryStart(event);
                 break;
-            }
-            case "auto_retry_end": {
-                // Restore escape handler
-                if (this.retryEscapeHandler) {
-                    this.defaultEditor.onEscape = this.retryEscapeHandler;
-                    this.retryEscapeHandler = undefined;
-                }
-                if (this.retryCountdown) {
-                    this.retryCountdown.dispose();
-                    this.retryCountdown = undefined;
-                }
-                // Stop loader
-                if (this.retryLoader) {
-                    this.retryLoader.stop();
-                    this.retryLoader = undefined;
-                    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"}`);
-                }
-                this.ui.requestRender();
+            case "auto_retry_end":
+                this._handleAutoRetryEnd(event);
                 break;
+        }
+    }
+    _handleAgentStart() {
+        this.pendingTools.clear();
+        if (this.settingsManager.getShowTerminalProgress()) {
+            this.ui.terminal.setProgress(true);
+        }
+        if (this.retryEscapeHandler) {
+            this.defaultEditor.onEscape = this.retryEscapeHandler;
+            this.retryEscapeHandler = undefined;
+        }
+        if (this.retryCountdown) {
+            this.retryCountdown.dispose();
+            this.retryCountdown = undefined;
+        }
+        if (this.retryLoader) {
+            this.retryLoader.stop();
+            this.retryLoader = undefined;
+        }
+        this.stopWorkingLoader();
+        if (this.workingVisible) {
+            this.loadingAnimation = this.createWorkingLoader();
+            this.statusContainer.addChild(this.loadingAnimation);
+        }
+        this.ui.requestRender();
+    }
+    _handleQueueUpdate() {
+        this.updatePendingMessagesDisplay();
+        this.ui.requestRender();
+    }
+    _handleSessionInfoChanged() {
+        this.updateTerminalTitle();
+        this.footer.invalidate();
+        this.ui.requestRender();
+    }
+    _handleThinkingLevelChanged() {
+        this.footer.invalidate();
+        this.updateEditorBorderColor();
+    }
+    _handleMessageStart(event) {
+        if (event.message.role === "custom") {
+            this.addMessageToChat(event.message);
+            this.ui.requestRender();
+        }
+        else if (event.message.role === "user") {
+            this.addMessageToChat(event.message);
+            this.updatePendingMessagesDisplay();
+            this.ui.requestRender();
+        }
+        else if (event.message.role === "assistant") {
+            this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel);
+            this.streamingMessage = event.message;
+            this.chatContainer.addChild(this.streamingComponent);
+            this.streamingComponent.updateContent(this.streamingMessage);
+            this.ui.requestRender();
+        }
+    }
+    _handleMessageUpdate(event) {
+        if (!this.streamingComponent || event.message.role !== "assistant")
+            return;
+        this.streamingMessage = event.message;
+        this.streamingComponent.updateContent(this.streamingMessage);
+        for (const content of this.streamingMessage.content) {
+            if (content.type !== "toolCall")
+                continue;
+            if (!this.pendingTools.has(content.id)) {
+                const component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
+                    showImages: this.settingsManager.getShowImages(),
+                    imageWidthCells: this.settingsManager.getImageWidthCells(),
+                }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
+                component.setExpanded(this.toolOutputExpanded);
+                this.chatContainer.addChild(component);
+                this.pendingTools.set(content.id, component);
+            }
+            else {
+                this.pendingTools.get(content.id)?.updateArgs(content.arguments);
+            }
+        }
+        this.ui.requestRender();
+    }
+    _handleMessageEnd(event) {
+        if (event.message.role === "user")
+            return;
+        if (!this.streamingComponent || event.message.role !== "assistant")
+            return;
+        this.streamingMessage = event.message;
+        let errorMessage;
+        if (this.streamingMessage.stopReason === "aborted") {
+            const retryAttempt = this.session.retryAttempt;
+            errorMessage =
+                retryAttempt > 0
+                    ? `Aborted after ${retryAttempt} retry attempt${retryAttempt > 1 ? "s" : ""}`
+                    : "Operation aborted";
+            this.streamingMessage.errorMessage = errorMessage;
+        }
+        this.streamingComponent.updateContent(this.streamingMessage);
+        if (this.streamingMessage.stopReason === "aborted" || this.streamingMessage.stopReason === "error") {
+            const msg = errorMessage || this.streamingMessage.errorMessage || "Error";
+            for (const [, component] of this.pendingTools.entries()) {
+                component.updateResult({ content: [{ type: "text", text: msg }], isError: true });
+            }
+            this.pendingTools.clear();
+        }
+        else {
+            for (const [, component] of this.pendingTools.entries()) {
+                component.setArgsComplete();
             }
         }
+        this.streamingComponent = undefined;
+        this.streamingMessage = undefined;
+        this.footer.invalidate();
+        this.ui.requestRender();
+    }
+    _handleToolExecutionStart(event) {
+        let component = this.pendingTools.get(event.toolCallId);
+        if (!component) {
+            component = new ToolExecutionComponent(event.toolName, event.toolCallId, event.args, {
+                showImages: this.settingsManager.getShowImages(),
+                imageWidthCells: this.settingsManager.getImageWidthCells(),
+            }, this.getRegisteredToolDefinition(event.toolName), this.ui, this.sessionManager.getCwd());
+            component.setExpanded(this.toolOutputExpanded);
+            this.chatContainer.addChild(component);
+            this.pendingTools.set(event.toolCallId, component);
+        }
+        component.markExecutionStarted();
+        this.ui.requestRender();
+    }
+    _handleToolExecutionUpdate(event) {
+        const component = this.pendingTools.get(event.toolCallId);
+        if (component) {
+            component.updateResult({ ...event.partialResult, isError: false }, true);
+            this.ui.requestRender();
+        }
+    }
+    _handleToolExecutionEnd(event) {
+        const component = this.pendingTools.get(event.toolCallId);
+        if (component) {
+            component.updateResult({ ...event.result, isError: event.isError });
+            this.pendingTools.delete(event.toolCallId);
+            this.ui.requestRender();
+        }
+    }
+    async _handleAgentEnd() {
+        if (this.settingsManager.getShowTerminalProgress()) {
+            this.ui.terminal.setProgress(false);
+        }
+        if (this.loadingAnimation) {
+            this.loadingAnimation.stop();
+            this.loadingAnimation = undefined;
+            this.statusContainer.clear();
+        }
+        if (this.streamingComponent) {
+            this.chatContainer.removeChild(this.streamingComponent);
+            this.streamingComponent = undefined;
+            this.streamingMessage = undefined;
+        }
+        this.pendingTools.clear();
+        await this.checkShutdownRequested();
+        this.ui.requestRender();
+    }
+    _handleCompactionStart(event) {
+        if (this.settingsManager.getShowTerminalProgress()) {
+            this.ui.terminal.setProgress(true);
+        }
+        this.autoCompactionEscapeHandler = this.defaultEditor.onEscape;
+        this.defaultEditor.onEscape = () => {
+            this.session.abortCompaction();
+        };
+        this.statusContainer.clear();
+        const cancelHint = `(${keyText("app.interrupt")} to cancel)`;
+        const label = event.reason === "manual"
+            ? `Compacting context... ${cancelHint}`
+            : `${event.reason === "overflow" ? "Context overflow detected, " : ""}Auto-compacting... ${cancelHint}`;
+        this.autoCompactionLoader = new Loader(this.ui, (spinner) => theme.fg("accent", spinner), (text) => theme.fg("muted", text), label);
+        this.statusContainer.addChild(this.autoCompactionLoader);
+        this.ui.requestRender();
+    }
+    _handleCompactionEnd(event) {
+        if (this.settingsManager.getShowTerminalProgress()) {
+            this.ui.terminal.setProgress(false);
+        }
+        if (this.autoCompactionEscapeHandler) {
+            this.defaultEditor.onEscape = this.autoCompactionEscapeHandler;
+            this.autoCompactionEscapeHandler = undefined;
+        }
+        if (this.autoCompactionLoader) {
+            this.autoCompactionLoader.stop();
+            this.autoCompactionLoader = undefined;
+            this.statusContainer.clear();
+        }
+        if (event.aborted) {
+            if (event.reason === "manual") {
+                this.showError("Compaction cancelled");
+            }
+            else {
+                this.showStatus("Auto-compaction cancelled");
+            }
+        }
+        else if (event.result) {
+            this.chatContainer.clear();
+            this.rebuildChatFromMessages();
+            this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString()));
+            this.footer.invalidate();
+        }
+        else if (event.errorMessage) {
+            if (event.reason === "manual") {
+                this.showError(event.errorMessage);
+            }
+            else {
+                this.chatContainer.addChild(new Spacer(1));
+                this.chatContainer.addChild(new Text(theme.fg("error", event.errorMessage), 1, 0));
+            }
+        }
+        void this.flushCompactionQueue({ willRetry: event.willRetry });
+        this.ui.requestRender();
+    }
+    _handleAutoRetryStart(event) {
+        this.retryEscapeHandler = this.defaultEditor.onEscape;
+        this.defaultEditor.onEscape = () => {
+            this.session.abortRetry();
+        };
+        this.statusContainer.clear();
+        this.retryCountdown?.dispose();
+        const retryMessage = (seconds) => `Retrying (${event.attempt}/${event.maxAttempts}) in ${seconds}s... (${keyText("app.interrupt")} to cancel)`;
+        this.retryLoader = new Loader(this.ui, (spinner) => theme.fg("warning", spinner), (text) => theme.fg("muted", text), retryMessage(Math.ceil(event.delayMs / 1000)));
+        this.retryCountdown = new CountdownTimer(event.delayMs, this.ui, (seconds) => this.retryLoader?.setMessage(retryMessage(seconds)), () => {
+            this.retryCountdown = undefined;
+        });
+        this.statusContainer.addChild(this.retryLoader);
+        this.ui.requestRender();
+    }
+    _handleAutoRetryEnd(event) {
+        if (this.retryEscapeHandler) {
+            this.defaultEditor.onEscape = this.retryEscapeHandler;
+            this.retryEscapeHandler = undefined;
+        }
+        if (this.retryCountdown) {
+            this.retryCountdown.dispose();
+            this.retryCountdown = undefined;
+        }
+        if (this.retryLoader) {
+            this.retryLoader.stop();
+            this.retryLoader = undefined;
+            this.statusContainer.clear();
+        }
+        if (!event.success) {
+            this.showError(`Retry failed after ${event.attempt} attempts: ${event.finalError || "Unknown error"}`);
+        }
+        this.ui.requestRender();
     }
     /** Extract text content from a user message */
     getUserMessageText(message) {
@@ -4612,7 +4545,7 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Text(info, 1, 0));
         this.ui.requestRender();
     }
-    showMcpSelector(highlightServer) {
+    async showMcpSelector(highlightServer) {
         const buildItems = () => {
             // Fetch fresh config each time so toggle reflects immediately
             const configured = this.settingsManager.getMcpServers();
@@ -4635,22 +4568,22 @@ export class InteractiveMode {
                 };
             });
         };
-        const items = buildItems();
-        if (items.length === 0) {
-            this.chatContainer.addChild(new Spacer(1));
-            this.chatContainer.addChild(new Text(`${theme.bold("MCP Servers")}\n\n${theme.fg("dim", "No MCP servers configured. Add 'mcpServers' to settings.json.")}`, 1, 0));
-            this.ui.requestRender();
-            return;
-        }
         if (highlightServer) {
             const configured = this.settingsManager.getMcpServers();
             const server = configured?.[highlightServer];
             if (server) {
                 const currentEnabled = server.enabled !== false;
                 this.settingsManager.setMcpServerEnabled(highlightServer, !currentEnabled);
-                this.session.reloadMcp();
+                await this.session.reloadMcp(highlightServer);
             }
         }
+        const items = buildItems();
+        if (items.length === 0) {
+            this.chatContainer.addChild(new Spacer(1));
+            this.chatContainer.addChild(new Text(`${theme.bold("MCP Servers")}\n\n${theme.fg("dim", "No MCP servers configured. Add 'mcpServers' to settings.json.")}`, 1, 0));
+            this.ui.requestRender();
+            return;
+        }
         this.showSelector((done) => {
             const selector = new McpSelectorComponent("MCP Servers", items, async (name) => {
                 const cur = this.settingsManager.getMcpServers();
@@ -4658,7 +4591,7 @@ export class InteractiveMode {
                 if (!server)
                     return;
                 this.settingsManager.setMcpServerEnabled(name, server.enabled === false);
-                await this.session.reloadMcp();
+                await this.session.reloadMcp(name);
                 selector.setItems(buildItems());
             }, () => done());
             return { component: selector, focus: selector };