merge conflicts

2026-05-03 21:01:55 +03:00 · 2026-03-19 13:59:01 -07:00
parent 80f3b3d1fe
commit 6c4176db18
5 changed files with 16 additions and 34 deletions
--- a/codex-rs/app-server-protocol/src/protocol/thread_history.rs
+++ b/codex-rs/app-server-protocol/src/protocol/thread_history.rs
@@ -2738,6 +2738,7 @@ mod tests {
                content: vec![codex_protocol::models::ContentItem::InputText {
                    text: "plain text".into(),
                }],
+                metadata: None,
                end_turn: None,
                phase: None,
            }),