diff --git a/codex-rs/core/src/mcp_tool_call.rs b/codex-rs/core/src/mcp_tool_call.rs index e63a96e37e..414e8b2180 100644 --- a/codex-rs/core/src/mcp_tool_call.rs +++ b/codex-rs/core/src/mcp_tool_call.rs @@ -54,6 +54,7 @@ use codex_protocol::mcp_approval_meta::APPROVAL_KIND_MCP_TOOL_CALL as MCP_TOOL_A use codex_protocol::mcp_approval_meta::CONNECTOR_DESCRIPTION_KEY as MCP_TOOL_APPROVAL_CONNECTOR_DESCRIPTION_KEY; use codex_protocol::mcp_approval_meta::CONNECTOR_ID_KEY as MCP_TOOL_APPROVAL_CONNECTOR_ID_KEY; use codex_protocol::mcp_approval_meta::CONNECTOR_NAME_KEY as MCP_TOOL_APPROVAL_CONNECTOR_NAME_KEY; +use codex_protocol::mcp_approval_meta::LINK_ID_KEY as MCP_TOOL_APPROVAL_LINK_ID_KEY; use codex_protocol::mcp_approval_meta::PERSIST_ALWAYS as MCP_TOOL_APPROVAL_PERSIST_ALWAYS; use codex_protocol::mcp_approval_meta::PERSIST_KEY as MCP_TOOL_APPROVAL_PERSIST_KEY; use codex_protocol::mcp_approval_meta::PERSIST_SESSION as MCP_TOOL_APPROVAL_PERSIST_SESSION; @@ -972,6 +973,7 @@ pub(crate) struct McpToolApprovalMetadata { tool_title: Option, tool_description: Option, mcp_app_resource_uri: Option, + connector_link_id: Option, codex_apps_meta: Option>, openai_file_input_params: Option>, } @@ -1467,6 +1469,7 @@ pub(crate) async fn lookup_mcp_tool_metadata( tool_title: tool_info.tool.title, tool_description: tool_info.tool.description.map(std::borrow::Cow::into_owned), mcp_app_resource_uri: get_mcp_app_resource_uri(tool_info.tool.meta.as_deref()), + connector_link_id: connector_link_id_for_server(server, tool_info.tool.meta.as_deref()), codex_apps_meta: tool_info .tool .meta @@ -1491,6 +1494,19 @@ fn openai_file_input_params_for_server( .filter(|params| !params.is_empty()) } +fn connector_link_id_for_server( + server: &str, + meta: Option<&serde_json::Map>, +) -> Option { + if server != CODEX_APPS_MCP_SERVER_NAME { + return None; + } + + meta.and_then(|meta| meta.get(MCP_TOOL_APPROVAL_LINK_ID_KEY)) + .and_then(serde_json::Value::as_str) + .map(str::to_string) +} + fn get_mcp_app_resource_uri( meta: Option<&serde_json::Map>, ) -> Option { @@ -1713,6 +1729,14 @@ fn build_mcp_tool_approval_elicitation_meta( ); } } + if server == CODEX_APPS_MCP_SERVER_NAME + && let Some(connector_link_id) = metadata.connector_link_id.as_ref() + { + meta.insert( + MCP_TOOL_APPROVAL_LINK_ID_KEY.to_string(), + serde_json::Value::String(connector_link_id.clone()), + ); + } } if let Some(tool_params) = tool_params { meta.insert( diff --git a/codex-rs/core/src/mcp_tool_call_tests.rs b/codex-rs/core/src/mcp_tool_call_tests.rs index b413704cd5..a2dc53944e 100644 --- a/codex-rs/core/src/mcp_tool_call_tests.rs +++ b/codex-rs/core/src/mcp_tool_call_tests.rs @@ -82,6 +82,7 @@ fn approval_metadata( tool_title: tool_title.map(str::to_string), tool_description: tool_description.map(str::to_string), mcp_app_resource_uri: None, + connector_link_id: None, codex_apps_meta: None, openai_file_input_params: None, } @@ -356,6 +357,20 @@ fn openai_file_params_are_only_honored_for_codex_apps() { ); } +#[test] +fn connector_link_id_is_only_honored_for_codex_apps() { + let meta = serde_json::json!({ + MCP_TOOL_APPROVAL_LINK_ID_KEY: "link_123", + }); + let meta = meta.as_object(); + + assert_eq!( + connector_link_id_for_server(CODEX_APPS_MCP_SERVER_NAME, meta), + Some("link_123".to_string()) + ); + assert_eq!(connector_link_id_for_server("custom_server", meta), None); +} + #[test] fn approval_required_when_read_only_false_and_destructive() { let annotations = annotations(Some(false), Some(true), /*open_world*/ None); @@ -1164,6 +1179,7 @@ async fn codex_apps_tool_call_request_meta_includes_turn_metadata_and_codex_apps tool_title: Some("Create Event".to_string()), tool_description: Some("Create a calendar event.".to_string()), mcp_app_resource_uri: None, + connector_link_id: None, codex_apps_meta: Some( serde_json::json!({ "resource_uri": "connector://calendar/tools/calendar_create_event", @@ -1628,6 +1644,7 @@ fn guardian_mcp_review_request_includes_annotations_when_present() { tool_title: None, tool_description: None, mcp_app_resource_uri: None, + connector_link_id: None, codex_apps_meta: None, openai_file_input_params: None, }; @@ -1717,16 +1734,19 @@ async fn guardian_review_decision_maps_to_mcp_tool_decision() { #[test] fn approval_elicitation_meta_includes_connector_source_for_codex_apps() { + let mut metadata = approval_metadata( + Some("calendar"), + Some("Calendar"), + Some("Manage events and schedules."), + Some("Run Action"), + Some("Runs the selected action."), + ); + metadata.connector_link_id = Some("link_123".to_string()); + assert_eq!( build_mcp_tool_approval_elicitation_meta( CODEX_APPS_MCP_SERVER_NAME, - Some(&approval_metadata( - Some("calendar"), - Some("Calendar"), - Some("Manage events and schedules."), - Some("Run Action"), - Some("Runs the selected action."), - )), + Some(&metadata), Some(&serde_json::json!({ "calendar_id": "primary", })), @@ -1741,6 +1761,7 @@ fn approval_elicitation_meta_includes_connector_source_for_codex_apps() { MCP_TOOL_APPROVAL_CONNECTOR_ID_KEY: "calendar", MCP_TOOL_APPROVAL_CONNECTOR_NAME_KEY: "Calendar", MCP_TOOL_APPROVAL_CONNECTOR_DESCRIPTION_KEY: "Manage events and schedules.", + MCP_TOOL_APPROVAL_LINK_ID_KEY: "link_123", MCP_TOOL_APPROVAL_TOOL_TITLE_KEY: "Run Action", MCP_TOOL_APPROVAL_TOOL_DESCRIPTION_KEY: "Runs the selected action.", MCP_TOOL_APPROVAL_TOOL_PARAMS_KEY: { @@ -2293,6 +2314,7 @@ async fn approve_mode_skips_when_annotations_do_not_require_approval() { tool_title: Some("Read Only Tool".to_string()), tool_description: None, mcp_app_resource_uri: None, + connector_link_id: None, codex_apps_meta: None, openai_file_input_params: None, }; @@ -2367,6 +2389,7 @@ async fn guardian_mode_skips_auto_when_annotations_do_not_require_approval() { tool_title: Some("Read Only Tool".to_string()), tool_description: None, mcp_app_resource_uri: None, + connector_link_id: None, codex_apps_meta: None, openai_file_input_params: None, }; @@ -2424,6 +2447,7 @@ async fn permission_request_hook_allows_mcp_tool_call() { tool_title: Some("Create entities".to_string()), tool_description: None, mcp_app_resource_uri: None, + connector_link_id: None, codex_apps_meta: None, openai_file_input_params: None, }; @@ -2560,6 +2584,7 @@ async fn permission_request_hook_runs_after_remembered_mcp_approval() { tool_title: Some("Create entities".to_string()), tool_description: None, mcp_app_resource_uri: None, + connector_link_id: None, codex_apps_meta: None, openai_file_input_params: None, }; @@ -2647,6 +2672,7 @@ async fn guardian_mode_mcp_denial_returns_rationale_message() { tool_title: Some("Dangerous Tool".to_string()), tool_description: Some("Reads calendar data.".to_string()), mcp_app_resource_uri: None, + connector_link_id: None, codex_apps_meta: None, openai_file_input_params: None, }; @@ -2701,6 +2727,7 @@ async fn prompt_mode_waits_for_approval_when_annotations_do_not_require_approval tool_title: Some("Read Only Tool".to_string()), tool_description: None, mcp_app_resource_uri: None, + connector_link_id: None, codex_apps_meta: None, openai_file_input_params: None, }; @@ -2756,6 +2783,7 @@ async fn full_access_mode_skips_mcp_tool_approval_for_all_approval_modes() { tool_title: Some("Dangerous Tool".to_string()), tool_description: Some("Performs a risky action.".to_string()), mcp_app_resource_uri: None, + connector_link_id: None, codex_apps_meta: None, openai_file_input_params: None, }; @@ -2809,6 +2837,7 @@ async fn approve_mode_skips_guardian_in_every_permission_mode() { tool_title: Some("Dangerous Tool".to_string()), tool_description: Some("Performs a risky action.".to_string()), mcp_app_resource_uri: None, + connector_link_id: None, codex_apps_meta: None, openai_file_input_params: None, }; diff --git a/codex-rs/protocol/src/mcp_approval_meta.rs b/codex-rs/protocol/src/mcp_approval_meta.rs index 7a8695a9b6..7009d5bb41 100644 --- a/codex-rs/protocol/src/mcp_approval_meta.rs +++ b/codex-rs/protocol/src/mcp_approval_meta.rs @@ -12,6 +12,7 @@ pub const SOURCE_CONNECTOR: &str = "connector"; pub const CONNECTOR_ID_KEY: &str = "connector_id"; pub const CONNECTOR_NAME_KEY: &str = "connector_name"; pub const CONNECTOR_DESCRIPTION_KEY: &str = "connector_description"; +pub const LINK_ID_KEY: &str = "link_id"; pub const TOOL_NAME_KEY: &str = "tool_name"; pub const TOOL_TITLE_KEY: &str = "tool_title"; pub const TOOL_DESCRIPTION_KEY: &str = "tool_description";