@code-yeongyu/senpi 2026.9.19-2 → 2026.9.20

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

@@ -20,6 +20,7 @@ import { resolveChangelogSource } from "../../core/changelog-source.js";
 import { collectEntriesForBranchSummary } from "../../core/compaction/branch-summarization.js";
 import { AssistantEditError, assistantTextEquals } from "../../core/edited-assistant-message.js";
 import { formatUserMessage } from "../../core/extensions/builtin/ask-user/format.js";
+import { askUserRenderers } from "../../core/extensions/builtin/ask-user/render.js";
 import { buildNoticeBox } from "../../core/extensions/notice/index.js";
 import { FooterDataProvider } from "../../core/footer-data-provider.js";
 import { appendUncaughtCrashLog } from "../../core/hidden-stdout-log.js";
@@ -105,6 +106,7 @@ import { buildResourceScopeGroups, formatResourceScopeGroups, getDisplaySourceIn
 import { describeLoginFailure } from "./login-outcome.js";
 import { refreshModelCatalogs } from "./model-catalog-refresh.js";
 import { getModelSearchText } from "./model-search.js";
+import { isNetworkProviderError, isNetworkProviderMessage, ProviderErrorPresentation, } from "./provider-error-presentation.js";
 import { isRiskyMainModel, RISKY_MAIN_MODEL_WARNING } from "./risky-main-model-warning.js";
 import { DEFAULT_SMOOTH_FPS, StreamingRevealController } from "./streaming-reveal.js";
 import { getAvailableThemes, getAvailableThemesWithPaths, getEditorTheme, getMarkdownTheme, getSelectListTheme, getThemeByName, onThemeChange, setRegisteredThemes, stopThemeWatcher, Theme, theme, } from "./theme/theme.js";
@@ -2066,7 +2068,10 @@ export class InteractiveMode {
      * whatever this returns, so they never reach into the tool registry themselves.
      */
     getRegisteredToolDefinition(toolName) {
-        return withBuiltInRenderers(toolName, this.session.getToolDefinition(toolName));
+        // A question card can stream while a reload is in flight, when the registry no longer holds the
+        // ask-user tools and session_start has not re-synchronized them yet. Its renderers do not depend
+        // on the registration, so fall back to them instead of dumping the raw arguments.
+        return withBuiltInRenderers(toolName, this.session.getToolDefinition(toolName) ?? askUserRenderers(toolName));
     }
     getMarkdownTransformers() {
         return [this.mermaidMarkdownTransformer, ...this.session.extensionRunner.getMarkdownTransformers()];
@@ -3004,6 +3009,7 @@ export class InteractiveMode {
                 tui: this.ui,
                 timeoutMs: opts?.timeout ?? request.timeoutMs,
                 getDeadlineAtMs: opts?.getDeadlineAtMs,
+                initialDraft: opts?.initialDraft,
                 onProgress: opts?.onProgress,
             });
             this.disposeActiveSelector();
@@ -3048,7 +3054,7 @@ export class InteractiveMode {
             completion: completion.promise,
             getDeadlineAtMs: opts?.getDeadlineAtMs,
             onProgress: opts?.onProgress,
-            draft: { answers: {} },
+            draft: opts?.initialDraft ?? { answers: {} },
             finish: (response) => {
                 if (this.pendingQuestions.get(request.requestId) !== state)
                     return;
@@ -4069,6 +4075,10 @@ export class InteractiveMode {
                     `more tokens for its ${event.contextWindow.toLocaleString()}-token window ` +
                     `(${event.safetyMarginProfile} usability budget).`);
                 break;
+            case "model_change_pending":
+                this.showWarning(event.notice);
+                this.footer.invalidate();
+                break;
             case "high_reasoning_warning":
                 this.showHighReasoningWarning(event);
                 break;
@@ -4087,6 +4097,7 @@ export class InteractiveMode {
                     this.ui.requestRender();
                 }
                 else if (event.message.role === "user") {
+                    this.providerErrors?.newTurn();
                     if (!this.optimisticUserEchoes.replaceNext(event.message))
                         this.addMessageToChat(event.message);
                     this.updatePendingMessagesDisplay();
@@ -4103,6 +4114,10 @@ export class InteractiveMode {
                 break;
             case "message_update":
                 if (this.streamingComponent && event.message.role === "assistant") {
+                    if (event.message.content.some((part) => part.type === "text" && part.text.trim())) {
+                        this.providerErrors?.clear();
+                        this.clearStatusIndicator("retry");
+                    }
                     this.streamingMessage = event.message;
                     this.streamingReveal.setTarget(assistantStreamingHeadMessage(event.message));
                     for (const content of this.streamingMessage.content) {
@@ -4144,6 +4159,13 @@ export class InteractiveMode {
                     }
                     this.toolArgsReveal.flushAll();
                     const renderedMessage = abortedMessageForRendering(this.streamingMessage, this.session.retryAttempt, this.session.currentAbortSource);
+                    if (isNetworkProviderMessage(renderedMessage)) {
+                        this.getProviderErrors().record(renderedMessage.errorMessage ?? "", this.toolOutputExpanded);
+                    }
+                    else if (renderedMessage.stopReason === "stop" || renderedMessage.stopReason === "toolUse") {
+                        this.providerErrors?.clear();
+                        this.clearStatusIndicator("retry");
+                    }
                     let errorMessage = renderedMessage.errorMessage;
                     this.syncTrailingAssistantText(renderedMessage);
                     this.assistantTextSegments.clear();
@@ -4255,6 +4277,7 @@ export class InteractiveMode {
                 break;
             case "agent_idle":
                 this.agentIdle = true;
+                this.providerErrors?.finish();
                 if (this.pendingUserInputs.length === 0) {
                     this.clearStatusIndicator("working");
                 }
@@ -4263,6 +4286,12 @@ export class InteractiveMode {
             case "continuation_error":
                 this.showError(sanitizeTerminalLabel(event.errorMessage));
                 break;
+            case "session_abort":
+                this.providerErrors?.clear();
+                this.clearStatusIndicator("retry");
+                this.pendingZeroDelayRetryIndicator = undefined;
+                this.ui.requestRender();
+                break;
             case "compaction_start": {
                 if (this.settingsManager.getShowTerminalProgress() && this.ui.terminal) {
                     this.ui.terminal.setProgress(true);
@@ -4381,7 +4410,10 @@ export class InteractiveMode {
                 }
                 else if (event.errorMessage) {
                     const errorMessage = sanitizeTerminalLabel(event.errorMessage);
-                    if (event.reason === "manual") {
+                    if (isNetworkProviderError(errorMessage)) {
+                        this.getProviderErrors().finish(errorMessage);
+                    }
+                    else if (event.reason === "manual") {
                         this.showError(errorMessage);
                     }
                     else {
@@ -4489,6 +4521,11 @@ export class InteractiveMode {
                 this.setExtensionStatus(FALLBACK_STATUS_KEY, undefined);
                 break;
             case "retry_fallback_exhausted":
+                if (isNetworkProviderError(event.lastError)) {
+                    this.getProviderErrors().finish(event.lastError);
+                    this.setExtensionStatus(FALLBACK_STATUS_KEY, undefined);
+                    break;
+                }
                 this.showNoticeBox({
                     title: `✕ Fallback chain exhausted · ${event.chainKey}`,
                     tone: "error",
@@ -4506,6 +4543,9 @@ export class InteractiveMode {
                 });
                 break;
             case "auto_retry_start": {
+                if (isNetworkProviderError(event.errorMessage)) {
+                    this.getProviderErrors().retrying(event.errorMessage, this.toolOutputExpanded);
+                }
                 // During retry waits, isStreaming flips false between attempts. The main Esc handler
                 // keys off both isStreaming and retryAttempt so we keep the same close-out path here;
                 // no separate retry-only handler is installed (the prior one only called
@@ -4540,14 +4580,25 @@ export class InteractiveMode {
                 }
                 this.clearStatusIndicator("retry");
                 // Show error only on final failure (success shows normal response)
-                if (!event.success) {
+                if (event.success || event.finalError === "Retry cancelled") {
+                    this.providerErrors?.clear();
+                }
+                else if (isNetworkProviderError(event.finalError)) {
+                    this.getProviderErrors().finish(event.finalError, event.attempt);
+                }
+                else {
                     this.showError(`Retry failed after ${event.attempt} attempts: ${event.finalError || "Unknown error"}`);
                 }
                 this.ui.requestRender();
                 break;
             }
             case "summarization_retry_scheduled": {
-                this.showError(event.errorMessage);
+                if (isNetworkProviderError(event.errorMessage)) {
+                    this.getProviderErrors().retrying(event.errorMessage, this.toolOutputExpanded);
+                }
+                else {
+                    this.showError(event.errorMessage);
+                }
                 this.showSummarizationRetryStatusIndicator(event);
                 break;
             }
@@ -4563,6 +4614,7 @@ export class InteractiveMode {
                 break;
             }
             case "summarization_retry_finished": {
+                this.providerErrors?.clear();
                 this.clearStatusIndicator("retry");
                 this.ui.requestRender();
                 break;
@@ -4597,7 +4649,7 @@ export class InteractiveMode {
     showRetryStatusIndicatorWithCadence(event) {
         const refreshIntervalMs = largeSessionWorkingStatusInterval(this.sessionManager.getEntryCount(), DEFAULT_RETRY_STATUS_REFRESH_INTERVAL_MS, LARGE_SESSION_RETRY_STATUS_REFRESH_INTERVAL_MS);
         const indicator = refreshIntervalMs === DEFAULT_RETRY_STATUS_REFRESH_INTERVAL_MS ? undefined : { intervalMs: refreshIntervalMs };
-        this.showStatusIndicator(new RetryStatusIndicator(this.ui, event.attempt, event.maxAttempts, event.delayMs, indicator));
+        this.showStatusIndicator(new RetryStatusIndicator(this.ui, event.attempt, event.maxAttempts, event.delayMs, indicator, isNetworkProviderError(event.errorMessage)));
         this.ui.requestRender();
     }
     /** Extract text content from a user message */
@@ -4701,6 +4753,8 @@ export class InteractiveMode {
         };
     }
     addMessageToChat(message, options) {
+        if (message.role === "user")
+            this.providerErrors?.newTurn();
         switch (message.role) {
             case "bashExecution": {
                 const component = new BashExecutionComponent(message.command, this.ui, message.excludeFromContext);
@@ -4765,8 +4819,16 @@ export class InteractiveMode {
                 break;
             }
             case "assistant": {
+                if (isNetworkProviderMessage(message)) {
+                    this.getProviderErrors().record(message.errorMessage ?? "", this.toolOutputExpanded);
+                    this.providerErrors?.finish();
+                }
+                else if (message.stopReason === "stop" || message.stopReason === "toolUse") {
+                    this.providerErrors?.clear();
+                }
                 const assistantComponent = new AssistantMessageComponent(message, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
                 assistantComponent.setExpanded(this.toolOutputExpanded);
+                assistantComponent.setProviderErrorOwned(isNetworkProviderMessage(message));
                 this.chatContainer.addChild(assistantComponent);
                 break;
             }
@@ -4786,6 +4848,7 @@ export class InteractiveMode {
     syncTrailingAssistantText(message) {
         if (!this.streamingComponent)
             return;
+        this.streamingComponent.setProviderErrorOwned(isNetworkProviderMessage(message));
         const head = assistantStreamingHeadMessage(message);
         // Single writer: while smooth streaming paces the head (no toolCall block),
         // streamingReveal owns the streaming component. Overwriting the full head
@@ -4818,11 +4881,13 @@ export class InteractiveMode {
             const runMessage = { ...message, content: runBlocks };
             const existing = this.assistantTextSegments.get(runStart);
             if (existing) {
+                existing.setProviderErrorOwned(isNetworkProviderMessage(message));
                 existing.updateContent(runMessage, true);
                 continue;
             }
             const segment = new AssistantMessageComponent(runMessage, this.hideThinkingBlock, this.getMarkdownThemeWithSettings(), this.hiddenThinkingLabel, this.outputPad, this.getMarkdownTransformers());
             segment.setExpanded(this.toolOutputExpanded);
+            segment.setProviderErrorOwned(isNetworkProviderMessage(message));
             this.assistantTextSegments.set(runStart, segment);
             const followingToolCall = content.slice(index).find((block) => block.type === "toolCall");
             const followingToolCallId = followingToolCall?.type === "toolCall" ? followingToolCall.id : undefined;
@@ -4859,6 +4924,7 @@ export class InteractiveMode {
         }, this.getRegisteredToolDefinition(toolName), this.ui, this.sessionManager.getCwd());
     }
     renderSessionItems(items, options = {}) {
+        this.providerErrors = undefined;
         this.clearPendingTools();
         // The rebuilt transcript re-derives continuity notices from persisted
         // messages, so the tracker's suppression state must not survive the
@@ -5558,10 +5624,19 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     showError(errorMessage) {
+        if (isNetworkProviderError(errorMessage, true)) {
+            this.getProviderErrors().record(errorMessage, this.toolOutputExpanded);
+            this.ui.requestRender();
+            return;
+        }
         this.chatContainer.addChild(new Spacer(1));
         this.chatContainer.addChild(new Text(theme.fg("error", `Error: ${sanitizeTuiErrorMessage(errorMessage)}`), 1, 0));
         this.ui.requestRender();
     }
+    getProviderErrors() {
+        this.providerErrors ??= new ProviderErrorPresentation(this.chatContainer);
+        return this.providerErrors;
+    }
     showNoticeBox(spec) {
         const sanitized = {
             ...spec,