erosolar-cli 1.7.64 → 1.7.66

package/dist/shell/interactiveShell.js

@@ -472,9 +472,9 @@ export class InteractiveShell {
                 inputStream.off('keypress', this.keypressHandler);
                 this.keypressHandler = null;
             }
-            // Remove raw data handler
-            if (inputStream && this.rawDataHandler) {
-                inputStream.off('data', this.rawDataHandler);
+            // Restore original stdin emit (cleanup from paste interception)
+            if (this.rawDataHandler) {
+                this.rawDataHandler(); // This restores the original emit function
                 this.rawDataHandler = null;
             }
             // Clear any pending cleanup to prevent hanging
@@ -525,21 +525,31 @@ export class InteractiveShell {
             // All pastes (single or multi-line) are captured for confirmation before submit
             this.capturePaste(content, lineCount);
         });
-        // Set up raw data interception to catch bracketed paste before readline processes it
-        // We prepend our listener so it runs before readline's listener
-        this.rawDataHandler = (data) => {
-            const str = data.toString();
-            const result = this.bracketedPaste.processRawData(str);
-            if (result.consumed) {
-                // Don't show preview here - readline will still echo lines to the terminal,
-                // and our preview would get clobbered. Instead, we show the preview in the
-                // line handler after clearing readline's echoed output.
-                // The processRawData() sets flags that the line handler will check.
+        // Set up raw data interception to catch bracketed paste before readline processes it.
+        // We need to actually PREVENT readline from seeing the paste content to avoid echo.
+        // Strategy: Replace stdin's 'data' event emission during paste capture.
+        const originalEmit = inputStream.emit.bind(inputStream);
+        inputStream.emit = (event, ...args) => {
+            if (event === 'data' && args[0]) {
+                const data = args[0];
+                const str = typeof data === 'string' ? data : data.toString();
+                const result = this.bracketedPaste.processRawData(str);
+                if (result.consumed) {
+                    // Data was consumed by paste handler - don't pass to readline
+                    // If there's passThrough data, emit that instead
+                    if (result.passThrough) {
+                        return originalEmit('data', Buffer.from(result.passThrough));
+                    }
+                    return true; // Event "handled" but not passed to other listeners
+                }
             }
+            // Pass through all other events and non-paste data normally
+            return originalEmit(event, ...args);
+        };
+        // Store reference for cleanup
+        this.rawDataHandler = () => {
+            inputStream.emit = originalEmit;
         };
-        // Use prependListener to ensure our handler runs before readline's handlers
-        // This gives us first look at the raw data including bracketed paste markers
-        inputStream.prependListener('data', this.rawDataHandler);
     }
     setupSlashCommandPreviewHandler() {
         const inputStream = input;
@@ -1309,6 +1319,7 @@ export class InteractiveShell {
         this.baseSystemPrompt = buildInteractiveSystemPrompt(profileConfig.systemPrompt, profileConfig.label, tools);
         if (this.rebuildAgent()) {
             display.showInfo(`Workspace snapshot refreshed (${this.describeWorkspaceOptions()}).`);
+            this.resetChatBoxAfterModelSwap();
         }
         else {
             display.showWarning('Workspace snapshot refreshed, but the agent failed to rebuild. Run /doctor for details.');
@@ -1486,7 +1497,9 @@ export class InteractiveShell {
         }
         this.thinkingMode = value;
         saveSessionPreferences({ thinkingMode: this.thinkingMode });
-        this.rebuildAgent();
+        if (this.rebuildAgent()) {
+            this.resetChatBoxAfterModelSwap();
+        }
         const descriptions = {
             concise: 'Hides internal reasoning and responds directly.',
             balanced: 'Shows short thoughts only when helpful.',
@@ -2181,6 +2194,7 @@ export class InteractiveShell {
             display.showInfo(`Switched to ${preset.label}.`);
             this.refreshBannerSessionInfo();
             this.persistSessionPreference();
+            this.resetChatBoxAfterModelSwap();
         }
     }
     async handleSecretSelection(input) {
@@ -2241,7 +2255,9 @@ export class InteractiveShell {
             const deferred = this.pendingSecretRetry;
             this.pendingSecretRetry = null;
             if (pending.secret.providers.includes(this.sessionState.provider)) {
-                this.rebuildAgent();
+                if (this.rebuildAgent()) {
+                    this.resetChatBoxAfterModelSwap();
+                }
             }
             if (deferred) {
                 await deferred();
@@ -2837,6 +2853,18 @@ What's the next action?`;
             return false;
         }
     }
+    /**
+     * Reset the pinned chat box to a fresh state after model/provider swap.
+     * Ensures the input box is properly visible and ready for input,
+     * just like on fresh startup.
+     */
+    resetChatBoxAfterModelSwap() {
+        this.pinnedChatBox.setStatusMessage(null);
+        this.pinnedChatBox.setProcessing(false);
+        this.pinnedChatBox.show();
+        this.pinnedChatBox.forceRender();
+        this.ensureReadlineReady();
+    }
     buildSystemPrompt() {
         const providerLabel = this.providerLabel(this.sessionState.provider);
         const lines = [
@@ -3295,6 +3323,7 @@ What's the next action?`;
             this.persistSessionPreference();
             this.refreshBannerSessionInfo();
             display.showInfo(`Switched from ${this.providerLabel(oldProvider)}/${oldModel} to ${match.label}/${defaultModel.id}`);
+            this.resetChatBoxAfterModelSwap();
         }
         else {
             // Revert on failure