process: fix Windows cmd exec UTF-8 output

zhangyongjie1997 · zhangyongjie1997 · commit a66fca1b37bf · 2026-03-20T06:21:22.000Z
diff --git a/src/process/exec.ts b/src/process/exec.ts
@@ -100,16 +100,19 @@ export function shouldSpawnWithShell(params: {
 export async function runExec(
   command: string,
   args: string[],
-  opts: number | { timeoutMs?: number; maxBuffer?: number; cwd?: string } = 10_000,
+  opts:
+    | number
+    | { timeoutMs?: number; maxBuffer?: number; cwd?: string; encoding?: BufferEncoding } = 10_000,
 ): Promise<{ stdout: string; stderr: string }> {
+  const encoding = typeof opts === "number" ? "utf8" : (opts.encoding ?? "utf8");
   const options =
     typeof opts === "number"
-      ? { timeout: opts, encoding: "utf8" as const }
+      ? { timeout: opts, encoding }
       : {
           timeout: opts.timeoutMs,
           maxBuffer: opts.maxBuffer,
           cwd: opts.cwd,
-          encoding: "utf8" as const,
+          encoding,
         };
   try {
     const argv = [command, ...args];
@@ -129,10 +132,15 @@ export async function runExec(
       execArgs = args;
     }
     const useCmdWrapper = isWindowsBatchCommand(execCommand);
+    const cmdCommandLine = buildCmdExeCommandLine(execCommand, execArgs);
+    const wrappedCommandLine =
+      process.platform === "win32" && useCmdWrapper && encoding.toLowerCase() === "utf8"
+        ? `chcp 65001>nul && ${cmdCommandLine}`
+        : cmdCommandLine;
     const { stdout, stderr } = useCmdWrapper
       ? await execFileAsync(
           process.env.ComSpec ?? "cmd.exe",
-          ["/d", "/s", "/c", buildCmdExeCommandLine(execCommand, execArgs)],
+          ["/d", "/s", "/c", wrappedCommandLine],
           { ...options, windowsVerbatimArguments: true },
         )
       : await execFileAsync(execCommand, execArgs, options);
diff --git a/src/process/exec.windows.test.ts b/src/process/exec.windows.test.ts
@@ -113,6 +113,7 @@ describe("windows command wrapper behavior", () => {
       await runExec("pnpm", ["--version"], 1000);
       const captured = execFileMock.mock.calls[0] as ExecCall | undefined;
       expectCmdWrappedInvocation({ captured, expectedComSpec });
+      expect(captured?.[1][3]).toContain("chcp 65001>nul &&");
     } finally {
       platformSpy.mockRestore();
     }

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ describe("windows command wrapper behavior", () => {`
`113`	`113`	`await runExec("pnpm", ["--version"], 1000);`
`114`	`114`	`const captured = execFileMock.mock.calls[0] as ExecCall \| undefined;`
`115`	`115`	`expectCmdWrappedInvocation({ captured, expectedComSpec });`
	`116`	`+ expect(captured?.[1][3]).toContain("chcp 65001>nul &&");`
`116`	`117`	`} finally {`
`117`	`118`	`platformSpy.mockRestore();`
`118`	`119`	`}`