erosolar-cli 2.1.203 → 2.1.205

package/dist/shell/interactiveShell.js

@@ -34,7 +34,6 @@ import { classifyTaskType } from '../core/alphaZeroEngine.js';
 import { analyzeImprovementOpportunities, runSelfImprovementCycle, getImprovementSummary, runAutonomousImprovement, requestAutoImprovementStop, getAutoImprovementState, emergencyRollback, } from '../core/selfImprovement.js';
 import { listAvailablePlugins } from '../plugins/index.js';
 import { isValidSourceRepo, getRepoName, analyzeSource, runSelfEvolution, stopEvolution, getEvolutionStatus, emergencyEvolutionRollback, learnSourcePatterns, generateFix, } from '../core/selfEvolution.js';
-import { analyzeTokenUsage, discoverModularTargets, getModularStatusDisplay, generateContextOptimizations, getGuidelines, deleteGuideline, getPendingActions, executeModularAction, } from '../core/alphaZeroModular.js';
 import { generateTestFlows, detectBugs, detectUIUpdates, saveTestFlows, saveBugReports, saveUIUpdates, getTestFlowStatus, } from '../core/intelligentTestFlows.js';
 import { PromptController } from '../ui/PromptController.js';
 import { enterStreamingMode, exitStreamingMode, isStreamingMode } from '../ui/globalWriteLock.js';
@@ -802,7 +801,7 @@ export class InteractiveShell {
             '/plugins',
             '/skills',
             // Self-improvement
-            '/evolve', '/modular', '/a0',
+            '/evolve',
             '/learn', '/improve',
             '/test', '/tests',
             // Metrics
@@ -2542,10 +2541,6 @@ export class InteractiveShell {
                 case '/evolve':
                     void this.handleEvolveCommand(input);
                     break;
-                case '/modular':
-                case '/a0':
-                    void this.handleModularCommand(input);
-                    break;
                 case '/test':
                 case '/tests':
                     void this.handleTestCommand(input);
@@ -3788,157 +3783,9 @@ export class InteractiveShell {
             display.showSystemMessage(lines.join('\n'));
             return;
         }
-        // ========== MODULAR / TOKEN OPTIMIZATION COMMANDS ==========
-        if (subcommand === 'tokens') {
-            display.showSystemMessage(theme.gradient.primary('🔍 Analyzing Token Usage...'));
-            display.showSystemMessage('');
-            const analysis = analyzeTokenUsage(this.workingDir);
-            const lines = [];
-            lines.push(`Total Tokens: ${theme.bold(analysis.totalTokens.toLocaleString())}`);
-            lines.push('');
-            lines.push(theme.bold('By Category:'));
-            for (const [category, tokens] of Object.entries(analysis.byCategory)) {
-                const pct = ((tokens / analysis.totalTokens) * 100).toFixed(1);
-                const bar = '█'.repeat(Math.floor(Number(pct) / 5)) + '░'.repeat(20 - Math.floor(Number(pct) / 5));
-                lines.push(`  ${category.padEnd(15)} ${bar} ${tokens.toLocaleString().padStart(8)} (${pct}%)`);
-            }
-            lines.push('');
-            lines.push(theme.bold('Optimization Opportunities:'));
-            for (const opp of analysis.optimizationOpportunities.slice(0, 10)) {
-                lines.push(`  ${opp.autoFixable ? '✅' : '⚠️'} ${opp.target}`);
-                lines.push(`     Save: ${opp.savings} tokens (${opp.savingsPercent}%)`);
-                lines.push(`     ${theme.dim(opp.strategy)}`);
-            }
-            display.showSystemMessage(lines.join('\n'));
-            return;
-        }
-        if (subcommand === 'targets') {
-            const targets = discoverModularTargets(this.workingDir);
-            const lines = [];
-            lines.push(theme.gradient.primary('🎯 Modular Targets'));
-            lines.push('');
-            lines.push(`Found ${theme.bold(String(targets.length))} targets`);
-            lines.push('');
-            const byType = {};
-            for (const target of targets) {
-                if (!byType[target.type])
-                    byType[target.type] = [];
-                byType[target.type].push(target);
-            }
-            for (const [type, typeTargets] of Object.entries(byType)) {
-                lines.push(theme.bold(`${type} (${typeTargets.length}):`));
-                for (const target of typeTargets.slice(0, 5)) {
-                    const issueCount = target.issues.length;
-                    const icon = issueCount === 0 ? '✅' : issueCount < 3 ? '⚠️' : '🔴';
-                    lines.push(`  ${icon} ${target.name} (${target.tokenCount} tokens)`);
-                    if (target.issues.length > 0) {
-                        lines.push(`     ${theme.dim(target.issues[0]?.description ?? '')}`);
-                    }
-                }
-                if (typeTargets.length > 5) {
-                    lines.push(`  ${theme.dim(`... and ${typeTargets.length - 5} more`)}`);
-                }
-                lines.push('');
-            }
-            display.showSystemMessage(lines.join('\n'));
-            return;
-        }
-        if (subcommand === 'optimize') {
-            const optimizations = generateContextOptimizations(this.workingDir);
-            const lines = [];
-            lines.push(theme.gradient.primary('⚡ Context Optimization Strategies'));
-            lines.push('');
-            const totalSavings = optimizations.reduce((sum, o) => sum + o.tokensSaved, 0);
-            lines.push(`Total potential savings: ${theme.success(totalSavings.toLocaleString())} tokens`);
-            lines.push('');
-            for (const opt of optimizations) {
-                const icon = opt.impact === 'high' ? '🔴' : opt.impact === 'medium' ? '🟡' : '⚪';
-                lines.push(`${icon} ${theme.bold(opt.strategy)}`);
-                lines.push(`   ${opt.description}`);
-                lines.push(`   Savings: ${theme.success(opt.tokensSaved.toLocaleString())} tokens`);
-                lines.push(`   ${theme.dim(opt.implementation)}`);
-                lines.push('');
-            }
-            display.showSystemMessage(lines.join('\n'));
-            return;
-        }
-        if (subcommand === 'guidelines') {
-            const action = args[1]?.toLowerCase();
-            if (action === 'add') {
-                display.showInfo('Use: /evolve guidelines add <id> <category> <rule>');
-                return;
-            }
-            if (action === 'delete' && args[2]) {
-                const result = deleteGuideline(args[2]);
-                if (result.success) {
-                    display.showSuccess(`Deleted guideline: ${args[2]}`);
-                }
-                else {
-                    display.showError(result.error ?? 'Failed to delete');
-                }
-                return;
-            }
-            const guidelines = getGuidelines();
-            const lines = [];
-            lines.push(theme.gradient.primary('📋 Active Guidelines'));
-            lines.push('');
-            for (const g of guidelines) {
-                const icon = g.severity === 'must' ? '🔴' : g.severity === 'should' ? '🟡' : '⚪';
-                lines.push(`${icon} [${g.category}] ${theme.bold(g.id)}`);
-                lines.push(`   ${g.rule}`);
-                lines.push(`   ${theme.dim(g.rationale)}`);
-                lines.push('');
-            }
-            display.showSystemMessage(lines.join('\n'));
-            return;
-        }
-        if (subcommand === 'actions') {
-            const actions = getPendingActions();
-            const lines = [];
-            lines.push(theme.gradient.primary('📝 Pending Actions'));
-            lines.push('');
-            if (actions.length === 0) {
-                lines.push(theme.dim('No pending actions'));
-            }
-            else {
-                for (let i = 0; i < actions.length; i++) {
-                    const action = actions[i];
-                    lines.push(`${i + 1}. [${action.type}] ${action.target.name}`);
-                    lines.push(`   Impact: ${action.tokenImpact > 0 ? '+' : ''}${action.tokenImpact} tokens`);
-                    lines.push(`   ${theme.dim(action.changes.slice(0, 60))}`);
-                    lines.push('');
-                }
-                lines.push('Run /evolve execute <number> to apply an action');
-            }
-            display.showSystemMessage(lines.join('\n'));
-            return;
-        }
-        if (subcommand === 'execute') {
-            const actionIndex = parseInt(args[1] ?? '', 10) - 1;
-            const result = executeModularAction(actionIndex, this.workingDir);
-            if (result.success) {
-                display.showSuccess('Action executed successfully');
-            }
-            else {
-                display.showError(result.error ?? 'Failed to execute');
-            }
-            return;
-        }
-        // Default: show combined status
+        // Default: show status
         const evolveStatus = getEvolutionStatus(this.workingDir);
-        const modularStatus = getModularStatusDisplay(this.workingDir);
         display.showSystemMessage(evolveStatus);
-        display.showSystemMessage('');
-        display.showSystemMessage(modularStatus);
-    }
-    /**
-     * Handle /modular command - redirects to /evolve (merged functionality)
-     */
-    async handleModularCommand(input) {
-        // Redirect /modular to /evolve with the same arguments
-        const evolveInput = input.replace(/^\/(?:modular|a0)\s*/i, '/evolve ');
-        display.showInfo('Note: /modular is now part of /evolve. Use /evolve tokens, /evolve targets, etc.');
-        await this.handleEvolveCommand(evolveInput);
     }
     /**
      * Handle /test command for intelligent test flows
@@ -5538,14 +5385,15 @@ export class InteractiveShell {
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
-        if (!Number.isFinite(choice)) {
-            display.showWarning('Please enter a valid number.');
+        const optionCount = pending.options.length;
+        if (!Number.isFinite(choice) || choice < 1 || choice > optionCount) {
+            display.showWarning(`Enter a number between 1 and ${optionCount}.`);
             this.syncRendererInput();
             return;
         }
         const option = pending.options[choice - 1];
         if (!option) {
-            display.showWarning('That option is not available.');
+            display.showWarning(`Enter a number between 1 and ${optionCount}.`);
             this.syncRendererInput();
             return;
         }
@@ -5558,8 +5406,9 @@ export class InteractiveShell {
             return;
         }
         const trimmed = input.trim();
+        const optionCount = pending.options.length;
         if (!trimmed) {
-            display.showWarning('Enter a number, type "back", or type "cancel".');
+            display.showWarning(`Enter 1-${optionCount}, "back", or "cancel".`);
             this.syncRendererInput();
             return;
         }
@@ -5576,14 +5425,14 @@ export class InteractiveShell {
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
-        if (!Number.isFinite(choice)) {
-            display.showWarning('Please enter a valid number.');
+        if (!Number.isFinite(choice) || choice < 1 || choice > optionCount) {
+            display.showWarning(`Enter 1-${optionCount}, "back", or "cancel".`);
             this.syncRendererInput();
             return;
         }
         const preset = pending.options[choice - 1];
         if (!preset) {
-            display.showWarning('That option is not available.');
+            display.showWarning(`Enter 1-${optionCount}, "back", or "cancel".`);
             this.syncRendererInput();
             return;
         }
@@ -5621,8 +5470,9 @@ export class InteractiveShell {
             return;
         }
         const trimmed = input.trim();
+        const optionCount = pending.options.length;
         if (!trimmed) {
-            display.showWarning('Enter a number or type cancel.');
+            display.showWarning(`Enter 1-${optionCount} or "cancel".`);
             this.syncRendererInput();
             return;
         }
@@ -5634,18 +5484,21 @@ export class InteractiveShell {
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
-        if (!Number.isFinite(choice)) {
-            display.showWarning('Please enter a valid number.');
+        if (!Number.isFinite(choice) || choice < 1 || choice > optionCount) {
+            display.showWarning(`Enter 1-${optionCount} or "cancel".`);
             this.syncRendererInput();
             return;
         }
         const secret = pending.options[choice - 1];
         if (!secret) {
-            display.showWarning('That option is not available.');
+            display.showWarning(`Enter 1-${optionCount} or "cancel".`);
             this.syncRendererInput();
             return;
         }
-        this.showInlinePanel([`Enter a new value for ${secret.label} or type "cancel".`]);
+        this.showInlinePanel([
+            `Enter new ${secret.label} or "cancel" to keep current value.`,
+            theme.ui.muted('Paste your API key - input is hidden for security.'),
+        ]);
         this.pendingInteraction = { type: 'secret-input', secret };
         this.terminalInput.setSecretMode(true);
         this.syncRendererInput();
@@ -7037,12 +6890,18 @@ Return ONLY JSON array:
             if (this.renderer) {
                 this.renderer.hideCompactingStatus();
             }
-            // Show the Claude Code style separator: ══ Conversation compacted · ctrl+o for history ═
+            // Format token savings for display
+            const tokenSavingsText = bestTokenSavings >= 1000
+                ? `${(bestTokenSavings / 1000).toFixed(1)}k`
+                : String(bestTokenSavings);
+            const percentText = Math.round(bestPercentSavings);
+            // Show the Claude Code style separator with savings info
+            const compactMessage = `Conversation compacted · freed ${tokenSavingsText} tokens (${percentText}%) · ctrl+o for history`;
             if (this.renderer) {
-                this.renderer.addCompactBlock('', 'Conversation compacted · ctrl+o for history');
+                this.renderer.addCompactBlock('', compactMessage);
             }
             else {
-                display.showSystemMessage('══ Conversation compacted · ctrl+o for history ═');
+                display.showSystemMessage(`══ ${compactMessage} ═`);
             }
             this.recordContextCompaction({
                 timestamp: Date.now(),
@@ -7389,34 +7248,30 @@ Return ONLY JSON array:
         const secret = info.secret ?? null;
         const providerLabel = info.provider ? this.providerLabel(info.provider) : 'the selected provider';
         const portalLink = this.getApiKeyPortalLink(secret, info.provider);
+        const isMissing = info.type === 'missing';
         if (!secret) {
             this.pendingSecretRetry = null;
-            const guidance = 'Run "/secrets" to configure the required API key or export it (e.g., EXPORT KEY=value) before launching the CLI.';
-            const baseMessage = info.type === 'missing'
-                ? `An API key is required before using ${providerLabel}.`
+            const baseMessage = isMissing
+                ? `API key required for ${providerLabel}.`
                 : `API authentication failed for ${providerLabel}.`;
-            const portalHelp = portalLink ? ` Get a key: ${portalLink}` : '';
-            display.showWarning(`${baseMessage} ${guidance}${portalHelp}`.trim());
-            if (portalLink) {
-                display.showSystemMessage(`Purchase or generate a key to continue: ${portalLink}`);
-            }
+            const action = portalLink
+                ? `Get a key at ${portalLink} then run /secrets to set it.`
+                : 'Run /secrets to configure it.';
+            display.showWarning(`${baseMessage} ${action}`);
             return;
         }
-        const isMissing = info.type === 'missing';
-        if (!isMissing && info.message && info.message.trim()) {
-            display.showWarning(info.message.trim());
-        }
-        const prefix = isMissing
-            ? `${secret.label} is required before you can use ${providerLabel}.`
-            : `${secret.label} appears to be invalid for ${providerLabel}.`;
-        display.showWarning(prefix);
-        if (portalLink) {
-            display.showSystemMessage(`Acquire or top up ${secret.label}: ${portalLink}`);
-        }
+        // Show single consolidated error message
+        const action = isMissing ? 'is required' : 'appears invalid';
+        const portalHelp = portalLink ? ` Get one at ${portalLink}` : '';
+        display.showWarning(`${secret.label} ${action} for ${providerLabel}.${portalHelp}`);
         this.pendingSecretRetry = retryAction ?? null;
         this.pendingInteraction = { type: 'secret-input', secret };
         this.terminalInput.setSecretMode(true);
-        this.showSecretGuidance(secret, isMissing, portalLink);
+        this.showInlinePanel([
+            `Enter new ${secret.label} or "cancel" to abort.`,
+            theme.ui.muted('Paste your API key - input is hidden for security.'),
+            theme.ui.muted('I will retry your request automatically after you set it.'),
+        ]);
     }
     getApiKeyPortalLink(secret, provider) {
         const key = secret?.id ?? provider ?? null;
@@ -7440,21 +7295,6 @@ Return ONLY JSON array:
                 return null;
         }
     }
-    showSecretGuidance(secret, promptForInput, portalLink) {
-        const lines = [];
-        if (promptForInput) {
-            lines.push(`Enter a new value for ${secret.label} or type "cancel".`);
-        }
-        else {
-            lines.push(`Update the stored value for ${secret.label} or type "cancel".`);
-        }
-        if (portalLink) {
-            lines.push(`Get a fresh key: ${portalLink}`);
-        }
-        lines.push('Paste it here to resume and I will retry the pending action automatically.');
-        lines.push(`Run "/secrets" anytime to manage credentials or export ${secret.envVar}=<value> before launching the CLI.`);
-        display.showSystemMessage(lines.join('\n'));
-    }
     colorizeDropdownLine(text, index) {
         if (!DROPDOWN_COLORS.length) {
             return text;