fix(process): skip codepage probe for UTF-8 output

steipete · mushuiyu886 · web-flow · commit 4389f844e3d5 · 2026-07-18T22:05:56.000+01:00
Co-authored-by: 杨浩宇0668001029 &lt;yang.haoyu@xydigit.com&gt;
diff --git a/src/process/exec-runner.ts b/src/process/exec-runner.ts
@@ -139,7 +139,7 @@ async function runCommandWithOutputEncoding(
     MAX_PRESERVED_PENDING_LINE_BYTES,
   );
   const maxPreservedOutputLines = Math.max(0, Math.floor(options.maxPreservedOutputLines ?? 16));
-  const windowsEncoding = resolveWindowsConsoleEncoding();
+  const windowsEncoding = forceUtf8 ? null : resolveWindowsConsoleEncoding();
   const cancelController = new AbortController();
   let termination: CommandTerminationReason | undefined;
   let childExitState: { code: number | null; signal: NodeJS.Signals | null } | undefined;
diff --git a/src/process/exec.windows.integration.test.ts b/src/process/exec.windows.integration.test.ts
@@ -7,7 +7,7 @@ describe("runUtf8CommandWithTimeout Windows integration", () => {
     "keeps truncated UTF-8 head output on a code point boundary",
     async () => {
       const result = await runUtf8CommandWithTimeout(
-        [process.execPath, "-e", "process.stdout.write('a😀z')"],
+        [process.execPath, "-e", "process.stdout.write('a😀z'); process.stderr.write('b😀y')"],
         {
           maxOutputBytes: 3,
           outputCapture: "head",
@@ -16,7 +16,9 @@ describe("runUtf8CommandWithTimeout Windows integration", () => {
       );
 
       expect(result.stdout).toBe("a");
+      expect(result.stderr).toBe("b");
       expect(result.stdoutTruncatedBytes).toBe(5);
+      expect(result.stderrTruncatedBytes).toBe(5);
     },
   );
 });
diff --git a/src/process/exec.windows.test.ts b/src/process/exec.windows.test.ts
@@ -533,7 +533,10 @@ describe("Windows command execution", () => {
 
   it("keeps truncated UTF-8 head output on a code point boundary", async () => {
     execaMock.mockImplementationOnce(() =>
-      createMockSubprocess({ stdoutChunks: [Buffer.from("a😀z", "utf8")] }),
+      createMockSubprocess({
+        stdoutChunks: [Buffer.from("a😀z", "utf8")],
+        stderrChunks: [Buffer.from("b😀y", "utf8")],
+      }),
     );
     await withMockedWindowsPlatform(async () => {
       await expect(
@@ -544,8 +547,11 @@ describe("Windows command execution", () => {
         }),
       ).resolves.toMatchObject({
         stdout: "a",
+        stderr: "b",
         stdoutTruncatedBytes: 5,
+        stderrTruncatedBytes: 5,
       });
+      expect(spawnSyncMock).not.toHaveBeenCalled();
     });
   });
 
