@hyzyn/dsh-safe 0.1.0 → 0.2.0

package/README.en.md

@@ -0,0 +1,84 @@
+# dsh-safe · Startup Fuse for dsh
+
+[中文](./README.md) | English
+
+When a community plugin of DeepSeek Harness (DSH) is incompatible with the dsh runtime, `dsh web` **fails to boot entirely** — the loader flattens all patch layers into a single load tree, so if any plugin fails to import, throws inside `apply`, or times out waiting for an injected service, the boot audit rejects the whole tree and the process exits. The only remedy was manually editing `cordis.patch.yml` to disable the broken plugin.
+
+**dsh-safe automates that manual step**: it wraps `dsh`, identifies the offending plugin from the startup error, sets the matching row to `disabled: true` in the profile patch (recording it in a quarantine ledger), and retries automatically. A broken plugin only breaks itself; dsh boots as usual.
+
+## Installation
+
+```bash
+npm install -g @hyzyn/dsh-safe
+```
+
+Requires Node >= 20 and a local `dsh` command. Zero runtime dependencies.
+
+## Quick Start
+
+Just replace `dsh` with `dsh-safe`:
+
+```bash
+dsh-safe web          # same as dsh web, with auto-quarantine
+dsh-safe --profile tui --patch ./extra.yml
+```
+
+Sample output (shown with a zh locale: a broken plugin is quarantined, then startup retries):
+
+```
+Error: dsh: plugin tree failed to load: failed to apply loader entry smoke-broken (@smoke/broken-impl): Cannot find package '@smoke/broken-impl' ...
+[dsh-safe] 已禁用 @smoke/broken-impl (id: smoke-broken) → /Users/me/.dsh/profiles/web/cordis.patch.yml
+           原因: Error: failed to import loader entry smoke-broken (@smoke/broken-impl): Cannot find package …
+[dsh-safe] 重试启动…
+```
+
+## Commands
+
+```
+dsh-safe <dsh args…>              wrap and run dsh
+dsh-safe list [--profile <name>]  show quarantined plugins (defaults to all profiles)
+dsh-safe restore --profile <name> (--id <id> | --all) [--dry-run]
+                                  re-enable auto-disabled plugins (after a fixed plugin upgrade)
+dsh-safe help
+```
+
+Wrapper-mode options (must come before the profile / subcommand):
+
+| Option | Description |
+| --- | --- |
+| `--dry-run` | Parse and report only; no files are modified |
+| `--max-retries <n>` | Max startup retries after an auto-quarantine (default 2; `0` means pass through without quarantining) |
+| `--allow-first-party` | Allow auto-disabling first-party `@deepseek-ai/*` plugins (skipped by default; handle manually) |
+
+Messages follow `LC_ALL` / `LC_MESSAGES` / `LANG` / `LANGUAGE` (`zh*` → Chinese, otherwise English); force with `DSH_SAFE_LANG=zh|en`.
+
+## How It Works
+
+1. **Failure identification**: when dsh fails to start, stderr carries four kinds of signatures (`plugin(s) failed to load: …`, `N entries did not activate` with per-row failures, `failed to apply/import loader entry <id> (<name>)`, and outer stack frames `…#<entryId>`). dsh-safe extracts the broken plugin's package name and row id from them.
+2. **Match against real rows**: it scans the profile patch, `$DSH_HOME/cordis.patch.yml` (home layer) and each bundle's patch to build a "row id ↔ plugin package" mapping; only rows that actually exist are disabled, avoiding collateral damage.
+3. **Managed block writing**: it appends a marker-commented managed block at the end of the matching patch file (same convention as `dsh-mcp-config managed`), setting matched rows to `disabled: true`. Existing user content and comments are preserved; a fresh profile's `[]` template is correctly replaced with a block sequence.
+4. **Ledger & restore**: quarantine records live in `$DSH_HOME/dsh-safe/quarantine.json`. Once a plugin upgrade fixes the issue, `dsh-safe restore --profile web --all` removes the managed block and re-mounts the plugin (hot-applied for profiles with `patchReload: live`).
+
+## Safety Boundaries
+
+- **First-party protection**: rows of `@deepseek-ai/*` plugins are skipped by default (disabling plugins like `dsh-web-app` would strip dsh of its core capabilities); pass `--allow-first-party` to touch them.
+- **Startup-phase failures only**: module resolution failures / `apply` throws / timed-out service injection. Uncaught runtime exceptions are still handled by dsh's own fail-loud policy and are out of scope for boot quarantine.
+- **Auditable**: every write records the reason and a timestamp; `--dry-run` previews which plugins would be disabled.
+- **Faithful pass-through**: when no broken plugin can be identified, the retry limit is exceeded, or for `dsh plugin` (pnpm forwarding), the exit code is passed through untouched and no files are modified.
+
+## Known Limitations
+
+- If the patch file itself fails YAML parsing (e.g. broken by hand-editing), plugins cannot be identified and the failure is passed through.
+- Rows inserted via `--patch` overlay layers are not part of the mapping (only the profile patch, the home patch and bundle patches are scanned).
+- To capture stderr, the wrapper pipes dsh's stderr (content is still echoed to the terminal in real time); stdout/stdin pass through unaffected.
+- Match patterns target the dsh 0.1.x error formats; a major dsh upgrade that changes them requires updating the parser.
+
+## Development
+
+```bash
+npm test        # node:test unit tests + fake-dsh integration tests
+```
+
+## License
+
+[MIT](./LICENSE)

package/README.md

@@ -1,6 +1,6 @@
 # dsh-safe · dsh 启动保险丝
 
-中文 | [English](#english)
+中文 | [English](./README.en.md)
 
 DeepSeek Harness（DSH）的社区插件与 dsh 运行时不兼容时，`dsh web` 会**整体启动失败**——加载器把所有 patch 层拉平成同一棵加载树，任何一个插件 import 失败、`apply` 抛错、或等不到注入的服务，启动审计就会拒绝整棵树，进程退出。此时只能手动编辑 `cordis.patch.yml` 把坏插件禁用。
 
@@ -50,6 +50,8 @@ dsh-safe help
 | `--max-retries <n>` | 自动隔离后最多重试启动的次数（默认 2；`0` 表示不隔离只透传） |
 | `--allow-first-party` | 允许自动禁用 `@deepseek-ai/*` 第一方插件（默认跳过，需手动处理） |
 
+提示信息语言跟随 `LC_ALL` / `LC_MESSAGES` / `LANG` / `LANGUAGE`（`zh*` 为中文，其余英文），也可用环境变量 `DSH_SAFE_LANG=zh|en` 强制指定。
+
 ## 工作原理
 
 1. **识别失败**：dsh 启动失败时，stderr 里有四类特征（`plugin(s) failed to load: …`、`N entries did not activate` 逐行失败、`failed to apply/import loader entry <id> (<name>)`、外层栈 `…#<entryId>`）。dsh-safe 从中提取坏插件的包名与行 id。
@@ -77,18 +79,6 @@ dsh-safe help
 npm test        # node:test 单元测试 + 假 dsh 集成测试
 ```
 
-<a name="english"></a>
-## English
-
-**dsh-safe** is a fuse for DeepSeek Harness (DSH) startup: when a community plugin is incompatible with the running dsh version, `dsh web` normally fails to boot entirely — one broken plugin rejects the whole loader tree. dsh-safe wraps any `dsh` invocation, parses the startup-failure diagnostics on stderr, marks the offending patch rows as `disabled: true` inside a managed block in your profile patch file (keeping all user content and comments), records the action in a quarantine ledger, and retries. First-party `@deepseek-ai/*` plugins are protected by default; `dsh-safe restore --profile <name> --all` re-enables quarantined rows after you upgrade the plugin.
-
-```bash
-npm install -g @hyzyn/dsh-safe
-dsh-safe web                 # run dsh web with auto-quarantine
-dsh-safe list                # show quarantined plugins
-dsh-safe restore --profile web --all
-```
-
 ## License
 
 [MIT](./LICENSE)

package/lib/cli.js

@@ -10,38 +10,13 @@
 import { createRequire } from 'node:module'
 import { loadLedger, restoreQuarantine } from './quarantine.js'
 import { runWrapped } from './wrap.js'
+import { t } from './i18n.js'
 
 const require = createRequire(import.meta.url)
 const { version } = require('../package.json')
 
-const HELP = `dsh-safe ${version} — dsh 启动保险丝
-
-社区插件与 dsh 运行时不兼容会让 dsh 整体启动失败。dsh-safe 包装运行 dsh：
-启动失败时从报错里识别坏插件，在 profile patch 里把对应行置为 disabled
-（记录进隔离台账），然后自动重试。
-
-用法:
-  dsh-safe <dsh 参数…>             包装运行 dsh，例: dsh-safe web
-  dsh-safe list [--profile <名>]    查看隔离名单（缺省列出全部 profile）
-  dsh-safe restore --profile <名> (--id <id> | --all) [--dry-run]
-                                    恢复被自动禁用的插件（升级修复后使用）
-  dsh-safe help                     显示本帮助
-  dsh-safe --version                显示版本
-
-包装模式选项（必须写在 profile / 子命令之前）:
-  --dry-run                只解析与报告，不修改任何文件
-  --max-retries <n>        自动隔离后最多重试启动的次数（默认 2）
-  --allow-first-party      允许自动禁用 @deepseek-ai/* 第一方插件（默认跳过）
-
-说明:
-  - 行的禁用以 patch 文件末尾的托管区块写入（带标记注释），不改动用户内容；
-    恢复用 dsh-safe restore，或手动删除区块。
-  - 只隔离"启动期"失败（模块解析失败 / apply 抛错 / 等不到注入服务）；
-    运行期的未捕获异常仍由 dsh 自身的 fail-loud 策略处理。
-`
-
 function printHelp() {
-  process.stdout.write(HELP)
+  process.stdout.write(t('helpText', { version }))
 }
 
 function printVersion() {
@@ -92,10 +67,12 @@ function cmdList(args) {
     process.stdout.write(`${p}:\n`)
     for (const e of entries) {
       found++
-      process.stdout.write(`  - ${e.name ?? '(未知包名)'} (id: ${e.id})\n      隔离于 ${e.quarantinedAt}\n      原因: ${e.reason}\n      位置: ${e.file}\n`)
+      process.stdout.write(
+        `  - ${e.name ?? t('unknownName')} (id: ${e.id})\n${t('quarantinedAt', { time: e.quarantinedAt })}\n${t('reasonLine', { reason: e.reason })}\n${t('locationLine', { file: e.file })}\n`,
+      )
     }
   }
-  if (!found) process.stdout.write(profile ? `${profile}: 没有隔离记录\n` : '没有隔离记录\n')
+  if (!found) process.stdout.write(profile ? `${t('noRecordsProfile', { profile })}\n` : `${t('noRecords')}\n`)
   return 0
 }
 
@@ -106,19 +83,19 @@ function cmdRestore(args) {
   const all = rest1.includes('--all')
   const profile = profile0
   if (!profile) {
-    process.stderr.write('[dsh-safe] restore 需要 --profile <名>\n')
+    process.stderr.write(`${t('restoreNeedsProfile')}\n`)
     return 2
   }
   if (!all && ids0.length === 0) {
-    process.stderr.write('[dsh-safe] restore 需要 --id <id>（可重复）或 --all\n')
+    process.stderr.write(`${t('restoreNeedsId')}\n`)
     return 2
   }
   const { restored, kept } = restoreQuarantine(profile, all ? 'all' : ids0, dryRun)
-  const verb = dryRun ? '（dry-run）将恢复' : '已恢复'
+  const verb = t(dryRun ? 'restoredDry' : 'restored')
   for (const e of restored) process.stdout.write(`[dsh-safe] ${verb} ${e.name ?? e.id} (id: ${e.id})\n`)
-  if (!restored.length) process.stdout.write('[dsh-safe] 没有匹配的隔离记录\n')
-  else if (kept.length) process.stdout.write(`[dsh-safe] ${profile} 仍隔离 ${kept.length} 行；重启 dsh 生效。\n`)
-  else process.stdout.write('[dsh-safe] 该 profile 的隔离名单已清空；重启 dsh 生效。\n')
+  if (!restored.length) process.stdout.write(`${t('noMatching')}\n`)
+  else if (kept.length) process.stdout.write(`${t('stillQuarantined', { profile, count: kept.length })}\n`)
+  else process.stdout.write(`${t('ledgerCleared')}\n`)
   return 0
 }
 
@@ -158,7 +135,7 @@ export async function main(argv) {
       const raw = argv[++i]
       const v = raw === undefined || raw === '' ? NaN : Number(raw)
       if (!Number.isFinite(v) || v < 0) {
-        process.stderr.write('[dsh-safe] --max-retries 需要一个非负整数\n')
+        process.stderr.write(`${t('maxRetriesInvalid')}\n`)
         return 2
       }
       maxRetries = v
@@ -168,7 +145,7 @@ export async function main(argv) {
       const raw = a.slice('--max-retries='.length)
       const v = raw === '' ? NaN : Number(raw)
       if (!Number.isFinite(v) || v < 0) {
-        process.stderr.write('[dsh-safe] --max-retries 需要一个非负整数\n')
+        process.stderr.write(`${t('maxRetriesInvalid')}\n`)
         return 2
       }
       maxRetries = v
@@ -181,6 +158,6 @@ export async function main(argv) {
     printHelp()
     return 0
   }
-  if (dryRun) process.stderr.write('[dsh-safe] dry-run：只报告，不修改文件。\n')
+  if (dryRun) process.stderr.write(`${t('dryRunNotice')}\n`)
   return runWrapped({ forwardArgs, dryRun, maxRetries, allowFirstParty })
 }

package/lib/i18n.js

@@ -0,0 +1,171 @@
+/**
+ * @hyzyn/dsh-safe — 输出语言自适应。
+ *
+ * 语言判定优先级：DSH_SAFE_LANG > LC_ALL > LC_MESSAGES > LANG > LANGUAGE。
+ * 值为 zh* 时用中文，否则英文；全部未设置（或为 C/POSIX）时退回 Node 的
+ * Intl 默认 locale，仍非 zh 则英文。零依赖，不引 i18n 库。
+ */
+
+const ZH = {
+  // ---- cli.js ----
+  helpText: `dsh-safe {version} — dsh 启动保险丝
+
+社区插件与 dsh 运行时不兼容会让 dsh 整体启动失败。dsh-safe 包装运行 dsh：
+启动失败时从报错里识别坏插件，在 profile patch 里把对应行置为 disabled
+（记录进隔离台账），然后自动重试。
+
+用法:
+  dsh-safe <dsh 参数…>             包装运行 dsh，例: dsh-safe web
+  dsh-safe list [--profile <名>]    查看隔离名单（缺省列出全部 profile）
+  dsh-safe restore --profile <名> (--id <id> | --all) [--dry-run]
+                                    恢复被自动禁用的插件（升级修复后使用）
+  dsh-safe help                     显示本帮助
+  dsh-safe --version                显示版本
+
+包装模式选项（必须写在 profile / 子命令之前）:
+  --dry-run                只解析与报告，不修改任何文件
+  --max-retries <n>        自动隔离后最多重试启动的次数（默认 2）
+  --allow-first-party      允许自动禁用 @deepseek-ai/* 第一方插件（默认跳过）
+
+说明:
+  - 行的禁用以 patch 文件末尾的托管区块写入（带标记注释），不改动用户内容；
+    恢复用 dsh-safe restore，或手动删除区块。
+  - 只隔离"启动期"失败（模块解析失败 / apply 抛错 / 等不到注入服务）；
+    运行期的未捕获异常仍由 dsh 自身的 fail-loud 策略处理。
+  - 输出语言跟随 LC_ALL / LC_MESSAGES / LANG / LANGUAGE（zh* 中文，其余英文）；
+    可用环境变量 DSH_SAFE_LANG=zh|en 强制指定。
+`,
+  unknownName: '(未知包名)',
+  quarantinedAt: '      隔离于 {time}',
+  reasonLine: '      原因: {reason}',
+  locationLine: '      位置: {file}',
+  noRecordsProfile: '{profile}: 没有隔离记录',
+  noRecords: '没有隔离记录',
+  restoreNeedsProfile: '[dsh-safe] restore 需要 --profile <名>',
+  restoreNeedsId: '[dsh-safe] restore 需要 --id <id>（可重复）或 --all',
+  restored: '已恢复',
+  restoredDry: '（dry-run）将恢复',
+  noMatching: '[dsh-safe] 没有匹配的隔离记录',
+  stillQuarantined: '[dsh-safe] {profile} 仍隔离 {count} 行；重启 dsh 生效。',
+  ledgerCleared: '[dsh-safe] 该 profile 的隔离名单已清空；重启 dsh 生效。',
+  maxRetriesInvalid: '[dsh-safe] --max-retries 需要一个非负整数',
+  dryRunNotice: '[dsh-safe] dry-run：只报告，不修改文件。',
+
+  // ---- wrap.js ----
+  spawnFailed: '[dsh-safe] 无法启动 {command}: {message}',
+  pluginPassthrough: '[dsh-safe] `dsh plugin` 为 pnpm 转发，不做隔离，原样透传。',
+  noProfile:
+    '[dsh-safe] 未能从参数确定 profile（launcher 旗标需在最前，或用 --profile <name>），无法自动隔离，原样透传。',
+  skipFirstParty:
+    '[dsh-safe] 跳过第一方插件 {name} (id: {id}) —— 默认保护 @deepseek-ai/*，需要手动处理；确认要禁用可加 --allow-first-party。',
+  nothingFound: '[dsh-safe] 报错里没有识别出可自动隔离的已挂载插件，原样透传。',
+  maxRetriesReached: '[dsh-safe] 已达最大重试次数（--max-retries {count}），不再重试。',
+  disabled: '已禁用',
+  willDisable: '（dry-run）将禁用',
+  reasonIndent: '           原因: {reason}',
+  retrying: '[dsh-safe] 重试启动…',
+}
+
+const EN = {
+  // ---- cli.js ----
+  helpText: `dsh-safe {version} — startup fuse for dsh
+
+When a community plugin is incompatible with the dsh runtime, dsh fails to boot as a
+whole. dsh-safe wraps dsh: on startup failure it identifies the broken plugin from
+the error, marks its row disabled in the profile patch (recording it in a quarantine
+ledger), and retries automatically.
+
+Usage:
+  dsh-safe <dsh args…>             wrap and run dsh, e.g. dsh-safe web
+  dsh-safe list [--profile <name>] show quarantined plugins (defaults to all profiles)
+  dsh-safe restore --profile <name> (--id <id> | --all) [--dry-run]
+                                    re-enable auto-disabled plugins (after a fixed plugin upgrade)
+  dsh-safe help                     show this help
+  dsh-safe --version                show version
+
+Wrapper-mode options (must come before the profile / subcommand):
+  --dry-run                parse and report only; no files are modified
+  --max-retries <n>        max startup retries after an auto-quarantine (default 2)
+  --allow-first-party      allow auto-disabling @deepseek-ai/* first-party plugins (skipped by default)
+
+Notes:
+  - Rows are disabled via a marker-commented managed block appended to the patch file;
+    user content is untouched. Restore with dsh-safe restore, or delete the block manually.
+  - Only startup-phase failures are quarantined (module resolution / apply throw /
+    missing injected service); runtime uncaught exceptions stay under dsh's own
+    fail-loud policy.
+  - Output language follows LC_ALL / LC_MESSAGES / LANG / LANGUAGE (zh* → Chinese,
+    otherwise English); force it with DSH_SAFE_LANG=zh|en.
+`,
+  unknownName: '(unknown package)',
+  quarantinedAt: '      quarantined at {time}',
+  reasonLine: '      reason: {reason}',
+  locationLine: '      location: {file}',
+  noRecordsProfile: '{profile}: no quarantine records',
+  noRecords: 'no quarantine records',
+  restoreNeedsProfile: '[dsh-safe] restore requires --profile <name>',
+  restoreNeedsId: '[dsh-safe] restore requires --id <id> (repeatable) or --all',
+  restored: 'restored',
+  restoredDry: '(dry-run) would restore',
+  noMatching: '[dsh-safe] no matching quarantine records',
+  stillQuarantined: '[dsh-safe] {profile} still has {count} quarantined row(s); restart dsh to apply.',
+  ledgerCleared: '[dsh-safe] quarantine list for this profile is now empty; restart dsh to apply.',
+  maxRetriesInvalid: '[dsh-safe] --max-retries requires a non-negative integer',
+  dryRunNotice: '[dsh-safe] dry-run: report only, no files will be modified.',
+
+  // ---- wrap.js ----
+  spawnFailed: '[dsh-safe] failed to start {command}: {message}',
+  pluginPassthrough: '[dsh-safe] `dsh plugin` is a pnpm forwarder; no quarantine, exit code passed through.',
+  noProfile:
+    '[dsh-safe] could not determine the profile from args (launcher flags must come first, or use --profile <name>); no auto-quarantine, exit code passed through.',
+  skipFirstParty:
+    '[dsh-safe] skipping first-party plugin {name} (id: {id}) — @deepseek-ai/* is protected by default; handle manually, or pass --allow-first-party to allow disabling.',
+  nothingFound:
+    '[dsh-safe] no mounted plugin could be identified as auto-quarantinable from the error; exit code passed through.',
+  maxRetriesReached: '[dsh-safe] max retries reached (--max-retries {count}); giving up.',
+  disabled: 'disabled',
+  willDisable: '(dry-run) would disable',
+  reasonIndent: '           reason: {reason}',
+  retrying: '[dsh-safe] retrying…',
+}
+
+const CATALOG = { zh: ZH, en: EN }
+
+/** 把 locale 值归一成 'zh' | 'en'；空值 / C / POSIX 返回 null（交给下一优先级）。 */
+function parseLocale(raw) {
+  if (!raw) return null
+  const base = raw.split(':')[0].split('.')[0].split('@')[0].trim().toLowerCase()
+  if (!base || base === 'c' || base === 'posix') return null
+  return base.startsWith('zh') ? 'zh' : 'en'
+}
+
+/**
+ * 纯函数，方便单测。默认参数取真实环境。
+ * @param {Record<string, string | undefined>} env
+ * @param {string} [intlLocale] 环境变量全部缺失时的兜底（生产为 Node 的 Intl 默认 locale）
+ */
+export function detectLocale(env = process.env, intlLocale = Intl.DateTimeFormat().resolvedOptions().locale) {
+  for (const key of ['DSH_SAFE_LANG', 'LC_ALL', 'LC_MESSAGES', 'LANG', 'LANGUAGE']) {
+    const lang = parseLocale(env[key])
+    if (lang) return lang
+  }
+  return typeof intlLocale === 'string' && intlLocale.toLowerCase().startsWith('zh') ? 'zh' : 'en'
+}
+
+let cached
+
+/** 当前进程的输出语言（首次调用时检测并缓存）。 */
+export function getLocale() {
+  return (cached ??= detectLocale())
+}
+
+/** 指定语言取词条，主要用于单测。 */
+export function translate(locale, key, params = {}) {
+  const text = CATALOG[locale]?.[key] ?? CATALOG.en[key] ?? key
+  return text.replace(/\{(\w+)\}/g, (match, name) => (params[name] !== undefined ? String(params[name]) : match))
+}
+
+/** 按当前语言取词条并做 {name} 插值。 */
+export function t(key, params = {}) {
+  return translate(getLocale(), key, params)
+}

package/lib/knownrows.js

@@ -1,11 +1,14 @@
 /**
  * @hyzyn/dsh-safe — 收集一个 profile 下"行 id ↔ 插件包名"的对照表。
  *
- * 来源（后写的层优先级更高）：
- * 1. profile 自己的 cordis.patch.yml（写层）
- * 2. `$DSH_HOME/cordis.patch.yml` home 层（写层：发现的行写回 home patch）
- * 3. profile package.json `dsh.profile.bundles` 里每个 bundle 的 patch
- *    （只读对照；禁用行写入 profile 层，它在 bundle 层之后合成，同 id 后写覆盖）
+ * 收集顺序 = dsh 的 patch 合成顺序（同 id 后写覆盖）：
+ * 1. profile package.json `dsh.profile.bundles` 里每个 bundle 的 patch
+ *    （只读对照；禁用行写入 profile 层——它在 bundle 层之后合成，同 id 覆盖 bundle 行）
+ * 2. `$DSH_HOME/cordis.patch.yml` home 层
+ * 3. profile 自己的 cordis.patch.yml（写层，dsh-safe 托管区块也在其中）
+ *
+ * 因此对照表数组里越靠后的行优先级越高：profile 层（含托管区块的 disabled 行）
+ * 覆盖 home / bundle 层的同 id 行。
  */
 import { join } from 'node:path'
 import { scanPatchRows } from './patchfile.js'
@@ -32,16 +35,6 @@ export function collectKnownRows(profile) {
   const profilePatch = profilePatchPath(profile)
   const homePatch = homePatchPath()
 
-  const profileText = readIfExists(profilePatch)
-  if (profileText !== undefined) {
-    for (const row of scanPatchRows(profileText)) rows.push({ ...row, source: 'profile', file: profilePatch })
-  }
-
-  const homeText = readIfExists(homePatch)
-  if (homeText !== undefined) {
-    for (const row of scanPatchRows(homeText)) rows.push({ ...row, source: 'home', file: homePatch })
-  }
-
   const manifest = readJsonIfExists(profileManifestPath(profile))
   const bundles = manifest?.dsh?.profile?.bundles ?? []
   for (const bundle of bundles) {
@@ -54,12 +47,23 @@ export function collectKnownRows(profile) {
     for (const row of scanPatchRows(patchText)) rows.push({ ...row, source: bundle, file: profilePatch })
   }
 
+  const homeText = readIfExists(homePatch)
+  if (homeText !== undefined) {
+    for (const row of scanPatchRows(homeText)) rows.push({ ...row, source: 'home', file: homePatch })
+  }
+
+  const profileText = readIfExists(profilePatch)
+  if (profileText !== undefined) {
+    for (const row of scanPatchRows(profileText)) rows.push({ ...row, source: 'profile', file: profilePatch })
+  }
+
   return { rows, profilePatch, homePatch }
 }
 
 /**
  * 把失败报告对照到真实存在的 patch 行。
  * 包名命中该包的全部行（一个包可能挂多个 id）；行 id 命中对应行。
+ * 同一 id 在多层重复出现时，取合成顺序里最后出现的行（profile/托管区块覆盖 home/bundle）。
  * @param {{ names: Array<[string, string]>, entryIds: Array<[string, string]> }} report
  * @param {{ rows: Array<{ id: string, name: string|null, disabled: boolean, file: string }> }} known
  * @returns {Array<{ id: string, name: string|null, disabled: boolean, file: string, line: string }>}
@@ -68,7 +72,7 @@ export function matchFailures(report, known) {
   const byId = new Map()
   const byName = new Map()
   for (const row of known.rows) {
-    if (!byId.has(row.id)) byId.set(row.id, row)
+    byId.set(row.id, row) // 同 id 后写覆盖
     if (row.name) {
       if (!byName.has(row.name)) byName.set(row.name, [])
       byName.get(row.name).push(row)

package/lib/wrap.js

@@ -12,6 +12,7 @@ import { summarizeLine, parseFailureReport } from './failures.js'
 import { collectKnownRows, matchFailures } from './knownrows.js'
 import { detectInvocation } from './dshpaths.js'
 import { writeQuarantine } from './quarantine.js'
+import { t } from './i18n.js'
 
 const CAPTURE_LIMIT = 512 * 1024
 const FIRST_PARTY_PREFIX = '@deepseek-ai/'
@@ -31,7 +32,7 @@ export function spawnDsh(args, { command = 'dsh' } = {}) {
       if (captured.length < CAPTURE_LIMIT) captured += chunk
     })
     child.on('error', (error) => {
-      process.stderr.write(`[dsh-safe] 无法启动 ${command}: ${error.message}\n`)
+      process.stderr.write(`${t('spawnFailed', { command, message: error.message })}\n`)
       resolve({ code: 127, stderr: captured })
     })
     child.on('close', (code) => resolve({ code: code ?? 1, stderr: captured }))
@@ -63,11 +64,11 @@ export async function runWrapped(options) {
     const { code, stderr } = await spawnFn(forwardArgs)
     if (code === 0) return 0
     if (invocation.mode === 'plugin') {
-      log('[dsh-safe] `dsh plugin` 为 pnpm 转发，不做隔离，原样透传。')
+      log(t('pluginPassthrough'))
       return code
     }
     if (!invocation.profile) {
-      log('[dsh-safe] 未能从参数确定 profile（launcher 旗标需在最前，或用 --profile <name>），无法自动隔离，原样透传。')
+      log(t('noProfile'))
       return code
     }
     const known = collectKnownRows(invocation.profile)
@@ -81,14 +82,14 @@ export async function runWrapped(options) {
       else quarantinable.push(hit)
     }
     for (const hit of firstParty) {
-      log(`[dsh-safe] 跳过第一方插件 ${hit.name} (id: ${hit.id}) —— 默认保护 @deepseek-ai/*，需要手动处理；确认要禁用可加 --allow-first-party。`)
+      log(t('skipFirstParty', { name: hit.name, id: hit.id }))
     }
     if (!quarantinable.length) {
-      if (!firstParty.length) log('[dsh-safe] 报错里没有识别出可自动隔离的已挂载插件，原样透传。')
+      if (!firstParty.length) log(t('nothingFound'))
       return code
     }
     if (attempt >= maxRetries) {
-      log(`[dsh-safe] 已达最大重试次数（--max-retries ${maxRetries}），不再重试。`)
+      log(t('maxRetriesReached', { count: maxRetries }))
       return code
     }
     const targets = quarantinable.map((hit) => ({
@@ -98,12 +99,12 @@ export async function runWrapped(options) {
       file: hit.file,
     }))
     writeQuarantine(invocation.profile, targets, dryRun)
-    for (const t of targets) {
-      const verb = dryRun ? '（dry-run）将禁用' : '已禁用'
-      log(`[dsh-safe] ${verb} ${t.name ?? t.id} (id: ${t.id}) → ${t.file}`)
-      log(`           原因: ${t.reason}`)
+    for (const target of targets) {
+      const verb = t(dryRun ? 'willDisable' : 'disabled')
+      log(`[dsh-safe] ${verb} ${target.name ?? target.id} (id: ${target.id}) → ${target.file}`)
+      log(t('reasonIndent', { reason: target.reason }))
     }
     if (dryRun) return code
-    log('[dsh-safe] 重试启动…')
+    log(t('retrying'))
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyzyn/dsh-safe",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "dsh 启动保险丝：社区插件不兼容导致 dsh 启动失败时，自动禁用坏插件并重试",
   "type": "module",
   "license": "MIT",
@@ -10,7 +10,8 @@
   "files": [
     "bin",
     "lib",
-    "README.md"
+    "README.md",
+    "README.en.md"
   ],
   "engines": {
     "node": ">=20"
@@ -24,6 +25,7 @@
   },
   "keywords": [
     "dsh",
+    "dsh-plugin",
     "deepseek-harness",
     "plugin",
     "quarantine",