fix: address issue

pgondhi987 · pgondhi987 · commit 7cfbd805d2da · 2026-04-29T15:13:12.000Z
diff --git a/src/infra/dotenv.test.ts b/src/infra/dotenv.test.ts
@@ -660,6 +660,10 @@ describe("workspace .env blocklist completeness", () => {
           "OPENCLAW_NODE_EXEC_HOST",
           "OPENCLAW_NODE_EXEC_FALLBACK",
           "OPENCLAW_ALLOW_PROJECT_LOCAL_BIN",
+          "SystemRoot",
+          "WINDIR",
+          "ProgramFiles",
+          "ProgramW6432",
           "SYNOLOGY_CHAT_INCOMING_URL",
           "SYNOLOGY_NAS_HOST",
         ];
diff --git a/src/infra/dotenv.ts b/src/infra/dotenv.ts
@@ -70,9 +70,13 @@ const BLOCKED_WORKSPACE_DOTENV_KEYS = new Set([
   "OPENCLAW_TEST_TAILSCALE_BINARY",
   "PI_CODING_AGENT_DIR",
   "PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH",
+  "PROGRAMFILES",
+  "PROGRAMW6432",
   "SYNOLOGY_CHAT_INCOMING_URL",
   "SYNOLOGY_NAS_HOST",
+  "SYSTEMROOT",
   "UV_PYTHON",
+  "WINDIR",
 ]);
 
 // Block endpoint redirection for any service without overfitting per-provider names.
diff --git a/src/infra/restart-stale-pids.test.ts b/src/infra/restart-stale-pids.test.ts
@@ -90,6 +90,10 @@ vi.mock("./windows-port-pids.js", () => ({
     mockReadWindowsProcessArgsResult(pid, timeoutMs),
 }));
 
+vi.mock("./windows-install-roots.js", () => ({
+  getWindowsInstallRoots: () => ({ systemRoot: "C:\\Windows" }),
+}));
+
 import { resolveLsofCommandSync } from "./ports-lsof.js";
 let __testing: typeof import("./restart-stale-pids.js").__testing;
 let cleanStaleGatewayProcessesSync: typeof import("./restart-stale-pids.js").cleanStaleGatewayProcessesSync;
@@ -980,8 +984,10 @@ describe.skipIf(isWindows)("restart-stale-pids", () => {
 
     it("does not report Windows pids as killed when taskkill fails", () => {
       const origDescriptor = Object.getOwnPropertyDescriptor(process, "platform");
+      const originalSystemRoot = process.env.SystemRoot;
       const stalePid = process.pid + 911;
       Object.defineProperty(process, "platform", { value: "win32", configurable: true });
+      process.env.SystemRoot = "C:\\PoisonedWindows";
       try {
         let fakeNow = 0;
         __testing.setDateNowOverride(() => fakeNow);
@@ -1012,12 +1018,17 @@ describe.skipIf(isWindows)("restart-stale-pids", () => {
 
         expect(cleanStaleGatewayProcessesSync()).toEqual([]);
         expect(mockSpawnSync).toHaveBeenCalledWith(
-          expect.stringContaining("taskkill.exe"),
+          "C:\\Windows\\System32\\taskkill.exe",
           ["/T", "/PID", String(stalePid)],
           expect.objectContaining({ timeout: 5000 }),
         );
       } finally {
         __testing.setDateNowOverride(null);
+        if (originalSystemRoot === undefined) {
+          delete process.env.SystemRoot;
+        } else {
+          process.env.SystemRoot = originalSystemRoot;
+        }
         if (origDescriptor) {
           Object.defineProperty(process, "platform", origDescriptor);
         }
@@ -1063,13 +1074,13 @@ describe.skipIf(isWindows)("restart-stale-pids", () => {
         expect(cleanStaleGatewayProcessesSync()).toEqual([]);
         expect(mockSpawnSync).toHaveBeenNthCalledWith(
           1,
-          expect.stringContaining("taskkill.exe"),
+          "C:\\Windows\\System32\\taskkill.exe",
           ["/T", "/PID", String(stalePid)],
           expect.objectContaining({ timeout: 5000 }),
         );
         expect(mockSpawnSync).toHaveBeenNthCalledWith(
           2,
-          expect.stringContaining("taskkill.exe"),
+          "C:\\Windows\\System32\\taskkill.exe",
           ["/F", "/T", "/PID", String(stalePid)],
           expect.objectContaining({ timeout: 5000 }),
         );
diff --git a/src/infra/restart-stale-pids.ts b/src/infra/restart-stale-pids.ts
@@ -6,6 +6,7 @@ import { createSubsystemLogger } from "../logging/subsystem.js";
 import { normalizeLowercaseStringOrEmpty } from "../shared/string-coerce.js";
 import { isGatewayArgv } from "./gateway-process-argv.js";
 import { resolveLsofCommandSync } from "./ports-lsof.js";
+import { getWindowsInstallRoots } from "./windows-install-roots.js";
 import {
   readWindowsListeningPidsOnPortSync,
   readWindowsListeningPidsResultSync,
@@ -424,8 +425,8 @@ function terminateStaleProcessesSync(pids: number[]): number[] {
  * Sends a graceful taskkill first (/T for tree), waits, then escalates to /F.
  */
 function terminateStaleProcessesWindows(pids: number[]): number[] {
-  const taskkillPath = path.join(
-    process.env.SystemRoot ?? "C:\\Windows",
+  const taskkillPath = path.win32.join(
+    getWindowsInstallRoots().systemRoot,
     "System32",
     "taskkill.exe",
   );
