Use spawn for provider runtime commands

Author: Spencer

packages/server/src/__tests__/provider-runtime/command-check.test.ts

@@ -2,7 +2,6 @@ import { describe, expect, it, vi } from "vitest";
 import {
   checkCommandAvailable,
   getCommandLookupExecutable,
-  resolveCommand,
 } from "../../provider-runtime/command-check.js";
 
 describe("getCommandLookupExecutable", () => {
@@ -25,9 +24,9 @@ describe("checkCommandAvailable", () => {
       })
     );
 
-    await expect(checkCommandAvailable("codex", { platform: "linux", execFile })).resolves.toBe(
-      true
-    );
+    await expect(
+      checkCommandAvailable("codex", { platform: "linux", runCommand: execFile })
+    ).resolves.toBe(true);
     expect(execFile).toHaveBeenCalledWith("which", ["codex"], { windowsHide: true });
   });
 
@@ -38,9 +37,9 @@ describe("checkCommandAvailable", () => {
       }
     );
 
-    await expect(checkCommandAvailable("claude", { platform: "win32", execFile })).resolves.toBe(
-      false
-    );
+    await expect(
+      checkCommandAvailable("claude", { platform: "win32", runCommand: execFile })
+    ).resolves.toBe(false);
     expect(execFile).toHaveBeenCalledWith("where", ["claude"], { windowsHide: true });
   });
 
@@ -52,27 +51,10 @@ describe("checkCommandAvailable", () => {
       })
     );
 
-    await expect(checkCommandAvailable("codex", { platform: "win32", execFile })).resolves.toBe(
-      true
-    );
+    await expect(
+      checkCommandAvailable("codex", { platform: "win32", runCommand: execFile })
+    ).resolves.toBe(true);
 
     expect(execFile).toHaveBeenCalledWith("where", ["codex"], { windowsHide: true });
   });
 });
-
-describe("resolveCommand", () => {
-  it("returns the first resolved executable path from command lookup output", async () => {
-    const execFile = vi.fn(
-      async (_file: string, _args: string[], _options?: { windowsHide: boolean }) => ({
-        stdout: "C:\\npm\\npm.cmd\r\nC:\\Program Files\\nodejs\\npm.cmd\r\n",
-        stderr: "",
-      })
-    );
-
-    await expect(resolveCommand("npm", { platform: "win32", execFile })).resolves.toEqual({
-      command: "npm",
-      executable: "C:\\npm\\npm.cmd",
-    });
-    expect(execFile).toHaveBeenCalledWith("where", ["npm"], { windowsHide: true });
-  });
-});

packages/server/src/__tests__/provider-runtime/command-runner.test.ts

@@ -0,0 +1,53 @@
+import { Buffer } from "node:buffer";
+import { EventEmitter } from "node:events";
+import { describe, expect, it, vi } from "vitest";
+
+const { spawnMock } = vi.hoisted(() => ({
+  spawnMock: vi.fn(),
+}));
+
+vi.mock("node:child_process", async () => {
+  const actual = await vi.importActual<typeof import("node:child_process")>("node:child_process");
+  return {
+    ...actual,
+    spawn: spawnMock,
+  };
+});
+
+import { runCommandAsString } from "../../provider-runtime/command-runner.js";
+
+function createChildProcessMock() {
+  const stdout = new EventEmitter();
+  const stderr = new EventEmitter();
+  const child = new EventEmitter() as EventEmitter & {
+    stdout: EventEmitter;
+    stderr: EventEmitter;
+  };
+  child.stdout = stdout;
+  child.stderr = stderr;
+  return child;
+}
+
+describe("runCommandAsString", () => {
+  it("normalizes stdout and stderr to strings", async () => {
+    spawnMock.mockImplementation(
+      (_file: string, _args: string[], _options: { windowsHide?: boolean }) => {
+        const child = createChildProcessMock();
+        queueMicrotask(() => {
+          child.stdout.emit("data", Buffer.from("ok\n"));
+          child.stderr.emit("data", Buffer.from("warn\n"));
+          child.emit("close", 0);
+        });
+        return child;
+      }
+    );
+
+    const result = await runCommandAsString("demo", ["--version"], { windowsHide: true });
+
+    expect(result).toEqual({ stdout: "ok\n", stderr: "warn\n" });
+    expect(spawnMock).toHaveBeenCalledWith("demo", ["--version"], {
+      shell: false,
+      windowsHide: true,
+    });
+  });
+});

packages/server/src/__tests__/provider-runtime/exec-file.test.ts

@@ -8,7 +8,7 @@ describe("ProviderInstallManager", () => {
     const manager = new ProviderInstallManager([codexDefinition], {
       platform: "win32",
       commandExists,
-      execFile: vi.fn(async () => ({ stdout: "", stderr: "" })),
+      runCommand: vi.fn(async () => ({ stdout: "", stderr: "" })),
     });
 
     const job = await manager.start("codex");
@@ -26,7 +26,7 @@ describe("ProviderInstallManager", () => {
     const manager = new ProviderInstallManager([codexDefinition], {
       platform: "linux",
       commandExists,
-      execFile: vi.fn(async () => ({ stdout: "", stderr: "" })),
+      runCommand: vi.fn(async () => ({ stdout: "", stderr: "" })),
     });
 
     const job = await manager.start("codex");
@@ -45,7 +45,7 @@ describe("ProviderInstallManager", () => {
     const manager = new ProviderInstallManager([codexDefinition], {
       platform: "aix",
       commandExists: vi.fn(async (command: string) => command === "npm"),
-      execFile: vi.fn(async () => ({ stdout: "", stderr: "" })),
+      runCommand: vi.fn(async () => ({ stdout: "", stderr: "" })),
     });
 
     const job = await manager.start("codex");
@@ -71,7 +71,7 @@ describe("ProviderInstallManager", () => {
     const manager = new ProviderInstallManager([codexDefinition], {
       platform: "darwin",
       commandExists: vi.fn(async (command: string) => command === "npm"),
-      execFile,
+      runCommand: execFile,
     });
 
     const first = await manager.start("codex");
@@ -96,7 +96,7 @@ describe("ProviderInstallManager", () => {
     const manager = new ProviderInstallManager([codexDefinition], {
       platform: "linux",
       commandExists,
-      execFile: vi.fn(async () => ({ stdout: "", stderr: "" })),
+      runCommand: vi.fn(async () => ({ stdout: "", stderr: "" })),
     });
 
     const firstPromise = manager.start("codex");
@@ -119,7 +119,7 @@ describe("ProviderInstallManager", () => {
     const manager = new ProviderInstallManager([codexDefinition], {
       platform: "linux",
       commandExists: vi.fn(async (command: string) => command === "npm"),
-      execFile: vi.fn(async () => {
+      runCommand: vi.fn(async () => {
         throw installError;
       }),
     });
@@ -147,49 +147,33 @@ describe("ProviderInstallManager", () => {
     expect(stored?.steps[0]?.status).toBe("failed");
   });
 
-  it("re-resolves and executes the installed npm executable on Windows install steps", async () => {
+  it("executes Windows install steps with the declared command names", async () => {
     let npmInstalled = false;
     let codexInstalled = false;
+    const commandExists = vi.fn(async (command: string) => {
+      if (command === "winget") {
+        return true;
+      }
+      if (command === "npm") {
+        return npmInstalled;
+      }
+      if (command === "codex") {
+        return codexInstalled;
+      }
+      return false;
+    });
     const execFile = vi.fn(
       async (file: string, args: string[], _options?: { windowsHide: boolean }) => {
-        if (file === "where" && args[0] === "winget") {
-          return {
-            stdout: "C:\\Users\\test\\AppData\\Local\\Microsoft\\WindowsApps\\winget.exe\r\n",
-            stderr: "",
-          };
-        }
-
-        if (file === "where" && args[0] === "npm") {
-          if (!npmInstalled) {
-            throw new Error("npm unavailable");
-          }
-
-          return {
-            stdout: "C:\\npm\\npm.cmd\r\n",
-            stderr: "",
-          };
-        }
-
-        if (file === "where" && args[0] === "codex") {
-          if (!codexInstalled) {
-            throw new Error("codex unavailable");
-          }
-
-          return {
-            stdout: "C:\\codex\\codex.exe\r\n",
-            stderr: "",
-          };
-        }
-
         if (
-          file === "C:\\Users\\test\\AppData\\Local\\Microsoft\\WindowsApps\\winget.exe" &&
+          file === "winget" &&
           args.join(" ") === "install --id OpenJS.NodeJS.LTS --exact --silent"
         ) {
           npmInstalled = true;
           return { stdout: "installed node", stderr: "" };
         }
 
-        if (file === "C:\\npm\\npm.cmd" && args.join(" ") === "install -g @openai/codex") {
+        if (file === "npm" && args.join(" ") === "install -g @openai/codex") {
+          expect(npmInstalled).toBe(true);
           codexInstalled = true;
           return { stdout: "installed codex", stderr: "" };
         }
@@ -199,7 +183,8 @@ describe("ProviderInstallManager", () => {
     );
     const manager = new ProviderInstallManager([codexDefinition], {
       platform: "win32",
-      execFile,
+      commandExists,
+      runCommand: execFile,
     });
 
     const job = await manager.start("codex");
@@ -208,10 +193,8 @@ describe("ProviderInstallManager", () => {
       expect(manager.get(job.jobId)?.status).toBe("succeeded");
     });
 
-    expect(execFile).toHaveBeenCalledWith(
-      "C:\\npm\\npm.cmd",
-      ["install", "-g", "@openai/codex"],
-      { windowsHide: true }
-    );
+    expect(execFile).toHaveBeenCalledWith("npm", ["install", "-g", "@openai/codex"], {
+      windowsHide: true,
+    });
   });
 });