fix(package): force taskkill candidate runner trees on windows

vincentkoc · vincentkoc · commit 4b2298e8cbcb · 2026-06-21T07:33:04.000+02:00
diff --git a/scripts/resolve-openclaw-package-candidate.mjs b/scripts/resolve-openclaw-package-candidate.mjs
@@ -328,6 +328,12 @@ export function signalChildProcessTree(
     if (!result?.error && result?.status === 0) {
       return;
     }
+    if (signal !== "SIGKILL") {
+      const forceResult = runTaskkill("taskkill", [...args, "/F"], { stdio: "ignore" });
+      if (!forceResult?.error && forceResult?.status === 0) {
+        return;
+      }
+    }
   }
   child.kill(signal);
 }
diff --git a/test/scripts/resolve-openclaw-package-candidate.test.ts b/test/scripts/resolve-openclaw-package-candidate.test.ts
@@ -240,6 +240,30 @@ describe("resolve-openclaw-package-candidate", () => {
     expect(child.kill).not.toHaveBeenCalled();
   });
 
+  it("force-kills Windows package runner process trees when graceful taskkill fails", () => {
+    const child = {
+      kill: vi.fn(),
+      pid: 12345,
+    };
+    const runTaskkill = vi
+      .fn()
+      .mockReturnValueOnce({ error: undefined, status: 1 })
+      .mockReturnValueOnce({ error: undefined, status: 0 });
+
+    signalChildProcessTree(child, "SIGTERM", {
+      platform: "win32",
+      runTaskkill,
+    });
+
+    expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
+      stdio: "ignore",
+    });
+    expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
+      stdio: "ignore",
+    });
+    expect(child.kill).not.toHaveBeenCalled();
+  });
+
   it("keeps npm pack filenames inside the package candidate output directory", async () => {
     const dir = await mkdtemp(path.join(tmpdir(), "openclaw-package-npm-pack-"));
     tempDirs.push(dir);

Original file line number	Diff line number	Diff line change
`@@ -328,6 +328,12 @@ export function signalChildProcessTree(`
`328`	`328`	`if (!result?.error && result?.status === 0) {`
`329`	`329`	`return;`
`330`	`330`	`}`
	`331`	`+ if (signal !== "SIGKILL") {`
	`332`	`+ const forceResult = runTaskkill("taskkill", [...args, "/F"], { stdio: "ignore" });`
	`333`	`+ if (!forceResult?.error && forceResult?.status === 0) {`
	`334`	`+ return;`
	`335`	`+ }`
	`336`	`+ }`
`331`	`337`	`}`
`332`	`338`	`child.kill(signal);`
`333`	`339`	`}`