erosolar-cli 1.7.162 → 1.7.165

package/dist/shell/interactiveShell.js

@@ -24,6 +24,7 @@ import { formatShortcutsHelp } from '../ui/shortcutsHelp.js';
 import { MetricsTracker } from '../alpha-zero/index.js';
 import { listAvailablePlugins } from '../plugins/index.js';
 import { getClaudeCodeStreamHandler } from './claudeCodeStreamHandler.js';
+import { getUnifiedChatBox } from './unifiedChatBox.js';
 const DROPDOWN_COLORS = [
     theme.primary,
     theme.info,
@@ -116,6 +117,9 @@ export class InteractiveShell {
     readlineOutputSuppressed = false;
     originalStdoutWrite = null;
     streamHandler;
+    unifiedChatBox;
+    // Cached provider status for unified status bar display after streaming
+    cachedProviderStatus = [];
     constructor(config) {
         this.profile = config.profile;
         this.profileLabel = config.profileLabel;
@@ -232,6 +236,13 @@ export class InteractiveShell {
         // Key insight: No cursor manipulation during streaming - output just appends
         this.streamHandler = getClaudeCodeStreamHandler();
         this.streamHandler.attachToReadline(this.rl);
+        // Initialize UnifiedChatBox - Claude Code exact style
+        // The chat box is always at the bottom naturally through readline
+        // During streaming: output flows up, typed input queued invisibly
+        // After streaming: new prompt appears at bottom naturally
+        this.unifiedChatBox = getUnifiedChatBox();
+        this.unifiedChatBox.attachToReadline(this.rl);
+        this.unifiedChatBox.setPrompt(formatUserPrompt(this.profileLabel || this.profile));
         // Initialize Alpha Zero 2 metrics tracking
         this.alphaZeroMetrics = new MetricsTracker(`${this.profile}-${Date.now()}`);
         this.setupStatusTracking();
@@ -284,15 +295,16 @@ export class InteractiveShell {
         this.sessionResumeNotice = null;
     }
     async start(initialPrompt) {
-        // Always render the pinned chat box at startup so it's visible from the beginning
-        this.pinnedChatBox.show();
-        this.pinnedChatBox.forceRender();
+        // Claude Code style: Just use readline's prompt
+        // The prompt naturally appears at the bottom
+        // No complex UI rendering needed - terminal handles it naturally
         if (initialPrompt) {
             display.newLine();
             console.log(`${formatUserPrompt(this.profileLabel || this.profile)}${initialPrompt}`);
             await this.processInputBlock(initialPrompt);
             return;
         }
+        // Show readline prompt - naturally at bottom of terminal
         this.rl.prompt();
     }
     async handleToolSettingsInput(input) {
@@ -490,6 +502,8 @@ export class InteractiveShell {
             this.persistentPrompt.dispose();
             // Dispose Claude Code stream handler
             this.streamHandler.dispose();
+            // Dispose unified chat box
+            this.unifiedChatBox.dispose();
             // Dispose unified UI adapter
             this.uiAdapter.dispose();
             display.newLine();
@@ -1105,7 +1119,10 @@ export class InteractiveShell {
      * Process any inputs that were queued during streaming.
      * Claude Code style: User can type while streaming, input is stored in queue,
      * processed after streaming ends.
+     *
+     * @deprecated Use processUnifiedChatBoxQueue() instead
      */
+    // @ts-expect-error - Legacy method kept for backwards compatibility
     processQueuedInputs() {
         if (!this.streamHandler.hasQueuedInput()) {
             return;
@@ -1134,6 +1151,36 @@ export class InteractiveShell {
             display.showInfo(`📝 ${summary}`);
         }
     }
+    /**
+     * Process any inputs that were queued in UnifiedChatBox during streaming.
+     * Claude Code style: User can type while streaming, input is stored invisibly,
+     * processed after streaming ends.
+     */
+    processUnifiedChatBoxQueue() {
+        if (!this.unifiedChatBox.hasQueuedInput()) {
+            return;
+        }
+        // Transfer queued inputs from unified chat box to follow-up queue
+        while (this.unifiedChatBox.hasQueuedInput()) {
+            const input = this.unifiedChatBox.dequeue();
+            if (!input) {
+                break;
+            }
+            // Handle interrupts specially - they cancel current operation
+            if (input.type === 'interrupt') {
+                // Request cancellation if agent is running
+                if (this.agent) {
+                    this.agent.requestCancellation();
+                }
+                continue;
+            }
+            // Add to follow-up queue for processing
+            this.followUpQueue.push({
+                type: 'request',
+                text: input.text,
+            });
+        }
+    }
     async processQueuedActions() {
         if (this.isDrainingQueue || this.isProcessing || !this.followUpQueue.length) {
             return;
@@ -2469,26 +2516,20 @@ export class InteractiveShell {
         }
         this.isProcessing = true;
         const requestStartTime = Date.now(); // Alpha Zero 2 timing
-        // Keep persistent prompt visible during processing so users can type follow-up requests
-        // The prompt will show a "processing" indicator but remain interactive
-        this.persistentPrompt.updateStatusBar({ message: '⏳ Processing... (type to queue follow-up)' });
-        // Update pinned chat box to show processing state
-        // Clear the input display since the request was already submitted
-        // Note: Don't set statusMessage here - the isProcessing flag already shows "⏳ Processing..."
-        this.pinnedChatBox.setProcessing(true);
-        this.pinnedChatBox.setStatusMessage(null); // Clear any previous status to avoid duplication
-        this.pinnedChatBox.clearInput();
+        // Claude Code style: Update status (optional, won't interfere with streaming)
+        this.persistentPrompt.updateStatusBar({ message: '⏳ Processing...' });
         this.uiAdapter.startProcessing('Working on your request');
         this.setProcessingStatus();
         try {
             // Add visual separator between user prompt and AI response
             display.newLine();
             display.newLine();
-            // Claude Code style: Start streaming mode
-            // - Output flows naturally to stdout (no cursor manipulation)
-            // - User input is queued in memory, not rendered
-            // - After streaming ends, new prompt is shown at bottom
-            this.streamHandler.startStreaming();
+            // Claude Code style: Start streaming mode using UnifiedChatBox
+            // - Output flows naturally to stdout (NO cursor manipulation)
+            // - User input is captured invisibly and queued
+            // - Prompt scrolls up naturally with output
+            // - After streaming ends, new prompt appears at bottom
+            this.unifiedChatBox.startStreaming();
             // Enable streaming for real-time text output (Claude Code style)
             await agent.send(request, true);
             await this.awaitPendingCleanup();
@@ -2506,25 +2547,27 @@ export class InteractiveShell {
             }
         }
         finally {
-            // Claude Code style: End streaming mode
-            // This restores readline output and processes any queued input
-            this.streamHandler.endStreaming();
+            // Claude Code style: End streaming mode using UnifiedChatBox
+            // This restores readline echo and returns queue info
+            const streamResult = this.unifiedChatBox.endStreaming();
             // Process any queued inputs that came in during streaming
-            this.processQueuedInputs();
+            this.processUnifiedChatBoxQueue();
+            // Show queue indicator if there were queued inputs
+            if (streamResult.queuedCount > 0) {
+                this.unifiedChatBox.showQueueIndicator();
+            }
             display.stopThinking(false);
             this.isProcessing = false;
             this.uiAdapter.endProcessing('Ready for prompts');
             this.setIdleStatus();
             display.newLine();
-            // Clear the processing status and ensure persistent prompt is visible
+            // Clear the processing status
             this.persistentPrompt.updateStatusBar({ message: undefined });
-            this.persistentPrompt.show();
-            // Update pinned chat box to show ready state and force render
-            this.pinnedChatBox.setProcessing(false);
-            this.pinnedChatBox.setStatusMessage(null);
-            this.pinnedChatBox.forceRender();
+            // Claude Code style: Show unified status bar before prompt
+            // This creates consistent UI between startup and post-streaming
+            this.showUnifiedStatusBar();
             // CRITICAL: Ensure readline prompt is active for user input
-            // Call ensureReadlineReady to resume stdin if paused and re-enable keypress
+            // Claude Code style: New prompt naturally appears at bottom
             this.ensureReadlineReady();
             this.rl.prompt();
             this.scheduleQueueProcessing();
@@ -2562,21 +2605,17 @@ export class InteractiveShell {
         // Initialize the task completion detector
         const completionDetector = getTaskCompletionDetector();
         completionDetector.reset();
-        // Keep persistent prompt visible during processing so users can type follow-up requests
-        this.persistentPrompt.updateStatusBar({ message: '🔄 Continuous mode... (type to queue follow-up)' });
-        // Update pinned chat box for continuous mode
-        // Clear the input display since the request was already submitted
-        this.pinnedChatBox.setProcessing(true);
-        this.pinnedChatBox.setStatusMessage('Continuous execution mode...');
-        this.pinnedChatBox.clearInput();
+        // Claude Code style: Update status
+        this.persistentPrompt.updateStatusBar({ message: '🔄 Continuous mode...' });
         display.showSystemMessage(`🔄 Starting continuous execution mode. Press Ctrl+C to stop.`);
         display.showSystemMessage(`📊 Using intelligent task completion detection with AI verification.`);
         this.uiAdapter.startProcessing('Continuous execution mode');
         this.setProcessingStatus();
-        // Claude Code style: Start streaming mode
-        // - Output flows naturally to stdout (no cursor manipulation)
-        // - User input is queued in memory, not rendered
-        this.streamHandler.startStreaming();
+        // Claude Code style: Start streaming mode using UnifiedChatBox
+        // - Output flows naturally to stdout (NO cursor manipulation)
+        // - User input is captured invisibly and queued
+        // - Prompt scrolls up naturally with output
+        this.unifiedChatBox.startStreaming();
         let iteration = 0;
         let lastResponse = '';
         let consecutiveNoProgress = 0;
@@ -2738,24 +2777,25 @@ What's the next action?`;
             display.showSystemMessage(`\n🏁 Continuous execution completed: ${iteration} iterations, ${minutes}m ${seconds}s total`);
             // Reset completion detector for next task
             resetTaskCompletionDetector();
-            // Claude Code style: End streaming mode
-            // This restores readline output and processes any queued input
-            this.streamHandler.endStreaming();
+            // Claude Code style: End streaming mode using UnifiedChatBox
+            const streamResult = this.unifiedChatBox.endStreaming();
             // Process any queued inputs that came in during streaming
-            this.processQueuedInputs();
+            this.processUnifiedChatBoxQueue();
+            // Show queue indicator if there were queued inputs
+            if (streamResult.queuedCount > 0) {
+                this.unifiedChatBox.showQueueIndicator();
+            }
             this.isProcessing = false;
             this.uiAdapter.endProcessing('Ready for prompts');
             this.setIdleStatus();
             display.newLine();
-            // Clear the processing status and ensure persistent prompt is visible
+            // Clear the processing status
             this.persistentPrompt.updateStatusBar({ message: undefined });
-            this.persistentPrompt.show();
-            // Update pinned chat box to show ready state and force render
-            this.pinnedChatBox.setProcessing(false);
-            this.pinnedChatBox.setStatusMessage(null);
-            this.pinnedChatBox.forceRender();
+            // Claude Code style: Show unified status bar before prompt
+            // This creates consistent UI between startup and post-streaming
+            this.showUnifiedStatusBar();
             // CRITICAL: Ensure readline prompt is active for user input
-            // Call ensureReadlineReady to resume stdin if paused and re-enable keypress
+            // Claude Code style: New prompt naturally appears at bottom
             this.ensureReadlineReady();
             this.rl.prompt();
             this.scheduleQueueProcessing();
@@ -3747,6 +3787,20 @@ What's the next action?`;
             this.bracketedPaste.reset();
         }
     }
+    /**
+     * Set the cached provider status for unified status bar display.
+     * Called once at startup after checking providers.
+     */
+    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) {