diff --git a/codex-rs/core/src/codex_apps_file_download.rs b/codex-rs/core/src/codex_apps_file_download.rs index 7d89c1a5a7..04b5a43776 100644 --- a/codex-rs/core/src/codex_apps_file_download.rs +++ b/codex-rs/core/src/codex_apps_file_download.rs @@ -1,4 +1,3 @@ -use crate::session::session::Session; use crate::session::turn_context::TurnContext; use codex_api::download_openai_file; use codex_login::CodexAuth; @@ -51,25 +50,6 @@ fn should_materialize_codex_apps_file_download( } pub(crate) async fn maybe_materialize_codex_apps_file_download_result( - sess: &Session, - turn_context: &TurnContext, - server: &str, - codex_apps_meta: Option<&JsonMap>, - result: CallToolResult, -) -> CallToolResult { - let auth = sess.services.auth_manager.auth().await; - maybe_materialize_codex_apps_file_download_result_with_auth( - turn_context, - &sess.conversation_id.to_string(), - auth.as_ref(), - server, - codex_apps_meta, - result, - ) - .await -} - -async fn maybe_materialize_codex_apps_file_download_result_with_auth( turn_context: &TurnContext, session_id: &str, auth: Option<&CodexAuth>, @@ -302,7 +282,7 @@ mod tests { meta: None, }; - let result = maybe_materialize_codex_apps_file_download_result_with_auth( + let result = maybe_materialize_codex_apps_file_download_result( &turn_context, "session-1", Some(&CodexAuth::create_dummy_chatgpt_auth_for_testing()), diff --git a/codex-rs/core/src/mcp_tool_call.rs b/codex-rs/core/src/mcp_tool_call.rs index 96bd98fd84..5b575071f6 100644 --- a/codex-rs/core/src/mcp_tool_call.rs +++ b/codex-rs/core/src/mcp_tool_call.rs @@ -549,9 +549,11 @@ async fn execute_mcp_tool_call( .call_tool(server, tool_name, rewritten_arguments, request_meta) .await .map_err(|e| format!("tool call error: {e:?}"))?; + let auth = sess.services.auth_manager.auth().await; let result = maybe_materialize_codex_apps_file_download_result( - sess, turn_context, + &sess.conversation_id.to_string(), + auth.as_ref(), server, metadata.and_then(|metadata| metadata.codex_apps_meta.as_ref()), result,