fix(subagent): respect ANNOUNCE_SKIP in sessions_spawn direct completion delivery

shenghui kevin · shenghui kevin · commit 82908df3db89 · 2026-02-24T13:10:34.000-08:00
When a sub-agent spawned via sessions_spawn (mode="run") replies with exactly ANNOUNCE_SKIP, the completion message was still being delivered directly to the originating channel. The isAnnounceSkip check existed in the agent-to-agent announce path but was missing from the direct completion delivery path. This fix adds the isAnnounceSkip check before calling deliverSubagentAnnouncement, suppressing completion delivery when the sub-agent replies exactly ANNOUNCE_SKIP. Fixes #25800
diff --git a/src/agents/subagent-announce.ts b/src/agents/subagent-announce.ts
@@ -37,6 +37,7 @@ import { getSubagentDepthFromSessionStore } from "./subagent-depth.js";
 import type { SpawnSubagentMode } from "./subagent-spawn.js";
 import { readLatestAssistantReply } from "./tools/agent-step.js";
 import { sanitizeTextContent, extractAssistantText } from "./tools/sessions-helpers.js";
+import { isAnnounceSkip } from "./tools/sessions-send-helpers.js";
 
 const FAST_TEST_MODE = process.env.OPENCLAW_TEST_FAST === "1";
 const FAST_TEST_RETRY_INTERVAL_MS = 8;
@@ -1141,6 +1142,11 @@ export async function runSubagentAnnounceFlow(params: {
     const subagentName = resolveAgentIdFromSessionKey(params.childSessionKey);
     const announceSessionId = childSessionId || "unknown";
     const findings = reply || "(no output)";
+
+    // If the sub-agent replied exactly ANNOUNCE_SKIP, skip completion delivery
+    // but still send the internal trigger message to the requester session.
+    const shouldSkipCompletionDelivery = isAnnounceSkip(reply);
+
     let completionMessage = "";
     let triggerMessage = "";
 
@@ -1264,7 +1270,8 @@ export async function runSubagentAnnounceFlow(params: {
       directOrigin,
       targetRequesterSessionKey,
       requesterIsSubagent,
-      expectsCompletionMessage: expectsCompletionMessage,
+      // If the sub-agent replied ANNOUNCE_SKIP, suppress completion delivery
+      expectsCompletionMessage: expectsCompletionMessage && !shouldSkipCompletionDelivery,
       bestEffortDeliver: params.bestEffortDeliver,
       completionRouteMode: completionResolution.routeMode,
       spawnMode: params.spawnMode,
