From 8e412bad0ebe41264dc4cf169b1fdd8453f6b000 Mon Sep 17 00:00:00 2001
From: Val Alexander <bunsthedev@gmail.com>
Date: Mon, 9 Mar 2026 18:47:37 -0500
Subject: [PATCH] Revert "fix(ui): address review feedback on chat infra slice"

This reverts commit 8a6cd808a138ea73e53b7498bc3fd5dcfd565a7a.
---
 ui/src/ui/chat/slash-command-executor.ts | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/ui/src/ui/chat/slash-command-executor.ts b/ui/src/ui/chat/slash-command-executor.ts
index d1c767370a4..3392095c7c1 100644
--- a/ui/src/ui/chat/slash-command-executor.ts
+++ b/ui/src/ui/chat/slash-command-executor.ts
@@ -296,14 +296,9 @@ async function executeKill(
     }
 
     const results = await Promise.allSettled(
-      matched.map((key) =>
-        client.request<{ aborted?: boolean }>("chat.abort", { sessionKey: key }),
-      ),
+      matched.map((key) => client.request("chat.abort", { sessionKey: key })),
     );
-    const successCount = results.filter(
-      (entry) =>
-        entry.status === "fulfilled" && (entry.value as { aborted?: boolean })?.aborted !== false,
-    ).length;
+    const successCount = results.filter((entry) => entry.status === "fulfilled").length;
     if (successCount === 0) {
       const firstFailure = results.find((entry) => entry.status === "rejected");
       throw firstFailure?.reason ?? new Error("abort failed");
@@ -348,16 +343,15 @@ function resolveKillTargets(
     }
     const normalizedKey = key.toLowerCase();
     const parsed = parseAgentSessionKey(normalizedKey);
-    // For "all", only match subagents belonging to the current session's agent
-    const belongsToCurrentSession =
-      currentParsed?.agentId != null && parsed?.agentId === currentParsed.agentId;
     const isMatch =
-      (normalizedTarget === "all" && belongsToCurrentSession) ||
+      normalizedTarget === "all" ||
       normalizedKey === normalizedTarget ||
       (parsed?.agentId ?? "") === normalizedTarget ||
       normalizedKey.endsWith(`:subagent:${normalizedTarget}`) ||
       normalizedKey === `subagent:${normalizedTarget}` ||
-      (belongsToCurrentSession && normalizedKey.endsWith(`:subagent:${normalizedTarget}`));
+      (currentParsed?.agentId != null &&
+        parsed?.agentId === currentParsed.agentId &&
+        normalizedKey.endsWith(`:subagent:${normalizedTarget}`));
     if (isMatch) {
       keys.add(key);
     }