From 4d17a52924a66a083beee6a924e85a621ba71467 Mon Sep 17 00:00:00 2001
From: Vincent Koc <vincentkoc@ieee.org>
Date: Sun, 21 Jun 2026 07:36:02 +0200
Subject: [PATCH] fix(scripts): force taskkill boundary node steps on windows

---
 ...e-extension-package-boundary-artifacts.mjs |  6 +++++
 ...tension-package-boundary-artifacts.test.ts | 24 +++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/scripts/prepare-extension-package-boundary-artifacts.mjs b/scripts/prepare-extension-package-boundary-artifacts.mjs
index df961f4ff185..abc52eefccb0 100644
--- a/scripts/prepare-extension-package-boundary-artifacts.mjs
+++ b/scripts/prepare-extension-package-boundary-artifacts.mjs
@@ -425,6 +425,12 @@ export function signalNodeStep(
     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/prepare-extension-package-boundary-artifacts.test.ts b/test/scripts/prepare-extension-package-boundary-artifacts.test.ts
index 8d7e8ede51f4..6a303c054ce5 100644
--- a/test/scripts/prepare-extension-package-boundary-artifacts.test.ts
+++ b/test/scripts/prepare-extension-package-boundary-artifacts.test.ts
@@ -149,6 +149,30 @@ describe("prepare-extension-package-boundary-artifacts", () => {
     expect(child.kill).not.toHaveBeenCalled();
   });
 
+  it("force-kills Windows node step 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 });
+
+    signalNodeStep(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.runIf(process.platform !== "win32")(
     "force-kills aborted sibling step process groups",
     async () => {