From bf849fb48280aedac708c0e8d851ece4d19d1885 Mon Sep 17 00:00:00 2001
From: Eric Traut <etraut@openai.com>
Date: Thu, 19 Mar 2026 10:59:27 -0600
Subject: [PATCH] Simplify tool suggestion filtering

---
 codex-rs/core/src/codex.rs                             | 7 +------
 codex-rs/core/src/tools/discoverable.rs                | 7 -------
 codex-rs/core/src/tools/handlers/tool_suggest.rs       | 7 -------
 codex-rs/core/src/tools/handlers/tool_suggest_tests.rs | 1 -
 4 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index 45227d8136..f53c2f6b51 100644
--- a/codex-rs/core/src/codex.rs
+++ b/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) => {
diff --git a/codex-rs/core/src/tools/discoverable.rs b/codex-rs/core/src/tools/discoverable.rs
index 89d47390b4..7b5bebf466 100644
--- a/codex-rs/core/src/tools/discoverable.rs
+++ b/codex-rs/core/src/tools/discoverable.rs
@@ -90,13 +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> {
-    discoverable_tools
-}
-
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub(crate) struct DiscoverablePluginInfo {
     pub(crate) id: String,
diff --git a/codex-rs/core/src/tools/handlers/tool_suggest.rs b/codex-rs/core/src/tools/handlers/tool_suggest.rs
index ac12ec97ac..c191bccf76 100644
--- a/codex-rs/core/src/tools/handlers/tool_suggest.rs
+++ b/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;
@@ -116,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}"
diff --git a/codex-rs/core/src/tools/handlers/tool_suggest_tests.rs b/codex-rs/core/src/tools/handlers/tool_suggest_tests.rs
index da3cd7dcd3..7f548a1869 100644
--- a/codex-rs/core/src/tools/handlers/tool_suggest_tests.rs
+++ b/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;