From 74924bc91865f111542ac6b1554231a0d3f66f89 Mon Sep 17 00:00:00 2001 From: "zed-zippy[bot]" <234243425+zed-zippy[bot]@users.noreply.github.com> Date: Fri, 14 Nov 2025 15:13:53 -0800 Subject: [PATCH] Fix ACP extension root dir (#42131) (cherry-pick to stable) (#42777) Cherry-pick of #42131 to stable ---- Agents running in extensions need to have a root directory of the extension's dir for installation and authentication, but *not* for the conversation itself - otherwise the agent is running things like terminal commands in the wrong dir. Release Notes: - Fixed Agent Server extensions having the current working directory of the extension rather than the project Co-authored-by: Richard Feldman --- crates/agent_ui/src/acp/thread_view.rs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs index 717565c8486b79e3223a98fcf5e8ba8379fd0ae9..e6aab8c52adf112b07891178a3e0d98c8962b742 100644 --- a/crates/agent_ui/src/acp/thread_view.rs +++ b/crates/agent_ui/src/acp/thread_view.rs @@ -538,14 +538,7 @@ impl AcpThreadView { }) .log_err() } else { - let root_dir = if let Some(acp_agent) = connection - .clone() - .downcast::() - { - acp_agent.root_dir().into() - } else { - root_dir.unwrap_or(paths::home_dir().as_path().into()) - }; + let root_dir = root_dir.unwrap_or(paths::home_dir().as_path().into()); cx.update(|_, cx| { connection .clone()