Fix: Windows terminal encoding set to UTF-8

slc03 · slc03 · commit 97ab01eeda75 · 2026-03-15T14:43:43.000+08:00
diff --git a/src/agents/bash-tools.exec-runtime.ts b/src/agents/bash-tools.exec-runtime.ts
@@ -33,7 +33,11 @@ import {
   readEnvInt,
 } from "./bash-tools.shared.js";
 import { buildCursorPositionResponse, stripDsrRequests } from "./pty-dsr.js";
-import { getShellConfig, sanitizeBinaryOutput } from "./shell-utils.js";
+import {
+  getShellConfig,
+  sanitizeBinaryOutput,
+  wrapCommandWithWindowsPowerShellUtf8,
+} from "./shell-utils.js";
 
 // Sanitize inherited host env before merge so dangerous variables from process.env
 // are not propagated into non-sandboxed executions.
@@ -417,11 +421,12 @@ export async function runExecProcess(opts: {
       };
     }
     const { shell, args: shellArgs } = getShellConfig();
-    const childArgv = [shell, ...shellArgs, execCommand];
+    const runtimeCommand = wrapCommandWithWindowsPowerShellUtf8(execCommand, shell);
+    const childArgv = [shell, ...shellArgs, runtimeCommand];
     if (opts.usePty) {
       return {
         mode: "pty" as const,
-        ptyCommand: execCommand,
+        ptyCommand: runtimeCommand,
         childFallbackArgv: childArgv,
         env: shellRuntimeEnv,
         stdinMode: "pipe-open" as const,
diff --git a/src/agents/shell-utils.test.ts b/src/agents/shell-utils.test.ts
@@ -3,7 +3,12 @@ import os from "node:os";
 import path from "node:path";
 import { afterEach, beforeEach, describe, expect, it } from "vitest";
 import { captureEnv } from "../test-utils/env.js";
-import { getShellConfig, resolvePowerShellPath, resolveShellFromPath } from "./shell-utils.js";
+import {
+  getShellConfig,
+  resolvePowerShellPath,
+  resolveShellFromPath,
+  wrapCommandWithWindowsPowerShellUtf8,
+} from "./shell-utils.js";
 
 const isWin = process.platform === "win32";
 
@@ -207,3 +212,26 @@ describe("resolvePowerShellPath", () => {
     expect(resolvePowerShellPath()).toBe(ps51Path);
   });
 });
+
+describe("wrapCommandWithWindowsPowerShellUtf8", () => {
+  it("wraps command with UTF-8 initialization on Windows PowerShell", () => {
+    const shell = process.platform === "win32" ? "powershell.exe" : "pwsh";
+    const wrapped = wrapCommandWithWindowsPowerShellUtf8("Write-Output 'ok'", shell);
+    const shouldWrap = process.platform === "win32";
+
+    if (shouldWrap) {
+      expect(wrapped).toContain("[Console]::OutputEncoding = $__openclawUtf8");
+      expect(wrapped).toContain("$OutputEncoding = $__openclawUtf8");
+      expect(wrapped).toContain("chcp 65001 > $null");
+      expect(wrapped).toContain("Write-Output 'ok'");
+      return;
+    }
+
+    expect(wrapped).toBe("Write-Output 'ok'");
+  });
+
+  it("does not wrap non-powershell shells", () => {
+    const wrapped = wrapCommandWithWindowsPowerShellUtf8("echo ok", "bash");
+    expect(wrapped).toBe("echo ok");
+  });
+});
diff --git a/src/agents/shell-utils.ts b/src/agents/shell-utils.ts
@@ -69,6 +69,34 @@ export function getShellConfig(): { shell: string; args: string[] } {
   return { shell, args: ["-c"] };
 }
 
+function isWindowsPowerShellShell(shell: string): boolean {
+  if (process.platform !== "win32") {
+    return false;
+  }
+  const name = path
+    .basename(shell)
+    .replace(/\.(exe|cmd|bat)$/i, "")
+    .toLowerCase();
+  return name === "powershell" || name === "pwsh";
+}
+
+export function wrapCommandWithWindowsPowerShellUtf8(command: string, shell: string): string {
+  if (!isWindowsPowerShellShell(shell)) {
+    return command;
+  }
+
+  // Keep command semantics while forcing UTF-8 for both PowerShell text streams
+  // and external console apps (via code page 65001 when available).
+  return [
+    "$__openclawUtf8 = [System.Text.UTF8Encoding]::new($false)",
+    "[Console]::InputEncoding = $__openclawUtf8",
+    "[Console]::OutputEncoding = $__openclawUtf8",
+    "$OutputEncoding = $__openclawUtf8",
+    "try { chcp 65001 > $null } catch {}",
+    command,
+  ].join("; ");
+}
+
 export function resolveShellFromPath(name: string): string | undefined {
   const envPath = process.env.PATH ?? "";
   if (!envPath) {
