erosolar-cli 1.7.391 → 1.7.393

package/dist/shell/interactiveShell.js

@@ -152,15 +152,10 @@ export class InteractiveShell {
     // Auto-build tracking
     autoBuildInFlight = false;
     lastAutoBuildRun = null;
-    // Tool usage tracking for per-run summaries
-    toolHistoryOffset = 0;
     // Streaming UX tracking
-    batchedOutputMode;
     streamingHeartbeatStart = null;
     streamingHeartbeatFrame = 0;
     streamingStatusLabel = null;
-    streamingUiActive = false;
-    pendingStreamBuffer = '';
     lastStreamingElapsedSeconds = null; // Preserve final elapsed time
     statusLineState = null;
     statusMessageOverride = null;
@@ -182,11 +177,6 @@ export class InteractiveShell {
         this.sessionRestoreConfig = config.sessionRestore ?? { mode: 'none' };
         this._enabledPlugins = config.enabledPlugins ?? [];
         this.version = config.version ?? '0.0.0';
-        const streamingEnv = process.env['EROSOLAR_STREAMING_UI']?.toLowerCase();
-        // Default to live streaming for immediate thought/tool/response visibility; opt out with EROSOLAR_STREAMING_UI=off/false/0/batch/batched
-        const streamingDisabled = streamingEnv === 'off' || streamingEnv === 'false' || streamingEnv === '0' ||
-            streamingEnv === 'batch' || streamingEnv === 'batched';
-        this.batchedOutputMode = streamingDisabled;
         // Alternate screen disabled - use terminal-native mode for proper scrollback and text selection
         this.alternateScreenEnabled = false;
         this.initializeSessionHistory();
@@ -289,7 +279,7 @@ export class InteractiveShell {
         }
         // Stream banner first - this sets up scroll region dynamically
         const banner = this.buildBanner();
-        this.terminalInput.streamContent(banner + '\n');
+        this.terminalInput.streamContent(banner + '\n\n');
         // Render chat box after banner is streamed
         this.refreshControlBar();
         this.terminalInput.forceRender();
@@ -789,21 +779,6 @@ export class InteractiveShell {
         // During streaming we still want the spinner prefix; when idle force a fast refresh.
         this.refreshStatusLine(!this.isProcessing);
     }
-    /**
-     * Inline menu/panel helpers (rendered in TerminalInput, not in scrollback).
-     */
-    showInlineMenu(title, lines, tone = 'info', hint) {
-        const merged = [...lines];
-        if (hint) {
-            merged.push('', tone === 'error' ? theme.error(hint) : theme.warning(hint));
-        }
-        this.terminalInput.setInlinePanel({ title, lines: merged, tone });
-        this.terminalInput.render();
-    }
-    clearInlineMenu() {
-        this.terminalInput.setInlinePanel(null);
-        this.terminalInput.render();
-    }
     async handleToolSettingsInput(input) {
         const pending = this.pendingInteraction;
         if (!pending || pending.type !== 'tool-settings') {
@@ -1103,6 +1078,7 @@ export class InteractiveShell {
             }
         });
         this.setIdleStatus();
+        this.startStatusHeartbeat();
     }
     teardownStatusTracking() {
         if (this.statusSubscription) {
@@ -1114,8 +1090,6 @@ export class InteractiveShell {
         this.statusTracker.reset();
     }
     setIdleStatus(detail) {
-        // Reset streaming timer display when returning to idle so elapsed doesn't linger
-        this.lastStreamingElapsedSeconds = null;
         this.statusTracker.setBase('Ready for prompts', {
             detail: this.describeStatusDetail(detail),
             tone: 'success',
@@ -1228,6 +1202,26 @@ export class InteractiveShell {
             this.terminalInput.render();
         }
     }
+    /**
+     * Keep the bottom meta/status line ticking so elapsed time updates even when idle.
+     * Streaming heartbeat already refreshes once per second; skip duplicate work there.
+     */
+    startStatusHeartbeat() {
+        this.uiUpdates.startHeartbeat('status:meta', {
+            intervalMs: 1000,
+            lane: 'heartbeat',
+            priority: 'low',
+            coalesceKey: 'heartbeat:status-meta',
+            description: 'status/meta refresh',
+            mode: ['idle', 'processing', 'streaming', 'tooling', 'mcp', 'external'],
+            run: () => {
+                if (this.uiUpdates.isHeartbeatActive('streaming')) {
+                    return;
+                }
+                this.refreshStatusLine(true);
+            },
+        });
+    }
     formatStatusLine(state) {
         if (!state) {
             return null;
@@ -1315,49 +1309,17 @@ export class InteractiveShell {
             this.promptRefreshTimer = null;
         }
     }
-    resetStreamBuffer() {
-        this.pendingStreamBuffer = '';
-    }
-    captureStreamChunk(chunk) {
-        if (!this.batchedOutputMode || !chunk) {
-            return;
-        }
-        this.pendingStreamBuffer += chunk;
-    }
-    consumeStreamBuffer(fallback) {
-        if (!this.batchedOutputMode) {
-            return fallback;
-        }
-        const buffered = this.pendingStreamBuffer;
-        this.pendingStreamBuffer = '';
-        return buffered || fallback;
-    }
-    currentRunElapsedMs() {
-        if (!this.streamingHeartbeatStart) {
-            return undefined;
-        }
-        return Date.now() - this.streamingHeartbeatStart;
-    }
     startStreamingHeartbeat(label = 'Streaming') {
         this.stopStreamingHeartbeat();
-        this.resetStreamBuffer();
-        this.lastStreamingElapsedSeconds = null;
+        // Enter global streaming mode - blocks all non-streaming UI output
+        enterStreamingMode();
+        // Set up scroll region for streaming content
+        this.terminalInput.enterStreamingScrollRegion();
+        this.uiUpdates.setMode('streaming');
         this.streamingHeartbeatStart = Date.now();
         this.streamingHeartbeatFrame = 0;
         const initialFrame = STREAMING_SPINNER_FRAMES[this.streamingHeartbeatFrame];
         this.streamingStatusLabel = this.buildStreamingStatus(`${initialFrame} ${label}`, 0);
-        if (this.batchedOutputMode) {
-            this.streamingUiActive = false;
-            this.uiUpdates.setMode('processing');
-        }
-        else {
-            // Enter global streaming mode - blocks all non-streaming UI output
-            enterStreamingMode();
-            // Set up scroll region for streaming content
-            this.terminalInput.enterStreamingScrollRegion();
-            this.streamingUiActive = true;
-            this.uiUpdates.setMode('streaming');
-        }
         display.updateStreamingStatus(this.streamingStatusLabel);
         this.refreshStatusLine(true);
         // Periodically refresh the pinned input/status region while streaming so
@@ -1387,21 +1349,18 @@ export class InteractiveShell {
         });
     }
     stopStreamingHeartbeat() {
+        // Exit global streaming mode - allows UI to render again
+        exitStreamingMode();
         // Preserve final elapsed time before clearing heartbeat start
         if (this.streamingHeartbeatStart) {
             this.lastStreamingElapsedSeconds = Math.max(0, Math.floor((Date.now() - this.streamingHeartbeatStart) / 1000));
         }
-        if (this.streamingUiActive) {
-            // Exit global streaming mode - allows UI to render again
-            exitStreamingMode();
-            // Exit scroll region mode
-            this.terminalInput.exitStreamingScrollRegion();
-        }
+        // Exit scroll region mode
+        this.terminalInput.exitStreamingScrollRegion();
         this.uiUpdates.stopHeartbeat('streaming');
         this.streamingHeartbeatStart = null;
         this.streamingHeartbeatFrame = 0;
         this.streamingStatusLabel = null;
-        this.streamingUiActive = false;
         // Clear streaming label specifically (keeps override and main status if set)
         this.terminalInput.setStreamingLabel(null);
         // Clear streaming status from display
@@ -3709,22 +3668,36 @@ export class InteractiveShell {
     async showModelMenu() {
         // Hold input immediately so numeric selections don't get queued as prompts while we fetch
         this.pendingInteraction = { type: 'model-loading' };
-        this.showInlineMenu('Model provider', [theme.ui.muted('Fetching latest models from providers...')], 'info');
+        display.showSystemMessage(theme.ui.muted('Fetching latest models from providers...'));
         try {
             // Fetch live models from all configured providers
             const providerStatuses = await quickCheckProviders();
             const providerOptions = this.buildProviderOptionsWithDiscovery(providerStatuses);
             if (!providerOptions.length) {
+                display.showWarning('No providers are available.');
                 this.pendingInteraction = null;
-                this.showInlineMenu('Model provider', [theme.warning('No providers are available.')], 'warning');
+                this.terminalInput.render();
                 return;
             }
+            const lines = [
+                theme.bold('Select a provider:'),
+                ...providerOptions.map((option, index) => {
+                    const isCurrent = option.provider === this.sessionState.provider;
+                    const countLabel = `${option.modelCount} model${option.modelCount === 1 ? '' : 's'}`;
+                    const latestLabel = option.latestModel ? theme.success(` (latest: ${option.latestModel})`) : '';
+                    const label = this.colorizeDropdownLine(`${index + 1}. ${option.label} — ${countLabel}${latestLabel}`, index);
+                    const suffix = isCurrent ? ` ${theme.primary('• current')}` : '';
+                    return `${label}${suffix}`;
+                }),
+                'Type the number of the provider to continue, or type "cancel".',
+            ];
+            display.showSystemMessage(lines.join('\n'));
             this.pendingInteraction = { type: 'model-provider', options: providerOptions };
-            this.renderProviderMenu(providerOptions);
         }
         catch (error) {
+            display.showError('Failed to load model list. Try again in a moment.', error);
             this.pendingInteraction = null;
-            this.showInlineMenu('Model provider', [theme.error('Failed to load model list. Try again in a moment.')], 'error');
+            this.terminalInput.render();
         }
     }
     buildProviderOptions() {
@@ -3815,21 +3788,6 @@ export class InteractiveShell {
             };
         });
     }
-    renderProviderMenu(options, hint) {
-        const lines = [
-            theme.bold('Select a provider:'),
-            ...options.map((option, index) => {
-                const isCurrent = option.provider === this.sessionState.provider;
-                const countLabel = `${option.modelCount} model${option.modelCount === 1 ? '' : 's'}`;
-                const latestLabel = option.latestModel ? theme.success(` (latest: ${option.latestModel})`) : '';
-                const label = this.colorizeDropdownLine(`${index + 1}. ${option.label} — ${countLabel}${latestLabel}`, index);
-                const suffix = isCurrent ? ` ${theme.primary('• current')}` : '';
-                return `${label}${suffix}`;
-            }),
-            'Type the number of the provider to continue, or type "cancel".',
-        ];
-        this.showInlineMenu('Model provider', lines, 'info', hint);
-    }
     showProviderModels(option) {
         // Start with static presets
         const staticModels = MODEL_PRESETS.filter((preset) => preset.provider === option.provider);
@@ -3869,17 +3827,13 @@ export class InteractiveShell {
             }
         }
         if (!allModels.length) {
-            this.showInlineMenu('Model selection', [theme.warning(`No models available for ${option.label}.`)], 'warning');
+            display.showWarning(`No models available for ${option.label}.`);
             this.pendingInteraction = null;
             return;
         }
-        this.renderModelSelection(allModels, option, null);
-        this.pendingInteraction = { type: 'model', provider: option.provider, options: allModels };
-    }
-    renderModelSelection(models, option, hint) {
         const lines = [
             theme.bold(`Select a model from ${option.label}:`),
-            ...models.map((preset, index) => {
+            ...allModels.map((preset, index) => {
                 const isCurrent = preset.id === this.sessionState.model;
                 const isLatest = preset.id === option.latestModel;
                 const latestBadge = isLatest ? theme.success(' ★ LATEST') : '';
@@ -3890,23 +3844,11 @@ export class InteractiveShell {
             }),
             'Type the number of the model to select it, type "back" to change provider, or type "cancel".',
         ];
-        this.showInlineMenu('Model selection', lines, 'info', hint ?? undefined);
-    }
-    buildProviderContext(provider, models) {
-        return {
-            provider,
-            label: this.providerLabel(provider),
-            modelCount: models.length,
-            latestModel: models[0]?.id,
-            discoveredModels: [],
-        };
+        display.showSystemMessage(lines.join('\n'));
+        this.pendingInteraction = { type: 'model', provider: option.provider, options: allModels };
     }
     showSecretsMenu() {
         const definitions = listSecretDefinitions();
-        this.pendingInteraction = { type: 'secret-select', options: definitions };
-        this.renderSecretsMenu(definitions);
-    }
-    renderSecretsMenu(definitions, hint) {
         const lines = [
             theme.bold('Manage Secrets:'),
             ...definitions.map((definition, index) => {
@@ -3918,18 +3860,8 @@ export class InteractiveShell {
             }),
             'Enter the number to update a key, or type "cancel".',
         ];
-        this.showInlineMenu('Secrets', lines, 'info', hint);
-    }
-    renderSecretInput(secret, hint) {
-        const value = getSecretValue(secret.id);
-        const status = value ? maskSecret(value) : theme.warning('not set');
-        const providers = secret.providers.map((id) => this.providerLabel(id)).join(', ');
-        const lines = [
-            `${secret.label} (${providers})`,
-            `Current: ${status}`,
-            'Enter a new value or type "cancel".',
-        ];
-        this.showInlineMenu('Update secret', lines, 'info', hint);
+        display.showSystemMessage(lines.join('\n'));
+        this.pendingInteraction = { type: 'secret-select', options: definitions };
     }
     showToolsMenu() {
         const options = getToolToggleOptions();
@@ -4309,23 +4241,26 @@ export class InteractiveShell {
         }
         const trimmed = input.trim();
         if (!trimmed) {
-            this.renderProviderMenu(pending.options, 'Enter a number or type cancel.');
+            display.showWarning('Enter a number or type cancel.');
+            this.terminalInput.render();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
-            this.clearInlineMenu();
-            this.updateStatusMessage('Model selection cancelled.');
+            display.showInfo('Model selection cancelled.');
+            this.terminalInput.render();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
-            this.renderProviderMenu(pending.options, 'Please enter a valid number.');
+            display.showWarning('Please enter a valid number.');
+            this.terminalInput.render();
             return;
         }
         const option = pending.options[choice - 1];
         if (!option) {
-            this.renderProviderMenu(pending.options, 'That option is not available.');
+            display.showWarning('That option is not available.');
+            this.terminalInput.render();
             return;
         }
         this.showProviderModels(option);
@@ -4336,10 +4271,10 @@ export class InteractiveShell {
         if (!pending || pending.type !== 'model') {
             return;
         }
-        const providerContext = this.buildProviderContext(pending.provider, pending.options);
         const trimmed = input.trim();
         if (!trimmed) {
-            this.renderModelSelection(pending.options, providerContext, 'Enter a number, type "back", or type "cancel".');
+            display.showWarning('Enter a number, type "back", or type "cancel".');
+            this.terminalInput.render();
             return;
         }
         if (trimmed.toLowerCase() === 'back') {
@@ -4349,18 +4284,20 @@ export class InteractiveShell {
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
-            this.clearInlineMenu();
-            this.updateStatusMessage('Model selection cancelled.');
+            display.showInfo('Model selection cancelled.');
+            this.terminalInput.render();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
-            this.renderModelSelection(pending.options, providerContext, 'Please enter a valid number.');
+            display.showWarning('Please enter a valid number.');
+            this.terminalInput.render();
             return;
         }
         const preset = pending.options[choice - 1];
         if (!preset) {
-            this.renderModelSelection(pending.options, providerContext, 'That option is not available.');
+            display.showWarning('That option is not available.');
+            this.terminalInput.render();
             return;
         }
         this.pendingInteraction = null;
@@ -4384,14 +4321,11 @@ export class InteractiveShell {
         };
         this.applyPresetReasoningDefaults();
         if (this.rebuildAgent()) {
-            this.showInlineMenu('Model updated', [`Switched to ${preset.label}.`], 'success');
+            display.showInfo(`Switched to ${preset.label}.`);
             this.refreshBannerSessionInfo();
             this.persistSessionPreference();
             this.resetChatBoxAfterModelSwap();
         }
-        else {
-            this.showInlineMenu('Model updated', [`Using ${preset.label}.`], 'info');
-        }
     }
     async handleSecretSelection(input) {
         const pending = this.pendingInteraction;
@@ -4400,27 +4334,30 @@ export class InteractiveShell {
         }
         const trimmed = input.trim();
         if (!trimmed) {
-            this.renderSecretsMenu(pending.options, 'Enter a number or type cancel.');
+            display.showWarning('Enter a number or type cancel.');
+            this.terminalInput.render();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
-            this.clearInlineMenu();
-            this.updateStatusMessage('Secret management cancelled.');
+            display.showInfo('Secret management cancelled.');
+            this.terminalInput.render();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
-            this.renderSecretsMenu(pending.options, 'Please enter a valid number.');
+            display.showWarning('Please enter a valid number.');
+            this.terminalInput.render();
             return;
         }
         const secret = pending.options[choice - 1];
         if (!secret) {
-            this.renderSecretsMenu(pending.options, 'That option is not available.');
+            display.showWarning('That option is not available.');
+            this.terminalInput.render();
             return;
         }
+        display.showSystemMessage(`Enter a new value for ${secret.label} or type "cancel".`);
         this.pendingInteraction = { type: 'secret-input', secret };
-        this.renderSecretInput(secret);
         this.terminalInput.render();
     }
     async handleSecretInput(input) {
@@ -4430,20 +4367,20 @@ export class InteractiveShell {
         }
         const trimmed = input.trim();
         if (!trimmed) {
-            this.renderSecretInput(pending.secret, 'Enter a value or type cancel.');
+            display.showWarning('Enter a value or type cancel.');
+            this.terminalInput.render();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             this.pendingSecretRetry = null;
-            this.clearInlineMenu();
-            this.updateStatusMessage('Secret unchanged.');
+            display.showInfo('Secret unchanged.');
             this.terminalInput.render();
             return;
         }
         try {
             setSecretValue(pending.secret.id, trimmed);
-            this.showInlineMenu('Secret updated', [`${pending.secret.label} saved.`], 'success');
+            display.showInfo(`${pending.secret.label} updated.`);
             this.pendingInteraction = null;
             const deferred = this.pendingSecretRetry;
             this.pendingSecretRetry = null;
@@ -4458,7 +4395,7 @@ export class InteractiveShell {
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            this.showInlineMenu('Secret error', [message], 'error');
+            display.showError(message);
             this.pendingInteraction = null;
             this.pendingSecretRetry = null;
         }
@@ -4496,10 +4433,8 @@ export class InteractiveShell {
         this.setProcessingStatus();
         let responseText = '';
         try {
-            this.captureToolHistoryOffset();
             // Start streaming - no header needed, the input area already provides context
-            const heartbeatLabel = this.batchedOutputMode ? 'Processing response' : 'Streaming response';
-            this.startStreamingHeartbeat(heartbeatLabel);
+            this.startStreamingHeartbeat('Streaming response');
             responseText = await agent.send(request, true);
             await this.awaitPendingCleanup();
             this.captureHistorySnapshot();
@@ -4615,8 +4550,7 @@ export class InteractiveShell {
         this.uiAdapter.startProcessing('Continuous execution mode');
         this.setProcessingStatus();
         // No streaming header - just start streaming directly
-        const continuousLabel = this.batchedOutputMode ? 'Processing' : 'Streaming';
-        this.startStreamingHeartbeat(continuousLabel);
+        this.startStreamingHeartbeat('Streaming');
         let iteration = 0;
         let lastResponse = '';
         let consecutiveNoProgress = 0;
@@ -4644,11 +4578,9 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`;
                 display.showSystemMessage(`\n📍 Iteration ${iteration}/${MAX_ITERATIONS}`);
                 this.updateStatusMessage(`Working on iteration ${iteration}...`);
                 try {
-                    this.captureToolHistoryOffset();
-                    // Send the request and capture the response as a single block
+                    // Send the request and capture the response (streaming disabled)
                     display.showThinking('Responding...');
                     this.refreshStatusLine(true);
-                    this.resetStreamBuffer();
                     const response = await agent.send(currentPrompt, true);
                     await this.awaitPendingCleanup();
                     this.captureHistorySnapshot();
@@ -5149,7 +5081,6 @@ What's the next action?`;
             // Send the error to the agent for fixing
             display.showThinking('Analyzing build errors');
             this.refreshStatusLine(true);
-            this.resetStreamBuffer();
             const response = await this.agent.send(prompt, true);
             display.stopThinking();
             this.refreshStatusLine(true);
@@ -5179,37 +5110,30 @@ What's the next action?`;
             };
             this.agent = this.runtimeSession.createAgent(selection, {
                 onStreamChunk: (chunk) => {
-                    if (this.batchedOutputMode) {
-                        this.captureStreamChunk(chunk);
-                        return;
-                    }
                     // Stream output using clean streamContent() - chat box floats below
                     this.terminalInput.streamContent(chunk);
                 },
                 onStreamFallback: (info) => this.handleStreamingFallback(info),
                 onAssistantMessage: (content, metadata) => {
                     const enriched = this.buildDisplayMetadata(metadata);
-                    const alreadyStreamedToUi = !this.batchedOutputMode && metadata.wasStreamed;
-                    const bufferedContent = this.consumeStreamBuffer(content);
                     // Update spinner based on message type
                     if (metadata.isFinal) {
-                        const parsed = this.splitThinkingResponse(bufferedContent);
-                        const finalContent = parsed?.response?.trim() || bufferedContent.trim();
-                        const thinkingContent = parsed?.thinking?.trim() || null;
-                        const toolsUsed = this.getToolNamesSinceOffset();
-                        if (thinkingContent) {
-                            const summary = this.extractThoughtSummary(thinkingContent);
-                            if (summary) {
-                                display.updateThinking(`💭 ${summary}`);
+                        // Skip display if content was already streamed to avoid double-display
+                        if (!metadata.wasStreamed) {
+                            const parsed = this.splitThinkingResponse(content);
+                            if (parsed?.thinking) {
+                                const summary = this.extractThoughtSummary(parsed.thinking);
+                                if (summary) {
+                                    display.updateThinking(`💭 ${summary}`);
+                                }
+                                display.showAssistantMessage(parsed.thinking, { ...enriched, isFinal: false });
+                            }
+                            const finalContent = parsed?.response?.trim() || content;
+                            if (finalContent) {
+                                display.showAssistantMessage(finalContent, enriched);
                             }
                         }
-                        if (thinkingContent || finalContent) {
-                            display.showThoughtAndResponse({
-                                thinking: thinkingContent,
-                                response: finalContent || null,
-                                metadata: { ...enriched, isFinal: true, toolsUsed },
-                            });
-                        }
+                        // Status shown in mode controls bar - no separate status line needed
                         display.stopThinking();
                         // Update context usage for mode controls display
                         if (enriched.contextWindowTokens && metadata.usage) {
@@ -5228,13 +5152,8 @@ What's the next action?`;
                         // Stop spinner and show the narrative text directly
                         display.stopThinking();
                         // Skip display if content was already streamed to avoid double-display
-                        if (!alreadyStreamedToUi) {
-                            const parsed = this.splitThinkingResponse(bufferedContent);
-                            const thoughtContent = parsed?.thinking ?? parsed?.response ?? bufferedContent;
-                            const trimmed = thoughtContent.trim();
-                            if (trimmed) {
-                                display.showThinkingBlock(trimmed, enriched.elapsedMs ?? this.currentRunElapsedMs());
-                            }
+                        if (!metadata.wasStreamed) {
+                            display.showNarrative(content.trim());
                         }
                         // The isProcessing flag already shows "⏳ Processing..." - no need for duplicate status
                         this.requestPromptRefresh();
@@ -5587,25 +5506,6 @@ What's the next action?`;
             return false;
         }
     }
-    captureToolHistoryOffset() {
-        this.toolHistoryOffset = this.runtimeSession.toolRuntime.getToolHistory?.().length ?? 0;
-    }
-    getToolNamesSinceOffset() {
-        const history = this.runtimeSession.toolRuntime.getToolHistory?.();
-        if (!history?.length) {
-            return [];
-        }
-        const start = Math.max(0, this.toolHistoryOffset);
-        const recent = history.slice(start);
-        const names = [];
-        for (const entry of recent) {
-            const name = entry.toolName;
-            if (name && !names.includes(name)) {
-                names.push(name);
-            }
-        }
-        return names;
-    }
     getContextWarningLevel(percentage) {
         if (percentage >= 90) {
             return 'danger';
@@ -5812,12 +5712,7 @@ What's the next action?`;
         const reason = info.reason ? ` (${info.reason.replace(/-/g, ' ')})` : '';
         const partialNote = info.partialResponse ? ' Received partial stream before failure.' : '';
         display.showWarning(`Streaming failed${reason}, retrying without streaming.${detail}${partialNote}`);
-        const bufferedPartial = this.consumeStreamBuffer(info.partialResponse ?? '');
-        if (this.batchedOutputMode && bufferedPartial.trim()) {
-            display.showThinkingBlock(bufferedPartial.trim(), this.currentRunElapsedMs());
-        }
-        const fallbackLabel = this.batchedOutputMode ? 'Retrying (batched)' : 'Fallback in progress';
-        this.startStreamingHeartbeat(fallbackLabel);
+        this.startStreamingHeartbeat('Fallback in progress');
         this.requestPromptRefresh(true);
     }
     handleProviderError(error, retryAction) {
@@ -5828,9 +5723,9 @@ What's the next action?`;
         this.handleApiKeyIssue(apiKeyIssue, retryAction);
         return true;
     }
-    handleApiKeyIssue(info, retryAction, contextLabel) {
+    handleApiKeyIssue(info, retryAction) {
         const secret = info.secret ?? null;
-        const providerLabel = contextLabel ?? (info.provider ? this.providerLabel(info.provider) : 'the selected provider');
+        const providerLabel = info.provider ? this.providerLabel(info.provider) : 'the selected provider';
         if (!secret) {
             this.pendingSecretRetry = null;
             const guidance = 'Run "/secrets" to configure the required API key or export it (e.g., EXPORT KEY=value) before launching the CLI.';
@@ -5852,10 +5747,6 @@ What's the next action?`;
         this.pendingInteraction = { type: 'secret-input', secret };
         this.showSecretGuidance(secret, isMissing);
     }
-    handleToolApiKeyIssue(info, call) {
-        const label = call?.name ? `${call.name} tool` : 'web tools';
-        this.handleApiKeyIssue(info, undefined, label);
-    }
     showSecretGuidance(secret, promptForInput) {
         const lines = [];
         if (promptForInput) {
@@ -5865,7 +5756,7 @@ What's the next action?`;
             lines.push(`Update the stored value for ${secret.label} or type "cancel".`);
         }
         lines.push(`Tip: run "/secrets" anytime to manage credentials or export ${secret.envVar}=<value> before launching the CLI.`);
-        this.showInlineMenu('Secrets', lines, promptForInput ? 'warning' : 'info');
+        display.showSystemMessage(lines.join('\n'));
     }
     colorizeDropdownLine(text, index) {
         if (!DROPDOWN_COLORS.length) {