fix: preserve direct subagent dispatch failures on abort

Takhoffman · Takhoffman · commit 0fc27409c0e4 · 2026-03-24T00:47:01.000-05:00
diff --git a/src/agents/subagent-announce-dispatch.test.ts b/src/agents/subagent-announce-dispatch.test.ts
@@ -135,6 +135,42 @@ describe("runSubagentAnnounceDispatch", () => {
     ]);
   });
 
+  it("preserves direct failure when completion dispatch aborts before fallback queue", async () => {
+    const controller = new AbortController();
+    const queue = vi.fn(async () => "queued" as const);
+    const direct = vi.fn(async () => {
+      controller.abort();
+      return {
+        delivered: false,
+        path: "direct" as const,
+        error: "direct failed before abort",
+      };
+    });
+
+    const result = await runSubagentAnnounceDispatch({
+      expectsCompletionMessage: true,
+      signal: controller.signal,
+      queue,
+      direct,
+    });
+
+    expect(direct).toHaveBeenCalledTimes(1);
+    expect(queue).not.toHaveBeenCalled();
+    expect(result).toMatchObject({
+      delivered: false,
+      path: "direct",
+      error: "direct failed before abort",
+    });
+    expect(result.phases).toEqual([
+      {
+        phase: "direct-primary",
+        delivered: false,
+        path: "direct",
+        error: "direct failed before abort",
+      },
+    ]);
+  });
+
   it("returns none immediately when signal is already aborted", async () => {
     const queue = vi.fn(async () => "none" as const);
     const direct = vi.fn(async () => ({ delivered: true, path: "direct" as const }));
diff --git a/src/agents/subagent-announce-dispatch.ts b/src/agents/subagent-announce-dispatch.ts
@@ -88,10 +88,7 @@ export async function runSubagentAnnounceDispatch(params: {
   }
 
   if (params.signal?.aborted) {
-    return withPhases({
-      delivered: false,
-      path: "none",
-    });
+    return withPhases(primaryDirect);
   }
 
   const fallbackQueue = mapQueueOutcomeToDeliveryResult(await params.queue());

Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,7 @@ export async function runSubagentAnnounceDispatch(params: {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`if (params.signal?.aborted) {`
`91`		`- return withPhases({`
`92`		`- delivered: false,`
`93`		`- path: "none",`
`94`		`- });`
	`91`	`+ return withPhases(primaryDirect);`
`95`	`92`	`}`
`96`	`93`
`97`	`94`	`const fallbackQueue = mapQueueOutcomeToDeliveryResult(await params.queue());`