apex-code 0.0.1-alpha.1 → 0.0.1-alpha.11

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

@@ -14,17 +14,22 @@ import { APP_NAME, APP_TITLE, CONFIG_DIR_NAME, getAgentDir, getAuthPath, getDebu
 import { parseSkillBlock } from "../../core/agent-session.js";
 import { SessionImportFileNotFoundError } from "../../core/agent-session-runtime.js";
 import { CACHE_TTL_MS, collectCacheMisses, computeCacheWaste, detectCacheMiss, } from "../../core/cache-stats.js";
+import { DEFAULT_THINKING_LEVEL, THINKING_LEVEL_OPTIONS } from "../../core/defaults.js";
+import { getApexEnvironment } from "../../core/environment.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
 import { createCompactionSummaryMessage } from "../../core/messages.js";
 import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScopeFromModels, } from "../../core/model-resolver.js";
 import { CredentialSynchronizationError } from "../../core/model-runtime.js";
+import { aggregateUsagePerformance } from "../../core/observability/aggregate.js";
 import { DefaultPackageManager } from "../../core/package-manager.js";
+import { observeTerminalHandoff, TERMINAL_HANDOFF_PATH_VARIABLE } from "../../core/sandbox/terminal-handoff.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
 import { SessionManager, sessionEntryToContextMessages } from "../../core/session-manager.js";
+import { formatShareUnavailableMessage, publishSessionShare } from "../../core/session-share.js";
+import { slugifySkillCommandName } from "../../core/skills.js";
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
-import { isInstallTelemetryEnabled } from "../../core/telemetry.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";
@@ -33,10 +38,10 @@ import { extensionForImageMimeType, readClipboardImage } from "../../utils/clipb
 import { parseGitUrl } from "../../utils/git.js";
 import { openBrowser } from "../../utils/open-browser.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 { checkForNewApexCodeVersion } from "../../utils/version-check.js";
 import { ArminComponent } from "./components/armin.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
@@ -52,6 +57,7 @@ import { EarendilAnnouncementComponent } from "./components/earendil-announcemen
 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 { LoginDialogComponent } from "./components/login-dialog.js";
@@ -60,15 +66,18 @@ import { ModelSelectorComponent } from "./components/model-selector.js";
 import { formatAuthSelectorProviderType, OAuthSelectorComponent, } from "./components/oauth-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 { PERMISSION_MODE_OVERRIDE_HINTS, SettingsSelectorComponent } from "./components/settings-selector.js";
 import { SkillInvocationMessageComponent } from "./components/skill-invocation-message.js";
+import { ApexSplashHeader } from "./components/splash-header.js";
 import { BranchSummaryStatusIndicator, CompactionStatusIndicator, IdleStatus, RetryStatusIndicator, WorkingStatusIndicator, } from "./components/status-indicator.js";
+import { ThinkingSelectorComponent } from "./components/thinking-selector.js";
 import { ToolExecutionComponent } from "./components/tool-execution.js";
 import { TreeSelectorComponent } from "./components/tree-selector.js";
 import { TrustSelectorComponent } from "./components/trust-selector.js";
 import { UserMessageComponent } from "./components/user-message.js";
 import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
 import { editInExternalEditor } from "./external-editor.js";
+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";
@@ -90,6 +99,9 @@ class ExpandableText extends Text {
 function isCustomSessionEntry(item) {
     return "type" in item && item.type === "custom";
 }
+function isCompactionCostNotice(item) {
+    return "type" in item && item.type === "compaction_cost";
+}
 const DEAD_TERMINAL_ERROR_CODES = new Set(["EIO", "EPIPE", "ENOTCONN"]);
 function isDeadTerminalError(error) {
     if (!error || typeof error !== "object" || !("code" in error)) {
@@ -129,6 +141,11 @@ export function formatResumeCommand(sessionManager) {
 function hasDefaultModelProvider(providerId) {
     return providerId in defaultModelPerProvider;
 }
+function llamaCppPostLoginGuidance(actionLabel, loadedModelCount) {
+    return loadedModelCount === 0
+        ? `${actionLabel}. No llama.cpp models are loaded. Use /llama to load a model, then /model to select it.`
+        : `${actionLabel}. Use /model to select a loaded llama.cpp model, or /llama to manage models.`;
+}
 const AUTH_TYPE_ORDER = { oauth: 0, api_key: 1 };
 function createFuzzyAutocompleteItems(items, prefix, getSearchText, toAutocompleteItem) {
     const filtered = fuzzyFilter(items, prefix, getSearchText);
@@ -169,9 +186,21 @@ function formatLoginProviderCompletionDescription(provider) {
 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,
+            copySelection: async (text) => {
+                try {
+                    await copyToClipboard(text);
+                    return true;
+                }
+                catch {
+                    return false;
+                }
+            },
         });
     }
     return new TuiMainScreen(terminal, options.showHardwareCursor, options.logDirectory);
@@ -209,6 +238,8 @@ export function createInteractiveTuiReference(getTui) {
 }
 export class InteractiveMode {
     runtimeHost;
+    /** Settled once the most recent /settings permission-mode write has hit disk. */
+    pendingPermissionModeWrite;
     renderer;
     ui;
     mainScreenRenderState;
@@ -231,6 +262,14 @@ export class InteractiveMode {
     footer;
     footerContainer;
     footerDataProvider;
+    /**
+     * Whether the startup screen is showing its counted inventory line.
+     *
+     * Warnings are only allowed to collapse into that count when the count is
+     * actually on screen. Under a quiet startup there is no splash header, so
+     * collapsing them would hide conflicts entirely rather than summarise them.
+     */
+    startupInventoryVisible = false;
     // Stored so the same manager can be injected into custom editors, selectors, and extension UI.
     keybindings;
     version;
@@ -253,6 +292,7 @@ export class InteractiveMode {
     // Status line tracking (for mutating immediately-sequential status updates)
     lastStatusSpacer = undefined;
     lastStatusText = undefined;
+    managedToolStatusStarted = false;
     // Streaming message tracking
     streamingComponent = undefined;
     streamingMessage = undefined;
@@ -274,8 +314,14 @@ export class InteractiveMode {
     signalCleanupHandlers = [];
     // Track if editor is in bash mode (text starts with !)
     isBashMode = false;
+    firstUseHints;
     // Track current bash execution component
     bashComponent = undefined;
+    // Reentrancy guard: session.isBashRunning only turns true inside
+    // executeBash, so a second `!cmd` submitted during the extension
+    // emitUserBash await would otherwise overwrite the in-flight component
+    // and orphan the first command's output callback.
+    isHandlingBashCommand = false;
     // Track pending bash components (shown in pending area, moved to chat on submit)
     pendingBashComponents = [];
     // Auto-compaction state
@@ -323,6 +369,14 @@ export class InteractiveMode {
     get settingsManager() {
         return this.session.settingsManager;
     }
+    offerFirstUseHint(id) {
+        this.firstUseHints ??= new FirstUseHints(this.settingsManager.getFirstUseHints());
+        const hint = this.firstUseHints.offer(id);
+        if (!hint)
+            return;
+        this.settingsManager.setFirstUseHints(this.firstUseHints.getSeen());
+        this.chatContainer.addChild(new Text(theme.fg("dim", hint), this.outputPad, 0));
+    }
     constructor(runtimeHost, options = {}) {
         this.runtimeHost = runtimeHost;
         const tuiMode = options.tuiMode ?? this.settingsManager.getTuiMode();
@@ -333,6 +387,7 @@ export class InteractiveMode {
         });
         this.runtimeHost.setRebindSession(async () => {
             await this.rebindCurrentSession({ renderBeforeBind: true });
+            await this.themeController.applyFromSettings();
         });
         this.version = VERSION;
         this.renderer = createInteractiveTui({
@@ -361,12 +416,20 @@ export class InteractiveMode {
         this.defaultEditor = new CustomEditor(this.ui, getEditorTheme(), this.keybindings, {
             paddingX: editorPaddingX,
             autocompleteMaxVisible,
+            promptPrefix: "› ",
+            promptColor: (text) => theme.fg("accent", text),
+            placeholder: "Ask anything",
+            placeholderColor: (text) => theme.fg("dim", text),
+            commandColor: (text) => theme.fg("accent", text),
+            surfaceColor: (text) => theme.bg("userMessageBg", text),
+            autocompleteRule: (width) => theme.fg("borderMuted", (this.settingsManager.getSymbolPreset() === "ascii" ? "-" : "┄").repeat(Math.max(1, width))),
+            autocompleteFooter: () => this.buildAutocompleteFooter(),
         });
         this.editor = this.defaultEditor;
         this.editorContainer = new Container();
         this.editorContainer.addChild(this.editor);
         this.footerDataProvider = new FooterDataProvider(this.sessionManager.getCwd());
-        this.footer = new FooterComponent(this.session, this.footerDataProvider);
+        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);
@@ -375,7 +438,12 @@ export class InteractiveMode {
         this.outputPad = this.settingsManager.getOutputPad();
         // Register themes from resource loader and initialize
         setRegisteredThemes(this.session.resourceLoader.getThemes().themes);
-        this.themeController = new InteractiveThemeController(this.ui, this.settingsManager, (message) => this.showError(message), () => this.updateEditorBorderColor());
+        this.themeController = new InteractiveThemeController(this.ui, {
+            getSettingsManager: () => this.settingsManager,
+            showError: (message) => this.showError(message),
+            onChanged: () => this.updateEditorBorderColor(),
+            initialThemeSetting: options.initialThemeSetting,
+        });
     }
     getAutocompleteSourceTag(sourceInfo) {
         if (!sourceInfo) {
@@ -416,8 +484,21 @@ export class InteractiveMode {
             path: command.sourceInfo.path,
         }));
     }
-    createBaseAutocompleteProvider() {
-        // Define commands for autocomplete
+    /**
+     * Every *registered* command: builtin, prompt template, extension, and skill.
+     *
+     * One function rather than two because `/help` renders this list and autocomplete
+     * completes it. Built in two places they would disagree the first time either grew a
+     * source, and the disagreement would show up as a command a user can complete but not
+     * find, or find but not run.
+     *
+     * A few commands are dispatched without being registered -- `/debug`, and the
+     * `/arminsayshi` and `/dementedelves` easter eggs. They are absent here on purpose,
+     * which is also why autocomplete has never offered them. "Registered" is the boundary
+     * both surfaces share; listing them in `/help` would advertise what completion cannot
+     * complete.
+     */
+    collectSessionCommands() {
         const slashCommands = BUILTIN_SLASH_COMMANDS.map((command) => ({
             name: command.name,
             description: command.description,
@@ -445,6 +526,15 @@ export class InteractiveMode {
                 }));
             };
         }
+        const thinkingCommand = slashCommands.find((command) => command.name === "thinking");
+        if (thinkingCommand) {
+            thinkingCommand.getArgumentCompletions = (prefix) => {
+                return createFuzzyAutocompleteItems(this.session.getAvailableThinkingLevels(), prefix, (level) => level, (level) => ({
+                    value: level,
+                    label: level,
+                }));
+            };
+        }
         const loginCommand = slashCommands.find((command) => command.name === "login");
         if (loginCommand) {
             loginCommand.getArgumentCompletions = (prefix) => {
@@ -477,7 +567,7 @@ export class InteractiveMode {
         const skillCommandList = [];
         if (this.settingsManager.getEnableSkillCommands()) {
             for (const skill of this.session.resourceLoader.getSkills().skills) {
-                const commandName = `skill:${skill.name}`;
+                const commandName = `skill:${slugifySkillCommandName(skill.name)}`;
                 this.skillCommands.set(commandName, skill.filePath);
                 skillCommandList.push({
                     name: commandName,
@@ -485,7 +575,10 @@ export class InteractiveMode {
                 });
             }
         }
-        return new CombinedAutocompleteProvider([...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList], this.sessionManager.getCwd(), this.fdPath);
+        return [...slashCommands, ...templateCommands, ...extensionCommands, ...skillCommandList];
+    }
+    createBaseAutocompleteProvider() {
+        return new CombinedAutocompleteProvider(this.collectSessionCommands(), this.sessionManager.getCwd(), this.fdPath);
     }
     setupAutocompleteProvider() {
         let provider = this.createBaseAutocompleteProvider();
@@ -516,7 +609,7 @@ export class InteractiveMode {
         }
         this.chatContainer.addChild(new DynamicBorder());
         if (this.settingsManager.getCollapseChangelog()) {
-            const versionMatch = this.changelogMarkdown.match(/##\s+\[?(\d+\.\d+\.\d+)\]?/);
+            const versionMatch = this.changelogMarkdown.match(/##\s+\[?(\d+\.\d+\.\d+(?:-[0-9A-Za-z][0-9A-Za-z.-]*)?)\]?/);
             const latestVersion = versionMatch ? versionMatch[1] : this.version;
             const condensedText = `Updated to v${latestVersion}. Use ${theme.bold("/changelog")} to view full changelog.`;
             this.chatContainer.addChild(new Text(condensedText, 1, 0));
@@ -538,14 +631,14 @@ export class InteractiveMode {
             tui.setLayoutRoot(this.fullscreenLayoutRoot);
         }
     }
-    stopInteractiveTui() {
-        if (this.renderer.mode === "fullscreen") {
+    stopInteractiveTui(fullscreenExitOutput) {
+        if (this.renderer.mode === "fullscreen" && fullscreenExitOutput === "transcript") {
             while (this.renderer.hasOverlayEntries)
                 this.renderer.hideOverlay();
             this.switchTuiMode("regular", false, false);
             this.renderer.renderNow();
         }
-        this.ui.stop();
+        this.ui.stop({ preserveScreen: this.renderer.mode === "fullscreen" });
     }
     switchTuiMode(mode, restoreProgress = true, startRenderer = true) {
         const previousUi = this.renderer;
@@ -602,10 +695,9 @@ export class InteractiveMode {
         this.registerSignalHandlers();
         // Load changelog (only show new entries, skip for resumed sessions)
         this.changelogMarkdown = this.getChangelogForDisplay();
-        // Ensure fd and rg are available (downloads if missing, adds to PATH via getBinDir)
-        // Both are needed: fd for autocomplete, rg for grep tool and bash commands
-        const [fdPath] = await Promise.all([ensureTool("fd"), ensureTool("rg")]);
-        this.fdPath = fdPath;
+        // Resolve the effective mode before mounting or focusing components. Both
+        // operations can schedule a frame even before the renderer is started.
+        await this.refreshFooterPermissionMode();
         if (this.session.scopedModels.length > 0 && (this.options.verbose || !this.settingsManager.getQuietStartup())) {
             const modelList = this.session.scopedModels
                 .map((sm) => {
@@ -649,18 +741,23 @@ export class InteractiveMode {
             this.widgetContainerBelow,
             this.footerContainer,
         ]);
+        // Accept text while startup completes, but only enable interrupt, exit, and submission feedback.
+        this.defaultEditor.onAction("app.clear", () => this.handleCtrlC());
+        this.defaultEditor.onCtrlD = () => this.handleCtrlD();
+        this.defaultEditor.onSubmit = (text) => this.handleStartupSubmit(text);
         this.ui.setFocus(this.editor);
-        this.setupKeyHandlers();
-        this.setupEditorSubmitHandler();
         // Start the UI before initializing extensions so session_start handlers can use interactive dialogs
         this.ui.start();
         this.isInitialized = true;
         await this.themeController.applyFromSettings();
-        // Add header with keybindings from config (unless silenced)
+        // Brand splash: mark on the left, runtime metadata on the right. The model
+        // and cwd are read through live getters, so they fill in once the session
+        // binds in rebindCurrentSession below.
         if (this.options.verbose || !this.settingsManager.getQuietStartup()) {
-            const logo = theme.bold(theme.fg("accent", APP_NAME)) + theme.fg("dim", ` v${this.version}`);
             // Build startup instructions using keybinding hint helpers
             const hint = (keybinding, description) => keyHint(keybinding, description);
+            // 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"),
@@ -682,27 +779,45 @@ export class InteractiveMode {
                 hint("app.clipboard.pasteImage", "to paste image (with text fallback)"),
                 rawKeyHint("drop files", "to attach"),
             ].join("\n");
-            const compactInstructions = [
-                hint("app.interrupt", "interrupt"),
-                rawKeyHint(`${keyText("app.clear")}/${keyText("app.exit")}`, "clear/exit"),
-                rawKeyHint("/", "commands"),
-                rawKeyHint("!", "bash"),
-                hint("app.tools.expand", "more"),
-            ].join(theme.fg("muted", " · "));
-            const compactOnboarding = theme.fg("dim", `Press ${keyText("app.tools.expand")} to show full startup help and loaded resources.`);
-            const onboarding = theme.fg("dim", `Pi can explain its own features and look up its docs. Ask it how to use or extend Pi.`);
-            this.builtInHeader = new ExpandableText(() => `${logo}\n${compactInstructions}\n${compactOnboarding}\n\n${onboarding}`, () => `${logo}\n${expandedInstructions}\n\n${onboarding}`, this.getStartupExpansionState(), 1, 0);
+            this.builtInHeader = new ApexSplashHeader(this.version, () => this.session.state.model?.id, () => this.session.sessionManager.getCwd(), this.options.verbose ? expandedInstructions : undefined, {
+                topPadding: true,
+                getSymbolPreset: () => this.settingsManager.getSymbolPreset(),
+                getExtraMetadata: () => {
+                    // Which branch the session is rooted on differs between launches
+                    // and is not derivable from the prompt, so it belongs here. The
+                    // tray carries it too, but drops it first when space is tight.
+                    const branch = this.footerDataProvider.getGitBranch();
+                    return branch ? [{ label: "branch", value: branch }] : [];
+                },
+                getInventory: () => this.buildStartupInventory(),
+                inventoryHint: "/resources",
+                getShortcuts: () => this.buildStartupShortcuts(),
+                getHint: () => "Apex Code can explain its own features and look up its docs.",
+            });
             // Setup UI layout
-            this.headerContainer.addChild(new Spacer(1));
+            this.startupInventoryVisible = true;
             this.headerContainer.addChild(this.builtInHeader);
             this.headerContainer.addChild(new Spacer(1));
         }
         else {
             // Minimal header when silenced
+            this.startupInventoryVisible = false;
             this.builtInHeader = new Text("", 0, 0);
             this.headerContainer.addChild(this.builtInHeader);
         }
         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.
+        const [fdPath] = await Promise.all([
+            ensureTool("fd", (status) => this.showManagedToolStatus(status)),
+            ensureTool("rg", (status) => this.showManagedToolStatus(status)),
+        ]);
+        this.fdPath = fdPath;
+        // Enable the remaining input handlers only after managed-tool setup completes.
+        this.setupKeyHandlers();
+        this.setupEditorSubmitHandler();
+        this.ui.requestRender();
         // Initialize extensions first so resources are shown before messages
         await this.rebindCurrentSession();
         // Render initial messages AFTER showing loaded resources
@@ -719,6 +834,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.
@@ -739,17 +862,16 @@ export class InteractiveMode {
      */
     async run() {
         await this.init();
-        if (!process.env.PI_OFFLINE) {
+        if (!getApexEnvironment("APEX_CODE_OFFLINE")) {
             const controller = new AbortController();
             const timeout = setTimeout(() => controller.abort(), 15_000);
-            void this.session.modelRuntime
-                .refresh({ signal: controller.signal })
+            void refreshModelCatalogs(this.session.modelRuntime, controller.signal)
                 .then(() => this.updateAvailableProviderCount())
                 .catch(() => { })
                 .finally(() => clearTimeout(timeout));
         }
         // Start version check asynchronously
-        checkForNewPiVersion(this.version).then((newRelease) => {
+        checkForNewApexCodeVersion(this.version).then((newRelease) => {
             if (newRelease) {
                 this.showNewVersionNotification(newRelease);
             }
@@ -775,7 +897,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(", ")}`);
         }
@@ -821,7 +954,7 @@ export class InteractiveMode {
         }
     }
     async checkForPackageUpdates() {
-        if (process.env.PI_OFFLINE) {
+        if (getApexEnvironment("APEX_CODE_OFFLINE")) {
             return [];
         }
         try {
@@ -874,7 +1007,7 @@ export class InteractiveMode {
             return "tmux extended-keys is off. Modified Enter keys may not work. Add `set -g extended-keys on` to ~/.tmux.conf and restart tmux.";
         }
         if (extendedKeysFormat === "xterm") {
-            return "tmux extended-keys-format is xterm. Pi works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
+            return "tmux extended-keys-format is xterm. Apex Code works best with csi-u. Add `set -g extended-keys-format csi-u` to ~/.tmux.conf and restart tmux.";
         }
         return undefined;
     }
@@ -891,35 +1024,17 @@ export class InteractiveMode {
         const changelogPath = getChangelogPath();
         const entries = parseChangelog(changelogPath);
         if (!lastVersion) {
-            // Fresh install - record the version, send telemetry, don't show changelog
+            // Fresh install - record the version, don't show changelog
             this.settingsManager.setLastChangelogVersion(VERSION);
-            this.reportInstallTelemetry(VERSION);
             return undefined;
         }
         const newEntries = getNewEntries(entries, lastVersion);
         if (newEntries.length > 0) {
             this.settingsManager.setLastChangelogVersion(VERSION);
-            this.reportInstallTelemetry(VERSION);
             return newEntries.map((e) => normalizeChangelogLinks(e.content, e)).join("\n\n");
         }
         return undefined;
     }
-    reportInstallTelemetry(version) {
-        if (process.env.PI_OFFLINE) {
-            return;
-        }
-        if (!isInstallTelemetryEnabled(this.settingsManager)) {
-            return;
-        }
-        void fetch(`https://pi.dev/api/report-install?version=${encodeURIComponent(version)}`, {
-            headers: {
-                "User-Agent": getPiUserAgent(version),
-            },
-            signal: AbortSignal.timeout(5000),
-        })
-            .then(() => undefined)
-            .catch(() => undefined);
-    }
     getMarkdownThemeWithSettings() {
         return {
             ...getMarkdownTheme(),
@@ -1216,7 +1331,7 @@ export class InteractiveMode {
     showLoadedResources(options) {
         // Resource rendering is idempotent; chat clears no longer clear this separate container.
         this.loadedResourcesContainer.clear();
-        const showListing = options?.force || this.options.verbose || !this.settingsManager.getQuietStartup();
+        const showListing = options?.force || this.options.verbose;
         const showDiagnostics = showListing || options?.showDiagnosticsWhenQuiet === true;
         if (!showListing && !showDiagnostics) {
             return;
@@ -1333,43 +1448,105 @@ export class InteractiveMode {
                 addLoadedSection("Themes", themeCompactList, themeList);
             }
         }
+        // Warnings collapse into the counted line when that line is on screen; the
+        // full trace lives behind /resources. Errors always surface inline,
+        // because an error means a resource did not load at all.
         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));
-                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));
-                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 commandDiagnostics = this.session.extensionRunner.getCommandDiagnostics();
-            extensionDiagnostics.push(...commandDiagnostics);
-            extensionDiagnostics.push(...this.getBuiltInCommandConflictDiagnostics(this.session.extensionRunner));
-            const shortcutDiagnostics = this.session.extensionRunner.getShortcutDiagnostics();
-            extensionDiagnostics.push(...shortcutDiagnostics);
-            if (extensionDiagnostics.length > 0) {
-                const warningLines = this.formatDiagnostics(extensionDiagnostics, sourceInfos);
-                this.loadedResourcesContainer.addChild(new Text(`${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 collapseWarnings = !showListing && this.startupInventoryVisible;
+            for (const group of this.collectDiagnosticGroups()) {
+                const visible = collapseWarnings
+                    ? group.diagnostics.filter((diagnostic) => diagnostic.type === "error")
+                    : group.diagnostics;
+                if (visible.length === 0)
+                    continue;
+                const severity = visible.some((diagnostic) => diagnostic.type === "error") ? "error" : "warning";
+                const body = this.formatDiagnostics(visible, sourceInfos);
+                this.loadedResourcesContainer.addChild(new Text(`${theme.fg(severity, `[${group.label}]`)}\n${body}`, 0, 0));
                 this.loadedResourcesContainer.addChild(new Spacer(1));
             }
         }
+        // Counts on the startup screen are read at render time, so they fill in
+        // once resources finish loading without an explicit refresh here.
+        this.builtInHeader?.invalidate?.();
+    }
+    /**
+     * Every startup diagnostic, grouped by the resource kind that produced it.
+     *
+     * One list feeds both the counted line in the header and the detailed
+     * listing, so the two can never disagree about how many issues exist.
+     */
+    collectDiagnosticGroups() {
+        const extensionDiagnostics = [
+            ...this.session.resourceLoader
+                .getExtensions()
+                .errors.map((error) => ({ type: "error", message: error.error, path: error.path })),
+            ...this.session.extensionRunner.getCommandDiagnostics(),
+            ...this.getBuiltInCommandConflictDiagnostics(this.session.extensionRunner),
+            ...this.session.extensionRunner.getShortcutDiagnostics(),
+        ];
+        return [
+            { label: "Skill conflicts", diagnostics: this.session.resourceLoader.getSkills().diagnostics },
+            { label: "Prompt conflicts", diagnostics: this.session.resourceLoader.getPrompts().diagnostics },
+            { label: "Extension issues", diagnostics: extensionDiagnostics },
+            { label: "Theme conflicts", diagnostics: this.session.resourceLoader.getThemes().diagnostics },
+        ].filter((group) => group.diagnostics.length > 0);
+    }
+    /**
+     * The counted line in the ruled band under the mark.
+     *
+     * The startup screen used to print all 152 skill names across fifteen rows.
+     * A count answers the only question that screen can usefully answer, which
+     * is what got loaded; the names live behind /resources now.
+     */
+    /**
+     * The sigil row under the hint: how to reach commands, bash, and files.
+     *
+     * These are the only three characters that change what the composer does, so
+     * they take the accent and everything around them stays quiet.
+     */
+    /** 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);
+    }
+    buildStartupShortcuts() {
+        const entry = (sigil, label) => `${theme.fg("accent", sigil)} ${theme.fg("muted", label)}`;
+        return [
+            entry("/", "commands"),
+            entry("!", "bash"),
+            entry("@", "files"),
+            `${theme.fg("dim", keyText("app.interrupt"))} ${theme.fg("muted", "interrupt")}`,
+        ].join("    ");
+    }
+    buildStartupInventory() {
+        const counted = (total, singular) => `${total} ${singular}${total === 1 ? "" : "s"}`;
+        const parts = [];
+        const skills = this.session.resourceLoader.getSkills().skills.length;
+        const extensions = this.session.resourceLoader.getExtensions().extensions.filter((e) => !e.hidden).length;
+        const prompts = this.session.resourceLoader.getPrompts().prompts.length;
+        if (skills > 0)
+            parts.push(theme.fg("muted", counted(skills, "skill")));
+        if (extensions > 0)
+            parts.push(theme.fg("muted", counted(extensions, "extension")));
+        if (prompts > 0)
+            parts.push(theme.fg("muted", counted(prompts, "prompt")));
+        const diagnostics = this.collectDiagnosticGroups().flatMap((group) => group.diagnostics);
+        const errors = diagnostics.filter((diagnostic) => diagnostic.type === "error").length;
+        const conflicts = diagnostics.length - errors;
+        if (errors > 0)
+            parts.push(theme.fg("error", counted(errors, "error")));
+        if (conflicts > 0)
+            parts.push(theme.fg("warning", counted(conflicts, "conflict")));
+        if (parts.length === 0)
+            return undefined;
+        const ascii = this.settingsManager.getSymbolPreset() === "ascii";
+        const separator = theme.fg("borderMuted", ascii ? " - " : " · ");
+        return parts.join(separator);
     }
     /**
      * Initialize the extension system with TUI-based UI context.
@@ -1457,6 +1634,7 @@ export class InteractiveMode {
         this.applyFullscreenScrollbarSetting();
         this.footer.setSession(this.session);
         this.footer.setAutoCompactEnabled(this.session.autoCompactionEnabled);
+        void this.refreshFooterPermissionMode();
         this.footerDataProvider.setCwd(this.sessionManager.getCwd());
         this.hideThinkingBlock = this.settingsManager.getHideThinkingBlock();
         this.outputPad = this.settingsManager.getOutputPad();
@@ -1499,7 +1677,7 @@ export class InteractiveMode {
         const message = error instanceof Error ? error.message : String(error);
         this.showError(`${prefix}: ${message}`);
         stopThemeWatcher();
-        this.stop();
+        this.stop("transcript");
         process.exit(1);
     }
     renderCurrentSessionState() {
@@ -1509,9 +1687,23 @@ export class InteractiveMode {
         this.compactionQueuedMessages = [];
         this.streamingComponent = undefined;
         this.streamingMessage = undefined;
-        this.pendingTools.clear();
+        // The clears above detach children without stopping their animation
+        // timers. Bash components embed an animated loader; dispose them
+        // explicitly so an in-flight `!cmd` cannot keep rendering (or get
+        // flushed back into a fresh session by flushPendingBashComponents).
+        for (const component of this.pendingBashComponents)
+            component.dispose();
+        this.pendingBashComponents = [];
+        this.bashComponent?.dispose();
+        this.bashComponent = undefined;
+        this.clearPendingTools();
         this.renderInitialMessages();
     }
+    clearPendingTools() {
+        for (const component of this.pendingTools.values())
+            component.dispose();
+        this.pendingTools.clear();
+    }
     /**
      * Get a registered tool definition by name (for custom rendering).
      */
@@ -1894,7 +2086,7 @@ export class InteractiveMode {
     /**
      * Show a selector for extensions.
      */
-    showExtensionSelector(title, options, opts) {
+    showExtensionSelector(title, options, opts, enableSearch = false) {
         return new Promise((resolve) => {
             if (opts?.signal?.aborted) {
                 resolve(undefined);
@@ -1913,7 +2105,12 @@ export class InteractiveMode {
                 opts?.signal?.removeEventListener("abort", onAbort);
                 this.hideExtensionSelector();
                 resolve(undefined);
-            }, { tui: this.ui, timeout: opts?.timeout, onToggleToolsExpanded: () => this.toggleToolOutputExpansion() });
+            }, {
+                tui: this.ui,
+                timeout: opts?.timeout,
+                onToggleToolsExpanded: () => this.toggleToolOutputExpansion(),
+                enableSearch,
+            });
             this.disposeActiveSelector();
             this.editorContainer.clear();
             this.editorContainer.addChild(this.extensionSelector);
@@ -1932,6 +2129,54 @@ export class InteractiveMode {
         this.ui.setFocus(this.editor);
         this.ui.requestRender();
     }
+    async showConfigurationIndex() {
+        const choice = await this.showExtensionSelector("Configuration", [
+            "Settings",
+            "Model",
+            "Model cycling",
+            "Provider login",
+            "Provider logout",
+            "Project trust",
+            "Resources, extensions, and MCP adapters",
+        ], undefined, true);
+        switch (choice) {
+            case "Settings":
+                await this.showSettingsSelector();
+                break;
+            case "Model":
+                this.showModelSelector();
+                break;
+            case "Model cycling":
+                await this.showModelsSelector();
+                break;
+            case "Provider login":
+                await this.handleLoginCommand();
+                break;
+            case "Provider logout":
+                this.showOAuthSelector("logout");
+                break;
+            case "Project trust":
+                this.showTrustSelector();
+                break;
+            case "Resources, extensions, and MCP adapters":
+                this.showStatus(this.describeMcpServers());
+                break;
+        }
+    }
+    /**
+     * Report configured MCP servers and their live connection state. Replaces a string
+     * that offered MCP management from `apex-code config`, which manages package
+     * resources and has never been able to configure a server.
+     */
+    describeMcpServers() {
+        const runtime = this.session.mcpRuntime;
+        const servers = runtime ? [...runtime.servers.keys()] : [];
+        if (servers.length === 0) {
+            return "Run apex-code config to manage resources and extensions. No MCP server is configured; add one to .mcp.json.";
+        }
+        const states = servers.map((name) => `${name} (${runtime?.manager.state(name).kind ?? "disconnected"})`);
+        return `Run apex-code config to manage resources and extensions. MCP servers: ${states.join(", ")}.`;
+    }
     /**
      * Show a confirmation dialog for extensions.
      */
@@ -2243,6 +2488,8 @@ export class InteractiveMode {
             const wasBashMode = this.isBashMode;
             this.isBashMode = text.trimStart().startsWith("!");
             if (wasBashMode !== this.isBashMode) {
+                if (this.isBashMode)
+                    this.offerFirstUseHint("bash");
                 this.updateEditorBorderColor();
             }
         };
@@ -2274,7 +2521,7 @@ export class InteractiveMode {
             if (image) {
                 const tmpDir = os.tmpdir();
                 const ext = extensionForImageMimeType(image.mimeType) ?? "png";
-                const fileName = `pi-clipboard-${crypto.randomUUID()}.${ext}`;
+                const fileName = `apex-code-clipboard-${crypto.randomUUID()}.${ext}`;
                 const filePath = path.join(tmpDir, fileName);
                 fs.writeFileSync(filePath, Buffer.from(image.bytes));
                 this.editor.insertTextAtCursor?.(filePath);
@@ -2291,15 +2538,31 @@ export class InteractiveMode {
             // Silently ignore clipboard errors (may not have permission, etc.)
         }
     }
+    handleStartupSubmit(text) {
+        this.editor.setText(text);
+        this.showStatus("Startup is still in progress");
+    }
     setupEditorSubmitHandler() {
         this.defaultEditor.onSubmit = async (text) => {
             text = text.trim();
             if (!text)
                 return;
+            // A mode chosen in /settings is written asynchronously. Awaiting it here
+            // keeps the store authoritative before any tool call can read it, so a
+            // switch *out* of bypassPermissions can never be raced by the next turn.
+            if (this.pendingPermissionModeWrite) {
+                await this.pendingPermissionModeWrite;
+                this.pendingPermissionModeWrite = undefined;
+            }
             // Handle commands
+            if (text === "/config") {
+                this.editor.setText("");
+                await this.showConfigurationIndex();
+                return;
+            }
             if (text === "/settings") {
-                this.showSettingsSelector();
                 this.editor.setText("");
+                await this.showSettingsSelector();
                 return;
             }
             if (text === "/scoped-models") {
@@ -2313,6 +2576,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("");
@@ -2339,7 +2608,7 @@ export class InteractiveMode {
                 return;
             }
             if (text === "/session") {
-                this.handleSessionCommand();
+                await this.handleSessionCommand();
                 this.editor.setText("");
                 return;
             }
@@ -2348,11 +2617,21 @@ export class InteractiveMode {
                 this.editor.setText("");
                 return;
             }
+            if (text === "/resources") {
+                this.showLoadedResources({ force: true });
+                this.editor.setText("");
+                return;
+            }
             if (text === "/hotkeys") {
                 this.handleHotkeysCommand();
                 this.editor.setText("");
                 return;
             }
+            if (text === "/help") {
+                this.handleHelpCommand();
+                this.editor.setText("");
+                return;
+            }
             if (text === "/fork") {
                 this.showUserMessageSelector();
                 this.editor.setText("");
@@ -2488,7 +2767,7 @@ export class InteractiveMode {
         this.footer.invalidate();
         switch (event.type) {
             case "agent_start":
-                this.pendingTools.clear();
+                this.clearPendingTools();
                 if (this.settingsManager.getShowTerminalProgress()) {
                     this.ui.terminal.setProgress(true);
                 }
@@ -2540,6 +2819,7 @@ export class InteractiveMode {
                     this.streamingMessage = event.message;
                     this.chatContainer.addChild(this.streamingComponent);
                     this.streamingComponent.updateContent(this.streamingMessage, true);
+                    this.updateEditorBorderColor();
                     this.ui.requestRender();
                 }
                 break;
@@ -2557,6 +2837,7 @@ export class InteractiveMode {
                                 component.setExpanded(this.toolOutputExpanded);
                                 this.chatContainer.addChild(component);
                                 this.pendingTools.set(content.id, component);
+                                this.offerFirstUseHint("tool-expand");
                             }
                             else {
                                 const component = this.pendingTools.get(content.id);
@@ -2594,7 +2875,7 @@ export class InteractiveMode {
                                 isError: true,
                             });
                         }
-                        this.pendingTools.clear();
+                        this.clearPendingTools();
                     }
                     else {
                         // Args are now complete - trigger diff computation for edit tools
@@ -2606,6 +2887,7 @@ export class InteractiveMode {
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
                     this.footer.invalidate();
+                    this.updateEditorBorderColor();
                 }
                 this.ui.requestRender();
                 break;
@@ -2654,7 +2936,7 @@ export class InteractiveMode {
                     this.streamingComponent = undefined;
                     this.streamingMessage = undefined;
                 }
-                this.pendingTools.clear();
+                this.clearPendingTools();
                 this.ui.requestRender();
                 break;
             case "agent_settled":
@@ -2691,9 +2973,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) {
@@ -2766,6 +3060,19 @@ export class InteractiveMode {
             : message.content.filter((c) => c.type === "text");
         return textBlocks.map((c) => c.text).join("");
     }
+    /** Show a managed-tool status update in the chat. */
+    showManagedToolStatus(status) {
+        if (!this.managedToolStatusStarted) {
+            this.chatContainer.addChild(new Spacer(1));
+            this.managedToolStatusStarted = true;
+        }
+        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.lastStatusSpacer = undefined;
+        this.lastStatusText = undefined;
+        this.ui.requestRender();
+    }
     /**
      * Show a status message in the chat.
      *
@@ -2886,7 +3193,7 @@ export class InteractiveMode {
         }
     }
     renderSessionItems(items, options = {}) {
-        this.pendingTools.clear();
+        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.
@@ -2902,6 +3209,10 @@ export class InteractiveMode {
                 this.addCustomEntryToChat(item);
                 continue;
             }
+            if (isCompactionCostNotice(item)) {
+                this.addCompactionCostNotice(item);
+                continue;
+            }
             const message = item;
             // Assistant messages need special handling for tool calls
             if (message.role === "assistant") {
@@ -2969,10 +3280,28 @@ export class InteractiveMode {
             if (entry.type === "custom") {
                 return [entry];
             }
-            return sessionEntryToContextMessages(entry);
+            const messages = sessionEntryToContextMessages(entry);
+            if ((entry.type === "compaction" || entry.type === "branch_summary") && entry.usage && messages.length > 0) {
+                return [...messages, { type: "compaction_cost", kind: entry.type, usage: entry.usage }];
+            }
+            return messages;
         });
         this.renderSessionItems(items, options);
     }
+    /**
+     * Render billing usage for a compaction or branch summary. The notice is derived
+     * from persisted summary usage and is not stored as a separate session entry.
+     */
+    addCompactionCostNotice(notice) {
+        if (!this.settingsManager.getShowCacheMissNotices())
+            return;
+        const { usage } = notice;
+        const tokens = usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+        const cost = usage.cost.total >= 0.01 ? ` (~$${usage.cost.total.toFixed(2)})` : "";
+        const label = notice.kind === "compaction" ? "Compaction" : "Branch summary";
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new Text(theme.fg("warning", `${label}: ${formatTokens(tokens)} tokens billed${cost}`), 1, 0));
+    }
     /**
      * Show a transcript notice when a completed assistant message paid for a
      * significant cache miss. Only states observable facts: the miss itself,
@@ -3024,7 +3353,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 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 apex-code.`), 1, 0));
     }
     async getUserInput() {
         const queuedInput = this.pendingUserInputs.shift();
@@ -3137,7 +3466,7 @@ export class InteractiveMode {
             this.ui.stop();
         }
         catch { }
-        console.error("pi exiting due to uncaughtException:");
+        console.error("apex-code exiting due to uncaughtException:");
         console.error(error);
         process.exit(1);
     }
@@ -3183,6 +3512,34 @@ export class InteractiveMode {
         const uncaughtExceptionHandler = (error) => this.uncaughtCrash(error);
         process.prependListener("uncaughtException", uncaughtExceptionHandler);
         this.signalCleanupHandlers.push(() => process.off("uncaughtException", uncaughtExceptionHandler));
+        // Lend the terminal back to the supervisor when it needs to draw a sandbox
+        // escalation prompt. The supervisor owns that decision (ADR 0023) and this
+        // process cannot read the answer anyway -- bwrap --new-session leaves it with no
+        // controlling terminal. `ui.stop()` is the same restore Ctrl+Z already performs,
+        // so the terminal is in cooked mode with a visible cursor while the human answers.
+        const handoffDirectory = process.env[TERMINAL_HANDOFF_PATH_VARIABLE];
+        if (handoffDirectory) {
+            const observer = observeTerminalHandoff(handoffDirectory, {
+                suspend: () => {
+                    try {
+                        this.ui.stop();
+                    }
+                    catch {
+                        // A terminal we cannot restore still leaves the prompt readable.
+                    }
+                },
+                resume: () => {
+                    try {
+                        this.ui.start();
+                        this.ui.requestRender(true);
+                    }
+                    catch {
+                        // Nothing further to try; the next render request recovers.
+                    }
+                },
+            });
+            this.signalCleanupHandlers.push(() => observer.stop());
+        }
     }
     unregisterSignalHandlers() {
         for (const cleanup of this.signalCleanupHandlers) {
@@ -3244,6 +3601,7 @@ export class InteractiveMode {
             this.editor.addToHistory?.(text);
             this.editor.setText("");
             await this.session.prompt(text, { streamingBehavior: "followUp" });
+            this.offerFirstUseHint("queue");
             this.updatePendingMessagesDisplay();
             this.ui.requestRender();
         }
@@ -3263,6 +3621,7 @@ export class InteractiveMode {
         }
     }
     updateEditorBorderColor() {
+        this.defaultEditor.setModeLabel(this.isBashMode ? "bash" : this.session.isStreaming ? "busy" : undefined);
         if (this.isBashMode) {
             this.editor.borderColor = theme.getBashModeBorderColor();
         }
@@ -3323,6 +3682,7 @@ export class InteractiveMode {
         this.showStatus(`Tool output: ${expanded ? "expanded" : "collapsed"}`);
     }
     toggleThinkingBlockVisibility() {
+        this.offerFirstUseHint("thinking");
         this.hideThinkingBlock = !this.hideThinkingBlock;
         this.settingsManager.setHideThinkingBlock(this.hideThinkingBlock);
         // Rebuild chat from session messages
@@ -3374,7 +3734,7 @@ export class InteractiveMode {
     showNewVersionNotification(release) {
         const action = theme.fg("accent", `${APP_NAME} update`);
         const updateInstruction = theme.fg("muted", `New version ${release.version} is available. Run `) + action;
-        const changelogUrl = "https://pi.dev/changelog";
+        const changelogUrl = "https://github.com/Fchery87/apex-code/blob/main/packages/coding-agent/CHANGELOG.md";
         const changelogLink = getCapabilities().hyperlinks
             ? hyperlink(theme.fg("accent", changelogUrl), changelogUrl)
             : theme.fg("accent", changelogUrl);
@@ -3606,11 +3966,63 @@ export class InteractiveMode {
         this.ui.setFocus(created.focus);
         this.ui.requestRender();
     }
-    showSettingsSelector() {
+    /**
+     * Resyncs the footer from the store. Called on every session swap, not just at
+     * startup: `applyRuntimeSettings` also repoints the cwd, and cwd selects which
+     * project-scope permission file applies, so the mode genuinely can differ
+     * between two sessions in one process. A footer left showing the old value
+     * would under-report bypassPermissions, which is the one direction that matters.
+     */
+    async refreshFooterPermissionMode() {
+        const resolution = await this.session.getPermissionMode();
+        this.footer.setPermissionMode(resolution?.mode ?? "default");
+        if (this.isInitialized) {
+            this.ui.requestRender();
+        }
+    }
+    /**
+     * Writes the mode to user scope, then reports what is actually in force. The
+     * write can be outranked by `--permission-mode` or a project file, and a
+     * settings row that silently does nothing is worse than no row at all.
+     */
+    async applyPermissionMode(mode) {
+        let resolution;
+        try {
+            const write = this.session.setPermissionMode(mode);
+            this.pendingPermissionModeWrite = write.then(() => { }, () => { });
+            resolution = await write;
+        }
+        catch (error) {
+            // Never swallow this. A permission mode the user believes they set, and
+            // did not, is the one outcome worse than the prompt they were escaping.
+            const detail = error instanceof Error ? error.message : String(error);
+            this.chatContainer.addChild(new Text(theme.fg("error", `Permission mode could not be saved: ${detail}`), 1, 0));
+            this.ui.requestRender();
+            return;
+        }
+        if (!resolution)
+            return;
+        const outranked = resolution.mode !== mode;
+        const source = PERMISSION_MODE_OVERRIDE_HINTS[resolution.origin] ?? resolution.origin;
+        const line = outranked
+            ? `Permission mode saved as ${mode}, but ${source} sets ${resolution.mode} for this session.`
+            : `Permission mode set to ${mode}.`;
+        this.chatContainer.addChild(new Text(theme.fg(outranked ? "warning" : "muted", line), 1, 0));
+        this.footer.setPermissionMode(resolution.mode);
+        this.ui.requestRender();
+    }
+    async showSettingsSelector() {
+        const permissionMode = await this.session.getPermissionMode();
         this.showSelector((done) => {
             let selector;
+            const defaultProvider = this.settingsManager.getDefaultProvider();
+            const defaultModelId = this.settingsManager.getDefaultModel();
+            const defaultModel = defaultProvider && defaultModelId ? `${defaultProvider}/${defaultModelId}` : "not set";
             selector = new SettingsSelectorComponent({
                 autoCompact: this.session.autoCompactionEnabled,
+                defaultModel,
+                currentModel: this.session.model,
+                availableDefaultModels: this.session.modelRuntime.getAvailableSnapshot(),
                 showImages: this.settingsManager.getShowImages(),
                 imageWidthCells: this.settingsManager.getImageWidthCells(),
                 autoResizeImages: this.settingsManager.getImageAutoResize(),
@@ -3620,20 +4032,22 @@ export class InteractiveMode {
                 followUpMode: this.session.followUpMode,
                 transport: this.settingsManager.getTransport(),
                 httpIdleTimeoutMs: this.settingsManager.getHttpIdleTimeoutMs(),
-                thinkingLevel: this.session.thinkingLevel,
-                availableThinkingLevels: this.session.getAvailableThinkingLevels(),
-                currentTheme: this.settingsManager.getThemeSetting() || "dark",
+                thinkingLevel: this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL,
+                availableThinkingLevels: [...THINKING_LEVEL_OPTIONS],
+                modelThinkingLevels: this.settingsManager.getAllModelThinkingLevels(),
+                currentTheme: this.themeController.getThemeSelection() || "dark",
                 terminalTheme: this.themeController.getTerminalTheme(),
                 availableThemes: getAvailableThemes(),
                 hideThinkingBlock: this.hideThinkingBlock,
                 mermaidRenderingMode: this.settingsManager.getMermaidRenderingMode(),
                 collapseChangelog: this.settingsManager.getCollapseChangelog(),
-                enableInstallTelemetry: this.settingsManager.getEnableInstallTelemetry(),
+                sendProviderAttribution: this.settingsManager.getSendProviderAttribution(),
                 doubleEscapeAction: this.settingsManager.getDoubleEscapeAction(),
                 treeFilterMode: this.settingsManager.getTreeFilterMode(),
                 showHardwareCursor: this.settingsManager.getShowHardwareCursor(),
                 showCacheMissNotices: this.settingsManager.getShowCacheMissNotices(),
                 defaultProjectTrust: this.settingsManager.getDefaultProjectTrust(),
+                permissionMode,
                 editorPaddingX: this.settingsManager.getEditorPaddingX(),
                 outputPad: this.settingsManager.getOutputPad(),
                 autocompleteMaxVisible: this.settingsManager.getAutocompleteMaxVisible(),
@@ -3641,6 +4055,7 @@ export class InteractiveMode {
                 clearOnShrink: this.settingsManager.getClearOnShrink(),
                 showTerminalProgress: this.settingsManager.getShowTerminalProgress(),
                 tuiMode: this.ui.mode,
+                fullscreenExitOutput: this.settingsManager.getFullscreenExitOutput(),
                 fullscreenScrollbar: this.settingsManager.getFullscreenScrollbar(),
                 warnings: this.settingsManager.getWarnings(),
             }, {
@@ -3689,14 +4104,30 @@ export class InteractiveMode {
                     configureHttpDispatcher(timeoutMs);
                     this.showStatus(`HTTP idle timeout: ${formatHttpIdleTimeoutMs(timeoutMs)}`);
                 },
-                onThinkingLevelChange: (level) => {
-                    this.session.setThinkingLevel(level);
-                    this.footer.invalidate();
-                    this.updateEditorBorderColor();
+                onModelThinkingLevelChange: (provider, modelId, level) => {
+                    this.settingsManager.setModelThinkingLevel(provider, modelId, level);
+                    // If the override is for the current model, apply it to the session too
+                    const current = this.session.model;
+                    if (current && current.provider === provider && current.id === modelId) {
+                        this.session.setThinkingLevel(level);
+                        this.footer.invalidate();
+                        this.updateEditorBorderColor();
+                    }
+                },
+                onModelThinkingLevelRemove: (provider, modelId) => {
+                    this.settingsManager.removeModelThinkingLevel(provider, modelId);
+                    // If the override was for the current model, revert to global default
+                    const current = this.session.model;
+                    if (current && current.provider === provider && current.id === modelId) {
+                        const globalDefault = this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL;
+                        this.session.setThinkingLevel(globalDefault);
+                        this.footer.invalidate();
+                        this.updateEditorBorderColor();
+                    }
                 },
                 onThemeChange: (themeSetting) => {
                     this.settingsManager.setTheme(themeSetting);
-                    void this.themeController.applyFromSettings();
+                    void this.themeController.setThemeSetting(themeSetting);
                 },
                 onThemePreview: (themeName) => this.themeController.preview(themeName),
                 onHideThinkingBlockChange: (hidden) => {
@@ -3722,8 +4153,8 @@ export class InteractiveMode {
                 onCollapseChangelogChange: (collapsed) => {
                     this.settingsManager.setCollapseChangelog(collapsed);
                 },
-                onEnableInstallTelemetryChange: (enabled) => {
-                    this.settingsManager.setEnableInstallTelemetry(enabled);
+                onSendProviderAttributionChange: (enabled) => {
+                    this.settingsManager.setSendProviderAttribution(enabled);
                 },
                 onQuietStartupChange: (enabled) => {
                     this.settingsManager.setQuietStartup(enabled);
@@ -3731,6 +4162,9 @@ export class InteractiveMode {
                 onDefaultProjectTrustChange: (defaultProjectTrust) => {
                     this.settingsManager.setDefaultProjectTrust(defaultProjectTrust);
                 },
+                onPermissionModeChange: (mode) => {
+                    void this.applyPermissionMode(mode);
+                },
                 onDoubleEscapeActionChange: (action) => {
                     this.settingsManager.setDoubleEscapeAction(action);
                 },
@@ -3795,6 +4229,9 @@ export class InteractiveMode {
                         this.statusContainer.clear();
                     this.showStatus(`TUI mode: ${mode}`);
                 },
+                onFullscreenExitOutputChange: (output) => {
+                    this.settingsManager.setFullscreenExitOutput(output);
+                },
                 onFullscreenScrollbarChange: (mode) => {
                     this.settingsManager.setFullscreenScrollbar(mode);
                     this.applyFullscreenScrollbarSetting();
@@ -3810,6 +4247,44 @@ export class InteractiveMode {
             return { component: selector, focus: selector.getSettingsList() };
         });
     }
+    handleThinkingCommand(searchTerm) {
+        const availableLevels = this.session.getAvailableThinkingLevels();
+        if (!searchTerm) {
+            this.showThinkingSelector();
+            return;
+        }
+        const normalized = searchTerm.trim().toLowerCase();
+        const level = availableLevels.find((candidate) => candidate.toLowerCase() === normalized);
+        if (!level) {
+            this.showError(`Unknown thinking level "${searchTerm}". Available levels: ${availableLevels.join(", ")}.`);
+            return;
+        }
+        this.selectThinkingLevel(level, false);
+    }
+    selectThinkingLevel(level, persist) {
+        try {
+            this.session.setThinkingLevel(level, { persist });
+            this.footer.invalidate();
+            this.updateEditorBorderColor();
+            this.showStatus(persist ? `Default thinking level: ${level}` : `Thinking level: ${level}`);
+        }
+        catch (error) {
+            this.showError(error instanceof Error ? error.message : String(error));
+        }
+    }
+    showThinkingSelector() {
+        this.showSelector((done) => {
+            const selectLevel = (level, persist) => {
+                this.selectThinkingLevel(level, persist);
+                done();
+            };
+            const selector = new ThinkingSelectorComponent(this.session.thinkingLevel ?? DEFAULT_THINKING_LEVEL, this.session.getAvailableThinkingLevels(), (level) => selectLevel(level, false), () => {
+                done();
+                this.ui.requestRender();
+            }, (level) => selectLevel(level, true), this.settingsManager.getDefaultThinkingLevel() ?? DEFAULT_THINKING_LEVEL);
+            return { component: selector, focus: selector };
+        });
+    }
     async handleModelCommand(searchTerm) {
         if (!searchTerm) {
             this.showModelSelector();
@@ -3818,7 +4293,7 @@ export class InteractiveMode {
         const model = await this.findExactModelMatch(searchTerm);
         if (model) {
             try {
-                await this.session.setModel(model);
+                await this.session.setModel(model, { persist: false });
                 this.footer.invalidate();
                 this.updateEditorBorderColor();
                 this.showStatus(`Model: ${model.id}`);
@@ -3847,7 +4322,7 @@ export class InteractiveMode {
             controller.abort();
         }, 15_000);
         try {
-            const result = await this.session.modelRuntime.refresh({ signal: controller.signal });
+            const result = await refreshModelCatalogs(this.session.modelRuntime, controller.signal);
             if (result.aborted && timedOut) {
                 this.showWarning("Model refresh timed out; searching cached models.");
             }
@@ -3935,7 +4410,7 @@ export class InteractiveMode {
                 onSelect: (selection) => {
                     trustStore.setMany(selection.updates);
                     done();
-                    this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart pi for this to take effect.`);
+                    this.showStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart ${APP_NAME} for this to take effect.`);
                 },
                 onCancel: () => {
                     done();
@@ -3947,13 +4422,13 @@ export class InteractiveMode {
     }
     showModelSelector(initialSearchInput) {
         this.showSelector((done) => {
-            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRuntime, this.session.scopedModels, async (model) => {
+            const selectModel = async (model, persist) => {
                 try {
-                    await this.session.setModel(model);
+                    await this.session.setModel(model, { persist });
                     this.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);
                 }
@@ -3961,10 +4436,13 @@ export class InteractiveMode {
                     done();
                     this.showError(error instanceof Error ? error.message : String(error));
                 }
-            }, () => {
+            };
+            const defaultProvider = this.settingsManager.getDefaultProvider();
+            const defaultModel = this.settingsManager.getDefaultModel();
+            const selector = new ModelSelectorComponent(this.ui, this.session.model, this.session.modelRuntime, this.session.scopedModels, (model) => selectModel(model, false), () => {
                 done();
                 this.ui.requestRender();
-            }, initialSearchInput);
+            }, initialSearchInput, (model) => selectModel(model, true), defaultProvider && defaultModel ? { provider: defaultProvider, id: defaultModel } : undefined);
             return { component: selector, focus: selector, dispose: () => selector.dispose() };
         });
     }
@@ -4035,8 +4513,7 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 },
             });
-            void this.session.modelRuntime
-                .refresh({ signal: controller.signal })
+            void refreshModelCatalogs(this.session.modelRuntime, controller.signal)
                 .then((result) => {
                 if (disposed)
                     return;
@@ -4521,7 +4998,11 @@ export class InteractiveMode {
         if (isUnknownModel(previousModel)) {
             const availableModels = this.session.modelRuntime.getAvailableSnapshot();
             const providerModels = availableModels.filter((model) => model.provider === providerId);
-            if (!hasDefaultModelProvider(providerId)) {
+            // Matches LLAMA_PROVIDER_ID from extensions/llama/provider.ts; kept inline to avoid coupling interactive mode to the built-in extension.
+            if (providerId === "llama.cpp") {
+                selectionError = llamaCppPostLoginGuidance(actionLabel, providerModels.length);
+            }
+            else if (!hasDefaultModelProvider(providerId)) {
                 selectionError = `${actionLabel}, but no default model is configured for provider "${providerId}". Use /model to select a model.`;
             }
             else if (providerModels.length === 0) {
@@ -4535,7 +5016,7 @@ export class InteractiveMode {
                 }
                 else {
                     try {
-                        await this.session.setModel(selectedModel);
+                        await this.session.setModel(selectedModel, { persist: true });
                     }
                     catch (error) {
                         selectedModel = undefined;
@@ -4590,7 +5071,7 @@ export class InteractiveMode {
             this.ui.requestRender();
         };
         const dialog = new LoginDialogComponent(this.ui, providerOption.id, () => restoreEditor(), providerOption.name, `${providerOption.name} setup`);
-        dialog.showInfo(`${providerOption.method?.name ?? "Authentication"} is configured outside pi.`, [], true);
+        dialog.showInfo(`${providerOption.method?.name ?? "Authentication"} is configured outside Apex Code.`, [], true);
         this.editorContainer.clear();
         this.editorContainer.addChild(dialog);
         this.ui.setFocus(dialog);
@@ -4827,7 +5308,9 @@ export class InteractiveMode {
                 this.showStatus(`Session exported to: ${filePath}`);
             }
             else {
-                const filePath = await this.session.exportToHtml(outputPath);
+                const filePath = await this.session.exportToHtml(outputPath, {
+                    themeName: theme.name,
+                });
                 this.showStatus(`Session exported to: ${filePath}`);
             }
         }
@@ -4903,89 +5386,74 @@ export class InteractiveMode {
         }
     }
     async handleShareCommand() {
-        // Check if gh is available and logged in
+        // Check before confirmation so a user without a working GitHub CLI gets an actionable error.
         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.");
+                this.showError(formatShareUnavailableMessage("unauthenticated"));
                 return;
             }
         }
         catch {
-            this.showError("GitHub CLI (gh) is not installed. Install it from https://cli.github.com/");
+            this.showError(formatShareUnavailableMessage("missing"));
             return;
         }
-        // Export to a temp file
-        const tmpFile = path.join(os.tmpdir(), "session.html");
+        let loader;
+        let proc;
         try {
-            await this.session.exportToHtml(tmpFile);
-        }
-        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 }));
+            const result = await publishSessionShare({
+                confirm: () => this.showExtensionConfirm("Publish session to GitHub?", "This uploads a complete HTML export to a secret GitHub Gist. Secret Gists are unlisted, not private or access-controlled; anyone with the URL can read the transcript, prompts, tool activity, and included file content. Review a local /export first if needed."),
+                exportToHtml: async (exportPath) => {
+                    await this.session.exportToHtml(exportPath);
+                },
+                publishGist: (exportPath) => new Promise((resolve, reject) => {
+                    loader = new BorderedLoader(this.ui, theme, "Creating secret GitHub Gist...");
+                    this.editorContainer.clear();
+                    this.editorContainer.addChild(loader);
+                    this.ui.setFocus(loader);
+                    this.ui.requestRender();
+                    loader.onAbort = () => proc?.kill();
+                    proc = spawn("gh", ["gist", "create", "--public=false", exportPath]);
+                    let stdout = "";
+                    let stderr = "";
+                    proc.stdout?.on("data", (data) => {
+                        stdout += data.toString();
+                    });
+                    proc.stderr?.on("data", (data) => {
+                        stderr += data.toString();
+                    });
+                    proc.on("error", reject);
+                    proc.on("close", (code) => {
+                        if (loader?.signal.aborted)
+                            reject(new Error("Share cancelled"));
+                        else if (code !== 0)
+                            reject(new Error(stderr.trim() || "Unknown GitHub CLI error"));
+                        else
+                            resolve(stdout);
+                    });
+                }),
             });
-            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");
+            if (result.kind === "cancelled") {
+                this.showStatus("Share cancelled");
                 return;
             }
-            // Create the preview URL
-            const previewUrl = getShareViewerUrl(gistId);
-            this.showStatus(`Share URL: ${previewUrl}\nGist: ${gistUrl}`);
+            const previewUrl = getShareViewerUrl(result.gistId);
+            this.showStatus(previewUrl
+                ? `Secret GitHub Gist: ${result.gistUrl}\nConfigured preview: ${previewUrl}`
+                : `Secret GitHub Gist: ${result.gistUrl}`);
         }
         catch (error) {
-            if (!loader.signal.aborted) {
-                restoreEditor();
-                this.showError(`Failed to create gist: ${error instanceof Error ? error.message : "Unknown error"}`);
+            if (error instanceof Error && error.message === "Share cancelled")
+                this.showStatus("Share cancelled");
+            else
+                this.showError(`Failed to create secret GitHub Gist: ${error instanceof Error ? error.message : "Unknown error"}`);
+        }
+        finally {
+            if (loader) {
+                loader.dispose();
+                this.editorContainer.clear();
+                this.editorContainer.addChild(this.editor);
+                this.ui.setFocus(this.editor);
             }
         }
     }
@@ -5031,7 +5499,7 @@ export class InteractiveMode {
         this.chatContainer.addChild(new Text(theme.fg("dim", `Session name set: ${sessionName ?? name}`), 1, 0));
         this.ui.requestRender();
     }
-    handleSessionCommand() {
+    async handleSessionCommand() {
         const stats = this.session.getSessionStats();
         const sessionName = this.sessionManager.getSessionName();
         const entries = this.sessionManager.getEntries();
@@ -5084,6 +5552,26 @@ export class InteractiveMode {
                         : `\n${theme.fg("dim", "Cache Re-billed:")} ${detail}`;
             }
         }
+        // Role and latency: the two dimensions the durable ledger (roadmap Phase 8)
+        // carries that session entries never did. Scoped to this session's rows only
+        // -- a ledger that also served other sessions must never leak their cost in.
+        const usagePerformanceSamples = (await this.session.modelRuntime.listUsagePerformanceSamples()).filter((sample) => sample.sessionId === stats.sessionId);
+        if (usagePerformanceSamples.length > 0) {
+            const avgTtftMs = usagePerformanceSamples.reduce((sum, sample) => sum + sample.ttftMs, 0) / usagePerformanceSamples.length;
+            const avgGenerationMs = usagePerformanceSamples.reduce((sum, sample) => sum + sample.generationMs, 0) /
+                usagePerformanceSamples.length;
+            info += `\n\n${theme.bold("Latency")}\n`;
+            info += `${theme.fg("dim", "Avg TTFT:")} ${Math.round(avgTtftMs)}ms\n`;
+            info += `${theme.fg("dim", "Avg Generation:")} ${Math.round(avgGenerationMs)}ms`;
+            const roleRows = aggregateUsagePerformance(usagePerformanceSamples, "role");
+            if (roleRows.length > 0) {
+                info += `\n\n${theme.bold("Roles")}`;
+                for (const row of roleRows) {
+                    const requestLabel = row.sampleCount === 1 ? "1 request" : `${row.sampleCount} requests`;
+                    info += `\n  ${theme.fg("dim", `${row.key}:`)} $${row.cost.toFixed(3)} ${theme.fg("dim", `(${requestLabel})`)}`;
+                }
+            }
+        }
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(info, 1, 0));
         this.ui.requestRender();
@@ -5228,6 +5716,28 @@ export class InteractiveMode {
         this.chatContainer.addChild(new DynamicBorder());
         this.ui.requestRender();
     }
+    /**
+     * Renders what `collectSessionCommands` returns, so the list a user reads and the list
+     * autocomplete offers are the same list rather than two that agree today. Unregistered
+     * dispatch-only commands are outside that boundary; see the note there.
+     */
+    handleHelpCommand() {
+        const commands = this.collectSessionCommands();
+        const rows = commands
+            .map((command) => {
+            const invocation = command.argumentHint ? `/${command.name} ${command.argumentHint}` : `/${command.name}`;
+            return `| \`${invocation}\` | ${command.description ?? ""} |`;
+        })
+            .join("\n");
+        const help = `| Command | Description |\n|---------|-------------|\n${rows}\n\nType \`/\` to filter these, or \`/hotkeys\` for keyboard shortcuts.`;
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new DynamicBorder());
+        this.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "Commands")), 1, 0));
+        this.chatContainer.addChild(new Spacer(1));
+        this.chatContainer.addChild(new Markdown(help, 1, 1, this.getMarkdownThemeWithSettings()));
+        this.chatContainer.addChild(new DynamicBorder());
+        this.ui.requestRender();
+    }
     async handleClearCommand() {
         this.clearStatusIndicator();
         try {
@@ -5291,6 +5801,19 @@ export class InteractiveMode {
         }
     }
     async handleBashCommand(command, excludeFromContext = false) {
+        if (this.isHandlingBashCommand) {
+            this.showWarning("A bash command is already running; wait for it to finish");
+            return;
+        }
+        this.isHandlingBashCommand = true;
+        try {
+            await this.runBashCommand(command, excludeFromContext);
+        }
+        finally {
+            this.isHandlingBashCommand = false;
+        }
+    }
+    async runBashCommand(command, excludeFromContext = false) {
         const extensionRunner = this.session.extensionRunner;
         // Emit user_bash event to let extensions intercept
         const eventResult = await extensionRunner.emitUserBash({
@@ -5364,7 +5887,7 @@ export class InteractiveMode {
             // Ignore, will be emitted as an event
         }
     }
-    stop() {
+    stop(fullscreenExitOutput = this.settingsManager.getFullscreenExitOutput()) {
         this.disposeActiveSelector();
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);
@@ -5378,7 +5901,7 @@ export class InteractiveMode {
             this.unsubscribe();
         }
         if (this.isInitialized) {
-            this.stopInteractiveTui();
+            this.stopInteractiveTui(fullscreenExitOutput);
             this.isInitialized = false;
         }
         this.unregisterSignalHandlers();