@kolisachint/hoocode-agent 0.4.106 → 0.4.108

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

@@ -6,32 +6,25 @@ import * as crypto from "node:crypto";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-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 { spawn, spawnSync } from "child_process";
-import { APP_NAME, APP_TITLE, getAgentDir, getAuthPath, getDocsPath, VERSION } from "../../config.js";
+import { createCompactionSummaryMessage } from "@kolisachint/hoocode-agent-core";
+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, 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 { createCompactionSummaryMessage } from "../../core/messages.js";
-import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope } from "../../core/model-resolver.js";
-import { DefaultPackageManager } from "../../core/package-manager.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";
 import { taskStore } from "../../core/task-store.js";
-import { TeamApprovalCoordinator } from "../../core/team-approvals.js";
 import { buildCompactWordmark } from "../../core/wordmark.js";
-import { getChangelogPath, getNewEntries, parseChangelog } from "../../utils/changelog.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
-import { getCwdRelativePath } from "../../utils/paths.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 { AskOptionsComponent } from "./components/ask-options.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
 import { BranchSummaryMessageComponent } from "./components/branch-summary-message.js";
@@ -39,44 +32,28 @@ import { CompactionSummaryMessageComponent } from "./components/compaction-summa
 import { CountdownTimer } from "./components/countdown-timer.js";
 import { CustomEditor } from "./components/custom-editor.js";
 import { CustomMessageComponent } from "./components/custom-message.js";
-import { DaxnutsComponent } from "./components/daxnuts.js";
 import { DynamicBorder } from "./components/dynamic-border.js";
-import { ExtensionEditorComponent } from "./components/extension-editor.js";
-import { ExtensionInputComponent } from "./components/extension-input.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";
 import { TaskPanelComponent } from "./components/task-panel.js";
-import { TeamAttachPanelComponent } from "./components/team-attach-panel.js";
 import { ToolExecutionComponent } from "./components/tool-execution.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
-import { VoicePanel } from "./components/voice-panel.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 { startVoiceTranscribe, VoiceDaemon } from "./voice-transcribe.js";
-function isExpandable(obj) {
-    return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
-}
-class ExpandableText extends Text {
-    getCollapsedText;
-    getExpandedText;
-    constructor(getCollapsedText, getExpandedText, expanded = false, paddingX = 0, paddingY = 0) {
-        super(expanded ? getExpandedText() : getCollapsedText(), paddingX, paddingY);
-        this.getCollapsedText = getCollapsedText;
-        this.getExpandedText = getExpandedText;
-    }
-    setExpanded(expanded) {
-        this.setText(expanded ? this.getExpandedText() : this.getCollapsedText());
-    }
-}
+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)) {
@@ -85,39 +62,6 @@ function isDeadTerminalError(error) {
     const code = error.code;
     return code !== undefined && DEAD_TERMINAL_ERROR_CODES.has(code);
 }
-// Trailing-silence window: how long a pause while speaking lasts before the
-// capture auto-stops. Passed to `voicetools serve` via `--silence-ms` (see
-// VoiceDaemon.spawn) so the binary's real cutoff matches the on-screen
-// countdown this same value drives. Kept generous so a thinking pause mid-
-// sentence doesn't cut the user off (the binary's own default is 600ms).
-const VOICE_SILENCE_MS = 3000;
-/** How long to keep the warm voice model in memory after the last capture
- * completes. The daemon auto-shuts down after this window, releasing the
- * ~900 MB resident model; the next ctrl+r pays a cold-start respawn cost. */
-const VOICE_IDLE_TIMEOUT_MS = 60_000;
-const VOICE_UNAVAILABLE_MESSAGE = "Voice input failed: voicetools binary unavailable and could not be downloaded. " +
-    "Install it, set VOICETOOLS_BIN, or ensure a published release exists for this platform.";
-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;
@@ -128,19 +72,7 @@ export class InteractiveMode {
     defaultEditor;
     editor;
     editorComponentFactory;
-    voiceSession;
-    // Persistent `voicetools serve` process, once probed successfully. Stays alive
-    // (and warm) across captures for the life of the interactive session.
-    voiceDaemon;
-    // Sticky for the session: set once `serve` is confirmed unsupported (old binary)
-    // so later presses skip straight to the per-press `transcribe` fallback.
-    voiceDaemonUnsupported = false;
-    /** True while the voicetools binary is being resolved/downloaded before a session starts. */
-    voiceStarting = false;
-    /** True while a capture (daemon or legacy) is in flight. */
-    voiceActive = false;
-    /** The live multi-line status panel for the current capture (undefined when idle). */
-    voicePanel;
+    voice;
     autocompleteProvider;
     autocompleteProviderWrappers = [];
     fdPath;
@@ -163,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;
@@ -185,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;
@@ -196,35 +123,31 @@ export class InteractiveMode {
     retryLoader = undefined;
     retryCountdown = undefined;
     retryEscapeHandler;
-    // Messages queued while compaction is running
-    compactionQueuedMessages = [];
     // Shutdown state
     shutdownRequested = false;
     // Extension UI state
-    extensionSelector = undefined;
-    extensionInput = undefined;
-    askOptions = undefined;
-    extensionEditor = undefined;
+    dialogs;
     extensionTerminalInputUnsubscribers = new Set();
     // Extension widgets (components rendered above/below the editor)
-    extensionWidgetsAbove = new Map();
-    extensionWidgetsBelow = new Map();
+    chrome;
     widgetContainerAbove;
     widgetContainerBelow;
     // Task panel shown just above the editor (active subagent tasks)
     taskPanel;
     // hooteams team client (--team): steering + attach share its single SSE stream
-    teamClient = undefined;
-    teamAttachPanel = undefined;
-    teamAttachHandle = undefined;
-    // Custom footer from extension (undefined = use built-in footer)
-    customFooter = undefined;
+    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)
     builtInHeader = undefined;
-    // Custom header from extension (undefined = use built-in header)
-    customHeader = undefined;
     // Convenience accessors
     get session() {
         return this.runtimeHost.session;
@@ -277,11 +200,10 @@ export class InteractiveMode {
                 rebuildChatFromMessages: () => self.rebuildChatFromMessages(),
                 getMarkdownThemeWithSettings: () => self.getMarkdownThemeWithSettings(),
                 stopLoadingAnimation: () => self.stopLoadingAnimation(),
-                findExactModelMatch: (searchTerm) => self.findExactModelMatch(searchTerm),
-                maybeWarnAboutAnthropicSubscriptionAuth: (model) => self.maybeWarnAboutAnthropicSubscriptionAuth(model),
-                checkDaxnutsEasterEgg: (model) => self.checkDaxnutsEasterEgg(model),
-                showModelSelector: (searchTerm) => self.showModelSelector(searchTerm),
-                showExtensionConfirm: (title, message) => self.showExtensionConfirm(title, message),
+                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),
             };
@@ -338,10 +260,89 @@ export class InteractiveMode {
         this.footer = new FooterComponent(this.session, this.footerDataProvider);
         this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
         this.footerDataProvider.setSubagentEnabled(this.session.getActiveToolNames().includes("Task"));
+        this.chrome = new ExtensionChrome({
+            ui: this.ui,
+            widgetContainerAbove: this.widgetContainerAbove,
+            widgetContainerBelow: this.widgetContainerBelow,
+            headerContainer: this.headerContainer,
+            footer: this.footer,
+            footerDataProvider: this.footerDataProvider,
+            getBuiltInHeader: () => this.builtInHeader,
+            isToolOutputExpanded: () => this.toolOutputExpanded,
+        });
         this.taskPanel = new TaskPanelComponent(this.ui);
-        this.taskPanel.onNudge = (role) => this.showTeamNudgeInput(role);
-        this.taskPanel.onAttach = (role) => this.showTeamAttach(role);
-        this.taskPanel.onExitFocus = () => this.exitTeamFocus();
+        this.dialogs = new ExtensionDialogs({
+            ui: this.ui,
+            editorContainer: this.editorContainer,
+            keybindings: this.keybindings,
+            getEditor: () => this.editor,
+        });
+        this.teamFocus = new TeamFocusController({
+            ui: this.ui,
+            taskPanel: this.taskPanel,
+            editorContainer: this.editorContainer,
+            getEditor: () => this.editor,
+            showStatus: (message) => this.showStatus(message),
+            showWarning: (message) => this.showWarning(message),
+            showAskOptions: (questions, opts) => this.dialogs.showAskOptions(questions, opts),
+            isAskOptionsOpen: () => this.dialogs.isAskOptionsOpen(),
+        });
+        this.voice = new VoiceController({
+            ui: this.ui,
+            statusContainer: this.statusContainer,
+            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();
         // Load hide thinking block setting
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
         // Register themes from resource loader and initialize
@@ -492,7 +493,10 @@ export class InteractiveMode {
             return;
         this.registerSignalHandlers();
         // Load changelog (only show new entries, skip for resumed sessions)
-        this.changelogMarkdown = this.getChangelogForDisplay();
+        this.changelogMarkdown = getChangelogForDisplay({
+            hasMessages: this.session.state.messages.length > 0,
+            settingsManager: this.settingsManager,
+        });
         // Ensure fd and rg are available (downloads if missing, adds to PATH via getBinDir)
         // Both are needed: fd for autocomplete, rg for grep tool and bash commands
         const [fdPath] = await Promise.all([ensureTool("fd"), ensureTool("rg")]);
@@ -506,7 +510,7 @@ export class InteractiveMode {
                 ? buildCompactWordmark({
                     appName: APP_NAME,
                     version: this.version,
-                    cwd: this.formatDisplayPath(this.sessionManager.getCwd()),
+                    cwd: formatDisplayPath(this.sessionManager.getCwd()),
                     accent: (text) => theme.fg("accent", text),
                     dim: (text) => theme.fg("dim", text),
                     muted: (text) => theme.fg("muted", text),
@@ -529,7 +533,7 @@ export class InteractiveMode {
                 hint("app.tools.expand", "to expand tools"),
                 hint("app.thinking.toggle", "to expand thinking"),
                 hint("app.tasks.cycleView", "to cycle task panel view"),
-                ...(this.teamClient ? [hint("app.team.focus", "to focus team roster")] : []),
+                ...(this.teamFocus.connected ? [hint("app.team.focus", "to focus team roster")] : []),
                 hint("app.editor.external", "for external editor"),
                 rawKeyHint("/", "for commands"),
                 rawKeyHint("!", "to run bash"),
@@ -552,7 +556,7 @@ export class InteractiveMode {
         this.ui.addChild(this.chatContainer);
         this.ui.addChild(this.pendingMessagesContainer);
         this.ui.addChild(this.statusContainer);
-        this.renderWidgets(); // Initialize with default spacer
+        this.chrome.renderWidgets(); // Initialize with default spacer
         this.ui.addChild(this.widgetContainerAbove);
         this.ui.addChild(this.taskPanel);
         this.ui.addChild(this.editorContainer);
@@ -583,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.
@@ -611,13 +615,13 @@ export class InteractiveMode {
             }
         });
         // Start package update check asynchronously
-        this.checkForPackageUpdates().then((updates) => {
+        checkForPackageUpdates(this.sessionManager.getCwd(), this.settingsManager).then((updates) => {
             if (updates.length > 0) {
                 this.showPackageUpdateNotification(updates);
             }
         });
         // Check tmux keyboard setup asynchronously
-        this.checkTmuxKeyboardSetup().then((warning) => {
+        checkTmuxKeyboardSetup().then((warning) => {
             if (warning) {
                 this.showWarning(warning);
             }
@@ -634,7 +638,7 @@ export class InteractiveMode {
         if (modelFallbackMessage) {
             this.showWarning(modelFallbackMessage);
         }
-        void this.maybeWarnAboutAnthropicSubscriptionAuth();
+        void this.modelController.maybeWarnAboutAnthropicSubscriptionAuth();
         // Process initial messages
         if (initialMessage) {
             try {
@@ -668,98 +672,6 @@ export class InteractiveMode {
             }
         }
     }
-    async checkForPackageUpdates() {
-        if (process.env.HOOCODE_OFFLINE ?? process.env.PI_OFFLINE) {
-            return [];
-        }
-        try {
-            const packageManager = new DefaultPackageManager({
-                cwd: this.sessionManager.getCwd(),
-                agentDir: getAgentDir(),
-                settingsManager: this.settingsManager,
-            });
-            const updates = await packageManager.checkForAvailableUpdates();
-            return updates.map((update) => update.displayName);
-        }
-        catch {
-            return [];
-        }
-    }
-    async checkTmuxKeyboardSetup() {
-        if (!process.env.TMUX)
-            return undefined;
-        const runTmuxShow = (option) => {
-            return new Promise((resolve) => {
-                const proc = spawn("tmux", ["show", "-gv", option], {
-                    stdio: ["ignore", "pipe", "ignore"],
-                });
-                let stdout = "";
-                const timer = setTimeout(() => {
-                    proc.kill();
-                    resolve(undefined);
-                }, 2000);
-                proc.stdout?.on("data", (data) => {
-                    stdout += data.toString();
-                });
-                proc.on("error", () => {
-                    clearTimeout(timer);
-                    resolve(undefined);
-                });
-                proc.on("close", (code) => {
-                    clearTimeout(timer);
-                    resolve(code === 0 ? stdout.trim() : undefined);
-                });
-            });
-        };
-        const [extendedKeys, extendedKeysFormat] = await Promise.all([
-            runTmuxShow("extended-keys"),
-            runTmuxShow("extended-keys-format"),
-        ]);
-        // If we couldn't query tmux (timeout, sandbox, etc.), don't warn
-        if (extendedKeys === undefined)
-            return undefined;
-        if (extendedKeys !== "on" && extendedKeys !== "always") {
-            return "tmux extended-keys is off. Modified Enter keys may not work. Add `set -g extended-keys on` to ~/.tmux.conf and restart tmux.";
-        }
-        if (extendedKeysFormat === "xterm") {
-            return `tmux extended-keys-format is xterm. ${APP_NAME} works best with csi-u. Add \`set -g extended-keys-format csi-u\` to ~/.tmux.conf and restart tmux.`;
-        }
-        return undefined;
-    }
-    /**
-     * Get changelog entries to display on startup.
-     * Only shows new entries since last seen version, skips for resumed sessions.
-     */
-    getChangelogForDisplay() {
-        // Skip changelog for resumed/continued sessions (already have messages)
-        if (this.session.state.messages.length > 0) {
-            return undefined;
-        }
-        const lastVersion = this.settingsManager.getLastChangelogVersion();
-        const changelogPath = getChangelogPath();
-        const entries = parseChangelog(changelogPath);
-        if (!lastVersion) {
-            // Fresh install - record the latest entry's version (not VERSION, which may
-            // overshoot the latest entry and silently swallow it once it appears).
-            // Fall back to VERSION only if no entries exist yet.
-            const seedVersion = entries.length > 0 ? `${entries[0].major}.${entries[0].minor}.${entries[0].patch}` : VERSION;
-            this.settingsManager.setLastChangelogVersion(seedVersion);
-            this.reportInstallTelemetry(seedVersion);
-            return undefined;
-        }
-        const newEntries = getNewEntries(entries, lastVersion);
-        if (newEntries.length > 0) {
-            const latest = newEntries[0];
-            const latestVersion = `${latest.major}.${latest.minor}.${latest.patch}`;
-            this.settingsManager.setLastChangelogVersion(latestVersion);
-            this.reportInstallTelemetry(latestVersion);
-            return newEntries.map((e) => e.content).join("\n\n");
-        }
-        return undefined;
-    }
-    reportInstallTelemetry(_version) {
-        // Disabled in HooCode fork: this is forked from pi (upstream pi.dev install-telemetry endpoint is not run by this fork).
-    }
     getMarkdownThemeWithSettings() {
         return {
             ...getMarkdownTheme(),
@@ -769,475 +681,24 @@ export class InteractiveMode {
     // =========================================================================
     // Extension System
     // =========================================================================
-    formatDisplayPath(p) {
-        const home = os.homedir();
-        let result = p;
-        // Replace home directory with ~
-        if (result.startsWith(home)) {
-            result = `~${result.slice(home.length)}`;
-        }
-        return result;
-    }
-    formatExtensionDisplayPath(path) {
-        let result = this.formatDisplayPath(path);
-        result = result.replace(/\/index\.ts$/, "").replace(/\/index\.js$/, "");
-        return result;
-    }
-    formatContextPath(p) {
-        const cwd = path.resolve(this.sessionManager.getCwd());
-        const absolutePath = path.isAbsolute(p) ? path.resolve(p) : path.resolve(cwd, p);
-        const relativePath = getCwdRelativePath(absolutePath, cwd);
-        if (relativePath !== undefined) {
-            return relativePath;
-        }
-        return this.formatDisplayPath(absolutePath);
-    }
     getStartupExpansionState() {
         return this.options.verbose || this.toolOutputExpanded;
     }
-    /**
-     * Get a short path relative to the package root for display.
-     */
-    getShortPath(fullPath, sourceInfo) {
-        const baseDir = sourceInfo?.baseDir;
-        if (baseDir && this.isPackageSource(sourceInfo)) {
-            const relativePath = path.relative(path.resolve(baseDir), path.resolve(fullPath));
-            if (relativePath &&
-                relativePath !== "." &&
-                !relativePath.startsWith("..") &&
-                !relativePath.startsWith(`..${path.sep}`) &&
-                !path.isAbsolute(relativePath)) {
-                return relativePath.replace(/\\/g, "/");
-            }
-        }
-        const source = sourceInfo?.source ?? "";
-        const npmMatch = fullPath.match(/node_modules\/(@?[^/]+(?:\/[^/]+)?)\/(.*)/);
-        if (npmMatch && source.startsWith("npm:")) {
-            return npmMatch[2];
-        }
-        const gitMatch = fullPath.match(/git\/[^/]+\/[^/]+\/(.*)/);
-        if (gitMatch && source.startsWith("git:")) {
-            return gitMatch[1];
-        }
-        return this.formatDisplayPath(fullPath);
-    }
-    getCompactPathLabel(resourcePath, sourceInfo) {
-        const shortPath = this.getShortPath(resourcePath, sourceInfo);
-        const normalizedPath = shortPath.replace(/\\/g, "/");
-        const segments = normalizedPath.split("/").filter((segment) => segment.length > 0 && segment !== "~");
-        if (segments.length > 0) {
-            return segments[segments.length - 1];
-        }
-        return shortPath;
-    }
-    getCompactPackageSourceLabel(sourceInfo) {
-        const source = sourceInfo?.source ?? "";
-        if (source.startsWith("npm:")) {
-            return source.slice("npm:".length) || source;
-        }
-        const gitSource = parseGitUrl(source);
-        if (gitSource) {
-            return gitSource.path || source;
-        }
-        return source;
-    }
-    getCompactExtensionLabel(resourcePath, sourceInfo) {
-        if (!this.isPackageSource(sourceInfo)) {
-            return this.getCompactPathLabel(resourcePath, sourceInfo);
-        }
-        const sourceLabel = this.getCompactPackageSourceLabel(sourceInfo);
-        if (!sourceLabel) {
-            return this.getCompactPathLabel(resourcePath, sourceInfo);
-        }
-        const shortPath = this.getShortPath(resourcePath, sourceInfo).replace(/\\/g, "/");
-        const packagePath = shortPath.startsWith("extensions/") ? shortPath.slice("extensions/".length) : shortPath;
-        const parsedPath = path.posix.parse(packagePath);
-        if (parsedPath.name === "index") {
-            return !parsedPath.dir || parsedPath.dir === "." ? sourceLabel : `${sourceLabel}:${parsedPath.dir}`;
-        }
-        return `${sourceLabel}:${packagePath}`;
-    }
-    getCompactDisplayPathSegments(resourcePath) {
-        return this.formatDisplayPath(resourcePath)
-            .replace(/\\/g, "/")
-            .split("/")
-            .filter((segment) => segment.length > 0 && segment !== "~");
-    }
-    getCompactNonPackageExtensionLabel(resourcePath, index, allPaths) {
-        const segments = allPaths[index]?.segments;
-        if (!segments || segments.length === 0) {
-            return this.getCompactPathLabel(resourcePath);
-        }
-        for (let segmentCount = 1; segmentCount <= segments.length; segmentCount += 1) {
-            const candidate = segments.slice(-segmentCount).join("/");
-            const isUnique = allPaths.every((item, itemIndex) => {
-                if (itemIndex === index) {
-                    return true;
-                }
-                return item.segments.slice(-segmentCount).join("/") !== candidate;
-            });
-            if (isUnique) {
-                return candidate;
-            }
-        }
-        return segments.join("/");
-    }
-    getCompactExtensionLabels(extensions) {
-        const nonPackageExtensions = extensions
-            .map((extension) => {
-            const segments = this.getCompactDisplayPathSegments(extension.path);
-            const lastSegment = segments[segments.length - 1];
-            if (segments.length > 1 && (lastSegment === "index.ts" || lastSegment === "index.js")) {
-                segments.pop();
-            }
-            return {
-                path: extension.path,
-                sourceInfo: extension.sourceInfo,
-                segments,
-            };
-        })
-            .filter((extension) => !this.isPackageSource(extension.sourceInfo));
-        return extensions.map((extension) => {
-            if (extension.displayName) {
-                return extension.displayName;
-            }
-            if (this.isPackageSource(extension.sourceInfo)) {
-                return this.getCompactExtensionLabel(extension.path, extension.sourceInfo);
-            }
-            const nonPackageIndex = nonPackageExtensions.findIndex((item) => item.path === extension.path);
-            if (nonPackageIndex === -1) {
-                return this.getCompactPathLabel(extension.path, extension.sourceInfo);
-            }
-            return this.getCompactNonPackageExtensionLabel(extension.path, nonPackageIndex, nonPackageExtensions);
-        });
-    }
-    getDisplaySourceInfo(sourceInfo) {
-        const source = sourceInfo?.source ?? "local";
-        const scope = sourceInfo?.scope ?? "project";
-        if (source === "local") {
-            if (scope === "user") {
-                return { label: "user", color: "muted" };
-            }
-            if (scope === "project") {
-                return { label: "project", color: "muted" };
-            }
-            if (scope === "temporary") {
-                return { label: "path", scopeLabel: "temp", color: "muted" };
-            }
-            return { label: "path", color: "muted" };
-        }
-        if (source === "cli") {
-            return { label: "path", scopeLabel: scope === "temporary" ? "temp" : undefined, color: "muted" };
-        }
-        const scopeLabel = scope === "user" ? "user" : scope === "project" ? "project" : scope === "temporary" ? "temp" : undefined;
-        return { label: source, scopeLabel, color: "accent" };
-    }
-    getScopeGroup(sourceInfo) {
-        const source = sourceInfo?.source ?? "local";
-        const scope = sourceInfo?.scope ?? "project";
-        if (source === "cli" || scope === "temporary")
-            return "path";
-        if (scope === "user")
-            return "user";
-        if (scope === "project")
-            return "project";
-        return "path";
-    }
-    isPackageSource(sourceInfo) {
-        const source = sourceInfo?.source ?? "";
-        return source.startsWith("npm:") || source.startsWith("git:");
-    }
-    buildScopeGroups(items) {
-        const groups = {
-            user: { scope: "user", paths: [], packages: new Map() },
-            project: { scope: "project", paths: [], packages: new Map() },
-            path: { scope: "path", paths: [], packages: new Map() },
-        };
-        for (const item of items) {
-            const groupKey = this.getScopeGroup(item.sourceInfo);
-            const group = groups[groupKey];
-            const source = item.sourceInfo?.source ?? "local";
-            if (this.isPackageSource(item.sourceInfo)) {
-                const list = group.packages.get(source) ?? [];
-                list.push(item);
-                group.packages.set(source, list);
-            }
-            else {
-                group.paths.push(item);
-            }
-        }
-        return [groups.project, groups.user, groups.path].filter((group) => group.paths.length > 0 || group.packages.size > 0);
-    }
-    formatScopeGroups(groups, options) {
-        const lines = [];
-        for (const group of groups) {
-            lines.push(`  ${theme.fg("accent", group.scope)}`);
-            const sortedPaths = [...group.paths].sort((a, b) => a.path.localeCompare(b.path));
-            for (const item of sortedPaths) {
-                lines.push(theme.fg("dim", `    ${options.formatPath(item)}`));
-            }
-            const sortedPackages = Array.from(group.packages.entries()).sort(([a], [b]) => a.localeCompare(b));
-            for (const [source, items] of sortedPackages) {
-                lines.push(`    ${theme.fg("mdLink", source)}`);
-                const sortedPackagePaths = [...items].sort((a, b) => a.path.localeCompare(b.path));
-                for (const item of sortedPackagePaths) {
-                    lines.push(theme.fg("dim", `      ${options.formatPackagePath(item, source)}`));
-                }
-            }
-        }
-        return lines.join("\n");
-    }
-    findSourceInfoForPath(p, sourceInfos) {
-        const exact = sourceInfos.get(p);
-        if (exact)
-            return exact;
-        let current = p;
-        while (current.includes("/")) {
-            current = current.substring(0, current.lastIndexOf("/"));
-            const parent = sourceInfos.get(current);
-            if (parent)
-                return parent;
-        }
-        return undefined;
-    }
-    formatPathWithSource(p, sourceInfo) {
-        if (sourceInfo) {
-            const shortPath = this.getShortPath(p, sourceInfo);
-            const { label, scopeLabel } = this.getDisplaySourceInfo(sourceInfo);
-            const labelText = scopeLabel ? `${label} (${scopeLabel})` : label;
-            return `${labelText} ${shortPath}`;
-        }
-        return this.formatDisplayPath(p);
-    }
-    formatDiagnostics(diagnostics, sourceInfos) {
-        const lines = [];
-        // Group collision diagnostics by name
-        const collisions = new Map();
-        const otherDiagnostics = [];
-        for (const d of diagnostics) {
-            if (d.type === "collision" && d.collision) {
-                const list = collisions.get(d.collision.name) ?? [];
-                list.push(d);
-                collisions.set(d.collision.name, list);
-            }
-            else {
-                otherDiagnostics.push(d);
-            }
-        }
-        // Format collision diagnostics grouped by name
-        for (const [name, collisionList] of collisions) {
-            const first = collisionList[0]?.collision;
-            if (!first)
-                continue;
-            lines.push(theme.fg("warning", `  "${name}" collision:`));
-            lines.push(theme.fg("dim", `    ${theme.fg("success", "✓")} ${this.formatPathWithSource(first.winnerPath, this.findSourceInfoForPath(first.winnerPath, sourceInfos))}`));
-            for (const d of collisionList) {
-                if (d.collision) {
-                    lines.push(theme.fg("dim", `    ${theme.fg("warning", "✗")} ${this.formatPathWithSource(d.collision.loserPath, this.findSourceInfoForPath(d.collision.loserPath, sourceInfos))} (skipped)`));
-                }
-            }
-        }
-        for (const d of otherDiagnostics) {
-            if (d.path) {
-                const formattedPath = this.formatPathWithSource(d.path, this.findSourceInfoForPath(d.path, sourceInfos));
-                lines.push(theme.fg(d.type === "error" ? "error" : "warning", `  ${formattedPath}`));
-                lines.push(theme.fg(d.type === "error" ? "error" : "warning", `    ${d.message}`));
-            }
-            else {
-                lines.push(theme.fg(d.type === "error" ? "error" : "warning", `  ${d.message}`));
-            }
-        }
-        return lines.join("\n");
-    }
+    /** Render the startup/reload resource listing (see resource-display.ts). */
     showLoadedResources(options) {
-        const showListing = options?.force || this.options.verbose || !this.settingsManager.getQuietStartup();
-        const showDiagnostics = showListing || options?.showDiagnosticsWhenQuiet === true;
-        if (!showListing && !showDiagnostics) {
-            return;
-        }
-        const sectionHeader = (name, color = "mdHeading") => theme.fg(color, `[${name}]`);
-        const formatCompactList = (items, options) => {
-            const labels = items.map((item) => item.trim()).filter((item) => item.length > 0);
-            if (options?.sort !== false) {
-                labels.sort((a, b) => a.localeCompare(b));
-            }
-            return theme.fg("dim", `  ${labels.join(", ")}`);
-        };
-        const addLoadedSection = (name, collapsedBody, expandedBody = collapsedBody, color = "mdHeading") => {
-            const section = new ExpandableText(() => `${sectionHeader(name, color)}\n${collapsedBody}`, () => `${sectionHeader(name, color)}\n${expandedBody}`, this.getStartupExpansionState(), 0, 0);
-            this.chatContainer.addChild(section);
-            this.chatContainer.addChild(new Spacer(1));
-        };
-        const skillsResult = this.session.resourceLoader.getSkills();
-        const promptsResult = this.session.resourceLoader.getPrompts();
-        const themesResult = this.session.resourceLoader.getThemes();
-        const extensions = options?.extensions ??
-            this.session.resourceLoader
-                .getExtensions()
-                .extensions.filter((extension) => !extension.internal)
-                .map((extension) => ({
-                path: extension.path,
-                sourceInfo: extension.sourceInfo,
-                displayName: extension.displayName,
-            }));
-        const sourceInfos = new Map();
-        for (const extension of extensions) {
-            if (extension.sourceInfo) {
-                sourceInfos.set(extension.path, extension.sourceInfo);
-            }
-        }
-        for (const skill of skillsResult.skills) {
-            if (skill.sourceInfo) {
-                sourceInfos.set(skill.filePath, skill.sourceInfo);
-            }
-        }
-        for (const prompt of promptsResult.prompts) {
-            if (prompt.sourceInfo) {
-                sourceInfos.set(prompt.filePath, prompt.sourceInfo);
-            }
-        }
-        for (const loadedTheme of themesResult.themes) {
-            if (loadedTheme.sourcePath && loadedTheme.sourceInfo) {
-                sourceInfos.set(loadedTheme.sourcePath, loadedTheme.sourceInfo);
-            }
-        }
-        if (showListing) {
-            this.chatContainer.addChild(new Spacer(1));
-            const { agentsFiles: contextFiles, warnings: contextWarnings } = this.session.resourceLoader.getAgentsFiles();
-            const skills = skillsResult.skills;
-            const templates = this.session.promptTemplates;
-            const loadedThemes = themesResult.themes;
-            const customThemes = loadedThemes.filter((t) => t.sourcePath);
-            const totalItems = contextFiles.length + skills.length + templates.length + extensions.length + customThemes.length;
-            // Meta items: active mode and subagent system prompt (always shown)
-            const metaItems = [];
-            const rawMode = this.footerDataProvider.getActiveMode().replace(" + subagent", "");
-            metaItems.push(`mode/${rawMode}`);
-            if (this.footerDataProvider.getSubagentEnabled()) {
-                metaItems.push("subagent_system_prompt");
-            }
-            if (totalItems > 0 && totalItems <= 5) {
-                const allCompactItems = [...metaItems];
-                if (contextFiles.length > 0) {
-                    allCompactItems.push(...contextFiles.map((contextFile) => this.formatContextPath(contextFile.path)));
-                }
-                if (skills.length > 0) {
-                    allCompactItems.push(...skills.map((skill) => skill.name));
-                }
-                if (templates.length > 0) {
-                    allCompactItems.push(...templates.map((template) => `/${template.name}`));
-                }
-                if (extensions.length > 0) {
-                    allCompactItems.push(...this.getCompactExtensionLabels(extensions));
-                }
-                if (customThemes.length > 0) {
-                    allCompactItems.push(...customThemes.map((loadedTheme) => loadedTheme.name ?? this.getCompactPathLabel(loadedTheme.sourcePath, loadedTheme.sourceInfo)));
-                }
-                this.chatContainer.addChild(new Text(`${theme.fg("mdHeading", "[Resources]")} ${theme.fg("dim", allCompactItems.join(", "))}`, 0, 0));
-            }
-            else if (totalItems === 0) {
-                this.chatContainer.addChild(new Text(`${theme.fg("mdHeading", "[Resources]")} ${theme.fg("dim", metaItems.join(", "))}`, 0, 0));
-            }
-            else {
-                addLoadedSection("Resources", formatCompactList(metaItems), formatCompactList(metaItems));
-                if (contextFiles.length > 0) {
-                    this.chatContainer.addChild(new Spacer(1));
-                    const contextList = contextFiles
-                        .map((f) => theme.fg("dim", `  ${this.formatDisplayPath(f.path)}`))
-                        .join("\n");
-                    const contextCompactList = formatCompactList(contextFiles.map((contextFile) => this.formatContextPath(contextFile.path)), { sort: false });
-                    addLoadedSection("Context", contextCompactList, contextList);
-                }
-                if (skills.length > 0) {
-                    const groups = this.buildScopeGroups(skills.map((skill) => ({ path: skill.filePath, sourceInfo: skill.sourceInfo })));
-                    const skillList = this.formatScopeGroups(groups, {
-                        formatPath: (item) => this.formatDisplayPath(item.path),
-                        formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
-                    });
-                    const skillCompactList = formatCompactList(skills.map((skill) => skill.name));
-                    addLoadedSection("Skills", skillCompactList, skillList);
-                }
-                if (templates.length > 0) {
-                    const groups = this.buildScopeGroups(templates.map((template) => ({ path: template.filePath, sourceInfo: template.sourceInfo })));
-                    const templateByPath = new Map(templates.map((t) => [t.filePath, t]));
-                    const templateList = this.formatScopeGroups(groups, {
-                        formatPath: (item) => {
-                            const template = templateByPath.get(item.path);
-                            return template ? `/${template.name}` : this.formatDisplayPath(item.path);
-                        },
-                        formatPackagePath: (item) => {
-                            const template = templateByPath.get(item.path);
-                            return template ? `/${template.name}` : this.formatDisplayPath(item.path);
-                        },
-                    });
-                    const promptCompactList = formatCompactList(templates.map((template) => `/${template.name}`));
-                    addLoadedSection("Prompts", promptCompactList, templateList);
-                }
-                if (extensions.length > 0) {
-                    const groups = this.buildScopeGroups(extensions);
-                    const extList = this.formatScopeGroups(groups, {
-                        formatPath: (item) => item.displayName ?? this.formatExtensionDisplayPath(item.path),
-                        formatPackagePath: (item) => item.displayName ?? this.formatExtensionDisplayPath(this.getShortPath(item.path, item.sourceInfo)),
-                    });
-                    const extensionCompactList = formatCompactList(this.getCompactExtensionLabels(extensions));
-                    addLoadedSection("Extensions", extensionCompactList, extList, "mdHeading");
-                }
-                if (customThemes.length > 0) {
-                    const groups = this.buildScopeGroups(customThemes.map((loadedTheme) => ({
-                        path: loadedTheme.sourcePath,
-                        sourceInfo: loadedTheme.sourceInfo,
-                    })));
-                    const themeList = this.formatScopeGroups(groups, {
-                        formatPath: (item) => this.formatDisplayPath(item.path),
-                        formatPackagePath: (item) => this.getShortPath(item.path, item.sourceInfo),
-                    });
-                    const themeCompactList = formatCompactList(customThemes.map((loadedTheme) => loadedTheme.name ?? this.getCompactPathLabel(loadedTheme.sourcePath, loadedTheme.sourceInfo)));
-                    addLoadedSection("Themes", themeCompactList, themeList);
-                }
-            }
-            if (contextWarnings.length > 0) {
-                for (const warning of contextWarnings) {
-                    this.chatContainer.addChild(new Text(theme.fg("warning", warning), 0, 0));
-                }
-            }
-        }
-        if (showDiagnostics) {
-            const skillDiagnostics = skillsResult.diagnostics;
-            if (skillDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(skillDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
-            }
-            const promptDiagnostics = promptsResult.diagnostics;
-            if (promptDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(promptDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
-            }
-            const extensionDiagnostics = [];
-            const extensionErrors = this.session.resourceLoader.getExtensions().errors;
-            if (extensionErrors.length > 0) {
-                for (const error of extensionErrors) {
-                    extensionDiagnostics.push({ type: "error", message: error.error, path: error.path });
-                }
-            }
-            const commandDiagnostics = this.session.extensionRunner.getCommandDiagnostics();
-            extensionDiagnostics.push(...commandDiagnostics);
-            extensionDiagnostics.push(...this.getBuiltInCommandConflictDiagnostics(this.session.extensionRunner));
-            const shortcutDiagnostics = this.session.extensionRunner.getShortcutDiagnostics();
-            extensionDiagnostics.push(...shortcutDiagnostics);
-            if (extensionDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(extensionDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
-            }
-            const themeDiagnostics = themesResult.diagnostics;
-            if (themeDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(themeDiagnostics, sourceInfos);
-                this.chatContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
-                this.chatContainer.addChild(new Spacer(1));
-            }
-        }
+        renderLoadedResources({
+            chatContainer: this.chatContainer,
+            getCwd: () => this.sessionManager.getCwd(),
+            getResourceLoader: () => this.session.resourceLoader,
+            getPromptTemplates: () => this.session.promptTemplates,
+            getExtensionRunner: () => this.session.extensionRunner,
+            getActiveMode: () => this.footerDataProvider.getActiveMode(),
+            getSubagentEnabled: () => this.footerDataProvider.getSubagentEnabled(),
+            quietStartup: () => this.settingsManager.getQuietStartup(),
+            verbose: this.options.verbose ?? false,
+            isExpanded: () => this.getStartupExpansionState(),
+            getBuiltInCommandConflictDiagnostics: (runner) => this.getBuiltInCommandConflictDiagnostics(runner),
+        }, options);
     }
     /**
      * Initialize the extension system with TUI-based UI context.
@@ -1296,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) => {
@@ -1345,7 +806,7 @@ export class InteractiveMode {
         this.applyRuntimeSettings();
         await this.bindCurrentSessionExtensions();
         this.subscribeToAgent();
-        await this.updateAvailableProviderCount();
+        await this.modelController.updateAvailableProviderCount();
         this.updateEditorBorderColor();
         this.updateTerminalTitle();
     }
@@ -1359,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();
@@ -1474,72 +935,11 @@ export class InteractiveMode {
         }
         this.ui.requestRender();
     }
-    /**
-     * Set an extension widget (string array or custom component).
-     */
-    setExtensionWidget(key, content, options) {
-        const placement = options?.placement ?? "aboveEditor";
-        const removeExisting = (map) => {
-            const existing = map.get(key);
-            if (existing?.dispose)
-                existing.dispose();
-            map.delete(key);
-        };
-        removeExisting(this.extensionWidgetsAbove);
-        removeExisting(this.extensionWidgetsBelow);
-        if (content === undefined) {
-            this.renderWidgets();
-            return;
-        }
-        let component;
-        if (Array.isArray(content)) {
-            // Wrap string array in a Container with Text components
-            const container = new Container();
-            for (const line of content.slice(0, InteractiveMode.MAX_WIDGET_LINES)) {
-                container.addChild(new Text(line, 1, 0));
-            }
-            if (content.length > InteractiveMode.MAX_WIDGET_LINES) {
-                container.addChild(new Text(theme.fg("muted", "... (widget truncated)"), 1, 0));
-            }
-            component = container;
-        }
-        else {
-            // Factory function - create component
-            component = content(this.ui, theme);
-        }
-        const targetMap = placement === "belowEditor" ? this.extensionWidgetsBelow : this.extensionWidgetsAbove;
-        targetMap.set(key, component);
-        this.renderWidgets();
-    }
-    clearExtensionWidgets() {
-        for (const widget of this.extensionWidgetsAbove.values()) {
-            widget.dispose?.();
-        }
-        for (const widget of this.extensionWidgetsBelow.values()) {
-            widget.dispose?.();
-        }
-        this.extensionWidgetsAbove.clear();
-        this.extensionWidgetsBelow.clear();
-        this.renderWidgets();
-    }
     resetExtensionUI() {
-        if (this.extensionSelector) {
-            this.hideExtensionSelector();
-        }
-        if (this.extensionInput) {
-            this.hideExtensionInput();
-        }
-        if (this.askOptions) {
-            this.hideAskOptions();
-        }
-        if (this.extensionEditor) {
-            this.hideExtensionEditor();
-        }
+        this.dialogs.reset();
         this.ui.hideOverlay();
         this.clearExtensionTerminalInputListeners();
-        this.setExtensionFooter(undefined);
-        this.setExtensionHeader(undefined);
-        this.clearExtensionWidgets();
+        this.chrome.reset();
         this.footerDataProvider.clearExtensionStatuses();
         this.footer.invalidate();
         this.autocompleteProviderWrappers = [];
@@ -1555,101 +955,6 @@ export class InteractiveMode {
         }
         this.setHiddenThinkingLabel();
     }
-    // Maximum total widget lines to prevent viewport overflow
-    static MAX_WIDGET_LINES = 10;
-    /**
-     * Render all extension widgets to the widget container.
-     */
-    renderWidgets() {
-        if (!this.widgetContainerAbove || !this.widgetContainerBelow)
-            return;
-        this.renderWidgetContainer(this.widgetContainerAbove, this.extensionWidgetsAbove, true, true);
-        this.renderWidgetContainer(this.widgetContainerBelow, this.extensionWidgetsBelow, false, false);
-        this.ui.requestRender();
-    }
-    renderWidgetContainer(container, widgets, spacerWhenEmpty, leadingSpacer) {
-        container.clear();
-        if (widgets.size === 0) {
-            if (spacerWhenEmpty) {
-                container.addChild(new Spacer(1));
-            }
-            return;
-        }
-        if (leadingSpacer) {
-            container.addChild(new Spacer(1));
-        }
-        for (const component of widgets.values()) {
-            container.addChild(component);
-        }
-    }
-    /**
-     * Set a custom footer component, or restore the built-in footer.
-     */
-    setExtensionFooter(factory) {
-        // Dispose existing custom footer
-        if (this.customFooter?.dispose) {
-            this.customFooter.dispose();
-        }
-        // Remove current footer from UI
-        if (this.customFooter) {
-            this.ui.removeChild(this.customFooter);
-        }
-        else {
-            this.ui.removeChild(this.footer);
-        }
-        if (factory) {
-            // Create and add custom footer, passing the data provider
-            this.customFooter = factory(this.ui, theme, this.footerDataProvider);
-            this.ui.addChild(this.customFooter);
-        }
-        else {
-            // Restore built-in footer
-            this.customFooter = undefined;
-            this.ui.addChild(this.footer);
-        }
-        this.ui.requestRender();
-    }
-    /**
-     * Set a custom header component, or restore the built-in header.
-     */
-    setExtensionHeader(factory) {
-        // Header may not be initialized yet if called during early initialization
-        if (!this.builtInHeader) {
-            return;
-        }
-        // Dispose existing custom header
-        if (this.customHeader?.dispose) {
-            this.customHeader.dispose();
-        }
-        // Find the index of the current header in the header container
-        const currentHeader = this.customHeader || this.builtInHeader;
-        const index = this.headerContainer.children.indexOf(currentHeader);
-        if (factory) {
-            // Create and add custom header
-            this.customHeader = factory(this.ui, theme);
-            if (isExpandable(this.customHeader)) {
-                this.customHeader.setExpanded(this.toolOutputExpanded);
-            }
-            if (index !== -1) {
-                this.headerContainer.children[index] = this.customHeader;
-            }
-            else {
-                // If not found (e.g. builtInHeader was never added), add at the top
-                this.headerContainer.children.unshift(this.customHeader);
-            }
-        }
-        else {
-            // Restore built-in header
-            this.customHeader = undefined;
-            if (isExpandable(this.builtInHeader)) {
-                this.builtInHeader.setExpanded(this.toolOutputExpanded);
-            }
-            if (index !== -1) {
-                this.headerContainer.children[index] = this.builtInHeader;
-            }
-        }
-        this.ui.requestRender();
-    }
     addExtensionTerminalInputListener(handler) {
         const unsubscribe = this.ui.addInputListener(handler);
         this.extensionTerminalInputUnsubscribers.add(unsubscribe);
@@ -1669,10 +974,10 @@ export class InteractiveMode {
      */
     createExtensionUIContext() {
         return {
-            select: (title, options, opts) => this.showExtensionSelector(title, options, opts),
-            confirm: (title, message, opts) => this.showExtensionConfirm(title, message, opts),
-            input: (title, placeholder, opts) => this.showExtensionInput(title, placeholder, opts),
-            askOptions: (questions, opts) => this.showAskOptions(questions, opts),
+            select: (title, options, opts) => this.dialogs.showSelector(title, options, opts),
+            confirm: (title, message, opts) => this.dialogs.confirm(title, message, opts),
+            input: (title, placeholder, opts) => this.dialogs.showInput(title, placeholder, opts),
+            askOptions: (questions, opts) => this.dialogs.showAskOptions(questions, opts),
             notify: (message, type) => this.showExtensionNotify(message, type),
             onTerminalInput: (handler) => this.addExtensionTerminalInputListener(handler),
             setStatus: (key, text) => this.setExtensionStatus(key, text),
@@ -1690,15 +995,15 @@ export class InteractiveMode {
             setWorkingVisible: (visible) => this.setWorkingVisible(visible),
             setWorkingIndicator: (options) => this.setWorkingIndicator(options),
             setHiddenThinkingLabel: (label) => this.setHiddenThinkingLabel(label),
-            setWidget: (key, content, options) => this.setExtensionWidget(key, content, options),
-            setFooter: (factory) => this.setExtensionFooter(factory),
-            setHeader: (factory) => this.setExtensionHeader(factory),
+            setWidget: (key, content, options) => this.chrome.setWidget(key, content, options),
+            setFooter: (factory) => this.chrome.setFooter(factory),
+            setHeader: (factory) => this.chrome.setHeader(factory),
             setTitle: (title) => this.ui.terminal.setTitle(title),
-            custom: (factory, options) => this.showExtensionCustom(factory, options),
+            custom: (factory, options) => this.dialogs.showCustom(factory, options),
             pasteToEditor: (text) => this.editor.handleInput(`\x1b[200~${text}\x1b[201~`),
             setEditorText: (text) => this.editor.setText(text),
             getEditorText: () => this.editor.getExpandedText?.() ?? this.editor.getText(),
-            editor: (title, prefill) => this.showExtensionEditor(title, prefill),
+            editor: (title, prefill) => this.dialogs.showEditor(title, prefill),
             addAutocompleteProvider: (factory) => {
                 this.autocompleteProviderWrappers.push(factory);
                 this.setupAutocompleteProvider();
@@ -1729,175 +1034,18 @@ export class InteractiveMode {
             setToolsExpanded: (expanded) => this.setToolsExpanded(expanded),
         };
     }
-    /**
-     * Show a selector for extensions.
-     */
-    showExtensionSelector(title, options, opts) {
-        return new Promise((resolve) => {
-            if (opts?.signal?.aborted) {
-                resolve(undefined);
-                return;
-            }
-            const onAbort = () => {
-                this.hideExtensionSelector();
-                resolve(undefined);
-            };
-            opts?.signal?.addEventListener("abort", onAbort, { once: true });
-            this.extensionSelector = new ExtensionSelectorComponent(title, options, (option) => {
-                opts?.signal?.removeEventListener("abort", onAbort);
-                this.hideExtensionSelector();
-                resolve(option);
-            }, () => {
-                opts?.signal?.removeEventListener("abort", onAbort);
-                this.hideExtensionSelector();
-                resolve(undefined);
-            }, { tui: this.ui, timeout: opts?.timeout });
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.extensionSelector);
-            this.ui.setFocus(this.extensionSelector);
-            this.ui.requestRender();
-        });
+    async promptForMissingSessionCwd(error) {
+        const confirmed = await this.dialogs.confirm("Session cwd not found", formatMissingSessionCwdPrompt(error.issue));
+        return confirmed ? error.issue.fallbackCwd : undefined;
     }
     /**
-     * Hide the extension selector.
+     * Set a custom editor component from an extension.
+     * Pass undefined to restore the default editor.
      */
-    hideExtensionSelector() {
-        this.extensionSelector?.dispose();
-        this.editorContainer.clear();
-        this.editorContainer.addChild(this.editor);
-        this.extensionSelector = undefined;
-        this.ui.setFocus(this.editor);
-        this.ui.requestRender();
-    }
-    /**
-     * Show the options pane — the agent asking the user one or more questions.
-     * Resolves with one answer per question, or undefined if skipped/aborted.
-     */
-    showAskOptions(questions, opts) {
-        return new Promise((resolve) => {
-            if (!questions.length || opts?.signal?.aborted) {
-                resolve(undefined);
-                return;
-            }
-            const onAbort = () => {
-                this.hideAskOptions();
-                resolve(undefined);
-            };
-            opts?.signal?.addEventListener("abort", onAbort, { once: true });
-            this.askOptions = new AskOptionsComponent(questions, (answers) => {
-                opts?.signal?.removeEventListener("abort", onAbort);
-                this.hideAskOptions();
-                resolve(answers);
-            }, () => {
-                opts?.signal?.removeEventListener("abort", onAbort);
-                this.hideAskOptions();
-                resolve(undefined);
-            });
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.askOptions);
-            this.ui.setFocus(this.askOptions);
-            this.ui.requestRender();
-        });
-    }
-    /**
-     * Hide the options pane and restore the editor.
-     */
-    hideAskOptions() {
-        if (!this.askOptions)
-            return;
-        this.editorContainer.clear();
-        this.editorContainer.addChild(this.editor);
-        this.askOptions = undefined;
-        this.ui.setFocus(this.editor);
-        this.ui.requestRender();
-    }
-    /**
-     * Show a confirmation dialog for extensions.
-     */
-    async showExtensionConfirm(title, message, opts) {
-        const result = await this.showExtensionSelector(`${title}\n${message}`, ["Yes", "No"], opts);
-        return result === "Yes";
-    }
-    async promptForMissingSessionCwd(error) {
-        const confirmed = await this.showExtensionConfirm("Session cwd not found", formatMissingSessionCwdPrompt(error.issue));
-        return confirmed ? error.issue.fallbackCwd : undefined;
-    }
-    /**
-     * Show a text input for extensions.
-     */
-    showExtensionInput(title, placeholder, opts) {
-        return new Promise((resolve) => {
-            if (opts?.signal?.aborted) {
-                resolve(undefined);
-                return;
-            }
-            const onAbort = () => {
-                this.hideExtensionInput();
-                resolve(undefined);
-            };
-            opts?.signal?.addEventListener("abort", onAbort, { once: true });
-            this.extensionInput = new ExtensionInputComponent(title, placeholder, (value) => {
-                opts?.signal?.removeEventListener("abort", onAbort);
-                this.hideExtensionInput();
-                resolve(value);
-            }, () => {
-                opts?.signal?.removeEventListener("abort", onAbort);
-                this.hideExtensionInput();
-                resolve(undefined);
-            }, { tui: this.ui, timeout: opts?.timeout });
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.extensionInput);
-            this.ui.setFocus(this.extensionInput);
-            this.ui.requestRender();
-        });
-    }
-    /**
-     * Hide the extension input.
-     */
-    hideExtensionInput() {
-        this.extensionInput?.dispose();
-        this.editorContainer.clear();
-        this.editorContainer.addChild(this.editor);
-        this.extensionInput = undefined;
-        this.ui.setFocus(this.editor);
-        this.ui.requestRender();
-    }
-    /**
-     * Show a multi-line editor for extensions (with Ctrl+G support).
-     */
-    showExtensionEditor(title, prefill) {
-        return new Promise((resolve) => {
-            this.extensionEditor = new ExtensionEditorComponent(this.ui, this.keybindings, title, prefill, (value) => {
-                this.hideExtensionEditor();
-                resolve(value);
-            }, () => {
-                this.hideExtensionEditor();
-                resolve(undefined);
-            });
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.extensionEditor);
-            this.ui.setFocus(this.extensionEditor);
-            this.ui.requestRender();
-        });
-    }
-    /**
-     * Hide the extension editor.
-     */
-    hideExtensionEditor() {
-        this.editorContainer.clear();
-        this.editorContainer.addChild(this.editor);
-        this.extensionEditor = undefined;
-        this.ui.setFocus(this.editor);
-        this.ui.requestRender();
-    }
-    /**
-     * Set a custom editor component from an extension.
-     * Pass undefined to restore the default editor.
-     */
-    setCustomEditorComponent(factory) {
-        this.editorComponentFactory = factory;
-        // Save text from current editor before switching
-        const currentText = this.editor.getText();
+    setCustomEditorComponent(factory) {
+        this.editorComponentFactory = factory;
+        // Save text from current editor before switching
+        const currentText = this.editor.getText();
         this.editorContainer.clear();
         if (factory) {
             // Create the custom editor with tui, theme, and keybindings
@@ -1964,75 +1112,6 @@ export class InteractiveMode {
             this.showStatus(message);
         }
     }
-    /** Show a custom component with keyboard focus. Overlay mode renders on top of existing content. */
-    async showExtensionCustom(factory, options) {
-        const savedText = this.editor.getText();
-        const isOverlay = options?.overlay ?? false;
-        const restoreEditor = () => {
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
-            this.editor.setText(savedText);
-            this.ui.setFocus(this.editor);
-            this.ui.requestRender();
-        };
-        return new Promise((resolve, reject) => {
-            let component;
-            let closed = false;
-            const close = (result) => {
-                if (closed)
-                    return;
-                closed = true;
-                if (isOverlay)
-                    this.ui.hideOverlay();
-                else
-                    restoreEditor();
-                // Note: both branches above already call requestRender
-                resolve(result);
-                try {
-                    component?.dispose?.();
-                }
-                catch {
-                    /* ignore dispose errors */
-                }
-            };
-            Promise.resolve(factory(this.ui, theme, this.keybindings, close))
-                .then((c) => {
-                if (closed)
-                    return;
-                component = c;
-                if (isOverlay) {
-                    // Resolve overlay options - can be static or dynamic function
-                    const resolveOptions = () => {
-                        if (options?.overlayOptions) {
-                            const opts = typeof options.overlayOptions === "function"
-                                ? options.overlayOptions()
-                                : options.overlayOptions;
-                            return opts;
-                        }
-                        // Fallback: use component's width property if available
-                        const w = component.width;
-                        return w ? { width: w } : undefined;
-                    };
-                    const handle = this.ui.showOverlay(component, resolveOptions());
-                    // Expose handle to caller for visibility control
-                    options?.onHandle?.(handle);
-                }
-                else {
-                    this.editorContainer.clear();
-                    this.editorContainer.addChild(component);
-                    this.ui.setFocus(component);
-                    this.ui.requestRender();
-                }
-            })
-                .catch((err) => {
-                if (closed)
-                    return;
-                if (!isOverlay)
-                    restoreEditor();
-                reject(err);
-            });
-        });
-    }
     /**
      * Show an extension error in the UI.
      */
@@ -2061,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();
@@ -2096,19 +1175,19 @@ 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", () => {
             this.taskPanel.cycleView();
         });
-        this.defaultEditor.onAction("app.team.focus", () => this.enterTeamFocus());
+        this.defaultEditor.onAction("app.team.focus", () => this.teamFocus.enterFocus());
         this.defaultEditor.onAction("app.editor.external", () => this.openExternalEditor());
-        this.defaultEditor.onAction("app.input.voiceTranscribe", () => this.toggleVoiceTranscribe());
+        this.defaultEditor.onAction("app.input.voiceTranscribe", () => this.voice.toggle());
         this.defaultEditor.onAction("app.message.followUp", () => this.handleFollowUp());
         this.defaultEditor.onAction("app.message.dequeue", () => this.handleDequeue());
         this.defaultEditor.onAction("app.session.new", () => this.commandExecutor.handleClear());
@@ -2153,278 +1232,183 @@ export class InteractiveMode {
     // =========================================================================
     /**
      * Wire a hooteams connection into the TUI. Called by main.ts when `--team`
-     * is set, before run(). Enables team focus (app.team.focus), nudging (n),
-     * the attach side panel (a) on the task panel's teams view, and approval
-     * gates: task_paused events (and gates already pending on the server)
-     * surface inline in the attach panel when it shows the paused role,
-     * otherwise in the options pane; the answer goes back over
-     * POST /tasks/:id/resume.
+     * is set, before run(). See TeamFocusController for the feature itself.
      */
     attachTeamClient(client) {
-        this.teamClient = client;
-        const approvals = new TeamApprovalCoordinator({
-            present: (approval, signal) => this.presentTeamApproval(approval, signal),
-            resume: (taskId, option) => client.resume(taskId, option),
-            info: (message) => this.showStatus(message),
-            warn: (message) => this.showWarning(message),
-        });
-        client.subscribe((event) => approvals.handleEvent(event));
-        // Gates that opened before we attached don't replay as task_paused.
-        void client.pendingApprovals().then((pending) => {
-            for (const gate of pending)
-                approvals.enqueuePending(gate);
-        }, () => {
-            // Best-effort like the rest of the bridge; live gates still arrive via SSE.
-        });
+        this.teamFocus.attachClient(client);
     }
     /**
-     * Show one team approval gate and resolve with the chosen (or free-form)
-     * answer, undefined when skipped. When the attach side panel is open on the
-     * role that paused, the gate renders inline in the panel — right where its
-     * stream stopped; otherwise it goes to the options pane, waiting politely
-     * while another ask is on screen. Either way the signal (gate answered
-     * elsewhere) dismisses the prompt.
+     * Built-in slash commands dispatched by the editor submit handler.
+     * `withArgs` commands also match "/name <args>" and receive the full text.
+     * Each handler keeps its own editor-clearing order (before vs after the
+     * await) — some commands must show their UI before the prompt is wiped.
      */
-    async presentTeamApproval(approval, signal) {
-        const panel = this.teamAttachPanel;
-        if (panel && approval.role === panel.role) {
-            this.teamAttachHandle?.focus();
-            const answer = await panel.presentApproval(approval, signal);
-            // Detaching mid-gate settles as skipped — fall through to the options
-            // pane so the question isn't silently lost. A skip with the panel
-            // still open is a real skip.
-            if (answer !== undefined || signal.aborted || this.teamAttachPanel === panel)
-                return answer;
-        }
-        while (this.askOptions && !signal.aborted) {
-            await new Promise((resolve) => setTimeout(resolve, 200));
-        }
-        if (signal.aborted)
-            return undefined;
-        const answers = await this.showAskOptions([
-            {
-                question: approval.question,
-                short: approval.taskId,
-                detail: `team task "${approval.taskId}"${approval.role ? ` (${approval.role})` : ""} is paused until answered`,
-                options: approval.options.map((label) => ({ label })),
-                allowCustom: true,
+    createBuiltInSlashCommands() {
+        const clearEditor = () => this.editor.setText("");
+        return new Map(Object.entries({
+            "/settings": {
+                run: () => {
+                    this.showSettingsSelector();
+                    clearEditor();
+                },
             },
-        ], { signal });
-        return answers?.[0];
-    }
-    /** Move keyboard focus to the task panel's team roster. */
-    enterTeamFocus() {
-        if (!this.teamClient) {
-            this.showStatus("No team connected. Start with --team <url> to mirror a hooteams server.");
-            return;
-        }
-        if (!taskStore.agents().some((a) => a.kind === "role")) {
-            this.showStatus("Team roster is empty — waiting for roles from the team server.");
-            return;
-        }
-        this.taskPanel.setView("teams");
-        this.ui.setFocus(this.taskPanel);
-        this.ui.requestRender();
-    }
-    /** Leave team focus: detach any side panel and return focus to the editor. */
-    exitTeamFocus() {
-        this.closeTeamAttach();
-        this.ui.setFocus(this.editor);
-        this.ui.requestRender();
-    }
-    /**
-     * Inline nudge editor for a role (n in team focus or while attached).
-     * Swaps the prompt editor for a one-line input; submit fires POST /steer in
-     * the background (the REPL and team focus are never blocked on the network).
-     */
-    showTeamNudgeInput(role) {
-        const client = this.teamClient;
-        if (!client)
-            return;
-        const restoreFocus = () => {
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
-            // Return focus where the nudge came from: the attach panel if one is
-            // open, otherwise the team roster.
-            if (this.teamAttachHandle)
-                this.teamAttachHandle.focus();
-            else
-                this.ui.setFocus(this.taskPanel);
-            this.ui.requestRender();
-        };
-        const input = new ExtensionInputComponent(`Nudge ${role}`, undefined, (value) => {
-            input.dispose();
-            restoreFocus();
-            const message = value.trim();
-            if (!message)
-                return;
-            void client.steer(role, message).then(() => this.showStatus(`Nudged ${role}`), (error) => this.showWarning(`Failed to nudge ${role}: ${String(error)}`));
-        }, () => {
-            input.dispose();
-            restoreFocus();
-        }, { tui: this.ui });
-        this.editorContainer.clear();
-        this.editorContainer.addChild(input);
-        this.ui.setFocus(input);
-        this.ui.requestRender();
-    }
-    /** Open the attach side panel for a role (a in team focus). */
-    showTeamAttach(role) {
-        const client = this.teamClient;
-        if (!client)
-            return;
-        // One attached role at a time: re-attaching swaps the panel.
-        this.closeTeamAttach();
-        const panel = new TeamAttachPanelComponent(role, client, {
-            onDetach: () => this.closeTeamAttach(),
-            onNudge: (attachedRole) => this.showTeamNudgeInput(attachedRole),
-        }, this.ui);
-        this.teamAttachPanel = panel;
-        // preFocus is the task panel (attach is triggered from team focus), so
-        // hiding the overlay drops the user back on the role roster.
-        this.teamAttachHandle = this.ui.showOverlay(panel, {
-            anchor: "top-right",
-            width: "45%",
-            minWidth: 36,
-            margin: { top: 1, right: 1 },
-        });
-    }
-    /** Detach the side panel; the role keeps running. Safe to call when closed. */
-    closeTeamAttach() {
-        this.teamAttachPanel?.dispose();
-        this.teamAttachHandle?.hide();
-        this.teamAttachPanel = undefined;
-        this.teamAttachHandle = undefined;
+            "/scoped-models": {
+                run: async () => {
+                    clearEditor();
+                    await this.modelController.showModelsSelector();
+                },
+            },
+            "/model": {
+                withArgs: true,
+                run: async (text) => {
+                    const searchTerm = text.startsWith("/model ") ? text.slice(7).trim() : undefined;
+                    clearEditor();
+                    await this.commandExecutor.handleModel(searchTerm);
+                },
+            },
+            "/export": {
+                withArgs: true,
+                run: async (text) => {
+                    await this.commandExecutor.handleExport(text);
+                    clearEditor();
+                },
+            },
+            "/import": {
+                withArgs: true,
+                run: async (text) => {
+                    await this.commandExecutor.handleImport(text);
+                    clearEditor();
+                },
+            },
+            "/share": {
+                run: async () => {
+                    await this.commandExecutor.handleShare();
+                    clearEditor();
+                },
+            },
+            "/copy": {
+                run: async () => {
+                    await this.commandExecutor.handleCopy();
+                    clearEditor();
+                },
+            },
+            "/name": {
+                withArgs: true,
+                run: (text) => {
+                    this.commandExecutor.handleName(text);
+                    clearEditor();
+                },
+            },
+            "/session": {
+                run: () => {
+                    this.commandExecutor.handleSession();
+                    clearEditor();
+                },
+            },
+            "/changelog": {
+                run: () => {
+                    this.commandExecutor.handleChangelog();
+                    clearEditor();
+                },
+            },
+            "/hotkeys": {
+                run: () => {
+                    this.commandExecutor.handleHotkeys();
+                    clearEditor();
+                },
+            },
+            "/fork": {
+                run: () => {
+                    this.showUserMessageSelector();
+                    clearEditor();
+                },
+            },
+            "/clone": {
+                run: async () => {
+                    clearEditor();
+                    await this.commandExecutor.handleClone();
+                },
+            },
+            "/tree": {
+                run: () => {
+                    this.showTreeSelector();
+                    clearEditor();
+                },
+            },
+            "/login": {
+                run: () => {
+                    this.loginController.showOAuthSelector("login");
+                    clearEditor();
+                },
+            },
+            "/logout": {
+                run: () => {
+                    this.loginController.showOAuthSelector("logout");
+                    clearEditor();
+                },
+            },
+            "/new": {
+                run: async () => {
+                    clearEditor();
+                    await this.commandExecutor.handleClear();
+                },
+            },
+            "/compact": {
+                withArgs: true,
+                run: async (text) => {
+                    const prefix = "/compact ";
+                    const customInstructions = text.startsWith(prefix)
+                        ? text.slice(prefix.length).trim() || undefined
+                        : undefined;
+                    clearEditor();
+                    await this.handleCompactCommand(customInstructions);
+                },
+            },
+            "/reload": {
+                run: async () => {
+                    clearEditor();
+                    await this.handleReloadCommand();
+                },
+            },
+            "/debug": {
+                run: () => {
+                    this.commandExecutor.handleDebug();
+                    clearEditor();
+                },
+            },
+            "/resume": {
+                run: () => {
+                    this.showSessionSelector();
+                    clearEditor();
+                },
+            },
+            "/quit": {
+                run: async () => {
+                    clearEditor();
+                    await this.shutdown();
+                },
+            },
+            "/subagent": {
+                withArgs: true,
+                run: async (text) => {
+                    clearEditor();
+                    await this.commandExecutor.handleSubagent(text);
+                },
+            },
+        }));
     }
     setupEditorSubmitHandler() {
+        const slashCommands = this.createBuiltInSlashCommands();
         this.defaultEditor.onSubmit = async (text) => {
             text = text.trim();
             if (!text)
                 return;
-            // 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.commandExecutor.handleModel(searchTerm);
-                return;
-            }
-            if (text === "/export" || text.startsWith("/export ")) {
-                await this.commandExecutor.handleExport(text);
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/import" || text.startsWith("/import ")) {
-                await this.commandExecutor.handleImport(text);
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/share") {
-                await this.commandExecutor.handleShare();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/copy") {
-                await this.commandExecutor.handleCopy();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/name" || text.startsWith("/name ")) {
-                this.commandExecutor.handleName(text);
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/session") {
-                this.commandExecutor.handleSession();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/changelog") {
-                this.commandExecutor.handleChangelog();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/hotkeys") {
-                this.commandExecutor.handleHotkeys();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/fork") {
-                this.showUserMessageSelector();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/clone") {
-                this.editor.setText("");
-                await this.commandExecutor.handleClone();
-                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.commandExecutor.handleClear();
-                return;
-            }
-            if (text === "/compact" || text.startsWith("/compact ")) {
-                const prefix = "/compact ";
-                const customInstructions = text.startsWith(prefix)
-                    ? text.slice(prefix.length).trim() || undefined
-                    : undefined;
-                this.editor.setText("");
-                await this.handleCompactCommand(customInstructions);
-                return;
-            }
-            if (text === "/reload") {
-                this.editor.setText("");
-                await this.handleReloadCommand();
-                return;
-            }
-            if (text === "/debug") {
-                this.commandExecutor.handleDebug();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/arminsayshi") {
-                this.commandExecutor.handleArminSaysHi();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/resume") {
-                this.showSessionSelector();
-                this.editor.setText("");
-                return;
-            }
-            if (text === "/quit") {
-                this.editor.setText("");
-                await this.shutdown();
-                return;
-            }
-            if (text === "/subagent" || text.startsWith("/subagent ")) {
-                this.editor.setText("");
-                await this.commandExecutor.handleSubagent(text);
+            // Handle built-in slash commands
+            const spaceIdx = text.indexOf(" ");
+            const commandName = spaceIdx === -1 ? text : text.slice(0, spaceIdx);
+            const command = slashCommands.get(commandName);
+            if (command && (spaceIdx === -1 || command.withArgs)) {
+                await command.run(text);
                 return;
             }
             // Handle bash command (! for normal, !! for excluded from context)
@@ -2438,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;
@@ -2446,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;
             }
@@ -2462,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);
             }
@@ -2513,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":
@@ -2539,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") {
@@ -2720,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;
             }
@@ -2784,273 +1768,13 @@ export class InteractiveMode {
      * If multiple status messages are emitted back-to-back (without anything else being added to the chat),
      * we update the previous status line instead of appending new ones to avoid log spam.
      */
-    /**
-     * Toggle voice-to-text capture.
-     *
-     * Prefers a persistent `voicetools serve` daemon: the first press probes for
-     * support and (if found) loads models once, showing a "warming up" spinner;
-     * every later press reuses the already-warm daemon and jumps straight to
-     * Listening. Binaries without `serve` support fall back to spawning
-     * `voicetools transcribe` per press, same as before. Pressing the shortcut
-     * again while listening (or while still warming up) cancels.
-     */
-    toggleVoiceTranscribe() {
-        if (this.voiceActive) {
-            if (this.voiceDaemon?.isReady) {
-                this.voiceDaemon.cancel();
-            }
-            else {
-                this.voiceSession?.stop();
-            }
-            this.voiceSession = undefined;
-            this.voiceActive = false;
-            this.resetVoiceUI();
-            return;
-        }
-        if (this.voiceStarting) {
-            // A second press while resolving/warming up: honour the cancel. Any
-            // daemon that finishes loading afterwards is kept warm for next time.
-            this.voiceStarting = false;
-            this.resetVoiceUI();
-            return;
-        }
-        if (this.voiceDaemonUnsupported) {
-            this.voiceStarting = true;
-            this.showVoiceWarming("Starting voice input...");
-            void this.resolveVoiceBin()
-                .then((bin) => {
-                if (!this.voiceStarting)
-                    return;
-                this.voiceStarting = false;
-                if (!bin) {
-                    this.resetVoiceUI();
-                    this.showError(VOICE_UNAVAILABLE_MESSAGE);
-                    return;
-                }
-                this.beginLegacyVoiceCapture(bin);
-            })
-                .catch((err) => {
-                this.voiceStarting = false;
-                this.resetVoiceUI();
-                this.showError(`Voice input failed: ${err instanceof Error ? err.message : String(err)}`);
-            });
-            return;
-        }
-        if (this.voiceDaemon?.isReady) {
-            this.beginDaemonVoiceCapture();
-            return;
-        }
-        // No daemon yet: resolve the binary, then probe for `serve` support by
-        // spawning it. `VoiceDaemon.spawn` doubles as the probe: it resolves to a
-        // live daemon once READY arrives, to "unsupported" if the process exits
-        // with no output at all (an old binary rejecting the unrecognized `serve`
-        // subcommand), or to "error" if it printed a real ERROR first (e.g. no
-        // model installed yet) — already surfaced via onError, so that case skips
-        // the legacy fallback (it would just hit the same error) but leaves
-        // daemon mode available to retry on the next press.
-        this.voiceStarting = true;
-        this.showVoiceWarming("Warming up voice input...");
-        void this.resolveVoiceBin()
-            .then(async (bin) => {
-            if (!bin) {
-                this.voiceStarting = false;
-                this.resetVoiceUI();
-                this.showError(VOICE_UNAVAILABLE_MESSAGE);
-                return;
-            }
-            const result = await VoiceDaemon.spawn(bin, this.buildVoiceDaemonHandlers(), {
-                silenceMs: VOICE_SILENCE_MS,
-                idleTimeoutMs: VOICE_IDLE_TIMEOUT_MS,
-            });
-            if (!result.ok) {
-                if (result.reason === "unsupported") {
-                    this.voiceDaemonUnsupported = true;
-                    if (!this.voiceStarting) {
-                        this.resetVoiceUI();
-                        return;
-                    }
-                    this.voiceStarting = false;
-                    this.beginLegacyVoiceCapture(bin);
-                    return;
-                }
-                this.voiceStarting = false;
-                this.resetVoiceUI();
-                return;
-            }
-            this.voiceDaemon = result.daemon;
-            if (!this.voiceStarting) {
-                // Cancelled while warming up: keep the loaded daemon warm for next time.
-                this.resetVoiceUI();
-                return;
-            }
-            this.voiceStarting = false;
-            this.beginDaemonVoiceCapture();
-        })
-            .catch((err) => {
-            this.voiceStarting = false;
-            this.resetVoiceUI();
-            this.showError(`Voice input failed: ${err instanceof Error ? err.message : String(err)}`);
-        });
-    }
-    /**
-     * Build the (stable, reused-across-captures) handlers for the daemon.
-     *
-     * Every handler bails out once `voiceActive` is false: CANCEL is a soft
-     * request (unlike the legacy path's `proc.kill()`, it doesn't sever the
-     * pipe), so the daemon can still have a trailing PARTIAL/FINAL/DONE for the
-     * just-cancelled capture in flight when the user presses cancel. Without
-     * this guard that stale text would land in the editor after the panel had
-     * already collapsed.
-     *
-     * v0.1.4 serve streams `PARTIAL <full growing hypothesis>` (live preview,
-     * never committed) and ends with a single `FINAL <complete text>` (the one
-     * commit to the editor). `SEGMENT` is still handled for the legacy
-     * transcribe path and any binary that streams committed chunks directly.
-     */
-    buildVoiceDaemonHandlers() {
-        return {
-            onSegment: (text) => {
-                if (!this.voiceActive)
-                    return;
-                this.commitVoiceText(text);
-            },
-            onPartial: (text) => {
-                if (!this.voiceActive)
-                    return;
-                this.voicePanel?.setPartial(text);
-            },
-            onFinal: (text) => {
-                if (!this.voiceActive)
-                    return;
-                this.commitVoiceText(text);
-            },
-            onStatus: (status) => {
-                if (!this.voiceActive)
-                    return;
-                if (status === "done") {
-                    this.voiceActive = false;
-                    this.resetVoiceUI();
-                    return;
-                }
-                if (status === "transcribing") {
-                    this.voicePanel?.setTranscribing();
-                }
-                else if (status === "listening") {
-                    this.voicePanel?.startListening();
-                }
-            },
-            onLevel: (rms) => {
-                if (!this.voiceActive)
-                    return;
-                this.voicePanel?.pushLevel(rms);
-            },
-            onPhase: (phase) => {
-                if (!this.voiceActive)
-                    return;
-                if (phase === "silence") {
-                    this.voicePanel?.beginSilence(VOICE_SILENCE_MS);
-                }
-                else {
-                    this.voicePanel?.endSilence();
-                }
-            },
-            onError: (message) => {
-                this.voiceActive = false;
-                this.resetVoiceUI();
-                this.showError(`Voice input failed: ${message}`);
-            },
-            onCrash: (message) => {
-                this.voiceActive = false;
-                this.voiceDaemon = undefined;
-                this.resetVoiceUI();
-                this.showError(`Voice input daemon crashed: ${message}. It will restart on next use.`);
-            },
-            onIdle: () => {
-                // Daemon auto-shut down after idle timeout: drop the reference so the
-                // next ctrl+r respawns (cold start). No user-facing message — this is
-                // an expected memory-reclamation event, not an error.
-                this.voiceDaemon = undefined;
-            },
-        };
-    }
-    /** Inject decoded text into the editor via bracketed paste (with a trailing space). */
-    commitVoiceText(text) {
-        this.editor.handleInput(`\x1b[200~${text} \x1b[201~`);
-    }
-    beginDaemonVoiceCapture() {
-        if (!this.voiceDaemon?.isReady)
-            return;
-        this.voiceActive = true;
-        this.showVoicePanel().startListening();
-        this.voiceDaemon.startCapture();
-    }
-    beginLegacyVoiceCapture(bin) {
-        this.voiceActive = true;
-        const panel = this.showVoicePanel();
-        panel.startListening();
-        this.voiceSession = startVoiceTranscribe(bin, {
-            onStatus: (status) => {
-                if (status === "done") {
-                    this.voiceActive = false;
-                    this.voiceSession = undefined;
-                    this.resetVoiceUI();
-                    return;
-                }
-                // Old binaries emit no LEVEL/PARTIAL, so the panel shows a spinner
-                // for the batch phases; committed words still stream into the editor.
-                if (status === "transcribing")
-                    panel.setTranscribing();
-            },
-            onSegment: (text) => {
-                this.commitVoiceText(text);
-            },
-            onError: (message) => {
-                this.voiceActive = false;
-                this.voiceSession = undefined;
-                this.resetVoiceUI();
-                this.showError(`Voice input failed: ${message}`);
-            },
-        });
-    }
-    /** Resolve the `voicetools` binary path. Prefers an explicit VOICETOOLS_BIN
-     * override, otherwise resolves via the managed tools manager (bin dir / PATH /
-     * download from the published release). Returns undefined when unavailable.
-     */
-    async resolveVoiceBin() {
-        const override = process.env.VOICETOOLS_BIN?.trim();
-        if (override)
-            return override;
-        return ensureTool("voicetools", true);
-    }
-    /** Create (or reuse) the voice panel and mount it in the status container. */
-    showVoicePanel() {
-        if (!this.voicePanel) {
-            this.statusContainer.clear();
-            this.voicePanel = new VoicePanel(this.ui, keyHint("app.input.voiceTranscribe", "cancel"));
-            this.statusContainer.addChild(this.voicePanel);
-        }
-        this.ui.requestRender();
-        return this.voicePanel;
-    }
-    showVoiceWarming(message) {
-        this.showVoicePanel().setWarming(message);
-    }
-    /** Collapse the voice panel back to nothing (idle) and stop its animation. */
-    resetVoiceUI() {
-        if (this.voicePanel) {
-            this.voicePanel.dispose();
-            this.voicePanel = undefined;
-        }
-        this.statusContainer.clear();
-        this.ui.requestRender();
-    }
-    showStatus(message) {
-        const children = this.chatContainer.children;
-        const last = children.length > 0 ? children[children.length - 1] : undefined;
-        const secondLast = children.length > 1 ? children[children.length - 2] : undefined;
-        if (last && secondLast && last === this.lastStatusText && secondLast === this.lastStatusSpacer) {
-            this.lastStatusText.setText(theme.fg("dim", message));
-            this.ui.requestRender();
+    showStatus(message) {
+        const children = this.chatContainer.children;
+        const last = children.length > 0 ? children[children.length - 1] : undefined;
+        const secondLast = children.length > 1 ? children[children.length - 2] : undefined;
+        if (last && secondLast && last === this.lastStatusText && secondLast === this.lastStatusSpacer) {
+            this.lastStatusText.setText(theme.fg("dim", message));
+            this.ui.requestRender();
             return;
         }
         const spacer = new Spacer(1);
@@ -3261,7 +1985,7 @@ export class InteractiveMode {
         // This prevents escape sequences from leaking to the parent shell over slow SSH.
         await this.ui.terminal.drainInput(1000);
         this.taskStoreUnsubscribe?.();
-        this.closeTeamAttach();
+        this.teamFocus.closeAttach();
         this.taskPanel.dispose();
         this.stop();
         await this.runtimeHost.dispose();
@@ -3355,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;
         }
@@ -3371,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)
@@ -3381,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");
         }
@@ -3421,31 +2145,12 @@ 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);
     }
     setToolsExpanded(expanded) {
         this.toolOutputExpanded = expanded;
-        const activeHeader = this.customHeader ?? this.builtInHeader;
+        const activeHeader = this.chrome.customHeader ?? this.builtInHeader;
         if (isExpandable(activeHeader)) {
             activeHeader.setExpanded(expanded);
         }
@@ -3552,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
     // =========================================================================
@@ -3886,145 +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);
-                    this.checkDaxnutsEasterEgg(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) {
@@ -4081,7 +2483,7 @@ export class InteractiveMode {
                 // Check if we should skip the prompt (user preference to always default to no summary)
                 if (!this.settingsManager.getBranchSummarySkipPrompt()) {
                     while (true) {
-                        const summaryChoice = await this.showExtensionSelector("Summarize branch?", [
+                        const summaryChoice = await this.dialogs.showSelector("Summarize branch?", [
                             "No summary",
                             "Summarize",
                             "Summarize with custom prompt",
@@ -4093,7 +2495,7 @@ export class InteractiveMode {
                         }
                         wantsSummary = summaryChoice !== "No summary";
                         if (summaryChoice === "Summarize with custom prompt") {
-                            customInstructions = await this.showExtensionEditor("Custom summarization instructions");
+                            customInstructions = await this.dialogs.showEditor("Custom summarization instructions");
                             if (customInstructions === undefined) {
                                 // User cancelled - loop back to summary selector
                                 continue;
@@ -4137,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));
@@ -4221,327 +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);
-            this.checkDaxnutsEasterEgg(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
     // =========================================================================
@@ -4577,7 +2658,7 @@ export class InteractiveMode {
         try {
             await this.session.reload();
             this.keybindings.reload();
-            const activeHeader = this.customHeader ?? this.builtInHeader;
+            const activeHeader = this.chrome.customHeader ?? this.builtInHeader;
             if (isExpandable(activeHeader)) {
                 activeHeader.setExpanded(this.toolOutputExpanded);
             }
@@ -4618,87 +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);
-    }
-    handleDaxnuts() {
-        this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new DaxnutsComponent(this.ui));
-        this.ui.requestRender();
-    }
-    checkDaxnutsEasterEgg(model) {
-        if (model.provider === "opencode" && model.id.toLowerCase().includes("kimi-k2.5")) {
-            this.handleDaxnuts();
-        }
-    }
-    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
@@ -4718,18 +2718,7 @@ export class InteractiveMode {
     }
     stop() {
         this.unregisterSignalHandlers();
-        if (this.voiceSession?.running) {
-            this.voiceSession.stop();
-            this.voiceSession = undefined;
-        }
-        this.voiceDaemon?.shutdown();
-        this.voiceDaemon = undefined;
-        if (this.voicePanel) {
-            this.voicePanel.dispose();
-            this.voicePanel = undefined;
-        }
-        this.voiceActive = false;
-        this.voiceStarting = false;
+        this.voice.dispose();
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
         }