diff --git a/codex-rs/app-server/src/codex_message_processor.rs b/codex-rs/app-server/src/codex_message_processor.rs index 5166ffad28..60581b5ef4 100644 --- a/codex-rs/app-server/src/codex_message_processor.rs +++ b/codex-rs/app-server/src/codex_message_processor.rs @@ -1683,7 +1683,7 @@ impl CodexMessageProcessor { .and_then(|timeout_ms| u64::try_from(timeout_ms).ok()); let requested_policy = params.sandbox_policy.map(|policy| policy.to_core()); let effective_policy = match requested_policy { - Some(policy) => match self.config.sandbox_policy.can_set(&policy) { + Some(policy) => match self.config.permissions.sandbox_policy.can_set(&policy) { Ok(()) => policy, Err(err) => { let error = JSONRPCErrorError { @@ -1695,9 +1695,9 @@ impl CodexMessageProcessor { return; } }, - None => self.config.sandbox_policy.get().clone(), + None => self.config.permissions.sandbox_policy.get().clone(), }; - let started_network_proxy = match self.config.network.as_ref() { + let started_network_proxy = match self.config.permissions.network.as_ref() { Some(spec) => match spec.start_proxy(&effective_policy, None).await { Ok(started) => Some(started), Err(err) => { diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs index 7f7b8bbc0a..291ec0893b 100644 --- a/codex-rs/core/src/codex.rs +++ b/codex-rs/core/src/codex.rs @@ -1211,10 +1211,10 @@ impl Session { } } }); - let network_proxy = match config.network.as_ref() { + let network_proxy = match config.permissions.network.as_ref() { Some(spec) => Some( spec.start_proxy( - config.sandbox_policy.get(), + config.permissions.sandbox_policy.get(), Some(Arc::clone(&inline_network_decider)), ) .await diff --git a/codex-rs/core/src/tasks/user_shell.rs b/codex-rs/core/src/tasks/user_shell.rs index 43950a8da0..35088efce8 100644 --- a/codex-rs/core/src/tasks/user_shell.rs +++ b/codex-rs/core/src/tasks/user_shell.rs @@ -150,6 +150,7 @@ pub(crate) async fn execute_user_shell_command( Some(session.conversation_id), ), network: turn_context.network.clone(), + network_attempt_id: None, // TODO(zhao-oai): Now that we have ExecExpiration::Cancellation, we // should use that instead of an "arbitrarily large" timeout here. expiration: USER_SHELL_TIMEOUT_MS.into(), diff --git a/codex-rs/network-proxy/src/lib.rs b/codex-rs/network-proxy/src/lib.rs index dcd5243c1b..0983b07dc5 100644 --- a/codex-rs/network-proxy/src/lib.rs +++ b/codex-rs/network-proxy/src/lib.rs @@ -1,7 +1,6 @@ #![deny(clippy::print_stdout, clippy::print_stderr)] mod admin; -mod attempt_metadata; mod config; mod http_proxy; mod metadata;