codex: remove client-name checks from core (#15181)

codex-rs/core/src/codex.rs

@@ -6370,12 +6370,7 @@ pub(crate) async fn built_tools(
                 accessible_connectors.as_slice(),
             )
             .await
-            .map(|discoverable_tools| {
-                crate::tools::discoverable::filter_tool_suggest_discoverable_tools_for_client(
-                    discoverable_tools,
-                    turn_context.app_server_client_name.as_deref(),
-                )
-            }) {
+            {
                 Ok(discoverable_tools) if discoverable_tools.is_empty() => None,
                 Ok(discoverable_tools) => Some(discoverable_tools),
                 Err(err) => {

codex-rs/core/src/tools/discoverable.rs

@@ -3,8 +3,6 @@ use codex_app_server_protocol::AppInfo;
 use serde::Deserialize;
 use serde::Serialize;
 
-const TUI_APP_SERVER_CLIENT_NAME: &str = "codex-tui";
-
 #[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub(crate) enum DiscoverableToolType {
@@ -92,20 +90,6 @@ impl From<DiscoverablePluginInfo> for DiscoverableTool {
     }
 }
 
-pub(crate) fn filter_tool_suggest_discoverable_tools_for_client(
-    discoverable_tools: Vec<DiscoverableTool>,
-    app_server_client_name: Option<&str>,
-) -> Vec<DiscoverableTool> {
-    if app_server_client_name != Some(TUI_APP_SERVER_CLIENT_NAME) {
-        return discoverable_tools;
-    }
-
-    discoverable_tools
-        .into_iter()
-        .filter(|tool| !matches!(tool, DiscoverableTool::Plugin(_)))
-        .collect()
-}
-
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub(crate) struct DiscoverablePluginInfo {
     pub(crate) id: String,

codex-rs/core/src/tools/handlers/tool_suggest.rs

@@ -23,7 +23,6 @@ use crate::tools::context::ToolPayload;
 use crate::tools::discoverable::DiscoverableTool;
 use crate::tools::discoverable::DiscoverableToolAction;
 use crate::tools::discoverable::DiscoverableToolType;
-use crate::tools::discoverable::filter_tool_suggest_discoverable_tools_for_client;
 use crate::tools::handlers::parse_arguments;
 use crate::tools::registry::ToolHandler;
 use crate::tools::registry::ToolKind;
@@ -102,14 +101,6 @@ impl ToolHandler for ToolSuggestHandler {
                 "tool suggestions currently support only action_type=\"install\"".to_string(),
             ));
         }
-        if args.tool_type == DiscoverableToolType::Plugin
-            && turn.app_server_client_name.as_deref() == Some("codex-tui")
-        {
-            return Err(FunctionCallError::RespondToModel(
-                "plugin tool suggestions are not available in codex-tui yet".to_string(),
-            ));
-        }
-
         let auth = session.services.auth_manager.auth().await;
         let manager = session.services.mcp_connection_manager.read().await;
         let mcp_tools = manager.list_all_tools().await;
@@ -124,12 +115,6 @@ impl ToolHandler for ToolSuggestHandler {
             &accessible_connectors,
         )
         .await
-        .map(|discoverable_tools| {
-            filter_tool_suggest_discoverable_tools_for_client(
-                discoverable_tools,
-                turn.app_server_client_name.as_deref(),
-            )
-        })
         .map_err(|err| {
             FunctionCallError::RespondToModel(format!(
                 "tool suggestions are unavailable right now: {err}"

codex-rs/core/src/tools/handlers/tool_suggest_tests.rs

@@ -6,7 +6,6 @@ use crate::plugins::test_support::write_curated_plugin_sha;
 use crate::plugins::test_support::write_openai_curated_marketplace;
 use crate::plugins::test_support::write_plugins_feature_config;
 use crate::tools::discoverable::DiscoverablePluginInfo;
-use crate::tools::discoverable::filter_tool_suggest_discoverable_tools_for_client;
 use codex_app_server_protocol::AppInfo;
 use codex_utils_absolute_path::AbsolutePathBuf;
 use pretty_assertions::assert_eq;
@@ -159,54 +158,6 @@ fn build_tool_suggestion_meta_uses_expected_shape() {
     );
 }
 
-#[test]
-fn filter_tool_suggest_discoverable_tools_for_codex_tui_omits_plugins() {
-    let discoverable_tools = vec![
-        DiscoverableTool::Connector(Box::new(AppInfo {
-            id: "connector_google_calendar".to_string(),
-            name: "Google Calendar".to_string(),
-            description: Some("Plan events and schedules.".to_string()),
-            logo_url: None,
-            logo_url_dark: None,
-            distribution_channel: None,
-            branding: None,
-            app_metadata: None,
-            labels: None,
-            install_url: Some("https://example.test/google-calendar".to_string()),
-            is_accessible: false,
-            is_enabled: true,
-            plugin_display_names: Vec::new(),
-        })),
-        DiscoverableTool::Plugin(Box::new(DiscoverablePluginInfo {
-            id: "slack@openai-curated".to_string(),
-            name: "Slack".to_string(),
-            description: Some("Search Slack messages".to_string()),
-            has_skills: true,
-            mcp_server_names: vec!["slack".to_string()],
-            app_connector_ids: vec!["connector_slack".to_string()],
-        })),
-    ];
-
-    assert_eq!(
-        filter_tool_suggest_discoverable_tools_for_client(discoverable_tools, Some("codex-tui"),),
-        vec![DiscoverableTool::Connector(Box::new(AppInfo {
-            id: "connector_google_calendar".to_string(),
-            name: "Google Calendar".to_string(),
-            description: Some("Plan events and schedules.".to_string()),
-            logo_url: None,
-            logo_url_dark: None,
-            distribution_channel: None,
-            branding: None,
-            app_metadata: None,
-            labels: None,
-            install_url: Some("https://example.test/google-calendar".to_string()),
-            is_accessible: false,
-            is_enabled: true,
-            plugin_display_names: Vec::new(),
-        }))]
-    );
-}
-
 #[test]
 fn verified_connector_suggestion_completed_requires_accessible_connector() {
     let accessible_connectors = vec![AppInfo {

codex-rs/tui_app_server/src/lib.rs

@@ -33,6 +33,7 @@ use codex_core::config_loader::CloudRequirementsLoader;
 use codex_core::config_loader::ConfigLoadError;
 use codex_core::config_loader::LoaderOverrides;
 use codex_core::config_loader::format_config_error_with_source;
+use codex_core::default_client::DEFAULT_ORIGINATOR;
 use codex_core::default_client::set_default_client_residency_requirement;
 use codex_core::format_exec_policy_error_with_source;
 use codex_core::path_utils;
@@ -339,7 +340,7 @@ pub fn normalize_remote_addr(addr: &str) -> color_eyre::Result<String> {
 async fn connect_remote_app_server(websocket_url: String) -> color_eyre::Result<AppServerClient> {
     let app_server = RemoteAppServerClient::connect(RemoteAppServerConnectArgs {
         websocket_url,
-        client_name: "codex-tui".to_string(),
+        client_name: DEFAULT_ORIGINATOR.to_string(),
         client_version: env!("CARGO_PKG_VERSION").to_string(),
         experimental_api: true,
         opt_out_notification_methods: Vec::new(),
@@ -433,7 +434,7 @@ where
         config_warnings,
         session_source: codex_protocol::protocol::SessionSource::Cli,
         enable_codex_api_key_env: false,
-        client_name: "codex-tui".to_string(),
+        client_name: DEFAULT_ORIGINATOR.to_string(),
         client_version: env!("CARGO_PKG_VERSION").to_string(),
         experimental_api: true,
         opt_out_notification_methods: Vec::new(),
@@ -1784,6 +1785,7 @@ mod tests {
         );
         Ok(())
     }
+
     #[tokio::test]
     #[serial]
     async fn windows_shows_trust_prompt_with_sandbox() -> std::io::Result<()> {