Restore CLI originator for tui app server

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 {
@@ -94,16 +92,9 @@ 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>,
+    _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)]

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

@@ -102,14 +102,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;

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

@@ -159,54 +159,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 {