erosolar-cli 1.7.428 → 1.7.430

package/dist/shell/interactiveShell.js

@@ -4,9 +4,9 @@ import { promisify } from 'node:util';
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { display } from '../ui/display.js';
-import { isPlainOutputMode } from '../ui/outputMode.js';
 import { theme } from '../ui/theme.js';
 import { StreamingResponseFormatter } from '../ui/streamingFormatter.js';
+import { UnifiedUIRenderer } from '../ui/UnifiedUIRenderer.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, loadFeatureFlags, saveFeatureFlags, toggleFeatureFlag, FEATURE_FLAG_INFO, } from '../core/preferences.js';
@@ -174,6 +174,8 @@ export class InteractiveShell {
     alternateScreenEnabled;
     welcomeShown = false;
     scrollbackRestored = false;
+    uiRenderer;
+    useUnifiedRenderer;
     constructor(config) {
         this.profile = config.profile;
         this.profileLabel = config.profileLabel;
@@ -270,6 +272,10 @@ export class InteractiveShell {
             onToggleThinking: () => this.cycleThinkingMode(),
             onClearContext: () => this.handleClearContext(),
         });
+        const canUseRenderer = output.isTTY;
+        this.uiRenderer = canUseRenderer ? new UnifiedUIRenderer(output, input) : null;
+        this.useUnifiedRenderer = !!this.uiRenderer;
+        display.setRenderer(this.uiRenderer);
         // Initialize Alpha Zero 2 metrics tracking
         this.alphaZeroMetrics = new MetricsTracker(`${this.profile}-${Date.now()}`);
         this.setupStatusTracking();
@@ -292,7 +298,8 @@ export class InteractiveShell {
         }
         // Render chat box immediately using the streaming UI lifecycle
         this.refreshControlBar();
-        this.terminalInput.forceRender();
+        this.syncRendererInput();
+        this.uiRenderer?.render();
         this.rebuildAgent();
         this.setupHandlers();
         this.refreshSessionContext();
@@ -383,19 +390,38 @@ export class InteractiveShell {
         if (this.welcomeShown && !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 message = [header, modelLine, profileLine, workspaceLine, versionLine, hintLine]
-            .filter(Boolean)
-            .join('\n');
-        this.streamEventBlock(message);
+        const banner = this.buildClaudeStyleBanner();
+        this.streamEventBlock(banner);
         this.welcomeShown = true;
         this.requestPromptRefresh(true);
     }
+    buildClaudeStyleBanner() {
+        const welcome = `Welcome back ${this.profileLabel}!`;
+        const model = `${this.sessionState.model} @ ${this.providerLabel(this.sessionState.provider)}`;
+        const workspace = this.workingDir;
+        const lines = [
+            'Erosolar-CLI',
+            welcome,
+            model,
+            workspace,
+            '/help for commands · /model to switch · /secrets for keys',
+        ];
+        return lines.join('\n');
+    }
+    syncRendererInput() {
+        // No-op: UnifiedUIRenderer handles its own input state now
+        // The new architecture doesn't require separate input syncing
+    }
+    pushUiEvent(type, content) {
+        if (!content) {
+            return;
+        }
+        if (this.useUnifiedRenderer && this.uiRenderer) {
+            this.uiRenderer.addEvent(type, content);
+            return;
+        }
+        display.stream(content);
+    }
     /**
      * Stream a content block as a single event, isolating it from adjacent output.
      */
@@ -404,6 +430,10 @@ export class InteractiveShell {
         if (!normalized) {
             return;
         }
+        if (this.useUnifiedRenderer && this.uiRenderer) {
+            this.uiRenderer.addEvent('banner', normalized);
+            return;
+        }
         const bullet = `${theme.info('⏺')} `;
         const indent = '  ';
         const lines = normalized.split('\n').map(line => line.trimEnd());
@@ -411,11 +441,18 @@ export class InteractiveShell {
             .map((line, index) => (index === 0 ? `${bullet}${line}` : `${indent}${line}`))
             .join('\n');
         const block = `\n${formatted}\n`;
-        this.terminalInput.streamContent(block);
+        this.pushUiEvent('raw', block);
     }
     async start(initialPrompt) {
         // Always use the scroll-region streaming layout from the outset
-        this.terminalInput.enterStreamingScrollRegion({ statusMessage: 'Ready for prompts' });
+        if (this.useUnifiedRenderer && this.uiRenderer) {
+            this.uiRenderer.initialize();
+        }
+        else {
+            this.terminalInput.clearScreen();
+            this.terminalInput.resetContentPosition();
+        }
+        this.syncRendererInput();
         this.showWelcomeBanner();
         if (initialPrompt) {
             await this.processInputBlock(initialPrompt);
@@ -423,7 +460,7 @@ export class InteractiveShell {
         }
         this.showLaunchCommandPalette();
         // Ensure the terminal input is visible
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     showLaunchCommandPalette() {
         // Disabled: Quick commands palette takes up too much space
@@ -542,6 +579,7 @@ export class InteractiveShell {
      */
     handleInputChange(text) {
         this.currentInput = text;
+        this.syncRendererInput();
         if (text.length > 0) {
             this.resetCtrlCSequence();
         }
@@ -563,7 +601,7 @@ export class InteractiveShell {
                 display.showSystemMessage('✏️ Display edits mode enabled.');
             }
         }
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     toggleVerificationMode() {
         this.setVerificationMode(!this.verificationEnabled, 'shortcut');
@@ -684,7 +722,7 @@ export class InteractiveShell {
         if (['n', 'no', 'cancel', '/cancel'].includes(lower)) {
             this.pendingPermissionInput = null;
             display.showInfo('Request cancelled.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return null;
         }
         // Treat any other input as a replacement request that also needs confirmation
@@ -702,7 +740,7 @@ export class InteractiveShell {
         ]
             .filter(Boolean)
             .join('\n'));
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     /**
      * Handle Ctrl+C presses in three stages:
@@ -767,6 +805,7 @@ export class InteractiveShell {
         this.stopStreamingHeartbeat('quit', { quiet: true });
         this.endAiRuntime();
         this.uiUpdates.dispose();
+        this.uiRenderer?.cleanup();
         this.clearPromptRefreshTimer();
         this.teardownStatusTracking();
         // Clear global AI enhancer (explore tool will work offline after this)
@@ -826,26 +865,26 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a number, "save", "defaults", or "cancel".');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const normalized = trimmed.toLowerCase();
         if (normalized === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Tool selection cancelled.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         if (normalized === 'defaults') {
             pending.selection = buildEnabledToolSet(null);
             this.renderToolMenu(pending);
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         if (normalized === 'save') {
             await this.persistToolSelection(pending);
             this.pendingInteraction = null;
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
@@ -868,11 +907,11 @@ export class InteractiveShell {
                 }
                 this.renderToolMenu(pending);
             }
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         display.showWarning('Enter a number, "save", "defaults", or "cancel".');
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     async persistToolSelection(interaction) {
         if (setsEqual(interaction.selection, interaction.initialSelection)) {
@@ -900,36 +939,36 @@ export class InteractiveShell {
         if (!this.agentMenu) {
             this.pendingInteraction = null;
             display.showWarning('Agent selection is unavailable in this CLI.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a number or type "cancel".');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Agent selection cancelled.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
             display.showWarning('Please enter a valid number.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const option = pending.options[choice - 1];
         if (!option) {
             display.showWarning('That option is not available.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         await this.persistAgentSelection(option.name);
         this.pendingInteraction = null;
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     async persistAgentSelection(profileName) {
         if (!this.agentMenu) {
@@ -1002,7 +1041,7 @@ export class InteractiveShell {
         lines.push(`  ${theme.primary('[text]')}   Submit your own solution instead`);
         lines.push('');
         display.showSystemMessage(lines.join('\n'));
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     async handlePlanApprovalInput(input) {
         const pending = this.pendingInteraction;
@@ -1011,7 +1050,7 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a command or your own solution.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const lower = trimmed.toLowerCase();
@@ -1019,7 +1058,7 @@ export class InteractiveShell {
         if (lower === 'cancel' || lower === 'c') {
             this.pendingInteraction = null;
             display.showInfo('Plan cancelled. You can continue with a different approach.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         // Select all
@@ -1039,7 +1078,7 @@ export class InteractiveShell {
             const selectedSteps = pending.steps.filter(s => pending.selectedSteps.has(s.id));
             if (selectedSteps.length === 0) {
                 display.showWarning('No steps selected. Select steps or enter your own solution.');
-                this.terminalInput.render();
+                this.syncRendererInput();
                 return;
             }
             this.pendingInteraction = null;
@@ -1072,7 +1111,7 @@ export class InteractiveShell {
             return;
         }
         display.showWarning('Invalid input. Enter a step number, command (go/cancel/all/none), or your own solution.');
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     setupHandlers() {
         // Handle terminal resize
@@ -1080,7 +1119,7 @@ export class InteractiveShell {
             this.terminalInput.handleResize();
         });
         // Show initial input UI
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     /**
      * Set up command autocomplete with all available slash commands.
@@ -1193,7 +1232,7 @@ export class InteractiveShell {
             thinkingHotkey: 'tab',
         });
         this.refreshStatusLine();
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     writeLocked(content) {
         if (!content) {
@@ -1231,7 +1270,7 @@ export class InteractiveShell {
     /**
      * Refresh the status line in the persistent input area.
      * Uses combined status display: streaming label + override + main status.
-     * All three can be shown simultaneously (Claude Code style).
+     * All three can be shown simultaneously (Erosolar-CLI style).
      */
     refreshStatusLine(forceRender = false) {
         // Set streaming label (spinner + label) - shows during streaming
@@ -1258,8 +1297,10 @@ export class InteractiveShell {
             model: this.sessionState.model,
             provider: this.providerLabel(this.sessionState.provider),
         });
+        this.syncRendererInput();
         if (forceRender) {
-            this.terminalInput.render();
+            this.syncRendererInput();
+            this.uiRenderer?.render();
         }
     }
     /**
@@ -1318,7 +1359,8 @@ export class InteractiveShell {
     }
     requestPromptRefresh(force = false) {
         if (force) {
-            this.terminalInput.forceRender();
+            this.syncRendererInput();
+            this.uiRenderer?.render();
             return;
         }
         if (this.promptRefreshTimer) {
@@ -1326,7 +1368,7 @@ export class InteractiveShell {
         }
         this.promptRefreshTimer = setTimeout(() => {
             this.promptRefreshTimer = null;
-            this.terminalInput.render();
+            this.syncRendererInput();
         }, 48);
     }
     clearPromptRefreshTimer() {
@@ -1340,7 +1382,6 @@ export class InteractiveShell {
         // Enter global streaming mode - blocks all non-streaming UI output
         enterStreamingMode();
         // Set up scroll region for streaming content
-        this.terminalInput.enterStreamingScrollRegion();
         this.uiUpdates.setMode('streaming');
         this.streamingHeartbeatStart = Date.now();
         this.streamingHeartbeatFrame = 0;
@@ -1407,19 +1448,14 @@ export class InteractiveShell {
         if (!chunk) {
             return;
         }
-        // Preserve raw output in plain/CI modes or non-TTY environments
-        if (isPlainOutputMode() || !output.isTTY) {
-            this.terminalInput.streamContent(chunk);
-            return;
-        }
         if (!this.streamingFormatter) {
             this.streamingFormatter = new StreamingResponseFormatter(output.columns ?? undefined);
-            this.terminalInput.streamContent(this.streamingFormatter.header());
+            this.pushUiEvent('streaming', this.streamingFormatter.header());
         }
         const formatted = this.streamingFormatter.formatChunk(chunk);
         this.captureStreamingThought(chunk);
         if (formatted) {
-            this.terminalInput.streamContent(formatted);
+            this.pushUiEvent('streaming', formatted);
         }
     }
     finishStreamingFormatter(note, options) {
@@ -1431,7 +1467,7 @@ export class InteractiveShell {
             mode: options?.mode ?? 'complete',
         });
         if (closing) {
-            this.terminalInput.streamContent(closing);
+            this.pushUiEvent('streaming', closing);
         }
         if (this.streamingThoughtBuffer.trim()) {
             this.ui.controller.recordAssistantThought(this.streamingThoughtBuffer.trim());
@@ -1483,7 +1519,7 @@ export class InteractiveShell {
         else {
             this.setIdleStatus();
         }
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     enqueueFollowUpAction(action) {
         this.followUpQueue.push(action);
@@ -1502,7 +1538,7 @@ export class InteractiveShell {
         this.refreshQueueIndicators();
         this.scheduleQueueProcessing();
         // Re-show the prompt so user can continue typing more follow-ups
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     scheduleQueueProcessing() {
         if (!this.followUpQueue.length) {
@@ -1557,12 +1593,12 @@ export class InteractiveShell {
         }
         if (lower === 'clear') {
             display.clear();
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         if (lower === 'help') {
             this.showHelp();
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         if (trimmed.startsWith('/')) {
@@ -1572,12 +1608,12 @@ export class InteractiveShell {
         // Check for continuous/infinite loop commands
         if (this.isContinuousCommand(trimmed)) {
             await this.processContinuousRequest(trimmed);
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         // Direct execution for all inputs, including multi-line pastes
         await this.processRequest(trimmed);
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     /**
      * Check if the command is a continuous/infinite loop command
@@ -1622,7 +1658,7 @@ export class InteractiveShell {
         switch (this.pendingInteraction.type) {
             case 'model-loading':
                 display.showInfo('Still fetching model options. Please wait a moment.');
-                this.terminalInput.render();
+                this.syncRendererInput();
                 return true;
             case 'model-provider':
                 await this.handleModelProviderSelection(input);
@@ -1653,7 +1689,7 @@ export class InteractiveShell {
         const [command] = input.split(/\s+/);
         if (!command) {
             display.showWarning('Enter a slash command.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         switch (command) {
@@ -1756,7 +1792,7 @@ export class InteractiveShell {
             case '/discover':
                 await this.discoverModelsCommand();
                 break;
-            // Claude Code style commands
+            // Erosolar-CLI style commands
             case '/rewind':
                 await this.handleRewindCommand(input);
                 break;
@@ -1811,7 +1847,7 @@ export class InteractiveShell {
                 }
                 break;
         }
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     async tryCustomSlashCommand(command, fullInput) {
         const custom = this.customCommandMap.get(command);
@@ -2137,7 +2173,7 @@ export class InteractiveShell {
         display.showSystemMessage(`${headline}\n${theme.ui.muted(descriptions[this.thinkingMode])}`);
     }
     handleShortcutsCommand() {
-        // Display keyboard shortcuts help (Claude Code style)
+        // Display keyboard shortcuts help (Erosolar-CLI style)
         display.showSystemMessage(formatShortcutsHelp());
     }
     showFileChangeSummary() {
@@ -3460,7 +3496,7 @@ export class InteractiveShell {
         }
         this.setAutoContinueMode(value === 'on', 'command');
     }
-    // ==================== Claude Code Style Commands ====================
+    // ==================== Erosolar-CLI Style Commands ====================
     async handleRewindCommand(_input) {
         const lines = [];
         lines.push(theme.bold('Rewind / Checkpoint System'));
@@ -3619,7 +3655,7 @@ export class InteractiveShell {
         display.clear();
         clearAutosaveSnapshot(this.profile);
         display.showInfo('Conversation cleared. Starting fresh.');
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     async handleResumeCommand(input) {
         const tokens = input.split(/\s+/).slice(1);
@@ -3747,7 +3783,7 @@ export class InteractiveShell {
         display.showInfo('Compacting conversation context...');
         await this.performContextCompaction('Manual /compact request');
     }
-    // ==================== End Claude Code Style Commands ====================
+    // ==================== End Erosolar-CLI Style Commands ====================
     updateActiveSession(summary, remember = false) {
         this.activeSessionId = summary?.id ?? null;
         this.activeSessionTitle = summary?.title ?? null;
@@ -3922,7 +3958,7 @@ export class InteractiveShell {
             if (!providerOptions.length) {
                 display.showWarning('No providers are available.');
                 this.pendingInteraction = null;
-                this.terminalInput.render();
+                this.syncRendererInput();
                 return;
             }
             const lines = [
@@ -3943,7 +3979,7 @@ export class InteractiveShell {
         catch (error) {
             display.showError('Failed to load model list. Try again in a moment.', error);
             this.pendingInteraction = null;
-            this.terminalInput.render();
+            this.syncRendererInput();
         }
     }
     buildProviderOptions() {
@@ -4498,29 +4534,29 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a number or type cancel.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Model selection cancelled.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
             display.showWarning('Please enter a valid number.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const option = pending.options[choice - 1];
         if (!option) {
             display.showWarning('That option is not available.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         this.showProviderModels(option);
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     async handleModelSelection(input) {
         const pending = this.pendingInteraction;
@@ -4530,35 +4566,35 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a number, type "back", or type "cancel".');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         if (trimmed.toLowerCase() === 'back') {
             this.showModelMenu();
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Model selection cancelled.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
             display.showWarning('Please enter a valid number.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const preset = pending.options[choice - 1];
         if (!preset) {
             display.showWarning('That option is not available.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         this.pendingInteraction = null;
         await this.applyModelPreset(preset);
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     async applyModelPreset(preset) {
         try {
@@ -4591,30 +4627,30 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a number or type cancel.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Secret management cancelled.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
             display.showWarning('Please enter a valid number.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         const secret = pending.options[choice - 1];
         if (!secret) {
             display.showWarning('That option is not available.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         display.showSystemMessage(`Enter a new value for ${secret.label} or type "cancel".`);
         this.pendingInteraction = { type: 'secret-input', secret };
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     async handleSecretInput(input) {
         const pending = this.pendingInteraction;
@@ -4624,14 +4660,14 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a value or type cancel.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             this.pendingSecretRetry = null;
             display.showInfo('Secret unchanged.');
-            this.terminalInput.render();
+            this.syncRendererInput();
             return;
         }
         try {
@@ -4655,7 +4691,7 @@ export class InteractiveShell {
             this.pendingInteraction = null;
             this.pendingSecretRetry = null;
         }
-        this.terminalInput.render();
+        this.syncRendererInput();
     }
     async processRequest(request) {
         if (this.isProcessing) {
@@ -4675,7 +4711,8 @@ export class InteractiveShell {
         this.uiUpdates.setMode('processing');
         this.terminalInput.setStreaming(true);
         // Keep the persistent input/control bar active as we transition into streaming.
-        this.terminalInput.forceRender();
+        this.syncRendererInput();
+        this.uiRenderer?.render();
         const requestStartTime = Date.now(); // Alpha Zero 2 timing
         // Clear previous parallel agents and start fresh for new request
         const parallelManager = getParallelAgentManager();
@@ -4761,7 +4798,7 @@ export class InteractiveShell {
             this.updateStatusMessage(null);
             queueMicrotask(() => this.uiUpdates.setMode('idle'));
             // CRITICAL: Ensure readline prompt is active for user input
-            // Claude Code style: New prompt naturally appears at bottom
+            // Erosolar-CLI style: New prompt naturally appears at bottom
             this.ensureReadlineReady();
             this.scheduleQueueProcessing();
             this.refreshQueueIndicators();
@@ -4991,7 +5028,7 @@ What's the next action?`;
             this.updateStatusMessage(null);
             queueMicrotask(() => this.uiUpdates.setMode('idle'));
             // CRITICAL: Ensure readline prompt is active for user input
-            // Claude Code style: New prompt naturally appears at bottom
+            // Erosolar-CLI style: New prompt naturally appears at bottom
             this.ensureReadlineReady();
             this.scheduleQueueProcessing();
             this.refreshQueueIndicators();
@@ -5602,7 +5639,7 @@ Return ONLY JSON array:
                         void this.runAutoQualityChecks('final-response', finalContent);
                     }
                     else {
-                        // Non-final message = narrative text before tool calls (Claude Code style)
+                        // Non-final message = narrative text before tool calls (Erosolar-CLI style)
                         // Stop spinner and show the narrative text directly
                         display.stopThinking();
                         // Skip display if content was already streamed to avoid double-display
@@ -5649,19 +5686,19 @@ Return ONLY JSON array:
                         this.updateContextUsage(percentage);
                     }
                     // Ensure prompt remains visible at bottom after context messages
-                    this.terminalInput.render();
+                    this.syncRendererInput();
                 },
                 onContinueAfterRecovery: () => {
                     // Update UI to show we're continuing after context recovery
                     display.showSystemMessage(`🔄 Continuing after context recovery...`);
                     this.updateStatusMessage('Retrying with reduced context...');
-                    this.terminalInput.render();
+                    this.syncRendererInput();
                 },
                 onAutoContinue: (attempt, maxAttempts, _message) => {
                     // Show auto-continue progress in UI
                     display.showSystemMessage(`🔄 Auto-continue (${attempt}/${maxAttempts}): Model expressed intent, prompting to act...`);
                     this.updateStatusMessage('Auto-continuing...');
-                    this.terminalInput.render();
+                    this.syncRendererInput();
                 },
                 onCancelled: () => {
                     // Update UI to show operation was cancelled