@kolisachint/hoocode-agent 0.4.107 → 0.4.108

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

@@ -7,15 +7,12 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import { createCompactionSummaryMessage } from "@kolisachint/hoocode-agent-core";
-import { getProviders, } from "@kolisachint/hoocode-ai";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TUI, } from "@kolisachint/hoocode-tui";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Loader, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TUI, } from "@kolisachint/hoocode-tui";
 import { spawnSync } from "child_process";
-import { APP_NAME, APP_TITLE, getAuthPath, getDocsPath, VERSION } from "../../config.js";
+import { APP_NAME, APP_TITLE, VERSION } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
-import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
-import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "../../core/provider-display-names.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager } from "../../core/session-manager.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
@@ -26,6 +23,7 @@ import { parseGitUrl } from "../../utils/git.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { checkForNewHooCodeVersion } from "../../utils/version-check.js";
+import { BashExecutionController } from "./bash-execution-controller.js";
 import { CommandExecutor } from "./command-executor.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
@@ -35,13 +33,8 @@ import { CountdownTimer } from "./components/countdown-timer.js";
 import { CustomEditor } from "./components/custom-editor.js";
 import { CustomMessageComponent } from "./components/custom-message.js";
 import { DynamicBorder } from "./components/dynamic-border.js";
-import { ExtensionSelectorComponent } from "./components/extension-selector.js";
 import { FooterComponent } from "./components/footer.js";
-import { keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
-import { LoginDialogComponent } from "./components/login-dialog.js";
-import { ModelSelectorComponent } from "./components/model-selector.js";
-import { OAuthSelectorComponent } from "./components/oauth-selector.js";
-import { ScopedModelsSelectorComponent } from "./components/scoped-models-selector.js";
+import { keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 import { SessionSelectorComponent } from "./components/session-selector.js";
 import { SettingsSelectorComponent } from "./components/settings-selector.js";
 import { SkillInvocationMessageComponent } from "./components/skill-invocation-message.js";
@@ -52,11 +45,15 @@ import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
 import { ExtensionChrome } from "./extension-chrome.js";
 import { ExtensionDialogs } from "./extension-dialogs.js";
+import { LoginController } from "./login-controller.js";
+import { MessageQueueController } from "./message-queue-controller.js";
+import { ModelController } from "./model-controller.js";
 import { ExpandableText, formatDisplayPath, isExpandable, showLoadedResources as renderLoadedResources, } from "./resource-display.js";
 import { checkForPackageUpdates, checkTmuxKeyboardSetup, getChangelogForDisplay } from "./startup-checks.js";
 import { TeamFocusController } from "./team-focus.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, initTheme, onThemeChange, setRegisteredThemes, setTheme, setThemeInstance, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
 import { VoiceController } from "./voice/voice-controller.js";
+/** Interface for components that can be expanded/collapsed */
 const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN"]);
 function isDeadTerminalError(error) {
     if (!error || typeof error !== "object" || !("code" in error)) {
@@ -65,27 +62,6 @@ function isDeadTerminalError(error) {
     const code = error.code;
     return code !== undefined && DEAD_TERMINAL_ERROR_CODES.has(code);
 }
-const ANTHROPIC_SUBSCRIPTION_AUTH_WARNING = "Anthropic subscription auth: billed per token as extra usage, not plan limits.";
-function isAnthropicSubscriptionAuthKey(apiKey) {
-    return typeof apiKey === "string" && apiKey.startsWith("sk-ant-oat");
-}
-function isUnknownModel(model) {
-    return !!model && model.provider === "unknown" && model.id === "unknown" && model.api === "unknown";
-}
-function hasDefaultModelProvider(providerId) {
-    return providerId in defaultModelPerProvider;
-}
-const BEDROCK_PROVIDER_ID = "amazon-bedrock";
-const BUILT_IN_MODEL_PROVIDERS = new Set(getProviders());
-export function isApiKeyLoginProvider(providerId, oauthProviderIds, builtInProviderIds = BUILT_IN_MODEL_PROVIDERS) {
-    if (BUILT_IN_PROVIDER_DISPLAY_NAMES[providerId]) {
-        return true;
-    }
-    if (builtInProviderIds.has(providerId)) {
-        return false;
-    }
-    return !oauthProviderIds.has(providerId);
-}
 export class InteractiveMode {
     options;
     runtimeHost;
@@ -119,7 +95,6 @@ export class InteractiveMode {
     lastEscapeTime = 0;
     changelogMarkdown = undefined;
     startupNoticesShown = false;
-    anthropicSubscriptionWarningShown = false;
     // Status line tracking (for mutating immediately-sequential status updates)
     lastStatusSpacer = undefined;
     lastStatusText = undefined;
@@ -141,10 +116,6 @@ export class InteractiveMode {
     signalCleanupHandlers = [];
     // Track if editor is in bash mode (text starts with !)
     isBashMode = false;
-    // Track current bash execution component
-    bashComponent = undefined;
-    // Track pending bash components (shown in pending area, moved to chat on submit)
-    pendingBashComponents = [];
     // Auto-compaction state
     autoCompactionLoader = undefined;
     autoCompactionEscapeHandler;
@@ -152,8 +123,6 @@ export class InteractiveMode {
     retryLoader = undefined;
     retryCountdown = undefined;
     retryEscapeHandler;
-    // Messages queued while compaction is running
-    compactionQueuedMessages = [];
     // Shutdown state
     shutdownRequested = false;
     // Extension UI state
@@ -167,6 +136,14 @@ export class InteractiveMode {
     taskPanel;
     // hooteams team client (--team): steering + attach share its single SSE stream
     teamFocus;
+    // Bash command execution (the `!cmd` prompt mode)
+    bashExecution;
+    // Message queueing (compaction queue + pending-messages display)
+    messageQueue;
+    // Model selection (/model, /models, cycle keys)
+    modelController;
+    // Auth / login flows (/login, /logout)
+    loginController;
     // Header container that holds the built-in or custom header
     headerContainer;
     // Built-in header (logo + keybinding hints + changelog)
@@ -223,9 +200,9 @@ export class InteractiveMode {
                 rebuildChatFromMessages: () => self.rebuildChatFromMessages(),
                 getMarkdownThemeWithSettings: () => self.getMarkdownThemeWithSettings(),
                 stopLoadingAnimation: () => self.stopLoadingAnimation(),
-                findExactModelMatch: (searchTerm) => self.findExactModelMatch(searchTerm),
-                maybeWarnAboutAnthropicSubscriptionAuth: (model) => self.maybeWarnAboutAnthropicSubscriptionAuth(model),
-                showModelSelector: (searchTerm) => self.showModelSelector(searchTerm),
+                findExactModelMatch: (searchTerm) => self.modelController.findExactModelMatch(searchTerm),
+                maybeWarnAboutAnthropicSubscriptionAuth: (model) => self.modelController.maybeWarnAboutAnthropicSubscriptionAuth(model),
+                showModelSelector: (searchTerm) => self.modelController.showModelSelector(searchTerm),
                 showExtensionConfirm: (title, message) => self.dialogs.confirm(title, message),
                 promptForMissingSessionCwd: (error) => self.promptForMissingSessionCwd(error),
                 handleFatalRuntimeError: (prefix, error) => self.handleFatalRuntimeError(prefix, error),
@@ -316,6 +293,53 @@ export class InteractiveMode {
             sendEditorInput: (data) => this.editor.handleInput(data),
             showError: (message) => this.showError(message),
         });
+        const self = this;
+        this.bashExecution = new BashExecutionController({
+            get session() {
+                return self.session;
+            },
+            ui: this.ui,
+            pendingMessagesContainer: this.pendingMessagesContainer,
+            chatContainer: this.chatContainer,
+            showError: (message) => this.showError(message),
+        });
+        this.messageQueue = new MessageQueueController({
+            get session() {
+                return self.session;
+            },
+            getEditor: () => this.editor,
+            pendingMessagesContainer: this.pendingMessagesContainer,
+            showStatus: (message) => this.showStatus(message),
+            showError: (message) => this.showError(message),
+        });
+        this.modelController = new ModelController({
+            ui: this.ui,
+            get session() {
+                return self.session;
+            },
+            showSelector: (create) => this.showSelector(create),
+            showStatus: (message) => this.showStatus(message),
+            showError: (message) => this.showError(message),
+            showWarning: (message) => this.showWarning(message),
+            updateEditorBorderColor: () => this.updateEditorBorderColor(),
+            invalidateFooter: () => this.footer.invalidate(),
+            setAvailableProviderCount: (count) => this.footerDataProvider.setAvailableProviderCount(count),
+        });
+        this.loginController = new LoginController({
+            ui: this.ui,
+            get session() {
+                return self.session;
+            },
+            getEditor: () => this.editor,
+            editorContainer: this.editorContainer,
+            showSelector: (create) => this.showSelector(create),
+            showStatus: (message) => this.showStatus(message),
+            showError: (message) => this.showError(message),
+            updateAvailableProviderCount: () => this.modelController.updateAvailableProviderCount(),
+            updateEditorBorderColor: () => this.updateEditorBorderColor(),
+            invalidateFooter: () => this.footer.invalidate(),
+            maybeWarnAboutAnthropicSubscriptionAuth: (model) => this.modelController.maybeWarnAboutAnthropicSubscriptionAuth(model),
+        });
         this.taskPanel.onNudge = (role) => this.teamFocus.showNudgeInput(role);
         this.taskPanel.onAttach = (role) => this.teamFocus.showAttach(role);
         this.taskPanel.onExitFocus = () => this.teamFocus.exitFocus();
@@ -563,7 +587,7 @@ export class InteractiveMode {
             this.ui.requestRender();
         });
         // Initialize available provider count for footer display
-        await this.updateAvailableProviderCount();
+        await this.modelController.updateAvailableProviderCount();
     }
     /**
      * Update terminal title with session name and cwd.
@@ -614,7 +638,7 @@ export class InteractiveMode {
         if (modelFallbackMessage) {
             this.showWarning(modelFallbackMessage);
         }
-        void this.maybeWarnAboutAnthropicSubscriptionAuth();
+        void this.modelController.maybeWarnAboutAnthropicSubscriptionAuth();
         // Process initial messages
         if (initialMessage) {
             try {
@@ -733,7 +757,7 @@ export class InteractiveMode {
                         this.editor.setText(result.editorText);
                     }
                     this.showStatus("Navigated to selected point");
-                    void this.flushCompactionQueue({ willRetry: false });
+                    void this.messageQueue.flushCompactionQueue({ willRetry: false });
                     return { cancelled: false };
                 },
                 switchSession: async (sessionPath, options) => {
@@ -782,7 +806,7 @@ export class InteractiveMode {
         this.applyRuntimeSettings();
         await this.bindCurrentSessionExtensions();
         this.subscribeToAgent();
-        await this.updateAvailableProviderCount();
+        await this.modelController.updateAvailableProviderCount();
         this.updateEditorBorderColor();
         this.updateTerminalTitle();
     }
@@ -796,7 +820,7 @@ export class InteractiveMode {
     renderCurrentSessionState() {
         this.chatContainer.clear();
         this.pendingMessagesContainer.clear();
-        this.compactionQueuedMessages = [];
+        this.messageQueue.resetCompactionQueue();
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
         this.pendingTools.clear();
@@ -1116,7 +1140,7 @@ export class InteractiveMode {
         // so they work correctly regardless of which editor is active
         this.defaultEditor.onEscape = () => {
             if (this.session.isStreaming) {
-                this.restoreQueuedMessagesToEditor({ abort: true });
+                this.messageQueue.restoreQueuedMessagesToEditor({ abort: true });
             }
             else if (this.session.isBashRunning) {
                 this.session.abortBash();
@@ -1151,11 +1175,11 @@ export class InteractiveMode {
         this.defaultEditor.onCtrlD = () => this.handleCtrlD();
         this.defaultEditor.onAction("app.suspend", () => this.handleCtrlZ());
         this.defaultEditor.onAction("app.thinking.cycle", () => this.cycleThinkingLevel());
-        this.defaultEditor.onAction("app.model.cycleForward", () => this.cycleModel("forward"));
-        this.defaultEditor.onAction("app.model.cycleBackward", () => this.cycleModel("backward"));
+        this.defaultEditor.onAction("app.model.cycleForward", () => this.modelController.cycleModel("forward"));
+        this.defaultEditor.onAction("app.model.cycleBackward", () => this.modelController.cycleModel("backward"));
         // Global debug handler on TUI (works regardless of focus)
         this.ui.onDebug = () => this.commandExecutor.handleDebug();
-        this.defaultEditor.onAction("app.model.select", () => this.showModelSelector());
+        this.defaultEditor.onAction("app.model.select", () => this.modelController.showModelSelector());
         this.defaultEditor.onAction("app.tools.expand", () => this.toggleToolOutputExpansion());
         this.defaultEditor.onAction("app.thinking.toggle", () => this.toggleThinkingBlockVisibility());
         this.defaultEditor.onAction("app.tasks.cycleView", () => {
@@ -1231,7 +1255,7 @@ export class InteractiveMode {
             "/scoped-models": {
                 run: async () => {
                     clearEditor();
-                    await this.showModelsSelector();
+                    await this.modelController.showModelsSelector();
                 },
             },
             "/model": {
@@ -1313,13 +1337,13 @@ export class InteractiveMode {
             },
             "/login": {
                 run: () => {
-                    this.showOAuthSelector("login");
+                    this.loginController.showOAuthSelector("login");
                     clearEditor();
                 },
             },
             "/logout": {
                 run: () => {
-                    this.showOAuthSelector("logout");
+                    this.loginController.showOAuthSelector("logout");
                     clearEditor();
                 },
             },
@@ -1398,7 +1422,7 @@ export class InteractiveMode {
                         return;
                     }
                     this.editor.addToHistory?.(text);
-                    await this.handleBashCommand(command, isExcluded);
+                    await this.bashExecution.handleBashCommand(command, isExcluded);
                     this.isBashMode = false;
                     this.updateEditorBorderColor();
                     return;
@@ -1406,13 +1430,13 @@ export class InteractiveMode {
             }
             // Queue input during compaction (extension commands execute immediately)
             if (this.session.isCompacting) {
-                if (this.isExtensionCommand(text)) {
+                if (this.messageQueue.isExtensionCommand(text)) {
                     this.editor.addToHistory?.(text);
                     this.editor.setText("");
                     await this.session.prompt(text);
                 }
                 else {
-                    this.queueCompactionMessage(text, "steer");
+                    this.messageQueue.queueCompactionMessage(text, "steer");
                 }
                 return;
             }
@@ -1422,13 +1446,13 @@ export class InteractiveMode {
                 this.editor.addToHistory?.(text);
                 this.editor.setText("");
                 await this.session.prompt(text, { streamingBehavior: "steer" });
-                this.updatePendingMessagesDisplay();
+                this.messageQueue.updatePendingMessagesDisplay();
                 this.ui.requestRender();
                 return;
             }
             // Normal message submission
             // First, move any pending bash components to chat
-            this.flushPendingBashComponents();
+            this.bashExecution.flushPendingBashComponents();
             if (this.onInputCallback) {
                 this.onInputCallback(text);
             }
@@ -1473,7 +1497,7 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             case "queue_update":
-                this.updatePendingMessagesDisplay();
+                this.messageQueue.updatePendingMessagesDisplay();
                 this.ui.requestRender();
                 break;
             case "session_info_changed":
@@ -1499,7 +1523,7 @@ export class InteractiveMode {
                     // message can arrive while a subagent is still running.
                     taskStore.reset();
                     this.addMessageToChat(event.message);
-                    this.updatePendingMessagesDisplay();
+                    this.messageQueue.updatePendingMessagesDisplay();
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
@@ -1680,7 +1704,7 @@ export class InteractiveMode {
                         this.chatContainer.addChild(new Text(theme.fg("error", event.errorMessage), 1, 0));
                     }
                 }
-                void this.flushCompactionQueue({ willRetry: event.willRetry });
+                void this.messageQueue.flushCompactionQueue({ willRetry: event.willRetry });
                 this.ui.requestRender();
                 break;
             }
@@ -2055,13 +2079,13 @@ export class InteractiveMode {
             return;
         // Queue input during compaction (extension commands execute immediately)
         if (this.session.isCompacting) {
-            if (this.isExtensionCommand(text)) {
+            if (this.messageQueue.isExtensionCommand(text)) {
                 this.editor.addToHistory?.(text);
                 this.editor.setText("");
                 await this.session.prompt(text);
             }
             else {
-                this.queueCompactionMessage(text, "followUp");
+                this.messageQueue.queueCompactionMessage(text, "followUp");
             }
             return;
         }
@@ -2071,7 +2095,7 @@ export class InteractiveMode {
             this.editor.addToHistory?.(text);
             this.editor.setText("");
             await this.session.prompt(text, { streamingBehavior: "followUp" });
-            this.updatePendingMessagesDisplay();
+            this.messageQueue.updatePendingMessagesDisplay();
             this.ui.requestRender();
         }
         // If not streaming, Alt+Enter acts like regular Enter (trigger onSubmit)
@@ -2081,7 +2105,7 @@ export class InteractiveMode {
         }
     }
     handleDequeue() {
-        const restored = this.restoreQueuedMessagesToEditor();
+        const restored = this.messageQueue.restoreQueuedMessagesToEditor();
         if (restored === 0) {
             this.showStatus("No queued messages to restore");
         }
@@ -2121,25 +2145,6 @@ export class InteractiveMode {
             this.showStatus(`Thinking level: ${newLevel}`);
         }
     }
-    async cycleModel(direction) {
-        try {
-            const result = await this.session.cycleModel(direction);
-            if (result === undefined) {
-                const msg = this.session.scopedModels.length > 0 ? "Only one model in scope" : "Only one model available";
-                this.showStatus(msg);
-            }
-            else {
-                this.footer.invalidate();
-                this.updateEditorBorderColor();
-                const thinkingStr = result.model.reasoning && result.thinkingLevel !== "off" ? ` (thinking: ${result.thinkingLevel})` : "";
-                this.showStatus(`Switched to ${result.model.name || result.model.id}${thinkingStr}`);
-                void this.maybeWarnAboutAnthropicSubscriptionAuth(result.model);
-            }
-        }
-        catch (error) {
-            this.showError(error instanceof Error ? error.message : String(error));
-        }
-    }
     toggleToolOutputExpansion() {
         this.setToolsExpanded(!this.toolOutputExpanded);
     }
@@ -2252,170 +2257,6 @@ export class InteractiveMode {
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
         this.ui.requestRender();
     }
-    /**
-     * Get all queued messages (read-only).
-     * Combines session queue and compaction queue.
-     */
-    getAllQueuedMessages() {
-        return {
-            steering: [
-                ...this.session.getSteeringMessages(),
-                ...this.compactionQueuedMessages.filter((msg) => msg.mode === "steer").map((msg) => msg.text),
-            ],
-            followUp: [
-                ...this.session.getFollowUpMessages(),
-                ...this.compactionQueuedMessages.filter((msg) => msg.mode === "followUp").map((msg) => msg.text),
-            ],
-        };
-    }
-    /**
-     * Clear all queued messages and return their contents.
-     * Clears both session queue and compaction queue.
-     */
-    clearAllQueues() {
-        const { steering, followUp } = this.session.clearQueue();
-        const compactionSteering = this.compactionQueuedMessages
-            .filter((msg) => msg.mode === "steer")
-            .map((msg) => msg.text);
-        const compactionFollowUp = this.compactionQueuedMessages
-            .filter((msg) => msg.mode === "followUp")
-            .map((msg) => msg.text);
-        this.compactionQueuedMessages = [];
-        return {
-            steering: [...steering, ...compactionSteering],
-            followUp: [...followUp, ...compactionFollowUp],
-        };
-    }
-    updatePendingMessagesDisplay() {
-        this.pendingMessagesContainer.clear();
-        const { steering: steeringMessages, followUp: followUpMessages } = this.getAllQueuedMessages();
-        if (steeringMessages.length > 0 || followUpMessages.length > 0) {
-            this.pendingMessagesContainer.addChild(new Spacer(1));
-            for (const message of steeringMessages) {
-                const text = theme.fg("dim", `Steering: ${message}`);
-                this.pendingMessagesContainer.addChild(new TruncatedText(text, 1, 0));
-            }
-            for (const message of followUpMessages) {
-                const text = theme.fg("dim", `Follow-up: ${message}`);
-                this.pendingMessagesContainer.addChild(new TruncatedText(text, 1, 0));
-            }
-            const dequeueHint = this.getAppKeyDisplay("app.message.dequeue");
-            const hintText = theme.fg("dim", `↳ ${dequeueHint} to edit all queued messages`);
-            this.pendingMessagesContainer.addChild(new TruncatedText(hintText, 1, 0));
-        }
-    }
-    restoreQueuedMessagesToEditor(options) {
-        const { steering, followUp } = this.clearAllQueues();
-        const allQueued = [...steering, ...followUp];
-        if (allQueued.length === 0) {
-            this.updatePendingMessagesDisplay();
-            if (options?.abort) {
-                this.agent.abort();
-            }
-            return 0;
-        }
-        const queuedText = allQueued.join("\n\n");
-        const currentText = options?.currentText ?? this.editor.getText();
-        const combinedText = [queuedText, currentText].filter((t) => t.trim()).join("\n\n");
-        this.editor.setText(combinedText);
-        this.updatePendingMessagesDisplay();
-        if (options?.abort) {
-            this.agent.abort();
-        }
-        return allQueued.length;
-    }
-    queueCompactionMessage(text, mode) {
-        this.compactionQueuedMessages.push({ text, mode });
-        this.editor.addToHistory?.(text);
-        this.editor.setText("");
-        this.updatePendingMessagesDisplay();
-        this.showStatus("Queued message for after compaction");
-    }
-    isExtensionCommand(text) {
-        if (!text.startsWith("/"))
-            return false;
-        const extensionRunner = this.session.extensionRunner;
-        const spaceIndex = text.indexOf(" ");
-        const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
-        return !!extensionRunner.getCommand(commandName);
-    }
-    async flushCompactionQueue(options) {
-        if (this.compactionQueuedMessages.length === 0) {
-            return;
-        }
-        const queuedMessages = [...this.compactionQueuedMessages];
-        this.compactionQueuedMessages = [];
-        this.updatePendingMessagesDisplay();
-        const restoreQueue = (error) => {
-            this.session.clearQueue();
-            this.compactionQueuedMessages = queuedMessages;
-            this.updatePendingMessagesDisplay();
-            this.showError(`Failed to send queued message${queuedMessages.length > 1 ? "s" : ""}: ${error instanceof Error ? error.message : String(error)}`);
-        };
-        try {
-            if (options?.willRetry) {
-                // When retry is pending, queue messages for the retry turn
-                for (const message of queuedMessages) {
-                    if (this.isExtensionCommand(message.text)) {
-                        await this.session.prompt(message.text);
-                    }
-                    else if (message.mode === "followUp") {
-                        await this.session.followUp(message.text);
-                    }
-                    else {
-                        await this.session.steer(message.text);
-                    }
-                }
-                this.updatePendingMessagesDisplay();
-                return;
-            }
-            // Find first non-extension-command message to use as prompt
-            const firstPromptIndex = queuedMessages.findIndex((message) => !this.isExtensionCommand(message.text));
-            if (firstPromptIndex === -1) {
-                // All extension commands - execute them all
-                for (const message of queuedMessages) {
-                    await this.session.prompt(message.text);
-                }
-                return;
-            }
-            // Execute any extension commands before the first prompt
-            const preCommands = queuedMessages.slice(0, firstPromptIndex);
-            const firstPrompt = queuedMessages[firstPromptIndex];
-            const rest = queuedMessages.slice(firstPromptIndex + 1);
-            for (const message of preCommands) {
-                await this.session.prompt(message.text);
-            }
-            // Send first prompt (starts streaming)
-            const promptPromise = this.session.prompt(firstPrompt.text).catch((error) => {
-                restoreQueue(error);
-            });
-            // Queue remaining messages
-            for (const message of rest) {
-                if (this.isExtensionCommand(message.text)) {
-                    await this.session.prompt(message.text);
-                }
-                else if (message.mode === "followUp") {
-                    await this.session.followUp(message.text);
-                }
-                else {
-                    await this.session.steer(message.text);
-                }
-            }
-            this.updatePendingMessagesDisplay();
-            void promptPromise;
-        }
-        catch (error) {
-            restoreQueue(error);
-        }
-    }
-    /** Move pending bash components from pending area to chat */
-    flushPendingBashComponents() {
-        for (const component of this.pendingBashComponents) {
-            this.pendingMessagesContainer.removeChild(component);
-            this.chatContainer.addChild(component);
-        }
-        this.pendingBashComponents = [];
-    }
     // =========================================================================
     // Selectors
     // =========================================================================
@@ -2586,144 +2427,6 @@ export class InteractiveMode {
             return { component: selector, focus: selector.getSettingsList() };
         });
     }
-    async findExactModelMatch(searchTerm) {
-        const models = await this.getModelCandidates();
-        return findExactModelReferenceMatch(searchTerm, models);
-    }
-    async getModelCandidates() {
-        if (this.session.scopedModels.length > 0) {
-            return this.session.scopedModels.map((scoped) => scoped.model);
-        }
-        this.session.modelRegistry.refresh();
-        try {
-            return await this.session.modelRegistry.getAvailable();
-        }
-        catch {
-            return [];
-        }
-    }
-    /** Update the footer's available provider count from current model candidates */
-    async updateAvailableProviderCount() {
-        const models = await this.getModelCandidates();
-        const uniqueProviders = new Set(models.map((m) => m.provider));
-        this.footerDataProvider.setAvailableProviderCount(uniqueProviders.size);
-    }
-    async maybeWarnAboutAnthropicSubscriptionAuth(model = this.session.model) {
-        if (this.settingsManager.getWarnings().anthropicExtraUsage === false) {
-            return;
-        }
-        if (this.anthropicSubscriptionWarningShown) {
-            return;
-        }
-        if (!model || model.provider !== "anthropic") {
-            return;
-        }
-        const storedCredential = this.session.modelRegistry.authStorage.get("anthropic");
-        if (storedCredential?.type === "oauth") {
-            this.anthropicSubscriptionWarningShown = true;
-            this.showWarning(ANTHROPIC_SUBSCRIPTION_AUTH_WARNING);
-            return;
-        }
-        try {
-            const apiKey = await this.session.modelRegistry.getApiKeyForProvider(model.provider);
-            if (!isAnthropicSubscriptionAuthKey(apiKey)) {
-                return;
-            }
-            this.anthropicSubscriptionWarningShown = true;
-            this.showWarning(ANTHROPIC_SUBSCRIPTION_AUTH_WARNING);
-        }
-        catch {
-            // Ignore auth lookup failures for warning-only checks.
-        }
-    }
-    showModelSelector(initialSearchInput) {
-        this.showSelector((done) => {
-            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRegistry, this.session.scopedModels, async (model) => {
-                try {
-                    await this.session.setModel(model);
-                    this.footer.invalidate();
-                    this.updateEditorBorderColor();
-                    done();
-                    this.showStatus(`Model: ${model.id}`);
-                    void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
-                }
-                catch (error) {
-                    done();
-                    this.showError(error instanceof Error ? error.message : String(error));
-                }
-            }, () => {
-                done();
-                this.ui.requestRender();
-            }, initialSearchInput);
-            return { component: selector, focus: selector };
-        });
-    }
-    async showModelsSelector() {
-        // Get all available models
-        this.session.modelRegistry.refresh();
-        const allModels = this.session.modelRegistry.getAvailable();
-        if (allModels.length === 0) {
-            this.showStatus("No models available");
-            return;
-        }
-        // Check if session has scoped models (from previous session-only changes or CLI --models)
-        const sessionScopedModels = this.session.scopedModels;
-        const hasSessionScope = sessionScopedModels.length > 0;
-        // Build enabled model IDs from session state or settings
-        let currentEnabledIds = null;
-        if (hasSessionScope) {
-            // Use current session's scoped models
-            currentEnabledIds = sessionScopedModels.map((scoped) => `${scoped.model.provider}/${scoped.model.id}`);
-        }
-        else {
-            // Fall back to settings
-            const patterns = this.settingsManager.getEnabledModels();
-            if (patterns !== undefined && patterns.length > 0) {
-                const scopedModels = await resolveModelScope(patterns, this.session.modelRegistry);
-                currentEnabledIds = scopedModels.map((scoped) => `${scoped.model.provider}/${scoped.model.id}`);
-            }
-        }
-        // Helper to update session's scoped models (session-only, no persist)
-        const updateSessionModels = async (enabledIds) => {
-            currentEnabledIds = enabledIds === null ? null : [...enabledIds];
-            if (enabledIds && enabledIds.length > 0 && enabledIds.length < allModels.length) {
-                const newScopedModels = await resolveModelScope(enabledIds, this.session.modelRegistry);
-                this.session.setScopedModels(newScopedModels.map((sm) => ({
-                    model: sm.model,
-                    thinkingLevel: sm.thinkingLevel,
-                })));
-            }
-            else {
-                // All enabled or none enabled = no filter
-                this.session.setScopedModels([]);
-            }
-            await this.updateAvailableProviderCount();
-            this.ui.requestRender();
-        };
-        this.showSelector((done) => {
-            const selector = new ScopedModelsSelectorComponent({
-                allModels,
-                enabledModelIds: currentEnabledIds,
-            }, {
-                onChange: async (enabledIds) => {
-                    await updateSessionModels(enabledIds);
-                },
-                onPersist: (enabledIds) => {
-                    // Persist to settings
-                    const newPatterns = enabledIds === null || enabledIds.length === allModels.length
-                        ? undefined // All enabled = clear filter
-                        : enabledIds;
-                    this.settingsManager.setEnabledModels(newPatterns ? [...newPatterns] : undefined);
-                    this.showStatus("Model selection saved to settings");
-                },
-                onCancel: () => {
-                    done();
-                    this.ui.requestRender();
-                },
-            });
-            return { component: selector, focus: selector };
-        });
-    }
     showUserMessageSelector() {
         const userMessages = this.session.getUserMessagesForForking();
         if (userMessages.length === 0) {
@@ -2836,7 +2539,7 @@ export class InteractiveMode {
                         this.editor.setText(result.editorText);
                     }
                     this.showStatus("Navigated to selected point");
-                    void this.flushCompactionQueue({ willRetry: false });
+                    void this.messageQueue.flushCompactionQueue({ willRetry: false });
                 }
                 catch (error) {
                     this.showError(error instanceof Error ? error.message : String(error));
@@ -2920,326 +2623,6 @@ export class InteractiveMode {
             return this.handleFatalRuntimeError("Failed to resume session", error);
         }
     }
-    getLoginProviderOptions(authType) {
-        const authStorage = this.session.modelRegistry.authStorage;
-        const oauthProviders = authStorage.getOAuthProviders();
-        const oauthProviderIds = new Set(oauthProviders.map((provider) => provider.id));
-        const options = oauthProviders.map((provider) => ({
-            id: provider.id,
-            name: provider.name,
-            authType: "oauth",
-        }));
-        const modelProviders = new Set(this.session.modelRegistry.getAll().map((model) => model.provider));
-        for (const providerId of modelProviders) {
-            if (!isApiKeyLoginProvider(providerId, oauthProviderIds)) {
-                continue;
-            }
-            options.push({
-                id: providerId,
-                name: this.session.modelRegistry.getProviderDisplayName(providerId),
-                authType: "api_key",
-            });
-        }
-        const filteredOptions = authType ? options.filter((option) => option.authType === authType) : options;
-        return filteredOptions.sort((a, b) => a.name.localeCompare(b.name));
-    }
-    getLogoutProviderOptions() {
-        const authStorage = this.session.modelRegistry.authStorage;
-        const options = [];
-        for (const providerId of authStorage.list()) {
-            const credential = authStorage.get(providerId);
-            if (!credential) {
-                continue;
-            }
-            options.push({
-                id: providerId,
-                name: this.session.modelRegistry.getProviderDisplayName(providerId),
-                authType: credential.type,
-            });
-        }
-        return options.sort((a, b) => a.name.localeCompare(b.name));
-    }
-    showLoginAuthTypeSelector() {
-        const subscriptionLabel = "Use a subscription";
-        const apiKeyLabel = "Use an API key";
-        this.showSelector((done) => {
-            const selector = new ExtensionSelectorComponent("Select authentication method:", [subscriptionLabel, apiKeyLabel], (option) => {
-                done();
-                const authType = option === subscriptionLabel ? "oauth" : "api_key";
-                this.showLoginProviderSelector(authType);
-            }, () => {
-                done();
-                this.ui.requestRender();
-            });
-            return { component: selector, focus: selector };
-        });
-    }
-    showLoginProviderSelector(authType) {
-        const providerOptions = this.getLoginProviderOptions(authType);
-        if (providerOptions.length === 0) {
-            this.showStatus(authType === "oauth" ? "No subscription providers available." : "No API key providers available.");
-            return;
-        }
-        this.showSelector((done) => {
-            const selector = new OAuthSelectorComponent("login", this.session.modelRegistry.authStorage, providerOptions, async (providerId) => {
-                done();
-                const providerOption = providerOptions.find((provider) => provider.id === providerId);
-                if (!providerOption) {
-                    return;
-                }
-                if (providerOption.authType === "oauth") {
-                    await this.showLoginDialog(providerOption.id, providerOption.name);
-                }
-                else if (providerOption.id === BEDROCK_PROVIDER_ID) {
-                    this.showBedrockSetupDialog(providerOption.id, providerOption.name);
-                }
-                else {
-                    await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
-                }
-            }, () => {
-                done();
-                this.showLoginAuthTypeSelector();
-            }, (providerId) => this.session.modelRegistry.getProviderAuthStatus(providerId));
-            return { component: selector, focus: selector };
-        });
-    }
-    async showOAuthSelector(mode) {
-        if (mode === "login") {
-            this.showLoginAuthTypeSelector();
-            return;
-        }
-        const providerOptions = this.getLogoutProviderOptions();
-        if (providerOptions.length === 0) {
-            this.showStatus("No stored credentials to remove. /logout only removes credentials saved by /login; environment variables and models.json config are unchanged.");
-            return;
-        }
-        this.showSelector((done) => {
-            const selector = new OAuthSelectorComponent(mode, this.session.modelRegistry.authStorage, providerOptions, async (providerId) => {
-                done();
-                const providerOption = providerOptions.find((provider) => provider.id === providerId);
-                if (!providerOption) {
-                    return;
-                }
-                try {
-                    this.session.modelRegistry.authStorage.logout(providerOption.id);
-                    this.session.modelRegistry.refresh();
-                    await this.updateAvailableProviderCount();
-                    const message = providerOption.authType === "oauth"
-                        ? `Logged out of ${providerOption.name}`
-                        : `Removed stored API key for ${providerOption.name}. Environment variables and models.json config are unchanged.`;
-                    this.showStatus(message);
-                }
-                catch (error) {
-                    this.showError(`Logout failed: ${error instanceof Error ? error.message : String(error)}`);
-                }
-            }, () => {
-                done();
-                this.ui.requestRender();
-            });
-            return { component: selector, focus: selector };
-        });
-    }
-    async completeProviderAuthentication(providerId, providerName, authType, previousModel) {
-        this.session.modelRegistry.refresh();
-        const actionLabel = authType === "oauth" ? `Logged in to ${providerName}` : `Saved API key for ${providerName}`;
-        let selectedModel;
-        let selectionError;
-        if (isUnknownModel(previousModel)) {
-            const availableModels = this.session.modelRegistry.getAvailable();
-            const providerModels = availableModels.filter((model) => model.provider === providerId);
-            if (!hasDefaultModelProvider(providerId)) {
-                selectionError = `${actionLabel}, but no default model is configured for provider "${providerId}". Use /model to select a model.`;
-            }
-            else if (providerModels.length === 0) {
-                selectionError = `${actionLabel}, but no models are available for that provider. Use /model to select a model.`;
-            }
-            else {
-                const defaultModelId = defaultModelPerProvider[providerId];
-                selectedModel = providerModels.find((model) => model.id === defaultModelId);
-                if (!selectedModel) {
-                    selectionError = `${actionLabel}, but its default model "${defaultModelId}" is not available. Use /model to select a model.`;
-                }
-                else {
-                    try {
-                        await this.session.setModel(selectedModel);
-                    }
-                    catch (error) {
-                        selectedModel = undefined;
-                        const errorMessage = error instanceof Error ? error.message : String(error);
-                        selectionError = `${actionLabel}, but selecting its default model failed: ${errorMessage}. Use /model to select a model.`;
-                    }
-                }
-            }
-        }
-        await this.updateAvailableProviderCount();
-        this.footer.invalidate();
-        this.updateEditorBorderColor();
-        if (selectedModel) {
-            this.showStatus(`${actionLabel}. Selected ${selectedModel.id}. Credentials saved to ${getAuthPath()}`);
-            void this.maybeWarnAboutAnthropicSubscriptionAuth(selectedModel);
-        }
-        else {
-            this.showStatus(`${actionLabel}. Credentials saved to ${getAuthPath()}`);
-            if (selectionError) {
-                this.showError(selectionError);
-            }
-            else {
-                void this.maybeWarnAboutAnthropicSubscriptionAuth();
-            }
-        }
-    }
-    showBedrockSetupDialog(providerId, providerName) {
-        const restoreEditor = () => {
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
-            this.ui.setFocus(this.editor);
-            this.ui.requestRender();
-        };
-        const dialog = new LoginDialogComponent(this.ui, providerId, () => restoreEditor(), providerName, "Amazon Bedrock setup");
-        dialog.showInfo([
-            theme.fg("text", "Amazon Bedrock uses AWS credentials instead of a single API key."),
-            theme.fg("text", "Configure an AWS profile, IAM keys, bearer token, or role-based credentials."),
-            theme.fg("muted", "See:"),
-            theme.fg("accent", `  ${path.join(getDocsPath(), "providers.md")}`),
-        ]);
-        this.editorContainer.clear();
-        this.editorContainer.addChild(dialog);
-        this.ui.setFocus(dialog);
-        this.ui.requestRender();
-    }
-    async showApiKeyLoginDialog(providerId, providerName) {
-        const previousModel = this.session.model;
-        const dialog = new LoginDialogComponent(this.ui, providerId, (_success, _message) => {
-            // Completion handled below
-        }, providerName);
-        this.editorContainer.clear();
-        this.editorContainer.addChild(dialog);
-        this.ui.setFocus(dialog);
-        this.ui.requestRender();
-        const restoreEditor = () => {
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
-            this.ui.setFocus(this.editor);
-            this.ui.requestRender();
-        };
-        try {
-            const apiKey = (await dialog.showPrompt("Enter API key:")).trim();
-            if (!apiKey) {
-                throw new Error("API key cannot be empty.");
-            }
-            this.session.modelRegistry.authStorage.set(providerId, { type: "api_key", key: apiKey });
-            restoreEditor();
-            await this.completeProviderAuthentication(providerId, providerName, "api_key", previousModel);
-        }
-        catch (error) {
-            restoreEditor();
-            const errorMsg = error instanceof Error ? error.message : String(error);
-            if (errorMsg !== "Login cancelled") {
-                this.showError(`Failed to save API key for ${providerName}: ${errorMsg}`);
-            }
-        }
-    }
-    showOAuthLoginSelect(dialog, prompt) {
-        return new Promise((resolve) => {
-            const restoreDialog = () => {
-                this.editorContainer.clear();
-                this.editorContainer.addChild(dialog);
-                this.ui.setFocus(dialog);
-                this.ui.requestRender();
-            };
-            const labels = prompt.options.map((option) => option.label);
-            const selector = new ExtensionSelectorComponent(prompt.message, labels, (optionLabel) => {
-                restoreDialog();
-                resolve(prompt.options.find((option) => option.label === optionLabel)?.id);
-            }, () => {
-                restoreDialog();
-                resolve(undefined);
-            });
-            this.editorContainer.clear();
-            this.editorContainer.addChild(selector);
-            this.ui.setFocus(selector);
-            this.ui.requestRender();
-        });
-    }
-    async showLoginDialog(providerId, providerName) {
-        const providerInfo = this.session.modelRegistry.authStorage
-            .getOAuthProviders()
-            .find((provider) => provider.id === providerId);
-        const previousModel = this.session.model;
-        // Providers that use callback servers (can paste redirect URL)
-        const usesCallbackServer = providerInfo?.usesCallbackServer ?? false;
-        // Create login dialog component
-        const dialog = new LoginDialogComponent(this.ui, providerId, (_success, _message) => {
-            // Completion handled below
-        }, providerName);
-        // Show dialog in editor container
-        this.editorContainer.clear();
-        this.editorContainer.addChild(dialog);
-        this.ui.setFocus(dialog);
-        this.ui.requestRender();
-        // Promise for manual code input (racing with callback server)
-        let manualCodeResolve;
-        let manualCodeReject;
-        const manualCodePromise = new Promise((resolve, reject) => {
-            manualCodeResolve = resolve;
-            manualCodeReject = reject;
-        });
-        // Restore editor helper
-        const restoreEditor = () => {
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
-            this.ui.setFocus(this.editor);
-            this.ui.requestRender();
-        };
-        try {
-            await this.session.modelRegistry.authStorage.login(providerId, {
-                onAuth: (info) => {
-                    dialog.showAuth(info.url, info.instructions);
-                    if (usesCallbackServer) {
-                        // Show input for manual paste, racing with callback
-                        dialog
-                            .showManualInput("Paste redirect URL below, or complete login in browser:")
-                            .then((value) => {
-                            if (value && manualCodeResolve) {
-                                manualCodeResolve(value);
-                                manualCodeResolve = undefined;
-                            }
-                        })
-                            .catch(() => {
-                            if (manualCodeReject) {
-                                manualCodeReject(new Error("Login cancelled"));
-                                manualCodeReject = undefined;
-                            }
-                        });
-                    }
-                    else if (providerId === "github-copilot") {
-                        // GitHub Copilot polls after onAuth
-                        dialog.showWaiting("Waiting for browser authentication...");
-                    }
-                    // For Anthropic: onPrompt is called immediately after
-                },
-                onPrompt: async (prompt) => {
-                    return dialog.showPrompt(prompt.message, prompt.placeholder);
-                },
-                onProgress: (message) => {
-                    dialog.showProgress(message);
-                },
-                onSelect: (prompt) => this.showOAuthLoginSelect(dialog, prompt),
-                onManualCodeInput: () => manualCodePromise,
-                signal: dialog.signal,
-            });
-            // Success
-            restoreEditor();
-            await this.completeProviderAuthentication(providerId, providerName, "oauth", previousModel);
-        }
-        catch (error) {
-            restoreEditor();
-            const errorMsg = error instanceof Error ? error.message : String(error);
-            if (errorMsg !== "Login cancelled") {
-                this.showError(`Failed to login to ${providerName}: ${errorMsg}`);
-            }
-        }
-    }
     // =========================================================================
     // Command handlers
     // =========================================================================
@@ -3316,77 +2699,6 @@ export class InteractiveMode {
             this.showError(`Reload failed: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
-    /**
-     * Get capitalized display string for an app keybinding action.
-     */
-    getAppKeyDisplay(action) {
-        return keyDisplayText(action);
-    }
-    async handleBashCommand(command, excludeFromContext = false) {
-        const extensionRunner = this.session.extensionRunner;
-        // Emit user_bash event to let extensions intercept
-        const eventResult = await extensionRunner.emitUserBash({
-            type: "user_bash",
-            command,
-            excludeFromContext,
-            cwd: this.sessionManager.getCwd(),
-        });
-        // If extension returned a full result, use it directly
-        if (eventResult?.result) {
-            const result = eventResult.result;
-            // Create UI component for display
-            this.bashComponent = new BashExecutionComponent(command, this.ui, excludeFromContext);
-            if (this.session.isStreaming) {
-                this.pendingMessagesContainer.addChild(this.bashComponent);
-                this.pendingBashComponents.push(this.bashComponent);
-            }
-            else {
-                this.chatContainer.addChild(this.bashComponent);
-            }
-            // Show output and complete
-            if (result.output) {
-                this.bashComponent.appendOutput(result.output);
-            }
-            this.bashComponent.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true, content: result.output } : undefined, result.fullOutputPath);
-            // Record the result in session
-            this.session.recordBashResult(command, result, { excludeFromContext });
-            this.bashComponent = undefined;
-            this.ui.requestRender();
-            return;
-        }
-        // Normal execution path (possibly with custom operations)
-        const isDeferred = this.session.isStreaming;
-        this.bashComponent = new BashExecutionComponent(command, this.ui, excludeFromContext);
-        if (isDeferred) {
-            // Show in pending area when agent is streaming
-            this.pendingMessagesContainer.addChild(this.bashComponent);
-            this.pendingBashComponents.push(this.bashComponent);
-        }
-        else {
-            // Show in chat immediately when agent is idle
-            this.chatContainer.addChild(this.bashComponent);
-        }
-        this.ui.requestRender();
-        try {
-            const result = await this.session.executeBash(command, (chunk) => {
-                if (this.bashComponent) {
-                    this.bashComponent.appendOutput(chunk);
-                    this.ui.requestRender();
-                }
-            }, { excludeFromContext, operations: eventResult?.operations });
-            if (this.bashComponent) {
-                this.bashComponent.setComplete(result.exitCode, result.cancelled, result.truncated ? { truncated: true, content: result.output } : undefined, result.fullOutputPath);
-            }
-        }
-        catch (error) {
-            if (this.bashComponent) {
-                this.bashComponent.setComplete(undefined, false);
-            }
-            this.showError(`Bash command failed: ${error instanceof Error ? error.message : "Unknown error"}`);
-        }
-        this.bashComponent = undefined;
-        this.ui.requestRender();
-    }
     async handleCompactCommand(customInstructions) {
         // The session is the single source of truth for whether compaction is
         // possible (e.g. "Already compacted", "Nothing to compact (session too