From ec5f2732554606890c811379aec9e4f2dcb62ce9 Mon Sep 17 00:00:00 2001
From: Charles Cunningham <ccunningham@openai.com>
Date: Wed, 4 Mar 2026 18:58:58 -0800
Subject: [PATCH] Install refreshed turn metadata tasks atomically

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

diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index 4abe1093c3..eb0f9739a9 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -2353,7 +2353,6 @@ impl Session {
                 .features
                 .enabled(Feature::UseLinuxSandboxBwrap),
         ));
-        turn_metadata_state.spawn_git_enrichment_task();
 
         Arc::new(TurnContext {
             sub_id: current_turn_context.sub_id.clone(),
@@ -2786,6 +2785,7 @@ impl Session {
                     ))
                     .then(|| Arc::clone(&previous_turn_context.turn_metadata_state))
                 });
+        turn_context.turn_metadata_state.spawn_git_enrichment_task();
         turn.current_turn_context = Some(turn_context);
         drop(active);
         if let Some(previous_turn_metadata_state) = previous_turn_metadata_state {
@@ -9406,6 +9406,54 @@ mod tests {
         assert!(Arc::ptr_eq(&updated.tool_call_gate, &tc.tool_call_gate));
     }
 
+    #[tokio::test]
+    async fn build_updated_turn_context_does_not_spawn_metadata_task_before_install() {
+        let (sess, tc, _rx) = make_session_and_context_with_rx().await;
+        let session_configuration = {
+            let state = sess.state.lock().await;
+            state.session_configuration.clone()
+        };
+
+        let refreshed_turn_context = sess
+            .build_updated_turn_context(tc.as_ref(), &session_configuration)
+            .await;
+
+        assert!(
+            !refreshed_turn_context
+                .turn_metadata_state
+                .has_enrichment_task_for_test(),
+            "refreshed context should not spawn git enrichment until installation succeeds"
+        );
+    }
+
+    #[tokio::test]
+    async fn set_current_active_turn_context_spawns_metadata_task_on_success() {
+        let (sess, tc, _rx) = make_session_and_context_with_rx().await;
+        let session_configuration = {
+            let state = sess.state.lock().await;
+            state.session_configuration.clone()
+        };
+        let refreshed_turn_context = sess
+            .build_updated_turn_context(tc.as_ref(), &session_configuration)
+            .await;
+        let active_turn = crate::state::ActiveTurn {
+            current_turn_context: Some(Arc::clone(&tc)),
+            ..Default::default()
+        };
+        *sess.active_turn.lock().await = Some(active_turn);
+
+        assert!(
+            sess.set_current_active_turn_context(Arc::clone(&refreshed_turn_context))
+                .await
+        );
+        assert!(
+            refreshed_turn_context
+                .turn_metadata_state
+                .has_enrichment_task_for_test(),
+            "successful installation should start git enrichment for the refreshed context"
+        );
+    }
+
     #[tokio::test]
     async fn override_turn_context_cancels_superseded_turn_metadata_task() {
         let (sess, tc, _rx) = make_session_and_context_with_rx().await;