Merge 4eaec7be7d into sapling-pr-archive-bolinfest

codex-rs/core/src/codex.rs

@@ -2604,6 +2604,7 @@ impl Session {
         network_approval_context: Option<NetworkApprovalContext>,
         proposed_execpolicy_amendment: Option<ExecPolicyAmendment>,
         additional_permissions: Option<PermissionProfile>,
+        available_decisions: Option<Vec<ReviewDecision>>,
     ) -> ReviewDecision {
         self.request_command_approval_with_options(
             turn_context,

codex-rs/core/src/tools/network_approval.rs

@@ -331,6 +331,7 @@ impl NetworkApprovalService {
             protocol,
         };
 
+        let available_decisions = None;
         let approval_decision = session
             .request_command_approval(
                 turn_context.as_ref(),
@@ -342,6 +343,7 @@ impl NetworkApprovalService {
                 Some(network_approval_context.clone()),
                 None,
                 None,
+                available_decisions,
             )
             .await;
 

codex-rs/core/src/tools/runtimes/shell.rs

@@ -150,6 +150,7 @@ impl Approvable<ShellRequest> for ShellRuntime {
         let call_id = ctx.call_id.to_string();
         Box::pin(async move {
             with_cached_approval(&session.services, "shell", keys, move || async move {
+                let available_decisions = None;
                 session
                     .request_command_approval(
                         turn,
@@ -163,6 +164,7 @@ impl Approvable<ShellRequest> for ShellRuntime {
                             .proposed_execpolicy_amendment()
                             .cloned(),
                         req.additional_permissions.clone(),
+                        available_decisions,
                     )
                     .await
             })

codex-rs/core/src/tools/runtimes/shell/unix_escalation.rs

@@ -199,6 +199,7 @@ impl CoreShellActionProvider {
         let approval_id = Some(Uuid::new_v4().to_string());
         Ok(stopwatch
             .pause_for(async move {
+                let available_decisions = None;
                 session
                     .request_command_approval(
                         &turn,
@@ -210,6 +211,7 @@ impl CoreShellActionProvider {
                         None,
                         None,
                         additional_permissions,
+                        available_decisions,
                     )
                     .await
             })

codex-rs/core/src/tools/runtimes/unified_exec.rs

@@ -111,6 +111,7 @@ impl Approvable<UnifiedExecRequest> for UnifiedExecRuntime<'_> {
             .or_else(|| req.justification.clone());
         Box::pin(async move {
             with_cached_approval(&session.services, "unified_exec", keys, || async move {
+                let available_decisions = None;
                 session
                     .request_command_approval(
                         turn,
@@ -124,6 +125,7 @@ impl Approvable<UnifiedExecRequest> for UnifiedExecRuntime<'_> {
                             .proposed_execpolicy_amendment()
                             .cloned(),
                         req.additional_permissions.clone(),
+                        available_decisions,
                     )
                     .await
             })