fix(daemon): resolve Windows scheduled-task tools

vincentkoc · vincentkoc · commit 2a140e6e6ae8 · 2026-06-21T12:45:49.000+02:00
diff --git a/src/daemon/schtasks.startup-fallback.test.ts b/src/daemon/schtasks.startup-fallback.test.ts
@@ -3,7 +3,10 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import { PassThrough } from "node:stream";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { getWindowsCmdExePath } from "../infra/windows-install-roots.js";
+import {
+  getWindowsCmdExePath,
+  getWindowsPowerShellExePath,
+} from "../infra/windows-install-roots.js";
 import "./test-helpers/schtasks-base-mocks.js";
 import {
   inspectPortUsage,
@@ -136,7 +139,11 @@ function makeSpawnSyncResult(overrides: Partial<SpawnSyncResult> = {}): SpawnSyn
 function mockWindowsNodeHostProcess(processId = 5151): void {
   vi.spyOn(process, "platform", "get").mockReturnValue("win32");
   spawnSync.mockImplementation((command, args) => {
-    if (command === "powershell" && Array.isArray(args) && args.includes(NODE_PROCESS_QUERY)) {
+    if (
+      command === getWindowsPowerShellExePath() &&
+      Array.isArray(args) &&
+      args.includes(NODE_PROCESS_QUERY)
+    ) {
       return makeSpawnSyncResult({
         stdout: JSON.stringify([
           {
@@ -405,7 +412,7 @@ describe("Windows startup fallback", () => {
       findVerifiedGatewayListenerPidsOnPortSync.mockReturnValue([4242]);
       spawnSync.mockImplementation((command, args) => {
         if (
-          command === "powershell" &&
+          command === getWindowsPowerShellExePath() &&
           Array.isArray(args) &&
           args.includes(
             "Get-CimInstance Win32_Process | Select-Object ProcessId,CommandLine | ConvertTo-Json -Compress",
@@ -475,7 +482,7 @@ describe("Windows startup fallback", () => {
       fastForwardTaskStartWait();
       spawnSync.mockImplementation((command, args) => {
         if (
-          command === "powershell" &&
+          command === getWindowsPowerShellExePath() &&
           Array.isArray(args) &&
           args.includes(
             "Get-CimInstance Win32_Process | Select-Object ProcessId,CommandLine | ConvertTo-Json -Compress",
@@ -563,7 +570,7 @@ describe("Windows startup fallback", () => {
       );
       spawnSync.mockImplementation((command, args) => {
         if (
-          command === "powershell" &&
+          command === getWindowsPowerShellExePath() &&
           Array.isArray(args) &&
           args.includes(
             "Get-CimInstance Win32_Process | Select-Object ProcessId,CommandLine | ConvertTo-Json -Compress",
diff --git a/src/daemon/schtasks.ts b/src/daemon/schtasks.ts
@@ -9,7 +9,11 @@ import { isGatewayArgv } from "../infra/gateway-process-argv.js";
 import { findVerifiedGatewayListenerPidsOnPortSync } from "../infra/gateway-processes.js";
 import { inspectPortUsage } from "../infra/ports.js";
 import { parseTcpPort } from "../infra/tcp-port.js";
-import { getWindowsCmdExePath, getWindowsInstallRoots } from "../infra/windows-install-roots.js";
+import {
+  getWindowsCmdExePath,
+  getWindowsPowerShellExePath,
+  getWindowsSystem32ExePath,
+} from "../infra/windows-install-roots.js";
 import { killProcessTree } from "../process/kill-tree.js";
 import { sleep } from "../utils.js";
 import { parseCmdScriptCommandLine, quoteCmdScriptArg } from "./cmd-argv.js";
@@ -743,7 +747,7 @@ async function terminateGatewayProcessTree(pid: number, graceMs: number): Promis
     killProcessTree(pid, { graceMs });
     return;
   }
-  const taskkillPath = path.join(getWindowsInstallRoots().systemRoot, "System32", "taskkill.exe");
+  const taskkillPath = getWindowsSystem32ExePath("taskkill.exe");
   spawnSync(taskkillPath, ["/T", "/PID", String(pid)], {
     stdio: "ignore",
     timeout: 5_000,
@@ -796,7 +800,7 @@ function readWindowsProcessSnapshot(): WindowsProcessSnapshotEntry[] | null {
   }
 
   const processSnapshot = spawnSync(
-    "powershell",
+    getWindowsPowerShellExePath(),
     [
       "-NoProfile",
       "-Command",
