@leanandmean/coding-agent 0.74.1-scramjet.35 → 0.74.1-scramjet.39

package/dist/modes/interactive/interactive-mode.js

@@ -154,6 +154,8 @@ export class InteractiveMode {
     pendingTools = new Map();
     pendingToolFinalizations = new Set();
     agentRunGeneration = 0;
+    selectorOpenGeneration = 0;
+    pendingSelectorOpenGeneration;
     // Tool output expansion state
     toolOutputExpanded = false;
     // Thinking block visibility state
@@ -2038,6 +2040,11 @@ export class InteractiveMode {
         // Set up handlers on defaultEditor - they use this.editor for text access
         // so they work correctly regardless of which editor is active
         this.defaultEditor.onEscape = () => {
+            if (this.pendingSelectorOpenGeneration !== undefined) {
+                this.selectorOpenGeneration++;
+                this.pendingSelectorOpenGeneration = undefined;
+                return;
+            }
             if (this.session.isStreaming) {
                 this.restoreQueuedMessagesToEditor({ abort: true });
             }
@@ -3396,7 +3403,10 @@ export class InteractiveMode {
      * @param create Factory that receives a `done` callback and returns the component and focus target
      */
     showSelector(create) {
+        this.selectorOpenGeneration++;
+        this.pendingSelectorOpenGeneration = undefined;
         const done = () => {
+            this.selectorOpenGeneration++;
             this.editorContainer.clear();
             this.editorContainer.addChild(this.editor);
             this.ui.setFocus(this.editor);
@@ -3618,7 +3628,22 @@ export class InteractiveMode {
             // Ignore auth lookup failures for warning-only checks.
         }
     }
-    showModelSelector(initialSearchInput) {
+    selectorPreparationIsCurrent(session, generation) {
+        const current = this.isInitialized && this.session === session && this.selectorOpenGeneration === generation;
+        if (!current && this.pendingSelectorOpenGeneration === generation)
+            this.pendingSelectorOpenGeneration = undefined;
+        return current;
+    }
+    // SCRAMJET-DIVERGENCE: Refresh profile-scoped output-rate history before opening model selectors (issue 476).
+    async showModelSelector(initialSearchInput) {
+        const session = this.session;
+        const generation = ++this.selectorOpenGeneration;
+        this.pendingSelectorOpenGeneration = generation;
+        await session.refreshOutputThroughputHistory().catch(() => undefined);
+        if (!this.selectorPreparationIsCurrent(session, generation))
+            return;
+        this.pendingSelectorOpenGeneration = undefined;
+        const outputThroughputHistory = session.outputThroughputHistory;
         this.showSelector((done) => {
             const selector = new ModelSelectorComponent(this.ui, this.session.model, this.settingsManager, this.session.modelRegistry, this.session.scopedModels, async (model) => {
                 try {
@@ -3637,20 +3662,28 @@ export class InteractiveMode {
             }, () => {
                 done();
                 this.ui.requestRender();
-            }, initialSearchInput);
+            }, initialSearchInput, outputThroughputHistory);
             return { component: selector, focus: selector };
         });
     }
     async showModelsSelector() {
+        const session = this.session;
+        const generation = ++this.selectorOpenGeneration;
+        this.pendingSelectorOpenGeneration = generation;
+        await session.refreshOutputThroughputHistory().catch(() => undefined);
+        if (!this.selectorPreparationIsCurrent(session, generation))
+            return;
+        const outputThroughputHistory = session.outputThroughputHistory;
         // Get all available models
-        this.session.modelRegistry.refresh();
-        const allModels = this.session.modelRegistry.getAvailable();
+        session.modelRegistry.refresh();
+        const allModels = session.modelRegistry.getAvailable();
         if (allModels.length === 0) {
+            this.pendingSelectorOpenGeneration = undefined;
             this.showStatus("No models available");
             return;
         }
         // Check if session has scoped models (from previous session-only changes or CLI --models)
-        const sessionScopedModels = this.session.scopedModels;
+        const sessionScopedModels = session.scopedModels;
         const hasSessionScope = sessionScopedModels.length > 0;
         // Build enabled model IDs from session state or settings
         let currentEnabledIds = null;
@@ -3662,10 +3695,13 @@ export class InteractiveMode {
             // Fall back to settings
             const patterns = this.settingsManager.getEnabledModels();
             if (patterns !== undefined && patterns.length > 0) {
-                const scopedModels = await resolveModelScope(patterns, this.session.modelRegistry);
+                const scopedModels = await resolveModelScope(patterns, session.modelRegistry);
                 currentEnabledIds = scopedModels.map((scoped) => `${scoped.model.provider}/${scoped.model.id}`);
             }
         }
+        if (!this.selectorPreparationIsCurrent(session, generation))
+            return;
+        this.pendingSelectorOpenGeneration = undefined;
         // Helper to update session's scoped models (session-only, no persist)
         const updateSessionModels = async (enabledIds) => {
             currentEnabledIds = enabledIds === null ? null : [...enabledIds];
@@ -3703,7 +3739,7 @@ export class InteractiveMode {
                     done();
                     this.ui.requestRender();
                 },
-            });
+            }, outputThroughputHistory);
             return { component: selector, focus: selector };
         });
     }
@@ -4787,6 +4823,8 @@ export class InteractiveMode {
         }
     }
     stop() {
+        this.selectorOpenGeneration++;
+        this.pendingSelectorOpenGeneration = undefined;
         this.unregisterSignalHandlers();
         if (this.settingsManager.getShowTerminalProgress()) {
             this.ui.terminal.setProgress(false);