From 9ad785b4bbec1574e8b9d7a3928013481226e529 Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Thu, 2 Apr 2026 19:17:11 +0200
Subject: [PATCH] more

---
 crates/agent_servers/src/acp.rs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 0eb047fe2592be9a531b451caa63fc178b514d15..236558e8870cea02afaabba21c5655226ae455ae 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -58,7 +58,10 @@ fn into_foreground_future<T: JsonRpcResponse + Send + 'static>(
     });
     async move {
         spawn_result?;
-        rx.await.map_err(|_| acp::Error::internal_error())?
+        rx.await.map_err(|_| {
+            acp::Error::internal_error()
+                .data("response channel cancelled — connection may have dropped")
+        })?
     }
 }
 
@@ -229,15 +232,11 @@ macro_rules! dispatch_request_handler {
     ($dispatch_tx:expr, $handler:expr) => {{
         let dispatch_tx = $dispatch_tx.clone();
         async move |args, responder, _connection| {
-            if dispatch_tx.is_closed() {
-                respond_err(responder, acp::Error::internal_error());
-            } else {
-                dispatch_tx
-                    .unbounded_send(Box::new(move |cx, ctx| {
-                        $handler(args, responder, cx, ctx);
-                    }))
-                    .log_err();
-            }
+            dispatch_tx
+                .unbounded_send(Box::new(move |cx, ctx| {
+                    $handler(args, responder, cx, ctx);
+                }))
+                .log_err();
             Ok(())
         }
     }};