fix(cron): isolate transient auth cooldowns · openclaw/op...

Recent Commits to openclaw:main

openperf · 2026-06-14 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ import {`
`137`	`137`	`type PostCompactionGuardObservation,`
`138`	`138`	`} from "./post-compaction-loop-guard.js";`
`139`	`139`	`import { createEmbeddedRunReplayState, observeReplayMetadata } from "./replay-state.js";`
`140`		`-import { handleAssistantFailover } from "./run/assistant-failover.js";`
	`140`	`+import { handleAssistantFailover, isShortWindowRateLimitMessage } from "./run/assistant-failover.js";`
`141`	`141`	`import {`
`142`	`142`	`createEmbeddedRunStageTracker,`
`143`	`143`	`EMBEDDED_RUN_ATTEMPT_DISPATCH_STAGE,`
`@@ -1418,11 +1418,12 @@ async function runEmbeddedAgentInternal(`
`1418`	`1418`	`};`
`1419`	`1419`	`const resolveRunAuthProfileFailureReason = (`
`1420`	`1420`	`failoverReason: FailoverReason \| null,`
`1421`		`-opts?: { providerStarted?: boolean },`
	`1421`	`+opts?: { providerStarted?: boolean; transientRateLimit?: boolean },`
`1422`	`1422`	`) =>`
`1423`	`1423`	`resolveAuthProfileFailureReason({`
`1424`	`1424`	`failoverReason,`
`1425`	`1425`	`providerStarted: opts?.providerStarted,`
	`1426`	`+transientRateLimit: opts?.transientRateLimit,`
`1426`	`1427`	`policy: params.authProfileFailurePolicy,`
`1427`	`1428`	`});`
`1428`	`1429`	`const maybeBackoffBeforeOverloadFailover = async (reason: FailoverReason \| null) => {`
`@@ -2695,6 +2696,9 @@ async function runEmbeddedAgentInternal(`
`2695`	`2696`	`promptFailoverReason,`
`2696`	`2697`	`{`
`2697`	`2698`	`providerStarted: promptErrorSource === "prompt",`
	`2699`	`+transientRateLimit:`
	`2700`	`+promptFailoverReason === "rate_limit" &&`
	`2701`	`+isShortWindowRateLimitMessage(errorText),`
`2698`	`2702`	`},`
`2699`	`2703`	`);`
`2700`	`2704`	`const promptFailoverFailure =`
`@@ -2865,6 +2869,9 @@ async function runEmbeddedAgentInternal(`
`2865`	`2869`	`assistantProfileFailoverReason,`
`2866`	`2870`	`{`
`2867`	`2871`	`providerStarted: assistantProviderStarted,`
	`2872`	`+transientRateLimit:`
	`2873`	`+assistantProfileFailoverReason === "rate_limit" &&`
	`2874`	`+isShortWindowRateLimitMessage(assistantForFailover?.errorMessage),`
`2868`	`2875`	`},`
`2869`	`2876`	`);`
`2870`	`2877`	`const cloudCodeAssistFormatError = attempt.cloudCodeAssistFormatError;`

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,10 @@ function resolveShortWindowRateLimitRetry(`
`110`	`110`	`return retryAfterSeconds !== null ? { retryAfterSeconds } : {};`
`111`	`111`	`}`
`112`	`112`
	`113`	`+export function isShortWindowRateLimitMessage(message: string \| undefined): boolean {`
	`114`	`+return resolveShortWindowRateLimitRetry(message) !== null;`
	`115`	`+}`
	`116`	`+`
`113`	`117`	`/**`
`114`	`118`	`* Applies an assistant-stage failover decision and returns the next run action.`
`115`	`119`	`* It owns auth-profile rotation, overload/rate-limit escalation, same-model`

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,40 @@ describe("resolveAuthProfileFailureReason", () => {`
`33`	`33`	`).toBeNull();`
`34`	`34`	`});`
`35`	`35`
	`36`	`+it("keeps only transient local failures out of shared auth state", () => {`
	`37`	`+expect(`
	`38`	`+resolveAuthProfileFailureReason({`
	`39`	`+failoverReason: "rate_limit",`
	`40`	`+policy: "local_transient",`
	`41`	`+}),`
	`42`	`+).toBe("rate_limit");`
	`43`	`+expect(`
	`44`	`+resolveAuthProfileFailureReason({`
	`45`	`+failoverReason: "rate_limit",`
	`46`	`+policy: "local_transient",`
	`47`	`+transientRateLimit: true,`
	`48`	`+}),`
	`49`	`+).toBeNull();`
	`50`	`+expect(`
	`51`	`+resolveAuthProfileFailureReason({`
	`52`	`+failoverReason: "overloaded",`
	`53`	`+policy: "local_transient",`
	`54`	`+}),`
	`55`	`+).toBeNull();`
	`56`	`+expect(`
	`57`	`+resolveAuthProfileFailureReason({`
	`58`	`+failoverReason: "auth",`
	`59`	`+policy: "local_transient",`
	`60`	`+}),`
	`61`	`+).toBe("auth");`
	`62`	`+expect(`
	`63`	`+resolveAuthProfileFailureReason({`
	`64`	`+failoverReason: "billing",`
	`65`	`+policy: "local_transient",`
	`66`	`+}),`
	`67`	`+).toBe("billing");`
	`68`	`+});`
	`69`	`+`
`36`	`70`	`it("only persists timeouts when the provider request started", () => {`
`37`	`71`	`// Pre-provider timeout says nothing about credential health; started`
`38`	`72`	`// provider timeouts can cool down the active profile.`

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import type { AuthProfileFailurePolicy } from "./auth-profile-failure-policy.typ`
`14`	`14`	`export function resolveAuthProfileFailureReason(params: {`
`15`	`15`	`failoverReason: FailoverReason \| null;`
`16`	`16`	`providerStarted?: boolean;`
	`17`	`+transientRateLimit?: boolean;`
`17`	`18`	`policy?: AuthProfileFailurePolicy;`
`18`	`19`	`}): AuthProfileFailureReason \| null {`
`19`	`20`	`// Helper-local runs, transport/server failures, empty responses, and request-shape ("format") rejections`
`@@ -28,6 +29,9 @@ export function resolveAuthProfileFailureReason(params: {`
`28`	`29`	`if (`
`29`	`30`	`params.policy === "local" \|\|`
`30`	`31`	`!params.failoverReason \|\|`
	`32`	`+(params.policy === "local_transient" &&`
	`33`	`+(params.failoverReason === "overloaded" \|\|`
	`34`	`+(params.failoverReason === "rate_limit" && params.transientRateLimit === true))) \|\|`
`31`	`35`	`params.failoverReason === "server_error" \|\|`
`32`	`36`	`params.failoverReason === "empty_response" \|\|`
`33`	`37`	`params.failoverReason === "format"`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`/**`
`2`	`2`	`* Scope used when classifying auth-profile failures for retry/fallback decisions.`
`3`	`3`	`*/`
`4`		`-export type AuthProfileFailurePolicy = "shared" \| "local";`
	`4`	`+export type AuthProfileFailurePolicy = "shared" \| "local" \| "local_transient";`

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`// Auth profile propagation tests cover isolated agent auth profile forwarding.`
`2`	`2`	`import { describe, expect, it } from "vitest";`
	`3`	`+import type { AuthProfileFailurePolicy } from "../agents/embedded-agent-runner/run/auth-profile-failure-policy.types.js";`
`3`	`4`	`import {`
`4`	`5`	`makeIsolatedAgentTurnJob,`
`5`	`6`	`makeIsolatedAgentTurnParams,`
`@@ -15,17 +16,42 @@ import {`
`15`	`16`
`16`	`17`	`const runCronIsolatedAgentTurn = await loadRunCronIsolatedAgentTurn();`
`17`	`18`
`18`		`-function getEmbeddedAgentParams(): { authProfileId?: string; authProfileIdSource?: string } {`
	`19`	`+function getEmbeddedAgentParams(): {`
	`20`	`+authProfileId?: string;`
	`21`	`+authProfileIdSource?: string;`
	`22`	`+authProfileFailurePolicy?: AuthProfileFailurePolicy;`
	`23`	`+} {`
`19`	`24`	`const params = runEmbeddedAgentMock.mock.calls[0]?.[0];`
`20`	`25`	`if (!params \|\| typeof params !== "object" \|\| Array.isArray(params)) {`
`21`	`26`	`throw new Error("Expected embedded OpenClaw agent params to be an object");`
`22`	`27`	`}`
`23`	`28`	`return params;`
`24`	`29`	`}`
`25`	`30`
`26`		`-describe("runCronIsolatedAgentTurn auth profile propagation (#20624)", () => {`
	`31`	`+describe("runCronIsolatedAgentTurn auth profile propagation (#20624, #90991)", () => {`
`27`	`32`	`setupRunCronIsolatedAgentTurnSuite();`
`28`	`33`
	`34`	`+it("uses transient-local auth cooldown policy for cron throttling failures", async () => {`
	`35`	`+mockRunCronFallbackPassthrough();`
	`36`	`+`
	`37`	`+await runCronIsolatedAgentTurn(`
	`38`	`+makeIsolatedAgentTurnParams({`
	`39`	`+job: makeIsolatedAgentTurnJob({`
	`40`	`+delivery: { mode: "none" },`
	`41`	`+payload: { kind: "agentTurn", message: "check status" },`
	`42`	`+}),`
	`43`	`+message: "check status",`
	`44`	`+sessionKey: "cron:job-1",`
	`45`	`+lane: "cron",`
	`46`	`+}),`
	`47`	`+);`
	`48`	`+`
	`49`	`+expect(runEmbeddedAgentMock).toHaveBeenCalledOnce();`
	`50`	`+expect(getEmbeddedAgentParams()).toMatchObject({`
	`51`	`+authProfileFailurePolicy: "local_transient",`
	`52`	`+});`
	`53`	`+});`
	`54`	`+`
`29`	`55`	`it("passes authProfileId to runEmbeddedAgent when auth profiles exist", async () => {`
`30`	`56`	`resolveConfiguredModelRefMock.mockReturnValue({`
`31`	`57`	`provider: "openrouter",`

Original file line number	Diff line number	Diff line change
`@@ -304,6 +304,9 @@ export function createCronPromptExecutor(params: {`
`304`	`304`	`authProfileIdSource: params.liveSelection.authProfileId`
`305`	`305`	`? params.liveSelection.authProfileIdSource`
`306`	`306`	`: undefined,`
	`307`	`+// Scheduled run: keep bursty cron overloaded/rate_limit local, while`
	`308`	`+// still sharing real credential/account failures across auth profiles.`
	`309`	`+authProfileFailurePolicy: "local_transient",`
`307`	`310`	`thinkLevel: params.thinkLevel,`
`308`	`311`	`fastMode: resolveFastModeState({`
`309`	`312`	`cfg: params.cfgWithAgentDefaults,`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main