diff --git a/codex-rs/core/src/mcp_tool_call.rs b/codex-rs/core/src/mcp_tool_call.rs index d1afef307f..fd9ad4f7dd 100644 --- a/codex-rs/core/src/mcp_tool_call.rs +++ b/codex-rs/core/src/mcp_tool_call.rs @@ -1567,7 +1567,7 @@ fn build_mcp_tool_approval_elicitation_request( turn_id: Some(turn_context.sub_id.clone()), server_name: request.server.to_string(), request: McpServerElicitationRequest::Form { - meta: mcp_tool_approval_elicitation_meta( + meta: build_mcp_tool_approval_elicitation_meta( request.approval_request, request.tool_params, request.tool_params_display, @@ -1584,7 +1584,7 @@ fn build_mcp_tool_approval_elicitation_request( } } -fn mcp_tool_approval_elicitation_meta( +fn build_mcp_tool_approval_elicitation_meta( approval_request: &GuardianApprovalRequest, tool_params: Option<&JsonValue>, tool_params_display: Option<&[RenderedMcpToolApprovalParam]>, diff --git a/codex-rs/core/src/mcp_tool_call_tests.rs b/codex-rs/core/src/mcp_tool_call_tests.rs index 446edb4a5a..f45ea6c38c 100644 --- a/codex-rs/core/src/mcp_tool_call_tests.rs +++ b/codex-rs/core/src/mcp_tool_call_tests.rs @@ -1236,7 +1236,7 @@ fn approval_elicitation_meta_marks_tool_approvals() { /*metadata*/ None, ); assert_eq!( - mcp_tool_approval_elicitation_meta( + build_mcp_tool_approval_elicitation_meta( &request, /*tool_params*/ None, /*tool_params_display*/ None, @@ -1266,7 +1266,7 @@ fn approval_elicitation_meta_merges_session_and_always_persist_for_custom_server Some(&metadata), ); assert_eq!( - mcp_tool_approval_elicitation_meta( + build_mcp_tool_approval_elicitation_meta( &request, Some(&serde_json::json!({"id": 1})), /*tool_params_display*/ None, @@ -1490,7 +1490,7 @@ fn approval_elicitation_meta_includes_connector_source_for_codex_apps() { Some(&metadata), ); assert_eq!( - mcp_tool_approval_elicitation_meta( + build_mcp_tool_approval_elicitation_meta( &request, Some(&serde_json::json!({ "calendar_id": "primary", @@ -1533,7 +1533,7 @@ fn approval_elicitation_meta_merges_session_and_always_persist_with_connector_so Some(&metadata), ); assert_eq!( - mcp_tool_approval_elicitation_meta( + build_mcp_tool_approval_elicitation_meta( &request, Some(&serde_json::json!({ "calendar_id": "primary",