dsh-win-pwsh7 0.2.3 → 0.2.5

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## 0.2.5 — transitional Windows UTF-8 console bridge
+
+- Added `lib/utf8-console-bridge.js`, a removable layer that wraps the same `ctx.shell.execute`
+  the `pwsh` tool uses and prefixes Windows commands with `chcp.com 65001 > $null;`. A nested
+  `pwsh -File` / `powershell -File` otherwise inherits the console code page (936 on a Simplified
+  Chinese machine) and emits GBK, which the Host collector decodes as UTF-8 and renders as U+FFFD.
+- `utf8Console` (default `true`) gates the layer. It fails open when the shell service, the
+  executor shape or the config reader is unavailable, and restores the original executor when the
+  plugin unloads. No tool, prompt, install or gate behavior changed.
+- `tools/check-utf8-bridge.mjs` covers the prefix, opt-out, idempotence, restore and fail-open paths
+  with a fake executor; it runs in the `check` chain.
+- Removal contract: delete `lib/utf8-console-bridge.js`, its import and mount in `index.js`, the
+  `utf8Console` config field, the bridge gate and its `check` entry, plus the README section and
+  this note. The README records the exact steps and the `grep` acceptance check.
+
+## 0.2.4 — plugin page aligned with the dsh-ops card language
+
+- Restyled both contributions after the installed dsh-ops 0.5.0 branch: a 0.5px hairline card on
+  `radius-lg` with a shaded card body, 13px/600 group titles, max-content fact labels, and the
+  same input, button and focus-token metrics.
+- Split the configure surface into two cards: the executor path sits in a shaded body, the
+  dsh-ops coexistence switch sits in the card head, and save/reset follow the cards.
+- The status section is one card now: title, refresh metric and action in the head, the facts in
+  a shaded body, and the profile patch as a sunken preview block.
+- Updated the client gate to assert the card language instead of the retired flat section.
+
 ## 0.2.3 — removable dsh-ops coexistence bridge
 
 - Moved the bridge, profile-patch ownership, and pure name planning into `lib/dsh-ops-bridge.js`.

package/README.en.md

@@ -44,7 +44,7 @@ multi-session validation passed, so the switch is default-on again.
 ## Install this plugin
 
 ```powershell
-dsh plugin --profile desktop add github:XinSpark/dsh-win-pwsh7#v0.2.3
+dsh plugin --profile desktop add github:XinSpark/dsh-win-pwsh7#v0.2.5
 # or
 dsh plugin --profile desktop add dsh-win-pwsh7
 ```
@@ -83,6 +83,7 @@ The count lives in the current process and resets when DSH restarts.
 |---|---|---|
 | `overridePath` | unset | Priority ① explicit `pwsh.exe`. It must spawn and report PowerShell 7+; a failed validation falls back to auto-detection. **It only changes probing and recommendations, not executor wiring.** |
 | `dshOpsCompat` | `true` | Coexist with dsh-ops (on by default): writes and enables its Compatibility mode, hides duplicate official tools, and keeps `pwsh` + `ops_bash`. Requires a restart. |
+| `utf8Console` | `true` | Transitional: prefixes every `pwsh` tool command with `chcp.com 65001` on Windows, so a nested `pwsh -File` cannot emit GBK under code page 936 and be decoded as UTF-8. Removable once the Host ships the same fix. |
 
 `overridePath` is `volatile()`: the plugin-page configuration section saves it live; it can also be
 set in the profile patch:
@@ -129,6 +130,42 @@ The status section is a native card showing the state, runtime and executor path
 at the top right; the configuration section exposes `overridePath` and the default-on "Keep native
 pwsh alongside dsh-ops" native switch.
 
+## Windows UTF-8 console (transitional)
+
+The Host collector decodes `pwsh` output as UTF-8, but a `pwsh -File` / `powershell -File` started
+inside a tool command inherits the **console code page** (936 on a Simplified Chinese machine) and
+emits GBK, which then renders as `�`. The Host preamble pins the outer process's .NET encoding, not
+the console code page.
+
+0.2.5 adds a transitional layer: it wraps the same `ctx.shell.execute` the `pwsh` tool uses and
+prefixes every Windows command with `chcp.com 65001 > $null;`. It affects only this plugin's users,
+is on by default, can be disabled with `utf8Console: false`, and fails open when the Host shape
+does not match.
+
+### Removal contract
+
+After the Host ships the same fix, delete the layer whole:
+
+1. delete `lib/utf8-console-bridge.js`;
+2. delete the import and `mountUtf8ConsoleBridge(ctx, current)` call in `index.js`;
+3. delete `Config.utf8Console`;
+4. delete `tools/check-utf8-bridge.mjs` and its entry in the `package.json` `check` chain;
+5. delete this section and the 0.2.5 transitional note in CHANGELOG.
+
+Acceptance: `grep -rn "utf8-console-bridge\|utf8Console" index.js lib tools` returns nothing.
+
+### Deciding that the Host has fixed it
+
+Either signal is enough to start removing the layer:
+
+- `@deepseek-ai/dsh-pwsh-local`'s own `ENCODING_PREAMBLE` includes the `chcp.com 65001` switch
+  (check `packages/shell/pwsh-local/src/index.ts` upstream, or `lib/index.js` in the installed
+  package);
+- with this plugin absent or `utf8Console` off, a nested `pwsh -File` under a CP936 console already
+  prints UTF-8.
+
+Re-run the nested script in a real CP936 environment before deleting.
+
 ## Disable or uninstall
 
 Disabling the plugin removes the `pwsh` gate and the plugin page; it does not uninstall PowerShell 7.
@@ -143,6 +180,7 @@ to 5.1, uninstall the Store build or pin the executor to `powershell.exe` (not r
 | The Store page opens without an Install button | Confirm the VPN is off, fully quit and restart Microsoft Store, then retry; or use the manual path. |
 | `pwsh` still runs 5.1 | Run `pwsh7_status`, paste the reported `pwshPath` patch into the profile, and restart; or install the Store build. |
 | The plugin page is missing | Confirm `dsh-win-pwsh7` is enabled in the current profile, then restart DSH. |
+| Chinese turns into `�` when a command nests `pwsh` | 0.2.5 handles it through `utf8Console`; if you disabled it, turn it back on or prefix the command with `chcp.com 65001 > $null;`. |
 
 ## Verification
 
@@ -150,10 +188,11 @@ to 5.1, uninstall the Store build or pin the executor to `powershell.exe` (not r
 $env:DSH_APP_DIR = 'E:\FXS\APP\DSH NEXT\resources\app.asar'
 node tools/check-host.mjs
 node tools/check-client.mjs
+node tools/check-utf8-bridge.mjs
 node tools/check-native-contracts.mjs
 ```
 
-All three gates run offline against a packed installation (`resources/app.asar`); `DSH_APP_DIR`
+All four gates run offline against a packed installation (`resources/app.asar`); `DSH_APP_DIR`
 accepts the install root, `resources/app`, or `resources/app.asar`.
 
 ## Design constraints
@@ -163,7 +202,7 @@ accepts the install root, `resources/app`, or `resources/app.asar`.
 - No VPN auto-detection and no metered-connection preflight: the user confirms the VPN before an
   install, and a page-load failure asks again.
 - No automatic retries; the three-failure breaker ends the loop.
-- Run all three gates before publishing; end-to-end installation is release evidence, not part of
+- Run all four gates before publishing; end-to-end installation is release evidence, not part of
   the automated gate.
 
 ## License

package/README.md

@@ -36,7 +36,7 @@
 
 ```powershell
 # 从 GitHub 安装（推荐锁定 tag）
-dsh plugin --profile desktop add github:XinSpark/dsh-win-pwsh7#v0.2.3
+dsh plugin --profile desktop add github:XinSpark/dsh-win-pwsh7#v0.2.5
 # 或 npm
 dsh plugin --profile desktop add dsh-win-pwsh7
 ```
@@ -70,6 +70,7 @@ dsh plugin --profile desktop add dsh-win-pwsh7
 |---|---|---|
 | `overridePath` | 未设 | 优先级①的显式 `pwsh.exe`。必须能启动并报告 PowerShell 7+；未通过校验就回落到自动探测。**只影响探测与推荐，不接线**。 |
 | `dshOpsCompat` | `true` | 与 dsh-ops 共存（默认开启）：自动写入并启用兼容模式，隐藏重复的官方工具，保留 `pwsh` + `ops_bash`。需要重启。 |
+| `utf8Console` | `true` | 过渡层：Windows 下给 `pwsh` 工具的每条命令前加 `chcp.com 65001`，避免嵌套 `pwsh -File` 按 936 输出 GBK 后被按 UTF-8 解码成乱码。宿主修复后可删除。 |
 
 `overridePath` 是 `volatile()`：插件页配置区保存即生效；也可以写进 profile 补丁：
 
@@ -107,6 +108,34 @@ The executor resolves to the version-stable Store family alias: … Nothing to c
 
 插件页的状态区是原生卡片，显示状态、运行时和执行器路径，右上角有「重新检测」；配置区有 `overridePath` 和默认开启的「与 dsh-ops 共存」原生开关。
 
+## Windows UTF-8 控制台（过渡层）
+
+DSH 的 `pwsh` 工具按 UTF-8 解码输出，但命令里再启动的 `pwsh -File` / `powershell -File` 会继承**控制台代码页**（简体中文机器通常是 936），输出 GBK，最终显示为 `�`。宿主的前缀只固定了外层进程的 .NET 编码，没有改控制台代码页。
+
+0.2.5 增加一个过渡层：包装 `pwsh` 工具使用的 `ctx.shell.execute`，在 Windows 上给每条命令前加 `chcp.com 65001 > $null;`。它只影响装了本插件的用户；默认开启，可用 `utf8Console: false` 关闭；宿主接口形状不符时 fail-open，不影响 `pwsh` 工具本身。
+
+### 删除契约
+
+宿主发布同样的修复后，按这五步整块删除：
+
+1. 删 `lib/utf8-console-bridge.js`；
+2. 删 `index.js` 的 import 和 `mountUtf8ConsoleBridge(ctx, current)` 调用；
+3. 删 `Config.utf8Console`；
+4. 删 `tools/check-utf8-bridge.mjs`，并从 `package.json` 的 `check` 链里移除；
+5. 删本节和 CHANGELOG 里的 0.2.5 过渡说明。
+
+验收：`grep -rn "utf8-console-bridge\|utf8Console" index.js lib tools` 无结果。
+
+### 判定上游已修复
+
+满足任一条件即可开始删除：
+
+- `@deepseek-ai/dsh-pwsh-local` 的 `ENCODING_PREAMBLE` 自己包含 `chcp.com 65001`（可查上游
+  `packages/shell/pwsh-local/src/index.ts`，或安装包里的 `lib/index.js`）；
+- 在 CP936 控制台下，不装/关闭本插件时，命令里嵌套的 `pwsh -File` 已经输出 UTF-8。
+
+删除前先在真实的 CP936 环境复跑一遍嵌套脚本，确认不再需要这层。
+
 ## 禁用或卸载
 
 禁用插件只移除 `pwsh` 的 gate 和插件页，不会卸载 PowerShell 7。只要机器上仍有 `pwsh.exe`，默认执行器仍会优先运行它（通常是 Store 版 PowerShell 7）；只有找不到 `pwsh.exe` 时才回退到 Windows PowerShell 5.1。要真正回到 5.1，需要卸载 Store 版或把执行器 pin 到 `powershell.exe`，不推荐这样做。
@@ -118,6 +147,7 @@ The executor resolves to the version-stable Store family alias: … Nothing to c
 | Store 页面打开但没有「安装」按钮 | 确认 VPN 已关闭，完全退出并重启 Microsoft Store 后重试；或改用手动安装。 |
 | `pwsh` 仍运行 5.1 | 运行 `pwsh7_status`，按报告把 `pwshPath` 补丁粘进 profile 并重启；或安装 Store 版。 |
 | 插件页看不到 | 确认当前 profile 已启用 `dsh-win-pwsh7`，然后重启 DSH。 |
+| 命令里嵌套 `pwsh` 时中文变 `�` | 0.2.5 默认已由 `utf8Console` 过渡层处理；若手动关掉，重新开启，或在命令前加 `chcp.com 65001 > $null;`。 |
 
 ## 验证
 
@@ -125,17 +155,18 @@ The executor resolves to the version-stable Store family alias: … Nothing to c
 $env:DSH_APP_DIR = 'E:\FXS\APP\DSH NEXT\resources\app.asar'
 node tools/check-host.mjs
 node tools/check-client.mjs
+node tools/check-utf8-bridge.mjs
 node tools/check-native-contracts.mjs
 ```
 
-三套门都可以在打包安装（`resources/app.asar`）上离线复跑；`DSH_APP_DIR` 接安装根目录、`resources/app` 或 `resources/app.asar`。
+四套门都可以在打包安装（`resources/app.asar`）上离线复跑；`DSH_APP_DIR` 接安装根目录、`resources/app` 或 `resources/app.asar`。
 
 ## 设计约束
 
 - 判定读执行器自己的 `ctx.shell.pwshPath`，不是扫配置行；`overridePath` 只影响探测与推荐。
 - 不做 VPN 自动检测、不做计量连接预检；VPN 由用户在安装前确认，页面加载失败时再提示。
 - 不自动重试；连续失败由熔断终止。
-- 提交前跑三套门；端到端安装是发布证据，不是自动化门的一部分。
+- 提交前跑四套门；端到端安装是发布证据，不是自动化门的一部分。
 
 ## License
 

package/client.js

@@ -1,6 +1,7 @@
-// client.js — the browser half of dsh-win-pwsh7: the configure section, the diagnostics
-// section, and the re-detect action on the plugin pages. Both render as flat native detail
-// sections — no card chrome, and the host page's own 32px section rhythm does the spacing.
+// client.js — the browser half of dsh-win-pwsh7: the configure cards and the status card
+// on the plugin pages. Both use the same chrome as the installed dsh-ops branch — a 0.5px
+// hairline card on radius-lg, a shaded card body, 13px/600 titles and max-content fact
+// labels — while the Host page keeps its own 32px rhythm between detail sections.
 //
 // One operation, two callers: the diagnostics section and the re-detect button call the
 // same Host method (`status`) that the `pwsh7_status` agent tool runs — over the Remote
@@ -97,6 +98,8 @@ window.__ModuleLoader__.load({
       redetect: 'Re-detect',
       redetecting: 'Detecting…',
       card_title: 'Configuration',
+      executor_title: 'PowerShell 7 executor',
+      executor_hint: 'The runtime the pwsh tool runs. This page only probes and recommends; the profile patch in the status section does the wiring.',
       field_overridePath: 'PowerShell 7 path',
       overridePath_hint: 'Optional explicit pwsh.exe path (`overridePath`). Empty = auto-detect. It must spawn and report PowerShell 7 or newer; the Store family alias is accepted, while a version-numbered Store path is never pinned. This only changes what the plugin probes and recommends — it does not wire the pwsh tool. Use the patch in the status section for that.',
       field_dshOpsCompat: 'Coexist with dsh-ops',
@@ -141,6 +144,8 @@ window.__ModuleLoader__.load({
       redetect: '重新检测',
       redetecting: '检测中…',
       card_title: '配置',
+      executor_title: 'PowerShell 7 执行器',
+      executor_hint: 'pwsh 工具实际运行的 PowerShell。本页只做探测与推荐；接线用状态区里的 profile 补丁。',
       field_overridePath: 'PowerShell 7 路径',
       overridePath_hint: '可选的显式 pwsh.exe 路径（`overridePath`）。留空 = 自动探测。必须能启动并报告 PowerShell 7 及以上；Store 家族别名可用，版本号目录永不被 pin。这里只影响插件的探测与推荐，不会给 pwsh 工具接线；接线请用状态区里的补丁。',
       field_dshOpsCompat: '与 dsh-ops 共存',
@@ -164,48 +169,61 @@ window.__ModuleLoader__.load({
     // while its section is mounted, so both sections carry it: a page can render the status
     // section without ever rendering the configure section.
     const CSS = `
-.dw7-section{display:flex;flex-direction:column;gap:12px;min-width:0;}
-.dw7-head{display:flex;align-items:baseline;gap:10px;min-width:0;}
-.dw7-title{margin:0;color:var(--dsw-alias-label-primary);font-size:14px;font-weight:500;line-height:20px;}
-.dw7-status{box-sizing:border-box;display:flex;flex-direction:column;gap:10px;padding:14px;border:.5px solid var(--dsw-alias-border-l1);border-radius:10px;font-size:13px;min-width:0;}
-.dw7-status-head{display:flex;align-items:center;gap:10px;flex-wrap:wrap;min-width:0;}
-.dw7-status-title{flex:none;color:var(--dsw-alias-label-primary);font-size:13px;font-weight:600;line-height:20px;}
-.dw7-status-metric{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:18px;}
-.dw7-status-action{margin-left:auto;flex:none;}
-.dw7-estimate{display:grid;gap:10px;padding:12px;border-radius:8px;background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-secondary);font-size:13px;line-height:1.6;min-width:0;}
-.dw7-estimate p{margin:0;}
-.dw7-facts{display:grid;gap:6px;margin:0;}
-.dw7-facts>div{display:grid;grid-template-columns:72px minmax(0,1fr);gap:10px;}
-.dw7-facts dt{color:var(--dsw-alias-label-tertiary);}
-.dw7-facts dd{margin:0;overflow-wrap:anywhere;}
-.dw7-note{color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.6;}
+.dw7-settings{display:flex;flex-direction:column;gap:12px;min-width:0;color:var(--dsw-alias-label-primary);font:inherit;}
+.dw7-settings p{margin:0;line-height:1.55;overflow-wrap:anywhere;}
+.dw7-group{display:flex;flex-direction:column;min-width:0;}
+.dw7-card{border:.5px solid var(--dsw-alias-border-l2);border-radius:var(--dsw-radius-lg);padding:14px;gap:10px;}
+.dw7-group-head{display:flex;align-items:flex-start;gap:16px;min-width:0;}
+.dw7-card .dw7-group-head{align-items:flex-start;}
+.dw7-group-head .dw7-field-text{display:flex;flex-direction:column;flex:1 1 auto;min-width:0;gap:2px;}
+.dw7-group-head > button[role=switch]{flex:none;margin-top:1px;}
+.dw7-group-title{margin:0 0 4px;font-size:13px;font-weight:600;line-height:20px;color:var(--dsw-alias-label-secondary);}
+.dw7-card .dw7-group-title{margin:0;}
+.dw7-card-body{display:flex;flex-direction:column;min-width:0;padding:12px;border-radius:var(--dsw-radius-md);background:var(--dsw-alias-interactive-bg-hover);}
+.dw7-card-body > .dw7-field{padding:10px 0;}
+.dw7-card-body > .dw7-field:first-child{padding-top:0;}
+.dw7-card-body > .dw7-field:last-child{padding-bottom:0;}
+.dw7-card-body .dw7-field + .dw7-field{border-top:.5px solid var(--dsw-alias-border-l2);}
 .dw7-field{display:flex;flex-direction:column;gap:6px;padding:12px 0;min-width:0;}
 .dw7-field + .dw7-field{border-top:.5px solid var(--dsw-alias-border-l2);}
-.dw7-label{color:var(--dsw-alias-label-primary);font-size:13px;font-weight:500;line-height:1.5;}
-.dw7-input{box-sizing:border-box;width:100%;height:34px;padding:0 12px;border:.5px solid var(--dsw-alias-border-l4);border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-3);font-family:inherit;font-size:13px;line-height:1.5;color:var(--dsw-alias-label-primary);}
+.dw7-field-text{display:flex;flex-direction:column;flex:1 1 auto;gap:4px;min-width:0;}
+.dw7-field-label{font-size:13px;font-weight:500;line-height:1.5;color:var(--dsw-alias-label-primary);}
+.dw7-field-hint{margin:0;font-size:12px;line-height:1.5;color:var(--dsw-alias-label-tertiary);}
+.dw7-input{box-sizing:border-box;width:100%;height:34px;padding:0 12px;border:.5px solid var(--dsw-alias-border-l4);border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-primary);font:inherit;font-size:13px;line-height:1.5;}
 .dw7-input:focus-visible{outline:none;border-color:var(--dsw-alias-state-business-primary);}
 .dw7-input:disabled{color:var(--dsw-alias-label-tertiary);cursor:default;}
-.dw7-hint{margin:0;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.5;}
-.dw7-switch-row{display:flex;align-items:flex-start;gap:16px;min-width:0;}
-.dw7-switch-text{flex:1 1 auto;min-width:0;display:flex;flex-direction:column;gap:4px;}
+.dw7-input[aria-invalid=true]{border-color:var(--dsw-alias-state-error-primary);}
+.dw7-field-error{margin:0;font-size:12px;line-height:18px;color:var(--dsw-alias-state-error-primary);}
 .dw7-actions{display:flex;align-items:center;gap:8px;flex-wrap:wrap;padding-top:4px;}
 .dw7-save{appearance:none;border:1px solid transparent;border-radius:var(--dsw-radius-md);padding:5px 14px;font:inherit;font-size:13px;line-height:1.5;cursor:pointer;background:var(--dsw-alias-label-primary);color:var(--dsw-alias-bg-layer-3);}
 .dw7-save:disabled{opacity:.4;cursor:default;}
-.dw7-save:focus-visible,.dw7-reset:focus-visible,.dw7-small:focus-visible{outline:var(--dsw-focus-ring-width) solid var(--dsw-focus-ring-color,var(--dsw-alias-state-business-primary));outline-offset:1px;}
 .dw7-reset{border:none;background:none;padding:0;font:inherit;font-size:12px;line-height:1.5;color:var(--dsw-alias-label-secondary);cursor:pointer;}
-.dw7-reset:hover:not(:disabled){color:var(--dsw-alias-label-primary);}
-.dw7-reset:disabled{cursor:default;}
+.dw7-reset:disabled{opacity:.4;cursor:default;}
 .dw7-small{box-sizing:border-box;height:28px;padding:0 10px;border:.5px solid var(--dsw-alias-border-l3);border-radius:var(--dsw-radius-sm);background:transparent;font:inherit;font-size:12px;line-height:18px;color:var(--dsw-alias-label-primary);cursor:pointer;}
-.dw7-small:hover:not(:disabled){background:var(--dsw-alias-interactive-bg-hover);}
 .dw7-small:disabled{opacity:.4;cursor:not-allowed;}
+.dw7-detail{display:flex;flex-direction:column;gap:12px;min-width:0;}
+.dw7-detail-head{display:flex;align-items:center;gap:10px;flex-wrap:wrap;min-width:0;}
+.dw7-detail-title{margin:0;flex:none;font-size:13px;font-weight:600;line-height:20px;color:var(--dsw-alias-label-primary);}
+.dw7-detail-metric{font-size:12px;line-height:18px;color:var(--dsw-alias-label-tertiary);}
+.dw7-detail-action{margin-left:auto;flex:none;}
+.dw7-status-card{display:flex;flex-direction:column;gap:10px;padding:14px;border:.5px solid var(--dsw-alias-border-l2);border-radius:var(--dsw-radius-lg);min-width:0;}
+.dw7-status-body{padding:12px;border-radius:var(--dsw-radius-md);background:var(--dsw-alias-interactive-bg-hover);min-width:0;}
+.dw7-status-lead{margin:0 0 12px;color:var(--dsw-alias-label-secondary);font-size:13px;line-height:1.6;}
+.dw7-facts{display:grid;gap:6px;margin:0;}
+.dw7-facts > div{display:grid;grid-template-columns:max-content minmax(0,1fr);align-items:baseline;column-gap:14px;}
+.dw7-facts dt{color:var(--dsw-alias-label-tertiary);font-size:13px;}
+.dw7-facts dd{margin:0;overflow-wrap:anywhere;font-size:13px;}
+.dw7-status-note{margin:12px 0 0;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.6;}
+.dw7-note{margin:0;font-size:12px;line-height:1.6;color:var(--dsw-alias-label-tertiary);}
 .dw7-report{margin:0;color:var(--dsw-alias-label-secondary);font-size:12px;line-height:1.6;white-space:pre-wrap;overflow-wrap:anywhere;}
-.dw7-empty{margin:0;color:var(--dsw-alias-label-tertiary);font-size:13px;line-height:20px;}
 .dw7-error{margin:0;color:var(--dsw-alias-state-error-primary);font-size:12px;line-height:18px;overflow-wrap:anywhere;}
 .dw7-ok{margin:0;color:var(--dsw-alias-state-success-primary);font-size:12px;line-height:1.5;}
-.dw7-patch{display:flex;flex-direction:column;gap:8px;min-width:0;}
-.dw7-patch-head{display:flex;align-items:center;gap:8px;flex-wrap:wrap;min-width:0;}
-.dw7-patch-note{margin:0;flex:1;min-width:0;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.5;}
+.dw7-preview{display:flex;flex-direction:column;gap:10px;padding:12px;border-radius:var(--dsw-radius-md);background:var(--dsw-alias-interactive-bg-hover);font-size:13px;}
+.dw7-preview-head{display:flex;align-items:center;gap:8px;flex-wrap:wrap;min-width:0;}
+.dw7-preview-note{margin:0;flex:1;min-width:0;color:var(--dsw-alias-label-tertiary);font-size:12px;line-height:1.5;}
 .dw7-code{box-sizing:border-box;margin:0;padding:10px 12px;border:.5px solid var(--dsw-alias-border-l2);border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg-layer-3);color:var(--dsw-alias-label-primary);font-family:var(--dsw-font-mono,ui-monospace,SFMono-Regular,Menlo,monospace);font-size:12px;line-height:1.6;white-space:pre-wrap;overflow-wrap:anywhere;}
+.dw7-save:focus-visible,.dw7-reset:focus-visible,.dw7-small:focus-visible,.dw7-input:focus-visible{outline:var(--dsw-focus-ring-width) solid var(--dsw-focus-ring-color,var(--dsw-alias-state-business-primary));outline-offset:1px;}
+@media(max-width:440px){.dw7-facts > div{grid-template-columns:1fr;gap:2px;}}
 `
 
     return {
@@ -369,40 +387,43 @@ window.__ModuleLoader__.load({
             }
           }
           const patchBlock = patch !== null
-            ? h('div', { className: 'dw7-patch' },
-              h('div', { className: 'dw7-patch-head' },
-                h('p', { className: 'dw7-patch-note' }, t('patch_note')),
-                h('button', { className: 'dw7-small', onClick: () => void copyPatch() }, copied ? t('copied') : t('copy_patch')),
+            ? h('div', { className: 'dw7-preview' },
+              h('div', { className: 'dw7-preview-head' },
+                h('p', { className: 'dw7-preview-note' }, t('patch_note')),
+                h('button', { type: 'button', className: 'dw7-small', onClick: () => void copyPatch() }, copied ? t('copied') : t('copy_patch')),
                 copyNote ? h('span', { className: 'dw7-error' }, copyNote) : null),
               h('pre', { className: 'dw7-code' }, patch))
             : null
-          return h('section', { className: 'dw7-status' },
+          const body = fallback
+            ? h('p', { className: 'dw7-report', key: 'report' }, report)
+            : h('div', { className: 'dw7-status-body', key: 'body' },
+              h('p', { className: 'dw7-status-lead' }, view.lead),
+              h('dl', { className: 'dw7-facts' },
+                h('div', { key: 'status' },
+                  h('dt', null, t('status_row_status')),
+                  h('dd', null, view.status)),
+                h('div', { key: 'runtime' },
+                  h('dt', null, t('status_row_runtime')),
+                  h('dd', null, view.runtime)),
+                h('div', { key: 'path' },
+                  h('dt', null, t('status_row_path')),
+                  h('dd', null, path ?? t('status_no_path')))),
+              h('p', { className: 'dw7-status-note' }, view.note))
+          return h('section', { className: 'dw7-detail' },
             h('style', null, CSS),
-            h('div', { className: 'dw7-status-head' },
-              h('strong', { className: 'dw7-status-title' }, t('diagnostics_title')),
-              snap.at ? h('span', { className: 'dw7-status-metric' }, t('refreshed_at', { at: snap.at })) : null,
-              h('button', {
-                className: 'dw7-small dw7-status-action',
-                onClick: () => void refresh(),
-                disabled: snap.state === 'loading',
-              }, snap.state === 'loading' ? t('redetecting') : t('redetect'))),
-            fallback
-              ? h('p', { className: 'dw7-report' }, report)
-              : h('div', { className: 'dw7-estimate' },
-                h('p', null, view.lead),
-                h('dl', { className: 'dw7-facts' },
-                  h('div', { key: 'status' },
-                    h('dt', null, t('status_row_status')),
-                    h('dd', null, view.status)),
-                  h('div', { key: 'runtime' },
-                    h('dt', null, t('status_row_runtime')),
-                    h('dd', null, view.runtime)),
-                  h('div', { key: 'path' },
-                    h('dt', null, t('status_row_path')),
-                    h('dd', null, path ?? t('status_no_path')))),
-                h('small', { className: 'dw7-note' }, view.note)),
-            patchBlock,
-            snap.error !== null ? h('p', { className: 'dw7-error' }, t('status_error', { error: snap.error })) : null,
+            h('div', { className: 'dw7-status-card' },
+              h('div', { className: 'dw7-detail-head' },
+                h('h3', { className: 'dw7-detail-title' }, t('diagnostics_title')),
+                snap.at ? h('span', { className: 'dw7-detail-metric' }, t('refreshed_at', { at: snap.at })) : null,
+                h('button', {
+                  type: 'button',
+                  className: 'dw7-small dw7-detail-action',
+                  onClick: () => void refresh(),
+                  disabled: snap.state === 'loading',
+                }, snap.state === 'loading' ? t('redetecting') : t('redetect'))),
+              body,
+              patchBlock,
+              snap.error !== null ? h('p', { className: 'dw7-error' }, t('status_error', { error: snap.error })) : null),
           )
         }
 
@@ -455,35 +476,45 @@ window.__ModuleLoader__.load({
             }
           }
 
-          return h('section', { className: 'dw7-section' },
+          return h('form', {
+            className: 'dw7-settings',
+            onSubmit: (event) => {
+              event.preventDefault()
+              void save()
+            },
+          },
             h('style', null, CSS),
-            h('div', { className: 'dw7-head' },
-              h('h4', { className: 'dw7-title' }, t('card_title'))),
             loading || unavailable
-              ? h('p', { className: 'dw7-empty' }, loading ? t('form_loading') : t('form_unavailable'))
+              ? h('p', { className: 'dw7-note' }, loading ? t('form_loading') : t('form_unavailable'))
               : [
-                h('div', { className: 'dw7-field', key: 'overridePath' },
-                  h('label', { className: 'dw7-label', htmlFor: 'dw7-override-path' }, t('field_overridePath')),
-                  h('input', {
-                    id: 'dw7-override-path',
-                    className: 'dw7-input',
-                    type: 'text',
-                    spellCheck: false,
-                    value: values.overridePath,
-                    disabled: !editable,
-                    placeholder: 'C:\\Program Files\\PowerShell\\7\\pwsh.exe',
-                    onChange: (event) => {
-                      setDraft({ ...values, overridePath: event.target.value })
-                      setNote(null)
-                      setSavedAt(null)
-                    },
-                  }),
-                  h('p', { className: 'dw7-hint' }, t('overridePath_hint'))),
-                h('div', { className: 'dw7-field', key: 'dshOpsCompat' },
-                  h('div', { className: 'dw7-switch-row' },
-                    h('div', { className: 'dw7-switch-text' },
-                      h('div', { className: 'dw7-label' }, t('field_dshOpsCompat')),
-                      h('p', { className: 'dw7-hint' }, t('dshOpsCompat_hint'))),
+                h('section', { className: 'dw7-group dw7-card', key: 'executor' },
+                  h('div', { className: 'dw7-group-head' },
+                    h('div', { className: 'dw7-field-text' },
+                      h('h4', { className: 'dw7-group-title' }, t('executor_title')),
+                      h('p', { className: 'dw7-field-hint' }, t('executor_hint')))),
+                  h('div', { className: 'dw7-card-body' },
+                    h('div', { className: 'dw7-field' },
+                      h('label', { className: 'dw7-field-label', htmlFor: 'dw7-override-path' }, t('field_overridePath')),
+                      h('input', {
+                        id: 'dw7-override-path',
+                        className: 'dw7-input',
+                        type: 'text',
+                        spellCheck: false,
+                        value: values.overridePath,
+                        disabled: !editable,
+                        placeholder: 'C:\\Program Files\\PowerShell\\7\\pwsh.exe',
+                        onChange: (event) => {
+                          setDraft({ ...values, overridePath: event.target.value })
+                          setNote(null)
+                          setSavedAt(null)
+                        },
+                      }),
+                      h('p', { className: 'dw7-field-hint' }, t('overridePath_hint'))))),
+                h('section', { className: 'dw7-group dw7-card', key: 'compat' },
+                  h('div', { className: 'dw7-group-head' },
+                    h('div', { className: 'dw7-field-text' },
+                      h('h4', { className: 'dw7-group-title' }, t('field_dshOpsCompat')),
+                      h('p', { className: 'dw7-field-hint' }, t('dshOpsCompat_hint'))),
                     h(Switch, {
                       checked: values.dshOpsCompat,
                       disabled: !editable,
@@ -496,11 +527,12 @@ window.__ModuleLoader__.load({
                     }))),
                 h('div', { className: 'dw7-actions', key: 'actions' },
                   h('button', {
+                    type: 'submit',
                     className: 'dw7-save',
-                    onClick: () => void save(),
                     disabled: !editable || (!dirty && note === null),
                   }, t('save')),
                   h('button', {
+                    type: 'button',
                     className: 'dw7-reset',
                     onClick: () => {
                       setDraft(null)

package/index.js

@@ -51,6 +51,7 @@ import {
   mountDshOpsBridge,
   removeDshOpsCompatPatch,
 } from './lib/dsh-ops-bridge.js'
+import { mountUtf8ConsoleBridge } from './lib/utf8-console-bridge.js'
 
 export const name = 'dsh-win-pwsh7'
 export const inject = ['subprocess', 'tools', 'configEditor', 'systemPrompt']
@@ -70,6 +71,9 @@ export const Config = z.object({
   // Default-on after the multi-session validation of the pre-restriction bridge. Turning it
   // off removes the managed compatibility override; turning it on restores it.
   dshOpsCompat: z.boolean().default(true).volatile(),
+  // Transitional Windows console code page fix, owned by lib/utf8-console-bridge.js.
+  // Delete this field together with the bridge and its mount (see README removal contract).
+  utf8Console: z.boolean().default(true).volatile(),
 })
 
 /**
@@ -374,6 +378,10 @@ export function apply(ctx, config) {
 
   ctx.effect(() => mountDshOpsBridge(ctx, current), 'dsh-win-pwsh7: hide duplicate official tools while dsh-ops is compatible')
 
+  // Transitional, removable: delete this mount and lib/utf8-console-bridge.js once the Host
+  // pins the console code page itself. The README records the removal contract.
+  ctx.effect(() => mountUtf8ConsoleBridge(ctx, current), 'dsh-win-pwsh7: pin the Windows console code page for pwsh output')
+
   ctx.effect(() => {
     void activationSweep(ctx, current()).then((report) => {
       ctx.logger?.info?.('dsh-win-pwsh7: %s', flattenReport(report))
@@ -533,12 +541,14 @@ function readRowConfig(ctx, fallback) {
   const merged = {
     overridePath: typeof fallback?.overridePath === 'string' ? fallback.overridePath : undefined,
     dshOpsCompat: fallback?.dshOpsCompat !== false,
+    utf8Console: fallback?.utf8Console !== false,
   }
   try {
     const entry = ctx.configEditor.entries().find((candidate) => candidate?.options?.name === 'dsh-win-pwsh7')
     const values = entry?.options?.config
     if (isSet(values?.overridePath)) merged.overridePath = String(values.overridePath)
     if (values?.dshOpsCompat !== undefined) merged.dshOpsCompat = values.dshOpsCompat !== false
+    if (values?.utf8Console !== undefined) merged.utf8Console = values.utf8Console !== false
   } catch { /* fall back to the captured config */ }
   return merged
 }

package/lib/utf8-console-bridge.js

@@ -0,0 +1,104 @@
+/**
+ * Transitional Windows UTF-8 console bridge.
+ *
+ * The Host's `dsh-pwsh-local` collector decodes stdout as UTF-8, but a nested
+ * `pwsh -File` / `powershell -File` started by a tool command inherits the console
+ * code page (936 on a Simplified Chinese machine) and emits GBK. The Host preamble
+ * only pins the .NET output encoding of the outer process; it does not change the
+ * console code page. This module wraps the same `ctx.shell` executor the `pwsh` tool
+ * uses and prepends `chcp.com 65001` so the code page is right before the command
+ * runs.
+ *
+ * It is deliberately a leaf: no imports from the rest of the plugin, one mount in
+ * `index.js`, one config field, and a documented removal contract. Delete this file,
+ * the import/mount and the config field when the Host ships the same fix.
+ *
+ * REMOVE WHEN: the Host's `@deepseek-ai/dsh-pwsh-local` pins the console code page
+ * itself (its `ENCODING_PREAMBLE` carries the `chcp.com 65001` switch), or a nested
+ * `pwsh -File` under code page 936 already emits UTF-8 without this plugin. Follow
+ * the README removal contract in the same change.
+ */
+
+/** One line of the wrapper's own diagnostics. */
+const describe = (error) => (error instanceof Error ? error.message : String(error))
+
+/** Marks an executor this module already wrapped, so HMR or a second mount cannot stack. */
+export const UTF8_CONSOLE_PATCH = Symbol.for('dsh-win-pwsh7.utf8ConsoleBridge')
+
+/** A command that already selects UTF-8 must not be prefixed twice. */
+const ALREADY_UTF8 = /^\s*chcp(?:\.com)?\s+65001(?:\s|>|$)/iu
+
+/**
+ * Prefix a Windows command with the console code page switch.
+ *
+ * @param {unknown} command - the caller's command text.
+ * @returns the command, prefixed once when it is a string and not already pinned.
+ */
+export function utf8Command(command) {
+  if (typeof command !== 'string' || command.length === 0) return command
+  if (ALREADY_UTF8.test(command)) return command
+  return `chcp.com 65001 > $null; ${command}`
+}
+
+/**
+ * Wrap the live shell executor the `pwsh` tool resolves.
+ *
+ * Fails open: a missing service, a non-writable executor or a shape change leaves
+ * the plugin working exactly as before and logs one warning. The wrapper is removed
+ * with the plugin's fiber; it never writes files, config or profile state.
+ *
+ * @param ctx - the row's Host context.
+ * @param current - reads the live row configuration.
+ * @param platform - injectable for tests; defaults to `process.platform`.
+ * @returns void; the wrap is owned by the injected fiber.
+ */
+export function mountUtf8ConsoleBridge(ctx, current, platform = process.platform) {
+  if (platform !== 'win32') return
+  const warn = (message) => ctx.logger?.warn?.(`dsh-win-pwsh7: ${message}`)
+  if (typeof ctx.inject !== 'function') return
+  try {
+    ctx.inject(['shell'], (scoped) => {
+      try {
+        const viaGet = typeof scoped.get === 'function' ? scoped.get('shell') : undefined
+        const shell = viaGet ?? scoped.shell
+        if (shell === undefined || shell === null) return
+        if (shell[UTF8_CONSOLE_PATCH] === true) return
+        const original = shell.execute
+        if (typeof original !== 'function') {
+          warn('the shell service exposes no execute(); the UTF-8 console bridge stays off')
+          return
+        }
+        shell.execute = function executeWithUtf8Console(spec) {
+          try {
+            if (current?.()?.utf8Console === false) return original.call(this, spec)
+            if (spec === null || typeof spec !== 'object' || typeof spec.command !== 'string') {
+              return original.call(this, spec)
+            }
+            const command = utf8Command(spec.command)
+            if (command === spec.command) return original.call(this, spec)
+            return original.call(this, { ...spec, command })
+          } catch (error) {
+            warn(`the UTF-8 console bridge fell open: ${describe(error)}`)
+            return original.call(this, spec)
+          }
+        }
+        Object.defineProperty(shell, UTF8_CONSOLE_PATCH, { value: true, configurable: true })
+        const restore = () => {
+          try {
+            shell.execute = original
+          } catch { /* the executor was replaced by another owner */ }
+          try {
+            delete shell[UTF8_CONSOLE_PATCH]
+          } catch { /* non-configurable; the marker is advisory */ }
+        }
+        if (typeof scoped.effect === 'function') {
+          scoped.effect(() => restore, 'dsh-win-pwsh7: utf8 console bridge')
+        }
+      } catch (error) {
+        warn(`the UTF-8 console bridge could not attach: ${describe(error)}`)
+      }
+    })
+  } catch (error) {
+    warn(`the UTF-8 console bridge could not inject the shell service: ${describe(error)}`)
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-win-pwsh7",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "type": "module",
   "description": "Detect and validate PowerShell 7 for the Harness pwsh tool on Windows, and install it on request through the Microsoft Store — scripted or manual — while the pwsh tool stays blocked until a PowerShell 7 runtime actually resolves.",
   "engines": {
@@ -33,6 +33,7 @@
     "client.js",
     "lib/typert.host.js",
     "lib/dsh-ops-bridge.js",
+    "lib/utf8-console-bridge.js",
     "cordis.patch.yml",
     "locale/*.json",
     "icon.svg",
@@ -51,7 +52,7 @@
     "windows"
   ],
   "scripts": {
-    "check": "node tools/check-host.mjs && node tools/check-client.mjs && node tools/check-native-contracts.mjs",
+    "check": "node tools/check-host.mjs && node tools/check-client.mjs && node tools/check-utf8-bridge.mjs && node tools/check-native-contracts.mjs",
     "check:contracts": "node tools/check-native-contracts.mjs",
     "prepublishOnly": "npm run check"
   },

package/tools/check-client.mjs

@@ -176,10 +176,19 @@ check('the card renders every hint in Chinese', () => {
 check('the summary view renders nothing, as the row list expects', () => {
   assert.equal(card({ view: 'summary' }), null)
 })
-check('the configure surface is one flat section, not a card inside the native page', () => {
+check('the configure surface uses the dsh-ops card language', () => {
+  // Aligned with the installed dsh-ops branch: one hairline card per group, a shaded
+  // card body for editable fields, and the toggle in the card head.
   const sections = elementsOf(cardTree, 'section')
-  assert.equal(sections.length, 1, `expected one section, found ${sections.length}`)
-  assert.equal(sections[0].props.className, 'dw7-section')
+  assert.equal(sections.length, 2, `expected two cards, found ${sections.length}`)
+  for (const section of sections) {
+    assert.match(String(section.props.className), /\bdw7-card\b/u)
+    assert.match(String(section.props.className), /\bdw7-group\b/u)
+  }
+  const bodies = elementsOf(cardTree, 'div').filter(node => node.props.className === 'dw7-card-body')
+  assert.equal(bodies.length, 1, `expected one shaded body for the editable card, found ${bodies.length}`)
+  assert.ok(!elementsOf(cardTree, 'section').some(node => /\bdw7-section\b/u.test(String(node.props.className))),
+    'the retired flat section class survived')
 })
 
 // A second application with no controller for this row — the state that used to throw inside the
@@ -256,16 +265,28 @@ check('the en dictionary carries no Chinese', () => {
   const cjk = en.match(/[\u4e00-\u9fff]/gu)
   assert.equal(cjk, null, `Chinese in the en dictionary: ${cjk === null ? '' : cjk.join('')}`)
 })
-check('one flat stylesheet covers both sections and keeps the native control scale', () => {
+check('one card-language stylesheet covers both surfaces', () => {
   assert.ok(/const CSS = `/u.test(source), 'the shared stylesheet is missing')
   assert.ok(!/CSS_CARD|CSS_DIAG/u.test(source), 'the old per-card stylesheets survived')
-  for (const selector of ['.dw7-section{', '.dw7-status{', '.dw7-estimate{', '.dw7-facts{', '.dw7-input{', '.dw7-save{', '.dw7-small{', '.dw7-code{']) {
+  for (const selector of ['.dw7-card{', '.dw7-card-body{', '.dw7-group-title{', '.dw7-detail{', '.dw7-status-card{',
+    '.dw7-status-body{', '.dw7-facts{', '.dw7-input{', '.dw7-save{', '.dw7-small{', '.dw7-code{']) {
     assert.ok(source.includes(selector), `the stylesheet does not define ${selector}`)
   }
+  // The dsh-ops branch's card chrome: a 0.5px hairline on radius-lg with a shaded body,
+  // 13px/600 group titles, and description-list labels sized to their own text.
+  assert.ok(source.includes('border:.5px solid var(--dsw-alias-border-l2);border-radius:var(--dsw-radius-lg);padding:14px;gap:10px;'),
+    'the card chrome no longer matches the dsh-ops card')
+  assert.ok(source.includes('background:var(--dsw-alias-interactive-bg-hover);'),
+    'the card body no longer uses the sunken surface')
+  assert.ok(source.includes('font-size:13px;font-weight:600;line-height:20px;'),
+    'the group title metrics no longer match the dsh-ops card')
+  assert.ok(source.includes('grid-template-columns:max-content minmax(0,1fr);align-items:baseline;column-gap:14px;'),
+    'the fact list no longer uses the native max-content label column')
   const start = source.indexOf('const CSS = `')
   const css = source.slice(start, source.indexOf('`', start + 20))
   assert.ok(!/#[0-9a-f]{3,8}\b/iu.test(css), 'the stylesheet hard-codes a color instead of using a theme token')
 })
+
 check('no metered-network copy or branch remains', () => {
   assert.ok(!/metered/iu.test(source), 'the removed metered-network feature still has copy or a branch')
 })

package/tools/check-utf8-bridge.mjs

@@ -0,0 +1,148 @@
+/**
+ * Gate for the transitional Windows UTF-8 console bridge.
+ *
+ * The bridge wraps the Host's `ctx.shell.execute`; this suite drives it with a fake
+ * executor so the prefix, the opt-out, the fail-open paths and the restore are
+ * verifiable without a DSH installation.
+ */
+import assert from 'node:assert/strict'
+import { mountUtf8ConsoleBridge, utf8Command } from '../lib/utf8-console-bridge.js'
+
+let failures = 0
+function check(label, assertion) {
+  try {
+    assertion()
+  } catch (error) {
+    failures += 1
+    console.error(`FAIL — ${label}: ${error.message}`)
+  }
+}
+
+function fakeContext(shell, options = {}) {
+  const effects = []
+  const warnings = []
+  const injected = []
+  const scoped = {
+    get: () => shell,
+    effect(fn) { effects.push(fn()) },
+  }
+  const ctx = {
+    logger: { warn: (message) => warnings.push(message) },
+    inject(deps, callback) {
+      injected.push(deps)
+      callback(scoped)
+    },
+  }
+  return { ctx, effects, warnings, injected }
+}
+
+function fakeShell() {
+  const calls = []
+  const shell = {
+    execute(spec) {
+      calls.push({ spec, self: this })
+      return spec
+    },
+  }
+  return { shell, calls }
+}
+
+// --- The pure command transform -----------------------------------------------------------
+
+check('prefixes a bare command once', () => {
+  assert.equal(utf8Command('Get-Location'), 'chcp.com 65001 > $null; Get-Location')
+})
+check('leaves an already-pinned command alone', () => {
+  for (const command of [
+    'chcp 65001 > $null; Get-Location',
+    'chcp.com 65001 > $null; Get-Location',
+    '  chcp.com 65001 >$null; Get-Location',
+  ]) {
+    assert.equal(utf8Command(command), command)
+  }
+})
+check('leaves non-strings and empty strings alone', () => {
+  for (const value of [undefined, null, 42, '']) assert.equal(utf8Command(value), value)
+})
+
+// --- The executor wrapper ----------------------------------------------------------------
+
+check('wraps the shell executor and prefixes the command', () => {
+  const { shell, calls } = fakeShell()
+  const { ctx } = fakeContext(shell)
+  mountUtf8ConsoleBridge(ctx, () => ({ utf8Console: true }), 'win32')
+  const spec = { command: 'pwsh -NoProfile -File enc_test.ps1', cwd: 'C:\\work', timeoutMs: 1000 }
+  shell.execute(spec)
+  assert.equal(calls.length, 1)
+  assert.equal(calls[0].spec.command, 'chcp.com 65001 > $null; pwsh -NoProfile -File enc_test.ps1')
+  assert.equal(calls[0].spec.cwd, 'C:\\work')
+  assert.equal(calls[0].spec.timeoutMs, 1000)
+  assert.equal(calls[0].self, shell)
+})
+check('passes through when the config field is off', () => {
+  const { shell, calls } = fakeShell()
+  const { ctx } = fakeContext(shell)
+  mountUtf8ConsoleBridge(ctx, () => ({ utf8Console: false }), 'win32')
+  shell.execute({ command: 'Get-Location' })
+  assert.equal(calls[0].spec.command, 'Get-Location')
+})
+check('does not double-prefix a command that already selects UTF-8', () => {
+  const { shell, calls } = fakeShell()
+  const { ctx } = fakeContext(shell)
+  mountUtf8ConsoleBridge(ctx, () => ({ utf8Console: true }), 'win32')
+  shell.execute({ command: 'chcp.com 65001 > $null; Get-Location' })
+  assert.equal(calls[0].spec.command, 'chcp.com 65001 > $null; Get-Location')
+})
+check('is idempotent when mounted twice on the same executor', () => {
+  const { shell } = fakeShell()
+  const { ctx } = fakeContext(shell)
+  mountUtf8ConsoleBridge(ctx, () => ({ utf8Console: true }), 'win32')
+  const once = shell.execute
+  mountUtf8ConsoleBridge(ctx, () => ({ utf8Console: true }), 'win32')
+  assert.equal(shell.execute, once)
+})
+check('restores the original executor when the fiber disposes', () => {
+  const { shell, calls } = fakeShell()
+  const original = shell.execute
+  const { ctx, effects } = fakeContext(shell)
+  mountUtf8ConsoleBridge(ctx, () => ({ utf8Console: true }), 'win32')
+  assert.notEqual(shell.execute, original)
+  effects.forEach((dispose) => dispose())
+  assert.equal(shell.execute, original)
+  shell.execute({ command: 'Get-Location' })
+  assert.equal(calls.at(-1).spec.command, 'Get-Location')
+})
+
+// --- Fail-open paths ---------------------------------------------------------------------
+
+check('does nothing on non-Windows', () => {
+  const { shell } = fakeShell()
+  const { ctx, injected } = fakeContext(shell)
+  mountUtf8ConsoleBridge(ctx, () => ({ utf8Console: true }), 'linux')
+  assert.deepEqual(injected, [])
+})
+check('warns and leaves a service without execute untouched', () => {
+  const { ctx, warnings } = fakeContext({})
+  mountUtf8ConsoleBridge(ctx, () => ({ utf8Console: true }), 'win32')
+  assert.equal(warnings.length, 1)
+  assert.match(warnings[0], /no execute/u)
+})
+check('warns instead of throwing on a frozen executor', () => {
+  const shell = Object.freeze({ execute(spec) { return spec } })
+  const { ctx, warnings } = fakeContext(shell)
+  assert.doesNotThrow(() => mountUtf8ConsoleBridge(ctx, () => ({ utf8Console: true }), 'win32'))
+  assert.equal(warnings.length, 1)
+})
+check('falls open when the config reader throws', () => {
+  const { shell, calls } = fakeShell()
+  const { ctx } = fakeContext(shell)
+  mountUtf8ConsoleBridge(ctx, () => { throw new Error('config unavailable') }, 'win32')
+  shell.execute({ command: 'Get-Location' })
+  assert.equal(calls[0].spec.command, 'Get-Location')
+})
+
+if (failures > 0) {
+  console.error(`utf8 bridge: ${failures} check(s) failed`)
+  process.exit(1)
+}
+console.log('ok — utf8 console bridge: prefix, opt-out, idempotence, restore and fail-open paths')