fix(scripts): kill run-with-env trees on windows

vincentkoc · vincentkoc · commit 8d2e6d7686b0 · 2026-06-21T06:24:47.000+02:00
diff --git a/scripts/run-with-env.mjs b/scripts/run-with-env.mjs
@@ -1,5 +1,5 @@
 // Runs a command with inline KEY=value assignments while preserving signal behavior.
-import { spawn } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 
 const ENV_ASSIGNMENT_RE = /^[A-Za-z_][A-Za-z0-9_]*=/u;
 const USAGE = "Usage: node scripts/run-with-env.mjs KEY=value [KEY=value ...] -- command [args...]";
@@ -80,6 +80,42 @@ export function resolveForceKillDelayMs(env = process.env) {
   return parsed;
 }
 
+/**
+ * Signals the wrapped command tree when this small parent wrapper is stopped.
+ */
+export function signalRunWithEnvChild(
+  child,
+  signal,
+  {
+    platform = process.platform,
+    runTaskkill = spawnSync,
+    useChildProcessGroup = platform !== "win32",
+  } = {},
+) {
+  if (useChildProcessGroup && typeof child.pid === "number") {
+    try {
+      process.kill(-child.pid, signal);
+      return;
+    } catch (error) {
+      if (error?.code !== "ESRCH") {
+        child.kill(signal);
+        return;
+      }
+    }
+  }
+  if (platform === "win32" && typeof child.pid === "number") {
+    const args = ["/PID", String(child.pid), "/T"];
+    if (signal === "SIGKILL") {
+      args.push("/F");
+    }
+    const result = runTaskkill("taskkill", args, { stdio: "ignore" });
+    if (!result?.error && result?.status === 0) {
+      return;
+    }
+  }
+  child.kill(signal);
+}
+
 function main(argv = process.argv.slice(2)) {
   if (isRunWithEnvHelpRequest(argv)) {
     console.log(USAGE);
@@ -120,20 +156,7 @@ function main(argv = process.argv.slice(2)) {
   const forwardedSignals = useChildProcessGroup
     ? ["SIGTERM", "SIGHUP", "SIGINT"]
     : ["SIGTERM", "SIGHUP"];
-  const signalChild = (signal) => {
-    if (useChildProcessGroup && typeof child.pid === "number") {
-      try {
-        process.kill(-child.pid, signal);
-        return;
-      } catch (error) {
-        if (error?.code !== "ESRCH") {
-          child.kill(signal);
-          return;
-        }
-      }
-    }
-    child.kill(signal);
-  };
+  const signalChild = (signal) => signalRunWithEnvChild(child, signal, { useChildProcessGroup });
   const childProcessGroupAlive = () => {
     if (!useChildProcessGroup || typeof child.pid !== "number") {
       return false;
diff --git a/test/scripts/run-with-env.test.ts b/test/scripts/run-with-env.test.ts
@@ -3,12 +3,13 @@ import { spawn, spawnSync, type ChildProcess } from "node:child_process";
 import { existsSync, mkdtempSync, readFileSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import path from "node:path";
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 import {
   isRunWithEnvHelpRequest,
   parseRunWithEnvArgs,
   resolveForceKillDelayMs,
   resolveSpawnCommand,
+  signalRunWithEnvChild,
 } from "../../scripts/run-with-env.mjs";
 
 async function waitFor(predicate: () => boolean, label: string, timeoutMs = 3_000): Promise<void> {
@@ -158,6 +159,31 @@ describe("run-with-env", () => {
     );
   });
 
+  it("signals Windows wrapped command trees with taskkill", () => {
+    const child = {
+      kill: vi.fn(),
+      pid: 12345,
+    };
+    const runTaskkill = vi.fn(() => ({ error: undefined, status: 0 }));
+
+    signalRunWithEnvChild(child, "SIGTERM", {
+      platform: "win32",
+      runTaskkill,
+    });
+    expect(runTaskkill).toHaveBeenNthCalledWith(1, "taskkill", ["/PID", "12345", "/T"], {
+      stdio: "ignore",
+    });
+
+    signalRunWithEnvChild(child, "SIGKILL", {
+      platform: "win32",
+      runTaskkill,
+    });
+    expect(runTaskkill).toHaveBeenNthCalledWith(2, "taskkill", ["/PID", "12345", "/T", "/F"], {
+      stdio: "ignore",
+    });
+    expect(child.kill).not.toHaveBeenCalled();
+  });
+
   it.runIf(process.platform !== "win32").each(["SIGTERM", "SIGHUP", "SIGINT"] as const)(
     "forwards parent %s to the wrapped command",
     async (signal) => {
