erosolar-cli 1.7.410 → 1.7.412

package/dist/shell/interactiveShell.js

@@ -1,18 +1,19 @@
 import { stdin as input, stdout as output, exit } from 'node:process';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
-import { AssistantBlockRenderer } from '../ui/assistantBlockRenderer.js';
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
 import { display } from '../ui/display.js';
-import { compactRenderer } from '../ui/compactRenderer.js';
-import { theme, icons } from '../ui/theme.js';
+import { isPlainOutputMode } from '../ui/outputMode.js';
+import { theme } from '../ui/theme.js';
+import { StreamingResponseFormatter } from '../ui/streamingFormatter.js';
 import { getContextWindowTokens } from '../core/contextWindow.js';
-import { ensureSecretForProvider, getSecretDefinitionForProvider, getSecretValue, listSecretDefinitions, MissingSecretError, maskSecret, setSecretValue, } from '../core/secretStore.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';
 import { getLearningSummary, getRecentLearning, commitLearning, exportAllLearning, getLearningDir, } from '../core/learningPersistence.js';
 import { buildEnabledToolSet, evaluateToolPermissions, getToolToggleOptions, } from '../capabilities/toolRegistry.js';
 import { detectApiKeyError } from '../core/errors/apiKeyErrors.js';
 import { buildWorkspaceContext } from '../workspace.js';
-import { detectBuildCommand, detectTestCommand } from '../tools/detectCommands.js';
 import { buildInteractiveSystemPrompt } from './systemPrompt.js';
 import { getTaskCompletionDetector, resetTaskCompletionDetector, } from './taskCompletionDetector.js';
 import { discoverAllModels, quickCheckProviders, getCachedDiscoveredModels, sortModelsByPriority } from '../core/modelDiscovery.js';
@@ -36,14 +37,11 @@ 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 { TerminalInputAdapter } from './terminalInputAdapter.js';
-import { renderSessionFrame } from '../ui/unified/layout.js';
-import { isUpdateInProgress, maybeOfferCliUpdate } from './updateManager.js';
 import { writeLock } from '../ui/writeLock.js';
 import { enterStreamingMode, exitStreamingMode } from '../ui/globalWriteLock.js';
 import { setGlobalAIEnhancer } from '../tools/localExplore.js';
 import { createProvider } from '../providers/providerFactory.js';
 import { getParallelAgentManager } from '../subagents/parallelAgentManager.js';
-import { formatThinkingContent } from '../ui/textHighlighter.js';
 const execAsync = promisify(exec);
 const DROPDOWN_COLORS = [
     theme.primary,
@@ -113,19 +111,15 @@ export class InteractiveShell {
     thinkingMode = 'balanced';
     agentMenu;
     slashCommands;
-    bannerSessionState = null;
     statusTracker;
     ui;
     uiAdapter;
     uiUpdates;
-    assistantBlocksEnabled;
-    assistantBlockRenderer;
     _fileChangeTracker = new FileChangeTracker(); // Reserved for future file tracking features
     alphaZeroMetrics; // Alpha Zero 2 performance tracking
     statusSubscription = null;
     followUpQueue = [];
     isDrainingQueue = false;
-    apiKeyGateActive = false;
     activeContextWindowTokens = null;
     latestTokenUsage = { used: null, limit: null };
     planApprovalBridgeRegistered = false;
@@ -134,9 +128,7 @@ export class InteractiveShell {
     sessionPreferences;
     autosaveEnabled;
     autoContinueEnabled;
-    verificationEnabled = true;
-    alphaZeroModeEnabled;
-    alphaZeroVerificationSnapshot = null;
+    verificationEnabled = false;
     editGuardMode = 'display-edits';
     pendingPermissionInput = null;
     pendingHistoryLoad = null;
@@ -148,51 +140,36 @@ export class InteractiveShell {
     customCommandMap;
     sessionRestoreConfig;
     _enabledPlugins;
-    autoVerificationInFlight = false;
+    // Cached provider status for unified status bar display after streaming
+    cachedProviderStatus = [];
     // Auto-test tracking
     autoTestInFlight = false;
     // AlphaZero learning tracking
     currentTaskType = 'general';
     currentToolCalls = [];
     lastUserQuery = '';
+    lastAssistantResponse = null;
     lastFailure = null;
     lastAutoTestRun = null;
-    runIdCounter = 0;
-    lastRunLog = null;
-    lastReflectedRunId = null;
-    skipNextAutoReflection = false;
-    alphaZeroAutoImproveActive = false;
-    alphaZeroAutoImproveIterations = 0;
-    alphaZeroAutoImproveMaxIterations = 6;
     // Auto-build tracking
     autoBuildInFlight = false;
+    autoBuildPromise = null;
     lastAutoBuildRun = null;
+    lastBuildSucceededAt = null;
     // Offsec AlphaZero tracking
     offsecRunId = null;
     // Streaming UX tracking
     streamingHeartbeatStart = null;
     streamingHeartbeatFrame = 0;
     streamingStatusLabel = null;
-    streamingStatusBase = null;
-    streamingStatusDetail = null;
     lastStreamingElapsedSeconds = null; // Preserve final elapsed time
+    streamingFormatter = null;
     statusLineState = null;
     statusMessageOverride = null;
-    latestThoughtSummary = null;
-    hasShownThoughtProcess = false;
     promptRefreshTimer = null;
     launchPaletteShown = false;
     version;
     alternateScreenEnabled;
-    inputInitialized = false;
-    assistantStreamActive = false;
-    assistantStreamPhase = null;
-    assistantStreamHeaderShown = false;
-    assistantStreamBuffer = '';
-    assistantStreamMetadata;
-    assistantStreamHadContent = false;
-    lastRequestStartedAt = null;
-    lastToolSummaryRenderedAt = null;
     constructor(config) {
         this.profile = config.profile;
         this.profileLabel = config.profileLabel;
@@ -204,10 +181,10 @@ export class InteractiveShell {
         this.thinkingMode = this.sessionPreferences.thinkingMode;
         this.autosaveEnabled = this.sessionPreferences.autosave;
         this.autoContinueEnabled = this.sessionPreferences.autoContinue;
-        this.alphaZeroModeEnabled = this.sessionPreferences.alphaZeroMode;
+        const featureFlags = loadFeatureFlags();
+        this.verificationEnabled = featureFlags.verification === true;
         this.sessionRestoreConfig = config.sessionRestore ?? { mode: 'none' };
         this._enabledPlugins = config.enabledPlugins ?? [];
-        this.assistantBlocksEnabled = config.assistantBlocksEnabled ?? true;
         this.version = config.version ?? '0.0.0';
         // Alternate screen disabled - use terminal-native mode for proper scrollback and text selection
         this.alternateScreenEnabled = false;
@@ -220,11 +197,6 @@ export class InteractiveShell {
             reasoningEffort: config.initialModel.reasoningEffort,
         };
         this.applyPresetReasoningDefaults();
-        // The welcome banner only includes model + provider on launch, so mark that as the initial state.
-        this.bannerSessionState = {
-            model: this.sessionState.model,
-            provider: this.sessionState.provider,
-        };
         this.agentMenu = config.agentSelection ?? null;
         this.slashCommands = [...BASE_SLASH_COMMANDS];
         if (this.agentMenu) {
@@ -256,21 +228,11 @@ export class InteractiveShell {
             description: 'Show available and loaded plugins',
             category: 'configuration',
         });
-        this.slashCommands.push({
-            command: '/contextlog',
-            description: 'Show recent context compaction summaries',
-            category: 'context',
-        });
         this.slashCommands.push({
             command: '/offsec',
             description: 'AlphaZero offensive security run (start/status/next)',
             category: 'automation',
         });
-        this.slashCommands.push({
-            command: '/alphazero',
-            description: 'Toggle AlphaZero RL mode with full-cycle verification',
-            category: 'mode',
-        });
         this.statusTracker = config.statusTracker;
         this.ui = config.ui;
         this.uiAdapter = config.ui.adapter;
@@ -282,11 +244,7 @@ export class InteractiveShell {
         });
         // Set up tool status callback to update status during tool execution
         this.uiAdapter.setToolStatusCallback((status) => {
-            const statusText = status?.text ?? null;
-            if (statusText) {
-                this.terminalInput.recordRecentAction(`[tool] ${statusText}`);
-            }
-            this.updateStatusMessage(statusText, { logRecent: false });
+            this.updateStatusMessage(status ?? null);
         });
         this.skillRepository = new SkillRepository({
             workingDir: this.workingDir,
@@ -306,19 +264,14 @@ export class InteractiveShell {
             onToggleVerify: () => this.toggleVerificationMode(),
             onToggleAutoContinue: () => this.toggleAutoContinueMode(),
             onToggleThinking: () => this.cycleThinkingMode(),
-            onToggleAlphaZero: () => this.toggleAlphaZeroMode('shortcut'),
             onClearContext: () => this.handleClearContext(),
         });
-        this.assistantBlockRenderer = this.assistantBlocksEnabled
-            ? new AssistantBlockRenderer({
-                write: (text) => this.writeAssistantBlock(text),
-                updates: this.uiUpdates,
-            })
-            : null;
         // Initialize Alpha Zero 2 metrics tracking
         this.alphaZeroMetrics = new MetricsTracker(`${this.profile}-${Date.now()}`);
         this.setupStatusTracking();
         this.refreshContextGauge();
+        // Start terminal input (sets up handlers)
+        this.terminalInput.start();
         // Allow planning tools (e.g., ProposePlan) to open the interactive approval UI just like Codex CLI
         this.registerPlanApprovalBridge();
         // Capture display output into the scrollback/chat log so system messages
@@ -333,12 +286,12 @@ export class InteractiveShell {
         else if (output.isTTY) {
             this.terminalInput.clearScreen();
         }
-        // Stream banner first - this sets up scroll region dynamically
-        const banner = this.buildBanner();
-        this.terminalInput.streamContent(banner + '\n\n');
+        // Render chat box immediately using the streaming UI lifecycle
+        this.refreshControlBar();
+        this.terminalInput.forceRender();
         this.rebuildAgent();
         this.setupHandlers();
-        this.refreshBannerSessionInfo();
+        this.refreshSessionContext();
         // Subscribe to parallel agent manager events
         this.setupParallelAgentTracking();
     }
@@ -350,13 +303,7 @@ export class InteractiveShell {
             this.parallelAgentDisplayLines = manager.formatDisplay();
             // Trigger UI refresh if streaming
             if (this.streamingHeartbeatStart) {
-                this.uiUpdates.enqueue({
-                    lane: 'stream',
-                    mode: ['streaming', 'processing'],
-                    coalesceKey: 'parallel-agents',
-                    description: 'parallel agent status',
-                    run: () => this.displayParallelAgents(),
-                });
+                this.displayParallelAgents();
             }
         };
         manager.on('agent:started', updateDisplay);
@@ -427,56 +374,13 @@ export class InteractiveShell {
         this.sessionResumeNotice = null;
     }
     async start(initialPrompt) {
-        await this.runStartupUpdatePrompt();
-        this.ensureInputInitialized();
         if (initialPrompt) {
             await this.processInputBlock(initialPrompt);
             return;
         }
         this.showLaunchCommandPalette();
         // Ensure the terminal input is visible
-        this.renderPromptArea();
-    }
-    async runStartupUpdatePrompt() {
-        if (this.version) {
-            try {
-                await maybeOfferCliUpdate(this.version);
-            }
-            catch {
-                // Ignore update check failures at startup
-            }
-        }
-        this.showStartupSecretGuidance();
-    }
-    ensureInputInitialized() {
-        if (this.inputInitialized) {
-            return;
-        }
-        this.terminalInput.start();
-        this.refreshControlBar();
-        this.renderPromptArea(true);
-        this.inputInitialized = true;
-    }
-    showStartupSecretGuidance() {
-        const definitions = listSecretDefinitions();
-        const providerSecret = definitions.find((definition) => definition.providers.includes(this.sessionState.provider));
-        const missingProviderKey = providerSecret ? !getSecretValue(providerSecret.id) : false;
-        const hasSearchKey = Boolean(getSecretValue('TAVILY_API_KEY')) ||
-            Boolean(getSecretValue('BRAVE_SEARCH_API_KEY')) ||
-            Boolean(getSecretValue('SERPAPI_API_KEY'));
-        if (!missingProviderKey && hasSearchKey) {
-            return;
-        }
-        const lines = [];
-        lines.push(theme.gradient.primary('Quick setup needed:'));
-        if (missingProviderKey && providerSecret) {
-            lines.push(`${theme.primary('•')} Set ${providerSecret.label} to use ${this.providerLabel(this.sessionState.provider)}.`);
-        }
-        if (!hasSearchKey) {
-            lines.push(`${theme.primary('•')} Add a web search API key (Tavily recommended) for web tools.`);
-        }
-        lines.push(theme.ui.muted('Run /secrets to configure keys now. Stored values override env vars.'));
-        display.showSystemMessage(lines.join('\n'));
+        this.terminalInput.render();
     }
     showLaunchCommandPalette() {
         // Disabled: Quick commands palette takes up too much space
@@ -487,10 +391,6 @@ export class InteractiveShell {
      * TerminalInputAdapter submit handler
      */
     processInput(text) {
-        // Guard: Don't process input if CLI update is in progress (we're about to exit)
-        if (isUpdateInProgress()) {
-            return;
-        }
         const approved = this.resolveEditPermission(text);
         if (!approved) {
             this.handleInputChange('');
@@ -506,10 +406,6 @@ export class InteractiveShell {
      * TerminalInputAdapter queue handler (streaming mode)
      */
     handleQueuedInput(text) {
-        // Guard: Don't queue input if CLI update is in progress (we're about to exit)
-        if (isUpdateInProgress()) {
-            return;
-        }
         if (this.isExitCommand(text)) {
             // Allow immediate exits even while streaming
             this.terminalInput.dequeue();
@@ -534,8 +430,7 @@ export class InteractiveShell {
         // Keep adapter queue trimmed so hints stay accurate
         this.terminalInput.dequeue();
         this.followUpQueue.push({ type: 'request', text });
-        // Record the queued action in the pinned recent strip instead of the scroll log
-        this.terminalInput.recordRecentAction(`queued: ${text}`);
+        display.showInfo(`Queued: "${text}"`);
         this.refreshQueueIndicators();
         this.scheduleQueueProcessing();
         this.handleInputChange('');
@@ -574,7 +469,6 @@ export class InteractiveShell {
             // Mode toggles
             '/thinking',
             '/autocontinue',
-            '/alphazero',
             // Discovery and plugins
             '/local', '/discover',
             '/plugins',
@@ -596,30 +490,15 @@ export class InteractiveShell {
      * Execute a command immediately during streaming.
      */
     async executeImmediateCommand(text) {
-        const label = text.trim() || 'command';
-        // Keep the action visible in the pinned input area instead of the scroll log
-        this.terminalInput.recordRecentAction(label);
-        // Surface a lightweight inline status while the command runs
-        const previousOverride = this.statusMessageOverride;
-        this.statusMessageOverride = `Running ${label}`;
-        this.refreshStatusLine(true);
-        try {
-            await this.processSlashCommand(text);
-        }
-        finally {
-            this.statusMessageOverride = previousOverride;
-            this.refreshStatusLine(true);
-        }
+        // Pause streaming display briefly to show command output
+        display.showInfo(`Running command during stream: ${text}`);
+        await this.processSlashCommand(text);
     }
     /**
      * TerminalInputAdapter change handler
      */
     handleInputChange(text) {
-        const previous = this.currentInput;
         this.currentInput = text;
-        if (previous !== text) {
-            this.terminalInput.clearInlineCommandPanel();
-        }
         if (text.length > 0) {
             this.resetCtrlCSequence();
         }
@@ -641,7 +520,7 @@ export class InteractiveShell {
                 display.showSystemMessage('✏️ Display edits mode enabled.');
             }
         }
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     toggleVerificationMode() {
         this.setVerificationMode(!this.verificationEnabled, 'shortcut');
@@ -654,8 +533,8 @@ export class InteractiveShell {
             return;
         }
         const message = enabled
-            ? '✅ Verification on. Auto-tests will run after edits. (Ctrl+Shift+V to toggle)'
-            : '⏭️ Verification off. Skipping auto-tests until re-enabled. (Ctrl+Shift+V to toggle)';
+            ? '✅ Verification on for this session. Auto-tests will run after edits. (Ctrl+Shift+V to toggle; use /features verification on and restart to make this the default)'
+            : '⏭️ Verification off. Skipping auto-tests until re-enabled. (Ctrl+Shift+V to toggle; defaults to off unless enabled via /features)';
         display.showSystemMessage(message);
     }
     toggleAutoContinueMode() {
@@ -678,54 +557,21 @@ export class InteractiveShell {
                 : 'The model will not be auto-prompted to continue.') +
             ' Toggle with Ctrl+Shift+C.');
     }
-    toggleAlphaZeroMode(source = 'shortcut') {
-        this.setAlphaZeroMode(!this.alphaZeroModeEnabled, source);
-    }
-    setAlphaZeroMode(enabled, source) {
-        const changed = this.alphaZeroModeEnabled !== enabled;
-        this.alphaZeroModeEnabled = enabled;
-        saveSessionPreferences({ alphaZeroMode: this.alphaZeroModeEnabled });
-        // Force verification on while AlphaZero mode is active to guarantee deep checks
-        if (enabled) {
-            if (this.alphaZeroVerificationSnapshot === null) {
-                this.alphaZeroVerificationSnapshot = this.verificationEnabled;
-            }
-            if (!this.verificationEnabled) {
-                this.setVerificationMode(true, 'command');
-            }
-        }
-        else if (this.alphaZeroVerificationSnapshot !== null) {
-            this.setVerificationMode(this.alphaZeroVerificationSnapshot, 'command');
-            this.alphaZeroVerificationSnapshot = null;
-        }
-        this.refreshControlBar();
-        if (!changed && source === 'shortcut') {
-            return;
-        }
-        if (enabled) {
-            display.showSystemMessage('♞ AlphaZero RL mode enabled. Difficult prompts will use the duel/self-critique playbook with full lifecycle verification.');
-        }
-        else {
-            display.showInfo('AlphaZero RL mode disabled. Returning to standard flow.');
-        }
-    }
     /**
-     * Cycle through thinking modes (Ctrl+Shift+T keyboard shortcut).
+     * Cycle through thinking modes (Tab shortcut).
      */
     cycleThinkingMode() {
-        const modes = ['concise', 'balanced', 'extended'];
-        const currentIndex = modes.indexOf(this.thinkingMode);
-        const nextIndex = (currentIndex + 1) % modes.length;
-        const nextMode = modes[nextIndex];
+        const nextMode = this.thinkingMode === 'balanced' ? 'extended' : 'balanced';
         this.thinkingMode = nextMode;
         saveSessionPreferences({ thinkingMode: this.thinkingMode });
         this.refreshControlBar();
-        const descriptions = {
-            concise: 'Minimal reasoning, faster responses',
-            balanced: 'Default reasoning depth',
-            extended: 'Deep reasoning, thorough analysis',
-        };
-        display.showInfo(`Thinking mode: ${theme.info(nextMode)} - ${descriptions[nextMode]}. (Alt+T to cycle)`);
+        const headline = nextMode === 'extended'
+            ? `${theme.info('Thinking on')} (Tab to toggle)`
+            : `${theme.info('Thinking off')} (Tab to toggle)`;
+        const detail = nextMode === 'extended'
+            ? 'Longer reasoning enabled; expect extra usage for deeper answers.'
+            : 'Balanced (default) reasoning restored.';
+        display.showSystemMessage([headline, theme.ui.muted(detail)].join('\n'));
     }
     /**
      * Handle context clear/compact request (Alt+X keyboard shortcut).
@@ -744,27 +590,17 @@ export class InteractiveShell {
      */
     async performContextCompaction() {
         try {
-            const sourceHistory = this.agent ? this.agent.getHistory() : this.cachedHistory;
-            const oldLength = sourceHistory.length;
+            // For now, just clear the history and show a message
+            // A full implementation would summarize the conversation
+            const oldLength = this.cachedHistory.length;
             if (oldLength === 0) {
                 display.showInfo('Context is already empty.');
                 return;
             }
-            // Preserve the first system message (base prompt) and the last few user/assistant turns.
-            const systemMessage = sourceHistory.find((message) => message.role === 'system') ?? null;
-            const conversationalMessages = sourceHistory.filter((message) => message.role !== 'system');
-            const keepCount = Math.min(4, conversationalMessages.length);
-            const tail = keepCount > 0 ? conversationalMessages.slice(-keepCount) : [];
-            const compacted = systemMessage ? [systemMessage, ...tail] : tail;
-            this.cachedHistory = compacted;
-            if (this.agent) {
-                this.agent.loadHistory(compacted);
-            }
-            // Reset tracked context usage so tools and status bars stay in sync post-compaction.
-            this.latestTokenUsage = { used: null, limit: this.activeContextWindowTokens ?? null };
-            this.updateContextUsage(0, CONTEXT_AUTOCOMPACT_PERCENT);
-            this.lastContextWarningLevel = null;
-            display.showSuccess(`Context compacted: ${oldLength} messages reduced to ${compacted.length}. ` +
+            // Keep the last few messages for continuity
+            const keepCount = Math.min(4, oldLength);
+            this.cachedHistory = this.cachedHistory.slice(-keepCount);
+            display.showSuccess(`Context compacted: ${oldLength} messages reduced to ${keepCount}. ` +
                 `Context usage reset. Continue your conversation.`);
             this.refreshControlBar();
         }
@@ -796,7 +632,7 @@ export class InteractiveShell {
         if (['n', 'no', 'cancel', '/cancel'].includes(lower)) {
             this.pendingPermissionInput = null;
             display.showInfo('Request cancelled.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return null;
         }
         // Treat any other input as a replacement request that also needs confirmation
@@ -814,7 +650,7 @@ export class InteractiveShell {
         ]
             .filter(Boolean)
             .join('\n'));
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     /**
      * Handle Ctrl+C presses in three stages:
@@ -828,8 +664,8 @@ export class InteractiveShell {
         if (this.ctrlCPressCount === 1) {
             this.clearChatInput();
             const prefix = hadBuffer ? 'Input cleared.' : 'Nothing to clear.';
-            display.showSystemMessage(`${prefix} Press Ctrl+C again to pause the AI; a third time quits.`);
-            this.renderPromptArea();
+            display.showSystemMessage(`${prefix} Press Ctrl+C again to pause the AI.`);
+            this.terminalInput.render();
             return;
         }
         if (this.ctrlCPressCount === 2) {
@@ -841,10 +677,10 @@ export class InteractiveShell {
     pauseAiExecution() {
         if (this.isProcessing && this.agent) {
             this.agent.requestCancellation();
-            display.showWarning('Pausing AI execution... (Press Ctrl+C again to quit)');
+            display.showWarning('Pausing AI execution...');
             return;
         }
-        display.showInfo('No active AI execution to pause. Press Ctrl+C again to quit.');
+        display.showInfo('No active AI execution to pause.');
     }
     resetCtrlCSequence() {
         this.ctrlCPressCount = 0;
@@ -877,7 +713,7 @@ export class InteractiveShell {
             : null;
         // Stop any active spinner to prevent process hang
         display.stopThinking(false);
-        this.stopStreamingHeartbeat({ skipRender: true });
+        this.stopStreamingHeartbeat();
         this.uiUpdates.dispose();
         this.clearPromptRefreshTimer();
         this.teardownStatusTracking();
@@ -886,9 +722,7 @@ export class InteractiveShell {
         // Clear any pending cleanup to prevent hanging
         this.pendingCleanup = null;
         // Reset terminal state before disposing adapters
-        if (this.terminalInput.isScrollRegionActive()) {
-            this.terminalInput.exitStreamingScrollRegion({ skipRender: true });
-        }
+        this.terminalInput.exitStreamingScrollRegion();
         if (this.alternateScreenEnabled) {
             this.terminalInput.exitAlternateScreen();
         }
@@ -901,9 +735,7 @@ export class InteractiveShell {
         if (scrollbackSnapshot && scrollbackSnapshot.length > 0) {
             this.restoreScrollbackSnapshot(scrollbackSnapshot);
         }
-        console.log(theme.ui.muted('━'.repeat(44)));
-        console.log(theme.ui.muted('  Goodbye! · support@ero.solar'));
-        console.log(theme.ui.muted('━'.repeat(44)));
+        display.stream(`\n${theme.ui.muted('Session closed.')}\n`);
         exit(0);
     }
     restoreScrollbackSnapshot(lines) {
@@ -913,8 +745,8 @@ export class InteractiveShell {
         const transcript = lines.join('\n');
         const separator = theme.ui.muted('─'.repeat(44));
         const header = theme.ui.muted('Restored scrollback from this session:');
-        // Write directly to stdout after exiting alternate screen to preserve the transcript
-        process.stdout.write(`\n${separator}\n${header}\n${transcript}\n${separator}\n`);
+        // Stream the restored transcript so it stays within the in-stream UI flow
+        display.stream(`\n${separator}\n${header}\n${transcript}\n${separator}\n`);
     }
     /**
      * Wire the planning tool suite to the interactive plan approval UI so ProposePlan behaves like Codex CLI.
@@ -931,11 +763,8 @@ export class InteractiveShell {
     /**
      * Update status bar message
      */
-    updateStatusMessage(message, options = {}) {
+    updateStatusMessage(message) {
         this.statusMessageOverride = message;
-        if (message && options.logRecent !== false) {
-            this.terminalInput.recordRecentAction(`[status] ${message}`);
-        }
         // During streaming we still want the spinner prefix; when idle force a fast refresh.
         this.refreshStatusLine(!this.isProcessing);
     }
@@ -947,26 +776,26 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a number, "save", "defaults", or "cancel".');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const normalized = trimmed.toLowerCase();
         if (normalized === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Tool selection cancelled.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         if (normalized === 'defaults') {
             pending.selection = buildEnabledToolSet(null);
             this.renderToolMenu(pending);
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         if (normalized === 'save') {
             await this.persistToolSelection(pending);
             this.pendingInteraction = null;
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
@@ -976,19 +805,24 @@ export class InteractiveShell {
                 display.showWarning('That option is not available.');
             }
             else {
-                if (pending.selection.has(option.id)) {
-                    pending.selection.delete(option.id);
+                if (option.locked) {
+                    display.showInfo('The default tool package is always enabled and cannot be toggled.');
                 }
                 else {
-                    pending.selection.add(option.id);
+                    if (pending.selection.has(option.id)) {
+                        pending.selection.delete(option.id);
+                    }
+                    else {
+                        pending.selection.add(option.id);
+                    }
                 }
                 this.renderToolMenu(pending);
             }
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         display.showWarning('Enter a number, "save", "defaults", or "cancel".');
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     async persistToolSelection(interaction) {
         if (setsEqual(interaction.selection, interaction.initialSelection)) {
@@ -998,10 +832,11 @@ export class InteractiveShell {
         const defaults = buildEnabledToolSet(null);
         if (setsEqual(interaction.selection, defaults)) {
             clearToolSettings();
-            display.showInfo('Tool settings cleared. Defaults will be used on the next launch. Next steps: enable any optional suites from the Tools menu or preferences (restart to apply) if you want them available by default.');
+            display.showInfo('Tool settings cleared. Defaults will be used on the next launch.');
             return;
         }
         const ordered = interaction.options
+            .filter((option) => !option.locked)
             .map((option) => option.id)
             .filter((id) => interaction.selection.has(id));
         saveToolSettings({ enabledTools: ordered });
@@ -1015,36 +850,36 @@ export class InteractiveShell {
         if (!this.agentMenu) {
             this.pendingInteraction = null;
             display.showWarning('Agent selection is unavailable in this CLI.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a number or type "cancel".');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Agent selection cancelled.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
             display.showWarning('Please enter a valid number.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const option = pending.options[choice - 1];
         if (!option) {
             display.showWarning('That option is not available.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         await this.persistAgentSelection(option.name);
         this.pendingInteraction = null;
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     async persistAgentSelection(profileName) {
         if (!this.agentMenu) {
@@ -1117,7 +952,7 @@ export class InteractiveShell {
         lines.push(`  ${theme.primary('[text]')}   Submit your own solution instead`);
         lines.push('');
         display.showSystemMessage(lines.join('\n'));
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     async handlePlanApprovalInput(input) {
         const pending = this.pendingInteraction;
@@ -1126,7 +961,7 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a command or your own solution.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const lower = trimmed.toLowerCase();
@@ -1134,7 +969,7 @@ export class InteractiveShell {
         if (lower === 'cancel' || lower === 'c') {
             this.pendingInteraction = null;
             display.showInfo('Plan cancelled. You can continue with a different approach.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         // Select all
@@ -1154,7 +989,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.renderPromptArea();
+                this.terminalInput.render();
                 return;
             }
             this.pendingInteraction = null;
@@ -1187,18 +1022,15 @@ export class InteractiveShell {
             return;
         }
         display.showWarning('Invalid input. Enter a step number, command (go/cancel/all/none), or your own solution.');
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     setupHandlers() {
         // Handle terminal resize
         output.on('resize', () => {
-            if (!this.inputInitialized) {
-                return;
-            }
-            this.terminalInput.resetContentPosition();
             this.terminalInput.handleResize();
-            this.terminalInput.forceRender();
         });
+        // Show initial input UI
+        this.terminalInput.render();
     }
     /**
      * Set up command autocomplete with all available slash commands.
@@ -1229,14 +1061,6 @@ export class InteractiveShell {
         catch {
             // Custom commands are optional
         }
-        // Add manual commands that are not yet in the schema
-        if (!commands.some((cmd) => cmd.command === '/alphazero')) {
-            commands.push({
-                command: '/alphazero',
-                description: 'Toggle AlphaZero RL mode',
-                category: 'mode',
-            });
-        }
         // Sort commands alphabetically
         commands.sort((a, b) => a.command.localeCompare(b.command));
         this.terminalInput.setAvailableCommands(commands);
@@ -1315,312 +1139,25 @@ export class InteractiveShell {
             autoContinueEnabled: this.autoContinueEnabled,
             verificationHotkey: 'ctrl+shift+v',
             autoContinueHotkey: 'ctrl+shift+c',
-            thinkingModeLabel: this.thinkingMode,
-            thinkingHotkey: 'ctrl+shift+t',
-            alphaZeroEnabled: this.alphaZeroModeEnabled,
-            alphaZeroHotkey: 'ctrl+shift+a',
-            alphaZeroLabel: 'AlphaZero RL',
+            thinkingModeLabel: this.thinkingMode === 'extended' ? 'on' : 'off',
+            thinkingHotkey: 'tab',
         });
-        this.refreshFeatureStatusDisplay();
         this.refreshStatusLine();
-        this.renderPromptArea();
-    }
-    refreshFeatureStatusDisplay() {
-        this.terminalInput.setFeatureStatus(this.buildFeatureStatusSnapshot());
+        this.terminalInput.render();
     }
     writeLocked(content) {
         if (!content) {
             return;
         }
-        // Route through display stream so scroll regions and streaming locks stay in sync
-        display.stream(content);
-    }
-    resetAssistantStreamTracking() {
-        this.assistantStreamActive = false;
-        this.assistantStreamPhase = null;
-        this.assistantStreamHeaderShown = false;
-        this.assistantStreamBuffer = '';
-        this.assistantStreamMetadata = undefined;
-        this.assistantStreamHadContent = false;
-    }
-    startAssistantStream(metadata) {
-        if (this.assistantStreamActive) {
-            this.assistantStreamMetadata = metadata ?? this.assistantStreamMetadata;
+        // 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;
         }
-        this.assistantStreamActive = true;
-        // Default to thought phase so the first output after a prompt is the assistant's thinking.
-        this.assistantStreamPhase = 'thought';
-        this.assistantStreamHeaderShown = false;
-        this.assistantStreamBuffer = '';
-        this.assistantStreamMetadata = metadata;
-        this.assistantStreamHadContent = false;
-    }
-    streamAssistantChunk(chunk, channel) {
-        if (!chunk) {
-            return;
-        }
-        if (!this.assistantStreamActive) {
-            this.startAssistantStream({
-                contextWindowTokens: this.activeContextWindowTokens,
-            });
-        }
-        // Agent wraps reasoning chunks in <thinking> tags via openThinking()/closeThinking()
-        // Always use tag parsing to properly handle the tags
-        this.processAssistantStreamChunk(chunk);
-    }
-    finalizeAssistantStream() {
-        if (!this.assistantStreamActive) {
-            return;
-        }
-        if (this.assistantStreamBuffer) {
-            this.writeAssistantStream(this.assistantStreamBuffer);
-            this.assistantStreamBuffer = '';
-        }
-        this.assistantStreamActive = false;
-        this.assistantStreamPhase = null;
-        this.assistantStreamHeaderShown = false;
-        this.assistantStreamMetadata = undefined;
-    }
-    processAssistantStreamChunk(chunk) {
-        this.assistantStreamBuffer += chunk;
-        const tagRegex = /<(\/?)(thinking|response)>/i;
-        while (this.assistantStreamBuffer.length > 0) {
-            const match = tagRegex.exec(this.assistantStreamBuffer);
-            if (!match || match.index === undefined) {
-                // No more full tags - flush what we can but keep any partial tag prefix buffered
-                const { flushable, remainder } = this.splitAssistantStreamRemainder(this.assistantStreamBuffer);
-                if (flushable) {
-                    this.writeAssistantStream(flushable);
-                }
-                this.assistantStreamBuffer = remainder;
-                return;
-            }
-            const tagIndex = match.index;
-            const beforeTag = this.assistantStreamBuffer.slice(0, tagIndex);
-            if (beforeTag) {
-                this.writeAssistantStream(beforeTag);
-            }
-            // Advance buffer past the tag
-            this.assistantStreamBuffer = this.assistantStreamBuffer.slice(tagIndex + match[0].length);
-            const isClosing = match[1] === '/';
-            const rawTagType = (match[2] ?? '').toLowerCase();
-            // Map 'thinking' to 'thought' for AssistantBlockType compatibility
-            const tagType = (rawTagType === 'thinking' ? 'thought' : rawTagType);
-            if (isClosing) {
-                if (this.assistantStreamPhase === tagType) {
-                    this.assistantStreamPhase = null;
-                    this.assistantStreamHeaderShown = false;
-                }
-            }
-            else {
-                this.setAssistantStreamPhase(tagType);
-            }
-        }
-    }
-    writeAssistantStream(content) {
-        if (!content) {
-            return;
-        }
-        if (content.trim().length > 0) {
-            this.assistantStreamHadContent = true;
-        }
-        // If no explicit phase has been set yet, keep the stream labeled as "thought"
-        // until a <response> tag arrives so operators see thinking first.
-        this.setAssistantStreamPhase(this.assistantStreamPhase ?? 'thought');
-        if (this.assistantStreamPhase) {
-            this.renderAssistantStreamHeader(this.assistantStreamPhase);
-        }
-        let output = content;
-        if (this.assistantStreamPhase === 'thought') {
-            output = this.formatThoughtDisplay(content, { streaming: true });
-        }
-        this.enqueueAssistantStream(output);
-    }
-    setAssistantStreamPhase(phase) {
-        if (this.assistantStreamPhase === phase) {
-            return;
-        }
-        this.assistantStreamPhase = phase;
-        this.assistantStreamHeaderShown = false;
-        if (phase) {
-            this.renderAssistantStreamHeader(phase);
-        }
-    }
-    renderAssistantStreamHeader(type) {
-        if (this.assistantStreamHeaderShown) {
-            return;
-        }
-        const header = this.formatAssistantHeader(type, this.assistantStreamMetadata);
-        if (header.trim()) {
-            this.enqueueAssistantStream(`\n${header}\n`);
-        }
-        this.assistantStreamHeaderShown = true;
-    }
-    splitAssistantStreamRemainder(buffer) {
-        if (!buffer) {
-            return { flushable: '', remainder: '' };
-        }
-        const tags = ['<thinking>', '</thinking>', '<response>', '</response>'];
-        let longest = '';
-        for (const tag of tags) {
-            for (let i = 1; i < tag.length; i += 1) {
-                const prefix = tag.slice(0, i);
-                if (buffer.endsWith(prefix) && prefix.length > longest.length) {
-                    longest = prefix;
-                }
-            }
-        }
-        if (!longest) {
-            return { flushable: buffer, remainder: '' };
-        }
-        return {
-            flushable: buffer.slice(0, -longest.length),
-            remainder: longest,
-        };
-    }
-    enqueueAssistantStream(content) {
-        if (!content) {
-            return;
-        }
-        const run = () => this.writeAssistantBlock(content);
-        this.uiUpdates.enqueue({
-            lane: 'stream',
-            mode: ['streaming', 'processing', 'idle'],
-            priority: 'high',
-            description: 'assistant stream flush',
-            run,
-        });
-    }
-    writeAssistantBlock(content) {
-        if (!content) {
-            return;
-        }
-        // Ensure assistant block writes are serialized with terminal input renders
-        writeLock.safeWrite(() => {
-            this.terminalInput.streamContent(content);
-        });
-    }
-    renderAssistantBlock(type, content, metadata) {
-        if (!this.assistantBlocksEnabled || !this.assistantBlockRenderer) {
-            return;
-        }
-        this.assistantBlockRenderer.renderBlock(type, content, metadata);
-        // Ensure the prompt stays pinned below freshly written blocks
-        this.renderPromptArea();
-    }
-    renderAssistantContent(type, content, metadata) {
-        const normalized = content.replace(/\r\n/g, '\n').trim();
-        if (!normalized) {
-            return;
-        }
-        const formatted = type === 'thought' ? this.formatThoughtDisplay(normalized) : normalized;
-        if (this.assistantBlocksEnabled && this.assistantBlockRenderer) {
-            this.renderAssistantBlock(type, formatted, metadata);
-            return;
-        }
-        this.renderAssistantFallback(type, formatted, metadata);
-    }
-    renderAssistantFallback(type, content, metadata) {
-        const header = this.formatAssistantHeader(type, metadata);
-        const compact = content.trimEnd().replace(/\n{3,}/g, '\n\n');
-        const block = `\n${header}\n${compact}\n\n`;
-        this.enqueueAssistantStream(block);
-    }
-    formatThoughtDisplay(content, options = {}) {
-        const normalized = content.replace(/\r\n/g, '\n');
-        if (options.streaming) {
-            return formatThinkingContent(normalized);
-        }
-        const lines = normalized.split('\n');
-        return lines
-            .map((line, index) => {
-            const prefix = index === 0 ? theme.info(icons.action) : theme.ui.muted(icons.subaction);
-            const trimmed = line.trim();
-            const body = trimmed ? formatThinkingContent(trimmed) : '';
-            return body ? `${prefix} ${body}` : `${prefix}`;
-        })
-            .join('\n');
-    }
-    formatAssistantHeader(type, metadata) {
-        if (this.assistantBlocksEnabled && this.assistantBlockRenderer) {
-            return this.assistantBlockRenderer.formatHeader(type, metadata);
-        }
-        const badges = [];
-        badges.push(this.buildAssistantTypeBadge(type));
-        const timestamp = new Date().toLocaleTimeString('en-US', {
-            hour12: false,
-            hour: '2-digit',
-            minute: '2-digit',
-            second: '2-digit',
-        });
-        badges.push({ text: timestamp, style: 'muted', icon: '🕑' });
-        const total = metadata?.usage ? this.totalTokens(metadata.usage) : null;
-        const windowTokens = metadata?.contextWindowTokens;
-        if (typeof total === 'number') {
-            badges.push({ text: `${total} tok`, style: 'muted', icon: '⎍' });
-        }
-        if (typeof total === 'number' && typeof windowTokens === 'number' && windowTokens > 0) {
-            const percentage = Math.round((total / windowTokens) * 100);
-            const style = percentage > 85 ? 'error' : percentage > 70 ? 'warning' : 'info';
-            badges.push({ text: `${percentage}% ctx`, style, icon: '⊛' });
-        }
-        const elapsedBadge = this.buildElapsedBadge(metadata);
-        if (elapsedBadge) {
-            badges.push(elapsedBadge);
-        }
-        return compactRenderer.formatBadges(badges, theme.ui.muted(' │ '));
-    }
-    buildAssistantTypeBadge(type) {
-        switch (type) {
-            case 'thought':
-                return { text: 'Thought', style: 'info', icon: '💭' };
-            case 'tools':
-                return { text: 'Tools', style: 'primary', icon: '🛠' };
-            case 'response':
-            default:
-                return { text: 'Response', style: 'success', icon: '💬' };
-        }
-    }
-    buildElapsedBadge(metadata) {
-        const elapsed = metadata?.elapsedMs;
-        if (typeof elapsed !== 'number' || elapsed <= 0) {
-            return null;
-        }
-        const formatted = elapsed < 1000 ? `${Math.round(elapsed)}ms` : `${Math.round(elapsed / 1000)}s`;
-        return { text: formatted, style: 'muted', icon: '⏱' };
-    }
-    isStreamingUiActive() {
-        return this.streamingHeartbeatStart !== null;
-    }
-    /**
-     * Render the prompt/control bar. During streaming, rely on the streaming frame
-     * renderer and enqueue through the UIUpdateCoordinator to avoid fighting the
-     * scroll region or duplicating the prompt.
-     */
-    renderPromptArea(force = false) {
-        if (this.isStreamingUiActive()) {
-            this.uiUpdates.enqueue({
-                lane: 'prompt',
-                mode: ['streaming', 'processing'],
-                coalesceKey: 'prompt:streaming-frame',
-                description: 'render streaming prompt frame',
-                run: () => {
-                    if (force) {
-                        this.terminalInput.renderStreamingFrame(true);
-                        return;
-                    }
-                    this.terminalInput.renderStreamingFrame();
-                },
-            });
-            return;
-        }
-        if (force) {
-            this.terminalInput.forceRender();
-        }
-        else {
-            this.terminalInput.render();
-        }
+        writeLock.withLock(() => {
+            process.stdout.write(content);
+        }, 'interactiveShell.stdout');
     }
     /**
      * Refresh the status line in the persistent input area.
@@ -1638,23 +1175,19 @@ export class InteractiveShell {
         // Surface meta header (elapsed + context usage) above the divider
         // Use streaming elapsed time if available, otherwise fall back to status line state
         let elapsedSeconds = null;
-        const shouldShowElapsed = this.streamingHeartbeatStart !== null || this.isProcessing;
-        if (this.streamingHeartbeatStart && shouldShowElapsed) {
+        if (this.streamingHeartbeatStart) {
             // Actively streaming - compute live elapsed
             elapsedSeconds = Math.max(0, Math.floor((Date.now() - this.streamingHeartbeatStart) / 1000));
         }
-        else if (shouldShowElapsed && this.lastStreamingElapsedSeconds !== null) {
+        else if (this.lastStreamingElapsedSeconds !== null) {
             // Just finished streaming - use preserved final time
             elapsedSeconds = this.lastStreamingElapsedSeconds;
         }
-        else if (shouldShowElapsed && this.statusLineState) {
+        else if (this.statusLineState) {
             // Fallback to status line state elapsed
             elapsedSeconds = Math.max(0, Math.floor((Date.now() - this.statusLineState.startedAt) / 1000));
         }
-        const hasThoughtSummary = !!this.latestThoughtSummary;
-        const thinkingMs = hasThoughtSummary && display.isSpinnerActive()
-            ? display.getThinkingElapsedMs()
-            : null;
+        const thinkingMs = display.isSpinnerActive() ? display.getThinkingElapsedMs() : null;
         const tokensUsed = this.latestTokenUsage.used;
         const tokenLimit = this.latestTokenUsage.limit ?? this.activeContextWindowTokens;
         this.terminalInput.setMetaStatus({
@@ -1662,7 +1195,7 @@ export class InteractiveShell {
             tokensUsed,
             tokenLimit,
             thinkingMs,
-            thinkingHasContent: hasThoughtSummary,
+            thinkingHasContent: display.isSpinnerActive(),
         });
         // Keep model/provider visible in the controls bar
         this.terminalInput.setModelContext({
@@ -1670,7 +1203,7 @@ export class InteractiveShell {
             provider: this.providerLabel(this.sessionState.provider),
         });
         if (forceRender) {
-            this.renderPromptArea(true);
+            this.terminalInput.render();
         }
     }
     /**
@@ -1707,7 +1240,7 @@ export class InteractiveShell {
      * Ensure the terminal input is ready for interactive input.
      */
     ensureReadlineReady() {
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     /**
      * Log user prompt to the scroll region so it's part of the conversation flow.
@@ -1729,7 +1262,7 @@ export class InteractiveShell {
     }
     requestPromptRefresh(force = false) {
         if (force) {
-            this.renderPromptArea(true);
+            this.terminalInput.forceRender();
             return;
         }
         if (this.promptRefreshTimer) {
@@ -1737,7 +1270,7 @@ export class InteractiveShell {
         }
         this.promptRefreshTimer = setTimeout(() => {
             this.promptRefreshTimer = null;
-            this.renderPromptArea();
+            this.terminalInput.render();
         }, 48);
     }
     clearPromptRefreshTimer() {
@@ -1746,53 +1279,35 @@ export class InteractiveShell {
             this.promptRefreshTimer = null;
         }
     }
-    async withStreamingUi(label, run) {
-        if (this.isStreamingUiActive()) {
-            return run();
-        }
-        this.resetAssistantStreamTracking();
-        this.terminalInput.setStreaming(true);
-        this.startStreamingHeartbeat(label);
-        try {
-            return await run();
-        }
-        finally {
-            this.stopStreamingHeartbeat();
-            this.terminalInput.setStreaming(false);
-            const nextMode = this.isProcessing ? 'processing' : 'idle';
-            this.uiUpdates.setMode(nextMode);
-            if (nextMode === 'processing') {
-                queueMicrotask(() => this.uiUpdates.setMode('idle'));
-            }
-        }
-    }
     startStreamingHeartbeat(label = 'Streaming') {
-        this.stopStreamingHeartbeat({ skipRender: true });
+        this.stopStreamingHeartbeat();
         // Enter global streaming mode - blocks all non-streaming UI output
         enterStreamingMode();
-        this.streamingStatusBase = label;
-        this.streamingStatusDetail = null;
-        this.latestThoughtSummary = null;
-        this.lastStreamingElapsedSeconds = null;
         // Set up scroll region for streaming content
         this.terminalInput.enterStreamingScrollRegion();
         this.uiUpdates.setMode('streaming');
         this.streamingHeartbeatStart = Date.now();
         this.streamingHeartbeatFrame = 0;
-        this.rebuildStreamingStatusLabel();
+        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',
-            priority: 'high',
             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;
-                this.rebuildStreamingStatusLabel();
+                const frame = STREAMING_SPINNER_FRAMES[this.streamingHeartbeatFrame];
+                this.streamingStatusLabel = this.buildStreamingStatus(`${frame} ${label}`, elapsedSeconds);
+                display.updateStreamingStatus(this.streamingStatusLabel);
                 // Update parallel agent display during streaming
                 const manager = getParallelAgentManager();
                 if (manager.isRunning()) {
@@ -1803,13 +1318,7 @@ export class InteractiveShell {
             },
         });
     }
-    stopStreamingHeartbeat(options = {}) {
-        const skipRender = !!options.skipRender;
-        const streamingActive = this.isStreamingUiActive();
-        const scrollRegionActive = this.terminalInput.isScrollRegionActive();
-        if (!streamingActive && !scrollRegionActive) {
-            return;
-        }
+    stopStreamingHeartbeat() {
         // Exit global streaming mode - allows UI to render again
         exitStreamingMode();
         // Preserve final elapsed time before clearing heartbeat start
@@ -1817,44 +1326,51 @@ export class InteractiveShell {
             this.lastStreamingElapsedSeconds = Math.max(0, Math.floor((Date.now() - this.streamingHeartbeatStart) / 1000));
         }
         // Exit scroll region mode
-        this.terminalInput.exitStreamingScrollRegion({ skipRender });
+        this.terminalInput.exitStreamingScrollRegion();
         this.uiUpdates.stopHeartbeat('streaming');
         this.streamingHeartbeatStart = null;
         this.streamingHeartbeatFrame = 0;
         this.streamingStatusLabel = null;
-        this.streamingStatusBase = null;
-        this.streamingStatusDetail = null;
-        this.latestThoughtSummary = null;
         // Clear streaming label specifically (keeps override and main status if set)
         this.terminalInput.setStreamingLabel(null);
         // Clear streaming status from display
         display.updateStreamingStatus(null);
         // Force refresh to update the input area now that streaming has ended
-        if (!skipRender) {
-            this.refreshStatusLine(true);
-        }
+        this.refreshStatusLine(true);
     }
-    buildStreamingStatus(label, _elapsedSeconds) {
-        // Model + elapsed time already live in the pinned meta header; keep the streaming
-        // status focused on the activity and most recent thought summary.
-        const prefix = theme.info('⏺');
-        const parts = [label.trim()];
-        if (this.streamingStatusDetail) {
-            const detail = this.streamingStatusDetail.length > 52
-                ? `${this.streamingStatusDetail.slice(0, 51)}…`
-                : this.streamingStatusDetail;
-            parts.push(theme.ui.muted(detail));
+    handleStreamChunk(chunk) {
+        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());
+        }
+        const formatted = this.streamingFormatter.formatChunk(chunk);
+        if (formatted) {
+            this.terminalInput.streamContent(formatted);
         }
-        return `${prefix} ${parts.join(' · ')}`.trim();
     }
-    rebuildStreamingStatusLabel() {
-        if (this.streamingHeartbeatStart === null) {
+    finishStreamingFormatter(note) {
+        if (!this.streamingFormatter) {
             return;
         }
-        const frame = STREAMING_SPINNER_FRAMES[this.streamingHeartbeatFrame];
-        const base = this.streamingStatusBase ?? 'Streaming';
-        this.streamingStatusLabel = this.buildStreamingStatus(`${frame} ${base}`);
-        display.updateStreamingStatus(this.streamingStatusLabel);
+        const closing = this.streamingFormatter.finish(note);
+        if (closing) {
+            this.terminalInput.streamContent(closing);
+        }
+        this.streamingFormatter = null;
+    }
+    buildStreamingStatus(label, _elapsedSeconds) {
+        // Model + elapsed time already live in the pinned meta header; keep the streaming
+        // status focused on the activity to avoid duplicate info.
+        const prefix = theme.info('⏺');
+        return `${prefix} ${label}`.trim();
     }
     formatElapsedShort(seconds) {
         if (seconds < 60) {
@@ -1871,7 +1387,7 @@ export class InteractiveShell {
         else {
             this.setIdleStatus();
         }
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     enqueueFollowUpAction(action) {
         this.followUpQueue.push(action);
@@ -1890,21 +1406,14 @@ export class InteractiveShell {
         this.refreshQueueIndicators();
         this.scheduleQueueProcessing();
         // Re-show the prompt so user can continue typing more follow-ups
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     scheduleQueueProcessing() {
         if (!this.followUpQueue.length) {
             this.refreshQueueIndicators();
             return;
         }
-        if (this.apiKeyGateActive) {
-            this.refreshQueueIndicators();
-            return;
-        }
         queueMicrotask(() => {
-            if (this.apiKeyGateActive) {
-                return;
-            }
             void this.processQueuedActions();
         });
     }
@@ -1912,12 +1421,12 @@ export class InteractiveShell {
      * Process queued follow-up actions.
      */
     async processQueuedActions() {
-        if (this.apiKeyGateActive || this.isDrainingQueue || this.isProcessing || !this.followUpQueue.length) {
+        if (this.isDrainingQueue || this.isProcessing || !this.followUpQueue.length) {
             return;
         }
         this.isDrainingQueue = true;
         try {
-            while (!this.isProcessing && !this.apiKeyGateActive && this.followUpQueue.length) {
+            while (!this.isProcessing && this.followUpQueue.length) {
                 const next = this.followUpQueue.shift();
                 const remaining = this.followUpQueue.length;
                 const label = next.type === 'continuous' ? 'continuous command' : 'follow-up';
@@ -1952,12 +1461,12 @@ export class InteractiveShell {
         }
         if (lower === 'clear') {
             display.clear();
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         if (lower === 'help') {
             this.showHelp();
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         if (trimmed.startsWith('/')) {
@@ -1967,12 +1476,12 @@ export class InteractiveShell {
         // Check for continuous/infinite loop commands
         if (this.isContinuousCommand(trimmed)) {
             await this.processContinuousRequest(trimmed);
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         // Direct execution for all inputs, including multi-line pastes
         await this.processRequest(trimmed);
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     /**
      * Check if the command is a continuous/infinite loop command
@@ -2010,153 +1519,6 @@ export class InteractiveShell {
         ];
         return patterns.some(pattern => pattern.test(lower));
     }
-    isDifficultProblem(input) {
-        const normalized = input.toLowerCase();
-        const wordCount = normalized.split(/\s+/).filter(Boolean).length;
-        if (normalized.length > 600 || wordCount > 80) {
-            return true;
-        }
-        const signals = [
-            'root cause',
-            'postmortem',
-            'crash',
-            'incident',
-            'outage',
-            'optimiz',
-            'performance',
-            'throughput',
-            'latency',
-            'scalab',
-            'architecture',
-            'rewrite',
-            'migration',
-            'refactor',
-            'reverse engineer',
-            'security',
-            'exploit',
-            'injection',
-            'vulnerability',
-            'compliance',
-            'multi-step',
-            'complex',
-            'difficult',
-            'hard problem',
-            'debug',
-            'trace',
-            'profil',
-            'bottleneck',
-        ];
-        return signals.some((signal) => normalized.includes(signal));
-    }
-    buildAlphaZeroPrompt(request, flaggedDifficult) {
-        const playbook = [
-            'AlphaZero RL MODE is ACTIVE. Operate as a self-play reinforcement loop.',
-            flaggedDifficult
-                ? 'Treat this as a difficult, high-risk task and over-verify the result.'
-                : 'Apply the reinforcement loop even if the task looks small.',
-            'Follow this closed-loop playbook:',
-            '- Draft two competing solution strategies and merge the strongest ideas before executing.',
-            '- Execute with tools while logging decisions and evidence.',
-            '- Self-critique and repair until the quality is excellent (aim ≥90/100).',
-            '- Run full-lifecycle verification like a human reviewer: build/tests, manual sanity checks, edge cases, performance/safety/security probes, docs/UX/readiness notes.',
-            '- Keep a verification ledger: each check with PASS/FAIL, evidence, and remaining risks. If anything fails, fix and re-verify before claiming completion.',
-            'Finish with a concise sign-off that lists what was achieved and the proof of completion.',
-        ];
-        return `${playbook.join('\n')}\n\nPrimary user request:\n${request.trim()}`;
-    }
-    buildRunLogExcerpt(startIndex) {
-        const buffer = this.terminalInput.getScrollbackBuffer();
-        const sinceStart = buffer.slice(Math.max(0, startIndex));
-        const excerpt = sinceStart.slice(-200); // Cap prompt size
-        return excerpt.join('\n').trim();
-    }
-    buildRunLogEntry(request, response, scrollbackStartIndex, meta) {
-        return {
-            id: ++this.runIdCounter,
-            request,
-            response,
-            timestamp: new Date().toISOString(),
-            alphaZero: meta.alphaZeroEngaged,
-            difficult: meta.alphaZeroDifficult,
-            failureType: meta.failureType,
-            outputExcerpt: this.buildRunLogExcerpt(scrollbackStartIndex),
-        };
-    }
-    buildAlphaZeroReflectionPrompt(runLog, options) {
-        const lines = [];
-        lines.push('AlphaZero Post-Run Self-Reflection (erosolar-cli)');
-        lines.push(`Timestamp: ${runLog.timestamp}`);
-        lines.push(`AlphaZero: ${runLog.alphaZero ? 'on' : 'off'}${runLog.difficult ? ' | difficult' : ''}${runLog.failureType ? ` | signal: ${runLog.failureType}` : ''}`);
-        lines.push('');
-        lines.push('User request:');
-        lines.push(runLog.request);
-        lines.push('');
-        lines.push('Previous run log excerpt:');
-        lines.push(runLog.outputExcerpt || '[empty]');
-        lines.push('');
-        lines.push('Instructions:');
-        lines.push('- Reflect on the log to spot erosolar-cli bugs, UX issues, or reliability gaps.');
-        lines.push('- Propose and apply targeted fixes in this repository only (no user workspace edits).');
-        lines.push('- Prefer small, test-backed changes; run any relevant checks you invoke.');
-        lines.push('- Keep notes concise and finish with applied changes plus follow-ups.');
-        if (options.autoChain) {
-            lines.push('- Continue iterating automatically while meaningful improvements remain.');
-            lines.push('- When no further improvements are possible, reply with NO_MORE_IMPROVEMENTS on its own line.');
-        }
-        return lines.join('\n');
-    }
-    maybeQueueAlphaZeroSelfReflection(runLog, alphaZeroEngaged, allowAutoChain) {
-        if (!alphaZeroEngaged) {
-            return;
-        }
-        if (!isErosolarRepo(this.workingDir)) {
-            return;
-        }
-        if (!runLog.outputExcerpt) {
-            return;
-        }
-        if (this.lastReflectedRunId === runLog.id) {
-            return;
-        }
-        if (allowAutoChain) {
-            if (!this.autoContinueEnabled) {
-                return;
-            }
-            if (this.alphaZeroAutoImproveIterations >= this.alphaZeroAutoImproveMaxIterations) {
-                display.showInfo('AlphaZero auto-improvement limit reached; stopping.');
-                this.alphaZeroAutoImproveActive = false;
-                this.alphaZeroAutoImproveIterations = 0;
-                return;
-            }
-            if (!this.alphaZeroAutoImproveActive) {
-                this.alphaZeroAutoImproveIterations = 0;
-            }
-            this.alphaZeroAutoImproveActive = true;
-            this.alphaZeroAutoImproveIterations++;
-        }
-        const prompt = this.buildAlphaZeroReflectionPrompt(runLog, { autoChain: allowAutoChain });
-        this.lastReflectedRunId = runLog.id;
-        this.skipNextAutoReflection = !allowAutoChain; // Prevent reflection-on-reflection unless auto-chaining
-        this.enqueueFollowUpAction({ type: 'request', text: prompt });
-        display.showInfo(allowAutoChain
-            ? 'Auto AlphaZero self-improvement queued (auto-continue enabled).'
-            : 'Queued AlphaZero self-reflection to improve erosolar-cli from the latest run log.');
-    }
-    shouldStopAlphaZeroAutoImprove(responseText, allowAutoChain) {
-        if (!this.alphaZeroAutoImproveActive) {
-            return false;
-        }
-        if (!allowAutoChain) {
-            return true;
-        }
-        if (!responseText) {
-            return false;
-        }
-        const normalized = responseText.toLowerCase();
-        return (normalized.includes('no_more_improvements') ||
-            normalized.includes('no more improvements') ||
-            normalized.includes('stop_auto_improve'));
-    }
     async handlePendingInteraction(input) {
         if (!this.pendingInteraction) {
             return false;
@@ -2164,7 +1526,7 @@ export class InteractiveShell {
         switch (this.pendingInteraction.type) {
             case 'model-loading':
                 display.showInfo('Still fetching model options. Please wait a moment.');
-                this.renderPromptArea();
+                this.terminalInput.render();
                 return true;
             case 'model-provider':
                 await this.handleModelProviderSelection(input);
@@ -2195,213 +1557,166 @@ export class InteractiveShell {
         const [command] = input.split(/\s+/);
         if (!command) {
             display.showWarning('Enter a slash command.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
-        // Keep the slash action visible in the pinned recent strip
-        this.terminalInput.recordRecentAction(command);
-        const runCommand = async () => {
-            switch (command) {
-                case '/help':
-                case '/?':
-                    this.showHelp();
-                    break;
-                case '/features':
-                    this.showFeaturesMenu(input);
-                    break;
-                case '/learn':
-                    this.showLearningStatus(input);
-                    break;
-                case '/improve':
-                    void this.handleImprovementCommand(input);
-                    break;
-                case '/model':
-                    this.showModelMenu();
-                    break;
-                case '/exit':
-                case '/quit':
-                case '/q':
-                    this.shutdown();
-                    break;
-                case '/secrets':
-                    this.showSecretsMenu();
-                    break;
-                case '/tools':
-                    this.showToolsMenu();
-                    break;
-                case '/mcp':
-                    await this.showMcpStatus();
-                    break;
-                case '/doctor':
-                    this.runDoctor();
-                    break;
-                case '/checks':
-                    await this.runRepoChecksCommand();
-                    break;
-                case '/context':
-                    await this.refreshWorkspaceContextCommand(input);
-                    break;
-                case '/contextlog':
-                    this.showContextSummaryLog(input);
-                    break;
-                case '/agents':
-                    this.showAgentsMenu();
-                    break;
-                case '/sessions':
-                    await this.handleSessionCommand(input);
-                    break;
-                case '/skills':
-                    await this.handleSkillsCommand(input);
-                    break;
-                case '/thinking':
-                    this.handleThinkingCommand(input);
-                    break;
-                case '/autocontinue':
-                    this.handleAutoContinueCommand(input);
-                    break;
-                case '/alphazero':
-                    this.handleAlphaZeroCommand(input);
-                    break;
-                case '/shortcuts':
-                case '/keys':
-                    this.handleShortcutsCommand();
-                    break;
-                case '/changes':
-                case '/summary':
-                    this.showFileChangeSummary();
-                    break;
-                case '/metrics':
-                case '/stats':
-                case '/perf':
-                    this.showAlphaZeroMetrics();
-                    break;
-                case '/suggestions':
-                case '/improve':
-                    this.showImprovementSuggestions();
-                    break;
-                case '/plugins':
-                    this.showPluginStatus();
-                    break;
-                case '/evolve':
-                    void this.handleEvolveCommand(input);
-                    break;
-                case '/modular':
-                case '/a0':
-                    void this.handleModularCommand(input);
-                    break;
-                case '/offsec':
-                    void this.handleOffsecCommand(input);
-                    break;
-                case '/test':
-                case '/tests':
-                    void this.handleTestCommand(input);
-                    break;
-                case '/provider':
-                    await this.handleProviderCommand(input);
-                    break;
-                case '/providers':
-                    this.showConfiguredProviders();
-                    break;
-                case '/local':
-                    await this.handleLocalCommand(input);
-                    break;
-                case '/discover':
-                    await this.discoverModelsCommand();
-                    break;
-                // Claude Code style commands
-                case '/rewind':
-                    await this.handleRewindCommand(input);
-                    break;
-                case '/memory':
-                    this.handleMemoryCommand(input);
-                    break;
-                case '/vim':
-                    this.handleVimCommand();
-                    break;
-                case '/output-style':
-                    this.handleOutputStyleCommand(input);
-                    break;
-                case '/cost':
-                    this.handleCostCommand();
-                    break;
-                case '/usage':
-                    this.handleUsageCommand();
-                    break;
-                case '/update':
-                    await this.handleUpdateCommand();
-                    break;
-                case '/clear':
-                    this.handleClearCommand();
-                    break;
-                case '/resume':
-                    await this.handleResumeCommand(input);
-                    break;
-                case '/export':
-                    this.handleExportCommand(input);
-                    break;
-                case '/review':
-                    await this.handleReviewCommand();
-                    break;
-                case '/security-review':
-                    await this.handleSecurityReviewCommand();
-                    break;
-                case '/bug':
-                    this.handleBugCommand();
-                    break;
-                case '/terminal-setup':
-                    this.handleTerminalSetupCommand();
-                    break;
-                case '/permissions':
-                    this.handlePermissionsCommand();
-                    break;
-                case '/init':
-                    this.handleInitCommand();
-                    break;
-                case '/compact':
-                    await this.handleCompactCommand();
-                    break;
-                default:
-                    if (!(await this.tryCustomSlashCommand(command, input))) {
-                        display.showWarning(`Unknown command "${command}".`);
-                    }
-                    break;
-            }
-        };
-        const streamingUiActive = this.isStreamingUiActive();
-        const captureOptions = streamingUiActive
-            ? { includeStreaming: false, suppressTypes: ['normal'] }
-            : undefined;
-        let capturedOutput = '';
-        try {
-            const { output: outputBuffer } = await display.captureOutput(runCommand, captureOptions);
-            capturedOutput = outputBuffer;
-        }
-        catch (error) {
-            capturedOutput = error?.capturedOutput ?? capturedOutput;
-            if (streamingUiActive) {
-                const message = error instanceof Error ? error.message : String(error);
-                const { output: errorOutput } = await display.captureOutput(() => display.showError(message, error), { includeStreaming: false, suppressTypes: ['normal'] });
-                capturedOutput = capturedOutput || errorOutput || message;
-            }
-            else {
-                display.showError(error instanceof Error ? error.message : String(error), error);
-            }
-        }
-        const panelContent = this.buildInlineCommandPanel(command, capturedOutput);
-        this.terminalInput.setInlineCommandPanel(panelContent);
-        this.renderPromptArea();
-    }
-    buildInlineCommandPanel(command, output) {
-        const normalized = output ? output.replace(/\r\n/g, '\n').replace(/\r/g, '\n').trimEnd() : '';
-        if (!normalized) {
-            return null;
-        }
-        const header = theme.ui.muted(command);
-        const body = normalized.split('\n');
-        if (body.length === 1) {
-            return [`${header} ${body[0] ?? ''}`.trimEnd()];
+        switch (command) {
+            case '/help':
+            case '/?':
+                this.showHelp();
+                break;
+            case '/features':
+                this.showFeaturesMenu(input);
+                break;
+            case '/learn':
+                this.showLearningStatus(input);
+                break;
+            case '/improve':
+                void this.handleImprovementCommand(input);
+                break;
+            case '/model':
+                this.showModelMenu();
+                break;
+            case '/exit':
+            case '/quit':
+            case '/q':
+                this.shutdown();
+                break;
+            case '/secrets':
+                this.showSecretsMenu();
+                break;
+            case '/tools':
+                this.showToolsMenu();
+                break;
+            case '/mcp':
+                await this.showMcpStatus();
+                break;
+            case '/doctor':
+                this.runDoctor();
+                break;
+            case '/checks':
+                await this.runRepoChecksCommand();
+                break;
+            case '/context':
+                await this.refreshWorkspaceContextCommand(input);
+                break;
+            case '/agents':
+                this.showAgentsMenu();
+                break;
+            case '/sessions':
+                await this.handleSessionCommand(input);
+                break;
+            case '/skills':
+                await this.handleSkillsCommand(input);
+                break;
+            case '/thinking':
+                this.handleThinkingCommand(input);
+                break;
+            case '/autocontinue':
+                this.handleAutoContinueCommand(input);
+                break;
+            case '/shortcuts':
+            case '/keys':
+                this.handleShortcutsCommand();
+                break;
+            case '/changes':
+            case '/summary':
+                this.showFileChangeSummary();
+                break;
+            case '/metrics':
+            case '/stats':
+            case '/perf':
+                this.showAlphaZeroMetrics();
+                break;
+            case '/suggestions':
+            case '/improve':
+                this.showImprovementSuggestions();
+                break;
+            case '/plugins':
+                this.showPluginStatus();
+                break;
+            case '/evolve':
+                void this.handleEvolveCommand(input);
+                break;
+            case '/modular':
+            case '/a0':
+                void this.handleModularCommand(input);
+                break;
+            case '/offsec':
+                void this.handleOffsecCommand(input);
+                break;
+            case '/test':
+            case '/tests':
+                void this.handleTestCommand(input);
+                break;
+            case '/provider':
+                await this.handleProviderCommand(input);
+                break;
+            case '/providers':
+                this.showConfiguredProviders();
+                break;
+            case '/local':
+                await this.handleLocalCommand(input);
+                break;
+            case '/discover':
+                await this.discoverModelsCommand();
+                break;
+            // Claude Code style commands
+            case '/rewind':
+                await this.handleRewindCommand(input);
+                break;
+            case '/memory':
+                this.handleMemoryCommand(input);
+                break;
+            case '/vim':
+                this.handleVimCommand();
+                break;
+            case '/output-style':
+                this.handleOutputStyleCommand(input);
+                break;
+            case '/cost':
+                this.handleCostCommand();
+                break;
+            case '/usage':
+                this.handleUsageCommand();
+                break;
+            case '/clear':
+                this.handleClearCommand();
+                break;
+            case '/resume':
+                await this.handleResumeCommand(input);
+                break;
+            case '/export':
+                this.handleExportCommand(input);
+                break;
+            case '/review':
+                await this.handleReviewCommand();
+                break;
+            case '/security-review':
+                await this.handleSecurityReviewCommand();
+                break;
+            case '/bug':
+                this.handleBugCommand();
+                break;
+            case '/terminal-setup':
+                this.handleTerminalSetupCommand();
+                break;
+            case '/permissions':
+                this.handlePermissionsCommand();
+                break;
+            case '/init':
+                this.handleInitCommand();
+                break;
+            case '/compact':
+                await this.handleCompactCommand();
+                break;
+            default:
+                if (!(await this.tryCustomSlashCommand(command, input))) {
+                    display.showWarning(`Unknown command "${command}".`);
+                }
+                break;
         }
-        return [header, ...body];
+        this.terminalInput.render();
     }
     async tryCustomSlashCommand(command, fullInput) {
         const custom = this.customCommandMap.get(command);
@@ -2438,13 +1753,11 @@ export class InteractiveShell {
             `    ${theme.info('Option+V')}       ${theme.ui.muted('Toggle verification')}`,
             `    ${theme.info('Option+C')}       ${theme.ui.muted('Toggle auto-continue')}`,
             `    ${theme.info('Option+T')}       ${theme.ui.muted('Cycle thinking mode')}`,
-            `    ${theme.info('Option+A')}       ${theme.ui.muted('Toggle AlphaZero RL mode')}`,
             `    ${theme.info('Option+E')}       ${theme.ui.muted('Toggle edit permission mode')}`,
             `    ${theme.info('Option+X')}       ${theme.ui.muted('Clear/compact context')}`,
             '',
             theme.bold('  Navigation'),
             `    ${theme.info('PageUp/PageDown')} ${theme.ui.muted('Scroll through output')}`,
-            `    ${theme.info('Escape')}         ${theme.ui.muted('Stop streaming')}`,
             `    ${theme.info('Ctrl+C')}         ${theme.ui.muted('Clear input or interrupt')}`,
             `    ${theme.info('Up/Down')}        ${theme.ui.muted('Navigate command history')}`,
             '',
@@ -2531,76 +1844,16 @@ export class InteractiveShell {
         }
         display.showInfo('Refreshing workspace snapshot...');
         const context = buildWorkspaceContext(this.workingDir, this.workspaceOptions);
-        const profileConfig = this.runtimeSession.refreshWorkspaceContext(context);
-        const tools = this.runtimeSession.toolRuntime.listProviderTools();
-        this.baseSystemPrompt = buildInteractiveSystemPrompt(profileConfig.systemPrompt, profileConfig.label, tools);
-        if (this.rebuildAgent()) {
-            display.showInfo(`Workspace snapshot refreshed (${this.describeWorkspaceOptions()}).`);
-            this.resetChatBoxAfterModelSwap();
-        }
-        else {
-            display.showWarning('Workspace snapshot refreshed, but the agent failed to rebuild. Run /doctor for details.');
-        }
-    }
-    showContextSummaryLog(input) {
-        const agent = this.agent;
-        if (!agent) {
-            display.showWarning('No active agent session. Start one to inspect context summaries.');
-            return;
-        }
-        const contextManager = agent.getContextManager();
-        if (!contextManager?.getSummaryLog) {
-            display.showWarning('Context summary logging is unavailable in this session.');
-            return;
-        }
-        const tokens = input.trim().split(/\s+/).slice(1);
-        let limit = 5;
-        for (const token of tokens) {
-            if (!token)
-                continue;
-            const normalized = token.toLowerCase();
-            if (/^\d+$/.test(token)) {
-                limit = Math.min(Math.max(parseInt(token, 10), 1), 20);
-            }
-            else if (normalized.startsWith('limit=')) {
-                const value = parseInt(normalized.split('=')[1] ?? '', 10);
-                if (!Number.isNaN(value)) {
-                    limit = Math.min(Math.max(value, 1), 20);
-                }
-            }
-        }
-        const entries = contextManager.getSummaryLog(limit);
-        if (!entries.length) {
-            display.showInfo('No context summaries captured yet.');
-            return;
+        const profileConfig = this.runtimeSession.refreshWorkspaceContext(context);
+        const tools = this.runtimeSession.toolRuntime.listProviderTools();
+        this.baseSystemPrompt = buildInteractiveSystemPrompt(profileConfig.systemPrompt, profileConfig.label, tools);
+        if (this.rebuildAgent()) {
+            display.showInfo(`Workspace snapshot refreshed (${this.describeWorkspaceOptions()}).`);
+            this.resetChatBoxAfterModelSwap();
         }
-        const lines = [];
-        lines.push(`${theme.primary('Context summaries')} ${theme.ui.muted(`(latest ${entries.length})`)}`);
-        for (const entry of entries) {
-            const timestamp = new Date(entry.timestamp).toLocaleString();
-            const headerParts = [
-                theme.ui.muted(timestamp),
-                theme.info(entry.method),
-                `removed ${theme.error(String(entry.removed))}`,
-                `kept ${theme.success(String(entry.preserved))}`,
-            ];
-            if (entry.reason) {
-                headerParts.push(theme.ui.muted(entry.reason));
-            }
-            if (entry.model) {
-                headerParts.push(theme.ui.muted(`model=${entry.model}`));
-            }
-            lines.push(headerParts.join(' · '));
-            if (entry.summary) {
-                const trimmed = entry.summary.length > 600 ? `${entry.summary.slice(0, 600)}…` : entry.summary;
-                lines.push(trimmed);
-            }
-            else {
-                lines.push(theme.ui.muted('(no summary text — simple prune)'));
-            }
-            lines.push(''); // spacer
+        else {
+            display.showWarning('Workspace snapshot refreshed, but the agent failed to rebuild. Run /doctor for details.');
         }
-        display.showSystemMessage(lines.join('\n'));
     }
     parseContextOverrideTokens(input) {
         const overrides = {};
@@ -2761,11 +2014,12 @@ export class InteractiveShell {
     handleThinkingCommand(input) {
         const value = input.slice('/thinking'.length).trim().toLowerCase();
         if (!value) {
-            display.showInfo(`Thinking mode is currently ${theme.info(this.thinkingMode)}. Usage: /thinking [concise|balanced|extended]`);
+            display.showInfo(`Thinking mode is currently ${theme.info(this.thinkingMode)}. Usage: /thinking [balanced|extended].` +
+                ' Press Tab any time to toggle.');
             return;
         }
-        if (value !== 'concise' && value !== 'balanced' && value !== 'extended') {
-            display.showWarning('Usage: /thinking [concise|balanced|extended]');
+        if (value !== 'balanced' && value !== 'extended') {
+            display.showWarning('Usage: /thinking [balanced|extended]');
             return;
         }
         if (this.isProcessing) {
@@ -2777,30 +2031,15 @@ export class InteractiveShell {
         if (this.rebuildAgent()) {
             this.resetChatBoxAfterModelSwap();
         }
+        this.refreshControlBar();
         const descriptions = {
-            concise: 'Hides internal reasoning and responds directly.',
-            balanced: 'Shows short thoughts only when helpful.',
-            extended: 'Always emits a <thinking> block before the final response.',
+            balanced: 'Balanced (default) reasoning with short thoughts only when helpful.',
+            extended: 'Longer reasoning enabled; expect extra usage for deeper answers.',
         };
-        display.showInfo(`Thinking mode set to ${theme.info(value)} – ${descriptions[this.thinkingMode]}`);
-    }
-    handleAlphaZeroCommand(input) {
-        const value = input.slice('/alphazero'.length).trim().toLowerCase();
-        if (!value || value === 'status') {
-            const status = this.alphaZeroModeEnabled ? theme.success('on') : theme.ui.muted('off');
-            const verification = this.verificationEnabled ? 'verification locked on' : 'verification optional';
-            display.showInfo(`AlphaZero RL mode is ${status}. When enabled, difficult prompts use duel/self-critique and human-style verification (${verification}).`);
-            return;
-        }
-        if (['on', 'enable', 'enabled'].includes(value)) {
-            this.setAlphaZeroMode(true, 'command');
-            return;
-        }
-        if (['off', 'disable', 'disabled'].includes(value)) {
-            this.setAlphaZeroMode(false, 'command');
-            return;
-        }
-        display.showWarning('Usage: /alphazero [on|off|status]');
+        const headline = this.thinkingMode === 'extended'
+            ? `${theme.info('Thinking on')} (Tab to toggle)`
+            : `${theme.info('Thinking off')} (Tab to toggle)`;
+        display.showSystemMessage(`${headline}\n${theme.ui.muted(descriptions[this.thinkingMode])}`);
     }
     handleShortcutsCommand() {
         // Display keyboard shortcuts help (Claude Code style)
@@ -2889,7 +2128,6 @@ export class InteractiveShell {
                 const updated = toggleFeatureFlag(matchedKey, newValue);
                 const status = updated[matchedKey] ? theme.success('enabled') : theme.ui.muted('disabled');
                 display.showInfo(`Feature "${FEATURE_FLAG_INFO[matchedKey].label}" is now ${status}.`);
-                this.refreshFeatureStatusDisplay();
                 display.showInfo('Changes will take effect on next launch or after /features refresh.');
                 return;
             }
@@ -2902,7 +2140,6 @@ export class InteractiveShell {
                 }
                 saveFeatureFlags(updated);
                 display.showInfo(`All features ${newValue ? theme.success('enabled') : theme.ui.muted('disabled')}.`);
-                this.refreshFeatureStatusDisplay();
                 return;
             }
             else {
@@ -4075,7 +3312,9 @@ export class InteractiveShell {
         }
         display.showInfo(`Deleted session "${summary.title}".`);
         if (this.activeSessionId === summary.id) {
-            this.updateActiveSession(null, true);
+            this.activeSessionId = null;
+            this.activeSessionTitle = null;
+            saveSessionPreferences({ lastSessionId: null });
         }
     }
     newSessionCommand(title) {
@@ -4095,7 +3334,6 @@ export class InteractiveShell {
         clearAutosaveSnapshot(this.profile);
         display.showInfo('Started a new empty session.');
         this.refreshContextGauge();
-        this.refreshFeatureStatusDisplay();
     }
     toggleAutosaveCommand(value) {
         if (!value) {
@@ -4150,6 +3388,7 @@ export class InteractiveShell {
         lines.push('  /rewind code            Rewind code only (keep conversation)');
         lines.push('  /rewind conv            Rewind conversation only (keep code)');
         lines.push('');
+        lines.push(theme.ui.muted('Press Esc+Esc for quick access to the rewind menu'));
         display.showSystemMessage(lines.join('\n'));
     }
     handleMemoryCommand(input) {
@@ -4168,6 +3407,7 @@ export class InteractiveShell {
         lines.push('  - Use # prefix to quickly add notes to project memory');
         lines.push('  - Import other files with @./relative/path syntax');
         lines.push('');
+        lines.push(theme.ui.muted('Create EROSOLAR.md with project coding standards for better results'));
         display.showSystemMessage(lines.join('\n'));
     }
     handleVimCommand() {
@@ -4248,20 +3488,6 @@ export class InteractiveShell {
         }
         display.showSystemMessage(lines.join('\n'));
     }
-    async handleUpdateCommand() {
-        display.showInfo('Checking for updates...');
-        const lines = [];
-        lines.push(theme.bold('Update Check'));
-        lines.push('');
-        lines.push(`Current version: ${this.version ?? 'unknown'}`);
-        lines.push('');
-        lines.push(theme.secondary('To update:'));
-        lines.push('  npm install -g erosolar-cli@latest');
-        lines.push('  or: npm update erosolar-cli');
-        lines.push('');
-        lines.push(theme.ui.muted('Auto-updates will be checked periodically.'));
-        display.showSystemMessage(lines.join('\n'));
-    }
     handleClearCommand() {
         if (this.agent) {
             this.agent.clearHistory();
@@ -4270,7 +3496,7 @@ export class InteractiveShell {
         display.clear();
         clearAutosaveSnapshot(this.profile);
         display.showInfo('Conversation cleared. Starting fresh.');
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     async handleResumeCommand(input) {
         const tokens = input.split(/\s+/).slice(1);
@@ -4411,7 +3637,6 @@ export class InteractiveShell {
         if (remember) {
             saveSessionPreferences({ lastSessionId: summary?.id ?? null });
         }
-        this.refreshFeatureStatusDisplay();
     }
     resolveSessionBySelector(selector) {
         const sessions = listSessions(this.profile);
@@ -4580,7 +3805,7 @@ export class InteractiveShell {
             if (!providerOptions.length) {
                 display.showWarning('No providers are available.');
                 this.pendingInteraction = null;
-                this.renderPromptArea();
+                this.terminalInput.render();
                 return;
             }
             const lines = [
@@ -4601,7 +3826,7 @@ export class InteractiveShell {
         catch (error) {
             display.showError('Failed to load model list. Try again in a moment.', error);
             this.pendingInteraction = null;
-            this.renderPromptArea();
+            this.terminalInput.render();
         }
     }
     buildProviderOptions() {
@@ -4785,7 +4010,7 @@ export class InteractiveShell {
     }
     renderToolMenu(interaction) {
         const lines = [
-            theme.bold('Select which tools are enabled (changes apply on next launch):'),
+            theme.bold('Select which tools are enabled (changes apply on next launch; default package is locked on).'),
             ...interaction.options.map((option, index) => this.formatToolOptionLine(option, index, interaction.selection)),
             '',
             'Enter the number to toggle, "save" to persist, "defaults" to restore recommended tools, or "cancel".',
@@ -4794,13 +4019,23 @@ export class InteractiveShell {
     }
     formatToolOptionLine(option, index, selection) {
         const enabled = selection.has(option.id);
-        const checkbox = enabled ? theme.primary('[x]') : theme.ui.muted('[ ]');
+        const checkbox = option.locked
+            ? theme.primary('[✓]')
+            : enabled
+                ? theme.primary('[x]')
+                : theme.ui.muted('[ ]');
         const details = [option.description];
         if (option.requiresSecret) {
             const hasSecret = Boolean(getSecretValue(option.requiresSecret));
             const status = hasSecret ? theme.success('API key set') : theme.warning('API key missing');
             details.push(status);
         }
+        if (option.locked) {
+            details.push(theme.ui.muted('Locked default package'));
+        }
+        if (option.restartRequired) {
+            details.push(theme.ui.muted('Restart required'));
+        }
         const numberLabel = this.colorizeDropdownLine(`${index + 1}.`, index);
         const optionLabel = this.colorizeDropdownLine(option.label, index);
         const detailLine = this.colorizeDropdownLine(`   ${details.join(' • ')}`, index);
@@ -5146,29 +4381,29 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a number or type cancel.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Model selection cancelled.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
             display.showWarning('Please enter a valid number.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const option = pending.options[choice - 1];
         if (!option) {
             display.showWarning('That option is not available.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         this.showProviderModels(option);
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     async handleModelSelection(input) {
         const pending = this.pendingInteraction;
@@ -5178,35 +4413,35 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a number, type "back", or type "cancel".');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         if (trimmed.toLowerCase() === 'back') {
             this.showModelMenu();
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Model selection cancelled.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
             display.showWarning('Please enter a valid number.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const preset = pending.options[choice - 1];
         if (!preset) {
             display.showWarning('That option is not available.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         this.pendingInteraction = null;
         await this.applyModelPreset(preset);
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     async applyModelPreset(preset) {
         try {
@@ -5226,7 +4461,7 @@ export class InteractiveShell {
         this.applyPresetReasoningDefaults();
         if (this.rebuildAgent()) {
             display.showInfo(`Switched to ${preset.label}.`);
-            this.refreshBannerSessionInfo();
+            this.refreshSessionContext();
             this.persistSessionPreference();
             this.resetChatBoxAfterModelSwap();
         }
@@ -5239,30 +4474,30 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a number or type cancel.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Secret management cancelled.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
             display.showWarning('Please enter a valid number.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         const secret = pending.options[choice - 1];
         if (!secret) {
             display.showWarning('That option is not available.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         display.showSystemMessage(`Enter a new value for ${secret.label} or type "cancel".`);
         this.pendingInteraction = { type: 'secret-input', secret };
-        this.renderPromptArea();
+        this.terminalInput.render();
     }
     async handleSecretInput(input) {
         const pending = this.pendingInteraction;
@@ -5272,16 +4507,14 @@ export class InteractiveShell {
         const trimmed = input.trim();
         if (!trimmed) {
             display.showWarning('Enter a value or type cancel.');
-            this.renderPromptArea();
+            this.terminalInput.render();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             this.pendingSecretRetry = null;
-            this.apiKeyGateActive = false;
             display.showInfo('Secret unchanged.');
-            this.renderPromptArea();
-            this.scheduleQueueProcessing();
+            this.terminalInput.render();
             return;
         }
         try {
@@ -5290,7 +4523,6 @@ export class InteractiveShell {
             this.pendingInteraction = null;
             const deferred = this.pendingSecretRetry;
             this.pendingSecretRetry = null;
-            this.apiKeyGateActive = false;
             if (pending.secret.providers.includes(this.sessionState.provider)) {
                 if (this.rebuildAgent()) {
                     this.resetChatBoxAfterModelSwap();
@@ -5305,14 +4537,12 @@ export class InteractiveShell {
             display.showError(message);
             this.pendingInteraction = null;
             this.pendingSecretRetry = null;
-            this.apiKeyGateActive = false;
         }
-        this.renderPromptArea();
-        this.scheduleQueueProcessing();
+        this.terminalInput.render();
     }
-    async processRequest(userRequest) {
+    async processRequest(request) {
         if (this.isProcessing) {
-            this.enqueueFollowUpAction({ type: 'request', text: userRequest });
+            this.enqueueFollowUpAction({ type: 'request', text: request });
             return;
         }
         if (!this.agent && !this.rebuildAgent()) {
@@ -5323,57 +4553,29 @@ export class InteractiveShell {
         if (!agent) {
             return;
         }
-        this.hasShownThoughtProcess = false;
-        this.resetAssistantStreamTracking();
-        const alphaZeroEngaged = this.alphaZeroModeEnabled;
-        const alphaZeroDifficult = alphaZeroEngaged ? this.isDifficultProblem(userRequest) : false;
-        const requestForAgent = alphaZeroEngaged
-            ? this.buildAlphaZeroPrompt(userRequest, alphaZeroDifficult)
-            : userRequest;
-        const skipReflectionForThisRun = this.skipNextAutoReflection;
-        this.skipNextAutoReflection = false;
-        const scrollbackStartIndex = this.terminalInput.getScrollbackBuffer().length;
-        const alphaZeroStatusId = 'alpha-zero';
-        let alphaZeroStatusApplied = false;
-        let alphaZeroTaskStarted = false;
-        let alphaZeroTaskCompleted = false;
-        if (alphaZeroEngaged) {
-            const detail = alphaZeroDifficult ? 'Difficult request detected' : 'Reinforcement loop enabled';
-            this.statusTracker.pushOverride(alphaZeroStatusId, 'AlphaZero RL active', {
-                detail: `${detail} · full verification`,
-                tone: 'info',
-            });
-            alphaZeroStatusApplied = true;
-            display.showInfo(`AlphaZero RL mode engaged${alphaZeroDifficult ? ' for a difficult request' : ''}. Duel + self-critique with verification enabled.`);
-            this.alphaZeroMetrics.startAlphaZeroTask(userRequest);
-            alphaZeroTaskStarted = true;
-        }
-        this.logUserPrompt(userRequest);
+        this.logUserPrompt(request);
         this.isProcessing = true;
         this.uiUpdates.setMode('processing');
         this.terminalInput.setStreaming(true);
         // Keep the persistent input/control bar active as we transition into streaming.
-        this.renderPromptArea(true);
+        this.terminalInput.forceRender();
         const requestStartTime = Date.now(); // Alpha Zero 2 timing
-        this.lastRequestStartedAt = requestStartTime;
-        this.lastToolSummaryRenderedAt = null;
         // Clear previous parallel agents and start fresh for new request
         const parallelManager = getParallelAgentManager();
         parallelManager.clear();
         parallelManager.startBatch();
         // AlphaZero: Track task for learning
-        this.lastUserQuery = userRequest;
-        this.currentTaskType = classifyTaskType(userRequest);
+        this.lastUserQuery = request;
+        this.currentTaskType = classifyTaskType(request);
         this.currentToolCalls = [];
         this.uiAdapter.startProcessing('Working on your request');
         this.setProcessingStatus();
         let responseText = '';
-        let detectedFailure = null;
-        let hadUnhandledError = false;
         try {
             // Start streaming - no header needed, the input area already provides context
-            this.startStreamingHeartbeat(alphaZeroEngaged ? 'AlphaZero RL' : 'Streaming response');
-            responseText = await agent.send(requestForAgent, true);
+            this.startStreamingHeartbeat('Streaming response');
+            responseText = await agent.send(request, true);
+            this.finishStreamingFormatter();
             await this.awaitPendingCleanup();
             this.captureHistorySnapshot();
             this.autosaveIfEnabled();
@@ -5392,18 +4594,14 @@ export class InteractiveShell {
                 duration: 0,
             }));
             // AlphaZero: Check for failure in response
-            detectedFailure = detectFailure(responseText, {
+            const failure = detectFailure(responseText, {
                 toolCalls: this.currentToolCalls,
-                userMessage: userRequest,
+                userMessage: request,
             });
-            if (alphaZeroEngaged && alphaZeroTaskStarted && !alphaZeroTaskCompleted) {
-                this.alphaZeroMetrics.completeAlphaZeroTask(!detectedFailure);
-                alphaZeroTaskCompleted = true;
-            }
-            if (detectedFailure) {
-                this.lastFailure = detectedFailure;
+            if (failure) {
+                this.lastFailure = failure;
                 // Check if we have a recovery strategy
-                const strategy = findRecoveryStrategy(detectedFailure);
+                const strategy = findRecoveryStrategy(failure);
                 if (strategy) {
                     display.showSystemMessage(`🔄 Found recovery strategy for this type of issue (success rate: ${Math.round(strategy.successRate * 100)}%)`);
                 }
@@ -5426,55 +4624,28 @@ export class InteractiveShell {
             }
         }
         catch (error) {
-            const handled = this.handleProviderError(error, () => this.processRequest(userRequest));
-            hadUnhandledError = !handled;
-            if (alphaZeroEngaged && alphaZeroTaskStarted && !alphaZeroTaskCompleted) {
-                this.alphaZeroMetrics.completeAlphaZeroTask(false);
-                alphaZeroTaskCompleted = true;
-            }
+            const handled = this.handleProviderError(error, () => this.processRequest(request));
             if (!handled) {
                 // Pass full error object for enhanced formatting with stack trace
                 display.showError(error instanceof Error ? error.message : String(error), error);
             }
         }
         finally {
-            const runLogEntry = this.buildRunLogEntry(userRequest, responseText, scrollbackStartIndex, {
-                alphaZeroEngaged,
-                alphaZeroDifficult,
-                failureType: detectedFailure?.type ?? (hadUnhandledError ? 'unhandled-error' : null),
-            });
-            this.lastRunLog = runLogEntry;
-            const allowAutoChain = alphaZeroEngaged && this.autoContinueEnabled && isErosolarRepo(this.workingDir);
-            let shouldStopAuto = false;
-            if (this.alphaZeroAutoImproveActive) {
-                shouldStopAuto = this.shouldStopAlphaZeroAutoImprove(responseText, allowAutoChain);
-                if (shouldStopAuto) {
-                    this.alphaZeroAutoImproveActive = false;
-                    this.alphaZeroAutoImproveIterations = 0;
-                }
-            }
-            if (!skipReflectionForThisRun && !shouldStopAuto) {
-                this.maybeQueueAlphaZeroSelfReflection(runLogEntry, alphaZeroEngaged, allowAutoChain);
-            }
-            if (alphaZeroEngaged && alphaZeroStatusApplied) {
-                this.statusTracker.clearOverride(alphaZeroStatusId);
-            }
-            if (alphaZeroEngaged && alphaZeroTaskStarted && !alphaZeroTaskCompleted) {
-                this.alphaZeroMetrics.completeAlphaZeroTask(false);
-            }
+            this.finishStreamingFormatter();
             display.stopThinking(false);
             this.uiUpdates.setMode('processing');
-            this.stopStreamingHeartbeat({ skipRender: true });
+            this.stopStreamingHeartbeat();
             this.isProcessing = false;
             this.terminalInput.setStreaming(false);
             this.uiAdapter.endProcessing('Ready for prompts');
             this.setIdleStatus();
+            display.newLine();
             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
             this.ensureReadlineReady();
-            this.renderPromptArea();
+            this.terminalInput.render();
             this.scheduleQueueProcessing();
             this.refreshQueueIndicators();
         }
@@ -5505,7 +4676,6 @@ export class InteractiveShell {
         if (!agent) {
             return;
         }
-        this.hasShownThoughtProcess = false;
         this.isProcessing = true;
         this.uiUpdates.setMode('processing');
         this.terminalInput.setStreaming(true);
@@ -5546,8 +4716,6 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`;
             }
             while (iteration < MAX_ITERATIONS) {
                 iteration++;
-                this.hasShownThoughtProcess = false;
-                this.resetAssistantStreamTracking();
                 display.showSystemMessage(`\n📍 Iteration ${iteration}/${MAX_ITERATIONS}`);
                 this.updateStatusMessage(`Working on iteration ${iteration}...`);
                 try {
@@ -5555,6 +4723,7 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`;
                     display.showThinking('Responding...');
                     this.refreshStatusLine(true);
                     const response = await agent.send(currentPrompt, true);
+                    this.finishStreamingFormatter();
                     await this.awaitPendingCleanup();
                     this.captureHistorySnapshot();
                     this.autosaveIfEnabled();
@@ -5687,6 +4856,7 @@ What's the next action?`;
             }
         }
         finally {
+            this.finishStreamingFormatter();
             const totalElapsed = Date.now() - overallStartTime;
             const minutes = Math.floor(totalElapsed / 60000);
             const seconds = Math.floor((totalElapsed % 60000) / 1000);
@@ -5700,6 +4870,10 @@ What's the next action?`;
             this.uiAdapter.endProcessing('Ready for prompts');
             this.setIdleStatus();
             this.updateStatusMessage(null);
+            display.newLine();
+            // Claude Code style: Show unified status bar before prompt
+            // This creates consistent UI between startup and post-streaming
+            this.showUnifiedStatusBar();
             queueMicrotask(() => this.uiUpdates.setMode('idle'));
             // CRITICAL: Ensure readline prompt is active for user input
             // Claude Code style: New prompt naturally appears at bottom
@@ -5878,25 +5052,7 @@ What's the next action?`;
         }
         if (name === 'bash' || name === 'execute_bash') {
             const command = String(entry.args['command'] ?? '').toLowerCase();
-            const patterns = [
-                'npm test',
-                'yarn test',
-                'pnpm test',
-                'bun test',
-                'go test',
-                'cargo test',
-                'pytest',
-                'python -m pytest',
-                'tox',
-                'mvn test',
-                './mvnw test',
-                'gradle test',
-                './gradlew test',
-                'dotnet test',
-                'make test',
-                'swift test',
-            ];
-            return patterns.some((pattern) => command.includes(pattern));
+            return command.includes('npm test') || command.includes('yarn test') || command.includes('pnpm test');
         }
         return false;
     }
@@ -5914,170 +5070,310 @@ What's the next action?`;
         const parts = [error?.stdout, error?.stderr, error?.message].filter((part) => typeof part === 'string' && part.trim());
         return parts.join('\n').trim();
     }
-    async enforceAutoTests(trigger, commandInfo) {
-        if (this.autoTestInFlight || !this.verificationEnabled) {
-            return 'skipped';
+    runAutoQualityChecks(trigger, assistantResponse, verificationContext) {
+        if (!this.verificationEnabled) {
+            return;
+        }
+        void (async () => {
+            try {
+                const buildOk = await this.enforceAutoBuild(trigger);
+                if (!buildOk) {
+                    return;
+                }
+                await this.enforceAutoTests(trigger, assistantResponse, verificationContext);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                display.showWarning(`Auto quality checks failed: ${message}`);
+            }
+        })();
+    }
+    async enforceAutoTests(trigger, assistantResponse, verificationContext) {
+        if (this.autoTestInFlight) {
+            return;
+        }
+        if (!this.verificationEnabled) {
+            return;
         }
         const latestChange = this.getLatestFileChangeTimestamp();
         if (!latestChange) {
-            return 'skipped';
+            return;
         }
         const latestTest = this.getLatestTestTimestamp();
         if (latestTest && latestChange <= latestTest) {
-            return 'skipped';
+            return;
         }
-        const detected = commandInfo ?? detectTestCommand(this.workingDir);
-        if (!detected) {
-            this.lastAutoTestRun = Date.now();
-            display.showSystemMessage('ℹ️ Skipping auto-tests: no test command detected for this repo.');
-            return 'skipped';
+        if (!this.lastBuildSucceededAt || this.lastBuildSucceededAt < latestChange) {
+            display.showSystemMessage('⏭️ Skipping auto-tests because no successful build is recorded for the latest changes.');
+            return;
         }
         this.autoTestInFlight = true;
-        const command = detected.command;
-        const reasonSuffix = detected.reason ? ` [${detected.reason}]` : '';
-        display.showSystemMessage(`🧪 Auto-testing recent changes (${trigger}) with "${command}"${reasonSuffix}...`);
+        const command = 'npm test -- --runInBand';
+        display.showSystemMessage(`🧪 Auto-testing recent changes (${trigger}) with "${command}"...`);
         this.updateStatusMessage('Running tests automatically...');
+        let combinedOutput = '';
         try {
             const { stdout, stderr } = await execAsync(command, {
                 cwd: this.workingDir,
                 timeout: 10 * 60 * 1000,
                 maxBuffer: 10 * 1024 * 1024,
             });
-            this.lastAutoTestRun = Date.now();
-            const outputText = [stdout, stderr].filter(Boolean).join('\n').trim();
+            combinedOutput = [stdout, stderr].filter(Boolean).join('\n').trim();
             display.showSystemMessage('✅ Auto-tests finished.');
-            if (outputText) {
-                this.writeLocked(`${outputText}\n`);
-            }
             this.statusTracker.clearOverride('tests');
-            return 'success';
         }
         catch (error) {
-            this.lastAutoTestRun = Date.now();
-            const message = this.formatCommandError(error);
+            combinedOutput = this.formatCommandError(error);
             display.showWarning('⚠️ Auto-tests failed. Review output below.');
-            if (message) {
-                this.writeLocked(`${message}\n`);
-            }
             this.statusTracker.pushOverride('tests', 'Tests failing', {
-                detail: `Auto-run ${command} failed`,
+                detail: 'Auto-run npm test failed',
                 tone: 'danger',
             });
-            return 'failed';
         }
         finally {
+            if (combinedOutput) {
+                this.writeLocked(`${combinedOutput}\n`);
+            }
+            try {
+                await this.runAIDesignedTests(trigger, assistantResponse, verificationContext);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                display.showWarning(`AI-designed tests failed: ${message}`);
+            }
+            this.lastAutoTestRun = Date.now();
             this.updateStatusMessage(null);
             this.autoTestInFlight = false;
-            this.terminalInput.resetContentPosition();
-            this.terminalInput.forceRender();
         }
     }
-    isBuildToolCall(entry) {
-        const name = entry.toolName.toLowerCase();
-        if (name === 'run_build' || name === 'build') {
+    /**
+     * Auto-build verification after file edits.
+     * Runs `npm run build` to catch TypeScript errors and feeds failures back to the agent.
+     */
+    async enforceAutoBuild(trigger) {
+        if (this.autoBuildPromise) {
+            return this.autoBuildPromise;
+        }
+        if (!this.verificationEnabled) {
+            return false;
+        }
+        const latestChange = this.getLatestFileChangeTimestamp();
+        if (!latestChange) {
             return true;
         }
-        if (name === 'bash' || name === 'execute_bash') {
-            const command = String(entry.args['command'] ?? '').toLowerCase();
-            const makeBuild = command.startsWith('make') && !command.includes('make test') && !command.includes('make lint');
-            const patterns = [
-                'npm run build',
-                'yarn build',
-                'pnpm build',
-                'bun run build',
-                'bun build',
-                'tsc',
-                'cargo build',
-                'go build',
-                'python -m build',
-                'mvn -b -dskiptests package',
-                'mvn package',
-                'mvn install',
-                './mvnw -b -dskiptests package',
-                './mvnw package',
-                './mvnw install',
-                'gradle build',
-                'gradle assemble',
-                './gradlew build',
-                './gradlew assemble',
-                'dotnet build',
-                'swift build',
-            ];
-            return makeBuild || patterns.some((pattern) => command.includes(pattern));
+        if (this.lastBuildSucceededAt && latestChange <= this.lastBuildSucceededAt) {
+            return true;
         }
-        return false;
+        const command = 'npm run build';
+        const runner = (async () => {
+            this.autoBuildInFlight = true;
+            display.showSystemMessage(`🔨 Auto-building to verify changes (${trigger})...`);
+            this.updateStatusMessage('Running build automatically...');
+            try {
+                const { stdout, stderr } = await execAsync(command, {
+                    cwd: this.workingDir,
+                    timeout: 5 * 60 * 1000,
+                    maxBuffer: 10 * 1024 * 1024,
+                });
+                const finishedAt = Date.now();
+                this.lastAutoBuildRun = finishedAt;
+                this.lastBuildSucceededAt = finishedAt;
+                const outputText = [stdout, stderr].filter(Boolean).join('\n').trim();
+                display.showSystemMessage('✅ Build succeeded.');
+                if (outputText && outputText.length < 500) {
+                    this.writeLocked(`${outputText}\n`);
+                }
+                this.statusTracker.clearOverride('build');
+                return true;
+            }
+            catch (error) {
+                const finishedAt = Date.now();
+                this.lastAutoBuildRun = finishedAt;
+                this.lastBuildSucceededAt = null;
+                const errorOutput = this.formatCommandError(error);
+                display.showWarning('⚠️ Build failed. Feeding errors back to agent...');
+                if (errorOutput) {
+                    this.writeLocked(`${errorOutput}\n`);
+                }
+                this.statusTracker.pushOverride('build', 'Build failing', {
+                    detail: 'Auto-run npm run build failed',
+                    tone: 'danger',
+                });
+                // Feed build errors back to the agent so it can fix them
+                await this.feedBuildErrorsToAgent(errorOutput);
+                return false;
+            }
+            finally {
+                this.updateStatusMessage(null);
+                this.autoBuildInFlight = false;
+                this.autoBuildPromise = null;
+            }
+        })();
+        this.autoBuildPromise = runner;
+        return runner;
     }
-    getLatestBuildTimestamp() {
-        const history = this.runtimeSession.toolRuntime.getToolHistory?.() ?? [];
-        let latest = this.lastAutoBuildRun;
-        for (const entry of history) {
-            if (this.isBuildToolCall(entry)) {
-                latest = latest ? Math.max(latest, entry.timestamp) : entry.timestamp;
+    describeRecentChanges() {
+        const changes = this._fileChangeTracker.getAllChanges();
+        if (!changes.length) {
+            return 'No tracked changes';
+        }
+        const items = changes.slice(0, 8).map((change) => {
+            const additions = change.additions ? `+${change.additions}` : '';
+            const removals = change.removals ? `-${change.removals}` : '';
+            const delta = [additions, removals].filter(Boolean).join('/');
+            const deltaLabel = delta ? ` ${delta}` : '';
+            return `${change.path} (${change.type}${deltaLabel})`;
+        });
+        return items.join('; ');
+    }
+    describePackageScripts() {
+        try {
+            const pkgPath = join(this.workingDir, 'package.json');
+            if (!existsSync(pkgPath)) {
+                return 'package.json not found';
+            }
+            const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+            const scripts = pkg.scripts ? Object.keys(pkg.scripts) : [];
+            if (!scripts.length) {
+                return 'package.json present without scripts';
             }
+            return `package.json scripts: ${scripts.slice(0, 8).join(', ')}`;
+        }
+        catch {
+            return 'package.json present but unreadable';
         }
-        return latest;
     }
-    /**
-     * Auto-build verification after file edits.
-     * Detects the build command for the current repo and feeds failures back to the agent.
-     */
-    async enforceAutoBuild(trigger, commandInfo) {
-        if (this.autoBuildInFlight || !this.verificationEnabled) {
-            return 'skipped';
+    parseAIDesignedTests(plan) {
+        if (!plan?.trim()) {
+            return [];
         }
-        const latestChange = this.getLatestFileChangeTimestamp();
-        if (!latestChange) {
-            return 'skipped';
-        }
-        const latestBuild = this.getLatestBuildTimestamp();
-        if (latestBuild && latestChange <= latestBuild) {
-            return 'skipped';
-        }
-        const detected = commandInfo ?? detectBuildCommand(this.workingDir);
-        if (!detected) {
-            this.lastAutoBuildRun = Date.now();
-            display.showSystemMessage('ℹ️ Skipping auto-build: no build command detected for this repo.');
-            return 'skipped';
-        }
-        this.autoBuildInFlight = true;
-        const command = detected.command;
-        const reasonSuffix = detected.reason ? ` [${detected.reason}]` : '';
-        display.showSystemMessage(`🔨 Auto-building to verify changes (${trigger}) with "${command}"${reasonSuffix}...`);
-        this.updateStatusMessage('Running build automatically...');
+        const match = plan.match(/\[[\s\S]*\]/);
+        const payload = match ? match[0] : plan;
         try {
-            const { stdout, stderr } = await execAsync(command, {
-                cwd: this.workingDir,
-                timeout: 5 * 60 * 1000,
-                maxBuffer: 10 * 1024 * 1024,
+            const parsed = JSON.parse(payload);
+            if (!Array.isArray(parsed)) {
+                return [];
+            }
+            return parsed
+                .map((entry, index) => ({
+                id: typeof entry.id === 'string' && entry.id.trim() ? entry.id.trim() : `ai-test-${index + 1}`,
+                description: typeof entry.description === 'string' ? entry.description.trim() : `AI test ${index + 1}`,
+                command: typeof entry.command === 'string' ? entry.command.trim() : '',
+                expect: typeof entry.expect === 'string' ? entry.expect.trim() : undefined,
+                timeoutMs: typeof entry.timeoutMs === 'number' ? entry.timeoutMs : undefined,
+            }))
+                .filter((test) => !!test.command);
+        }
+        catch {
+            return [];
+        }
+    }
+    isDangerousTestCommand(command) {
+        const patterns = [
+            /\brm\s+-/i,
+            /\brm\s+/i,
+            /\brmdir\b/i,
+            /\bchmod\s+7/i,
+            /\bsudo\b/i,
+            /\bmkfs\b/i,
+            /\bshutdown\b/i,
+            /\breboot\b/i,
+            /\bgit\s+(push|reset|checkout|clean)\b/i,
+            /\bnpm\s+install\b/i,
+            /\byarn\s+add\b/i,
+            /\bpnpm\s+add\b/i,
+        ];
+        return patterns.some((pattern) => pattern.test(command));
+    }
+    async runAIDesignedTests(trigger, assistantResponse, verificationContext) {
+        const userGoal = this.lastUserQuery?.trim() || 'Not provided';
+        const implementationClaim = (assistantResponse ?? this.lastAssistantResponse ?? '').trim();
+        const changeSummary = this.describeRecentChanges();
+        const packageSummary = this.describePackageScripts();
+        const recentConversation = verificationContext?.conversationHistory?.slice(-3).join('\n') ?? '';
+        let provider;
+        try {
+            provider = createProvider({
+                provider: this.sessionState.provider,
+                model: this.sessionState.model,
+                temperature: 0.15,
+                maxTokens: 900,
             });
-            this.lastAutoBuildRun = Date.now();
-            const outputText = [stdout, stderr].filter(Boolean).join('\n').trim();
-            display.showSystemMessage('✅ Build succeeded.');
-            if (outputText && outputText.length < 500) {
-                this.writeLocked(`${outputText}\n`);
-            }
-            this.statusTracker.clearOverride('build');
-            return 'success';
         }
         catch (error) {
-            this.lastAutoBuildRun = Date.now();
-            const errorOutput = this.formatCommandError(error);
-            display.showWarning('⚠️ Build failed. Feeding errors back to agent...');
-            if (errorOutput) {
-                this.writeLocked(`${errorOutput}\n`);
-            }
-            this.statusTracker.pushOverride('build', 'Build failing', {
-                detail: `Auto-run ${command} failed`,
-                tone: 'danger',
-            });
-            // Feed build errors back to the agent so it can fix them
-            await this.feedBuildErrorsToAgent(errorOutput);
-            return 'failed';
+            const message = error instanceof Error ? error.message : String(error);
+            display.showWarning(`AI-designed tests skipped: ${message}`);
+            return;
         }
-        finally {
-            this.updateStatusMessage(null);
-            this.autoBuildInFlight = false;
+        const systemPrompt = 'You design high-value, repo-aware verification commands. Only emit JSON. Use read-only commands that run quickly.';
+        const prompt = `Workspace: ${this.workingDir}
+User goal: ${userGoal.slice(0, 800)}
+Assistant claim: ${implementationClaim ? implementationClaim.slice(0, 1200) : 'No implementation summary captured.'}
+Recent file changes: ${changeSummary}
+Package signals: ${packageSummary}
+Recent conversation: ${recentConversation || 'n/a'}
+
+Design 3-5 focused verification commands to confirm the requested functionality works after the successful build.
+Rules:
+- Commands must be safe and non-destructive (no rm, mv, chmod 7xx, sudo, package installs, or git mutations).
+- Prefer existing npm/yarn/pnpm scripts or targeted checks (node scripts, grep, curl localhost) that prove behavior.
+- Keep commands runnable from the repo root and finish quickly.
+Return ONLY JSON array:
+[{"id":"ai-test-1","description":"what it verifies","command":"npm test -- my-case","expect":"substring to find","timeoutMs":45000}]`;
+        const plan = await provider.generate([
+            { role: 'system', content: systemPrompt },
+            { role: 'user', content: prompt },
+        ], []);
+        const planText = plan.type === 'message' ? plan.content : plan.content ?? '';
+        const tests = this.parseAIDesignedTests(planText).slice(0, 5);
+        if (!tests.length) {
+            display.showWarning('AI-designed tests could not be generated. Skipping.');
+            return;
+        }
+        const results = [];
+        results.push(`🤖 Running ${tests.length} AI-designed verification tests (${trigger})...`);
+        for (const test of tests) {
+            const command = test.command.trim();
+            if (!command) {
+                continue;
+            }
+            if (this.isDangerousTestCommand(command)) {
+                results.push(`⚠️ ${test.id} blocked (unsafe command): ${command}`);
+                continue;
+            }
+            try {
+                const { stdout, stderr } = await execAsync(command, {
+                    cwd: this.workingDir,
+                    timeout: Math.min(Math.max(test.timeoutMs ?? 45000, 5000), 120000),
+                    maxBuffer: 10 * 1024 * 1024,
+                });
+                const output = [stdout, stderr].filter(Boolean).join('\n');
+                const expected = test.expect?.trim();
+                const success = expected ? output.toLowerCase().includes(expected.toLowerCase()) : true;
+                const snippet = output.replace(/\s+/g, ' ').trim().slice(0, 240);
+                results.push(`${success ? '✅' : '❌'} ${test.description || test.id}`);
+                results.push(`   cmd: ${command}`);
+                if (expected) {
+                    results.push(`   expect: ${expected}`);
+                }
+                if (snippet) {
+                    results.push(`   output: ${snippet}`);
+                }
+                if (!success && !snippet) {
+                    results.push('   output: [no output captured]');
+                }
+            }
+            catch (error) {
+                const message = this.formatCommandError(error) || (error instanceof Error ? error.message : String(error));
+                results.push(`❌ ${test.description || test.id}`);
+                results.push(`   cmd: ${command}`);
+                if (test.expect) {
+                    results.push(`   expect: ${test.expect}`);
+                }
+                results.push(`   error: ${message.slice(0, 240)}`);
+            }
         }
+        display.showSystemMessage(results.join('\n'));
     }
     /**
      * Feed build errors back to the agent conversation for automatic fixing.
@@ -6103,43 +5399,21 @@ What's the next action?`;
             // Send the error to the agent for fixing
             display.showThinking('Analyzing build errors');
             this.refreshStatusLine(true);
-            this.hasShownThoughtProcess = false;
-            await this.withStreamingUi('Fixing build errors', () => this.agent.send(prompt, true));
+            const response = await this.agent.send(prompt, true);
+            this.finishStreamingFormatter();
             display.stopThinking();
             this.refreshStatusLine(true);
+            if (response) {
+                display.showAssistantMessage(response, { isFinal: true });
+            }
             // Recursively verify the fix worked
             await this.enforceAutoBuild('verification');
         }
         catch (agentError) {
             display.showWarning('Agent could not automatically fix build errors. Please review manually.');
         }
-    }
-    async enforceAutoVerification(trigger) {
-        if (this.autoVerificationInFlight || !this.verificationEnabled) {
-            return;
-        }
-        const latestChange = this.getLatestFileChangeTimestamp();
-        if (!latestChange) {
-            return;
-        }
-        this.autoVerificationInFlight = true;
-        try {
-            const buildInfo = detectBuildCommand(this.workingDir);
-            const testInfo = detectTestCommand(this.workingDir);
-            const buildResult = await this.enforceAutoBuild(trigger, buildInfo);
-            if (buildResult === 'failed') {
-                return;
-            }
-            if (testInfo) {
-                await this.enforceAutoTests(trigger, testInfo);
-            }
-            else {
-                this.lastAutoTestRun = Date.now();
-                display.showSystemMessage('ℹ️ Skipping auto-tests: no test command detected for this repo.');
-            }
-        }
         finally {
-            this.autoVerificationInFlight = false;
+            this.finishStreamingFormatter();
         }
     }
     rebuildAgent() {
@@ -6157,35 +5431,29 @@ What's the next action?`;
                 autoContinue: this.autoContinueEnabled,
             };
             this.agent = this.runtimeSession.createAgent(selection, {
-                onStreamChunk: (chunk, channel) => {
-                    this.streamAssistantChunk(chunk, channel);
+                onStreamChunk: (chunk) => {
+                    this.handleStreamChunk(chunk);
                 },
                 onStreamFallback: (info) => this.handleStreamingFallback(info),
                 onAssistantMessage: (content, metadata) => {
                     const enriched = this.buildDisplayMetadata(metadata);
-                    const blocksActive = this.assistantBlocksEnabled && this.assistantBlockRenderer !== null;
-                    const parsed = this.splitThinkingResponse(content);
-                    const thinking = parsed?.thinking ?? null;
-                    const responseContent = parsed ? parsed.response?.trim() ?? '' : content.trim();
-                    const narrativeContent = (parsed?.response ?? content).trim();
-                    const streamRendered = metadata.wasStreamed && this.assistantStreamHadContent;
-                    if (thinking) {
-                        this.presentThoughtProcess(thinking, enriched, {
-                            wasStreamed: metadata.wasStreamed,
-                            // Always render the thought block immediately when present so it appears first.
-                            renderWhenStreamed: true,
-                        });
-                    }
+                    // Update spinner based on message type
                     if (metadata.isFinal) {
-                        if (metadata.wasStreamed) {
-                            this.finalizeAssistantStream();
-                        }
-                        const body = responseContent || content;
-                        // Always render the final response body even if it already streamed.
-                        if (body) {
-                            this.renderAssistantContent('response', body, { ...enriched, isFinal: true });
+                        const parsed = this.splitThinkingResponse(content);
+                        const finalContent = parsed?.response?.trim() || content;
+                        // Skip display if content was already streamed to avoid double-display
+                        if (!metadata.wasStreamed) {
+                            if (parsed?.thinking) {
+                                const summary = this.extractThoughtSummary(parsed.thinking);
+                                if (summary) {
+                                    display.updateThinking(`💭 ${summary}`);
+                                }
+                                display.showAssistantMessage(parsed.thinking, { ...enriched, isFinal: false });
+                            }
+                            if (finalContent) {
+                                display.showAssistantMessage(finalContent, enriched);
+                            }
                         }
-                        this.renderToolUsageSummary({ ...enriched, isFinal: true });
                         // Status shown in mode controls bar - no separate status line needed
                         display.stopThinking();
                         // Update context usage for mode controls display
@@ -6196,22 +5464,19 @@ What's the next action?`;
                                 this.updateContextUsage(percentage);
                             }
                         }
+                        if (finalContent) {
+                            this.lastAssistantResponse = finalContent;
+                        }
                         // Auto-verify changes: build first (catches type errors), then tests
-                        void this.enforceAutoVerification('final-response');
+                        void this.runAutoQualityChecks('final-response', finalContent);
                     }
                     else {
                         // Non-final message = narrative text before tool calls (Claude Code style)
                         // Stop spinner and show the narrative text directly
                         display.stopThinking();
-                        if (metadata.wasStreamed) {
-                            this.finalizeAssistantStream();
-                        }
-                        const shouldRenderNarrative = Boolean(narrativeContent && (!metadata.wasStreamed || !blocksActive || !streamRendered));
-                        if (shouldRenderNarrative) {
-                            this.renderAssistantContent('thought', narrativeContent, {
-                                ...enriched,
-                                isFinal: false,
-                            });
+                        // Skip display if content was already streamed to avoid double-display
+                        if (!metadata.wasStreamed) {
+                            display.showNarrative(content.trim());
                         }
                         // The isProcessing flag already shows "⏳ Processing..." - no need for duplicate status
                         this.requestPromptRefresh();
@@ -6224,8 +5489,8 @@ What's the next action?`;
                     this.requestPromptRefresh();
                 },
                 onContextSquishing: (message) => {
-                    // Stream notification in UI when auto context squishing occurs
-                    display.stream(`\n🔄 ${message}\n`);
+                    // Show notification in UI when auto context squishing occurs
+                    display.showSystemMessage(`🔄 ${message}`);
                     this.statusTracker.pushOverride('context-squish', 'Auto-squishing context', {
                         detail: 'Reducing conversation history to fit within token limits',
                         tone: 'warning',
@@ -6233,7 +5498,7 @@ What's the next action?`;
                 },
                 onContextRecovery: (attempt, maxAttempts, message) => {
                     // Show recovery progress in UI
-                    display.stream(`\n⚡ Context Recovery (${attempt}/${maxAttempts}): ${message}\n`);
+                    display.showSystemMessage(`⚡ Context Recovery (${attempt}/${maxAttempts}): ${message}`);
                 },
                 onContextPruned: (removedCount, stats) => {
                     // Clear squish overlay if active
@@ -6241,43 +5506,40 @@ What's the next action?`;
                     // Show notification that context was pruned
                     const method = stats['method'];
                     const percentage = stats['percentage'];
-                    const summarized = stats['summarized'] === true;
                     if (method === 'emergency-recovery') {
-                        display.stream(`\n✅ Context recovery complete. Removed ${removedCount} messages. Context now at ${percentage ?? 'unknown'}%\n`);
+                        display.showSystemMessage(`✅ Context recovery complete. Removed ${removedCount} messages. Context now at ${percentage ?? 'unknown'}%`);
                     }
                     // Update context usage in UI
                     if (typeof percentage === 'number') {
                         this.updateContextUsage(percentage);
                     }
-                    if (summarized) {
-                        display.showSystemMessage('Context summary captured. View the latest summaries with /contextlog.');
-                    }
                     // Ensure prompt remains visible at bottom after context messages
-                    this.renderPromptArea();
+                    this.terminalInput.render();
                 },
                 onContinueAfterRecovery: () => {
                     // Update UI to show we're continuing after context recovery
-                    display.stream(`\n🔄 Continuing after context recovery...\n`);
+                    display.showSystemMessage(`🔄 Continuing after context recovery...`);
                     this.updateStatusMessage('Retrying with reduced context...');
-                    this.renderPromptArea();
+                    this.terminalInput.render();
                 },
                 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.renderPromptArea();
+                    this.terminalInput.render();
                 },
                 onCancelled: () => {
                     // Update UI to show operation was cancelled
                     display.showWarning('Operation cancelled.');
                     this.uiUpdates.setMode('processing');
-                    this.stopStreamingHeartbeat({ skipRender: true });
+                    this.stopStreamingHeartbeat();
                     this.updateStatusMessage(null);
                     this.terminalInput.setStreaming(false);
-                    this.renderPromptArea();
+                    this.terminalInput.render();
                 },
-                onVerificationNeeded: () => {
-                    void this.enforceAutoVerification('verification');
+                onVerificationNeeded: (response, context) => {
+                    this.lastAssistantResponse = response;
+                    void this.runAutoQualityChecks('verification', response, context);
                 },
             });
             // Register global AI enhancer for explore tool - uses active model by default
@@ -6311,7 +5573,7 @@ What's the next action?`;
     resetChatBoxAfterModelSwap() {
         this.updateStatusMessage(null);
         this.terminalInput.setStreaming(false);
-        this.renderPromptArea();
+        this.terminalInput.render();
         this.ensureReadlineReady();
     }
     /**
@@ -6374,22 +5636,19 @@ What's the next action?`;
     }
     buildThinkingDirective() {
         switch (this.thinkingMode) {
-            case 'concise':
-                return 'Concise thinking mode: respond directly with the final answer and skip <thinking> blocks unless the user explicitly asks for reasoning.';
             case 'extended':
                 return [
-                    'Extended thinking mode: include a <thinking> block followed by a <response> block.',
+                    'Extended thinking mode is enabled. Format every reply as:',
                     '<thinking>',
-                    'Brief, structured reasoning (cite tools/files when relevant; no secrets).',
+                    'Detailed multi-step reasoning (reference tool runs/files when relevant, keep secrets redacted, no code blocks unless citing filenames).',
                     '</thinking>',
                     '<response>',
-                    'Final answer with requested code/commands and next steps.',
+                    'Final answer with actionable next steps and any code/commands requested.',
                     '</response>',
                 ].join('\n');
             case 'balanced':
             default:
-                // Balanced mode: show thinking for complex reasoning, planning, or multi-step tasks
-                return 'When reasoning through complex tasks, planning approaches, or making decisions, wrap your thought process in <thinking> tags before your response. Keep thinking concise and focused on the decision-making process.';
+                return 'Balanced thinking mode: include a short <thinking>...</thinking> block before <response> when the reasoning is non-trivial; skip it for simple answers.';
         }
     }
     buildDisplayMetadata(metadata) {
@@ -6398,58 +5657,6 @@ What's the next action?`;
             contextWindowTokens: this.activeContextWindowTokens,
         };
     }
-    presentThoughtProcess(thinking, metadata, options) {
-        if (!thinking || this.hasShownThoughtProcess) {
-            return;
-        }
-        const summary = this.extractThoughtSummary(thinking);
-        if (summary) {
-            display.updateThinking(`💭 ${summary}`);
-            this.latestThoughtSummary = summary;
-            this.streamingStatusDetail = summary;
-            this.terminalInput.recordRecentAction(`💭 ${summary}`);
-            this.rebuildStreamingStatusLabel();
-            this.refreshStatusLine(true);
-        }
-        const shouldRender = !options?.wasStreamed || options?.renderWhenStreamed;
-        if (shouldRender) {
-            this.renderAssistantContent('thought', thinking, { ...metadata, isFinal: false });
-        }
-        this.hasShownThoughtProcess = true;
-    }
-    renderToolUsageSummary(metadata) {
-        const since = this.lastToolSummaryRenderedAt ?? this.lastRequestStartedAt ?? Date.now();
-        const operations = this.uiAdapter.getToolOperationsSince(since);
-        if (!operations.length) {
-            return;
-        }
-        let summaryLine = compactRenderer.formatCompactLine(operations, {
-            showIcons: true,
-            showTimings: true,
-        });
-        const warnings = this.uiAdapter.getRecentWarnings(since);
-        if (warnings.length) {
-            const limited = warnings.slice(0, 3);
-            const formattedWarnings = limited
-                .map((warning) => `${icons.warning} ${warning.tool}: ${warning.text}`)
-                .join(' • ');
-            summaryLine = `${summaryLine}   ${theme.warning('[warnings]')} ${formattedWarnings}`;
-        }
-        if (!summaryLine.trim()) {
-            this.lastToolSummaryRenderedAt = Date.now();
-            return;
-        }
-        this.lastToolSummaryRenderedAt =
-            operations[operations.length - 1]?.startedAt ?? Date.now();
-        const blockMetadata = { ...metadata, isFinal: true };
-        if (this.assistantBlocksEnabled && this.assistantBlockRenderer) {
-            this.renderAssistantBlock('tools', summaryLine, blockMetadata);
-            return;
-        }
-        const header = this.formatAssistantHeader('tools', blockMetadata);
-        const block = `\n${header}\n${summaryLine}\n\n`;
-        this.enqueueAssistantStream(block);
-    }
     handleContextTelemetry(metadata, displayMetadata) {
         if (!metadata.isFinal) {
             return null;
@@ -6810,7 +6017,7 @@ What's the next action?`;
     }
     handleAgentSetupError(error, retryAction, providerOverride) {
         this.pendingInteraction = null;
-        const provider = providerOverride === undefined ? this.sessionState.provider : providerOverride;
+        const provider = providerOverride ?? this.sessionState.provider;
         const apiKeyIssue = detectApiKeyError(error, provider);
         if (apiKeyIssue) {
             this.handleApiKeyIssue(apiKeyIssue, retryAction);
@@ -6825,14 +6032,13 @@ What's the next action?`;
         const detail = detailText ? ` Error: ${detailText}` : '';
         const reason = info.reason ? ` (${info.reason.replace(/-/g, ' ')})` : '';
         const partialNote = info.partialResponse ? ' Received partial stream before failure.' : '';
-        this.finalizeAssistantStream();
         display.showWarning(`Streaming failed${reason}, retrying without streaming.${detail}${partialNote}`);
+        this.finishStreamingFormatter('Stream interrupted - retrying without streaming');
         this.startStreamingHeartbeat('Fallback in progress');
         this.requestPromptRefresh(true);
     }
     handleProviderError(error, retryAction) {
-        const providerHint = error instanceof MissingSecretError ? null : this.sessionState.provider;
-        const apiKeyIssue = detectApiKeyError(error, providerHint);
+        const apiKeyIssue = detectApiKeyError(error, this.sessionState.provider);
         if (!apiKeyIssue) {
             return false;
         }
@@ -6841,19 +6047,13 @@ What's the next action?`;
     }
     handleApiKeyIssue(info, retryAction) {
         const secret = info.secret ?? null;
-        const providerLabel = info.provider
-            ? this.providerLabel(info.provider)
-            : secret?.providers?.length
-                ? this.providerLabel(secret.providers[0])
-                : null;
-        const targetLabel = providerLabel ?? secret?.label ?? 'this tool';
-        this.apiKeyGateActive = !!secret;
+        const providerLabel = info.provider ? this.providerLabel(info.provider) : 'the selected provider';
         if (!secret) {
             this.pendingSecretRetry = null;
             const guidance = 'Run "/secrets" to configure the required API key or export it (e.g., EXPORT KEY=value) before launching the CLI.';
             const baseMessage = info.type === 'missing'
-                ? `An API key is required before using ${targetLabel}.`
-                : `API authentication failed for ${targetLabel}.`;
+                ? `An API key is required before using ${providerLabel}.`
+                : `API authentication failed for ${providerLabel}.`;
             display.showWarning(`${baseMessage} ${guidance}`.trim());
             return;
         }
@@ -6862,8 +6062,8 @@ What's the next action?`;
             display.showWarning(info.message.trim());
         }
         const prefix = isMissing
-            ? `${secret.label} is required before you can use ${targetLabel}.`
-            : `${secret.label} appears to be invalid for ${targetLabel}.`;
+            ? `${secret.label} is required before you can use ${providerLabel}.`
+            : `${secret.label} appears to be invalid for ${providerLabel}.`;
         display.showWarning(prefix);
         this.pendingSecretRetry = retryAction ?? null;
         this.pendingInteraction = { type: 'secret-input', secret };
@@ -6899,138 +6099,12 @@ What's the next action?`;
             this.sessionState.reasoningEffort = preset.reasoningEffort;
         }
     }
-    /**
-     * Build the session banner with comprehensive feature status.
-     */
-    getSessionFrameProps() {
-        return {
-            profileLabel: this.profileLabel,
-            profileName: this.profile,
-            model: this.sessionState.model,
-            provider: this.sessionState.provider,
-            workspace: this.workingDir,
-            version: this.version,
-        };
-    }
-    buildBanner() {
-        const terminalWidth = output.columns ?? 100;
-        const width = Math.min(terminalWidth - 4, 110);
-        return renderSessionFrame({
-            ...this.getSessionFrameProps(),
-            width,
-        });
-    }
-    /**
-     * Collect tool categories for banner display.
-     */
-    collectToolCategories() {
-        const categories = [];
-        try {
-            const providerTools = this.runtimeSession.toolRuntime.listProviderTools();
-            if (providerTools.length > 0) {
-                // Group by category (first word of tool name or namespace)
-                const groups = new Map();
-                for (const tool of providerTools) {
-                    const category = this.extractToolCategory(tool.name);
-                    groups.set(category, (groups.get(category) || 0) + 1);
-                }
-                // Convert to array sorted by count
-                const sorted = Array.from(groups.entries())
-                    .sort((a, b) => b[1] - a[1])
-                    .slice(0, 5); // Top 5 categories
-                for (const [name, count] of sorted) {
-                    categories.push({ name, count, icon: this.getToolCategoryIcon(name) });
-                }
-            }
-        }
-        catch {
-            // Ignore errors in tool collection
-        }
-        return categories;
-    }
-    buildFeatureStatusSnapshot() {
-        const featureFlags = loadFeatureFlags();
-        const toolCategories = this.collectToolCategories();
-        const toolCount = toolCategories.reduce((sum, cat) => sum + cat.count, 0);
-        const pluginCount = this._enabledPlugins.length;
-        return {
-            pluginCount: pluginCount > 0 ? pluginCount : undefined,
-            toolCount: toolCount > 0 ? toolCount : undefined,
-            sessionId: this.activeSessionId,
-            mcpEnabled: featureFlags.mcpEnabled,
-            metricsEnabled: featureFlags.metrics,
-            autoCompact: featureFlags.autoCompact,
-            dualMode: featureFlags.alphaZeroDual,
-        };
-    }
-    /**
-     * Extract category from tool name.
-     */
-    extractToolCategory(toolName) {
-        // Common tool prefixes
-        const prefixMap = {
-            git: 'Git',
-            npm: 'NPM',
-            bash: 'Shell',
-            file: 'Files',
-            read: 'Files',
-            write: 'Files',
-            edit: 'Files',
-            search: 'Search',
-            glob: 'Search',
-            grep: 'Search',
-            web: 'Web',
-            fetch: 'Web',
-            test: 'Testing',
-            build: 'Build',
-            deploy: 'Deploy',
-            cloud: 'Cloud',
-            browser: 'Browser',
-        };
-        const lower = toolName.toLowerCase();
-        for (const [prefix, category] of Object.entries(prefixMap)) {
-            if (lower.startsWith(prefix)) {
-                return category;
-            }
-        }
-        // Default to first word capitalized
-        const firstWord = toolName.split(/[_\-\s]/)[0] || 'Other';
-        return firstWord.charAt(0).toUpperCase() + firstWord.slice(1).toLowerCase();
-    }
-    /**
-     * Get icon for tool category.
-     */
-    getToolCategoryIcon(category) {
-        const icons = {
-            Git: '⎇',
-            NPM: '📦',
-            Shell: '⌘',
-            Files: '📁',
-            Search: '🔍',
-            Web: '🌐',
-            Testing: '🧪',
-            Build: '🔧',
-            Deploy: '🚀',
-            Cloud: '☁',
-            Browser: '🌐',
-        };
-        return icons[category] || '⚙';
-    }
-    refreshBannerSessionInfo() {
-        const nextState = {
-            model: this.sessionState.model,
-            provider: this.sessionState.provider,
-        };
-        const previous = this.bannerSessionState;
-        if (previous && previous.model === nextState.model && previous.provider === nextState.provider) {
-            return;
-        }
+    refreshSessionContext() {
         this.refreshContextGauge();
-        // Banner is streamed once at launch; keep the control bar up to date without re-rendering it
         if (!this.isProcessing) {
             this.setIdleStatus();
         }
-        this.bannerSessionState = nextState;
+        this.refreshStatusLine(true);
     }
     providerLabel(id) {
         return PROVIDER_LABELS[id] ?? id;
@@ -7137,7 +6211,7 @@ What's the next action?`;
         // Rebuild agent with new provider
         if (this.rebuildAgent()) {
             this.persistSessionPreference();
-            this.refreshBannerSessionInfo();
+            this.refreshSessionContext();
             display.showInfo(`Switched from ${this.providerLabel(oldProvider)}/${oldModel} to ${match.label}/${defaultModel.id}`);
             this.resetChatBoxAfterModelSwap();
         }
@@ -7331,6 +6405,20 @@ What's the next action?`;
         ];
         display.showSystemMessage(lines.join('\n'));
     }
+    /**
+     * 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) {