erosolar-cli 1.7.253 → 1.7.255

package/dist/shell/interactiveShell.js

@@ -2,7 +2,7 @@ import { stdin as input, stdout as output, exit } from 'node:process';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 import { display } from '../ui/display.js';
-import { theme } from '../ui/theme.js';
+import { theme, formatUserPrompt } from '../ui/theme.js';
 import { getContextWindowTokens } from '../core/contextWindow.js';
 import { ensureSecretForProvider, getSecretDefinitionForProvider, getSecretValue, listSecretDefinitions, maskSecret, setSecretValue, } from '../core/secretStore.js';
 import { saveActiveProfilePreference, saveModelPreference, loadToolSettings, saveToolSettings, clearToolSettings, clearActiveProfilePreference, loadSessionPreferences, saveSessionPreferences, } from '../core/preferences.js';
@@ -34,7 +34,6 @@ const DROPDOWN_COLORS = [
     theme.success,
     theme.warning,
 ];
-const STREAMING_SPINNER_FRAMES = ['◐', '◓', '◑', '◒'];
 // Load MODEL_PRESETS from centralized schema
 const MODEL_PRESETS = getModels().map((model) => ({
     id: model.id,
@@ -49,13 +48,11 @@ const MODEL_PRESETS = getModels().map((model) => ({
 const BASE_SLASH_COMMANDS = getSlashCommands().map((cmd) => ({
     command: cmd.command,
     description: cmd.description,
-    category: cmd.category,
 }));
 // Load PROVIDER_LABELS from centralized schema
 const PROVIDER_LABELS = Object.fromEntries(getProviders().map((provider) => [provider.id, provider.label]));
 // Allow enough time for paste detection to kick in before flushing buffered lines
 const CONTEXT_USAGE_THRESHOLD = 0.9;
-const CONTEXT_AUTOCOMPACT_PERCENT = Math.round(CONTEXT_USAGE_THRESHOLD * 100);
 const CONTEXT_RECENT_MESSAGE_COUNT = 12;
 const CONTEXT_CLEANUP_CHARS_PER_CHUNK = 6000;
 const CONTEXT_CLEANUP_MAX_OUTPUT_TOKENS = 800;
@@ -101,7 +98,6 @@ export class InteractiveShell {
     followUpQueue = [];
     isDrainingQueue = false;
     activeContextWindowTokens = null;
-    latestTokenUsage = { used: null, limit: null };
     sessionPreferences;
     autosaveEnabled;
     autoContinueEnabled;
@@ -132,7 +128,6 @@ export class InteractiveShell {
     statusLineState = null;
     statusMessageOverride = null;
     promptRefreshTimer = null;
-    launchPaletteShown = false;
     constructor(config) {
         this.profile = config.profile;
         this.profileLabel = config.profileLabel;
@@ -166,7 +161,6 @@ export class InteractiveShell {
             this.slashCommands.push({
                 command: '/agents',
                 description: 'Select the default agent profile (applies on next launch)',
-                category: 'configuration',
             });
         }
         this.customCommands = loadCustomSlashCommands();
@@ -175,21 +169,18 @@ export class InteractiveShell {
             this.slashCommands.push({
                 command: custom.command,
                 description: `${custom.description} (custom)`,
-                category: custom.category ?? 'other',
             });
         }
         if (!this.slashCommands.some((cmd) => cmd.command === '/exit')) {
             this.slashCommands.push({
                 command: '/exit',
                 description: 'Quit the CLI immediately',
-                category: 'other',
             });
         }
         // Add /plugins command
         this.slashCommands.push({
             command: '/plugins',
             description: 'Show available and loaded plugins',
-            category: 'configuration',
         });
         this.statusTracker = config.statusTracker;
         this.ui = config.ui;
@@ -224,6 +215,9 @@ export class InteractiveShell {
         });
         // Register output interceptor for cursor positioning during streaming
         this.terminalInput.registerOutputInterceptor(display);
+        // Use flow mode: input renders inline after content for a unified layout
+        // This eliminates the blank space between banner and input area
+        this.terminalInput.setFlowMode(true);
         // Initialize Alpha Zero 2 metrics tracking
         this.alphaZeroMetrics = new MetricsTracker(`${this.profile}-${Date.now()}`);
         this.setupStatusTracking();
@@ -281,24 +275,9 @@ export class InteractiveShell {
             await this.processInputBlock(initialPrompt);
             return;
         }
-        this.showLaunchCommandPalette();
         // Ensure the terminal input is visible
         this.terminalInput.render();
     }
-    showLaunchCommandPalette() {
-        if (this.launchPaletteShown) {
-            return;
-        }
-        const palette = this.buildLaunchCommandPalette();
-        if (!palette.length) {
-            return;
-        }
-        display.showCommandPalette(palette, {
-            title: 'Quick commands',
-            intro: 'Describe a task or run a slash command to get started:',
-        });
-        this.launchPaletteShown = true;
-    }
     /**
      * TerminalInputAdapter submit handler
      */
@@ -312,8 +291,9 @@ export class InteractiveShell {
             this.handleInputChange('');
             return;
         }
-        // DON'T clear the input here - keep it visible while streaming.
-        // The input will be cleared after streaming completes in the finally block.
+        // Enter streaming mode BEFORE logging prompt - this positions cursor correctly
+        // so content appears right after the banner, not at bottom with blank space above
+        this.terminalInput.setStreaming(true);
         this.logUserPrompt(approved);
         void this.processInputBlock(approved).catch((err) => {
             display.showError(err instanceof Error ? err.message : String(err), err);
@@ -515,9 +495,10 @@ export class InteractiveShell {
         // Dispose unified UI adapter
         this.uiAdapter.dispose();
         display.newLine();
-        console.log(theme.ui.muted('━'.repeat(44)));
-        console.log(theme.ui.muted('  Goodbye! · support@ero.solar'));
-        console.log(theme.ui.muted('━'.repeat(44)));
+        console.log(theme.gradient.warm('━'.repeat(50)));
+        console.log(`  ${theme.gradient.cool('✨ Goodbye!')} ${theme.ui.muted('·')} ${theme.info('support@ero.solar')}`);
+        console.log(`  ${theme.ui.muted('Read:')} ${theme.accent('anthropic.com/news/disrupting-AI-espionage')}`);
+        console.log(theme.gradient.warm('━'.repeat(50)));
         exit(0);
     }
     /**
@@ -687,7 +668,6 @@ export class InteractiveShell {
         });
     }
     setProcessingStatus(detail) {
-        this.latestTokenUsage = { used: null, limit: this.latestTokenUsage.limit };
         this.statusTracker.setBase('Working on your request', {
             detail: this.describeStatusDetail(detail),
             tone: 'info',
@@ -707,18 +687,12 @@ export class InteractiveShell {
     }
     refreshContextGauge() {
         const tokens = getContextWindowTokens(this.sessionState.model);
-        const normalizedTokens = typeof tokens === 'number' && Number.isFinite(tokens) ? tokens : null;
-        this.activeContextWindowTokens = normalizedTokens;
-        if (normalizedTokens !== null) {
-            this.latestTokenUsage = {
-                used: this.latestTokenUsage.used,
-                limit: normalizedTokens,
-            };
-        }
+        this.activeContextWindowTokens =
+            typeof tokens === 'number' && Number.isFinite(tokens) ? tokens : null;
     }
     updateContextUsage(percentage) {
         this.uiAdapter.updateContextUsage(percentage);
-        this.terminalInput.setContextUsage(percentage, CONTEXT_AUTOCOMPACT_PERCENT);
+        this.terminalInput.setContextUsage(percentage);
     }
     refreshControlBar() {
         this.terminalInput.setModeToggles({
@@ -726,7 +700,6 @@ export class InteractiveShell {
             autoContinueEnabled: this.autoContinueEnabled,
             verificationHotkey: 'alt+v',
             autoContinueHotkey: 'alt+c',
-            thinkingModeLabel: this.thinkingMode,
         });
         this.refreshStatusLine();
         this.terminalInput.render();
@@ -758,20 +731,6 @@ export class InteractiveShell {
         // Set main status (tool execution, etc.) - shown when not overridden
         const statusText = this.formatStatusLine(this.statusLineState);
         this.terminalInput.setStatusMessage(statusText);
-        // Surface meta header (elapsed + context usage) above the divider
-        const elapsedSeconds = this.statusLineState
-            ? Math.max(0, Math.floor((Date.now() - this.statusLineState.startedAt) / 1000))
-            : null;
-        const thinkingMs = display.isSpinnerActive() ? display.getThinkingElapsedMs() : null;
-        const tokensUsed = this.latestTokenUsage.used;
-        const tokenLimit = this.latestTokenUsage.limit ?? this.activeContextWindowTokens;
-        this.terminalInput.setMetaStatus({
-            elapsedSeconds,
-            tokensUsed,
-            tokenLimit,
-            thinkingMs,
-            thinkingHasContent: display.isSpinnerActive(),
-        });
         if (forceRender) {
             this.terminalInput.render();
         }
@@ -831,11 +790,13 @@ export class InteractiveShell {
         this.terminalInput.render();
     }
     /**
-     * Keep submissions out of the transcript to preserve the persistent input area.
-     * The chat box already holds the user's prompt, so avoid echoing it into output.
+     * Log the user's prompt as a visible message in the conversation.
+     * This creates a persistent log entry that remains visible during and after streaming.
      */
-    logUserPrompt(_text) {
-        // Intentionally no-op to keep the input area persistent and uncluttered.
+    logUserPrompt(text) {
+        // Display the user's prompt with the standard prefix
+        const prefix = formatUserPrompt();
+        display.stream(`\n${prefix}${text}\n\n`);
     }
     requestPromptRefresh(force = false) {
         if (force) {
@@ -863,29 +824,9 @@ export class InteractiveShell {
         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);
-        display.updateStreamingStatus(this.streamingStatusLabel);
-        this.refreshStatusLine(true);
-        // Periodically refresh the pinned input/status region while streaming so
-        // elapsed time remains visible without interrupting the scroll region.
-        this.uiUpdates.startHeartbeat('streaming', {
-            intervalMs: 1000,
-            lane: 'heartbeat',
-            mode: ['streaming', 'processing'],
-            coalesceKey: 'streaming:heartbeat',
-            run: () => {
-                const elapsedSeconds = this.streamingHeartbeatStart
-                    ? Math.max(0, Math.floor((Date.now() - this.streamingHeartbeatStart) / 1000))
-                    : 0;
-                this.streamingHeartbeatFrame =
-                    (this.streamingHeartbeatFrame + 1) % STREAMING_SPINNER_FRAMES.length;
-                const frame = STREAMING_SPINNER_FRAMES[this.streamingHeartbeatFrame];
-                this.streamingStatusLabel = this.buildStreamingStatus(`${frame} ${label}`, elapsedSeconds);
-                display.updateStreamingStatus(this.streamingStatusLabel);
-                this.refreshStatusLine(true);
-            },
-        });
+        // Note: We don't start a heartbeat during streaming anymore
+        // because the UI shouldn't be rendering during streaming.
+        // The streaming status is shown in the streaming header instead.
     }
     stopStreamingHeartbeat() {
         // Exit global streaming mode - allows UI to render again
@@ -901,28 +842,10 @@ export class InteractiveShell {
         // Force refresh to update the input area now that streaming has ended
         this.refreshStatusLine(true);
     }
-    buildStreamingStatus(label, elapsedSeconds) {
+    buildStreamingStatus(label) {
         const detail = this.describeModelDetail();
-        const elapsedLabel = typeof elapsedSeconds === 'number' && elapsedSeconds >= 0
-            ? theme.ui.muted(this.formatElapsedShort(elapsedSeconds))
-            : null;
-        const prefix = theme.info('⏺');
-        const parts = [label];
-        if (detail) {
-            parts.push(theme.ui.muted('·'), detail);
-        }
-        if (elapsedLabel) {
-            parts.push(theme.ui.muted('·'), elapsedLabel);
-        }
-        return `${prefix} ${parts.join(' ')}`.trim();
-    }
-    formatElapsedShort(seconds) {
-        if (seconds < 60) {
-            return `${seconds}s`;
-        }
-        const minutes = Math.floor(seconds / 60);
-        const remaining = seconds % 60;
-        return remaining > 0 ? `${minutes}m ${remaining}s` : `${minutes}m`;
+        const prefix = theme.info('●');
+        return detail ? `${prefix} ${label} ${theme.ui.muted('·')} ${detail}` : `${prefix} ${label}`;
     }
     refreshQueueIndicators() {
         if (this.isProcessing) {
@@ -1816,75 +1739,6 @@ export class InteractiveShell {
         }
         return `${warning.label}: ${warning.reason}.`;
     }
-    buildLaunchCommandPalette() {
-        const entries = [];
-        const secretsSummary = this.summarizeSecretsForPalette();
-        const toolSummary = this.getToolSelectionSummary();
-        const autosaveLabel = this.autosaveEnabled ? 'on' : 'off';
-        for (const command of this.slashCommands) {
-            const entry = {
-                command: command.command,
-                description: command.description,
-                category: command.category ?? 'other',
-            };
-            switch (command.command) {
-                case '/secrets':
-                    if (secretsSummary.text) {
-                        entry.description = `${command.description} (${secretsSummary.text})`;
-                        entry.tone = secretsSummary.tone;
-                    }
-                    break;
-                case '/tools':
-                    if (toolSummary) {
-                        entry.description = `${command.description} (${toolSummary})`;
-                    }
-                    break;
-                case '/sessions':
-                    entry.description = `${command.description} (autosave ${autosaveLabel})`;
-                    break;
-                case '/model':
-                    entry.description = `${command.description} (current: ${this.sessionState.model})`;
-                    break;
-                case '/provider':
-                    entry.description = `${command.description} (current: ${this.providerLabel(this.sessionState.provider)})`;
-                    break;
-                default:
-                    break;
-            }
-            entries.push(entry);
-        }
-        return entries;
-    }
-    summarizeSecretsForPalette() {
-        const definitions = listSecretDefinitions();
-        if (!definitions.length) {
-            return { text: null };
-        }
-        const missing = definitions.filter((definition) => !getSecretValue(definition.id));
-        if (missing.length === 0) {
-            return { text: 'all configured', tone: 'success' };
-        }
-        const labels = missing.map((definition) => definition.label ?? definition.id);
-        return { text: `missing ${this.formatList(labels)}`, tone: 'warn' };
-    }
-    getToolSelectionSummary() {
-        const toolSettings = loadToolSettings();
-        const selection = buildEnabledToolSet(toolSettings);
-        const options = getToolToggleOptions();
-        if (!options.length) {
-            return null;
-        }
-        const enabledCount = options.filter((option) => selection.has(option.id)).length;
-        return `${enabledCount}/${options.length} enabled`;
-    }
-    formatList(values, maxItems = 3) {
-        if (!values.length) {
-            return '';
-        }
-        const shown = values.slice(0, maxItems);
-        const suffix = values.length > maxItems ? ', …' : '';
-        return `${shown.join(', ')}${suffix}`;
-    }
     buildSlashCommandList(header) {
         const lines = [theme.gradient.primary(header), ''];
         for (const command of this.slashCommands) {
@@ -2454,7 +2308,6 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`;
                 try {
                     // Send the request and capture the response (streaming disabled)
                     display.showThinking('Responding...');
-                    this.refreshStatusLine(true);
                     const response = await agent.send(currentPrompt, true);
                     await this.awaitPendingCleanup();
                     this.captureHistorySnapshot();
@@ -2954,10 +2807,8 @@ What's the next action?`;
         try {
             // Send the error to the agent for fixing
             display.showThinking('Analyzing build errors');
-            this.refreshStatusLine(true);
             const response = await this.agent.send(prompt, true);
             display.stopThinking();
-            this.refreshStatusLine(true);
             if (response) {
                 display.showAssistantMessage(response, { isFinal: true });
             }
@@ -3007,16 +2858,18 @@ What's the next action?`;
                                 display.showAssistantMessage(finalContent, enriched);
                             }
                         }
-                        // Status shown in mode controls bar - no separate status line needed
+                        // Show status line at end (Claude Code style: "• Context X% used • Ready for prompts (2s)")
                         display.stopThinking();
-                        // Update context usage for mode controls display
+                        // Calculate context usage
+                        let contextInfo;
                         if (enriched.contextWindowTokens && metadata.usage) {
                             const total = this.totalTokens(metadata.usage);
                             if (total && total > 0) {
                                 const percentage = Math.round((total / enriched.contextWindowTokens) * 100);
-                                this.updateContextUsage(percentage);
+                                contextInfo = { percentage, tokens: total };
                             }
                         }
+                        display.showStatusLine('Ready for prompts', enriched.elapsedMs, contextInfo);
                         // Auto-verify changes: build first (catches type errors), then tests
                         void this.enforceAutoBuild('final-response');
                         void this.enforceAutoTests('final-response');
@@ -3186,14 +3039,9 @@ What's the next action?`;
             return null;
         }
         const usageRatio = total / windowTokens;
-        this.latestTokenUsage = {
-            used: total,
-            limit: windowTokens,
-        };
         // Always update context usage in the UI
         const percentUsed = Math.round(usageRatio * 100);
         this.updateContextUsage(percentUsed);
-        this.refreshStatusLine(true);
         if (usageRatio < CONTEXT_USAGE_THRESHOLD) {
             return null;
         }