From 7b3920801b8b891d2b23240f16a92ae37703dc35 Mon Sep 17 00:00:00 2001
From: imccyu <cc.yu@deepseek.com>
Date: Sat, 1 Aug 2026 09:17:12 +0800
Subject: [PATCH] fix(subagent): deduplicate activation teardown

---
 .../subagent/subagent/src/continuation.ts     | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/packages/subagent/subagent/src/continuation.ts b/packages/subagent/subagent/src/continuation.ts
index 2bd89607f8..03b4c34a31 100644
--- a/packages/subagent/subagent/src/continuation.ts
+++ b/packages/subagent/subagent/src/continuation.ts
@@ -404,22 +404,7 @@ export class SubagentContinuationManager {
       for (const child of activation.ownedChildren) owned.add(child)
     }
     const roots = [...this.activations.values()].filter(activation => !owned.has(activation.childId))
-    const failures = await Promise.all(roots.map(async (activation) => {
-      try {
-        await this.dispose(activation)
-        return undefined
-      } catch (error: unknown) {
-        return error
-      }
-    }))
-    const reasons = failures.filter(failure => failure !== undefined)
-    if (reasons.length > 0) {
-      throw new SubagentError(
-        `continuable subagent teardown failed for ${reasons.length} activation(s): `
-        + reasons.map(reason => errorChain(reason)).join('; '),
-        'ACTIVATION_TEARDOWN_FAILED',
-      )
-    }
+    await this.disposeRoots(roots, 'activation(s)')
   }
 
   /**
@@ -481,7 +466,15 @@ export class SubagentContinuationManager {
     }
 
     await Promise.all(materializations.map(materialization => materialization.settled))
-    const failures = await Promise.all(targetRoots.map(async (activation) => {
+    await this.disposeRoots(targetRoots, 'scoped activation(s)')
+  }
+
+  /** Dispose independent roots and report every branch failure after all settle. */
+  private async disposeRoots(
+    roots: readonly Activation[],
+    failureSubject: 'activation(s)' | 'scoped activation(s)',
+  ): Promise<void> {
+    const failures = await Promise.all(roots.map(async (activation) => {
       try {
         await this.dispose(activation)
         return undefined
@@ -492,7 +485,7 @@ export class SubagentContinuationManager {
     const reasons = failures.filter(failure => failure !== undefined)
     if (reasons.length > 0) {
       throw new SubagentError(
-        `continuable subagent teardown failed for ${reasons.length} scoped activation(s): `
+        `continuable subagent teardown failed for ${reasons.length} ${failureSubject}: `
         + reasons.map(reason => errorChain(reason)).join('; '),
         'ACTIVATION_TEARDOWN_FAILED',
       )