From ad1db47cecff3bbdc465a65f0c324703ebd1c03c Mon Sep 17 00:00:00 2001
From: martinauyeung-oai <280153141+martinauyeung-oai@users.noreply.github.com>
Date: Tue, 7 Jul 2026 03:56:21 -0700
Subject: [PATCH] Annotate MCP UI capability arguments

---
 .../app-server/src/request_processors/turn_processor.rs  | 2 +-
 codex-rs/codex-mcp/src/client_capabilities.rs            | 9 ++++++---
 codex-rs/core/src/session/tests.rs                       | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/codex-rs/app-server/src/request_processors/turn_processor.rs b/codex-rs/app-server/src/request_processors/turn_processor.rs
index 6bc64f01e6..25e66a7f68 100644
--- a/codex-rs/app-server/src/request_processors/turn_processor.rs
+++ b/codex-rs/app-server/src/request_processors/turn_processor.rs
@@ -862,7 +862,7 @@ impl TurnRequestProcessor {
             .set_app_server_client_info(
                 app_server_client_name,
                 app_server_client_version,
-                None,
+                /*supports_mcp_app_ui_webview*/ None,
                 mcp_elicitations_auto_deny,
             )
             .await
diff --git a/codex-rs/codex-mcp/src/client_capabilities.rs b/codex-rs/codex-mcp/src/client_capabilities.rs
index c89f80ee69..7876b08c10 100644
--- a/codex-rs/codex-mcp/src/client_capabilities.rs
+++ b/codex-rs/codex-mcp/src/client_capabilities.rs
@@ -103,7 +103,7 @@ mod tests {
                 MCP_CLIENT_CAPABILITIES_META_KEY: {"spoofed": true},
                 "caller": "preserved",
             })),
-            true,
+            /*supports_mcp_app_ui_webview*/ true,
         );
 
         assert_eq!(
@@ -131,7 +131,7 @@ mod tests {
                     MCP_CLIENT_CAPABILITIES_META_KEY: {"spoofed": true},
                     "caller": "preserved",
                 })),
-                false,
+                /*supports_mcp_app_ui_webview*/ false,
             ),
             Some(json!({"caller": "preserved"}))
         );
@@ -140,7 +140,10 @@ mod tests {
     #[test]
     fn invalid_caller_metadata_does_not_suppress_trusted_capabilities() {
         assert_eq!(
-            with_client_capabilities_meta(Some(json!("invalid")), true),
+            with_client_capabilities_meta(
+                Some(json!("invalid")),
+                /*supports_mcp_app_ui_webview*/ true,
+            ),
             Some(json!({
                 MCP_CLIENT_CAPABILITIES_META_KEY: {
                     "extensions": {
diff --git a/codex-rs/core/src/session/tests.rs b/codex-rs/core/src/session/tests.rs
index 643ac760b4..b1d152476e 100644
--- a/codex-rs/core/src/session/tests.rs
+++ b/codex-rs/core/src/session/tests.rs
@@ -7854,7 +7854,7 @@ async fn request_scoped_host_mcp_app_ui_capability_survives_later_session_update
     let (session, _) = make_session_and_context().await;
     let session = Arc::new(session);
     let widget_turn_context = session
-        .new_default_turn_with_mcp_app_ui_webview_support(true)
+        .new_default_turn_with_mcp_app_ui_webview_support(/*supports_mcp_app_ui_webview*/ true)
         .await
         .expect("capture widget client turn context");