From 894aa05eb86ac12d1b4cb89687e921fd90b2bdfd Mon Sep 17 00:00:00 2001 From: Roy Han Date: Thu, 19 Mar 2026 18:34:44 -0700 Subject: [PATCH] fixes --- .../app-server/tests/suite/v2/compaction.rs | 1 + codex-rs/core/src/codex.rs | 23 ------------------- codex-rs/core/src/codex_tests.rs | 4 +++- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/codex-rs/app-server/tests/suite/v2/compaction.rs b/codex-rs/app-server/tests/suite/v2/compaction.rs index 800c2d9875..aa40721811 100644 --- a/codex-rs/app-server/tests/suite/v2/compaction.rs +++ b/codex-rs/app-server/tests/suite/v2/compaction.rs @@ -135,6 +135,7 @@ async fn auto_compaction_remote_emits_started_and_completed_items() -> Result<() }, ResponseItem::Compaction { encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(), + metadata: None, }, ]; let compact_mock = responses::mount_compact_json_once( diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs index ddb1fb6af1..c5e476bcf3 100644 --- a/codex-rs/core/src/codex.rs +++ b/codex-rs/core/src/codex.rs @@ -330,7 +330,6 @@ use codex_protocol::config_types::ServiceTier; use codex_protocol::config_types::WindowsSandboxLevel; use codex_protocol::models::ContentItem; use codex_protocol::models::DeveloperInstructions; -use codex_protocol::models::ReviewDecisionMetadata; use codex_protocol::models::ResponseInputItem; use codex_protocol::models::ResponseItem; use codex_protocol::models::ResponseItemMetadata; @@ -1140,28 +1139,6 @@ fn response_item_metadata_or_default(item: &ResponseItem) -> Option ReviewDecisionMetadata { - match decision { - ReviewDecision::Approved => ReviewDecisionMetadata::Approved, - ReviewDecision::ApprovedExecpolicyAmendment { .. } => { - ReviewDecisionMetadata::ApprovedWithAmendment - } - ReviewDecision::ApprovedForSession => ReviewDecisionMetadata::ApprovedForSession, - ReviewDecision::NetworkPolicyAmendment { - network_policy_amendment, - } => match network_policy_amendment.action { - codex_protocol::protocol::NetworkPolicyRuleAction::Allow => { - ReviewDecisionMetadata::ApprovedWithNetworkPolicyAllow - } - codex_protocol::protocol::NetworkPolicyRuleAction::Deny => { - ReviewDecisionMetadata::DeniedWithNetworkPolicyDeny - } - }, - ReviewDecision::Denied => ReviewDecisionMetadata::Denied, - ReviewDecision::Abort => ReviewDecisionMetadata::Abort, - } -} - #[derive(Clone, Debug, Default)] struct ToolApprovalMetadataSnapshot { approval_outcomes_by_call_id: HashMap, diff --git a/codex-rs/core/src/codex_tests.rs b/codex-rs/core/src/codex_tests.rs index 7f1b45b9cb..662afe229e 100644 --- a/codex-rs/core/src/codex_tests.rs +++ b/codex-rs/core/src/codex_tests.rs @@ -4486,6 +4486,7 @@ async fn record_response_item_stamps_session_source_on_all_supported_variants() }, ResponseItem::CustomToolCallOutput { call_id: "custom-output-1".to_string(), + name: None, output: FunctionCallOutputPayload { body: FunctionCallOutputBody::Text("done".to_string()), success: None, @@ -5032,7 +5033,8 @@ async fn steer_input_returns_active_turn_id() { } #[tokio::test] -async fn record_into_history_generates_metadata_uuid_for_metadata_bearing_items_when_item_metadata_enabled() { +async fn record_into_history_generates_metadata_uuid_for_metadata_bearing_items_when_item_metadata_enabled() + { let (mut sess, tc) = make_session_and_context().await; let _ = sess.features.enable(crate::features::Feature::ItemMetadata);