@hyzyn/dsh-safe 0.14.0 → 0.14.2

package/lib/i18n.js

@@ -136,7 +136,8 @@ 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 恢复。',
+  repairDuplicate: '[dsh-safe] 这是重复挂载问题（id: {id}）。一键修复：dsh-safe repair {id}（自动移除冗余来源并恢复挂载）',
+  repairDuplicateManual: '[dsh-safe] 这是重复挂载问题（同一 id 被多个 bundle/行挂载），重装包无法修复。请从 profile 的 bundles 清单或 patch 中移除多余的挂载来源，然后 dsh-safe restore 恢复。',
   repairDedupePick: '[dsh-safe] {id} 同时由以下 bundle 挂载，保留哪个来源？',
   repairDedupeDefault: '（bundles 中先声明，缺省保留）',
   repairDedupeChoose: '保留哪个？输入编号 [1]: ',
@@ -286,7 +287,8 @@ 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.',
+  repairDuplicate: '[dsh-safe] duplicate-mount issue (id: {id}). One-command fix: dsh-safe repair {id} (removes the redundant source and restores automatically)',
+  repairDuplicateManual: '[dsh-safe] 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]: ',

package/lib/repair.js

@@ -98,7 +98,7 @@ async function repairEntry({ profile, entry, to = undefined, yes = false, tty =
   if (DUPLICATE_RE.test(entry.reason ?? '')) {
     const sources = bundleMountSources(collectKnownRows(profile), id)
     if (sources.length < 2) {
-      log(t('repairDuplicate'))
+      log(t('repairDuplicateManual'))
       return { code: 1, outcome: 'skipped' }
     }
     const manifest = readJsonIfExists(profileManifestPath(profile))
@@ -433,13 +433,40 @@ export async function cmdRepairAndBoot(args, { boot, spawn = spawnSync, log = er
     if (opts.profile && profile !== opts.profile) continue
     for (const entry of entries ?? []) targets.push({ profile, entry })
   }
+
+  // 预检：duplicate 失败不产生台账条目——按挂载来源找出未入账的重复挂载，
+  // 并入修复目标（否则 -r 对这类 profile 空手而归）
+  const scanProfiles = opts.profile ? [opts.profile] : [...new Set(targets.map((t) => t.profile))]
+  for (const p of scanProfiles) {
+    const known = collectKnownRows(p)
+    const ledgerIds = new Set(targets.filter((t) => t.profile === p).map((t) => t.entry.id))
+    const byId = new Map()
+    for (const row of known.rows) {
+      if (row.source === 'profile' || row.source === 'home') continue
+      if (!byId.has(row.id)) byId.set(row.id, new Set())
+      byId.get(row.id).add(row.source)
+    }
+    for (const [dupId, srcs] of byId) {
+      if (srcs.size < 2 || ledgerIds.has(dupId)) continue
+      const nameRow = known.rows.find((r) => r.id === dupId)
+      targets.unshift({ profile: p, entry: { id: dupId, name: nameRow?.name ?? null, reason: 'duplicate loader entry id' } })
+    }
+  }
+
+  // --profile 同时作用于修复与启动：启动参数未显式给 --profile 时自动补上
+  const finalBootArgs =
+    opts.profile && !bootArgs.some((a) => a === '--profile' || a.startsWith('--profile='))
+      ? ['--profile', opts.profile, ...bootArgs]
+      : bootArgs
+
   if (!targets.length) {
     log(t('noRecords'))
-    if (bootArgs.length) return boot(bootArgs)
+    if (bootArgs.length) return boot(finalBootArgs)
     return 0
   }
 
   const { failed } = await repairBatch(targets, { to: opts.to, yes: opts.yes, dryRun: opts.dryRun, spawn, log, write })
-  if (bootArgs.length) return boot(bootArgs)
+
+  if (bootArgs.length) return boot(finalBootArgs)
   return failed ? 1 : 0
 }

package/lib/wrap.js

@@ -119,9 +119,10 @@ export async function runWrapped(options) {
     if (!dryRun) persistFailure(invocation.profile, stderr)
     // 重复挂载（同一 id 被多个 bundle/行挂载）发生在 include 挂载阶段，
     // 早于 profile 层 disabled 覆盖的合并——禁用行管不住它，隔离无效。
-    // 直接给针对性指引并透传，不做无效的"禁用+重试"。
+    // 给出一键修复指引（repair 会移除冗余来源并恢复）并透传。
     if (stderr.includes('duplicate loader entry id')) {
-      log(t('repairDuplicate'))
+      const m = /duplicate loader entry id: ([\w:\-]+)/.exec(stderr)
+      log(t('repairDuplicate', { id: m ? m[1] : '' }))
       log(t('explainHint'))
       return code
     }

package/package.json

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