diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs index a509922c33..f53c2f6b51 100644 --- a/codex-rs/core/src/codex.rs +++ b/codex-rs/core/src/codex.rs @@ -6370,21 +6370,7 @@ 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 b67f1fe272..c191bccf76 100644 --- a/codex-rs/core/src/tools/handlers/tool_suggest.rs +++ b/codex-rs/core/src/tools/handlers/tool_suggest.rs @@ -115,16 +115,6 @@ 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}"