apex-code 0.4.0 → 0.5.1

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

@@ -6,30 +6,35 @@ 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, getCapabilities, hyperlink, Markdown, matchesKey, ProcessTerminal, 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, getDebugLogPath, getDocsPath, getShareViewerUrl, VERSION, } from "../../config.js";
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
 import { CACHE_TTL_MS, collectCacheMisses, computeCacheWaste, detectCacheMiss, } from "../../core/cache-stats.js";
+import { formatCacheWarmingStatus, formatCacheWarmingUsage } from "../../core/cache-warmer.js";
+import { findExtensionStackMatches, recordCrash, takeUnnotifiedCrash } from "../../core/crash-log.js";
 import { DEFAULT_THINKING_LEVEL, THINKING_LEVEL_OPTIONS } from "../../core/defaults.js";
 import { getApexEnvironment } from "../../core/environment.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { authorizeConfiguredServer } from "../../core/mcp/oauth/authorize.js";
-import { createCompactionSummaryMessage } from "../../core/messages.js";
+import { createCompactionSummaryMessage, createCustomMessage } from "../../core/messages.js";
 import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScopeFromModels, } from "../../core/model-resolver.js";
 import { CredentialSynchronizationError } from "../../core/model-runtime.js";
 import { aggregateUsagePerformance } from "../../core/observability/aggregate.js";
 import { DefaultPackageManager } from "../../core/package-manager.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
-import { SessionManager, sessionEntryToContextMessages } from "../../core/session-manager.js";
+import { SessionManager, sessionEntryToContextMessages, } from "../../core/session-manager.js";
 import { formatShareUnavailableMessage, publishSessionShare } from "../../core/session-share.js";
+import { CHAT_DETAILS } from "../../core/settings-manager.js";
 import { slugifySkillCommandName } from "../../core/skills.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
+import { withBuiltInRenderers } from "../../core/tools/renderers/index.js";
 import { hasTrustRequiringProjectResources, ProjectTrustStore } from "../../core/trust-manager.js";
 import { getUsageCostBreakdown } from "../../core/usage-totals.js";
 import { getChangelogPath, getNewEntries, normalizeChangelogLinks, parseChangelog } from "../../utils/changelog.js";
@@ -42,24 +47,29 @@ import { killTrackedDetachedChildren } from "../../utils/shell.js";
 import { loadAllHighlightLanguages } from "../../utils/syntax-highlight.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { checkForNewApexCodeVersion } from "../../utils/version-check.js";
+import { reportBug } from "./bug-report.js";
+import { createChatViewport } from "./chat-viewport.js";
 import { ArminComponent } from "./components/armin.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
+import { describeWithSource } from "./components/autocomplete-source.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 { ComposerDock } from "./components/composer-dock.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 { EarendilAnnouncementComponent } from "./components/earendil-announcement.js";
+import { collapsedErrorLine, summarizeError } from "./components/error-summary.js";
 import { ExtensionEditorComponent } from "./components/extension-editor.js";
 import { ExtensionInputComponent } from "./components/extension-input.js";
 import { ExtensionSelectorComponent } from "./components/extension-selector.js";
 import { FirstUseHints } from "./components/first-use-hints.js";
 import { FooterComponent, formatTokens } from "./components/footer.js";
-import { formatKeyText, keyDisplayText, keyHint, keyText, rawKeyHint } from "./components/keybinding-hints.js";
+import { formatKeyText, hintRow, 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";
@@ -82,19 +92,28 @@ import { refreshModelCatalogs } from "./model-catalog-refresh.js";
 import { getModelSearchText } from "./model-search.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getThemeByName, onThemeChange, setRegisteredThemes, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
 import { InteractiveThemeController } from "./theme/theme-controller.js";
-const CHAT_DETAIL_ORDER = ["overview", "details", "all"];
+import { createInteractiveTui, createInteractiveTuiReference } from "./tui-renderer.js";
+export { createInteractiveTui, createInteractiveTuiReference } from "./tui-renderer.js";
+/** A session opens with everything collapsed; the expand key opens it rung by rung. */
+export const INITIAL_CHAT_DETAIL = "overview";
 /** The next rung, wrapping from `all` back to `overview`. */
 export function nextChatDetail(detail) {
-    return CHAT_DETAIL_ORDER[(CHAT_DETAIL_ORDER.indexOf(detail) + 1) % CHAT_DETAIL_ORDER.length] ?? "details";
+    return CHAT_DETAILS[(CHAT_DETAILS.indexOf(detail) + 1) % CHAT_DETAILS.length] ?? INITIAL_CHAT_DETAIL;
 }
 /** The single place the three rungs turn into rendering flags. */
 export function chatDetailView(detail) {
     return {
         toolOutputExpanded: detail === "all",
         editDiffsExpanded: detail !== "overview",
-        revealThinking: detail === "all",
+        thinking: detail === "overview" ? "collapsed" : detail === "details" ? "preference" : "revealed",
     };
 }
+function isWorkingStatusEditor(editor) {
+    return ("embedWorkingStatus" in editor &&
+        editor.embedWorkingStatus === true &&
+        "setWorkingStatusIndicator" in editor &&
+        typeof editor.setWorkingStatusIndicator === "function");
+}
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
@@ -116,12 +135,27 @@ class ExpandableText extends Text {
         this.setText(expanded ? this.getExpandedText() : this.getCollapsedText());
     }
 }
+/**
+ * An error line that joins the detail cycle: a multi-line error folds to its
+ * summary until the transcript is fully expanded. `outcome` trails both forms,
+ * so what happened to the request stays visible while the detail is folded.
+ */
+function errorText(message, expanded, paddingX, outcome = "") {
+    const summary = summarizeError(message);
+    const full = () => theme.fg("error", `${message}${outcome}`);
+    if (summary === undefined)
+        return new Text(full(), paddingX, 0);
+    return new ExpandableText(() => collapsedErrorLine(theme.fg("error", `${summary}${outcome}`)), full, expanded, paddingX, 0);
+}
 function isCustomSessionEntry(item) {
     return "type" in item && item.type === "custom";
 }
 function isCompactionCostNotice(item) {
     return "type" in item && item.type === "compaction_cost";
 }
+function isUsageSessionEntry(item) {
+    return "type" in item && item.type === "usage";
+}
 const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN"]);
 function isDeadTerminalError(error) {
     if (!error || typeof error !== "object" || !("code" in error)) {
@@ -130,6 +164,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.";
 function isAnthropicSubscriptionAuthKey(apiKey) {
     return typeof apiKey === "string" && apiKey.startsWith("sk-ant-oat");
@@ -202,61 +252,6 @@ function formatLoginProviderCompletionDescription(provider) {
     const authTypes = provider.authTypes.map(formatAuthSelectorProviderType).join("/");
     return provider.name === provider.id ? authTypes : `${provider.name} · ${authTypes}`;
 }
-/** Composition root for selecting the interactive terminal renderer. */
-export function createInteractiveTui(options) {
-    const terminal = options.terminal ?? new ProcessTerminal();
-    if (options.tuiMode === "fullscreen") {
-        const styleSearchMatch = (text) => theme.bg("searchMatchBg", theme.fg("searchMatchText", text));
-        return new TuiAltScreen(terminal, options.showHardwareCursor, options.logDirectory, {
-            searchMatchStyle: (text) => theme.underline(styleSearchMatch(text)),
-            searchCurrentMatchStyle: (text) => theme.bold(theme.inverse(styleSearchMatch(text))),
-            openUrl: openBrowser,
-            onRightClickPaste: options.onRightClickPaste,
-            copyOnSelect: options.fullscreenCopyOnSelect,
-            copySelection: async (text) => {
-                try {
-                    await copyToClipboard(text);
-                    return true;
-                }
-                catch {
-                    return false;
-                }
-            },
-        });
-    }
-    return new TuiMainScreen(terminal, options.showHardwareCursor, options.logDirectory);
-}
-/** Stable reference for components while InteractiveMode replaces the active renderer. */
-export function createInteractiveTuiReference(getTui) {
-    return new Proxy({}, {
-        get: (_target, property) => {
-            const tui = getTui();
-            const value = Reflect.get(tui, property, tui);
-            if (typeof value !== "function")
-                return value;
-            let methodTui = tui;
-            let method = value;
-            return (...args) => {
-                const currentTui = getTui();
-                if (currentTui !== methodTui) {
-                    const currentMethod = Reflect.get(currentTui, property, currentTui);
-                    if (typeof currentMethod !== "function") {
-                        throw new TypeError(`TUI property ${String(property)} is not callable`);
-                    }
-                    methodTui = currentTui;
-                    method = currentMethod;
-                }
-                return Reflect.apply(method, methodTui, args);
-            };
-        },
-        set: (_target, property, value) => {
-            const tui = getTui();
-            return Reflect.set(tui, property, value, tui);
-        },
-        has: (_target, property) => Reflect.has(getTui(), property),
-        getPrototypeOf: () => Reflect.getPrototypeOf(getTui()),
-    });
-}
 /**
  * Working status rides in the footer tray; everything else keeps its own rows.
  *
@@ -315,11 +310,12 @@ export class InteractiveMode {
     onInputCallback;
     pendingUserInputs = [];
     activeStatusIndicator = undefined;
+    activeWorkingIndicatorEmbedded = false;
     idleStatus = new IdleStatus();
     workingMessage = undefined;
     workingVisible = true;
     workingIndicatorOptions = undefined;
-    defaultWorkingMessage = "Working...";
+    defaultWorkingMessage = "Working";
     defaultHiddenThinkingLabel = "Thinking...";
     hiddenThinkingLabel = this.defaultHiddenThinkingLabel;
     lastSigintTime = 0;
@@ -333,13 +329,14 @@ export class InteractiveMode {
     managedToolStatusStarted = false;
     // Streaming message tracking
     streamingComponent = undefined;
+    entriesRenderedByBoundaryCompaction = new Set();
     streamingMessage = undefined;
     // Tool execution tracking: toolCallId -> component
     pendingTools = new Map();
     // Tool output expansion state
-    chatDetail = "details";
-    toolOutputExpanded = false;
-    editDiffsExpanded = true;
+    chatDetail = INITIAL_CHAT_DETAIL;
+    toolOutputExpanded = chatDetailView(INITIAL_CHAT_DETAIL).toolOutputExpanded;
+    editDiffsExpanded = chatDetailView(INITIAL_CHAT_DETAIL).editDiffsExpanded;
     // Thinking block visibility state
     hideThinkingBlock = false;
     outputPad = 1;
@@ -368,10 +365,19 @@ export class InteractiveMode {
     autoCompactionEscapeHandler;
     // Auto-retry state
     retryEscapeHandler;
+    /**
+     * The failed attempt an auto-retry would supersede. `component` is set while its error is
+     * still on screen, and a retry removes it from the chat.
+     */
+    retriedAttempt;
+    /** Set when the user presses Escape during a retry wait, which is the only way to cancel one. */
+    retryCancelled = false;
     // Messages queued while compaction is running
     compactionQueuedMessages = [];
     // Shutdown state
     shutdownRequested = false;
+    /** The `/bug` hint is shown at most once per session so error output stays readable. */
+    bugReportHintShown = false;
     // Extension UI state
     extensionSelector = undefined;
     extensionInput = undefined;
@@ -435,6 +441,7 @@ export class InteractiveMode {
             tuiMode,
             showHardwareCursor: this.settingsManager.getShowHardwareCursor(),
             logDirectory: getAgentDir(),
+            terminal: options.terminal,
             onRightClickPaste: this.onRightClickPaste,
             fullscreenCopyOnSelect: this.settingsManager.getFullscreenCopyOnSelect(),
         });
@@ -470,17 +477,20 @@ export class InteractiveMode {
             surfaceColor: (text) => theme.bg("userMessageBg", text),
             autocompleteRule: (width) => theme.fg("borderMuted", (this.settingsManager.getSymbolPreset() === "ascii" ? "-" : "┄").repeat(Math.max(1, width))),
             autocompleteFooter: () => this.buildAutocompleteFooter(),
+            // Upstream embeds the working status in this editor's top border. The Apex
+            // composer draws a filled surface with no top border and the footer tray
+            // carries that status, so the default editor leaves `embedWorkingStatus` off.
         });
         this.editor = this.defaultEditor;
-        this.editorContainer = new Container();
+        this.editorContainer = new ComposerDock(() => this.editor);
         this.editorContainer.addChild(this.editor);
         this.footerDataProvider = new FooterDataProvider(this.sessionManager.getCwd());
         this.footer = new FooterComponent(this.session, this.footerDataProvider, this.settingsManager);
         this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
         this.footerContainer = new Container();
         this.footerContainer.addChild(this.footer);
-        // Load hide thinking block setting
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+        this.loadChatDetail(this.settingsManager.getChatDetail());
         this.outputPad = this.settingsManager.getOutputPad();
         // Register themes from resource loader and initialize
         setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
@@ -491,32 +501,6 @@ export class InteractiveMode {
             initialThemeSetting: options.initialThemeSetting,
         });
     }
-    getAutocompleteSourceTag(sourceInfo) {
-        if (!sourceInfo) {
-            return undefined;
-        }
-        const scopePrefix = sourceInfo.scope === "user" ? "u" : sourceInfo.scope === "project" ? "p" : "t";
-        const source = sourceInfo.source.trim();
-        if (source === "auto" || source === "local" || source === "cli") {
-            return scopePrefix;
-        }
-        if (source.startsWith("npm:")) {
-            return `${scopePrefix}:${source}`;
-        }
-        const gitSource = parseGitUrl(source);
-        if (gitSource) {
-            const ref = gitSource.ref ? `@${gitSource.ref}` : "";
-            return `${scopePrefix}:git:${gitSource.host}/${gitSource.path}${ref}`;
-        }
-        return scopePrefix;
-    }
-    prefixAutocompleteDescription(description, sourceInfo) {
-        const sourceTag = this.getAutocompleteSourceTag(sourceInfo);
-        if (!sourceTag) {
-            return description;
-        }
-        return description ? `[${sourceTag}] ${description}` : `[${sourceTag}]`;
-    }
     getBuiltInCommandConflictDiagnostics(extensionRunner) {
         const builtinNames = new Set(BUILTIN_SLASH_COMMANDS.map((command) => command.name));
         return extensionRunner
@@ -595,7 +579,7 @@ export class InteractiveMode {
         // Convert prompt templates to SlashCommand format for autocomplete
         const templateCommands = this.session.promptTemplates.map((cmd) => ({
             name: cmd.name,
-            description: this.prefixAutocompleteDescription(cmd.description, cmd.sourceInfo),
+            description: describeWithSource(cmd.description, cmd.sourceInfo),
             ...(cmd.argumentHint && { argumentHint: cmd.argumentHint }),
         }));
         // Convert extension commands to SlashCommand format
@@ -605,7 +589,7 @@ export class InteractiveMode {
             .filter((cmd) => !builtinCommandNames.has(cmd.name))
             .map((cmd) => ({
             name: cmd.invocationName,
-            description: this.prefixAutocompleteDescription(cmd.description, cmd.sourceInfo),
+            description: describeWithSource(cmd.description, cmd.sourceInfo),
             getArgumentCompletions: cmd.getArgumentCompletions,
         }));
         // Build skill commands from session.skills (if enabled)
@@ -617,7 +601,7 @@ export class InteractiveMode {
                 this.skillCommands.set(commandName, skill.filePath);
                 skillCommandList.push({
                     name: commandName,
-                    description: this.prefixAutocompleteDescription(skill.description, skill.sourceInfo),
+                    description: describeWithSource(skill.description, skill.sourceInfo),
                 });
             }
         }
@@ -661,7 +645,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 Text(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));
@@ -760,25 +744,20 @@ export class InteractiveMode {
         }
         // Keep one component tree and remount it when changing renderers.
         this.renderWidgets(); // Initialize with default spacer
-        this.transcriptScrollView = new TuiLayouts.ScrollView(this.documentContainer, {
-            follow: "end",
-            primary: true,
-            overscroll: "chain",
+        const viewport = createChatViewport({
+            document: this.documentContainer,
+            pendingMessages: this.pendingMessagesContainer,
+            status: this.statusContainer,
+            widgetsAbove: this.widgetContainerAbove,
+            editor: this.editorContainer,
+            widgetsBelow: this.widgetContainerBelow,
+            footer: this.footerContainer,
             scrollbar: this.settingsManager.getFullscreenScrollbar(),
-            scrollbarStyle: (text) => theme.bg("scrollbarThumb", text),
+            scrollbarTrackStyle: (text) => theme.fg("scrollbarTrack", text),
+            scrollbarThumbStyle: (text) => theme.fg("scrollbarThumb", text),
         });
-        const dock = new TuiLayouts.VStack([
-            { component: this.pendingMessagesContainer, shrink: 1, minSize: 0 },
-            { component: this.statusContainer, shrink: 1, minSize: 0 },
-            { component: this.widgetContainerAbove, shrink: 1, minSize: 0 },
-            { component: this.editorContainer, shrink: 1, minSize: 3 },
-            { component: this.widgetContainerBelow, shrink: 1, minSize: 0 },
-            { component: this.footerContainer, shrink: 1, minSize: 1 },
-        ]);
-        this.fullscreenLayoutRoot = new TuiLayouts.VStack([
-            { component: this.transcriptScrollView, basis: 0, grow: 1, shrink: 1, minSize: 1 },
-            { component: dock, basis: "auto", grow: 0, shrink: 1, minSize: 1 },
-        ]);
+        this.transcriptScrollView = viewport.transcript;
+        this.fullscreenLayoutRoot = viewport.root;
         this.mountInteractiveTui(this.renderer, [
             this.documentContainer,
             this.pendingMessagesContainer,
@@ -806,25 +785,25 @@ export class InteractiveMode {
             // The full cheatsheet is verbose-only. The default screen leads with the
             // mark and the runtime facts that actually differ between launches.
             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"),
+                hint("app.interrupt", "interrupt"),
+                hint("app.clear", "clear"),
+                rawKeyHint(`${keyText("app.clear")} twice`, "exit"),
+                hint("app.exit", "exit (empty)"),
+                hint("app.suspend", "suspend"),
+                keyHint("tui.editor.deleteToLineEnd", "delete to end"),
+                hint("app.thinking.cycle", "cycle thinking level"),
+                rawKeyHint(`${keyText("app.model.cycleForward")}/${keyText("app.model.cycleBackward")}`, "cycle models"),
+                hint("app.model.select", "select model"),
+                hint("app.tools.expand", "expand tools"),
+                hint("app.thinking.toggle", "expand thinking"),
+                hint("app.editor.external", "external editor"),
+                rawKeyHint("/", "commands"),
+                rawKeyHint("!", "run bash"),
+                rawKeyHint("!!", "run bash (no context)"),
+                hint("app.message.followUp", "queue follow-up"),
+                hint("app.message.dequeue", "edit all queued messages"),
+                hint("app.clipboard.pasteImage", "paste image (with text fallback)"),
+                rawKeyHint("drop files", "attach"),
             ].join("\n");
             this.builtInHeader = new ApexSplashHeader(this.version, () => this.session.state.model?.id, () => this.session.sessionManager.getCwd(), this.options.verbose ? expandedInstructions : undefined, {
                 topPadding: true,
@@ -966,6 +945,11 @@ export class InteractiveMode {
         if (modelFallbackMessage) {
             this.showWarning(modelFallbackMessage);
         }
+        const crash = takeUnnotifiedCrash();
+        if (crash) {
+            const when = new Date(crash.timestamp).toLocaleString();
+            this.showWarning(`${APP_NAME} crashed on ${when} (${crash.message}). Run /bug to report it; the crash details are attached automatically.`);
+        }
         void this.maybeWarnAboutAnthropicSubscriptionAuth();
         // Process initial messages
         if (initialMessage) {
@@ -1553,13 +1537,12 @@ export class InteractiveMode {
      */
     /** Live keybindings under the autocomplete dropdown. */
     buildAutocompleteFooter() {
-        const separator = theme.fg("borderMuted", this.settingsManager.getSymbolPreset() === "ascii" ? " - " : " · ");
-        return [
-            rawKeyHint(`${keyText("tui.select.up")}/${keyText("tui.select.down")}`, "move"),
-            keyHint("tui.select.confirm", "select"),
-            keyHint("tui.input.tab", "complete"),
-            keyHint("tui.select.cancel", "dismiss"),
-        ].join(separator);
+        return hintRow([
+            [["tui.select.up", "tui.select.down"], "move"],
+            ["tui.select.confirm", "select"],
+            ["tui.input.tab", "complete"],
+            ["tui.select.cancel", "dismiss"],
+        ], { ascii: this.settingsManager.getSymbolPreset() === "ascii" });
     }
     buildStartupShortcuts() {
         const entry = (sigil, label) => `${theme.fg("accent", sigil)} ${theme.fg("muted", label)}`;
@@ -1727,10 +1710,57 @@ 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 Text(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));
+        }
         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 {
+            return (recordCrash({
+                kind,
+                error,
+                sessionFile: this.session.sessionFile,
+                cwd: this.session.sessionManager.getCwd(),
+            }) !== undefined);
+        }
+        catch {
+            return false;
+        }
+    }
+    crashReportInstructions() {
+        const resume = this.session.sessionFile ? `run \`${APP_NAME} -r\` to resume the session, then` : "start pi and";
+        return `To report this crash: ${resume} run /bug. The crash details are attached automatically.`;
+    }
+    suggestBugReport() {
+        if (this.bugReportHintShown)
+            return;
+        this.bugReportHintShown = true;
+        this.chatContainer.addChild(new Text(theme.fg("muted", `If this looks like a ${APP_NAME} bug, /bug exports a report locally without uploading it.`), this.outputPad, 0));
+        this.ui.requestRender();
+    }
+    maybeSuggestBugReport(message) {
+        if (message.stopReason !== "error" || isRetryableAssistantError(message))
+            return;
+        if (/\b(?:abort(?:ed)?|cancel(?:l?ed)?)\b/i.test(message.errorMessage ?? ""))
+            return;
+        this.suggestBugReport();
+    }
     renderCurrentSessionState() {
         this.loadedResourcesContainer.clear();
         this.chatContainer.clear();
@@ -1758,8 +1788,12 @@ export class InteractiveMode {
     /**
      * Get a registered tool definition by name (for custom rendering).
      */
+    /**
+     * Extension-registered definition, falling back to the built-in one. The renderer components take
+     * whatever this returns, so they never reach into the tool registry themselves.
+     */
     getRegisteredToolDefinition(toolName) {
-        return this.session.getToolDefinition(toolName);
+        return withBuiltInRenderers(toolName, this.session.getToolDefinition(toolName));
     }
     getMarkdownTransformers() {
         return [this.mermaidMarkdownTransformer, ...this.session.extensionRunner.getMarkdownTransformers()];
@@ -1829,38 +1863,58 @@ export class InteractiveMode {
         this.footerDataProvider.setExtensionStatus(key, text);
         this.ui.requestRender();
     }
+    setEditorWorkingStatusIndicator(indicator) {
+        this.defaultEditor.setWorkingStatusIndicator(undefined);
+        if (!isWorkingStatusEditor(this.editor))
+            return false;
+        this.editor.setWorkingStatusIndicator(indicator);
+        return true;
+    }
     showStatusIndicator(indicator) {
         this.activeStatusIndicator?.dispose();
         this.activeStatusIndicator = indicator;
+        this.activeWorkingIndicatorEmbedded = false;
         this.statusContainer.clear();
+        this.setEditorWorkingStatusIndicator(undefined);
         if (trayOwnsActivity(indicator.kind, this.customFooter !== undefined)) {
             this.footer.setActivity(indicator);
             return;
         }
         this.footer.setActivity(undefined);
+        // With a custom footer there is no tray; an editor that opts in to
+        // `embedWorkingStatus` then carries the working status in its border.
+        if (indicator instanceof WorkingStatusIndicator && this.setEditorWorkingStatusIndicator(indicator)) {
+            this.activeWorkingIndicatorEmbedded = true;
+            return;
+        }
         this.statusContainer.addChild(indicator);
     }
     clearStatusIndicator(kind) {
         if (kind && this.activeStatusIndicator?.kind !== kind) {
             return;
         }
-        const hadActiveStatusIndicator = this.activeStatusIndicator !== undefined;
-        const wasInTray = this.activeStatusIndicator !== undefined &&
-            trayOwnsActivity(this.activeStatusIndicator.kind, this.customFooter !== undefined);
-        this.activeStatusIndicator?.dispose();
+        const clearedIndicator = this.activeStatusIndicator;
+        const wasInTray = clearedIndicator !== undefined && trayOwnsActivity(clearedIndicator.kind, this.customFooter !== undefined);
+        const clearedIndicatorWasEmbedded = clearedIndicator?.kind === "working" && this.activeWorkingIndicatorEmbedded;
+        clearedIndicator?.dispose();
         this.activeStatusIndicator = undefined;
+        this.activeWorkingIndicatorEmbedded = false;
         this.footer?.setActivity(undefined);
         this.statusContainer.clear();
-        // The tray never occupied those rows, so it must not leave the idle filler
-        // behind to reserve them.
-        if (wasInTray)
+        this.setEditorWorkingStatusIndicator(undefined);
+        // Neither the tray nor the editor border occupied those rows, so they must
+        // not leave the idle filler behind to reserve them.
+        if (wasInTray || clearedIndicatorWasEmbedded)
             return;
-        if (hadActiveStatusIndicator && this.options.tuiMode === "regular" && this.ui.getClearOnShrink()) {
+        if (clearedIndicator && this.options.tuiMode === "regular" && this.ui.getClearOnShrink()) {
             this.statusContainer.addChild(this.idleStatus);
         }
     }
     showWorkingStatusIndicator() {
-        this.showStatusIndicator(new WorkingStatusIndicator(this.ui, this.workingMessage ?? this.defaultWorkingMessage, this.workingIndicatorOptions));
+        const colorFn = !trayOwnsActivity("working", this.customFooter !== undefined) && isWorkingStatusEditor(this.editor)
+            ? (text) => (this.editor.borderColor ?? theme.getThinkingBorderColor(this.session.thinkingLevel || "off"))(text)
+            : undefined;
+        this.showStatusIndicator(new WorkingStatusIndicator(this.ui, this.workingMessage ?? this.defaultWorkingMessage, this.workingIndicatorOptions, colorFn));
     }
     setWorkingVisible(visible) {
         this.workingVisible = visible;
@@ -2386,6 +2440,15 @@ export class InteractiveMode {
             this.editor = this.defaultEditor;
         }
         this.editorContainer.addChild(this.editor);
+        // A tray-owned working status stays in the footer whichever editor is mounted.
+        if (this.activeStatusIndicator instanceof WorkingStatusIndicator &&
+            !trayOwnsActivity("working", this.customFooter !== undefined)) {
+            this.statusContainer.clear();
+            this.activeWorkingIndicatorEmbedded = this.setEditorWorkingStatusIndicator(this.activeStatusIndicator);
+            if (!this.activeWorkingIndicatorEmbedded) {
+                this.statusContainer.addChild(this.activeStatusIndicator);
+            }
+        }
         this.ui.setFocus(this.editor);
         this.ui.requestRender();
     }
@@ -2664,6 +2727,12 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
+            if (text === "/bug" || text.startsWith("/bug ")) {
+                const hint = text.slice("/bug".length).trim();
+                this.editor.setText("");
+                await this.handleBugCommand(hint ? hint : undefined);
+                return;
+            }
             if (text === "/copy") {
                 await this.handleCopyCommand();
                 this.editor.setText("");
@@ -2870,10 +2939,44 @@ 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();
                 }
+                else if (event.entry.type === "usage" && event.entry.kind === "cache_warm") {
+                    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();
@@ -2895,7 +2998,9 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "assistant") {
+                    this.retriedAttempt = undefined;
                     this.streamingComponent = new AssistantMessageComponent(undefined, this.isThinkingHidden(), this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
+                    this.adoptChatDetail(this.streamingComponent);
                     this.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
                     this.streamingComponent.updateContent(this.streamingMessage, true);
@@ -2949,6 +3054,9 @@ export class InteractiveMode {
                         if (!errorMessage) {
                             errorMessage = this.streamingMessage.errorMessage || "Error";
                         }
+                        if (this.streamingMessage.stopReason === "error" && this.pendingTools.size === 0) {
+                            this.retriedAttempt = { error: errorMessage, component: this.streamingComponent };
+                        }
                         for (const [, component] of this.pendingTools.entries()) {
                             component.updateResult({
                                 content: [{ type: "text", text: errorMessage }],
@@ -2956,12 +3064,14 @@ export class InteractiveMode {
                             });
                         }
                         this.clearPendingTools();
+                        this.maybeSuggestBugReport(this.streamingMessage);
                     }
                     else {
                         // Args are now complete - trigger diff computation for edit tools
                         for (const [, component] of this.pendingTools.entries()) {
                             component.setArgsComplete();
                         }
+                        this.maybeShowThinkingDropNotice(this.streamingMessage);
                         this.maybeShowCacheMissNotice(this.streamingMessage);
                     }
                     this.streamingComponent = undefined;
@@ -3076,7 +3186,7 @@ export class InteractiveMode {
                     }
                     else {
                         this.chatContainer.addChild(new Spacer(1));
-                        this.chatContainer.addChild(new Text(theme.fg("error", event.errorMessage), 1, 0));
+                        this.chatContainer.addChild(errorText(event.errorMessage, this.toolOutputExpanded, 1));
                     }
                 }
                 void this.flushCompactionQueue({ willRetry: event.willRetry });
@@ -3084,9 +3194,16 @@ export class InteractiveMode {
                 break;
             }
             case "auto_retry_start": {
+                // The session drops the failed attempt from agent state; the chat drops it too, and
+                // the retry indicator carries the attempt count instead.
+                if (this.retriedAttempt?.component) {
+                    this.chatContainer.removeChild(this.retriedAttempt.component);
+                    this.retriedAttempt = { error: this.retriedAttempt.error };
+                }
                 // Set up escape to abort retry
                 this.retryEscapeHandler = this.defaultEditor.onEscape;
                 this.defaultEditor.onEscape = () => {
+                    this.retryCancelled = true;
                     this.session.abortRetry();
                 };
                 this.showStatusIndicator(new RetryStatusIndicator(this.ui, event.attempt, event.maxAttempts, event.delayMs));
@@ -3102,8 +3219,16 @@ export class InteractiveMode {
                 this.clearStatusIndicator("retry");
                 // Show error only on final failure (success shows normal response)
                 if (!event.success) {
-                    this.showError(`Retry failed after ${event.attempt} attempts: ${event.finalError || "Unknown error"}`);
+                    const lastAttempt = this.retriedAttempt;
+                    if (lastAttempt?.component)
+                        this.chatContainer.removeChild(lastAttempt.component);
+                    const outcome = this.retryCancelled
+                        ? "retry cancelled"
+                        : `gave up after ${event.attempt} ${event.attempt === 1 ? "retry" : "retries"}`;
+                    this.showError(lastAttempt?.error ?? event.finalError ?? "Unknown error", ` (${outcome})`);
                 }
+                this.retriedAttempt = undefined;
+                this.retryCancelled = false;
                 this.ui.requestRender();
                 break;
             }
@@ -3229,6 +3354,8 @@ export class InteractiveMode {
                 this.chatContainer.addChild(component);
                 break;
             }
+            case "system":
+                break;
             case "user": {
                 const textContent = this.getUserMessageText(message);
                 if (textContent) {
@@ -3260,6 +3387,7 @@ export class InteractiveMode {
             }
             case "assistant": {
                 const assistantComponent = new AssistantMessageComponent(message, this.isThinkingHidden(), this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
+                this.adoptChatDetail(assistantComponent);
                 this.chatContainer.addChild(assistantComponent);
                 break;
             }
@@ -3275,8 +3403,8 @@ export class InteractiveMode {
     renderSessionItems(items, options = {}) {
         this.clearPendingTools();
         const renderedPendingTools = new Map();
-        // Cache-miss notices are not persisted; re-derive them from the full entry
-        // list and re-inject them after the assistant messages that paid for them.
+        // Cache misses are not persisted, unlike successful cache-warming usage.
+        // Re-derive them and inject them after the assistant messages that paid for them.
         const cacheMisses = this.settingsManager.getShowCacheMissNotices()
             ? collectCacheMisses(this.sessionManager.getEntries(), this.session.modelRuntime)
             : new Map();
@@ -3289,6 +3417,10 @@ export class InteractiveMode {
                 this.addCustomEntryToChat(item);
                 continue;
             }
+            if (isUsageSessionEntry(item)) {
+                this.addCacheWarmingUsage(item);
+                continue;
+            }
             if (isCompactionCostNotice(item)) {
                 this.addCompactionCostNotice(item);
                 continue;
@@ -3357,7 +3489,7 @@ export class InteractiveMode {
      */
     renderSessionEntries(entries, options = {}) {
         const items = entries.flatMap((entry) => {
-            if (entry.type === "custom") {
+            if (entry.type === "custom" || (entry.type === "usage" && entry.kind === "cache_warm")) {
                 return [entry];
             }
             const messages = sessionEntryToContextMessages(entry);
@@ -3368,6 +3500,12 @@ export class InteractiveMode {
         });
         this.renderSessionItems(items, options);
     }
+    addCacheWarmingUsage(entry) {
+        if (!this.settingsManager.getShowCacheMissNotices())
+            return;
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new Text(theme.fg("dim", formatCacheWarmingUsage(entry)), 1, 0));
+    }
     /**
      * Render billing usage for a compaction or branch summary. The notice is derived
      * from persisted summary usage and is not stored as a separate session entry.
@@ -3382,6 +3520,43 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("warning", `${label}: ${formatTokens(tokens)} tokens billed${cost}`), 1, 0));
     }
+    static countDroppedThinkingBlocks(message) {
+        let count = 0;
+        for (const diagnostic of message.diagnostics ?? []) {
+            if (diagnostic.type !== "anthropic_input_transformations")
+                continue;
+            const transformations = diagnostic.details?.transformations;
+            if (!Array.isArray(transformations))
+                continue;
+            count += transformations.filter((transformation) => typeof transformation === "object" &&
+                transformation !== null &&
+                transformation.type === "thinking_dropped").length;
+        }
+        return count;
+    }
+    maybeShowThinkingDropNotice(message) {
+        if (!this.settingsManager.getShowCacheMissNotices())
+            return;
+        const droppedCount = InteractiveMode.countDroppedThinkingBlocks(message);
+        if (droppedCount === 0)
+            return;
+        let previousDroppedCount = 0;
+        // message_end reaches the UI before the current message is persisted,
+        // so the branch's last assistant message is the previous response.
+        const branch = this.sessionManager.getBranch();
+        for (let i = branch.length - 1; i >= 0; i--) {
+            const entry = branch[i];
+            if (entry.type === "message" && entry.message.role === "assistant") {
+                previousDroppedCount = InteractiveMode.countDroppedThinkingBlocks(entry.message);
+                break;
+            }
+        }
+        if (droppedCount <= previousDroppedCount)
+            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));
+    }
     /**
      * Show a transcript notice when a completed assistant message paid for a
      * significant cache miss. Only states observable facts: the miss itself,
@@ -3548,6 +3723,12 @@ export class InteractiveMode {
         catch { }
         console.error("apex-code 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()}`);
+        }
         process.exit(1);
     }
     /**
@@ -3683,6 +3864,7 @@ export class InteractiveMode {
             const level = this.session.thinkingLevel || "off";
             this.editor.borderColor = theme.getThinkingBorderColor(level);
         }
+        this.activeStatusIndicator?.invalidate();
         this.ui.requestRender();
     }
     cycleThinkingLevel() {
@@ -3728,27 +3910,40 @@ export class InteractiveMode {
         if (hasEditDiffsExpansion(component))
             component.setEditDiffsExpanded(this.editDiffsExpanded);
     }
+    /** The expand key. A level the user picks is saved, so the next session opens at it. */
     cycleChatDetail() {
-        this.setChatDetail(nextChatDetail(this.chatDetail));
+        this.chooseChatDetail(nextChatDetail(this.chatDetail));
+    }
+    chooseChatDetail(detail) {
+        this.settingsManager.setChatDetail(detail);
+        this.setChatDetail(detail);
+    }
+    /** Adopt a saved level before the transcript renders; unset opens collapsed. */
+    loadChatDetail(saved) {
+        this.assignChatDetail(saved ?? INITIAL_CHAT_DETAIL);
+    }
+    assignChatDetail(detail) {
+        const view = chatDetailView(detail);
+        this.chatDetail = detail;
+        this.toolOutputExpanded = view.toolOutputExpanded;
+        this.editDiffsExpanded = view.editDiffsExpanded;
     }
     /**
-     * Presentation only. This never rewrites messages, settings, or the session
-     * transcript, which is why it may override the persisted thinking preference
-     * at `all` without saving that override.
+     * Presentation only. This never rewrites messages or the session transcript,
+     * and never the hide-thinking preference, which `all` overrides unsaved.
+     * Saving the level itself is `chooseChatDetail`'s job, for user choices only.
      */
     setChatDetail(detail) {
         if (detail === this.chatDetail)
             return;
-        this.chatDetail = detail;
-        const view = chatDetailView(detail);
-        this.toolOutputExpanded = view.toolOutputExpanded;
-        this.editDiffsExpanded = view.editDiffsExpanded;
+        this.assignChatDetail(detail);
         this.applyChatDetail();
         this.showStatus(`Conversation detail: ${detail}`);
     }
     /** True when thinking blocks are hidden right now, setting and detail level combined. */
     isThinkingHidden() {
-        return this.hideThinkingBlock && !chatDetailView(this.chatDetail).revealThinking;
+        const { thinking } = chatDetailView(this.chatDetail);
+        return thinking === "preference" ? this.hideThinkingBlock : thinking === "collapsed";
     }
     applyChatDetail() {
         const activeHeader = this.customHeader ?? this.builtInHeader;
@@ -3775,7 +3970,8 @@ export class InteractiveMode {
      *
      * Collapsing maps to `details` rather than `overview`, because an extension
      * asking to collapse tool output has not asked to hide edit diffs, and
-     * `details` is the level where only tool output is collapsed.
+     * `details` is the level where only tool output is collapsed. Not saved: an
+     * extension's request should not decide how the next session opens.
      */
     setToolsExpanded(expanded) {
         this.setChatDetail(expanded ? "all" : "details");
@@ -3791,8 +3987,16 @@ export class InteractiveMode {
     }
     toggleThinkingBlockVisibility() {
         this.offerFirstUseHint("thinking");
-        this.hideThinkingBlock = !this.hideThinkingBlock;
-        this.settingsManager.setHideThinkingBlock(this.hideThinkingBlock);
+        if (this.chatDetail === "overview") {
+            // Overview hides thinking regardless of the preference. Treat the toggle as a request to show it.
+            this.hideThinkingBlock = false;
+            this.settingsManager.setHideThinkingBlock(false);
+            this.chooseChatDetail("details");
+        }
+        else {
+            this.hideThinkingBlock = !this.hideThinkingBlock;
+            this.settingsManager.setHideThinkingBlock(this.hideThinkingBlock);
+        }
         this.updateThinkingBlockVisibility();
         this.showStatus(`Thinking blocks: ${this.hideThinkingBlock ? "hidden" : "visible"}`);
     }
@@ -3821,9 +4025,9 @@ export class InteractiveMode {
         this.editor.setText("");
         this.ui.requestRender();
     }
-    showError(errorMessage) {
+    showError(errorMessage, outcome) {
         this.chatContainer.addChild(new Spacer(1));
-        this.chatContainer.addChild(new Text(theme.fg("error", `Error: ${errorMessage}`), this.outputPad, 0));
+        this.chatContainer.addChild(errorText(`Error: ${errorMessage}`, this.toolOutputExpanded, this.outputPad, outcome));
         this.ui.requestRender();
     }
     showWarning(warningMessage) {
@@ -3922,7 +4126,7 @@ export class InteractiveMode {
         if (allQueued.length === 0) {
             this.updatePendingMessagesDisplay();
             if (options?.abort) {
-                this.agent.abort();
+                void this.session.abort();
             }
             return 0;
         }
@@ -3932,7 +4136,7 @@ export class InteractiveMode {
         this.editor.setText(combinedText);
         this.updatePendingMessagesDisplay();
         if (options?.abort) {
-            this.agent.abort();
+            void this.session.abort();
         }
         return allQueued.length;
     }
@@ -4132,6 +4336,7 @@ export class InteractiveMode {
                 followUpMode: this.session.followUpMode,
                 transport: this.settingsManager.getTransport(),
                 httpIdleTimeoutMs: this.settingsManager.getHttpIdleTimeoutMs(),
+                cacheWarmingMode: this.settingsManager.getCacheWarmingMode(),
                 thinkingLevel: this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL,
                 availableThinkingLevels: [...THINKING_LEVEL_OPTIONS],
                 modelThinkingLevels: this.settingsManager.getAllModelThinkingLevels(),
@@ -4150,6 +4355,7 @@ export class InteractiveMode {
                 permissionMode,
                 editorPaddingX: this.settingsManager.getEditorPaddingX(),
                 outputPad: this.settingsManager.getOutputPad(),
+                chatDetail: this.chatDetail,
                 autocompleteMaxVisible: this.settingsManager.getAutocompleteMaxVisible(),
                 quietStartup: this.settingsManager.getQuietStartup(),
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
@@ -4205,6 +4411,10 @@ export class InteractiveMode {
                     configureHttpDispatcher(timeoutMs);
                     this.showStatus(`HTTP idle timeout: ${formatHttpIdleTimeoutMs(timeoutMs)}`);
                 },
+                onCacheWarmingModeChange: (mode) => {
+                    this.session.setCacheWarmingMode(mode);
+                    this.showStatus(`Cache warming: ${mode}`);
+                },
                 onModelThinkingLevelChange: (provider, modelId, level) => {
                     this.settingsManager.setModelThinkingLevel(provider, modelId, level);
                     // If the override is for the current model, apply it to the session too
@@ -4231,6 +4441,7 @@ export class InteractiveMode {
                     void this.themeController.setThemeSetting(themeSetting);
                 },
                 onThemePreview: (themeName) => this.themeController.preview(themeName),
+                onChatDetailChange: (detail) => this.chooseChatDetail(detail),
                 onHideThinkingBlockChange: (hidden) => {
                     this.hideThinkingBlock = hidden;
                     this.settingsManager.setHideThinkingBlock(hidden);
@@ -4766,6 +4977,11 @@ export class InteractiveMode {
                     this.restoreQueuedMessagesToEditor();
                     await this.session.abort();
                 }
+                // Recheck after the dialogs and streaming abort, before replacing another operation's UI.
+                if (this.session.isCompacting) {
+                    this.showError("Wait for the current compaction or tree navigation to finish before navigating the session tree.");
+                    return;
+                }
                 // Set up escape handler and status indicator if summarizing
                 let showingSummaryIndicator = false;
                 const originalOnEscape = this.defaultEditor.onEscape;
@@ -4836,9 +5052,9 @@ export class InteractiveMode {
     }
     showSessionSelector() {
         this.showSelector((done) => {
-            const selector = new SessionSelectorComponent((onProgress) => SessionManager.list(this.sessionManager.getCwd(), this.sessionManager.getSessionDir(), onProgress), (onProgress) => this.sessionManager.usesDefaultSessionDir()
-                ? SessionManager.listAll(onProgress)
-                : SessionManager.listAll(this.sessionManager.getSessionDir(), onProgress), async (sessionPath) => {
+            const selector = new SessionSelectorComponent((onProgress, signal) => SessionManager.list(this.sessionManager.getCwd(), this.sessionManager.getSessionDir(), onProgress, signal), (onProgress, signal) => this.sessionManager.usesDefaultSessionDir()
+                ? SessionManager.listAll(onProgress, signal)
+                : SessionManager.listAll(this.sessionManager.getSessionDir(), onProgress, signal), async (sessionPath) => {
                 done();
                 await this.handleResumeSession(sessionPath);
             }, () => {
@@ -5122,67 +5338,89 @@ export class InteractiveMode {
     }
     async completeProviderAuthentication(providerId, providerName, authType, previousModel) {
         const actionLabel = authType === "oauth" ? `Logged in to ${providerName}` : `Saved API key for ${providerName}`;
-        let selectedModel;
-        let selectionError;
-        if (isUnknownModel(previousModel)) {
-            const availableModels = this.session.modelRuntime.getAvailableSnapshot();
-            const providerModels = availableModels.filter((model) => model.provider === providerId);
-            // Matches LLAMA_PROVIDER_ID from extensions/llama/provider.ts; kept inline to avoid coupling interactive mode to the built-in extension.
-            if (providerId === "llama.cpp") {
-                selectionError = llamaCppPostLoginGuidance(actionLabel, providerModels.length);
-            }
-            else if (!hasDefaultModelProvider(providerId)) {
-                selectionError = `${actionLabel}, but no default model is configured for provider "${providerId}". Use /model to select a model.`;
-            }
-            else if (providerModels.length === 0) {
-                selectionError = `${actionLabel}, but no models are available for that provider. Use /model to select a model.`;
-            }
-            else {
-                const defaultModelId = defaultModelPerProvider[providerId];
-                selectedModel = providerModels.find((model) => model.id === defaultModelId);
-                if (!selectedModel) {
-                    selectionError = `${actionLabel}, but its default model "${defaultModelId}" is not available. Use /model to select a model.`;
+        const session = this.session;
+        // Dynamic catalogs may be empty until the first authenticated network refresh.
+        const deferSelection = isUnknownModel(previousModel) &&
+            hasDefaultModelProvider(providerId) &&
+            !session.modelRuntime
+                .getAvailableSnapshot()
+                .some((model) => model.provider === providerId && model.id === defaultModelPerProvider[providerId]);
+        const finishAuthentication = async () => {
+            let selectedModel;
+            let selectionError;
+            if (isUnknownModel(previousModel)) {
+                const availableModels = this.session.modelRuntime.getAvailableSnapshot();
+                const providerModels = availableModels.filter((model) => model.provider === providerId);
+                // Matches LLAMA_PROVIDER_ID from extensions/llama/provider.ts; kept inline to avoid coupling interactive mode to the built-in extension.
+                if (providerId === "llama.cpp") {
+                    selectionError = llamaCppPostLoginGuidance(actionLabel, providerModels.length);
+                }
+                else if (!hasDefaultModelProvider(providerId)) {
+                    selectionError = `${actionLabel}, but no default model is configured for provider "${providerId}". Use /model to select a model.`;
+                }
+                else if (providerModels.length === 0) {
+                    selectionError = `${actionLabel}, but no models are available for that provider. Use /model to select a model.`;
                 }
                 else {
-                    try {
-                        await this.session.setModel(selectedModel, { persist: true });
+                    const defaultModelId = defaultModelPerProvider[providerId];
+                    // Radius catalogs vary by account; prefer balanced, then use catalog order.
+                    selectedModel =
+                        providerModels.find((model) => model.id === defaultModelId) ??
+                            (providerId === "radius" ? providerModels[0] : undefined);
+                    if (!selectedModel) {
+                        selectionError = `${actionLabel}, but its default model "${defaultModelId}" is not available. Use /model to select a model.`;
                     }
-                    catch (error) {
-                        selectedModel = undefined;
-                        const errorMessage = error instanceof Error ? error.message : String(error);
-                        selectionError = `${actionLabel}, but selecting its default model failed: ${errorMessage}. Use /model to select a model.`;
+                    else {
+                        try {
+                            await this.session.setModel(selectedModel, { persist: true });
+                        }
+                        catch (error) {
+                            selectedModel = undefined;
+                            const errorMessage = error instanceof Error ? error.message : String(error);
+                            selectionError = `${actionLabel}, but selecting its default model failed: ${errorMessage}. Use /model to select a model.`;
+                        }
                     }
                 }
             }
-        }
-        await this.updateAvailableProviderCount();
-        this.footer.invalidate();
-        this.updateEditorBorderColor();
-        if (selectedModel) {
-            this.showStatus(`${actionLabel}. Selected ${selectedModel.id}. Credentials saved to ${getAuthPath()}`);
-            void this.maybeWarnAboutAnthropicSubscriptionAuth(selectedModel);
-            this.checkDaxnutsEasterEgg(selectedModel);
-        }
-        else {
-            this.showStatus(`${actionLabel}. Credentials saved to ${getAuthPath()}`);
-            if (selectionError) {
-                this.showError(selectionError);
+            await this.updateAvailableProviderCount();
+            this.footer.invalidate();
+            this.updateEditorBorderColor();
+            if (selectedModel) {
+                this.showStatus(`${actionLabel}. Selected ${selectedModel.id}. Credentials saved to ${getAuthPath()}`);
+                void this.maybeWarnAboutAnthropicSubscriptionAuth(selectedModel);
+                this.checkDaxnutsEasterEgg(selectedModel);
             }
             else {
-                void this.maybeWarnAboutAnthropicSubscriptionAuth();
+                this.showStatus(`${actionLabel}. Credentials saved to ${getAuthPath()}`);
+                if (selectionError) {
+                    this.showError(selectionError);
+                }
+                else {
+                    void this.maybeWarnAboutAnthropicSubscriptionAuth();
+                }
             }
+        };
+        if (deferSelection) {
+            this.showStatus(`${actionLabel}. Credentials saved to ${getAuthPath()}. Refreshing model catalog…`);
+        }
+        else {
+            await finishAuthentication();
         }
         const controller = new AbortController();
         const timeout = setTimeout(() => controller.abort(), 15_000);
-        void this.session.modelRuntime
+        void session.modelRuntime
             .refresh({ providers: [providerId], signal: controller.signal })
-            .then((result) => {
+            .then(async (result) => {
             if (result.aborted) {
                 this.showWarning(`${actionLabel}, but its model catalog refresh timed out; using cached models.`);
             }
             else if (result.errors.size > 0) {
                 this.showWarning(`${actionLabel}, but its model catalog could not be refreshed; using cached models.`);
             }
+            // Do not replace a model or session selected while the refresh was running.
+            if (deferSelection && this.session === session && session.model === previousModel) {
+                await finishAuthentication();
+            }
             this.updateAvailableProviderCount();
             this.footer.invalidate();
             this.ui.requestRender();
@@ -5364,12 +5602,11 @@ export class InteractiveMode {
         }
         this.resetExtensionUI();
         const reloadBox = new Container();
-        const borderColor = (s) => theme.fg("border", s);
-        reloadBox.addChild(new DynamicBorder(borderColor));
+        reloadBox.addChild(new DynamicBorder());
         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 Text(theme.fg("muted", "Reloading keybindings, extensions, skills, prompts, themes, and context files..."), 0, 0));
         reloadBox.addChild(new Spacer(1));
-        reloadBox.addChild(new DynamicBorder(borderColor));
+        reloadBox.addChild(new DynamicBorder());
         const previousEditor = this.editor;
         this.editorContainer.clear();
         this.editorContainer.addChild(reloadBox);
@@ -5389,6 +5626,7 @@ export class InteractiveMode {
                 return;
             }
             this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
+            this.loadChatDetail(this.settingsManager.getChatDetail());
             this.outputPad = this.settingsManager.getOutputPad();
             this.rebuildChatFromMessages();
             chatRestoredBeforeSessionStart = true;
@@ -5586,6 +5824,17 @@ export class InteractiveMode {
             }
         }
     }
+    async handleBugCommand(hint) {
+        await reportBug({
+            session: this.session,
+            ui: this.ui,
+            editorContainer: this.editorContainer,
+            editor: this.editor,
+            keybindings: this.keybindings,
+            showStatus: (message) => this.showStatus(message),
+            showError: (message) => this.showError(message),
+        }, hint);
+    }
     async handleCopyCommand(options = {}) {
         if (options.preferSelection &&
             this.ui instanceof TuiAltScreen &&
@@ -5671,6 +5920,15 @@ export class InteractiveMode {
         }
         info += `${theme.fg("dim", "Output:")} ${stats.tokens.output.toLocaleString()}\n`;
         info += `${theme.fg("dim", "Total:")} ${stats.tokens.total.toLocaleString()}\n`;
+        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:")} $${stats.cost.toFixed(3)}`;
@@ -5723,7 +5981,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 Text(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());
@@ -5821,7 +6079,7 @@ export class InteractiveMode {
 | \`${expandTools}\` | Cycle conversation detail (overview / details / all) |
 | \`${toggleThinking}\` | Toggle thinking block visibility |
 | \`${externalEditor}\` | Edit message in external editor |
-| \`${copyMessage}\` | Copy last assistant message |
+| \`${copyMessage}\` | Copy selection or last assistant message |
 | \`${followUp}\` | Queue follow-up message |
 | \`${dequeue}\` | Restore queued messages |
 | \`${pasteImage}\` | Paste image or text from clipboard |
@@ -5952,12 +6210,19 @@ export class InteractiveMode {
     async runBashCommand(command, excludeFromContext = false) {
         const extensionRunner = this.session.extensionRunner;
         // Emit user_bash event to let extensions intercept
-        const eventResult = await extensionRunner.emitUserBash({
-            type: "user_bash",
-            command,
-            excludeFromContext,
-            cwd: this.sessionManager.getCwd(),
-        });
+        let eventResult;
+        try {
+            eventResult = await extensionRunner.emitUserBash({
+                type: "user_bash",
+                command,
+                excludeFromContext,
+                cwd: this.sessionManager.getCwd(),
+            });
+        }
+        catch {
+            // The extension runner already reported the error. Do not fall back to local execution.
+            return;
+        }
         // If extension returned a full result, use it directly
         if (eventResult?.result) {
             const result = eventResult.result;