mirror of
https://github.com/openai/codex.git
synced 2026-11-16 06:54:36 +00:00
Track parent turns for nested Codex requests (#35835)
## What changed - Propagate the initiating turn ID through agent spawns, follow-up tasks, reviews, and delegated Codex sessions. - Add `parent_turn_id` to Responses client and turn metadata while keeping it out of external MCP metadata. - Preserve parent-turn provenance across queued agent messages when their triggering parent is unambiguous. ## Testing - Cover spawned, resumed, nested, reviewed, delegated, and WebSocket request metadata. - Verify queued messages do not claim ambiguous or queue-only parent turns. GitOrigin-RevId: 481fdebbe7df2031880fe259509273cce50b20a8
This commit is contained in:
1 parent
12b3e88028
commit
1def0a8925
34 files changed
+635
-165
No files matched your search
@@ -806,10 +806,8 @@ async fn run_review_on_session(
|
||||
.and_then(|environment| environment.cwd().to_abs_path().ok())
|
||||
.unwrap_or_else(|| params.parent_turn.config.cwd.clone());
|
||||
|
||||
let submit_result = run_before_review_deadline(
|
||||
deadline,
|
||||
params.external_cancel.as_ref(),
|
||||
Box::pin(review_session.io.submit(Op::UserInput {
|
||||
let submission = review_session.io.submit_with_trace(
|
||||
Op::UserInput {
|
||||
items: prompt_items.items,
|
||||
final_output_json_schema: Some(params.schema.clone()),
|
||||
responsesapi_client_metadata: None,
|
||||
@@ -834,7 +832,14 @@ async fn run_review_on_session(
|
||||
}),
|
||||
..Default::default()
|
||||
},
|
||||
})),
|
||||
},
|
||||
/*trace*/ None,
|
||||
Some(params.parent_turn.sub_id.clone()),
|
||||
);
|
||||
let submit_result = run_before_review_deadline(
|
||||
deadline,
|
||||
params.external_cancel.as_ref(),
|
||||
Box::pin(submission),
|
||||
)
|
||||
.await;
|
||||
let child_turn_id = match submit_result {
|
||||
|
||||
@@ -1476,6 +1476,7 @@ async fn guardian_request_model_for_auto_review(
|
||||
.auto_review_model_override = auto_review_model_override;
|
||||
let parent_model = turn.model_info.slug.clone();
|
||||
let preferred_model = turn.provider.approval_review_preferred_model().to_string();
|
||||
let parent_turn_id = turn.sub_id.clone();
|
||||
seed_guardian_parent_history(&session, &turn).await;
|
||||
|
||||
let (outcome, analytics_result) = run_guardian_review_session_for_test(
|
||||
@@ -1500,8 +1501,9 @@ async fn guardian_request_model_for_auto_review(
|
||||
};
|
||||
|
||||
let request = request_log.single_request();
|
||||
let request_model = request
|
||||
.body_json()
|
||||
let request_body = request.body_json();
|
||||
core_test_support::responses::assert_parent_turn(&request_body, Some(parent_turn_id.as_str()))?;
|
||||
let request_model = request_body
|
||||
.get("model")
|
||||
.and_then(|value| value.as_str())
|
||||
.expect("guardian request should include a model")
|
||||
|
||||
Reference in new issue
Block a user