erosolar-cli 2.1.11 → 2.1.12

package/dist/shell/interactiveShell.js

@@ -1,4 +1,5 @@
 import { stdin as input, stdout as output, exit } from 'node:process';
+import { homedir } from 'node:os';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 import { existsSync, readFileSync } from 'node:fs';
@@ -237,6 +238,11 @@ export class InteractiveShell {
             description: 'Show available and loaded plugins',
             category: 'configuration',
         });
+        this.slashCommands.push({
+            command: '/approvals',
+            description: 'Switch between auto and approval mode for high-impact actions',
+            category: 'configuration',
+        });
         this.slashCommands.push({
             command: '/offsec',
             description: 'AlphaZero offensive security run (start/status/next)',
@@ -283,6 +289,8 @@ export class InteractiveShell {
         this.alphaZeroMetrics = new MetricsTracker(`${this.profile}-${Date.now()}`);
         this.setupStatusTracking();
         this.refreshContextGauge();
+        // Prime renderer state before it first paints
+        this.refreshControlBar();
         // Start terminal input (sets up handlers)
         this.terminalInput.start();
         // Allow planning tools (e.g., ProposePlan) to open the interactive approval UI just like Codex CLI
@@ -290,7 +298,6 @@ export class InteractiveShell {
         // Set up command autocomplete with all slash commands
         this.setupCommandAutocomplete();
         // Render chat box immediately using the streaming UI lifecycle
-        this.refreshControlBar();
         this.syncRendererInput();
         this.renderer?.render();
         this.rebuildAgent();
@@ -420,6 +427,15 @@ export class InteractiveShell {
                 return this.editGuardMode;
         }
     }
+    abbreviatePath(pathValue) {
+        if (!pathValue)
+            return '—';
+        const home = homedir();
+        if (home && pathValue.startsWith(home)) {
+            return pathValue.replace(home, '~');
+        }
+        return pathValue;
+    }
     async checkAndShowUpdates() {
         try {
             const { checkForUpdates, formatUpdateNotification } = await import('../core/updateChecker.js');
@@ -490,6 +506,7 @@ export class InteractiveShell {
         const statusParts = [
             theme.success('Ready'),
             `${theme.primary('Auto')}: ${this.autoContinueEnabled ? theme.success('on') : theme.ui.muted('off')}`,
+            `${theme.primary('Approvals')}: ${this.criticalApprovalMode === 'auto' ? theme.ui.muted('auto') : theme.warning('ask')}`,
             `${theme.primary('Verify')}: ${this.verificationEnabled ? theme.success('on') : theme.ui.muted('off')}`,
             `${theme.primary('Thinking')}: ${theme.info(thinkingLabel)}`,
             `${theme.primary('Autosave')}: ${this.autosaveEnabled ? theme.success('on') : theme.ui.muted('off')}`,
@@ -649,6 +666,7 @@ export class InteractiveShell {
             '/bug',
             '/changes', '/summary',
             '/export',
+            '/approvals',
             // Configuration menus
             '/model', '/models',
             '/secrets',
@@ -1230,6 +1248,78 @@ export class InteractiveShell {
         display.showWarning('Invalid input. Enter a step number, command (go/cancel/all/none), or your own solution.');
         this.syncRendererInput();
     }
+    async runWithCriticalApproval(label, detail, action) {
+        if (this.criticalApprovalMode === 'auto') {
+            await action();
+            return;
+        }
+        if (this.pendingInteraction && this.pendingInteraction.type === 'critical-approval') {
+            display.showWarning('Finish the pending approval first.');
+            return;
+        }
+        await new Promise((resolve) => {
+            this.pendingInteraction = {
+                type: 'critical-approval',
+                label,
+                detail,
+                onApprove: async () => {
+                    this.pendingInteraction = null;
+                    try {
+                        await action();
+                    }
+                    catch (error) {
+                        display.showError(error instanceof Error ? error.message : String(error), error);
+                    }
+                    resolve();
+                },
+                onCancel: () => {
+                    this.pendingInteraction = null;
+                    display.showInfo('Action cancelled.');
+                    resolve();
+                },
+            };
+            this.showCriticalApprovalPrompt(label, detail);
+        });
+    }
+    showCriticalApprovalPrompt(label, detail) {
+        const lines = [];
+        lines.push(theme.gradient.primary('⚠️ Approval required'));
+        lines.push('');
+        lines.push(theme.bold(label));
+        if (detail) {
+            lines.push(theme.ui.muted(detail));
+        }
+        lines.push('');
+        lines.push('Type "yes" to proceed or "no" to cancel.');
+        display.showSystemMessage(lines.join('\n'));
+        this.syncRendererInput();
+    }
+    async handleCriticalApprovalInput(input) {
+        const pending = this.pendingInteraction;
+        if (!pending || pending.type !== 'critical-approval') {
+            return;
+        }
+        const normalized = input.trim().toLowerCase();
+        if (!normalized) {
+            display.showWarning('Enter "yes" to proceed or "no" to cancel.');
+            this.syncRendererInput();
+            return;
+        }
+        if (normalized === 'yes' || normalized === 'y') {
+            this.pendingInteraction = null;
+            await pending.onApprove();
+            this.syncRendererInput();
+            return;
+        }
+        if (normalized === 'no' || normalized === 'n' || normalized === 'cancel' || normalized === 'c') {
+            this.pendingInteraction = null;
+            pending.onCancel?.();
+            this.syncRendererInput();
+            return;
+        }
+        display.showWarning('Please respond with "yes" to proceed or "no" to cancel.');
+        this.syncRendererInput();
+    }
     setupHandlers() {
         // Handle terminal resize
         output.on('resize', () => {
@@ -1350,9 +1440,11 @@ export class InteractiveShell {
             criticalApprovalMode: this.criticalApprovalMode,
             criticalApprovalHotkey: 'ctrl+shift+a',
         });
+        const workspaceDisplay = this.abbreviatePath(this.workingDir);
         this.terminalInput.setChromeMeta({
             profile: this.profileLabel,
-            workspace: this.workingDir,
+            workspace: workspaceDisplay,
+            directory: workspaceDisplay,
             writes: this.describeEditGuardMode(),
             sessionLabel: this.describeSessionLabel(),
             thinkingLabel: (this.thinkingMode || 'off').toString(),
@@ -1432,15 +1524,6 @@ export class InteractiveShell {
      * All three can be shown simultaneously (Erosolar-CLI style).
      */
     refreshStatusLine(forceRender = false) {
-        const statusText = this.formatStatusLine(this.statusLineState);
-        // Compose streaming/override/base status into a single line so the prompt
-        // looks the same before and during streaming.
-        this.terminalInput.setStatusLine({
-            streaming: this.streamingStatusLabel,
-            override: this.statusMessageOverride,
-            main: statusText,
-        });
-        // Surface meta header (elapsed + context usage) above the divider
         const elapsedSeconds = this.getAiRuntimeSeconds();
         const thinkingMs = display.isSpinnerActive() ? display.getThinkingElapsedMs() : null;
         const tokensUsed = this.latestTokenUsage.used;
@@ -1873,6 +1956,9 @@ export class InteractiveShell {
             case 'plan-approval':
                 await this.handlePlanApprovalInput(input);
                 return true;
+            case 'critical-approval':
+                await this.handleCriticalApprovalInput(input);
+                return true;
             default:
                 return false;
         }
@@ -1892,6 +1978,9 @@ export class InteractiveShell {
             case '/features':
                 this.showFeaturesMenu(input);
                 break;
+            case '/approvals':
+                this.handleApprovalsCommand(input);
+                break;
             case '/learn':
                 this.showLearningStatus(input);
                 break;
@@ -2075,6 +2164,7 @@ export class InteractiveShell {
             `    ${theme.info('Shift+Tab')}      ${theme.ui.muted('Toggle edit mode (auto/ask)')}`,
             `    ${theme.info('Option+V')}       ${theme.ui.muted('Toggle verification')}`,
             `    ${theme.info('Option+C')}       ${theme.ui.muted('Toggle auto-continue')}`,
+            `    ${theme.info('Ctrl+Shift+A')}   ${theme.ui.muted('Toggle approvals for high-impact actions')}`,
             `    ${theme.info('Option+T')}       ${theme.ui.muted('Cycle thinking mode')}`,
             `    ${theme.info('Option+E')}       ${theme.ui.muted('Toggle edit permission mode')}`,
             `    ${theme.info('Option+X')}       ${theme.ui.muted('Clear/compact context')}`,
@@ -2639,40 +2729,43 @@ export class InteractiveShell {
             return;
         }
         if (subcommand === 'apply') {
-            display.showSystemMessage(theme.gradient.primary('🚀 Running Self-Improvement Cycle...'));
-            display.showSystemMessage('');
-            try {
-                const result = await runSelfImprovementCycle(this.workingDir, {
-                    maxChanges: 3,
-                    minConfidence: 0.7,
-                    runTests: true,
-                    autoCommit: true,
-                });
-                const lines = [];
-                lines.push(theme.bold('Results:'));
-                lines.push(result.summary);
-                lines.push('');
-                if (result.applied > 0) {
-                    lines.push(theme.success(`✅ Applied ${result.applied} improvements!`));
-                    for (const r of result.results.filter(r => r.success)) {
-                        lines.push(`  - Files: ${r.filesChanged.join(', ')}`);
-                        if (r.commitHash) {
-                            lines.push(`    Commit: ${theme.ui.muted(r.commitHash)}`);
-                            lines.push(`    Rollback: ${theme.dim(r.rollbackCommand ?? '')}`);
+            const runApply = async () => {
+                display.showSystemMessage(theme.gradient.primary('🚀 Running Self-Improvement Cycle...'));
+                display.showSystemMessage('');
+                try {
+                    const result = await runSelfImprovementCycle(this.workingDir, {
+                        maxChanges: 3,
+                        minConfidence: 0.7,
+                        runTests: true,
+                        autoCommit: true,
+                    });
+                    const lines = [];
+                    lines.push(theme.bold('Results:'));
+                    lines.push(result.summary);
+                    lines.push('');
+                    if (result.applied > 0) {
+                        lines.push(theme.success(`✅ Applied ${result.applied} improvements!`));
+                        for (const r of result.results.filter(r => r.success)) {
+                            lines.push(`  - Files: ${r.filesChanged.join(', ')}`);
+                            if (r.commitHash) {
+                                lines.push(`    Commit: ${theme.ui.muted(r.commitHash)}`);
+                                lines.push(`    Rollback: ${theme.dim(r.rollbackCommand ?? '')}`);
+                            }
                         }
                     }
-                }
-                else {
-                    lines.push(theme.warning('No improvements were applied.'));
-                    for (const r of result.results.filter(r => !r.success)) {
-                        lines.push(`  ${theme.error('✗')} ${r.error}`);
+                    else {
+                        lines.push(theme.warning('No improvements were applied.'));
+                        for (const r of result.results.filter(r => !r.success)) {
+                            lines.push(`  ${theme.error('✗')} ${r.error}`);
+                        }
                     }
+                    display.showSystemMessage(lines.join('\n'));
                 }
-                display.showSystemMessage(lines.join('\n'));
-            }
-            catch (error) {
-                display.showError(`Self-improvement failed: ${error instanceof Error ? error.message : String(error)}`);
-            }
+                catch (error) {
+                    display.showError(`Self-improvement failed: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            };
+            await this.runWithCriticalApproval('Apply self-improvement changes', 'Runs automated fixes with tests and commits before continuing.', runApply);
             return;
         }
         if (subcommand === 'dry-run') {
@@ -2701,7 +2794,7 @@ export class InteractiveShell {
             return;
         }
         if (subcommand === 'auto') {
-            void this.runAutonomousImprovementMode();
+            await this.runWithCriticalApproval('Start autonomous improvement mode', 'Allows the CLI to apply and validate changes until stopped.', () => this.runAutonomousImprovementMode());
             return;
         }
         if (subcommand === 'stop') {
@@ -2710,13 +2803,15 @@ export class InteractiveShell {
             return;
         }
         if (subcommand === 'rollback') {
-            const result = emergencyRollback(this.workingDir);
-            if (result.success) {
-                display.showSuccess(result.message);
-            }
-            else {
-                display.showError(result.message);
-            }
+            await this.runWithCriticalApproval('Emergency rollback of self-improvement', 'Restores the last checkpoint created by the improvement engine.', () => {
+                const result = emergencyRollback(this.workingDir);
+                if (result.success) {
+                    display.showSuccess(result.message);
+                }
+                else {
+                    display.showError(result.message);
+                }
+            });
             return;
         }
         if (subcommand === 'status') {
@@ -2919,64 +3014,67 @@ export class InteractiveShell {
             return;
         }
         if (subcommand === 'start') {
-            display.showSystemMessage(theme.gradient.primary('🧬 Starting Self-Evolution Mode'));
-            display.showSystemMessage('');
-            display.showSystemMessage(theme.bold('Safety Features:'));
-            display.showSystemMessage('  • Git checkpoint created before starting');
-            display.showSystemMessage('  • Each change validated with build + tests');
-            display.showSystemMessage('  • Auto-rollback on failures');
-            display.showSystemMessage('  • Auto-relaunch with improved code');
-            display.showSystemMessage('  • Press Ctrl+C to stop gracefully');
-            display.showSystemMessage('');
-            try {
-                const result = await runSelfEvolution(this.workingDir, {
-                    maxIterations: 50,
-                    minConfidence: 0.8,
-                    runTests: true,
-                    autoRelaunch: true,
-                }, {
-                    onStart: () => {
-                        display.showInfo('Evolution started. Creating checkpoint...');
-                    },
-                    onIteration: (iteration, issues) => {
-                        display.showSystemMessage(`\n[Iteration ${iteration}] Found ${issues.length} high-confidence issues`);
-                    },
-                    onFix: (issue, success) => {
-                        if (success) {
-                            display.showSuccess(`Fixed: ${issue.description.slice(0, 50)}`);
-                        }
-                        else {
-                            display.showWarning(`Failed: ${issue.description.slice(0, 50)}`);
-                        }
-                    },
-                    onRelaunch: () => {
-                        display.showSystemMessage('');
-                        display.showSystemMessage(theme.gradient.primary('🔄 Relaunching with improved code...'));
-                    },
-                    onComplete: (result) => {
-                        display.showSystemMessage('');
-                        display.showSuccess(`Evolution complete! Fixed ${result.issuesFixed} issues.`);
-                    },
-                    onError: (error) => {
-                        display.showError(`Evolution error: ${error}`);
-                    },
-                });
-                const lines = [];
-                lines.push('');
-                lines.push(theme.bold('Evolution Result:'));
-                lines.push(`  Success: ${result.success ? theme.success('Yes') : theme.error('No')}`);
-                lines.push(`  Iterations: ${result.iteration}`);
-                lines.push(`  Issues Found: ${result.issuesFound}`);
-                lines.push(`  Issues Fixed: ${result.issuesFixed}`);
-                if (result.error) {
-                    lines.push(`  Error: ${theme.error(result.error)}`);
+            const startEvolution = async () => {
+                display.showSystemMessage(theme.gradient.primary('🧬 Starting Self-Evolution Mode'));
+                display.showSystemMessage('');
+                display.showSystemMessage(theme.bold('Safety Features:'));
+                display.showSystemMessage('  • Git checkpoint created before starting');
+                display.showSystemMessage('  • Each change validated with build + tests');
+                display.showSystemMessage('  • Auto-rollback on failures');
+                display.showSystemMessage('  • Auto-relaunch with improved code');
+                display.showSystemMessage('  • Press Ctrl+C to stop gracefully');
+                display.showSystemMessage('');
+                try {
+                    const result = await runSelfEvolution(this.workingDir, {
+                        maxIterations: 50,
+                        minConfidence: 0.8,
+                        runTests: true,
+                        autoRelaunch: true,
+                    }, {
+                        onStart: () => {
+                            display.showInfo('Evolution started. Creating checkpoint...');
+                        },
+                        onIteration: (iteration, issues) => {
+                            display.showSystemMessage(`\n[Iteration ${iteration}] Found ${issues.length} high-confidence issues`);
+                        },
+                        onFix: (issue, success) => {
+                            if (success) {
+                                display.showSuccess(`Fixed: ${issue.description.slice(0, 50)}`);
+                            }
+                            else {
+                                display.showWarning(`Failed: ${issue.description.slice(0, 50)}`);
+                            }
+                        },
+                        onRelaunch: () => {
+                            display.showSystemMessage('');
+                            display.showSystemMessage(theme.gradient.primary('🔄 Relaunching with improved code...'));
+                        },
+                        onComplete: (result) => {
+                            display.showSystemMessage('');
+                            display.showSuccess(`Evolution complete! Fixed ${result.issuesFixed} issues.`);
+                        },
+                        onError: (error) => {
+                            display.showError(`Evolution error: ${error}`);
+                        },
+                    });
+                    const lines = [];
+                    lines.push('');
+                    lines.push(theme.bold('Evolution Result:'));
+                    lines.push(`  Success: ${result.success ? theme.success('Yes') : theme.error('No')}`);
+                    lines.push(`  Iterations: ${result.iteration}`);
+                    lines.push(`  Issues Found: ${result.issuesFound}`);
+                    lines.push(`  Issues Fixed: ${result.issuesFixed}`);
+                    if (result.error) {
+                        lines.push(`  Error: ${theme.error(result.error)}`);
+                    }
+                    lines.push(`  Next Action: ${result.nextAction}`);
+                    display.showSystemMessage(lines.join('\n'));
                 }
-                lines.push(`  Next Action: ${result.nextAction}`);
-                display.showSystemMessage(lines.join('\n'));
-            }
-            catch (error) {
-                display.showError(`Evolution failed: ${error instanceof Error ? error.message : String(error)}`);
-            }
+                catch (error) {
+                    display.showError(`Evolution failed: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            };
+            await this.runWithCriticalApproval('Start self-evolution mode', 'Automates repo changes with checkpoints, tests, and relaunch.', startEvolution);
             return;
         }
         if (subcommand === 'stop') {
@@ -3243,42 +3341,48 @@ export class InteractiveShell {
             '       /offsec runs';
         if (sub === 'start') {
             const rest = args.slice(1);
-            const scope = [];
-            const objectiveParts = [];
-            for (let i = 0; i < rest.length; i++) {
-                if (rest[i]?.toLowerCase() === '--scope') {
-                    const scopeArg = rest[i + 1];
-                    if (scopeArg) {
-                        scope.push(...scopeArg.split(',').map((s) => s.trim()).filter(Boolean));
+            const startRun = async () => {
+                const scope = [];
+                const objectiveParts = [];
+                for (let i = 0; i < rest.length; i++) {
+                    if (rest[i]?.toLowerCase() === '--scope') {
+                        const scopeArg = rest[i + 1];
+                        if (scopeArg) {
+                            scope.push(...scopeArg.split(',').map((s) => s.trim()).filter(Boolean));
+                        }
+                        i += 1;
+                        continue;
                     }
-                    i += 1;
-                    continue;
+                    objectiveParts.push(rest[i]);
                 }
-                objectiveParts.push(rest[i]);
-            }
-            const objective = objectiveParts.join(' ').trim();
-            if (!objective) {
-                display.showWarning('Provide an objective. Example: /offsec start gain shell on api.example.com --scope api.example.com');
-                display.showInfo(usage);
-                return;
-            }
-            const run = startOffsecRun(objective, scope);
-            this.offsecRunId = run.id;
-            const next = getOffsecNextActions(run.id, 3);
-            display.showSystemMessage(theme.gradient.primary('🛡️ Offsec AlphaZero run started'));
-            display.showSystemMessage(formatOffsecStatus(run, next));
+                const objective = objectiveParts.join(' ').trim();
+                if (!objective) {
+                    display.showWarning('Provide an objective. Example: /offsec start gain shell on api.example.com --scope api.example.com');
+                    display.showInfo(usage);
+                    return;
+                }
+                const run = startOffsecRun(objective, scope);
+                this.offsecRunId = run.id;
+                const next = getOffsecNextActions(run.id, 3);
+                display.showSystemMessage(theme.gradient.primary('🛡️ Offsec AlphaZero run started'));
+                display.showSystemMessage(formatOffsecStatus(run, next));
+            };
+            await this.runWithCriticalApproval('Start offensive security run', 'Begins an automated security workflow and logs results to ~/.erosolar/offsec.', startRun);
             return;
         }
         if (sub === 'resume') {
-            const targetRun = args[1] ?? this.offsecRunId;
-            const run = resumeOffsecRun(targetRun);
-            if (!run) {
-                display.showWarning(`No offsec run found for id ${targetRun ?? '<unset>'}`);
-                return;
-            }
-            this.offsecRunId = run.id;
-            display.showSystemMessage(theme.gradient.primary(`Resumed offsec run ${run.id}`));
-            display.showSystemMessage(formatOffsecStatus(run, getOffsecNextActions(run.id, 3)));
+            const resumeRun = async () => {
+                const targetRun = args[1] ?? this.offsecRunId;
+                const run = resumeOffsecRun(targetRun);
+                if (!run) {
+                    display.showWarning(`No offsec run found for id ${targetRun ?? '<unset>'}`);
+                    return;
+                }
+                this.offsecRunId = run.id;
+                display.showSystemMessage(theme.gradient.primary(`Resumed offsec run ${run.id}`));
+                display.showSystemMessage(formatOffsecStatus(run, getOffsecNextActions(run.id, 3)));
+            };
+            await this.runWithCriticalApproval('Resume offensive security run', 'Continues a previously started offensive security workflow.', resumeRun);
             return;
         }
         if (sub === 'runs') {
@@ -3933,6 +4037,35 @@ export class InteractiveShell {
         lines.push(theme.ui.muted('Shift+Enter enables multi-line input.'));
         display.showSystemMessage(lines.join('\n'));
     }
+    handleApprovalsCommand(input) {
+        const mode = input.split(/\s+/)[1]?.toLowerCase();
+        const showStatus = () => {
+            const lines = [];
+            lines.push(theme.bold('High-Impact Action Approvals'));
+            lines.push('');
+            lines.push(`Current mode: ${this.criticalApprovalMode === 'auto' ? theme.ui.muted('auto (no prompt)') : theme.warning('ask before high-impact actions')}`);
+            lines.push('');
+            lines.push(theme.secondary('Switch mode:'));
+            lines.push('  /approvals auto   - run critical flows without prompting');
+            lines.push('  /approvals ask    - require approval for major actions');
+            lines.push('');
+            lines.push(theme.ui.muted('Keyboard: Ctrl+Shift+A toggles modes.'));
+            display.showSystemMessage(lines.join('\n'));
+        };
+        if (!mode || mode === 'status') {
+            showStatus();
+            return;
+        }
+        if (['auto', 'default', 'off'].includes(mode)) {
+            this.setCriticalApprovalMode('auto', 'command');
+            return;
+        }
+        if (['ask', 'approval', 'require', 'confirm', 'on'].includes(mode)) {
+            this.setCriticalApprovalMode('approval', 'command');
+            return;
+        }
+        display.showWarning('Usage: /approvals [auto|ask|status]');
+    }
     handlePermissionsCommand() {
         const lines = [];
         lines.push(theme.bold('Tool Permissions'));
@@ -3947,6 +4080,9 @@ export class InteractiveShell {
         lines.push('  Shift+Tab    Cycle through modes');
         lines.push('  Option+E     Toggle edit permission');
         lines.push('');
+        lines.push(theme.secondary('High-impact approvals:'));
+        lines.push('  /approvals ask|auto    (Ctrl+Shift+A to toggle)');
+        lines.push('');
         lines.push(theme.ui.muted('Use /tools to manage which tool suites are enabled.'));
         display.showSystemMessage(lines.join('\n'));
     }