@renjfk/opencode-model-fallback 0.1.2 → 0.2.1

package/README.md

@@ -55,7 +55,6 @@ If you want to set plugin options, use the tuple form:
 - `retry_on_errors`: retryable HTTP status codes. Defaults to `429`.
 - `retryable_error_patterns`: retryable error message patterns. Defaults to `["rate.?limit"]`.
 - `cooldown_seconds`: how long a failed original model remains on fallback. Defaults to `3600`.
-- `timeout_seconds`: abort and retry if a response is inactive for this long. Defaults to `30`.
 - `notify_on_fallback`: show fallback/recovery toasts. Defaults to `true`.
 
 ## How it works
@@ -227,7 +226,7 @@ at the local repo path, not the npm package name:
 
 ```json
 {
-  "plugin": ["/Users/your-user/opencode-model-fallback"]
+  "plugin": ["/Users/your-user/opencode-model-fallback/index.js"]
 }
 ```
 

package/lib/options.js

@@ -3,7 +3,6 @@ const DEFAULT_OPTIONS = {
   retry_on_errors: [429],
   retryable_error_patterns: ["rate.?limit"],
   cooldown_seconds: 3600,
-  timeout_seconds: 30,
   notify_on_fallback: true,
 };
 

package/lib/router.js

@@ -13,9 +13,9 @@ export function createMappedFallbackRouter(ctx, rawOptions) {
   );
   const store = createStateStore();
   const retrying = new Set();
-  const timers = new Map();
   const selfAbortAt = new Map();
   const activeOriginals = new Map();
+  const activeRequested = new Map();
   const activeTargets = new Map();
   let agentConfigs;
 
@@ -42,13 +42,6 @@ export function createMappedFallbackRouter(ctx, rawOptions) {
     return cooldown ? fallback : original;
   }
 
-  function timedOriginal(requested) {
-    if (!hasMapping(requested)) return undefined;
-    const cooldown = store.getModelCooldown(requested);
-    if (cooldown) return undefined;
-    return requested;
-  }
-
   function shouldRoute(requested) {
     return hasMapping(requested) || !!fallbackToOriginal[requested];
   }
@@ -66,31 +59,6 @@ export function createMappedFallbackRouter(ctx, rawOptions) {
     return !cooldown;
   }
 
-  function clearTimer(sessionID) {
-    const timer = timers.get(sessionID);
-    if (timer) clearTimeout(timer);
-    timers.delete(sessionID);
-  }
-
-  function scheduleTimeout(sessionID, original, agent) {
-    clearTimer(sessionID);
-    if (options.timeout_seconds <= 0 || !hasMapping(original)) return;
-    timers.set(
-      sessionID,
-      setTimeout(async () => {
-        timers.delete(sessionID);
-        if (retrying.has(sessionID) || !timedOriginal(original)) return;
-        retrying.add(sessionID);
-        try {
-          await abortCurrentSession(sessionID);
-          await retryWithFallback(sessionID, original, agent, "timeout");
-        } finally {
-          retrying.delete(sessionID);
-        }
-      }, options.timeout_seconds * 1000),
-    );
-  }
-
   async function abortCurrentSession(sessionID) {
     const aborted = await abortSession(ctx.client, sessionID);
     if (aborted) selfAbortAt.set(sessionID, Date.now());
@@ -105,7 +73,6 @@ export function createMappedFallbackRouter(ctx, rawOptions) {
     store.setModelCooldown(original, reason, failedAt, cooldownUntil);
     const parts = await getReplayParts(ctx.client, ctx.directory, sessionID);
     if (parts.length === 0) return;
-    clearTimer(sessionID);
     try {
       await new Promise((resolve) => setTimeout(resolve, POST_ABORT_DELAY_MS));
       await ctx.client.session.promptAsync({
@@ -125,10 +92,13 @@ export function createMappedFallbackRouter(ctx, rawOptions) {
   }
 
   async function toastRouteChange(sessionID, requested, target, original) {
+    const previousRequested = activeRequested.get(sessionID);
     const previous = activeTargets.get(sessionID);
+    activeRequested.set(sessionID, requested);
     activeTargets.set(sessionID, target);
     if (previous === target) return;
     if (!previous && requested === target) return;
+    if (requested === target && previousRequested === previous) return;
     const isFallback = target !== original;
     await toast(
       isFallback ? "Model Fallback" : "Model Recovered",
@@ -152,7 +122,6 @@ export function createMappedFallbackRouter(ctx, rawOptions) {
     }
     if (!shouldFallbackFromError(failed, original)) return;
     retrying.add(sessionID);
-    clearTimer(sessionID);
     try {
       await retryWithFallback(sessionID, original, agent, source);
     } finally {
@@ -180,7 +149,6 @@ export function createMappedFallbackRouter(ctx, rawOptions) {
     }
     if (!shouldFallbackFromError(failed, original)) return;
     retrying.add(sessionID);
-    clearTimer(sessionID);
     try {
       await abortCurrentSession(sessionID);
       await retryWithFallback(sessionID, original, agent, "session.status");
@@ -212,8 +180,6 @@ export function createMappedFallbackRouter(ctx, rawOptions) {
       const model = modelObject(target);
       if (model && output.message) output.message.model = model;
       await toastRouteChange(sessionID, requested, target, original);
-      if (hasMapping(target)) scheduleTimeout(sessionID, target, input.agent);
-      else clearTimer(sessionID);
     },
 
     event: async ({ event }) => {
@@ -223,8 +189,8 @@ export function createMappedFallbackRouter(ctx, rawOptions) {
         if (id) {
           retrying.delete(id);
           activeOriginals.delete(id);
+          activeRequested.delete(id);
           activeTargets.delete(id);
-          clearTimer(id);
         }
         return;
       }
@@ -245,11 +211,8 @@ export function createMappedFallbackRouter(ctx, rawOptions) {
       if (event.type === "message.updated") {
         const info = props?.info;
         if (info?.role !== "assistant") return;
+        if (!info?.error) return;
         const sessionID = info?.sessionID;
-        if (!info?.error) {
-          if (sessionID) clearTimer(sessionID);
-          return;
-        }
         const model =
           info?.model ??
           (typeof info?.providerID === "string" && typeof info?.modelID === "string"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@renjfk/opencode-model-fallback",
-  "version": "0.1.2",
+  "version": "0.2.1",
   "description": "Mapped model fallback router for OpenCode. Routes retryable model failures to configured fallback models and recovers after cooldown.",
   "keywords": [
     "fallback",
@@ -39,6 +39,6 @@
   "devDependencies": {
     "oxfmt": "0.50.0",
     "oxlint": "1.65.0",
-    "vitest": "latest"
+    "vitest": "4.1.6"
   }
 }