fix: satisfy failover proof review

pashpashpash · pashpashpash · commit 7aae537a7d05 · 2026-05-26T11:21:50.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -196,7 +196,6 @@ Docs: https://docs.openclaw.ai
 - Auth/Codex: emit a one-shot actionable `log.warn` from the embedded legacy Codex OAuth sidecar loader when the only available seed lives in the macOS Keychain, naming `openclaw doctor --fix` and macOS Keychain instead of letting the credential silently fall through to a downstream `No API key found for provider "openai-codex"`. Thanks @romneyda.
 - Agents: fail closed when provider-less session models match multiple provider-prefixed runtime policies so CLI runtime routing no longer depends on config order. (#85970) Thanks @potterdigital.
 - Control UI/agents: keep collapsed tool rows readable without early ellipses, preserve raw expanded tool details, and make post-compaction AGENTS.md reinjection opt-in to avoid duplicated project context. Fixes #45649 and #45488. Thanks @BunsDev.
-- Codex: keep harness-owned turn timeouts inside the Codex runtime boundary instead of rotating auth profiles, falling back to public OpenAI, or retiring the shared app-server.
 
 ## 2026.5.24
 
diff --git a/src/agents/pi-embedded-runner/run/failover-policy.ts b/src/agents/pi-embedded-runner/run/failover-policy.ts
@@ -127,10 +127,11 @@ function shouldRotateAssistant(params: AssistantDecisionParams): boolean {
 }
 
 function assistantFallbackReason(params: AssistantDecisionParams): FailoverReason {
-  if (isConcreteNonTimeoutAssistantFailure(params)) {
-    return params.failoverReason;
+  const failoverReason = params.failoverReason;
+  if (params.failoverFailure && failoverReason && failoverReason !== "timeout") {
+    return failoverReason;
   }
-  return isAssistantTimeoutFailure(params) ? "timeout" : (params.failoverReason ?? "unknown");
+  return isAssistantTimeoutFailure(params) ? "timeout" : (failoverReason ?? "unknown");
 }
 
 export function mergeRetryFailoverReason(params: {

Original file line number	Diff line number	Diff line change
`@@ -127,10 +127,11 @@ function shouldRotateAssistant(params: AssistantDecisionParams): boolean {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`function assistantFallbackReason(params: AssistantDecisionParams): FailoverReason {`
`130`		`- if (isConcreteNonTimeoutAssistantFailure(params)) {`
`131`		`- return params.failoverReason;`
	`130`	`+ const failoverReason = params.failoverReason;`
	`131`	`+ if (params.failoverFailure && failoverReason && failoverReason !== "timeout") {`
	`132`	`+ return failoverReason;`
`132`	`133`	`}`
`133`		`- return isAssistantTimeoutFailure(params) ? "timeout" : (params.failoverReason ?? "unknown");`
	`134`	`+ return isAssistantTimeoutFailure(params) ? "timeout" : (failoverReason ?? "unknown");`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`export function mergeRetryFailoverReason(params: {`