@ponythewhite/base-context 1.0.13 → 1.0.15

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

@@ -1846,13 +1846,16 @@ export class InteractiveMode {
     }
     async refreshConnectionCatalog() {
         this.invalidateConnectionModelRefresh();
+        const read = this.captureConnectionStateRead();
         const [state, commands, modelCatalog, resources] = await Promise.all([
             this.agentConnection.getState(),
             this.agentConnection.getCommands().catch(() => []),
             this.agentConnection.getModelCatalog(),
             this.agentConnection.getResourceSnapshot(),
         ]);
-        this.applyConnectionStateSnapshot(state);
+        if (!this.isConnectionStateReadCurrent(read))
+            return;
+        this.applyConnectionStateSnapshot(state, read);
         this.connectionCommands = commands;
         this.applyConnectionModelCatalog(modelCatalog);
         this.connectionModelsFetchedAt = Date.now();
@@ -1889,7 +1892,23 @@ export class InteractiveMode {
     getScopedHeartbeats() {
         return scopeHeartbeatsToSession(this.heartbeatCatalog, this.connectionState, this.subagentSnapshots.values());
     }
-    applyConnectionStateSnapshot(state) {
+    captureConnectionStateRead() {
+        return {
+            connection: this.agentConnection,
+            generation: this.sessionEventGeneration,
+            goal: this.connectionState?.goal,
+        };
+    }
+    isConnectionStateReadCurrent(read) {
+        return read.connection === this.agentConnection && read.generation === this.sessionEventGeneration;
+    }
+    applyConnectionStateSnapshot(state, read) {
+        const current = this.connectionState;
+        // A pending read must not replace a goal observation applied after that read began.
+        // Authoritative replacement/resync snapshots apply without a read capture.
+        if (read && current?.sessionId === state.sessionId && current.goal !== read.goal) {
+            state = { ...state, goal: current.goal };
+        }
         this.bindPromptStashSession(state.sessionId);
         this.connectionState = state;
         this.scheduleHeartbeatManagerRefresh();
@@ -5469,13 +5488,16 @@ export class InteractiveMode {
         this.ui.requestRender();
     }
     async renderInitialMessages() {
+        const read = this.captureConnectionStateRead();
         const snapshot = await this.agentConnection.getInitialSnapshot();
+        if (!this.isConnectionStateReadCurrent(read))
+            return;
         const context = this.getSessionContextFromConnectionSnapshot(snapshot);
         const state = snapshot.state;
         const streamingMessage = snapshot.streamingMessage;
         this.rlmNodeId = snapshot.parent?.childId;
         this.seedSubagentSummary(snapshot.children);
-        this.applyConnectionStateSnapshot(state);
+        this.applyConnectionStateSnapshot(state, read);
         this.restoreTurnStartFromMessages(context.messages);
         await this.renderSessionContext(context, {
             updateFooter: true,
@@ -6306,10 +6328,13 @@ export class InteractiveMode {
         return showFullPaneOverlay(this.ui, component, options);
     }
     async showSettingsSelector() {
+        const read = this.captureConnectionStateRead();
         let state;
         try {
             state = await this.agentConnection.getState();
-            this.applyConnectionStateSnapshot(state);
+            if (!this.isConnectionStateReadCurrent(read))
+                return;
+            this.applyConnectionStateSnapshot(state, read);
         }
         catch (error) {
             this.showError(error instanceof Error ? error.message : String(error));