erosolar-cli 1.7.339 → 1.7.341

package/dist/shell/terminalInput.js

@@ -3,20 +3,15 @@
  *
  * Design principles:
  * - Single source of truth for input state
- * - Hybrid floating/scroll approach:
- *   - Initially: chat box floats below content
- *   - When terminal fills: scroll region activates, chat box pins to bottom
  * - 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 } from '../core/multilinePasteHandler.js';
+import { isMultilinePaste, generatePasteSummary } from '../core/multilinePasteHandler.js';
 import { writeLock } from '../ui/writeLock.js';
-import { renderDivider, renderStatusLine } from '../ui/unified/layout.js';
-import { isStreamingMode } from '../ui/globalWriteLock.js';
-import { formatThinking } from '../ui/toolDisplay.js';
+import { UI_COLORS, DEFAULT_UI_CONFIG, } from '../ui/terminalUISchema.js';
 // ANSI escape codes
 const ESC = {
     // Cursor control
@@ -26,18 +21,14 @@ 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',
+    ALT_SCREEN_ENTER: '\x1b[?1049h', // Enter alternate screen buffer
+    ALT_SCREEN_EXIT: '\x1b[?1049l', // Exit alternate screen buffer
     // Line control
     CLEAR_LINE: '\x1b[2K',
     CLEAR_TO_END: '\x1b[0J',
-    // Screen control
-    HOME: '\x1b[H',
-    CLEAR_SCREEN: '\x1b[2J',
-    // Alternate screen buffer (like vim/tmux)
-    ENTER_ALT_SCREEN: '\x1b[?1049h',
-    EXIT_ALT_SCREEN: '\x1b[?1049l',
-    // Scroll region
-    SET_SCROLL: (top, bottom) => `\x1b[${top};${bottom}r`,
-    RESET_SCROLL: '\x1b[r',
     // Style
     RESET: '\x1b[0m',
     DIM: '\x1b[2m',
@@ -77,46 +68,49 @@ 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;
+    flowModeRenderedLines = 0; // Track lines rendered for clearing
+    inputAreaStartRow = 0; // Track absolute row position of input area
+    contentEndRow = 0; // Row where content ends (chat box renders below this)
+    // Command suggestions (Claude Code style auto-complete)
+    commandSuggestions = [];
+    filteredSuggestions = [];
+    selectedSuggestionIndex = 0;
+    showSuggestions = false;
     // Lifecycle
     disposed = false;
     enabled = true;
     contextUsage = null;
-    contextAutoCompactThreshold = 90;
-    // Track current content row (starts at top, moves down)
-    contentRow = 1;
-    // Track if scroll region is currently active
-    scrollRegionActive = false;
-    thinkingModeLabel = null;
     editMode = 'display-edits';
     verificationEnabled = true;
     autoContinueEnabled = false;
     verificationHotkey = 'alt+v';
     autoContinueHotkey = 'alt+c';
-    thinkingHotkey = '/thinking';
-    modelLabel = null;
-    providerLabel = null;
-    // Streaming render throttle
-    lastStreamingRender = 0;
-    streamingRenderInterval = 250; // ms between renders during streaming
+    // Output interceptor cleanup
+    outputInterceptorCleanup;
+    // Metrics tracking for status bar
+    streamingStartTime = null;
+    thinkingEnabled = true;
+    modelInfo = null; // Provider · Model info
+    // Streaming input area render timer (updates elapsed time display)
     streamingRenderTimer = null;
+    // Reference to display module for getting line counts during streaming
+    displayRef = 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 ?? 1000,
-            maxLength: config.maxLength ?? 10000,
+            maxLines: config.maxLines ?? DEFAULT_UI_CONFIG.inputArea.maxLines,
+            maxLength: config.maxLength ?? DEFAULT_UI_CONFIG.inputArea.maxLength,
             maxQueueSize: config.maxQueueSize ?? 100,
-            promptChar: config.promptChar ?? '> ',
-            continuationChar: config.continuationChar ?? '│ ',
+            promptChar: config.promptChar ?? DEFAULT_UI_CONFIG.inputArea.promptChar,
+            continuationChar: config.continuationChar ?? DEFAULT_UI_CONFIG.inputArea.continuationChar,
         };
     }
     // ===========================================================================
@@ -195,36 +189,306 @@ 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 with BOTTOM PINNED chat box.
+     *
+     * Layout:
+     * 1. Clear screen
+     * 2. Write banner at top
+     * 3. Set content cursor row after banner
+     * 4. Render chat box at bottom (sets up scroll region)
+     */
+    initializeUnifiedUI() {
+        if (this.unifiedUIInitialized) {
+            return;
+        }
+        // Enter alternate screen buffer for complete terminal control
+        this.write(ESC.ALT_SCREEN_ENTER);
+        // Hide cursor during setup
+        this.write(ESC.HIDE);
+        // Clear screen and go home (in alternate buffer)
+        this.write(ESC.HOME);
+        this.write(ESC.CLEAR_SCREEN);
+        // Write banner at top
+        let bannerLines = 0;
+        if (this.bannerContent) {
+            const lines = this.bannerContent.split('\n');
+            bannerLines = lines.length + 2; // +2 for trailing \n\n
+            process.stdout.write(this.bannerContent + '\n\n');
+        }
+        // Set content cursor row after banner
+        this.contentCursorRow = bannerLines > 0 ? bannerLines + 1 : 1;
+        // Content ends at same row initially (no content yet)
+        this.contentEndRow = this.contentCursorRow - 1;
+        // Mark initialized
+        this.unifiedUIInitialized = true;
+        // Render floating chat box below content
+        this.renderFloatingInputArea();
+    }
+    /**
+     * 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;
+    }
+    /**
+     * Render chat box - FLOATING below content (no scroll regions).
+     * Chat box appears right after content and moves down as content grows.
+     * Content and banner scroll naturally off the top of the screen.
+     */
+    renderFloatingInputArea() {
+        const { cols } = this.getSize();
+        const divider = '─'.repeat(cols);
+        const { dim: DIM, reset: R } = UI_COLORS;
+        // Chat box is 4 lines: divider + input + divider + controls
+        const chatBoxHeight = 4;
+        // Chat box starts right after content
+        const chatBoxStartRow = this.contentEndRow + 1;
+        // Save cursor position before rendering
+        this.write('\x1b7');
+        // Hide cursor during render
+        this.write(ESC.HIDE);
+        // Track position
+        this.inputAreaStartRow = chatBoxStartRow;
+        let currentRow = chatBoxStartRow;
+        // Helper to write a line at absolute position (clears then writes)
+        const writeLine = (content) => {
+            this.write(ESC.TO(currentRow, 1));
+            this.write(ESC.CLEAR_LINE);
+            this.write(content);
+            currentRow++;
+        };
+        // Top divider
+        writeLine(`${DIM}${divider}${R}`);
+        // Input line with > prompt
+        const { lines, cursorCol } = this.wrapBuffer(cols - 3);
+        const displayLine = lines[0] ?? '';
+        const inputRow = currentRow;
+        writeLine(`${DIM}>${R} ${displayLine}`);
+        // Bottom divider
+        writeLine(`${DIM}${divider}${R}`);
+        // Mode controls line - Claude Code style
+        this.write(ESC.TO(currentRow, 1));
+        this.write(ESC.CLEAR_LINE);
+        this.write(this.buildClaudeStyleControls(cols));
+        // Track lines rendered
+        this.flowModeRenderedLines = chatBoxHeight;
+        // Restore cursor position (back to where content was being written)
+        // During streaming, this keeps cursor in content area
+        // During idle, cursor was in input area anyway
+        this.write('\x1b8');
+        // Show cursor
+        this.write(ESC.SHOW);
+        // Update tracking
+        this.lastRenderContent = this.buffer;
+        this.lastRenderCursor = this.cursor;
+    }
+    /**
+     * Build Claude Code style controls line.
+     * Shows: edit mode indicator (shift+tab to cycle)
+     */
+    buildClaudeStyleControls(cols) {
+        const { dim: DIM, green: GREEN, yellow: YELLOW, cyan: CYAN, reset: R } = UI_COLORS;
+        // Edit mode indicator
+        let editModeText;
+        if (this.editMode === 'display-edits') {
+            editModeText = `${GREEN}⏵⏵${R} accept edits on`;
+        }
+        else {
+            editModeText = `${YELLOW}⏸⏸${R} ask before edit`;
+        }
+        // Build controls line
+        const parts = [`  ${editModeText} ${DIM}(shift+tab to cycle)${R}`];
+        // Add thinking mode if enabled
+        if (this.thinkingEnabled) {
+            parts.push(`${CYAN}💭${R}`);
+        }
+        // Add context usage if available
+        if (this.contextUsage !== null) {
+            const rem = Math.max(0, 100 - this.contextUsage);
+            if (rem < 10) {
+                parts.push(`${UI_COLORS.red}ctx ${rem}%${R}`);
+            }
+            else if (rem < 25) {
+                parts.push(`${YELLOW}ctx ${rem}%${R}`);
+            }
+        }
+        return parts.join(` ${DIM}·${R} `);
+    }
     /**
      * Set the input mode
      *
-     * Content flows naturally - no scroll region pinning.
+     * BOTTOM PINNED with SSE: Chat box stays at terminal bottom.
+     * Scroll region protects chat box, content scrolls above it.
      */
     setMode(mode) {
         const prevMode = this.mode;
         this.mode = mode;
         if (mode === 'streaming' && prevMode !== 'streaming') {
-            this.resetStreamingRenderThrottle();
+            // Track streaming start time for elapsed display
+            this.streamingStartTime = Date.now();
+            // Ensure unified UI is initialized
+            if (!this.unifiedUIInitialized) {
+                this.initializeUnifiedUI();
+            }
+            // Start periodic render timer to keep chat box updated during streaming
+            // This updates contentEndRow from display and re-renders chat box
+            if (!this.streamingRenderTimer) {
+                this.streamingRenderTimer = setInterval(() => {
+                    // Update contentEndRow from display's line count
+                    if (this.displayRef?.getTotalWrittenLines) {
+                        this.contentEndRow = this.displayRef.getTotalWrittenLines();
+                    }
+                    // Re-render chat box at updated position
+                    this.renderFloatingInputArea();
+                }, 100); // Update every 100ms
+            }
+            // Initial render
             this.renderDirty = true;
-            this.render();
+            this.scheduleRender();
         }
         else if (mode !== 'streaming' && prevMode === 'streaming') {
-            // Streaming ended - render the input area
-            this.resetStreamingRenderThrottle();
-            this.forceRender();
+            // Stop streaming render timer
+            if (this.streamingRenderTimer) {
+                clearInterval(this.streamingRenderTimer);
+                this.streamingRenderTimer = null;
+            }
+            // Reset streaming time
+            this.streamingStartTime = null;
+            // Final render with accurate position
+            this.renderDirty = true;
+            this.scheduleRender();
         }
     }
     /**
-     * Legacy method - no longer used (content flows naturally).
-     * @deprecated Use setContentRow instead
+     * 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.
      */
-    setPinnedHeaderLines(_count) {
-        // No-op: scroll region pinning removed
+    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;
+    }
+    /**
+     * Toggle thinking/reasoning mode
+     */
+    toggleThinking() {
+        this.thinkingEnabled = !this.thinkingEnabled;
+        this.emit('thinkingToggle', this.thinkingEnabled);
+        this.scheduleRender();
+    }
+    /**
+     * Get thinking enabled state
+     */
+    isThinkingEnabled() {
+        return this.thinkingEnabled;
     }
     /**
      * Get current mode
@@ -257,14 +521,17 @@ export class TerminalInput extends EventEmitter {
     }
     /**
      * Clear the buffer
+     * @param skipRender - If true, don't trigger a re-render (used during submit flow)
      */
-    clear() {
+    clear(skipRender = false) {
         this.buffer = '';
         this.cursor = 0;
         this.historyIndex = -1;
         this.tempInput = '';
         this.pastePlaceholders = [];
-        this.scheduleRender();
+        if (!skipRender) {
+            this.scheduleRender();
+        }
     }
     /**
      * Get queued inputs
@@ -335,37 +602,6 @@ 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.
@@ -375,22 +611,26 @@ 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.thinkingHotkey === nextThinkingHotkey &&
-            this.thinkingModeLabel === nextThinkingLabel) {
+            this.autoContinueHotkey === nextAutoHotkey) {
             return;
         }
         this.verificationEnabled = nextVerification;
         this.autoContinueEnabled = nextAutoContinue;
         this.verificationHotkey = nextVerifyHotkey;
         this.autoContinueHotkey = nextAutoHotkey;
-        this.thinkingHotkey = nextThinkingHotkey;
-        this.thinkingModeLabel = nextThinkingLabel;
+        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.scheduleRender();
     }
     /**
@@ -403,171 +643,33 @@ export class TerminalInput extends EventEmitter {
         this.scheduleRender();
     }
     /**
-     * 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.
-     *
-     * 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 the input area.
+     * During streaming: renders at terminal bottom (with scroll region)
+     * After streaming: renders floating below content
      */
     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.renderPinnedChatBox();
-    }
-    /**
-     * Unified scroll region renderer.
-     * Chat box is ALWAYS pinned at the bottom of the terminal.
-     * Content scrolls in the region above the chat box.
-     */
-    renderPinnedChatBox() {
-        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 = this.getChatBoxHeight();
-        // ALWAYS pin chat box at absolute bottom
-        const chatBoxStartRow = Math.max(1, rows - chatBoxHeight + 1);
-        const scrollEnd = chatBoxStartRow - 1;
-        writeLock.lock('terminalInput.renderPinned');
         this.isRendering = true;
+        writeLock.lock('terminalInput.render');
         try {
-            this.write(ESC.SAVE);
-            this.write(ESC.HIDE);
-            // Temporarily reset scroll region to write chat box cleanly
-            if (this.scrollRegionActive) {
-                this.write(ESC.RESET_SCROLL);
-            }
-            // Clear the chat box area
-            for (let i = 0; i < chatBoxHeight; i++) {
-                const row = chatBoxStartRow + i;
-                if (row <= rows) {
-                    this.write(ESC.TO(row, 1));
-                    this.write(ESC.CLEAR_LINE);
-                }
-            }
-            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 with all keyboard shortcuts
-            const controlRow = currentRow + visibleLines.length;
-            this.write(ESC.TO(controlRow, 1));
-            this.write(this.buildModeControls(cols));
-            // Restore scroll region and cursor
-            if (this.scrollRegionActive) {
-                // Restore scroll region
-                this.write(ESC.SET_SCROLL(1, scrollEnd));
-                // Restore cursor to where it was before rendering (preserves column position)
-                this.write(ESC.RESTORE);
-            }
-            else {
-                // Not streaming - position cursor in input box
-                this.write(ESC.RESTORE);
-                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;
-            }
+            // Always render floating right after content (no wasted space)
+            this.renderFloatingInputArea();
         }
         finally {
             writeLock.unlock();
@@ -575,198 +677,99 @@ export class TerminalInput extends EventEmitter {
         }
     }
     /**
-     * Build compact meta line above the divider.
-     * Shows model/provider and key metrics in a single line.
-     * Status message is shown in mode controls to avoid duplication.
+     * Build status bar showing streaming/ready status and key info.
+     * This is the TOP line above the input area - minimal Claude Code style.
      */
-    buildMetaLines(width) {
+    buildStatusBar(cols) {
+        const maxWidth = cols - 2;
         const parts = [];
-        // Model/provider info
-        if (this.modelLabel) {
-            const modelText = this.providerLabel
-                ? `${this.modelLabel} @ ${this.providerLabel}`
-                : this.modelLabel;
-            parts.push({ text: modelText, tone: 'info' });
-        }
-        // Elapsed time
-        if (this.metaElapsedSeconds !== null) {
-            parts.push({ text: this.formatElapsedLabel(this.metaElapsedSeconds), tone: 'muted' });
-        }
-        // Token usage (compact)
-        if (this.metaTokensUsed !== null) {
-            const formattedUsed = this.formatTokenCount(this.metaTokensUsed);
-            const formattedLimit = this.metaTokenLimit ? `/${this.formatTokenCount(this.metaTokenLimit)}` : '';
-            parts.push({ text: `${formattedUsed}${formattedLimit}`, tone: 'muted' });
-        }
-        // Context remaining (only show if concerning)
-        const tokensRemaining = this.computeTokensRemaining();
-        if (tokensRemaining !== null) {
-            parts.push({ text: `↓${tokensRemaining}`, tone: 'muted' });
-        }
-        // Thinking indicator
-        if (this.metaThinkingMs !== null) {
-            parts.push({ text: formatThinking(this.metaThinkingMs, this.metaThinkingHasContent), tone: 'info' });
-        }
-        if (!parts.length) {
-            return [];
-        }
-        return [renderStatusLine(parts, width)];
-    }
-    /**
-     * Build mode controls line with all keyboard shortcuts.
-     * Shows status, all toggles, and contextual information.
-     */
-    buildModeControls(cols) {
-        const width = Math.max(8, cols - 2);
-        const leftParts = [];
-        const rightParts = [];
-        // Streaming indicator
-        if (this.streamingLabel) {
-            leftParts.push({ text: `◐ ${this.streamingLabel}`, tone: 'info' });
-        }
-        // Override status (warnings, errors)
-        if (this.overrideStatusMessage) {
-            leftParts.push({ text: `⚠ ${this.overrideStatusMessage}`, tone: 'warn' });
-        }
-        // Main status message
-        if (this.statusMessage) {
-            leftParts.push({ text: this.statusMessage, tone: this.streamingLabel ? 'muted' : 'info' });
-        }
-        // === KEYBOARD SHORTCUTS ===
-        // Interrupt shortcut (during streaming)
-        if (this.mode === 'streaming' || this.scrollRegionActive) {
-            leftParts.push({ text: `${this.formatHotkey('esc')} stop`, tone: 'warn' });
-        }
-        // Edit mode toggle (Shift+Tab)
-        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 });
-        // Verification toggle (Alt+V)
-        const verifyHotkey = this.formatHotkey(this.verificationHotkey || 'alt+v');
-        const verifyLabel = this.verificationEnabled ? 'verify:on' : 'verify:off';
-        leftParts.push({ text: `${verifyHotkey} ${verifyLabel}`, tone: this.verificationEnabled ? 'success' : 'muted' });
-        // Auto-continue toggle (Alt+C)
-        const continueHotkey = this.formatHotkey(this.autoContinueHotkey || 'alt+c');
-        const continueLabel = this.autoContinueEnabled ? 'auto:on' : 'auto:off';
-        leftParts.push({ text: `${continueHotkey} ${continueLabel}`, tone: this.autoContinueEnabled ? 'info' : 'muted' });
-        // Thinking mode toggle (if available)
-        if (this.thinkingModeLabel) {
-            const thinkingHotkey = this.formatHotkey(this.thinkingHotkey || 'alt+t');
-            rightParts.push({ text: `${thinkingHotkey} think:${this.thinkingModeLabel}`, tone: 'info' });
-        }
-        // === CONTEXTUAL INFO ===
-        // Queued commands
-        if (this.queue.length > 0 && this.mode !== 'streaming') {
-            leftParts.push({ text: `queued:${this.queue.length}`, tone: 'info' });
+        // 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`;
+            }
+            parts.push(`\x1b[32m${statusText}\x1b[0m`); // Green
         }
-        // Multi-line indicator
-        if (this.buffer.includes('\n')) {
-            const lineCount = this.buffer.split('\n').length;
-            rightParts.push({ text: `${lineCount}L`, tone: 'muted' });
+        // Queue indicator during streaming
+        if (this.mode === 'streaming' && this.queue.length > 0) {
+            parts.push(`\x1b[36mqueued: ${this.queue.length}\x1b[0m`); // Cyan
         }
         // Paste indicator
         if (this.pastePlaceholders.length > 0) {
-            const latest = this.pastePlaceholders[this.pastePlaceholders.length - 1];
-            rightParts.push({
-                text: `paste#${latest.id} +${latest.lineCount}L ${this.formatHotkey('backspace')}drop`,
-                tone: 'info',
-            });
-        }
-        // Context remaining warning
-        const contextRemaining = this.computeContextRemaining();
-        if (contextRemaining !== null) {
-            const tone = contextRemaining <= 10 ? 'warn' : 'muted';
-            const label = contextRemaining === 0 && this.contextUsage !== null
-                ? 'compact imminent'
-                : `ctx:${contextRemaining}%`;
-            rightParts.push({ text: label, tone });
-        }
-        // Render: left-aligned shortcuts, right-aligned context info
-        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.65));
-        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 totalLines = this.pastePlaceholders.reduce((sum, p) => sum + p.lineCount, 0);
+            parts.push(`\x1b[36m📋 ${totalLines}L\x1b[0m`);
         }
-        const remaining = Math.max(0, this.metaTokenLimit - this.metaTokensUsed);
-        return this.formatTokenCount(remaining);
-    }
-    formatElapsedLabel(seconds) {
-        if (seconds < 60) {
-            return `${seconds}s`;
+        // Override/warning status
+        if (this.overrideStatusMessage) {
+            parts.push(`\x1b[33m⚠ ${this.overrideStatusMessage}\x1b[0m`); // Yellow
         }
-        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 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}`;
         }
-        if (value >= 1_000_000) {
-            return `${(value / 1_000_000).toFixed(1)}M`;
+        // Multi-line indicator
+        if (this.buffer.includes('\n')) {
+            parts.push(`${ESC.DIM}${this.buffer.split('\n').length}L${ESC.RESET}`);
         }
-        if (value >= 1_000) {
-            return `${(value / 1_000).toFixed(1)}k`;
+        if (parts.length === 0) {
+            return ''; // Empty status bar when idle
         }
-        return `${Math.round(value)}`;
-    }
-    visibleLength(value) {
-        const ansiPattern = /\u001B\[[0-?]*[ -/]*[@-~]/g;
-        return value.replace(ansiPattern, '').length;
+        const joined = parts.join(`${ESC.DIM} · ${ESC.RESET}`);
+        return joined.slice(0, maxWidth);
     }
     /**
-     * Debug-only snapshot used by tests to assert rendered strings without
-     * needing a TTY. Not used by production code.
+     * 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]
      */
-    getDebugUiSnapshot(width) {
-        const cols = Math.max(8, width ?? this.getSize().cols);
-        return {
-            meta: this.buildMetaLines(cols - 2),
-            controls: this.buildModeControls(cols),
-        };
+    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}`);
+        }
+        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;
     }
     /**
      * Force a re-render
@@ -789,189 +792,31 @@ export class TerminalInput extends EventEmitter {
     handleResize() {
         this.lastRenderContent = '';
         this.lastRenderCursor = -1;
-        this.resetStreamingRenderThrottle();
         this.scheduleRender();
     }
+    // Track current content row for writing
+    contentCursorRow = 1;
     /**
-     * Enter streaming mode with scroll region.
-     * Sets up terminal scroll region to exclude chat box.
-     */
-    enterStreamingScrollRegion() {
-        const { rows } = this.getSize();
-        const chatBoxHeight = this.getChatBoxHeight();
-        const scrollEnd = Math.max(1, rows - chatBoxHeight);
-        writeLock.lock('enterStreamingScrollRegion');
-        try {
-            // Set scroll region for content area (above chat box)
-            this.write(ESC.SET_SCROLL(1, scrollEnd));
-            // Position cursor at current content row
-            this.write(ESC.TO(Math.min(this.contentRow, scrollEnd), 1));
-            this.scrollRegionActive = true;
-            this.setStatusMessage('esc to interrupt');
-        }
-        finally {
-            writeLock.unlock();
-        }
-        // Render pinned chat box at bottom
-        this.forceRender();
-    }
-    /**
-     * Exit streaming mode and restore normal operation.
+     * Register with display's output interceptor.
+     * Clears chat box before writes, re-renders after with updated position.
      */
-    exitStreamingScrollRegion() {
-        writeLock.lock('exitStreamingScrollRegion');
-        try {
-            // Reset scroll region to full terminal
-            this.write(ESC.RESET_SCROLL);
-            this.scrollRegionActive = false;
-            this.setStatusMessage('Ready for prompts');
-        }
-        finally {
-            writeLock.unlock();
-        }
-        // Final render
-        this.forceRender();
-    }
-    /**
-     * Render chat box at bottom - now uses unified renderer.
-     * @deprecated Use renderPinnedChatBox() directly via render()/forceRender()
-     */
-    renderChatBoxAtBottom() {
-        this.renderPinnedChatBox();
-    }
-    /**
-     * Stream content within the scroll region.
-     * Content is written directly and scrolls naturally.
-     */
-    streamContent(content) {
-        if (!content)
-            return;
-        writeLock.lock('streamContent');
-        try {
-            // Write content - scroll region handles scrolling
-            this.write(content);
-            // Track newlines
-            const newlines = (content.match(/\n/g) || []).length;
-            this.contentRow += newlines;
-        }
-        finally {
-            writeLock.unlock();
-        }
-        // Throttle chat box updates during streaming
-        this.scheduleStreamingRender(200);
-    }
-    /**
-     * Enable scroll region (no-op in floating mode).
-     */
-    enableScrollRegion() {
-        // No-op: using pure floating approach
-    }
-    /**
-     * Disable scroll region (no-op in floating mode).
-     */
-    disableScrollRegion() {
-        // No-op: using pure floating approach
-    }
-    /**
-     * Calculate chat box height.
-     */
-    getChatBoxHeight() {
-        return 6; // Fixed: meta + divider + input + controls + buffer
-    }
-    /**
-     * @deprecated Use streamContent() instead
-     * Register with display's output interceptor - kept for backwards compatibility
-     */
-    registerOutputInterceptor(_display) {
-        // No-op: Use streamContent() for cleaner floating chat box behavior
-    }
-    /**
-     * Write content above the floating chat box.
-     * Works both during streaming and when idle.
-     */
-    writeToScrollRegion(content) {
-        if (!content)
-            return;
-        writeLock.lock('writeToScrollRegion');
-        try {
-            // Position cursor at content row and write
-            this.write(ESC.TO(this.contentRow, 1));
-            this.write(content);
-            // Track newlines
-            const newlines = (content.match(/\n/g) || []).length;
-            this.contentRow += newlines;
-        }
-        finally {
-            writeLock.unlock();
-        }
-        // Re-render chat box below new content (only when not streaming)
-        if (!this.scrollRegionActive) {
-            this.forceRender();
-        }
-    }
-    /**
-     * Enter alternate screen buffer and clear it.
-     * This gives us full control over the terminal without affecting user's history.
-     */
-    enterAlternateScreen() {
-        writeLock.lock('enterAltScreen');
-        try {
-            this.write(ESC.ENTER_ALT_SCREEN);
-            this.write(ESC.HOME);
-            this.write(ESC.CLEAR_SCREEN);
-            this.contentRow = 1;
-        }
-        finally {
-            writeLock.unlock();
-        }
-    }
-    /**
-     * Exit alternate screen buffer.
-     * Restores the user's previous terminal content.
-     */
-    exitAlternateScreen() {
-        writeLock.lock('exitAltScreen');
-        try {
-            this.write(ESC.EXIT_ALT_SCREEN);
-        }
-        finally {
-            writeLock.unlock();
-        }
-    }
-    /**
-     * Clear the entire terminal screen and reset content position.
-     * This removes all content including the launching command.
-     */
-    clearScreen() {
-        writeLock.lock('clearScreen');
-        try {
-            this.write(ESC.HOME);
-            this.write(ESC.CLEAR_SCREEN);
-            this.contentRow = 1;
-        }
-        finally {
-            writeLock.unlock();
-        }
-    }
-    /**
-     * 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;
+    registerOutputInterceptor(display) {
+        if (this.outputInterceptorCleanup) {
+            this.outputInterceptorCleanup();
+        }
+        // Store display reference for streaming timer to use
+        this.displayRef = display;
+        // Clear chat box before writes to make room for content
+        // Re-render is done via periodic timer during streaming, or setContentEndRow after
+        this.outputInterceptorCleanup = display.registerOutputInterceptor({
+            beforeWrite: () => {
+                // Clear chat box to make room for content
+                this.clearInputArea();
+            },
+            afterWrite: () => {
+                // Render is handled by streaming timer or setContentEndRow
+            },
+        });
     }
     /**
      * Dispose and clean up
@@ -979,10 +824,24 @@ export class TerminalInput extends EventEmitter {
     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();
+            this.outputInterceptorCleanup = undefined;
+        }
+        // Reset scroll region
+        this.write('\x1b[r');
+        // Exit alternate screen buffer (restores main terminal)
+        if (this.unifiedUIInitialized) {
+            this.write(ESC.ALT_SCREEN_EXIT);
+        }
         this.disposed = true;
         this.enabled = false;
-        this.disableScrollRegion();
-        this.resetStreamingRenderThrottle();
         this.disableBracketedPaste();
         this.buffer = '';
         this.queue = [];
@@ -1087,7 +946,22 @@ export class TerminalInput extends EventEmitter {
                     this.toggleEditMode();
                     return true;
                 }
-                this.insertText('  ');
+                // 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();
+                }
                 return true;
         }
         return false;
@@ -1105,6 +979,7 @@ export class TerminalInput extends EventEmitter {
         this.insertPlainText(chunk, insertPos);
         this.cursor = insertPos + chunk.length;
         this.emit('change', this.buffer);
+        this.updateSuggestions();
         this.scheduleRender();
     }
     insertNewline() {
@@ -1129,6 +1004,7 @@ export class TerminalInput extends EventEmitter {
             this.cursor = Math.max(0, this.cursor - 1);
         }
         this.emit('change', this.buffer);
+        this.updateSuggestions();
         this.scheduleRender();
     }
     deleteForward() {
@@ -1356,12 +1232,13 @@ export class TerminalInput extends EventEmitter {
                 timestamp: Date.now(),
             });
             this.emit('queue', text);
-            this.clear(); // Clear immediately for queued input
+            this.clear(); // Clear immediately for queued input, re-render to update queue display
         }
         else {
-            // In idle mode, clear the input first, then emit submit.
-            // The prompt will be logged as a visible message by the caller.
-            this.clear();
+            // 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
             this.emit('submit', text);
         }
     }
@@ -1378,9 +1255,7 @@ export class TerminalInput extends EventEmitter {
         if (available <= 0)
             return;
         const chunk = clean.slice(0, available);
-        const isMultiline = isMultilinePaste(chunk);
-        const isShortMultiline = isMultiline && this.shouldInlineMultiline(chunk);
-        if (isMultiline && !isShortMultiline) {
+        if (isMultilinePaste(chunk)) {
             this.insertPastePlaceholder(chunk);
         }
         else {
@@ -1516,19 +1391,17 @@ 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(lineCount) {
+    buildPlaceholder(summary) {
         const id = ++this.pasteCounter;
-        const plural = lineCount === 1 ? '' : 's';
-        const placeholder = `[Pasted text #${id} +${lineCount} line${plural}]`;
+        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}"`;
         return { id, placeholder };
     }
     insertPastePlaceholder(content) {
@@ -1536,21 +1409,67 @@ export class TerminalInput extends EventEmitter {
         if (available <= 0)
             return;
         const cleanContent = content.slice(0, available);
-        const lineCount = cleanContent.split('\n').length;
-        const { id, placeholder } = this.buildPlaceholder(lineCount);
+        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 insertPos = this.cursor;
         this.shiftPlaceholders(insertPos, placeholder.length);
         this.pastePlaceholders.push({
             id,
             content: cleanContent,
-            lineCount,
+            lineCount: summary.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);
@@ -1558,11 +1477,7 @@ export class TerminalInput extends EventEmitter {
         this.shiftPlaceholders(placeholder.end, -length, placeholder.id);
         this.cursor = placeholder.start;
     }
-    updateContextUsage(value, autoCompactThreshold) {
-        if (typeof autoCompactThreshold === 'number' && Number.isFinite(autoCompactThreshold)) {
-            const boundedThreshold = Math.max(1, Math.min(100, Math.round(autoCompactThreshold)));
-            this.contextAutoCompactThreshold = boundedThreshold;
-        }
+    updateContextUsage(value) {
         if (value === null || !Number.isFinite(value)) {
             this.contextUsage = null;
         }
@@ -1589,28 +1504,6 @@ 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;
-            // During streaming, only update chat box (not full render)
-            if (this.scrollRegionActive) {
-                this.renderChatBoxAtBottom();
-            }
-            else {
-                this.render();
-            }
-        }, wait);
-    }
-    resetStreamingRenderThrottle() {
-        if (this.streamingRenderTimer) {
-            clearTimeout(this.streamingRenderTimer);
-            this.streamingRenderTimer = null;
-        }
-        this.lastStreamingRender = 0;
-    }
     scheduleRender() {
         if (!this.canRender())
             return;