From f946f2b3bb2006e0d3303b12b48211863b851ba3 Mon Sep 17 00:00:00 2001 From: Owen Lin Date: Thu, 13 Nov 2025 14:09:14 -0800 Subject: [PATCH] stub out IDs for now --- codex-rs/app-server-protocol/src/protocol/common.rs | 8 ++++---- codex-rs/app-server/src/codex_message_processor.rs | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/codex-rs/app-server-protocol/src/protocol/common.rs b/codex-rs/app-server-protocol/src/protocol/common.rs index 3e1215779e..a782762e50 100644 --- a/codex-rs/app-server-protocol/src/protocol/common.rs +++ b/codex-rs/app-server-protocol/src/protocol/common.rs @@ -428,14 +428,14 @@ impl TryFrom for ServerRequest { server_request_definitions! { /// NEW APIs /// Sent when approval is requested for a specific command execution. - /// This request is used when calling turn/start instead of the legacy APIs (i.e. SendUserTurn, SendUserMessage). + /// This request is used for Turns started via turn/start. CommandExecutionRequestApproval => "item/commandExecution/requestApproval" { params: v2::CommandExecutionRequestApprovalParams, response: v2::CommandExecutionRequestApprovalResponse, }, /// Sent when approval is requested for a specific file change. - /// This request is used when calling turn/start instead of the legacy APIs (i.e. SendUserTurn, SendUserMessage). + /// This request is used for Turns started via turn/start. FileChangeRequestApproval => "item/fileChange/requestApproval" { params: v2::FileChangeRequestApprovalParams, response: v2::FileChangeRequestApprovalResponse, @@ -443,13 +443,13 @@ server_request_definitions! { /// DEPRECATED APIs below /// Request to approve a patch. - /// This request is used only when calling the legacy APIs (i.e. SendUserTurn, SendUserMessage). + /// This request is used for Turns started via the legacy APIs (i.e. SendUserTurn, SendUserMessage). ApplyPatchApproval { params: v1::ApplyPatchApprovalParams, response: v1::ApplyPatchApprovalResponse, }, /// Request to exec a command. - /// This request is used only when calling the legacy APIs (i.e. SendUserTurn, SendUserMessage). + /// This request is used for Turns started via the legacy APIs (i.e. SendUserTurn, SendUserMessage). ExecCommandApproval { params: v1::ExecCommandApprovalParams, response: v1::ExecCommandApprovalResponse, diff --git a/codex-rs/app-server/src/codex_message_processor.rs b/codex-rs/app-server/src/codex_message_processor.rs index 5b7104b872..bf2d0f1995 100644 --- a/codex-rs/app-server/src/codex_message_processor.rs +++ b/codex-rs/app-server/src/codex_message_processor.rs @@ -2696,7 +2696,6 @@ async fn apply_bespoke_event_handling( }); } ApiVersion::V2 => { - let item_id = call_id.clone(); let request = FileChangeRequest { call_id, file_changes: changes @@ -2708,8 +2707,9 @@ async fn apply_bespoke_event_handling( }; let params = FileChangeRequestApprovalParams { thread_id: conversation_id.to_string(), - turn_id: event_id.clone(), - item_id, + // TODO: use the actual IDs once we have them + turn_id: "placeholder_turn_id".to_string(), + item_id: "placeholder_item_id".to_string(), request, }; let rx = outgoing @@ -2746,7 +2746,6 @@ async fn apply_bespoke_event_handling( }); } ApiVersion::V2 => { - let item_id = call_id.clone(); let request = CommandExecutionRequest { call_id, command, @@ -2757,8 +2756,9 @@ async fn apply_bespoke_event_handling( }; let params = CommandExecutionRequestApprovalParams { thread_id: conversation_id.to_string(), - turn_id: event_id.clone(), - item_id, + // TODO: use the actual IDs once we have them + turn_id: "placeholder_turn_id".to_string(), + item_id: "placeholder_item_id".to_string(), request, }; let rx = outgoing