fix: wrap bunx with cmd shim on Windows

choiking · choiking · commit e3741adcde60 · 2026-03-16T10:03:10.000+08:00
diff --git a/src/process/exec.ts b/src/process/exec.ts
@@ -79,7 +79,7 @@ function resolveNpmArgvForWindows(argv: string[]): string[] | null {
 function resolveCommand(command: string): string {
   return resolveWindowsCommandShim({
     command,
-    cmdCommands: ["pnpm", "yarn"],
+    cmdCommands: ["pnpm", "yarn", "bunx"],
   });
 }
 
diff --git a/src/process/exec.windows.test.ts b/src/process/exec.windows.test.ts
@@ -111,4 +111,28 @@ describe("windows command wrapper behavior", () => {
       platformSpy.mockRestore();
     }
   });
+
+  it("wraps bunx via cmd.exe in runCommandWithTimeout on Windows", async () => {
+    const platformSpy = vi.spyOn(process, "platform", "get").mockReturnValue("win32");
+    const expectedComSpec = process.env.ComSpec ?? "cmd.exe";
+
+    spawnMock.mockImplementation(
+      (_command: string, _args: string[], _options: Record<string, unknown>) => createMockChild(),
+    );
+
+    try {
+      const result = await runCommandWithTimeout(["bunx", "--version"], { timeoutMs: 1000 });
+      expect(result.code).toBe(0);
+      const captured = spawnMock.mock.calls[0] as SpawnCall | undefined;
+      if (!captured) {
+        throw new Error("expected command wrapper to be called");
+      }
+      expect(captured[0]).toBe(expectedComSpec);
+      expect(captured[1].slice(0, 3)).toEqual(["/d", "/s", "/c"]);
+      expect(captured[1][3]).toContain("bunx.cmd --version");
+      expect(captured[2].windowsVerbatimArguments).toBe(true);
+    } finally {
+      platformSpy.mockRestore();
+    }
+  });
 });

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ function resolveNpmArgvForWindows(argv: string[]): string[] \| null {`
`79`	`79`	`function resolveCommand(command: string): string {`
`80`	`80`	`return resolveWindowsCommandShim({`
`81`	`81`	`command,`
`82`		`- cmdCommands: ["pnpm", "yarn"],`
	`82`	`+ cmdCommands: ["pnpm", "yarn", "bunx"],`
`83`	`83`	`});`
`84`	`84`	`}`
`85`	`85`