clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-06-01 19:02:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add environment default cwd support

Browse Source 
Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
starr-openai
2026-04-16 13:06:49 -07:00
parent 220ad648c2
commit 4d51d3b6e2
7 changed files with 258 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
codex-rs/app-server/src/codex_message_processor.rs
View File

@@ -2542,6 +2542,7 @@ impl CodexMessageProcessor {
service_name,
request_trace,
environment_id,
requested_cwd,
)
.instrument(tracing::info_span!(
"app_server.thread_start.create_thread",

82
codex-rs/app-server/tests/suite/v2/thread_start.rs
View File

@@ -46,6 +46,7 @@ use super::analytics::wait_for_analytics_payload;
const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10);
const CODEX_EXEC_SERVER_URL_ENV_VAR: &str = "CODEX_EXEC_SERVER_URL";
const CODEX_EXEC_SERVER_CWD_ENV_VAR: &str = "CODEX_EXEC_SERVER_CWD";
#[tokio::test]
async fn thread_start_creates_thread_and_emits_started() -> Result<()> {
@@ -196,6 +197,87 @@ async fn thread_start_accepts_explicit_local_environment_when_default_is_remote(
Ok(())
}
#[tokio::test]
async fn thread_start_uses_remote_default_cwd_when_request_omits_cwd() -> Result<()> {
let server = create_mock_responses_server_repeating_assistant("Done").await;
let codex_home = TempDir::new()?;
create_config_toml_without_approval_policy(codex_home.path(), &server.uri())?;
let remote_default_cwd = TempDir::new()?;
let remote_default_cwd = remote_default_cwd.path().to_string_lossy().into_owned();
let mut mcp = McpProcess::new_with_env(
codex_home.path(),
&[
(CODEX_EXEC_SERVER_URL_ENV_VAR, Some("ws://127.0.0.1:1")),
(
CODEX_EXEC_SERVER_CWD_ENV_VAR,
Some(remote_default_cwd.as_str()),
),
],
)
.await?;
timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??;
let req_id = mcp
.send_thread_start_request(ThreadStartParams::default())
.await?;
let resp: JSONRPCResponse = timeout(
DEFAULT_READ_TIMEOUT,
mcp.read_stream_until_response_message(RequestId::Integer(req_id)),
)
.await??;
let ThreadStartResponse { thread, .. } = to_response::<ThreadStartResponse>(resp)?;
assert_eq!(thread.cwd.as_path(), Path::new(&remote_default_cwd));
Ok(())
}
#[tokio::test]
async fn thread_start_explicit_cwd_overrides_remote_default_cwd() -> Result<()> {
let server = create_mock_responses_server_repeating_assistant("Done").await;
let codex_home = TempDir::new()?;
create_config_toml_without_approval_policy(codex_home.path(), &server.uri())?;
let remote_default_cwd = TempDir::new()?;
let remote_default_cwd = remote_default_cwd.path().to_string_lossy().into_owned();
let requested_cwd = TempDir::new()?;
let requested_cwd = requested_cwd.path().to_string_lossy().into_owned();
let mut mcp = McpProcess::new_with_env(
codex_home.path(),
&[
(CODEX_EXEC_SERVER_URL_ENV_VAR, Some("ws://127.0.0.1:1")),
(
CODEX_EXEC_SERVER_CWD_ENV_VAR,
Some(remote_default_cwd.as_str()),
),
],
)
.await?;
timeout(DEFAULT_READ_TIMEOUT, mcp.initialize()).await??;
let req_id = mcp
.send_thread_start_request(ThreadStartParams {
cwd: Some(requested_cwd.clone()),
..Default::default()
})
.await?;
let resp: JSONRPCResponse = timeout(
DEFAULT_READ_TIMEOUT,
mcp.read_stream_until_response_message(RequestId::Integer(req_id)),
)
.await??;
let ThreadStartResponse { thread, .. } = to_response::<ThreadStartResponse>(resp)?;
assert_eq!(thread.cwd.as_path(), Path::new(&requested_cwd));
Ok(())
}
#[tokio::test]
async fn thread_start_rejects_explicit_remote_environment_when_not_configured() -> Result<()> {
let server = create_mock_responses_server_repeating_assistant("Done").await;