erosolar-cli 1.7.404 → 1.7.405

package/dist/shell/interactiveShell.js

@@ -902,7 +902,7 @@ export class InteractiveShell {
             : null;
         // Stop any active spinner to prevent process hang
         display.stopThinking(false);
-        this.stopStreamingHeartbeat();
+        this.stopStreamingHeartbeat({ skipRender: true });
         this.uiUpdates.dispose();
         this.clearPromptRefreshTimer();
         this.teardownStatusTracking();
@@ -911,7 +911,9 @@ export class InteractiveShell {
         // Clear any pending cleanup to prevent hanging
         this.pendingCleanup = null;
         // Reset terminal state before disposing adapters
-        this.terminalInput.exitStreamingScrollRegion({ skipRender: true });
+        if (this.terminalInput.isScrollRegionActive()) {
+            this.terminalInput.exitStreamingScrollRegion({ skipRender: true });
+        }
         if (this.alternateScreenEnabled) {
             this.terminalInput.exitAlternateScreen();
         }
@@ -1021,7 +1023,7 @@ export class InteractiveShell {
         const defaults = buildEnabledToolSet(null);
         if (setsEqual(interaction.selection, defaults)) {
             clearToolSettings();
-            display.showInfo('Tool settings cleared. Defaults will be used on the next launch.');
+            display.showInfo('Tool settings cleared. Defaults will be used on the next launch. Next steps: enable any optional suites from the Tools menu or preferences (restart to apply) if you want them available by default.');
             return;
         }
         const ordered = interaction.options
@@ -1765,7 +1767,7 @@ export class InteractiveShell {
         }
     }
     startStreamingHeartbeat(label = 'Streaming') {
-        this.stopStreamingHeartbeat();
+        this.stopStreamingHeartbeat({ skipRender: true });
         // Enter global streaming mode - blocks all non-streaming UI output
         enterStreamingMode();
         this.streamingStatusBase = label;
@@ -1801,7 +1803,13 @@ export class InteractiveShell {
             },
         });
     }
-    stopStreamingHeartbeat() {
+    stopStreamingHeartbeat(options = {}) {
+        const skipRender = !!options.skipRender;
+        const streamingActive = this.isStreamingUiActive();
+        const scrollRegionActive = this.terminalInput.isScrollRegionActive();
+        if (!streamingActive && !scrollRegionActive) {
+            return;
+        }
         // Exit global streaming mode - allows UI to render again
         exitStreamingMode();
         // Preserve final elapsed time before clearing heartbeat start
@@ -1809,7 +1817,7 @@ export class InteractiveShell {
             this.lastStreamingElapsedSeconds = Math.max(0, Math.floor((Date.now() - this.streamingHeartbeatStart) / 1000));
         }
         // Exit scroll region mode
-        this.terminalInput.exitStreamingScrollRegion();
+        this.terminalInput.exitStreamingScrollRegion({ skipRender });
         this.uiUpdates.stopHeartbeat('streaming');
         this.streamingHeartbeatStart = null;
         this.streamingHeartbeatFrame = 0;
@@ -1822,7 +1830,9 @@ export class InteractiveShell {
         // Clear streaming status from display
         display.updateStreamingStatus(null);
         // Force refresh to update the input area now that streaming has ended
-        this.refreshStatusLine(true);
+        if (!skipRender) {
+            this.refreshStatusLine(true);
+        }
     }
     buildStreamingStatus(label, _elapsedSeconds) {
         // Model + elapsed time already live in the pinned meta header; keep the streaming
@@ -5391,7 +5401,7 @@ export class InteractiveShell {
             }
             display.stopThinking(false);
             this.uiUpdates.setMode('processing');
-            this.stopStreamingHeartbeat();
+            this.stopStreamingHeartbeat({ skipRender: true });
             this.isProcessing = false;
             this.terminalInput.setStreaming(false);
             this.uiAdapter.endProcessing('Ready for prompts');
@@ -6020,7 +6030,8 @@ What's the next action?`;
                     if (thinking) {
                         this.presentThoughtProcess(thinking, enriched, {
                             wasStreamed: metadata.wasStreamed,
-                            renderWhenStreamed: !blocksActive && Boolean(metadata.wasStreamed),
+                            // Always render the thought block immediately when present so it appears first.
+                            renderWhenStreamed: true,
                         });
                     }
                     if (metadata.isFinal) {
@@ -6028,8 +6039,8 @@ What's the next action?`;
                             this.finalizeAssistantStream();
                         }
                         const body = responseContent || content;
-                        const shouldRenderResponse = Boolean(body && (!metadata.wasStreamed || !blocksActive || !streamRendered));
-                        if (shouldRenderResponse) {
+                        // Always render the final response body even if it already streamed.
+                        if (body) {
                             this.renderAssistantContent('response', body, { ...enriched, isFinal: true });
                         }
                         this.renderToolUsageSummary({ ...enriched, isFinal: true });
@@ -6115,7 +6126,7 @@ What's the next action?`;
                     // Update UI to show operation was cancelled
                     display.showWarning('Operation cancelled.');
                     this.uiUpdates.setMode('processing');
-                    this.stopStreamingHeartbeat();
+                    this.stopStreamingHeartbeat({ skipRender: true });
                     this.updateStatusMessage(null);
                     this.terminalInput.setStreaming(false);
                     this.renderPromptArea();
@@ -6220,20 +6231,21 @@ What's the next action?`;
     buildThinkingDirective() {
         switch (this.thinkingMode) {
             case 'concise':
-                return 'Concise thinking mode is enabled: respond directly with the final answer and skip <thinking> blocks unless the user explicitly asks for your reasoning.';
+                return 'Concise thinking mode: respond directly with the final answer and skip <thinking> blocks unless the user explicitly asks for reasoning.';
             case 'extended':
                 return [
-                    'Extended thinking mode is enabled. Format every reply as:',
+                    'Extended thinking mode: include a <thinking> block followed by a <response> block.',
                     '<thinking>',
-                    'Detailed multi-step reasoning (reference tool runs/files when relevant, keep secrets redacted, no code blocks unless citing filenames).',
+                    'Brief, structured reasoning (cite tools/files when relevant; no secrets).',
                     '</thinking>',
                     '<response>',
-                    'Final answer with actionable next steps and any code/commands requested.',
+                    'Final answer with requested code/commands and next steps.',
                     '</response>',
                 ].join('\n');
             case 'balanced':
             default:
-                return 'Balanced thinking mode: include a short <thinking>...</thinking> block before <response> when the reasoning is non-trivial; skip it for simple answers.';
+                // Balanced is the default; avoid injecting extra prompt text to keep context lean.
+                return null;
         }
     }
     buildDisplayMetadata(metadata) {