Lightweight coding agent that runs in your terminal
Rust
Generate unique exec-server process IDs for every request (#48168)
Steve Coffeyf6a4bd81e310
diff --git a/codex-rs/core/src/unified_exec/process_manager.rs b/codex-rs/core/src/unified_exec/process_manager.rsindex d8433551e5..3dc3e97d91 100644--- a/codex-rs/core/src/unified_exec/process_manager.rs+++ b/codex-rs/core/src/unified_exec/process_manager.rs@@ -230,14 +230,9 @@ fn exec_server_params_for_request(sandbox.windows_sandbox_proxy_settings_mode = Some(windows_sandbox_proxy_settings_mode);sandbox});- // Sandbox retries and memory-backed local launches can reuse a unified-exec- // ID while the executor still retains the previous process.- let exec_server_process_id =- if request.exec_server_sandbox.is_some() || request.exec_server_shell_snapshot.is_some() {- format!("{process_id}-{}", Uuid::new_v4())- } else {- process_id.to_string()- };+ // Threads sharing an executor and sandbox retries can reuse a public handle+ // while the executor still retains its previous process.+ let exec_server_process_id = format!("{process_id}-{}", Uuid::new_v4());codex_exec_server::ExecParams {process_id: exec_server_process_id.into(),metadata: tool_ctx.map(|ctx| codex_exec_server::ExecMetadata {diff --git a/codex-rs/core/src/unified_exec/process_manager_tests.rs b/codex-rs/core/src/unified_exec/process_manager_tests.rsindex 5ce38c4930..7edc743ce4 100644--- a/codex-rs/core/src/unified_exec/process_manager_tests.rs+++ b/codex-rs/core/src/unified_exec/process_manager_tests.rs@@ -1,6 +1,7 @@use super::*;use crate::unified_exec::clamp_yield_time;use codex_network_proxy::ManagedNetworkSandboxContext;+use core_test_support::assert_regex_match;use pretty_assertions::assert_eq;use tokio::sync::Notify;use tokio::time::Duration;@@ -249,7 +250,11 @@ fn exec_server_params_use_path_uri_and_env_policy_overlay_contract() {};let params = params_for_request(&request);- assert_eq!(params.process_id.as_str(), "123");+ assert_regex_match(+ r"^123-[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$",+ params.process_id.as_str(),+ );+ assert_ne!(params.process_id, params_for_request(&request).process_id);assert_eq!(params.metadata, None);assert_eq!(params.cwd, request.cwd);assert!(params.enforce_managed_network);