apex-code 0.0.1-alpha.8 → 0.0.4

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

@@ -7,22 +7,25 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import * as TuiLayouts from "@earendil-works/pi-tui";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Markdown, matchesKey, ProcessTerminal, Spacer, setKeybindings, Text, TruncatedText, TuiAltScreen, TuiMainScreen, visibleWidth, } from "@earendil-works/pi-tui";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Markdown, matchesKey, ProcessTerminal, Spacer, setCapabilityOverrides, setKeybindings, Text, TruncatedText, TuiAltScreen, TuiMainScreen, visibleWidth, } from "@earendil-works/pi-tui";
 import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
 import { APP_NAME, APP_TITLE, CONFIG_DIR_NAME, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
 import { CACHE_TTL_MS, collectCacheMisses, computeCacheWaste, detectCacheMiss, } from "../../core/cache-stats.js";
+import { DEFAULT_THINKING_LEVEL, THINKING_LEVEL_OPTIONS } from "../../core/defaults.js";
 import { getApexEnvironment } from "../../core/environment.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
+import { authorizeConfiguredServer } from "../../core/mcp/oauth/authorize.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScopeFromModels, } from "../../core/model-resolver.js";
 import { CredentialSynchronizationError } from "../../core/model-runtime.js";
 import { aggregateUsagePerformance } from "../../core/observability/aggregate.js";
 import { DefaultPackageManager } from "../../core/package-manager.js";
+import { observeTerminalHandoff, TERMINAL_HANDOFF_ACK_PATH_VARIABLE, TERMINAL_HANDOFF_PATH_VARIABLE, } from "../../core/sandbox/terminal-handoff.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager, sessionEntryToContextMessages } from "../../core/session-manager.js";
 import { formatShareUnavailableMessage, publishSessionShare } from "../../core/session-share.js";
@@ -37,6 +40,7 @@ import { parseGitUrl } from "../../utils/git.js";
 import { openBrowser } from "../../utils/open-browser.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
+import { loadAllHighlightLanguages } from "../../utils/syntax-highlight.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { checkForNewApexCodeVersion } from "../../utils/version-check.js";
 import { ArminComponent } from "./components/armin.js";
@@ -61,12 +65,14 @@ import { LoginDialogComponent } from "./components/login-dialog.js";
 import { createMermaidMarkdownTransformer } from "./components/mermaid.js";
 import { ModelSelectorComponent } from "./components/model-selector.js";
 import { formatAuthSelectorProviderType, OAuthSelectorComponent, } from "./components/oauth-selector.js";
+import { renderPermissionPreview } from "./components/permission-preview.js";
 import { ScopedModelsSelectorComponent } from "./components/scoped-models-selector.js";
 import { SessionSelectorComponent } from "./components/session-selector.js";
 import { PERMISSION_MODE_OVERRIDE_HINTS, SettingsSelectorComponent } from "./components/settings-selector.js";
 import { SkillInvocationMessageComponent } from "./components/skill-invocation-message.js";
 import { ApexSplashHeader } from "./components/splash-header.js";
 import { BranchSummaryStatusIndicator, CompactionStatusIndicator, IdleStatus, RetryStatusIndicator, WorkingStatusIndicator, } from "./components/status-indicator.js";
+import { ThinkingSelectorComponent } from "./components/thinking-selector.js";
 import { ToolExecutionComponent } from "./components/tool-execution.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { TrustSelectorComponent } from "./components/trust-selector.js";
@@ -95,6 +101,9 @@ class ExpandableText extends Text {
 function isCustomSessionEntry(item) {
     return "type" in item && item.type === "custom";
 }
+function isCompactionCostNotice(item) {
+    return "type" in item && item.type === "compaction_cost";
+}
 const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN"]);
 function isDeadTerminalError(error) {
     if (!error || typeof error !== "object" || !("code" in error)) {
@@ -134,6 +143,11 @@ export function formatResumeCommand(sessionManager) {
 function hasDefaultModelProvider(providerId) {
     return providerId in defaultModelPerProvider;
 }
+function llamaCppPostLoginGuidance(actionLabel, loadedModelCount) {
+    return loadedModelCount === 0
+        ? `${actionLabel}. No llama.cpp models are loaded. Use /llama to load a model, then /model to select it.`
+        : `${actionLabel}. Use /model to select a loaded llama.cpp model, or /llama to manage models.`;
+}
 const AUTH_TYPE_ORDER = { oauth: 0, api_key: 1 };
 function createFuzzyAutocompleteItems(items, prefix, getSearchText, toAutocompleteItem) {
     const filtered = fuzzyFilter(items, prefix, getSearchText);
@@ -180,6 +194,7 @@ export function createInteractiveTui(options) {
             searchCurrentMatchStyle: (text) => theme.bold(theme.inverse(styleSearchMatch(text))),
             openUrl: openBrowser,
             onRightClickPaste: options.onRightClickPaste,
+            copyOnSelect: options.fullscreenCopyOnSelect,
             copySelection: async (text) => {
                 try {
                     await copyToClipboard(text);
@@ -224,6 +239,23 @@ export function createInteractiveTuiReference(getTui) {
         getPrototypeOf: () => Reflect.getPrototypeOf(getTui()),
     });
 }
+/**
+ * Working status rides in the footer tray; everything else keeps its own rows.
+ *
+ * The tray is a line the screen already spends, so a turn no longer costs two
+ * rows above the editor. Retry, compaction and branch summary stay in the status
+ * container. They are interruptions rather than steady state and they carry
+ * their own countdowns.
+ *
+ * A custom footer replaces the built-in one entirely, so a session running one
+ * keeps its indicator where it can still be seen.
+ *
+ * Free of `this` so the white-box prototype tests can exercise the callers
+ * without fabricating a whole InteractiveMode.
+ */
+function trayOwnsActivity(kind, hasCustomFooter) {
+    return kind === "working" && !hasCustomFooter;
+}
 export class InteractiveMode {
     runtimeHost;
     /** Settled once the most recent /settings permission-mode write has hit disk. */
@@ -305,6 +337,11 @@ export class InteractiveMode {
     firstUseHints;
     // Track current bash execution component
     bashComponent = undefined;
+    // Reentrancy guard: session.isBashRunning only turns true inside
+    // executeBash, so a second `!cmd` submitted during the extension
+    // emitUserBash await would otherwise overwrite the in-flight component
+    // and orphan the first command's output callback.
+    isHandlingBashCommand = false;
     // Track pending bash components (shown in pending area, moved to chat on submit)
     pendingBashComponents = [];
     // Auto-compaction state
@@ -362,6 +399,7 @@ export class InteractiveMode {
     }
     constructor(runtimeHost, options = {}) {
         this.runtimeHost = runtimeHost;
+        setCapabilityOverrides(this.settingsManager.getTerminalCapabilityOverrides());
         const tuiMode = options.tuiMode ?? this.settingsManager.getTuiMode();
         this.options = { ...options, tuiMode };
         this.autoTrustOnReloadCwd = options.autoTrustOnReloadCwd;
@@ -378,6 +416,7 @@ export class InteractiveMode {
             showHardwareCursor: this.settingsManager.getShowHardwareCursor(),
             logDirectory: getAgentDir(),
             onRightClickPaste: this.onRightClickPaste,
+            fullscreenCopyOnSelect: this.settingsManager.getFullscreenCopyOnSelect(),
         });
         this.ui = createInteractiveTuiReference(() => this.renderer);
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
@@ -401,6 +440,10 @@ export class InteractiveMode {
             autocompleteMaxVisible,
             promptPrefix: "› ",
             promptColor: (text) => theme.fg("accent", text),
+            // Bash mode changes the glyph as well as the hue, so the mode is still
+            // readable on a monochrome terminal. Same cell count, so nothing shifts.
+            bashPromptPrefix: "! ",
+            bashPromptColor: (text) => theme.fg("bashMode", text),
             placeholder: "Ask anything",
             placeholderColor: (text) => theme.fg("dim", text),
             commandColor: (text) => theme.fg("accent", text),
@@ -467,8 +510,21 @@ export class InteractiveMode {
             path: command.sourceInfo.path,
         }));
     }
-    createBaseAutocompleteProvider() {
-        // Define commands for autocomplete
+    /**
+     * Every *registered* command: builtin, prompt template, extension, and skill.
+     *
+     * One function rather than two because `/help` renders this list and autocomplete
+     * completes it. Built in two places they would disagree the first time either grew a
+     * source, and the disagreement would show up as a command a user can complete but not
+     * find, or find but not run.
+     *
+     * A few commands are dispatched without being registered -- `/debug`, and the
+     * `/arminsayshi` and `/dementedelves` easter eggs. They are absent here on purpose,
+     * which is also why autocomplete has never offered them. "Registered" is the boundary
+     * both surfaces share; listing them in `/help` would advertise what completion cannot
+     * complete.
+     */
+    collectSessionCommands() {
         const slashCommands = BUILTIN_SLASH_COMMANDS.map((command) => ({
             name: command.name,
             description: command.description,
@@ -496,6 +552,15 @@ export class InteractiveMode {
                 }));
             };
         }
+        const thinkingCommand = slashCommands.find((command) => command.name === "thinking");
+        if (thinkingCommand) {
+            thinkingCommand.getArgumentCompletions = (prefix) => {
+                return createFuzzyAutocompleteItems(this.session.getAvailableThinkingLevels(), prefix, (level) => level, (level) => ({
+                    value: level,
+                    label: level,
+                }));
+            };
+        }
         const loginCommand = slashCommands.find((command) => command.name === "login");
         if (loginCommand) {
             loginCommand.getArgumentCompletions = (prefix) => {
@@ -536,7 +601,10 @@ export class InteractiveMode {
                 });
             }
         }
-        return new CombinedAutocompleteProvider([...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList], this.sessionManager.getCwd(), this.fdPath);
+        return [...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList];
+    }
+    createBaseAutocompleteProvider() {
+        return new CombinedAutocompleteProvider(this.collectSessionCommands(), this.sessionManager.getCwd(), this.fdPath);
     }
     setupAutocompleteProvider() {
         let provider = this.createBaseAutocompleteProvider();
@@ -624,6 +692,7 @@ export class InteractiveMode {
             logDirectory: getAgentDir(),
             terminal,
             onRightClickPaste: this.onRightClickPaste,
+            fullscreenCopyOnSelect: this.settingsManager.getFullscreenCopyOnSelect(),
         });
         nextUi.setClearOnShrink(clearOnShrink);
         nextUi.onDebug = onDebug;
@@ -792,6 +861,14 @@ export class InteractiveMode {
         });
         // Initialize available provider count for footer display
         await this.updateAvailableProviderCount();
+        // Flush the completed startup state before loading the remaining syntax grammars.
+        this.ui.renderNow();
+        void loadAllHighlightLanguages().then(() => {
+            if (!this.isInitialized)
+                return;
+            this.ui.invalidate();
+            this.ui.requestRender();
+        });
     }
     /**
      * Update terminal title with session name and cwd.
@@ -847,7 +924,18 @@ export class InteractiveMode {
             }
         });
         // Show startup warnings
-        const { migratedProviders, modelFallbackMessage, initialMessage, initialImages, initialMessages } = this.options;
+        const { migratedProviders, startupDiagnostics, modelFallbackMessage, initialMessage, initialImages, initialMessages, } = this.options;
+        for (const diagnostic of startupDiagnostics ?? []) {
+            if (diagnostic.type === "error") {
+                this.showError(diagnostic.message);
+            }
+            else if (diagnostic.type === "warning") {
+                this.showWarning(diagnostic.message);
+            }
+            else {
+                this.showStatus(diagnostic.message);
+            }
+        }
         if (migratedProviders && migratedProviders.length > 0) {
             this.showWarning(`Migrated credentials to auth.json: ${migratedProviders.join(", ")}`);
         }
@@ -1569,8 +1657,12 @@ export class InteractiveMode {
         this.transcriptScrollView?.setScrollbar(this.settingsManager.getFullscreenScrollbar());
     }
     applyRuntimeSettings() {
+        setCapabilityOverrides(this.settingsManager.getTerminalCapabilityOverrides());
         configureHttpDispatcher(this.settingsManager.getHttpIdleTimeoutMs());
         this.applyFullscreenScrollbarSetting();
+        if (this.renderer instanceof TuiAltScreen) {
+            this.renderer.setCopyOnSelect(this.settingsManager.getFullscreenCopyOnSelect());
+        }
         this.footer.setSession(this.session);
         this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
         void this.refreshFooterPermissionMode();
@@ -1626,6 +1718,15 @@ export class InteractiveMode {
         this.compactionQueuedMessages = [];
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
+        // The clears above detach children without stopping their animation
+        // timers. Bash components embed an animated loader; dispose them
+        // explicitly so an in-flight `!cmd` cannot keep rendering (or get
+        // flushed back into a fresh session by flushPendingBashComponents).
+        for (const component of this.pendingBashComponents)
+            component.dispose();
+        this.pendingBashComponents = [];
+        this.bashComponent?.dispose();
+        this.bashComponent = undefined;
         this.clearPendingTools();
         this.renderInitialMessages();
     }
@@ -1712,6 +1813,11 @@ export class InteractiveMode {
         this.activeStatusIndicator?.dispose();
         this.activeStatusIndicator = indicator;
         this.statusContainer.clear();
+        if (trayOwnsActivity(indicator.kind, this.customFooter !== undefined)) {
+            this.footer.setActivity(indicator);
+            return;
+        }
+        this.footer.setActivity(undefined);
         this.statusContainer.addChild(indicator);
     }
     clearStatusIndicator(kind) {
@@ -1719,13 +1825,23 @@ export class InteractiveMode {
             return;
         }
         const hadActiveStatusIndicator = this.activeStatusIndicator !== undefined;
+        const wasInTray = this.activeStatusIndicator !== undefined &&
+            trayOwnsActivity(this.activeStatusIndicator.kind, this.customFooter !== undefined);
         this.activeStatusIndicator?.dispose();
         this.activeStatusIndicator = undefined;
+        this.footer?.setActivity(undefined);
         this.statusContainer.clear();
+        // The tray never occupied those rows, so it must not leave the idle filler
+        // behind to reserve them.
+        if (wasInTray)
+            return;
         if (hadActiveStatusIndicator && this.options.tuiMode === "regular" && this.ui.getClearOnShrink()) {
             this.statusContainer.addChild(this.idleStatus);
         }
     }
+    showWorkingStatusIndicator() {
+        this.showStatusIndicator(new WorkingStatusIndicator(this.ui, this.workingMessage ?? this.defaultWorkingMessage, this.workingIndicatorOptions));
+    }
     setWorkingVisible(visible) {
         this.workingVisible = visible;
         if (!visible) {
@@ -1734,7 +1850,7 @@ export class InteractiveMode {
             return;
         }
         if (this.session.isStreaming && this.activeStatusIndicator?.kind !== "working") {
-            this.showStatusIndicator(new WorkingStatusIndicator(this.ui, this.workingMessage ?? this.defaultWorkingMessage, this.workingIndicatorOptions));
+            this.showWorkingStatusIndicator();
         }
         this.ui.requestRender();
     }
@@ -2040,6 +2156,7 @@ export class InteractiveMode {
                 timeout: opts?.timeout,
                 onToggleToolsExpanded: () => this.toggleToolOutputExpansion(),
                 enableSearch,
+                preamble: opts?.preview ? renderPermissionPreview(opts.preview) : undefined,
             });
             this.disposeActiveSelector();
             this.editorContainer.clear();
@@ -2089,10 +2206,24 @@ export class InteractiveMode {
                 this.showTrustSelector();
                 break;
             case "Resources, extensions, and MCP adapters":
-                this.showStatus("Run apex-code config to manage resources, extensions, and MCP adapters.");
+                this.showStatus(this.describeMcpServers());
                 break;
         }
     }
+    /**
+     * Report configured MCP servers and their live connection state. Replaces a string
+     * that offered MCP management from `apex-code config`, which manages package
+     * resources and has never been able to configure a server.
+     */
+    describeMcpServers() {
+        const runtime = this.session.mcpRuntime;
+        const servers = runtime ? [...runtime.servers.keys()] : [];
+        if (servers.length === 0) {
+            return "Run apex-code config to manage resources and extensions. No MCP server is configured; add one to .mcp.json.";
+        }
+        const states = servers.map((name) => `${name} (${runtime?.manager.state(name).kind ?? "disconnected"})`);
+        return `Run apex-code config to manage resources and extensions. MCP servers: ${states.join(", ")}.`;
+    }
     /**
      * Show a confirmation dialog for extensions.
      */
@@ -2393,7 +2524,7 @@ export class InteractiveMode {
         this.defaultEditor.onAction("app.tools.expand", () => this.toggleToolOutputExpansion());
         this.defaultEditor.onAction("app.thinking.toggle", () => this.toggleThinkingBlockVisibility());
         this.defaultEditor.onAction("app.editor.external", () => void this.handleOpenExternalEditor());
-        this.defaultEditor.onAction("app.message.copy", () => void this.handleCopyCommand({ flashConfirmation: true }));
+        this.defaultEditor.onAction("app.message.copy", () => void this.handleCopyCommand({ flashConfirmation: true, preferSelection: true }));
         this.defaultEditor.onAction("app.message.followUp", () => this.handleFollowUp());
         this.defaultEditor.onAction("app.message.dequeue", () => this.handleDequeue());
         this.defaultEditor.onAction("app.session.new", () => this.handleClearCommand());
@@ -2492,6 +2623,12 @@ export class InteractiveMode {
                 await this.handleModelCommand(searchTerm);
                 return;
             }
+            if (text === "/thinking" || text.startsWith("/thinking ")) {
+                const searchTerm = text.startsWith("/thinking ") ? text.slice(10).trim() : undefined;
+                this.editor.setText("");
+                this.handleThinkingCommand(searchTerm);
+                return;
+            }
             if (text === "/export" || text.startsWith("/export ")) {
                 await this.handleExportCommand(text);
                 this.editor.setText("");
@@ -2537,6 +2674,11 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
+            if (text === "/help") {
+                this.handleHelpCommand();
+                this.editor.setText("");
+                return;
+            }
             if (text === "/fork") {
                 this.showUserMessageSelector();
                 this.editor.setText("");
@@ -2568,6 +2710,12 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
+            if (text === "/mcp" || text.startsWith("/mcp ")) {
+                const mcpArgs = text.slice(4).trim().split(/\s+/).filter(Boolean);
+                this.editor.setText("");
+                await this.handleMcpAuthCommand(mcpArgs);
+                return;
+            }
             if (text === "/new") {
                 this.editor.setText("");
                 await this.handleClearCommand();
@@ -2682,8 +2830,15 @@ export class InteractiveMode {
                     this.defaultEditor.onEscape = this.retryEscapeHandler;
                     this.retryEscapeHandler = undefined;
                 }
+                break;
+            case "turn_start":
+                if (this.settingsManager.getShowTerminalProgress()) {
+                    this.ui.terminal.setProgress(true);
+                }
                 if (this.workingVisible) {
-                    this.showStatusIndicator(new WorkingStatusIndicator(this.ui, this.workingMessage ?? this.defaultWorkingMessage, this.workingIndicatorOptions));
+                    if (this.activeStatusIndicator?.kind !== "working") {
+                        this.showWorkingStatusIndicator();
+                    }
                 }
                 else {
                     this.clearStatusIndicator();
@@ -2878,9 +3033,21 @@ export class InteractiveMode {
                     }
                 }
                 else if (event.result) {
+                    const entries = this.sessionManager.buildContextEntries();
+                    if (entries[0]?.type !== "compaction") {
+                        throw new Error("Completed compaction is missing from the session context");
+                    }
                     this.chatContainer.clear();
-                    this.rebuildChatFromMessages();
+                    // The latest compaction is prepended for model context; append it below at its chronological position.
+                    this.renderSessionEntries(entries.slice(1));
                     this.addMessageToChat(createCompactionSummaryMessage(event.result.summary, event.result.tokensBefore, new Date().toISOString()));
+                    if (event.result.usage) {
+                        this.addCompactionCostNotice({
+                            type: "compaction_cost",
+                            kind: "compaction",
+                            usage: event.result.usage,
+                        });
+                    }
                     this.footer.invalidate();
                 }
                 else if (event.errorMessage) {
@@ -3102,6 +3269,10 @@ export class InteractiveMode {
                 this.addCustomEntryToChat(item);
                 continue;
             }
+            if (isCompactionCostNotice(item)) {
+                this.addCompactionCostNotice(item);
+                continue;
+            }
             const message = item;
             // Assistant messages need special handling for tool calls
             if (message.role === "assistant") {
@@ -3169,10 +3340,28 @@ export class InteractiveMode {
             if (entry.type === "custom") {
                 return [entry];
             }
-            return sessionEntryToContextMessages(entry);
+            const messages = sessionEntryToContextMessages(entry);
+            if ((entry.type === "compaction" || entry.type === "branch_summary") && entry.usage && messages.length > 0) {
+                return [...messages, { type: "compaction_cost", kind: entry.type, usage: entry.usage }];
+            }
+            return messages;
         });
         this.renderSessionItems(items, options);
     }
+    /**
+     * Render billing usage for a compaction or branch summary. The notice is derived
+     * from persisted summary usage and is not stored as a separate session entry.
+     */
+    addCompactionCostNotice(notice) {
+        if (!this.settingsManager.getShowCacheMissNotices())
+            return;
+        const { usage } = notice;
+        const tokens = usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+        const cost = usage.cost.total >= 0.01 ? ` (~$${usage.cost.total.toFixed(2)})` : "";
+        const label = notice.kind === "compaction" ? "Compaction" : "Branch summary";
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new Text(theme.fg("warning", `${label}: ${formatTokens(tokens)} tokens billed${cost}`), 1, 0));
+    }
     /**
      * Show a transcript notice when a completed assistant message paid for a
      * significant cache miss. Only states observable facts: the miss itself,
@@ -3383,6 +3572,34 @@ export class InteractiveMode {
         const uncaughtExceptionHandler = (error) => this.uncaughtCrash(error);
         process.prependListener("uncaughtException", uncaughtExceptionHandler);
         this.signalCleanupHandlers.push(() => process.off("uncaughtException", uncaughtExceptionHandler));
+        // Lend the terminal back to the supervisor when it needs to draw a sandbox
+        // escalation prompt. The supervisor owns that decision (ADR 0023) and this
+        // process cannot read the answer anyway -- bwrap --new-session leaves it with no
+        // controlling terminal. `ui.stop()` is the same restore Ctrl+Z already performs,
+        // so the terminal is in cooked mode with a visible cursor while the human answers.
+        const handoffDirectory = process.env[TERMINAL_HANDOFF_PATH_VARIABLE];
+        if (handoffDirectory) {
+            const observer = observeTerminalHandoff(handoffDirectory, {
+                suspend: () => {
+                    try {
+                        this.ui.stop();
+                    }
+                    catch {
+                        // A terminal we cannot restore still leaves the prompt readable.
+                    }
+                },
+                resume: () => {
+                    try {
+                        this.ui.start();
+                        this.ui.requestRender(true);
+                    }
+                    catch {
+                        // Nothing further to try; the next render request recovers.
+                    }
+                },
+            }, { acknowledgementPath: process.env[TERMINAL_HANDOFF_ACK_PATH_VARIABLE] });
+            this.signalCleanupHandlers.push(() => observer.stop());
+        }
     }
     unregisterSignalHandlers() {
         for (const cleanup of this.signalCleanupHandlers) {
@@ -3464,7 +3681,9 @@ export class InteractiveMode {
         }
     }
     updateEditorBorderColor() {
-        this.defaultEditor.setModeLabel(this.isBashMode ? "bash" : this.session.isStreaming ? "busy" : undefined);
+        // Streaming no longer touches the dock. WorkingStatusIndicator already owns
+        // that signal, and a `[busy]` prefix moved the caret mid-turn.
+        this.defaultEditor.setPromptMode(this.isBashMode ? "bash" : "agent");
         if (this.isBashMode) {
             this.editor.borderColor = theme.getBashModeBorderColor();
         }
@@ -3524,19 +3743,20 @@ export class InteractiveMode {
         }
         this.showStatus(`Tool output: ${expanded ? "expanded" : "collapsed"}`);
     }
+    /** Update rendered assistant messages without rebuilding live tool components. */
+    updateThinkingBlockVisibility() {
+        for (const child of this.chatContainer.children) {
+            if (child instanceof AssistantMessageComponent) {
+                child.setHideThinkingBlock(this.hideThinkingBlock);
+            }
+        }
+        this.ui.requestRender();
+    }
     toggleThinkingBlockVisibility() {
         this.offerFirstUseHint("thinking");
         this.hideThinkingBlock = !this.hideThinkingBlock;
         this.settingsManager.setHideThinkingBlock(this.hideThinkingBlock);
-        // Rebuild chat from session messages
-        this.chatContainer.clear();
-        this.rebuildChatFromMessages();
-        // If streaming, re-add the streaming component with updated visibility and re-render
-        if (this.streamingComponent && this.streamingMessage) {
-            this.streamingComponent.setHideThinkingBlock(this.hideThinkingBlock);
-            this.streamingComponent.updateContent(this.streamingMessage);
-            this.chatContainer.addChild(this.streamingComponent);
-        }
+        this.updateThinkingBlockVisibility();
         this.showStatus(`Thinking blocks: ${this.hideThinkingBlock ? "hidden" : "visible"}`);
     }
     async handleOpenExternalEditor() {
@@ -3858,8 +4078,14 @@ export class InteractiveMode {
         const permissionMode = await this.session.getPermissionMode();
         this.showSelector((done) => {
             let selector;
+            const defaultProvider = this.settingsManager.getDefaultProvider();
+            const defaultModelId = this.settingsManager.getDefaultModel();
+            const defaultModel = defaultProvider && defaultModelId ? `${defaultProvider}/${defaultModelId}` : "not set";
             selector = new SettingsSelectorComponent({
                 autoCompact: this.session.autoCompactionEnabled,
+                defaultModel,
+                currentModel: this.session.model,
+                availableDefaultModels: this.session.modelRuntime.getAvailableSnapshot(),
                 showImages: this.settingsManager.getShowImages(),
                 imageWidthCells: this.settingsManager.getImageWidthCells(),
                 autoResizeImages: this.settingsManager.getImageAutoResize(),
@@ -3869,8 +4095,9 @@ export class InteractiveMode {
                 followUpMode: this.session.followUpMode,
                 transport: this.settingsManager.getTransport(),
                 httpIdleTimeoutMs: this.settingsManager.getHttpIdleTimeoutMs(),
-                thinkingLevel: this.session.thinkingLevel,
-                availableThinkingLevels: this.session.getAvailableThinkingLevels(),
+                thinkingLevel: this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL,
+                availableThinkingLevels: [...THINKING_LEVEL_OPTIONS],
+                modelThinkingLevels: this.settingsManager.getAllModelThinkingLevels(),
                 currentTheme: this.themeController.getThemeSelection() || "dark",
                 terminalTheme: this.themeController.getTerminalTheme(),
                 availableThemes: getAvailableThemes(),
@@ -3893,6 +4120,7 @@ export class InteractiveMode {
                 tuiMode: this.ui.mode,
                 fullscreenExitOutput: this.settingsManager.getFullscreenExitOutput(),
                 fullscreenScrollbar: this.settingsManager.getFullscreenScrollbar(),
+                fullscreenCopyOnSelect: this.settingsManager.getFullscreenCopyOnSelect(),
                 warnings: this.settingsManager.getWarnings(),
             }, {
                 onAutoCompactChange: (enabled) => {
@@ -3940,10 +4168,26 @@ export class InteractiveMode {
                     configureHttpDispatcher(timeoutMs);
                     this.showStatus(`HTTP idle timeout: ${formatHttpIdleTimeoutMs(timeoutMs)}`);
                 },
-                onThinkingLevelChange: (level) => {
-                    this.session.setThinkingLevel(level);
-                    this.footer.invalidate();
-                    this.updateEditorBorderColor();
+                onModelThinkingLevelChange: (provider, modelId, level) => {
+                    this.settingsManager.setModelThinkingLevel(provider, modelId, level);
+                    // If the override is for the current model, apply it to the session too
+                    const current = this.session.model;
+                    if (current && current.provider === provider && current.id === modelId) {
+                        this.session.setThinkingLevel(level);
+                        this.footer.invalidate();
+                        this.updateEditorBorderColor();
+                    }
+                },
+                onModelThinkingLevelRemove: (provider, modelId) => {
+                    this.settingsManager.removeModelThinkingLevel(provider, modelId);
+                    // If the override was for the current model, revert to global default
+                    const current = this.session.model;
+                    if (current && current.provider === provider && current.id === modelId) {
+                        const globalDefault = this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL;
+                        this.session.setThinkingLevel(globalDefault);
+                        this.footer.invalidate();
+                        this.updateEditorBorderColor();
+                    }
                 },
                 onThemeChange: (themeSetting) => {
                     this.settingsManager.setTheme(themeSetting);
@@ -3953,13 +4197,7 @@ export class InteractiveMode {
                 onHideThinkingBlockChange: (hidden) => {
                     this.hideThinkingBlock = hidden;
                     this.settingsManager.setHideThinkingBlock(hidden);
-                    for (const child of this.chatContainer.children) {
-                        if (child instanceof AssistantMessageComponent) {
-                            child.setHideThinkingBlock(hidden);
-                        }
-                    }
-                    this.chatContainer.clear();
-                    this.rebuildChatFromMessages();
+                    this.updateThinkingBlockVisibility();
                 },
                 onMermaidRenderingModeChange: (mode) => {
                     this.settingsManager.setMermaidRenderingMode(mode);
@@ -4056,6 +4294,11 @@ export class InteractiveMode {
                     this.settingsManager.setFullscreenScrollbar(mode);
                     this.applyFullscreenScrollbarSetting();
                 },
+                onFullscreenCopyOnSelectChange: (enabled) => {
+                    this.settingsManager.setFullscreenCopyOnSelect(enabled);
+                    if (this.renderer instanceof TuiAltScreen)
+                        this.renderer.setCopyOnSelect(enabled);
+                },
                 onWarningsChange: (warnings) => {
                     this.settingsManager.setWarnings(warnings);
                 },
@@ -4067,6 +4310,44 @@ export class InteractiveMode {
             return { component: selector, focus: selector.getSettingsList() };
         });
     }
+    handleThinkingCommand(searchTerm) {
+        const availableLevels = this.session.getAvailableThinkingLevels();
+        if (!searchTerm) {
+            this.showThinkingSelector();
+            return;
+        }
+        const normalized = searchTerm.trim().toLowerCase();
+        const level = availableLevels.find((candidate) => candidate.toLowerCase() === normalized);
+        if (!level) {
+            this.showError(`Unknown thinking level "${searchTerm}". Available levels: ${availableLevels.join(", ")}.`);
+            return;
+        }
+        this.selectThinkingLevel(level, false);
+    }
+    selectThinkingLevel(level, persist) {
+        try {
+            this.session.setThinkingLevel(level, { persist });
+            this.footer.invalidate();
+            this.updateEditorBorderColor();
+            this.showStatus(persist ? `Default thinking level: ${level}` : `Thinking level: ${level}`);
+        }
+        catch (error) {
+            this.showError(error instanceof Error ? error.message : String(error));
+        }
+    }
+    showThinkingSelector() {
+        this.showSelector((done) => {
+            const selectLevel = (level, persist) => {
+                this.selectThinkingLevel(level, persist);
+                done();
+            };
+            const selector = new ThinkingSelectorComponent(this.session.thinkingLevel ?? DEFAULT_THINKING_LEVEL, this.session.getAvailableThinkingLevels(), (level) => selectLevel(level, false), () => {
+                done();
+                this.ui.requestRender();
+            }, (level) => selectLevel(level, true), this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL);
+            return { component: selector, focus: selector };
+        });
+    }
     async handleModelCommand(searchTerm) {
         if (!searchTerm) {
             this.showModelSelector();
@@ -4075,7 +4356,7 @@ export class InteractiveMode {
         const model = await this.findExactModelMatch(searchTerm);
         if (model) {
             try {
-                await this.session.setModel(model);
+                await this.session.setModel(model, { persist: false });
                 this.footer.invalidate();
                 this.updateEditorBorderColor();
                 this.showStatus(`Model: ${model.id}`);
@@ -4204,13 +4485,14 @@ export class InteractiveMode {
     }
     showModelSelector(initialSearchInput) {
         this.showSelector((done) => {
-            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRuntime, this.session.scopedModels, async (model) => {
+            const selectModel = async (model, persist) => {
                 try {
-                    await this.session.setModel(model);
+                    await this.session.setModel(model, { persist });
+                    this.updateAvailableProviderCount();
                     this.footer.invalidate();
                     this.updateEditorBorderColor();
                     done();
-                    this.showStatus(`Model: ${model.id}`);
+                    this.showStatus(persist ? `Default model: ${model.provider}/${model.id}` : `Model: ${model.id}`);
                     void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
                     this.checkDaxnutsEasterEgg(model);
                 }
@@ -4218,10 +4500,13 @@ export class InteractiveMode {
                     done();
                     this.showError(error instanceof Error ? error.message : String(error));
                 }
-            }, () => {
+            };
+            const defaultProvider = this.settingsManager.getDefaultProvider();
+            const defaultModel = this.settingsManager.getDefaultModel();
+            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.session.modelRuntime, this.session.scopedModels, (model) => selectModel(model, false), () => {
                 done();
                 this.ui.requestRender();
-            }, initialSearchInput);
+            }, initialSearchInput, (model) => selectModel(model, true), defaultProvider && defaultModel ? { provider: defaultProvider, id: defaultModel } : undefined);
             return { component: selector, focus: selector, dispose: () => selector.dispose() };
         });
     }
@@ -4614,6 +4899,27 @@ export class InteractiveMode {
         return this.getLoginProviderOptions().filter((provider) => provider.id.toLowerCase() === normalizedProviderRef ||
             provider.name.toLowerCase() === normalizedProviderRef);
     }
+    /** `/mcp auth <server>`: runs the same OAuth flow as the CLI, printing into the chat. */
+    async handleMcpAuthCommand(mcpArgs) {
+        const show = (line, kind = "dim") => {
+            this.chatContainer.addChild(new Text(theme.fg(kind, line), 1, 0));
+            this.ui.requestRender();
+        };
+        if (mcpArgs[0] !== "auth" || !mcpArgs[1] || mcpArgs.length > 2) {
+            show("Usage: /mcp auth <server>", "error");
+            return;
+        }
+        try {
+            await authorizeConfiguredServer({
+                serverName: mcpArgs[1],
+                openBrowser: (url) => openBrowser(url),
+                log: (line) => show(line),
+            });
+        }
+        catch (error) {
+            show(`Error: ${error instanceof Error ? error.message : String(error)}`, "error");
+        }
+    }
     async handleLoginCommand(providerRef) {
         if (!providerRef) {
             this.showLoginAuthTypeSelector();
@@ -4777,7 +5083,11 @@ export class InteractiveMode {
         if (isUnknownModel(previousModel)) {
             const availableModels = this.session.modelRuntime.getAvailableSnapshot();
             const providerModels = availableModels.filter((model) => model.provider === providerId);
-            if (!hasDefaultModelProvider(providerId)) {
+            // Matches LLAMA_PROVIDER_ID from extensions/llama/provider.ts; kept inline to avoid coupling interactive mode to the built-in extension.
+            if (providerId === "llama.cpp") {
+                selectionError = llamaCppPostLoginGuidance(actionLabel, providerModels.length);
+            }
+            else 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) {
@@ -4791,7 +5101,7 @@ export class InteractiveMode {
                 }
                 else {
                     try {
-                        await this.session.setModel(selectedModel);
+                        await this.session.setModel(selectedModel, { persist: true });
                     }
                     catch (error) {
                         selectedModel = undefined;
@@ -5048,8 +5358,8 @@ export class InteractiveMode {
                 activeHeader.setExpanded(this.toolOutputExpanded);
             }
             setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
-            await this.themeController.applyFromSettings();
             this.applyRuntimeSettings();
+            await this.themeController.applyFromSettings();
             this.setupAutocompleteProvider();
             const runner = this.session.extensionRunner;
             this.setupExtensionShortcuts(runner);
@@ -5233,6 +5543,13 @@ export class InteractiveMode {
         }
     }
     async handleCopyCommand(options = {}) {
+        if (options.preferSelection &&
+            this.ui instanceof TuiAltScreen &&
+            !this.ui.getCopyOnSelect() &&
+            this.ui.hasActiveSelection()) {
+            await this.ui.copyActiveSelectionToClipboard();
+            return;
+        }
         const text = this.session.getLastAssistantText();
         if (!text) {
             this.showError("No agent messages to copy yet.");
@@ -5491,6 +5808,28 @@ export class InteractiveMode {
         this.chatContainer.addChild(new DynamicBorder());
         this.ui.requestRender();
     }
+    /**
+     * Renders what `collectSessionCommands` returns, so the list a user reads and the list
+     * autocomplete offers are the same list rather than two that agree today. Unregistered
+     * dispatch-only commands are outside that boundary; see the note there.
+     */
+    handleHelpCommand() {
+        const commands = this.collectSessionCommands();
+        const rows = commands
+            .map((command) => {
+            const invocation = command.argumentHint ? `/${command.name} ${command.argumentHint}` : `/${command.name}`;
+            return `| \`${invocation}\` | ${command.description ?? ""} |`;
+        })
+            .join("\n");
+        const help = `| Command | Description |\n|---------|-------------|\n${rows}\n\nType \`/\` to filter these, or \`/hotkeys\` for keyboard shortcuts.`;
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new DynamicBorder());
+        this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "Commands")), 1, 0));
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new Markdown(help, 1, 1, this.getMarkdownThemeWithSettings()));
+        this.chatContainer.addChild(new DynamicBorder());
+        this.ui.requestRender();
+    }
     async handleClearCommand() {
         this.clearStatusIndicator();
         try {
@@ -5554,6 +5893,19 @@ export class InteractiveMode {
         }
     }
     async handleBashCommand(command, excludeFromContext = false) {
+        if (this.isHandlingBashCommand) {
+            this.showWarning("A bash command is already running; wait for it to finish");
+            return;
+        }
+        this.isHandlingBashCommand = true;
+        try {
+            await this.runBashCommand(command, excludeFromContext);
+        }
+        finally {
+            this.isHandlingBashCommand = false;
+        }
+    }
+    async runBashCommand(command, excludeFromContext = false) {
         const extensionRunner = this.session.extensionRunner;
         // Emit user_bash event to let extensions intercept
         const eventResult = await extensionRunner.emitUserBash({