@trenchwork/erosolar 1.1.41 → 1.1.43

package/dist/headless/interactiveShell.js

@@ -43,6 +43,9 @@ import { startNewRun } from '../tools/fileChangeTracker.js';
 import { onSudoPasswordNeeded, offSudoPasswordNeeded, provideSudoPassword } from '../core/sudoPasswordManager.js';
 import { reportStatus, setStatusSink } from '../utils/statusReporter.js';
 import { isSafetyRefusal } from '../core/refusalDetection.js';
+import { formatToolCall, toolActivityLabel, formatToolResult, formatToolError } from '../shell/toolPresentation.js';
+// Tool-result display (ANSI stripping, summarisation, the `⎿` block) now lives
+// in ../shell/toolPresentation.ts — the shell just emits the formatted strings.
 // Timeout constants for regular prompt processing (reasoning models like DeepSeek)
 const PROMPT_REASONING_TIMEOUT_MS = 60 * 1000; // 60 seconds max for reasoning-only without action
 // Per-step timeout: how long we'll wait for the *next* event before
@@ -128,24 +131,46 @@ function getVersion() {
         return '0.0.0';
     }
 }
+/** Inner content of the welcome box (plain, no border/colour). */
+function welcomeBodyLines(input) {
+    const body = ['✻ Welcome to Erosolar Coder', ''];
+    if (!input.hasApiKey) {
+        body.push('⚠ No API key configured', '', 'Get your key: https://platform.deepseek.com/', 'Set your key: /key YOUR_API_KEY');
+    }
+    else {
+        body.push(`${input.model} · ${input.provider}`, `Key: ${input.maskedKey} · /help for commands`);
+    }
+    if (input.cwd)
+        body.push(`cwd: ${input.cwd}`);
+    return body;
+}
+/**
+ * Wrap content lines in a Claude-Code-style rounded box (╭╮╰╯). `paint`
+ * colours an already-padded content cell; `border` colours the frame. Both
+ * default to identity so the pure version stays ANSI-free.
+ */
+function roundedBox(content, paint = (s) => s, border = (s) => s) {
+    const width = Math.min(content.reduce((m, c) => Math.max(m, c.length), 0), 72);
+    const pad = (c) => c + ' '.repeat(Math.max(0, width - c.length));
+    const rule = '─'.repeat(width + 2);
+    return [
+        border(`╭${rule}╮`),
+        ...content.map((c) => `${border('│')} ${paint(pad(c))} ${border('│')}`),
+        border(`╰${rule}╯`),
+    ];
+}
 /**
  * Compose the lines shown when the interactive shell opens. Deliberately NOT a
  * marketing splash — bare `erosolar` opens straight into the chat (like
- * `claude`); this is just the load-bearing status: either how to set a key, or
- * the active model + masked key. Pure (no chalk/ANSI, no I/O) so the
- * "no brand banner, key guidance kept" contract is unit-testable without a PTY.
- * The live renderer colorizes equivalent content; this is the source of truth
- * for WHICH lines appear.
+ * `claude`); this is the load-bearing welcome: a sparkle, the name, and either
+ * how to set a key or the active model + masked key, inside a rounded box that
+ * mirrors Claude Code's. Pure (no chalk/ANSI, no I/O) so the "no marketing
+ * splash, key guidance kept" contract is unit-testable without a PTY. The live
+ * renderer colourises equivalent content; this is the source of truth for
+ * WHICH lines appear.
  */
 export function composeWelcomeLines(input) {
-    const lines = ['', ...(input.updateLines ?? [])];
-    if (!input.hasApiKey) {
-        lines.push('  ⚠ No API key configured', '', '  Get your key: https://platform.deepseek.com/', '  Set your key: /key YOUR_API_KEY', '');
-    }
-    else {
-        lines.push(`  ${input.model} · ${input.provider}`, `  Key: ${input.maskedKey} · /help for commands`, '');
-    }
-    return lines;
+    return ['', ...(input.updateLines ?? []), ...roundedBox(welcomeBodyLines(input)), ''];
 }
 /**
  * Run the fully interactive shell with rich UI.
@@ -292,6 +317,7 @@ class InteractiveShell {
             onCtrlC: (info) => this.handleCtrlC(info),
             onToggleAutoContinue: () => this.handleAutoContinueToggle(),
             onToggleHITL: () => this.handleHITLToggle(),
+            onCyclePermissionMode: (mode) => this.handlePermissionModeChange(mode),
         });
         // Register cleanup callback for graceful shutdown
         onShutdown(() => {
@@ -395,21 +421,20 @@ class InteractiveShell {
                 chalk.dim(' · installing in background…'));
             this.runBackgroundUpdate(updateInfo);
         }
-        // Clean, minimal welcome - just the essentials
-        const welcomeLines = [
-            '',
-            ...updateLines,
-            '',
-        ];
-        if (!hasApiKey) {
-            // Show API key setup instructions
-            welcomeLines.push(chalk.yellow('  ⚠ No API key configured'), '', chalk.dim('  Get your key: ') + chalk.cyan('https://platform.deepseek.com/'), chalk.dim('  Set your key: ') + chalk.hex('#ffb142')('/key YOUR_API_KEY'), '');
-        }
-        else {
-            const maskedKey = maskApiKey(apiKey);
-            welcomeLines.push(chalk.dim(`  ${this.profileConfig.model} · ${this.profileConfig.provider}`), chalk.dim('  Key: ') + chalk.green(maskedKey) + chalk.dim(' · /help for commands'), '');
-        }
-        const welcomeContent = welcomeLines.join('\n');
+        // Clean, minimal welcome — a sparkle + the essentials in a rounded box,
+        // mirroring Claude Code. The pure composeWelcomeLines() is the contract for
+        // WHICH lines appear; here we draw the same box with brand colour.
+        const flare = chalk.hex('#ff6a1f');
+        const wire = chalk.hex('#3a362e');
+        const body = welcomeBodyLines({
+            hasApiKey,
+            maskedKey: hasApiKey ? maskApiKey(apiKey) : '',
+            model: this.profileConfig.model,
+            provider: this.profileConfig.provider,
+            cwd: this.workingDir,
+        });
+        const boxed = roundedBox(body, (cell) => cell.replace('✻', flare('✻')), (s) => wire(s));
+        const welcomeContent = ['', ...updateLines, ...boxed, ''].join('\n');
         // Use renderer event system instead of direct stdout writes
         renderer.addEvent('banner', welcomeContent);
         // Update renderer meta with model info
@@ -455,7 +480,7 @@ class InteractiveShell {
             }
             try {
                 // Show password prompt
-                renderer.addEvent('system', chalk.yellow('🔐 Sudo password required'));
+                renderer.addEvent('system', chalk.yellow('Sudo password required'));
                 renderer.setSecretMode(true);
                 renderer.clearBuffer();
                 // Capture password input
@@ -804,11 +829,6 @@ class InteractiveShell {
             this.promptController?.getRenderer()?.addEvent('response', 'Email is not handled by the CLI.');
             return true;
         }
-        // Session stats
-        if (lower === '/stats' || lower === '/status') {
-            this.showSessionStats();
-            return true;
-        }
         return false;
     }
     /**
@@ -1054,7 +1074,7 @@ class InteractiveShell {
             // Clear loading message
             this.promptController?.setStatusMessage(null);
             // Show the interactive menu
-            this.promptController?.setMenu(menuItems, { title: '🤖 Select Model' }, (selected) => {
+            this.promptController?.setMenu(menuItems, { title: 'Select Model' }, (selected) => {
                 if (selected) {
                     // Parse provider:model format
                     const [providerId, ...modelParts] = selected.id.split(':');
@@ -1115,7 +1135,7 @@ class InteractiveShell {
             };
         });
         // Show the interactive menu
-        this.promptController.setMenu(menuItems, { title: '🔑 API Keys - Select to Configure' }, (selected) => {
+        this.promptController.setMenu(menuItems, { title: 'API Keys — Select to Configure' }, (selected) => {
             if (selected) {
                 // Start secret input for selected key
                 this.promptForSecret(selected.id);
@@ -1229,7 +1249,7 @@ class InteractiveShell {
     }
     showHelp() {
         if (!this.promptController?.supportsInlinePanel()) {
-            this.promptController?.setStatusMessage('Help: /model /secrets /auto /stats /keys /clear /exit');
+            this.promptController?.setStatusMessage('Help: /model /secrets /auto /keys /clear /exit');
             setTimeout(() => this.promptController?.setStatusMessage(null), 3000);
             return;
         }
@@ -1248,11 +1268,14 @@ class InteractiveShell {
             cmd('/debug') + dim('       Toggle debug mode'),
             cmd('/adversarial') + dim(' Toggle the adversarial verifier (default on)'),
             cmd('/ultracode') + dim('   Toggle ultracode operating mode (default on)'),
-            cmd('/stats') + dim('       Show session token + cost stats'),
             cmd('/keys') + dim('        Show keyboard shortcuts'),
             cmd('/clear') + dim('       Clear the screen'),
             cmd('/exit') + dim('        Quit'),
             '',
+            heading('Modes'),
+            cmd('Shift+Tab') + dim('    Cycle permission mode: default → accept edits → plan'),
+            dim('  plan mode is read-only — the agent investigates, then proposes a plan'),
+            '',
             heading('Quick start'),
             dim('  1. /key sk-…   (or set DEEPSEEK_API_KEY)'),
             dim('  2. Type any prompt; the agent reads files, edits, runs commands'),
@@ -1272,67 +1295,32 @@ class InteractiveShell {
         }
         const kb = (key) => chalk.hex('#ffb142')(key);
         const desc = (text) => chalk.dim(text);
+        // Only shortcuts the Ink Prompt (src/ui/ink/Prompt.tsx) actually
+        // implements are listed — advertising keys the input handler ignores
+        // would be a deceptive panel (Glasswing transparency).
         const lines = [
             chalk.bold.hex('#ece6da')('Keyboard Shortcuts') + chalk.dim('  (press any key to dismiss)'),
             '',
             chalk.hex('#cbf24e')('Navigation'),
             `  ${kb('Ctrl+A')} / ${kb('Home')}  ${desc('Move to start of line')}`,
             `  ${kb('Ctrl+E')} / ${kb('End')}   ${desc('Move to end of line')}`,
-            `  ${kb('Alt+←')} / ${kb('Alt+→')}  ${desc('Move word by word')}`,
+            `  ${kb('←')} / ${kb('→')}        ${desc('Move cursor')}`,
             '',
             chalk.hex('#cbf24e')('Editing'),
-            `  ${kb('Ctrl+U')}  ${desc('Clear entire line')}`,
-            `  ${kb('Ctrl+W')} / ${kb('Alt+⌫')}  ${desc('Delete word backward')}`,
+            `  ${kb('Ctrl+U')}  ${desc('Delete to start of line')}`,
+            `  ${kb('Ctrl+W')}  ${desc('Delete word backward')}`,
             `  ${kb('Ctrl+K')}  ${desc('Delete to end of line')}`,
             '',
-            chalk.hex('#cbf24e')('Display'),
-            `  ${kb('Ctrl+L')}  ${desc('Clear screen')}`,
-            `  ${kb('Ctrl+O')}  ${desc('Expand last tool result')}`,
+            chalk.hex('#cbf24e')('Modes'),
+            `  ${kb('Shift+Tab')}  ${desc('Cycle permission mode (default · accept edits · plan)')}`,
             '',
             chalk.hex('#cbf24e')('Control'),
-            `  ${kb('Ctrl+C')}  ${desc('Cancel input / interrupt')}`,
+            `  ${kb('Ctrl+C')}  ${desc('Clear input / interrupt')}`,
             `  ${kb('Ctrl+D')}  ${desc('Exit (when empty)')}`,
-            `  ${kb('Esc')}     ${desc('Interrupt AI response')}`,
         ];
         this.promptController.setInlinePanel(lines);
         this.scheduleInlinePanelDismiss();
     }
-    showSessionStats() {
-        if (!this.promptController?.supportsInlinePanel()) {
-            this.promptController?.setStatusMessage('Use /stats in interactive mode');
-            setTimeout(() => this.promptController?.setStatusMessage(null), 3000);
-            return;
-        }
-        const history = this.controller.getHistory();
-        const messageCount = history.length;
-        const userMessages = history.filter(m => m.role === 'user').length;
-        const assistantMessages = history.filter(m => m.role === 'assistant').length;
-        // Calculate approximate token usage from history
-        let totalChars = 0;
-        for (const msg of history) {
-            if (typeof msg.content === 'string') {
-                totalChars += msg.content.length;
-            }
-        }
-        const approxTokens = Math.round(totalChars / 4); // Rough estimate
-        const collapsedCount = this.promptController?.getRenderer?.()?.getCollapsedResultCount?.() ?? 0;
-        const lines = [
-            chalk.bold.hex('#ece6da')('Session Stats') + chalk.dim('  (press any key to dismiss)'),
-            '',
-            chalk.hex('#cbf24e')('Conversation'),
-            `  ${chalk.white(messageCount.toString())} messages (${userMessages} user, ${assistantMessages} assistant)`,
-            `  ${chalk.dim('~')}${chalk.white(approxTokens.toLocaleString())} ${chalk.dim('tokens (estimate)')}`,
-            '',
-            chalk.hex('#cbf24e')('Model'),
-            `  ${chalk.white(this.profileConfig.model)} ${chalk.dim('on')} ${chalk.hex('#ff9352')(this.profileConfig.provider)}`,
-            collapsedCount > 0 ? `  ${chalk.white(collapsedCount.toString())} collapsed results` : '',
-            '',
-            chalk.hex('#cbf24e')('Settings'),
-            `  Debug: ${this.debugEnabled ? chalk.green('on') : chalk.dim('off')}`,
-        ].filter(line => line !== '');
-        this.promptController.setInlinePanel(lines);
-        this.scheduleInlinePanelDismiss();
-    }
     /**
      * Auto-dismiss inline panel after timeout or on next input.
      */
@@ -1428,11 +1416,11 @@ class InteractiveShell {
                 // Check for timeout marker
                 if (eventOrTimeout && typeof eventOrTimeout === 'object' && '__timeout' in eventOrTimeout) {
                     if (hitlDepth > 0) {
-                        this.promptController?.setStatusMessage('⏱ Waiting for human decision...');
+                        this.promptController?.setStatusMessage('Waiting for human decision…');
                         continue;
                     }
                     stepTimedOut = true;
-                    this.promptController?.setStatusMessage(`⏱ Step timeout (${PROMPT_STEP_TIMEOUT_MS / 1000}s) - completing response`);
+                    this.promptController?.setStatusMessage(`Step timeout (${PROMPT_STEP_TIMEOUT_MS / 1000}s) — completing response`);
                     // Cancel the controller so the underlying agent stops generating
                     // events that would never be consumed. Without this the spinner
                     // can keep ticking against a "ghost" run after the for-await
@@ -1448,7 +1436,7 @@ class InteractiveShell {
                 const totalElapsed = Date.now() - promptStartTime;
                 if (!hasReceivedMeaningfulContent && totalElapsed > TOTAL_PROMPT_TIMEOUT_MS) {
                     if (renderer) {
-                        renderer.addEvent('response', chalk.yellow(`\n⏱ Response timeout (${Math.round(totalElapsed / 1000)}s) - completing\n`));
+                        renderer.addEvent('response', chalk.yellow(`\nResponse timeout (${Math.round(totalElapsed / 1000)}s) — completing\n`));
                     }
                     reasoningTimedOut = true;
                     try {
@@ -1542,7 +1530,6 @@ class InteractiveShell {
                     case 'tool.start': {
                         const toolName = event.toolName;
                         const args = event.parameters;
-                        let toolDisplay = `[${toolName}]`;
                         if (isHitlToolName(toolName)) {
                             hitlDepth += 1;
                         }
@@ -1552,98 +1539,34 @@ class InteractiveShell {
                         if (!toolsUsed.includes(toolName)) {
                             toolsUsed.push(toolName);
                         }
-                        const filePath = args?.['file_path'];
-                        if (filePath && (toolName === 'Write' || toolName === 'Edit')) {
+                        const filePath = (args?.['file_path'] ?? args?.['path']);
+                        if (filePath && /edit|write|create|update/i.test(toolName)) {
                             if (!filesModified.includes(filePath)) {
                                 filesModified.push(filePath);
                             }
                         }
-                        if (toolName === 'Bash' && args?.['command']) {
-                            toolDisplay = `Running: $ ${args['command']}`;
-                        }
-                        else if (toolName === 'Read' && args?.['file_path']) {
-                            toolDisplay += ` ${args['file_path']}`;
-                        }
-                        else if (toolName === 'Write' && args?.['file_path']) {
-                            toolDisplay += ` ${args['file_path']}`;
-                        }
-                        else if (toolName === 'Edit' && args?.['file_path']) {
-                            toolDisplay += ` ${args['file_path']}`;
-                        }
-                        else if (toolName === 'Search' && args?.['pattern']) {
-                            toolDisplay += ` ${args['pattern']}`;
-                        }
-                        else if (toolName === 'Grep' && args?.['pattern']) {
-                            toolDisplay += ` ${args['pattern']}`;
-                        }
-                        else if (toolName === 'WebSearch' && args?.['query']) {
-                            // Surface the query so the user can see exactly what the
-                            // agent is searching for. Without this, every web-search
-                            // turn looked like an opaque "[WebSearch]" in scrollback.
-                            toolDisplay = `🌐 WebSearch: "${String(args['query']).slice(0, 80)}"`;
-                        }
-                        else if (toolName === 'WebExtract') {
-                            const urlsArg = args?.['urls'];
-                            const urls = Array.isArray(urlsArg)
-                                ? urlsArg.filter((u) => typeof u === 'string')
-                                : typeof args?.['url'] === 'string'
-                                    ? [args['url']]
-                                    : [];
-                            const display = urls.length > 0
-                                ? urls.length === 1 ? urls[0] : `${urls[0]} (+${urls.length - 1} more)`
-                                : '...';
-                            toolDisplay = `🌐 WebExtract: ${display}`;
-                        }
+                        // Claude-Code action line: `⏺ ToolName(primaryArg)`. The dim
+                        // present-tense label drives the working spinner above the prompt.
                         if (renderer) {
-                            renderer.addEvent('tool', toolDisplay);
-                        }
-                        // Provide explanatory status messages for different tool types
-                        let statusMsg = '';
-                        if (toolName === 'Bash') {
-                            statusMsg = `Running: ${args?.['command'] ? String(args['command']).slice(0, 40) : '...'}`;
+                            renderer.addEvent('tool', formatToolCall(toolName, args, this.workingDir));
                         }
-                        else if (toolName === 'Edit' || toolName === 'Write') {
-                            statusMsg = `📝 Editing file: ${args?.['file_path'] || '...'}`;
-                        }
-                        else if (toolName === 'Read') {
-                            statusMsg = `📖 Reading file: ${args?.['file_path'] || '...'}`;
-                        }
-                        else if (toolName === 'Search' || toolName === 'Grep') {
-                            statusMsg = `🔍 Searching: ${args?.['pattern'] ? String(args['pattern']).slice(0, 30) : '...'}`;
-                        }
-                        else if (toolName === 'WebSearch') {
-                            statusMsg = `🌐 Searching web: ${args?.['query'] ? String(args['query']).slice(0, 40) : '...'}`;
-                        }
-                        else if (toolName === 'WebExtract') {
-                            const urlsArg = args?.['urls'];
-                            const firstUrl = Array.isArray(urlsArg)
-                                ? urlsArg.find((u) => typeof u === 'string')
-                                : typeof args?.['url'] === 'string' ? args['url'] : '...';
-                            statusMsg = `🌐 Extracting: ${String(firstUrl ?? '...').slice(0, 50)}`;
-                        }
-                        else {
-                            statusMsg = `🔧 Running ${toolName}...`;
-                        }
-                        this.promptController?.setStatusMessage(statusMsg);
+                        this.promptController?.setStatusMessage(toolActivityLabel(toolName, args, this.workingDir));
                         break;
                     }
                     case 'tool.complete': {
                         if (isHitlToolName(event.toolName)) {
                             hitlDepth = Math.max(0, hitlDepth - 1);
                         }
-                        // Clear the "Running X..." status since tool is complete
-                        this.promptController?.setStatusMessage('Thinking...');
+                        // Clear the activity label; the agent is thinking again.
+                        this.promptController?.setStatusMessage('Thinking…');
                         // Reset reasoning timer after tool completes
                         reasoningOnlyStartTime = null;
-                        // Show "Done:" prefix for Bash completions
-                        const isBash = event.toolName === 'Bash';
-                        if (isBash && renderer) {
-                            renderer.addEvent('tool', 'Done:');
-                        }
-                        // Pass full result to renderer - it handles display truncation
-                        // and stores full content for Ctrl+O expansion
+                        // Render the result as a dim `  ⎿  …` block (summarised, never a
+                        // raw multi-KB dump). Pre-formatted ⏺ blocks (editTools) pass
+                        // through with just their duplicate header stripped.
                         if (event.result && typeof event.result === 'string' && event.result.trim() && renderer) {
-                            renderer.addEvent('tool-result', event.result);
+                            const params = event.parameters;
+                            renderer.addEvent('tool-result', formatToolResult(event.toolName, event.result, params));
                         }
                         break;
                     }
@@ -1651,10 +1574,10 @@ class InteractiveShell {
                         if (isHitlToolName(event.toolName)) {
                             hitlDepth = Math.max(0, hitlDepth - 1);
                         }
-                        // Clear the "Running X..." status since tool errored
-                        this.promptController?.setStatusMessage('Thinking...');
+                        this.promptController?.setStatusMessage('Thinking…');
                         if (renderer) {
-                            renderer.addEvent('error', event.error);
+                            // Red `  ⎿  Error: …` line, mirroring a failed tool result.
+                            renderer.addEvent('error', formatToolError(event.error));
                         }
                         break;
                     case 'error':
@@ -1706,7 +1629,7 @@ class InteractiveShell {
                     const reasoningElapsed = Date.now() - reasoningOnlyStartTime;
                     if (reasoningElapsed > PROMPT_REASONING_TIMEOUT_MS) {
                         if (renderer) {
-                            renderer.addEvent('response', chalk.yellow(`\n⏱ Reasoning timeout (${Math.round(reasoningElapsed / 1000)}s)\n`));
+                            renderer.addEvent('response', chalk.yellow(`\nReasoning timeout (${Math.round(reasoningElapsed / 1000)}s)\n`));
                         }
                         reasoningTimedOut = true;
                     }
@@ -1935,6 +1858,21 @@ class InteractiveShell {
         this.promptController?.setStatusMessage(`HITL: ${mode}`);
         setTimeout(() => this.promptController?.setStatusMessage(null), 1500);
     }
+    /**
+     * Shift+Tab cycled the permission mode. The hint line under the input box
+     * already shows the active mode; this surfaces a brief one-line note in
+     * the chat so the change is unmistakable, matching how Claude Code echoes
+     * a mode switch.
+     */
+    handlePermissionModeChange(mode) {
+        const note = mode === 'plan'
+            ? 'plan mode — read-only; I won’t edit files or run commands until you approve a plan'
+            : mode === 'acceptEdits'
+                ? 'accept edits on — file edits apply without the adversarial pre-flight'
+                : 'default mode';
+        this.promptController?.setStatusMessage(note);
+        setTimeout(() => this.promptController?.setStatusMessage(null), 2500);
+    }
     handleCtrlC(info) {
         const now = Date.now();
         // Reset count if more than 2 seconds since last Ctrl+C