Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Set working directories for environment MCP tests (#41683)

jif88f776588f5e
diff --git a/codex-rs/core/tests/suite/code_mode.rs b/codex-rs/core/tests/suite/code_mode.rs
index acfbdbd2c6..6d6bd7d4af 100644
--- a/codex-rs/core/tests/suite/code_mode.rs
+++ b/codex-rs/core/tests/suite/code_mode.rs
@@ -915,6 +915,7 @@ async fn code_mode_excludes_mcp_servers_using_their_configured_identity() -> Res
serde_json::from_value(serde_json::json!({
"command": rmcp_test_server_bin,
"environment_id": environment_id,
+ "cwd": config.cwd,
"omit_tools_from": omit_tools_from,
}))
.expect("test MCP server config should be valid"),
@@ -1149,6 +1150,7 @@ async fn mcp_code_mode_exclusion_does_not_change_direct_mode_tool_exposure() ->
serde_json::from_value(serde_json::json!({
"command": rmcp_test_server_bin,
"environment_id": environment_id,
+ "cwd": config.cwd,
"omit_tools_from": omit_tools_from,
}))
.expect("test MCP server config should be valid"),
@@ -4348,6 +4350,7 @@ async fn code_mode_node_repl_screenshots_can_be_captured_without_guardian_transc
let mcp = serde_json::from_value(serde_json::json!({
"command": mcp_server_bin,
"environment_id": remote_aware_environment_id(),
+ "cwd": config.cwd,
"env": { "MCP_TEST_ENABLE_NODE_REPL_JS": "1" },
"omit_tools_from": ["deferred"],
}))
@@ -4441,6 +4444,7 @@ async fn code_mode_node_repl_image_flag_without_enhanced_stays_disabled(
let mcp = serde_json::from_value(serde_json::json!({
"command": mcp_server_bin,
"environment_id": remote_aware_environment_id(),
+ "cwd": config.cwd,
"env": { "MCP_TEST_ENABLE_NODE_REPL_JS": "1" },
"omit_tools_from": ["deferred"],
}))
@@ -4603,6 +4607,7 @@ async fn code_mode_node_repl_text_evidence_is_visible_only_to_guardian(
let mcp: McpServerConfig = serde_json::from_value(serde_json::json!({
"command": mcp_server_bin,
"environment_id": remote_aware_environment_id(),
+ "cwd": config.cwd,
"env": {
"MCP_TEST_ENABLE_NODE_REPL_JS": "1",
"MCP_TEST_IMAGE_DATA_URL": format!("data:image/png;base64,{}", BASE64_STANDARD.encode(large_image.into_inner())),
@@ -5917,6 +5922,7 @@ async fn code_mode_omits_configured_mcp_server_tools() -> Result<()> {
serde_json::from_value(serde_json::json!({
"command": rmcp_test_server_bin,
"environment_id": environment_id,
+ "cwd": config.cwd,
"omit_tools_from": ["code_mode"],
}))
.expect("test MCP server config should be valid"),
@@ -6008,6 +6014,7 @@ async fn code_mode_only_keeps_mcp_tools_direct_when_nested_exposure_is_omitted()
serde_json::from_value(serde_json::json!({
"command": rmcp_test_server_bin,
"environment_id": environment_id,
+ "cwd": config.cwd,
"omit_tools_from": ["code_mode"],
}))
.expect("test MCP server config should be valid"),
@@ -6101,6 +6108,7 @@ async fn code_mode_only_can_call_mcp_tools_hidden_from_direct_and_deferred_expos
serde_json::from_value(serde_json::json!({
"command": rmcp_test_server_bin,
"environment_id": environment_id,
+ "cwd": config.cwd,
"omit_tools_from": ["direct", "deferred"],
"supports_parallel_tool_calls": true,
}))
diff --git a/codex-rs/core/tests/suite/guardian_review.rs b/codex-rs/core/tests/suite/guardian_review.rs
index c21dec9161..49f52c014c 100644
--- a/codex-rs/core/tests/suite/guardian_review.rs
+++ b/codex-rs/core/tests/suite/guardian_review.rs
@@ -685,6 +685,7 @@ async fn guardian_node_repl_policy_follows_production_approval_path(
let repl: McpServerConfig = serde_json::from_value(json!({
"command": mcp_server_bin,
"environment_id": remote_aware_environment_id(),
+ "cwd": config.cwd,
"default_tools_approval_mode": "prompt",
"env": { "MCP_TEST_ENABLE_NODE_REPL_JS": "1" }
}))
diff --git a/codex-rs/core/tests/suite/hooks_mcp.rs b/codex-rs/core/tests/suite/hooks_mcp.rs
index 2243b15778..41d1e06be5 100644
--- a/codex-rs/core/tests/suite/hooks_mcp.rs
+++ b/codex-rs/core/tests/suite/hooks_mcp.rs
@@ -13,6 +13,7 @@ use codex_core::config::Config;
use codex_features::Feature;
use codex_protocol::models::PermissionProfile;
use codex_protocol::protocol::AskForApproval;
+use codex_utils_path_uri::LegacyAppPathString;
use core_test_support::hooks::trust_discovered_hooks;
use core_test_support::responses::ev_assistant_message;
use core_test_support::responses::ev_completed;
@@ -285,7 +286,7 @@ fn insert_rmcp_test_server(
args: Vec::new(),
env: None,
env_vars: Vec::new(),
- cwd: None,
+ cwd: Some(LegacyAppPathString::from_path(config.cwd.as_path())),
},
environment_id,
enabled: true,
diff --git a/codex-rs/core/tests/suite/mcp_tool_cache.rs b/codex-rs/core/tests/suite/mcp_tool_cache.rs
index 523923ee3b..9602d53248 100644
--- a/codex-rs/core/tests/suite/mcp_tool_cache.rs
+++ b/codex-rs/core/tests/suite/mcp_tool_cache.rs
@@ -42,6 +42,7 @@ use core_test_support::responses::mount_sse_once;
use core_test_support::skip_if_no_network;
use core_test_support::skip_if_wine_exec;
use core_test_support::test_codex::test_codex;
+use core_test_support::test_codex::test_env;
use core_test_support::wait_for_event;
use core_test_support::wait_for_mcp_server;
use pretty_assertions::assert_eq;
@@ -128,10 +129,12 @@ async fn mcp_calls_stay_bound_to_each_thread() -> anyhow::Result<()> {
let responses_server = responses::start_mock_server().await;
let command = remote_aware_stdio_server_bin()?;
let environment_id = remote_aware_environment_id();
+ let test_env = test_env().await?;
let make_server = |marker| {
serde_json::from_value::<McpServerConfig>(json!({
"command": command,
"environment_id": environment_id,
+ "cwd": test_env.cwd(),
"env": {
"MCP_TEST_DYNAMIC_SERVER_METADATA": "1",
"MCP_TEST_VALUE": marker,
@@ -157,7 +160,7 @@ async fn mcp_calls_stay_bound_to_each_thread() -> anyhow::Result<()> {
.set(servers)
.expect("first thread should accept its MCP servers");
})
- .build_with_auto_env(&responses_server)
+ .build_with_environment(&responses_server, test_env)
.await?;
let mut second_config = fixture.config.clone();
@@ -584,6 +587,7 @@ async fn cached_mcp_startup_is_eager_for_root_and_lazy_for_subagents() -> anyhow
serde_json::from_value(json!({
"command": command,
"environment_id": environment_id,
+ "cwd": config.cwd,
"env": {
"MCP_TEST_APP_ONLY_CWD_MARKER_FILE": app_only_cwd_marker_file,
"MCP_TEST_INITIALIZE_BARRIER_FILE": barrier_file,
diff --git a/codex-rs/core/tests/suite/request_plugin_install.rs b/codex-rs/core/tests/suite/request_plugin_install.rs
index 950dfb7bec..5325a5fbcd 100644
--- a/codex-rs/core/tests/suite/request_plugin_install.rs
+++ b/codex-rs/core/tests/suite/request_plugin_install.rs
@@ -237,6 +237,7 @@ async fn build_gated_step_preparation_test(
serde_json::from_value(json!({
"command": command.clone(),
"environment_id": environment_id.clone(),
+ "cwd": config.cwd,
"env": {
"MCP_TEST_INITIALIZE_BARRIER_FILE": barrier_file,
"MCP_TEST_PID_FILE": pid_file,
diff --git a/codex-rs/core/tests/suite/rmcp_client.rs b/codex-rs/core/tests/suite/rmcp_client.rs
index 74d0d6e641..6f1b29b0ff 100644
--- a/codex-rs/core/tests/suite/rmcp_client.rs
+++ b/codex-rs/core/tests/suite/rmcp_client.rs
@@ -96,6 +96,7 @@ 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::test_codex;
+use core_test_support::test_codex::test_env;
use core_test_support::test_codex::turn_permission_fields;
use core_test_support::test_docker_container_name;
use core_test_support::wait_for_event;
@@ -342,9 +343,17 @@ fn stdio_transport_with_cwd(
fn insert_mcp_server(
config: &mut Config,
server_name: &str,
- transport: McpServerTransportConfig,
+ mut transport: McpServerTransportConfig,
options: TestMcpServerOptions,
) {
+ // Executor stdio has no host-local cwd fallback. Use the fixture's selected
+ // workspace unless this test supplied a more specific server directory.
+ if options.environment_id == REMOTE_MCP_ENVIRONMENT
+ && let McpServerTransportConfig::Stdio { cwd, .. } = &mut transport
+ && cwd.is_none()
+ {
+ *cwd = Some(LegacyAppPathString::from_path(config.cwd.as_path()));
+ }
let mut servers = config.mcp_servers.get().clone();
servers.insert(
server_name.to_string(),
@@ -699,12 +708,14 @@ async fn environment_mcp_policy_filters_runtime_config_and_model_tools(
let command = remote_aware_stdio_server_bin()?;
let allowed_command = command.clone();
let codex_home = Arc::new(tempdir()?);
+ let test_env = test_env().await?;
if from_plugin {
let plugin_root =
super::plugins::write_sample_plugin_manifest_and_config(codex_home.as_ref());
let plugin_server = json!({
"command": command,
"environment_id": remote_aware_environment_id(),
+ "cwd": test_env.cwd(),
});
fs::write(
plugin_root.join(".mcp.json"),
@@ -743,7 +754,7 @@ async fn environment_mcp_policy_filters_runtime_config_and_model_tools(
},
);
})
- .build_with_auto_env(&server)
+ .build_with_environment(&server, test_env)
.await?;
let selection = fixture
diff --git a/codex-rs/core/tests/suite/search_tool.rs b/codex-rs/core/tests/suite/search_tool.rs
index 45b0fcb93d..ff241cd2fb 100644
--- a/codex-rs/core/tests/suite/search_tool.rs
+++ b/codex-rs/core/tests/suite/search_tool.rs
@@ -36,6 +36,7 @@ use codex_tools::ToolName;
use codex_tools::ToolOutput;
use codex_tools::ToolPayload;
use codex_tools::ToolSpec;
+use codex_utils_path_uri::LegacyAppPathString;
use core_test_support::apps_test_server::AppsTestServer;
use core_test_support::apps_test_server::AppsTestToolLoading;
use core_test_support::apps_test_server::CALENDAR_CREATE_EVENT_MCP_APP_RESOURCE_URI;
@@ -1320,7 +1321,7 @@ async fn tool_search_indexes_only_enabled_non_app_mcp_tools() -> Result<()> {
args: Vec::new(),
env: None,
env_vars: Vec::new(),
- cwd: None,
+ cwd: Some(LegacyAppPathString::from_path(config.cwd.as_path())),
},
environment_id,
enabled: true,
@@ -1453,7 +1454,7 @@ async fn tool_search_surfaced_mcp_tool_errors_are_returned_to_model() -> Result<
args: Vec::new(),
env: None,
env_vars: Vec::new(),
- cwd: None,
+ cwd: Some(LegacyAppPathString::from_path(config.cwd.as_path())),
},
environment_id,
enabled: true,
@@ -1602,7 +1603,7 @@ async fn tool_search_uses_non_app_mcp_server_instructions_as_namespace_descripti
args: Vec::new(),
env: None,
env_vars: Vec::new(),
- cwd: None,
+ cwd: Some(LegacyAppPathString::from_path(config.cwd.as_path())),
},
environment_id,
enabled: true,
diff --git a/codex-rs/core/tests/suite/tool_lifecycle.rs b/codex-rs/core/tests/suite/tool_lifecycle.rs
index 5de7cc3498..4e093fa70e 100644
--- a/codex-rs/core/tests/suite/tool_lifecycle.rs
+++ b/codex-rs/core/tests/suite/tool_lifecycle.rs
@@ -36,6 +36,7 @@ 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::test_codex;
+use core_test_support::test_codex::test_env;
use core_test_support::wait_for_event;
use core_test_support::wait_for_mcp_server;
use pretty_assertions::assert_eq;
@@ -498,9 +499,11 @@ async fn tool_start_receives_frozen_host_plugin_root() -> Result<()> {
let server = responses::start_mock_server().await;
let codex_home = Arc::new(tempfile::tempdir()?);
let plugin_root = super::plugins::write_sample_plugin_manifest_and_config(codex_home.as_ref());
+ let test_env = test_env().await?;
let server_config = json!({
"command": super::rmcp_client::remote_aware_stdio_server_bin()?,
"environment_id": super::rmcp_client::remote_aware_environment_id(),
+ "cwd": test_env.cwd(),
});
fs::write(
plugin_root.join(".mcp.json"),
@@ -514,7 +517,7 @@ async fn tool_start_receives_frozen_host_plugin_root() -> Result<()> {
.with_home(codex_home)
.with_extensions(Arc::new(extensions.build()))
.with_model_info_override("gpt-5.4", |model| model.supports_search_tool = false)
- .build_with_auto_env(&server)
+ .build_with_environment(&server, test_env)
.await?;
wait_for_mcp_server(&test.codex, "sample").await?;
responses::mount_sse_sequence(
diff --git a/codex-rs/core/tests/suite/truncation.rs b/codex-rs/core/tests/suite/truncation.rs
index ed1c77f0f7..59c722abc3 100644
--- a/codex-rs/core/tests/suite/truncation.rs
+++ b/codex-rs/core/tests/suite/truncation.rs
@@ -787,13 +787,16 @@ async fn call_mcp_echo(
)
.await;
- let mcp_server = serde_json::from_value(json!({
- "command": remote_aware_stdio_server_bin()?,
- "environment_id": remote_aware_environment_id(),
- "startup_timeout_sec": 10,
- "tools": { "echo": { "output_token_limit": output_token_limit } },
- }))?;
+ let command = remote_aware_stdio_server_bin()?;
let mut builder = builder.with_config(move |config| {
+ let mcp_server = serde_json::from_value(json!({
+ "command": command,
+ "environment_id": remote_aware_environment_id(),
+ "cwd": config.cwd,
+ "startup_timeout_sec": 10,
+ "tools": { "echo": { "output_token_limit": output_token_limit } },
+ }))
+ .expect("test MCP server configuration");
config
.mcp_servers
.set(HashMap::from([(server_name.to_string(), mcp_server)]))