erosolar-cli 1.7.296 → 1.7.298

package/dist/shell/terminalInput.js

@@ -3,15 +3,18 @@
  *
  * Design principles:
  * - Single source of truth for input state
+ * - Content flows naturally from top to bottom (no scroll region pinning)
  * - Native bracketed paste support (no heuristics)
  * - Clean cursor model with render-time wrapping
  * - State machine for different input modes
  * - No readline dependency for display
  */
 import { EventEmitter } from 'node:events';
-import { isMultilinePaste, generatePasteSummary } from '../core/multilinePasteHandler.js';
+import { isMultilinePaste } from '../core/multilinePasteHandler.js';
 import { writeLock } from '../ui/writeLock.js';
-import { UI_COLORS, DEFAULT_UI_CONFIG, } from '../ui/terminalUISchema.js';
+import { renderDivider, renderStatusLine } from '../ui/unified/layout.js';
+import { isStreamingMode } from '../ui/globalWriteLock.js';
+import { formatThinking } from '../ui/toolDisplay.js';
 // ANSI escape codes
 const ESC = {
     // Cursor control
@@ -21,9 +24,6 @@ const ESC = {
     SHOW: '\x1b[?25h',
     TO: (row, col) => `\x1b[${row};${col}H`,
     TO_COL: (col) => `\x1b[${col}G`,
-    // Screen control
-    CLEAR_SCREEN: '\x1b[2J',
-    HOME: '\x1b[H',
     // Line control
     CLEAR_LINE: '\x1b[2K',
     CLEAR_TO_END: '\x1b[0J',
@@ -69,56 +69,46 @@ export class TerminalInput extends EventEmitter {
     statusMessage = null;
     overrideStatusMessage = null; // Secondary status (warnings, etc.)
     streamingLabel = null; // Streaming progress indicator
+    metaElapsedSeconds = null; // Optional elapsed time for header line
+    metaTokensUsed = null; // Optional token usage
+    metaTokenLimit = null; // Optional token window
+    metaThinkingMs = null; // Optional thinking duration
+    metaThinkingHasContent = false; // Whether collapsed thinking content exists
     lastRenderContent = '';
     lastRenderCursor = -1;
     renderDirty = false;
     isRendering = false;
-    pinnedTopRows = 0;
-    inlineAnchorRow = null;
-    inlineLayout = false;
-    anchorProvider = null;
-    // Flow mode: when true, renders inline after content (no absolute positioning)
-    flowMode = true;
-    flowModeRenderedLines = 0; // Track lines rendered for clearing
-    inputAreaStartRow = 0; // Track absolute row position of input area
-    scrollRegionActive = false; // Track if scroll region is enabled
-    contentEndRow = 0; // Row where content ends (for idle mode positioning)
-    // Command suggestions (Claude Code style auto-complete)
-    commandSuggestions = [];
-    filteredSuggestions = [];
-    selectedSuggestionIndex = 0;
-    showSuggestions = false;
-    maxVisibleSuggestions = 10;
     // Lifecycle
     disposed = false;
     enabled = true;
     contextUsage = null;
+    contextAutoCompactThreshold = 90;
+    // Track current content row in scroll region (starts at top, moves down)
+    contentRow = 1;
+    thinkingModeLabel = null;
     editMode = 'display-edits';
     verificationEnabled = true;
     autoContinueEnabled = false;
     verificationHotkey = 'alt+v';
     autoContinueHotkey = 'alt+c';
+    thinkingHotkey = '/thinking';
+    modelLabel = null;
+    providerLabel = null;
     // Output interceptor cleanup
     outputInterceptorCleanup;
-    // Metrics tracking for status bar
-    streamingStartTime = null;
-    tokensUsed = 0;
-    thinkingEnabled = true;
-    modelInfo = null; // Provider · Model info
-    // Streaming input area render timer (updates elapsed time display)
+    // Streaming render throttle
+    lastStreamingRender = 0;
+    streamingRenderInterval = 250; // ms between renders during streaming
     streamingRenderTimer = null;
-    // Unified UI initialization flag
-    unifiedUIInitialized = false;
     constructor(writeStream = process.stdout, config = {}) {
         super();
         this.out = writeStream;
-        // Use schema defaults for configuration consistency
         this.config = {
-            maxLines: config.maxLines ?? DEFAULT_UI_CONFIG.inputArea.maxLines,
-            maxLength: config.maxLength ?? DEFAULT_UI_CONFIG.inputArea.maxLength,
+            maxLines: config.maxLines ?? 1000,
+            maxLength: config.maxLength ?? 10000,
             maxQueueSize: config.maxQueueSize ?? 100,
-            promptChar: config.promptChar ?? DEFAULT_UI_CONFIG.inputArea.promptChar,
-            continuationChar: config.continuationChar ?? DEFAULT_UI_CONFIG.inputArea.continuationChar,
+            promptChar: config.promptChar ?? '> ',
+            continuationChar: config.continuationChar ?? '│ ',
         };
     }
     // ===========================================================================
@@ -197,460 +187,36 @@ export class TerminalInput extends EventEmitter {
             if (handled)
                 return;
         }
-        // Handle '?' for help hint (if buffer is empty)
-        if (str === '?' && this.buffer.length === 0) {
-            this.emit('showHelp');
-            return;
-        }
         // Insert printable characters
         if (str && !key?.ctrl && !key?.meta) {
             this.insertText(str);
         }
     }
-    // Banner content to write on init (set via setBannerContent before initializeUnifiedUI)
-    bannerContent = null;
-    /**
-     * Set banner content to be written when unified UI initializes.
-     */
-    setBannerContent(content) {
-        this.bannerContent = content;
-    }
-    /**
-     * Initialize the unified UI system.
-     *
-     * Layout:
-     * 1. Clear screen
-     * 2. Write banner at top
-     * 3. Render input area at bottom
-     */
-    initializeUnifiedUI() {
-        if (this.unifiedUIInitialized) {
-            return;
-        }
-        // Hide cursor during setup
-        this.write(ESC.HIDE);
-        // Clear screen and go home
-        this.write(ESC.HOME);
-        this.write(ESC.CLEAR_SCREEN);
-        // Write banner at top
-        if (this.bannerContent) {
-            process.stdout.write(this.bannerContent + '\n\n');
-        }
-        // Mark initialized
-        this.unifiedUIInitialized = true;
-        // Render input area at bottom (unified for all modes)
-        this.renderInputAreaAtBottom();
-    }
-    /**
-     * Clear the input area at its tracked position.
-     * Returns true if something was cleared.
-     */
-    clearInputArea() {
-        if (this.inputAreaStartRow > 0 && this.flowModeRenderedLines > 0) {
-            for (let i = 0; i < this.flowModeRenderedLines; i++) {
-                this.write(ESC.TO(this.inputAreaStartRow + i, 1));
-                this.write(ESC.CLEAR_LINE);
-            }
-            return true;
-        }
-        return false;
-    }
-    /**
-     * Reset input area tracking state.
-     */
-    resetInputAreaTracking() {
-        this.inputAreaStartRow = 0;
-        this.flowModeRenderedLines = 0;
-    }
-    /**
-     * Enable scroll region - content scrolls above, input area protected at bottom.
-     */
-    enableScrollRegion() {
-        if (this.scrollRegionActive)
-            return;
-        const { rows } = this.getSize();
-        const linesNeeded = 6 + (this.modelInfo ? 1 : 0);
-        const scrollBottom = Math.max(1, rows - linesNeeded);
-        this.write(ESC.SET_SCROLL(1, scrollBottom));
-        this.scrollRegionActive = true;
-    }
-    /**
-     * Disable scroll region.
-     */
-    disableScrollRegion() {
-        if (!this.scrollRegionActive)
-            return;
-        this.write(ESC.RESET_SCROLL);
-        this.scrollRegionActive = false;
-    }
-    /**
-     * Render input area at absolute bottom of terminal.
-     * Used during streaming (with scroll region) and after streaming.
-     * This is the UNIFIED render method for all modes.
-     */
-    renderInputAreaAtBottom() {
-        const { rows, cols } = this.getSize();
-        const divider = '─'.repeat(cols - 1);
-        const { dim: DIM, reset: R } = UI_COLORS;
-        // Calculate lines needed and starting row
-        const linesNeeded = 5 + (this.modelInfo ? 1 : 0);
-        const startRow = Math.max(1, rows - linesNeeded + 1);
-        // Save cursor and hide during render
-        this.write(ESC.SAVE);
-        this.write(ESC.HIDE);
-        let currentRow = startRow;
-        // Clear input area lines
-        for (let r = startRow; r <= rows; r++) {
-            this.write(ESC.TO(r, 1));
-            this.write(ESC.CLEAR_LINE);
-        }
-        // Status bar (shows streaming status or idle hint)
-        this.write(ESC.TO(currentRow, 1));
-        this.write(this.buildStatusBar(cols));
-        currentRow++;
-        // Model info line (if set)
-        if (this.modelInfo) {
-            this.write(ESC.TO(currentRow, 1));
-            let modelLine = `${DIM}${this.modelInfo}${R}`;
-            if (this.contextUsage !== null) {
-                const rem = Math.max(0, 100 - this.contextUsage);
-                if (rem < 10)
-                    modelLine += ` ${UI_COLORS.red}⚠ ctx: ${rem}%${R}`;
-                else if (rem < 25)
-                    modelLine += ` ${UI_COLORS.yellow}! ctx: ${rem}%${R}`;
-                else
-                    modelLine += ` ${DIM}· ctx: ${rem}%${R}`;
-            }
-            this.write(modelLine);
-            currentRow++;
-        }
-        // Top divider
-        this.write(ESC.TO(currentRow, 1));
-        this.write(divider);
-        currentRow++;
-        // Input line with prompt and buffer content
-        const { lines, cursorCol } = this.wrapBuffer(cols - 4);
-        const displayLine = lines[0] ?? '';
-        const inputRow = currentRow;
-        this.write(ESC.TO(currentRow, 1));
-        this.write(ESC.BG_DARK + ESC.DIM + this.config.promptChar + ESC.RESET);
-        this.write(ESC.BG_DARK + displayLine);
-        const padding = Math.max(0, cols - this.config.promptChar.length - displayLine.length - 1);
-        if (padding > 0)
-            this.write(' '.repeat(padding));
-        this.write(ESC.RESET);
-        currentRow++;
-        // Bottom divider
-        this.write(ESC.TO(currentRow, 1));
-        this.write(divider);
-        currentRow++;
-        // Mode controls
-        this.write(ESC.TO(currentRow, 1));
-        this.write(this.buildModeControls(cols));
-        // Track position
-        this.inputAreaStartRow = startRow;
-        this.flowModeRenderedLines = currentRow - startRow + 1;
-        // Restore cursor position (back to scroll region if streaming)
-        this.write(ESC.RESTORE);
-        this.write(ESC.SHOW);
-        // Update tracking
-        this.lastRenderContent = this.buffer;
-        this.lastRenderCursor = this.cursor;
-    }
-    /**
-     * Render floating input area below current content.
-     * This is "bottom floating" - follows content, not pinned to terminal bottom.
-     * Uses absolute positioning to prevent duplicates.
-     */
-    renderFloatingInputArea() {
-        const { rows, cols } = this.getSize();
-        const divider = '─'.repeat(cols - 1);
-        const { dim: DIM, reset: R } = UI_COLORS;
-        // Calculate lines needed for input area
-        const linesNeeded = 5 + (this.modelInfo ? 1 : 0);
-        // FIRST: Clear any previously rendered input area
-        this.clearInputArea();
-        // Hide cursor during render
-        this.write(ESC.HIDE);
-        // Calculate where to render: after current content
-        // Use contentEndRow if set, otherwise estimate from terminal bottom
-        let startRow;
-        if (this.contentEndRow > 0) {
-            startRow = this.contentEndRow + 1;
-        }
-        else {
-            // Render near bottom, leaving space for input area
-            startRow = Math.max(1, rows - linesNeeded);
-        }
-        // Ensure we don't go past terminal bounds
-        startRow = Math.min(startRow, rows - linesNeeded + 1);
-        startRow = Math.max(1, startRow);
-        // Track this position
-        this.inputAreaStartRow = startRow;
-        let currentRow = startRow;
-        // Status bar
-        this.write(ESC.TO(currentRow, 1));
-        this.write(this.buildStatusBar(cols));
-        currentRow++;
-        // Model info line (if set)
-        if (this.modelInfo) {
-            this.write(ESC.TO(currentRow, 1));
-            let modelLine = `${DIM}${this.modelInfo}${R}`;
-            if (this.contextUsage !== null) {
-                const rem = Math.max(0, 100 - this.contextUsage);
-                if (rem < 10)
-                    modelLine += ` ${UI_COLORS.red}⚠ ctx: ${rem}%${R}`;
-                else if (rem < 25)
-                    modelLine += ` ${UI_COLORS.yellow}! ctx: ${rem}%${R}`;
-                else
-                    modelLine += ` ${DIM}· ctx: ${rem}%${R}`;
-            }
-            this.write(modelLine);
-            currentRow++;
-        }
-        // Top divider
-        this.write(ESC.TO(currentRow, 1));
-        this.write(divider);
-        currentRow++;
-        // Input line with prompt and buffer content
-        const { lines, cursorCol } = this.wrapBuffer(cols - 4);
-        const displayLine = lines[0] ?? '';
-        const inputRow = currentRow;
-        this.write(ESC.TO(currentRow, 1));
-        this.write(ESC.BG_DARK + ESC.DIM + this.config.promptChar + ESC.RESET);
-        this.write(ESC.BG_DARK + displayLine);
-        const padding = Math.max(0, cols - this.config.promptChar.length - displayLine.length - 1);
-        if (padding > 0)
-            this.write(' '.repeat(padding));
-        this.write(ESC.RESET);
-        currentRow++;
-        // Bottom divider
-        this.write(ESC.TO(currentRow, 1));
-        this.write(divider);
-        currentRow++;
-        // Mode controls
-        this.write(ESC.TO(currentRow, 1));
-        this.write(this.buildModeControls(cols));
-        // Track lines rendered
-        this.flowModeRenderedLines = currentRow - startRow + 1;
-        // Position cursor in input line for typing
-        this.write(ESC.TO(inputRow, this.config.promptChar.length + 1 + cursorCol));
-        // Show cursor
-        this.write(ESC.SHOW);
-        // Update tracking
-        this.lastRenderContent = this.buffer;
-        this.lastRenderCursor = this.cursor;
-    }
     /**
      * Set the input mode
      *
-     * Floating input mode - input area follows content, not pinned to bottom.
+     * Content flows naturally - no scroll region pinning.
      */
     setMode(mode) {
         const prevMode = this.mode;
         this.mode = mode;
         if (mode === 'streaming' && prevMode !== 'streaming') {
-            // Track streaming start time for elapsed display
-            this.streamingStartTime = Date.now();
-            // Ensure unified UI is initialized
-            if (!this.unifiedUIInitialized) {
-                this.initializeUnifiedUI();
-            }
-            // Clear any floating input area first
-            this.clearInputArea();
-            this.resetInputAreaTracking();
-            // Enable scroll region - content scrolls above, input protected at bottom
-            this.enableScrollRegion();
-            // Render input at bottom (protected by scroll region)
-            this.renderInputAreaAtBottom();
-            // Position cursor in scroll region for content
-            const { rows } = this.getSize();
-            const linesNeeded = 6 + (this.modelInfo ? 1 : 0);
-            this.write(ESC.TO(Math.max(1, rows - linesNeeded), 1));
+            this.resetStreamingRenderThrottle();
             this.renderDirty = true;
+            this.render();
         }
         else if (mode !== 'streaming' && prevMode === 'streaming') {
-            // Stop streaming render timer (if any)
-            if (this.streamingRenderTimer) {
-                clearInterval(this.streamingRenderTimer);
-                this.streamingRenderTimer = null;
-            }
-            // Reset streaming time
-            this.streamingStartTime = null;
-            // Disable scroll region
-            this.disableScrollRegion();
-            // Clear bottom input area
-            this.clearInputArea();
-            this.resetInputAreaTracking();
-            // Render input area floating below content
-            writeLock.withLock(() => {
-                this.renderFloatingInputArea();
-            }, 'terminalInput.streamingEnd');
-        }
-    }
-    /**
-     * Enable or disable flow mode.
-     * In flow mode, the input renders immediately after content (wherever cursor is).
-     * When disabled, input renders at the absolute bottom of terminal.
-     */
-    setFlowMode(enabled) {
-        if (this.flowMode === enabled)
-            return;
-        this.flowMode = enabled;
-        this.renderDirty = true;
-        this.scheduleRender();
-    }
-    /**
-     * Check if flow mode is enabled.
-     */
-    isFlowMode() {
-        return this.flowMode;
-    }
-    /**
-     * Set the row where content ends (for idle mode positioning).
-     * Input area will render starting from this row + 1.
-     */
-    setContentEndRow(row) {
-        this.contentEndRow = Math.max(0, row);
-        this.renderDirty = true;
-        this.scheduleRender();
-    }
-    /**
-     * Set available slash commands for auto-complete suggestions.
-     */
-    setCommands(commands) {
-        this.commandSuggestions = commands;
-        this.updateSuggestions();
-    }
-    /**
-     * Update filtered suggestions based on current input.
-     */
-    updateSuggestions() {
-        const input = this.buffer.trim();
-        // Only show suggestions when input starts with "/"
-        if (!input.startsWith('/')) {
-            this.showSuggestions = false;
-            this.filteredSuggestions = [];
-            this.selectedSuggestionIndex = 0;
-            return;
-        }
-        const query = input.toLowerCase();
-        this.filteredSuggestions = this.commandSuggestions.filter(cmd => cmd.command.toLowerCase().startsWith(query) ||
-            cmd.command.toLowerCase().includes(query.slice(1)));
-        // Show suggestions if we have matches
-        this.showSuggestions = this.filteredSuggestions.length > 0;
-        // Keep selection in bounds
-        if (this.selectedSuggestionIndex >= this.filteredSuggestions.length) {
-            this.selectedSuggestionIndex = Math.max(0, this.filteredSuggestions.length - 1);
-        }
-    }
-    /**
-     * Select next suggestion (arrow down / tab).
-     */
-    selectNextSuggestion() {
-        if (!this.showSuggestions || this.filteredSuggestions.length === 0)
-            return;
-        this.selectedSuggestionIndex = (this.selectedSuggestionIndex + 1) % this.filteredSuggestions.length;
-        this.renderDirty = true;
-        this.scheduleRender();
-    }
-    /**
-     * Select previous suggestion (arrow up / shift+tab).
-     */
-    selectPrevSuggestion() {
-        if (!this.showSuggestions || this.filteredSuggestions.length === 0)
-            return;
-        this.selectedSuggestionIndex = this.selectedSuggestionIndex === 0
-            ? this.filteredSuggestions.length - 1
-            : this.selectedSuggestionIndex - 1;
-        this.renderDirty = true;
-        this.scheduleRender();
-    }
-    /**
-     * Accept current suggestion and insert into buffer.
-     */
-    acceptSuggestion() {
-        if (!this.showSuggestions || this.filteredSuggestions.length === 0)
-            return false;
-        const selected = this.filteredSuggestions[this.selectedSuggestionIndex];
-        if (!selected)
-            return false;
-        // Replace buffer with selected command
-        this.buffer = selected.command + ' ';
-        this.cursor = this.buffer.length;
-        this.showSuggestions = false;
-        this.renderDirty = true;
-        this.scheduleRender();
-        return true;
-    }
-    /**
-     * Check if suggestions are visible.
-     */
-    areSuggestionsVisible() {
-        return this.showSuggestions && this.filteredSuggestions.length > 0;
-    }
-    /**
-     * Update token count for metrics display
-     */
-    setTokensUsed(tokens) {
-        this.tokensUsed = tokens;
-    }
-    /**
-     * Toggle thinking/reasoning mode
-     */
-    toggleThinking() {
-        this.thinkingEnabled = !this.thinkingEnabled;
-        this.emit('thinkingToggle', this.thinkingEnabled);
-        this.scheduleRender();
-    }
-    /**
-     * Get thinking enabled state
-     */
-    isThinkingEnabled() {
-        return this.thinkingEnabled;
-    }
-    /**
-     * Keep the top N rows pinned (used for the launch banner tracking).
-     * Note: No longer uses scroll regions - inline rendering only.
-     */
-    setPinnedHeaderLines(count) {
-        this.pinnedTopRows = count;
-    }
-    /**
-     * Anchor prompt rendering near a specific row (inline layout). Pass null to
-     * restore the default bottom-aligned layout.
-     */
-    setInlineAnchor(row) {
-        if (row === null || row === undefined) {
-            this.inlineAnchorRow = null;
-            this.inlineLayout = false;
-            this.renderDirty = true;
-            this.render();
-            return;
+            // Streaming ended - render the input area
+            this.resetStreamingRenderThrottle();
+            this.forceRender();
         }
-        const { rows } = this.getSize();
-        const clamped = Math.max(1, Math.min(Math.floor(row), rows));
-        this.inlineAnchorRow = clamped;
-        this.inlineLayout = true;
-        this.renderDirty = true;
-        this.render();
     }
     /**
-     * Provide a dynamic anchor callback. When set, the prompt will follow the
-     * output by re-evaluating the anchor before each render.
+     * Legacy method - no longer used (content flows naturally).
+     * @deprecated Use setContentRow instead
      */
-    setInlineAnchorProvider(provider) {
-        this.anchorProvider = provider;
-        if (!provider) {
-            this.inlineLayout = false;
-            this.inlineAnchorRow = null;
-            this.renderDirty = true;
-            this.render();
-            return;
-        }
-        this.inlineLayout = true;
-        this.renderDirty = true;
-        this.render();
+    setPinnedHeaderLines(_count) {
+        // No-op: scroll region pinning removed
     }
     /**
      * Get current mode
@@ -683,17 +249,14 @@ export class TerminalInput extends EventEmitter {
     }
     /**
      * Clear the buffer
-     * @param skipRender - If true, don't trigger a re-render (used during submit flow)
      */
-    clear(skipRender = false) {
+    clear() {
         this.buffer = '';
         this.cursor = 0;
         this.historyIndex = -1;
         this.tempInput = '';
         this.pastePlaceholders = [];
-        if (!skipRender) {
-            this.scheduleRender();
-        }
+        this.scheduleRender();
     }
     /**
      * Get queued inputs
@@ -764,6 +327,37 @@ export class TerminalInput extends EventEmitter {
         this.streamingLabel = next;
         this.scheduleRender();
     }
+    /**
+     * Surface meta status just above the divider (e.g., elapsed time or token usage).
+     */
+    setMetaStatus(meta) {
+        const nextElapsed = typeof meta.elapsedSeconds === 'number' && Number.isFinite(meta.elapsedSeconds) && meta.elapsedSeconds >= 0
+            ? Math.floor(meta.elapsedSeconds)
+            : null;
+        const nextTokens = typeof meta.tokensUsed === 'number' && Number.isFinite(meta.tokensUsed) && meta.tokensUsed >= 0
+            ? Math.floor(meta.tokensUsed)
+            : null;
+        const nextLimit = typeof meta.tokenLimit === 'number' && Number.isFinite(meta.tokenLimit) && meta.tokenLimit > 0
+            ? Math.floor(meta.tokenLimit)
+            : null;
+        const nextThinking = typeof meta.thinkingMs === 'number' && Number.isFinite(meta.thinkingMs) && meta.thinkingMs >= 0
+            ? Math.floor(meta.thinkingMs)
+            : null;
+        const nextThinkingHasContent = !!meta.thinkingHasContent;
+        if (this.metaElapsedSeconds === nextElapsed &&
+            this.metaTokensUsed === nextTokens &&
+            this.metaTokenLimit === nextLimit &&
+            this.metaThinkingMs === nextThinking &&
+            this.metaThinkingHasContent === nextThinkingHasContent) {
+            return;
+        }
+        this.metaElapsedSeconds = nextElapsed;
+        this.metaTokensUsed = nextTokens;
+        this.metaTokenLimit = nextLimit;
+        this.metaThinkingMs = nextThinking;
+        this.metaThinkingHasContent = nextThinkingHasContent;
+        this.scheduleRender();
+    }
     /**
      * Keep mode toggles (verification/auto-continue) visible in the control bar.
      * Hotkey labels remain stable so the bar looks the same before/during streaming.
@@ -773,26 +367,22 @@ export class TerminalInput extends EventEmitter {
         const nextAutoContinue = !!options.autoContinueEnabled;
         const nextVerifyHotkey = options.verificationHotkey ?? this.verificationHotkey;
         const nextAutoHotkey = options.autoContinueHotkey ?? this.autoContinueHotkey;
+        const nextThinkingHotkey = options.thinkingHotkey ?? this.thinkingHotkey;
+        const nextThinkingLabel = options.thinkingModeLabel === undefined ? this.thinkingModeLabel : (options.thinkingModeLabel || null);
         if (this.verificationEnabled === nextVerification &&
             this.autoContinueEnabled === nextAutoContinue &&
             this.verificationHotkey === nextVerifyHotkey &&
-            this.autoContinueHotkey === nextAutoHotkey) {
+            this.autoContinueHotkey === nextAutoHotkey &&
+            this.thinkingHotkey === nextThinkingHotkey &&
+            this.thinkingModeLabel === nextThinkingLabel) {
             return;
         }
         this.verificationEnabled = nextVerification;
         this.autoContinueEnabled = nextAutoContinue;
         this.verificationHotkey = nextVerifyHotkey;
         this.autoContinueHotkey = nextAutoHotkey;
-        this.scheduleRender();
-    }
-    /**
-     * Set the model info string (e.g., "OpenAI · gpt-4")
-     * This is displayed persistently above the input area.
-     */
-    setModelInfo(info) {
-        if (this.modelInfo === info)
-            return;
-        this.modelInfo = info;
+        this.thinkingHotkey = nextThinkingHotkey;
+        this.thinkingModeLabel = nextThinkingLabel;
         this.scheduleRender();
     }
     /**
@@ -805,39 +395,154 @@ export class TerminalInput extends EventEmitter {
         this.scheduleRender();
     }
     /**
-     * Render the input area
+     * Surface model/provider context in the controls bar.
+     */
+    setModelContext(options) {
+        const nextModel = options.model?.trim() || null;
+        const nextProvider = options.provider?.trim() || null;
+        if (this.modelLabel === nextModel && this.providerLabel === nextProvider) {
+            return;
+        }
+        this.modelLabel = nextModel;
+        this.providerLabel = nextProvider;
+        this.scheduleRender();
+    }
+    /**
+     * Render the floating input area at contentRow.
      *
-     * During streaming: renders at terminal bottom (with scroll region)
-     * After streaming: renders floating below content
+     * The chat box "floats" - it renders right below the last streamed content.
+     * As content is added, contentRow advances, and the chat box moves down.
+     * No scroll regions - pure floating behavior.
      */
     render() {
         if (!this.canRender())
             return;
         if (this.isRendering)
             return;
+        const streamingActive = this.mode === 'streaming' || isStreamingMode();
+        // During streaming, throttle re-renders
+        if (streamingActive && this.lastStreamingRender > 0) {
+            const elapsed = Date.now() - this.lastStreamingRender;
+            const waitMs = Math.max(0, this.streamingRenderInterval - elapsed);
+            if (waitMs > 0) {
+                this.renderDirty = true;
+                this.scheduleStreamingRender(waitMs);
+                return;
+            }
+        }
         const shouldSkip = !this.renderDirty &&
             this.buffer === this.lastRenderContent &&
             this.cursor === this.lastRenderCursor;
         this.renderDirty = false;
-        // Skip if nothing changed (unless explicitly forced)
         if (shouldSkip) {
             return;
         }
-        // If write lock is held, defer render
         if (writeLock.isLocked()) {
             writeLock.safeWrite(() => this.render());
             return;
         }
+        this.renderFloatingInputArea();
+    }
+    /**
+     * Core floating input area renderer.
+     * Chat box always floats at contentRow (below streamed content).
+     * This creates "persistent bottom floating" behavior.
+     */
+    renderFloatingInputArea() {
+        const { rows, cols } = this.getSize();
+        const maxWidth = Math.max(8, cols - 4);
+        const streamingActive = this.mode === 'streaming' || isStreamingMode();
+        // Wrap buffer into display lines
+        const { lines, cursorLine, cursorCol } = this.wrapBuffer(maxWidth);
+        const maxVisible = Math.max(1, Math.min(this.config.maxLines, rows - 3));
+        const displayLines = Math.min(lines.length, maxVisible);
+        const metaLines = this.buildMetaLines(cols - 2);
+        // Calculate display window (keep cursor visible)
+        let startLine = 0;
+        if (lines.length > displayLines) {
+            startLine = Math.max(0, cursorLine - displayLines + 1);
+            startLine = Math.min(startLine, lines.length - displayLines);
+        }
+        const visibleLines = lines.slice(startLine, startLine + displayLines);
+        const adjustedCursorLine = cursorLine - startLine;
+        // Chat box height
+        const chatBoxHeight = metaLines.length + 1 + displayLines + 1;
+        // Chat box floats at contentRow - right below the last content
+        // This is "persistent bottom floating" - always at bottom of content
+        const chatBoxStartRow = this.contentRow;
+        writeLock.lock('terminalInput.renderFloating');
         this.isRendering = true;
-        writeLock.lock('terminalInput.render');
         try {
-            if (this.mode === 'streaming' && this.scrollRegionActive) {
-                // During streaming: update input at bottom (protected by scroll region)
-                this.renderInputAreaAtBottom();
+            // Hide cursor during render
+            this.write(ESC.HIDE);
+            this.write(ESC.RESET);
+            // Clear the chat box area
+            for (let i = 0; i < chatBoxHeight; i++) {
+                this.write(ESC.TO(chatBoxStartRow + i, 1));
+                this.write(ESC.CLEAR_LINE);
             }
-            else {
-                // Idle: render floating below content
-                this.renderFloatingInputArea();
+            let currentRow = chatBoxStartRow;
+            // Meta/status header
+            for (const metaLine of metaLines) {
+                this.write(ESC.TO(currentRow, 1));
+                this.write(metaLine);
+                currentRow += 1;
+            }
+            // Separator line
+            this.write(ESC.TO(currentRow, 1));
+            this.write(renderDivider(cols - 2));
+            currentRow += 1;
+            // Render input lines
+            let finalRow = currentRow;
+            let finalCol = 3;
+            for (let i = 0; i < visibleLines.length; i++) {
+                const rowNum = currentRow + i;
+                this.write(ESC.TO(rowNum, 1));
+                const line = visibleLines[i] ?? '';
+                const isFirstLine = (startLine + i) === 0;
+                const isCursorLine = i === adjustedCursorLine;
+                this.write(ESC.BG_DARK);
+                this.write(ESC.DIM);
+                this.write(isFirstLine ? this.config.promptChar : this.config.continuationChar);
+                this.write(ESC.RESET);
+                this.write(ESC.BG_DARK);
+                if (isCursorLine) {
+                    const col = Math.min(cursorCol, line.length);
+                    const before = line.slice(0, col);
+                    const at = col < line.length ? line[col] : ' ';
+                    const after = col < line.length ? line.slice(col + 1) : '';
+                    this.write(before);
+                    this.write(ESC.REVERSE + ESC.BOLD);
+                    this.write(at);
+                    this.write(ESC.RESET + ESC.BG_DARK);
+                    this.write(after);
+                    finalRow = rowNum;
+                    finalCol = this.config.promptChar.length + col + 1;
+                }
+                else {
+                    this.write(line);
+                }
+                // Pad to edge
+                const lineLen = this.config.promptChar.length + line.length + (isCursorLine && cursorCol >= line.length ? 1 : 0);
+                const padding = Math.max(0, cols - lineLen - 1);
+                if (padding > 0)
+                    this.write(' '.repeat(padding));
+                this.write(ESC.RESET);
+            }
+            // Mode controls line
+            const controlRow = currentRow + visibleLines.length;
+            this.write(ESC.TO(controlRow, 1));
+            this.write(this.buildModeControls(cols));
+            // Position cursor in input box
+            this.write(ESC.TO(finalRow, Math.min(finalCol, cols)));
+            this.write(ESC.SHOW);
+            // Update state
+            this.lastRenderContent = this.buffer;
+            this.lastRenderCursor = this.cursor;
+            this.lastStreamingRender = streamingActive ? Date.now() : 0;
+            if (this.streamingRenderTimer) {
+                clearTimeout(this.streamingRenderTimer);
+                this.streamingRenderTimer = null;
             }
         }
         finally {
@@ -846,99 +551,217 @@ export class TerminalInput extends EventEmitter {
         }
     }
     /**
-     * Build status bar showing streaming/ready status and key info.
-     * This is the TOP line above the input area - minimal Claude Code style.
+     * Build one or more compact meta lines above the divider (thinking, status, usage).
+     * During streaming, shows model line pinned above streaming info.
      */
-    buildStatusBar(cols) {
-        const maxWidth = cols - 2;
-        const parts = [];
-        // Streaming status with elapsed time (left side)
-        if (this.mode === 'streaming') {
-            let statusText = '● Streaming';
-            if (this.streamingStartTime) {
-                const elapsed = Math.floor((Date.now() - this.streamingStartTime) / 1000);
-                const mins = Math.floor(elapsed / 60);
-                const secs = elapsed % 60;
-                statusText += mins > 0 ? ` ${mins}m ${secs}s` : ` ${secs}s`;
+    buildMetaLines(width) {
+        const streamingActive = this.mode === 'streaming' || isStreamingMode();
+        const lines = [];
+        // Model line should ALWAYS be shown (pinned above streaming content)
+        if (this.modelLabel) {
+            const modelText = this.providerLabel
+                ? `model ${this.modelLabel} @ ${this.providerLabel}`
+                : `model ${this.modelLabel}`;
+            lines.push(renderStatusLine([{ text: modelText, tone: 'info' }], width));
+        }
+        // During streaming, add a compact status line with essential info
+        if (streamingActive) {
+            const parts = [];
+            // Essential streaming info
+            if (this.metaThinkingMs !== null) {
+                parts.push({ text: formatThinking(this.metaThinkingMs, this.metaThinkingHasContent), tone: 'info' });
             }
-            parts.push(`\x1b[32m${statusText}\x1b[0m`); // Green
+            if (this.metaElapsedSeconds !== null) {
+                parts.push({ text: this.formatElapsedLabel(this.metaElapsedSeconds), tone: 'muted' });
+            }
+            parts.push({ text: 'esc to stop', tone: 'warn' });
+            if (parts.length) {
+                lines.push(renderStatusLine(parts, width));
+            }
+            return lines;
         }
-        // Queue indicator during streaming
-        if (this.mode === 'streaming' && this.queue.length > 0) {
-            parts.push(`\x1b[36mqueued: ${this.queue.length}\x1b[0m`); // Cyan
+        // Non-streaming: show full status info (model line already added above)
+        if (this.metaThinkingMs !== null) {
+            const thinkingText = formatThinking(this.metaThinkingMs, this.metaThinkingHasContent);
+            lines.push(renderStatusLine([{ text: thinkingText, tone: 'info' }], width));
         }
-        // Paste indicator
-        if (this.pastePlaceholders.length > 0) {
-            const totalLines = this.pastePlaceholders.reduce((sum, p) => sum + p.lineCount, 0);
-            parts.push(`\x1b[36m📋 ${totalLines}L\x1b[0m`);
+        const statusParts = [];
+        const statusLabel = this.statusMessage ?? this.streamingLabel;
+        if (statusLabel) {
+            statusParts.push({ text: statusLabel, tone: 'info' });
         }
-        // Override/warning status
-        if (this.overrideStatusMessage) {
-            parts.push(`\x1b[33m⚠ ${this.overrideStatusMessage}\x1b[0m`); // Yellow
+        if (this.metaElapsedSeconds !== null) {
+            statusParts.push({ text: this.formatElapsedLabel(this.metaElapsedSeconds), tone: 'muted' });
         }
-        // If idle with empty buffer, show quick shortcuts
-        if (this.mode !== 'streaming' && this.buffer.length === 0 && parts.length === 0) {
-            return `${ESC.DIM}Type a message or / for commands${ESC.RESET}`;
+        const tokensRemaining = this.computeTokensRemaining();
+        if (tokensRemaining !== null) {
+            statusParts.push({ text: `↓ ${tokensRemaining}`, tone: 'muted' });
         }
-        // Multi-line indicator
-        if (this.buffer.includes('\n')) {
-            parts.push(`${ESC.DIM}${this.buffer.split('\n').length}L${ESC.RESET}`);
+        if (statusParts.length) {
+            lines.push(renderStatusLine(statusParts, width));
+        }
+        const usageParts = [];
+        if (this.metaTokensUsed !== null) {
+            const formattedUsed = this.formatTokenCount(this.metaTokensUsed);
+            const formattedLimit = this.metaTokenLimit ? `/${this.formatTokenCount(this.metaTokenLimit)}` : '';
+            usageParts.push({ text: `tokens ${formattedUsed}${formattedLimit}`, tone: 'muted' });
+        }
+        if (this.contextUsage !== null) {
+            const tone = this.contextUsage >= 75 ? 'warn' : 'muted';
+            const left = Math.max(0, 100 - this.contextUsage);
+            usageParts.push({ text: `context used ${this.contextUsage}% (${left}% left)`, tone });
         }
-        if (parts.length === 0) {
-            return ''; // Empty status bar when idle
+        if (this.queue.length > 0) {
+            usageParts.push({ text: `queued ${this.queue.length}`, tone: 'info' });
         }
-        const joined = parts.join(`${ESC.DIM} · ${ESC.RESET}`);
-        return joined.slice(0, maxWidth);
+        if (usageParts.length) {
+            lines.push(renderStatusLine(usageParts, width));
+        }
+        return lines;
     }
     /**
-     * Build mode controls line showing toggles and context info.
-     * This is the BOTTOM line below the input area - Claude Code style layout with erosolar features.
-     *
-     * Layout: [toggles on left] ... [context info on right]
+     * Build Claude Code style mode controls line.
+     * Combines streaming label + override status + main status for simultaneous display.
      */
     buildModeControls(cols) {
-        const maxWidth = cols - 2;
-        // Use schema-defined colors for consistency
-        const { green: GREEN, yellow: YELLOW, cyan: CYAN, magenta: MAGENTA, red: RED, dim: DIM, reset: R } = UI_COLORS;
-        // Mode toggles with colors (following ModeControlsSchema)
-        const toggles = [];
-        // Edit mode (green=auto, yellow=ask) - per schema.editMode
-        if (this.editMode === 'display-edits') {
-            toggles.push(`${GREEN}⏵⏵ auto-edit${R}`);
+        const width = Math.max(8, cols - 2);
+        const leftParts = [];
+        const rightParts = [];
+        if (this.streamingLabel) {
+            leftParts.push({ text: `◐ ${this.streamingLabel}`, tone: 'info' });
         }
-        else {
-            toggles.push(`${YELLOW}⏸⏸ ask-first${R}`);
-        }
-        // Thinking mode (cyan when on) - per schema.thinkingMode
-        toggles.push(this.thinkingEnabled ? `${CYAN}💭 think${R}` : `${DIM}○ think${R}`);
-        // Verification (green when on) - per schema.verificationMode
-        toggles.push(this.verificationEnabled ? `${GREEN}✓ verify${R}` : `${DIM}○ verify${R}`);
-        // Auto-continue (magenta when on) - per schema.autoContinueMode
-        toggles.push(this.autoContinueEnabled ? `${MAGENTA}↻ auto${R}` : `${DIM}○ auto${R}`);
-        const leftPart = toggles.join(`${DIM} · ${R}`) + `${DIM} (⇧⇥)${R}`;
-        // Context usage with color - per schema.contextUsage thresholds
-        let rightPart = '';
-        if (this.contextUsage !== null) {
-            const rem = Math.max(0, 100 - this.contextUsage);
-            // Thresholds: critical < 10%, warning < 25%
-            if (rem < 10)
-                rightPart = `${RED}⚠ ctx: ${rem}%${R}`;
-            else if (rem < 25)
-                rightPart = `${YELLOW}! ctx: ${rem}%${R}`;
-            else
-                rightPart = `${DIM}ctx: ${rem}%${R}`;
-        }
-        // Calculate visible lengths (strip ANSI)
-        const strip = (s) => s.replace(/\x1b\[[0-9;]*m/g, '');
-        const leftLen = strip(leftPart).length;
-        const rightLen = strip(rightPart).length;
-        if (leftLen + rightLen < maxWidth - 4) {
-            return `${leftPart}${' '.repeat(maxWidth - leftLen - rightLen)}${rightPart}`;
-        }
-        if (rightLen > 0 && leftLen + 8 < maxWidth) {
-            return `${leftPart}    ${rightPart}`;
-        }
-        return leftPart;
+        if (this.overrideStatusMessage) {
+            leftParts.push({ text: `⚠ ${this.overrideStatusMessage}`, tone: 'warn' });
+        }
+        if (this.statusMessage) {
+            leftParts.push({ text: this.statusMessage, tone: this.streamingLabel ? 'muted' : 'info' });
+        }
+        const editHotkey = this.formatHotkey('shift+tab');
+        const editLabel = this.editMode === 'display-edits' ? 'edits: accept' : 'edits: ask';
+        const editTone = this.editMode === 'display-edits' ? 'success' : 'muted';
+        leftParts.push({ text: `${editHotkey} ${editLabel}`, tone: editTone });
+        const verifyHotkey = this.formatHotkey(this.verificationHotkey);
+        const verifyLabel = this.verificationEnabled ? 'verify:on' : 'verify:off';
+        leftParts.push({ text: `${verifyHotkey} ${verifyLabel}`, tone: this.verificationEnabled ? 'success' : 'muted' });
+        const continueHotkey = this.formatHotkey(this.autoContinueHotkey);
+        const continueLabel = this.autoContinueEnabled ? 'auto:on' : 'auto:off';
+        leftParts.push({ text: `${continueHotkey} ${continueLabel}`, tone: this.autoContinueEnabled ? 'info' : 'muted' });
+        if (this.queue.length > 0 && this.mode !== 'streaming') {
+            leftParts.push({ text: `queued ${this.queue.length}`, tone: 'info' });
+        }
+        if (this.buffer.includes('\n')) {
+            const lineCount = this.buffer.split('\n').length;
+            leftParts.push({ text: `${lineCount} lines`, tone: 'muted' });
+        }
+        if (this.pastePlaceholders.length > 0) {
+            const latest = this.pastePlaceholders[this.pastePlaceholders.length - 1];
+            leftParts.push({
+                text: `paste #${latest.id} +${latest.lineCount} lines (⌫ to drop)`,
+                tone: 'info',
+            });
+        }
+        const contextRemaining = this.computeContextRemaining();
+        if (this.thinkingModeLabel) {
+            const thinkingHotkey = this.formatHotkey(this.thinkingHotkey);
+            rightParts.push({ text: `${thinkingHotkey} thinking:${this.thinkingModeLabel}`, tone: 'info' });
+        }
+        // Show model in controls only when NOT streaming (during streaming it's in meta lines)
+        const streamingActive = this.mode === 'streaming' || isStreamingMode();
+        if (this.modelLabel && !streamingActive) {
+            const modelText = this.providerLabel ? `${this.modelLabel} @ ${this.providerLabel}` : this.modelLabel;
+            rightParts.push({ text: modelText, tone: 'muted' });
+        }
+        if (contextRemaining !== null) {
+            const tone = contextRemaining <= 10 ? 'warn' : 'muted';
+            const label = contextRemaining === 0 && this.contextUsage !== null
+                ? 'Context auto-compact imminent'
+                : `Context left until auto-compact: ${contextRemaining}%`;
+            rightParts.push({ text: label, tone });
+        }
+        if (!rightParts.length || width < 60) {
+            const merged = rightParts.length ? [...leftParts, ...rightParts] : leftParts;
+            return renderStatusLine(merged, width);
+        }
+        const leftWidth = Math.max(12, Math.floor(width * 0.6));
+        const rightWidth = Math.max(14, width - leftWidth - 1);
+        const leftText = renderStatusLine(leftParts, leftWidth);
+        const rightText = renderStatusLine(rightParts, rightWidth);
+        const spacing = Math.max(1, width - this.visibleLength(leftText) - this.visibleLength(rightText));
+        return `${leftText}${' '.repeat(spacing)}${rightText}`;
+    }
+    formatHotkey(hotkey) {
+        const normalized = hotkey.trim().toLowerCase();
+        if (!normalized)
+            return hotkey;
+        const parts = normalized.split('+').filter(Boolean);
+        const map = {
+            shift: '⇧',
+            sh: '⇧',
+            alt: '⌥',
+            option: '⌥',
+            opt: '⌥',
+            ctrl: '⌃',
+            control: '⌃',
+            cmd: '⌘',
+            meta: '⌘',
+        };
+        const formatted = parts
+            .map((part) => {
+            const symbol = map[part];
+            if (symbol)
+                return symbol;
+            return part.length === 1 ? part.toUpperCase() : part.toUpperCase();
+        })
+            .join('');
+        return formatted || hotkey;
+    }
+    computeContextRemaining() {
+        if (this.contextUsage === null) {
+            return null;
+        }
+        return Math.max(0, this.contextAutoCompactThreshold - this.contextUsage);
+    }
+    computeTokensRemaining() {
+        if (this.metaTokensUsed === null || this.metaTokenLimit === null) {
+            return null;
+        }
+        const remaining = Math.max(0, this.metaTokenLimit - this.metaTokensUsed);
+        return this.formatTokenCount(remaining);
+    }
+    formatElapsedLabel(seconds) {
+        if (seconds < 60) {
+            return `${seconds}s`;
+        }
+        const mins = Math.floor(seconds / 60);
+        const secs = seconds % 60;
+        return secs > 0 ? `${mins}m ${secs}s` : `${mins}m`;
+    }
+    formatTokenCount(value) {
+        if (!Number.isFinite(value)) {
+            return `${value}`;
+        }
+        if (value >= 1_000_000) {
+            return `${(value / 1_000_000).toFixed(1)}M`;
+        }
+        if (value >= 1_000) {
+            return `${(value / 1_000).toFixed(1)}k`;
+        }
+        return `${Math.round(value)}`;
+    }
+    visibleLength(value) {
+        const ansiPattern = /\u001B\[[0-?]*[ -/]*[@-~]/g;
+        return value.replace(ansiPattern, '').length;
+    }
+    /**
+     * Debug-only snapshot used by tests to assert rendered strings without
+     * needing a TTY. Not used by production code.
+     */
+    getDebugUiSnapshot(width) {
+        const cols = Math.max(8, width ?? this.getSize().cols);
+        return {
+            meta: this.buildMetaLines(cols - 2),
+            controls: this.buildModeControls(cols),
+        };
     }
     /**
      * Force a re-render
@@ -961,17 +784,12 @@ export class TerminalInput extends EventEmitter {
     handleResize() {
         this.lastRenderContent = '';
         this.lastRenderCursor = -1;
-        // Re-clamp pinned header rows to the new terminal height
-        this.setPinnedHeaderLines(this.pinnedTopRows);
+        this.resetStreamingRenderThrottle();
         this.scheduleRender();
     }
     /**
      * Register with display's output interceptor to position cursor correctly.
-     * When scroll region is active, output needs to go to the scroll region,
-     * not the protected bottom area where the input is rendered.
-     *
-     * NOTE: With scroll region properly set, content naturally stays within
-     * the region boundaries - no cursor manipulation needed per-write.
+     * Output is written at contentRow, which advances as content is written.
      */
     registerOutputInterceptor(display) {
         if (this.outputInterceptorCleanup) {
@@ -979,25 +797,78 @@ export class TerminalInput extends EventEmitter {
         }
         this.outputInterceptorCleanup = display.registerOutputInterceptor({
             beforeWrite: () => {
-                // Scroll region handles content containment automatically
-                // No per-write cursor manipulation needed
+                // During streaming: clear chat box and position cursor at contentRow
+                // This allows content to be written where the chat box was
+                const metaLines = this.buildMetaLines(this.getSize().cols - 2);
+                const chatBoxHeight = metaLines.length + 1 + 2 + 1; // meta + divider + 1 line input + controls
+                // Clear the chat box area so content can be written there
+                for (let i = 0; i < chatBoxHeight; i++) {
+                    this.write(ESC.TO(this.contentRow + i, 1));
+                    this.write(ESC.CLEAR_LINE);
+                }
+                // Position cursor at contentRow for writing new content
+                this.write(ESC.TO(this.contentRow, 1));
             },
-            afterWrite: () => {
-                // No cursor manipulation needed
+            afterWrite: (content) => {
+                // Advance contentRow by number of newlines in the content
+                const newlines = content ? (content.match(/\n/g) || []).length : 0;
+                this.contentRow += newlines;
+                // Schedule re-render to show chat box at new position (below new content)
+                this.scheduleRender();
             },
         });
     }
+    /**
+     * Write content above the floating chat box.
+     * Clears the chat box, writes content at contentRow, advances contentRow, re-renders chat box.
+     */
+    writeToScrollRegion(content) {
+        if (!content)
+            return;
+        // Get chat box dimensions for clearing
+        const { cols } = this.getSize();
+        const metaLines = this.buildMetaLines(cols - 2);
+        const chatBoxHeight = metaLines.length + 1 + 1 + 1 + 2; // meta + divider + input + controls + buffer
+        // Clear the current chat box area (it will re-render at new position)
+        for (let i = 0; i < chatBoxHeight; i++) {
+            this.write(ESC.TO(this.contentRow + i, 1));
+            this.write(ESC.CLEAR_LINE);
+        }
+        // Write content at contentRow
+        this.write(ESC.TO(this.contentRow, 1));
+        this.write(content);
+        // Advance contentRow by number of newlines
+        const newlines = (content.match(/\n/g) || []).length;
+        this.contentRow += newlines;
+        // Re-render chat box at new position (below the content just written)
+        this.forceRender();
+    }
+    /**
+     * Reset content position to row 1.
+     * Does NOT clear the terminal - content starts from current position.
+     */
+    resetContentPosition() {
+        this.contentRow = 1;
+    }
+    /**
+     * Set the content row explicitly (used after banner is written).
+     * This tells the input where content should start flowing from.
+     */
+    setContentRow(row) {
+        this.contentRow = Math.max(1, row);
+    }
+    /**
+     * Get the current content row position.
+     */
+    getContentRow() {
+        return this.contentRow;
+    }
     /**
      * Dispose and clean up
      */
     dispose() {
         if (this.disposed)
             return;
-        // Clean up streaming render timer
-        if (this.streamingRenderTimer) {
-            clearInterval(this.streamingRenderTimer);
-            this.streamingRenderTimer = null;
-        }
         // Clean up output interceptor
         if (this.outputInterceptorCleanup) {
             this.outputInterceptorCleanup();
@@ -1005,6 +876,7 @@ export class TerminalInput extends EventEmitter {
         }
         this.disposed = true;
         this.enabled = false;
+        this.resetStreamingRenderThrottle();
         this.disableBracketedPaste();
         this.buffer = '';
         this.queue = [];
@@ -1109,22 +981,7 @@ export class TerminalInput extends EventEmitter {
                     this.toggleEditMode();
                     return true;
                 }
-                // Tab: toggle paste expansion if in placeholder, otherwise toggle thinking
-                if (this.findPlaceholderAt(this.cursor)) {
-                    this.togglePasteExpansion();
-                }
-                else {
-                    this.toggleThinking();
-                }
-                return true;
-            case 'escape':
-                // Esc: interrupt if streaming, otherwise clear buffer
-                if (this.mode === 'streaming') {
-                    this.emit('interrupt');
-                }
-                else if (this.buffer.length > 0) {
-                    this.clear();
-                }
+                this.insertText('  ');
                 return true;
         }
         return false;
@@ -1142,7 +999,6 @@ export class TerminalInput extends EventEmitter {
         this.insertPlainText(chunk, insertPos);
         this.cursor = insertPos + chunk.length;
         this.emit('change', this.buffer);
-        this.updateSuggestions();
         this.scheduleRender();
     }
     insertNewline() {
@@ -1167,7 +1023,6 @@ export class TerminalInput extends EventEmitter {
             this.cursor = Math.max(0, this.cursor - 1);
         }
         this.emit('change', this.buffer);
-        this.updateSuggestions();
         this.scheduleRender();
     }
     deleteForward() {
@@ -1395,13 +1250,12 @@ export class TerminalInput extends EventEmitter {
                 timestamp: Date.now(),
             });
             this.emit('queue', text);
-            this.clear(); // Clear immediately for queued input, re-render to update queue display
+            this.clear(); // Clear immediately for queued input
         }
         else {
-            // In idle mode, clear the input WITHOUT rendering.
-            // The caller will display the user message and start streaming.
-            // We'll render the input area again after streaming ends.
-            this.clear(true); // Skip render - streaming will handle display
+            // In idle mode, clear the input first, then emit submit.
+            // The prompt will be logged as a visible message by the caller.
+            this.clear();
             this.emit('submit', text);
         }
     }
@@ -1418,7 +1272,9 @@ export class TerminalInput extends EventEmitter {
         if (available <= 0)
             return;
         const chunk = clean.slice(0, available);
-        if (isMultilinePaste(chunk)) {
+        const isMultiline = isMultilinePaste(chunk);
+        const isShortMultiline = isMultiline && this.shouldInlineMultiline(chunk);
+        if (isMultiline && !isShortMultiline) {
             this.insertPastePlaceholder(chunk);
         }
         else {
@@ -1554,17 +1410,19 @@ export class TerminalInput extends EventEmitter {
         this.shiftPlaceholders(position, text.length);
         this.buffer = this.buffer.slice(0, position) + text + this.buffer.slice(position);
     }
+    shouldInlineMultiline(content) {
+        const lines = content.split('\n').length;
+        const maxInlineLines = 4;
+        const maxInlineChars = 240;
+        return lines <= maxInlineLines && content.length <= maxInlineChars;
+    }
     findPlaceholderAt(position) {
         return this.pastePlaceholders.find((ph) => position >= ph.start && position < ph.end) ?? null;
     }
-    buildPlaceholder(summary) {
+    buildPlaceholder(lineCount) {
         const id = ++this.pasteCounter;
-        const lang = summary.language ? ` ${summary.language.toUpperCase()}` : '';
-        // Show first line preview (truncated)
-        const preview = summary.preview.length > 30
-            ? `${summary.preview.slice(0, 30)}...`
-            : summary.preview;
-        const placeholder = `[📋 #${id}${lang} ${summary.lineCount}L] "${preview}"`;
+        const plural = lineCount === 1 ? '' : 's';
+        const placeholder = `[Pasted text #${id} +${lineCount} line${plural}]`;
         return { id, placeholder };
     }
     insertPastePlaceholder(content) {
@@ -1572,67 +1430,21 @@ export class TerminalInput extends EventEmitter {
         if (available <= 0)
             return;
         const cleanContent = content.slice(0, available);
-        const summary = generatePasteSummary(cleanContent);
-        // For short pastes (< 5 lines), show full content instead of placeholder
-        if (summary.lineCount < 5) {
-            const placeholder = this.findPlaceholderAt(this.cursor);
-            const insertPos = placeholder && this.cursor > placeholder.start ? placeholder.end : this.cursor;
-            this.insertPlainText(cleanContent, insertPos);
-            this.cursor = insertPos + cleanContent.length;
-            return;
-        }
-        const { id, placeholder } = this.buildPlaceholder(summary);
+        const lineCount = cleanContent.split('\n').length;
+        const { id, placeholder } = this.buildPlaceholder(lineCount);
         const insertPos = this.cursor;
         this.shiftPlaceholders(insertPos, placeholder.length);
         this.pastePlaceholders.push({
             id,
             content: cleanContent,
-            lineCount: summary.lineCount,
+            lineCount,
             placeholder,
             start: insertPos,
             end: insertPos + placeholder.length,
-            summary,
-            expanded: false,
         });
         this.buffer = this.buffer.slice(0, insertPos) + placeholder + this.buffer.slice(insertPos);
         this.cursor = insertPos + placeholder.length;
     }
-    /**
-     * Toggle expansion of a paste placeholder at the current cursor position.
-     * When expanded, shows first 3 and last 2 lines of the content.
-     */
-    togglePasteExpansion() {
-        const placeholder = this.findPlaceholderAt(this.cursor);
-        if (!placeholder)
-            return false;
-        placeholder.expanded = !placeholder.expanded;
-        // Update the placeholder text in buffer
-        const newPlaceholder = placeholder.expanded
-            ? this.buildExpandedPlaceholder(placeholder)
-            : this.buildPlaceholder(placeholder.summary).placeholder;
-        const lengthDiff = newPlaceholder.length - placeholder.placeholder.length;
-        // Update buffer
-        this.buffer =
-            this.buffer.slice(0, placeholder.start) +
-                newPlaceholder +
-                this.buffer.slice(placeholder.end);
-        // Update placeholder tracking
-        placeholder.placeholder = newPlaceholder;
-        placeholder.end = placeholder.start + newPlaceholder.length;
-        // Shift other placeholders
-        this.shiftPlaceholders(placeholder.end, lengthDiff, placeholder.id);
-        this.scheduleRender();
-        return true;
-    }
-    buildExpandedPlaceholder(ph) {
-        const lines = ph.content.split('\n');
-        const firstLines = lines.slice(0, 3).map(l => l.slice(0, 60)).join('\n');
-        const lastLines = lines.length > 5
-            ? '\n...\n' + lines.slice(-2).map(l => l.slice(0, 60)).join('\n')
-            : '';
-        const lang = ph.summary.language ? ` ${ph.summary.language.toUpperCase()}` : '';
-        return `[📋 #${ph.id}${lang} ${ph.lineCount}L ▼]\n${firstLines}${lastLines}\n[/📋 #${ph.id}]`;
-    }
     deletePlaceholder(placeholder) {
         const length = placeholder.end - placeholder.start;
         this.buffer = this.buffer.slice(0, placeholder.start) + this.buffer.slice(placeholder.end);
@@ -1640,7 +1452,11 @@ export class TerminalInput extends EventEmitter {
         this.shiftPlaceholders(placeholder.end, -length, placeholder.id);
         this.cursor = placeholder.start;
     }
-    updateContextUsage(value) {
+    updateContextUsage(value, autoCompactThreshold) {
+        if (typeof autoCompactThreshold === 'number' && Number.isFinite(autoCompactThreshold)) {
+            const boundedThreshold = Math.max(1, Math.min(100, Math.round(autoCompactThreshold)));
+            this.contextAutoCompactThreshold = boundedThreshold;
+        }
         if (value === null || !Number.isFinite(value)) {
             this.contextUsage = null;
         }
@@ -1667,6 +1483,22 @@ export class TerminalInput extends EventEmitter {
         const next = this.editMode === 'display-edits' ? 'ask-permission' : 'display-edits';
         this.setEditMode(next);
     }
+    scheduleStreamingRender(delayMs) {
+        if (this.streamingRenderTimer)
+            return;
+        const wait = Math.max(16, delayMs);
+        this.streamingRenderTimer = setTimeout(() => {
+            this.streamingRenderTimer = null;
+            this.render();
+        }, wait);
+    }
+    resetStreamingRenderThrottle() {
+        if (this.streamingRenderTimer) {
+            clearTimeout(this.streamingRenderTimer);
+            this.streamingRenderTimer = null;
+        }
+        this.lastStreamingRender = 0;
+    }
     scheduleRender() {
         if (!this.canRender())
             return;