From a055cddce3bf67c4d775c066392c4774f7835926 Mon Sep 17 00:00:00 2001
From: Eric Traut <etraut@openai.com>
Date: Fri, 27 Mar 2026 15:40:04 -0600
Subject: [PATCH] codex: address PR review feedback (#16041)

---
 .../tui_app_server/src/app/app_server_adapter.rs  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/codex-rs/tui_app_server/src/app/app_server_adapter.rs b/codex-rs/tui_app_server/src/app/app_server_adapter.rs
index 1b7c7a3c4b..d6dd52715e 100644
--- a/codex-rs/tui_app_server/src/app/app_server_adapter.rs
+++ b/codex-rs/tui_app_server/src/app/app_server_adapter.rs
@@ -152,8 +152,21 @@ impl App {
                         .await
                     {
                         Ok(statuses) => {
+                            let disabled_config_mcp_servers: std::collections::HashSet<String> =
+                                self.chat_widget
+                                    .config_ref()
+                                    .mcp_servers
+                                    .get()
+                                    .iter()
+                                    .filter_map(|(name, server)| {
+                                        (!server.enabled).then_some(name.clone())
+                                    })
+                                    .collect();
                             self.chat_widget.set_mcp_startup_expected_servers(
-                                statuses.into_iter().map(|status| status.name),
+                                statuses.into_iter().filter_map(|status| {
+                                    (!disabled_config_mcp_servers.contains(&status.name))
+                                        .then_some(status.name)
+                                }),
                             );
                         }
                         Err(err) => {