@hyzyn/dsh-safe 0.12.0 → 0.13.0

package/README.en.md

@@ -48,7 +48,7 @@ Error: dsh: plugin tree failed to load: failed to apply loader entry smoke-broke
 | `dsh-safe doctor` | environment check: versions, DSH_HOME, profiles, ledger, patch health |
 | `dsh-safe restore [--profile <name>] (--id <id> \| --all) [--dry-run]` | re-enable auto-disabled plugins (omit `--profile` to cover every profile in the ledger) |
 | `dsh-safe explain [id] [--profile <name> \| --file <path>]` | interpret failure info with AI: an `id` interprets that quarantine record (with repair advice); defaults to the last failure log, falling back to the ledger; `--file`/stdin read any log (needs `DSH_SAFE_AI_KEY`) |
-| `dsh-safe repair [id] [--profile <name>] [--to <version>] [-y] [--dry-run]` | reinstall/upgrade a quarantined plugin and auto-restore it (failures a reinstall/upgrade may fix: package resolution, export mismatches; installs via `dsh plugin`'s pnpm channel) |
+| `dsh-safe repair [id] [--profile <name>] [--to <version>] [-y] [--dry-run]` | reinstall/upgrade a quarantined plugin and auto-restore it (failures a reinstall/upgrade may fix: package resolution, export mismatches; installs via `dsh plugin`'s pnpm channel); duplicate mounts support auto-dedup (interactively pick which source to keep) |
 | `dsh-safe help` (`-h` / `--help`) | show help |
 | `dsh-safe --version` (`-V`) | show version |
 

package/README.md

@@ -48,7 +48,7 @@ Error: dsh: plugin tree failed to load: failed to apply loader entry smoke-broke
 | `dsh-safe doctor` | 环境体检：版本、DSH_HOME、profiles、台账、各 patch 健康度 |
 | `dsh-safe restore [--profile <名>] (--id <id> \| --all) [--dry-run]` | 恢复被自动禁用的插件（省略 `--profile` 时遍历台账全部 profile） |
 | `dsh-safe explain [id] [--profile <名> \| --file <路径>]` | 用 AI 解读失败信息：指定 `id` 解读该条隔离记录（给 repair 建议）；默认解读最近一次失败日志，无日志则解读隔离台账；`--file`/stdin 读任意日志（需 `DSH_SAFE_AI_KEY`） |
-| `dsh-safe repair [id] [--profile <名>] [--to <版本>] [-y] [--dry-run]` | 重装/升级被隔离的插件并自动恢复（限重装/升级可能修复的失败：包解析失败、导出版本不匹配等；经 `dsh plugin` 的 pnpm 通道安装） |
+| `dsh-safe repair [id] [--profile <名>] [--to <版本>] [-y] [--dry-run]` | 重装/升级被隔离的插件并自动恢复（限重装/升级可能修复的失败：包解析失败、导出版本不匹配等；经 `dsh plugin` 的 pnpm 通道安装）；重复挂载类支持自动去重（交互选择保留哪个来源，从 bundles 移除冗余） |
 | `dsh-safe help`（`-h` / `--help`） | 显示帮助 |
 | `dsh-safe --version`（`-V`） | 显示版本 |
 

package/lib/i18n.js

@@ -136,6 +136,12 @@ const ZH = {
     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 恢复。',
+  repairDedupePick: '[dsh-safe] {id} 同时由以下 bundle 挂载，保留哪个来源？',
+  repairDedupeDefault: '（bundles 中先声明，缺省保留）',
+  repairDedupeChoose: '保留哪个？输入编号 [1]: ',
+  repairDedupePlan: '[dsh-safe] 修复方案：保留 {keep} 的挂载，从 bundles 移除 {remove}，并摘除 {id} 的禁用行',
+  repairDedupeNoManifest: '[dsh-safe] profile 清单中没有可编辑的 bundles 数组，请手动处理。',
+  repairDedupeDone: '[dsh-safe] 去重完成：已从 bundles 移除 {removed}；{keep} 的挂载保留、禁用行已摘除。跑 dsh-safe <启动命令> 验证。',
   repairInstallFailed: '[dsh-safe] 插件安装失败（退出码 {code}），隔离状态保持不变。',
   repairDone: '[dsh-safe] 修复完成：跑 dsh-safe <启动命令> 验证；若仍失败会被自动重新隔离。',
 }
@@ -274,6 +280,12 @@ Notes:
     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.',
+  repairDedupePick: '[dsh-safe] {id} is mounted by the following bundles; which source to keep?',
+  repairDedupeDefault: ' (declared first in bundles; default keep)',
+  repairDedupeChoose: 'which one to keep? number [1]: ',
+  repairDedupePlan: '[dsh-safe] fix plan: keep {keep} mounted, remove {remove} from bundles, and drop the disabled row for {id}',
+  repairDedupeNoManifest: '[dsh-safe] the profile manifest has no editable bundles array; handle it manually.',
+  repairDedupeDone: '[dsh-safe] dedupe finished: removed {removed} from bundles; {keep} stays mounted and the disabled row was dropped. Run dsh-safe <boot command> to verify.',
   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

@@ -12,9 +12,11 @@
  */
 import { spawnSync } from 'node:child_process'
 import { createInterface } from 'node:readline/promises'
+import { readFileSync, writeFileSync } from 'node:fs'
 import { loadLedger, restoreQuarantine } from './quarantine.js'
 import { summarizeLine } from './failures.js'
-import { resolveDshSpawnTarget } from './dshpaths.js'
+import { profileManifestPath, readIfExists, resolveDshSpawnTarget } from './dshpaths.js'
+import { collectKnownRows } from './knownrows.js'
 import { t } from './i18n.js'
 
 const err = (line) => process.stderr.write(`${line}\n`)
@@ -113,10 +115,10 @@ export async function cmdRepair(args, { spawn = spawnSync, log = err, write = ou
   const { profile, entry } = matches[0]
   const name = entry.name ?? entry.id
 
-  // 类别门禁：重复挂载是配置层问题（同一 id 多处挂载），重装无意义，给针对性指引
+  // 类别门禁：重复挂载是配置层问题（同一 id 多处挂载），重装无意义——
+  // 但可以自动去重：从 profile 的 bundles 移除一个挂载来源
   if (/duplicate loader entry id/i.test(entry.reason ?? '')) {
-    log(t('repairDuplicate'))
-    return 1
+    return dedupeForDuplicate({ id: opts.id, profile, opts, spawn, log, write })
   }
   // 只修"包的安装状态/版本适配"类
   if (!REPAIRABLE_RE.test(entry.reason ?? '')) {
@@ -180,3 +182,100 @@ function askConfirm(question) {
     },
   )
 }
+
+const readJsonIfExists = (path) => {
+  const raw = readIfExists(path)
+  if (raw === undefined) return undefined
+  try {
+    return JSON.parse(raw)
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * duplicate 类的自动去重：同一 id 被多个 bundle 挂载时，从 profile 清单的
+ * bundles 数组移除一个来源（保留的来源继续提供插件），并摘除无效的禁用行。
+ * 编辑的是用户自己的 profile 清单（与 cordis.patch.yml 托管区块同信任级别），
+ * 有确认环节、可逆（bundles 加回来即可）。
+ */
+async function dedupeForDuplicate({ id, profile, opts, spawn, log, write }) {
+  const known = collectKnownRows(profile)
+  // 挂载来源只统计 bundle 层；profile/home 层的同 id 是 override，不是重复来源
+  const sources = new Set()
+  for (const row of known.rows) {
+    if (row.id !== id) continue
+    if (row.source === 'profile' || row.source === 'home') continue
+    sources.add(row.source)
+  }
+  const sourceList = [...sources]
+  if (sourceList.length < 2) {
+    // 重复不在 bundle 层（可能在 include 文件或用户层），自动去重帮不上，给指引
+    log(t('repairDuplicate'))
+    return 1
+  }
+
+  const manifestPath = profileManifestPath(profile)
+  const manifest = readJsonIfExists(manifestPath)
+  const bundles = manifest?.dsh?.profile?.bundles
+  if (!Array.isArray(bundles)) {
+    log(t('repairDedupeNoManifest'))
+    return 1
+  }
+  // 按 bundles 数组声明顺序排序：先声明的是既有来源，缺省保留
+  const ordered = [...sourceList].sort((a, b) => {
+    const ia = bundles.indexOf(a)
+    const ib = bundles.indexOf(b)
+    return (ia < 0 ? 999 : ia) - (ib < 0 ? 999 : ib)
+  })
+
+  const keepDefault = ordered[0]
+  const planLine = () => log(t('repairDedupePlan', { keep: keep, remove: remove.join(', '), id }))
+  if (opts.dryRun) {
+    log(t('repairDedupePlan', { keep: keepDefault, remove: ordered.slice(1).join(', '), id }))
+    log(t('dryRunNotice'))
+    return 0
+  }
+
+  let keep
+  if (!opts.yes && !process.stdin.isTTY) {
+    log(t('updateNonInteractive'))
+    return 1
+  }
+  if (opts.yes) {
+    keep = keepDefault // -y：保留先声明的来源
+  } else {
+    const rl = createInterface({ input: process.stdin, output: process.stderr })
+    log(t('repairDedupePick', { id }))
+    ordered.forEach((b, i) => log(`${i + 1}. ${b}${i === 0 ? t('repairDedupeDefault') : ''}`))
+    const answer = await rl.question(t('repairDedupeChoose'))
+    rl.close()
+    const pick = Math.min(Math.max(parseInt(answer, 10) || 1, 1), ordered.length)
+    keep = ordered[pick - 1]
+  }
+  const remove = ordered.filter((b) => b !== keep)
+  planLine()
+
+  const fresh = readJsonIfExists(manifestPath)
+  const current = fresh?.dsh?.profile?.bundles
+  if (!Array.isArray(current)) {
+    log(t('repairDedupeNoManifest'))
+    return 1
+  }
+  const next = current.filter((b) => !remove.includes(b))
+  if (next.length === current.length) {
+    log(t('repairDedupeNoManifest'))
+    return 1
+  }
+  fresh.dsh.profile.bundles = next
+  writeFileSync(manifestPath, `${JSON.stringify(fresh, null, 2)}\n`)
+
+  const { restored } = restoreQuarantine(profile, [id], false)
+  if (restored.length) {
+    const e = restored[0]
+    write(`[dsh-safe] ${t('restored')} ${e.name ?? e.id} (id: ${e.id})`)
+  }
+  log(t('repairDedupeDone', { removed: remove.join(', '), keep }))
+  log(t('repairDone'))
+  return 0
+}

package/lib/wrap.js

@@ -117,6 +117,14 @@ export async function runWrapped(options) {
       return code
     }
     if (!dryRun) persistFailure(invocation.profile, stderr)
+    // 重复挂载（同一 id 被多个 bundle/行挂载）发生在 include 挂载阶段，
+    // 早于 profile 层 disabled 覆盖的合并——禁用行管不住它，隔离无效。
+    // 直接给针对性指引并透传，不做无效的"禁用+重试"。
+    if (stderr.includes('duplicate loader entry id')) {
+      log(t('repairDuplicate'))
+      log(t('explainHint'))
+      return code
+    }
     const known = collectKnownRows(invocation.profile)
     const report = parseFailureReport(stderr)
     let hits = matchFailures(report, known)

package/package.json

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