From 9b6bc8f46ae4b3ed7e9c50e791179e1d996de98c Mon Sep 17 00:00:00 2001
From: Eric Traut <etraut@openai.com>
Date: Thu, 19 Mar 2026 11:11:06 -0600
Subject: [PATCH] codex: address PR review feedback (#15181)

---
 codex-rs/core/src/codex.rs                       | 16 +++++++++++++++-
 codex-rs/core/src/tools/handlers/tool_suggest.rs | 10 ++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index f53c2f6b51..a509922c33 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -6370,7 +6370,21 @@ pub(crate) async fn built_tools(
                 accessible_connectors.as_slice(),
             )
             .await
-            {
+            .map(|discoverable_tools| {
+                if turn_context.app_server_client_name.as_deref() != Some("codex-tui") {
+                    return discoverable_tools;
+                }
+
+                discoverable_tools
+                    .into_iter()
+                    .filter(|tool| {
+                        !matches!(
+                            tool,
+                            crate::tools::discoverable::DiscoverableTool::Plugin(_)
+                        )
+                    })
+                    .collect()
+            }) {
                 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/handlers/tool_suggest.rs b/codex-rs/core/src/tools/handlers/tool_suggest.rs
index c191bccf76..b67f1fe272 100644
--- a/codex-rs/core/src/tools/handlers/tool_suggest.rs
+++ b/codex-rs/core/src/tools/handlers/tool_suggest.rs
@@ -115,6 +115,16 @@ impl ToolHandler for ToolSuggestHandler {
             &accessible_connectors,
         )
         .await
+        .map(|discoverable_tools| {
+            if turn.app_server_client_name.as_deref() != Some("codex-tui") {
+                return discoverable_tools;
+            }
+
+            discoverable_tools
+                .into_iter()
+                .filter(|tool| !matches!(tool, DiscoverableTool::Plugin(_)))
+                .collect()
+        })
         .map_err(|err| {
             FunctionCallError::RespondToModel(format!(
                 "tool suggestions are unavailable right now: {err}"