fix(exec): skip subagent exec heartbeat wake

GavinZ · altaywtf · commit 381e2eea8101 · 2026-05-12T18:02:33.000+03:00
diff --git a/src/agents/bash-tools.exec-runtime.test.ts b/src/agents/bash-tools.exec-runtime.test.ts
@@ -565,6 +565,21 @@ describe("emitExecSystemEvent", () => {
     expect(enqueueSystemEventMock).not.toHaveBeenCalled();
     expect(requestHeartbeatMock).not.toHaveBeenCalled();
   });
+
+  it("skips heartbeat wake for subagent session keys", () => {
+    emitExecSystemEvent("Exec finished", {
+      sessionKey: "agent:main:subagent:abc-123",
+      contextKey: "exec:run-sub",
+    });
+
+    expect(enqueueSystemEventMock).toHaveBeenCalledWith("Exec finished", {
+      sessionKey: "agent:main:subagent:abc-123",
+      contextKey: "exec:run-sub",
+      deliveryContext: undefined,
+      trusted: false,
+    });
+    expect(requestHeartbeatMock).not.toHaveBeenCalled();
+  });
 });
 
 describe("formatExecFailureReason", () => {
diff --git a/src/agents/bash-tools.exec-runtime.ts b/src/agents/bash-tools.exec-runtime.ts
@@ -13,6 +13,7 @@ import { isDangerousHostInheritedEnvVarName } from "../infra/host-env-security.j
 import { findPathKey, mergePathPrepend } from "../infra/path-prepend.js";
 import { enqueueSystemEvent } from "../infra/system-events.js";
 import { resolveEventSessionKey, scopedHeartbeatWakeOptions } from "../routing/session-key.js";
+import { isSubagentSessionKey } from "../sessions/session-key-utils.js";
 import type { ProcessSession } from "./bash-process-registry.js";
 import type { ExecToolDetails } from "./bash-tools.exec-types.js";
 import type { BashSandboxConfig } from "./bash-tools.shared.js";
@@ -344,19 +345,23 @@ function maybeNotifyOnExit(session: ProcessSession, status: "completed" | "faile
     deliveryContext: session.notifyDeliveryContext,
     trusted: false,
   });
-  requestHeartbeat(
-    scopedHeartbeatWakeOptions(
-      sessionKey,
-      {
-        source: "exec-event",
-        intent: "event",
-        reason: "exec-event",
-        coalesceMs: 0,
-      },
-      session.mainKey,
-      session.sessionScope,
-    ),
-  );
+  // Subagent sessions receive exec results via process poll and announce flow;
+  // the heartbeat would fall back to the main session and cause spurious wakes.
+  if (!isSubagentSessionKey(sessionKey)) {
+    requestHeartbeat(
+      scopedHeartbeatWakeOptions(
+        sessionKey,
+        {
+          source: "exec-event",
+          intent: "event",
+          reason: "exec-event",
+          coalesceMs: 0,
+        },
+        session.mainKey,
+        session.sessionScope,
+      ),
+    );
+  }
 }
 
 export function createApprovalSlug(id: string) {
@@ -443,19 +448,23 @@ export function emitExecSystemEvent(
     deliveryContext: opts.deliveryContext,
     trusted: false,
   });
-  requestHeartbeat(
-    scopedHeartbeatWakeOptions(
-      sessionKey,
-      {
-        source: "exec-event",
-        intent: "event",
-        reason: "exec-event",
-        coalesceMs: 0,
-      },
-      opts.mainKey,
-      opts.sessionScope,
-    ),
-  );
+  // Subagent sessions receive exec results via process poll and announce flow;
+  // the heartbeat would fall back to the main session and cause spurious wakes.
+  if (!isSubagentSessionKey(sessionKey)) {
+    requestHeartbeat(
+      scopedHeartbeatWakeOptions(
+        sessionKey,
+        {
+          source: "exec-event",
+          intent: "event",
+          reason: "exec-event",
+          coalesceMs: 0,
+        },
+        opts.mainKey,
+        opts.sessionScope,
+      ),
+    );
+  }
 }
 
 export { renderExecUpdateText } from "./bash-tools.exec-output.js";
