fix(process): report tree-kill completion by callback

mikasa0818 · mikasa0818 · commit f4d4e62159e0 · 2026-07-11T23:11:30.000+08:00
diff --git a/packages/agent-core/src/harness/env/kill-tree.ts b/packages/agent-core/src/harness/env/kill-tree.ts
@@ -58,18 +58,20 @@ export function killProcessTree(pid: number, opts?: KillProcessTreeOptions): voi
 export function signalProcessTree(
   pid: number,
   signal: "SIGTERM" | "SIGKILL",
-  opts?: { detached?: boolean },
-): Promise<void> {
+  opts?: { detached?: boolean; onComplete?: () => void },
+): void {
   if (!Number.isFinite(pid) || pid <= 0) {
-    return Promise.resolve();
+    opts?.onComplete?.();
+    return;
   }
 
   if (process.platform === "win32") {
-    return signalProcessTreeWindowsAndWait(pid, signal);
+    void signalProcessTreeWindowsAndWait(pid, signal).then(opts?.onComplete);
+    return;
   }
 
   signalProcessTreeUnix(pid, signal, opts?.detached !== false);
-  return Promise.resolve();
+  opts?.onComplete?.();
 }
 
 function normalizeGraceMs(value?: number): number {
diff --git a/src/process/kill-tree.test.ts b/src/process/kill-tree.test.ts
@@ -235,7 +235,7 @@ describe("killProcessTree", () => {
 
     await withMockedPlatform("win32", async () => {
       const completed = vi.fn();
-      void signalProcessTree(8989, "SIGKILL").then(completed);
+      signalProcessTree(8989, "SIGKILL", { onComplete: completed });
       await Promise.resolve();
       expect(completed).not.toHaveBeenCalled();
 
@@ -253,7 +253,7 @@ describe("killProcessTree", () => {
 
     await withMockedPlatform("win32", async () => {
       const completed = vi.fn();
-      void signalProcessTree(9090, "SIGKILL").then(completed);
+      signalProcessTree(9090, "SIGKILL", { onComplete: completed });
 
       await vi.advanceTimersByTimeAsync(2_999);
       expect(completed).not.toHaveBeenCalled();
diff --git a/src/process/supervisor/adapters/child.test.ts b/src/process/supervisor/adapters/child.test.ts
@@ -18,7 +18,11 @@ import {
 const { spawnWithFallbackMock, signalProcessTreeMock, createWindowsOutputDecoderMock } = vi.hoisted(
   () => ({
     spawnWithFallbackMock: vi.fn(),
-    signalProcessTreeMock: vi.fn(() => Promise.resolve()),
+    signalProcessTreeMock: vi.fn(
+      (_pid: number, _signal: string, opts?: { onComplete?: () => void }) => {
+        opts?.onComplete?.();
+      },
+    ),
     createWindowsOutputDecoderMock: vi.fn(() => ({
       decode: (chunk: Buffer | string) => (Buffer.isBuffer(chunk) ? chunk.toString("utf8") : chunk),
       flush: () => "",
@@ -203,9 +207,11 @@ describe("createChildAdapter", () => {
     // Detachment flag is now passed to signalProcessTree so it knows whether
     // it can safely group-kill via -pid. (#71662)
     const expectedDetached = process.platform !== "win32" && !process.env.OPENCLAW_SERVICE_MARKER;
-    expect(signalProcessTreeMock).toHaveBeenCalledWith(4321, "SIGKILL", {
-      detached: expectedDetached,
-    });
+    expect(signalProcessTreeMock).toHaveBeenCalledWith(
+      4321,
+      "SIGKILL",
+      expect.objectContaining({ detached: expectedDetached }),
+    );
     expect(killMock).toHaveBeenCalledWith("SIGKILL");
   });
 
@@ -227,9 +233,11 @@ describe("createChildAdapter", () => {
     adapter.kill();
     await Promise.resolve();
 
-    expect(signalProcessTreeMock).toHaveBeenCalledWith(8888, "SIGKILL", {
-      detached: false,
-    });
+    expect(signalProcessTreeMock).toHaveBeenCalledWith(
+      8888,
+      "SIGKILL",
+      expect.objectContaining({ detached: false }),
+    );
     expect(killMock).toHaveBeenCalledWith("SIGKILL");
   });
 
@@ -239,9 +247,11 @@ describe("createChildAdapter", () => {
       const { adapter, killMock } = await createAdapterHarness({ pid: 9999 });
       adapter.kill();
       await Promise.resolve();
-      expect(signalProcessTreeMock).toHaveBeenCalledWith(9999, "SIGKILL", {
-        detached: false,
-      });
+      expect(signalProcessTreeMock).toHaveBeenCalledWith(
+        9999,
+        "SIGKILL",
+        expect.objectContaining({ detached: false }),
+      );
       expect(killMock).toHaveBeenCalledWith("SIGKILL");
     } finally {
       delete process.env.OPENCLAW_SERVICE_MARKER;
@@ -382,10 +392,10 @@ describe("createChildAdapter", () => {
     vi.useFakeTimers();
     setPlatform("win32");
     let resolveTreeKill: (() => void) | undefined;
-    signalProcessTreeMock.mockReturnValueOnce(
-      new Promise<void>((resolve) => {
-        resolveTreeKill = resolve;
-      }),
+    signalProcessTreeMock.mockImplementationOnce(
+      (_pid: number, _signal: string, opts?: { onComplete?: () => void }) => {
+        resolveTreeKill = opts?.onComplete;
+      },
     );
 
     const stub = createStubChild(9753);
@@ -419,10 +429,10 @@ describe("createChildAdapter", () => {
     vi.useFakeTimers();
     setPlatform("win32");
     let resolveTreeKill: (() => void) | undefined;
-    signalProcessTreeMock.mockReturnValueOnce(
-      new Promise<void>((resolve) => {
-        resolveTreeKill = resolve;
-      }),
+    signalProcessTreeMock.mockImplementationOnce(
+      (_pid: number, _signal: string, opts?: { onComplete?: () => void }) => {
+        resolveTreeKill = opts?.onComplete;
+      },
     );
 
     const stub = createStubChild(9754);
@@ -450,10 +460,10 @@ describe("createChildAdapter", () => {
     vi.useFakeTimers();
     setPlatform("win32");
     let resolveTreeKill: (() => void) | undefined;
-    signalProcessTreeMock.mockReturnValueOnce(
-      new Promise<void>((resolve) => {
-        resolveTreeKill = resolve;
-      }),
+    signalProcessTreeMock.mockImplementationOnce(
+      (_pid: number, _signal: string, opts?: { onComplete?: () => void }) => {
+        resolveTreeKill = opts?.onComplete;
+      },
     );
 
     const stub = createStubChild(9755);
diff --git a/src/process/supervisor/adapters/child.ts b/src/process/supervisor/adapters/child.ts
@@ -437,7 +437,9 @@ export async function createChildAdapter(params: {
     signalProcessTree(pid, signal, { detached: childIsDetached });
   };
   const signalProcessTreeForChildAndWait = (pid: number, signal: "SIGTERM" | "SIGKILL") =>
-    signalProcessTree(pid, signal, { detached: childIsDetached });
+    new Promise<void>((resolve) => {
+      signalProcessTree(pid, signal, { detached: childIsDetached, onComplete: resolve });
+    });
   const kill = (signal?: NodeJS.Signals) => {
     const pid = child.pid ?? undefined;
     if (signal === undefined || signal === "SIGKILL") {
