@skj1724/oh-my-opencode 3.19.12 → 3.19.14

package/dist/cli/index.js

@@ -8467,7 +8467,7 @@ var import_picocolors2 = __toESM(require_picocolors(), 1);
 // package.json
 var package_default = {
   name: "@skj1724/oh-my-opencode",
-  version: "3.19.12",
+  version: "3.19.14",
   description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   main: "dist/index.js",
   types: "dist/index.d.ts",

package/dist/index.js

@@ -24998,6 +24998,7 @@ init_runtime_fallback();
 function createRuntimeFallbackHook(ctx, options) {
   const retryStates = new Map;
   const fallbackAttempts = new Map;
+  const interruptingSessions = new Map;
   const config = options?.config ?? {
     enabled: true,
     max_attempts: 3,
@@ -25020,21 +25021,31 @@ function createRuntimeFallbackHook(ctx, options) {
       if (sessionID2) {
         retryStates.delete(sessionID2);
         fallbackAttempts.delete(sessionID2);
+        interruptingSessions.delete(sessionID2);
       }
       return false;
     }
-    if (event.type !== "session.error" && event.type !== "message.updated")
+    if (event.type !== "session.error" && event.type !== "message.updated" && event.type !== "message.part.updated")
       return false;
     const props = event.properties;
     let sessionID;
     let error;
+    let retryAttempt;
     if (event.type === "session.error") {
       sessionID = props?.sessionID;
       error = props?.error;
-    } else {
+    } else if (event.type === "message.updated") {
       const info = props?.info;
       sessionID = info?.sessionID;
       error = info?.error;
+    } else {
+      const part = props?.part;
+      if (part?.type !== "retry")
+        return false;
+      const retryPart = part;
+      sessionID = retryPart.sessionID ?? props?.sessionID;
+      error = retryPart.error;
+      retryAttempt = retryPart.attempt;
     }
     if (!sessionID || error === undefined || error === null)
       return false;
@@ -25049,7 +25060,8 @@ function createRuntimeFallbackHook(ctx, options) {
       errorKeys: error && typeof error === "object" ? Object.keys(error) : [],
       messageSnippet: classification.reason?.substring(0, 100),
       sessionID,
-      eventType: event.type
+      eventType: event.type,
+      retryAttempt
     });
     if (classification.category === "context_overflow") {
       return false;
@@ -25058,17 +25070,26 @@ function createRuntimeFallbackHook(ctx, options) {
       return false;
     }
     if (classification.category === "rate_limit") {
-      const state2 = retryStates.get(sessionID) ?? { attempt: 0, lastAttemptTime: Date.now() };
-      const decision = calculateRetryDelay(state2.attempt, config, classification.retryAfterMs);
-      if (decision.retryable && state2.attempt < config.max_retries_before_fallback) {
-        retryStates.set(sessionID, {
-          attempt: state2.attempt + 1,
-          lastAttemptTime: Date.now()
-        });
-        await new Promise((resolve8) => setTimeout(resolve8, decision.delay_ms));
-        return false;
+      const effectiveAttempt = retryAttempt ?? retryStates.get(sessionID)?.attempt ?? 0;
+      if (retryAttempt !== undefined) {
+        if (effectiveAttempt >= config.max_retries_before_fallback) {
+          retryStates.delete(sessionID);
+        } else {
+          return false;
+        }
+      } else {
+        const state2 = retryStates.get(sessionID) ?? { attempt: 0, lastAttemptTime: Date.now() };
+        const decision = calculateRetryDelay(state2.attempt, config, classification.retryAfterMs);
+        if (decision.retryable && state2.attempt < config.max_retries_before_fallback) {
+          retryStates.set(sessionID, {
+            attempt: state2.attempt + 1,
+            lastAttemptTime: Date.now()
+          });
+          await new Promise((resolve8) => setTimeout(resolve8, decision.delay_ms));
+          return false;
+        }
+        retryStates.delete(sessionID);
       }
-      retryStates.delete(sessionID);
     }
     if (classification.category !== "quota" && classification.category !== "rate_limit") {
       return false;
@@ -25110,6 +25131,22 @@ function createRuntimeFallbackHook(ctx, options) {
     if (fallbackResult.kind !== "next") {
       return false;
     }
+    const isRetryPartEvent = event.type === "message.part.updated" && retryAttempt !== undefined;
+    if (isRetryPartEvent) {
+      if (interruptingSessions.get(sessionID)) {
+        return false;
+      }
+      interruptingSessions.set(sessionID, true);
+      try {
+        await ctx.client.session.abort({ path: { id: sessionID } });
+        log("[runtime-fallback] aborted retry loop", { sessionID, retryAttempt });
+      } catch (abortErr) {
+        log("[runtime-fallback] abort failed, falling through to direct prompt", {
+          sessionID,
+          error: String(abortErr)
+        });
+      }
+    }
     try {
       await ctx.client.session.prompt({
         path: { id: sessionID },
@@ -25127,6 +25164,10 @@ function createRuntimeFallbackHook(ctx, options) {
         { model: fallbackResult.model, error: classifyProviderError(fallbackError) }
       ]);
       return false;
+    } finally {
+      if (isRetryPartEvent) {
+        interruptingSessions.delete(sessionID);
+      }
     }
   };
   return { handler };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skj1724/oh-my-opencode",
-  "version": "3.19.12",
+  "version": "3.19.14",
   "description": "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",