erosolar-cli 1.7.205 → 1.7.207

package/dist/shell/updateManager.js

@@ -1,6 +1,9 @@
 import { spawn } from 'node:child_process';
 import { stdin as input, stdout as output } from 'node:process';
 import { createInterface } from 'node:readline/promises';
+import { writeFileSync, chmodSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
 import { display } from '../ui/display.js';
 const PACKAGE_NAME = 'erosolar-cli';
 const REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
@@ -127,32 +130,83 @@ async function installLatestVersion() {
 }
 /**
  * Relaunch the CLI with the same arguments after update.
- * Uses process.execPath to ensure we run the same Node.js,
- * and process.argv to pass the same arguments.
+ * Ensures the old instance fully exits before the new one starts.
+ *
+ * Strategy: Create a temporary launcher script that:
+ * 1. Waits for the parent process to exit
+ * 2. Then launches the new CLI
+ * 3. Cleans up after itself
  */
 function relaunchCli() {
-    // Clear the terminal input state before exit
-    if (input.isTTY && input.setRawMode) {
-        try {
+    // Fully disable terminal input to prevent any further processing
+    // This is critical: we must stop all input handling before exit
+    try {
+        // Pause stdin to stop emitting data/keypress events
+        input.pause();
+        // Remove all listeners to prevent any queued events from firing
+        input.removeAllListeners('data');
+        input.removeAllListeners('keypress');
+        // Clear the terminal input state before exit
+        if (input.isTTY && input.setRawMode) {
             input.setRawMode(false);
         }
+    }
+    catch {
+        // Ignore errors during cleanup - we're exiting anyway
+    }
+    const parentPid = process.pid;
+    const args = process.argv.slice(2).map(arg => `"${arg.replace(/"/g, '\\"')}"`).join(' ');
+    if (process.platform === 'win32') {
+        // Windows: Use a batch script
+        const scriptPath = join(tmpdir(), `erosolar-relaunch-${parentPid}.bat`);
+        const script = `@echo off
+:wait
+tasklist /FI "PID eq ${parentPid}" 2>NUL | find /I "${parentPid}" >NUL
+if %ERRORLEVEL%==0 (
+  timeout /t 1 /nobreak >NUL
+  goto wait
+)
+erosolar ${args}
+del "%~f0"
+`;
+        writeFileSync(scriptPath, script);
+        spawn('cmd', ['/c', 'start', '/b', scriptPath], {
+            detached: true,
+            stdio: 'inherit', // Inherit terminal so new CLI can use stdin/stdout
+            shell: false,
+        }).unref();
+    }
+    else {
+        // Unix: Use a shell script that waits for parent to exit
+        const scriptPath = join(tmpdir(), `erosolar-relaunch-${parentPid}.sh`);
+        const script = `#!/bin/sh
+SCRIPT_PATH="${scriptPath}"
+# Wait for parent process to fully exit
+while kill -0 ${parentPid} 2>/dev/null; do
+  sleep 0.2
+done
+# Small additional delay to ensure cleanup
+sleep 0.3
+# Clean up this script
+rm -f "$SCRIPT_PATH" 2>/dev/null
+# Launch new CLI (exec replaces this shell) with terminal connected
+exec erosolar ${args} </dev/tty >/dev/tty 2>&1
+`;
+        writeFileSync(scriptPath, script, { mode: 0o755 });
+        // Also try to make it executable explicitly
+        try {
+            chmodSync(scriptPath, 0o755);
+        }
         catch {
-            // Ignore if already in cooked mode
+            // Ignore chmod errors
         }
+        spawn('/bin/sh', [scriptPath], {
+            detached: true,
+            stdio: 'inherit', // Inherit terminal so new CLI can use stdin/stdout
+            shell: false,
+        }).unref();
     }
-    // Get the erosolar binary path - it should be in PATH after update
-    const binary = process.platform === 'win32' ? 'erosolar.cmd' : 'erosolar';
-    // Spawn the new process detached so it survives parent exit
-    const child = spawn(binary, process.argv.slice(2), {
-        stdio: 'inherit',
-        detached: true,
-        shell: true,
-    });
-    // Unref so we can exit without waiting
-    child.unref();
-    // Give the child process a moment to start, then exit
-    setTimeout(() => {
-        process.exit(0);
-    }, 200);
+    // Exit immediately - the launcher script will start the new CLI after we're gone
+    process.exit(0);
 }
 //# sourceMappingURL=updateManager.js.map

package/dist/shell/updateManager.js.map

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

package/dist/ui/display.d.ts

@@ -71,8 +71,8 @@ export declare class Display {
     private writeLine;
     /**
      * Write raw content directly to output stream.
-     * Goes through interceptors and shared write lock so overlays refresh safely.
-     * Use this for streaming output chunks.
+     * For streaming output chunks - uses output interceptors for cursor positioning
+     * but avoids complex locking that can cause race conditions.
      */
     writeRaw(content: string): void;
     /**
@@ -88,17 +88,27 @@ export declare class Display {
      * Prefer writeRaw/writeStreamChunk for interceptor support.
      */
     getOutputStream(): OutputStream;
+    /**
+     * Current number of lines written to stdout (tracked for positioning).
+     */
+    getTotalWrittenLines(): number;
+    /**
+     * Number of lines at the top of the terminal that belong to the pinned banner.
+     * For integrated scroll-region layouts, banners are not pinned, so this is 0.
+     */
+    getPinnedHeaderLines(): number;
     private getColumnWidth;
     private bannerState;
+    private bannerContext;
     /**
-     * Displays the welcome banner with session information.
-     * Stores banner state for potential in-place updates.
+     * Displays the welcome banner with session information and tracks its bounds
+     * for potential in-place updates (still rendered inside the scroll region).
      */
     showWelcome(profileLabel: string, profileName: string, model: string, provider: string, workingDir: string, version?: string): void;
     /**
-     * Updates the session information banner with new model/provider.
-     * Attempts in-place update if possible, otherwise re-renders.
-     */
+     * Updates the session information banner with new model/provider by appending
+     * a new banner entry in the scroll region (no pinned header rewriting).
+    */
     updateSessionInfo(model: string, provider: string): void;
     showThinking(message?: string): void;
     /**
@@ -148,6 +158,10 @@ export declare class Display {
     updateStreamingStatus(status: string | null): void;
     /**
      * Internal implementation of updateStreamingStatus (called with lock held)
+     * NOTE: During streaming, we do NOT write status lines to stdout to prevent
+     * race conditions with stream chunks. The status is tracked internally and
+     * the terminalInput's status message display handles showing it in the
+     * reserved input area, separate from the main content stream.
      */
     private updateStreamingStatusInternal;
     /**

package/dist/ui/display.d.ts.map

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

package/dist/ui/display.js

@@ -242,20 +242,17 @@ export class Display {
     }
     /**
      * Write raw content directly to output stream.
-     * Goes through interceptors and shared write lock so overlays refresh safely.
-     * Use this for streaming output chunks.
+     * For streaming output chunks - uses output interceptors for cursor positioning
+     * but avoids complex locking that can cause race conditions.
      */
     writeRaw(content) {
-        if (typeof content !== 'string') {
+        if (typeof content !== 'string' || !content) {
             return;
         }
-        // Use shared writeLock to coordinate with terminalInput
-        writeLock.safeWrite(() => {
-            this.outputLock.safeWrite(() => {
-                this.withOutput(() => {
-                    this.write(content);
-                });
-            });
+        // Use withOutput to trigger interceptors (for cursor positioning during scroll region)
+        // but write synchronously without queueing
+        this.withOutput(() => {
+            this.write(content);
         });
     }
     /**
@@ -277,6 +274,19 @@ export class Display {
     getOutputStream() {
         return this.outputStream;
     }
+    /**
+     * Current number of lines written to stdout (tracked for positioning).
+     */
+    getTotalWrittenLines() {
+        return this.stdoutTracker.totalLines;
+    }
+    /**
+     * Number of lines at the top of the terminal that belong to the pinned banner.
+     * For integrated scroll-region layouts, banners are not pinned, so this is 0.
+     */
+    getPinnedHeaderLines() {
+        return 0;
+    }
     getColumnWidth() {
         if (typeof this.outputStream.columns === 'number' &&
             Number.isFinite(this.outputStream.columns) &&
@@ -286,9 +296,10 @@ export class Display {
         return getTerminalColumns();
     }
     bannerState = null;
+    bannerContext = null;
     /**
-     * Displays the welcome banner with session information.
-     * Stores banner state for potential in-place updates.
+     * Displays the welcome banner with session information and tracks its bounds
+     * for potential in-place updates (still rendered inside the scroll region).
      */
     showWelcome(profileLabel, profileName, model, provider, workingDir, version) {
         // Validate required inputs
@@ -304,47 +315,64 @@ export class Display {
         this.withOutput(() => {
             this.writeLine(banner);
         });
-        const nextState = {
+        const height = this.measureBannerHeight(banner);
+        this.bannerState = {
             startLine,
-            height: this.measureBannerHeight(banner),
+            height,
             width,
             workingDir,
+            version: version?.trim() || undefined,
             model,
             provider,
             profileLabel: profileLabel ?? '',
             profileName: profileName ?? '',
         };
-        if (version?.trim()) {
-            nextState.version = version.trim();
-        }
-        this.bannerState = nextState;
+        this.bannerContext = {
+            workingDir,
+            model,
+            provider,
+            profileLabel: profileLabel ?? '',
+            profileName: profileName ?? '',
+            version: version?.trim() || undefined,
+        };
     }
     /**
-     * Updates the session information banner with new model/provider.
-     * Attempts in-place update if possible, otherwise re-renders.
-     */
+     * Updates the session information banner with new model/provider by appending
+     * a new banner entry in the scroll region (no pinned header rewriting).
+    */
     updateSessionInfo(model, provider) {
         const state = this.bannerState;
         if (!state) {
             return;
         }
-        // Validate inputs
-        if (!model?.trim() || !provider?.trim()) {
-            return;
-        }
         const width = this.getBannerWidth();
         const banner = this.buildClaudeStyleBanner(state.profileLabel, state.profileName, model, provider, state.workingDir, width, state.version);
         const height = this.measureBannerHeight(banner);
         // If height changed or rewrite failed, do full re-render
         if (height !== state.height || !this.tryRewriteBanner(state, banner)) {
             this.renderAndStoreBanner(state, model, provider);
+            this.bannerContext = {
+                workingDir: state.workingDir,
+                model: state.model,
+                provider: state.provider,
+                profileLabel: state.profileLabel,
+                profileName: state.profileName,
+                version: state.version,
+            };
             return;
         }
-        // Update succeeded, update state
         state.model = model;
         state.provider = provider;
         state.width = width;
         state.height = height;
+        this.bannerContext = {
+            workingDir: state.workingDir,
+            model,
+            provider,
+            profileLabel: state.profileLabel,
+            profileName: state.profileName,
+            version: state.version,
+        };
     }
     showThinking(message = 'Thinking...') {
         // If we already have a spinner, just update its text instead of creating a new one
@@ -498,53 +526,18 @@ export class Display {
     }
     /**
      * Internal implementation of updateStreamingStatus (called with lock held)
+     * NOTE: During streaming, we do NOT write status lines to stdout to prevent
+     * race conditions with stream chunks. The status is tracked internally and
+     * the terminalInput's status message display handles showing it in the
+     * reserved input area, separate from the main content stream.
      */
     updateStreamingStatusInternal(status) {
         if (!status) {
-            if (this.streamingStatusVisible) {
-                if (this.scrollRegionActive) {
-                    // Clear status in the fixed area
-                    const rows = this.getTerminalRows();
-                    this.outputStream.write('\x1b[s'); // Save cursor
-                    this.outputStream.write(`\x1b[${rows};1H\x1b[2K`); // Go to status line, clear
-                    this.outputStream.write('\x1b[u'); // Restore cursor
-                }
-                else {
-                    this.outputStream.write('\r\x1b[2K');
-                }
-                this.streamingStatusVisible = false;
-            }
+            this.streamingStatusVisible = false;
             return;
         }
-        // Truncate status if needed
-        const cols = this.getColumnWidth();
-        const maxStatusLen = cols - 4;
-        const displayStatus = status.length > maxStatusLen
-            ? `${status.slice(0, maxStatusLen - 3)}...`
-            : status;
-        if (this.scrollRegionActive) {
-            // Update status in the fixed area at bottom (outside scroll region)
-            const rows = this.getTerminalRows();
-            const separatorWidth = Math.min(cols - 2, 72);
-            const separator = theme.ui.border('─'.repeat(separatorWidth));
-            this.outputStream.write('\x1b[s'); // Save cursor position
-            // Draw separator on row (rows - 1)
-            this.outputStream.write(`\x1b[${rows - 1};1H\x1b[2K${separator}`);
-            // Draw status on row (rows)
-            this.outputStream.write(`\x1b[${rows};1H\x1b[2K${theme.ui.muted(displayStatus)}`);
-            this.outputStream.write('\x1b[u'); // Restore cursor position
-            this.streamingStatusVisible = true;
-        }
-        else {
-            // Fallback: simple single-line update
-            if (this.streamingStatusVisible) {
-                this.outputStream.write(`\r\x1b[2K${theme.ui.muted(displayStatus)}`);
-            }
-            else {
-                this.outputStream.write(`\n${theme.ui.muted(displayStatus)}`);
-                this.streamingStatusVisible = true;
-            }
-        }
+        // Just track the status - don't write to stdout during streaming
+        this.streamingStatusVisible = true;
     }
     /**
      * Check if streaming status is currently visible.
@@ -562,15 +555,7 @@ export class Display {
      * Clear streaming status and reset state.
      */
     clearStreamingStatus() {
-        if (this.streamingStatusVisible) {
-            if (this.scrollRegionActive) {
-                this.teardownScrollRegion();
-            }
-            else {
-                this.outputStream.write('\r\x1b[2K');
-                this.streamingStatusVisible = false;
-            }
-        }
+        this.streamingStatusVisible = false;
     }
     clearSpinnerIfActive(addNewLine = true) {
         if (!this.activeSpinner) {
@@ -794,7 +779,46 @@ export class Display {
      * Show streaming header - Claude Code style (minimal)
      */
     showStreamingHeader() {
-        // Claude Code style: no header, just start streaming
+        const banner = this.bannerState;
+        const modelLabel = banner ? this.formatModelLabel(banner.model) : null;
+        const provider = banner?.provider ?? '';
+        const maxWidth = Math.min(this.getColumnWidth() - 4, DISPLAY_CONSTANTS.MAX_MESSAGE_WIDTH);
+        const width = Math.max(32, Math.min(80, maxWidth));
+        const workspace = banner
+            ? this.abbreviatePath(banner.workingDir, Math.max(18, width - 14))
+            : '';
+        // Plain output: keep it simple
+        if (isPlainOutputMode()) {
+            const label = modelLabel ? `Streaming ${modelLabel}` : 'Streaming response';
+            this.withOutput(() => this.writeLine(`--- ${label} ---`));
+            return;
+        }
+        const line = theme.gradient.cool('━'.repeat(width));
+        const pad = (value) => {
+            const visible = this.visibleLength(value);
+            const padding = Math.max(0, width - visible);
+            return `${value}${' '.repeat(padding)}`;
+        };
+        const statusParts = [
+            theme.gradient.cool('▶'),
+            theme.info('Live stream'),
+            modelLabel ? theme.ui.muted('•') : '',
+            modelLabel ? theme.info(modelLabel) : '',
+            provider ? theme.ui.muted('@') : '',
+            provider ? theme.accent(provider) : '',
+        ].filter(Boolean);
+        const statusLine = statusParts.join(' ');
+        const workspaceLine = workspace ? `${theme.ui.muted('Workspace')} ${workspace}` : '';
+        this.withOutput(() => {
+            this.writeLine();
+            this.writeLine(line);
+            this.writeLine(pad(`${theme.gradient.cool('┃')} ${statusLine}`));
+            if (workspaceLine) {
+                this.writeLine(pad(`${theme.gradient.cool('┃')} ${workspaceLine}`));
+            }
+            this.writeLine(line);
+            this.writeLine();
+        });
     }
     /**
      * Show model commands help
@@ -877,44 +901,36 @@ export class Display {
         if (!banner) {
             return 0;
         }
-        const lines = banner.split('\n').length;
-        return lines;
+        return banner.split('\n').length;
     }
     /**
      * Attempts to rewrite the banner in place using terminal cursor manipulation.
      * Returns true if successful, false if rewrite is not possible.
      */
     tryRewriteBanner(state, banner) {
-        // Validate TTY availability
         if (!this.outputStream.isTTY) {
             return false;
         }
-        // Validate banner state
         if (!banner || state.height <= 0) {
             return false;
         }
         const linesWritten = this.stdoutTracker.totalLines;
         const linesAfterBanner = linesWritten - (state.startLine + state.height);
-        // Cannot rewrite if banner position is invalid
         if (linesAfterBanner < 0) {
             return false;
         }
         const totalOffset = linesAfterBanner + state.height;
         const maxRows = this.outputStream.rows;
-        // Cannot rewrite if offset exceeds terminal height
         if (typeof maxRows === 'number' && maxRows > 0 && totalOffset > maxRows) {
             return false;
         }
         try {
             this.withOutput(() => {
-                // Move cursor up to banner start
                 moveCursor(this.outputStream, 0, -totalOffset);
                 cursorTo(this.outputStream, 0);
-                // Write new banner without tracking
                 this.stdoutTracker.withSuspended(() => {
                     this.outputStream.write(`${banner}\n`);
                 });
-                // Restore cursor position
                 if (linesAfterBanner > 0) {
                     moveCursor(this.outputStream, 0, linesAfterBanner);
                 }
@@ -922,11 +938,7 @@ export class Display {
             });
             return true;
         }
-        catch (error) {
-            // Cursor manipulation failed (e.g., terminal doesn't support it)
-            if (error instanceof Error) {
-                // Could log error in debug mode if needed
-            }
+        catch {
             return false;
         }
     }
@@ -1029,23 +1041,28 @@ export class Display {
     }
     buildClaudeStyleBanner(_profileLabel, _profileName, model, provider, workingDir, _width, version) {
         // Advanced banner with clean visual hierarchy
-        const lines = [];
+        const baseWidth = Number.isFinite(_width) ? Math.max(0, _width) : this.getBannerWidth();
+        const totalWidth = Math.max(DISPLAY_CONSTANTS.MIN_BANNER_WIDTH, Math.min(baseWidth, DISPLAY_CONSTANTS.MAX_BANNER_WIDTH));
+        const innerWidth = Math.max(28, totalWidth - 4);
+        const frameWidth = innerWidth + 2;
         const modelLabel = this.formatModelLabel(model);
-        const versionStr = version ? `v${version}` : '';
-        // Top separator with branding
-        const sepWidth = Math.min(this.getColumnWidth() - 4, 56);
-        lines.push(theme.gradient.cool('━'.repeat(sepWidth)));
-        // Title line with version
-        lines.push(`${theme.gradient.cool('⚡ EROSOLAR')} ${theme.ui.muted(versionStr)}`);
-        // Model and provider info
-        lines.push(`${theme.ui.muted('┃')} ${theme.ui.muted('Model:')} ${theme.info(modelLabel)} ${theme.ui.muted('via')} ${theme.accent(provider)}`);
-        // Working directory
-        const shortDir = this.abbreviatePath(workingDir, 40);
-        lines.push(`${theme.ui.muted('┃')} ${theme.ui.muted('Path:')}  ${shortDir}`);
-        // Commands hint
-        lines.push(`${theme.ui.muted('┃')} ${theme.ui.muted('Help:')}  /help · /model · /clear · /quit`);
-        // Bottom separator
-        lines.push(theme.ui.muted('━'.repeat(sepWidth)));
+        const versionStr = version ? `v${version}` : 'live';
+        const profileLabel = _profileLabel || _profileName || 'Default';
+        const shortDir = this.abbreviatePath(workingDir, Math.max(16, innerWidth - 14));
+        const commands = '/help · /model · /clear · /quit';
+        const renderRow = (content) => {
+            const visible = this.visibleLength(content);
+            const padding = Math.max(0, innerWidth - visible);
+            return `${theme.gradient.cool('┃')} ${content}${' '.repeat(padding)} ${theme.gradient.cool('┃')}`;
+        };
+        const lines = [];
+        lines.push(theme.gradient.cool(`╭${'━'.repeat(frameWidth)}╮`));
+        lines.push(renderRow(`${theme.gradient.cool('⚡ EROSOLAR CLI')} ${theme.ui.muted(versionStr)}`));
+        lines.push(renderRow(`${theme.ui.muted('Profile')} ${theme.info(profileLabel)}`));
+        lines.push(renderRow(`${theme.ui.muted('Model')}  ${theme.info(modelLabel)} ${theme.ui.muted('via')} ${theme.accent(provider)}`));
+        lines.push(renderRow(`${theme.ui.muted('Workspace')} ${shortDir}`));
+        lines.push(renderRow(`${theme.ui.muted('Shortcuts')} ${commands}`));
+        lines.push(theme.gradient.cool(`╰${'━'.repeat(frameWidth)}╯`));
         return lines.join('\n');
     }
     abbreviatePath(path, maxLen) {