erosolar-cli 1.7.282 → 1.7.284

package/dist/shell/interactiveShell.js

@@ -2,7 +2,7 @@ import { stdin as input, stdout as output, exit } from 'node:process';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 import { display } from '../ui/display.js';
-import { theme, formatUserPrompt } from '../ui/theme.js';
+import { theme } from '../ui/theme.js';
 import { getContextWindowTokens } from '../core/contextWindow.js';
 import { ensureSecretForProvider, getSecretDefinitionForProvider, getSecretValue, listSecretDefinitions, maskSecret, setSecretValue, } from '../core/secretStore.js';
 import { saveActiveProfilePreference, saveModelPreference, loadToolSettings, saveToolSettings, clearToolSettings, clearActiveProfilePreference, loadSessionPreferences, saveSessionPreferences, } from '../core/preferences.js';
@@ -19,10 +19,10 @@ import { SkillRepository } from '../skills/skillRepository.js';
 import { createSkillTools } from '../tools/skillTools.js';
 import { FileChangeTracker } from './fileChangeTracker.js';
 import { formatShortcutsHelp } from '../ui/shortcutsHelp.js';
-import { MetricsTracker } from './metricsTracker.js';
+import { MetricsTracker } from '../core/metricsTracker.js';
 import { listAvailablePlugins } from '../plugins/index.js';
-import { loadMemory, listMemoryPaths, getDefaultProjectMemoryPath, getUserMemoryEditPath, } from '../core/memorySystem.js';
 import { TerminalInputAdapter } from './terminalInputAdapter.js';
+import { renderSessionFrame } from '../ui/unified/layout.js';
 import { isUpdateInProgress } from './updateManager.js';
 import { writeLock } from '../ui/writeLock.js';
 import { enterStreamingMode, exitStreamingMode } from '../ui/globalWriteLock.js';
@@ -35,6 +35,7 @@ const DROPDOWN_COLORS = [
     theme.success,
     theme.warning,
 ];
+const STREAMING_SPINNER_FRAMES = ['◐', '◓', '◑', '◒'];
 // Load MODEL_PRESETS from centralized schema
 const MODEL_PRESETS = getModels().map((model) => ({
     id: model.id,
@@ -49,11 +50,13 @@ const MODEL_PRESETS = getModels().map((model) => ({
 const BASE_SLASH_COMMANDS = getSlashCommands().map((cmd) => ({
     command: cmd.command,
     description: cmd.description,
+    category: cmd.category,
 }));
 // Load PROVIDER_LABELS from centralized schema
 const PROVIDER_LABELS = Object.fromEntries(getProviders().map((provider) => [provider.id, provider.label]));
 // Allow enough time for paste detection to kick in before flushing buffered lines
 const CONTEXT_USAGE_THRESHOLD = 0.9;
+const CONTEXT_AUTOCOMPACT_PERCENT = Math.round(CONTEXT_USAGE_THRESHOLD * 100);
 const CONTEXT_RECENT_MESSAGE_COUNT = 12;
 const CONTEXT_CLEANUP_CHARS_PER_CHUNK = 6000;
 const CONTEXT_CLEANUP_MAX_OUTPUT_TOKENS = 800;
@@ -94,11 +97,12 @@ export class InteractiveShell {
     uiAdapter;
     uiUpdates;
     _fileChangeTracker = new FileChangeTracker(); // Reserved for future file tracking features
-    sessionMetrics; // Session performance tracking
+    alphaZeroMetrics; // Alpha Zero 2 performance tracking
     statusSubscription = null;
     followUpQueue = [];
     isDrainingQueue = false;
     activeContextWindowTokens = null;
+    latestTokenUsage = { used: null, limit: null };
     sessionPreferences;
     autosaveEnabled;
     autoContinueEnabled;
@@ -129,6 +133,8 @@ export class InteractiveShell {
     statusLineState = null;
     statusMessageOverride = null;
     promptRefreshTimer = null;
+    launchPaletteShown = false;
+    version;
     constructor(config) {
         this.profile = config.profile;
         this.profileLabel = config.profileLabel;
@@ -142,6 +148,7 @@ export class InteractiveShell {
         this.autoContinueEnabled = this.sessionPreferences.autoContinue;
         this.sessionRestoreConfig = config.sessionRestore ?? { mode: 'none' };
         this._enabledPlugins = config.enabledPlugins ?? [];
+        this.version = config.version ?? '0.0.0';
         this.initializeSessionHistory();
         this.sessionState = {
             provider: config.initialModel.provider,
@@ -162,6 +169,7 @@ export class InteractiveShell {
             this.slashCommands.push({
                 command: '/agents',
                 description: 'Select the default agent profile (applies on next launch)',
+                category: 'configuration',
             });
         }
         this.customCommands = loadCustomSlashCommands();
@@ -170,18 +178,21 @@ export class InteractiveShell {
             this.slashCommands.push({
                 command: custom.command,
                 description: `${custom.description} (custom)`,
+                category: custom.category ?? 'other',
             });
         }
         if (!this.slashCommands.some((cmd) => cmd.command === '/exit')) {
             this.slashCommands.push({
                 command: '/exit',
                 description: 'Quit the CLI immediately',
+                category: 'other',
             });
         }
         // Add /plugins command
         this.slashCommands.push({
             command: '/plugins',
             description: 'Show available and loaded plugins',
+            category: 'configuration',
         });
         this.statusTracker = config.statusTracker;
         this.ui = config.ui;
@@ -216,17 +227,14 @@ export class InteractiveShell {
         });
         // Register output interceptor for cursor positioning during streaming
         this.terminalInput.registerOutputInterceptor(display);
-        // Set banner content to be written during unified UI initialization
-        this.terminalInput.setBannerContent(display.getBannerContent());
-        // Initialize unified UI - clears screen, sets up scroll region, writes banner,
-        // and renders input area at bottom
-        this.terminalInput.initializeUnifiedUI();
         // Initialize Alpha Zero 2 metrics tracking
-        this.sessionMetrics = new MetricsTracker(`${this.profile}-${Date.now()}`);
+        this.alphaZeroMetrics = new MetricsTracker(`${this.profile}-${Date.now()}`);
         this.setupStatusTracking();
         this.refreshContextGauge();
         this.terminalInput.start();
         this.refreshControlBar();
+        // Stream banner into the unified scroll region at the top
+        this.streamBannerToScrollRegion();
         this.rebuildAgent();
         this.setupHandlers();
         this.refreshBannerSessionInfo();
@@ -278,9 +286,15 @@ export class InteractiveShell {
             await this.processInputBlock(initialPrompt);
             return;
         }
+        this.showLaunchCommandPalette();
         // Ensure the terminal input is visible
         this.terminalInput.render();
     }
+    showLaunchCommandPalette() {
+        // Disabled: Quick commands palette takes up too much space
+        // Users can type /help to see available commands
+        this.launchPaletteShown = true;
+    }
     /**
      * TerminalInputAdapter submit handler
      */
@@ -294,9 +308,8 @@ export class InteractiveShell {
             this.handleInputChange('');
             return;
         }
-        // Enter streaming mode BEFORE logging prompt - this positions cursor correctly
-        // so content appears right after the banner, not at bottom with blank space above
-        this.terminalInput.setStreaming(true);
+        // DON'T clear the input here - keep it visible while streaming.
+        // The input will be cleared after streaming completes in the finally block.
         this.logUserPrompt(approved);
         void this.processInputBlock(approved).catch((err) => {
             display.showError(err instanceof Error ? err.message : String(err), err);
@@ -498,11 +511,9 @@ export class InteractiveShell {
         // Dispose unified UI adapter
         this.uiAdapter.dispose();
         display.newLine();
-        const version = display.getVersion() || 'unknown';
-        console.log(theme.gradient.warm('━'.repeat(50)));
-        console.log(`  ${theme.gradient.cool('✨ Goodbye!')} ${theme.ui.muted('·')} ${theme.info(`erosolar-cli v${version}`)}`);
-        console.log(`  ${theme.ui.muted('Support:')} ${theme.info('support@ero.solar')}`);
-        console.log(theme.gradient.warm('━'.repeat(50)));
+        console.log(theme.ui.muted('━'.repeat(44)));
+        console.log(theme.ui.muted('  Goodbye! · support@ero.solar'));
+        console.log(theme.ui.muted('━'.repeat(44)));
         exit(0);
     }
     /**
@@ -672,13 +683,14 @@ export class InteractiveShell {
         });
     }
     setProcessingStatus(detail) {
+        this.latestTokenUsage = { used: null, limit: this.latestTokenUsage.limit };
         this.statusTracker.setBase('Working on your request', {
             detail: this.describeStatusDetail(detail),
             tone: 'info',
         });
     }
     describeStatusDetail(detail) {
-        const parts = [detail?.trim() || this.describeModelDetail()];
+        const parts = detail?.trim() ? [detail.trim()] : [];
         const queued = this.followUpQueue.length;
         if (queued > 0) {
             parts.push(`${queued} follow-up${queued === 1 ? '' : 's'} queued`);
@@ -691,12 +703,18 @@ export class InteractiveShell {
     }
     refreshContextGauge() {
         const tokens = getContextWindowTokens(this.sessionState.model);
-        this.activeContextWindowTokens =
-            typeof tokens === 'number' && Number.isFinite(tokens) ? tokens : null;
+        const normalizedTokens = typeof tokens === 'number' && Number.isFinite(tokens) ? tokens : null;
+        this.activeContextWindowTokens = normalizedTokens;
+        if (normalizedTokens !== null) {
+            this.latestTokenUsage = {
+                used: this.latestTokenUsage.used,
+                limit: normalizedTokens,
+            };
+        }
     }
     updateContextUsage(percentage) {
         this.uiAdapter.updateContextUsage(percentage);
-        this.terminalInput.setContextUsage(percentage);
+        this.terminalInput.setContextUsage(percentage, CONTEXT_AUTOCOMPACT_PERCENT);
     }
     refreshControlBar() {
         this.terminalInput.setModeToggles({
@@ -704,9 +722,9 @@ export class InteractiveShell {
             autoContinueEnabled: this.autoContinueEnabled,
             verificationHotkey: 'alt+v',
             autoContinueHotkey: 'alt+c',
+            thinkingModeLabel: this.thinkingMode,
+            thinkingHotkey: '/thinking',
         });
-        // Update persistent model info display
-        this.terminalInput.setModelInfo(this.describeModelDetail());
         this.refreshStatusLine();
         this.terminalInput.render();
     }
@@ -737,6 +755,25 @@ export class InteractiveShell {
         // Set main status (tool execution, etc.) - shown when not overridden
         const statusText = this.formatStatusLine(this.statusLineState);
         this.terminalInput.setStatusMessage(statusText);
+        // Surface meta header (elapsed + context usage) above the divider
+        const elapsedSeconds = this.statusLineState
+            ? Math.max(0, Math.floor((Date.now() - this.statusLineState.startedAt) / 1000))
+            : null;
+        const thinkingMs = display.isSpinnerActive() ? display.getThinkingElapsedMs() : null;
+        const tokensUsed = this.latestTokenUsage.used;
+        const tokenLimit = this.latestTokenUsage.limit ?? this.activeContextWindowTokens;
+        this.terminalInput.setMetaStatus({
+            elapsedSeconds,
+            tokensUsed,
+            tokenLimit,
+            thinkingMs,
+            thinkingHasContent: display.isSpinnerActive(),
+        });
+        // Keep model/provider visible in the controls bar
+        this.terminalInput.setModelContext({
+            model: this.sessionState.model,
+            provider: this.providerLabel(this.sessionState.provider),
+        });
         if (forceRender) {
             this.terminalInput.render();
         }
@@ -796,13 +833,14 @@ export class InteractiveShell {
         this.terminalInput.render();
     }
     /**
-     * Log the user's prompt as a visible message in the conversation.
-     * This creates a persistent log entry that remains visible during and after streaming.
+     * Log user prompt to the scroll region so it's part of the conversation flow.
      */
     logUserPrompt(text) {
-        // Display the user's prompt with the standard prefix
-        const prefix = formatUserPrompt();
-        display.stream(`\n${prefix}${text}\n\n`);
+        if (!text.trim())
+            return;
+        // Format with user prompt prefix and write to scroll region
+        const formatted = `${theme.user('>')} ${text}\n`;
+        this.terminalInput.writeToScrollRegion(formatted);
     }
     requestPromptRefresh(force = false) {
         if (force) {
@@ -830,9 +868,29 @@ export class InteractiveShell {
         this.uiUpdates.setMode('streaming');
         this.streamingHeartbeatStart = Date.now();
         this.streamingHeartbeatFrame = 0;
-        // Note: We don't start a heartbeat during streaming anymore
-        // because the UI shouldn't be rendering during streaming.
-        // The streaming status is shown in the streaming header instead.
+        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',
+            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;
+                const frame = STREAMING_SPINNER_FRAMES[this.streamingHeartbeatFrame];
+                this.streamingStatusLabel = this.buildStreamingStatus(`${frame} ${label}`, elapsedSeconds);
+                display.updateStreamingStatus(this.streamingStatusLabel);
+                this.refreshStatusLine(true);
+            },
+        });
     }
     stopStreamingHeartbeat() {
         // Exit global streaming mode - allows UI to render again
@@ -848,10 +906,28 @@ export class InteractiveShell {
         // Force refresh to update the input area now that streaming has ended
         this.refreshStatusLine(true);
     }
-    buildStreamingStatus(label) {
+    buildStreamingStatus(label, elapsedSeconds) {
         const detail = this.describeModelDetail();
-        const prefix = theme.info('●');
-        return detail ? `${prefix} ${label} ${theme.ui.muted('·')} ${detail}` : `${prefix} ${label}`;
+        const elapsedLabel = typeof elapsedSeconds === 'number' && elapsedSeconds >= 0
+            ? theme.ui.muted(this.formatElapsedShort(elapsedSeconds))
+            : null;
+        const prefix = theme.info('⏺');
+        const parts = [label];
+        if (detail) {
+            parts.push(theme.ui.muted('·'), detail);
+        }
+        if (elapsedLabel) {
+            parts.push(theme.ui.muted('·'), elapsedLabel);
+        }
+        return `${prefix} ${parts.join(' ')}`.trim();
+    }
+    formatElapsedShort(seconds) {
+        if (seconds < 60) {
+            return `${seconds}s`;
+        }
+        const minutes = Math.floor(seconds / 60);
+        const remaining = seconds % 60;
+        return remaining > 0 ? `${minutes}m ${remaining}s` : `${minutes}m`;
     }
     refreshQueueIndicators() {
         if (this.isProcessing) {
@@ -1099,17 +1175,6 @@ export class InteractiveShell {
             case '/discover':
                 await this.discoverModelsCommand();
                 break;
-            case '/memory':
-                this.handleMemoryCommand(input);
-                break;
-            case '/clear':
-                display.clear();
-                this.cachedHistory = [];
-                display.showInfo('Conversation cleared.');
-                break;
-            case '/help':
-                this.showHelp();
-                break;
             default:
                 if (!(await this.tryCustomSlashCommand(command, input))) {
                     display.showWarning(`Unknown command "${command}".`);
@@ -1418,99 +1483,6 @@ export class InteractiveShell {
         // Display keyboard shortcuts help (Claude Code style)
         display.showSystemMessage(formatShortcutsHelp());
     }
-    handleMemoryCommand(input) {
-        const tokens = input.trim().split(/\s+/).slice(1);
-        const action = (tokens.shift() ?? 'show').toLowerCase();
-        switch (action) {
-            case '':
-            case 'show':
-            case 'list': {
-                this.showMemoryStatus();
-                break;
-            }
-            case 'paths': {
-                this.showMemoryPaths();
-                break;
-            }
-            case 'edit': {
-                const level = (tokens[0] ?? 'project').toLowerCase();
-                this.openMemoryForEdit(level);
-                break;
-            }
-            default:
-                display.showWarning('Usage: /memory [show|paths|edit <user|project>]');
-                break;
-        }
-    }
-    showMemoryStatus() {
-        const memory = loadMemory(this.workingDir);
-        const lines = [];
-        lines.push(theme.bold('Persistent Memory'));
-        lines.push('');
-        if (memory.sources.length === 0) {
-            lines.push(theme.secondary('No memory files found.'));
-            lines.push('');
-            lines.push(`Create ${theme.info('EROSOLAR.md')} in your project to add persistent context.`);
-            lines.push(`Use ${theme.info('/memory edit project')} to create one.`);
-        }
-        else {
-            for (const source of memory.sources) {
-                const levelLabel = source.level === 'enterprise' ? 'Enterprise' :
-                    source.level === 'user' ? 'User' : 'Project';
-                const preview = source.content.slice(0, 200).replace(/\n/g, ' ').trim();
-                const truncated = source.content.length > 200 ? '...' : '';
-                lines.push(`${theme.success('●')} ${theme.bold(levelLabel)}: ${source.path}`);
-                lines.push(`  ${theme.dim(preview + truncated)}`);
-                lines.push('');
-            }
-            if (memory.importedPaths.length > memory.sources.length) {
-                lines.push(theme.secondary(`Imported ${memory.importedPaths.length - memory.sources.length} additional files via @imports.`));
-            }
-        }
-        display.showSystemMessage(lines.join('\n'));
-    }
-    showMemoryPaths() {
-        const paths = listMemoryPaths(this.workingDir);
-        const lines = [];
-        lines.push(theme.bold('Memory File Locations'));
-        lines.push('');
-        for (const { level, path, exists } of paths) {
-            const icon = exists ? theme.success('✓') : theme.dim('○');
-            const levelLabel = level.charAt(0).toUpperCase() + level.slice(1);
-            lines.push(`${icon} ${levelLabel}: ${path}`);
-        }
-        lines.push('');
-        lines.push(theme.secondary('Create any of these files to add persistent memory.'));
-        lines.push(theme.secondary('Use @path/to/file.md syntax to import other files.'));
-        display.showSystemMessage(lines.join('\n'));
-    }
-    openMemoryForEdit(level) {
-        let targetPath;
-        if (level === 'user') {
-            targetPath = getUserMemoryEditPath();
-        }
-        else if (level === 'project') {
-            targetPath = getDefaultProjectMemoryPath(this.workingDir);
-        }
-        else {
-            display.showWarning('Specify "user" or "project" to edit. Enterprise memory is read-only.');
-            return;
-        }
-        display.showInfo(`Memory file: ${targetPath}`);
-        display.showInfo('Create or edit this file to add persistent context for the AI.');
-        display.showInfo('');
-        display.showInfo('Example EROSOLAR.md content:');
-        display.showInfo('');
-        display.showInfo(theme.dim(`# Project Guidelines
-
-When working in this codebase:
-- Follow TypeScript strict mode conventions
-- Use functional patterns where appropriate
-- Run tests before committing
-
-@./docs/coding-standards.md
-`));
-    }
     showFileChangeSummary() {
         const summary = this._fileChangeTracker.getSummary();
         const changes = this._fileChangeTracker.getAllChanges();
@@ -1553,11 +1525,11 @@ When working in this codebase:
         display.showSystemMessage(lines.join('\n'));
     }
     showAlphaZeroMetrics() {
-        const summary = this.sessionMetrics.getPerformanceSummary();
+        const summary = this.alphaZeroMetrics.getPerformanceSummary();
         display.showSystemMessage(summary);
     }
     showImprovementSuggestions() {
-        const suggestions = this.sessionMetrics.getImprovementSuggestions();
+        const suggestions = this.alphaZeroMetrics.getImprovementSuggestions();
         if (suggestions.length === 0) {
             display.showInfo('No improvement suggestions at this time. Keep using the shell to generate metrics!');
             return;
@@ -1603,7 +1575,9 @@ When working in this codebase:
             }
         }
         lines.push(theme.secondary('CLI Flags:'));
+        lines.push('  --alpha-zero    Enable Alpha Zero 2 RL framework');
         lines.push('  --coding        Enable enhanced coding tools');
+        lines.push('  --security      Enable security research tools');
         lines.push('  --all-plugins   Enable all optional plugins');
         display.showSystemMessage(lines.join('\n'));
     }
@@ -1847,6 +1821,75 @@ When working in this codebase:
         }
         return `${warning.label}: ${warning.reason}.`;
     }
+    buildLaunchCommandPalette() {
+        const entries = [];
+        const secretsSummary = this.summarizeSecretsForPalette();
+        const toolSummary = this.getToolSelectionSummary();
+        const autosaveLabel = this.autosaveEnabled ? 'on' : 'off';
+        for (const command of this.slashCommands) {
+            const entry = {
+                command: command.command,
+                description: command.description,
+                category: command.category ?? 'other',
+            };
+            switch (command.command) {
+                case '/secrets':
+                    if (secretsSummary.text) {
+                        entry.description = `${command.description} (${secretsSummary.text})`;
+                        entry.tone = secretsSummary.tone;
+                    }
+                    break;
+                case '/tools':
+                    if (toolSummary) {
+                        entry.description = `${command.description} (${toolSummary})`;
+                    }
+                    break;
+                case '/sessions':
+                    entry.description = `${command.description} (autosave ${autosaveLabel})`;
+                    break;
+                case '/model':
+                    entry.description = `${command.description} (current: ${this.sessionState.model})`;
+                    break;
+                case '/provider':
+                    entry.description = `${command.description} (current: ${this.providerLabel(this.sessionState.provider)})`;
+                    break;
+                default:
+                    break;
+            }
+            entries.push(entry);
+        }
+        return entries;
+    }
+    summarizeSecretsForPalette() {
+        const definitions = listSecretDefinitions();
+        if (!definitions.length) {
+            return { text: null };
+        }
+        const missing = definitions.filter((definition) => !getSecretValue(definition.id));
+        if (missing.length === 0) {
+            return { text: 'all configured', tone: 'success' };
+        }
+        const labels = missing.map((definition) => definition.label ?? definition.id);
+        return { text: `missing ${this.formatList(labels)}`, tone: 'warn' };
+    }
+    getToolSelectionSummary() {
+        const toolSettings = loadToolSettings();
+        const selection = buildEnabledToolSet(toolSettings);
+        const options = getToolToggleOptions();
+        if (!options.length) {
+            return null;
+        }
+        const enabledCount = options.filter((option) => selection.has(option.id)).length;
+        return `${enabledCount}/${options.length} enabled`;
+    }
+    formatList(values, maxItems = 3) {
+        if (!values.length) {
+            return '';
+        }
+        const shown = values.slice(0, maxItems);
+        const suffix = values.length > maxItems ? ', …' : '';
+        return `${shown.join(', ')}${suffix}`;
+    }
     buildSlashCommandList(header) {
         const lines = [theme.gradient.primary(header), ''];
         for (const command of this.slashCommands) {
@@ -2315,7 +2358,7 @@ When working in this codebase:
             this.autosaveIfEnabled();
             // Track metrics with Alpha Zero 2
             const elapsedMs = Date.now() - requestStartTime;
-            this.sessionMetrics.recordMessage(elapsedMs);
+            this.alphaZeroMetrics.recordMessage(elapsedMs);
             if (!responseText?.trim()) {
                 display.showWarning('The provider returned an empty response. Check your API key/provider selection or retry the prompt.');
             }
@@ -2333,14 +2376,10 @@ When working in this codebase:
             this.stopStreamingHeartbeat();
             this.isProcessing = false;
             this.terminalInput.setStreaming(false);
-            this.terminalInput.setContentEndRow(display.getTotalWrittenLines());
             this.uiAdapter.endProcessing('Ready for prompts');
             this.setIdleStatus();
             display.newLine();
             this.updateStatusMessage(null);
-            // 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
@@ -2417,13 +2456,14 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`;
                 try {
                     // Send the request and capture the response (streaming disabled)
                     display.showThinking('Responding...');
+                    this.refreshStatusLine(true);
                     const response = await agent.send(currentPrompt, true);
                     await this.awaitPendingCleanup();
                     this.captureHistorySnapshot();
                     this.autosaveIfEnabled();
                     // Track metrics
                     const elapsedMs = Date.now() - overallStartTime;
-                    this.sessionMetrics.recordMessage(elapsedMs);
+                    this.alphaZeroMetrics.recordMessage(elapsedMs);
                     if (!response?.trim()) {
                         display.showWarning('Model returned an empty response. Retrying this iteration...');
                         consecutiveNoProgress++;
@@ -2560,7 +2600,6 @@ What's the next action?`;
             this.stopStreamingHeartbeat();
             this.isProcessing = false;
             this.terminalInput.setStreaming(false);
-            this.terminalInput.setContentEndRow(display.getTotalWrittenLines());
             this.uiAdapter.endProcessing('Ready for prompts');
             this.setIdleStatus();
             this.updateStatusMessage(null);
@@ -2917,8 +2956,10 @@ What's the next action?`;
         try {
             // Send the error to the agent for fixing
             display.showThinking('Analyzing build errors');
+            this.refreshStatusLine(true);
             const response = await this.agent.send(prompt, true);
             display.stopThinking();
+            this.refreshStatusLine(true);
             if (response) {
                 display.showAssistantMessage(response, { isFinal: true });
             }
@@ -2968,18 +3009,16 @@ What's the next action?`;
                                 display.showAssistantMessage(finalContent, enriched);
                             }
                         }
-                        // Show status line at end (Claude Code style: "• Context X% used • Ready for prompts (2s)")
+                        // Status shown in mode controls bar - no separate status line needed
                         display.stopThinking();
-                        // Calculate context usage
-                        let contextInfo;
+                        // Update context usage for mode controls display
                         if (enriched.contextWindowTokens && metadata.usage) {
                             const total = this.totalTokens(metadata.usage);
                             if (total && total > 0) {
                                 const percentage = Math.round((total / enriched.contextWindowTokens) * 100);
-                                contextInfo = { percentage, tokens: total };
+                                this.updateContextUsage(percentage);
                             }
                         }
-                        display.showStatusLine('Ready for prompts', enriched.elapsedMs, contextInfo);
                         // Auto-verify changes: build first (catches type errors), then tests
                         void this.enforceAutoBuild('final-response');
                         void this.enforceAutoTests('final-response');
@@ -3049,7 +3088,6 @@ What's the next action?`;
                     this.stopStreamingHeartbeat();
                     this.updateStatusMessage(null);
                     this.terminalInput.setStreaming(false);
-                    this.terminalInput.setContentEndRow(display.getTotalWrittenLines());
                     this.terminalInput.render();
                 },
                 onVerificationNeeded: () => {
@@ -3086,7 +3124,6 @@ What's the next action?`;
     resetChatBoxAfterModelSwap() {
         this.updateStatusMessage(null);
         this.terminalInput.setStreaming(false);
-        this.terminalInput.setContentEndRow(display.getTotalWrittenLines());
         this.terminalInput.render();
         this.ensureReadlineReady();
     }
@@ -3151,9 +3188,14 @@ What's the next action?`;
             return null;
         }
         const usageRatio = total / windowTokens;
+        this.latestTokenUsage = {
+            used: total,
+            limit: windowTokens,
+        };
         // Always update context usage in the UI
         const percentUsed = Math.round(usageRatio * 100);
         this.updateContextUsage(percentUsed);
+        this.refreshStatusLine(true);
         if (usageRatio < CONTEXT_USAGE_THRESHOLD) {
             return null;
         }
@@ -3420,6 +3462,33 @@ What's the next action?`;
             this.sessionState.reasoningEffort = preset.reasoningEffort;
         }
     }
+    /**
+     * Build the session banner using the unified layout renderer.
+     * This is streamed as content, not stored in display.
+     */
+    buildBanner() {
+        const terminalWidth = output.columns ?? 100;
+        const width = Math.min(terminalWidth - 4, 110);
+        return renderSessionFrame({
+            profileLabel: this.profileLabel,
+            profileName: this.profile,
+            model: this.sessionState.model,
+            provider: this.sessionState.provider,
+            workspace: this.workingDir,
+            version: this.version,
+            width,
+        });
+    }
+    /**
+     * Stream banner into the unified scroll region.
+     * Uses the same path as AI responses so content flows consistently.
+     */
+    streamBannerToScrollRegion() {
+        const banner = this.buildBanner();
+        // Stream through display to use the output interceptor
+        // This positions cursor correctly within scroll region
+        display.stream(banner + '\n\n');
+    }
     refreshBannerSessionInfo() {
         const nextState = {
             model: this.sessionState.model,
@@ -3430,13 +3499,11 @@ What's the next action?`;
             return;
         }
         this.refreshContextGauge();
-        display.updateSessionInfo(nextState.model, nextState.provider);
-        // Update the persistent model info display in terminal input
-        this.terminalInput.setModelInfo(this.describeModelDetail());
+        // Banner is no longer stored in display - it was streamed as content
+        // Model/provider changes are visible in the control bar
         if (!this.isProcessing) {
             this.setIdleStatus();
         }
-        // Pinned header rows are disabled; scroll region handles all output.
         this.bannerSessionState = nextState;
     }
     providerLabel(id) {