From 837b2a3235a16f28cc9b00d303581a321d728ae3 Mon Sep 17 00:00:00 2001 From: Friel Date: Thu, 23 Apr 2026 05:51:00 +0000 Subject: [PATCH] codex: fix CI failure on PR #19083 --- codex-rs/app-server-protocol/src/protocol/thread_history.rs | 1 + codex-rs/app-server/tests/suite/v2/compaction.rs | 1 + codex-rs/app-server/tests/suite/v2/thread_inject_items.rs | 2 ++ codex-rs/app-server/tests/suite/v2/thread_resume.rs | 2 ++ codex-rs/codex-api/tests/clients.rs | 1 + codex-rs/rollout/src/tests.rs | 1 + codex-rs/state/src/extract.rs | 1 + codex-rs/tui/src/app/side.rs | 1 + 8 files changed, 10 insertions(+) diff --git a/codex-rs/app-server-protocol/src/protocol/thread_history.rs b/codex-rs/app-server-protocol/src/protocol/thread_history.rs index c6090dbe11..32d16f6674 100644 --- a/codex-rs/app-server-protocol/src/protocol/thread_history.rs +++ b/codex-rs/app-server-protocol/src/protocol/thread_history.rs @@ -3098,6 +3098,7 @@ mod tests { }], end_turn: None, phase: None, + exclude_from_compaction: false, }), RolloutItem::EventMsg(EventMsg::TurnComplete(TurnCompleteEvent { turn_id: "turn-a".into(), diff --git a/codex-rs/app-server/tests/suite/v2/compaction.rs b/codex-rs/app-server/tests/suite/v2/compaction.rs index 44b5dd6dc6..e4a5fc03d5 100644 --- a/codex-rs/app-server/tests/suite/v2/compaction.rs +++ b/codex-rs/app-server/tests/suite/v2/compaction.rs @@ -136,6 +136,7 @@ async fn auto_compaction_remote_emits_started_and_completed_items() -> Result<() }], end_turn: None, phase: None, + exclude_from_compaction: false, }, ResponseItem::Compaction { encrypted_content: "ENCRYPTED_COMPACTION_SUMMARY".to_string(), diff --git a/codex-rs/app-server/tests/suite/v2/thread_inject_items.rs b/codex-rs/app-server/tests/suite/v2/thread_inject_items.rs index 56fd188c4b..f16a9144c3 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_inject_items.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_inject_items.rs @@ -61,6 +61,7 @@ async fn thread_inject_items_adds_raw_response_items_to_thread_history() -> Resu }], end_turn: None, phase: None, + exclude_from_compaction: false, }; let inject_req = mcp @@ -197,6 +198,7 @@ async fn thread_inject_items_adds_raw_response_items_after_a_turn() -> Result<() }], end_turn: None, phase: None, + exclude_from_compaction: false, }; let injected_value = serde_json::to_value(&injected_item)?; diff --git a/codex-rs/app-server/tests/suite/v2/thread_resume.rs b/codex-rs/app-server/tests/suite/v2/thread_resume.rs index 7a5f2c543d..3c6c68566e 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_resume.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_resume.rs @@ -1097,6 +1097,7 @@ async fn thread_resume_rejects_history_when_thread_is_running() -> Result<()> { }], end_turn: None, phase: None, + exclude_from_compaction: false, }]), ..Default::default() }) @@ -1926,6 +1927,7 @@ async fn thread_resume_supports_history_and_overrides() -> Result<()> { }], end_turn: None, phase: None, + exclude_from_compaction: false, }]; // Resume with explicit history and override the model. diff --git a/codex-rs/codex-api/tests/clients.rs b/codex-rs/codex-api/tests/clients.rs index 46f5627592..e17565e5aa 100644 --- a/codex-rs/codex-api/tests/clients.rs +++ b/codex-rs/codex-api/tests/clients.rs @@ -425,6 +425,7 @@ async fn azure_default_store_attaches_ids_and_headers() -> Result<()> { content: vec![ContentItem::InputText { text: "hi".into() }], end_turn: None, phase: None, + exclude_from_compaction: false, }], tools: Vec::new(), tool_choice: "auto".into(), diff --git a/codex-rs/rollout/src/tests.rs b/codex-rs/rollout/src/tests.rs index 5769a3d576..6f50a3e107 100644 --- a/codex-rs/rollout/src/tests.rs +++ b/codex-rs/rollout/src/tests.rs @@ -1181,6 +1181,7 @@ async fn test_updated_at_uses_file_mtime() -> Result<()> { }], end_turn: None, phase: None, + exclude_from_compaction: false, }), }; writeln!(file, "{}", serde_json::to_string(&response_line)?)?; diff --git a/codex-rs/state/src/extract.rs b/codex-rs/state/src/extract.rs index f0fe3c693c..ab7d2bdf6c 100644 --- a/codex-rs/state/src/extract.rs +++ b/codex-rs/state/src/extract.rs @@ -179,6 +179,7 @@ mod tests { }], end_turn: None, phase: None, + exclude_from_compaction: false, }); apply_rollout_item(&mut metadata, &item, "test-provider"); diff --git a/codex-rs/tui/src/app/side.rs b/codex-rs/tui/src/app/side.rs index 4ca3785ebf..04bd365058 100644 --- a/codex-rs/tui/src/app/side.rs +++ b/codex-rs/tui/src/app/side.rs @@ -442,6 +442,7 @@ impl App { }], end_turn: None, phase: None, + exclude_from_compaction: false, } }