erosolar-cli 2.1.203 → 2.1.204

package/dist/shell/interactiveShell.js

@@ -5538,14 +5538,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 +5559,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 +5578,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 +5623,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 +5637,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 +7043,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 +7401,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 +7448,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;