diff --git a/codex-rs/core/src/tools/runtimes/unified_exec.rs b/codex-rs/core/src/tools/runtimes/unified_exec.rs
index 2d0a271d81..546d0fdfcf 100644
--- a/codex-rs/core/src/tools/runtimes/unified_exec.rs
+++ b/codex-rs/core/src/tools/runtimes/unified_exec.rs
@@ -262,7 +262,7 @@ impl<'a> ToolRuntime<UnifiedExecRequest, UnifiedExecProcess> for UnifiedExecRunt
                             req.process_id,
                             &prepared.exec_request,
                             req.tty,
-                            None,
+                            /*startup_exec_approval*/ None,
                             prepared.spawn_lifecycle,
                             ctx.turn.environment.as_ref(),
                         )
diff --git a/codex-rs/core/src/unified_exec/mod_tests.rs b/codex-rs/core/src/unified_exec/mod_tests.rs
index ff84c07bee..2baf2b612e 100644
--- a/codex-rs/core/src/unified_exec/mod_tests.rs
+++ b/codex-rs/core/src/unified_exec/mod_tests.rs
@@ -97,7 +97,7 @@ async fn exec_command_with_tty(
                 process_id,
                 &request,
                 tty,
-                None,
+                /*startup_exec_approval*/ None,
                 Box::new(NoopSpawnLifecycle),
                 turn.environment.as_ref(),
             )
@@ -513,7 +513,7 @@ async fn completed_pipe_commands_preserve_exit_code() -> anyhow::Result<()> {
             /*process_id*/ 1234,
             &request,
             /*tty*/ false,
-            None,
+            /*startup_exec_approval*/ None,
             Box::new(NoopSpawnLifecycle),
             &environment,
         )
@@ -556,7 +556,7 @@ async fn unified_exec_uses_remote_exec_server_when_configured() -> anyhow::Resul
             /*process_id*/ 1234,
             &request,
             /*tty*/ true,
-            None,
+            /*startup_exec_approval*/ None,
             Box::new(NoopSpawnLifecycle),
             remote_test_env.environment(),
         )
@@ -611,7 +611,7 @@ async fn remote_exec_server_rejects_inherited_fd_launches() -> anyhow::Result<()
             /*process_id*/ 1234,
             &request,
             /*tty*/ true,
-            None,
+            /*startup_exec_approval*/ None,
             Box::new(TestSpawnLifecycle {
                 inherited_fds: vec![42],
             }),
diff --git a/codex-rs/core/src/unified_exec/process_manager.rs b/codex-rs/core/src/unified_exec/process_manager.rs
index a2bdbfd7b3..f6274a86fb 100644
--- a/codex-rs/core/src/unified_exec/process_manager.rs
+++ b/codex-rs/core/src/unified_exec/process_manager.rs
@@ -115,7 +115,7 @@ fn exec_server_process_id(process_id: i32) -> String {
 fn startup_exec_approval_request(
     context: &UnifiedExecContext,
     request: &ExecCommandRequest,
-    cwd: &PathBuf,
+    cwd: &Path,
     exec_approval_requirement: &crate::tools::sandboxing::ExecApprovalRequirement,
 ) -> Option<codex_exec_server::ExecApprovalRequest> {
     match exec_approval_requirement {
@@ -127,7 +127,7 @@ fn startup_exec_approval_request(
             approval_id: None,
             turn_id: context.turn.sub_id.clone(),
             command: request.command.clone(),
-            cwd: cwd.clone(),
+            cwd: cwd.to_path_buf(),
             reason: reason.clone().or_else(|| request.justification.clone()),
             additional_permissions: request.additional_permissions.clone().map(Into::into),
             proposed_execpolicy_amendment: proposed_execpolicy_amendment