@hyzyn/dsh-safe 0.5.0 → 0.7.0

package/README.en.md

@@ -48,6 +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 help` (`-h` / `--help`) | show help |
 | `dsh-safe --version` (`-V`) | show version |
 

package/README.md

@@ -48,6 +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 help`（`-h` / `--help`） | 显示帮助 |
 | `dsh-safe --version`（`-V`） | 显示版本 |
 

package/lib/cli.js

@@ -12,6 +12,7 @@ import { readFileSync } from 'node:fs'
 import { loadLedger, restoreQuarantine } from './quarantine.js'
 import { runWrapped } from './wrap.js'
 import { cmdUpdate, cmdUpdateAndBoot, maybeNotifySelfUpdate } from './update.js'
+import { cmdRepair } from './repair.js'
 import { printDoctor } from './doctor.js'
 import { aiEnabled, explainFailure } from './ai.js'
 import { t } from './i18n.js'
@@ -181,6 +182,7 @@ export async function main(argv) {
   }
   if (cmd === 'list') return cmdList(argv.slice(1))
   if (cmd === 'restore') return cmdRestore(argv.slice(1))
+  if (cmd === 'repair') return cmdRepair(argv.slice(1))
   if (cmd === 'update') return cmdUpdate(argv.slice(1))
   if (cmd === 'explain') return cmdExplain(argv.slice(1))
   if (cmd === 'doctor') {

package/lib/i18n.js

@@ -25,6 +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]
+                                    重装/升级被隔离的插件并自动恢复（限模块解析失败类；省略 id 时只有一条记录则直接修）
   dsh-safe help                     显示本帮助
   dsh-safe --version                显示版本
 
@@ -122,6 +124,14 @@ const ZH = {
   doctorAIOff: 'AI         未启用（DSH_SAFE_AI_KEY 未设置）',
   doctorCheckLast: '更新检查    上次 {time}',
   doctorCheckNever: '更新检查    从未执行',
+  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 查看解读。',
+  repairPlan: '[dsh-safe] 将在 profile {profile} 中修复 {name}：执行 {command}，成功后自动摘除隔离行',
+  repairInstallFailed: '[dsh-safe] 插件安装失败（退出码 {code}），隔离状态保持不变。',
+  repairDone: '[dsh-safe] 修复完成：跑 dsh-safe <启动命令> 验证；若仍失败会被自动重新隔离。',
 }
 
 const EN = {
@@ -144,6 +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; omit id when there is exactly one record)
   dsh-safe help                     show this help
   dsh-safe --version                show version
 
@@ -244,6 +256,14 @@ Notes:
   doctorAIOff: 'AI         disabled (DSH_SAFE_AI_KEY not set)',
   doctorCheckLast: 'update-check last ran at {time}',
   doctorCheckNever: 'update-check never ran',
+  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.',
+  repairPlan: '[dsh-safe] repairing {name} in profile {profile}: running {command}, then the quarantine row is removed automatically',
+  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.',
 }
 
 const CATALOG = { zh: ZH, en: EN }

package/lib/repair.js

@@ -0,0 +1,167 @@
+/**
+ * @hyzyn/dsh-safe — `dsh-safe repair <id>`：半自动修复被隔离的插件。
+ *
+ * 只处理"模块解析失败"类（Cannot find package / could not be resolved /
+ * ERR_MODULE_NOT_FOUND）——这类问题重装/升级插件包即可修复。其它类型
+ * （apply 抛错、pending 服务等待等）属于代码或配置问题，明确拒接。
+ *
+ * 流程：台账定位条目 → 类别门禁 → 展示计划 → 确认 → 经 `dsh plugin add`
+ * （dsh 官方的 pnpm 转发通道）安装 → 自动摘除隔离行。不内置启动：装好后
+ * 由用户跑 dsh-safe 验证，再失败会自动回到隔离管线。安装失败则保持隔离
+ * 状态不变，退出码透传。
+ */
+import { spawnSync } from 'node:child_process'
+import { createInterface } from 'node:readline/promises'
+import { loadLedger, restoreQuarantine } from './quarantine.js'
+import { summarizeLine } from './failures.js'
+import { resolveDshSpawnTarget } from './dshpaths.js'
+import { t } from './i18n.js'
+
+const err = (line) => process.stderr.write(`${line}\n`)
+const out = (line) => process.stdout.write(`${line}\n`)
+
+/** 台账 reason 里判定"模块解析失败"的特征。 */
+const RESOLVE_FAIL_RE = /Cannot find package|could not be resolved|ERR_MODULE_NOT_FOUND/i
+
+function parseRepairArgs(args) {
+  const opts = { id: undefined, profile: undefined, to: undefined, yes: false, dryRun: false }
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i]
+    if (a === '-y' || a === '--yes') opts.yes = true
+    else if (a === '--dry-run') opts.dryRun = true
+    else if (a === '--profile') {
+      const v = args[++i]
+      if (v === undefined) return { error: { key: 'updateUnknownFlag', params: { arg: '--profile' } } }
+      opts.profile = v
+    } else if (a.startsWith('--profile=')) opts.profile = a.slice('--profile='.length)
+    else if (a === '--to') {
+      const v = args[++i]
+      if (v === undefined) return { error: { key: 'updateUnknownFlag', params: { arg: '--to' } } }
+      opts.to = v
+    } else if (a.startsWith('--to=')) opts.to = a.slice('--to='.length)
+    else if (!a.startsWith('-') && opts.id === undefined) opts.id = a
+    else return { error: { key: 'updateUnknownFlag', params: { arg: a } } }
+  }
+  if (opts.to !== undefined && !/^[\w.+-]+$/.test(opts.to)) return { error: { key: 'updateToInvalid' } }
+  return { opts }
+}
+
+/**
+ * @param {string[]} args
+ * @param {{
+ *   spawn?: typeof spawnSync,
+ *   log?: (line: string) => void,
+ *   write?: (line: string) => void,
+ * }} [hooks] spawn/log/write 可注入（测试）
+ * @returns {Promise<number>} 退出码
+ */
+export async function cmdRepair(args, { spawn = spawnSync, log = err, write = out } = {}) {
+  if (args.includes('-h') || args.includes('--help')) {
+    out(t('helpText', {}))
+    return 0
+  }
+  const { opts, error } = parseRepairArgs(args)
+  if (error) {
+    log(t(error.key, error.params))
+    return 2
+  }
+
+  // 台账定位：省略 --profile 时跨 profile 搜索；省略 id 时——
+  //   恰好一条隔离记录 → 直接修它（最常见情况）；
+  //   多条 → 列出清单让用户挑（标记哪些可自动修复）。
+  const ledger = loadLedger()
+  let matches = []
+  for (const [profile, entries] of Object.entries(ledger.profiles)) {
+    if (opts.profile && profile !== opts.profile) continue
+    for (const entry of entries ?? []) {
+      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
+  }
+  if (matches.length > 1) {
+    log(t('repairAmbiguous', { id: opts.id, profiles: matches.map((m) => m.profile).join(', ') }))
+    return 2
+  }
+  const { profile, entry } = matches[0]
+  const name = entry.name ?? entry.id
+
+  // 类别门禁：只修"模块解析失败"类
+  if (!RESOLVE_FAIL_RE.test(entry.reason ?? '')) {
+    log(t('repairUnsupported', { reason: summarizeLine(entry.reason) }))
+    return 1
+  }
+
+  const target = opts.to ?? 'latest'
+  const spec = `${name}@${target}`
+  const spawnTarget = resolveDshSpawnTarget('dsh')
+  const commandDesc = `dsh plugin --profile ${profile} add ${spec}`
+  log(t('repairPlan', { profile, name, command: commandDesc }))
+  if (opts.dryRun) {
+    log(t('dryRunNotice'))
+    return 0
+  }
+  if (!opts.yes) {
+    if (!process.stdin.isTTY) {
+      log(t('updateNonInteractive'))
+      return 1
+    }
+    const ok = await askConfirm(t('updateConfirm'))
+    if (!ok) {
+      log(t('updateAborted'))
+      return 0
+    }
+  }
+
+  const { status } = spawn(spawnTarget.file, [...spawnTarget.prefix, 'plugin', '--profile', profile, 'add', spec], {
+    stdio: 'inherit',
+    shell: spawnTarget.shell,
+    env: process.env,
+  })
+  if (status !== 0) {
+    log(t('repairInstallFailed', { code: status ?? '?' }))
+    return status ?? 1
+  }
+
+  const { restored } = restoreQuarantine(profile, [opts.id], false)
+  if (!restored.length) {
+    log(t('noMatching'))
+  } else {
+    const e = restored[0]
+    write(`[dsh-safe] ${t('restored')} ${e.name ?? e.id} (id: ${e.id})`)
+  }
+  log(t('repairDone'))
+  return 0
+}
+
+function askConfirm(question) {
+  const rl = createInterface({ input: process.stdin, output: process.stderr })
+  return rl.question(question).then(
+    (answer) => {
+      rl.close()
+      const a = answer.trim().toLowerCase()
+      return a === 'y' || a === 'yes'
+    },
+    () => {
+      rl.close()
+      return false
+    },
+  )
+}

package/package.json

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