agent/codex
2
0
Fork 0
mirror of https://github.com/pchuan98/codex.git synced 2026-07-01 00:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: update parallel tool call exec approval to approve on request id (#11162)

Browse Source 
### Summary

In parallel tool call, exec command approvals were not approved at
request level but at a turn level. i.e. when a single request is
approved, the system currently treats all requests in turn as approved.

### Before

https://github.com/user-attachments/assets/d50ed129-b3d2-4b2f-97fa-8601eb11f6a8

### After

https://github.com/user-attachments/assets/36528a43-a4aa-4775-9e12-f13287ef19fc
This commit is contained in:
Shijie Rao
2026-02-10 09:38:00 -08:00
committed by GitHub
parent 47356ff83c
commit c4b771a16f
15 changed files with 190 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/app-server/src/bespoke_event_handling.rs
+15 -12
View File
@@ -140,7 +140,7 @@ pub(crate) async fn apply_bespoke_event_handling(
ApiVersion::V1 => {
let params = ApplyPatchApprovalParams {
conversation_id,
call_id,
call_id: call_id.clone(),
file_changes: changes.clone(),
reason,
grant_root,
@@ -149,7 +149,7 @@ pub(crate) async fn apply_bespoke_event_handling(
.send_request(ServerRequestPayload::ApplyPatchApproval(params))
.await;
tokio::spawn(async move {
on_patch_approval_response(event_turn_id, rx, conversation).await;
on_patch_approval_response(call_id, rx, conversation).await;
});
}
ApiVersion::V2 => {
@@ -216,7 +216,7 @@ pub(crate) async fn apply_bespoke_event_handling(
ApiVersion::V1 => {
let params = ExecCommandApprovalParams {
conversation_id,
call_id,
call_id: call_id.clone(),
command,
cwd,
reason,
@@ -226,7 +226,7 @@ pub(crate) async fn apply_bespoke_event_handling(
.send_request(ServerRequestPayload::ExecCommandApproval(params))
.await;
tokio::spawn(async move {
on_exec_approval_response(event_turn_id, rx, conversation).await;
on_exec_approval_response(call_id, event_turn_id, rx, conversation).await;
});
}
ApiVersion::V2 => {
@@ -1428,7 +1428,7 @@ async fn handle_error(
}
async fn on_patch_approval_response(
event_turn_id: String,
call_id: String,
receiver: oneshot::Receiver<JsonValue>,
codex: Arc<CodexThread>,
) {
@@ -1439,7 +1439,7 @@ async fn on_patch_approval_response(
error!("request failed: {err:?}");
if let Err(submit_err) = codex
.submit(Op::PatchApproval {
id: event_turn_id.clone(),
id: call_id.clone(),
decision: ReviewDecision::Denied,
})
.await
@@ -1460,7 +1460,7 @@ async fn on_patch_approval_response(
if let Err(err) = codex
.submit(Op::PatchApproval {
id: event_turn_id,
id: call_id,
decision: response.decision,
})
.await
@@ -1470,7 +1470,8 @@ async fn on_patch_approval_response(
}
async fn on_exec_approval_response(
event_turn_id: String,
call_id: String,
turn_id: String,
receiver: oneshot::Receiver<JsonValue>,
conversation: Arc<CodexThread>,
) {
@@ -1496,7 +1497,8 @@ async fn on_exec_approval_response(
if let Err(err) = conversation
.submit(Op::ExecApproval {
id: event_turn_id,
id: call_id,
turn_id: Some(turn_id),
decision: response.decision,
})
.await
@@ -1678,7 +1680,7 @@ async fn on_file_change_request_approval_response(
if let Some(status) = completion_status {
complete_file_change_item(
conversation_id,
item_id,
item_id.clone(),
changes,
status,
event_turn_id.clone(),
@@ -1690,7 +1692,7 @@ async fn on_file_change_request_approval_response(
if let Err(err) = codex
.submit(Op::PatchApproval {
id: event_turn_id,
id: item_id,
decision,
})
.await
@@ -1771,7 +1773,8 @@ async fn on_command_execution_request_approval_response(
if let Err(err) = conversation
.submit(Op::ExecApproval {
id: event_turn_id,
id: item_id,
turn_id: Some(event_turn_id),
decision,
})
.await