@hyzyn/dsh-safe 0.6.0 → 0.7.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 [--file <path>]` | interpret a failed-boot stderr with AI (read-only, 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 (module-resolution failures only; 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 (module-resolution failures only; installs via `dsh plugin`'s pnpm channel) |
 | `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 [--file <路径>]` | 用 AI 解读一段启动失败 stderr（纯只读，需 `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 通道安装） |
 | `dsh-safe help`（`-h` / `--help`） | 显示帮助 |
 | `dsh-safe --version`（`-V`） | 显示版本 |
 

package/lib/i18n.js

@@ -25,8 +25,8 @@ const ZH = {
   dsh-safe update [-y] [--to <版本>] [--self] [--no-restore] [--no-verify] [--pm npm|pnpm]
                                     升级 dsh 与 dsh-safe 自身，并自动恢复被隔离的插件
   dsh-safe explain [--file <路径>]  用 AI 解读一段启动失败的 stderr（需 DSH_SAFE_AI_KEY）
-  dsh-safe repair <id> [--profile <名>] [--to <版本>] [-y] [--dry-run]
-                                    重装/升级被隔离的插件并自动恢复（限模块解析失败类）
+  dsh-safe repair [id] [--profile <名>] [--to <版本>] [-y] [--dry-run]
+                                    重装/升级被隔离的插件并自动恢复（限模块解析失败类；省略 id 时只有一条记录则直接修）
   dsh-safe help                     显示本帮助
   dsh-safe --version                显示版本
 
@@ -124,7 +124,8 @@ const ZH = {
   doctorAIOff: 'AI         未启用（DSH_SAFE_AI_KEY 未设置）',
   doctorCheckLast: '更新检查    上次 {time}',
   doctorCheckNever: '更新检查    从未执行',
-  repairIdRequired: '[dsh-safe] 需要提供要修复的隔离行 id（dsh-safe list 可查）。',
+  repairPickOne: '[dsh-safe] 共 {count} 条隔离记录，指定要修复的 id（dsh-safe repair <id>）：',
+  repairNotSupportedTag: '（不支持自动修复）',
   repairEntryMissing: '[dsh-safe] 台账里没有找到 {id} 对应的隔离记录。',
   repairAmbiguous: '[dsh-safe] {id} 在多个 profile 中都有隔离记录（{profiles}），请用 --profile <名> 指定。',
   repairUnsupported: '[dsh-safe] 该失败类型不支持自动修复（仅限模块解析失败类）。原因: {reason}\n           可用 dsh-safe explain 查看解读。',
@@ -153,8 +154,8 @@ Usage:
   dsh-safe update [-y] [--to <ver>] [--self] [--no-restore] [--no-verify] [--pm npm|pnpm]
                                     upgrade dsh and dsh-safe itself, auto-restore quarantined plugins
   dsh-safe explain [--file <path>]  interpret a failed-boot stderr with AI (needs DSH_SAFE_AI_KEY)
-  dsh-safe repair <id> [--profile <name>] [--to <ver>] [-y] [--dry-run]
-                                    reinstall/upgrade a quarantined plugin and auto-restore it (module-resolution failures only)
+  dsh-safe repair [id] [--profile <name>] [--to <ver>] [-y] [--dry-run]
+                                    reinstall/upgrade a quarantined plugin and auto-restore it (module-resolution failures only; omit id when there is exactly one record)
   dsh-safe help                     show this help
   dsh-safe --version                show version
 
@@ -255,7 +256,8 @@ Notes:
   doctorAIOff: 'AI         disabled (DSH_SAFE_AI_KEY not set)',
   doctorCheckLast: 'update-check last ran at {time}',
   doctorCheckNever: 'update-check never ran',
-  repairIdRequired: '[dsh-safe] an isolated row id is required (see dsh-safe list).',
+  repairPickOne: '[dsh-safe] {count} quarantined record(s); specify the id to repair (dsh-safe repair <id>):',
+  repairNotSupportedTag: ' (not auto-repairable)',
   repairEntryMissing: '[dsh-safe] no quarantine record found for {id}.',
   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 (module-resolution failures only). Reason: {reason}\n           try dsh-safe explain for an interpretation.',

package/lib/repair.js

@@ -42,7 +42,6 @@ function parseRepairArgs(args) {
     else if (!a.startsWith('-') && opts.id === undefined) opts.id = a
     else return { error: { key: 'updateUnknownFlag', params: { arg: a } } }
   }
-  if (opts.id === undefined) return { error: { key: 'repairIdRequired' } }
   if (opts.to !== undefined && !/^[\w.+-]+$/.test(opts.to)) return { error: { key: 'updateToInvalid' } }
   return { opts }
 }
@@ -67,15 +66,32 @@ export async function cmdRepair(args, { spawn = spawnSync, log = err, write = ou
     return 2
   }
 
-  // 台账定位：省略 --profile 时跨 profile 搜索
+  // 台账定位：省略 --profile 时跨 profile 搜索；省略 id 时——
+  //   恰好一条隔离记录 → 直接修它（最常见情况）；
+  //   多条 → 列出清单让用户挑（标记哪些可自动修复）。
   const ledger = loadLedger()
-  const matches = []
+  let matches = []
   for (const [profile, entries] of Object.entries(ledger.profiles)) {
     if (opts.profile && profile !== opts.profile) continue
     for (const entry of entries ?? []) {
-      if (entry.id === opts.id) matches.push({ profile, entry })
+      if (opts.id === undefined || entry.id === opts.id) matches.push({ profile, entry })
     }
   }
+  if (opts.id === undefined) {
+    if (!matches.length) {
+      log(t('noRecords'))
+      return 0
+    }
+    if (matches.length > 1) {
+      log(t('repairPickOne', { count: matches.length }))
+      for (const m of matches) {
+        const repairable = RESOLVE_FAIL_RE.test(m.entry.reason ?? '')
+        log(`  - ${m.entry.id}（${m.entry.name ?? '-'}）${repairable ? '' : t('repairNotSupportedTag')}`)
+      }
+      return 0
+    }
+    opts.id = matches[0].entry.id
+  }
   if (!matches.length) {
     log(t('repairEntryMissing', { id: opts.id }))
     return 1

package/package.json

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