From 6099d02539935555e63a6e089642376d4889b8f1 Mon Sep 17 00:00:00 2001 From: Ben Brandt Date: Mon, 29 Sep 2025 13:34:52 +0200 Subject: [PATCH] acp: Add NO_PROXY if not set otherwise to not proxy localhost urls (#39100) Since we might run MCP servers locally for an agent, we don't want to use the proxy for those. We set this if the user has set a proxy, but not a custom NO_PROXY env var. Closes #38839 Release Notes: - acp: Don't run local mcp servers through proxy, if set --- crates/agent_servers/src/agent_servers.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/agent_servers/src/agent_servers.rs b/crates/agent_servers/src/agent_servers.rs index b9751d7f63053bf073bcc8181f0cc2f8211d5c9f..af95fdfa4cde66ffbc04f7234112ba5243e7d951 100644 --- a/crates/agent_servers/src/agent_servers.rs +++ b/crates/agent_servers/src/agent_servers.rs @@ -99,6 +99,9 @@ pub fn load_proxy_env(cx: &mut App) -> HashMap { if let Some(no_proxy) = read_no_proxy_from_env() { env.insert("NO_PROXY".to_owned(), no_proxy); + } else if proxy_url.is_some() { + // We sometimes need local MCP servers that we don't want to proxy + env.insert("NO_PROXY".to_owned(), "localhost,127.0.0.1".to_owned()); } env