Skip to content

Commit 7ceb5da

Browse files
Apply per-turn local executor policies
1 parent c516553 commit 7ceb5da

27 files changed

Lines changed: 1984 additions & 165 deletions

‎packages/codex/Cargo.lock‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/codex/Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ serde_path_to_error = "0.1"
8484
sha2 = "0.10"
8585
tempfile = "3"
8686
rmcp = { git = "https://github.com/modelcontextprotocol/rust-sdk", rev = "3e636cab26c013eca5131103c03d20237f12c4df", version = "=3.3.0", default-features = false }
87+
rustls = { version = "=0.23.45", default-features = false, features = ["std"] }
8788
tokio = { version = "1", features = ["rt-multi-thread", "sync", "time", "macros", "net", "io-util"] }
89+
tokio-tungstenite = { version = "=0.28.0", default-features = false, features = ["handshake", "rustls-tls-native-roots"] }
8890
toml = "0.9.5"
8991
tracing = "0.1"
9092
tracing-subscriber = { version = "0.3", features = ["registry"] }
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
diff --git a/codex-rs/exec-server/src/client.rs b/codex-rs/exec-server/src/client.rs
2+
index 0369bb7185d4a68d5ad77c47f06c2524c249aa35..77a54c492c956bd8777a7ef0b32cf4333714a4d1 100644
3+
--- a/codex-rs/exec-server/src/client.rs
4+
+++ b/codex-rs/exec-server/src/client.rs
5+
@@ -440,8 +440,8 @@ impl LazyRemoteExecServerClient {
6+
let client = self.clone();
7+
Some(AbortOnDropHandle::new(tokio::spawn(
8+
async move {
9+
- if let Err(error) = client.wait_until_ready().await {
10+
- debug!(%error, "exec-server environment startup failed");
11+
+ if client.wait_until_ready().await.is_err() {
12+
+ debug!("exec-server environment startup failed");
13+
}
14+
}
15+
.in_current_span()
16+
diff --git a/codex-rs/exec-server/src/environment.rs b/codex-rs/exec-server/src/environment.rs
17+
index 2bf43abb8c389fd6c7273666decf7bacca3ae6c8..d9d651491ce0dcf385db157f81bea0f063a3e921 100644
18+
--- a/codex-rs/exec-server/src/environment.rs
19+
+++ b/codex-rs/exec-server/src/environment.rs
20+
@@ -1043,7 +1043,7 @@ impl Environment {
21+
};
22+
match discover().await {
23+
Err(error) if crate::client::is_retryable_recovery_error(&error) => {
24+
- tracing::warn!(%error, "replaying capability discovery after executor recovery");
25+
+ tracing::warn!("replaying capability discovery after executor recovery");
26+
let recovered =
27+
tokio::time::timeout(std::time::Duration::from_secs(8), async {
28+
loop {
29+
@@ -1107,8 +1107,8 @@ impl Environment {
30+
let client = client.clone();
31+
*startup_task = Some(AbortOnDropHandle::new(tokio::spawn(
32+
async move {
33+
- if let Err(error) = client.wait_until_ready().await {
34+
- tracing::debug!(%error, "exec-server environment startup failed");
35+
+ if client.wait_until_ready().await.is_err() {
36+
+ tracing::debug!("exec-server environment startup failed");
37+
}
38+
}
39+
.in_current_span()
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
diff --git a/codex-rs/core/src/session/step_context.rs b/codex-rs/core/src/session/step_context.rs
2+
index ef2ed3ad924bfb95d245ed155215c919859b8480..f3e6d4018a1ad40a96e75e2234eda6c3e6f71df2 100644
3+
--- a/codex-rs/core/src/session/step_context.rs
4+
+++ b/codex-rs/core/src/session/step_context.rs
5+
@@ -119,11 +119,26 @@ impl StepContext {
6+
let reasoning_effort = effort
7+
.or(model.default_reasoning_level.as_ref())
8+
.map(|effort| model.resolve_reasoning_effort(effort.clone()));
9+
+ let local_network = if seed.strict_executor_writes && self.turn.network.is_some() {
10+
+ self.turn
11+
+ .config
12+
+ .permissions
13+
+ .network
14+
+ .as_ref()
15+
+ .map(crate::config::NetworkProxySpec::environment_policy)
16+
+ .filter(|policy| policy.requires_proxy)
17+
+ } else {
18+
+ None
19+
+ };
20+
let executors = self
21+
.environments
22+
.turn_environments()
23+
.filter_map(|env| {
24+
- sdk_executor_policy_receipt(&env.selection, env.environment.is_remote())
25+
+ sdk_executor_policy_receipt(
26+
+ &env.selection,
27+
+ env.environment.is_remote(),
28+
+ local_network.as_ref(),
29+
+ )
30+
})
31+
.collect::<Vec<_>>();
32+
let user_config_applied = self
33+
diff --git a/codex-rs/protocol/src/environment.rs b/codex-rs/protocol/src/environment.rs
34+
index 93443249595270ed0c5509eee3b2eb14134a66bd..37687bfed91cdf6a6ea27b2df68a57dabf09d95a 100644
35+
--- a/codex-rs/protocol/src/environment.rs
36+
+++ b/codex-rs/protocol/src/environment.rs
37+
@@ -106,6 +106,7 @@ impl std::fmt::Debug for EnvironmentConfig {
38+
pub fn sdk_executor_policy_receipt(
39+
selection: &TurnEnvironmentSelection,
40+
remote: bool,
41+
+ local_session_policy: Option<&EnvironmentNetworkPolicy>,
42+
) -> Option<serde_json::Value> {
43+
let EnvironmentConfigState::Ready(config) = &selection.config else {
44+
return None;
45+
@@ -120,7 +121,12 @@ pub fn sdk_executor_policy_receipt(
46+
_ => None,
47+
})
48+
.collect::<Vec<_>>();
49+
- let network_policy = config.network_policy.as_ref().map(|policy| {
50+
+ let network_policy = if remote {
51+
+ config.network_policy.as_ref()
52+
+ } else {
53+
+ local_session_policy
54+
+ };
55+
+ let network_policy = network_policy.map(|policy| {
56+
serde_json::json!({
57+
"requires_proxy": policy.requires_proxy,
58+
"domains": policy.domains,
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
diff --git a/codex-rs/core/src/unified_exec/process_manager.rs b/codex-rs/core/src/unified_exec/process_manager.rs
2+
index 211d99de7cf4e92c21779712cb31dc1b0f1c4426..55d39c46d1eaff030fb9f303077d807f12c7fe85 100644
3+
--- a/codex-rs/core/src/unified_exec/process_manager.rs
4+
+++ b/codex-rs/core/src/unified_exec/process_manager.rs
5+
@@ -32,6 +32,7 @@ use crate::tools::ApprovalContext;
6+
use crate::tools::context::ExecCommandToolOutput;
7+
use crate::tools::events::ToolEmitter;
8+
use crate::tools::events::ToolEventCtx;
9+
+use crate::tools::events::ToolEventFailure;
10+
use crate::tools::events::ToolEventStage;
11+
use crate::tools::network_approval::DeferredNetworkApproval;
12+
use crate::tools::network_approval::finish_deferred_network_approval;
13+
@@ -533,6 +534,32 @@ impl UnifiedExecProcessManager {
14+
Ok((attempt, deferred_network_approval)) => (attempt, deferred_network_approval),
15+
Err(err) => {
16+
self.release_process_id(request.process_id).await;
17+
+ // A process denied during the early-exit check returns before Begin.
18+
+ // Record the final denial only after the sandbox orchestrator has
19+
+ // decided whether to retry, using the original process output.
20+
+ if let UnifiedExecError::SandboxDenied { output, .. } = &err {
21+
+ let model_context = context.step_context.model_context();
22+
+ let mut event_ctx = ToolEventCtx::new(
23+
+ context.session.as_ref(),
24+
+ context.step_context.turn.as_ref(),
25+
+ &context.step_context.settings.model_info,
26+
+ &context.call_id,
27+
+ /*turn_diff_tracker*/ None,
28+
+ );
29+
+ event_ctx.model_context = Some(&model_context);
30+
+ ToolEmitter::unified_exec(
31+
+ &request.command,
32+
+ cwd,
33+
+ ExecCommandSource::UnifiedExecStartup,
34+
+ /*process_id*/ None,
35+
+ /*plugin_attribution*/ None,
36+
+ )
37+
+ .emit(
38+
+ event_ctx,
39+
+ ToolEventStage::Failure(ToolEventFailure::Output(output.clone())),
40+
+ )
41+
+ .await;
42+
+ }
43+
return Err(err);
44+
}
45+
};

‎packages/codex/patches/series.json‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,19 @@
7979
{
8080
"path": "0020-sdk-turn-receipts.patch",
8181
"sha256": "de462b9b82de958fa52b350cf17da9c8a6a1200005ba6a12c64d0cb4d0d70d94"
82+
},
83+
{
84+
"path": "0021-redact-executor-startup-tracing.patch",
85+
"sha256": "2febc726d78dd113512306c3bd59d9eaf4b233ff18cba8559af20e94c918b7a0"
86+
},
87+
{
88+
"path": "0022-sdk-local-network-receipts.patch",
89+
"sha256": "44d43b139d8d1f8a010dbab32a3bb7ae8e54f10a695e97026e63c93d73bb0fcf"
90+
},
91+
{
92+
"path": "0023-retain-early-sandbox-denials.patch",
93+
"sha256": "31eee8fd638f35abd56e216a18bbc70dad6b8b93f90fe2db16b2deaae1bd004f"
8294
}
8395
],
84-
"result_tree": "e08df069309c6ed01d5dc0160f74df8ab90b7240"
96+
"result_tree": "bfb3f0280e467a641999c4be006f4188bfc85734"
8597
}

‎packages/codex/rust/application_instructions.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,10 @@ impl ContextContributor for Contributor {
427427
codex_revision: include_str!("../CODEX_REVISION").trim(),
428428
codex_source_tree: CODEX_SOURCE_TREE.as_str(),
429429
sha256,
430-
strict_executor_writes: false,
430+
strict_executor_writes: input
431+
.thread_store
432+
.get::<crate::environment::StrictExecutorWrites>()
433+
.is_some(),
431434
application: accepted.as_ref().map(|accepted| SdkApplicationInstructions {
432435
revision: accepted.id.to_string(),
433436
rendered: rendered(accepted),

0 commit comments

Comments
 (0)