erosolar-cli 1.7.355 → 1.7.356

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 } from '../ui/theme.js';
+import { theme, formatUserPrompt } 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,11 +19,11 @@ 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 '../core/metricsTracker.js';
+import { MetricsTracker } from './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, maybeOfferCliUpdate } from './updateManager.js';
+import { isUpdateInProgress } from './updateManager.js';
 import { writeLock } from '../ui/writeLock.js';
 import { enterStreamingMode, exitStreamingMode } from '../ui/globalWriteLock.js';
 const execAsync = promisify(exec);
@@ -35,7 +35,6 @@ 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,
@@ -50,13 +49,11 @@ 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;
@@ -97,12 +94,11 @@ export class InteractiveShell {
     uiAdapter;
     uiUpdates;
     _fileChangeTracker = new FileChangeTracker(); // Reserved for future file tracking features
-    alphaZeroMetrics; // Alpha Zero 2 performance tracking
+    sessionMetrics; // Session performance tracking
     statusSubscription = null;
     followUpQueue = [];
     isDrainingQueue = false;
     activeContextWindowTokens = null;
-    latestTokenUsage = { used: null, limit: null };
     sessionPreferences;
     autosaveEnabled;
     autoContinueEnabled;
@@ -133,9 +129,6 @@ export class InteractiveShell {
     statusLineState = null;
     statusMessageOverride = null;
     promptRefreshTimer = null;
-    launchPaletteShown = false;
-    version;
-    alternateScreenEnabled;
     constructor(config) {
         this.profile = config.profile;
         this.profileLabel = config.profileLabel;
@@ -149,9 +142,6 @@ 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';
-        // Alternate screen disabled - use terminal-native mode for proper scrollback and text selection
-        this.alternateScreenEnabled = false;
         this.initializeSessionHistory();
         this.sessionState = {
             provider: config.initialModel.provider,
@@ -172,7 +162,6 @@ export class InteractiveShell {
             this.slashCommands.push({
                 command: '/agents',
                 description: 'Select the default agent profile (applies on next launch)',
-                category: 'configuration',
             });
         }
         this.customCommands = loadCustomSlashCommands();
@@ -181,21 +170,18 @@ 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;
@@ -227,28 +213,20 @@ export class InteractiveShell {
             onEditModeChange: (mode) => this.handleEditModeChange(mode),
             onToggleVerify: () => this.toggleVerificationMode(),
             onToggleAutoContinue: () => this.toggleAutoContinueMode(),
-            onToggleThinking: () => this.cycleThinkingMode(),
-            onClearContext: () => this.handleClearContext(),
         });
+        // 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.alphaZeroMetrics = new MetricsTracker(`${this.profile}-${Date.now()}`);
+        this.sessionMetrics = new MetricsTracker(`${this.profile}-${Date.now()}`);
         this.setupStatusTracking();
         this.refreshContextGauge();
-        // Start terminal input (sets up handlers)
         this.terminalInput.start();
-        // Enter alternate screen buffer when enabled, otherwise clear the main screen for layout
-        if (this.alternateScreenEnabled) {
-            this.terminalInput.enterAlternateScreen();
-        }
-        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 after banner is streamed
         this.refreshControlBar();
-        this.terminalInput.forceRender();
         this.rebuildAgent();
         this.setupHandlers();
         this.refreshBannerSessionInfo();
@@ -268,10 +246,6 @@ export class InteractiveShell {
                 this.activeSessionId = stored.id;
                 this.activeSessionTitle = stored.title;
                 this.sessionResumeNotice = `Resumed session "${stored.title}".`;
-                // Restore scrollback buffer if available
-                if (stored.scrollbackBuffer && Array.isArray(stored.scrollbackBuffer)) {
-                    this.terminalInput.loadScrollbackBuffer(stored.scrollbackBuffer);
-                }
                 return;
             }
             display.showWarning(`Session "${this.sessionRestoreConfig.sessionId}" not found. Starting fresh session.`);
@@ -285,10 +259,6 @@ export class InteractiveShell {
                 this.activeSessionId = null;
                 this.activeSessionTitle = autosave.title;
                 this.sessionResumeNotice = 'Restored last autosaved session.';
-                // Restore scrollback buffer if available
-                if (autosave.scrollbackBuffer && Array.isArray(autosave.scrollbackBuffer)) {
-                    this.terminalInput.loadScrollbackBuffer(autosave.scrollbackBuffer);
-                }
                 return;
             }
             display.showWarning('No autosaved session found. Starting fresh session.');
@@ -303,24 +273,14 @@ export class InteractiveShell {
         this.sessionResumeNotice = null;
     }
     async start(initialPrompt) {
-        // Check for updates in background (non-blocking)
-        if (this.version) {
-            void maybeOfferCliUpdate(this.version);
-        }
         if (initialPrompt) {
             this.logUserPrompt(initialPrompt);
             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
      */
@@ -334,8 +294,9 @@ export class InteractiveShell {
             this.handleInputChange('');
             return;
         }
-        // DON'T clear the input here - keep it visible while streaming.
-        // The input will be cleared after streaming completes in the finally block.
+        // 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);
         this.logUserPrompt(approved);
         void this.processInputBlock(approved).catch((err) => {
             display.showError(err instanceof Error ? err.message : String(err), err);
@@ -425,59 +386,6 @@ export class InteractiveShell {
                 : 'The model will not be auto-prompted to continue.') +
             ' Toggle with alt+c.');
     }
-    /**
-     * Cycle through thinking modes (Alt+T keyboard shortcut).
-     */
-    cycleThinkingMode() {
-        const modes = ['concise', 'balanced', 'extended'];
-        const currentIndex = modes.indexOf(this.thinkingMode);
-        const nextIndex = (currentIndex + 1) % modes.length;
-        const nextMode = modes[nextIndex];
-        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)`);
-    }
-    /**
-     * Handle context clear/compact request (Alt+X keyboard shortcut).
-     */
-    handleClearContext() {
-        if (this.isProcessing) {
-            display.showWarning('Cannot clear context while processing. Wait for completion or press Ctrl+C.');
-            return;
-        }
-        // Trigger context compaction
-        display.showInfo('Compacting context... This will summarize the conversation and free up space.');
-        void this.performContextCompaction();
-    }
-    /**
-     * Perform context compaction by summarizing conversation history.
-     */
-    async performContextCompaction() {
-        try {
-            // 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;
-            }
-            // 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();
-        }
-        catch (error) {
-            display.showError('Failed to compact context', error);
-        }
-    }
     /**
      * Gate submissions when edit permission mode is active.
      * Returns the text to send when approved, or null when waiting for confirmation.
@@ -577,10 +485,6 @@ export class InteractiveShell {
             return;
         }
         this.shuttingDown = true;
-        const shouldRestoreScrollback = this.alternateScreenEnabled && this.terminalInput.isAlternateScreenActive();
-        const scrollbackSnapshot = shouldRestoreScrollback
-            ? this.terminalInput.getScrollbackSnapshot()
-            : null;
         // Stop any active spinner to prevent process hang
         display.stopThinking(false);
         this.stopStreamingHeartbeat();
@@ -589,34 +493,18 @@ export class InteractiveShell {
         this.teardownStatusTracking();
         // Clear any pending cleanup to prevent hanging
         this.pendingCleanup = null;
-        // Reset terminal state before disposing adapters
-        this.terminalInput.exitStreamingScrollRegion();
-        if (this.alternateScreenEnabled) {
-            this.terminalInput.exitAlternateScreen();
-        }
         // Dispose terminal input handler
         this.terminalInput.dispose();
         // Dispose unified UI adapter
         this.uiAdapter.dispose();
-        if (scrollbackSnapshot && scrollbackSnapshot.length > 0) {
-            this.restoreScrollbackSnapshot(scrollbackSnapshot);
-        }
         display.newLine();
-        console.log(theme.ui.muted('━'.repeat(44)));
-        console.log(theme.ui.muted('  Goodbye! · support@ero.solar'));
-        console.log(theme.ui.muted('━'.repeat(44)));
+        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)));
         exit(0);
     }
-    restoreScrollbackSnapshot(lines) {
-        if (!lines.length) {
-            return;
-        }
-        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`);
-    }
     /**
      * Update status bar message
      */
@@ -784,14 +672,13 @@ 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() ? [detail.trim()] : [];
+        const parts = [detail?.trim() || this.describeModelDetail()];
         const queued = this.followUpQueue.length;
         if (queued > 0) {
             parts.push(`${queued} follow-up${queued === 1 ? '' : 's'} queued`);
@@ -804,18 +691,12 @@ export class InteractiveShell {
     }
     refreshContextGauge() {
         const tokens = getContextWindowTokens(this.sessionState.model);
-        const normalizedTokens = typeof tokens === 'number' && Number.isFinite(tokens) ? tokens : null;
-        this.activeContextWindowTokens = normalizedTokens;
-        if (normalizedTokens !== null) {
-            this.latestTokenUsage = {
-                used: this.latestTokenUsage.used,
-                limit: normalizedTokens,
-            };
-        }
+        this.activeContextWindowTokens =
+            typeof tokens === 'number' && Number.isFinite(tokens) ? tokens : null;
     }
     updateContextUsage(percentage) {
         this.uiAdapter.updateContextUsage(percentage);
-        this.terminalInput.setContextUsage(percentage, CONTEXT_AUTOCOMPACT_PERCENT);
+        this.terminalInput.setContextUsage(percentage);
     }
     refreshControlBar() {
         this.terminalInput.setModeToggles({
@@ -823,9 +704,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();
     }
@@ -856,25 +737,6 @@ 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();
         }
@@ -934,14 +796,15 @@ export class InteractiveShell {
         this.terminalInput.render();
     }
     /**
-     * Log user prompt to the scroll region so it's part of the conversation flow.
+     * 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.
      */
     logUserPrompt(text) {
-        if (!text.trim())
-            return;
-        // Format with user prompt prefix and write to scroll region
-        const formatted = `${theme.user('>')} ${text}\n`;
-        this.terminalInput.writeToScrollRegion(formatted);
+        // Display the user's prompt with the standard prefix
+        const prefix = formatUserPrompt();
+        display.stream(`\n${prefix}${text}\n\n`);
+        // Update content end row so chat box renders below the user prompt
+        this.terminalInput.setContentEndRow(display.getTotalWrittenLines());
     }
     requestPromptRefresh(force = false) {
         if (force) {
@@ -966,40 +829,16 @@ export class InteractiveShell {
         this.stopStreamingHeartbeat();
         // Enter global streaming mode - blocks all non-streaming UI output
         enterStreamingMode();
-        // Set up scroll region for streaming content
-        this.terminalInput.enterStreamingScrollRegion();
         this.uiUpdates.setMode('streaming');
         this.streamingHeartbeatStart = Date.now();
         this.streamingHeartbeatFrame = 0;
-        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);
-            },
-        });
+        // 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.
     }
     stopStreamingHeartbeat() {
         // Exit global streaming mode - allows UI to render again
         exitStreamingMode();
-        // Exit scroll region mode
-        this.terminalInput.exitStreamingScrollRegion();
         this.uiUpdates.stopHeartbeat('streaming');
         this.streamingHeartbeatStart = null;
         this.streamingHeartbeatFrame = 0;
@@ -1011,28 +850,10 @@ export class InteractiveShell {
         // Force refresh to update the input area now that streaming has ended
         this.refreshStatusLine(true);
     }
-    buildStreamingStatus(label, elapsedSeconds) {
+    buildStreamingStatus(label) {
         const detail = this.describeModelDetail();
-        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`;
+        const prefix = theme.info('●');
+        return detail ? `${prefix} ${label} ${theme.ui.muted('·')} ${detail}` : `${prefix} ${label}`;
     }
     refreshQueueIndicators() {
         if (this.isProcessing) {
@@ -1280,6 +1101,17 @@ 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}".`);
@@ -1588,6 +1420,99 @@ 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();
@@ -1630,11 +1555,11 @@ export class InteractiveShell {
         display.showSystemMessage(lines.join('\n'));
     }
     showAlphaZeroMetrics() {
-        const summary = this.alphaZeroMetrics.getPerformanceSummary();
+        const summary = this.sessionMetrics.getPerformanceSummary();
         display.showSystemMessage(summary);
     }
     showImprovementSuggestions() {
-        const suggestions = this.alphaZeroMetrics.getImprovementSuggestions();
+        const suggestions = this.sessionMetrics.getImprovementSuggestions();
         if (suggestions.length === 0) {
             display.showInfo('No improvement suggestions at this time. Keep using the shell to generate metrics!');
             return;
@@ -1680,9 +1605,7 @@ export class InteractiveShell {
             }
         }
         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'));
     }
@@ -1731,7 +1654,6 @@ export class InteractiveShell {
             model: this.sessionState.model,
             workspaceRoot: this.workingDir,
             messages: history,
-            scrollbackBuffer: this.terminalInput.getScrollbackBuffer(),
         });
         this.cachedHistory = history;
         this.updateActiveSession(summary, true);
@@ -1910,7 +1832,6 @@ export class InteractiveShell {
             workspaceRoot: this.workingDir,
             title: this.activeSessionTitle,
             messages: this.cachedHistory,
-            scrollbackBuffer: this.terminalInput.getScrollbackBuffer(),
         });
     }
     describeWorkspaceOptions() {
@@ -1928,75 +1849,6 @@ export class InteractiveShell {
         }
         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) {
@@ -2465,7 +2317,7 @@ export class InteractiveShell {
             this.autosaveIfEnabled();
             // Track metrics with Alpha Zero 2
             const elapsedMs = Date.now() - requestStartTime;
-            this.alphaZeroMetrics.recordMessage(elapsedMs);
+            this.sessionMetrics.recordMessage(elapsedMs);
             if (!responseText?.trim()) {
                 display.showWarning('The provider returned an empty response. Check your API key/provider selection or retry the prompt.');
             }
@@ -2483,10 +2335,14 @@ export class InteractiveShell {
             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
@@ -2563,14 +2419,13 @@ 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.alphaZeroMetrics.recordMessage(elapsedMs);
+                    this.sessionMetrics.recordMessage(elapsedMs);
                     if (!response?.trim()) {
                         display.showWarning('Model returned an empty response. Retrying this iteration...');
                         consecutiveNoProgress++;
@@ -2707,6 +2562,7 @@ 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);
@@ -3063,10 +2919,8 @@ 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 });
             }
@@ -3093,8 +2947,8 @@ What's the next action?`;
             };
             this.agent = this.runtimeSession.createAgent(selection, {
                 onStreamChunk: (chunk) => {
-                    // Stream output using clean streamContent() - chat box floats below
-                    this.terminalInput.streamContent(chunk);
+                    // Stream output directly - no spinner during streaming to avoid race conditions
+                    display.stream(chunk);
                 },
                 onStreamFallback: (info) => this.handleStreamingFallback(info),
                 onAssistantMessage: (content, metadata) => {
@@ -3116,16 +2970,18 @@ What's the next action?`;
                                 display.showAssistantMessage(finalContent, enriched);
                             }
                         }
-                        // Status shown in mode controls bar - no separate status line needed
+                        // Show status line at end (Claude Code style: "• Context X% used • Ready for prompts (2s)")
                         display.stopThinking();
-                        // Update context usage for mode controls display
+                        // Calculate context usage
+                        let contextInfo;
                         if (enriched.contextWindowTokens && metadata.usage) {
                             const total = this.totalTokens(metadata.usage);
                             if (total && total > 0) {
                                 const percentage = Math.round((total / enriched.contextWindowTokens) * 100);
-                                this.updateContextUsage(percentage);
+                                contextInfo = { percentage, tokens: total };
                             }
                         }
+                        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');
@@ -3195,6 +3051,7 @@ What's the next action?`;
                     this.stopStreamingHeartbeat();
                     this.updateStatusMessage(null);
                     this.terminalInput.setStreaming(false);
+                    this.terminalInput.setContentEndRow(display.getTotalWrittenLines());
                     this.terminalInput.render();
                 },
                 onVerificationNeeded: () => {
@@ -3231,6 +3088,7 @@ What's the next action?`;
     resetChatBoxAfterModelSwap() {
         this.updateStatusMessage(null);
         this.terminalInput.setStreaming(false);
+        this.terminalInput.setContentEndRow(display.getTotalWrittenLines());
         this.terminalInput.render();
         this.ensureReadlineReady();
     }
@@ -3295,14 +3153,9 @@ 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;
         }
@@ -3569,113 +3422,6 @@ What's the next action?`;
             this.sessionState.reasoningEffort = preset.reasoningEffort;
         }
     }
-    /**
-     * Build the session banner with comprehensive feature status.
-     */
-    buildBanner() {
-        const terminalWidth = output.columns ?? 100;
-        const width = Math.min(terminalWidth - 4, 110);
-        // Collect tool categories for display
-        const toolCategories = this.collectToolCategories();
-        return renderSessionFrame({
-            profileLabel: this.profileLabel,
-            profileName: this.profile,
-            model: this.sessionState.model,
-            provider: this.sessionState.provider,
-            workspace: this.workingDir,
-            version: this.version,
-            width,
-            features: {
-                verification: this.verificationEnabled,
-                autoContinue: this.autoContinueEnabled,
-                thinkingMode: this.thinkingMode,
-                plugins: this._enabledPlugins,
-                tools: toolCategories,
-                sessionId: this.activeSessionId ?? undefined,
-            },
-        });
-    }
-    /**
-     * 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;
-    }
-    /**
-     * 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,
@@ -3686,11 +3432,13 @@ What's the next action?`;
             return;
         }
         this.refreshContextGauge();
-        // Banner is no longer stored in display - it was streamed as content
-        // Model/provider changes are visible in the control bar
+        display.updateSessionInfo(nextState.model, nextState.provider);
+        // Update the persistent model info display in terminal input
+        this.terminalInput.setModelInfo(this.describeModelDetail());
         if (!this.isProcessing) {
             this.setIdleStatus();
         }
+        // Pinned header rows are disabled; scroll region handles all output.
         this.bannerSessionState = nextState;
     }
     providerLabel(id) {