dsh-m 0.9.92 → 0.9.94

package/CHANGELOG.md

@@ -8,6 +8,18 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## 中文
 
+### 0.9.94 重构+修复：变更结局描述客户端单源化（op-outcome）+ 补丁映射 YAML 引号宽容与重复键根治
+
+- **需求（2026-10-17 架构巡查 + grill 九决议）**：变更结局的呈现无 owning module——守卫拦截文案装配 main.jsx 三处逐字重复（0.9.93 toWire 收敛了线格式、client 侧呈现是已知残尾，`repairBasis` 后加时的多点位手补复发已实证）、升级成功文案两处逐字、builds 后缀四处拼装、superseded 五处；另：事务补偿对 workspace `patchedDependencies` **非双引号在场形态**（pnpm 的单引号/无引号书写）逐字判重失明——逐字判重可自造重复键文件、复读检查可假 committed（同包链经 strip 先摘在生产不可达，本项属防御面收敛与 fail-closed 补洞）。
+- **方案**：新纯模块 `src/client/op-outcome.js`（GLOSSARY「变更结局描述」入册）——工厂 `createOpOutcome(lookup)` 出成品文案（`createMarkdown(h)` 同款注入先例），`guardBlockedText`/`buildsSuffix`/`upgradeOkText`/`mutationFailed` 四函数；六处接线站点（五类投影）一行接线，流程特有分支（兼容弹窗/能力表拒绝/乐观提示）与 ToolCardRow 短版留守注记。D9：`verifyPatchMapping` workspace 支改 yaml 键成员判定（解析失败 fail-closed 报「复读失败」）；`restorePatchMapping` 追加前解析去重（同键任意引号形态在场即跳过，解析失败退化逐字判重）。
+- **验证**：全量 1567 测试全绿（新增 client-op-outcome 参数化矩阵 32 例——guardBlockedText/buildsSuffix/upgradeOkText to×activation 3×3 全交叉/mutationFailed × verb 五枚，期望串全手写字面量；事务补丁映射五钉例——单引号去重/无引号去重/模拟 pnpm 解析炸端到端/坏 YAML 假 committed→fail-closed/restore 退化不抛，夹具异包前提钉死）、typecheck 零错误；收敛锚 main.jsx `join(" | ")` 3→0、`mutationFailed` ≥ 6、`upgradeNotify` 解构随调用点清除；实施经计划评审四轮 15 项收敛 + 硬停点执行评审两轮（基线独立树复跑 1530 对照 + TDD 红→绿独立复演）后放行；实施计划见 `docs/plans/2026-10-17-op-outcome-and-verify-quote-fix-implementation-plan.md`。
+
+### 0.9.93 重构：装后守卫线格式收敛至 InstallGuardError.toWire——加守卫字段编辑点 8 → 2（纯重构，线格式语义零变化）
+
+- **需求（2026-10-16 架构巡查摩擦点 3，巡查首推）**：`InstallGuardError` → 线格式的投影在手写 5 处逐字重复（host-api 409 payload / tools install+upgrade 两臂 / cli install+upgrade 两臂）+ client 再拼一次——加一个守卫字段要碰 8 处（类 + 5 投影 + client 读取 + 测试），`repairBasis` 后加时各点手补已实证过一次复发。
+- **方案**：产地方法 `toWire(): InstallGuardWire`（随类导出接口 + `GuardViolation` re-export）成为 6 字段共享线格式单一事实源；五处投影改一行展开（信封差异留在各端：host-api `ok/error`、tools `ok/guard/message`、cli 裸 JSON），`repairBasis` undefined 时键不存在的语义移入方法本体。加字段编辑点降为 2（类+toWire 一处、client 读取一处——浏览器边界不能 import core，防御性拼装留守，如实注记）。自觉差异注记：tools 信封键序 kind/message 交换（JSON 键序对消费方无语义，全 tests/ 无原始 JSON 键序钉）。
+- **验证**：全量 1530 测试全绿（新增 toWire 三钉例：六字段齐/repairBasis 键缺席/键序；新增 host-api dispatcher 409 钉例补 host-api 投影零测试覆盖的缺口；tools 两臂 execute 钉例零迁移）、typecheck 零错误；收敛锚 `repairBasis ? { repairBasis: … }` 三文件 5 → 0（兼证无第 6 处投影）；实施计划经两轮独立评审四项收敛 + 执行评审两轮（含 A1 钉例独立成 describe）记录在 `docs/plans/2026-10-17-install-guard-towire-implementation-plan.md`。
+
 ### 0.9.92 修复+重构：三端市场查询文法统一（market-query 单一入口）——CLI 非法 category 吞错修复
 
 - **需求（2026-10-16 实测）**：`dshm search --category <非法>` 静默返回「没有匹配的收录条目」+ exit 0，而同输入 GUI 得 400、agent 工具显式报错——「合并市场」词条承诺的「三端同源同语义」被 CLI 打破；根因是分类 slug 正则、source/offset/limit 解析、精选标签表在三端各持一份拷贝（正则 ×3、解析 ×3、标签表 ×2、deadline 常量 ×2），CLI 的拷贝漏了 category 校验。
@@ -649,6 +661,18 @@ The full release history of dsh-m, maintained bilingually: **Chinese first, Engl
 
 ## English
 
+### Refactor + fix in 0.9.94 — client-side mutation-outcome copy single-sourced (op-outcome) + patch-mapping YAML quote tolerance and duplicate-key elimination
+
+- **Need (2026-10-17 architecture walk + nine grilled decisions)**: the presentation of mutation outcomes had no owning module — the guard-interception copy was assembled verbatim three times in main.jsx (0.9.93's toWire converged the wire format while the client-side presentation remained the known leftover; the multi-point hand-patching recurrence when `repairBasis` was added had already been demonstrated once), the upgrade-success copy twice verbatim, the builds suffix four times, superseded five times; separately: the transaction's compensation was blind to **non-double-quoted in-place forms** of workspace `patchedDependencies` (pnpm's single-quoted/unquoted spellings) via verbatim duplicate checks — the verbatim check could fabricate a duplicate-key file and the read-back check could false-pass (the same-package chain is unreachable in production because strip removes it first; this item is defensive-surface convergence and a fail-closed gap-fill).
+- **Approach**: a new pure module `src/client/op-outcome.js` (GLOSSARY term "Mutation Outcome Copy" registered) — a factory `createOpOutcome(lookup)` producing finished copy (the `createMarkdown(h)` injection precedent) with four functions `guardBlockedText`/`buildsSuffix`/`upgradeOkText`/`mutationFailed`; six wiring sites (five projection families) become one-line calls, while flow-specific branches (compat dialog / capability-rejection banner / optimistic note) and the ToolCardRow short variant stay behind with an annotation. D9: the workspace leg of `verifyPatchMapping` now judges key membership via real yaml parsing (parse failure fails closed with "read-back failed"); `restorePatchMapping` parse-dedupes before appending (skip when the key exists in any quoting form; on parse failure it degrades to today's verbatim line check).
+- **Verification**: full suite 1567 green (new client-op-outcome parametrized matrix of 32 cases — guardBlockedText/buildsSuffix/upgradeOkText to×activation 3×3 full cross/mutationFailed × five verbs, expected strings all hand-written literals; five transaction patch-mapping pins — single-quote dedupe / unquoted dedupe / simulated pnpm parse-explosion end-to-end / malformed-YAML false-committed → fail-closed / restore degradation does not throw, with the cross-package fixture premise pinned), typecheck clean; convergence anchors in main.jsx: `join(" | ")` 3→0, `mutationFailed` ≥ 6, and the `upgradeNotify` destructure removed along with its call sites; released after a four-round 15-finding plan review plus a hard-stopped two-round execution review (baseline independently re-run at 1530 for comparison + TDD red→green independently re-enacted); implementation plan in `docs/plans/2026-10-17-op-outcome-and-verify-quote-fix-implementation-plan.md`.
+
+### Refactor in 0.9.93 — post-install guard wire format converged onto InstallGuardError.toWire; adding a guard field now touches 8 → 2 points (pure refactor, zero wire-format semantic change)
+
+- **Need (2026-10-16 architecture walk, friction point 3, the walk's top pick)**: the `InstallGuardError` → wire-format projection was hand-written verbatim in 5 places (host-api 409 payload / tools install+upgrade arms / cli install+upgrade arms) plus one more assembly in the client — adding a guard field meant touching 8 points (class + 5 projections + client read + tests); the later addition of `repairBasis` had already demonstrated the recurrence once.
+- **Approach**: a source method `toWire(): InstallGuardWire` (interface exported alongside the class, plus a `GuardViolation` re-export) becomes the single source of the shared 6-field wire format; the five projections become one-line spreads (envelope differences stay per-end: host-api `ok/error`, tools `ok/guard/message`, cli bare JSON), and the "repairBasis key absent when undefined" semantics move into the method body. Adding a field now touches 2 points (class+toWire, and the client read — the browser bundle cannot import core modules, so its defensive assembly stays, honestly noted). Deliberate delta: the tools envelope swaps key order between kind/message (JSON key order carries no consumer semantics; no raw-JSON key-order pins exist across tests/).
+- **Verification**: full suite 1530 green (three new toWire pins: six fields / repairBasis key absence / key order; a new host-api dispatcher 409 pin closing the "host-api projection had zero test coverage" gap; tools-arm execute pins migrated zero), typecheck clean; the convergence anchor `repairBasis ? { repairBasis: … }` went 5 → 0 across the three files (also proving there is no 6th projection); plan review (two rounds, four findings) and execution review (two rounds, including A1 extracting the pin into its own describe) recorded in `docs/plans/2026-10-17-install-guard-towire-implementation-plan.md`.
+
 ### Fix + refactor in 0.9.92 — unified three-end market query intake (market-query single entry); CLI invalid-category silent swallow fixed
 
 - **Need (2026-10-16, reproduced live)**: `dshm search --category <invalid>` silently printed "no matching entries" and exited 0, while the same input gets a 400 from the panel API and an explicit error from the agent tool — breaking the "same source, same semantics across GUI / tools / CLI" promise. Root cause: the category slug regex, source/offset/limit parsing, and the curated label map each had per-end copies (regex ×3, parsing ×3, labels ×2, deadline constants ×2), and the CLI copy lacked category validation.

package/lib/cli.js

@@ -193,7 +193,7 @@ async function runCliDispatch(argv, deps, io) {
             // metadata-only：不构造全量 latest；0.9.92 三端查询文法：category/source/limit/offset 经
             // market-query 单一入口归一（与 host-api/工具同源同语义）；文法违规 throw 直飞 dispatch 统一
             // catch（`错误：${msg}` + exit 1，与此前 source 内联报错输出逐字节同款）——非法 category
-            // 自此显式报错（0.9.91 前静默空结果吞错，回归钉例在 cli-search.test.mjs）。
+            // 自此显式报错（≤0.9.91 静默空结果吞错，回归钉例在 cli-search.test.mjs）。
             // 双源判定：主清单 unavailable 但社区有条目 → 照常出页（Q42）；两层皆不可用 → exit 1
             const intake = parseMarketQueryInput({ category: flags.category, source: flags.source, limit: flags.limit, offset: flags.offset }, { limitMax: 80, limitDefault: 10 });
             const result = await d.listMarket(cfg, {
@@ -332,7 +332,7 @@ async function runCliDispatch(argv, deps, io) {
             }
             catch (e) {
                 if (e instanceof InstallGuardError) {
-                    err('[⛔ 装后守卫拦截] ' + JSON.stringify({ kind: e.kind, violations: e.violations, compensation: e.compensation, needsRestart: e.needsRestart, restartSafe: e.restartSafe, ...(e.repairBasis ? { repairBasis: e.repairBasis } : {}) }));
+                    err('[⛔ 装后守卫拦截] ' + JSON.stringify(e.toWire()));
                     err(e.message);
                     err(e.restartSafe ? '可以重启 DSH Web：dshm restart --yes' : '修复后再重启（不要现在重启）。');
                     return 1;
@@ -357,7 +357,7 @@ async function runCliDispatch(argv, deps, io) {
             }
             catch (e) {
                 if (e instanceof InstallGuardError) {
-                    err('[⛔ 装后守卫拦截] ' + JSON.stringify({ kind: e.kind, violations: e.violations, compensation: e.compensation, needsRestart: e.needsRestart, restartSafe: e.restartSafe, ...(e.repairBasis ? { repairBasis: e.repairBasis } : {}) }));
+                    err('[⛔ 装后守卫拦截] ' + JSON.stringify(e.toWire()));
                     err(e.message);
                     err(e.restartSafe ? '可以重启 DSH Web：dshm restart --yes' : '修复后再重启（不要现在重启）。');
                     return 1;

package/lib/client.js

@@ -2005,6 +2005,53 @@ var init_install_cmd = __esm({
   }
 });
 
+// src/client/op-outcome.js
+var op_outcome_exports = {};
+__export(op_outcome_exports, {
+  createOpOutcome: () => createOpOutcome
+});
+function createOpOutcome(lookup2) {
+  const guardBlockedText = (guard) => [
+    lookup2("guard.blocked"),
+    `${lookup2("guard.compstatus")}: ${guard.compensation?.status || "\u2014"}\uFF08${guard.compensation?.note || ""}\uFF09`,
+    guard.repairBasis ? `${lookup2("guard.repairbasis")}: ${guard.repairBasis}` : null,
+    lookup2("guard.noforce"),
+    guard.restartSafe ? lookup2("guard.restartsafenow") : lookup2("guard.restartunsafe")
+  ].filter(Boolean).join(" | ");
+  const buildsSuffix = (res) => res.buildApprovals && res.buildApprovals.length ? lookup2("notify.builds", { names: res.buildApprovals.join(", ") }) : res.fallbackAllBuilds ? lookup2("notify.builds.fallback") : "";
+  const upgradeOkText = (res) => {
+    const note = upgradeNotify(res.activation);
+    return {
+      needsRestart: note.needsRestart,
+      text: lookup2("notify.upgraded", {
+        pkg: res.pkg,
+        from: res.fromVersion ? `v${res.fromVersion}` : "\u2014",
+        to: res.version ? `v${res.version}` : res.sha ? res.sha.slice(0, 7) : "latest"
+      }) + buildsSuffix(res) + (note.suffixKey ? lookup2(note.suffixKey) : "")
+    };
+  };
+  const mutationFailed = (e, { verb, target }) => {
+    if (e && e.opSuperseded) return { kind: "ok", text: lookup2("op.superseded.note", { target }) };
+    if (e && e.guard) return { kind: "err", text: guardBlockedText(e.guard) };
+    return { kind: "err", text: lookup2(PLAIN_FAIL_KEY[verb], { err: e && e.message || e }) };
+  };
+  return { guardBlockedText, buildsSuffix, upgradeOkText, mutationFailed };
+}
+var PLAIN_FAIL_KEY;
+var init_op_outcome = __esm({
+  "src/client/op-outcome.js"() {
+    "use strict";
+    init_operations();
+    PLAIN_FAIL_KEY = {
+      install: "failed.install",
+      upgrade: "failed.upgrade",
+      uninstall: "failed.uninstall",
+      toggle: "toggle.failed",
+      self: "notify.selfupgraded.failed"
+    };
+  }
+});
+
 // src/client/main.jsx
 var React = require("react");
 var rd = require("react-dom");
@@ -2028,11 +2075,12 @@ var { pickPayload: pickPayload2, parseToolArgs: parseToolArgs2 } = (init_tool_vi
 var { RESTART_POLL_MS: RESTART_POLL_MS2, RESTART_DEADLINE_MS: RESTART_DEADLINE_MS2, nextRestartWait: nextRestartWait2, isAmbiguousRestartRequestError: isAmbiguousRestartRequestError2 } = (init_restart_wait(), __toCommonJS(restart_wait_exports));
 var { refreshAfterMutation: refreshAfterMutation2 } = (init_view_refresh(), __toCommonJS(view_refresh_exports));
 var { applyInstalledUpdates: applyInstalledUpdates2, installedUpdateStats: installedUpdateStats2 } = (init_installed_updates(), __toCommonJS(installed_updates_exports));
-var { createOperationsStore: createOperationsStore2, restoreRecords: restoreRecords2, createOpsPump: createOpsPump2, opAppliesTo: opAppliesTo2, TERMINAL_CLEARABLE: TERMINAL_CLEARABLE2, upgradeNotify: upgradeNotify2, REGISTRY_DEFAULT_TARGET: REGISTRY_DEFAULT_TARGET2 } = (init_operations(), __toCommonJS(operations_exports));
+var { createOperationsStore: createOperationsStore2, restoreRecords: restoreRecords2, createOpsPump: createOpsPump2, opAppliesTo: opAppliesTo2, TERMINAL_CLEARABLE: TERMINAL_CLEARABLE2, REGISTRY_DEFAULT_TARGET: REGISTRY_DEFAULT_TARGET2 } = (init_operations(), __toCommonJS(operations_exports));
 var { groupOpsByDay: groupOpsByDay2, opRowVm: opRowVm2, opUpgradeMeta: opUpgradeMeta2, canRemoveRow: canRemoveRow2, channelLabelKey: channelLabelKey2 } = (init_operations_view(), __toCommonJS(operations_view_exports));
 var { createFavoritesStore: createFavoritesStore2, partitionStale: partitionStale2 } = (init_favorites(), __toCommonJS(favorites_exports));
 var { readSelfCheckCache: readSelfCheckCache2, writeSelfCheckCache: writeSelfCheckCache2, clearSelfCheckCache: clearSelfCheckCache2, deriveChipState: deriveChipState2 } = (init_self_check(), __toCommonJS(self_check_exports));
 var { shouldShowInstallCmd: shouldShowInstallCmd2 } = (init_install_cmd(), __toCommonJS(install_cmd_exports));
+var { createOpOutcome: createOpOutcome2 } = (init_op_outcome(), __toCommonJS(op_outcome_exports));
 var ZH = {
   "market.title": "\u63D2\u4EF6\u5E02\u573A",
   "tab.market": "\u5E02\u573A",
@@ -2645,6 +2693,7 @@ function lookup(key, params) {
   const dict = browserLang() === "en" ? EN : ZH;
   return interpolate(dict[key] ?? ZH[key] ?? key, params);
 }
+var oc = createOpOutcome2(lookup);
 function communityLabels(data) {
   const c = data && data.community && typeof data.community === "object" ? data.community : {};
   const zh = c.categoryLabels && typeof c.categoryLabels === "object" ? c.categoryLabels : {};
@@ -4079,7 +4128,7 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind, o
     h(SearchBox, { key: zone, placeholder: lookup("search.ph"), initial: query.query, onCommit: (v) => updateQuery(v ? { query: v, category: null } : { query: v }) })
   ) : null;
   const zoneBar = zoneChips3;
-  const installResultText = (res) => lookup("notify.installed", { pkg: res.pkg, version: res.version ? ` v${res.version}` : "" }) + (res.buildApprovals && res.buildApprovals.length ? lookup("notify.builds", { names: res.buildApprovals.join(", ") }) : res.fallbackAllBuilds ? lookup("notify.builds.fallback") : "") + (res.bundleWarning === "no-patch-layer" ? lookup("notify.bundlewarning") : "");
+  const installResultText = (res) => lookup("notify.installed", { pkg: res.pkg, version: res.version ? ` v${res.version}` : "" }) + oc.buildsSuffix(res) + (res.bundleWarning === "no-patch-layer" ? lookup("notify.bundlewarning") : "");
   const installDone = (it2, res) => {
     notify({ kind: "ok", needsRestart: true, text: installResultText(res) });
     setInstallNote({ id: it2.id, kind: "ok", text: installResultText(res) });
@@ -4099,25 +4148,12 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind, o
       installDone(it, res);
       await (onMutation ? onMutation() : reload(false));
     } catch (e) {
-      if (e && e.opSuperseded) {
-        notify({ kind: "ok", text: lookup("op.superseded.note", { target: it.name }) });
-        setInstallNote({ id: it.id, kind: "hint", text: lookup("op.superseded.note", { target: it.name }) });
-      } else if (e && e.guard) {
-        const guardText = [
-          lookup("guard.blocked"),
-          `${lookup("guard.compstatus")}: ${e.guard.compensation?.status || "\u2014"}\uFF08${e.guard.compensation?.note || ""}\uFF09`,
-          e.guard.repairBasis ? `${lookup("guard.repairbasis")}: ${e.guard.repairBasis}` : null,
-          lookup("guard.noforce"),
-          e.guard.restartSafe ? lookup("guard.restartsafenow") : lookup("guard.restartunsafe")
-        ].filter(Boolean).join(" | ");
-        notify({ kind: "err", text: guardText });
-        setInstallNote({ id: it.id, kind: "err", text: guardText });
-      } else if (e && e.issue) {
+      if (e && e.issue) {
         setCompatConfirm({ it, version, issue: e.issue, opId: e.opId });
       } else {
-        const failText = lookup("failed.install", { err: e && e.message || e });
-        notify({ kind: "err", text: failText });
-        setInstallNote({ id: it.id, kind: "err", text: failText });
+        const m = oc.mutationFailed(e, { verb: "install", target: it.name });
+        notify({ kind: m.kind, text: m.text });
+        setInstallNote({ id: it.id, kind: m.kind === "ok" ? "hint" : "err", text: m.text });
       }
     }
   };
@@ -4128,31 +4164,14 @@ function MarketTab({ notify, markets, onMutation, ops, favorites, profileKind, o
         const m = opUpgradeMeta2(r);
         return m ? { ...r, opMeta: m } : r;
       });
-      const note = upgradeNotify2(res.activation);
-      const text = lookup("notify.upgraded", { pkg: res.pkg, from: res.fromVersion ? `v${res.fromVersion}` : "\u2014", to: res.version ? `v${res.version}` : res.sha ? res.sha.slice(0, 7) : "latest" }) + (res.buildApprovals && res.buildApprovals.length ? lookup("notify.builds", { names: res.buildApprovals.join(", ") }) : res.fallbackAllBuilds ? lookup("notify.builds.fallback") : "") + (note.suffixKey ? lookup(note.suffixKey) : "");
-      notify({ kind: "ok", needsRestart: note.needsRestart, text });
-      setInstallNote({ id: it.id, kind: "ok", text });
+      const ok = oc.upgradeOkText(res);
+      notify({ kind: "ok", needsRestart: ok.needsRestart, text: ok.text });
+      setInstallNote({ id: it.id, kind: "ok", text: ok.text });
       await (onMutation ? onMutation() : void 0);
     } catch (e) {
-      if (e && e.opSuperseded) {
-        const sup = lookup("op.superseded.note", { target: it.installedPkg });
-        notify({ kind: "ok", text: sup });
-        setInstallNote({ id: it.id, kind: "hint", text: sup });
-      } else if (e && e.guard) {
-        const guardText = [
-          lookup("guard.blocked"),
-          `${lookup("guard.compstatus")}: ${e.guard.compensation?.status || "\u2014"}\uFF08${e.guard.compensation?.note || ""}\uFF09`,
-          e.guard.repairBasis ? `${lookup("guard.repairbasis")}: ${e.guard.repairBasis}` : null,
-          lookup("guard.noforce"),
-          e.guard.restartSafe ? lookup("guard.restartsafenow") : lookup("guard.restartunsafe")
-        ].filter(Boolean).join(" | ");
-        notify({ kind: "err", text: guardText });
-        setInstallNote({ id: it.id, kind: "err", text: guardText });
-      } else {
-        const failText = lookup("failed.upgrade", { err: e && e.message || e });
-        notify({ kind: "err", text: failText });
-        setInstallNote({ id: it.id, kind: "err", text: failText });
-      }
+      const m = oc.mutationFailed(e, { verb: "upgrade", target: it.installedPkg });
+      notify({ kind: m.kind, text: m.text });
+      setInstallNote({ id: it.id, kind: m.kind === "ok" ? "hint" : "err", text: m.text });
     }
   };
   const CompatDialog = compatConfirm ? h(
@@ -4510,11 +4529,8 @@ function InstalledTab({ notify, installed, updates, onMutation, ops }) {
       notify({ kind: "ok", needsRestart: note.needsRestart, text: lookup(note.textKey, note.params) + extra });
       await reload();
     } catch (e) {
-      if (e && e.opSuperseded) {
-        notify({ kind: "ok", text: lookup("op.superseded.note", { target: it.pkg }) });
-      } else {
-        notify({ kind: "err", text: lookup("toggle.failed", { err: e && e.message || e }) });
-      }
+      const m = oc.mutationFailed(e, { verb: "toggle", target: it.pkg });
+      notify({ kind: m.kind, text: m.text });
     } finally {
       setPendingToggles((m) => {
         if (!(it.pkg in m)) return m;
@@ -4533,11 +4549,8 @@ function InstalledTab({ notify, installed, updates, onMutation, ops }) {
       });
       await (onMutation ? onMutation() : reload());
     } catch (e) {
-      if (e && e.opSuperseded) {
-        notify({ kind: "ok", text: lookup("op.superseded.note", { target: it.pkg }) });
-      } else {
-        notify({ kind: "err", text: lookup("failed.uninstall", { err: e && e.message || e }) });
-      }
+      const m = oc.mutationFailed(e, { verb: "uninstall", target: it.pkg });
+      notify({ kind: m.kind, text: m.text });
     }
   };
   const doUpgrade = async (it) => {
@@ -4547,34 +4560,12 @@ function InstalledTab({ notify, installed, updates, onMutation, ops }) {
         const m = opUpgradeMeta2(r);
         return m ? { ...r, opMeta: m } : r;
       });
-      const note = upgradeNotify2(res.activation);
-      notify({
-        kind: "ok",
-        needsRestart: note.needsRestart,
-        text: lookup("notify.upgraded", {
-          pkg: res.pkg,
-          from: res.fromVersion ? `v${res.fromVersion}` : "\u2014",
-          to: res.version ? `v${res.version}` : res.sha ? res.sha.slice(0, 7) : "latest"
-        }) + (res.buildApprovals && res.buildApprovals.length ? lookup("notify.builds", { names: res.buildApprovals.join(", ") }) : res.fallbackAllBuilds ? lookup("notify.builds.fallback") : "") + (note.suffixKey ? lookup(note.suffixKey) : "")
-      });
+      const ok = oc.upgradeOkText(res);
+      notify({ kind: "ok", needsRestart: ok.needsRestart, text: ok.text });
       await (onMutation ? onMutation() : reload());
     } catch (e) {
-      if (e && e.guard) {
-        notify({
-          kind: "err",
-          text: [
-            lookup("guard.blocked"),
-            `${lookup("guard.compstatus")}: ${e.guard.compensation?.status || "\u2014"}\uFF08${e.guard.compensation?.note || ""}\uFF09`,
-            e.guard.repairBasis ? `${lookup("guard.repairbasis")}: ${e.guard.repairBasis}` : null,
-            lookup("guard.noforce"),
-            e.guard.restartSafe ? lookup("guard.restartsafenow") : lookup("guard.restartunsafe")
-          ].filter(Boolean).join(" | ")
-        });
-      } else if (e && e.opSuperseded) {
-        notify({ kind: "ok", text: lookup("op.superseded.note", { target: it.pkg }) });
-      } else {
-        notify({ kind: "err", text: lookup("failed.upgrade", { err: e && e.message || e }) });
-      }
+      const m = oc.mutationFailed(e, { verb: "upgrade", target: it.pkg });
+      notify({ kind: m.kind, text: m.text });
     }
   };
   if (loading && !data) return h("div", { className: "dshm-empty" }, lookup("installed.loading"), Spin());
@@ -5211,13 +5202,14 @@ function DshmVersionChip({ version, notify, initialCheck, ops }) {
       notify({
         kind: "ok",
         needsRestart: true,
-        text: lookup("notify.selfupgraded", { from: version, to: res.version || "latest" }) + (res.buildApprovals && res.buildApprovals.length ? lookup("notify.builds", { names: res.buildApprovals.join(", ") }) : res.fallbackAllBuilds ? lookup("notify.builds.fallback") : "")
+        text: lookup("notify.selfupgraded", { from: version, to: res.version || "latest" }) + oc.buildsSuffix(res)
       });
     } catch (e) {
       if (e && e.unsupported) {
         notify({ kind: "info", text: e.unsupported.guidance || e && e.message || String(e) });
       } else {
-        notify({ kind: "err", text: lookup("notify.selfupgraded.failed", { err: e && e.message || e }) });
+        const m = oc.mutationFailed(e, { verb: "self", target: "dsh-m" });
+        notify({ kind: m.kind, text: m.text });
       }
     } finally {
       setBusy(false);

package/lib/core/host-api.js

@@ -166,18 +166,14 @@ function errorStatus(err) {
         return { status, payload: { ok: false, error: err.message, code: err.code } };
     }
     if (err instanceof InstallGuardError) {
-        // 装后守卫拦截（M2 Task 3）：结构化投影含 needsRestart/restartSafe/kind——GUI 一键重启只读 restartSafe
+        // 装后守卫拦截（M2 Task 3）：结构化投影含 needsRestart/restartSafe/kind——GUI 一键重启只读 restartSafe；
+        // 0.9.93 起线格式单源于 toWire（信封 ok/error 本端自拼）
         return {
             status: 409,
             payload: {
                 ok: false,
                 error: err.message,
-                kind: err.kind,
-                violations: err.violations,
-                compensation: err.compensation,
-                needsRestart: err.needsRestart,
-                restartSafe: err.restartSafe,
-                ...(err.repairBasis ? { repairBasis: err.repairBasis } : {}),
+                ...err.toWire(),
             },
         };
     }

package/lib/core/market.js

@@ -822,6 +822,21 @@ export class InstallGuardError extends Error {
         this.compensation = fields.compensation;
         this.repairBasis = fields.repairBasis;
     }
+    /**
+     * 线格式单一事实源（0.9.93）：三端共享的 6 字段守卫投影。各端信封自拼（host-api 409 payload 的
+     * ok/error、tools 的 ok/guard/message、cli 的裸 JSON），共享部分一律经此方法——加守卫字段只改
+     * 本方法 + client 读取一处。repairBasis undefined 时键不存在（今日 5 处投影同语义）。
+     */
+    toWire() {
+        return {
+            kind: this.kind,
+            violations: this.violations,
+            compensation: this.compensation,
+            needsRestart: this.needsRestart,
+            restartSafe: this.restartSafe,
+            ...(this.repairBasis ? { repairBasis: this.repairBasis } : {}),
+        };
+    }
 }
 /** lockfile packages 段的目标包 resolution 提取（行扫描：键行 `pkg@ver:` → 收集至下一键行；引号/嵌套键兼容）。 */
 function lockResolutionOf(lockText, pkg) {

package/lib/core/profile-transaction.js

@@ -40,6 +40,7 @@ import { setLivePluginDisabled } from './live-plugin.js';
 import { warmPackumentFor } from './packument.js';
 import { syncNpmmirrorPackage } from './npm-route.js';
 import { clearAllLatestCache } from './latest-cache.js';
+import { parse as yamlParse } from 'yaml';
 import { assertNpmIntegrity, atomicWriteFile, readPnpmLockIntegrity, readPnpmLockOverrides, restoreSnapshots, snapshotFiles, verifySnapshots, } from './npm-integrity.js';
 import { isSafePluginTarget, makeDshRunner, removePatchedDependencyEntries, PNPM_OUTCOME_CODES, } from './dsh-cli.js';
 export const TX_HEAL_CODES = [
@@ -811,6 +812,25 @@ async function uninstall(req, d, snapshots) {
     }
 }
 // ---------- compensate-install 门（M2 Task 3：专用补偿事务，四边界见 DESIGN §3） ----------
+/** 解析 pnpm-workspace.yaml 的 patchedDependencies 键集合（0.9.94 D9）。
+ *  文本不可解析（坏 YAML / 重复键）→ null（保守，不抛）——调用方据此走退化或 fail-closed；
+ *  空值/缺省（parse 得 null/undefined）与数组形态一律按空集处理（本机实证 parse('') === null；
+ *  防 typeof null === 'object' 朴素实现令 Object.keys(null) 抛错走 INTERNAL_ERROR——评审 N5）。 */
+function workspacePatchedKeys(text) {
+    let doc;
+    try {
+        doc = yamlParse(text);
+    }
+    catch {
+        return null;
+    }
+    if (doc === null || typeof doc !== 'object' || Array.isArray(doc))
+        return new Set();
+    const patched = doc.patchedDependencies;
+    if (patched === null || typeof patched !== 'object' || Array.isArray(patched))
+        return new Set();
+    return new Set(Object.keys(patched));
+}
 /** patchMapping 结构化双落点恢复：workspace（pnpm-workspace.yaml patchedDependencies）与 manifest（pnpm.patchedDependencies）。 */
 async function restorePatchMapping(profileDir, mapping, heal) {
     const wsFile = join(profileDir, 'pnpm-workspace.yaml');
@@ -826,9 +846,13 @@ async function restorePatchMapping(profileDir, mapping, heal) {
         if (!lines.some((l) => l.trim() === 'patchedDependencies:')) {
             lines.push('patchedDependencies:');
         }
+        // 0.9.94 D9：解析去重——同键任意引号形态（pnpm 的单引号/无引号书写）在场即跳过，杜绝对重复键文件的自造；
+        // 解析失败（坏 YAML/重复键）退化为今日逐字判重（保守不收紧）
+        const existingKeys = workspacePatchedKeys(text);
         for (const entry of mapping.workspace) {
             const line = `  ${JSON.stringify(entry.key)}: ${entry.patchPath}`;
-            if (!lines.includes(line))
+            const present = existingKeys !== null ? existingKeys.has(entry.key) : lines.includes(line);
+            if (!present)
                 lines.push(line);
         }
         await atomicWriteFile(wsFile, Buffer.from(lines.join('\n'), 'utf8'));
@@ -860,8 +884,13 @@ async function verifyPatchMapping(profileDir, mapping) {
     if (mapping.workspace.length > 0) {
         try {
             const text = await readFile(join(profileDir, 'pnpm-workspace.yaml'), 'utf8');
+            // 0.9.94 D9：yaml 键成员判定替代双引号子串扫描——单引号/无引号在场形态不再被误判「复读缺失」；
+            // 解析失败（坏 YAML/重复键）fail-closed 报「复读失败」（与 manifest 支 JSON 解析失败同款纪律）
+            const keys = workspacePatchedKeys(text);
+            if (keys === null)
+                return 'pnpm-workspace.yaml 复读失败：YAML 无法解析';
             for (const entry of mapping.workspace) {
-                if (!text.includes(JSON.stringify(entry.key)))
+                if (!keys.has(entry.key))
                     return `workspace 补丁映射复读缺失：${entry.key}`;
             }
         }

package/lib/tools.js

@@ -241,7 +241,7 @@ export function registerTools(ctx, cfg, deps = {}, profile = resolveActiveProfil
             catch (err) {
                 if (err instanceof InstallGuardError) {
                     // 结构化 error result（M2 Task 3 ㉑-㉜）：不渲染「已安装」，无 force 通道；restartSafe 随结果携带
-                    return { ok: false, guard: true, kind: err.kind, message: err.message, violations: err.violations, compensation: err.compensation, needsRestart: err.needsRestart, restartSafe: err.restartSafe, ...(err.repairBasis ? { repairBasis: err.repairBasis } : {}) };
+                    return { ok: false, guard: true, message: err.message, ...err.toWire() };
                 }
                 throw err;
             }
@@ -403,7 +403,7 @@ export function registerTools(ctx, cfg, deps = {}, profile = resolveActiveProfil
             }
             catch (err) {
                 if (err instanceof InstallGuardError) {
-                    return { ok: false, guard: true, kind: err.kind, message: err.message, violations: err.violations, compensation: err.compensation, needsRestart: err.needsRestart, restartSafe: err.restartSafe, ...(err.repairBasis ? { repairBasis: err.repairBasis } : {}) };
+                    return { ok: false, guard: true, message: err.message, ...err.toWire() };
                 }
                 throw err;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-m",
-  "version": "0.9.92",
+  "version": "0.9.94",
   "description": "可自定义收录清单的 DSH 插件市场：收录、安装、卸载、升级一站完成，附 agent 工具与 dshm CLI。",
   "license": "MIT",
   "type": "module",