erosolar-cli 1.7.199 → 1.7.201

package/dist/shell/interactiveShell.js

@@ -74,6 +74,8 @@ export class InteractiveShell {
     pendingSecretRetry = null;
     terminalInput;
     currentInput = '';
+    ctrlCPressCount = 0;
+    ctrlCHandledThisPress = false;
     pendingCleanup = null;
     cleanupInProgress = false;
     slashPreviewVisible = false;
@@ -94,6 +96,7 @@ export class InteractiveShell {
     sessionPreferences;
     autosaveEnabled;
     autoContinueEnabled;
+    verificationEnabled = true;
     editGuardMode = 'display-edits';
     pendingPermissionInput = null;
     pendingHistoryLoad = null;
@@ -184,9 +187,12 @@ export class InteractiveShell {
         this.terminalInput = new TerminalInputAdapter(input, output, {
             onSubmit: (text) => this.processInput(text),
             onQueue: (text) => this.handleQueuedInput(text),
+            onCtrlC: ({ hadBuffer }) => this.handleCtrlCPress(hadBuffer),
             onInterrupt: () => this.handleInterrupt(),
             onChange: (text) => this.handleInputChange(text),
             onEditModeChange: (mode) => this.handleEditModeChange(mode),
+            onToggleVerify: () => this.toggleVerificationMode(),
+            onToggleAutoContinue: () => this.toggleAutoContinueMode(),
         });
         // Register output interceptor for cursor positioning during streaming
         this.terminalInput.registerOutputInterceptor(display);
@@ -195,6 +201,7 @@ export class InteractiveShell {
         this.setupStatusTracking();
         this.refreshContextGauge();
         this.terminalInput.start();
+        this.refreshControlBar();
         this.rebuildAgent();
         this.setupHandlers();
         this.refreshBannerSessionInfo();
@@ -281,6 +288,9 @@ export class InteractiveShell {
      */
     handleInputChange(text) {
         this.currentInput = text;
+        if (text.length > 0) {
+            this.resetCtrlCSequence();
+        }
         this.handleSlashCommandPreviewChange();
     }
     /**
@@ -297,6 +307,41 @@ export class InteractiveShell {
         }
         this.terminalInput.render();
     }
+    toggleVerificationMode() {
+        this.setVerificationMode(!this.verificationEnabled, 'shortcut');
+    }
+    setVerificationMode(enabled, source) {
+        const changed = this.verificationEnabled !== enabled;
+        this.verificationEnabled = enabled;
+        this.refreshControlBar();
+        if (!changed && source === 'shortcut') {
+            return;
+        }
+        const message = enabled
+            ? '✅ Verification on. Auto-tests will run after edits. (alt+v to toggle)'
+            : '⏭️ Verification off. Skipping auto-tests until re-enabled. (alt+v to toggle)';
+        display.showSystemMessage(message);
+    }
+    toggleAutoContinueMode() {
+        this.setAutoContinueMode(!this.autoContinueEnabled, 'shortcut');
+    }
+    setAutoContinueMode(enabled, source) {
+        const changed = this.autoContinueEnabled !== enabled;
+        this.autoContinueEnabled = enabled;
+        saveSessionPreferences({ autoContinue: this.autoContinueEnabled });
+        if (this.agent) {
+            this.agent.setAutoContinue(this.autoContinueEnabled);
+        }
+        this.refreshControlBar();
+        if (!changed && source === 'shortcut') {
+            return;
+        }
+        display.showInfo(`Auto-continue ${this.autoContinueEnabled ? 'enabled' : 'disabled'}. ` +
+            (this.autoContinueEnabled
+                ? 'The model will be auto-prompted to continue when it expresses intent but does not use tools.'
+                : 'The model will not be auto-prompted to continue.') +
+            ' Toggle with alt+c.');
+    }
     /**
      * Gate submissions when edit permission mode is active.
      * Returns the text to send when approved, or null when waiting for confirmation.
@@ -342,15 +387,51 @@ export class InteractiveShell {
         this.terminalInput.render();
     }
     /**
-     * TerminalInputAdapter interrupt handler (Ctrl+C with empty buffer)
+     * Handle Ctrl+C presses in three stages:
+     * 1) Clear chat box text
+     * 2) Pause/interrupt AI execution (even while streaming)
+     * 3) Quit the program
      */
-    handleInterrupt() {
+    handleCtrlCPress(hadBuffer) {
+        this.ctrlCHandledThisPress = true;
+        this.ctrlCPressCount = Math.min(this.ctrlCPressCount + 1, 3);
+        if (this.ctrlCPressCount === 1) {
+            this.clearChatInput();
+            const prefix = hadBuffer ? 'Input cleared.' : 'Nothing to clear.';
+            display.showSystemMessage(`${prefix} Press Ctrl+C again to pause the AI; a third time quits.`);
+            this.terminalInput.render();
+            return;
+        }
+        if (this.ctrlCPressCount === 2) {
+            this.pauseAiExecution();
+            return;
+        }
+        this.shutdown();
+    }
+    pauseAiExecution() {
         if (this.isProcessing && this.agent) {
             this.agent.requestCancellation();
-            display.showWarning('Cancelling current operation... (Ctrl+C again to force quit)');
+            display.showWarning('Pausing AI execution... (Press Ctrl+C again to quit)');
             return;
         }
-        this.shutdown();
+        display.showInfo('No active AI execution to pause. Press Ctrl+C again to quit.');
+    }
+    resetCtrlCSequence() {
+        this.ctrlCPressCount = 0;
+        this.ctrlCHandledThisPress = false;
+    }
+    clearChatInput() {
+        this.pendingPermissionInput = null;
+        this.handleInputChange('');
+    }
+    /**
+     * TerminalInputAdapter interrupt handler (Ctrl+C with empty buffer)
+     */
+    handleInterrupt() {
+        if (!this.ctrlCHandledThisPress) {
+            this.handleCtrlCPress(false);
+        }
+        this.ctrlCHandledThisPress = false;
     }
     /**
      * Gracefully tear down the shell and exit
@@ -570,6 +651,10 @@ export class InteractiveShell {
         this.uiAdapter.updateContextUsage(percentage);
         this.terminalInput.setContextUsage(percentage);
     }
+    refreshControlBar() {
+        // Status indicators are now shown inline in the prompt
+        this.terminalInput.render();
+    }
     handleSlashCommandPreviewChange() {
         if (this.pendingInteraction) {
             this.slashPreviewVisible = false;
@@ -631,8 +716,6 @@ export class InteractiveShell {
     }
     startStreamingHeartbeat(label = 'Streaming response') {
         this.stopStreamingHeartbeat();
-        // Set up scroll region so status stays fixed at bottom while content streams above
-        display.setupScrollRegion();
         this.streamingHeartbeatStart = Date.now();
         this.streamingHeartbeatFrame = 0;
         const frames = ['●', '◐', '◉', '◐'];
@@ -643,10 +726,10 @@ export class InteractiveShell {
                 ? Math.floor((Date.now() - this.streamingHeartbeatStart) / 1000)
                 : 0;
             const suffix = elapsed > 0 ? ` • ${elapsed}s` : '';
-            display.updateStreamingStatus(`${theme.info(frame)} ${label}${suffix}`);
+            this.terminalInput.setStatusMessage(`${frame} ${label}${suffix}`);
         };
         tick();
-        this.streamingHeartbeat = setInterval(tick, 500); // Faster animation with scroll region
+        this.streamingHeartbeat = setInterval(tick, 500);
     }
     stopStreamingHeartbeat() {
         if (this.streamingHeartbeat) {
@@ -654,9 +737,7 @@ export class InteractiveShell {
             this.streamingHeartbeat = null;
         }
         this.streamingHeartbeatStart = null;
-        // Tear down scroll region and clear status
-        display.teardownScrollRegion();
-        display.clearStreamingStatus();
+        this.terminalInput.setStatusMessage(null);
     }
     refreshQueueIndicators() {
         if (this.isProcessing) {
@@ -1441,23 +1522,14 @@ export class InteractiveShell {
         if (!value) {
             // Show current status
             display.showInfo(`Auto-continue is ${this.autoContinueEnabled ? 'enabled' : 'disabled'}. ` +
-                `Use /autocontinue on|off to toggle.`);
+                `Use /autocontinue on|off or alt+c to toggle.`);
             return;
         }
         if (value !== 'on' && value !== 'off') {
             display.showWarning('Usage: /autocontinue on|off');
             return;
         }
-        this.autoContinueEnabled = value === 'on';
-        saveSessionPreferences({ autoContinue: this.autoContinueEnabled });
-        // Update the current agent if it exists
-        if (this.agent) {
-            this.agent.setAutoContinue(this.autoContinueEnabled);
-        }
-        display.showInfo(`Auto-continue ${this.autoContinueEnabled ? 'enabled' : 'disabled'}. ` +
-            (this.autoContinueEnabled
-                ? 'The model will be auto-prompted to continue when it expresses intent but does not use tools.'
-                : 'The model will not be auto-prompted to continue.'));
+        this.setAutoContinueMode(value === 'on', 'command');
     }
     updateActiveSession(summary, remember = false) {
         this.activeSessionId = summary?.id ?? null;
@@ -2464,6 +2536,9 @@ What's the next action?`;
         if (this.autoTestInFlight) {
             return;
         }
+        if (!this.verificationEnabled) {
+            return;
+        }
         const latestChange = this.getLatestFileChangeTimestamp();
         if (!latestChange) {
             return;
@@ -2930,7 +3005,9 @@ What's the next action?`;
     handleStreamingFallback(info) {
         const detailText = info.message.trim();
         const detail = detailText ? ` Error: ${detailText}` : '';
-        display.showWarning(`Streaming failed, retrying without streaming.${detail}`);
+        const reason = info.reason ? ` (${info.reason.replace(/-/g, ' ')})` : '';
+        const partialNote = info.partialResponse ? ' Received partial stream before failure.' : '';
+        display.showWarning(`Streaming failed${reason}, retrying without streaming.${detail}${partialNote}`);
         this.startStreamingHeartbeat('Fallback in progress');
         this.requestPromptRefresh(true);
     }