erosolar-cli 1.7.413 → 1.7.415

package/dist/shell/interactiveShell.js

@@ -125,6 +125,7 @@ export class InteractiveShell {
     planApprovalBridgeRegistered = false;
     contextCompactionInFlight = false;
     contextCompactionLog = [];
+    bannerShown = false;
     lastContextWarningLevel = null;
     sessionPreferences;
     autosaveEnabled;
@@ -390,14 +391,16 @@ export class InteractiveShell {
         const banner = [header, profileLine, workspaceLine, versionLine, hintLine, renderDivider(width)]
             .filter(Boolean)
             .join('\n');
-        if (!force && this.launchBannerText) {
+        if (this.bannerShown && !force) {
             return;
         }
         if (this.launchBannerText === banner) {
             return;
         }
         display.stream(`${banner}\n`);
+        this.bannerShown = true;
         this.launchBannerText = banner;
+        this.requestPromptRefresh(true);
     }
     async start(initialPrompt) {
         this.renderWelcomeBanner();
@@ -749,7 +752,7 @@ export class InteractiveShell {
             : null;
         // Stop any active spinner to prevent process hang
         display.stopThinking(false);
-        this.stopStreamingHeartbeat();
+        this.stopStreamingHeartbeat('quit', { quiet: true });
         this.endAiRuntime();
         this.uiUpdates.dispose();
         this.clearPromptRefreshTimer();
@@ -758,8 +761,6 @@ export class InteractiveShell {
         setGlobalAIEnhancer(null);
         // Clear any pending cleanup to prevent hanging
         this.pendingCleanup = null;
-        // Reset terminal state before disposing adapters
-        this.terminalInput.exitStreamingScrollRegion();
         if (this.alternateScreenEnabled) {
             this.terminalInput.exitAlternateScreen();
         }
@@ -1323,7 +1324,7 @@ export class InteractiveShell {
         }
     }
     startStreamingHeartbeat(label = 'Streaming') {
-        this.stopStreamingHeartbeat();
+        this.stopStreamingHeartbeat('complete', { quiet: true });
         // Enter global streaming mode - blocks all non-streaming UI output
         enterStreamingMode();
         // Set up scroll region for streaming content
@@ -1361,7 +1362,8 @@ export class InteractiveShell {
             },
         });
     }
-    stopStreamingHeartbeat() {
+    stopStreamingHeartbeat(reason = 'complete', options = {}) {
+        const quiet = options.quiet === true;
         // Exit global streaming mode - allows UI to render again
         exitStreamingMode();
         // Preserve final elapsed time before clearing heartbeat start
@@ -1369,7 +1371,11 @@ export class InteractiveShell {
             this.lastStreamingElapsedSeconds = Math.max(0, Math.floor((Date.now() - this.streamingHeartbeatStart) / 1000));
         }
         // Exit scroll region mode
-        this.terminalInput.exitStreamingScrollRegion();
+        const exitOptions = {
+            renderPrompt: !quiet,
+            statusMessage: quiet ? null : undefined,
+        };
+        this.terminalInput.exitStreamingScrollRegion(exitOptions);
         this.uiUpdates.stopHeartbeat('streaming');
         this.streamingHeartbeatStart = null;
         this.streamingHeartbeatFrame = 0;
@@ -1378,8 +1384,15 @@ export class InteractiveShell {
         this.terminalInput.setStreamingLabel(null);
         // Clear streaming status from display
         display.updateStreamingStatus(null);
+        // Emit a streaming note for stop/quit so the status stays inside the stream
+        if (reason === 'stop' || reason === 'quit') {
+            const note = reason === 'quit' ? 'Session closed.' : 'Stream stopped.';
+            this.finishStreamingFormatter(note, { refreshPrompt: !quiet });
+        }
         // Force refresh to update the input area now that streaming has ended
-        this.refreshStatusLine(true);
+        if (!quiet) {
+            this.refreshStatusLine(true);
+        }
     }
     handleStreamChunk(chunk) {
         if (!chunk) {
@@ -1399,7 +1412,7 @@ export class InteractiveShell {
             this.terminalInput.streamContent(formatted);
         }
     }
-    finishStreamingFormatter(note) {
+    finishStreamingFormatter(note, options) {
         if (!this.streamingFormatter) {
             return;
         }
@@ -1409,7 +1422,9 @@ export class InteractiveShell {
         }
         this.streamingFormatter = null;
         // Force the prompt to re-render after streaming so it stays below the last response
-        this.requestPromptRefresh(true);
+        if (options?.refreshPrompt ?? true) {
+            this.requestPromptRefresh(true);
+        }
     }
     buildStreamingStatus(label, _elapsedSeconds) {
         // Model + elapsed time already live in the pinned meta header; keep the streaming
@@ -4652,7 +4667,7 @@ export class InteractiveShell {
             // Start streaming - no header needed, the input area already provides context
             this.startStreamingHeartbeat('Streaming response');
             responseText = await agent.send(request, true);
-            this.finishStreamingFormatter();
+            this.finishStreamingFormatter(undefined, { refreshPrompt: false });
             await this.awaitPendingCleanup();
             this.captureHistorySnapshot();
             this.autosaveIfEnabled();
@@ -4708,10 +4723,10 @@ export class InteractiveShell {
             }
         }
         finally {
-            this.finishStreamingFormatter();
+            this.finishStreamingFormatter(undefined, { refreshPrompt: false });
             display.stopThinking(false);
             this.uiUpdates.setMode('processing');
-            this.stopStreamingHeartbeat();
+            this.stopStreamingHeartbeat('complete', { quiet: true });
             this.endAiRuntime();
             this.isProcessing = false;
             this.terminalInput.setStreaming(false);
@@ -4723,7 +4738,6 @@ export class InteractiveShell {
             // CRITICAL: Ensure readline prompt is active for user input
             // Claude Code style: New prompt naturally appears at bottom
             this.ensureReadlineReady();
-            this.terminalInput.render();
             this.scheduleQueueProcessing();
             this.refreshQueueIndicators();
         }
@@ -4802,7 +4816,7 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`;
                     display.showThinking('Responding...');
                     this.refreshStatusLine(true);
                     const response = await agent.send(currentPrompt, true);
-                    this.finishStreamingFormatter();
+                    this.finishStreamingFormatter(undefined, { refreshPrompt: false });
                     await this.awaitPendingCleanup();
                     this.captureHistorySnapshot();
                     this.autosaveIfEnabled();
@@ -4935,7 +4949,7 @@ What's the next action?`;
             }
         }
         finally {
-            this.finishStreamingFormatter();
+            this.finishStreamingFormatter(undefined, { refreshPrompt: false });
             const totalElapsed = Date.now() - overallStartTime;
             const minutes = Math.floor(totalElapsed / 60000);
             const seconds = Math.floor((totalElapsed % 60000) / 1000);
@@ -4943,7 +4957,7 @@ What's the next action?`;
             // Reset completion detector for next task
             resetTaskCompletionDetector();
             this.uiUpdates.setMode('processing');
-            this.stopStreamingHeartbeat();
+            this.stopStreamingHeartbeat('complete', { quiet: true });
             this.endAiRuntime();
             this.isProcessing = false;
             this.terminalInput.setStreaming(false);
@@ -5613,10 +5627,9 @@ Return ONLY JSON array:
                     // Update UI to show operation was cancelled
                     display.showWarning('Operation cancelled.');
                     this.uiUpdates.setMode('processing');
-                    this.stopStreamingHeartbeat();
+                    this.stopStreamingHeartbeat('stop', { quiet: true });
                     this.updateStatusMessage(null);
                     this.terminalInput.setStreaming(false);
-                    this.terminalInput.render();
                 },
                 onVerificationNeeded: (response, context) => {
                     this.lastAssistantResponse = response;
@@ -5655,7 +5668,6 @@ Return ONLY JSON array:
         this.renderWelcomeBanner(true);
         this.updateStatusMessage(null);
         this.terminalInput.setStreaming(false);
-        this.terminalInput.render();
         this.ensureReadlineReady();
     }
     /**