From 97a31c59c99781e33143321849e7613c62acd482 Mon Sep 17 00:00:00 2001
From: Bennet Bo Fenner <bennet@zed.dev>
Date: Tue, 19 Aug 2025 12:22:17 +0200
Subject: [PATCH] agent2: Fix agent location still being present after thread
 stopped (#36471)

Release Notes:

- N/A
---
 crates/acp_thread/src/acp_thread.rs | 2 ++
 crates/agent_ui/src/agent_diff.rs   | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/crates/acp_thread/src/acp_thread.rs b/crates/acp_thread/src/acp_thread.rs
index 916f48cbe0..b86696d437 100644
--- a/crates/acp_thread/src/acp_thread.rs
+++ b/crates/acp_thread/src/acp_thread.rs
@@ -1282,6 +1282,8 @@ impl AcpThread {
                 .await?;
 
             this.update(cx, |this, cx| {
+                this.project
+                    .update(cx, |project, cx| project.set_agent_location(None, cx));
                 match response {
                     Ok(Err(e)) => {
                         this.send_task.take();
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index b0b06583a4..b010f8a424 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1520,12 +1520,12 @@ impl AgentDiff {
                     self.update_reviewing_editors(workspace, window, cx);
                 }
             }
+            AcpThreadEvent::Stopped | AcpThreadEvent::Error | AcpThreadEvent::ServerExited(_) => {
+                self.update_reviewing_editors(workspace, window, cx);
+            }
             AcpThreadEvent::EntriesRemoved(_)
-            | AcpThreadEvent::Stopped
             | AcpThreadEvent::ToolAuthorizationRequired
-            | AcpThreadEvent::Retry(_)
-            | AcpThreadEvent::Error
-            | AcpThreadEvent::ServerExited(_) => {}
+            | AcpThreadEvent::Retry(_) => {}
         }
     }