From a765eb2cefe2ec0b9edba8cb909d0fea5000bd91 Mon Sep 17 00:00:00 2001
From: Friel <friel@openai.com>
Date: Tue, 31 Mar 2026 22:06:57 +0000
Subject: [PATCH] fix core: retry async quota-exhausted fallback spawns

---
 .../src/tools/handlers/multi_agents/spawn.rs  | 10 ++++
 .../src/tools/handlers/multi_agents_common.rs | 48 +++++++++++++++++++
 .../tools/handlers/multi_agents_v2/spawn.rs   | 10 ++++
 3 files changed, 68 insertions(+)

diff --git a/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs b/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs
index 3e9360d9e7..432b490a59 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs
@@ -120,6 +120,16 @@ impl ToolHandler for Handler {
                 .await;
             match attempt_result {
                 Ok(spawned_agent) => {
+                    if spawn_should_retry_on_async_quota_exhaustion(
+                        spawned_agent.status.clone(),
+                        spawned_agent.thread_id,
+                        &session.services.agent_control,
+                    )
+                    .await
+                        && idx + 1 < candidates_to_try.len()
+                    {
+                        continue;
+                    }
                     spawn_result = Some(spawned_agent);
                     break;
                 }
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_common.rs b/codex-rs/core/src/tools/handlers/multi_agents_common.rs
index de7a703363..93e9014ff1 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_common.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_common.rs
@@ -1,4 +1,5 @@
 use crate::agent::AgentStatus;
+use crate::agent::status::is_final;
 use crate::codex::Session;
 use crate::codex::TurnContext;
 use crate::config::Config;
@@ -25,6 +26,8 @@ use serde::Deserialize;
 use serde::Serialize;
 use serde_json::Value as JsonValue;
 use std::collections::HashMap;
+use tokio::time::Duration;
+use tokio::time::timeout;
 
 /// Minimum wait timeout to prevent tight polling loops from burning CPU.
 pub(crate) const MIN_WAIT_TIMEOUT_MS: i64 = 10_000;
@@ -117,6 +120,51 @@ pub(crate) fn spawn_should_retry_on_quota_exhaustion(error: &CodexErr) -> bool {
     )
 }
 
+pub(crate) async fn spawn_should_retry_on_async_quota_exhaustion(
+    thread_status: AgentStatus,
+    thread_id: ThreadId,
+    agent_control: &crate::agent::control::AgentControl,
+) -> bool {
+    if is_final(&thread_status) && spawn_should_retry_on_quota_exhaustion_status(&thread_status) {
+        return true;
+    }
+
+    let Ok(mut status_rx) = agent_control.subscribe_status(thread_id).await else {
+        return false;
+    };
+    let mut status = status_rx.borrow_and_update().clone();
+    if is_final(&status) && spawn_should_retry_on_quota_exhaustion_status(&status) {
+        return true;
+    }
+
+    loop {
+        if timeout(Duration::from_millis(250), status_rx.changed())
+            .await
+            .is_err()
+        {
+            break;
+        }
+        status = status_rx.borrow().clone();
+        if is_final(&status) {
+            return spawn_should_retry_on_quota_exhaustion_status(&status);
+        }
+    }
+    false
+}
+
+fn spawn_should_retry_on_quota_exhaustion_status(status: &AgentStatus) -> bool {
+    match status {
+        AgentStatus::Errored(message) => {
+            let message = message.to_lowercase();
+            message.contains("insufficient_quota")
+                || message.contains("usage limit")
+                || message.contains("quota")
+        }
+        AgentStatus::NotFound => false,
+        _ => false,
+    }
+}
+
 pub(crate) fn build_wait_agent_statuses(
     statuses: &HashMap<ThreadId, AgentStatus>,
     receiver_agents: &[CollabAgentRef],
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs b/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs
index eff49c0447..849bd606f8 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs
@@ -144,6 +144,16 @@ impl ToolHandler for Handler {
                 .await;
             match attempt_result {
                 Ok(spawned_agent) => {
+                    if spawn_should_retry_on_async_quota_exhaustion(
+                        spawned_agent.status.clone(),
+                        spawned_agent.thread_id,
+                        &session.services.agent_control,
+                    )
+                    .await
+                        && idx + 1 < candidates_to_try.len()
+                    {
+                        continue;
+                    }
                     spawn_result = Some(spawned_agent);
                     break;
                 }