From c7d99c63cf9da6255933ee6f21e731831dcb2c8d Mon Sep 17 00:00:00 2001
From: Joe Gershenson <jgershen@openai.com>
Date: Wed, 15 Apr 2026 10:28:05 -0700
Subject: [PATCH] Stabilize Bazel test timing under load

---
 codex-rs/app-server/BUILD.bazel                        | 1 +
 codex-rs/core/src/tools/handlers/multi_agents_tests.rs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/codex-rs/app-server/BUILD.bazel b/codex-rs/app-server/BUILD.bazel
index f32f811627..0930670ca5 100644
--- a/codex-rs/app-server/BUILD.bazel
+++ b/codex-rs/app-server/BUILD.bazel
@@ -6,6 +6,7 @@ codex_rust_crate(
     integration_test_tags_extra_by_stem = {
         "all": ["flaky"],
     },
+    integration_test_args = ["--test-threads=4"],
     integration_test_timeout = "long",
     test_tags = ["no-sandbox"],
 )
diff --git a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs b/codex-rs/core/src/tools/handlers/multi_agents_tests.rs
index a06c5c2376..bfa46f45bf 100644
--- a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs
+++ b/codex-rs/core/src/tools/handlers/multi_agents_tests.rs
@@ -182,7 +182,7 @@ async fn wait_for_redirected_envelope_in_history(
     thread: &Arc<CodexThread>,
     expected: &InterAgentCommunication,
 ) {
-    timeout(Duration::from_secs(5), async {
+    timeout(Duration::from_secs(30), async {
         loop {
             let history_items = thread
                 .codex