diff --git a/codex-rs/app-server/src/message_processor.rs b/codex-rs/app-server/src/message_processor.rs index 1f67b03fd6..862722fbc7 100644 --- a/codex-rs/app-server/src/message_processor.rs +++ b/codex-rs/app-server/src/message_processor.rs @@ -195,15 +195,12 @@ fn client_compatibility_flags_for_app_server_client( client_name: &str, client_version: &str, ) -> ClientCompatibilityFlags { - // Xcode 26.4 shipped against CLI behavior from before PR #17043, when - // Codex only advertised MCP elicitation support to the built-in - // `codex_apps` server. If Codex advertises custom-server elicitation - // support to that client family, those requests become new app-server - // events/messages that the client cannot handle. Preserve the old - // capability surface for that client only. - // - // TODO: Remove this Xcode 26.4 compatibility path once that client version - // has aged out of support. + // Compatibility hack for Xcode 26.4: that client shipped against the + // pre-PR #17043 MCP surface, where only `codex_apps` advertised elicitation + // support. Advertising custom-server elicitations creates app-server + // events/messages that Xcode 26.4 cannot handle, so keep that client on the + // old capability surface. + // TODO: Remove once Xcode 26.4 ages out of support. let mcp_elicitation = if client_name.eq_ignore_ascii_case("xcode") && client_version.starts_with("26.4") { McpElicitationCompatibility::CodexAppsOnly @@ -1141,6 +1138,7 @@ impl MessageProcessor { params, app_server_client_name.clone(), client_version.clone(), + client_compatibility_flags, ) .await } @@ -1307,24 +1305,22 @@ mod client_compatibility_tests { #[test] fn xcode_26_4_uses_legacy_mcp_elicitation_compatibility() { - fn mcp_elicitation(name: &str, version: &str) -> McpElicitationCompatibility { - client_compatibility_flags_for_app_server_client(name, version).mcp_elicitation + use McpElicitationCompatibility::CodexAppsOnly; + use McpElicitationCompatibility::Default as DefaultCompatibility; + + let cases = [ + ("Xcode", "26.4", CodexAppsOnly), + ("xcode", "26.4.1", CodexAppsOnly), + ("Xcode", "26.4-beta", CodexAppsOnly), + ("Xcode", "26.3", DefaultCompatibility), + ("Xcode", "26.5", DefaultCompatibility), + ("codex-vscode", "26.4", DefaultCompatibility), + ]; + for (name, version, expected) in cases { + assert_eq!( + client_compatibility_flags_for_app_server_client(name, version).mcp_elicitation, + expected + ); } - assert_eq!( - mcp_elicitation("xcode", "26.4.1"), - McpElicitationCompatibility::CodexAppsOnly - ); - assert_eq!( - mcp_elicitation("Xcode", "26.4-beta"), - McpElicitationCompatibility::CodexAppsOnly - ); - assert_eq!( - mcp_elicitation("Xcode", "26.5"), - McpElicitationCompatibility::Default - ); - assert_eq!( - mcp_elicitation("codex-vscode", "26.4"), - McpElicitationCompatibility::Default - ); } } diff --git a/codex-rs/app-server/src/request_processors/thread_processor.rs b/codex-rs/app-server/src/request_processors/thread_processor.rs index 857074530a..fb7263976f 100644 --- a/codex-rs/app-server/src/request_processors/thread_processor.rs +++ b/codex-rs/app-server/src/request_processors/thread_processor.rs @@ -597,21 +597,6 @@ impl ThreadRequestProcessor { }) } - async fn set_app_server_client_info( - thread: &CodexThread, - app_server_client_name: Option, - app_server_client_version: Option, - ) -> Result<(), JSONRPCErrorError> { - thread - .set_app_server_client_info(app_server_client_name, app_server_client_version) - .await - .map_err(|err| JSONRPCErrorError { - code: INTERNAL_ERROR_CODE, - message: format!("failed to set app server client info: {err}"), - data: None, - }) - } - async fn finalize_thread_teardown(&self, thread_id: ThreadId) { self.pending_thread_unloads.lock().await.remove(&thread_id); self.outgoing @@ -1003,12 +988,13 @@ impl ThreadRequestProcessor { err => internal_error(format!("error creating thread: {err}")), })?; - Self::set_app_server_client_info( - thread.as_ref(), - app_server_client_name, - app_server_client_version, - ) - .await?; + thread + .set_app_server_client_info( + app_server_client_name, + app_server_client_version, + client_compatibility_flags, + ) + .await; let config_snapshot = thread .config_snapshot() 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 613e53523c..96353e2e6b 100644 --- a/codex-rs/app-server/src/request_processors/turn_processor.rs +++ b/codex-rs/app-server/src/request_processors/turn_processor.rs @@ -51,12 +51,14 @@ impl TurnRequestProcessor { params: TurnStartParams, app_server_client_name: Option, app_server_client_version: Option, + client_compatibility_flags: ClientCompatibilityFlags, ) -> Result, JSONRPCErrorError> { self.turn_start_inner( request_id, params, app_server_client_name, app_server_client_version, + client_compatibility_flags, ) .await .map(|response| Some(response.into())) @@ -332,6 +334,7 @@ impl TurnRequestProcessor { params: TurnStartParams, app_server_client_name: Option, app_server_client_version: Option, + client_compatibility_flags: ClientCompatibilityFlags, ) -> Result { if let Err(error) = Self::validate_v2_input_limit(¶ms.input) { self.track_error_response( @@ -347,15 +350,13 @@ impl TurnRequestProcessor { .inspect_err(|error| { self.track_error_response(&request_id, error, /*error_type*/ None); })?; - Self::set_app_server_client_info( - thread.as_ref(), - app_server_client_name, - app_server_client_version, - ) - .await - .inspect_err(|error| { - self.track_error_response(&request_id, error, /*error_type*/ None); - })?; + thread + .set_app_server_client_info( + app_server_client_name, + app_server_client_version, + client_compatibility_flags, + ) + .await; let collaboration_mode = params .collaboration_mode @@ -556,21 +557,6 @@ impl TurnRequestProcessor { Ok(ThreadInjectItemsResponse {}) } - async fn set_app_server_client_info( - thread: &CodexThread, - app_server_client_name: Option, - app_server_client_version: Option, - ) -> Result<(), JSONRPCErrorError> { - thread - .set_app_server_client_info(app_server_client_name, app_server_client_version) - .await - .map_err(|err| JSONRPCErrorError { - code: INTERNAL_ERROR_CODE, - message: format!("failed to set app server client info: {err}"), - data: None, - }) - } - async fn turn_steer_inner( &self, request_id: &ConnectionRequestId, @@ -904,7 +890,7 @@ impl TurnRequestProcessor { }; let mut config = self.config.as_ref().clone(); - config.client_compatibility_flags = parent_thread.client_compatibility_flags().await; + config.client_compatibility_flags = parent_thread.config().await.client_compatibility_flags; if let Some(review_model) = &config.review_model { config.model = Some(review_model.clone()); } diff --git a/codex-rs/codex-mcp/src/connection_manager_tests.rs b/codex-rs/codex-mcp/src/connection_manager_tests.rs index 4c606f2672..97c18964b2 100644 --- a/codex-rs/codex-mcp/src/connection_manager_tests.rs +++ b/codex-rs/codex-mcp/src/connection_manager_tests.rs @@ -26,7 +26,6 @@ use futures::FutureExt; use pretty_assertions::assert_eq; use rmcp::model::CreateElicitationRequestParams; use rmcp::model::ElicitationAction; -use rmcp::model::ElicitationCapability; use rmcp::model::JsonObject; use rmcp::model::Meta; use rmcp::model::NumberOrString; @@ -292,10 +291,7 @@ async fn codex_apps_only_custom_server_elicitation_is_declined_without_event() { assert_eq!(response.action, ElicitationAction::Decline); assert_eq!(response.content, None); - assert!(matches!( - rx_event.try_recv(), - Err(async_channel::TryRecvError::Empty) - )); + assert!(rx_event.try_recv().is_err()); } #[test] @@ -847,12 +843,11 @@ fn elicitation_capability_uses_2025_06_18_shape_for_all_servers() { fn codex_apps_only_elicitation_capability_suppresses_custom_servers() { let compatibility = McpElicitationCompatibility::CodexAppsOnly; assert_eq!( - elicitation_capability_for_server(CODEX_APPS_MCP_SERVER_NAME, compatibility), - Some(ElicitationCapability::default()) - ); - assert_eq!( - elicitation_capability_for_server("custom_mcp", compatibility), - None + ( + elicitation_capability_for_server(CODEX_APPS_MCP_SERVER_NAME, compatibility).is_some(), + elicitation_capability_for_server("custom_mcp", compatibility).is_some(), + ), + (true, false) ); } diff --git a/codex-rs/codex-mcp/src/elicitation.rs b/codex-rs/codex-mcp/src/elicitation.rs index c724ed29d2..b038fac95b 100644 --- a/codex-rs/codex-mcp/src/elicitation.rs +++ b/codex-rs/codex-mcp/src/elicitation.rs @@ -37,7 +37,7 @@ pub(crate) struct ElicitationRequestManager { requests: Arc>, pub(crate) approval_policy: Arc>, pub(crate) permission_profile: Arc>, - compatibility: McpElicitationCompatibility, + pub(crate) compatibility: McpElicitationCompatibility, } impl ElicitationRequestManager { @@ -191,10 +191,6 @@ impl ElicitationRequestManager { .boxed() }) } - - pub(crate) fn compatibility(&self) -> McpElicitationCompatibility { - self.compatibility - } } /// Compatibility policy for the MCP elicitation capability surface. @@ -209,10 +205,7 @@ pub enum McpElicitationCompatibility { impl McpElicitationCompatibility { pub fn allows_server_elicitation(self, server_name: &str) -> bool { - match self { - Self::Default => true, - Self::CodexAppsOnly => server_name == CODEX_APPS_MCP_SERVER_NAME, - } + self == Self::Default || server_name == CODEX_APPS_MCP_SERVER_NAME } } diff --git a/codex-rs/codex-mcp/src/rmcp_client.rs b/codex-rs/codex-mcp/src/rmcp_client.rs index 4fde4ded92..d43105bd8f 100644 --- a/codex-rs/codex-mcp/src/rmcp_client.rs +++ b/codex-rs/codex-mcp/src/rmcp_client.rs @@ -467,7 +467,7 @@ async fn start_server_task( codex_apps_tools_cache_context, } = params; let elicitation = - elicitation_capability_for_server(&server_name, elicitation_requests.compatibility()); + elicitation_capability_for_server(&server_name, elicitation_requests.compatibility); let params = InitializeRequestParams { meta: None, capabilities: ClientCapabilities { diff --git a/codex-rs/core/src/codex_delegate.rs b/codex-rs/core/src/codex_delegate.rs index 1c46f4c93a..1aeb125091 100644 --- a/codex-rs/core/src/codex_delegate.rs +++ b/codex-rs/core/src/codex_delegate.rs @@ -62,7 +62,7 @@ use crate::session::completed_session_loop_termination; /// The returned `ops_tx` allows the caller to submit additional `Op`s to the sub-agent. #[allow(clippy::too_many_arguments)] pub(crate) async fn run_codex_thread_interactive( - mut config: Config, + config: Config, auth_manager: Arc, models_manager: SharedModelsManager, parent_session: Arc, @@ -73,7 +73,6 @@ pub(crate) async fn run_codex_thread_interactive( ) -> Result { let (tx_sub, rx_sub) = async_channel::bounded(SUBMISSION_CHANNEL_CAPACITY); let (tx_ops, rx_ops) = async_channel::bounded(SUBMISSION_CHANNEL_CAPACITY); - config.client_compatibility_flags = parent_session.client_compatibility_flags().await; let CodexSpawnOk { codex, .. } = Box::pin(Codex::spawn(CodexSpawnArgs { config, auth_manager, @@ -101,10 +100,10 @@ pub(crate) async fn run_codex_thread_interactive( .or_cancel(&cancel_token) .await??; let thread_config = codex.thread_config_snapshot().await; - let app_server_client_metadata = parent_session.app_server_client_metadata().await; + let client_metadata = parent_session.app_server_client_metadata().await; emit_subagent_session_started( &parent_session.services.analytics_events_client, - app_server_client_metadata, + client_metadata, codex.session.conversation_id, Some(parent_session.conversation_id), thread_config, diff --git a/codex-rs/core/src/codex_thread.rs b/codex-rs/core/src/codex_thread.rs index 6291e3da88..423153074d 100644 --- a/codex-rs/core/src/codex_thread.rs +++ b/codex-rs/core/src/codex_thread.rs @@ -219,16 +219,17 @@ impl CodexThread { &self, app_server_client_name: Option, app_server_client_version: Option, - ) -> ConstraintResult<()> { + client_compatibility_flags: ClientCompatibilityFlags, + ) { self.codex - .set_app_server_client_info(app_server_client_name, app_server_client_version) + .set_app_server_client_info( + app_server_client_name, + app_server_client_version, + client_compatibility_flags, + ) .await } - pub async fn client_compatibility_flags(&self) -> ClientCompatibilityFlags { - self.codex.session.client_compatibility_flags().await - } - /// Validate persistent turn context overrides without committing them. pub async fn validate_turn_context_overrides( &self, diff --git a/codex-rs/core/src/mcp_tool_call.rs b/codex-rs/core/src/mcp_tool_call.rs index 69b738534e..b0ef819600 100644 --- a/codex-rs/core/src/mcp_tool_call.rs +++ b/codex-rs/core/src/mcp_tool_call.rs @@ -1101,6 +1101,7 @@ async fn maybe_request_mcp_tool_approval( .features .enabled(Feature::ToolCallMcpElicitation) && turn_context + .config .client_compatibility_flags .mcp_elicitation .allows_server_elicitation(&invocation.server); diff --git a/codex-rs/core/src/mcp_tool_call_tests.rs b/codex-rs/core/src/mcp_tool_call_tests.rs index d4dd0a89bf..f6d5c8e1c5 100644 --- a/codex-rs/core/src/mcp_tool_call_tests.rs +++ b/codex-rs/core/src/mcp_tool_call_tests.rs @@ -1,5 +1,4 @@ use super::*; -use crate::ClientCompatibilityFlags; use crate::McpElicitationCompatibility; use crate::config::ConfigBuilder; use crate::session::tests::make_session_and_context; @@ -2287,10 +2286,9 @@ async fn prompt_mode_waits_for_approval_when_annotations_do_not_require_approval .features .enable(Feature::ToolCallMcpElicitation) .expect("test setup should allow enabling tool call MCP elicitation"); + config.client_compatibility_flags.mcp_elicitation = + McpElicitationCompatibility::CodexAppsOnly; turn_context.config = Arc::new(config); - turn_context.client_compatibility_flags = ClientCompatibilityFlags { - mcp_elicitation: McpElicitationCompatibility::CodexAppsOnly, - }; } { let mut active_turn = session.active_turn.lock().await; diff --git a/codex-rs/core/src/session/mcp.rs b/codex-rs/core/src/session/mcp.rs index 1e9739cf64..fa9b74726b 100644 --- a/codex-rs/core/src/session/mcp.rs +++ b/codex-rs/core/src/session/mcp.rs @@ -252,7 +252,10 @@ impl Session { codex_apps_tools_cache_key(auth.as_ref()), tool_plugin_provenance, auth.as_ref(), - turn_context.client_compatibility_flags.mcp_elicitation, + turn_context + .config + .client_compatibility_flags + .mcp_elicitation, ) .await; { diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs index d3a5e59b1a..950df9c8a3 100644 --- a/codex-rs/core/src/session/mod.rs +++ b/codex-rs/core/src/session/mod.rs @@ -750,14 +750,14 @@ impl Codex { &self, app_server_client_name: Option, app_server_client_version: Option, - ) -> ConstraintResult<()> { - self.session - .update_settings(SessionSettingsUpdate { - app_server_client_name, - app_server_client_version, - ..Default::default() - }) - .await + client_compatibility_flags: ClientCompatibilityFlags, + ) { + let mut state = self.session.state.lock().await; + state.session_configuration.app_server_client_name = app_server_client_name; + state.session_configuration.app_server_client_version = app_server_client_version; + let mut config = (*state.session_configuration.original_config_do_not_use).clone(); + config.client_compatibility_flags = client_compatibility_flags; + state.session_configuration.original_config_do_not_use = Arc::new(config); } pub(crate) async fn agent_status(&self) -> AgentStatus { @@ -835,15 +835,6 @@ async fn thread_title_from_state_db( } impl Session { - pub(crate) async fn client_compatibility_flags(&self) -> ClientCompatibilityFlags { - self.state - .lock() - .await - .session_configuration - .original_config_do_not_use - .client_compatibility_flags - } - pub(crate) async fn app_server_client_metadata(&self) -> AppServerClientMetadata { let state = self.state.lock().await; AppServerClientMetadata { diff --git a/codex-rs/core/src/session/review.rs b/codex-rs/core/src/session/review.rs index 0d2e17981a..67c1e33310 100644 --- a/codex-rs/core/src/session/review.rs +++ b/codex-rs/core/src/session/review.rs @@ -130,7 +130,6 @@ pub(super) async fn spawn_review_thread( current_date: parent_turn_context.current_date.clone(), timezone: parent_turn_context.timezone.clone(), app_server_client_name: parent_turn_context.app_server_client_name.clone(), - client_compatibility_flags: parent_turn_context.client_compatibility_flags, developer_instructions: None, user_instructions: None, compact_prompt: parent_turn_context.compact_prompt.clone(), diff --git a/codex-rs/core/src/session/session.rs b/codex-rs/core/src/session/session.rs index 785e3da90f..83fad7959f 100644 --- a/codex-rs/core/src/session/session.rs +++ b/codex-rs/core/src/session/session.rs @@ -315,7 +315,6 @@ pub(crate) struct SessionSettingsUpdate { pub(crate) app_server_client_version: Option, } -#[derive(Default)] pub(crate) struct AppServerClientMetadata { pub(crate) client_name: Option, pub(crate) client_version: Option, diff --git a/codex-rs/core/src/session/turn_context.rs b/codex-rs/core/src/session/turn_context.rs index d502227b74..a68b5396a0 100644 --- a/codex-rs/core/src/session/turn_context.rs +++ b/codex-rs/core/src/session/turn_context.rs @@ -69,7 +69,6 @@ pub(crate) struct TurnContext { pub(crate) current_date: Option, pub(crate) timezone: Option, pub(crate) app_server_client_name: Option, - pub(crate) client_compatibility_flags: ClientCompatibilityFlags, pub(crate) developer_instructions: Option, pub(crate) compact_prompt: Option, pub(crate) user_instructions: Option, @@ -237,7 +236,6 @@ impl TurnContext { current_date: self.current_date.clone(), timezone: self.timezone.clone(), app_server_client_name: self.app_server_client_name.clone(), - client_compatibility_flags: self.client_compatibility_flags, developer_instructions: self.developer_instructions.clone(), compact_prompt: self.compact_prompt.clone(), user_instructions: self.user_instructions.clone(), @@ -530,9 +528,6 @@ impl Session { current_date: Some(current_date), timezone: Some(timezone), app_server_client_name: session_configuration.app_server_client_name.clone(), - client_compatibility_flags: session_configuration - .original_config_do_not_use - .client_compatibility_flags, developer_instructions: session_configuration.developer_instructions.clone(), compact_prompt: session_configuration.compact_prompt.clone(), user_instructions: session_configuration.user_instructions.clone(),