erosolar-cli 1.7.401 → 1.7.403

package/dist/shell/interactiveShell.js

@@ -190,6 +190,7 @@ export class InteractiveShell {
     assistantStreamHeaderShown = false;
     assistantStreamBuffer = '';
     assistantStreamMetadata;
+    assistantStreamHadContent = false;
     lastRequestStartedAt = null;
     lastToolSummaryRenderedAt = null;
     constructor(config) {
@@ -329,7 +330,6 @@ export class InteractiveShell {
         }
         // Stream banner first - this sets up scroll region dynamically
         const banner = this.buildBanner();
-        this.terminalInput.setSessionFrame(this.getSessionFrameProps());
         this.terminalInput.streamContent(banner + '\n\n');
         this.rebuildAgent();
         this.setupHandlers();
@@ -913,7 +913,7 @@ export class InteractiveShell {
         // Clear any pending cleanup to prevent hanging
         this.pendingCleanup = null;
         // Reset terminal state before disposing adapters
-        this.terminalInput.exitStreamingScrollRegion();
+        this.terminalInput.exitStreamingScrollRegion({ skipRender: true });
         if (this.alternateScreenEnabled) {
             this.terminalInput.exitAlternateScreen();
         }
@@ -1361,6 +1361,14 @@ export class InteractiveShell {
         // Route through display stream so scroll regions and streaming locks stay in sync
         display.stream(content);
     }
+    resetAssistantStreamTracking() {
+        this.assistantStreamActive = false;
+        this.assistantStreamPhase = null;
+        this.assistantStreamHeaderShown = false;
+        this.assistantStreamBuffer = '';
+        this.assistantStreamMetadata = undefined;
+        this.assistantStreamHadContent = false;
+    }
     startAssistantStream(metadata) {
         if (this.assistantStreamActive) {
             this.assistantStreamMetadata = metadata ?? this.assistantStreamMetadata;
@@ -1371,6 +1379,7 @@ export class InteractiveShell {
         this.assistantStreamHeaderShown = false;
         this.assistantStreamBuffer = '';
         this.assistantStreamMetadata = metadata;
+        this.assistantStreamHadContent = false;
     }
     streamAssistantChunk(chunk) {
         if (!chunk) {
@@ -1395,7 +1404,6 @@ export class InteractiveShell {
         this.assistantStreamPhase = null;
         this.assistantStreamHeaderShown = false;
         this.assistantStreamMetadata = undefined;
-        this.enqueueAssistantStream('\n\n');
     }
     processAssistantStreamChunk(chunk) {
         this.assistantStreamBuffer += chunk;
@@ -1435,6 +1443,9 @@ export class InteractiveShell {
         if (!content) {
             return;
         }
+        if (content.trim().length > 0) {
+            this.assistantStreamHadContent = true;
+        }
         if (!this.assistantStreamPhase) {
             this.setAssistantStreamPhase('response');
         }
@@ -1528,31 +1539,57 @@ export class InteractiveShell {
     }
     renderAssistantFallback(type, content, metadata) {
         const header = this.formatAssistantHeader(type, metadata);
-        const block = `\n${header}\n${content.trimEnd()}\n\n`;
+        const compact = content.trimEnd().replace(/\n{3,}/g, '\n\n');
+        const block = `\n${header}\n${compact}\n\n`;
         this.enqueueAssistantStream(block);
     }
     formatAssistantHeader(type, metadata) {
         if (this.assistantBlocksEnabled && this.assistantBlockRenderer) {
             return this.assistantBlockRenderer.formatHeader(type, metadata);
         }
-        const label = type === 'thought' ? 'Thought' : type === 'tools' ? 'Tools' : 'Response';
+        const badges = [];
+        badges.push(this.buildAssistantTypeBadge(type));
         const timestamp = new Date().toLocaleTimeString('en-US', {
             hour12: false,
             hour: '2-digit',
             minute: '2-digit',
             second: '2-digit',
         });
-        const parts = [`${label} · ${timestamp}`];
+        badges.push({ text: timestamp, style: 'muted', icon: '🕑' });
         const total = metadata?.usage ? this.totalTokens(metadata.usage) : null;
-        if (total) {
-            parts.push(`${total} tok`);
-        }
         const windowTokens = metadata?.contextWindowTokens;
-        if (total && windowTokens) {
+        if (typeof total === 'number') {
+            badges.push({ text: `${total} tok`, style: 'muted', icon: '⎍' });
+        }
+        if (typeof total === 'number' && typeof windowTokens === 'number' && windowTokens > 0) {
             const percentage = Math.round((total / windowTokens) * 100);
-            parts.push(`${percentage}% ctx`);
+            const style = percentage > 85 ? 'error' : percentage > 70 ? 'warning' : 'info';
+            badges.push({ text: `${percentage}% ctx`, style, icon: '⊛' });
+        }
+        const elapsedBadge = this.buildElapsedBadge(metadata);
+        if (elapsedBadge) {
+            badges.push(elapsedBadge);
+        }
+        return compactRenderer.formatBadges(badges, theme.ui.muted(' │ '));
+    }
+    buildAssistantTypeBadge(type) {
+        switch (type) {
+            case 'thought':
+                return { text: 'Thought', style: 'info', icon: '💭' };
+            case 'tools':
+                return { text: 'Tools', style: 'primary', icon: '🛠' };
+            case 'response':
+            default:
+                return { text: 'Response', style: 'success', icon: '💬' };
         }
-        return parts.join(' • ');
+    }
+    buildElapsedBadge(metadata) {
+        const elapsed = metadata?.elapsedMs;
+        if (typeof elapsed !== 'number' || elapsed <= 0) {
+            return null;
+        }
+        const formatted = elapsed < 1000 ? `${Math.round(elapsed)}ms` : `${Math.round(elapsed / 1000)}s`;
+        return { text: formatted, style: 'muted', icon: '⏱' };
     }
     isStreamingUiActive() {
         return this.streamingHeartbeatStart !== null;
@@ -1714,6 +1751,7 @@ export class InteractiveShell {
         if (this.isStreamingUiActive()) {
             return run();
         }
+        this.resetAssistantStreamTracking();
         this.terminalInput.setStreaming(true);
         this.startStreamingHeartbeat(label);
         try {
@@ -4042,7 +4080,6 @@ export class InteractiveShell {
         lines.push('  /rewind code            Rewind code only (keep conversation)');
         lines.push('  /rewind conv            Rewind conversation only (keep code)');
         lines.push('');
-        lines.push(theme.ui.muted('Tip: Press Esc+Esc for quick access to rewind menu'));
         display.showSystemMessage(lines.join('\n'));
     }
     handleMemoryCommand(input) {
@@ -4061,7 +4098,6 @@ export class InteractiveShell {
         lines.push('  - Use # prefix to quickly add notes to project memory');
         lines.push('  - Import other files with @./relative/path syntax');
         lines.push('');
-        lines.push(theme.ui.muted('Tip: Create EROSOLAR.md with project coding standards for better results'));
         display.showSystemMessage(lines.join('\n'));
     }
     handleVimCommand() {
@@ -5218,6 +5254,7 @@ export class InteractiveShell {
             return;
         }
         this.hasShownThoughtProcess = false;
+        this.resetAssistantStreamTracking();
         const alphaZeroEngaged = this.alphaZeroModeEnabled;
         const alphaZeroDifficult = alphaZeroEngaged ? this.isDifficultProblem(userRequest) : false;
         const requestForAgent = alphaZeroEngaged
@@ -5441,6 +5478,7 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`;
             while (iteration < MAX_ITERATIONS) {
                 iteration++;
                 this.hasShownThoughtProcess = false;
+                this.resetAssistantStreamTracking();
                 display.showSystemMessage(`\n📍 Iteration ${iteration}/${MAX_ITERATIONS}`);
                 this.updateStatusMessage(`Working on iteration ${iteration}...`);
                 try {
@@ -5986,10 +6024,11 @@ What's the next action?`;
                     const thinking = parsed?.thinking ?? null;
                     const responseContent = parsed ? parsed.response?.trim() ?? '' : content.trim();
                     const narrativeContent = (parsed?.response ?? content).trim();
+                    const streamRendered = metadata.wasStreamed && this.assistantStreamHadContent;
                     if (thinking) {
                         this.presentThoughtProcess(thinking, enriched, {
                             wasStreamed: metadata.wasStreamed,
-                            renderWhenStreamed: blocksActive && Boolean(metadata.wasStreamed),
+                            renderWhenStreamed: !blocksActive && Boolean(metadata.wasStreamed),
                         });
                     }
                     if (metadata.isFinal) {
@@ -5997,7 +6036,7 @@ What's the next action?`;
                             this.finalizeAssistantStream();
                         }
                         const body = responseContent || content;
-                        const shouldRenderResponse = body && (blocksActive || !metadata.wasStreamed);
+                        const shouldRenderResponse = Boolean(body && (!metadata.wasStreamed || !blocksActive || !streamRendered));
                         if (shouldRenderResponse) {
                             this.renderAssistantContent('response', body, { ...enriched, isFinal: true });
                         }
@@ -6023,7 +6062,7 @@ What's the next action?`;
                         if (metadata.wasStreamed) {
                             this.finalizeAssistantStream();
                         }
-                        const shouldRenderNarrative = narrativeContent && (blocksActive || !metadata.wasStreamed);
+                        const shouldRenderNarrative = Boolean(narrativeContent && (!metadata.wasStreamed || !blocksActive || !streamRendered));
                         if (shouldRenderNarrative) {
                             this.renderAssistantContent('thought', narrativeContent, {
                                 ...enriched,
@@ -6682,7 +6721,7 @@ What's the next action?`;
         else {
             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.`);
+        lines.push(`Run "/secrets" anytime to manage credentials or export ${secret.envVar}=<value> before launching the CLI.`);
         display.showSystemMessage(lines.join('\n'));
     }
     colorizeDropdownLine(text, index) {
@@ -6831,9 +6870,7 @@ What's the next action?`;
             return;
         }
         this.refreshContextGauge();
-        this.terminalInput.setSessionFrame(this.getSessionFrameProps());
-        // Banner is no longer stored in display - it was streamed as content
-        // Model/provider changes are visible in the control bar
+        // Banner is streamed once at launch; keep the control bar up to date without re-rendering it
         if (!this.isProcessing) {
             this.setIdleStatus();
         }