From e7a305d4f15ff12fde2892022b3cfa0b8a2a76ed Mon Sep 17 00:00:00 2001
From: Ningyi Xie <ningyi@openai.com>
Date: Sat, 25 Apr 2026 01:53:06 -0700
Subject: [PATCH] Add nonblocking turn metadata test

Verify current turn metadata can be read without waiting for a pending git enrichment task, so turn completion remains fast when git metadata is not ready yet.

Co-authored-by: Codex <noreply@openai.com>
---
 codex-rs/core/src/turn_metadata_tests.rs | 38 ++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/codex-rs/core/src/turn_metadata_tests.rs b/codex-rs/core/src/turn_metadata_tests.rs
index ad42768a25..a19916caa2 100644
--- a/codex-rs/core/src/turn_metadata_tests.rs
+++ b/codex-rs/core/src/turn_metadata_tests.rs
@@ -6,8 +6,11 @@ use core_test_support::PathBufExt;
 use core_test_support::PathExt;
 use serde_json::Value;
 use std::collections::HashMap;
+use std::future::pending;
 use tempfile::TempDir;
 use tokio::process::Command;
+use tokio::time::Duration;
+use tokio::time::timeout;
 
 #[tokio::test]
 async fn build_turn_metadata_header_includes_has_changes_for_clean_repo() {
@@ -180,3 +183,38 @@ fn turn_metadata_state_merges_client_metadata_without_replacing_reserved_fields(
     assert_eq!(json["thread_source"].as_str(), Some("user"));
     assert_eq!(json["turn_id"].as_str(), Some("turn-a"));
 }
+
+#[tokio::test]
+async fn current_meta_value_does_not_wait_for_pending_git_enrichment_task() {
+    let temp_dir = TempDir::new().expect("temp dir");
+    let repo_path = temp_dir.path().join("repo").abs();
+    std::fs::create_dir_all(repo_path.join(".git")).expect("create git repo marker");
+    let sandbox_policy = SandboxPolicy::new_read_only_policy();
+
+    let state = TurnMetadataState::new(
+        "session-a".to_string(),
+        &SessionSource::Exec,
+        "turn-a".to_string(),
+        repo_path,
+        &sandbox_policy,
+        WindowsSandboxLevel::Disabled,
+    );
+    *state
+        .enrichment_task
+        .lock()
+        .unwrap_or_else(std::sync::PoisonError::into_inner) = Some(tokio::spawn(async {
+        pending::<()>().await;
+    }));
+
+    let metadata = timeout(Duration::from_millis(50), async {
+        state.current_meta_value().expect("metadata")
+    })
+    .await
+    .expect("current metadata should not wait for git enrichment");
+
+    assert_eq!(metadata["session_id"].as_str(), Some("session-a"));
+    assert_eq!(metadata["turn_id"].as_str(), Some("turn-a"));
+    assert!(metadata.get("workspaces").is_none());
+
+    state.cancel_git_enrichment_task();
+}