erosolar-cli 1.7.226 → 1.7.227

package/dist/shell/terminalInput.js

@@ -3,13 +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';
-import { isMultilinePaste, generatePasteSummary } from '../core/multilinePasteHandler.js';
+import { isMultilinePaste } from '../core/multilinePasteHandler.js';
 import { writeLock } from '../ui/writeLock.js';
 import { renderDivider, renderStatusLine } from '../ui/unified/layout.js';
 import { isStreamingMode } from '../ui/globalWriteLock.js';
@@ -67,6 +68,9 @@ 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
     reservedLines = 2;
     scrollRegionActive = false;
     lastRenderContent = '';
@@ -74,9 +78,6 @@ export class TerminalInput extends EventEmitter {
     renderDirty = false;
     isRendering = false;
     pinnedTopRows = 0;
-    inlineAnchorRow = null;
-    inlineLayout = false;
-    anchorProvider = null;
     // Lifecycle
     disposed = false;
     enabled = true;
@@ -91,10 +92,6 @@ export class TerminalInput extends EventEmitter {
     // Streaming render throttle
     lastStreamingRender = 0;
     streamingRenderInterval = 250; // ms between renders during streaming
-    // Metrics tracking for status bar
-    streamingStartTime = null;
-    tokensUsed = 0;
-    thinkingEnabled = true;
     constructor(writeStream = process.stdout, config = {}) {
         super();
         this.out = writeStream;
@@ -182,11 +179,6 @@ 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);
@@ -195,56 +187,24 @@ export class TerminalInput extends EventEmitter {
     /**
      * Set the input mode
      *
-     * Streaming uses scroll region to contain output:
-     * - Scroll region: rows 1 to (total - reservedLines)
-     * - Input area protected at bottom (outside scroll region)
-     * - Cursor positioned inside scroll region so content scrolls there
+     * Streaming keeps the scroll region active so the prompt/status stay pinned
+     * below the streaming output. When streaming ends, we refresh the input area.
      */
     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();
-            const { rows } = this.getSize();
-            // Ensure scroll region is active to protect input area
-            if (!this.scrollRegionActive) {
-                this.applyScrollRegion();
-                this.scrollRegionActive = true;
-            }
-            // Position cursor at BOTTOM of scroll region (row = rows - reservedLines)
-            // This is where new streaming content should appear and scroll up from
-            const scrollBottom = Math.max(1, rows - this.reservedLines);
-            this.write(ESC.TO(scrollBottom, 1));
+            // Keep scroll region active so status/prompt stay pinned while streaming
+            this.enableScrollRegion();
             this.renderDirty = true;
+            this.render();
         }
         else if (mode !== 'streaming' && prevMode === 'streaming') {
-            // Reset streaming time
-            this.streamingStartTime = null;
-            // Re-render the input area (scroll region keeps it protected)
+            // Streaming ended - render the input area
+            this.enableScrollRegion();
             this.forceRender();
         }
     }
-    /**
-     * 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 outside the scroll region (used for the launch banner).
      */
@@ -257,42 +217,6 @@ export class TerminalInput extends EventEmitter {
             }
         }
     }
-    /**
-     * 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;
-        }
-        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.
-     */
-    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();
-    }
     /**
      * Get current mode
      */
@@ -402,6 +326,29 @@ 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;
+        if (this.metaElapsedSeconds === nextElapsed &&
+            this.metaTokensUsed === nextTokens &&
+            this.metaTokenLimit === nextLimit) {
+            return;
+        }
+        this.metaElapsedSeconds = nextElapsed;
+        this.metaTokensUsed = nextTokens;
+        this.metaTokenLimit = nextLimit;
+        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.
@@ -480,9 +427,9 @@ export class TerminalInput extends EventEmitter {
             const availableForContent = Math.max(1, rows - 3); // room for separator + input + controls
             const maxVisible = Math.max(1, Math.min(this.config.maxLines, availableForContent));
             const displayLines = Math.min(lines.length, maxVisible);
-            // Reserved lines: separator(1) + controls(1) + input lines
-            // Layout: [separator] [controls] [input...]
-            this.updateReservedLines(displayLines + 2);
+            const metaLine = this.buildMetaLine(cols - 2);
+            // Reserved lines: optional meta(1) + separator(1) + input lines + controls(1)
+            this.updateReservedLines(displayLines + 2 + (metaLine ? 1 : 0));
             // Calculate display window (keep cursor visible)
             let startLine = 0;
             if (lines.length > displayLines) {
@@ -494,35 +441,26 @@ export class TerminalInput extends EventEmitter {
             // Render
             this.write(ESC.HIDE);
             this.write(ESC.RESET);
-            // Enhanced layout from bottom to top:
-            // Row N:     Mode controls (shortcuts, thinking toggle)
-            // Row N-1:   Bottom separator
-            // Row N-2:   Input area
-            // Row N-3:   Top separator
-            // Row N-4:   Status bar (streaming status, elapsed time, tokens)
-            // Calculate positions from absolute bottom
-            const modeControlRow = rows;
-            const bottomSepRow = rows - 1;
-            const inputEndRow = rows - 2;
-            const inputStartRow = inputEndRow - visibleLines.length + 1;
-            const topSepRow = inputStartRow - 1;
-            const statusBarRow = topSepRow - 1;
-            // Reserved lines: status(1) + topSep(1) + input + bottomSep(1) + controls(1)
-            this.updateReservedLines(visibleLines.length + 4);
-            // Status bar (streaming status + metrics)
-            this.write(ESC.TO(statusBarRow, 1));
-            this.write(ESC.CLEAR_LINE);
-            this.write(this.buildStatusBar(cols));
-            // Top separator
-            this.write(ESC.TO(topSepRow, 1));
+            const startRow = Math.max(1, rows - this.reservedLines + 1);
+            let currentRow = startRow;
+            // Meta/status header (elapsed, tokens/context)
+            if (metaLine) {
+                this.write(ESC.TO(currentRow, 1));
+                this.write(ESC.CLEAR_LINE);
+                this.write(metaLine);
+                currentRow += 1;
+            }
+            // Separator line
+            this.write(ESC.TO(currentRow, 1));
             this.write(ESC.CLEAR_LINE);
             const divider = renderDivider(cols - 2);
             this.write(divider);
+            currentRow += 1;
             // Render input lines
-            let finalRow = inputStartRow;
+            let finalRow = currentRow;
             let finalCol = 3;
             for (let i = 0; i < visibleLines.length; i++) {
-                const rowNum = inputStartRow + i;
+                const rowNum = currentRow + i;
                 this.write(ESC.TO(rowNum, 1));
                 this.write(ESC.CLEAR_LINE);
                 const line = visibleLines[i] ?? '';
@@ -560,15 +498,12 @@ export class TerminalInput extends EventEmitter {
                     this.write(' '.repeat(padding));
                 this.write(ESC.RESET);
             }
-            // Bottom separator
-            this.write(ESC.TO(bottomSepRow, 1));
-            this.write(ESC.CLEAR_LINE);
-            this.write(divider);
-            // Mode controls (shortcuts + thinking toggle)
-            this.write(ESC.TO(modeControlRow, 1));
+            // Mode controls line (Claude Code style)
+            const controlRow = currentRow + visibleLines.length;
+            this.write(ESC.TO(controlRow, 1));
             this.write(ESC.CLEAR_LINE);
             this.write(this.buildModeControls(cols));
-            // Position cursor in input area
+            // Position cursor
             this.write(ESC.TO(finalRow, Math.min(finalCol, cols)));
             this.write(ESC.SHOW);
             // Update state
@@ -581,86 +516,69 @@ export class TerminalInput extends EventEmitter {
         }
     }
     /**
-     * Build status bar showing streaming status, elapsed time, and token count.
+     * Build a compact meta line above the divider (elapsed, context usage, queue size).
      */
-    buildStatusBar(cols) {
+    buildMetaLine(width) {
         const parts = [];
-        // Streaming status
-        if (this.mode === 'streaming') {
-            parts.push({ text: '● Streaming', tone: 'success' });
-            // Elapsed time
-            if (this.streamingStartTime) {
-                const elapsed = Math.floor((Date.now() - this.streamingStartTime) / 1000);
-                const mins = Math.floor(elapsed / 60);
-                const secs = elapsed % 60;
-                const timeStr = mins > 0 ? `${mins}m ${secs}s` : `${secs}s`;
-                parts.push({ text: `⏱ ${timeStr}`, tone: 'muted' });
-            }
+        if (this.metaElapsedSeconds !== null) {
+            parts.push({ text: `elapsed ${this.metaElapsedSeconds}s`, tone: 'muted' });
         }
-        else {
-            parts.push({ text: '○ Ready', tone: 'muted' });
+        if (this.metaTokensUsed !== null) {
+            const limitText = this.metaTokenLimit ? `/${this.metaTokenLimit}` : '';
+            parts.push({ text: `tokens ${this.metaTokensUsed}${limitText}`, tone: 'muted' });
         }
-        // Token count
-        if (this.tokensUsed > 0) {
-            const tokenStr = this.tokensUsed >= 1000
-                ? `${(this.tokensUsed / 1000).toFixed(1)}k`
-                : `${this.tokensUsed}`;
-            parts.push({ text: `◈ ${tokenStr} tokens`, tone: 'info' });
+        if (this.contextUsage !== null) {
+            const tone = this.contextUsage >= 75 ? 'warn' : 'muted';
+            parts.push({ text: `used ${this.contextUsage}%`, tone });
         }
-        // Thinking mode
-        parts.push({
-            text: this.thinkingEnabled ? '💭 Thinking on' : '💭 Thinking off',
-            tone: this.thinkingEnabled ? 'info' : 'muted',
-        });
-        // Paste block count if any
-        if (this.pastePlaceholders.length > 0) {
-            const totalLines = this.pastePlaceholders.reduce((sum, p) => sum + p.lineCount, 0);
-            parts.push({
-                text: `📋 ${this.pastePlaceholders.length} paste(s), ${totalLines} lines`,
-                tone: 'info',
-            });
+        if (this.mode === 'streaming' && this.queue.length > 0) {
+            parts.push({ text: `queued ${this.queue.length}`, tone: 'info' });
         }
-        return renderStatusLine(parts, cols - 2);
+        return parts.length ? renderStatusLine(parts, width) : '';
     }
     /**
      * Build Claude Code style mode controls line.
-     * Shows keyboard shortcuts and toggle states.
+     * Combines streaming label + override status + main status for simultaneous display.
      */
     buildModeControls(cols) {
         const parts = [];
-        // Keyboard shortcuts hint
-        parts.push({ text: '? help', tone: 'muted' });
-        parts.push({ text: 'esc interrupt', tone: 'muted' });
-        // Streaming status messages
         if (this.streamingLabel) {
             parts.push({ text: `◐ ${this.streamingLabel}`, tone: 'info' });
         }
         if (this.overrideStatusMessage) {
             parts.push({ text: `⚠ ${this.overrideStatusMessage}`, tone: 'warn' });
         }
-        // Mode toggles
-        const verifyLabel = this.verificationEnabled ? 'verify on' : 'verify off';
+        if (this.statusMessage) {
+            parts.push({ text: this.statusMessage, tone: this.streamingLabel ? 'muted' : 'info' });
+        }
+        const verifyLabel = this.verificationEnabled ? 'verify+build on' : 'verify+build off';
         parts.push({
             text: `${verifyLabel} (${this.verificationHotkey.toLowerCase()})`,
             tone: this.verificationEnabled ? 'success' : 'muted',
         });
+        const continueLabel = this.autoContinueEnabled ? 'auto-continue on' : 'auto-continue off';
+        parts.push({
+            text: `${continueLabel} (${this.autoContinueHotkey.toLowerCase()})`,
+            tone: this.autoContinueEnabled ? 'info' : 'muted',
+        });
         const editLabel = this.editMode === 'display-edits' ? 'auto-edit' : 'ask first';
         parts.push({ text: `${editLabel} (⇧⇥)`, tone: 'muted' });
-        // Context usage
         if (this.contextUsage !== null) {
             const pct = Math.max(0, 100 - this.contextUsage);
             const tone = pct < 25 ? 'warn' : 'muted';
-            parts.push({ text: `ctx ${pct}%`, tone });
+            parts.push({ text: `context ${pct}%`, tone });
         }
-        // Queue during streaming
-        if (this.mode === 'streaming' && this.queue.length > 0) {
-            parts.push({ text: `queued ${this.queue.length}`, tone: 'info' });
-        }
-        // Multi-line indicator
         if (this.buffer.includes('\n')) {
             const lineCount = this.buffer.split('\n').length;
             parts.push({ text: `${lineCount} lines`, tone: 'muted' });
         }
+        if (this.pastePlaceholders.length > 0) {
+            const latest = this.pastePlaceholders[this.pastePlaceholders.length - 1];
+            parts.push({
+                text: `paste #${latest.id} +${latest.lineCount} lines (⌫ to drop)`,
+                tone: 'info',
+            });
+        }
         return renderStatusLine(parts, cols - 2);
     }
     /**
@@ -696,23 +614,13 @@ export 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) {
         if (this.outputInterceptorCleanup) {
             this.outputInterceptorCleanup();
         }
-        this.outputInterceptorCleanup = display.registerOutputInterceptor({
-            beforeWrite: () => {
-                // Scroll region handles content containment automatically
-                // No per-write cursor manipulation needed
-            },
-            afterWrite: () => {
-                // No cursor manipulation needed
-            },
-        });
+        // Scroll region handles containment now; interceptor is a no-op placeholder to keep API stable.
+        this.outputInterceptorCleanup = display.registerOutputInterceptor({});
     }
     /**
      * Dispose and clean up
@@ -832,22 +740,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;
@@ -1138,7 +1031,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 {
@@ -1158,6 +1053,7 @@ export class TerminalInput extends EventEmitter {
             return;
         this.applyScrollRegion();
         this.scrollRegionActive = true;
+        this.forceRender();
     }
     disableScrollRegion() {
         if (!this.scrollRegionActive)
@@ -1308,17 +1204,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) {
@@ -1326,67 +1224,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);