fix(package): resolve taskkill from system32 in candidate runner

vincentkoc · vincentkoc · commit b15f745a605c · 2026-06-21T09:28:31.000+02:00
diff --git a/scripts/resolve-openclaw-package-candidate.mjs b/scripts/resolve-openclaw-package-candidate.mjs
@@ -13,6 +13,7 @@ import os from "node:os";
 import path from "node:path";
 import { pipeline } from "node:stream/promises";
 import { fileURLToPath } from "node:url";
+import { resolveWindowsTaskkillPath } from "./lib/windows-taskkill.mjs";
 import { resolveNpmRunner } from "./npm-runner.mjs";
 
 const ROOT_DIR = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
@@ -320,16 +321,17 @@ export function signalChildProcessTree(
     }
   }
   if (platform === "win32" && typeof child.pid === "number") {
+    const taskkillPath = resolveWindowsTaskkillPath();
     const args = ["/PID", String(child.pid), "/T"];
     if (signal === "SIGKILL") {
       args.push("/F");
     }
-    const result = runTaskkill("taskkill", args, { stdio: "ignore" });
+    const result = runTaskkill(taskkillPath, args, { stdio: "ignore" });
     if (!result?.error && result?.status === 0) {
       return;
     }
     if (signal !== "SIGKILL") {
-      const forceResult = runTaskkill("taskkill", [...args, "/F"], { stdio: "ignore" });
+      const forceResult = runTaskkill(taskkillPath, [...args, "/F"], { stdio: "ignore" });
       if (!forceResult?.error && forceResult?.status === 0) {
         return;
       }
diff --git a/test/scripts/resolve-openclaw-package-candidate.test.ts b/test/scripts/resolve-openclaw-package-candidate.test.ts
@@ -6,6 +6,7 @@ import { tmpdir } from "node:os";
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { afterEach, describe, expect, it, vi } from "vitest";
+import { resolveWindowsTaskkillPath } from "../../scripts/lib/windows-taskkill.mjs";
 import {
   ARTIFACT_TARBALL_SCAN_MAX_ENTRIES,
   assertExpectedSha256ForTest,
@@ -24,6 +25,10 @@ import {
   validateOpenClawPackageSpec,
 } from "../../scripts/resolve-openclaw-package-candidate.mjs";
 
+function expectedTaskkillPath(): string {
+  return resolveWindowsTaskkillPath();
+}
+
 const tempDirs: string[] = [];
 
 type LookupAddress = { address: string; family: number };
@@ -226,17 +231,27 @@ describe("resolve-openclaw-package-candidate", () => {
       platform: "win32",
       runTaskkill,
     });
-    expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
-      stdio: "ignore",
-    });
+    expect(runTaskkill).toHaveBeenNthCalledWith(
+      1,
+      expectedTaskkillPath(),
+      ["/PID", "12345", "/T"],
+      {
+        stdio: "ignore",
+      },
+    );
 
     signalChildProcessTree(child, "SIGKILL", {
       platform: "win32",
       runTaskkill,
     });
-    expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
-      stdio: "ignore",
-    });
+    expect(runTaskkill).toHaveBeenNthCalledWith(
+      2,
+      expectedTaskkillPath(),
+      ["/PID", "12345", "/T", "/F"],
+      {
+        stdio: "ignore",
+      },
+    );
     expect(child.kill).not.toHaveBeenCalled();
   });
 
@@ -255,12 +270,22 @@ describe("resolve-openclaw-package-candidate", () => {
       runTaskkill,
     });
 
-    expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
-      stdio: "ignore",
-    });
-    expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
-      stdio: "ignore",
-    });
+    expect(runTaskkill).toHaveBeenNthCalledWith(
+      1,
+      expectedTaskkillPath(),
+      ["/PID", "12345", "/T"],
+      {
+        stdio: "ignore",
+      },
+    );
+    expect(runTaskkill).toHaveBeenNthCalledWith(
+      2,
+      expectedTaskkillPath(),
+      ["/PID", "12345", "/T", "/F"],
+      {
+        stdio: "ignore",
+      },
+    );
     expect(child.kill).not.toHaveBeenCalled();
   });
 

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import os from "node:os";`
`13`	`13`	`import path from "node:path";`
`14`	`14`	`import { pipeline } from "node:stream/promises";`
`15`	`15`	`import { fileURLToPath } from "node:url";`
	`16`	`+import { resolveWindowsTaskkillPath } from "./lib/windows-taskkill.mjs";`
`16`	`17`	`import { resolveNpmRunner } from "./npm-runner.mjs";`
`17`	`18`
`18`	`19`	`const ROOT_DIR = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");`
`@@ -320,16 +321,17 @@ export function signalChildProcessTree(`
`320`	`321`	`}`
`321`	`322`	`}`
`322`	`323`	`if (platform === "win32" && typeof child.pid === "number") {`
	`324`	`+ const taskkillPath = resolveWindowsTaskkillPath();`
`323`	`325`	`const args = ["/PID", String(child.pid), "/T"];`
`324`	`326`	`if (signal === "SIGKILL") {`
`325`	`327`	`args.push("/F");`
`326`	`328`	`}`
`327`		`- const result = runTaskkill("taskkill", args, { stdio: "ignore" });`
	`329`	`+ const result = runTaskkill(taskkillPath, args, { stdio: "ignore" });`
`328`	`330`	`if (!result?.error && result?.status === 0) {`
`329`	`331`	`return;`
`330`	`332`	`}`
`331`	`333`	`if (signal !== "SIGKILL") {`
`332`		`- const forceResult = runTaskkill("taskkill", [...args, "/F"], { stdio: "ignore" });`
	`334`	`+ const forceResult = runTaskkill(taskkillPath, [...args, "/F"], { stdio: "ignore" });`
`333`	`335`	`if (!forceResult?.error && forceResult?.status === 0) {`
`334`	`336`	`return;`
`335`	`337`	`}`