@selesai/code 0.13.40 → 0.14.3

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

@@ -2,27 +2,30 @@
  * Interactive mode for the coding agent.
  * Handles TUI rendering and user interaction, delegating business logic to AgentSession.
  */
+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 { isRetryableAssistantError, } from "@earendil-works/pi-ai/compat";
 import * as TuiLayouts from "@earendil-works/pi-tui";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, Markdown, matchesKey, Spacer, setCapabilityOverrides, setKeybindings, Text, TruncatedText, TuiAltScreen, TuiMainScreen, visibleWidth, } from "@earendil-works/pi-tui";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Markdown, matchesKey, 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, getBundledDefaultsDir, getDebugLogPath, getDocsPath, getShareViewerUrl, getUpdateInstruction, PACKAGE_NAME, VERSION, } from "../../config.js";
+import { spawn } from "child_process";
+import { APP_NAME, APP_TITLE, CONFIG_DIR_NAME, detectInstallChange, getAgentDir, getAuthPath, getBundledDefaultsDir, getDebugLogPath, getDocsPath, getUpdateInstruction, PACKAGE_NAME, VERSION, } from "../../config.js";
 import { parseSkillBlocks } 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 { formatCacheWarmingStatus, formatCacheWarmingUsage } from "../../core/cache-warmer.js";
-import { recordCrash, takeUnnotifiedCrash } from "../../core/crash-log.js";
+import { findExtensionStackMatches, recordCrash, takeUnnotifiedCrash } from "../../core/crash-log.js";
 import { DEFAULT_THINKING_LEVEL, THINKING_LEVEL_OPTIONS } from "../../core/defaults.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
-import { createCompactionSummaryMessage } from "../../core/messages.js";
-import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScope, resolveModelScopeWithDiagnostics, } from "../../core/model-resolver.js";
+import { createCompactionSummaryMessage, createCustomMessage } from "../../core/messages.js";
+import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScopeFromModels, } from "../../core/model-resolver.js";
+import { CredentialSynchronizationError } from "../../core/model-runtime.js";
 import { DefaultPackageManager } from "../../core/package-manager.js";
+import { RADIUS_MCP_URL, RADIUS_PROVIDER_ID } from "../../core/radius.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager, sessionEntryToContextMessages, } from "../../core/session-manager.js";
 import { buildGitCommandPrompt, GIT_COMMAND_MODES } from "../../core/git-command.js";
@@ -31,14 +34,16 @@ import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
 import { withBuiltInRenderers } from "../../core/tools/renderers/index.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
 import { formatCost, getUsageCostBreakdown } from "../../core/usage-totals.js";
+import { addMcpServerConfig, loadMcpConfig } from "../../extensions/mcp/config.js";
 import { getChangelogPath, getNewEntries, normalizeChangelogLinks, parseChangelog } from "../../utils/changelog.js";
-import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
+import { copyToClipboard, readClipboardFilePaths, readClipboardText } from "../../utils/clipboard.js";
 import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
-import { formatDimensionNote, resizeImage } from "../../utils/image-resize.js";
+import { ensurePngTranscoder } from "../../utils/image-convert.js";
 import { getCwdRelativePath } from "../../utils/paths.js";
 import { getPiUserAgent } from "../../utils/pi-user-agent.js";
 import { killTrackedDetachedChildren } from "../../utils/shell.js";
+import { loadAllHighlightLanguages } from "../../utils/syntax-highlight.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { checkForNewPiVersion } from "../../utils/version-check.js";
 import { reportBug } from "./bug-report.js";
@@ -46,13 +51,11 @@ import { createChatViewport } from "./chat-viewport.js";
 import { ArminComponent } from "./components/armin.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
-import { BorderedLoader } from "./components/bordered-loader.js";
 import { BranchSummaryMessageComponent } from "./components/branch-summary-message.js";
 import { CompactionSummaryMessageComponent } from "./components/compaction-summary-message.js";
 import { CustomEditor } from "./components/custom-editor.js";
 import { CustomEntryComponent } from "./components/custom-entry.js";
 import { CustomMessageComponent } from "./components/custom-message.js";
-import { DaxnutsComponent } from "./components/daxnuts.js";
 import { DynamicBorder } from "./components/dynamic-border.js";
 import { StartupBox } from "./components/startup-box.js";
 import { EarendilAnnouncementComponent } from "./components/earendil-announcement.js";
@@ -62,22 +65,28 @@ import { ExtensionSelectorComponent } from "./components/extension-selector.js";
 import { FooterComponent, formatTokens } from "./components/footer.js";
 import { formatKeyText, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
 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 { formatAuthSelectorProviderStatus, formatAuthSelectorProviderType, OAuthSelectorComponent, } from "./components/oauth-selector.js";
+import { createLoginMenuSelector } from "./components/radius-login-selector.js";
 import { ScopedModelsSelectorComponent } from "./components/scoped-models-selector.js";
 import { SessionSelectorComponent } from "./components/session-selector.js";
 import { SettingsSelectorComponent } from "./components/settings-selector.js";
 import { SkillInvocationMessageComponent } from "./components/skill-invocation-message.js";
 import { BranchSummaryStatusIndicator, CompactionStatusIndicator, IdleStatus, ImageCaptioningStatusIndicator, RetryStatusIndicator, WorkingStatusIndicator, } from "./components/status-indicator.js";
+import { ThemedText } from "./components/themed-text.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";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
 import { editInExternalEditor } from "./external-editor.js";
-import { getModelSearchText } from "./model-search.js";
 import { refreshModelCatalogs } from "./model-catalog-refresh.js";
-import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, onThemeChange, setRegisteredThemes, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
+import { getModelSearchText } from "./model-search.js";
+import { ProgramStatusReporter } from "./program-status-reporter.js";
+import { shareSession } from "./session-share.js";
+import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, onThemeChange, SYSTEM_THEME_NAME, setRegisteredThemes, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
 import { InteractiveThemeController } from "./theme/theme-controller.js";
 import { createInteractiveTui, createInteractiveTuiReference } from "./tui-renderer.js";
 export { createInteractiveTui, createInteractiveTuiReference } from "./tui-renderer.js";
@@ -90,16 +99,26 @@ function isWorkingStatusEditor(editor) {
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
-class ExpandableText extends Text {
-    getCollapsedText;
-    getExpandedText;
+class ExpandableText extends ThemedText {
+    state;
     constructor(getCollapsedText, getExpandedText, expanded = false, paddingX = 0, paddingY = 0) {
-        super(expanded ? getExpandedText() : getCollapsedText(), paddingX, paddingY);
-        this.getCollapsedText = getCollapsedText;
-        this.getExpandedText = getExpandedText;
+        const state = { expanded };
+        super(() => (state.expanded ? getExpandedText() : getCollapsedText()), paddingX, paddingY);
+        this.state = state;
     }
     setExpanded(expanded) {
-        this.setText(expanded ? this.getExpandedText() : this.getCollapsedText());
+        this.state.expanded = expanded;
+        this.invalidate();
+    }
+}
+/** The built-in header. Clicking its logo (the first two lines, after one column of padding) plays an easter egg. */
+class BuiltInHeader extends ExpandableText {
+    onLogoClick;
+    handleMouse(event) {
+        if (event.type !== "click" || event.y > 1 || event.x < 1 || event.x > 4 || !this.onLogoClick)
+            return undefined;
+        this.onLogoClick(event.screenX - event.x + 1, event.screenY - event.y);
+        return { handled: true };
     }
 }
 function isCustomSessionEntry(item) {
@@ -111,7 +130,9 @@ function isCompactionCostNotice(item) {
 function isUsageSessionEntry(item) {
     return "type" in item && item.type === "usage";
 }
-const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN"]);
+// EIO: tty reads/ioctls from an orphaned background process group, or writes after hangup.
+// ENOTTY: the tty was revoked (macOS) and stdin is no longer a terminal.
+const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN", "ENOTTY"]);
 function isDeadTerminalError(error) {
     if (!error || typeof error !== "object" || !("code" in error)) {
         return false;
@@ -119,6 +140,22 @@ function isDeadTerminalError(error) {
     const code = error.code;
     return code !== undefined && DEAD_TERMINAL_ERROR_CODES.has(code);
 }
+export function formatCrashExtensionHint(extensionMatches) {
+    const matches = Array.isArray(extensionMatches)
+        ? extensionMatches.filter((match) => typeof match === "string" && match.length > 0)
+        : [];
+    if (matches.length === 0)
+        return undefined;
+    const quoted = matches.map((match) => `\`${match}\``);
+    const labels = quoted.length === 1
+        ? quoted[0]
+        : quoted.length === 2
+            ? quoted.join(" and ")
+            : `${quoted.slice(0, -1).join(", ")}, and ${quoted[quoted.length - 1]}`;
+    const noun = matches.length === 1 ? "extension" : "extensions";
+    const pronoun = matches.length === 1 ? "it" : "them";
+    return `A stack frame came from loaded ${noun} ${labels}, which may be involved. Try disabling ${pronoun} with \`${APP_NAME} config\`, or run \`${APP_NAME} -ne\` to confirm.`;
+}
 const ANTHROPIC_SUBSCRIPTION_AUTH_WARNING = "Anthropic subscription auth is active. Third-party harness usage draws from extra usage and is billed per token, not your Claude plan limits. Manage extra usage at https://claude.ai/settings/usage. Disable this warning in /settings.";
 const SELESAI_LOGO = [
     " ____    ____    __       ____    ____        ______  ______     ",
@@ -179,6 +216,7 @@ function llamaCppPostLoginGuidance(actionLabel, loadedModelCount) {
         ? `${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 RADIUS_LOGIN_INTRO = "Radius is a service crafted for Pi by the builders of Pi, Earendil Works";
 const AUTH_TYPE_ORDER = { oauth: 0, api_key: 1 };
 function createFuzzyAutocompleteItems(items, prefix, getSearchText, toAutocompleteItem) {
     const filtered = fuzzyFilter(items, prefix, getSearchText);
@@ -201,18 +239,21 @@ function getLoginProviderCompletionOptions(providerOptions) {
             id: provider.id,
             name: provider.name,
             authTypes: [provider.authType],
+            subscription: provider.subscription,
         });
     }
     return Array.from(byId.values()).sort((a, b) => a.name.localeCompare(b.name));
 }
 function getLoginProviderSearchText(provider) {
     const authTypes = provider.authTypes
-        .map((authType) => `${authType} ${formatAuthSelectorProviderType(authType)}`)
+        .map((authType) => `${authType} ${formatAuthSelectorProviderType(authType, provider.subscription)}`)
         .join(" ");
     return `${provider.id} ${provider.name} ${authTypes}`;
 }
 function formatLoginProviderCompletionDescription(provider) {
-    const authTypes = provider.authTypes.map(formatAuthSelectorProviderType).join("/");
+    const authTypes = provider.authTypes
+        .map((authType) => formatAuthSelectorProviderType(authType, provider.subscription))
+        .join("/");
     return provider.name === provider.id ? authTypes : `${provider.name} · ${authTypes}`;
 }
 export class InteractiveMode {
@@ -220,13 +261,13 @@ export class InteractiveMode {
     renderer;
     ui;
     mainScreenRenderState;
-    documentContainer;
     loadedResourcesContainer;
     chatContainer;
-    pendingMessagesContainer;
-    statusContainer;
+    documentContainer;
     transcriptScrollView;
     fullscreenLayoutRoot;
+    pendingMessagesContainer;
+    statusContainer;
     defaultEditor;
     editor;
     editorComponentFactory;
@@ -234,6 +275,8 @@ export class InteractiveMode {
     autocompleteProviderWrappers = [];
     fdPath;
     editorContainer;
+    activeSelectorToken;
+    activeSelectorDispose;
     footer;
     footerContainer;
     footerDataProvider;
@@ -261,16 +304,22 @@ export class InteractiveMode {
     // Status line tracking (for mutating immediately-sequential status updates)
     lastStatusSpacer = undefined;
     lastStatusText = undefined;
+    lastStatusMessage = "";
+    managedToolStatusStarted = false;
     // Streaming message tracking
     streamingComponent = undefined;
+    entriesRenderedByBoundaryCompaction = new Set();
     streamingMessage = undefined;
     // Tool execution tracking: toolCallId -> component
     pendingTools = new Map();
     // Tool output expansion state
     toolOutputExpanded = false;
-    managedToolStatusStarted = false;
     // Thinking block visibility state
     hideThinkingBlock = false;
+    mermaidMarkdownTransformer = createMermaidMarkdownTransformer({
+        getMode: () => this.settingsManager.getMermaidRenderingMode(),
+        theme,
+    });
     outputPad = 1;
     // Agent subscription unsubscribe function
     unsubscribe;
@@ -289,15 +338,16 @@ export class InteractiveMode {
     compactionQueuedMessages = [];
     // Shutdown state
     shutdownRequested = false;
+    /** Reports working, blocked, done, and error states to terminals that support OSC 7501. */
+    programStatus = new ProgramStatusReporter(() => this.ui.terminal, () => this.sessionManager.getSessionName());
     /** The `/bug` hint is shown at most once per session so error output stays readable. */
     bugReportHintShown = false;
+    installChangeWarningShown = false;
     // Extension UI state
     extensionSelector = undefined;
     extensionInput = undefined;
     extensionEditor = undefined;
-    // Extension terminal input listeners, keyed by handler so they can be
-    // re-registered on the active renderer after a TUI mode switch.
-    extensionTerminalInputUnsubscribers = new Map();
+    extensionTerminalInputSubscriptions = new Set();
     // Extension widgets (components rendered above/below the editor)
     extensionWidgetsAbove = new Map();
     extensionWidgetsBelow = new Map();
@@ -343,6 +393,7 @@ export class InteractiveMode {
         });
         this.runtimeHost.setRebindSession(async () => {
             await this.rebindCurrentSession({ renderBeforeBind: true });
+            this.themeController.applyFromSettings();
         });
         this.version = VERSION;
         this.renderer = createInteractiveTui({
@@ -352,13 +403,14 @@ export class InteractiveMode {
             terminal: options.terminal,
             onRightClickPaste: this.onRightClickPaste,
             fullscreenCopyOnSelect: this.settingsManager.getFullscreenCopyOnSelect(),
+            fullscreenWheelScrollLines: this.settingsManager.getFullscreenWheelScrollLines(),
         });
         this.ui = createInteractiveTuiReference(() => this.renderer);
         this.ui.setClearOnShrink(this.settingsManager.getClearOnShrink());
-        this.documentContainer = new Container();
         this.headerContainer = new Container();
         this.loadedResourcesContainer = new Container();
         this.chatContainer = new Container();
+        this.documentContainer = new Container();
         this.documentContainer.addChild(this.headerContainer);
         this.documentContainer.addChild(this.loadedResourcesContainer);
         this.documentContainer.addChild(this.chatContainer);
@@ -396,7 +448,8 @@ export class InteractiveMode {
         });
     }
     getAutocompleteSourceTag(sourceInfo) {
-        if (!sourceInfo) {
+        // Built-in extension commands are untagged, like built-in commands.
+        if (!sourceInfo || sourceInfo.source === "builtin") {
             return undefined;
         }
         const scopePrefix = sourceInfo.scope === "user" ? "u" : sourceInfo.scope === "project" ? "p" : "t";
@@ -443,11 +496,10 @@ export class InteractiveMode {
         }));
         const modelCommand = slashCommands.find((command) => command.name === "model");
         if (modelCommand) {
-            modelCommand.getArgumentCompletions = async (prefix) => {
-                // Get available models (scoped or from registry)
+            modelCommand.getArgumentCompletions = (prefix) => {
                 const models = this.session.scopedModels.length > 0
                     ? this.session.scopedModels.map((s) => s.model)
-                    : await this.session.modelRuntime.getAvailable();
+                    : this.session.modelRuntime.getAvailableSnapshot();
                 if (models.length === 0)
                     return null;
                 // Create items with provider/id format
@@ -464,6 +516,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 gitCommand = slashCommands.find((command) => command.name === "git");
         if (gitCommand) {
             gitCommand.getArgumentCompletions = (prefix) => {
@@ -538,7 +599,7 @@ export class InteractiveMode {
             this.chatContainer.addChild(new Text(condensedText, 1, 0));
         }
         else {
-            this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "What's New")), 1, 0));
+            this.chatContainer.addChild(new ThemedText(() => theme.bold(theme.fg("accent", "What's New")), 1, 0));
             this.chatContainer.addChild(new Spacer(1));
             this.chatContainer.addChild(new Markdown(this.changelogMarkdown.trim(), 1, 0, this.getMarkdownThemeWithSettings()));
             this.chatContainer.addChild(new Spacer(1));
@@ -590,6 +651,7 @@ export class InteractiveMode {
             terminal,
             onRightClickPaste: this.onRightClickPaste,
             fullscreenCopyOnSelect: this.settingsManager.getFullscreenCopyOnSelect(),
+            fullscreenWheelScrollLines: this.settingsManager.getFullscreenWheelScrollLines(),
         });
         nextUi.setClearOnShrink(clearOnShrink);
         nextUi.onDebug = onDebug;
@@ -619,7 +681,7 @@ export class InteractiveMode {
         this.registerSignalHandlers();
         // Load changelog (only show new entries, skip for resumed sessions)
         this.changelogMarkdown = this.getChangelogForDisplay();
-        if (this.session.scopedModels.length > 0 && (this.options.verbose || !this.settingsManager.getQuietStartup())) {
+        if (this.session.scopedModels.length > 0 && this.shouldShowStartupDetails()) {
             const modelList = this.session.scopedModels
                 .map((sm) => {
                 const thinkingStr = sm.thinkingLevel ? `:${sm.thinkingLevel}` : "";
@@ -665,38 +727,45 @@ export class InteractiveMode {
         // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
         this.ui.start();
         this.isInitialized = true;
-        await this.themeController.applyFromSettings();
-        // Brand banner always appears; quiet startup only hides keybinding help.
-        const logo = `${gradientLogo(SELESAI_LOGO, "#ff6b2c", "#fb923c")}\n${theme.fg("dim", `  ${APP_NAME} v${this.version} · /help for commands`)}`;
-        // Build startup instructions using keybinding hint helpers
-        const hint = (keybinding, description) => keyHint(keybinding, description);
-        const expandedInstructions = [
-            hint("app.interrupt", "to interrupt"),
-            hint("app.clear", "to clear"),
-            rawKeyHint(`${keyText("app.clear")} twice`, "to exit"),
-            hint("app.exit", "to exit (empty)"),
-            hint("app.suspend", "to suspend"),
-            keyHint("tui.editor.deleteToLineEnd", "to delete to end"),
-            hint("app.thinking.cycle", "to cycle thinking level"),
-            rawKeyHint(`${keyText("app.model.cycleForward")}/${keyText("app.model.cycleBackward")}`, "to cycle models"),
-            hint("app.model.select", "to select model"),
-            hint("app.tools.expand", "to expand tools"),
-            hint("app.thinking.toggle", "to expand thinking"),
-            hint("app.editor.external", "for external editor"),
-            rawKeyHint("/", "for commands"),
-            rawKeyHint("!", "to run bash"),
-            rawKeyHint("!!", "to run bash (no context)"),
-            hint("app.message.followUp", "to queue follow-up"),
-            hint("app.message.dequeue", "to edit all queued messages"),
-            hint("app.clipboard.pasteImage", "to paste image (with text fallback)"),
-            rawKeyHint("drop files", "to attach"),
-        ].join("\n");
-        this.builtInHeader = new ExpandableText(() => logo, () => `${logo}\n\n${expandedInstructions}`, this.getStartupExpansionState(), 1, 0);
-        // Setup UI layout
-        this.headerContainer.addChild(new Spacer(1));
-        this.headerContainer.addChild(this.builtInHeader);
-        this.headerContainer.addChild(new Spacer(1));
-        this.ui.requestRender();
+        this.programStatus.report();
+        this.ensurePngTranscoder();
+        this.themeController.applyFromSettings();
+        // The header and startup notices bake theme colors into their text, so build them once the terminal
+        // reported its colors. This ends at the terminal's DA1 reply, or after 100 ms if it answers nothing.
+        await this.themeController.waitForTerminalColors();
+        if (this.shouldShowStartupHeader()) {
+            // Keep the Selesai banner; upstream quietStartup controls header visibility.
+            const logo = () => `${gradientLogo(SELESAI_LOGO, "#ff6b2c", "#fb923c")}\n${theme.fg("dim", `  ${APP_NAME} v${this.version} · /help for commands`)}`;
+            // Build startup instructions using keybinding hint helpers
+            const hint = (keybinding, description) => keyHint(keybinding, description);
+            const expandedInstructions = () => [
+                hint("app.interrupt", "to interrupt"),
+                hint("app.clear", "to clear"),
+                rawKeyHint(`${keyText("app.clear")} twice`, "to exit"),
+                hint("app.exit", "to exit (empty)"),
+                hint("app.suspend", "to suspend"),
+                keyHint("tui.editor.deleteToLineEnd", "to delete to end"),
+                hint("app.thinking.cycle", "to cycle thinking level"),
+                rawKeyHint(`${keyText("app.model.cycleForward")}/${keyText("app.model.cycleBackward")}`, "to cycle models"),
+                hint("app.model.select", "to select model"),
+                hint("app.tools.expand", "to expand tools"),
+                hint("app.thinking.toggle", "to expand thinking"),
+                hint("app.editor.external", "for external editor"),
+                rawKeyHint("/", "for commands"),
+                rawKeyHint("!", "to run bash"),
+                rawKeyHint("!!", "to run bash (no context)"),
+                hint("app.message.followUp", "to queue follow-up"),
+                hint("app.message.dequeue", "to edit all queued messages"),
+                hint("app.clipboard.pasteImage", "to paste image (with text fallback)"),
+                rawKeyHint("drop files", "to attach"),
+            ].join("\n");
+            this.builtInHeader = new ExpandableText(() => logo(), () => `${logo()}\n\n${expandedInstructions()}`, this.getStartupExpansionState(), 1, 0);
+            // Setup UI layout
+            this.headerContainer.addChild(new Spacer(1));
+            this.headerContainer.addChild(this.builtInHeader);
+            this.headerContainer.addChild(new Spacer(1));
+            this.ui.requestRender();
+        }
         // Ensure fd and rg are available after mounting the TUI (downloads if missing, adds to PATH via getBinDir)
         // so slow downloads do not make startup appear frozen.
         // Both are needed: fd for autocomplete, rg for grep tool and bash commands.
@@ -725,6 +794,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.
@@ -753,11 +830,15 @@ export class InteractiveMode {
                 .catch(() => { })
                 .finally(() => clearTimeout(timeout));
         }
-        // Start version check asynchronously
-        checkForNewPiVersion(this.version, PACKAGE_NAME).then((newRelease) => {
+        // Update checks are best-effort: a network failure must not end the session.
+        void checkForNewPiVersion(this.version, PACKAGE_NAME)
+            .then((newRelease) => {
             if (newRelease) {
                 this.showNewVersionNotification(newRelease);
             }
+        })
+            .catch(() => {
+            this.showWarning(`Could not check for updates. The network may be unavailable or the request timed out. Your session is still active; try again later with \`${APP_NAME} update --self\`.`);
         });
         // Start package update check asynchronously
         this.checkForPackageUpdates()
@@ -780,7 +861,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(", ")}`);
         }
@@ -965,6 +1057,14 @@ export class InteractiveMode {
     getStartupExpansionState() {
         return this.options.verbose || this.toolOutputExpanded;
     }
+    /** Startup header (logo, version, key hints). Hidden only by quietStartup: true. */
+    shouldShowStartupHeader() {
+        return this.options.verbose === true || this.settingsManager.getQuietStartup() !== true;
+    }
+    /** Startup details (model scope, loaded resources). Hidden by quietStartup: true or "header". */
+    shouldShowStartupDetails() {
+        return this.options.verbose === true || this.settingsManager.getQuietStartup() === false;
+    }
     /**
      * Get a short path relative to the package root for display.
      */
@@ -1228,7 +1328,7 @@ export class InteractiveMode {
         if (this.startupBannerDismissed)
             return;
         this.loadedResourcesContainer.clear();
-        const showListing = options?.force || !this.startupBannerDismissed || this.options.verbose || !this.settingsManager.getQuietStartup();
+        const showListing = options?.force || this.shouldShowStartupDetails();
         const showDiagnostics = showListing || options?.showDiagnosticsWhenQuiet === true;
         if (!showListing && !showDiagnostics) {
             return;
@@ -1281,22 +1381,23 @@ export class InteractiveMode {
         if (showDiagnostics) {
             const skillDiagnostics = skillsResult.diagnostics;
             if (skillDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(skillDiagnostics, sourceInfos);
-                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Skill conflicts]")}\n${warningLines}`, 0, 0));
+                const warningLines = () => this.formatDiagnostics(skillDiagnostics, sourceInfos);
+                this.loadedResourcesContainer.addChild(new ThemedText(() => `${theme.fg("warning", "[Skill conflicts]")}\n${warningLines()}`, 0, 0));
                 this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const promptDiagnostics = promptsResult.diagnostics;
             if (promptDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(promptDiagnostics, sourceInfos);
-                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines}`, 0, 0));
+                const warningLines = () => this.formatDiagnostics(promptDiagnostics, sourceInfos);
+                this.loadedResourcesContainer.addChild(new ThemedText(() => `${theme.fg("warning", "[Prompt conflicts]")}\n${warningLines()}`, 0, 0));
                 this.loadedResourcesContainer.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 extensionsResult = this.session.resourceLoader.getExtensions();
+            for (const error of extensionsResult.errors) {
+                extensionDiagnostics.push({ type: "error", message: error.error, path: error.path });
+            }
+            for (const warning of extensionsResult.warnings ?? []) {
+                extensionDiagnostics.push({ type: "warning", message: warning.warning, path: warning.path });
             }
             const commandDiagnostics = this.session.extensionRunner.getCommandDiagnostics();
             extensionDiagnostics.push(...commandDiagnostics);
@@ -1304,14 +1405,14 @@ export class InteractiveMode {
             const shortcutDiagnostics = this.session.extensionRunner.getShortcutDiagnostics();
             extensionDiagnostics.push(...shortcutDiagnostics);
             if (extensionDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(extensionDiagnostics, sourceInfos);
-                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Extension issues]")}\n${warningLines}`, 0, 0));
+                const warningLines = () => this.formatDiagnostics(extensionDiagnostics, sourceInfos);
+                this.loadedResourcesContainer.addChild(new ThemedText(() => `${theme.fg("warning", "[Extension issues]")}\n${warningLines()}`, 0, 0));
                 this.loadedResourcesContainer.addChild(new Spacer(1));
             }
             const themeDiagnostics = themesResult.diagnostics;
             if (themeDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(themeDiagnostics, sourceInfos);
-                this.loadedResourcesContainer.addChild(new Text(`${theme.fg("warning", "[Theme conflicts]")}\n${warningLines}`, 0, 0));
+                const warningLines = () => this.formatDiagnostics(themeDiagnostics, sourceInfos);
+                this.loadedResourcesContainer.addChild(new ThemedText(() => `${theme.fg("warning", "[Theme conflicts]")}\n${warningLines()}`, 0, 0));
                 this.loadedResourcesContainer.addChild(new Spacer(1));
             }
         }
@@ -1403,11 +1504,24 @@ export class InteractiveMode {
         this.showLoadedResources({ force: false, showDiagnosticsWhenQuiet: true });
         this.showStartupNoticesIfNeeded();
     }
+    applyFullscreenScrollbarSetting() {
+        this.transcriptScrollView?.setScrollbar(this.settingsManager.getFullscreenScrollbar());
+    }
+    /** Lets extension images use the PNG transcoder; tool results register it themselves. */
+    ensurePngTranscoder() {
+        ensurePngTranscoder(() => {
+            this.ui.invalidate();
+            this.ui.requestRender();
+        });
+    }
     applyRuntimeSettings() {
         setCapabilityOverrides(this.settingsManager.getTerminalCapabilityOverrides());
+        this.ensurePngTranscoder();
         configureHttpDispatcher(this.settingsManager.getHttpIdleTimeoutMs());
+        this.applyFullscreenScrollbarSetting();
         if (this.renderer instanceof TuiAltScreen) {
             this.renderer.setCopyOnSelect(this.settingsManager.getFullscreenCopyOnSelect());
+            this.renderer.setWheelScrollLines(this.settingsManager.getFullscreenWheelScrollLines());
         }
         this.footer.setSession(this.session);
         this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
@@ -1433,6 +1547,7 @@ export class InteractiveMode {
         const session = this.session;
         this.unsubscribe?.();
         this.unsubscribe = undefined;
+        this.programStatus.reset();
         this.applyRuntimeSettings();
         if (options.renderBeforeBind) {
             this.renderCurrentSessionState();
@@ -1452,13 +1567,26 @@ export class InteractiveMode {
     async handleFatalRuntimeError(prefix, error) {
         const message = error instanceof Error ? error.message : String(error);
         this.showError(`${prefix}: ${message}`);
+        const extensionHint = this.getCrashExtensionHint(error);
+        if (extensionHint) {
+            this.chatContainer.addChild(new ThemedText(() => theme.fg("warning", extensionHint), this.outputPad, 0));
+        }
         if (this.recordCrash("fatal_error", error)) {
-            this.chatContainer.addChild(new Text(theme.fg("muted", this.crashReportInstructions()), this.outputPad, 0));
+            const instructions = this.crashReportInstructions();
+            this.chatContainer.addChild(new ThemedText(() => theme.fg("muted", instructions), this.outputPad, 0));
         }
         stopThemeWatcher();
         this.stop("transcript");
         process.exit(1);
     }
+    getCrashExtensionHint(error) {
+        try {
+            return formatCrashExtensionHint(findExtensionStackMatches(error instanceof Error ? error.stack : undefined, this.session.resourceLoader.getExtensions().extensions));
+        }
+        catch {
+            return undefined;
+        }
+    }
     /** Persist a crash so the next start can point the user at `/bug`. Returns false when nothing was written. */
     recordCrash(kind, error) {
         try {
@@ -1481,7 +1609,7 @@ export class InteractiveMode {
         if (this.bugReportHintShown)
             return;
         this.bugReportHintShown = true;
-        this.chatContainer.addChild(new Text(theme.fg("muted", `If this looks like a ${APP_NAME} bug, /bug sends a report to the developers.`), this.outputPad, 0));
+        this.chatContainer.addChild(new ThemedText(() => theme.fg("muted", `If this looks like a ${APP_NAME} bug, /bug sends a report to the developers.`), this.outputPad, 0));
         this.ui.requestRender();
     }
     maybeSuggestBugReport(message) {
@@ -1489,8 +1617,32 @@ export class InteractiveMode {
             return;
         if (/\b(?:abort(?:ed)?|cancel(?:l?ed)?)\b/i.test(message.errorMessage ?? ""))
             return;
+        if (this.maybeShowInstallChangeWarning())
+            return;
         this.suggestBugReport();
     }
+    /**
+     * After an error, check whether an update replaced or removed this install while the session ran.
+     * Code loaded on demand then fails with missing modules until restart (#10439). Returns true when
+     * the install changed.
+     */
+    maybeShowInstallChangeWarning() {
+        if (this.installChangeWarningShown)
+            return true;
+        const change = detectInstallChange();
+        if (!change)
+            return false;
+        this.installChangeWarningShown = true;
+        const cause = change.kind === "updated"
+            ? `${APP_NAME} was updated to ${change.version} while this session was running (${VERSION})`
+            : `The ${APP_NAME} installation this session runs from was removed or replaced`;
+        const resumeCommand = formatResumeCommand(this.sessionManager);
+        const restart = resumeCommand
+            ? `Restart with \`${resumeCommand}\` to continue this session.`
+            : `Restart ${APP_NAME}.`;
+        this.showWarning(`${cause}. Features that load code on demand can fail until restart. ${restart}`);
+        return true;
+    }
     renderCurrentSessionState() {
         this.loadedResourcesContainer.clear();
         this.chatContainer.clear();
@@ -1509,7 +1661,10 @@ export class InteractiveMode {
      * whatever this returns, so they never reach into the tool registry themselves.
      */
     getRegisteredToolDefinition(toolName) {
-        return withBuiltInRenderers(toolName, this.session.getToolDefinition(toolName));
+        return this.session.extensionRunner.resolveToolRenderers(toolName, () => withBuiltInRenderers(toolName, this.session.getToolDefinition(toolName)));
+    }
+    getMarkdownTransformers() {
+        return [this.mermaidMarkdownTransformer, ...this.session.extensionRunner.getMarkdownTransformers()];
     }
     /**
      * Set up keyboard shortcuts registered by extensions.
@@ -1675,7 +1830,7 @@ export class InteractiveMode {
                 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));
+                container.addChild(new ThemedText(() => theme.fg("muted", "... (widget truncated)"), 1, 0));
             }
             component = container;
         }
@@ -1818,23 +1973,23 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     addExtensionTerminalInputListener(handler) {
-        const unsubscribe = this.ui.addInputListener(handler);
-        this.extensionTerminalInputUnsubscribers.set(handler, unsubscribe);
+        const subscription = { handler, unsubscribe: this.ui.addInputListener(handler) };
+        this.extensionTerminalInputSubscriptions.add(subscription);
         return () => {
-            unsubscribe();
-            this.extensionTerminalInputUnsubscribers.delete(handler);
+            subscription.unsubscribe();
+            this.extensionTerminalInputSubscriptions.delete(subscription);
         };
     }
     rebindExtensionTerminalInputListeners() {
-        for (const handler of this.extensionTerminalInputUnsubscribers.keys()) {
-            this.extensionTerminalInputUnsubscribers.set(handler, this.ui.addInputListener(handler));
+        for (const subscription of this.extensionTerminalInputSubscriptions) {
+            subscription.unsubscribe();
+            subscription.unsubscribe = this.ui.addInputListener(subscription.handler);
         }
     }
     clearExtensionTerminalInputListeners() {
-        for (const unsubscribe of this.extensionTerminalInputUnsubscribers.values()) {
-            unsubscribe();
-        }
-        this.extensionTerminalInputUnsubscribers.clear();
+        for (const subscription of this.extensionTerminalInputSubscriptions)
+            subscription.unsubscribe();
+        this.extensionTerminalInputSubscriptions.clear();
     }
     /**
      * Create the ExtensionUIContext for extensions.
@@ -1909,7 +2064,7 @@ export class InteractiveMode {
     /**
      * Show a selector for extensions.
      */
-    showExtensionSelector(title, options, opts) {
+    showExtensionSelector(title, options, opts, blocked = { kind: "question", message: title }) {
         return new Promise((resolve) => {
             if (opts?.signal?.aborted) {
                 resolve(undefined);
@@ -1929,9 +2084,12 @@ export class InteractiveMode {
                 this.hideExtensionSelector();
                 resolve(undefined);
             }, { tui: this.ui, timeout: opts?.timeout, onToggleToolsExpanded: () => this.toggleToolOutputExpansion() });
+            this.disposeActiveSelector();
             this.editorContainer.clear();
             this.editorContainer.addChild(this.extensionSelector);
             this.ui.setFocus(this.extensionSelector);
+            // Extension dialogs share the editor slot: opening one replaces the status of a displaced one.
+            this.programStatus.setBlocked("extension-dialog", blocked);
             this.ui.requestRender();
         });
     }
@@ -1943,6 +2101,7 @@ export class InteractiveMode {
         this.editorContainer.clear();
         this.editorContainer.addChild(this.editor);
         this.extensionSelector = undefined;
+        this.programStatus.setBlocked("extension-dialog", undefined);
         this.ui.setFocus(this.editor);
         this.ui.requestRender();
     }
@@ -1950,7 +2109,10 @@ export class InteractiveMode {
      * Show a confirmation dialog for extensions.
      */
     async showExtensionConfirm(title, message, opts) {
-        const result = await this.showExtensionSelector(`${title}\n${message}`, ["Yes", "No"], opts);
+        const result = await this.showExtensionSelector(`${title}\n${message}`, ["Yes", "No"], opts, {
+            kind: "permission",
+            message: title,
+        });
         return result === "Yes";
     }
     async promptForMissingSessionCwd(error) {
@@ -1980,9 +2142,11 @@ export class InteractiveMode {
                 this.hideExtensionInput();
                 resolve(undefined);
             }, { tui: this.ui, timeout: opts?.timeout });
+            this.disposeActiveSelector();
             this.editorContainer.clear();
             this.editorContainer.addChild(this.extensionInput);
             this.ui.setFocus(this.extensionInput);
+            this.programStatus.setBlocked("extension-dialog", { kind: "question", message: title });
             this.ui.requestRender();
         });
     }
@@ -1994,6 +2158,7 @@ export class InteractiveMode {
         this.editorContainer.clear();
         this.editorContainer.addChild(this.editor);
         this.extensionInput = undefined;
+        this.programStatus.setBlocked("extension-dialog", undefined);
         this.ui.setFocus(this.editor);
         this.ui.requestRender();
     }
@@ -2009,9 +2174,11 @@ export class InteractiveMode {
                 this.hideExtensionEditor();
                 resolve(undefined);
             }, undefined, this.settingsManager.getExternalEditorCommand());
+            this.disposeActiveSelector();
             this.editorContainer.clear();
             this.editorContainer.addChild(this.extensionEditor);
             this.ui.setFocus(this.extensionEditor);
+            this.programStatus.setBlocked("extension-dialog", { kind: "question", message: title });
             this.ui.requestRender();
         });
     }
@@ -2022,6 +2189,7 @@ export class InteractiveMode {
         this.editorContainer.clear();
         this.editorContainer.addChild(this.editor);
         this.extensionEditor = undefined;
+        this.programStatus.setBlocked("extension-dialog", undefined);
         this.ui.setFocus(this.editor);
         this.ui.requestRender();
     }
@@ -2033,6 +2201,7 @@ export class InteractiveMode {
         this.editorComponentFactory = factory;
         // Save text from current editor before switching
         const currentText = this.editor.getText();
+        this.disposeActiveSelector();
         this.editorContainer.clear();
         if (factory) {
             // Create the custom editor with tui, theme, and keybindings
@@ -2049,6 +2218,9 @@ export class InteractiveMode {
             if (newEditor.setPaddingX !== undefined) {
                 newEditor.setPaddingX(this.defaultEditor.getPaddingX());
             }
+            if (newEditor.setAutocompleteMaxVisible !== undefined) {
+                newEditor.setAutocompleteMaxVisible(this.defaultEditor.getAutocompleteMaxVisible());
+            }
             // Set autocomplete if supported
             if (newEditor.setAutocompleteProvider && this.autocompleteProvider) {
                 newEditor.setAutocompleteProvider(this.autocompleteProvider);
@@ -2160,6 +2332,7 @@ export class InteractiveMode {
                     options?.onHandle?.(handle);
                 }
                 else {
+                    this.disposeActiveSelector();
                     this.editorContainer.clear();
                     this.editorContainer.addChild(component);
                     this.ui.setFocus(component);
@@ -2180,17 +2353,14 @@ export class InteractiveMode {
      */
     showExtensionError(extensionPath, error, stack) {
         const errorMsg = `Extension "${extensionPath}" error: ${error}`;
-        const errorText = new Text(theme.fg("error", errorMsg), 1, 0);
+        const errorText = new ThemedText(() => theme.fg("error", errorMsg), 1, 0);
         this.chatContainer.addChild(errorText);
         if (stack) {
             // Show stack trace in dim color, indented
-            const stackLines = stack
-                .split("\n")
-                .slice(1) // Skip first line (duplicates error message)
-                .map((line) => theme.fg("dim", `  ${line.trim()}`))
-                .join("\n");
-            if (stackLines) {
-                this.chatContainer.addChild(new Text(stackLines, 1, 0));
+            const stackLines = stack.split("\n").slice(1); // Skip first line (duplicates error message)
+            if (stackLines.length > 0) {
+                const renderStack = () => stackLines.map((line) => theme.fg("dim", `  ${line.trim()}`)).join("\n");
+                this.chatContainer.addChild(new ThemedText(renderStack, 1, 0));
             }
         }
         this.ui.requestRender();
@@ -2260,8 +2430,8 @@ export class InteractiveMode {
                 this.updateEditorBorderColor();
             }
         };
-        // Handle clipboard paste (triggered on Ctrl+V). Images are attached by path;
-        // otherwise, paste plain text from the system clipboard.
+        // Handle clipboard paste (triggered on Ctrl+V). Copied files use their original paths,
+        // images are attached via temporary files, and plain text is the final fallback.
         this.defaultEditor.onPasteImage = () => {
             void this.handleClipboardPaste();
         };
@@ -2284,32 +2454,37 @@ export class InteractiveMode {
     }
     async handleClipboardPaste() {
         try {
+            const filePaths = await readClipboardFilePaths();
+            if (filePaths) {
+                if (filePaths.some((filePath) => /\p{Cc}/u.test(filePath))) {
+                    throw new Error("Clipboard file path contains control characters");
+                }
+                const paths = this.isBashMode ? filePaths.map(quoteIfNeeded).join(" ") : filePaths.join("\n");
+                const cursor = this.editor.getCursor?.();
+                const currentLine = cursor ? (this.editor.getText().split("\n")[cursor.line] ?? "") : "";
+                const characterBeforeCursor = cursor && cursor.col > 0 ? currentLine[cursor.col - 1] : "";
+                const characterAfterCursor = cursor ? currentLine[cursor.col] : "";
+                const leadingSpace = characterBeforeCursor && !/\s/.test(characterBeforeCursor) ? " " : "";
+                const trailingSpace = characterAfterCursor && !/\s/.test(characterAfterCursor) ? " " : "";
+                this.editor.insertTextAtCursor?.(`${leadingSpace}${paths}${trailingSpace}`);
+                this.ui.requestRender();
+                return;
+            }
             const image = await readClipboardImage();
             if (image) {
                 const tmpDir = os.tmpdir();
                 const ext = extensionForImageMimeType(image.mimeType) ?? "png";
-                const fileName = `selesai-clipboard-${Date.now()}-${this.pendingInputImages.length + 1}.${ext}`;
+                const fileName = `selesai-clipboard-${crypto.randomUUID()}.${ext}`;
                 const filePath = path.join(tmpDir, fileName);
                 fs.writeFileSync(filePath, Buffer.from(image.bytes));
-                let attachment;
-                let dimensionNote;
-                const autoResizeImages = this.settingsManager.getImageAutoResize();
-                if (autoResizeImages) {
-                    const resized = await resizeImage(image.bytes, image.mimeType).catch(() => null);
-                    if (!resized) {
-                        this.showWarning("Clipboard image attached without resize");
-                        attachment = { type: "image", mimeType: image.mimeType, data: Buffer.from(image.bytes).toString("base64") };
-                    }
-                    else {
-                        dimensionNote = formatDimensionNote(resized);
-                        attachment = { type: "image", mimeType: resized.mimeType, data: resized.data };
-                    }
-                }
-                else {
-                    attachment = { type: "image", mimeType: image.mimeType, data: Buffer.from(image.bytes).toString("base64") };
-                }
-                this.pendingInputImages.push(attachment);
-                this.editor.insertTextAtCursor?.(dimensionNote ? `${filePath} ${dimensionNote}` : filePath);
+                // Keep the fork caption attachment. AgentSession normalizes it after hooks
+                // select the request model; resizing here would discard source resolution.
+                this.pendingInputImages.push({
+                    type: "image",
+                    mimeType: image.mimeType,
+                    data: Buffer.from(image.bytes).toString("base64"),
+                });
+                this.editor.insertTextAtCursor?.(filePath);
                 this.ui.requestRender();
                 return;
             }
@@ -2320,7 +2495,7 @@ export class InteractiveMode {
             }
         }
         catch (error) {
-            this.showWarning(`Failed to paste clipboard: ${error instanceof Error ? error.message : String(error)}`);
+            this.showError(`Failed to paste from clipboard: ${error instanceof Error ? error.message : String(error)}`);
         }
     }
     consumePendingInputImages() {
@@ -2379,6 +2554,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("");
@@ -2568,6 +2749,7 @@ export class InteractiveMode {
             await this.init();
         }
         this.footer.invalidate();
+        this.programStatus.handleEvent(event);
         switch (event.type) {
             case "agent_start":
                 this.pendingTools.clear();
@@ -2597,6 +2779,8 @@ export class InteractiveMode {
                 this.ui.requestRender();
                 break;
             case "entry_appended":
+                if (this.entriesRenderedByBoundaryCompaction.delete(event.entry.id))
+                    break;
                 if (event.entry.type === "custom") {
                     this.addCustomEntryToChat(event.entry);
                     this.ui.requestRender();
@@ -2605,6 +2789,34 @@ export class InteractiveMode {
                     this.addCacheWarmingUsage(event.entry);
                     this.ui.requestRender();
                 }
+                else if (event.entry.type === "custom_message" && event.entry.display) {
+                    this.addMessageToChat(createCustomMessage(event.entry.customType, event.entry.content, event.entry.display, event.entry.details, event.entry.timestamp));
+                    this.ui.requestRender();
+                }
+                else if (event.entry.type === "compaction") {
+                    const entries = this.sessionManager.buildContextEntries();
+                    if (entries[0]?.id !== event.entry.id)
+                        break;
+                    this.chatContainer.clear();
+                    const branch = this.sessionManager.getBranch();
+                    const compactionIndex = branch.findIndex((entry) => entry.id === event.entry.id);
+                    const entriesAfterCompaction = new Set(branch.slice(compactionIndex + 1).map((entry) => entry.id));
+                    const retainedEntries = entries.slice(1);
+                    this.renderSessionEntries(retainedEntries.filter((entry) => !entriesAfterCompaction.has(entry.id)));
+                    this.addMessageToChat(createCompactionSummaryMessage(event.entry.summary, event.entry.tokensBefore, event.entry.timestamp));
+                    if (event.entry.usage) {
+                        this.addCompactionCostNotice({
+                            type: "compaction_cost",
+                            kind: "compaction",
+                            usage: event.entry.usage,
+                        });
+                    }
+                    this.renderSessionEntries(retainedEntries.filter((entry) => entriesAfterCompaction.has(entry.id)));
+                    for (const entryId of entriesAfterCompaction)
+                        this.entriesRenderedByBoundaryCompaction.add(entryId);
+                    this.footer.invalidate();
+                    this.ui.requestRender();
+                }
                 break;
             case "session_info_changed":
                 this.updateTerminalTitle();
@@ -2626,23 +2838,24 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
-                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad);
+                    this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
                     this.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
-                    this.streamingComponent.updateContent(this.streamingMessage);
+                    this.streamingComponent.updateContent(this.streamingMessage, true);
                     this.ui.requestRender();
                 }
                 break;
             case "message_update":
                 if (this.streamingComponent && event.message.role === "assistant") {
                     this.streamingMessage = event.message;
-                    this.streamingComponent.updateContent(this.streamingMessage);
+                    this.streamingComponent.updateContent(this.streamingMessage, true);
                     for (const content of this.streamingMessage.content) {
                         if (content.type === "toolCall") {
                             if (!this.pendingTools.has(content.id)) {
                                 const component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
                                     showImages: this.settingsManager.getShowImages(),
                                     imageWidthCells: this.settingsManager.getImageWidthCells(),
+                                    outputPad: this.outputPad,
                                 }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
                                 component.setExpanded(this.toolOutputExpanded);
                                 this.chatContainer.addChild(component);
@@ -2673,7 +2886,7 @@ export class InteractiveMode {
                                 : "Operation aborted";
                         this.streamingMessage.errorMessage = errorMessage;
                     }
-                    this.streamingComponent.updateContent(this.streamingMessage);
+                    this.streamingComponent.updateContent(this.streamingMessage, false);
                     if (this.streamingMessage.stopReason === "aborted" || this.streamingMessage.stopReason === "error") {
                         if (!errorMessage) {
                             errorMessage = this.streamingMessage.errorMessage || "Error";
@@ -2705,11 +2918,15 @@ export class InteractiveMode {
                 // The bash execution callback handles TUI output rendering.
                 break;
             case "tool_execution_start": {
+                // Nested calls (from codemode scripts) are shown inside their parent's row.
+                if (event.parentToolCallId)
+                    break;
                 let component = this.pendingTools.get(event.toolCallId);
                 if (!component) {
                     component = new ToolExecutionComponent(event.toolName, event.toolCallId, event.args, {
                         showImages: this.settingsManager.getShowImages(),
                         imageWidthCells: this.settingsManager.getImageWidthCells(),
+                        outputPad: this.outputPad,
                     }, this.getRegisteredToolDefinition(event.toolName), this.ui, this.sessionManager.getCwd());
                     component.setExpanded(this.toolOutputExpanded);
                     this.chatContainer.addChild(component);
@@ -2729,9 +2946,11 @@ export class InteractiveMode {
                 break;
             }
             case "tool_execution_end": {
+                if (event.isError)
+                    this.maybeShowInstallChangeWarning();
                 const component = this.pendingTools.get(event.toolCallId);
                 if (component) {
-                    component.updateResult({ ...event.result, isError: event.isError });
+                    component.updateResult({ ...event.result, isError: event.isError, durationMs: event.durationMs });
                     this.pendingTools.delete(event.toolCallId);
                     this.ui.requestRender();
                 }
@@ -2795,9 +3014,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) {
@@ -2806,7 +3037,8 @@ export class InteractiveMode {
                     }
                     else {
                         this.chatContainer.addChild(new Spacer(1));
-                        this.chatContainer.addChild(new Text(theme.fg("error", event.errorMessage), 1, 0));
+                        const errorMessage = event.errorMessage;
+                        this.chatContainer.addChild(new ThemedText(() => theme.fg("error", errorMessage), 1, 0));
                     }
                 }
                 void this.flushCompactionQueue({ willRetry: event.willRetry });
@@ -2878,7 +3110,7 @@ export class InteractiveMode {
         }
         const message = status.type === "warning" ? `Warning: ${status.message}` : status.message;
         const color = status.type === "warning" ? "warning" : "dim";
-        this.chatContainer.addChild(new Text(theme.fg(color, message), 1, 0));
+        this.chatContainer.addChild(new ThemedText(() => theme.fg(color, message), 1, 0));
         this.lastStatusSpacer = undefined;
         this.lastStatusText = undefined;
         this.ui.requestRender();
@@ -2894,12 +3126,14 @@ export class InteractiveMode {
         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.lastStatusMessage = message;
+            this.lastStatusText.invalidate();
             this.ui.requestRender();
             return;
         }
         const spacer = new Spacer(1);
-        const text = new Text(theme.fg("dim", message), 1, 0);
+        this.lastStatusMessage = message;
+        const text = new ThemedText(() => theme.fg("dim", this.lastStatusMessage), 1, 0);
         this.chatContainer.addChild(spacer);
         this.chatContainer.addChild(text);
         this.lastStatusSpacer = spacer;
@@ -2911,7 +3145,7 @@ export class InteractiveMode {
         if (!renderer) {
             return;
         }
-        const component = new CustomEntryComponent(entry, renderer);
+        const component = new CustomEntryComponent(entry, renderer, this.outputPad);
         component.setExpanded(this.toolOutputExpanded);
         if (!component.hasContent()) {
             return;
@@ -2928,7 +3162,7 @@ export class InteractiveMode {
     addMessageToChat(message, options) {
         switch (message.role) {
             case "bashExecution": {
-                const component = new BashExecutionComponent(message.command, this.ui, message.excludeFromContext);
+                const component = new BashExecutionComponent(message.command, this.ui, message.excludeFromContext, this.outputPad);
                 if (message.output) {
                     component.appendOutput(message.output);
                 }
@@ -2947,14 +3181,14 @@ export class InteractiveMode {
             }
             case "compactionSummary": {
                 this.chatContainer.addChild(new Spacer(1));
-                const component = new CompactionSummaryMessageComponent(message, this.getMarkdownThemeWithSettings());
+                const component = new CompactionSummaryMessageComponent(message, this.getMarkdownThemeWithSettings(), this.outputPad);
                 component.setExpanded(this.toolOutputExpanded);
                 this.chatContainer.addChild(component);
                 break;
             }
             case "branchSummary": {
                 this.chatContainer.addChild(new Spacer(1));
-                const component = new BranchSummaryMessageComponent(message, this.getMarkdownThemeWithSettings());
+                const component = new BranchSummaryMessageComponent(message, this.getMarkdownThemeWithSettings(), this.outputPad);
                 component.setExpanded(this.toolOutputExpanded);
                 this.chatContainer.addChild(component);
                 break;
@@ -2970,18 +3204,18 @@ export class InteractiveMode {
                     const skillBlocks = parseSkillBlocks(textContent);
                     if (skillBlocks) {
                         for (const skillBlock of skillBlocks.skills) {
-                            const component = new SkillInvocationMessageComponent(skillBlock, this.getMarkdownThemeWithSettings());
+                            const component = new SkillInvocationMessageComponent(skillBlock, this.getMarkdownThemeWithSettings(), this.outputPad);
                             component.setExpanded(this.toolOutputExpanded);
                             this.chatContainer.addChild(component);
                         }
                         if (skillBlocks.userMessage) {
                             this.chatContainer.addChild(new Spacer(1));
-                            const userComponent = new UserMessageComponent(skillBlocks.userMessage, this.getMarkdownThemeWithSettings(), this.outputPad);
+                            const userComponent = new UserMessageComponent(skillBlocks.userMessage, this.getMarkdownThemeWithSettings(), this.outputPad, this.getMarkdownTransformers());
                             this.chatContainer.addChild(userComponent);
                         }
                     }
                     else {
-                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), this.outputPad);
+                        const userComponent = new UserMessageComponent(textContent, this.getMarkdownThemeWithSettings(), this.outputPad, this.getMarkdownTransformers());
                         this.chatContainer.addChild(userComponent);
                     }
                     if (options?.populateHistory) {
@@ -2991,7 +3225,7 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
-                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad);
+                const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
                 this.chatContainer.addChild(assistantComponent);
                 break;
             }
@@ -3043,6 +3277,7 @@ export class InteractiveMode {
                         const component = new ToolExecutionComponent(content.name, content.id, content.arguments, {
                             showImages: this.settingsManager.getShowImages(),
                             imageWidthCells: this.settingsManager.getImageWidthCells(),
+                            outputPad: this.outputPad,
                         }, this.getRegisteredToolDefinition(content.name), this.ui, this.sessionManager.getCwd());
                         component.setExpanded(this.toolOutputExpanded);
                         this.chatContainer.addChild(component);
@@ -3096,11 +3331,18 @@ export class InteractiveMode {
      * @param options.populateHistory Add user messages to editor history
      */
     renderSessionEntries(entries, options = {}) {
+        // Selection coordinates point into the transcript being replaced (#9311).
+        if (this.renderer instanceof TuiAltScreen)
+            this.renderer.resetTextSelection();
         const items = entries.flatMap((entry) => {
             if (entry.type === "custom" || (entry.type === "usage" && entry.kind === "cache_warm")) {
                 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);
     }
@@ -3108,7 +3350,8 @@ export class InteractiveMode {
         if (!this.settingsManager.getShowCacheMissNotices())
             return;
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(theme.fg("dim", formatCacheWarmingUsage(entry)), 1, 0));
+        const usage = formatCacheWarmingUsage(entry);
+        this.chatContainer.addChild(new ThemedText(() => theme.fg("dim", usage), 1, 0));
     }
     /**
      * Render billing usage for a compaction or branch summary. The notice is derived
@@ -3122,7 +3365,7 @@ export class InteractiveMode {
         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));
+        this.chatContainer.addChild(new ThemedText(() => theme.fg("warning", `${label}: ${formatTokens(tokens)} tokens billed${cost}`), 1, 0));
     }
     static countDroppedThinkingBlocks(message) {
         let count = 0;
@@ -3159,7 +3402,7 @@ export class InteractiveMode {
             return;
         const noun = droppedCount === 1 ? "thinking block" : "thinking blocks";
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(theme.fg("warning", `Anthropic dropped ${droppedCount} ${noun} (details in session)`), 1, 0));
+        this.chatContainer.addChild(new ThemedText(() => theme.fg("warning", `Anthropic dropped ${droppedCount} ${noun} (details in session)`), 1, 0));
     }
     /**
      * Show a transcript notice when a completed assistant message paid for a
@@ -3186,9 +3429,8 @@ export class InteractiveMode {
         else if (miss.idleMs >= CACHE_TTL_MS) {
             label = `Cache miss after ${Math.round(miss.idleMs / 60_000)}m idle`;
         }
-        const text = theme.fg("warning", `${label}: ${reBilled}`);
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(text, 1, 0));
+        this.chatContainer.addChild(new ThemedText(() => theme.fg("warning", `${label}: ${reBilled}`), 1, 0));
     }
     renderInitialMessages() {
         const entries = this.sessionManager.buildContextEntries();
@@ -3216,7 +3458,7 @@ export class InteractiveMode {
         if (this.chatContainer.children.length > 0) {
             this.chatContainer.addChild(new Spacer(1));
         }
-        this.chatContainer.addChild(new Text(theme.fg("warning", `This project is not trusted. Project ${CONFIG_DIR_NAME} resources and packages are ignored. Use /trust to save a trust decision, then restart pi.`), 1, 0));
+        this.chatContainer.addChild(new ThemedText(() => theme.fg("warning", `This project is not trusted. Project ${CONFIG_DIR_NAME} resources and packages are ignored. Use /trust to save a trust decision, then restart pi.`), 1, 0));
     }
     async getUserInput() {
         const queuedInput = this.pendingUserInputs.shift();
@@ -3313,6 +3555,10 @@ export class InteractiveMode {
      * paste / Kitty / modifyOtherKeys sequences.
      */
     uncaughtCrash(error) {
+        // A dead terminal is not a pi crash. Do not try to restore it or record it.
+        if (isDeadTerminalError(error)) {
+            this.emergencyTerminalExit();
+        }
         if (this.isShuttingDown) {
             process.exit(1);
         }
@@ -3331,6 +3577,9 @@ export class InteractiveMode {
         catch { }
         console.error(`${APP_NAME} exiting due to uncaughtException:`);
         console.error(error);
+        const extensionHint = this.getCrashExtensionHint(error);
+        if (extensionHint)
+            console.error(`\n${extensionHint}`);
         if (this.recordCrash("uncaught_exception", error)) {
             console.error(`\n${this.crashReportInstructions()}`);
         }
@@ -3368,10 +3617,13 @@ export class InteractiveMode {
             }
             throw error;
         };
-        process.stdout.on("error", terminalErrorHandler);
-        process.stderr.on("error", terminalErrorHandler);
-        this.signalCleanupHandlers.push(() => process.stdout.off("error", terminalErrorHandler));
-        this.signalCleanupHandlers.push(() => process.stderr.off("error", terminalErrorHandler));
+        // stdin needs the handler too: once the terminal is gone, reads and setRawMode
+        // fail with EIO (orphaned background process group) or ENOTTY (revoked tty).
+        // Node emits these as stream errors, which are uncaught without a listener.
+        for (const stream of [process.stdin, process.stdout, process.stderr]) {
+            stream.on("error", terminalErrorHandler);
+            this.signalCleanupHandlers.push(() => stream.off("error", terminalErrorHandler));
+        }
         // Restore the terminal before the process dies on any uncaught throw.
         // Without this, an unhandled exception from extension code (or anywhere
         // in pi) leaves the terminal in raw mode with no cursor.
@@ -3504,6 +3756,8 @@ export class InteractiveMode {
         this.setToolsExpanded(!this.toolOutputExpanded);
     }
     setToolsExpanded(expanded) {
+        if (expanded === this.toolOutputExpanded)
+            return;
         this.toolOutputExpanded = expanded;
         const activeHeader = this.customHeader ?? this.builtInHeader;
         if (isExpandable(activeHeader)) {
@@ -3561,20 +3815,20 @@ export class InteractiveMode {
     }
     showError(errorMessage) {
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(theme.fg("error", `Error: ${errorMessage}`), 1, 0));
+        this.chatContainer.addChild(new ThemedText(() => theme.fg("error", `Error: ${errorMessage}`), this.outputPad, 0));
         this.ui.requestRender();
     }
     showWarning(warningMessage) {
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(theme.fg("warning", `Warning: ${warningMessage}`), 1, 0));
+        this.chatContainer.addChild(new ThemedText(() => theme.fg("warning", `Warning: ${warningMessage}`), 1, 0));
         this.ui.requestRender();
     }
     showNewVersionNotification(release) {
-        const updateInstruction = `New version ${release.version} is available. ${getUpdateInstruction(PACKAGE_NAME)}`;
+        const updateInstruction = () => `New version ${release.version} is available. ${getUpdateInstruction(PACKAGE_NAME)}`;
         const note = release.note?.trim();
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
-        this.chatContainer.addChild(new Text(`${theme.bold(theme.fg("warning", "Update Available"))}\n${updateInstruction}`, 1, 0));
+        this.chatContainer.addChild(new ThemedText(() => `${theme.bold(theme.fg("warning", "Update Available"))}\n${updateInstruction()}`, 1, 0));
         if (note) {
             this.chatContainer.addChild(new Spacer(1));
             this.chatContainer.addChild(new Markdown(note, 1, 0, this.getMarkdownThemeWithSettings(), {
@@ -3585,12 +3839,12 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     showPackageUpdateNotification(packages) {
-        const action = theme.fg("accent", `${APP_NAME} update --extensions`);
-        const updateInstruction = theme.fg("muted", "Package updates are available. Run ") + action;
+        const updateInstruction = () => theme.fg("muted", "Package updates are available. Run ") +
+            theme.fg("accent", `${APP_NAME} update --extensions`);
         const packageLines = packages.map((pkg) => `- ${pkg}`).join("\n");
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
-        this.chatContainer.addChild(new Text(`${theme.bold(theme.fg("warning", "Package Updates Available"))}\n${updateInstruction}\n${theme.fg("muted", "Packages:")}\n${packageLines}`, 1, 0));
+        this.chatContainer.addChild(new ThemedText(() => `${theme.bold(theme.fg("warning", "Package Updates Available"))}\n${updateInstruction()}\n${theme.fg("muted", "Packages:")}\n${packageLines}`, 1, 0));
         this.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
         this.ui.requestRender();
     }
@@ -3763,29 +4017,43 @@ export class InteractiveMode {
     // =========================================================================
     // Selectors
     // =========================================================================
+    disposeActiveSelector() {
+        const dispose = this.activeSelectorDispose;
+        this.activeSelectorToken = undefined;
+        this.activeSelectorDispose = undefined;
+        dispose?.();
+    }
     /**
      * Shows a selector component in place of the editor.
      * @param create Factory that receives a `done` callback and returns the component and focus target
      */
     showSelector(create) {
+        const token = {};
+        let dispose;
         const done = () => {
+            dispose?.();
+            if (this.activeSelectorToken !== token)
+                return;
+            this.activeSelectorToken = undefined;
+            this.activeSelectorDispose = undefined;
             this.editorContainer.clear();
             this.editorContainer.addChild(this.editor);
             this.ui.setFocus(this.editor);
         };
-        const { component, focus } = create(done);
+        const created = create(done);
+        dispose = created.dispose;
+        this.disposeActiveSelector();
+        this.activeSelectorToken = token;
+        this.activeSelectorDispose = dispose;
         this.editorContainer.clear();
-        this.editorContainer.addChild(component);
-        this.ui.setFocus(focus);
+        this.editorContainer.addChild(created.component);
+        this.ui.setFocus(created.focus);
         this.ui.requestRender();
     }
     showSettingsSelector() {
         this.showSelector((done) => {
             const selector = new SettingsSelectorComponent({
                 autoCompact: this.session.autoCompactionEnabled,
-                autoHandoffEnabled: this.settingsManager.getAutoHandoffEnabled(),
-                autoHandoffThresholdTokens: this.settingsManager.getAutoHandoffThresholdTokens(),
-                capabilityGatewayJevEnabled: this.settingsManager.getCapabilityGatewayJevEnabled(),
                 defaultModel: (() => {
                     const defaultProvider = this.settingsManager.getDefaultProvider();
                     const defaultModelId = this.settingsManager.getDefaultModel();
@@ -3803,11 +4071,11 @@ export class InteractiveMode {
                 visionModelSelector: (currentValue, selectorDone) => {
                     const slash = currentValue.indexOf("/");
                     const currentModel = slash > 0 ? this.session.modelRuntime.getModel(currentValue.slice(0, slash), currentValue.slice(slash + 1)) : undefined;
-                    return new ModelSelectorComponent(this.ui, currentModel, this.settingsManager, this.session.modelRuntime, this.session.scopedModels, (model) => {
+                    return new ModelSelectorComponent(this.ui, currentModel, this.session.modelRuntime, this.session.scopedModels, (model) => {
                         this.settingsManager.setImageCaptionModel(model ? `${model.provider}/${model.id}` : undefined);
                         selectorDone(model ? `${model.provider}/${model.id}` : "off");
                         this.showStatus(model ? `Vision caption model: ${model.provider}/${model.id}` : "Vision captioning disabled");
-                    }, selectorDone, undefined, { modelFilter: (model) => model.input.includes("image"), allowOff: true, persistSelection: false });
+                    }, selectorDone, undefined, undefined, undefined, { modelFilter: (model) => model.input.includes("image"), allowOff: true });
                 },
                 steeringMode: this.session.steeringMode,
                 followUpMode: this.session.followUpMode,
@@ -3817,10 +4085,11 @@ export class InteractiveMode {
                 thinkingLevel: this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL,
                 availableThinkingLevels: [...THINKING_LEVEL_OPTIONS],
                 modelThinkingLevels: this.settingsManager.getAllModelThinkingLevels(),
-                currentTheme: this.themeController.getThemeSelection() || "dark",
+                currentTheme: this.themeController.getThemeSelection() || SYSTEM_THEME_NAME,
                 terminalTheme: this.themeController.getTerminalTheme(),
                 availableThemes: getAvailableThemes(),
                 hideThinkingBlock: this.hideThinkingBlock,
+                mermaidRenderingMode: this.settingsManager.getMermaidRenderingMode(),
                 collapseChangelog: this.settingsManager.getCollapseChangelog(),
                 enableInstallTelemetry: this.settingsManager.getEnableInstallTelemetry(),
                 doubleEscapeAction: this.settingsManager.getDoubleEscapeAction(),
@@ -3838,6 +4107,7 @@ export class InteractiveMode {
                 fullscreenExitOutput: this.settingsManager.getFullscreenExitOutput(),
                 fullscreenScrollbar: this.settingsManager.getFullscreenScrollbar(),
                 fullscreenCopyOnSelect: this.settingsManager.getFullscreenCopyOnSelect(),
+                fullscreenWheelScrollLines: this.settingsManager.getFullscreenWheelScrollLines(),
                 warnings: this.settingsManager.getWarnings(),
                 skills: this.buildSkillToggleItems(),
             }, {
@@ -3845,29 +4115,6 @@ export class InteractiveMode {
                     this.session.setAutoCompactionEnabled(enabled);
                     this.footer.setAutoCompactEnabled(enabled);
                 },
-                onAutoHandoffEnabledChange: (enabled) => {
-                    this.settingsManager.setAutoHandoffEnabled(enabled);
-                },
-                onAutoHandoffThresholdTokensChange: (tokens) => {
-                    this.settingsManager.setAutoHandoffThresholdTokens(tokens);
-                },
-                onCapabilityGatewayJevChange: (enabled) => {
-                    if (enabled && !this.session.modelRuntime.getProviderAuthStatus("tokenin").configured) {
-                        this.showStatus("Token-In is required for Jev routing; starting /tokenin add");
-                        done();
-                        void this.session
-                            .prompt("/tokenin add")
-                            .then(() => {
-                            if (this.session.modelRuntime.getProviderAuthStatus("tokenin").configured) {
-                                this.settingsManager.setCapabilityGatewayJevEnabled(true);
-                            }
-                        })
-                            .catch((error) => this.showError(`Could not start Token-In setup: ${String(error)}`));
-                        return false;
-                    }
-                    this.settingsManager.setCapabilityGatewayJevEnabled(enabled);
-                    return true;
-                },
                 onShowImagesChange: (enabled) => {
                     this.settingsManager.setShowImages(enabled);
                     for (const child of this.chatContainer.children) {
@@ -3919,6 +4166,7 @@ export class InteractiveMode {
                 },
                 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);
@@ -3928,6 +4176,7 @@ export class InteractiveMode {
                 },
                 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;
@@ -3936,14 +4185,9 @@ export class InteractiveMode {
                         this.updateEditorBorderColor();
                     }
                 },
-                onThinkingLevelChange: (level) => {
-                    this.session.setThinkingLevel(level);
-                    this.footer.invalidate();
-                    this.updateEditorBorderColor();
-                },
                 onThemeChange: (themeSetting) => {
                     this.settingsManager.setTheme(themeSetting);
-                    void this.themeController.setThemeSetting(themeSetting);
+                    this.themeController.setThemeSetting(themeSetting);
                 },
                 onThemePreview: (themeName) => this.themeController.preview(themeName),
                 onHideThinkingBlockChange: (hidden) => {
@@ -3951,6 +4195,11 @@ export class InteractiveMode {
                     this.settingsManager.setHideThinkingBlock(hidden);
                     this.updateThinkingBlockVisibility();
                 },
+                onMermaidRenderingModeChange: (mode) => {
+                    this.settingsManager.setMermaidRenderingMode(mode);
+                    this.chatContainer.invalidate();
+                    this.ui.requestRender();
+                },
                 onShowCacheMissNoticesChange: (shown) => {
                     this.settingsManager.setShowCacheMissNotices(shown);
                     this.rebuildChatFromMessages();
@@ -3961,8 +4210,8 @@ export class InteractiveMode {
                 onEnableInstallTelemetryChange: (enabled) => {
                     this.settingsManager.setEnableInstallTelemetry(enabled);
                 },
-                onQuietStartupChange: (enabled) => {
-                    this.settingsManager.setQuietStartup(enabled);
+                onQuietStartupChange: (quiet) => {
+                    this.settingsManager.setQuietStartup(quiet);
                 },
                 onDefaultProjectTrustChange: (defaultProjectTrust) => {
                     this.settingsManager.setDefaultProjectTrust(defaultProjectTrust);
@@ -3987,21 +4236,14 @@ export class InteractiveMode {
                 onOutputPadChange: (padding) => {
                     this.settingsManager.setOutputPad(padding);
                     this.outputPad = padding;
-                    if (this.streamingComponent || this.session.isStreaming) {
-                        for (const child of this.chatContainer.children) {
-                            if (child instanceof AssistantMessageComponent ||
-                                child instanceof CustomMessageComponent ||
-                                child instanceof UserMessageComponent) {
+                    for (const container of [this.chatContainer, this.pendingMessagesContainer]) {
+                        for (const child of container.children) {
+                            if ("setOutputPad" in child && typeof child.setOutputPad === "function") {
                                 child.setOutputPad(padding);
                             }
                         }
-                        if (this.streamingComponent) {
-                            this.streamingComponent.setOutputPad(padding);
-                        }
-                        this.ui.requestRender();
-                        return;
                     }
-                    this.rebuildChatFromMessages();
+                    this.ui.requestRender();
                 },
                 onAutocompleteMaxVisibleChange: (maxVisible) => {
                     this.settingsManager.setAutocompleteMaxVisible(maxVisible);
@@ -4044,6 +4286,11 @@ export class InteractiveMode {
                     if (this.renderer instanceof TuiAltScreen)
                         this.renderer.setCopyOnSelect(enabled);
                 },
+                onFullscreenWheelScrollLinesChange: (lines) => {
+                    this.settingsManager.setFullscreenWheelScrollLines(lines);
+                    if (this.renderer instanceof TuiAltScreen)
+                        this.renderer.setWheelScrollLines(lines);
+                },
                 onWarningsChange: (warnings) => {
                     this.settingsManager.setWarnings(warnings);
                 },
@@ -4061,6 +4308,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 };
+        });
+    }
     getVisionModels() {
         try {
             const models = this.session.scopedModels.length > 0
@@ -4136,12 +4421,11 @@ 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}`);
                 void this.maybeWarnAboutAnthropicSubscriptionAuth(model);
-                this.checkDaxnutsEasterEgg(model);
             }
             catch (error) {
                 this.showError(error instanceof Error ? error.message : String(error));
@@ -4151,21 +4435,37 @@ export class InteractiveMode {
         this.showModelSelector(searchTerm);
     }
     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);
-        }
+        const cachedModels = this.session.scopedModels.length > 0
+            ? this.session.scopedModels.map((scoped) => scoped.model)
+            : [...this.session.modelRuntime.getAvailableSnapshot()];
+        const cachedMatch = findExactModelReferenceMatch(searchTerm, cachedModels);
+        if (cachedMatch || this.session.scopedModels.length > 0)
+            return cachedMatch;
+        this.showStatus("Refreshing model catalogs…");
+        const controller = new AbortController();
+        let timedOut = false;
+        const timeout = setTimeout(() => {
+            timedOut = true;
+            controller.abort();
+        }, 15_000);
         try {
-            const controller = new AbortController();
-            await refreshModelCatalogs(this.session.modelRuntime, controller.signal);
-            return [...(await this.session.modelRuntime.getAvailable())];
+            const result = await refreshModelCatalogs(this.session.modelRuntime, controller.signal);
+            if (result.aborted && timedOut) {
+                this.showWarning("Model refresh timed out; searching cached models.");
+            }
+            else if (result.errors.size > 0) {
+                this.showWarning(`Could not refresh ${[...result.errors.keys()].join(", ")}; searching cached models.`);
+            }
         }
-        catch {
-            return [];
+        catch (error) {
+            this.showWarning(timedOut
+                ? "Model refresh timed out; searching cached models."
+                : `Could not refresh model catalogs: ${error instanceof Error ? error.message : String(error)}`);
         }
+        finally {
+            clearTimeout(timeout);
+        }
+        return findExactModelReferenceMatch(searchTerm, [...this.session.modelRuntime.getAvailableSnapshot()]);
     }
     /** Update the footer's available provider count from the current snapshot without refreshing catalogs. */
     updateAvailableProviderCount() {
@@ -4249,95 +4549,91 @@ 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) => {
-                if (!model)
-                    return;
+            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);
                 }
                 catch (error) {
                     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) => {
+                if (model)
+                    selectModel(model, false);
             }, () => {
                 done();
                 this.ui.requestRender();
-            }, initialSearchInput);
-            return { component: selector, focus: selector };
+            }, initialSearchInput, (model) => selectModel(model, true), defaultProvider && defaultModel ? { provider: defaultProvider, id: defaultModel } : undefined);
+            return { component: selector, focus: selector, dispose: () => selector.dispose() };
         });
     }
-    async showModelsSelector() {
-        // Get all available models
-        const controller = new AbortController();
-        await refreshModelCatalogs(this.session.modelRuntime, controller.signal);
-        const allModels = [...(await this.session.modelRuntime.getAvailable())];
-        const allModelIds = new Set(allModels.map((model) => `${model.provider}/${model.id}`));
+    showModelsSelector() {
+        let availableModels = [...this.session.modelRuntime.getAvailableSnapshot()];
+        let availableModelIds = new Set(availableModels.map((model) => `${model.provider}/${model.id}`));
         const configuredPatterns = this.settingsManager.getEnabledModels();
         const sessionScopedModels = this.session.scopedModels;
-        if (allModels.length === 0 && !configuredPatterns?.length && sessionScopedModels.length === 0) {
-            this.showStatus("No models available");
-            return;
-        }
-        const configuredScope = configuredPatterns?.length
-            ? await resolveModelScopeWithDiagnostics(configuredPatterns, this.session.modelRuntime)
-            : undefined;
-        // Check if session has scoped models (from previous session-only changes or CLI --models)
-        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 if (configuredScope) {
-            currentEnabledIds = configuredScope.scopedModels.map((scoped) => `${scoped.model.provider}/${scoped.model.id}`);
-        }
-        for (const diagnostic of configuredScope?.diagnostics ?? []) {
-            if (diagnostic.code !== "no-match")
-                continue;
-            currentEnabledIds ??= [];
-            if (!currentEnabledIds.includes(diagnostic.pattern))
-                currentEnabledIds.push(diagnostic.pattern);
-        }
-        // Helper to update session's scoped models (session-only, no persist)
-        const updateSessionModels = async (enabledIds) => {
+        const configuredEnabledIds = (models) => {
+            if (!configuredPatterns?.length)
+                return null;
+            const resolved = resolveModelScopeFromModels(configuredPatterns, models);
+            const ids = resolved.scopedModels.map((scoped) => `${scoped.model.provider}/${scoped.model.id}`);
+            for (const diagnostic of resolved.diagnostics) {
+                if (diagnostic.code === "no-match" && !ids.includes(diagnostic.pattern))
+                    ids.push(diagnostic.pattern);
+            }
+            return ids;
+        };
+        let currentEnabledIds = sessionScopedModels.length > 0
+            ? sessionScopedModels.map((scoped) => `${scoped.model.provider}/${scoped.model.id}`)
+            : configuredEnabledIds(availableModels);
+        let selectionChanged = false;
+        const updateSessionModels = (enabledIds) => {
             currentEnabledIds = enabledIds === null ? null : [...enabledIds];
-            const hasEnabledAvailableModel = enabledIds?.some((id) => allModelIds.has(id)) ?? false;
-            const allAvailableModelsEnabled = enabledIds !== null && [...allModelIds].every((id) => enabledIds.includes(id));
+            const hasEnabledAvailableModel = enabledIds?.some((id) => availableModelIds.has(id)) ?? false;
+            const allAvailableModelsEnabled = enabledIds !== null && [...availableModelIds].every((id) => enabledIds.includes(id));
             if (enabledIds && hasEnabledAvailableModel && !allAvailableModelsEnabled) {
-                const newScopedModels = await resolveModelScope(enabledIds, this.session.modelRuntime);
-                this.session.setScopedModels(newScopedModels.map((sm) => ({
-                    model: sm.model,
-                    thinkingLevel: sm.thinkingLevel,
+                const newScopedModels = resolveModelScopeFromModels(enabledIds, availableModels).scopedModels;
+                this.session.setScopedModels(newScopedModels.map((scoped) => ({
+                    model: scoped.model,
+                    thinkingLevel: scoped.thinkingLevel,
                 })));
             }
             else {
-                // All enabled or none enabled = no filter
                 this.session.setScopedModels([]);
             }
-            await this.updateAvailableProviderCount();
+            this.updateAvailableProviderCount();
             this.ui.requestRender();
         };
         this.showSelector((done) => {
+            let disposed = false;
+            let timedOut = false;
+            const controller = new AbortController();
+            const timeout = setTimeout(() => {
+                timedOut = true;
+                controller.abort();
+            }, 15_000);
             const selector = new ScopedModelsSelectorComponent({
-                allModels,
+                allModels: availableModels,
                 enabledModelIds: currentEnabledIds,
+                refreshStatus: "Refreshing model catalogs…",
             }, {
-                onChange: async (enabledIds) => {
-                    await updateSessionModels(enabledIds);
+                onChange: (enabledIds) => {
+                    selectionChanged = true;
+                    updateSessionModels(enabledIds);
                 },
                 onPersist: (enabledIds) => {
-                    // Persist to settings
                     const allEnabled = enabledIds !== null &&
-                        enabledIds.length === allModels.length &&
-                        enabledIds.every((id) => allModelIds.has(id));
+                        enabledIds.length === availableModels.length &&
+                        enabledIds.every((id) => availableModelIds.has(id));
                     const newPatterns = enabledIds === null || allEnabled ? undefined : enabledIds;
                     this.settingsManager.setEnabledModels(newPatterns ? [...newPatterns] : undefined);
                     this.showStatus("Model selection saved to settings");
@@ -4347,7 +4643,50 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 },
             });
-            return { component: selector, focus: selector };
+            void refreshModelCatalogs(this.session.modelRuntime, controller.signal)
+                .then((result) => {
+                if (disposed)
+                    return;
+                availableModels = [...this.session.modelRuntime.getAvailableSnapshot()];
+                availableModelIds = new Set(availableModels.map((model) => `${model.provider}/${model.id}`));
+                if (!selectionChanged && sessionScopedModels.length === 0) {
+                    currentEnabledIds = configuredEnabledIds(availableModels);
+                    selector.updateModels(availableModels, currentEnabledIds);
+                }
+                else {
+                    selector.updateModels(availableModels);
+                }
+                if (currentEnabledIds !== null)
+                    updateSessionModels(currentEnabledIds);
+                if (result.aborted && timedOut) {
+                    selector.setRefreshStatus("Model refresh timed out; showing cached models.", "warning");
+                }
+                else if (result.errors.size > 0) {
+                    selector.setRefreshStatus(`Could not refresh ${[...result.errors.keys()].join(", ")}; showing cached models.`, "warning");
+                }
+                else {
+                    selector.setRefreshStatus("Model catalogs refreshed.", "success");
+                }
+                this.ui.requestRender();
+            })
+                .catch((error) => {
+                if (disposed)
+                    return;
+                selector.setRefreshStatus(timedOut
+                    ? "Model refresh timed out; showing cached models."
+                    : `Could not refresh model catalogs: ${error instanceof Error ? error.message : String(error)}`, "warning");
+                this.ui.requestRender();
+            })
+                .finally(() => clearTimeout(timeout));
+            return {
+                component: selector,
+                focus: selector,
+                dispose: () => {
+                    disposed = true;
+                    clearTimeout(timeout);
+                    controller.abort();
+                },
+            };
         });
     }
     showUserMessageSelector() {
@@ -4592,6 +4931,7 @@ export class InteractiveMode {
                     source: authStatus.label ?? authStatus.source,
                 }
                 : undefined;
+            const subscription = provider.auth.oauth?.isSubscription === true;
             if ((!authType || authType === "oauth") && provider.auth.oauth) {
                 options.push({
                     id: provider.id,
@@ -4599,6 +4939,7 @@ export class InteractiveMode {
                     authType: "oauth",
                     method: provider.auth.oauth,
                     status,
+                    subscription,
                 });
             }
             if ((!authType || authType === "api_key") && provider.auth.apiKey) {
@@ -4608,19 +4949,24 @@ export class InteractiveMode {
                     authType: "api_key",
                     method: provider.auth.apiKey,
                     status,
+                    subscription,
                 });
             }
         }
         return options.sort((a, b) => a.name.localeCompare(b.name));
     }
     async getLogoutProviderOptions() {
-        return (await this.session.modelRuntime.listCredentials())
-            .map(({ providerId, type }) => ({
-            id: providerId,
-            name: this.session.modelRuntime.getProvider(providerId)?.name ?? providerId,
-            authType: type,
-            status: { type, source: "stored credential" },
-        }))
+        return (await this.session.modelRuntime.listCredentials({ signal: AbortSignal.timeout(15_000) }))
+            .map(({ providerId, type }) => {
+            const provider = this.session.modelRuntime.getProvider(providerId);
+            return {
+                id: providerId,
+                name: provider?.name ?? providerId,
+                authType: type,
+                status: { type, source: "stored credential" },
+                subscription: provider?.auth.oauth?.isSubscription === true,
+            };
+        })
             .sort((a, b) => a.name.localeCompare(b.name));
     }
     findLoginProviderOptions(providerRef) {
@@ -4632,7 +4978,6 @@ export class InteractiveMode {
             provider.name.toLowerCase() === normalizedProviderRef);
     }
     async handleLoginCommand(providerRef) {
-        await this.session.modelRuntime.getAvailable();
         if (!providerRef) {
             this.showLoginAuthTypeSelector();
             return;
@@ -4651,18 +4996,25 @@ export class InteractiveMode {
         }
         this.showLoginProviderSelector(undefined, providerRef);
     }
-    async startProviderLogin(providerOption) {
+    /** `onBack` reopens the selector the login was started from when the user cancels it. */
+    async startProviderLogin(providerOption, onBack) {
         if (providerOption.authType === "oauth") {
-            await this.showLoginDialog(providerOption.id, providerOption.name);
+            await this.showLoginDialog(providerOption.id, providerOption.name, onBack);
         }
         else if (providerOption.method?.login) {
-            await this.showApiKeyLoginDialog(providerOption.id, providerOption.name);
+            await this.showApiKeyLoginDialog(providerOption.id, providerOption.name, onBack);
         }
         else {
-            this.showAmbientAuthDialog(providerOption);
+            this.showAmbientAuthDialog(providerOption, onBack);
         }
     }
     showLoginAuthTypeSelector(providerOptions) {
+        // The top-level selector offers Radius directly, as its last option.
+        const radiusOption = providerOptions
+            ? undefined
+            : this.getLoginProviderOptions("oauth").find((provider) => provider.id === RADIUS_PROVIDER_ID);
+        const radiusText = radiusOption ? `Sign in with ${radiusOption.name}` : undefined;
+        const radiusLabel = radiusOption ? `${radiusText}${formatAuthSelectorProviderStatus(radiusOption)}` : undefined;
         const oauthProvider = providerOptions?.find((provider) => provider.authType === "oauth");
         const oauthLoginLabel = oauthProvider?.method && "loginLabel" in oauthProvider.method ? oauthProvider.method.loginLabel : undefined;
         const subscriptionLabel = oauthLoginLabel ?? "Sign in with an account";
@@ -4677,6 +5029,8 @@ export class InteractiveMode {
         if (availableAuthTypes.has("api_key")) {
             options.push(apiKeyLabel);
         }
+        if (radiusLabel)
+            options.push(radiusLabel);
         if (options.length === 0) {
             this.showStatus("No login methods available.");
             return;
@@ -4692,29 +5046,37 @@ export class InteractiveMode {
             ? `Select authentication method for ${providerOptions[0].name}:`
             : "Select authentication method:";
         this.showSelector((done) => {
-            const selector = new ExtensionSelectorComponent(title, options, (option) => {
+            const onSelect = (option) => {
                 done();
+                if (radiusOption && option === radiusLabel) {
+                    void this.startProviderLogin(radiusOption, () => this.showLoginAuthTypeSelector());
+                    return;
+                }
                 const authType = option === subscriptionLabel ? "oauth" : "api_key";
                 if (providerOptions) {
                     const providerOption = providerOptions.find((provider) => provider.authType === authType);
                     if (providerOption) {
-                        void this.startProviderLogin(providerOption);
+                        void this.startProviderLogin(providerOption, () => this.showLoginAuthTypeSelector(providerOptions));
                     }
                     return;
                 }
                 this.showLoginProviderSelector(authType);
-            }, () => {
+            };
+            const onCancel = () => {
                 done();
                 this.ui.requestRender();
-            });
-            return { component: selector, focus: selector };
+            };
+            const selector = radiusLabel && radiusText
+                ? createLoginMenuSelector(this.ui, title, options, { label: radiusLabel, text: radiusText }, onSelect, onCancel)
+                : new ExtensionSelectorComponent(title, options, onSelect, onCancel);
+            return { component: selector, focus: selector, dispose: () => selector.dispose() };
         });
     }
     showLoginProviderSelector(authType, initialSearchInput) {
         const providerOptions = this.getLoginProviderOptions(authType);
         if (providerOptions.length === 0) {
             const message = authType === "oauth"
-                ? "No subscription providers available."
+                ? "No account providers available."
                 : authType === "api_key"
                     ? "No API key providers available."
                     : "No login providers available.";
@@ -4728,7 +5090,7 @@ export class InteractiveMode {
                 if (!providerOption) {
                     return;
                 }
-                await this.startProviderLogin(providerOption);
+                await this.startProviderLogin(providerOption, () => this.showLoginProviderSelector(authType, initialSearchInput));
             }, () => {
                 done();
                 if (authType) {
@@ -4746,7 +5108,14 @@ export class InteractiveMode {
             this.showLoginAuthTypeSelector();
             return;
         }
-        const providerOptions = await this.getLogoutProviderOptions();
+        let providerOptions;
+        try {
+            providerOptions = await this.getLogoutProviderOptions();
+        }
+        catch (error) {
+            this.showError(`Could not read stored credentials: ${error instanceof Error ? error.message : String(error)}`);
+            return;
+        }
         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;
@@ -4759,7 +5128,9 @@ export class InteractiveMode {
                     return;
                 }
                 try {
-                    await this.session.modelRuntime.logout(providerOption.id);
+                    await this.session.modelRuntime.logout(providerOption.id, {
+                        signal: AbortSignal.timeout(15_000),
+                    });
                     await this.updateAvailableProviderCount();
                     const message = providerOption.authType === "oauth"
                         ? `Logged out of ${providerOption.name}`
@@ -4767,7 +5138,10 @@ export class InteractiveMode {
                     this.showStatus(message);
                 }
                 catch (error) {
-                    this.showError(`Logout failed: ${error instanceof Error ? error.message : String(error)}`);
+                    const message = error instanceof Error ? error.message : String(error);
+                    this.showError(error instanceof CredentialSynchronizationError
+                        ? `Credentials removed for ${providerOption.name}, but local model state could not be synchronized: ${message}`
+                        : `Logout failed: ${message}`);
                 }
             }, () => {
                 done();
@@ -4777,8 +5151,8 @@ export class InteractiveMode {
         });
     }
     async completeProviderAuthentication(providerId, providerName, authType, previousModel) {
-        const session = this.session;
         const actionLabel = authType === "oauth" ? `Logged in to ${providerName}` : `Saved API key for ${providerName}`;
+        const session = this.session;
         // Dynamic catalogs may be empty until the first authenticated network refresh.
         const deferSelection = isUnknownModel(previousModel) &&
             hasDefaultModelProvider(providerId) &&
@@ -4789,10 +5163,9 @@ export class InteractiveMode {
             let selectedModel;
             let selectionError;
             if (isUnknownModel(previousModel)) {
-                const availableModels = await this.session.modelRuntime.getAvailable();
+                const availableModels = this.session.modelRuntime.getAvailableSnapshot();
                 const providerModels = availableModels.filter((model) => model.provider === providerId);
-                // Matches LLAMA_PROVIDER_ID from core/llama/provider.ts; kept inline to avoid
-                // coupling interactive mode to the built-in extension.
+                // 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);
                 }
@@ -4829,7 +5202,6 @@ export class InteractiveMode {
             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()}`);
@@ -4871,21 +5243,24 @@ export class InteractiveMode {
         })
             .finally(() => clearTimeout(timeout));
     }
-    showAmbientAuthDialog(providerOption) {
+    showAmbientAuthDialog(providerOption, onBack) {
         const restoreEditor = () => {
             this.editorContainer.clear();
             this.editorContainer.addChild(this.editor);
             this.ui.setFocus(this.editor);
             this.ui.requestRender();
         };
-        const dialog = new LoginDialogComponent(this.ui, providerOption.id, () => restoreEditor(), providerOption.name, `${providerOption.name} setup`);
+        const dialog = new LoginDialogComponent(this.ui, providerOption.id, () => {
+            restoreEditor();
+            onBack?.();
+        }, providerOption.name, `${providerOption.name} setup`);
         dialog.showInfo(`${providerOption.method?.name ?? "Authentication"} is configured outside ${APP_NAME}.`, [], true);
         this.editorContainer.clear();
         this.editorContainer.addChild(dialog);
         this.ui.setFocus(dialog);
         this.ui.requestRender();
     }
-    async showApiKeyLoginDialog(providerId, providerName) {
+    async showApiKeyLoginDialog(providerId, providerName, onBack) {
         const previousModel = this.session.model;
         const dialog = new LoginDialogComponent(this.ui, providerId, (_success, _message) => {
             // Completion handled below
@@ -4908,19 +5283,25 @@ export class InteractiveMode {
             this.ui.requestRender();
         };
         try {
-            await this.loginProvider(dialog, providerId, "api_key");
+            await this.loginProvider(dialog, providerId, providerName, "api_key");
             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") {
+            if (error instanceof CredentialSynchronizationError) {
+                this.showError(`Saved API key for ${providerName}, but local model state could not be synchronized: ${errorMsg}`);
+            }
+            else if (errorMsg === "Login cancelled") {
+                onBack?.();
+            }
+            else {
                 this.showError(`Failed to save API key for ${providerName}: ${errorMsg}`);
             }
         }
     }
-    showAuthSelect(dialog, prompt) {
+    showAuthSelect(dialog, prompt, providerId) {
         return new Promise((resolve, reject) => {
             const restoreDialog = () => {
                 this.editorContainer.clear();
@@ -4939,17 +5320,17 @@ export class InteractiveMode {
             }, () => {
                 restoreDialog();
                 reject(new Error("Login cancelled"));
-            });
+            }, { description: providerId === RADIUS_PROVIDER_ID ? RADIUS_LOGIN_INTRO : undefined });
             this.editorContainer.clear();
             this.editorContainer.addChild(selector);
             this.ui.setFocus(selector);
             this.ui.requestRender();
         });
     }
-    async showAuthPrompt(dialog, prompt) {
+    async showAuthPrompt(dialog, prompt, providerId) {
         let response;
         if (prompt.type === "select") {
-            response = this.showAuthSelect(dialog, prompt);
+            response = this.showAuthSelect(dialog, prompt, providerId);
         }
         else if (prompt.type === "manual_code") {
             response = dialog.showManualInput(prompt.message);
@@ -4990,14 +5371,20 @@ export class InteractiveMode {
             dialog.showProgress(event.message);
         }
     }
-    async loginProvider(dialog, providerId, method) {
-        await this.session.modelRuntime.login(providerId, method, {
-            signal: dialog.signal,
-            prompt: (prompt) => this.showAuthPrompt(dialog, prompt),
-            notify: (event) => this.notifyAuthDialog(dialog, event),
-        });
+    async loginProvider(dialog, providerId, providerName, method) {
+        this.programStatus.setBlocked("login", { kind: "auth", message: `Log in to ${providerName}` });
+        try {
+            await this.session.modelRuntime.login(providerId, method, {
+                signal: dialog.signal,
+                prompt: (prompt) => this.showAuthPrompt(dialog, prompt, providerId),
+                notify: (event) => this.notifyAuthDialog(dialog, event),
+            }, { getDeviceId: () => this.settingsManager.getOrCreateDeviceId() });
+        }
+        finally {
+            this.programStatus.setBlocked("login", undefined);
+        }
     }
-    async showLoginDialog(providerId, providerName) {
+    async showLoginDialog(providerId, providerName, onBack) {
         const previousModel = this.session.model;
         const dialog = new LoginDialogComponent(this.ui, providerId, (_success, _message) => { }, providerName);
         this.editorContainer.clear();
@@ -5011,18 +5398,70 @@ export class InteractiveMode {
             this.ui.requestRender();
         };
         try {
-            await this.loginProvider(dialog, providerId, "oauth");
+            await this.loginProvider(dialog, providerId, providerName, "oauth");
             restoreEditor();
             await this.completeProviderAuthentication(providerId, providerName, "oauth", previousModel);
+            if (providerId === RADIUS_PROVIDER_ID)
+                this.offerRadiusMcpServer(providerId, providerName);
         }
         catch (error) {
             restoreEditor();
             const errorMsg = error instanceof Error ? error.message : String(error);
-            if (errorMsg !== "Login cancelled") {
+            if (error instanceof CredentialSynchronizationError) {
+                this.showError(`Logged in to ${providerName}, but local model state could not be synchronized: ${errorMsg}`);
+            }
+            else if (errorMsg === "Login cancelled") {
+                onBack?.();
+            }
+            else {
                 this.showError(`Failed to login to ${providerName}: ${errorMsg}`);
             }
         }
     }
+    /**
+     * Offer to point the Radius MCP server in the global mcp.json at the Radius login, adding the server
+     * when missing. Nothing is asked when a global server already uses this login.
+     */
+    offerRadiusMcpServer(providerId, providerName) {
+        const mcpPath = path.join(getAgentDir(), "mcp.json");
+        const normalizeUrl = (url) => url.replace(/\/+$/u, "");
+        const { servers } = loadMcpConfig({
+            agentDir: getAgentDir(),
+            cwd: this.sessionManager.getCwd(),
+            projectTrusted: false,
+        });
+        const existing = servers.find((server) => "url" in server.config && normalizeUrl(server.config.url) === normalizeUrl(RADIUS_MCP_URL));
+        if (existing && "url" in existing.config && existing.config.auth?.provider === providerId)
+            return;
+        let name = existing?.name ?? "radius";
+        if (!existing && servers.some((server) => server.name === name))
+            name = "radius-mcp";
+        const config = existing && "url" in existing.config
+            ? { ...existing.config, auth: { provider: providerId } }
+            : { url: RADIUS_MCP_URL, auth: { provider: providerId } };
+        // `auth` replaces the MCP OAuth sign-in.
+        delete config.oauth;
+        this.showSelector((done) => {
+            const selector = new ExtensionSelectorComponent(`Configure ${providerName} MCP in ${mcpPath}?`, ["Yes", "No"], (option) => {
+                done();
+                if (option !== "Yes")
+                    return;
+                try {
+                    addMcpServerConfig(mcpPath, name, config);
+                }
+                catch (error) {
+                    this.showError(`Could not update ${mcpPath}: ${error instanceof Error ? error.message : String(error)}`);
+                    return;
+                }
+                // The MCP extension reads mcp.json when the session starts.
+                void this.handleReloadCommand();
+            }, () => {
+                done();
+                this.ui.requestRender();
+            });
+            return { component: selector, focus: selector };
+        });
+    }
     // =========================================================================
     // Command handlers
     // =========================================================================
@@ -5082,7 +5521,7 @@ export class InteractiveMode {
         const borderColor = (s) => theme.fg("border", s);
         reloadBox.addChild(new DynamicBorder(borderColor));
         reloadBox.addChild(new Spacer(1));
-        reloadBox.addChild(new Text(theme.fg("muted", "Reloading keybindings, extensions, skills, prompts, themes, and context files..."), 1, 0));
+        reloadBox.addChild(new ThemedText(() => theme.fg("muted", "Reloading keybindings, extensions, skills, prompts, themes, and context files..."), 1, 0));
         reloadBox.addChild(new Spacer(1));
         reloadBox.addChild(new DynamicBorder(borderColor));
         const previousEditor = this.editor;
@@ -5119,7 +5558,7 @@ export class InteractiveMode {
             }
             setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
             this.applyRuntimeSettings();
-            await this.themeController.applyFromSettings();
+            this.themeController.applyFromSettings();
             this.setupAutocompleteProvider();
             const runner = this.session.extensionRunner;
             this.setupExtensionShortcuts(runner);
@@ -5231,91 +5670,14 @@ export class InteractiveMode {
         }
     }
     async handleShareCommand() {
-        // Check if gh is available and logged in
-        try {
-            const authResult = spawnSync("gh", ["auth", "status"], { encoding: "utf-8" });
-            if (authResult.status !== 0) {
-                this.showError("GitHub CLI is not logged in. Run 'gh auth login' first.");
-                return;
-            }
-        }
-        catch {
-            this.showError("GitHub CLI (gh) is not installed. Install it from https://cli.github.com/");
-            return;
-        }
-        // Export to a temp file
-        const tmpFile = path.join(os.tmpdir(), "session.html");
-        try {
-            await this.session.exportToHtml(tmpFile, { themeName: theme.name });
-        }
-        catch (error) {
-            this.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
-            return;
-        }
-        // Show cancellable loader, replacing the editor
-        const loader = new BorderedLoader(this.ui, theme, "Creating gist...");
-        this.editorContainer.clear();
-        this.editorContainer.addChild(loader);
-        this.ui.setFocus(loader);
-        this.ui.requestRender();
-        const restoreEditor = () => {
-            loader.dispose();
-            this.editorContainer.clear();
-            this.editorContainer.addChild(this.editor);
-            this.ui.setFocus(this.editor);
-            try {
-                fs.unlinkSync(tmpFile);
-            }
-            catch {
-                // Ignore cleanup errors
-            }
-        };
-        // Create a secret gist asynchronously
-        let proc = null;
-        loader.onAbort = () => {
-            proc?.kill();
-            restoreEditor();
-            this.showStatus("Share cancelled");
-        };
-        try {
-            const result = await new Promise((resolve) => {
-                proc = spawn("gh", ["gist", "create", "--public=false", tmpFile]);
-                let stdout = "";
-                let stderr = "";
-                proc.stdout?.on("data", (data) => {
-                    stdout += data.toString();
-                });
-                proc.stderr?.on("data", (data) => {
-                    stderr += data.toString();
-                });
-                proc.on("close", (code) => resolve({ stdout, stderr, code }));
-            });
-            if (loader.signal.aborted)
-                return;
-            restoreEditor();
-            if (result.code !== 0) {
-                const errorMsg = result.stderr?.trim() || "Unknown error";
-                this.showError(`Failed to create gist: ${errorMsg}`);
-                return;
-            }
-            // Extract gist ID from the URL returned by gh
-            // gh returns something like: https://gist.github.com/username/GIST_ID
-            const gistUrl = result.stdout?.trim();
-            const gistId = gistUrl?.split("/").pop();
-            if (!gistId) {
-                this.showError("Failed to parse gist ID from gh output");
-                return;
-            }
-            // Create the preview URL
-            const previewUrl = getShareViewerUrl(gistId);
-            this.showStatus(`Share URL: ${previewUrl}\nGist: ${gistUrl}`);
-        }
-        catch (error) {
-            if (!loader.signal.aborted) {
-                restoreEditor();
-                this.showError(`Failed to create gist: ${error instanceof Error ? error.message : "Unknown error"}`);
-            }
-        }
+        await shareSession({
+            session: this.session,
+            ui: this.ui,
+            editorContainer: this.editorContainer,
+            editor: this.editor,
+            showStatus: (message) => this.showStatus(message),
+            showError: (message) => this.showError(message),
+        });
     }
     async handleBugCommand(hint) {
         await reportBug({
@@ -5360,7 +5722,7 @@ export class InteractiveMode {
             const currentName = this.sessionManager.getSessionName();
             if (currentName) {
                 this.chatContainer.addChild(new Spacer(1));
-                this.chatContainer.addChild(new Text(theme.fg("dim", `Session name: ${currentName}`), 1, 0));
+                this.chatContainer.addChild(new ThemedText(() => theme.fg("dim", `Session name: ${currentName}`), 1, 0));
             }
             else {
                 this.showWarning("Usage: /name <name>");
@@ -5374,7 +5736,8 @@ export class InteractiveMode {
             this.showWarning(`Session name was normalized from ${JSON.stringify(name)} to ${JSON.stringify(sessionName)}`);
         }
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(theme.fg("dim", `Session name set: ${sessionName ?? name}`), 1, 0));
+        const displayName = sessionName ?? name;
+        this.chatContainer.addChild(new ThemedText(() => theme.fg("dim", `Session name set: ${displayName}`), 1, 0));
         this.ui.requestRender();
     }
     handleSessionCommand() {
@@ -5386,61 +5749,69 @@ export class InteractiveMode {
         // resolves to a concrete responseModel). Usage without model attribution is
         // grouped separately so the breakdown reconciles with the session total.
         const usageBreakdown = getUsageCostBreakdown(entries);
-        let info = `${theme.bold("Session Info")}\n\n`;
-        if (sessionName) {
-            info += `${theme.fg("dim", "Name:")} ${sessionName}\n`;
-        }
-        info += `${theme.fg("dim", "File:")} ${stats.sessionFile ?? "In-memory"}\n`;
-        info += `${theme.fg("dim", "ID:")} ${stats.sessionId}\n\n`;
-        info += `${theme.bold("Messages")}\n`;
-        info += `${theme.fg("dim", "Total:")} ${stats.totalMessages}\n`;
-        info += `${theme.fg("dim", "User:")} ${stats.userMessages}\n`;
-        info += `${theme.fg("dim", "Assistant:")} ${stats.assistantMessages}\n`;
-        info += `${theme.fg("dim", "Tools:")} ${stats.toolCalls} calls, ${stats.toolResults} results\n\n`;
-        info += `${theme.bold("Tokens")}\n`;
-        // "Input" is the full prompt volume. With cache activity, split it into
-        // cached (served from cache) vs uncached (everything else) - the only
-        // provider-independent split. Cache writes, where reported, are a detail
-        // of the uncached portion.
-        const { input, cacheRead, cacheWrite } = stats.tokens;
-        const promptTokens = input + cacheRead + cacheWrite;
-        info += `${theme.fg("dim", "Input:")} ${promptTokens.toLocaleString()}\n`;
-        if (promptTokens > 0 && (cacheRead > 0 || cacheWrite > 0)) {
-            const hitRate = theme.fg("dim", `(${((cacheRead / promptTokens) * 100).toFixed(1)}%)`);
-            info += `  ${theme.fg("dim", "Cached:")} ${cacheRead.toLocaleString()} ${hitRate}\n`;
-            const written = cacheWrite > 0 ? ` ${theme.fg("dim", `(${cacheWrite.toLocaleString()} written to cache)`)}` : "";
-            info += `  ${theme.fg("dim", "Uncached:")} ${(input + cacheWrite).toLocaleString()}${written}\n`;
-        }
-        info += `${theme.fg("dim", "Output:")} ${stats.tokens.output.toLocaleString()}\n`;
-        info += `${theme.fg("dim", "Total:")} ${stats.tokens.total.toLocaleString()}\n`;
+        // Snapshot the stats; the text is built on demand so it follows theme changes.
         const cacheWarmingStatus = this.session.cacheWarmingStatus;
-        info += `\n${theme.bold("Cache Warming")}\n`;
-        info += `${theme.fg("dim", "Mode:")} ${this.settingsManager.getCacheWarmingMode()}\n`;
-        info += `${theme.fg("dim", "Status:")} ${cacheWarmingStatus ? formatCacheWarmingStatus(cacheWarmingStatus) : "Inactive (cache warming unavailable)"}\n`;
-        const decision = cacheWarmingStatus?.decision;
-        if (decision?.economicsAvailable) {
-            info += `${theme.fg("dim", "Cache miss penalty:")} $${decision.missCost.toFixed(3)}\n`;
-            info += `${theme.fg("dim", "Refresh cost:")} $${decision.warmCost.toFixed(3)}\n`;
-        }
-        if (stats.cost > 0 || cacheWaste.missedTokens > 0) {
-            info += `\n${theme.bold("Cost")}\n`;
-            info += `${theme.fg("dim", "Total:")} ${formatCost(stats.cost)}`;
-            if (usageBreakdown.length > 1) {
-                for (const entry of usageBreakdown) {
-                    info += `\n  ${theme.fg("dim", `${entry.key}:`)} ${formatCost(entry.cost)} ${theme.fg("dim", `(${formatTokens(entry.tokens)} tokens)`)}`;
+        const cacheWarmingMode = this.settingsManager.getCacheWarmingMode();
+        const model = this.session.model;
+        const selectedModelKey = `${model?.provider}/${model?.id}`;
+        const renderInfo = () => {
+            let info = `${theme.bold("Session Info")}\n\n`;
+            if (sessionName) {
+                info += `${theme.fg("dim", "Name:")} ${sessionName}\n`;
+            }
+            info += `${theme.fg("dim", "File:")} ${stats.sessionFile ?? "In-memory"}\n`;
+            info += `${theme.fg("dim", "ID:")} ${stats.sessionId}\n\n`;
+            info += `${theme.bold("Messages")}\n`;
+            info += `${theme.fg("dim", "Total:")} ${stats.totalMessages}\n`;
+            info += `${theme.fg("dim", "User:")} ${stats.userMessages}\n`;
+            info += `${theme.fg("dim", "Assistant:")} ${stats.assistantMessages}\n`;
+            info += `${theme.fg("dim", "Tools:")} ${stats.toolCalls} calls, ${stats.toolResults} results\n\n`;
+            info += `${theme.bold("Tokens")}\n`;
+            // "Input" is the full prompt volume. With cache activity, split it into
+            // cached (served from cache) vs uncached (everything else) - the only
+            // provider-independent split. Cache writes, where reported, are a detail
+            // of the uncached portion.
+            const { input, cacheRead, cacheWrite } = stats.tokens;
+            const promptTokens = input + cacheRead + cacheWrite;
+            info += `${theme.fg("dim", "Input:")} ${promptTokens.toLocaleString()}\n`;
+            if (promptTokens > 0 && (cacheRead > 0 || cacheWrite > 0)) {
+                const hitRate = theme.fg("dim", `(${((cacheRead / promptTokens) * 100).toFixed(1)}%)`);
+                info += `  ${theme.fg("dim", "Cached:")} ${cacheRead.toLocaleString()} ${hitRate}\n`;
+                const written = cacheWrite > 0 ? ` ${theme.fg("dim", `(${cacheWrite.toLocaleString()} written to cache)`)}` : "";
+                info += `  ${theme.fg("dim", "Uncached:")} ${(input + cacheWrite).toLocaleString()}${written}\n`;
+            }
+            info += `${theme.fg("dim", "Output:")} ${stats.tokens.output.toLocaleString()}\n`;
+            info += `${theme.fg("dim", "Total:")} ${stats.tokens.total.toLocaleString()}\n`;
+            info += `\n${theme.bold("Cache Warming")}\n`;
+            info += `${theme.fg("dim", "Mode:")} ${cacheWarmingMode}\n`;
+            info += `${theme.fg("dim", "Status:")} ${cacheWarmingStatus ? formatCacheWarmingStatus(cacheWarmingStatus) : "Inactive (cache warming unavailable)"}\n`;
+            const decision = cacheWarmingStatus?.decision;
+            if (decision?.economicsAvailable) {
+                info += `${theme.fg("dim", "Cache miss penalty:")} ${formatCost(decision.missCost)}\n`;
+                info += `${theme.fg("dim", "Refresh cost:")} ${formatCost(decision.warmCost)}\n`;
+            }
+            if (stats.cost > 0 || cacheWaste.missedTokens > 0) {
+                info += `\n${theme.bold("Cost")}\n`;
+                info += `${theme.fg("dim", "Total:")} ${formatCost(stats.cost)}`;
+                // A single entry repeats the total, unless it names a model other than the selected one.
+                if (usageBreakdown.length > 1 || usageBreakdown[0]?.key !== selectedModelKey) {
+                    for (const entry of usageBreakdown) {
+                        info += `\n  ${theme.fg("dim", `${entry.key}:`)} ${formatCost(entry.cost)} ${theme.fg("dim", `(${formatTokens(entry.tokens)} tokens)`)}`;
+                    }
+                }
+                if (cacheWaste.missedTokens > 0) {
+                    const missLabel = cacheWaste.missCount === 1 ? "1 miss" : `${cacheWaste.missCount} misses`;
+                    const detail = `${cacheWaste.missedTokens.toLocaleString()} tokens, ${missLabel}`;
+                    info +=
+                        cacheWaste.missedCost >= 0.0001
+                            ? `\n${theme.fg("dim", "Cache Re-billed:")} ${formatCost(cacheWaste.missedCost)} ${theme.fg("dim", `(${detail})`)}`
+                            : `\n${theme.fg("dim", "Cache Re-billed:")} ${detail}`;
                 }
             }
-            if (cacheWaste.missedTokens > 0) {
-                const missLabel = cacheWaste.missCount === 1 ? "1 miss" : `${cacheWaste.missCount} misses`;
-                const detail = `${cacheWaste.missedTokens.toLocaleString()} tokens, ${missLabel}`;
-                info +=
-                    cacheWaste.missedCost >= 0.0001
-                        ? `\n${theme.fg("dim", "Cache Re-billed:")} ${formatCost(cacheWaste.missedCost)} ${theme.fg("dim", `(${detail})`)}`
-                        : `\n${theme.fg("dim", "Cache Re-billed:")} ${detail}`;
-            }
-        }
+            return info;
+        };
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(info, 1, 0));
+        this.chatContainer.addChild(new ThemedText(renderInfo, 1, 0));
         this.ui.requestRender();
     }
     handleChangelogCommand() {
@@ -5454,7 +5825,7 @@ export class InteractiveMode {
             : "No changelog entries found.";
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new DynamicBorder());
-        this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "What's New")), 1, 0));
+        this.chatContainer.addChild(new ThemedText(() => theme.bold(theme.fg("accent", "What's New")), 1, 0));
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Markdown(changelogMarkdown, 1, 1, this.getMarkdownThemeWithSettings()));
         this.chatContainer.addChild(new DynamicBorder());
@@ -5555,7 +5926,7 @@ export class InteractiveMode {
 | \`${copyMessage}\` | Copy selection or last assistant message |
 | \`${followUp}\` | Queue follow-up message |
 | \`${dequeue}\` | Restore queued messages |
-| \`${pasteImage}\` | Paste image or text from clipboard |
+| \`${pasteImage}\` | Paste files on macOS, images, or text from clipboard |
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |
 | \`!!\` | Run bash command (excluded from context) |
@@ -5577,7 +5948,7 @@ export class InteractiveMode {
         }
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new DynamicBorder());
-        this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "Keyboard Shortcuts")), 1, 0));
+        this.chatContainer.addChild(new ThemedText(() => theme.bold(theme.fg("accent", "Keyboard Shortcuts")), 1, 0));
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Markdown(hotkeys.trim(), 1, 1, this.getMarkdownThemeWithSettings()));
         this.chatContainer.addChild(new DynamicBorder());
@@ -5591,7 +5962,7 @@ export class InteractiveMode {
                 return;
             }
             this.chatContainer.addChild(new Spacer(1));
-            this.chatContainer.addChild(new Text(`${theme.fg("accent", "✓ New session started")}`, 1, 1));
+            this.chatContainer.addChild(new ThemedText(() => theme.fg("accent", "✓ New session started"), 1, 1));
             this.ui.requestRender();
         }
         catch (error) {
@@ -5622,7 +5993,7 @@ export class InteractiveMode {
         fs.mkdirSync(path.dirname(debugLogPath), { recursive: true });
         fs.writeFileSync(debugLogPath, debugData);
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(`${theme.fg("accent", "✓ Debug log written")}\n${theme.fg("muted", debugLogPath)}`, 1, 1));
+        this.chatContainer.addChild(new ThemedText(() => `${theme.fg("accent", "✓ Debug log written")}\n${theme.fg("muted", debugLogPath)}`, 1, 1));
         this.ui.requestRender();
     }
     handleArminSaysHi() {
@@ -5635,16 +6006,6 @@ export class InteractiveMode {
         this.chatContainer.addChild(new EarendilAnnouncementComponent());
         this.ui.requestRender();
     }
-    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
@@ -5665,7 +6026,7 @@ export class InteractiveMode {
         if (eventResult?.result) {
             const result = eventResult.result;
             // Create UI component for display
-            this.bashComponent = new BashExecutionComponent(command, this.ui, excludeFromContext);
+            this.bashComponent = new BashExecutionComponent(command, this.ui, excludeFromContext, this.outputPad);
             if (this.session.isStreaming) {
                 this.pendingMessagesContainer.addChild(this.bashComponent);
                 this.pendingBashComponents.push(this.bashComponent);
@@ -5686,7 +6047,7 @@ export class InteractiveMode {
         }
         // Normal execution path (possibly with custom operations)
         const isDeferred = this.session.isStreaming;
-        this.bashComponent = new BashExecutionComponent(command, this.ui, excludeFromContext);
+        this.bashComponent = new BashExecutionComponent(command, this.ui, excludeFromContext, this.outputPad);
         if (isDeferred) {
             // Show in pending area when agent is streaming
             this.pendingMessagesContainer.addChild(this.bashComponent);
@@ -5727,6 +6088,7 @@ export class InteractiveMode {
         }
     }
     stop(fullscreenExitOutput = this.settingsManager.getFullscreenExitOutput()) {
+        this.disposeActiveSelector();
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
         }