opencode-windows-encoding 3.1.0 → 4.0.0

package/README.md

@@ -3,7 +3,7 @@
 [![npm version](https://img.shields.io/npm/v/opencode-windows-encoding)](https://www.npmjs.com/package/opencode-windows-encoding)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
 
-OpenCode plugin that fixes UTF-8 encoding issues when executing shell commands on Windows. Single-file, zero npm runtime dependencies.
+OpenCode plugin that fixes UTF-8 encoding issues when executing shell commands on Windows. Zero npm runtime dependencies.
 
 ## The Problem
 
@@ -36,13 +36,13 @@ chcp 65001 >nul
 - **Zero config** — works out of the box with no options
 - **Debug logging off by default** — set `OPENCODE_UTF8_DEBUG=1` to enable diagnostic logging to `$TMP/utf8-plugin.log`
 
-## Installation
+## Installation (OpenCode V1)
 
 ```bash
 npm install opencode-windows-encoding
 ```
 
-## Usage
+## Usage (OpenCode V1)
 
 Add the plugin to your `opencode.jsonc`:
 
@@ -66,23 +66,51 @@ Or with a specific version:
 
 After adding the plugin, restart OpenCode. All subsequent shell commands will use UTF-8 encoding automatically.
 
+## OpenCode V2 (opencode2)
+
+OpenCode V2 is in beta and uses a different plugin contract (`{ id, setup }`). This package ships a dedicated V2 line on the npm `beta` dist-tag:
+
+```bash
+opencode plugin add opencode-windows-encoding@beta
+```
+
+Or configure it in `opencode.jsonc`:
+
+```jsonc
+{
+  "plugins": [
+    "opencode-windows-encoding@beta"
+  ]
+}
+```
+
+The V2 build injects the encoding prefix via the `shell create.before` hook. The resolved shell is provided directly on the event (`event.shell`, possibly a full path with `.exe`), so the plugin does not need to read `config.shell`.
+
+> Note: the V2 plugin API is still in beta and its contract may change. If anything breaks after upgrading opencode2, please report it.
+
 ## Local Usage (Copy & Go)
 
-This is a single-file plugin. Copy `src/utf8-encoding.ts` directly to OpenCode's plugins directory — no dependencies required:
+The built V1 plugin is a single self-contained JavaScript file (the shared core is bundled inline). From a clone of this repo:
+
+```bash
+npm install && npm run build
+```
+
+Then copy `dist/v1.js` to OpenCode's plugins directory:
 
 **PowerShell:**
 ```powershell
-Copy-Item src/utf8-encoding.ts $env:USERPROFILE/.config/opencode/plugins/utf8-encoding.ts
+Copy-Item dist/v1.js $env:USERPROFILE/.config/opencode/plugins/utf8-encoding.js
 ```
 
 **Bash / WSL:**
 ```bash
-cp src/utf8-encoding.ts ~/.config/opencode/plugins/utf8-encoding.ts
+cp dist/v1.js ~/.config/opencode/plugins/utf8-encoding.js
 ```
 
-Restart OpenCode to apply. No `npm install`, no build step.
+Restart OpenCode to apply.
 
-`src/utf8-encoding.ts` uses only Node.js built-ins (`node:fs`, `node:os`, `node:path`) and a compile-time-only `import type` from `@opencode-ai/plugin` — zero npm runtime dependencies.
+The built file uses only Node.js built-ins (`node:fs`, `node:os`, `node:path`) and a compile-time-only `import type` from `@opencode-ai/plugin` — zero npm runtime dependencies.
 ## Requirements
 
 - **OpenCode** (any recent version with plugin support)
@@ -111,7 +139,7 @@ Reference the source file directly:
 ```jsonc
 {
   "plugin": [
-    "/path/to/opencode-windows-encoding/src/utf8-encoding.ts"
+    "/path/to/opencode-windows-encoding/src/v1.ts"
   ]
 }
 ```

package/dist/{utf8-encoding.d.ts → v1.d.ts}

@@ -1,9 +1,9 @@
 import { PluginInput } from '@opencode-ai/plugin';
 
 /**
- * OpenCode Plugin — UTF-8 Encoding Fix for Windows
+ * OpenCode Plugin — UTF-8 Encoding Fix for Windows (V1)
  *
- * 单文件插件，可直接复制到 ~/.config/opencode/plugins/ 使用，无需 npm install。
+ * V1 入口（tool.execute.before 契约），共享逻辑见 ./encoding-core.ts。
  *
  * 工作原理：拦截所有 bash/shell 工具调用，读取 opencode 配置的 shell
  * （pwsh / bash / cmd），按对应 shell 在命令前注入对应的 UTF-8 编码配置，

package/dist/{utf8-encoding.js → v1.js}

@@ -1,4 +1,4 @@
-// src/utf8-encoding.ts
+// src/encoding-core.ts
 import { appendFileSync } from "fs";
 import { tmpdir } from "os";
 import { join } from "path";
@@ -36,6 +36,23 @@ function detectShellKind(shell) {
   if (base === "cmd") return "cmd";
   return "bash";
 }
+function stripSetPrefixes(cmd) {
+  const m = cmd.match(/^((?:set\s+\w+="[^"]*"\s*&&\s*)+)/);
+  if (m) return { prefixes: m[1], cleanCmd: cmd.slice(m[1].length) };
+  return { prefixes: "", cleanCmd: cmd };
+}
+function injectUtf8Prefix(cmd, kind) {
+  const { prefixes, cleanCmd } = stripSetPrefixes(cmd);
+  flog(`  orig: ${cleanCmd.slice(0, 120)}`);
+  const { prefix, sep, marker } = ENC[kind];
+  if (cleanCmd.includes(marker)) {
+    flog("  skip (idempotent)");
+    return void 0;
+  }
+  return prefixes + prefix + sep + cleanCmd;
+}
+
+// src/v1.ts
 function withTimeout(p, ms) {
   return new Promise((resolve, reject) => {
     const t = setTimeout(() => reject(new Error("timeout")), ms);
@@ -60,11 +77,6 @@ async function resolveShellKind(client) {
     return void 0;
   }
 }
-function stripSetPrefixes(cmd) {
-  const m = cmd.match(/^((?:set\s+\w+="[^"]*"\s*&&\s*)+)/);
-  if (m) return { prefixes: m[1], cleanCmd: cmd.slice(m[1].length) };
-  return { prefixes: "", cleanCmd: cmd };
-}
 var Utf8EncodingPlugin = async (input) => {
   flog("=== LOADED ===");
   let kindPromise = null;
@@ -84,27 +96,22 @@ var Utf8EncodingPlugin = async (input) => {
         flog(`  args keys: ${JSON.stringify(Object.keys(args))}`);
         return;
       }
-      const { prefixes, cleanCmd } = stripSetPrefixes(cmd);
-      flog(`  orig: ${cleanCmd.slice(0, 120)}`);
       const kind = await getKind();
       if (!kind) {
         flog("  skip (no shell configured)");
         return;
       }
-      const { prefix, sep, marker } = ENC[kind];
       flog(`  shell kind: ${kind}`);
-      if (cleanCmd.includes(marker)) {
-        flog("  skip (idempotent)");
-        return;
-      }
-      args.command = prefixes + prefix + sep + cleanCmd;
+      const next = injectUtf8Prefix(cmd, kind);
+      if (next === void 0) return;
+      args.command = next;
       flog("  INJECTED");
     }
   };
 };
-var utf8_encoding_default = Utf8EncodingPlugin;
+var v1_default = Utf8EncodingPlugin;
 export {
   Utf8EncodingPlugin,
-  utf8_encoding_default as default
+  v1_default as default
 };
-//# sourceMappingURL=utf8-encoding.js.map
+//# sourceMappingURL=v1.js.map

package/dist/v1.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/encoding-core.ts","../src/v1.ts"],"sourcesContent":["/**\n * 共享核心 — UTF-8 编码前缀注入逻辑\n *\n * 由 V1（v1.ts）与 V2（v2.ts）入口共同复用；\n * 仅依赖 Node.js 内置模块，不引用任何插件包类型。\n */\n\nimport { appendFileSync } from \"node:fs\"\nimport { tmpdir } from \"node:os\"\nimport { join } from \"node:path\"\n\n// 调试日志（写入临时目录，默认关闭，设 OPENCODE_UTF8_DEBUG=1 开启）\nconst DEBUG = process.env.OPENCODE_UTF8_DEBUG === \"1\"\nconst LOG = join(tmpdir(), \"utf8-plugin.log\")\nexport function flog(msg: string) {\n  if (!DEBUG) return\n  try { appendFileSync(LOG, `[${new Date().toISOString()}] ${msg}\\n`, \"utf8\") } catch {}\n}\n\nexport type ShellKind = \"pwsh\" | \"bash\" | \"cmd\"\n\n// ── 各 shell 的 UTF-8 编码前缀与命令分隔符 ──\nexport const ENC: Record<ShellKind, { prefix: string; sep: string; marker: string }> = {\n  pwsh: {\n    prefix:\n      \"[Console]::OutputEncoding=[Console]::InputEncoding=[Text.Encoding]::UTF8;\" +\n      \"$OutputEncoding=[Text.Encoding]::UTF8;\" +\n      \"$env:PYTHONIOENCODING='utf-8';\",\n    sep: \"\\n\",\n    marker: \"OutputEncoding\",\n  },\n  bash: {\n    prefix: \"export LC_ALL=C.UTF-8; export LANG=C.UTF-8; export PYTHONIOENCODING=utf-8;\",\n    sep: \"\\n\",\n    marker: \"LC_ALL\",\n  },\n  cmd: {\n    prefix: \"chcp 65001 >nul\",\n    sep: \" & \",\n    marker: \"chcp\",\n  },\n}\n\n/** 由 shell 路径/名称（可能含目录与 .exe 后缀）归一化为 shell 类型；无法识别返回 undefined（不注入） */\nexport function detectShellKind(shell: string | undefined): ShellKind | undefined {\n  if (!shell) return undefined\n  const base = shell\n    .replace(/\\\\/g, \"/\")\n    .split(\"/\")\n    .pop()!\n    .toLowerCase()\n    .replace(/\\.exe$/, \"\")\n  if (base === \"pwsh\" || base === \"powershell\") return \"pwsh\"\n  if (base === \"cmd\") return \"cmd\"\n  return \"bash\" // bash / zsh / sh / dash / ksh 等 POSIX shell\n}\n\n/** 提取 opencode 在命令前追加的 set VAR=\"value\" && 前缀 */\nexport function stripSetPrefixes(cmd: string): { prefixes: string; cleanCmd: string } {\n  const m = cmd.match(/^((?:set\\s+\\w+=\"[^\"]*\"\\s*&&\\s*)+)/)\n  if (m) return { prefixes: m[1], cleanCmd: cmd.slice(m[1].length) }\n  return { prefixes: \"\", cleanCmd: cmd }\n}\n\n/** 在命令前注入 UTF-8 编码前缀；已含 marker（幂等）时返回 undefined */\nexport function injectUtf8Prefix(cmd: string, kind: ShellKind): string | undefined {\n  const { prefixes, cleanCmd } = stripSetPrefixes(cmd)\n  flog(`  orig: ${cleanCmd.slice(0, 120)}`)\n\n  const { prefix, sep, marker } = ENC[kind]\n\n  // 防止重复注入\n  if (cleanCmd.includes(marker)) { flog(\"  skip (idempotent)\"); return undefined }\n\n  return prefixes + prefix + sep + cleanCmd\n}\n","/**\n * OpenCode Plugin — UTF-8 Encoding Fix for Windows (V1)\n *\n * V1 入口（tool.execute.before 契约），共享逻辑见 ./encoding-core.ts。\n *\n * 工作原理：拦截所有 bash/shell 工具调用，读取 opencode 配置的 shell\n * （pwsh / bash / cmd），按对应 shell 在命令前注入对应的 UTF-8 编码配置，\n * 解决中文/非 ASCII 字符乱码问题。未配置 shell 时不注入。\n */\n\nimport type { PluginInput } from \"@opencode-ai/plugin\"\nimport { detectShellKind, flog, injectUtf8Prefix, type ShellKind } from \"./encoding-core.js\"\n\n/** 带超时的 Promise（插件内不引入额外运行时依赖） */\nfunction withTimeout<T>(p: Promise<T>, ms: number): Promise<T> {\n  return new Promise((resolve, reject) => {\n    const t = setTimeout(() => reject(new Error(\"timeout\")), ms)\n    p.then(\n      (v) => { clearTimeout(t); resolve(v) },\n      (e) => { clearTimeout(t); reject(e) },\n    )\n  })\n}\n\n/** 读取 opencode 配置中的 shell，失败/超时/未配置返回 undefined（不注入，永不 reject） */\nasync function resolveShellKind(client: PluginInput[\"client\"]): Promise<ShellKind | undefined> {\n  try {\n    const res = await withTimeout(client.config.get(), 3000)\n    const shell = (res.data as unknown as { shell?: string } | undefined)?.shell\n    return detectShellKind(shell)\n  } catch {\n    return undefined\n  }\n}\n\nexport const Utf8EncodingPlugin = async (input: PluginInput) => {\n  flog(\"=== LOADED ===\")\n\n  // 惰性检测：绝不在插件加载阶段调用 client.config.get()\n  //（会因 httpapi 未就绪 + 请求无超时而永久挂起，导致 opencode 启动死锁）。\n  // 首次 tool hook 触发时再查，结果缓存。\n  let kindPromise: Promise<ShellKind | undefined> | null = null\n  const getKind = () => (kindPromise ??= resolveShellKind(input.client))\n\n  return {\n    \"tool.execute.before\": async (input: { tool: string; sessionID: string; callID: string }, output: { args: any }) => {\n      const tool = String(input?.tool ?? \"\")\n      flog(`[tool.before] tool=\"${tool}\"`)\n\n      if (tool !== \"bash\" && tool !== \"shell\") return\n\n      const args = output.args\n      if (!args) { flog(\"  no args\"); return }\n\n      const cmd = args.command\n      if (typeof cmd !== \"string\" || !cmd) {\n        flog(`  args keys: ${JSON.stringify(Object.keys(args))}`)\n        return\n      }\n\n      const kind = await getKind()\n      if (!kind) { flog(\"  skip (no shell configured)\"); return }\n      flog(`  shell kind: ${kind}`)\n\n      const next = injectUtf8Prefix(cmd, kind)\n      if (next === undefined) return // 幂等 skip 日志已由 core 输出\n\n      args.command = next\n      flog(\"  INJECTED\")\n    },\n  }\n}\n\nexport default Utf8EncodingPlugin\n"],"mappings":"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","names":["input"]}

package/dist/v2.d.ts

@@ -0,0 +1,29 @@
+/**
+ * OpenCode V2 (opencode2) Plugin — UTF-8 Encoding Fix for Windows
+ *
+ * V2 入口（{ id, setup } 契约）。类型为自包含最小结构声明，
+ * 已对照 @opencode-ai/plugin@0.0.0-beta-18866（npm dist-tag beta）验证；
+ * V2 插件 API 在 beta 期间可能变动，升级时需重新核对。
+ */
+interface ShellCreateBeforeEvent {
+    command: string;
+    cwd: string;
+    timeout: number;
+    shell: string;
+    env: Record<string, string | undefined>;
+}
+interface HookRegistration {
+    dispose(): Promise<void>;
+}
+interface PluginContextV2 {
+    shell: {
+        hook(name: "create.before", cb: (event: ShellCreateBeforeEvent) => void | Promise<void>): Promise<HookRegistration>;
+    };
+}
+interface PluginV2 {
+    id: string;
+    setup(ctx: PluginContextV2): void | (() => void | Promise<void>) | Promise<void | (() => void | Promise<void>)>;
+}
+declare const Utf8EncodingPluginV2: PluginV2;
+
+export { Utf8EncodingPluginV2 as default };

package/dist/v2.js

@@ -0,0 +1,80 @@
+// src/encoding-core.ts
+import { appendFileSync } from "fs";
+import { tmpdir } from "os";
+import { join } from "path";
+var DEBUG = process.env.OPENCODE_UTF8_DEBUG === "1";
+var LOG = join(tmpdir(), "utf8-plugin.log");
+function flog(msg) {
+  if (!DEBUG) return;
+  try {
+    appendFileSync(LOG, `[${(/* @__PURE__ */ new Date()).toISOString()}] ${msg}
+`, "utf8");
+  } catch {
+  }
+}
+var ENC = {
+  pwsh: {
+    prefix: "[Console]::OutputEncoding=[Console]::InputEncoding=[Text.Encoding]::UTF8;$OutputEncoding=[Text.Encoding]::UTF8;$env:PYTHONIOENCODING='utf-8';",
+    sep: "\n",
+    marker: "OutputEncoding"
+  },
+  bash: {
+    prefix: "export LC_ALL=C.UTF-8; export LANG=C.UTF-8; export PYTHONIOENCODING=utf-8;",
+    sep: "\n",
+    marker: "LC_ALL"
+  },
+  cmd: {
+    prefix: "chcp 65001 >nul",
+    sep: " & ",
+    marker: "chcp"
+  }
+};
+function detectShellKind(shell) {
+  if (!shell) return void 0;
+  const base = shell.replace(/\\/g, "/").split("/").pop().toLowerCase().replace(/\.exe$/, "");
+  if (base === "pwsh" || base === "powershell") return "pwsh";
+  if (base === "cmd") return "cmd";
+  return "bash";
+}
+function stripSetPrefixes(cmd) {
+  const m = cmd.match(/^((?:set\s+\w+="[^"]*"\s*&&\s*)+)/);
+  if (m) return { prefixes: m[1], cleanCmd: cmd.slice(m[1].length) };
+  return { prefixes: "", cleanCmd: cmd };
+}
+function injectUtf8Prefix(cmd, kind) {
+  const { prefixes, cleanCmd } = stripSetPrefixes(cmd);
+  flog(`  orig: ${cleanCmd.slice(0, 120)}`);
+  const { prefix, sep, marker } = ENC[kind];
+  if (cleanCmd.includes(marker)) {
+    flog("  skip (idempotent)");
+    return void 0;
+  }
+  return prefixes + prefix + sep + cleanCmd;
+}
+
+// src/v2.ts
+var Utf8EncodingPluginV2 = {
+  id: "utf8-encoding",
+  async setup(ctx) {
+    flog("=== LOADED (v2) ===");
+    const registration = await ctx.shell.hook("create.before", (event) => {
+      flog(`[shell.create.before] shell="${event.shell}"`);
+      const kind = detectShellKind(event.shell);
+      if (!kind) {
+        flog("  skip (unknown shell)");
+        return;
+      }
+      flog(`  shell kind: ${kind}`);
+      const next = injectUtf8Prefix(event.command, kind);
+      if (next === void 0) return;
+      event.command = next;
+      flog("  INJECTED");
+    });
+    return () => registration.dispose();
+  }
+};
+var v2_default = Utf8EncodingPluginV2;
+export {
+  v2_default as default
+};
+//# sourceMappingURL=v2.js.map

package/dist/v2.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/encoding-core.ts","../src/v2.ts"],"sourcesContent":["/**\n * 共享核心 — UTF-8 编码前缀注入逻辑\n *\n * 由 V1（v1.ts）与 V2（v2.ts）入口共同复用；\n * 仅依赖 Node.js 内置模块，不引用任何插件包类型。\n */\n\nimport { appendFileSync } from \"node:fs\"\nimport { tmpdir } from \"node:os\"\nimport { join } from \"node:path\"\n\n// 调试日志（写入临时目录，默认关闭，设 OPENCODE_UTF8_DEBUG=1 开启）\nconst DEBUG = process.env.OPENCODE_UTF8_DEBUG === \"1\"\nconst LOG = join(tmpdir(), \"utf8-plugin.log\")\nexport function flog(msg: string) {\n  if (!DEBUG) return\n  try { appendFileSync(LOG, `[${new Date().toISOString()}] ${msg}\\n`, \"utf8\") } catch {}\n}\n\nexport type ShellKind = \"pwsh\" | \"bash\" | \"cmd\"\n\n// ── 各 shell 的 UTF-8 编码前缀与命令分隔符 ──\nexport const ENC: Record<ShellKind, { prefix: string; sep: string; marker: string }> = {\n  pwsh: {\n    prefix:\n      \"[Console]::OutputEncoding=[Console]::InputEncoding=[Text.Encoding]::UTF8;\" +\n      \"$OutputEncoding=[Text.Encoding]::UTF8;\" +\n      \"$env:PYTHONIOENCODING='utf-8';\",\n    sep: \"\\n\",\n    marker: \"OutputEncoding\",\n  },\n  bash: {\n    prefix: \"export LC_ALL=C.UTF-8; export LANG=C.UTF-8; export PYTHONIOENCODING=utf-8;\",\n    sep: \"\\n\",\n    marker: \"LC_ALL\",\n  },\n  cmd: {\n    prefix: \"chcp 65001 >nul\",\n    sep: \" & \",\n    marker: \"chcp\",\n  },\n}\n\n/** 由 shell 路径/名称（可能含目录与 .exe 后缀）归一化为 shell 类型；无法识别返回 undefined（不注入） */\nexport function detectShellKind(shell: string | undefined): ShellKind | undefined {\n  if (!shell) return undefined\n  const base = shell\n    .replace(/\\\\/g, \"/\")\n    .split(\"/\")\n    .pop()!\n    .toLowerCase()\n    .replace(/\\.exe$/, \"\")\n  if (base === \"pwsh\" || base === \"powershell\") return \"pwsh\"\n  if (base === \"cmd\") return \"cmd\"\n  return \"bash\" // bash / zsh / sh / dash / ksh 等 POSIX shell\n}\n\n/** 提取 opencode 在命令前追加的 set VAR=\"value\" && 前缀 */\nexport function stripSetPrefixes(cmd: string): { prefixes: string; cleanCmd: string } {\n  const m = cmd.match(/^((?:set\\s+\\w+=\"[^\"]*\"\\s*&&\\s*)+)/)\n  if (m) return { prefixes: m[1], cleanCmd: cmd.slice(m[1].length) }\n  return { prefixes: \"\", cleanCmd: cmd }\n}\n\n/** 在命令前注入 UTF-8 编码前缀；已含 marker（幂等）时返回 undefined */\nexport function injectUtf8Prefix(cmd: string, kind: ShellKind): string | undefined {\n  const { prefixes, cleanCmd } = stripSetPrefixes(cmd)\n  flog(`  orig: ${cleanCmd.slice(0, 120)}`)\n\n  const { prefix, sep, marker } = ENC[kind]\n\n  // 防止重复注入\n  if (cleanCmd.includes(marker)) { flog(\"  skip (idempotent)\"); return undefined }\n\n  return prefixes + prefix + sep + cleanCmd\n}\n","/**\n * OpenCode V2 (opencode2) Plugin — UTF-8 Encoding Fix for Windows\n *\n * V2 入口（{ id, setup } 契约）。类型为自包含最小结构声明，\n * 已对照 @opencode-ai/plugin@0.0.0-beta-18866（npm dist-tag beta）验证；\n * V2 插件 API 在 beta 期间可能变动，升级时需重新核对。\n */\n\nimport { detectShellKind, flog, injectUtf8Prefix } from \"./encoding-core.js\"\n\ninterface ShellCreateBeforeEvent {\n  command: string\n  cwd: string\n  timeout: number\n  shell: string\n  env: Record<string, string | undefined>\n}\ninterface HookRegistration { dispose(): Promise<void> }\ninterface PluginContextV2 {\n  shell: {\n    hook(name: \"create.before\", cb: (event: ShellCreateBeforeEvent) => void | Promise<void>): Promise<HookRegistration>\n  }\n}\ninterface PluginV2 {\n  id: string\n  setup(ctx: PluginContextV2): void | (() => void | Promise<void>) | Promise<void | (() => void | Promise<void>)>\n}\n\nconst Utf8EncodingPluginV2: PluginV2 = {\n  id: \"utf8-encoding\",\n  async setup(ctx) {\n    flog(\"=== LOADED (v2) ===\")\n    const registration = await ctx.shell.hook(\"create.before\", (event) => {\n      flog(`[shell.create.before] shell=\"${event.shell}\"`)\n      const kind = detectShellKind(event.shell)\n      if (!kind) { flog(\"  skip (unknown shell)\"); return }\n      flog(`  shell kind: ${kind}`)\n      const next = injectUtf8Prefix(event.command, kind)\n      if (next === undefined) return // 幂等 skip 日志已由 core 输出\n      event.command = next\n      flog(\"  INJECTED\")\n    })\n    return () => registration.dispose()\n  },\n}\nexport default Utf8EncodingPluginV2\n"],"mappings":";AAOA,SAAS,sBAAsB;AAC/B,SAAS,cAAc;AACvB,SAAS,YAAY;AAGrB,IAAM,QAAQ,QAAQ,IAAI,wBAAwB;AAClD,IAAM,MAAM,KAAK,OAAO,GAAG,iBAAiB;AACrC,SAAS,KAAK,KAAa;AAChC,MAAI,CAAC,MAAO;AACZ,MAAI;AAAE,mBAAe,KAAK,KAAI,oBAAI,KAAK,GAAE,YAAY,CAAC,KAAK,GAAG;AAAA,GAAM,MAAM;AAAA,EAAE,QAAQ;AAAA,EAAC;AACvF;AAKO,IAAM,MAA0E;AAAA,EACrF,MAAM;AAAA,IACJ,QACE;AAAA,IAGF,KAAK;AAAA,IACL,QAAQ;AAAA,EACV;AAAA,EACA,MAAM;AAAA,IACJ,QAAQ;AAAA,IACR,KAAK;AAAA,IACL,QAAQ;AAAA,EACV;AAAA,EACA,KAAK;AAAA,IACH,QAAQ;AAAA,IACR,KAAK;AAAA,IACL,QAAQ;AAAA,EACV;AACF;AAGO,SAAS,gBAAgB,OAAkD;AAChF,MAAI,CAAC,MAAO,QAAO;AACnB,QAAM,OAAO,MACV,QAAQ,OAAO,GAAG,EAClB,MAAM,GAAG,EACT,IAAI,EACJ,YAAY,EACZ,QAAQ,UAAU,EAAE;AACvB,MAAI,SAAS,UAAU,SAAS,aAAc,QAAO;AACrD,MAAI,SAAS,MAAO,QAAO;AAC3B,SAAO;AACT;AAGO,SAAS,iBAAiB,KAAqD;AACpF,QAAM,IAAI,IAAI,MAAM,mCAAmC;AACvD,MAAI,EAAG,QAAO,EAAE,UAAU,EAAE,CAAC,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE;AACjE,SAAO,EAAE,UAAU,IAAI,UAAU,IAAI;AACvC;AAGO,SAAS,iBAAiB,KAAa,MAAqC;AACjF,QAAM,EAAE,UAAU,SAAS,IAAI,iBAAiB,GAAG;AACnD,OAAK,WAAW,SAAS,MAAM,GAAG,GAAG,CAAC,EAAE;AAExC,QAAM,EAAE,QAAQ,KAAK,OAAO,IAAI,IAAI,IAAI;AAGxC,MAAI,SAAS,SAAS,MAAM,GAAG;AAAE,SAAK,qBAAqB;AAAG,WAAO;AAAA,EAAU;AAE/E,SAAO,WAAW,SAAS,MAAM;AACnC;;;AC/CA,IAAM,uBAAiC;AAAA,EACrC,IAAI;AAAA,EACJ,MAAM,MAAM,KAAK;AACf,SAAK,qBAAqB;AAC1B,UAAM,eAAe,MAAM,IAAI,MAAM,KAAK,iBAAiB,CAAC,UAAU;AACpE,WAAK,gCAAgC,MAAM,KAAK,GAAG;AACnD,YAAM,OAAO,gBAAgB,MAAM,KAAK;AACxC,UAAI,CAAC,MAAM;AAAE,aAAK,wBAAwB;AAAG;AAAA,MAAO;AACpD,WAAK,iBAAiB,IAAI,EAAE;AAC5B,YAAM,OAAO,iBAAiB,MAAM,SAAS,IAAI;AACjD,UAAI,SAAS,OAAW;AACxB,YAAM,UAAU;AAChB,WAAK,YAAY;AAAA,IACnB,CAAC;AACD,WAAO,MAAM,aAAa,QAAQ;AAAA,EACpC;AACF;AACA,IAAO,aAAQ;","names":[]}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "opencode-windows-encoding",
-  "version": "3.1.0",
+  "version": "4.0.0",
   "description": "OpenCode plugin to fix UTF-8 encoding issues in PowerShell on Windows",
   "type": "module",
-  "main": "./dist/utf8-encoding.js",
-  "types": "./dist/utf8-encoding.d.ts",
+  "main": "./dist/v1.js",
+  "types": "./dist/v1.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/utf8-encoding.d.ts",
-      "import": "./dist/utf8-encoding.js"
+      "types": "./dist/v1.d.ts",
+      "import": "./dist/v1.js"
     }
   },
   "files": [
@@ -18,7 +18,8 @@
     "build": "tsup",
     "dev": "tsup --watch",
     "typecheck": "tsc --noEmit",
-    "prepublishOnly": "npm run build"
+    "prepublishOnly": "npm run build",
+    "publish:beta": "node scripts/publish-v2.mjs"
   },
   "keywords": [
     "opencode",
@@ -34,7 +35,6 @@
     "url": "git+https://github.com/Cle2ment/opencode-windows-encoding.git"
   },
   "license": "AGPL-3.0",
-  "dependencies": {},
   "devDependencies": {
     "@opencode-ai/plugin": "^1.17.11",
     "@types/node": "^22.0.0",

package/dist/utf8-encoding.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/utf8-encoding.ts"],"sourcesContent":["/**\n * OpenCode Plugin — UTF-8 Encoding Fix for Windows\n *\n * 单文件插件，可直接复制到 ~/.config/opencode/plugins/ 使用，无需 npm install。\n *\n * 工作原理：拦截所有 bash/shell 工具调用，读取 opencode 配置的 shell\n * （pwsh / bash / cmd），按对应 shell 在命令前注入对应的 UTF-8 编码配置，\n * 解决中文/非 ASCII 字符乱码问题。未配置 shell 时不注入。\n */\n\nimport { appendFileSync } from \"node:fs\"\nimport { tmpdir } from \"node:os\"\nimport { join } from \"node:path\"\nimport type { PluginInput } from \"@opencode-ai/plugin\"\n\n// 调试日志（写入临时目录，默认关闭，设 OPENCODE_UTF8_DEBUG=1 开启）\nconst DEBUG = process.env.OPENCODE_UTF8_DEBUG === \"1\"\nconst LOG = join(tmpdir(), \"utf8-plugin.log\")\nfunction flog(msg: string) {\n  if (!DEBUG) return\n  try { appendFileSync(LOG, `[${new Date().toISOString()}] ${msg}\\n`, \"utf8\") } catch {}\n}\n\ntype ShellKind = \"pwsh\" | \"bash\" | \"cmd\"\n\n// ── 各 shell 的 UTF-8 编码前缀与命令分隔符 ──\nconst ENC: Record<ShellKind, { prefix: string; sep: string; marker: string }> = {\n  pwsh: {\n    prefix:\n      \"[Console]::OutputEncoding=[Console]::InputEncoding=[Text.Encoding]::UTF8;\" +\n      \"$OutputEncoding=[Text.Encoding]::UTF8;\" +\n      \"$env:PYTHONIOENCODING='utf-8';\",\n    sep: \"\\n\",\n    marker: \"OutputEncoding\",\n  },\n  bash: {\n    prefix: \"export LC_ALL=C.UTF-8; export LANG=C.UTF-8; export PYTHONIOENCODING=utf-8;\",\n    sep: \"\\n\",\n    marker: \"LC_ALL\",\n  },\n  cmd: {\n    prefix: \"chcp 65001 >nul\",\n    sep: \" & \",\n    marker: \"chcp\",\n  },\n}\n\n/** 由 config.shell 的值归一化为 shell 类型；未配置返回 undefined（不注入） */\nfunction detectShellKind(shell: string | undefined): ShellKind | undefined {\n  if (!shell) return undefined\n  const base = shell\n    .replace(/\\\\/g, \"/\")\n    .split(\"/\")\n    .pop()!\n    .toLowerCase()\n    .replace(/\\.exe$/, \"\")\n  if (base === \"pwsh\" || base === \"powershell\") return \"pwsh\"\n  if (base === \"cmd\") return \"cmd\"\n  return \"bash\" // bash / zsh / sh / dash / ksh 等 POSIX shell\n}\n\n/** 带超时的 Promise（插件内不引入额外运行时依赖） */\nfunction withTimeout<T>(p: Promise<T>, ms: number): Promise<T> {\n  return new Promise((resolve, reject) => {\n    const t = setTimeout(() => reject(new Error(\"timeout\")), ms)\n    p.then(\n      (v) => { clearTimeout(t); resolve(v) },\n      (e) => { clearTimeout(t); reject(e) },\n    )\n  })\n}\n\n/** 读取 opencode 配置中的 shell，失败/超时/未配置返回 undefined（不注入，永不 reject） */\nasync function resolveShellKind(client: PluginInput[\"client\"]): Promise<ShellKind | undefined> {\n  try {\n    const res = await withTimeout(client.config.get(), 3000)\n    const shell = (res.data as unknown as { shell?: string } | undefined)?.shell\n    return detectShellKind(shell)\n  } catch {\n    return undefined\n  }\n}\n\n/** 提取 opencode 在命令前追加的 set VAR=\"value\" && 前缀 */\nfunction stripSetPrefixes(cmd: string): { prefixes: string; cleanCmd: string } {\n  const m = cmd.match(/^((?:set\\s+\\w+=\"[^\"]*\"\\s*&&\\s*)+)/)\n  if (m) return { prefixes: m[1], cleanCmd: cmd.slice(m[1].length) }\n  return { prefixes: \"\", cleanCmd: cmd }\n}\n\nexport const Utf8EncodingPlugin = async (input: PluginInput) => {\n  flog(\"=== LOADED ===\")\n\n  // 惰性检测：绝不在插件加载阶段调用 client.config.get()\n  //（会因 httpapi 未就绪 + 请求无超时而永久挂起，导致 opencode 启动死锁）。\n  // 首次 tool hook 触发时再查，结果缓存。\n  let kindPromise: Promise<ShellKind | undefined> | null = null\n  const getKind = () => (kindPromise ??= resolveShellKind(input.client))\n\n  return {\n    \"tool.execute.before\": async (input: { tool: string; sessionID: string; callID: string }, output: { args: any }) => {\n      const tool = String(input?.tool ?? \"\")\n      flog(`[tool.before] tool=\"${tool}\"`)\n\n      if (tool !== \"bash\" && tool !== \"shell\") return\n\n      const args = output.args\n      if (!args) { flog(\"  no args\"); return }\n\n      const cmd = args.command\n      if (typeof cmd !== \"string\" || !cmd) {\n        flog(`  args keys: ${JSON.stringify(Object.keys(args))}`)\n        return\n      }\n\n      const { prefixes, cleanCmd } = stripSetPrefixes(cmd)\n      flog(`  orig: ${cleanCmd.slice(0, 120)}`)\n\n      const kind = await getKind()\n      if (!kind) { flog(\"  skip (no shell configured)\"); return }\n      const { prefix, sep, marker } = ENC[kind]\n      flog(`  shell kind: ${kind}`)\n\n      // 防止重复注入\n      if (cleanCmd.includes(marker)) { flog(\"  skip (idempotent)\"); return }\n\n      args.command = prefixes + prefix + sep + cleanCmd\n      flog(\"  INJECTED\")\n    },\n  }\n}\n\nexport default Utf8EncodingPlugin\n"],"mappings":"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","names":["input"]}