erosolar-cli 1.7.160 → 1.7.162

package/dist/shell/interactiveShell.js

@@ -23,6 +23,7 @@ import { PersistentPrompt, PinnedChatBox } from '../ui/persistentPrompt.js';
 import { formatShortcutsHelp } from '../ui/shortcutsHelp.js';
 import { MetricsTracker } from '../alpha-zero/index.js';
 import { listAvailablePlugins } from '../plugins/index.js';
+import { getClaudeCodeStreamHandler } from './claudeCodeStreamHandler.js';
 const DROPDOWN_COLORS = [
     theme.primary,
     theme.info,
@@ -114,6 +115,7 @@ export class InteractiveShell {
     pinnedChatBox;
     readlineOutputSuppressed = false;
     originalStdoutWrite = null;
+    streamHandler;
     constructor(config) {
         this.profile = config.profile;
         this.profileLabel = config.profileLabel;
@@ -226,6 +228,10 @@ export class InteractiveShell {
         // This ensures the pinned area is cleared before output and re-rendered after,
         // preventing ghost lines when the terminal scrolls
         this.pinnedChatBox.registerOutputInterceptor(display);
+        // Initialize Claude Code style stream handler for natural output flow
+        // Key insight: No cursor manipulation during streaming - output just appends
+        this.streamHandler = getClaudeCodeStreamHandler();
+        this.streamHandler.attachToReadline(this.rl);
         // Initialize Alpha Zero 2 metrics tracking
         this.alphaZeroMetrics = new MetricsTracker(`${this.profile}-${Date.now()}`);
         this.setupStatusTracking();
@@ -482,6 +488,8 @@ export class InteractiveShell {
             this.pendingCleanup = null;
             // Dispose persistent prompt
             this.persistentPrompt.dispose();
+            // Dispose Claude Code stream handler
+            this.streamHandler.dispose();
             // Dispose unified UI adapter
             this.uiAdapter.dispose();
             display.newLine();
@@ -786,14 +794,25 @@ export class InteractiveShell {
             }
         }
         // Restore readline output if it was suppressed
-        this.restoreReadlineOutput();
+        // Note: Stream handler manages its own state, this is for legacy compatibility
+        if (!this.streamHandler.isStreaming()) {
+            this.restoreReadlineOutput();
+        }
     }
     /**
      * Suppress readline's character echo during streaming.
      * Characters typed will be captured but not echoed to the main output.
      * Instead, they appear only in the persistent input box at the bottom.
+     *
+     * @deprecated Use streamHandler.startStreaming() instead - kept for backwards compatibility
+     * @internal Kept for legacy code paths that may still reference this method
      */
+    // @ts-expect-error - Legacy method kept for backwards compatibility, unused in favor of streamHandler
     suppressReadlineOutput() {
+        // Delegate to stream handler if it's not already streaming
+        if (this.streamHandler.isStreaming()) {
+            return;
+        }
         if (this.readlineOutputSuppressed || !output.isTTY) {
             return;
         }
@@ -850,6 +869,8 @@ export class InteractiveShell {
     }
     /**
      * Restore normal readline output after streaming completes.
+     *
+     * @deprecated Use streamHandler.endStreaming() instead
      */
     restoreReadlineOutput() {
         if (!this.readlineOutputSuppressed || !this.originalStdoutWrite) {
@@ -1080,6 +1101,39 @@ export class InteractiveShell {
             void this.processQueuedActions();
         });
     }
+    /**
+     * 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.
+     */
+    processQueuedInputs() {
+        if (!this.streamHandler.hasQueuedInput()) {
+            return;
+        }
+        // Transfer queued inputs from stream handler to follow-up queue
+        while (this.streamHandler.hasQueuedInput()) {
+            const input = this.streamHandler.getNextQueuedInput();
+            if (!input) {
+                break;
+            }
+            // Handle interrupts specially
+            if (input.type === 'interrupt') {
+                // Interrupt was already processed during capture
+                continue;
+            }
+            // Add to follow-up queue for processing
+            const actionType = input.type === 'command' ? 'request' : 'request';
+            this.followUpQueue.push({
+                type: actionType,
+                text: input.text,
+            });
+        }
+        // Show queue summary if there are items
+        const summary = this.streamHandler.getQueueSummary();
+        if (summary) {
+            display.showInfo(`📝 ${summary}`);
+        }
+    }
     async processQueuedActions() {
         if (this.isDrainingQueue || this.isProcessing || !this.followUpQueue.length) {
             return;
@@ -2430,10 +2484,11 @@ export class InteractiveShell {
             // Add visual separator between user prompt and AI response
             display.newLine();
             display.newLine();
-            // Enable scroll region so streaming output scrolls while input stays at bottom
-            this.pinnedChatBox.enableScrollRegion();
-            // Suppress readline echo so typed characters only appear in persistent input box
-            this.suppressReadlineOutput();
+            // 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();
             // Enable streaming for real-time text output (Claude Code style)
             await agent.send(request, true);
             await this.awaitPendingCleanup();
@@ -2451,10 +2506,11 @@ export class InteractiveShell {
             }
         }
         finally {
-            // Restore readline echo before other cleanup
-            this.restoreReadlineOutput();
-            // Disable scroll region before any other output to restore normal terminal behavior
-            this.pinnedChatBox.disableScrollRegion();
+            // Claude Code style: End streaming mode
+            // This restores readline output and processes any queued input
+            this.streamHandler.endStreaming();
+            // Process any queued inputs that came in during streaming
+            this.processQueuedInputs();
             display.stopThinking(false);
             this.isProcessing = false;
             this.uiAdapter.endProcessing('Ready for prompts');
@@ -2517,10 +2573,10 @@ export class InteractiveShell {
         display.showSystemMessage(`📊 Using intelligent task completion detection with AI verification.`);
         this.uiAdapter.startProcessing('Continuous execution mode');
         this.setProcessingStatus();
-        // Enable scroll region so streaming output scrolls while input stays at bottom
-        this.pinnedChatBox.enableScrollRegion();
-        // Suppress readline echo so typed characters only appear in persistent input box
-        this.suppressReadlineOutput();
+        // 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();
         let iteration = 0;
         let lastResponse = '';
         let consecutiveNoProgress = 0;
@@ -2682,13 +2738,14 @@ 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();
-            // Restore readline echo before other cleanup
-            this.restoreReadlineOutput();
+            // Claude Code style: End streaming mode
+            // This restores readline output and processes any queued input
+            this.streamHandler.endStreaming();
+            // Process any queued inputs that came in during streaming
+            this.processQueuedInputs();
             this.isProcessing = false;
             this.uiAdapter.endProcessing('Ready for prompts');
             this.setIdleStatus();
-            // Disable scroll region before output to restore normal terminal behavior
-            this.pinnedChatBox.disableScrollRegion();
             display.newLine();
             // Clear the processing status and ensure persistent prompt is visible
             this.persistentPrompt.updateStatusBar({ message: undefined });
@@ -2805,7 +2862,7 @@ What's the next action?`;
             /(?:running|executing|called?|using)\s+(?:the\s+)?(\w+(?:_\w+)*)\s+tool/gi,
             /tool[:\s]+(\w+(?:_\w+)*)/gi,
             /⎿\s*(\w+)/g, // Tool result prefix pattern
-            /(?:read_file|write_file|edit_file|bash|grep|glob|search)/gi,
+            /(?:read_file|edit_file|Edit|bash|grep|glob|search)/gi,
         ];
         for (const pattern of toolPatterns) {
             let match;