Address PR review follow-ups for retry status handling

src/hooks/runtime-fallback/error-classifier.test.ts

@@ -17,6 +17,20 @@ describe("runtime-fallback error classifier", () => {
     expect(signal).toBeDefined()
   })
 
+  test("detects single-word cooldown auto-retry status signals", () => {
+    //#given
+    const info = {
+      status:
+        "All credentials for model claude-opus-4-6 are cooldown [retrying in 7m 56s attempt #1]",
+    }
+
+    //#when
+    const signal = extractAutoRetrySignal(info)
+
+    //#then
+    expect(signal).toBeDefined()
+  })
+
   test("treats cooling-down retry messages as retryable", () => {
     //#given
     const error = {

src/hooks/runtime-fallback/error-classifier.ts

@@ -102,7 +102,7 @@ export interface AutoRetrySignal {
 export const AUTO_RETRY_PATTERNS: Array<(combined: string) => boolean> = [
   (combined) => /retrying\s+in/i.test(combined),
   (combined) =>
-    /(?:too\s+many\s+requests|quota\s*exceeded|quota\s+will\s+reset\s+after|usage\s+limit|rate\s+limit|limit\s+reached|all\s+credentials\s+for\s+model|cool(?:ing)?\s+down|exhausted\s+your\s+capacity)/i.test(combined),
+    /(?:too\s+many\s+requests|quota\s*exceeded|quota\s+will\s+reset\s+after|usage\s+limit|rate\s+limit|limit\s+reached|all\s+credentials\s+for\s+model|cool(?:ing)?\s*down|exhausted\s+your\s+capacity)/i.test(combined),
 ]
 
 export function extractAutoRetrySignal(info: Record<string, unknown> | undefined): AutoRetrySignal | undefined {

src/hooks/runtime-fallback/event-handler.ts

@@ -6,6 +6,7 @@ import { extractStatusCode, extractErrorName, classifyErrorType, isRetryableErro
 import { createFallbackState, prepareFallback } from "./fallback-state"
 import { getFallbackModelsForSession } from "./fallback-models"
 import { SessionCategoryRegistry } from "../../shared/session-category-registry"
+import { normalizeRetryStatusMessage, extractRetryAttempt } from "../../shared/retry-status-utils"
 
 export function createEventHandler(deps: HookDeps, helpers: AutoRetryHelpers) {
   const { config, pluginConfig, sessionStates, sessionLastAccess, sessionRetryInFlight, sessionAwaitingFallbackResult, sessionFallbackTimeouts } = deps
@@ -184,22 +185,6 @@ export function createEventHandler(deps: HookDeps, helpers: AutoRetryHelpers) {
     }
   }
 
-  const normalizeRetryStatusMessage = (message: string): string =>
-    message
-      .replace(/\[retrying in [^\]]*attempt\s*#\d+\]/gi, "[retrying]")
-      .replace(/retrying in\s+[^(]*attempt\s*#\d+/gi, "retrying")
-      .replace(/\s+/g, " ")
-      .trim()
-      .toLowerCase()
-
-  const extractRetryAttempt = (statusAttempt: unknown, message: string): string => {
-    if (typeof statusAttempt === "number" && Number.isFinite(statusAttempt)) {
-      return String(statusAttempt)
-    }
-    const match = message.match(/attempt\s*#\s*(\d+)/i)
-    return match?.[1] ?? "?"
-  }
-
   const handleSessionStatus = async (props: Record<string, unknown> | undefined) => {
     const sessionID = props?.sessionID as string | undefined
     const status = props?.status as { type?: string; message?: string; attempt?: number } | undefined

src/hooks/runtime-fallback/index.test.ts

@@ -515,6 +515,7 @@ describe("runtime-fallback", () => {
             sessionID,
             status: {
               type: "retry",
+              next: 476,
               attempt: 1,
               message: "All credentials for model claude-opus-4-6 are cooling down [retrying in 7m 56s attempt #1]",
             },
@@ -573,6 +574,7 @@ describe("runtime-fallback", () => {
             sessionID,
             status: {
               type: "retry",
+              next: 476,
               attempt: 1,
               message: "All credentials for model claude-opus-4-6 are cooling down [retrying in 7m 56s attempt #1]",
             },
@@ -587,6 +589,7 @@ describe("runtime-fallback", () => {
             sessionID,
             status: {
               type: "retry",
+              next: 475,
               attempt: 1,
               message: "All credentials for model claude-opus-4-6 are cooling down [retrying in 7m 55s attempt #1]",
             },