erosolar-cli 1.7.421 → 1.7.423

package/dist/shell/interactiveShell.js

@@ -6,7 +6,6 @@ import { join } from 'node:path';
 import { display } from '../ui/display.js';
 import { isPlainOutputMode } from '../ui/outputMode.js';
 import { theme } from '../ui/theme.js';
-import { renderDivider } from '../ui/unified/layout.js';
 import { StreamingResponseFormatter } from '../ui/streamingFormatter.js';
 import { getContextWindowTokens } from '../core/contextWindow.js';
 import { ensureSecretForProvider, getSecretDefinitionForProvider, getSecretValue, listSecretDefinitions, maskSecret, setSecretValue, } from '../core/secretStore.js';
@@ -33,7 +32,7 @@ import { addToolPattern } from '../core/learningPersistence.js';
 import { classifyTaskType } from '../core/alphaZeroEngine.js';
 import { analyzeImprovementOpportunities, runSelfImprovementCycle, getImprovementSummary, runAutonomousImprovement, requestAutoImprovementStop, getAutoImprovementState, emergencyRollback, } from '../core/selfImprovement.js';
 import { listAvailablePlugins } from '../plugins/index.js';
-import { isErosolarRepo, isValidSourceRepo, getRepoName, analyzeSource, runSelfEvolution, stopEvolution, getEvolutionStatus, emergencyEvolutionRollback, learnSourcePatterns, generateFix, } from '../core/selfEvolution.js';
+import { isValidSourceRepo, getRepoName, analyzeSource, runSelfEvolution, stopEvolution, getEvolutionStatus, emergencyEvolutionRollback, learnSourcePatterns, generateFix, } from '../core/selfEvolution.js';
 import { analyzeTokenUsage, discoverModularTargets, getModularStatusDisplay, generateContextOptimizations, getGuidelines, deleteGuideline, getPendingActions, executeModularAction, } from '../core/alphaZeroModular.js';
 import { startOffsecRun, resumeOffsecRun, recordOffsecOutcome, getOffsecNextActions, simulateOffsecRollout, formatOffsecStatus, listOffsecRuns, } from '../core/offsecAlphaZero.js';
 import { generateTestFlows, detectBugs, detectUIUpdates, saveTestFlows, saveBugReports, saveUIUpdates, getTestFlowStatus, } from '../core/intelligentTestFlows.js';
@@ -77,7 +76,6 @@ const CONTEXT_AUTOCOMPACT_PERCENT = Math.round(CONTEXT_USAGE_THRESHOLD * 100);
 const CONTEXT_AUTOCOMPACT_FLOOR = 0.6;
 const MIN_COMPACTION_TOKEN_SAVINGS = 200;
 const MIN_COMPACTION_PERCENT_SAVINGS = 0.5;
-const CONTEXT_RECENT_MESSAGE_COUNT = 12;
 const CONTEXT_CLEANUP_CHARS_PER_CHUNK = 6000;
 const CONTEXT_CLEANUP_MAX_OUTPUT_TOKENS = 800;
 const CONTEXT_CLEANUP_SYSTEM_PROMPT = `Summarize earlier IDE collaboration so the agent can keep working.
@@ -125,7 +123,6 @@ export class InteractiveShell {
     planApprovalBridgeRegistered = false;
     contextCompactionInFlight = false;
     contextCompactionLog = [];
-    bannerShown = false;
     lastContextWarningLevel = null;
     sessionPreferences;
     autosaveEnabled;
@@ -173,9 +170,10 @@ export class InteractiveShell {
     statusMessageOverride = null;
     promptRefreshTimer = null;
     launchPaletteShown = false;
-    launchBannerText = null;
     version;
     alternateScreenEnabled;
+    welcomeShown = false;
+    scrollbackRestored = false;
     constructor(config) {
         this.profile = config.profile;
         this.profileLabel = config.profileLabel;
@@ -348,6 +346,7 @@ export class InteractiveShell {
                 // Restore scrollback buffer if available
                 if (stored.scrollbackBuffer && Array.isArray(stored.scrollbackBuffer)) {
                     this.terminalInput.loadScrollbackBuffer(stored.scrollbackBuffer);
+                    this.scrollbackRestored = true;
                 }
                 return;
             }
@@ -365,6 +364,7 @@ export class InteractiveShell {
                 // Restore scrollback buffer if available
                 if (autosave.scrollbackBuffer && Array.isArray(autosave.scrollbackBuffer)) {
                     this.terminalInput.loadScrollbackBuffer(autosave.scrollbackBuffer);
+                    this.scrollbackRestored = true;
                 }
                 return;
             }
@@ -379,29 +379,35 @@ export class InteractiveShell {
         display.showInfo(this.sessionResumeNotice);
         this.sessionResumeNotice = null;
     }
-    renderWelcomeBanner(force = false) {
-        const header = `${theme.fields.model(this.sessionState.model)} ${theme.ui.muted('@')} ${theme.fields.agent(this.providerLabel(this.sessionState.provider))}`;
+    showWelcomeBanner(force = false) {
+        if ((this.welcomeShown || this.scrollbackRestored) && !force) {
+            return;
+        }
+        const header = theme.gradient.primary('Erosolar CLI');
+        const modelLine = `${theme.fields.model(this.sessionState.model)} ${theme.ui.muted('@')} ${theme.fields.agent(this.providerLabel(this.sessionState.provider))}`;
         const profileLine = `${theme.fields.profile(this.profileLabel)} ${theme.ui.muted(`(${this.profile})`)}`;
         const workspaceLine = theme.fields.workspace(this.workingDir);
         const versionLine = this.version ? theme.ui.muted(`v${this.version} · support@ero.solar`) : null;
         const hintLine = theme.ui.muted('/help for commands · /model to switch · /secrets for keys');
-        const width = output.columns ?? 80;
-        const banner = [header, profileLine, workspaceLine, versionLine, hintLine, renderDivider(width)]
+        const message = [header, modelLine, profileLine, workspaceLine, versionLine, hintLine]
             .filter(Boolean)
             .join('\n');
-        if (this.bannerShown && !force) {
-            return;
-        }
-        if (this.launchBannerText === banner) {
+        this.streamEventBlock(message);
+        this.welcomeShown = true;
+        this.requestPromptRefresh(true);
+    }
+    /**
+     * Stream a content block as a single event, isolating it from adjacent output.
+     */
+    streamEventBlock(content) {
+        const normalized = content.replace(/\s+$/u, '');
+        if (!normalized) {
             return;
         }
-        display.stream(`${banner}\n`);
-        this.bannerShown = true;
-        this.launchBannerText = banner;
-        this.requestPromptRefresh(true);
+        this.terminalInput.streamContent(`\n${normalized}\n\n`);
     }
     async start(initialPrompt) {
-        this.renderWelcomeBanner();
+        this.showWelcomeBanner();
         if (initialPrompt) {
             await this.processInputBlock(initialPrompt);
             return;
@@ -579,11 +585,11 @@ export class InteractiveShell {
         if (!changed && source === 'shortcut') {
             return;
         }
-        display.showInfo(`Auto-continue ${this.autoContinueEnabled ? 'enabled' : 'disabled'}. ` +
-            (this.autoContinueEnabled
-                ? 'The model will be auto-prompted to continue when it expresses intent but does not use tools.'
-                : 'The model will not be auto-prompted to continue.') +
-            ' Toggle with Ctrl+Shift+C.');
+        const modeLabel = this.autoContinueEnabled ? 'enabled' : 'disabled';
+        const behavior = this.autoContinueEnabled
+            ? 'The model will be auto-prompted to continue when it expresses intent but does not use tools.'
+            : 'The model will not be auto-prompted to continue.';
+        display.showInfo(`Auto-continue ${modeLabel}. ${behavior} Toggle with Ctrl+Shift+C.`);
     }
     /**
      * Cycle through thinking modes (Tab shortcut).
@@ -1297,9 +1303,9 @@ export class InteractiveShell {
         }
         this.lastLoggedPrompt = normalized;
         this.lastLoggedPromptAt = now;
-        // Format with user prompt prefix and write to scroll region
-        const formatted = `${theme.user('>')} ${normalized}\n`;
-        this.terminalInput.writeToScrollRegion(formatted);
+        // Format with user prompt prefix and stream as its own event
+        const formatted = `${theme.user('>')} ${normalized}`;
+        this.streamEventBlock(formatted);
     }
     requestPromptRefresh(force = false) {
         if (force) {
@@ -1384,7 +1390,10 @@ export class InteractiveShell {
         // 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: false });
+            this.finishStreamingFormatter(note, {
+                refreshPrompt: false,
+                mode: reason,
+            });
         }
         // Force refresh to update the input area now that streaming has ended
         if (!quiet) {
@@ -1414,7 +1423,10 @@ export class InteractiveShell {
         if (!this.streamingFormatter) {
             return;
         }
-        const closing = this.streamingFormatter.finish(note);
+        const closing = this.streamingFormatter.finish({
+            note,
+            mode: options?.mode ?? 'complete',
+        });
         if (closing) {
             this.terminalInput.streamContent(closing);
         }
@@ -1710,7 +1722,6 @@ export class InteractiveShell {
                 this.showAlphaZeroMetrics();
                 break;
             case '/suggestions':
-            case '/improve':
                 this.showImprovementSuggestions();
                 break;
             case '/plugins':
@@ -2137,7 +2148,7 @@ export class InteractiveShell {
         lines.push(theme.bold('Session File Changes'));
         lines.push('');
         lines.push(`${theme.info('•')} ${summary.files} file${summary.files === 1 ? '' : 's'} modified`);
-        lines.push(`${theme.info('•')} ${theme.success('+' + summary.additions)} ${theme.error('-' + summary.removals)} lines`);
+        lines.push(`${theme.info('•')} ${theme.success(`+${summary.additions}`)} ${theme.error(`-${summary.removals}`)} lines`);
         lines.push('');
         // Group changes by file
         const fileMap = new Map();
@@ -2161,7 +2172,7 @@ export class InteractiveShell {
             if (stats.writes > 0)
                 operations.push(`${stats.writes} write${stats.writes === 1 ? '' : 's'}`);
             const opsText = operations.join(', ');
-            const diffText = `${theme.success('+' + stats.additions)} ${theme.error('-' + stats.removals)}`;
+            const diffText = `${theme.success(`+${stats.additions}`)} ${theme.error(`-${stats.removals}`)}`;
             lines.push(`  ${theme.dim(path)}`);
             lines.push(`    ${opsText} • ${diffText}`);
         }
@@ -2618,7 +2629,7 @@ export class InteractiveShell {
         if (!isValidSourceRepo(this.workingDir)) {
             display.showWarning('Self-evolution requires a git repository with source code.');
             display.showSystemMessage('');
-            display.showSystemMessage('Current directory: ' + this.workingDir);
+            display.showSystemMessage(`Current directory: ${this.workingDir}`);
             display.showSystemMessage('');
             display.showSystemMessage('Requirements:');
             display.showSystemMessage('  • Must be a git repository (.git folder)');
@@ -2628,7 +2639,6 @@ export class InteractiveShell {
             return;
         }
         const repoName = getRepoName(this.workingDir);
-        const isErosolar = isErosolarRepo(this.workingDir);
         if (subcommand === 'analyze') {
             display.showSystemMessage(theme.gradient.primary(`🔍 Analyzing ${repoName} Source Code...`));
             display.showSystemMessage('');
@@ -3000,13 +3010,6 @@ export class InteractiveShell {
             '       /offsec win|fail|detect <actionId> [note]\n' +
             '       /offsec resume <runId>\n' +
             '       /offsec runs';
-        const loadRun = (explicitId) => {
-            const run = resumeOffsecRun(explicitId ?? this.offsecRunId);
-            if (!run) {
-                display.showWarning('No offsec run found. Start one with /offsec start "<objective>".');
-            }
-            return run;
-        };
         if (sub === 'start') {
             const rest = args.slice(1);
             const scope = [];
@@ -3445,8 +3448,7 @@ export class InteractiveShell {
         const value = tokens[0]?.toLowerCase();
         if (!value) {
             // Show current status
-            display.showInfo(`Auto-continue is ${this.autoContinueEnabled ? 'enabled' : 'disabled'}. ` +
-                `Use /autocontinue on|off or Ctrl+Shift+C to toggle.`);
+            display.showInfo(`Auto-continue is ${this.autoContinueEnabled ? 'enabled' : 'disabled'}. Use /autocontinue on|off or Ctrl+Shift+C to toggle.`);
             return;
         }
         if (value !== 'on' && value !== 'off') {
@@ -3456,7 +3458,7 @@ export class InteractiveShell {
         this.setAutoContinueMode(value === 'on', 'command');
     }
     // ==================== Claude Code Style Commands ====================
-    async handleRewindCommand(input) {
+    async handleRewindCommand(_input) {
         const lines = [];
         lines.push(theme.bold('Rewind / Checkpoint System'));
         lines.push('');
@@ -3472,7 +3474,7 @@ export class InteractiveShell {
         lines.push(theme.ui.muted('Press Esc+Esc for quick access to the rewind menu'));
         display.showSystemMessage(lines.join('\n'));
     }
-    handleMemoryCommand(input) {
+    handleMemoryCommand(_input) {
         const lines = [];
         lines.push(theme.bold('Memory System (EROSOLAR.md)'));
         lines.push('');
@@ -3513,7 +3515,7 @@ export class InteractiveShell {
         lines.push(theme.ui.muted('Vim mode is experimental. Toggle with /vim'));
         display.showSystemMessage(lines.join('\n'));
     }
-    handleOutputStyleCommand(input) {
+    handleOutputStyleCommand(_input) {
         const lines = [];
         lines.push(theme.bold('Output Styles'));
         lines.push('');
@@ -3634,7 +3636,7 @@ export class InteractiveShell {
             }
         }
     }
-    handleExportCommand(input) {
+    handleExportCommand(_input) {
         const lines = [];
         lines.push(theme.bold('Export Conversation'));
         lines.push('');
@@ -4227,7 +4229,7 @@ export class InteractiveShell {
                     const parts = tool.name.split('__');
                     const serverName = parts[1] || '';
                     const toolName = parts.slice(2).join('__') || tool.name;
-                    lines.push(`  ${theme.info('•')} ${theme.ui.muted(serverName + ':')} ${toolName}`);
+                    lines.push(`  ${theme.info('•')} ${theme.ui.muted(`${serverName}:`)} ${toolName}`);
                 }
                 if (mcpTools.length > 15) {
                     lines.push(`  ${theme.ui.muted(`... and ${mcpTools.length - 15} more`)}`);
@@ -4688,7 +4690,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(undefined, { refreshPrompt: false });
+            this.finishStreamingFormatter(undefined, { refreshPrompt: false, mode: 'complete' });
             await this.awaitPendingCleanup();
             this.captureHistorySnapshot();
             this.autosaveIfEnabled();
@@ -4744,7 +4746,7 @@ export class InteractiveShell {
             }
         }
         finally {
-            this.finishStreamingFormatter(undefined, { refreshPrompt: false });
+            this.finishStreamingFormatter(undefined, { refreshPrompt: false, mode: 'complete' });
             display.stopThinking(false);
             this.uiUpdates.setMode('processing');
             this.stopStreamingHeartbeat('complete', { quiet: true });
@@ -4753,7 +4755,6 @@ export class InteractiveShell {
             this.terminalInput.setStreaming(false);
             this.uiAdapter.endProcessing('Ready for prompts');
             this.setIdleStatus();
-            display.newLine();
             this.updateStatusMessage(null);
             queueMicrotask(() => this.uiUpdates.setMode('idle'));
             // CRITICAL: Ensure readline prompt is active for user input
@@ -4837,7 +4838,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(undefined, { refreshPrompt: false });
+                    this.finishStreamingFormatter(undefined, { refreshPrompt: false, mode: 'complete' });
                     await this.awaitPendingCleanup();
                     this.captureHistorySnapshot();
                     this.autosaveIfEnabled();
@@ -4970,7 +4971,7 @@ What's the next action?`;
             }
         }
         finally {
-            this.finishStreamingFormatter(undefined, { refreshPrompt: false });
+            this.finishStreamingFormatter(undefined, { refreshPrompt: false, mode: 'complete' });
             const totalElapsed = Date.now() - overallStartTime;
             const minutes = Math.floor(totalElapsed / 60000);
             const seconds = Math.floor((totalElapsed % 60000) / 1000);
@@ -4985,10 +4986,6 @@ What's the next action?`;
             this.uiAdapter.endProcessing('Ready for prompts');
             this.setIdleStatus();
             this.updateStatusMessage(null);
-            display.newLine();
-            // Claude Code style: Show unified status bar before prompt
-            // This creates consistent UI between startup and post-streaming
-            this.showUnifiedStatusBar();
             queueMicrotask(() => this.uiUpdates.setMode('idle'));
             // CRITICAL: Ensure readline prompt is active for user input
             // Claude Code style: New prompt naturally appears at bottom
@@ -5182,7 +5179,14 @@ What's the next action?`;
         return latest;
     }
     formatCommandError(error) {
-        const parts = [error?.stdout, error?.stderr, error?.message].filter((part) => typeof part === 'string' && part.trim());
+        const candidates = [];
+        if (error && typeof error === 'object') {
+            const stdout = error.stdout;
+            const stderr = error.stderr;
+            const message = error.message;
+            candidates.push(stdout, stderr, message);
+        }
+        const parts = candidates.filter((part) => typeof part === 'string' && part.trim().length > 0);
         return parts.join('\n').trim();
     }
     runAutoQualityChecks(trigger, assistantResponse, verificationContext) {
@@ -5515,7 +5519,6 @@ Return ONLY JSON array:
             display.showThinking('Analyzing build errors');
             this.refreshStatusLine(true);
             const response = await this.agent.send(prompt, true);
-            this.finishStreamingFormatter();
             display.stopThinking();
             this.refreshStatusLine(true);
             if (response) {
@@ -5528,7 +5531,7 @@ Return ONLY JSON array:
             display.showWarning('Agent could not automatically fix build errors. Please review manually.');
         }
         finally {
-            this.finishStreamingFormatter();
+            this.finishStreamingFormatter(undefined, { refreshPrompt: false, mode: 'complete' });
         }
     }
     rebuildAgent() {
@@ -5699,9 +5702,9 @@ Return ONLY JSON array:
      * Ensures the input area is visible and ready for input, just like on startup.
      */
     resetChatBoxAfterModelSwap() {
-        this.renderWelcomeBanner(true);
         this.updateStatusMessage(null);
         this.terminalInput.setStreaming(false);
+        this.requestPromptRefresh(true);
         this.ensureReadlineReady();
     }
     /**
@@ -6254,7 +6257,7 @@ Return ONLY JSON array:
         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}`);
-        this.finishStreamingFormatter('Stream interrupted - retrying without streaming');
+        this.finishStreamingFormatter('Stream interrupted - retrying without streaming', { mode: 'update' });
         this.startStreamingHeartbeat('Fallback in progress');
         this.requestPromptRefresh(true);
     }
@@ -6355,7 +6358,7 @@ Return ONLY JSON array:
         // Truncate to reasonable length
         const maxLength = 50;
         return cleaned.length > maxLength
-            ? cleaned.slice(0, maxLength - 3) + '...'
+            ? `${cleaned.slice(0, maxLength - 3)}...`
             : cleaned;
     }
     splitThinkingResponse(content) {
@@ -6520,13 +6523,15 @@ Return ONLY JSON array:
                 await this.scanLocalProviders();
                 break;
             case 'use':
-                const provider = tokens[1]?.toLowerCase();
-                if (!provider) {
-                    display.showWarning('Usage: /local use <provider>');
-                    display.showInfo('Example: /local use ollama');
-                    return;
+                {
+                    const provider = tokens[1]?.toLowerCase();
+                    if (!provider) {
+                        display.showWarning('Usage: /local use <provider>');
+                        display.showInfo('Example: /local use ollama');
+                        return;
+                    }
+                    await this.handleProviderCommand(`/provider ${provider}`);
                 }
-                await this.handleProviderCommand(`/provider ${provider}`);
                 break;
             default:
                 this.showLocalHelp();
@@ -6633,13 +6638,6 @@ Return ONLY JSON array:
     setProviderStatus(providers) {
         this.cachedProviderStatus = providers;
     }
-    /**
-     * Show the unified status bar (Claude Code style).
-     * Displays provider indicators and ready hints before the prompt.
-     */
-    showUnifiedStatusBar() {
-        display.showUnifiedStatusBar(this.cachedProviderStatus);
-    }
 }
 function setsEqual(first, second) {
     if (first.size !== second.size) {