From f354fa71242fa0be6bdf37e2fa8e783ef7375550 Mon Sep 17 00:00:00 2001
From: Roy Han <rhan@openai.com>
Date: Mon, 23 Mar 2026 13:01:03 -0700
Subject: [PATCH] merge cleanup

---
 codex-rs/core/src/agent/inter_agent_instruction.rs | 1 +
 codex-rs/core/src/codex_thread.rs                  | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/codex-rs/core/src/agent/inter_agent_instruction.rs b/codex-rs/core/src/agent/inter_agent_instruction.rs
index 0eff40beb4..4c1aeddc5b 100644
--- a/codex-rs/core/src/agent/inter_agent_instruction.rs
+++ b/codex-rs/core/src/agent/inter_agent_instruction.rs
@@ -38,6 +38,7 @@ impl InterAgentInstruction {
             content: vec![ContentItem::OutputText {
                 text: self.as_text(),
             }],
+            metadata: None,
             end_turn: None,
             phase: None,
         }
diff --git a/codex-rs/core/src/codex_thread.rs b/codex-rs/core/src/codex_thread.rs
index 04a4361ac1..a0a816f910 100644
--- a/codex-rs/core/src/codex_thread.rs
+++ b/codex-rs/core/src/codex_thread.rs
@@ -265,9 +265,15 @@ impl CodexThread {
 
 fn pending_message_input_item(message: &ResponseItem) -> CodexResult<ResponseInputItem> {
     match message {
-        ResponseItem::Message { role, content, .. } => Ok(ResponseInputItem::Message {
+        ResponseItem::Message {
+            role,
+            content,
+            metadata,
+            ..
+        } => Ok(ResponseInputItem::Message {
             role: role.clone(),
             content: content.clone(),
+            metadata: metadata.clone(),
         }),
         _ => Err(CodexErr::InvalidRequest(
             "append_message only supports ResponseItem::Message".to_string(),