nyrn
/
openclaw
mirror of https://github.com/openclaw/openclaw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: move cause-chain traversal before timeout heuristic (review feedback)

This commit is contained in:
Catalin Lupuleti 2026-03-09 22:39:49 +00:00 committed by Darshil
parent dac220bd88
commit c1c74f9952
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/agents/failover-error.ts
View File

@ -238,10 +238,9 @@ export function resolveFailoverReasonFromError(err: unknown): FailoverReason | n
) {
return "timeout";
}
if (isTimeoutError(err)) {
return "timeout";
}
// Walk into error cause chain (e.g. AbortError wrapping a rate-limit cause)
// Walk into error cause chain *before* timeout heuristics so that a specific
// cause (e.g. RESOURCE_EXHAUSTED wrapped in AbortError) overrides a parent
// message-based "timeout" guess from isTimeoutError.
const cause = getErrorCause(err);
if (cause && cause !== err) {
const causeReason = resolveFailoverReasonFromError(cause);
@ -249,6 +248,9 @@ export function resolveFailoverReasonFromError(err: unknown): FailoverReason | n
return causeReason;
}
}
if (isTimeoutError(err)) {
return "timeout";
}
if (!message) {
return null;
}

9
src/agents/model-fallback.probe.test.ts
View File

@ -394,6 +394,15 @@ describe("runWithModelFallback – probe logic", () => {
// All three candidates must be attempted — the abort must not short-circuit
expect(run).toHaveBeenCalledTimes(3);
// Verify the primary error is classified as rate_limit, not timeout — the
// cause chain (RESOURCE_EXHAUSTED) must override the parent AbortError message.
try {
await runWithModelFallback({ cfg, provider: "google", model: "gemini-3-flash-preview", run });
} catch (err) {
expect(String(err)).toContain("(rate_limit)");
expect(String(err)).not.toMatch(/gemini.*\(timeout\)/);
}
expect(run).toHaveBeenNthCalledWith(1, "google", "gemini-3-flash-preview", {
allowTransientCooldownProbe: true,
});