From 0307d8f791e1d9f019d5e937754fdf015c0a9c3d Mon Sep 17 00:00:00 2001
From: Liang-Ting Jiang <lt@openai.com>
Date: Fri, 24 Apr 2026 16:41:44 -0700
Subject: [PATCH] Avoid panic in uploaded file payload cleanup

---
 codex-rs/core/src/mcp_openai_file.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/codex-rs/core/src/mcp_openai_file.rs b/codex-rs/core/src/mcp_openai_file.rs
index 32480e0875..891d5493b4 100644
--- a/codex-rs/core/src/mcp_openai_file.rs
+++ b/codex-rs/core/src/mcp_openai_file.rs
@@ -149,10 +149,9 @@ async fn build_uploaded_local_argument_value(
         "file_size_bytes": uploaded.file_size_bytes,
     });
     if uploaded.library_file_id.is_none() {
-        uploaded_value
-            .as_object_mut()
-            .expect("uploaded value should be an object")
-            .remove("library_file_id");
+        if let Some(uploaded_object) = uploaded_value.as_object_mut() {
+            uploaded_object.remove("library_file_id");
+        }
     }
     Ok(uploaded_value)
 }