erosolar-cli 1.7.281 → 1.7.282

package/dist/shell/streamingOutputManager.js

@@ -0,0 +1,225 @@
+/**
+ * StreamingOutputManager - Buffered output for Claude Code style UI
+ *
+ * Key design principle:
+ * - Buffer streaming output instead of writing directly to stdout
+ * - This keeps the cursor at the prompt area (no cursor movement during streaming)
+ * - Render complete response when streaming ends
+ * - The UI (prompt) stays fixed at the bottom
+ *
+ * Two modes:
+ * 1. Direct mode (bufferedMode=false): Write chunks directly to stdout (original behavior)
+ * 2. Buffered mode (bufferedMode=true): Collect chunks, render when complete
+ */
+import { EventEmitter } from 'node:events';
+import { writeLock } from '../ui/writeLock.js';
+/**
+ * Manages streaming output with optional buffering.
+ *
+ * Buffered mode:
+ * - Chunks are collected in a buffer
+ * - Output is rendered all at once when streaming ends
+ * - Cursor stays at prompt area (no jumping during streaming)
+ *
+ * Direct mode:
+ * - Chunks written directly to stdout (original behavior)
+ * - Cursor moves with output
+ */
+export class StreamingOutputManager extends EventEmitter {
+    state = {
+        isStreaming: false,
+        charsWritten: 0,
+        linesWritten: 0,
+        startTime: null,
+    };
+    writeStream;
+    lastChunk = '';
+    // Buffered mode support
+    bufferedMode = false;
+    outputBuffer = [];
+    constructor(writeStream = process.stdout) {
+        super();
+        this.writeStream = writeStream;
+    }
+    /**
+     * Enable or disable buffered mode
+     * When buffered, chunks are collected and rendered at the end
+     */
+    setBufferedMode(enabled) {
+        this.bufferedMode = enabled;
+    }
+    /**
+     * Check if buffered mode is enabled
+     */
+    isBufferedMode() {
+        return this.bufferedMode;
+    }
+    /**
+     * Get the buffered content (for rendering)
+     */
+    getBuffer() {
+        return this.outputBuffer.join('');
+    }
+    /**
+     * Clear the buffer
+     */
+    clearBuffer() {
+        this.outputBuffer = [];
+    }
+    /**
+     * Check if currently streaming output
+     */
+    isStreaming() {
+        return this.state.isStreaming;
+    }
+    /**
+     * Begin a streaming session
+     * Resets counters and marks streaming as active
+     * In buffered mode, clears the buffer
+     */
+    startStream() {
+        if (this.state.isStreaming) {
+            return; // Already streaming
+        }
+        this.state = {
+            isStreaming: true,
+            charsWritten: 0,
+            linesWritten: 0,
+            startTime: Date.now(),
+        };
+        this.lastChunk = '';
+        this.outputBuffer = [];
+        this.emit('stream-start');
+    }
+    /**
+     * Write a chunk of content
+     *
+     * In buffered mode: Collect in buffer (cursor stays at prompt)
+     * In direct mode: Write to stdout immediately
+     */
+    writeChunk(chunk) {
+        if (!chunk) {
+            return;
+        }
+        // Track statistics
+        this.state.charsWritten += chunk.length;
+        this.state.linesWritten += this.countNewlines(chunk);
+        this.lastChunk = chunk;
+        if (this.bufferedMode) {
+            // Buffered mode: collect chunks, don't write yet
+            this.outputBuffer.push(chunk);
+        }
+        else {
+            // Direct mode: write immediately
+            this.writeLocked(chunk);
+        }
+        this.emit('stream-chunk', chunk);
+    }
+    /**
+     * Write a complete line (adds newline)
+     */
+    writeLine(line = '') {
+        this.writeChunk(`${line}\n`);
+    }
+    /**
+     * End the streaming session
+     * In buffered mode: Renders the complete buffered output
+     * Returns statistics about what was streamed
+     */
+    endStream() {
+        const stats = {
+            duration: this.state.startTime ? Date.now() - this.state.startTime : 0,
+            chars: this.state.charsWritten,
+            lines: this.state.linesWritten,
+            buffer: undefined,
+        };
+        if (this.bufferedMode) {
+            // In buffered mode, render the collected output now
+            const bufferedContent = this.outputBuffer.join('');
+            stats.buffer = bufferedContent;
+            if (bufferedContent) {
+                this.writeLocked(bufferedContent);
+                // Ensure we end with a newline
+                if (!bufferedContent.endsWith('\n')) {
+                    this.writeLocked('\n');
+                    stats.lines += 1;
+                }
+            }
+            this.outputBuffer = [];
+        }
+        else {
+            // Direct mode: just ensure newline
+            if (this.lastChunk && !this.lastChunk.endsWith('\n')) {
+                this.writeLocked('\n');
+                stats.lines += 1;
+            }
+        }
+        this.state = {
+            isStreaming: false,
+            charsWritten: 0,
+            linesWritten: 0,
+            startTime: null,
+        };
+        this.lastChunk = '';
+        this.emit('stream-end', stats);
+        return stats;
+    }
+    /**
+     * Get current streaming statistics
+     */
+    getStats() {
+        return {
+            chars: this.state.charsWritten,
+            lines: this.state.linesWritten,
+            elapsed: this.state.startTime ? Date.now() - this.state.startTime : 0,
+        };
+    }
+    /**
+     * Force a flush (for buffered output)
+     */
+    flush() {
+        // Cork/uncork pattern for optimal buffering
+        if (typeof this.writeStream.cork === 'function') {
+            this.writeStream.cork();
+            process.nextTick(() => {
+                if (typeof this.writeStream.uncork === 'function') {
+                    this.writeStream.uncork();
+                }
+            });
+        }
+    }
+    countNewlines(text) {
+        let count = 0;
+        for (const char of text) {
+            if (char === '\n') {
+                count += 1;
+            }
+        }
+        return count;
+    }
+    writeLocked(chunk) {
+        // If lock is already held, write directly - we're in a protected context
+        // This prevents queuing issues where content gets delayed during streaming
+        if (writeLock.isLocked()) {
+            this.writeStream.write(chunk);
+            return;
+        }
+        writeLock.withLock(() => {
+            this.writeStream.write(chunk);
+        }, 'streamingOutputManager.write');
+    }
+}
+/**
+ * Singleton instance for global use
+ */
+let globalInstance = null;
+export function getStreamingOutputManager() {
+    if (!globalInstance) {
+        globalInstance = new StreamingOutputManager();
+    }
+    return globalInstance;
+}
+export function resetStreamingOutputManager() {
+    globalInstance = null;
+}
+//# sourceMappingURL=streamingOutputManager.js.map

package/dist/shell/streamingOutputManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"streamingOutputManager.js","sourceRoot":"","sources":["../../src/shell/streamingOutputManager.ts"],"names":[],"mappings":"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"}

package/dist/shell/systemPrompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"systemPrompt.d.ts","sourceRoot":"","sources":["../../src/shell/systemPrompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAE/D,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,sBAAsB,EAAE,EAC/B,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CA2DR"}
+{"version":3,"file":"systemPrompt.d.ts","sourceRoot":"","sources":["../../src/shell/systemPrompt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAG/D,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EACpB,KAAK,EAAE,sBAAsB,EAAE,EAC/B,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,CA6DR"}

package/dist/shell/systemPrompt.js

@@ -1,7 +1,9 @@
+import { getMemoryForPrompt } from '../core/memorySystem.js';
 export function buildInteractiveSystemPrompt(basePrompt, profileLabel, tools, workspaceDir) {
     const name = profileLabel || 'Active Agent';
     const toolSummary = formatToolSummary(tools, { maxDescriptionLength: 80 });
     const workspace = workspaceDir || process.cwd();
+    const memoryContent = getMemoryForPrompt(workspace);
     const identityBlock = `
 CRITICAL IDENTITY: You ARE ${name}, an autonomous coding agent running INSIDE the erosolar-cli tool.
 You have FULL ACCESS to the workspace at: ${workspace}
@@ -51,7 +53,8 @@ ${capabilityLines.join('\n')}
 BEHAVIOR GUIDELINES:
 ${behaviorSection}
 
-Remember: answer truthfully, ground everything in the workspace, and let the logs show what you actually did. You CAN modify this codebase.`;
+Remember: answer truthfully, ground everything in the workspace, and let the logs show what you actually did. You CAN modify this codebase.
+${memoryContent}`;
 }
 function formatToolSummary(tools, options = {}) {
     if (!tools.length) {

package/dist/shell/systemPrompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"systemPrompt.js","sourceRoot":"","sources":["../../src/shell/systemPrompt.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,4BAA4B,CAC1C,UAAkB,EAClB,YAAoB,EACpB,KAA+B,EAC/B,YAAqB;IAErB,MAAM,IAAI,GAAG,YAAY,IAAI,cAAc,CAAC;IAC5C,MAAM,WAAW,GAAG,iBAAiB,CAAC,KAAK,EAAE,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,YAAY,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAEhD,MAAM,aAAa,GAAG;6BACK,IAAI;4CACW,SAAS;;;CAGpD,CAAC;IAEA,MAAM,eAAe,GAAG;QACtB,sCAAsC;QACtC,mDAAmD;QACnD,sEAAsE;QACtE,qCAAqC;QACrC,kDAAkD;QAClD,uDAAuD;KACxD,CAAC;IAEF,MAAM,kBAAkB,GAAG;QACzB,oVAAoV;QACpV,iHAAiH;QACjH,0EAA0E;QAC1E,6DAA6D;QAC7D,+CAA+C;QAC/C,6KAA6K;QAC7K,wLAAwL;QACxL,gIAAgI;QAChI,mIAAmI;QACnI,oIAAoI;QACpI,0RAA0R;QAC1R,qVAAqV;QACrV,0OAA0O;QAC1O,oNAAoN;QACpN,8NAA8N;QAC9N,wLAAwL;QACxL,oMAAoM;KACrM,CAAC;IAEF,MAAM,eAAe,GAAG,kBAAkB;SACvC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;SAC7C,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO,GAAG,UAAU;EACpB,aAAa;UACL,IAAI;;;EAGZ,WAAW;;;EAGX,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;;;EAG1B,eAAe;;4IAE2H,CAAC;AAC7I,CAAC;AAMD,SAAS,iBAAiB,CAAC,KAA+B,EAAE,UAA8B,EAAE;IAC1F,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAClB,OAAO,6CAA6C,CAAC;IACvD,CAAC;IACD,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC;QACzG,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACpE,OAAO,KAAK,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;IACtC,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAa;IACvC,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,SAAkB;IACjD,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;IAC9C,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC;AACtD,CAAC"}
+{"version":3,"file":"systemPrompt.js","sourceRoot":"","sources":["../../src/shell/systemPrompt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,UAAU,4BAA4B,CAC1C,UAAkB,EAClB,YAAoB,EACpB,KAA+B,EAC/B,YAAqB;IAErB,MAAM,IAAI,GAAG,YAAY,IAAI,cAAc,CAAC;IAC5C,MAAM,WAAW,GAAG,iBAAiB,CAAC,KAAK,EAAE,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAAC,CAAC;IAC3E,MAAM,SAAS,GAAG,YAAY,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAChD,MAAM,aAAa,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG;6BACK,IAAI;4CACW,SAAS;;;CAGpD,CAAC;IAEA,MAAM,eAAe,GAAG;QACtB,sCAAsC;QACtC,mDAAmD;QACnD,sEAAsE;QACtE,qCAAqC;QACrC,kDAAkD;QAClD,uDAAuD;KACxD,CAAC;IAEF,MAAM,kBAAkB,GAAG;QACzB,oVAAoV;QACpV,iHAAiH;QACjH,0EAA0E;QAC1E,6DAA6D;QAC7D,+CAA+C;QAC/C,6KAA6K;QAC7K,wLAAwL;QACxL,gIAAgI;QAChI,mIAAmI;QACnI,oIAAoI;QACpI,0RAA0R;QAC1R,qVAAqV;QACrV,0OAA0O;QAC1O,oNAAoN;QACpN,8NAA8N;QAC9N,wLAAwL;QACxL,oMAAoM;KACrM,CAAC;IAEF,MAAM,eAAe,GAAG,kBAAkB;SACvC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;SAC7C,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO,GAAG,UAAU;EACpB,aAAa;UACL,IAAI;;;EAGZ,WAAW;;;EAGX,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;;;EAG1B,eAAe;;;EAGf,aAAa,EAAE,CAAC;AAClB,CAAC;AAMD,SAAS,iBAAiB,CAAC,KAA+B,EAAE,UAA8B,EAAE;IAC1F,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAClB,OAAO,6CAA6C,CAAC;IACvD,CAAC;IACD,OAAO,KAAK;SACT,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,0BAA0B,CAAC;QACzG,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACpE,OAAO,KAAK,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;IACtC,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAa;IACvC,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,SAAkB;IACjD,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;QAC5C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,CAAC,CAAC;IAC9C,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC;AACtD,CAAC"}

package/dist/shell/terminalInput.d.ts

@@ -3,18 +3,14 @@
  *
  * Design principles:
  * - Single source of truth for input state
- * - One bottom-pinned chat box for the entire session (no inline anchors)
  * - 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';
-/**
- * Input modes - determines how input is handled
- */
-export type InputMode = 'idle' | 'streaming' | 'paste';
-export type EditGuardMode = 'display-edits' | 'ask-permission';
+import { type InputMode, type EditGuardMode } from '../ui/terminalUISchema.js';
+export type { InputMode, EditGuardMode } from '../ui/terminalUISchema.js';
 /**
  * Events emitted by TerminalInput
  */
@@ -66,11 +62,6 @@ export declare class TerminalInput extends EventEmitter {
     private statusMessage;
     private overrideStatusMessage;
     private streamingLabel;
-    private metaElapsedSeconds;
-    private metaTokensUsed;
-    private metaTokenLimit;
-    private metaThinkingMs;
-    private metaThinkingHasContent;
     private reservedLines;
     private scrollRegionActive;
     private lastRenderContent;
@@ -78,24 +69,32 @@ export declare class TerminalInput extends EventEmitter {
     private renderDirty;
     private isRendering;
     private pinnedTopRows;
+    private inlineAnchorRow;
+    private inlineLayout;
+    private anchorProvider;
+    private flowMode;
+    private flowModeRenderedLines;
+    private contentEndRow;
+    private commandSuggestions;
+    private filteredSuggestions;
+    private selectedSuggestionIndex;
+    private showSuggestions;
+    private maxVisibleSuggestions;
     private disposed;
     private enabled;
     private contextUsage;
-    private contextAutoCompactThreshold;
-    private contentRow;
-    private thinkingModeLabel;
     private editMode;
     private verificationEnabled;
     private autoContinueEnabled;
     private verificationHotkey;
     private autoContinueHotkey;
-    private thinkingHotkey;
-    private modelLabel;
-    private providerLabel;
     private outputInterceptorCleanup?;
-    private lastStreamingRender;
-    private streamingRenderInterval;
+    private streamingStartTime;
+    private tokensUsed;
+    private thinkingEnabled;
+    private modelInfo;
     private streamingRenderTimer;
+    private unifiedUIInitialized;
     constructor(writeStream?: NodeJS.WriteStream, config?: TerminalInputConfig);
     /**
      * Enable bracketed paste mode in terminal
@@ -117,17 +116,121 @@ export declare class TerminalInput extends EventEmitter {
      * Handle a keypress event
      */
     handleKeypress(str: string | undefined, key: KeyInfo): void;
+    private bannerContent;
+    /**
+     * Set banner content to be written when unified UI initializes.
+     */
+    setBannerContent(content: string | null): void;
+    /**
+     * Initialize the unified UI system immediately.
+     * Sets up scroll region (reserving bottom for input area), writes the banner
+     * as the first content, and positions cursor after it.
+     */
+    initializeUnifiedUI(): void;
     /**
      * Set the input mode
      *
-     * Streaming keeps the scroll region active so the prompt/status stay pinned
-     * below the streaming output. When streaming ends, we refresh the input area.
+     * Streaming mode disables scroll region and lets content flow naturally.
+     * The input area will be re-rendered after streaming ends at wherever
+     * the cursor is (below the streamed content).
      */
     setMode(mode: InputMode): void;
+    /**
+     * Update streaming status label (called by timer)
+     */
+    private updateStreamingStatus;
+    /**
+     * Render input area - unified for streaming and normal modes.
+     *
+     * In streaming mode: renders at absolute bottom, uses cursor save/restore
+     * In normal mode: renders right after the banner (pinnedTopRows + 1)
+     */
+    private renderPinnedInputArea;
+    /**
+     * Render input area during streaming (alias for unified method)
+     */
+    private renderStreamingInputArea;
+    /**
+     * Render bottom input area - UNIFIED for all modes.
+     * Uses cursor save/restore to update bottom without affecting content flow.
+     *
+     * Layout (same for idle/streaming/ready):
+     * - Status bar (streaming timer or "Type a message")
+     * - Model info line (provider · model · ctx)
+     * - Divider
+     * - Input area
+     * - Divider
+     * - Mode controls
+     */
+    private renderBottomInputArea;
+    /**
+     * 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: boolean): void;
+    /**
+     * Check if flow mode is enabled.
+     */
+    isFlowMode(): boolean;
+    /**
+     * Set the row where content ends (for idle mode positioning).
+     * Input area will render starting from this row + 1.
+     */
+    setContentEndRow(row: number): void;
+    /**
+     * Set available slash commands for auto-complete suggestions.
+     */
+    setCommands(commands: Array<{
+        command: string;
+        description: string;
+    }>): void;
+    /**
+     * Update filtered suggestions based on current input.
+     */
+    private updateSuggestions;
+    /**
+     * Select next suggestion (arrow down / tab).
+     */
+    selectNextSuggestion(): void;
+    /**
+     * Select previous suggestion (arrow up / shift+tab).
+     */
+    selectPrevSuggestion(): void;
+    /**
+     * Accept current suggestion and insert into buffer.
+     */
+    acceptSuggestion(): boolean;
+    /**
+     * Check if suggestions are visible.
+     */
+    areSuggestionsVisible(): boolean;
+    /**
+     * Update token count for metrics display
+     */
+    setTokensUsed(tokens: number): void;
+    /**
+     * Toggle thinking/reasoning mode
+     */
+    toggleThinking(): void;
+    /**
+     * Get thinking enabled state
+     */
+    isThinkingEnabled(): boolean;
     /**
      * Keep the top N rows pinned outside the scroll region (used for the launch banner).
      */
     setPinnedHeaderLines(count: number): void;
+    /**
+     * Anchor prompt rendering near a specific row (inline layout). Pass null to
+     * restore the default bottom-aligned layout.
+     */
+    setInlineAnchor(row: number | null): void;
+    /**
+     * Provide a dynamic anchor callback. When set, the prompt will follow the
+     * output by re-evaluating the anchor before each render.
+     */
+    setInlineAnchorProvider(provider: (() => number | null | undefined) | null): void;
     /**
      * Get current mode
      */
@@ -174,16 +277,6 @@ export declare class TerminalInput extends EventEmitter {
      * Can be shown alongside override status messages.
      */
     setStreamingLabel(label: string | null): void;
-    /**
-     * Surface meta status just above the divider (e.g., elapsed time or token usage).
-     */
-    setMetaStatus(meta: {
-        elapsedSeconds?: number | null;
-        tokensUsed?: number | null;
-        tokenLimit?: number | null;
-        thinkingMs?: number | null;
-        thinkingHasContent?: boolean;
-    }): void;
     /**
      * Keep mode toggles (verification/auto-continue) visible in the control bar.
      * Hotkey labels remain stable so the bar looks the same before/during streaming.
@@ -193,56 +286,69 @@ export declare class TerminalInput extends EventEmitter {
         autoContinueEnabled: boolean;
         verificationHotkey?: string;
         autoContinueHotkey?: string;
-        thinkingModeLabel?: string | null;
-        thinkingHotkey?: string;
     }): void;
+    /**
+     * Set the model info string (e.g., "OpenAI · gpt-4")
+     * This is displayed persistently above the input area.
+     */
+    setModelInfo(info: string | null): void;
     /**
      * Clear all status messages at once (convenience method).
      */
     clearAllStatus(): void;
     /**
-     * Surface model/provider context in the controls bar.
+     * Render the input area - UNIFIED for all modes
+     *
+     * Uses the same bottom-pinned layout with scroll regions for:
+     * - Idle mode: Shows "Type a message" hint
+     * - Streaming mode: Shows "● Streaming Xs" timer
+     * - Ready mode: Shows status info
      */
-    setModelContext(options: {
-        model?: string | null;
-        provider?: string | null;
-    }): void;
+    render(): void;
     /**
-     * Render the input area - Claude Code style with mode controls
+     * Render in flow mode - delegates to bottom-pinned for stability.
      *
-     * During streaming we keep the scroll region active and repaint only the
-     * pinned status/input block (throttled) so streamed content can scroll
-     * naturally above while elapsed time and status stay fresh.
+     * Flow mode attempted inline rendering but caused duplicate renders
+     * due to unreliable cursor position tracking. Bottom-pinned is reliable.
      */
-    render(): void;
+    private renderFlowMode;
+    /**
+     * Render in bottom-pinned mode - Claude Code style with suggestions
+     *
+     * Works for both normal and streaming modes:
+     * - During streaming: saves/restores cursor position
+     * - Status bar shows streaming info or "Type a message"
+     *
+     * Layout when suggestions visible:
+     * - Top divider
+     * - Input line(s)
+     * - Bottom divider
+     * - Suggestions (command list)
+     *
+     * Layout when suggestions hidden:
+     * - Status bar (Ready/Streaming)
+     * - Top divider
+     * - Input line(s)
+     * - Bottom divider
+     * - Mode controls
+     */
+    private renderBottomPinned;
     /**
-     * Build one or more compact meta lines above the divider (thinking, status, usage).
-     * During streaming, shows model line pinned above streaming info.
+     * Build status bar for streaming mode (shows elapsed time, queue count).
      */
-    private buildMetaLines;
+    private buildStreamingStatusBar;
     /**
-     * Clear the reserved bottom block (meta + divider + input + controls) before repainting.
+     * Build status bar showing streaming/ready status and key info.
+     * This is the TOP line above the input area - minimal Claude Code style.
      */
-    private clearReservedArea;
+    private buildStatusBar;
     /**
-     * Build Claude Code style mode controls line.
-     * Combines streaming label + override status + main status for simultaneous display.
+     * 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]
      */
     private buildModeControls;
-    private formatHotkey;
-    private computeContextRemaining;
-    private computeTokensRemaining;
-    private formatElapsedLabel;
-    private formatTokenCount;
-    private visibleLength;
-    /**
-     * Debug-only snapshot used by tests to assert rendered strings without
-     * needing a TTY. Not used by production code.
-     */
-    getDebugUiSnapshot(width?: number): {
-        meta: string[];
-        controls: string;
-    };
     /**
      * Force a re-render
      */
@@ -259,6 +365,9 @@ export declare class TerminalInput extends EventEmitter {
      * 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.
      */
     registerOutputInterceptor(display: {
         registerOutputInterceptor: (i: {
@@ -266,16 +375,6 @@ export declare class TerminalInput extends EventEmitter {
             afterWrite?: () => void;
         }) => () => void;
     }): void;
-    /**
-     * Write content directly into the scroll region (for banner, user prompts, etc.).
-     * Content starts at top and flows down, then scrolls when bottom is reached.
-     */
-    writeToScrollRegion(content: string): void;
-    /**
-     * Reset content position to start of scroll region.
-     * Does NOT clear the terminal - content starts from current position.
-     */
-    resetContentPosition(): void;
     /**
      * Dispose and clean up
      */
@@ -313,18 +412,21 @@ export declare class TerminalInput extends EventEmitter {
     private shiftPlaceholders;
     private removeRange;
     private insertPlainText;
-    private shouldInlineMultiline;
     private findPlaceholderAt;
     private buildPlaceholder;
     private insertPastePlaceholder;
+    /**
+     * Toggle expansion of a paste placeholder at the current cursor position.
+     * When expanded, shows first 3 and last 2 lines of the content.
+     */
+    togglePasteExpansion(): boolean;
+    private buildExpandedPlaceholder;
     private deletePlaceholder;
-    updateContextUsage(value: number | null, autoCompactThreshold?: number): void;
+    updateContextUsage(value: number | null): void;
     getEditMode(): EditGuardMode;
     applyEditMode(mode: EditGuardMode): void;
     private setEditMode;
     toggleEditMode(): void;
-    private scheduleStreamingRender;
-    private resetStreamingRenderThrottle;
     private scheduleRender;
     private canRender;
     private isTTY;