Lightweight coding agent that runs in your terminal
Rust
Include the environment's MXC backend in MCP sandbox metadata (#49781)
zm-oai8953de1f1ac7
diff --git a/codex-rs/codex-mcp/src/binding_tests.rs b/codex-rs/codex-mcp/src/binding_tests.rsindex 447a92364d..2cdd0c83c2 100644--- a/codex-rs/codex-mcp/src/binding_tests.rs+++ b/codex-rs/codex-mcp/src/binding_tests.rs@@ -113,6 +113,9 @@ async fn test_step(config.server_permission_profiles.insert(SERVER_NAME.to_string(), config.permission_profile.clone());+ config+ .environment_use_mxc+ .insert(format!("{label}-environment"), label == "new");let config = Arc::new(config);let prepared = PreparedMcpCall::new(Arc::clone(&connections),@@ -223,19 +226,26 @@ async fn prepared_call_keeps_captured_connection_and_authority_after_refresh() -old_call.config().approval_policy.value(),old_call.permission_profile(),old_call.config().approvals_reviewer,+ old_call.config().environment_use_mxc.get("old-environment"),),(AskForApproval::Never,&PermissionProfile::Disabled,ApprovalsReviewer::User,+ Some(&false),));assert_eq!((new_call.config().approval_policy.value(),new_call.config().approvals_reviewer,+ new_call.config().environment_use_mxc.get("new-environment"),),- (AskForApproval::OnRequest, ApprovalsReviewer::AutoReview)+ (+ AskForApproval::OnRequest,+ ApprovalsReviewer::AutoReview,+ Some(&true)+ ));drop(old.step);diff --git a/codex-rs/codex-mcp/src/mcp/mod.rs b/codex-rs/codex-mcp/src/mcp/mod.rsindex a97f61cfae..7f6be9376d 100644--- a/codex-rs/codex-mcp/src/mcp/mod.rs+++ b/codex-rs/codex-mcp/src/mcp/mod.rs@@ -160,6 +160,8 @@ pub struct McpConfig {pub approvals_reviewer: ApprovalsReviewer,/// Working directories for the exact environment handles used by this runtime.pub environment_cwds: HashMap<String, PathUri>,+ /// Effective backends captured with the environment handles, including local fallback.+ pub environment_use_mxc: HashMap<String, bool>,/// Explicit server permissions; unresolved or unavailable servers have no entry.pub server_permission_profiles: HashMap<String, PermissionProfile>,/// Optional path to `codex-linux-sandbox` for sandboxed MCP tool execution.diff --git a/codex-rs/codex-mcp/src/mcp/mod_tests.rs b/codex-rs/codex-mcp/src/mcp/mod_tests.rsindex 61f2a7f6f0..95b71ebbb9 100644--- a/codex-rs/codex-mcp/src/mcp/mod_tests.rs+++ b/codex-rs/codex-mcp/src/mcp/mod_tests.rs@@ -103,6 +103,7 @@ pub(crate) fn test_mcp_config(codex_home: PathBuf) -> McpConfig {config_layer_stack: codex_config::ConfigLayerStack::default(),approvals_reviewer: codex_config::types::ApprovalsReviewer::default(),environment_cwds: HashMap::new(),+ environment_use_mxc: HashMap::new(),server_permission_profiles: HashMap::new(),codex_linux_sandbox_exe: None,use_legacy_landlock: false,diff --git a/codex-rs/codex-mcp/src/runtime.rs b/codex-rs/codex-mcp/src/runtime.rsindex 5abfa51dc4..197e64420e 100644--- a/codex-rs/codex-mcp/src/runtime.rs+++ b/codex-rs/codex-mcp/src/runtime.rs@@ -790,6 +790,8 @@ pub struct SandboxState {pub sandbox_cwd: PathUri,#[serde(default)]pub use_legacy_landlock: bool,+ #[serde(default)]+ pub use_mxc: bool,}/// Runtime context used when resolving per-server MCP environments.@@ -1161,6 +1163,7 @@ mod tests {codex_linux_sandbox_exe: None,sandbox_cwd,use_legacy_landlock: false,+ use_mxc: false,};let serialized = serde_json::to_value(&sandbox_state).expect("serialize sandbox state");diff --git a/codex-rs/core/src/config/mod.rs b/codex-rs/core/src/config/mod.rsindex b58256da6a..e5b41a457f 100644--- a/codex-rs/core/src/config/mod.rs+++ b/codex-rs/core/src/config/mod.rs@@ -1848,6 +1848,7 @@ impl Config {config_layer_stack: self.config_layer_stack.clone(),approvals_reviewer: self.approvals_reviewer,environment_cwds: HashMap::new(),+ environment_use_mxc: HashMap::new(),server_permission_profiles: HashMap::new(),codex_linux_sandbox_exe: self.codex_linux_sandbox_exe.clone(),use_legacy_landlock: self.features.use_legacy_landlock(),diff --git a/codex-rs/core/src/mcp_tool_call.rs b/codex-rs/core/src/mcp_tool_call.rsindex 7f466edb3c..c2066132b8 100644--- a/codex-rs/core/src/mcp_tool_call.rs+++ b/codex-rs/core/src/mcp_tool_call.rs@@ -874,6 +874,12 @@ async fn augment_mcp_tool_request_meta_with_sandbox_state(codex_linux_sandbox_exe: prepared_call.config().codex_linux_sandbox_exe.clone(),sandbox_cwd,use_legacy_landlock: prepared_call.config().use_legacy_landlock,+ use_mxc: prepared_call+ .config()+ .environment_use_mxc+ .get(server_environment_id)+ .copied()+ .unwrap_or(false),})?;match meta.as_mut() {diff --git a/codex-rs/core/src/session/mcp_runtime.rs b/codex-rs/core/src/session/mcp_runtime.rsindex 375f88c45f..b813458ffa 100644--- a/codex-rs/core/src/session/mcp_runtime.rs+++ b/codex-rs/core/src/session/mcp_runtime.rs@@ -9,6 +9,7 @@ use super::*;use crate::mcp::McpRuntimeProjection;use codex_config::McpServerDisabledReason;use codex_config::McpServerTransportConfig;+use codex_file_system::WindowsSandboxSelection;use codex_mcp::CODEX_APPS_MCP_SERVER_NAME;use codex_mcp::ElicitationReviewerHandle;use codex_mcp::McpServerRegistration;@@ -337,6 +338,25 @@ impl Session {.environment_cwds.entry(codex_config::DEFAULT_MCP_SERVER_ENVIRONMENT_ID.to_string()).or_insert_with(|| PathUri::from_abs_path(&desired.config.cwd));+ config.environment_use_mxc = desired+ .environments+ .turn_environments()+ .map(|environment| {+ (+ environment.selection.environment_id.clone(),+ environment.windows_sandbox_selection_for_turn_metadata()+ == WindowsSandboxSelection::Mxc,+ )+ })+ .collect();+ config+ .environment_use_mxc+ .entry(codex_config::DEFAULT_MCP_SERVER_ENVIRONMENT_ID.to_string())+ .or_insert(+ cfg!(windows)+ && desired.config.effective_local_windows_sandbox_type()+ == SandboxType::WindowsMxc,+ );let mcp_servers = effective_mcp_servers(&config, auth.as_ref());config.set_server_permission_profiles(&mcp_servers,diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rsindex b3b6827936..62c16bec9e 100644--- a/codex-rs/core/src/session/tests.rs+++ b/codex-rs/core/src/session/tests.rs@@ -6264,6 +6264,30 @@ async fn session_settings_commit_keeps_snapshot_across_postcommit_wait() {assert_ne!(later_commit.snapshot, expected);}+#[tokio::test]+async fn mcp_runtime_keeps_local_backend_without_a_selected_local_environment() {+ let (session, turn) = make_session_and_context().await;+ let mut desired = session+ .latest_mcp_desired_state(/*auth*/ None, turn.initial_environments.clone())+ .await;+ Arc::make_mut(&mut desired.config).prefer_mxc = true;+ desired.environments.environments.clear();+ let runtime = session.build_mcp_runtime_input(+ &desired,+ crate::mcp::McpRuntimeProjection {+ config: (*mcp_config_for_test(&desired.config)).clone(),+ plugins_available: false,+ selected_plugins: Default::default(),+ },+ &[],+ /*elicitation_reviewer*/ None,+ );+ assert_eq!(+ runtime.config.environment_use_mxc,+ HashMap::from([(DEFAULT_MCP_SERVER_ENVIRONMENT_ID.to_string(), cfg!(windows))])+ );+}+#[tokio::test]async fn session_update_settings_does_not_rewrite_sticky_environment_cwds() {let (session, turn_context) = make_session_and_context().await;diff --git a/codex-rs/core/tests/suite/rmcp_client.rs b/codex-rs/core/tests/suite/rmcp_client.rsindex 5400f0f4ef..c705a6a1ba 100644--- a/codex-rs/core/tests/suite/rmcp_client.rs+++ b/codex-rs/core/tests/suite/rmcp_client.rs@@ -2114,20 +2114,22 @@ async fn local_stdio_server_uses_runtime_fallback_cwd_when_config_omits_cwd() ->Ok(())}-#[test_case("rmcp", false, false, false, Some("catalog policy"), Some("native catalog policy"); "both disabled")]-#[test_case("rmcp", true, false, false, Some("catalog policy"), Some("native catalog policy"); "auto review required")]-#[test_case("rmcp", false, true, false, Some("catalog policy"), Some("native catalog policy"); "disabled")]-#[test_case("rmcp", true, true, false, Some("catalog policy"), Some("native catalog policy"); "both enabled")]-#[test_case("rmcp", false, false, true, Some("catalog policy"), Some("native catalog policy"); "attachment-owned permissions preserve foreign workspace roots")]-#[test_case("node_repl", false, false, false, Some(" # Policy A\r\n{literal} <raw> & café\n"), Some("\t# Native A\n{{literal}} & desktop\r\n"); "node repl raw policy")]-#[test_case("cua_repl", false, false, false, Some("\t# Policy B\n${literal} </policy>\r\n "), Some(" # Native B\r\n<computer> ${native}\n "); "cua repl raw policy")]-#[test_case("node_repl", false, false, false, None, None; "node repl missing policy")]-#[test_case("cua_repl", false, false, false, Some(""), Some("native retained"); "cua repl empty policy")]-#[test_case("node_repl", false, false, false, Some(" \r\n\t"), Some("native retained"); "node repl blank policy")]-#[test_case("node_repl", false, false, false, None, Some("native retained"); "node repl missing browser policy")]-#[test_case("cua_repl", false, false, false, Some("browser retained"), None; "cua repl missing computer policy")]-#[test_case("node_repl", false, false, false, Some("browser retained"), Some(""); "node repl empty computer policy")]-#[test_case("cua_repl", false, false, false, Some("browser retained"), Some(" \r\n\t"); "cua repl blank computer policy")]+#[test_case("rmcp", false, false, false, Some("catalog policy"), Some("native catalog policy"), false; "both disabled")]+#[test_case("rmcp", true, false, false, Some("catalog policy"), Some("native catalog policy"), false; "auto review required")]+#[test_case("rmcp", false, true, false, Some("catalog policy"), Some("native catalog policy"), false; "disabled")]+#[test_case("rmcp", true, true, false, Some("catalog policy"), Some("native catalog policy"), false; "both enabled")]+#[test_case("rmcp", false, false, true, Some("catalog policy"), Some("native catalog policy"), false; "attachment-owned permissions preserve foreign workspace roots")]+#[test_case("node_repl", false, false, false, Some(" # Policy A\r\n{literal} <raw> & café\n"), Some("\t# Native A\n{{literal}} & desktop\r\n"), false; "node repl raw policy")]+#[test_case("cua_repl", false, false, false, Some("\t# Policy B\n${literal} </policy>\r\n "), Some(" # Native B\r\n<computer> ${native}\n "), false; "cua repl raw policy")]+#[test_case("node_repl", false, false, false, None, None, false; "node repl missing policy")]+#[test_case("cua_repl", false, false, false, Some(""), Some("native retained"), false; "cua repl empty policy")]+#[test_case("node_repl", false, false, false, Some(" \r\n\t"), Some("native retained"), false; "node repl blank policy")]+#[test_case("node_repl", false, false, false, None, Some("native retained"), false; "node repl missing browser policy")]+#[test_case("cua_repl", false, false, false, Some("browser retained"), None, false; "cua repl missing computer policy")]+#[test_case("node_repl", false, false, false, Some("browser retained"), Some(""), false; "node repl empty computer policy")]+#[test_case("cua_repl", false, false, false, Some("browser retained"), Some(" \r\n\t"), false; "cua repl blank computer policy")]+#[test_case("cua_repl", false, false, false, None, None, true; "mxc backend handoff")]+#[test_case("cua_repl", false, false, true, None, None, true; "mxc preference does not leak to attachment")]#[tokio::test(flavor = "multi_thread", worker_threads = 1)]async fn stdio_mcp_tool_call_includes_sandbox_state_meta(server_name: &'static str,@@ -2136,6 +2138,7 @@ async fn stdio_mcp_tool_call_includes_sandbox_state_meta(attachment_owned_permissions: bool,browser_policy: Option<&str>,computer_policy: Option<&str>,+ prefer_mxc: bool,) -> anyhow::Result<()> {// TODO(anp): Remove after packaging a Windows stdio test server for Wine exec.skip_if_wine_exec!(@@ -2209,6 +2212,7 @@ async fn stdio_mcp_tool_call_includes_sandbox_state_meta(.with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing()).with_model("gpt-5.5").with_config(move |config| {+ config.prefer_mxc = prefer_mxc;insert_mcp_server(config,server_name,@@ -2418,6 +2422,7 @@ async fn stdio_mcp_tool_call_includes_sandbox_state_meta(codex_linux_sandbox_exe: fixture.config.codex_linux_sandbox_exe.clone(),sandbox_cwd: PathUri::from_abs_path(&fixture.config.cwd),use_legacy_landlock: false,+ use_mxc: prefer_mxc && cfg!(windows) && !attachment_owned_permissions,});