Lightweight coding agent that runs in your terminal
Rust
Accept environment requests at thread and turn settings boundaries (#51422)
Adam Perry @ OpenAI404cd42aa525
diff --git a/codex-rs/app-server/src/request_processors.rs b/codex-rs/app-server/src/request_processors.rsindex 0646a6259c..3d3a1df988 100644--- a/codex-rs/app-server/src/request_processors.rs+++ b/codex-rs/app-server/src/request_processors.rs@@ -462,8 +462,6 @@ use codex_protocol::protocol::SessionConfiguredEvent;#[cfg(test)]use codex_protocol::protocol::SessionMetaLine;use codex_protocol::protocol::TurnEnvironmentRequest;-use codex_protocol::protocol::TurnEnvironmentSelection;-use codex_protocol::protocol::TurnEnvironmentSelections;use codex_protocol::protocol::W3cTraceContext;use codex_protocol::protocol::strip_user_message_prefix;use codex_protocol::user_input::MAX_USER_INPUT_TEXT_CHARS;diff --git a/codex-rs/app-server/src/request_processors/turn_processor.rs b/codex-rs/app-server/src/request_processors/turn_processor.rsindex 051408204f..67946c8ebc 100644--- a/codex-rs/app-server/src/request_processors/turn_processor.rs+++ b/codex-rs/app-server/src/request_processors/turn_processor.rs@@ -12,6 +12,7 @@ use codex_protocol::models::FunctionCallOutputPayload;use codex_protocol::models::ImageReference as CoreImageReference;use codex_protocol::protocol::AdditionalContextEntry as CoreAdditionalContextEntry;use codex_protocol::protocol::AdditionalContextKind as CoreAdditionalContextKind;+use codex_protocol::protocol::TurnEnvironmentRequests;use codex_protocol::protocol::TurnSettingsUpdate;use codex_protocol::protocol::TurnSettingsUpdateOutcome;use codex_skills::system_cache_root_dir;@@ -118,7 +119,7 @@ fn map_additional_context(#[derive(Default)]struct ThreadEnvironmentOverride {- environment_requests: Option<TurnEnvironmentSelections>,+ environment_requests: Option<TurnEnvironmentRequests>,// Only default-environment updates replace the task's separately persisted root selection.runtime_workspace_roots: Option<Vec<AbsolutePathBuf>>,}@@ -750,12 +751,9 @@ impl TurnRequestProcessor {},};return ThreadEnvironmentOverride {- environment_requests: Some(TurnEnvironmentSelections::new(+ environment_requests: Some(TurnEnvironmentRequests::new(legacy_fallback_cwd,- environment_requests- .into_iter()- .map(TurnEnvironmentSelection::new)- .collect(),+ environment_requests,)),..Default::default()};@@ -777,12 +775,9 @@ impl TurnRequestProcessor {.thread_manager.default_environment_requests(&legacy_fallback_cwd, &workspace_roots);ThreadEnvironmentOverride {- environment_requests: Some(TurnEnvironmentSelections::new(+ environment_requests: Some(TurnEnvironmentRequests::new(legacy_fallback_cwd,- environment_requests- .into_iter()- .map(TurnEnvironmentSelection::new)- .collect(),+ environment_requests,)),runtime_workspace_roots: Some(workspace_roots),}diff --git a/codex-rs/core/src/codex_thread.rs b/codex-rs/core/src/codex_thread.rsindex 9628c834d3..e3beb6bb47 100644--- a/codex-rs/core/src/codex_thread.rs+++ b/codex-rs/core/src/codex_thread.rs@@ -51,6 +51,7 @@ use codex_protocol::protocol::ThreadSettingsOverrides;use codex_protocol::protocol::ThreadSettingsSnapshot;use codex_protocol::protocol::ThreadSource;use codex_protocol::protocol::TokenUsageInfo;+use codex_protocol::protocol::TurnEnvironmentRequests;use codex_protocol::protocol::TurnEnvironmentSelection;use codex_protocol::protocol::TurnEnvironmentSelections;use codex_protocol::protocol::W3cTraceContext;@@ -149,7 +150,7 @@ impl ThreadConfigSnapshot {pub struct CodexThreadSettingsOverrides {/// Replaces the data captured by future turns. Omission preserves it.pub turn_extension_init: Option<codex_extension_api::ExtensionDataInit>,- pub environments: Option<TurnEnvironmentSelections>,+ pub environments: Option<TurnEnvironmentRequests>,pub runtime_workspace_roots: Option<Vec<AbsolutePathBuf>>,pub profile_workspace_roots: Option<Vec<ProfileWorkspaceRoot>>,pub approval_policy: Option<AskForApproval>,@@ -667,7 +668,7 @@ impl CodexThread {&self,overrides: CodexThreadSettingsOverrides,) -> ConstraintResult<ThreadConfigSnapshot> {- let updates = Self::thread_settings_update(overrides);+ let updates = self.thread_settings_update(overrides);self.session.preview_settings(&updates).await}@@ -702,7 +703,7 @@ impl CodexThread {&self,settings: CodexThreadSettingsOverrides,) -> ConstraintResult<()> {- let updates = Self::thread_settings_update(settings);+ let updates = self.thread_settings_update(settings);self.session.update_settings(updates).await.map(|_| ())}@@ -713,7 +714,10 @@ impl CodexThread {self.session.checkpoint_thread_settings().await}- fn thread_settings_update(overrides: CodexThreadSettingsOverrides) -> SessionSettingsUpdate {+ fn thread_settings_update(+ &self,+ overrides: CodexThreadSettingsOverrides,+ ) -> SessionSettingsUpdate {let CodexThreadSettingsOverrides {turn_extension_init,environments: environment_requests,@@ -745,7 +749,7 @@ impl CodexThread {approval_policy,approvals_reviewer,},- environments: environment_requests,+ environments: environment_requests.map(TurnEnvironmentRequests::select),runtime_workspace_roots,profile_workspace_roots,sandbox_policy,diff --git a/codex-rs/core/src/session/session.rs b/codex-rs/core/src/session/session.rsindex 8d16c6b9fc..7a65538d2a 100644--- a/codex-rs/core/src/session/session.rs+++ b/codex-rs/core/src/session/session.rs@@ -42,6 +42,7 @@ use codex_protocol::protocol::HookCompletedEvent;use codex_protocol::protocol::MultiAgentVersion;use codex_protocol::protocol::ThreadHistoryMode;use codex_protocol::protocol::ThreadSource;+use codex_protocol::protocol::TurnEnvironmentRequests;use codex_protocol::protocol::TurnEnvironmentSelections;use codex_sandboxing::SandboxType;use codex_skills::SkillError;@@ -340,9 +341,12 @@ impl SessionConfiguration {environment_selections: Vec<TurnEnvironmentSelection>,) -> CodexThreadSettingsOverrides {CodexThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(self.legacy_fallback_cwd.clone(),- environment_selections,+ environment_selections+ .into_iter()+ .map(TurnEnvironmentSelection::into_request)+ .collect(),)),runtime_workspace_roots: Some(self.runtime_workspace_roots.clone()),profile_workspace_roots: Some(diff --git a/codex-rs/core/src/session/step_activation.rs b/codex-rs/core/src/session/step_activation.rsindex 6a972b8ba7..a1a9c15250 100644--- a/codex-rs/core/src/session/step_activation.rs+++ b/codex-rs/core/src/session/step_activation.rs@@ -272,6 +272,12 @@ impl Session {summary,service_tier,} = update;+ let environments = environment_requests.map(|requests| {+ requests+ .into_iter()+ .map(TurnEnvironmentSelection::new)+ .collect::<Vec<_>>()+ });let updates_step_settings = updates_model_settings || approvals_reviewer.is_some();let update = StepSettingsUpdate {approvals_reviewer,@@ -286,9 +292,7 @@ impl Session {// progress, finish, or be cancelled while this awaits; we don't hold the update locks here.let prepared = if updates_step_settings {let current_environments = self.services.turn_environments.selections();- let proposed = environment_requests- .as_deref()- .unwrap_or(¤t_environments);+ let proposed = environments.as_deref().unwrap_or(¤t_environments);self.prepare_step_settings_activation(&turn_context, ¤t, &update, proposed).await.map(Some)@@ -297,9 +301,8 @@ impl Session {};// Validate the environment configuration supplied in the update.- let environment_config_validation = environment_requests- .as_deref()- .map(validate_environment_configs);+ let environment_config_validation =+ environments.as_deref().map(validate_environment_configs);// Confirm the task we originally targeted is still running.let active = self.active_turn.lock().await;@@ -329,9 +332,7 @@ impl Session {// Environment configuration can arrive before its executor connects. If this update// omits environments, use what the running turn's manager knows now.let current_environments = self.services.turn_environments.selections();- let proposed = environment_requests- .as_deref()- .unwrap_or(¤t_environments);+ let proposed = environments.as_deref().unwrap_or(¤t_environments);let validation = (|| {if let Some(configs) = environment_config_validation {validate_environment_ids_and_cwds(@@ -374,7 +375,7 @@ impl Session {.next_step_settings.store(Arc::new(settings));}- if environment_requests.is_some() {+ if environments.is_some() {self.services.turn_environments.update_selections(proposed);}TurnSettingsUpdateOutcome::Applieddiff --git a/codex-rs/core/src/session/thread_settings.rs b/codex-rs/core/src/session/thread_settings.rsindex 05d11c96e8..9e9644a432 100644--- a/codex-rs/core/src/session/thread_settings.rs+++ b/codex-rs/core/src/session/thread_settings.rs@@ -79,7 +79,8 @@ pub(super) fn prepare_update(approval_policy,approvals_reviewer,},- environments: environment_requests,+ environments: environment_requests+ .map(codex_protocol::protocol::TurnEnvironmentRequests::select),runtime_workspace_roots,profile_workspace_roots,sandbox_policy,diff --git a/codex-rs/core/src/session/turn_input_tests.rs b/codex-rs/core/src/session/turn_input_tests.rsindex bb338c72dd..eef3de7569 100644--- a/codex-rs/core/src/session/turn_input_tests.rs+++ b/codex-rs/core/src/session/turn_input_tests.rs@@ -179,7 +179,7 @@ async fn accepted_input_applies_thread_settings() {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(config.cwd.clone())),+ environments: Some(local_selections(config.cwd.clone()).into_requests()),approval_policy: Some(config.permissions.approval_policy.value()),approvals_reviewer: Some(codex_config::types::ApprovalsReviewer::AutoReview),sandbox_policy: Some(config.legacy_sandbox_policy()),@@ -556,7 +556,7 @@ async fn automatic_admission_rechecks_plan_mode_without_committing_sparse_settinlet overrides = ThreadSettingsOverrides {model: Some("automatic-model-must-not-be-applied".to_string()),service_tier: Some(Some(ServiceTier::Fast.request_value().to_string())),- environments: Some(proposed_environments.clone()),+ environments: Some(proposed_environments.clone().into_requests()),approval_policy: Some(AskForApproval::Never),approvals_reviewer: Some(ApprovalsReviewer::AutoReview),..Default::default()diff --git a/codex-rs/core/tests/common/test_codex.rs b/codex-rs/core/tests/common/test_codex.rsindex 3df9969532..bc57d3c310 100644--- a/codex-rs/core/tests/common/test_codex.rs+++ b/codex-rs/core/tests/common/test_codex.rs@@ -1,4 +1,5 @@use codex_protocol::protocol::TurnEnvironmentRequest;+use codex_protocol::protocol::TurnEnvironmentRequests;use std::future::Future;use std::io::ErrorKind;use std::mem::swap;@@ -191,6 +192,11 @@ pub fn local_selections(cwd: AbsolutePathBuf) -> TurnEnvironmentSelections {TurnEnvironmentSelections::new(cwd.clone(), vec![local(cwd)])}+/// Builds thread-settings input using the local test environment.+pub fn local_requests(cwd: AbsolutePathBuf) -> TurnEnvironmentRequests {+ TurnEnvironmentRequests::new(cwd.clone(), vec![local_request(cwd)])+}+#[derive(Debug)]pub struct TestEnv {environment: codex_exec_server::Environment,@@ -1227,7 +1233,8 @@ impl TestCodex {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: turn_environment_selections,+ environments: turn_environment_selections+ .map(TurnEnvironmentSelections::into_requests),approval_policy: Some(approval_policy),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/remote_env_windows/remote_env_windows_test.rs b/codex-rs/core/tests/remote_env_windows/remote_env_windows_test.rsindex 98b3fa0200..5dcbc37475 100644--- a/codex-rs/core/tests/remote_env_windows/remote_env_windows_test.rs+++ b/codex-rs/core/tests/remote_env_windows/remote_env_windows_test.rs@@ -118,7 +118,7 @@ async fn windows_exec_server_runs_with_native_shell_and_cwd() -> Result<()> {text: "run the Windows smoke command".to_string(),text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(environments),+ environments: Some(environments.into_requests()),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/agent_execution.rs b/codex-rs/core/tests/suite/agent_execution.rsindex 2f74b79568..898fa44891 100644--- a/codex-rs/core/tests/suite/agent_execution.rs+++ b/codex-rs/core/tests/suite/agent_execution.rs@@ -10,7 +10,7 @@ use codex_protocol::protocol::EnvironmentConfig;use codex_protocol::protocol::EnvironmentConfigState;use codex_protocol::protocol::EventMsg;use codex_protocol::protocol::ThreadSettingsOverrides;-use codex_protocol::protocol::TurnEnvironmentSelections;+use codex_protocol::protocol::TurnEnvironmentRequests;use core_test_support::apps_test_server::AppsTestServer;use core_test_support::responses::ResponseMock;use core_test_support::responses::ev_assistant_message;@@ -463,9 +463,9 @@ async fn v2_residency_reload_preserves_inherited_environment_and_tools(submit_thread_settings(&test.codex,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![child_environment.clone()],+ vec![child_environment.clone().into_request()],)),..Default::default()},@@ -492,9 +492,9 @@ async fn v2_residency_reload_preserves_inherited_environment_and_tools(submit_thread_settings(&test.codex,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![parent_environment.clone()],+ vec![parent_environment.clone().into_request()],)),..Default::default()},@@ -522,9 +522,9 @@ async fn v2_residency_reload_preserves_inherited_environment_and_tools(submit_thread_settings(&test.codex,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![parent_environment.clone()],+ vec![parent_environment.clone().into_request()],)),..Default::default()},diff --git a/codex-rs/core/tests/suite/agents_md.rs b/codex-rs/core/tests/suite/agents_md.rsindex 85ad32e68d..729c704c1e 100644--- a/codex-rs/core/tests/suite/agents_md.rs+++ b/codex-rs/core/tests/suite/agents_md.rs@@ -30,7 +30,7 @@ use codex_protocol::protocol::Op;use codex_protocol::protocol::ThreadHistoryMode;use codex_protocol::protocol::ThreadSettingsOverrides;use codex_protocol::protocol::TurnEnvironmentRequest;-use codex_protocol::protocol::TurnEnvironmentSelections;+use codex_protocol::protocol::TurnEnvironmentRequests;use codex_protocol::request_user_input::RequestUserInputAnswer;use codex_protocol::request_user_input::RequestUserInputResponse;use codex_protocol::user_input::UserInput;@@ -1474,7 +1474,7 @@ async fn thread_provider_enforces_its_own_limit_before_startup_and_sampling() ->text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(fixture.test.config.cwd.clone(),Vec::new(),)),diff --git a/codex-rs/core/tests/suite/apply_patch_cli.rs b/codex-rs/core/tests/suite/apply_patch_cli.rsindex 9c44c89dae..0edaa0dc53 100644--- a/codex-rs/core/tests/suite/apply_patch_cli.rs+++ b/codex-rs/core/tests/suite/apply_patch_cli.rs@@ -3,6 +3,7 @@ use base64::Engine;use base64::engine::general_purpose::STANDARD as BASE64_STANDARD;use codex_core::StartThreadOptions;use codex_core::TurnInputRequest;+use codex_protocol::protocol::TurnEnvironmentRequests;use core_test_support::responses::ev_apply_patch_custom_tool_call;use core_test_support::responses::ev_apply_patch_exec_command_call_via_heredoc;use core_test_support::responses::ev_exec_command_call;@@ -43,7 +44,6 @@ use codex_protocol::protocol::ReviewDecision;use codex_protocol::protocol::SandboxPolicy;use codex_protocol::protocol::ThreadSettingsOverrides;use codex_protocol::protocol::TurnEnvironmentSelection;-use codex_protocol::protocol::TurnEnvironmentSelections;use codex_protocol::user_input::UserInput;#[cfg(target_os = "linux")]use codex_sandboxing::landlock::CODEX_LINUX_SANDBOX_ARG0;@@ -1059,9 +1059,9 @@ async fn intercepted_apply_patch_updates_absolute_target_after_turn_cwd_is_removtext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![selection],+ vec![selection.into_request()],)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),@@ -2350,9 +2350,12 @@ async fn apply_patch_turn_diff_tracks_local_and_remote_environment_paths() -> Retext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(codex_protocol::protocol::TurnEnvironmentSelections::new(+ environments: Some(codex_protocol::protocol::TurnEnvironmentRequests::new(test.config.cwd.clone(),- environments,+ environments+ .into_iter()+ .map(TurnEnvironmentSelection::into_request)+ .collect(),)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),diff --git a/codex-rs/core/tests/suite/approvals.rs b/codex-rs/core/tests/suite/approvals.rsindex 22f28f9212..99836ced45 100644--- a/codex-rs/core/tests/suite/approvals.rs+++ b/codex-rs/core/tests/suite/approvals.rs@@ -49,7 +49,7 @@ use core_test_support::responses::sse;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -677,7 +677,7 @@ async fn submit_turn(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),approvals_reviewer: Some(ApprovalsReviewer::User),sandbox_policy: Some(sandbox_policy),@@ -711,7 +711,7 @@ async fn submit_turn_preserving_active_permission_profile(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),approvals_reviewer: Some(ApprovalsReviewer::User),collaboration_mode: Some(CollaborationMode {@@ -3585,7 +3585,7 @@ async fn env_zsh_script_spawned_by_python_can_request_escalation_under_zsh_fork(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),approvals_reviewer: Some(ApprovalsReviewer::User),sandbox_policy: Some(sandbox_policy),@@ -3726,7 +3726,7 @@ async fn matched_prefix_rule_runs_unsandboxed_under_zsh_fork() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),approvals_reviewer: Some(ApprovalsReviewer::User),sandbox_policy: Some(sandbox_policy),@@ -4731,7 +4731,7 @@ allow_local_binding = truetext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),approvals_reviewer: Some(ApprovalsReviewer::User),sandbox_policy: Some(turn_sandbox_policy),diff --git a/codex-rs/core/tests/suite/auto_review.rs b/codex-rs/core/tests/suite/auto_review.rsindex 6f5c9fc7d9..dae7afa057 100644--- a/codex-rs/core/tests/suite/auto_review.rs+++ b/codex-rs/core/tests/suite/auto_review.rs@@ -1,4 +1,5 @@use codex_core::TurnInputRequest;+use core_test_support::test_codex::local_requests;use std::sync::Arc;use std::time::Duration;@@ -44,7 +45,6 @@ use core_test_support::skip_if_no_network;use core_test_support::skip_if_sandbox;use core_test_support::skip_if_wine_exec;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -538,7 +538,7 @@ async fn remote_model_override_uses_catalog_model_for_strict_auto_review() -> Retext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_path)),+ environments: Some(local_requests(cwd_path)),approval_policy: Some(AskForApproval::OnRequest),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/client.rs b/codex-rs/core/tests/suite/client.rsindex 4f45445509..23e2f115f7 100644--- a/codex-rs/core/tests/suite/client.rs+++ b/codex-rs/core/tests/suite/client.rs@@ -82,7 +82,7 @@ use core_test_support::responses::strip_response_item_ids_from_json;use core_test_support::responses_metadata as test_responses_metadata;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::wait_for_event;use futures::StreamExt;@@ -2546,7 +2546,7 @@ async fn user_turn_collaboration_mode_overrides_model_and_effort() -> anyhow::Retext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(config.cwd.clone())),+ environments: Some(local_requests(config.cwd.clone())),approval_policy: Some(config.permissions.approval_policy.value()),sandbox_policy: Some(config.legacy_sandbox_policy()),summary: Some(@@ -2804,7 +2804,7 @@ async fn user_turn_explicit_reasoning_summary_overrides_model_catalog_default()text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(config.cwd.clone())),+ environments: Some(local_requests(config.cwd.clone())),approval_policy: Some(config.permissions.approval_policy.value()),sandbox_policy: Some(config.legacy_sandbox_policy()),summary: Some(ReasoningSummary::Concise),diff --git a/codex-rs/core/tests/suite/code_mode.rs b/codex-rs/core/tests/suite/code_mode.rsindex 95c7bdaaad..3452a3939e 100644--- a/codex-rs/core/tests/suite/code_mode.rs+++ b/codex-rs/core/tests/suite/code_mode.rs@@ -8124,7 +8124,7 @@ text(JSON.stringify({text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(codex_protocol::protocol::TurnEnvironmentSelections::new(+ environments: Some(codex_protocol::protocol::TurnEnvironmentRequests::new(cwd,Vec::new(),)),@@ -8460,7 +8460,7 @@ text(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(codex_protocol::protocol::TurnEnvironmentSelections::new(+ environments: Some(codex_protocol::protocol::TurnEnvironmentRequests::new(cwd,Vec::new(),)),diff --git a/codex-rs/core/tests/suite/collaboration_instructions.rs b/codex-rs/core/tests/suite/collaboration_instructions.rsindex 3077301477..deb15f4cd4 100644--- a/codex-rs/core/tests/suite/collaboration_instructions.rs+++ b/codex-rs/core/tests/suite/collaboration_instructions.rs@@ -25,7 +25,7 @@ use core_test_support::responses::sse;use core_test_support::responses::sse_response;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::wait_for_event;use pretty_assertions::assert_eq;@@ -542,7 +542,7 @@ async fn collaboration_instructions_added_on_user_turn() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(test.config.permissions.approval_policy.value()),sandbox_policy: Some(test.config.legacy_sandbox_policy()),summary: Some(@@ -589,7 +589,7 @@ async fn collaboration_instructions_omitted_when_disabled() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(test.config.permissions.approval_policy.value()),sandbox_policy: Some(test.config.legacy_sandbox_policy()),summary: Some(@@ -647,7 +647,7 @@ async fn user_turn_overrides_collaboration_instructions_after_override() -> Resutext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(test.config.permissions.approval_policy.value()),sandbox_policy: Some(test.config.legacy_sandbox_policy()),summary: Some(diff --git a/codex-rs/core/tests/suite/compact.rs b/codex-rs/core/tests/suite/compact.rsindex 99eb604e82..b46bc107e9 100644--- a/codex-rs/core/tests/suite/compact.rs+++ b/codex-rs/core/tests/suite/compact.rs@@ -44,7 +44,7 @@ use core_test_support::responses::ev_reasoning_item;use core_test_support::responses::mount_models_once;use core_test_support::responses::strip_response_item_ids_from_json;use core_test_support::skip_if_no_network;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::test_path_buf;@@ -130,7 +130,7 @@ fn disabled_permission_user_turn(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd.abs())),+ environments: Some(local_requests(cwd.abs())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -5291,7 +5291,7 @@ async fn snapshot_request_shape_pre_turn_compaction_including_incoming_user_messcore_test_support::submit_thread_settings(&codex,ThreadSettingsOverrides {- environments: Some(local_selections(+ environments: Some(local_requests(test_path_buf(PRETURN_CONTEXT_DIFF_CWD).abs(),)),..Default::default()diff --git a/codex-rs/core/tests/suite/exec_policy.rs b/codex-rs/core/tests/suite/exec_policy.rsindex 5dcf902a9f..aef95b4df0 100644--- a/codex-rs/core/tests/suite/exec_policy.rs+++ b/codex-rs/core/tests/suite/exec_policy.rs@@ -34,7 +34,7 @@ use core_test_support::responses::sse;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_target_windows;use core_test_support::skip_if_wine_exec;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -73,7 +73,7 @@ async fn submit_user_turn(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -566,7 +566,7 @@ async fn execpolicy_blocks_shell_invocation() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/extension_sandbox.rs b/codex-rs/core/tests/suite/extension_sandbox.rsindex f453ced280..ee02338961 100644--- a/codex-rs/core/tests/suite/extension_sandbox.rs+++ b/codex-rs/core/tests/suite/extension_sandbox.rs@@ -1,3 +1,4 @@+use core_test_support::test_codex::local_requests;use std::collections::BTreeSet;use std::sync::Arc;@@ -40,7 +41,6 @@ use core_test_support::responses;use core_test_support::skip_if_no_network;use core_test_support::skip_if_sandbox;use core_test_support::skip_if_target_windows;-use core_test_support::test_codex::local_selections;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -294,7 +294,7 @@ async fn extension_tool_uses_granted_turn_permissions_without_host_local_persisttext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(AskForApproval::OnRequest),approvals_reviewer: Some(ApprovalsReviewer::User),sandbox_policy: Some(sandbox_policy),@@ -517,7 +517,7 @@ async fn extension_tool_rebinds_granted_permissions_on_each_turn(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(AskForApproval::OnRequest),approvals_reviewer: Some(ApprovalsReviewer::User),sandbox_policy: Some(sandbox_policy),diff --git a/codex-rs/core/tests/suite/guardian_authorization.rs b/codex-rs/core/tests/suite/guardian_authorization.rsindex aac2e8c63f..3a8afec70a 100644--- a/codex-rs/core/tests/suite/guardian_authorization.rs+++ b/codex-rs/core/tests/suite/guardian_authorization.rs@@ -28,7 +28,7 @@ use core_test_support::skip_if_sandbox;use core_test_support::skip_if_wine_exec;use core_test_support::streaming_sse::StreamingSseChunk;use core_test_support::streaming_sse::start_streaming_sse_server;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::wait_for_event;use core_test_support::wait_for_event_match;@@ -200,7 +200,7 @@ async fn guardian_revalidates_owning_session_before_allow(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),..Default::default()}),)diff --git a/codex-rs/core/tests/suite/guardian_environments_tests.rs b/codex-rs/core/tests/suite/guardian_environments_tests.rsindex 452387a53e..d65866ddb2 100644--- a/codex-rs/core/tests/suite/guardian_environments_tests.rs+++ b/codex-rs/core/tests/suite/guardian_environments_tests.rs@@ -4,6 +4,7 @@ use super::*;use codex_core::context::UserGoalUpdate;use codex_history::RolloutItem;use codex_protocol::protocol::GuardianAssessmentStatus;+use codex_protocol::protocol::TurnEnvironmentRequests;use core_test_support::streaming_sse::StreamingSseChunk;use core_test_support::streaming_sse::start_streaming_sse_server;use pretty_assertions::assert_eq;@@ -202,9 +203,9 @@ async fn guardian_reviews_target_environment_and_reuses_prefix(tool: &str) -> Retext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![primary.clone(), secondary],+ vec![primary.clone().into_request(), secondary.into_request()],)),..Default::default()}),@@ -408,9 +409,9 @@ async fn guardian_reviews_with_offline_primary_executor() -> Result<()> {}]).with_thread_settings(ThreadSettingsOverrides {approvals_reviewer: Some(ApprovalsReviewer::AutoReview),- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![primary],+ vec![primary.into_request()],)),..Default::default()}),@@ -578,9 +579,9 @@ async fn guardian_revalidates_allow_with_offline_secondary_executor() -> Result<text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![primary, secondary],+ vec![primary.into_request(), secondary.into_request()],)),..Default::default()}),diff --git a/codex-rs/core/tests/suite/guardian_mcp_elicitation.rs b/codex-rs/core/tests/suite/guardian_mcp_elicitation.rsindex aa380b47eb..ab6bf48c1f 100644--- a/codex-rs/core/tests/suite/guardian_mcp_elicitation.rs+++ b/codex-rs/core/tests/suite/guardian_mcp_elicitation.rs@@ -23,7 +23,7 @@ use core_test_support::apps_test_server::apps_enabled_builder;use core_test_support::responses;use core_test_support::skip_if_no_network;use core_test_support::skip_if_wine_exec;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::wait_for_event;use core_test_support::wait_for_mcp_server;@@ -182,7 +182,7 @@ async fn interrupt_aborts_server_initiated_mcp_guardian_review() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),..Default::default()}),)diff --git a/codex-rs/core/tests/suite/guardian_review.rs b/codex-rs/core/tests/suite/guardian_review.rsindex 94b7054b87..a6163a521e 100644--- a/codex-rs/core/tests/suite/guardian_review.rs+++ b/codex-rs/core/tests/suite/guardian_review.rs@@ -73,6 +73,7 @@ use core_test_support::skip_if_sandbox;use core_test_support::skip_if_wine_exec;use core_test_support::streaming_sse::StreamingSseChunk;use core_test_support::streaming_sse::start_streaming_sse_server;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::local_selections;use core_test_support::test_codex::test_codex;use core_test_support::wait_for_event;@@ -1739,7 +1740,7 @@ async fn guardian_session_is_reused_for_consecutive_tool_reviews_without_prewarmtext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(parent_environments),+ environments: Some(parent_environments.into_requests()),approval_policy: Some(approval_policy),approvals_reviewer: Some(ApprovalsReviewer::AutoReview),..Default::default()@@ -2695,7 +2696,7 @@ printf '%s\n' "${@: -1}" >> "${payload_path}""#,text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),approvals_reviewer: Some(ApprovalsReviewer::AutoReview),sandbox_policy: Some(sandbox_policy),diff --git a/codex-rs/core/tests/suite/guardian_review_cancellation.rs b/codex-rs/core/tests/suite/guardian_review_cancellation.rsindex aac131c6b7..733f68024f 100644--- a/codex-rs/core/tests/suite/guardian_review_cancellation.rs+++ b/codex-rs/core/tests/suite/guardian_review_cancellation.rs@@ -21,7 +21,7 @@ use core_test_support::responses::sse;use core_test_support::skip_if_no_network;use core_test_support::skip_if_sandbox;use core_test_support::skip_if_wine_exec;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::wait_for_event;use serde_json::Value;@@ -159,7 +159,7 @@ async fn cancelling_tool_aborts_its_guardian_review(cancellation: Cancellation)text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),..Default::default()}),)diff --git a/codex-rs/core/tests/suite/hooks_executor.rs b/codex-rs/core/tests/suite/hooks_executor.rsindex 4dda896672..6ac3bac0d8 100644--- a/codex-rs/core/tests/suite/hooks_executor.rs+++ b/codex-rs/core/tests/suite/hooks_executor.rs@@ -20,8 +20,9 @@ use codex_protocol::protocol::SessionSource;use codex_protocol::protocol::SubAgentSource;use codex_protocol::protocol::ThreadSettingsOverrides;use codex_protocol::protocol::ThreadSource;+use codex_protocol::protocol::TurnEnvironmentRequest;+use codex_protocol::protocol::TurnEnvironmentRequests;use codex_protocol::protocol::TurnEnvironmentSelection;-use codex_protocol::protocol::TurnEnvironmentSelections;use codex_protocol::user_input::UserInput;use codex_utils_path_uri::PathUri;use core_test_support::apps_test_server::AppsTestServer;@@ -362,14 +363,14 @@ async fn executor_stop_hook_rejects_mismatched_environment() -> Result<()> {submit_thread_settings(&fixture.test.codex,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(fixture.test.config.cwd.clone(),vec![- attached_selection,- TurnEnvironmentSelection {+ attached_selection.into_request(),+ TurnEnvironmentRequest {environment_id: mismatched_environment_id.to_string(),config: EnvironmentConfigState::FromThread,- ..selection.clone()+ ..selection.clone().into_request()},],)),diff --git a/codex-rs/core/tests/suite/image_rollout.rs b/codex-rs/core/tests/suite/image_rollout.rsindex d24aa3b586..7bb84dbbcf 100644--- a/codex-rs/core/tests/suite/image_rollout.rs+++ b/codex-rs/core/tests/suite/image_rollout.rs@@ -43,7 +43,7 @@ use core_test_support::responses::strip_metadata;use core_test_support::responses::strip_response_item_id;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -188,7 +188,7 @@ async fn copy_paste_local_image_persists_rollout_request_shape() -> anyhow::Resu},]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd.abs())),+ environments: Some(local_requests(cwd.abs())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -286,7 +286,7 @@ async fn drag_drop_image_persists_rollout_request_shape() -> anyhow::Result<()>},]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd.abs())),+ environments: Some(local_requests(cwd.abs())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/items.rs b/codex-rs/core/tests/suite/items.rsindex f50baf2ad0..69ae12fe6a 100644--- a/codex-rs/core/tests/suite/items.rs+++ b/codex-rs/core/tests/suite/items.rs@@ -39,7 +39,7 @@ use core_test_support::responses::sse;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -59,7 +59,7 @@ fn disabled_plan_turn(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd)),+ environments: Some(local_requests(cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/json_result.rs b/codex-rs/core/tests/suite/json_result.rsindex dbe24124fd..2443765701 100644--- a/codex-rs/core/tests/suite/json_result.rs+++ b/codex-rs/core/tests/suite/json_result.rs@@ -13,7 +13,7 @@ use codex_protocol::user_input::UserInput;use core_test_support::responses;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -83,7 +83,7 @@ async fn codex_returns_json_result(model: String) -> anyhow::Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd)),+ environments: Some(local_requests(cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/mcp_startup_refresh_http_proxy.rs b/codex-rs/core/tests/suite/mcp_startup_refresh_http_proxy.rsindex 04dfcb48de..4590ed9b20 100644--- a/codex-rs/core/tests/suite/mcp_startup_refresh_http_proxy.rs+++ b/codex-rs/core/tests/suite/mcp_startup_refresh_http_proxy.rs@@ -403,7 +403,7 @@ async fn skill_mcp_dependency_oauth_uses_configured_http_client() -> Result<()>},]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(environments),+ environments: Some(environments.into_requests()),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/mcp_turn_metadata.rs b/codex-rs/core/tests/suite/mcp_turn_metadata.rsindex 963b143ae1..acf7d6ea93 100644--- a/codex-rs/core/tests/suite/mcp_turn_metadata.rs+++ b/codex-rs/core/tests/suite/mcp_turn_metadata.rs@@ -30,7 +30,7 @@ use codex_protocol::protocol::ItemCompletedEvent;use codex_protocol::protocol::ItemStartedEvent;use codex_protocol::protocol::Op;use codex_protocol::protocol::ThreadSettingsOverrides;-use codex_protocol::protocol::TurnEnvironmentSelections;+use codex_protocol::protocol::TurnEnvironmentRequests;use codex_protocol::protocol::TurnSettingsUpdate;use codex_protocol::protocol::TurnSettingsUpdateOutcome;use codex_protocol::request_permissions::PermissionGrantScope;@@ -456,9 +456,9 @@ async fn submit_user_turn(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![test.executor_environment().selection().clone()],+ vec![test.executor_environment().request()],)),approval_policy: Some(approval_policy),sandbox_policy: Some(sandbox_policy),diff --git a/codex-rs/core/tests/suite/model_switching.rs b/codex-rs/core/tests/suite/model_switching.rsindex 0801b977e5..2fe59dd372 100644--- a/codex-rs/core/tests/suite/model_switching.rs+++ b/codex-rs/core/tests/suite/model_switching.rs@@ -52,7 +52,7 @@ use core_test_support::responses::sse_completed;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -68,7 +68,7 @@ fn read_only_user_turn(test: &TestCodex, items: Vec<UserInput>, model: String) -let (sandbox_policy, permission_profile) =turn_permission_fields(PermissionProfile::read_only(), test.cwd_path());TurnInputRequest::user_input(items).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/model_visible_layout.rs b/codex-rs/core/tests/suite/model_visible_layout.rsindex 0256c00dc8..f220babc05 100644--- a/codex-rs/core/tests/suite/model_visible_layout.rs+++ b/codex-rs/core/tests/suite/model_visible_layout.rs@@ -1,4 +1,6 @@-use core_test_support::test_codex::local_selections;+use codex_protocol::protocol::TurnEnvironmentRequest;+use codex_protocol::protocol::TurnEnvironmentRequests;+use core_test_support::test_codex::local_requests;use std::fs;use std::sync::Arc;use std::sync::Mutex;@@ -25,8 +27,6 @@ use codex_protocol::protocol::AskForApproval;use codex_protocol::protocol::EnvironmentConfigState;use codex_protocol::protocol::EventMsg;use codex_protocol::protocol::ThreadSettingsOverrides;-use codex_protocol::protocol::TurnEnvironmentSelection;-use codex_protocol::protocol::TurnEnvironmentSelections;use codex_protocol::user_input::UserInput;use codex_skills_extension::SkillsExtensionConfig;use codex_skills_extension::install;@@ -226,9 +226,9 @@ async fn model_visible_environment_context_preserves_foreign_workspace_roots() -}]).with_thread_settings(ThreadSettingsOverrides {permission_profile: Some(PermissionProfile::workspace_write()),- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![TurnEnvironmentSelection {+ vec![TurnEnvironmentRequest {environment_id: LOCAL_ENVIRONMENT_ID.to_string(),cwd: PathUri::from_abs_path(&test.config.cwd),workspace_roots: vec![foreign_root],@@ -305,7 +305,7 @@ async fn snapshot_model_visible_layout_turn_overrides() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(first_turn_cwd)),+ environments: Some(local_requests(first_turn_cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(first_sandbox_policy),permission_profile: first_permission_profile,@@ -337,7 +337,7 @@ async fn snapshot_model_visible_layout_turn_overrides() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(preturn_context_diff_cwd)),+ environments: Some(local_requests(preturn_context_diff_cwd)),approval_policy: Some(AskForApproval::OnRequest),sandbox_policy: Some(second_sandbox_policy),permission_profile: second_permission_profile,@@ -425,7 +425,7 @@ async fn snapshot_model_visible_layout_cwd_change_refreshes_agents() -> Result<(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_one.clone())),+ environments: Some(local_requests(cwd_one.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(first_sandbox_policy),permission_profile: first_permission_profile,@@ -455,7 +455,7 @@ async fn snapshot_model_visible_layout_cwd_change_refreshes_agents() -> Result<(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_two)),+ environments: Some(local_requests(cwd_two)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(second_sandbox_policy),permission_profile: second_permission_profile,@@ -567,7 +567,7 @@ async fn snapshot_model_visible_layout_resume_with_personality_change() -> Resultext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(resume_override_cwd)),+ environments: Some(local_requests(resume_override_cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -665,7 +665,7 @@ async fn snapshot_model_visible_layout_resume_override_matches_rollout_model() -core_test_support::submit_thread_settings(&resumed.codex,ThreadSettingsOverrides {- environments: Some(local_selections(resume_override_cwd)),+ environments: Some(local_requests(resume_override_cwd)),model: Some("gpt-5.2".to_string()),..Default::default()},diff --git a/codex-rs/core/tests/suite/models_cache_ttl.rs b/codex-rs/core/tests/suite/models_cache_ttl.rsindex e3c2b59d95..e2e4a17a1a 100644--- a/codex-rs/core/tests/suite/models_cache_ttl.rs+++ b/codex-rs/core/tests/suite/models_cache_ttl.rs@@ -1,5 +1,5 @@use codex_core::TurnInputRequest;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use std::path::Path;use std::sync::Arc;@@ -214,7 +214,7 @@ async fn renews_cache_ttl_on_matching_models_etag() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(codex_protocol::protocol::AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/models_etag_responses.rs b/codex-rs/core/tests/suite/models_etag_responses.rsindex ffc69e98e1..bac80df6e2 100644--- a/codex-rs/core/tests/suite/models_etag_responses.rs+++ b/codex-rs/core/tests/suite/models_etag_responses.rs@@ -1,7 +1,7 @@#![cfg(not(target_os = "windows"))]use codex_core::TurnInputRequest;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use std::sync::Arc;use std::time::Duration;@@ -116,7 +116,7 @@ async fn refresh_models_on_models_etag_mismatch_and_avoid_duplicate_models_fetchtext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_path)),+ environments: Some(local_requests(cwd_path)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/multi_exec_server_sandbox.rs b/codex-rs/core/tests/suite/multi_exec_server_sandbox.rsindex 8928df9f6f..3c2893cbc5 100644--- a/codex-rs/core/tests/suite/multi_exec_server_sandbox.rs+++ b/codex-rs/core/tests/suite/multi_exec_server_sandbox.rs@@ -1,4 +1,5 @@use codex_core::TurnInputRequest;+use codex_protocol::protocol::TurnEnvironmentRequests;use std::process::Stdio;use std::time::Duration;@@ -12,7 +13,6 @@ use codex_protocol::protocol::EnvironmentConfigState;use codex_protocol::protocol::EventMsg;use codex_protocol::protocol::ThreadSettingsOverrides;use codex_protocol::protocol::TurnEnvironmentSelection;-use codex_protocol::protocol::TurnEnvironmentSelections;use codex_protocol::user_input::UserInput;use codex_utils_path_uri::PathUri;use core_test_support::responses::ev_assistant_message;@@ -208,9 +208,12 @@ async fn two_exec_servers_isolate_workspace_write_roots() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- environments,+ environments+ .into_iter()+ .map(TurnEnvironmentSelection::into_request)+ .collect(),)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),diff --git a/codex-rs/core/tests/suite/network_approval.rs b/codex-rs/core/tests/suite/network_approval.rsindex 5dc35601a1..c2de770967 100644--- a/codex-rs/core/tests/suite/network_approval.rs+++ b/codex-rs/core/tests/suite/network_approval.rs@@ -49,6 +49,7 @@ use codex_protocol::protocol::GuardianAssessmentStatus;use codex_protocol::protocol::Op;use codex_protocol::protocol::ReviewDecision;use codex_protocol::protocol::ThreadSettingsOverrides;+use codex_protocol::protocol::TurnEnvironmentRequests;use codex_protocol::protocol::TurnEnvironmentSelection;use codex_protocol::protocol::TurnEnvironmentSelections;use codex_protocol::request_permissions::PermissionGrantScope;@@ -80,6 +81,7 @@ use core_test_support::skip_if_target_windows;use core_test_support::test_codex::TestCodex;use core_test_support::test_codex::TestCodexBuilder;use core_test_support::test_codex::local;+use core_test_support::test_codex::local_request;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -905,9 +907,9 @@ async fn background_network_approval_uses_current_review_settings_and_original_etext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(current_cwd.abs(),- vec![local(current_cwd.abs())],+ vec![local_request(current_cwd.abs())],)),collaboration_mode: Some(CollaborationMode {mode: ModeKind::Default,@@ -3308,7 +3310,7 @@ async fn submit_managed_network_turn(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(turn_environment_selections),+ environments: Some(turn_environment_selections.into_requests()),approval_policy: Some(approval_policy),approvals_reviewer: Some(approvals_reviewer),sandbox_policy: Some(sandbox_policy),diff --git a/codex-rs/core/tests/suite/override_updates.rs b/codex-rs/core/tests/suite/override_updates.rsindex beb553e4ea..1b4339cd6a 100644--- a/codex-rs/core/tests/suite/override_updates.rs+++ b/codex-rs/core/tests/suite/override_updates.rs@@ -9,7 +9,7 @@ use codex_protocol::protocol::Op;use core_test_support::TempDirExt;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::wait_for_event;use tempfile::TempDir;@@ -69,7 +69,7 @@ async fn thread_settings_update_without_user_turn_does_not_record_environment_upcore_test_support::submit_thread_settings(&test.codex,codex_protocol::protocol::ThreadSettingsOverrides {- environments: Some(local_selections(new_cwd.abs())),+ environments: Some(local_requests(new_cwd.abs())),..Default::default()},)diff --git a/codex-rs/core/tests/suite/pending_input.rs b/codex-rs/core/tests/suite/pending_input.rsindex fed5252322..bc3ade0abe 100644--- a/codex-rs/core/tests/suite/pending_input.rs+++ b/codex-rs/core/tests/suite/pending_input.rs@@ -1,4 +1,4 @@-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use std::sync::Arc;use codex_core::CodexThread;@@ -357,7 +357,7 @@ async fn submit_danger_full_access_user_turn(test: &TestCodex, text: &str) {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/personality.rs b/codex-rs/core/tests/suite/personality.rsindex 924376511c..30275e0dd8 100644--- a/codex-rs/core/tests/suite/personality.rs+++ b/codex-rs/core/tests/suite/personality.rs@@ -12,7 +12,7 @@ use core_test_support::responses::sse_completed;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -34,7 +34,7 @@ fn read_only_text_turn(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/plugins.rs b/codex-rs/core/tests/suite/plugins.rsindex 178ba3e6ab..c93940599d 100644--- a/codex-rs/core/tests/suite/plugins.rs+++ b/codex-rs/core/tests/suite/plugins.rs@@ -1,5 +1,6 @@#![allow(clippy::unwrap_used)]+use core_test_support::test_codex::local_requests;use std::sync::Arc;use std::time::Duration;use std::time::Instant;@@ -62,7 +63,6 @@ use core_test_support::skip_if_target_windows;use core_test_support::stdio_server_bin;use core_test_support::submit_thread_settings;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -545,7 +545,7 @@ async fn persisted_remote_plugin_command_attribution_flows_through_turn_context(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd)),+ environments: Some(local_requests(cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/prompt_caching.rs b/codex-rs/core/tests/suite/prompt_caching.rsindex 12c1c42c2e..6cf6691cee 100644--- a/codex-rs/core/tests/suite/prompt_caching.rs+++ b/codex-rs/core/tests/suite/prompt_caching.rs@@ -1,5 +1,6 @@#![allow(clippy::unwrap_used)]+use core_test_support::test_codex::local_requests;use std::fs;use std::path::Path;use std::sync::Arc;@@ -35,7 +36,6 @@ use core_test_support::responses::strip_metadata_from_json;use core_test_support::responses::strip_response_item_ids_from_json;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -799,7 +799,7 @@ async fn per_turn_overrides_keep_cached_prefix_and_key_constant() -> anyhow::Restext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(new_cwd.abs())),+ environments: Some(local_requests(new_cwd.abs())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -919,7 +919,7 @@ async fn send_user_turn_with_no_changes_does_not_send_environment_context() -> atext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(default_cwd.clone())),+ environments: Some(local_requests(default_cwd.clone())),approval_policy: Some(default_approval_policy),sandbox_policy: Some(default_sandbox_policy.clone()),summary: Some(default_summary.unwrap_or(ReasoningSummary::Auto)),@@ -944,7 +944,7 @@ async fn send_user_turn_with_no_changes_does_not_send_environment_context() -> atext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(default_cwd.clone())),+ environments: Some(local_requests(default_cwd.clone())),approval_policy: Some(default_approval_policy),sandbox_policy: Some(default_sandbox_policy.clone()),summary: Some(default_summary.unwrap_or(ReasoningSummary::Auto)),@@ -1056,7 +1056,7 @@ async fn send_user_turn_with_changes_sends_environment_context() -> anyhow::Resutext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(default_cwd.clone())),+ environments: Some(local_requests(default_cwd.clone())),approval_policy: Some(default_approval_policy),sandbox_policy: Some(default_sandbox_policy.clone()),summary: Some(default_summary.unwrap_or(ReasoningSummary::Auto)),@@ -1083,7 +1083,7 @@ async fn send_user_turn_with_changes_sends_environment_context() -> anyhow::Resutext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(default_cwd.clone())),+ environments: Some(local_requests(default_cwd.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/remote_env.rs b/codex-rs/core/tests/suite/remote_env.rsindex 5f1fa0682d..d80e5f4fb4 100644--- a/codex-rs/core/tests/suite/remote_env.rs+++ b/codex-rs/core/tests/suite/remote_env.rs@@ -78,6 +78,7 @@ use codex_protocol::protocol::ReviewDecision;use codex_protocol::protocol::SandboxPolicy;use codex_protocol::protocol::ThreadSettingsOverrides;use codex_protocol::protocol::TurnEnvironmentRequest;+use codex_protocol::protocol::TurnEnvironmentRequests;use codex_protocol::protocol::TurnEnvironmentSelection;use codex_protocol::protocol::TurnEnvironmentSelections;use codex_protocol::protocol::TurnSettingsUpdate;@@ -115,6 +116,7 @@ use core_test_support::test_codex::TestCodex;use core_test_support::test_codex::TestCodexBuilder;use core_test_support::test_codex::environment_config_for_selection;use core_test_support::test_codex::local;+use core_test_support::test_codex::local_request;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::test_env;use core_test_support::test_codex::turn_permission_fields;@@ -243,7 +245,7 @@ async fn submit_turn_with_approval_and_environments(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(turn_environment_selections),+ environments: Some(turn_environment_selections.into_requests()),approval_policy: Some(approval_policy),approvals_reviewer: Some(ApprovalsReviewer::User),sandbox_policy: Some(SandboxPolicy::new_read_only_policy()),@@ -604,9 +606,9 @@ async fn environment_permissions_follow_configuration_ownership() -> Result<()>submit_thread_settings(&test.codex,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![TurnEnvironmentSelection {+ vec![TurnEnvironmentRequest {config: EnvironmentConfigState::Ready(EnvironmentConfig {allow_login_shell: test.config.permissions.allow_login_shell,workspace_roots: selection.workspace_roots.clone(),@@ -620,7 +622,7 @@ async fn environment_permissions_follow_configuration_ownership() -> Result<()>network_policy: None,selected_capability_roots: Vec::new(),}),- ..selection.clone()+ ..selection.clone().into_request()}],)),..Default::default()@@ -943,7 +945,7 @@ async fn settings_update_does_not_retarget_active_turn_environment() -> Result<(let preview = test.codex.preview_thread_settings_overrides(CodexThreadSettingsOverrides {- environments: Some(next_environments.clone()),+ environments: Some(next_environments.clone().into_requests()),..Default::default()}).await?;@@ -961,7 +963,7 @@ async fn settings_update_does_not_retarget_active_turn_environment() -> Result<(submit_thread_settings(&test.codex,ThreadSettingsOverrides {- environments: Some(next_environments.clone()),+ environments: Some(next_environments.clone().into_requests()),..Default::default()},)@@ -1103,7 +1105,7 @@ async fn active_environment_update_waits_for_a_configured_executor_to_connect(.submit(Op::TurnSettings {turn_id: request.turn_id.clone(),update: TurnSettingsUpdate {- environments: Some(vec![remote_selection.clone()]),+ environments: Some(vec![remote_selection.clone().into_request()]),..Default::default()},reply,@@ -1251,9 +1253,12 @@ async fn deferred_executor_promotes_primary_environment_when_startup_completes()text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![remote_selection, local_selection],+ vec![+ remote_selection.into_request(),+ local_selection.into_request(),+ ],)),..Default::default()}),@@ -1674,9 +1679,9 @@ async fn shared_executor_keeps_ready_capability_roots_scoped_to_each_attachment(let preview = test.codex.preview_thread_settings_overrides(CodexThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![selection_override],+ vec![selection_override.into_request()],)),..Default::default()})@@ -1717,9 +1722,9 @@ async fn shared_executor_keeps_ready_capability_roots_scoped_to_each_attachment(submit_thread_settings(&test.codex,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![TurnEnvironmentSelection {+ vec![TurnEnvironmentRequest {config: EnvironmentConfigState::Ready(EnvironmentConfig {allow_login_shell: false,workspace_roots: selection.workspace_roots.clone(),@@ -1733,7 +1738,7 @@ async fn shared_executor_keeps_ready_capability_roots_scoped_to_each_attachment(network_policy: None,selected_capability_roots: vec![root("first-root")],}),- ..selection.clone()+ ..selection.clone().into_request()}],)),..Default::default()@@ -1778,9 +1783,9 @@ async fn shared_executor_keeps_ready_capability_roots_scoped_to_each_attachment(}]);if index == 2 {request = request.with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![TurnEnvironmentSelection {+ vec![TurnEnvironmentRequest {config: EnvironmentConfigState::Ready(EnvironmentConfig {allow_login_shell: false,workspace_roots: selection.workspace_roots.clone(),@@ -1794,7 +1799,7 @@ async fn shared_executor_keeps_ready_capability_roots_scoped_to_each_attachment(network_policy: None,selected_capability_roots: vec![root("first-updated-root")],}),- ..selection.clone()+ ..selection.clone().into_request()}],)),..Default::default()@@ -1860,11 +1865,11 @@ async fn owner_network_policy_rejects_unsupported_environment_authority() -> Reslet preview_error = test.codex.preview_thread_settings_overrides(CodexThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![TurnEnvironmentSelection {+ vec![TurnEnvironmentRequest {config: EnvironmentConfigState::Ready(owner_config.clone()),- ..selection.clone()+ ..selection.clone().into_request()}],)),..Default::default()@@ -2176,7 +2181,7 @@ async fn pending_attachment_installs_configuration_before_waiting_turn_resumes()for thread in [&waiting.thread, &independent.thread, &failed.thread] {let error = thread.preview_thread_settings_overrides(CodexThreadSettingsOverrides {- environments: Some(downgraded_environments.clone()),+ environments: Some(downgraded_environments.clone().into_requests()),..Default::default()}).await@@ -2191,7 +2196,7 @@ async fn pending_attachment_installs_configuration_before_waiting_turn_resumes()text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(downgraded_environments),+ environments: Some(downgraded_environments.into_requests()),..Default::default()}),)@@ -2309,9 +2314,9 @@ async fn pending_attachment_installs_configuration_before_waiting_turn_resumes()submit_thread_settings(&failed.thread,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![recovered_selection.clone()],+ vec![recovered_selection.clone().into_request()],)),..Default::default()},@@ -2451,10 +2456,13 @@ async fn future_pending_environment_can_finish_without_retargeting_the_active_tu.start_or_steer_turn(request("use the other environment next turn").with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(- test.config.cwd.clone(),- vec![future.clone()],- )),+ environments: Some(+ TurnEnvironmentSelections::new(+ test.config.cwd.clone(),+ vec![future.clone()],+ )+ .into_requests()+ ),..Default::default()},)@@ -2571,7 +2579,7 @@ async fn active_environment_update_wakes_the_old_wait_with_the_new_selection() -.submit(Op::TurnSettings {turn_id,update: TurnSettingsUpdate {- environments: Some(vec![switched.clone()]),+ environments: Some(vec![switched.clone().into_request()]),..Default::default()},reply,@@ -2789,12 +2797,12 @@ async fn ready_before_selection_resolves_resumed_thread_capability_root_after_waanyhow::Ok(())});- let selection = TurnEnvironmentSelection {+ let selection = TurnEnvironmentSelection::new(TurnEnvironmentRequest {environment_id: REMOTE_ENVIRONMENT_ID.to_string(),cwd: PathUri::from_abs_path(&test.config.cwd),workspace_roots: vec![PathUri::from_abs_path(&test.config.cwd)],config: EnvironmentConfigState::FromThread,- };+ });let mut thread_extension_init = ExtensionDataInit::new();thread_extension_init.insert(vec![stale_root]);let resumed = test@@ -2930,9 +2938,9 @@ async fn deferred_executor_stays_pending_after_materialization() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![TurnEnvironmentSelection {+ vec![TurnEnvironmentRequest {environment_id: REMOTE_ENVIRONMENT_ID.to_string(),cwd: PathUri::from_abs_path(&test.config.cwd),workspace_roots: vec![PathUri::from_abs_path(&test.config.cwd)],@@ -3100,9 +3108,13 @@ async fn deferred_executor_spawn_agent_inherits_ready_step_environments(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- expected_environments.clone(),+ expected_environments+ .clone()+ .into_iter()+ .map(TurnEnvironmentSelection::into_request)+ .collect(),)),..Default::default()}),@@ -3289,9 +3301,12 @@ async fn deferred_executor_guardian_uses_newly_ready_step_environment(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![remote_selection, local(local_cwd.clone())],+ vec![+ remote_selection.into_request(),+ local_request(local_cwd.clone()),+ ],)),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -3897,16 +3912,16 @@ async fn remote_exec_materializes_target_roots_before_sandbox_selection() -> Restext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),vec![- TurnEnvironmentSelection {+ TurnEnvironmentRequest {environment_id: LOCAL_ENVIRONMENT_ID.to_string(),cwd: PathUri::from_abs_path(&local_cwd.path().abs()),workspace_roots: Vec::new(),config: EnvironmentConfigState::FromThread,},- TurnEnvironmentSelection {+ TurnEnvironmentRequest {environment_id: REMOTE_ENVIRONMENT_ID.to_string(),cwd: remote_cwd_uri.clone(),workspace_roots: vec![remote_cwd_uri.clone()],diff --git a/codex-rs/core/tests/suite/remote_env_capability_roots_tests.rs b/codex-rs/core/tests/suite/remote_env_capability_roots_tests.rsindex 4230e11565..4bc19dfa82 100644--- a/codex-rs/core/tests/suite/remote_env_capability_roots_tests.rs+++ b/codex-rs/core/tests/suite/remote_env_capability_roots_tests.rs@@ -1,6 +1,8 @@//! Capability discovery stays within the environments captured by the current turn.use super::*;+use codex_protocol::protocol::TurnEnvironmentRequests;+use codex_protocol::protocol::TurnEnvironmentSelection;use pretty_assertions::assert_eq;use test_case::test_case;@@ -96,9 +98,12 @@ async fn stale_roots_do_not_connect_unselected_executors(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- environments,+ environments+ .into_iter()+ .map(TurnEnvironmentSelection::into_request)+ .collect(),)),..Default::default()}),diff --git a/codex-rs/core/tests/suite/remote_env_failure_tests.rs b/codex-rs/core/tests/suite/remote_env_failure_tests.rsindex 8b0e4b2935..d50143eec6 100644--- a/codex-rs/core/tests/suite/remote_env_failure_tests.rs+++ b/codex-rs/core/tests/suite/remote_env_failure_tests.rs@@ -1,5 +1,7 @@//! Provisioning failures reach the model without terminating its turn.use super::*;+use codex_protocol::protocol::TurnEnvironmentRequest;+use codex_protocol::protocol::TurnEnvironmentRequests;use pretty_assertions::assert_eq;use test_case::test_case;@@ -60,9 +62,9 @@ async fn provisioning_failure_reaches_model_and_turn_continues(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![TurnEnvironmentSelection {+ vec![TurnEnvironmentRequest {environment_id: REMOTE_ENVIRONMENT_ID.to_string(),cwd: PathUri::from_abs_path(&test.config.cwd),workspace_roots: vec![PathUri::from_abs_path(&test.config.cwd)],diff --git a/codex-rs/core/tests/suite/remote_env_spawn_tests.rs b/codex-rs/core/tests/suite/remote_env_spawn_tests.rsindex cd07ca7691..d23f5c2b9a 100644--- a/codex-rs/core/tests/suite/remote_env_spawn_tests.rs+++ b/codex-rs/core/tests/suite/remote_env_spawn_tests.rs@@ -202,7 +202,7 @@ pub(crate) async fn pending_subagent_scenario(.submit(Op::TurnSettings {turn_id,update: TurnSettingsUpdate {- environments: Some(vec![expected.clone()]),+ environments: Some(vec![expected.clone().into_request()]),..Default::default()},reply,diff --git a/codex-rs/core/tests/suite/remote_models.rs b/codex-rs/core/tests/suite/remote_models.rsindex 2b1f07516a..40b80e6d7d 100644--- a/codex-rs/core/tests/suite/remote_models.rs+++ b/codex-rs/core/tests/suite/remote_models.rs@@ -42,7 +42,7 @@ use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::skip_if_sandbox;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -692,7 +692,7 @@ async fn remote_models_remote_model_uses_unified_exec() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_path)),+ environments: Some(local_requests(cwd_path)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -962,7 +962,7 @@ async fn remote_models_apply_legacy_instructions(auth: CodexAuth) -> Result<()>text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_path.clone())),+ environments: Some(local_requests(cwd_path.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -992,7 +992,7 @@ async fn remote_models_apply_legacy_instructions(auth: CodexAuth) -> Result<()>text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_path)),+ environments: Some(local_requests(cwd_path)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/request_permissions.rs b/codex-rs/core/tests/suite/request_permissions.rsindex 3cc15273c3..0adea400ec 100644--- a/codex-rs/core/tests/suite/request_permissions.rs+++ b/codex-rs/core/tests/suite/request_permissions.rs@@ -47,7 +47,7 @@ use core_test_support::skip_if_target_windows;use core_test_support::skip_if_wine_exec;use core_test_support::test_codex::TestCodex;use core_test_support::test_codex::TestCodexHarness;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -174,7 +174,7 @@ async fn submit_turn(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),approvals_reviewer: Some(ApprovalsReviewer::User),sandbox_policy: Some(sandbox_policy),diff --git a/codex-rs/core/tests/suite/request_permissions_tool.rs b/codex-rs/core/tests/suite/request_permissions_tool.rsindex e0adff8ded..9236e219ab 100644--- a/codex-rs/core/tests/suite/request_permissions_tool.rs+++ b/codex-rs/core/tests/suite/request_permissions_tool.rs@@ -33,7 +33,7 @@ use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::skip_if_sandbox;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -145,7 +145,7 @@ async fn submit_turn(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),approvals_reviewer,sandbox_policy: Some(sandbox_policy),diff --git a/codex-rs/core/tests/suite/request_user_input.rs b/codex-rs/core/tests/suite/request_user_input.rsindex dc546a24b2..22d2f593fe 100644--- a/codex-rs/core/tests/suite/request_user_input.rs+++ b/codex-rs/core/tests/suite/request_user_input.rs@@ -1,7 +1,7 @@#![allow(clippy::unwrap_used)]use codex_core::TurnInputRequest;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use std::collections::HashMap;use codex_features::Feature;@@ -138,7 +138,7 @@ async fn request_user_input_round_trip_for_mode(mode: ModeKind) -> anyhow::Resultext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd.abs())),+ environments: Some(local_requests(cwd.abs())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -280,7 +280,7 @@ async fn request_user_input_interrupt_emits_deferred_token_count() -> anyhow::Retext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd.abs())),+ environments: Some(local_requests(cwd.abs())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -381,7 +381,7 @@ wheretext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd.abs())),+ environments: Some(local_requests(cwd.abs())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/responses_api_proxy_headers.rs b/codex-rs/core/tests/suite/responses_api_proxy_headers.rsindex e156cd8f31..72e66ae153 100644--- a/codex-rs/core/tests/suite/responses_api_proxy_headers.rs+++ b/codex-rs/core/tests/suite/responses_api_proxy_headers.rs@@ -24,7 +24,7 @@ use core_test_support::responses::sse;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use pretty_assertions::assert_eq;@@ -167,7 +167,7 @@ async fn submit_turn_with_timeout(test: &TestCodex, prompt: &str) -> Result<()>text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd)),+ environments: Some(local_requests(cwd)),approval_policy: Some(AskForApproval::OnRequest),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/review.rs b/codex-rs/core/tests/suite/review.rsindex 19b3b44190..5f02ba8b1d 100644--- a/codex-rs/core/tests/suite/review.rs+++ b/codex-rs/core/tests/suite/review.rs@@ -35,7 +35,7 @@ use codex_protocol::protocol::ReviewOutputEvent;use codex_protocol::protocol::ReviewRequest;use codex_protocol::protocol::ReviewTarget;use codex_protocol::protocol::ThreadSettingsOverrides;-use codex_protocol::protocol::TurnEnvironmentSelections;+use codex_protocol::protocol::TurnEnvironmentRequests;use codex_protocol::review_format::render_review_output_text;use codex_protocol::user_input::UserInput;use core_test_support::PathBufExt;@@ -44,7 +44,7 @@ use core_test_support::responses::ResponseMock;use core_test_support::responses::mount_sse_sequence;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::wait_for_event;use pretty_assertions::assert_eq;@@ -720,9 +720,9 @@ async fn review_uses_updated_turn_permissions_and_approval_policy() {core_test_support::submit_thread_settings(&codex,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(updated_cwd.clone(),- vec![selection],+ vec![selection.into_request()],)),approval_policy: Some(AskForApproval::Never),approvals_reviewer: Some(ApprovalsReviewer::User),@@ -1453,7 +1453,7 @@ async fn review_uses_overridden_cwd_for_base_branch_merge_base() {core_test_support::submit_thread_settings(&codex,ThreadSettingsOverrides {- environments: Some(local_selections(repo_path.to_path_buf().abs())),+ environments: Some(local_requests(repo_path.to_path_buf().abs())),..Default::default()},)diff --git a/codex-rs/core/tests/suite/rmcp_client.rs b/codex-rs/core/tests/suite/rmcp_client.rsindex 598da1df8f..f7631ba140 100644--- a/codex-rs/core/tests/suite/rmcp_client.rs+++ b/codex-rs/core/tests/suite/rmcp_client.rs@@ -2,6 +2,8 @@ use anyhow::Context as _;use anyhow::ensure;use base64::Engine;use base64::engine::general_purpose::STANDARD as BASE64_STANDARD;+use codex_protocol::protocol::TurnEnvironmentRequest;+use codex_protocol::protocol::TurnEnvironmentRequests;use std::collections::BTreeMap;use std::collections::HashMap;use std::ffi::OsStr;@@ -84,8 +86,6 @@ use codex_protocol::protocol::McpStartupStatus;use codex_protocol::protocol::McpToolCallBeginEvent;use codex_protocol::protocol::Op;use codex_protocol::protocol::ThreadSettingsOverrides;-use codex_protocol::protocol::TurnEnvironmentSelection;-use codex_protocol::protocol::TurnEnvironmentSelections;use codex_protocol::protocol::TurnSettingsUpdate;use codex_protocol::protocol::TurnSettingsUpdateOutcome;use codex_protocol::request_user_input::RequestUserInputAnswer;@@ -815,11 +815,11 @@ async fn environment_mcp_policy_filters_runtime_config_and_model_tools(submit_thread_settings(&fixture.codex,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(fixture.config.cwd.clone(),- vec![TurnEnvironmentSelection {+ vec![TurnEnvironmentRequest {config: EnvironmentConfigState::Pending,- ..selection.clone()+ ..selection.clone().into_request()}],)),..Default::default()@@ -1006,11 +1006,11 @@ async fn future_environment_mcp_policy_applies_on_the_next_turn() -> anyhow::Resselected_capability_roots: Vec::new(),};let settings = |config| ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(fixture.config.cwd.clone(),- vec![TurnEnvironmentSelection {+ vec![TurnEnvironmentRequest {config: EnvironmentConfigState::Ready(config),- ..selection.clone()+ ..selection.clone().into_request()}],)),..Default::default()@@ -2285,11 +2285,11 @@ async fn stdio_mcp_tool_call_includes_sandbox_state_meta(submit_thread_settings(&fixture.codex,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(fixture.config.cwd.clone(),- vec![TurnEnvironmentSelection {+ vec![TurnEnvironmentRequest {config: EnvironmentConfigState::Pending,- ..selection.clone()+ ..selection.clone().into_request()}],)),..Default::default()diff --git a/codex-rs/core/tests/suite/safety_check_downgrade.rs b/codex-rs/core/tests/suite/safety_check_downgrade.rsindex d571575f8b..30485660d3 100644--- a/codex-rs/core/tests/suite/safety_check_downgrade.rs+++ b/codex-rs/core/tests/suite/safety_check_downgrade.rs@@ -25,7 +25,7 @@ use core_test_support::responses::sse_response;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -49,7 +49,7 @@ fn disabled_text_turn(test: &TestCodex, text: &str) -> TurnInputRequest {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/scenarios.rs b/codex-rs/core/tests/suite/scenarios.rsindex d6fb806405..d29673378f 100644--- a/codex-rs/core/tests/suite/scenarios.rs+++ b/codex-rs/core/tests/suite/scenarios.rs@@ -536,7 +536,7 @@ async fn astra_switches_environments_for_the_rest_of_the_active_turn() -> Result.submit(Op::TurnSettings {turn_id: request.turn_id.clone(),update: TurnSettingsUpdate {- environments: Some(vec![other.clone()]),+ environments: Some(vec![other.clone().into_request()]),..Default::default()},reply,@@ -861,7 +861,7 @@ async fn astra_omits_disabled_executor_and_plugin_skills_from_model_context() ->.submit(Op::TurnSettings {turn_id,update: TurnSettingsUpdate {- environments: Some(vec![next_environment]),+ environments: Some(vec![next_environment.into_request()]),..Default::default()},reply,diff --git a/codex-rs/core/tests/suite/settings_commits.rs b/codex-rs/core/tests/suite/settings_commits.rsindex 73c9ae83aa..0c341aed11 100644--- a/codex-rs/core/tests/suite/settings_commits.rs+++ b/codex-rs/core/tests/suite/settings_commits.rs@@ -21,7 +21,7 @@ use core_test_support::streaming_sse::StreamingSseChunk;use core_test_support::streaming_sse::start_streaming_sse_server;use core_test_support::submit_thread_settings;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::wait_for_event;use pretty_assertions::assert_eq;@@ -334,7 +334,7 @@ async fn compaction_checkpoints_settings_changed_during_its_model_request() -> Rsubmit_thread_settings(&test.codex,ThreadSettingsOverrides {- environments: Some(local_selections(updated_cwd_path.clone())),+ environments: Some(local_requests(updated_cwd_path.clone())),model: Some(COMMITTED_MODEL.to_string()),disabled_plugin_ids: Some(vec!["slack@openai".to_string()]),..Default::default()diff --git a/codex-rs/core/tests/suite/shell_snapshot.rs b/codex-rs/core/tests/suite/shell_snapshot.rsindex 7e047b44f4..92e0a4c3d6 100644--- a/codex-rs/core/tests/suite/shell_snapshot.rs+++ b/codex-rs/core/tests/suite/shell_snapshot.rs@@ -55,7 +55,7 @@ use core_test_support::skip_if_remote;#[cfg(unix)]use core_test_support::test_codex::TestCodexBuilder;use core_test_support::test_codex::TestCodexHarness;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -201,7 +201,7 @@ async fn run_snapshot_command_with_options(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd)),+ environments: Some(local_requests(cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -277,7 +277,7 @@ async fn run_tool_turn_on_harness(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd)),+ environments: Some(local_requests(cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -695,10 +695,10 @@ async fn shell_snapshot_v2_guardian_uses_its_resolved_permissions_and_tools(],).await;- let mut environments = local_selections(test.config.cwd.clone());- environments.environments[0].config = EnvironmentConfigState::Ready(EnvironmentConfig {+ let mut requests = local_requests(test.config.cwd.clone());+ requests.environment_requests[0].config = EnvironmentConfigState::Ready(EnvironmentConfig {allow_login_shell: true,- workspace_roots: environments.environments[0].workspace_roots.clone(),+ workspace_roots: requests.environment_requests[0].workspace_roots.clone(),permission_profile: PermissionProfileSnapshot::legacy(PermissionProfile::Disabled),shell_environment_policy: test.config.permissions.shell_environment_policy.clone(),windows_sandbox_level: WindowsSandboxLevel::from_config(&test.config),@@ -716,7 +716,7 @@ async fn shell_snapshot_v2_guardian_uses_its_resolved_permissions_and_tools(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(environments),+ environments: Some(requests),..Default::default()}),)@@ -1077,7 +1077,7 @@ async fn unified_exec_snapshot_still_intercepts_apply_patch() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd.clone())),+ environments: Some(local_requests(cwd.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/skill_approval.rs b/codex-rs/core/tests/suite/skill_approval.rsindex 7f64c2a89a..bc89d4acef 100644--- a/codex-rs/core/tests/suite/skill_approval.rs+++ b/codex-rs/core/tests/suite/skill_approval.rs@@ -17,7 +17,7 @@ use core_test_support::responses::mount_function_call_agent_response;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;use core_test_support::wait_for_event_match;@@ -57,7 +57,7 @@ async fn submit_turn_with_policies(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/skills.rs b/codex-rs/core/tests/suite/skills.rsindex 07b3c35763..0076c4e459 100644--- a/codex-rs/core/tests/suite/skills.rs+++ b/codex-rs/core/tests/suite/skills.rs@@ -36,7 +36,7 @@ use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::skip_if_remote;use core_test_support::skip_if_wine_exec;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use pretty_assertions::assert_eq;@@ -148,7 +148,7 @@ async fn user_turn_includes_skill_instructions() -> Result<()> {},]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/sqlite_state.rs b/codex-rs/core/tests/suite/sqlite_state.rsindex c329e2caa8..af772f8d9a 100644--- a/codex-rs/core/tests/suite/sqlite_state.rs+++ b/codex-rs/core/tests/suite/sqlite_state.rs@@ -40,7 +40,7 @@ use core_test_support::responses::mount_sse_sequence;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::stdio_server_bin;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -918,7 +918,7 @@ async fn mcp_call_marks_thread_memory_mode_polluted_when_configured() -> Result<text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd)),+ environments: Some(local_requests(cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/step_settings/environment_selection.rs b/codex-rs/core/tests/suite/step_settings/environment_selection.rsindex b758198396..3d1326a158 100644--- a/codex-rs/core/tests/suite/step_settings/environment_selection.rs+++ b/codex-rs/core/tests/suite/step_settings/environment_selection.rs@@ -5,7 +5,8 @@ use codex_config::test_support::CloudConfigBundleFixture;use codex_exec_server::CreateDirectoryOptions;use codex_protocol::models::PermissionProfileSnapshot;use codex_protocol::protocol::EnvironmentConfigState;-use codex_protocol::protocol::TurnEnvironmentSelections;+use codex_protocol::protocol::TurnEnvironmentRequests;+use codex_protocol::protocol::TurnEnvironmentSelection;use core_test_support::submit_thread_settings;use core_test_support::test_codex::environment_config_for_selection;use pretty_assertions::assert_eq;@@ -44,7 +45,13 @@ async fn current_turn_environment_selections_follow_active_updates() -> Result<(thread,&turn_id,TurnSettingsUpdate {- environments: Some(environments.clone()),+ environments: Some(+ environments+ .clone()+ .into_iter()+ .map(TurnEnvironmentSelection::into_request)+ .collect(),+ ),..Default::default()},)@@ -126,9 +133,9 @@ async fn model_update_preserves_active_environment_and_next_turn_uses_new_selectsubmit_thread_settings(&test.codex,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(test.config.cwd.join("future-environment"),- vec![next_environment],+ vec![next_environment.into_request()],)),..Default::default()},@@ -237,7 +244,7 @@ async fn combined_active_model_and_environment_updates_apply_or_reject_together(&test.codex,&paused.turn_id,TurnSettingsUpdate {- environments: Some(vec![owned_environment]),+ environments: Some(vec![owned_environment.into_request()]),..Default::default()},)@@ -249,7 +256,7 @@ async fn combined_active_model_and_environment_updates_apply_or_reject_together(&paused.turn_id,TurnSettingsUpdate {model: Some(MODEL_B.to_string()),- environments: Some(vec![inherited_environment]),+ environments: Some(vec![inherited_environment.into_request()]),..Default::default()},)@@ -274,7 +281,7 @@ async fn combined_active_model_and_environment_updates_apply_or_reject_together(&paused.turn_id,TurnSettingsUpdate {model: Some(MODEL_B.to_string()),- environments: Some(vec![next_environment]),+ environments: Some(vec![next_environment.into_request()]),..Default::default()},)@@ -368,7 +375,10 @@ async fn active_updates_check_known_permissions_from_the_running_turn() -> Resul&test.codex,&paused.turn_id,TurnSettingsUpdate {- environments: Some(vec![primary.clone(), secondary.clone()]),+ environments: Some(vec![+ primary.clone().into_request(),+ secondary.clone().into_request(),+ ]),..current_model.clone()},)@@ -383,7 +393,10 @@ async fn active_updates_check_known_permissions_from_the_running_turn() -> Resul&test.codex,&paused.turn_id,TurnSettingsUpdate {- environments: Some(vec![primary, secondary.clone()]),+ environments: Some(vec![+ primary.into_request(),+ secondary.clone().into_request(),+ ]),..Default::default()},)@@ -446,7 +459,7 @@ async fn inherited_permission_update_applies_to_the_next_turn_not_the_next_step(&test.codex,&paused.turn_id,TurnSettingsUpdate {- environments: Some(vec![inherited]),+ environments: Some(vec![inherited.into_request()]),..Default::default()},)diff --git a/codex-rs/core/tests/suite/subagent_notifications.rs b/codex-rs/core/tests/suite/subagent_notifications.rsindex 16ca5fa447..5280af100f 100644--- a/codex-rs/core/tests/suite/subagent_notifications.rs+++ b/codex-rs/core/tests/suite/subagent_notifications.rs@@ -51,7 +51,7 @@ use core_test_support::responses::strip_metadata_from_json;use core_test_support::responses::strip_response_item_ids_from_json;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -924,7 +924,7 @@ async fn subagent_stop_replaces_stop_and_skips_internal_subagents() -> Result<()text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/tool_harness.rs b/codex-rs/core/tests/suite/tool_harness.rsindex 7dcb85ae96..b96f6e6a7c 100644--- a/codex-rs/core/tests/suite/tool_harness.rs+++ b/codex-rs/core/tests/suite/tool_harness.rs@@ -1,7 +1,7 @@#![cfg(not(target_os = "windows"))]use codex_core::TurnInputRequest;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use std::fs;use assert_matches::assert_matches;@@ -106,7 +106,7 @@ async fn exec_command_tool_executes_command_and_streams_output() -> anyhow::Resutext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_path)),+ environments: Some(local_requests(cwd_path)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -184,7 +184,7 @@ async fn update_plan_tool_emits_plan_update_event() -> anyhow::Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_path)),+ environments: Some(local_requests(cwd_path)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -272,7 +272,7 @@ async fn update_plan_tool_rejects_malformed_payload() -> anyhow::Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_path)),+ environments: Some(local_requests(cwd_path)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -370,7 +370,7 @@ async fn apply_patch_tool_executes_and_emits_patch_events() -> anyhow::Result<()text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_path)),+ environments: Some(local_requests(cwd_path)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -505,7 +505,7 @@ async fn apply_patch_reports_parse_diagnostics() -> anyhow::Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd_path)),+ environments: Some(local_requests(cwd_path)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/tool_parallelism.rs b/codex-rs/core/tests/suite/tool_parallelism.rsindex e7b628b819..ba28e42f11 100644--- a/codex-rs/core/tests/suite/tool_parallelism.rs+++ b/codex-rs/core/tests/suite/tool_parallelism.rs@@ -2,7 +2,7 @@#![allow(clippy::unwrap_used)]use codex_core::TurnInputRequest;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use std::fs;use std::time::Duration;use std::time::Instant;@@ -48,7 +48,7 @@ async fn run_turn(test: &TestCodex, prompt: &str) -> anyhow::Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -370,7 +370,7 @@ async fn shell_tools_start_before_response_completed_when_stream_delayed() -> antext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/truncation.rs b/codex-rs/core/tests/suite/truncation.rsindex 665e49361a..1924d8d4ac 100644--- a/codex-rs/core/tests/suite/truncation.rs+++ b/codex-rs/core/tests/suite/truncation.rs@@ -30,7 +30,7 @@ use core_test_support::skip_if_wine_exec;use core_test_support::stdio_server_bin;use core_test_support::test_codex::TestCodex;use core_test_support::test_codex::TestCodexBuilder;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::wait_for_event;use core_test_support::wait_for_mcp_server;@@ -553,7 +553,7 @@ async fn mcp_image_output_preserves_image_and_no_text_summary() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(fixture.cwd.abs())),+ environments: Some(local_requests(fixture.cwd.abs())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile: Some(permission_profile),diff --git a/codex-rs/core/tests/suite/turn_input_submission.rs b/codex-rs/core/tests/suite/turn_input_submission.rsindex fcb4ef0ed5..af7fab2fa8 100644--- a/codex-rs/core/tests/suite/turn_input_submission.rs+++ b/codex-rs/core/tests/suite/turn_input_submission.rs@@ -27,6 +27,7 @@ use codex_protocol::protocol::Op;use codex_protocol::protocol::SessionSource;use codex_protocol::protocol::SubAgentSource;use codex_protocol::protocol::ThreadSettingsOverrides;+use codex_protocol::protocol::TurnEnvironmentRequests;use codex_protocol::protocol::TurnEnvironmentSelections;use codex_protocol::turn_input::TurnAttribution;use codex_protocol::user_input::UserInput;@@ -37,6 +38,7 @@ use core_test_support::streaming_sse::StreamingSseChunk;use core_test_support::streaming_sse::start_streaming_sse_server;use core_test_support::submit_thread_settings;use core_test_support::test_codex::local;+use core_test_support::test_codex::local_request;use core_test_support::test_codex::test_codex;use core_test_support::wait_for_event;use core_test_support::wait_for_event_match;@@ -1269,7 +1271,7 @@ async fn turn_input_submission_applies_thread_settings_only_after_accepted_inputuser_message_request("steer active turn").with_thread_settings(ThreadSettingsOverrides {approval_policy: Some(AskForApproval::Never),- environments: Some(steered_environments.clone()),+ environments: Some(steered_environments.clone().into_requests()),..Default::default()},),@@ -1302,9 +1304,9 @@ async fn turn_input_submission_applies_thread_settings_only_after_accepted_input.steer_turn(user_message_request("no active turn").with_thread_settings(ThreadSettingsOverrides {approval_policy: Some(AskForApproval::OnRequest),- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(rejected_cwd.clone(),- vec![local(rejected_cwd)],+ vec![local_request(rejected_cwd)],)),..Default::default()}),@@ -1533,9 +1535,9 @@ async fn daemon_recovery_includes_local_environment_that_finished_starting() ->.start_turn_if_idle(user_message_request("wait for the environment").with_thread_settings(ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(+ environments: Some(TurnEnvironmentRequests::new(cwd,- vec![selection.clone()],+ vec![selection.clone().into_request()],)),..Default::default()},diff --git a/codex-rs/core/tests/suite/unified_exec.rs b/codex-rs/core/tests/suite/unified_exec.rsindex 2edf5a39c1..a6e5161e96 100644--- a/codex-rs/core/tests/suite/unified_exec.rs+++ b/codex-rs/core/tests/suite/unified_exec.rs@@ -6,7 +6,7 @@ use codex_features::Feature;use codex_protocol::approvals::ExecApprovalKind;use codex_protocol::protocol::ReviewDecision;use codex_protocol::protocol::SandboxPolicy;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use std::collections::HashMap;use std::ffi::OsStr;use std::fs;@@ -599,7 +599,7 @@ async fn unified_exec_intercepts_apply_patch_exec_command() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd)),+ environments: Some(local_requests(cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -2884,7 +2884,7 @@ async fn unified_exec_keeps_long_running_session_after_turn_end() -> Result<()>text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(turn_cwd)),+ environments: Some(local_requests(turn_cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -2978,7 +2978,7 @@ async fn unified_exec_interrupt_preserves_long_running_session() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(turn_cwd)),+ environments: Some(local_requests(turn_cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -3579,7 +3579,7 @@ async fn unified_exec_runs_under_sandbox() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(turn_cwd)),+ environments: Some(local_requests(turn_cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -3695,7 +3695,7 @@ async fn unified_exec_enforces_glob_deny_read_policy() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(turn_cwd)),+ environments: Some(local_requests(turn_cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -3824,7 +3824,7 @@ async fn unified_exec_python_prompt_under_seatbelt() -> Result<()> {text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(turn_cwd)),+ environments: Some(local_requests(turn_cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/unified_exec_process_events.rs b/codex-rs/core/tests/suite/unified_exec_process_events.rsindex 983fc2ded3..1abc857c61 100644--- a/codex-rs/core/tests/suite/unified_exec_process_events.rs+++ b/codex-rs/core/tests/suite/unified_exec_process_events.rs@@ -26,8 +26,8 @@ use codex_protocol::protocol::EventMsg;use codex_protocol::protocol::Op;use codex_protocol::protocol::ReviewDecision;use codex_protocol::protocol::ThreadSettingsOverrides;-use codex_protocol::protocol::TurnEnvironmentSelection;-use codex_protocol::protocol::TurnEnvironmentSelections;+use codex_protocol::protocol::TurnEnvironmentRequest;+use codex_protocol::protocol::TurnEnvironmentRequests;use codex_protocol::user_input::UserInput;use codex_utils_path_uri::PathUri;use core_test_support::managed_network_requirements_loader;@@ -955,9 +955,9 @@ timeout = 900.expect("valid Windows workspace root"),);}- TurnEnvironmentSelections::new(+ TurnEnvironmentRequests::new(test.config.cwd.clone(),- vec![TurnEnvironmentSelection {+ vec![TurnEnvironmentRequest {environment_id: codex_exec_server::REMOTE_ENVIRONMENT_ID.to_string(),cwd,workspace_roots,diff --git a/codex-rs/core/tests/suite/unified_exec_zsh_fork_approvals.rs b/codex-rs/core/tests/suite/unified_exec_zsh_fork_approvals.rsindex 46b7aa3850..d41e2a26a7 100644--- a/codex-rs/core/tests/suite/unified_exec_zsh_fork_approvals.rs+++ b/codex-rs/core/tests/suite/unified_exec_zsh_fork_approvals.rs@@ -39,7 +39,7 @@ use core_test_support::responses::sse;use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;use core_test_support::wait_for_event_with_timeout;@@ -570,7 +570,7 @@ async fn unified_exec_zsh_fork_guardian_reviews_persistent_terminal_in_current_ttext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(next_cwd)),+ environments: Some(local_requests(next_cwd)),approvals_reviewer: Some(ApprovalsReviewer::AutoReview),sandbox_policy: Some(sandbox_policy),permission_profile,@@ -826,7 +826,7 @@ async fn submit_turn_with_session_permissions(text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(test.config.cwd.clone())),+ environments: Some(local_requests(test.config.cwd.clone())),approval_policy: Some(approval_policy),approvals_reviewer: Some(approvals_reviewer),sandbox_policy: Some(sandbox_policy),diff --git a/codex-rs/core/tests/suite/user_shell_cmd.rs b/codex-rs/core/tests/suite/user_shell_cmd.rsindex 49d27cf395..76793f38b3 100644--- a/codex-rs/core/tests/suite/user_shell_cmd.rs+++ b/codex-rs/core/tests/suite/user_shell_cmd.rs@@ -14,7 +14,8 @@ use codex_protocol::protocol::ExecOutputStream;use codex_protocol::protocol::Op;use codex_protocol::protocol::ThreadSettingsOverrides;use codex_protocol::protocol::TurnAbortReason;-use codex_protocol::protocol::TurnEnvironmentSelections;+use codex_protocol::protocol::TurnEnvironmentRequests;+use codex_protocol::protocol::TurnEnvironmentSelection;use codex_protocol::user_input::UserInput;use core_test_support::PathBufExt;use core_test_support::PathExt;@@ -30,7 +31,7 @@ use core_test_support::responses::start_mock_server;use core_test_support::skip_if_no_network;use core_test_support::submit_thread_settings;use core_test_support::test_codex::local;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use core_test_support::wait_for_event;@@ -124,7 +125,7 @@ async fn user_shell_command_without_local_environment_emits_error() -> anyhow::Rsubmit_thread_settings(&test.codex,ThreadSettingsOverrides {- environments: Some(codex_protocol::protocol::TurnEnvironmentSelections::new(+ environments: Some(codex_protocol::protocol::TurnEnvironmentRequests::new(test.config.cwd.clone(),vec![],)),@@ -211,7 +212,13 @@ async fn user_shell_command_honors_default_and_extended_deadlines() -> anyhow::Rsubmit_thread_settings(&fixture.codex,ThreadSettingsOverrides {- environments: Some(TurnEnvironmentSelections::new(local_cwd, environments)),+ environments: Some(TurnEnvironmentRequests::new(+ local_cwd,+ environments+ .into_iter()+ .map(TurnEnvironmentSelection::into_request)+ .collect(),+ )),..Default::default()},)@@ -314,7 +321,7 @@ async fn user_shell_command_does_not_replace_active_turn() -> anyhow::Result<()>text_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd)),+ environments: Some(local_requests(cwd)),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/core/tests/suite/websocket_fallback.rs b/codex-rs/core/tests/suite/websocket_fallback.rsindex 529419b8d1..afe50909d2 100644--- a/codex-rs/core/tests/suite/websocket_fallback.rs+++ b/codex-rs/core/tests/suite/websocket_fallback.rs@@ -18,7 +18,7 @@ use core_test_support::responses::mount_sse_sequence;use core_test_support::responses::sse;use core_test_support::skip_if_no_network;use core_test_support::test_codex::TestCodex;-use core_test_support::test_codex::local_selections;+use core_test_support::test_codex::local_requests;use core_test_support::test_codex::test_codex;use core_test_support::test_codex::turn_permission_fields;use pretty_assertions::assert_eq;@@ -164,7 +164,7 @@ async fn websocket_fallback_hides_first_websocket_retry_stream_error() -> Resulttext_elements: Vec::new(),}]).with_thread_settings(ThreadSettingsOverrides {- environments: Some(local_selections(cwd.abs())),+ environments: Some(local_requests(cwd.abs())),approval_policy: Some(AskForApproval::Never),sandbox_policy: Some(sandbox_policy),permission_profile,diff --git a/codex-rs/ext/guardian-reviewer/src/settings.rs b/codex-rs/ext/guardian-reviewer/src/settings.rsindex 619bf15eb0..a504b4dc26 100644--- a/codex-rs/ext/guardian-reviewer/src/settings.rs+++ b/codex-rs/ext/guardian-reviewer/src/settings.rs@@ -78,7 +78,7 @@ impl ReviewerTurn {}TurnInputRequest::user_input(self.items).with_thread_settings(ThreadSettingsOverrides {- environments: Some(self.environments),+ environments: Some(self.environments.into_requests()),approval_policy: Some(AskForApproval::Never),permission_profile: Some(self.permission_profile),summary: Some(self.reasoning_summary),diff --git a/codex-rs/protocol/src/environment.rs b/codex-rs/protocol/src/environment.rsindex 4d0c5f15bc..e9c00b1b88 100644--- a/codex-rs/protocol/src/environment.rs+++ b/codex-rs/protocol/src/environment.rs@@ -77,6 +77,50 @@ impl TurnEnvironmentSelections {environments,}}++ /// Requests these environments again, leaving root choices to the receiving thread.+ pub fn into_requests(self) -> TurnEnvironmentRequests {+ TurnEnvironmentRequests {+ legacy_fallback_cwd: self.legacy_fallback_cwd,+ environment_requests: self+ .environments+ .into_iter()+ .map(TurnEnvironmentSelection::into_request)+ .collect(),+ }+ }+}++/// Environment input supplied together with its fallback working directory.+/// The receiving thread constructs selections before capturing these environments.+#[derive(Debug, Clone, PartialEq)]+pub struct TurnEnvironmentRequests {+ pub legacy_fallback_cwd: AbsolutePathBuf,+ pub environment_requests: Vec<TurnEnvironmentRequest>,+}++impl TurnEnvironmentRequests {+ pub fn new(+ legacy_fallback_cwd: AbsolutePathBuf,+ environment_requests: Vec<TurnEnvironmentRequest>,+ ) -> Self {+ Self {+ legacy_fallback_cwd,+ environment_requests,+ }+ }++ /// Constructs the selections captured by the receiving thread.+ pub fn select(self) -> TurnEnvironmentSelections {+ TurnEnvironmentSelections {+ legacy_fallback_cwd: self.legacy_fallback_cwd,+ environments: self+ .environment_requests+ .into_iter()+ .map(TurnEnvironmentSelection::new)+ .collect(),+ }+ }}/// Configuration supplied for a thread's selected environment.diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rsindex d84f30f60a..5d84ca8c76 100644--- a/codex-rs/protocol/src/protocol.rs+++ b/codex-rs/protocol/src/protocol.rs@@ -100,6 +100,7 @@ pub use crate::approvals::NetworkPolicyRuleAction;pub use crate::environment::EnvironmentConfig;pub use crate::environment::EnvironmentConfigState;pub use crate::environment::TurnEnvironmentRequest;+pub use crate::environment::TurnEnvironmentRequests;pub use crate::environment::TurnEnvironmentSelection;pub use crate::environment::TurnEnvironmentSelections;pub use crate::environment::has_full_access;@@ -458,7 +459,7 @@ pub struct TurnSettingsUpdate {/// Replaces the selection for subsequent steps, without changing future turns./// Environments may inherit the running turn's defaults or provide their own configuration,/// which can be pending. An already-selected environment with its own cannot switch back.- pub environments: Option<Vec<TurnEnvironmentSelection>>,+ pub environments: Option<Vec<TurnEnvironmentRequest>>,pub model: Option<String>,/// `None` preserves the selection; `Some(None)` clears it.pub effort: Option<Option<ReasoningEffortConfig>>,@@ -485,7 +486,7 @@ pub enum TurnSettingsUpdateOutcome {#[derive(Debug, Clone, Default, PartialEq)]pub struct ThreadSettingsOverrides {/// Updated fallback `cwd` and environments supplied together as a complete pair.- pub environments: Option<TurnEnvironmentSelections>,+ pub environments: Option<TurnEnvironmentRequests>,/// Updated top-level runtime workspace roots for default environments./// Explicit environment requests own their workspace roots separately.