@azumag/opencode-rate-limit-fallback 1.39.0 → 1.40.0

package/dist/src/fallback/FallbackHandler.d.ts

@@ -19,6 +19,7 @@ export declare class FallbackHandler {
     private retryState;
     private fallbackInProgress;
     private fallbackMessages;
+    private sessionLock;
     private metricsManager;
     private subagentTracker;
     private retryManager;

package/dist/src/fallback/FallbackHandler.js

@@ -19,6 +19,7 @@ export class FallbackHandler {
     retryState;
     fallbackInProgress;
     fallbackMessages;
+    sessionLock;
     // Metrics manager reference
     metricsManager;
     // Subagent tracker reference
@@ -46,6 +47,7 @@ export class FallbackHandler {
         this.retryState = new Map();
         this.fallbackInProgress = new Map();
         this.fallbackMessages = new Map();
+        this.sessionLock = new Set();
         // Initialize retry manager
         this.retryManager = new RetryManager(config.retryPolicy || {}, logger);
     }
@@ -147,10 +149,16 @@ export class FallbackHandler {
      * Handle the rate limit fallback process
      */
     async handleRateLimitFallback(sessionID, currentProviderID, currentModelID) {
+        // Resolve target session before acquiring lock
+        const rootSessionID = this.subagentTracker.getRootSession(sessionID);
+        const targetSessionID = rootSessionID || sessionID;
+        // Session-level lock: prevent concurrent fallback processing
+        if (this.sessionLock.has(targetSessionID)) {
+            this.logger.debug(`Fallback already in progress for session ${targetSessionID}, skipping`);
+            return;
+        }
+        this.sessionLock.add(targetSessionID);
         try {
-            // Get root session and hierarchy using subagent tracker
-            const rootSessionID = this.subagentTracker.getRootSession(sessionID);
-            const targetSessionID = rootSessionID || sessionID;
             const hierarchy = this.subagentTracker.getHierarchy(sessionID);
             // If no model info provided, try to get from tracked session model
             if (!currentProviderID || !currentModelID) {
@@ -309,10 +317,11 @@ export class FallbackHandler {
                 name: errorName,
             });
             // Record retry failure on error
-            const rootSessionID = this.subagentTracker.getRootSession(sessionID);
-            const targetSessionID = rootSessionID || sessionID;
             this.retryManager.recordFailure(targetSessionID);
         }
+        finally {
+            this.sessionLock.delete(targetSessionID);
+        }
     }
     /**
      * Handle message updated events for metrics recording
@@ -419,6 +428,7 @@ export class FallbackHandler {
         this.retryState.clear();
         this.fallbackInProgress.clear();
         this.fallbackMessages.clear();
+        this.sessionLock.clear();
         this.retryManager.destroy();
         // Destroy circuit breaker
         if (this.circuitBreaker) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azumag/opencode-rate-limit-fallback",
-  "version": "1.39.0",
+  "version": "1.40.0",
   "description": "OpenCode plugin that automatically switches to fallback models when rate limited",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",