@hyzyn/dsh-safe 0.13.0 → 0.13.1

package/lib/repair.js

@@ -164,6 +164,36 @@ export async function cmdRepair(args, { spawn = spawnSync, log = err, write = ou
     const e = restored[0]
     write(`[dsh-safe] ${t('restored')} ${e.name ?? e.id} (id: ${e.id})`)
   }
+
+  // 防复发：修复的插件若同时被多个 bundle 挂载（如聚合包已内置同一插件），
+  // 恢复后下次启动会 duplicate——自动去重（交互选择保留来源，-y 保留先声明者）
+  const knownAfter = collectKnownRows(profile)
+  const sources = bundleMountSources(knownAfter, opts.id)
+  if (sources.length >= 2) {
+    const manifest = readJsonIfExists(profileManifestPath(profile))
+    const declared = manifest?.dsh?.profile?.bundles
+    const ordered = Array.isArray(declared)
+      ? [...sources].sort(
+          (a, b) =>
+            (declared.indexOf(a) < 0 ? 999 : declared.indexOf(a)) - (declared.indexOf(b) < 0 ? 999 : declared.indexOf(b)),
+        )
+      : sources
+    let keep = ordered[0]
+    if (!opts.yes) {
+      const rl = createInterface({ input: process.stdin, output: process.stderr })
+      log(t('repairDedupePick', { id: opts.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 removed = ordered.filter((b) => b !== keep)
+    if (removeFromManifestBundles(profile, removed)) {
+      log(t('repairDedupeDone', { removed: removed.join(', '), keep }))
+    }
+  }
+
   log(t('repairDone'))
   return 0
 }
@@ -193,6 +223,28 @@ const readJsonIfExists = (path) => {
   }
 }
 
+/** 该 id 的 bundle 挂载来源（profile/home 层是 override，不算挂载来源）。 */
+function bundleMountSources(known, id) {
+  return [
+    ...new Set(
+      known.rows.filter((r) => r.id === id && r.source !== 'profile' && r.source !== 'home').map((r) => r.source),
+    ),
+  ]
+}
+
+/** 从 profile 清单的 bundles 数组移除指定来源；没有变化返回 false。 */
+function removeFromManifestBundles(profile, removeNames) {
+  const manifestPath = profileManifestPath(profile)
+  const manifest = readJsonIfExists(manifestPath)
+  const current = manifest?.dsh?.profile?.bundles
+  if (!Array.isArray(current)) return false
+  const next = current.filter((b) => !removeNames.includes(b))
+  if (next.length === current.length) return false
+  manifest.dsh.profile.bundles = next
+  writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`)
+  return true
+}
+
 /**
  * duplicate 类的自动去重：同一 id 被多个 bundle 挂载时，从 profile 清单的
  * bundles 数组移除一个来源（保留的来源继续提供插件），并摘除无效的禁用行。

package/package.json

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