@azumag/opencode-rate-limit-fallback 1.0.20 → 1.0.22

package/README.md

@@ -89,16 +89,14 @@ If no configuration is provided, the following models are used:
 
 ## How It Works
 
-1. **Detection**: The plugin listens for rate limit errors via:
-   - `session.error` events
-   - `message.updated` events with errors
-   - `session.status` events with `type: "retry"`
+ 1. **Detection**: The plugin listens for rate limit errors via:
+    - `session.error` events
+    - `message.updated` events with errors
+    - `session.status` events with `type: "retry"`
 
-2. **Abort**: When a rate limit is detected, the current session is aborted to stop OpenCode's internal retry mechanism.
+2. **Fallback**: The plugin selects the next available model from the fallback list and resends the last user message using the `promptAsync` API.
 
-3. **Fallback**: The plugin selects the next available model from the fallback list and resends the last user message.
-
-4. **Cooldown**: Rate-limited models are tracked and skipped for the configured cooldown period.
+3. **Cooldown**: Rate-limited models are tracked and skipped for the configured cooldown period.
 
 ## License
 

package/dist/index.js

@@ -316,29 +316,28 @@ export const RateLimitFallback = async ({ client, directory }) => {
                 parts: parts,
                 model: { providerID: nextModel.providerID, modelID: nextModel.modelID },
             };
-            // promptAsync → abort: send fallback prompt first, then abort the old request
-            // This prevents the abort from killing the new fallback prompt.
-            //
-            // For session.error events, the request is already in error state, so we
-            // only send promptAsync (skipAbort = true). For retry status, we send both.
-            //
             // promptAsync: HTTP POST /session/{id}/prompt_async → 204 (SDK sdk.gen.js).
+            //
+            // For session.error and retry status events, we skip abort (skipAbort = true)
+            // because the request is already in an error or delayed state. Calling abort
+            // in these cases can trigger interrupted events that cancel the new fallback
+            // prompt.
             const t0 = Date.now();
-            await client.session.promptAsync({
-                path: { id: sessionID },
-                body: promptBody,
-            });
-            const t1 = Date.now();
             if (!skipAbort) {
                 try {
                     await client.session.abort({ path: { id: sessionID } });
-                    logToFile(`abort succeeded for session ${sessionID} (${Date.now() - t1}ms, total ${Date.now() - t0}ms)`);
+                    logToFile(`abort succeeded for session ${sessionID} (${Date.now() - t0}ms)`);
                 }
                 catch (abortErr) {
-                    logToFile(`abort failed (${Date.now() - t1}ms): ${abortErr}`);
+                    logToFile(`abort failed (${Date.now() - t0}ms): ${abortErr}`);
                 }
             }
-            logToFile(`promptAsync completed for session ${sessionID} (${Date.now() - t0}ms) with model ${nextModel.providerID}/${nextModel.modelID}`);
+            const t1 = Date.now();
+            await client.session.promptAsync({
+                path: { id: sessionID },
+                body: promptBody,
+            });
+            logToFile(`promptAsync completed for session ${sessionID} (${Date.now() - t1}ms, total ${Date.now() - t0}ms) with model ${nextModel.providerID}/${nextModel.modelID}`);
             // Toast is best-effort notification. The toast() function (line ~185) has
             // built-in fallback: showToast failure → app.log. After promptAsync the
             // server may already be disposing, so both showToast and app.log could fail.
@@ -458,23 +457,10 @@ export const RateLimitFallback = async ({ client, directory }) => {
                 catch {
                     console.log("[rate-limit-fallback] session.status:", status);
                 }
-                if (status?.type === "interrupted") {
-                    // Handle interrupted session - resend prompt with fallback model (skip abort)
-                    logToFile("Session interrupted, attempting to resend prompt");
-                    try {
-                        await client.app.log({
-                            body: {
-                                service: "rate-limit-fallback",
-                                level: "info",
-                                message: "Session interrupted, attempting to resend prompt",
-                            },
-                        });
-                    }
-                    catch {
-                        console.log("[rate-limit-fallback] Session interrupted, attempting to resend prompt");
-                    }
-                    await handleRateLimitFallback(props.sessionID, "", "", true); // skipAbort = true
-                }
+                // Note: interrupted status is ignored here. Since we no longer call abort
+                // for retry status events, interrupted events should not be triggered by
+                // our fallback logic. If they occur (e.g., from user action), we let them
+                // be handled by the system.
                 if (status?.type === "retry" && status?.message) {
                     const message = status.message.toLowerCase();
                     const isRateLimitRetry = message.includes("usage limit") ||
@@ -509,7 +495,9 @@ export const RateLimitFallback = async ({ client, directory }) => {
                         catch {
                             console.log("[rate-limit-fallback] Attempting fallback for rate limit retry");
                         }
-                        await handleRateLimitFallback(props.sessionID, "", "");
+                        // skipAbort = true for retry status to avoid triggering interrupted events
+                        // that could cancel the new fallback prompt
+                        await handleRateLimitFallback(props.sessionID, "", "", true);
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azumag/opencode-rate-limit-fallback",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "description": "OpenCode plugin that automatically switches to fallback models when rate limited",
   "type": "module",
   "main": "./dist/index.js",