@hyzyn/dsh-safe 0.11.0 → 0.12.0

package/README.en.md

@@ -90,7 +90,7 @@ How upgrading works: `dsh-safe update` auto-detects the dsh package name and ins
 
 ## How It Works
 
-1. **Failure identification**: when dsh fails to start, stderr carries four kinds of signatures (`plugin(s) failed to load: …`, `N entries did not activate` with per-row failures, `failed to apply/import loader entry <id> (<name>)`, and outer stack frames `…#<entryId>`). dsh-safe extracts the broken plugin's package name and row id from them.
+1. **Failure identification**: when dsh fails to start, stderr carries five kinds of signatures (`plugin(s) failed to load: …`, `N entries did not activate` with per-row failures, `failed to apply/import loader entry <id> (<name>)`, outer stack frames `…#<entryId>`, and `duplicate loader entry id: <id>` duplicates). dsh-safe extracts the broken plugin's package name and row id from them.
 2. **Match against real rows**: it scans the profile patch, `$DSH_HOME/cordis.patch.yml` (home layer) and each bundle's patch to build a "row id ↔ plugin package" mapping; only rows that actually exist are disabled, avoiding collateral damage.
 3. **Managed block writing**: it appends a marker-commented managed block at the end of the matching patch file (same convention as `dsh-mcp-config managed`), setting matched rows to `disabled: true`. Existing user content and comments are preserved; a fresh profile's `[]` template is correctly replaced with a block sequence.
 4. **Ledger & restore**: quarantine records live in `$DSH_HOME/dsh-safe/quarantine.json`. Once a plugin upgrade fixes the issue, `dsh-safe restore --profile web --all` removes the managed block and re-mounts the plugin (hot-applied for profiles with `patchReload: live`).

package/README.md

@@ -90,7 +90,7 @@ Error: dsh: plugin tree failed to load: failed to apply loader entry smoke-broke
 
 ## 工作原理
 
-1. **识别失败**：dsh 启动失败时，stderr 里有四类特征（`plugin(s) failed to load: …`、`N entries did not activate` 逐行失败、`failed to apply/import loader entry <id> (<name>)`、外层栈 `…#<entryId>`）。dsh-safe 从中提取坏插件的包名与行 id。
+1. **识别失败**：dsh 启动失败时，stderr 里有五类特征（`plugin(s) failed to load: …`、`N entries did not activate` 逐行失败、`failed to apply/import loader entry <id> (<name>)`、外层栈 `…#<entryId>`、`duplicate loader entry id: <id>` 重复挂载）。dsh-safe 从中提取坏插件的包名与行 id。
 2. **对照真实行**：扫描 profile patch、`$DSH_HOME/cordis.patch.yml`（home 层）与各 bundle 的 patch，得到「行 id ↔ 插件包名」对照表；只禁用真实存在的行，避免误伤。
 3. **写入托管区块**：在对应 patch 文件末尾追加带标记注释的区块（与 `dsh-mcp-config managed` 同款约定），把命中的行置为 `disabled: true`。用户已有内容与注释原样保留；全新 profile 的 `[]` 模板会被正确替换成块序列。
 4. **台账与恢复**：隔离记录存 `$DSH_HOME/dsh-safe/quarantine.json`。插件升级修复后用 `dsh-safe restore --profile web --all` 摘除区块恢复挂载（`patchReload: live` 的 profile 热生效）。

package/lib/failures.js

@@ -12,6 +12,10 @@
  *    `failed to (apply|import|dispose|rollback) loader entry <id> (<name>): <原因>`
  * 4. 外层栈（getOuterStack）：
  *    `    at file:///…/profiles/web/#<entryId>`
+ * 5. 重复挂载：
+ *    `duplicate loader entry id: <id>`（同一 id 被多个 bundle/行挂载）。
+ *    该行同时会被特征 3 命中包装层（如 include 入口），但 include 是机制层
+ *    而非元凶——命中本特征时抑制同线的特征 3 记录，避免误隔离机制行。
  *
  * 1–3 给出包名（entry.options.name），4 给出行 id；两者都要在调用方与
  * patch 行对照后才会生效，所以这里允许宽收集。
@@ -35,8 +39,16 @@ export function parseFailureReport(text) {
   const reEntry = new RegExp(`failed to (?:apply|import|dispose|rollback) loader entry (${ID_CLASS}) \\(([^)]+)\\)`)
   const reStackId = new RegExp(`^\\s*at \\S+#(${ID_CLASS})`)
   const reLoadList = /plugin\(s\) failed to load:\s*([^;\n]+);/
+  const reDupId = new RegExp(`duplicate loader entry id: (${ID_CLASS})`)
 
   for (const line of lines) {
+    const dup = reDupId.exec(line)
+    if (dup) {
+      // 重复挂载：真正元凶是被复制的 id；包装行（apply include 等）是机制层，
+      // 若一并记录可能误禁加载机制，故本行只记录 duplicate 的 id。
+      entryIds.set(dup[1], line)
+      continue
+    }
     const entry = reEntry.exec(line)
     if (entry) {
       entryIds.set(entry[1], line)

package/lib/i18n.js

@@ -135,6 +135,7 @@ const ZH = {
   repairAmbiguous: '[dsh-safe] {id} 在多个 profile 中都有隔离记录（{profiles}），请用 --profile <名> 指定。',
     repairUnsupported: '[dsh-safe] 该失败类型不支持自动修复（可修复范围：包解析失败、导出版本不匹配等重装/升级可能修复的问题）。原因: {reason}\n           可用 dsh-safe explain 查看解读。',
   repairPlan: '[dsh-safe] 将在 profile {profile} 中修复 {name}：执行 {command}，成功后自动摘除隔离行',
+  repairDuplicate: '[dsh-safe] 这是重复挂载问题（同一 id 被多个 bundle/行挂载），重装包无法修复。请从 profile 的 bundles 清单或 patch 中移除多余的挂载来源，然后 dsh-safe restore 恢复。',
   repairInstallFailed: '[dsh-safe] 插件安装失败（退出码 {code}），隔离状态保持不变。',
   repairDone: '[dsh-safe] 修复完成：跑 dsh-safe <启动命令> 验证；若仍失败会被自动重新隔离。',
 }
@@ -272,6 +273,7 @@ Notes:
   repairAmbiguous: '[dsh-safe] {id} is quarantined in multiple profiles ({profiles}); specify one with --profile <name>.',
     repairUnsupported: '[dsh-safe] this failure type cannot be auto-repaired (repairable: package-resolution failures, export mismatches — problems a reinstall/upgrade may fix). Reason: {reason}\n           try dsh-safe explain for an interpretation.',
   repairPlan: '[dsh-safe] repairing {name} in profile {profile}: running {command}, then the quarantine row is removed automatically',
+  repairDuplicate: '[dsh-safe] this is a duplicate-mount issue (the same id is mounted by multiple bundles/rows); reinstalling cannot fix it. Remove the redundant mount source from the profile bundles/patch, then run dsh-safe restore.',
   repairInstallFailed: '[dsh-safe] plugin install failed (exit code {code}); quarantine state left unchanged.',
   repairDone: '[dsh-safe] repair finished: run dsh-safe <boot command> to verify; a still-broken plugin will be auto-quarantined again.',
 }

package/lib/repair.js

@@ -24,12 +24,14 @@ const out = (line) => process.stdout.write(`${line}\n`)
  * repair 可修复的失败特征：问题出在"包的安装状态或版本适配"上，重装/升级
  * 插件包可能修复——
  *   - 模块解析失败：包缺失/损坏/未安装 → 重装即愈；
- *   - ESM 导出不匹配（does not provide an export/import binding）：插件与
+ *   - ESM 导出不匹配（does not provide an [export|import binding]）：插件与
  *     当前 dsh API 版本不兼容，升级插件到适配版本可能修复（真实案例：
  *     describe-image 隔离于 dsh-settings 导出变更）。修复失败不恢复、无损。
+ * 注意：台账 reason 经 summarizeLine 截断过（160 字符），关键短语可能被
+ * "…" 切断，因此导出不匹配的特征只匹配到 "does not provide an" 为止。
  */
 const REPAIRABLE_RE =
-  /Cannot find package|could not be resolved|ERR_MODULE_NOT_FOUND|does not provide an (?:export|import binding)/i
+  /Cannot find package|could not be resolved|ERR_MODULE_NOT_FOUND|does not provide an( (?:export|import binding))?/i
 
 function parseRepairArgs(args) {
   const opts = { id: undefined, profile: undefined, to: undefined, yes: false, dryRun: false }
@@ -111,7 +113,12 @@ export async function cmdRepair(args, { spawn = spawnSync, log = err, write = ou
   const { profile, entry } = matches[0]
   const name = entry.name ?? entry.id
 
-  // 类别门禁：只修"模块解析失败"类
+  // 类别门禁：重复挂载是配置层问题（同一 id 多处挂载），重装无意义，给针对性指引
+  if (/duplicate loader entry id/i.test(entry.reason ?? '')) {
+    log(t('repairDuplicate'))
+    return 1
+  }
+  // 只修"包的安装状态/版本适配"类
   if (!REPAIRABLE_RE.test(entry.reason ?? '')) {
     log(t('repairUnsupported', { reason: summarizeLine(entry.reason) }))
     return 1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyzyn/dsh-safe",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "description": "dsh 启动保险丝：社区插件不兼容导致 dsh 启动失败时，自动禁用坏插件并重试",
   "type": "module",
   "license": "MIT",