From c82cb044f3413e6584308d969b94e7a1430711ab Mon Sep 17 00:00:00 2001
From: jif <jif@openai.com>
Date: Mon, 3 Aug 2026 15:53:41 +0000
Subject: [PATCH] Stabilize the startup Git enrichment integration test
 (#36769)

## What changed

- Enable `test_sync_tool` for the startup prewarm test.
- Hold the first user-turn response open while Git enrichment completes, then
  verify the refreshed workspace metadata on the follow-up request.

GitOrigin-RevId: dd4254fba1ac2f346022988cc21a78648a29556a
---
 codex-rs/core/tests/suite/git_enrichment.rs | 23 +++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/codex-rs/core/tests/suite/git_enrichment.rs b/codex-rs/core/tests/suite/git_enrichment.rs
index e0e2c27fe6..dc2d4b077c 100644
--- a/codex-rs/core/tests/suite/git_enrichment.rs
+++ b/codex-rs/core/tests/suite/git_enrichment.rs
@@ -99,15 +99,26 @@ async fn startup_prewarm_skips_git_enrichment_and_user_turn_observes_fresh_state
         vec![ev_response_created("warm-1"), ev_completed("warm-1")],
         vec![
             ev_response_created("resp-1"),
-            ev_assistant_message("msg-1", "done"),
+            ev_function_call(
+                "wait-for-git",
+                "test_sync_tool",
+                r#"{"sleep_after_ms":5000}"#,
+            ),
             ev_completed("resp-1"),
         ],
+        vec![
+            ev_response_created("resp-2"),
+            ev_assistant_message("msg-2", "done"),
+            ev_completed("resp-2"),
+        ],
     ]])
     .await;
     let cwd = repo.path().to_path_buf();
-    let mut builder = test_codex().with_config(move |config| {
-        config.cwd = cwd.abs();
-    });
+    let mut builder = test_codex()
+        .with_model("test-gpt-5.1-codex")
+        .with_config(move |config| {
+            config.cwd = cwd.abs();
+        });
     let test = builder.build_with_websocket_server(&server).await?;
 
     let prewarm = tokio::time::timeout(
@@ -122,8 +133,8 @@ async fn startup_prewarm_skips_git_enrichment_and_user_turn_observes_fresh_state
     test.submit_turn("inspect the workspace").await?;
     let turn = server
         .single_connection()
-        .get(1)
-        .context("turn request")?
+        .get(2)
+        .context("turn follow-up request")?
         .body_json();
     assert_eq!(
         turn_metadata(&turn)?["workspaces"],