fix(core): reconcile stacked branch after conflict resolution

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) => {

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

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(),

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;