@code-yeongyu/senpi 2026.9.11 → 2026.9.12-3

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

@@ -7,7 +7,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { contentText, modelsAreEqual } from "@earendil-works/pi-ai";
 import * as TuiLayouts from "@earendil-works/pi-tui";
-import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Markdown, matchesKey, outerKittyGraphicsMode, ProcessTerminal, Spacer, sanitizeTerminalLabel, setCapabilityOverrides, setKeybindings, Text, TruncatedText, TuiAltScreen, TuiMainScreen, visibleWidth, } from "@earendil-works/pi-tui";
+import { CombinedAutocompleteProvider, Container, fuzzyFilter, getCapabilities, hyperlink, Markdown, matchesKey, outerKittyGraphicsMode, Spacer, sanitizeTerminalLabel, setCapabilityOverrides, setKeybindings, Text, TruncatedText, TuiAltScreen, TuiMainScreen, visibleWidth, } from "@earendil-works/pi-tui";
 import chalk from "chalk";
 import { spawn, spawnSync } from "child_process";
 import { APP_COMMAND, APP_NAME, APP_TITLE, BRAND, CONFIG_DIR_NAME, DISPLAY_VERSION, expandTildePath, getAgentDir, getAuthPath, getDebugLogPath, getDocsPath, getShareViewerUrl, } from "../../config.js";
@@ -21,7 +21,7 @@ import { collectEntriesForBranchSummary } from "../../core/compaction/branch-sum
 import { AssistantEditError, assistantTextEquals } from "../../core/edited-assistant-message.js";
 import { buildNoticeBox } from "../../core/extensions/notice/index.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
-import { appendHiddenTuiStdout, appendUncaughtCrashLog } from "../../core/hidden-stdout-log.js";
+import { appendUncaughtCrashLog } from "../../core/hidden-stdout-log.js";
 import { buildHighReasoningWarning } from "../../core/high-reasoning-warning.js";
 import { configureHttpDispatcher, formatHttpIdleTimeoutMs } from "../../core/http-dispatcher.js";
 import { KeybindingsManager } from "../../core/keybindings.js";
@@ -35,6 +35,7 @@ import { SessionManager, sessionEntryToContextMessages } from "../../core/sessio
 import { BUILTIN_SLASH_COMMANDS } from "../../core/slash-commands.js";
 import { isInstallTelemetryEnabled } from "../../core/telemetry.js";
 import { formatTimings, time } from "../../core/timings.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 { consumeEarlyInspectorVmImportRecoveries, INSPECTOR_VM_IMPORT_WARNING, isRecoverableInspectorVmImportError, } from "../../inspector-policy.js";
@@ -43,16 +44,17 @@ import { copyToClipboard, readClipboardText } from "../../utils/clipboard.js";
 import { readClipboardImage } from "../../utils/clipboard-image.js";
 import { parseGitUrl } from "../../utils/git.js";
 import { processImage } from "../../utils/image-process.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 { ensureTool } from "../../utils/tools-manager.js";
 import { checkForNewPiVersion, getReleaseChangelogUrl } from "../../utils/version-check.js";
 import { abortedMessageForRendering } from "./aborted-error-label.js";
+import { createChatViewport } from "./chat-viewport.js";
 import { transferCompactionQueue, waitForPromptDisposition, } from "./compaction-queue-transfer.js";
 import { ArminComponent } from "./components/armin.js";
-import { ASK_USER_ANSWER_KEY, ASK_USER_WIDGET_KEY, AskUserAsyncWidget, buildCommentResponse, buildTimedOutResponse, unansweredIds, } from "./components/ask-user-async-widget.js";
+import { matchesAskUserAnswerKey } from "./components/ask-user-answer-key.js";
+import { ASK_USER_WIDGET_KEY, AskUserAsyncWidget, buildCommentResponse, buildTimedOutResponse, } from "./components/ask-user-async-widget.js";
 import { AskUserQuestionComponent } from "./components/ask-user-question.js";
 import { AssistantMessageComponent } from "./components/assistant-message.js";
 import { BashExecutionComponent } from "./components/bash-execution.js";
@@ -112,13 +114,35 @@ import { buildTmuxSetupWarning } from "./tmux-setup.js";
 import { ToolArgsRevealController } from "./tool-args-reveal.js";
 import { readToolProgress } from "./tool-progress.js";
 import { ToolResultRevealController } from "./tool-result-reveal.js";
+import { createInteractiveTui, createInteractiveTuiReference } from "./tui-renderer.js";
 import { formatDisplayVersion } from "./version-label.js";
 import { blendWorkingStatusShimmerRgbColor, formatActiveToolWorkingLabel, formatToolHookStatusMessageFrame, formatWorkingStatusMessageFrame, largeSessionWorkingStatusInterval, sanitizeWorkingStatusPlainText, } from "./working-status.js";
+export { createInteractiveTui, createInteractiveTuiReference } from "./tui-renderer.js";
 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.`;
 }
+function isWorkingStatusEditor(editor) {
+    return ("embedWorkingStatus" in editor &&
+        editor.embedWorkingStatus === true &&
+        "setWorkingStatusIndicator" in editor &&
+        typeof editor.setWorkingStatusIndicator === "function");
+}
+/**
+ * Hand the active status indicator to the editor border. Returns whether it was embedded; when it
+ * was not, the caller keeps the indicator in the standalone status row. The base editor may be
+ * absent on renderer-only hosts and the active editor may be an extension editor that never opts
+ * in, so both are probed instead of assumed.
+ */
+function embedStatusIndicatorInEditor(defaultEditor, editor, indicator) {
+    if (defaultEditor && isWorkingStatusEditor(defaultEditor))
+        defaultEditor.setWorkingStatusIndicator(undefined);
+    if (!editor || !isWorkingStatusEditor(editor))
+        return false;
+    editor.setWorkingStatusIndicator(indicator);
+    return true;
+}
 function isExpandable(obj) {
     return typeof obj === "object" && obj !== null && "setExpanded" in obj && typeof obj.setExpanded === "function";
 }
@@ -453,61 +477,6 @@ function linesFactory(lines) {
         return container;
     };
 }
-/** Composition root for selecting the interactive terminal renderer. */
-export function createInteractiveTui(options) {
-    const terminal = options.terminal ?? new ProcessTerminal({ onExternalStdoutWrite: appendHiddenTuiStdout });
-    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()),
-    });
-}
 export class InteractiveMode {
     static restoreCompactionEscapeOverride(host) {
         if (!host.compactionEscapeOverrideActive)
@@ -556,6 +525,7 @@ export class InteractiveMode {
          */
         this.pendingImages = new Map();
         this.activeStatusIndicator = undefined;
+        this.activeWorkingIndicatorEmbedded = false;
         this.idleStatus = new IdleStatus();
         this.workingMessage = undefined;
         this.workingVisible = true;
@@ -725,6 +695,7 @@ export class InteractiveMode {
             this.defaultEditor = new CustomEditor(this.ui, getEditorTheme(), this.keybindings, {
                 paddingX: editorPaddingX,
                 autocompleteMaxVisible,
+                embedWorkingStatus: true,
             });
         }
         this.editor = this.defaultEditor;
@@ -994,32 +965,21 @@ 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,
+            hookStatus: this.hookStatusContainer,
+            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.hookStatusContainer, 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;
         const rootComponents = [
             this.documentContainer,
             this.pendingMessagesContainer,
@@ -2096,10 +2056,11 @@ export class InteractiveMode {
         this.renderInitialMessages();
     }
     /**
-     * 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()];
@@ -2134,7 +2095,7 @@ export class InteractiveMode {
                 this.requestExtensionShutdown();
             },
             getContextUsage: () => this.session.getContextUsage(),
-            getCompactionSettings: () => this.settingsManager.getCompactionSettings(),
+            getCompactionSettings: () => this.settingsManager.getCompactionSettings(this.session.model),
             getPromptCacheSafeWaitSeconds: () => this.session.resolvePromptCacheSafeWaitSeconds(),
             getPromptCacheGoalBackstopMaxSeconds: () => this.settingsManager.getPromptCacheGoalBackstopMaxSeconds(),
             getLookAtSettings: () => {
@@ -2474,7 +2435,16 @@ export class InteractiveMode {
         this.activeStatusIndicator?.dispose();
         this.activeStatusIndicator = indicator;
         this.statusContainer.clear();
+        const embedded = embedStatusIndicatorInEditor(this.defaultEditor, this.editor, indicator);
+        this.activeWorkingIndicatorEmbedded = embedded;
+        // The spinner lives in the editor border when the editor opts in; the status row
+        // then only carries the optional working tip instead of a second spinner line.
         const workingTip = indicator.kind === "working" ? this.resolveTurnWorkingTip() : undefined;
+        if (embedded) {
+            if (workingTip)
+                this.statusContainer.addChild(new Text(theme.fg("dim", workingTip.line), 1, 0));
+            return;
+        }
         if (!workingTip) {
             this.statusContainer.addChild(indicator);
             return;
@@ -2506,6 +2476,7 @@ export class InteractiveMode {
         }
         const hadActiveStatusIndicator = this.activeStatusIndicator !== undefined;
         const isClearingWorking = this.activeStatusIndicator?.kind === "working";
+        const clearedIndicatorWasEmbedded = this.activeWorkingIndicatorEmbedded;
         const shouldReserveHeight = hadActiveStatusIndicator && this.options.tuiMode === "regular" && this.ui.getClearOnShrink();
         const renderedHeight = shouldReserveHeight ? this.statusContainer.render(this.ui.terminal.columns).length : 0;
         this.activeStatusIndicator?.dispose();
@@ -2513,15 +2484,22 @@ export class InteractiveMode {
         if (isClearingWorking) {
             this.workingStartedAt = undefined;
         }
+        this.activeWorkingIndicatorEmbedded = false;
         this.statusContainer.clear();
-        if (shouldReserveHeight) {
+        embedStatusIndicatorInEditor(this.defaultEditor, this.editor, undefined);
+        // An embedded spinner occupied no status row, so only a rendered tip line is worth
+        // reserving; otherwise the placeholder would add rows that were never on screen.
+        if (shouldReserveHeight && (!clearedIndicatorWasEmbedded || renderedHeight > 0)) {
             const idleHeight = Math.min(this.ui.terminal.rows, Math.max(1, renderedHeight || 2));
             this.idleStatus.setHeight(idleHeight);
             this.statusContainer.addChild(this.idleStatus);
         }
     }
     showWorkingStatusIndicator() {
-        this.showStatusIndicator(new WorkingStatusIndicator(this.ui, this.workingMessage ?? this.defaultWorkingMessage, this.getWorkingIndicatorOptions()));
+        const colorFn = 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.getWorkingIndicatorOptions(), colorFn));
     }
     setWorkingVisible(visible) {
         this.workingVisible = visible;
@@ -3067,7 +3045,8 @@ export class InteractiveMode {
         this.setExtensionWidget(ASK_USER_WIDGET_KEY, (tui) => {
             const startedAt = Date.now();
             return new AskUserAsyncWidget({
-                unanswered: unansweredIds(state.request, state.draft).length,
+                request: state.request,
+                draft: state.draft,
                 timeoutMs: state.timeoutMs,
                 tui,
                 onExpire: () => state.finish(buildTimedOutResponse(state.request, state.draft, Date.now() - startedAt)),
@@ -3076,8 +3055,18 @@ export class InteractiveMode {
     }
     /** Editor shortcut: expand the pending async question into the full component. */
     handleAskUserShortcut(data) {
+        if (!this.asyncQuestion || this.askUserQuestion || !matchesAskUserAnswerKey(data))
+            return false;
+        return this.expandPendingQuestion();
+    }
+    /**
+     * Key-free entry into the pending async question (empty Enter, /answer):
+     * mounts the full component in place of the editor. Returns false when
+     * nothing is pending or the component is already open.
+     */
+    expandPendingQuestion() {
         const state = this.asyncQuestion;
-        if (!state || this.askUserQuestion || !matchesKey(data, ASK_USER_ANSWER_KEY))
+        if (!state || this.askUserQuestion)
             return false;
         const component = new AskUserQuestionComponent(state.request, (response) => {
             if (this.asyncQuestion !== state)
@@ -3209,6 +3198,13 @@ export class InteractiveMode {
             this.editor = this.defaultEditor;
         }
         this.editorContainer.addChild(this.editor);
+        if (this.activeStatusIndicator) {
+            this.statusContainer.clear();
+            this.activeWorkingIndicatorEmbedded = embedStatusIndicatorInEditor(this.defaultEditor, this.editor, this.activeStatusIndicator);
+            if (!this.activeWorkingIndicatorEmbedded) {
+                this.statusContainer.addChild(this.activeStatusIndicator);
+            }
+        }
         this.ui.setFocus(this.editor);
         this.ui.requestRender();
     }
@@ -3446,11 +3442,15 @@ export class InteractiveMode {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            this.getSessionLogger().warn("clipboard_error", {
+            // `?.` guards keep this handler callable on a minimal borrowed receiver
+            // ({ editor, ui }) - the contract upstream's clipboard tests pin; a full
+            // InteractiveMode instance still logs to the session log and shows the
+            // status line.
+            this.getSessionLogger?.().warn("clipboard_error", {
                 op: "paste",
                 error: message,
             });
-            this.showStatus(`Clipboard paste failed: ${sanitizeTuiErrorMessage(message)}`);
+            this.showStatus?.(`Clipboard paste failed: ${sanitizeTuiErrorMessage(message)}`);
         }
     }
     /** Route an editor's image-marker changes into {@link reconcilePendingImages}. */
@@ -3574,8 +3574,12 @@ export class InteractiveMode {
                 this.hideShortcutOverlay();
                 this.lastEditorText = "";
                 text = text.trim();
-                if (!text)
+                if (!text) {
+                    // Enter on an empty editor opens the pending async question; it needs
+                    // no chord, so it works under every terminal and keymap.
+                    this.expandPendingQuestion();
                     return;
+                }
                 // A pending async question claims ordinary text as its comment answer;
                 // slash and bash commands keep their normal routing.
                 if (!text.startsWith("/") &&
@@ -3645,6 +3649,12 @@ export class InteractiveMode {
                     await this.handleKeybindingsCommand();
                     return;
                 }
+                if (text === "/answer") {
+                    this.editor.setText("");
+                    if (!this.expandPendingQuestion())
+                        this.showStatus("No question is pending.");
+                    return;
+                }
                 if (text === "/hotkeys") {
                     this.handleHotkeysCommand();
                     this.editor.setText("");
@@ -5266,6 +5276,7 @@ export class InteractiveMode {
             const level = this.session.thinkingLevel || "off";
             this.editor.borderColor = theme.getThinkingBorderColor(level);
         }
+        this.activeStatusIndicator?.invalidate();
         this.ui.requestRender();
     }
     async cycleThinkingLevel() {
@@ -6569,6 +6580,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;
@@ -6881,75 +6897,97 @@ 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 systemPromptName;
-        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 systemPromptName;
+            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 {
-                        systemPromptName = (await this.session.setModel(selectedModel))?.systemPromptName;
+                    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 {
+                            systemPromptName = (await this.session.setModel(selectedModel))?.systemPromptName;
+                        }
+                        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.`;
+                        }
                     }
                 }
             }
-        }
-        this.updateAvailableProviderCount();
-        this.footer.invalidate();
-        this.updateEditorBorderColor();
-        if (selectedModel) {
-            const systemPromptStr = systemPromptName ? ` System prompt: ${systemPromptName}.` : "";
-            this.showStatus(`${actionLabel}. Selected ${selectedModel.id}.${systemPromptStr} Credentials saved to ${getAuthPath()}`);
-            this.showRiskyMainModelWarning(selectedModel);
-            void this.maybeWarnAboutAnthropicSubscriptionAuth(selectedModel);
-            this.checkDaxnutsEasterEgg(selectedModel);
-        }
-        else {
-            this.showStatus(`${actionLabel}. Credentials saved to ${getAuthPath()}`);
-            if (selectionError) {
-                this.showError(selectionError);
+            this.updateAvailableProviderCount();
+            this.footer.invalidate();
+            this.updateEditorBorderColor();
+            if (selectedModel) {
+                const systemPromptStr = systemPromptName ? ` System prompt: ${systemPromptName}.` : "";
+                this.showStatus(`${actionLabel}. Selected ${selectedModel.id}.${systemPromptStr} Credentials saved to ${getAuthPath()}`);
+                this.showRiskyMainModelWarning(selectedModel);
+                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);
         const refreshProviders = providerId === "cursor" ? [providerId, "cursor-cli-oauth"] : [providerId];
-        void this.session.modelRuntime
+        void session.modelRuntime
             .refresh({
             allowNetwork: true,
             providers: refreshProviders,
             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();
@@ -7573,6 +7611,7 @@ export class InteractiveMode {
         const copyMessage = this.getAppKeyDisplay("app.message.copy");
         const followUp = this.getAppKeyDisplay("app.message.followUp");
         const dequeue = this.getAppKeyDisplay("app.message.dequeue");
+        const answerQuestion = this.getAppKeyDisplay("app.question.answer");
         const pasteImage = this.getAppKeyDisplay("app.clipboard.pasteImage");
         let hotkeys = `
 **Navigation**
@@ -7616,6 +7655,7 @@ export class InteractiveMode {
 | \`${copyMessage}\` | Copy last assistant message |
 | \`${followUp}\` | Queue follow-up message |
 | \`${dequeue}\` | Restore queued messages |
+| \`${answerQuestion}\` | Open the pending question (also: Enter on an empty editor, or /answer) |
 | \`${pasteImage}\` | Paste image or text from clipboard |
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |