Keep active-turn model settings stable across updates (#38785)

## Why

Thread settings can change while a turn is still active, including between sampling requests. Those updates should apply to the next turn instead of changing the model configuration partway through the current turn.

## What changed

- Snapshot the model, reasoning settings, service tier, approval settings, and model-attributed telemetry in `StepContext`.
- Build prompts, model requests, world state, tracing, and startup prewarms from that step-scoped snapshot.
- Share immutable model metadata between turn and step contexts.

## Testing

Added an integration test that pauses an active turn, updates its thread settings, and verifies that all requests in the active turn retain the original settings while the next turn uses the updates.

GitOrigin-RevId: c51352218e463dcc9b7338566d16742292c49fbf
This commit is contained in:
joeflorencio-openai authored and copyberry committed 2026-08-15 16:58:08 +00:00
1 parent c4941302c7
commit 00f6a8a60e
13 files changed
+307 -104

No files matched your search

+18 -12
View File
@@ -1121,10 +1121,12 @@ fn guardian_approval_request_to_json_renders_mcp_tool_call_shape() -> serde_json
async fn build_guardian_prompt_items_explains_node_repl_review_scope() -> anyhow::Result<()> {
let (session, mut turn) =
guardian_test_session_and_turn_with_base_url("http://localhost").await;
Arc::get_mut(&mut turn)
.expect("turn should be uniquely owned")
.model_info
.node_repl_auto_review_required = true;
Arc::make_mut(
&mut Arc::get_mut(&mut turn)
.expect("turn should be uniquely owned")
.model_info,
)
.node_repl_auto_review_required = true;
seed_guardian_parent_history(&session, &turn).await;
let context = GuardianReviewContext::from(&turn);
@@ -1700,7 +1702,7 @@ async fn guardian_request_model_for_auto_review(
match catalog {
GuardianTestCatalog::Bundled => {}
GuardianTestCatalog::ParentOnly => {
let parent_model = turn.model_info.clone();
let parent_model = turn.model_info.as_ref().clone();
let auth_manager = Arc::clone(&session.services.auth_manager);
let models_manager = StaticModelsManager::new(
Some(auth_manager),
@@ -1714,10 +1716,12 @@ async fn guardian_request_model_for_auto_review(
.models_manager = Arc::new(models_manager);
}
}
Arc::get_mut(&mut turn)
.expect("turn should be unique")
.model_info
.auto_review_model_override = auto_review_model_override;
Arc::make_mut(
&mut Arc::get_mut(&mut turn)
.expect("turn should be unique")
.model_info,
)
.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();
@@ -1942,7 +1946,8 @@ async fn guardian_review_request_layout_matches_model_visible_request_snapshot()
session.services.skills_service.clear_cache();
turn.config = Arc::clone(&config);
turn.provider = create_model_provider(config.model_provider.clone(), turn.auth_manager.clone());
turn.model_info.auto_review_model_override = Some("codex-auto-review".to_string());
Arc::make_mut(&mut turn.model_info).auto_review_model_override =
Some("codex-auto-review".to_string());
let session = Arc::new(session);
let turn = Arc::new(turn);
seed_guardian_parent_history(&session, &turn).await;
@@ -2186,7 +2191,8 @@ async fn guardian_reuses_prompt_cache_key_and_appends_prior_reviews() -> anyhow:
.enable(Feature::GuardianReuseParentCompaction)
.expect("Guardian parent-compaction reuse should be configurable");
let turn_mut = Arc::get_mut(&mut turn).expect("turn should be unique");
turn_mut.model_info.auto_review_model_override = Some("codex-auto-review".to_string());
Arc::make_mut(&mut turn_mut.model_info).auto_review_model_override =
Some("codex-auto-review".to_string());
turn_mut.config = Arc::new(config);
seed_guardian_parent_history(&session, &turn).await;
@@ -3387,7 +3393,7 @@ async fn guardian_review_session_config_clears_context_overrides_for_distinct_ef
async fn guardian_review_session_config_preserves_context_overrides_for_same_effective_model() {
let server = start_mock_server().await;
let (mut session, mut turn) = guardian_test_session_and_turn(&server).await;
let parent_model = turn.model_info.clone();
let parent_model = turn.model_info.as_ref().clone();
let auth_manager = Arc::clone(&session.services.auth_manager);
Arc::get_mut(&mut session)
.expect("session should be unique")