erosolar-cli 2.0.4 → 2.1.1

package/dist/shell/interactiveShell.js

@@ -36,8 +36,7 @@ import { analyzeTokenUsage, discoverModularTargets, getModularStatusDisplay, gen
 import { startOffsecRun, resumeOffsecRun, recordOffsecOutcome, getOffsecNextActions, simulateOffsecRollout, formatOffsecStatus, listOffsecRuns, } from '../core/offsecAlphaZero.js';
 import { generateTestFlows, detectBugs, detectUIUpdates, saveTestFlows, saveBugReports, saveUIUpdates, getTestFlowStatus, } from '../core/intelligentTestFlows.js';
 import { PromptController } from '../ui/PromptController.js';
-import { writeLock } from '../ui/writeLock.js';
-import { enterStreamingMode, exitStreamingMode } from '../ui/globalWriteLock.js';
+import { enterStreamingMode, exitStreamingMode, isStreamingMode } from '../ui/globalWriteLock.js';
 import { setGlobalAIEnhancer } from '../tools/localExplore.js';
 import { createProvider } from '../providers/providerFactory.js';
 import { getParallelAgentManager } from '../subagents/parallelAgentManager.js';
@@ -96,6 +95,7 @@ export class InteractiveShell {
     pendingSecretRetry = null;
     terminalInput;
     currentInput = '';
+    currentCursor = 0;
     ctrlCPressCount = 0;
     ctrlCHandledThisPress = false;
     pendingCleanup = null;
@@ -175,6 +175,8 @@ export class InteractiveShell {
     alternateScreenEnabled;
     welcomeShown = false;
     renderer;
+    // Message queue for streaming mode coordination - prevents race conditions
+    pendingMessages = [];
     constructor(config) {
         this.profile = config.profile;
         this.profileLabel = config.profileLabel;
@@ -264,7 +266,7 @@ export class InteractiveShell {
             onQueue: (text) => this.handleQueuedInput(text),
             onCtrlC: ({ hadBuffer }) => this.handleCtrlCPress(hadBuffer),
             onInterrupt: () => this.handleInterrupt(),
-            onChange: (text) => this.handleInputChange(text),
+            onChange: ({ text, cursor }) => this.handleInputChange(text, cursor, 'renderer'),
             onEditModeChange: (mode) => this.handleEditModeChange(mode),
             onToggleVerify: () => this.toggleVerificationMode(),
             onToggleAutoContinue: () => this.toggleAutoContinueMode(),
@@ -521,9 +523,15 @@ export class InteractiveShell {
         }
         return { version: '1.7.458' };
     }
-    syncRendererInput() {
-        // No-op: UnifiedUIRenderer handles its own input state now
-        // The new architecture doesn't require separate input syncing
+    syncRendererInput(force = false) {
+        const targetText = this.currentInput ?? '';
+        const targetCursor = Number.isFinite(this.currentCursor) ? this.currentCursor : targetText.length;
+        const rendererBuffer = this.terminalInput.getBuffer();
+        const rendererCursor = this.terminalInput.getCursor();
+        if (!force && rendererBuffer === targetText && rendererCursor === targetCursor) {
+            return;
+        }
+        this.terminalInput.setBuffer(targetText, targetCursor);
     }
     pushUiEvent(type, content) {
         if (!content) {
@@ -681,12 +689,15 @@ export class InteractiveShell {
     /**
      * TerminalInputAdapter change handler
      */
-    handleInputChange(text) {
+    handleInputChange(text, cursor = text.length, source = 'programmatic') {
         this.currentInput = text;
-        this.syncRendererInput();
+        this.currentCursor = Math.max(0, Math.min(cursor, text.length));
         if (text.length > 0) {
             this.resetCtrlCSequence();
         }
+        if (source === 'programmatic') {
+            this.syncRendererInput();
+        }
     }
     /**
      * Edit guard mode change handler (Shift+Tab from terminal input)
@@ -960,7 +971,7 @@ export class InteractiveShell {
             return;
         }
         if (normalized === 'defaults') {
-            pending.selection = buildEnabledToolSet(null);
+            pending.selection = buildEnabledToolSet(null, this.profile);
             this.renderToolMenu(pending);
             this.syncRendererInput();
             return;
@@ -1002,7 +1013,7 @@ export class InteractiveShell {
             display.showInfo('No changes to save.');
             return;
         }
-        const defaults = buildEnabledToolSet(null);
+        const defaults = buildEnabledToolSet(null, this.profile);
         if (setsEqual(interaction.selection, defaults)) {
             clearToolSettings();
             display.showInfo('Tool settings cleared. Defaults will be used on the next launch.');
@@ -1322,15 +1333,46 @@ export class InteractiveShell {
         if (!content) {
             return;
         }
-        // If lock is already held, write directly - we're in a protected context
-        // This prevents queuing issues where content gets delayed
-        if (writeLock.isLocked()) {
-            process.stdout.write(content);
-            return;
+        const payload = content.endsWith('\n') ? content : `${content}\n`;
+        // Coordinate with streaming mode to prevent output corruption
+        // During AI streaming, queue this output instead of writing immediately
+        if (isStreamingMode()) {
+            // Queue message with timestamp for debugging and proper FIFO ordering
+            this.pendingMessages.push({
+                content: payload,
+                timestamp: Date.now()
+            });
+        }
+        else {
+            // Flush any pending messages first (in order) before writing new content
+            this.flushPendingMessages();
+            display.stream(payload);
+        }
+    }
+    /**
+     * Flush all pending messages in FIFO order with error handling
+     * Called when exiting streaming mode to ensure no messages are lost
+     */
+    flushPendingMessages() {
+        // Process messages in FIFO order
+        while (this.pendingMessages.length > 0) {
+            const msg = this.pendingMessages.shift();
+            if (msg) {
+                try {
+                    display.stream(msg.content);
+                }
+                catch (error) {
+                    // Fallback to direct stdout write if display fails
+                    console.error('Failed to flush message:', error);
+                    try {
+                        process.stdout.write(msg.content);
+                    }
+                    catch (fallbackError) {
+                        console.error('Critical: Unable to write message:', fallbackError);
+                    }
+                }
+            }
         }
-        writeLock.withLock(() => {
-            process.stdout.write(content);
-        }, 'interactiveShell.stdout');
     }
     beginAiRuntime() {
         if (this.aiRuntimeStart === null) {
@@ -1422,7 +1464,8 @@ export class InteractiveShell {
      * Ensure the terminal input is ready for interactive input.
      */
     ensureReadlineReady() {
-        // Unified in-stream UI handles prompt visibility; skip forcing an extra render here.
+        this.syncRendererInput(true);
+        this.renderer?.render();
     }
     /**
      * Log user prompt to the scroll region so it's part of the conversation flow.
@@ -1482,6 +1525,9 @@ export class InteractiveShell {
         const quiet = options.quiet === true;
         // Exit global streaming mode - allows UI to render again
         exitStreamingMode();
+        // CRITICAL: Flush all pending messages before continuing
+        // This ensures messages queued during streaming are displayed in order
+        this.flushPendingMessages();
         // Preserve final elapsed time before clearing heartbeat start
         if (this.streamingHeartbeatStart) {
             this.lastStreamingElapsedSeconds = Math.max(0, Math.floor((Date.now() - this.streamingHeartbeatStart) / 1000));
@@ -2040,7 +2086,7 @@ export class InteractiveShell {
         lines.push('');
         lines.push(theme.bold('Tool suites'));
         const toolSettings = loadToolSettings();
-        const selection = buildEnabledToolSet(toolSettings);
+        const selection = buildEnabledToolSet(toolSettings, this.profile);
         const permissions = evaluateToolPermissions(selection);
         const options = getToolToggleOptions();
         const enabledLabels = options
@@ -4037,7 +4083,7 @@ export class InteractiveShell {
     }
     getToolSelectionSummary() {
         const toolSettings = loadToolSettings();
-        const selection = buildEnabledToolSet(toolSettings);
+        const selection = buildEnabledToolSet(toolSettings, this.profile);
         const options = getToolToggleOptions();
         if (!options.length) {
             return null;
@@ -4264,7 +4310,7 @@ export class InteractiveShell {
             display.showWarning('No configurable tools are available.');
             return;
         }
-        const selection = buildEnabledToolSet(loadToolSettings());
+        const selection = buildEnabledToolSet(loadToolSettings(), this.profile);
         const interaction = {
             type: 'tool-settings',
             options,
@@ -5463,6 +5509,7 @@ What's the next action?`;
                 display.showSystemMessage('✅ Build succeeded.');
                 if (outputText && outputText.length < 500) {
                     this.writeLocked(`${outputText}\n`);
+                    this.ensureReadlineReady();
                 }
                 this.statusTracker.clearOverride('build');
                 return true;
@@ -5475,6 +5522,7 @@ What's the next action?`;
                 display.showWarning('⚠️ Build failed. Feeding errors back to agent...');
                 if (errorOutput) {
                     this.writeLocked(`${errorOutput}\n`);
+                    this.ensureReadlineReady();
                 }
                 this.statusTracker.pushOverride('build', 'Build failing', {
                     detail: 'Auto-run npm run build failed',