vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-03-12 07:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): address review feedback on chat infra slice

Browse Source 
- export.ts: handle array content blocks (Claude API format) instead
  of silently exporting empty strings
- slash-command-executor.ts: restrict /kill all to current session's
  subagent subtree instead of all sessions globally
- slash-command-executor.ts: only count truly aborted runs (check
  aborted !== false) in /kill summary
This commit is contained in:
Val Alexander
2026-03-09 18:09:37 -05:00
parent d648dd7643
commit 8a6cd808a1
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ui/src/ui/chat/slash-command-executor.ts
View File

@@ -296,9 +296,14 @@ async function executeKill(
} }
const results = await Promise.allSettled( const results = await Promise.allSettled(
matched.map((key) => client.request("chat.abort", { sessionKey: key })), matched.map((key) =>
client.request<{ aborted?: boolean }>("chat.abort", { sessionKey: key }),
),
); );
const successCount = results.filter((entry) => entry.status === "fulfilled").length; const successCount = results.filter(
(entry) =>
entry.status === "fulfilled" && (entry.value as { aborted?: boolean })?.aborted !== false,
).length;
if (successCount === 0) { if (successCount === 0) {
const firstFailure = results.find((entry) => entry.status === "rejected"); const firstFailure = results.find((entry) => entry.status === "rejected");
throw firstFailure?.reason ?? new Error("abort failed"); throw firstFailure?.reason ?? new Error("abort failed");
@@ -343,15 +348,16 @@ function resolveKillTargets(
} }
const normalizedKey = key.toLowerCase(); const normalizedKey = key.toLowerCase();
const parsed = parseAgentSessionKey(normalizedKey); 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 = const isMatch =
normalizedTarget === "all" || (normalizedTarget === "all" && belongsToCurrentSession) ||
normalizedKey === normalizedTarget || normalizedKey === normalizedTarget ||
(parsed?.agentId ?? "") === normalizedTarget || (parsed?.agentId ?? "") === normalizedTarget ||
normalizedKey.endsWith(`:subagent:${normalizedTarget}`) || normalizedKey.endsWith(`:subagent:${normalizedTarget}`) ||
normalizedKey === `subagent:${normalizedTarget}` || normalizedKey === `subagent:${normalizedTarget}` ||
(currentParsed?.agentId != null && (belongsToCurrentSession && normalizedKey.endsWith(`:subagent:${normalizedTarget}`));
parsed?.agentId === currentParsed.agentId &&
normalizedKey.endsWith(`:subagent:${normalizedTarget}`));
if (isMatch) { if (isMatch) {
keys.add(key); keys.add(key);
} }