From a1c89d3a609e4081559899c938248f72ae125ac4 Mon Sep 17 00:00:00 2001 From: Suraj Srinivasan Date: Fri, 19 Jun 2026 01:47:32 -0700 Subject: [PATCH] Refresh tool timing on stream retries --- codex-rs/core/src/session/turn.rs | 15 +++++++-------- codex-rs/core/tests/suite/stream_no_completed.rs | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/codex-rs/core/src/session/turn.rs b/codex-rs/core/src/session/turn.rs index 7b509ae42e..fa2ad24744 100644 --- a/codex-rs/core/src/session/turn.rs +++ b/codex-rs/core/src/session/turn.rs @@ -276,18 +276,12 @@ pub(crate) async fn run_turn( .instrument(trace_span!("run_turn.prepare_sampling_request_input")) .await; - let responses_metadata = turn_context.turn_metadata_state.to_responses_metadata( - sess.installation_id.clone(), - window_id, - CodexResponsesRequestKind::Turn, - ); run_sampling_request( Arc::clone(&sess), Arc::clone(&step_context), Arc::clone(&turn_extension_data), Arc::clone(&turn_diff_tracker), &mut client_session, - &responses_metadata, sampling_request_input, cancellation_token.child_token(), ) @@ -1075,7 +1069,6 @@ async fn run_sampling_request( turn_store: Arc, turn_diff_tracker: SharedTurnDiffTracker, client_session: &mut ModelClientSession, - responses_metadata: &CodexResponsesMetadata, input: Vec, cancellation_token: CancellationToken, ) -> CodexResult<(SamplingRequestResult, Vec)> { @@ -1114,13 +1107,19 @@ async fn run_sampling_request( turn_context.as_ref(), base_instructions.clone(), ); + let window_id = sess.current_window_id().await; + let responses_metadata = turn_context.turn_metadata_state.to_responses_metadata( + sess.installation_id.clone(), + window_id, + CodexResponsesRequestKind::Turn, + ); let err = match try_run_sampling_request( tool_runtime.clone(), Arc::clone(&sess), Arc::clone(&turn_context), Arc::clone(&turn_store), client_session, - responses_metadata, + &responses_metadata, Arc::clone(&turn_diff_tracker), &prompt, cancellation_token.child_token(), diff --git a/codex-rs/core/tests/suite/stream_no_completed.rs b/codex-rs/core/tests/suite/stream_no_completed.rs index 6e028279b1..4af6ae441e 100644 --- a/codex-rs/core/tests/suite/stream_no_completed.rs +++ b/codex-rs/core/tests/suite/stream_no_completed.rs @@ -13,6 +13,7 @@ use core_test_support::streaming_sse::start_streaming_sse_server; use core_test_support::test_codex::TestCodex; use core_test_support::test_codex::test_codex; use core_test_support::wait_for_event; +use serde_json::Value; fn sse_incomplete() -> String { responses::sse(vec![serde_json::json!({ @@ -97,6 +98,20 @@ async fn retries_on_early_close() { 2, "expected retry after incomplete SSE stream" ); + let tool_timing_report_ids = requests + .iter() + .map(|request| { + let body = serde_json::from_slice::(request).expect("request JSON"); + let turn_metadata = body["client_metadata"]["x-codex-turn-metadata"] + .as_str() + .expect("turn metadata"); + serde_json::from_str::(turn_metadata).expect("turn metadata JSON")["tool_timing"] + ["report_id"] + .as_u64() + .expect("tool timing report id") + }) + .collect::>(); + assert_eq!(tool_timing_report_ids, vec![0, 1]); server.shutdown().await; }