@bruc3van/dsh-doctor 0.1.0 → 0.1.2

package/README.md

@@ -21,6 +21,25 @@ npx @bruc3van/dsh-doctor
 
 默认检查 `$DSH_HOME/profiles/web`；未设置 `DSH_HOME` 时使用 `~/.dsh`。
 
+Doctor 不要求 `dsh` 必须是全局命令。它会按顺序查找 PATH、当前项目安装、profile 共享安装或 npx 缓存留下的链接、已构建的 Harness 源码工作区。DSH Desktop 内置运行时或其他特殊安装可以通过 `--dsh-command /path/to/dsh`（也接受官方包的 `lib/bin.js`）明确指定。找不到 CLI 时仍会完成只读诊断，但不会提供或执行无法验证的命令型修复。
+
+## 输出语言
+
+文本输出支持中文和英文。默认依次读取：
+
+1. `--lang zh|en`
+2. `DSH_DOCTOR_LANG`
+3. 当前 DSH Home 中 `settings.yaml` 的 `locale.preference`
+4. 终端或系统 locale
+
+```sh
+dsh-doctor --lang zh
+dsh-doctor --lang en
+DSH_DOCTOR_LANG=zh dsh-doctor
+```
+
+`--json` 始终保留稳定的英文消息与诊断 code，避免语言变化破坏脚本。
+
 ## 常用命令
 
 ```sh
@@ -28,6 +47,7 @@ npx @bruc3van/dsh-doctor
 dsh-doctor
 dsh-doctor --profile web
 dsh-doctor --home /path/to/.dsh
+dsh-doctor --dsh-command /path/to/@deepseek-ai/dsh/lib/bin.js
 
 # 机器可读的只读报告，不显示提示
 dsh-doctor --json
@@ -60,6 +80,7 @@ dsh-doctor --fix --yes --json
 - 文件修复在确认前展示路径，确认后再次校验 SHA-256 指纹。
 - 写入前创建 `.dsh-doctor-<timestamp>.bak` 备份，再通过同目录临时文件原子替换。
 - 外部命令使用固定 argv 调用，不拼接 shell 命令。
+- 命令修复绑定当前诊断的 `DSH_HOME`，并展示解析出的真实 CLI 路径；不会假定 PATH 中存在 `dsh`。
 - 任一步失败即停止后续修复，并保留已经创建的备份。
 - 完成后重新运行全部诊断，以最终状态决定退出码。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bruc3van/dsh-doctor",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Diagnostics and confirmed recovery for DeepSeek Harness profiles and third-party plugins",
   "license": "MIT",
   "type": "module",
@@ -22,7 +22,7 @@
   ],
   "scripts": {
     "test": "node --test",
-    "check": "node --check src/cli.mjs && node --check src/doctor.mjs && node --check src/repair.mjs && npm test",
+    "check": "node --check src/cli.mjs && node --check src/doctor.mjs && node --check src/i18n.mjs && node --check src/repair.mjs && npm test",
     "prepublishOnly": "npm run check"
   },
   "dependencies": {

package/src/cli.mjs

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 
-import { formatReport, diagnose } from './doctor.mjs'
+import { defaultDshHome, formatReport, diagnose } from './doctor.mjs'
 import { applyRepairs, formatRepairPlan, repairsFromReport } from './repair.mjs'
+import { resolveLanguage } from './i18n.mjs'
 import { readFileSync } from 'node:fs'
 import { dirname, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { createInterface } from 'node:readline/promises'
 
-const HELP = `Usage: dsh-doctor [options]
+const HELP_EN = `Usage: dsh-doctor [options]
 
 Diagnostics and confirmed recovery for a DeepSeek Harness profile.
 
@@ -15,6 +16,8 @@ Options:
   --profile <name>       profile to inspect (default: web)
   --home <path>          Harness home (default: $DSH_HOME or ~/.dsh)
   --harness-root <path>  active DeepSeek Harness source checkout
+  --dsh-command <path>   DSH executable or lib/bin.js used for command repairs
+  --lang <auto|zh|en>    output language (default: DSH setting, then system)
   --json                 print machine-readable JSON
   --fix, --repair        preview and apply available repairs after confirmation
   --yes                  confirm the displayed repair plan non-interactively
@@ -22,8 +25,27 @@ Options:
   -v, --version          show version
 `
 
-function fail(message) {
-  process.stderr.write(`dsh-doctor: ${message}\n\n${HELP}`)
+const HELP_ZH = `用法：dsh-doctor [选项]
+
+诊断 DeepSeek Harness profile，并在用户确认后实施修复。
+
+选项：
+  --profile <名称>       要检查的 profile（默认：web）
+  --home <路径>          Harness 主目录（默认：$DSH_HOME 或 ~/.dsh）
+  --harness-root <路径>  当前 DeepSeek Harness 源码工作区
+  --dsh-command <路径>   命令修复使用的 DSH 可执行文件或 lib/bin.js
+  --lang <auto|zh|en>    输出语言（默认：DSH 设置，其次系统语言）
+  --json                 输出稳定的机器可读 JSON
+  --fix, --repair        展示修复计划，确认后实施
+  --yes                  在非交互环境中确认当前修复计划
+  -h, --help             显示帮助
+  -v, --version          显示版本
+`
+
+const help = language => language === 'zh' ? HELP_ZH : HELP_EN
+
+function fail(message, language = 'en') {
+  process.stderr.write(`dsh-doctor: ${message}\n\n${help(language)}`)
   process.exitCode = 2
 }
 
@@ -40,6 +62,8 @@ function parse(args) {
     if (arg === '--profile') options.profile = valueAfter(args, index++, arg)
     else if (arg === '--home') options.home = valueAfter(args, index++, arg)
     else if (arg === '--harness-root') options.harnessRoot = valueAfter(args, index++, arg)
+    else if (arg === '--dsh-command') options.dshCommand = valueAfter(args, index++, arg)
+    else if (arg === '--lang') options.lang = valueAfter(args, index++, arg)
     else if (arg === '--json') options.json = true
     else if (arg === '--fix' || arg === '--repair') options.fix = true
     else if (arg === '--yes') options.yes = true
@@ -58,10 +82,15 @@ async function main() {
     fail(error instanceof Error ? error.message : String(error))
     return
   }
+  const language = resolveLanguage({
+    requested: options.lang,
+    home: resolve(options.home ?? defaultDshHome()),
+    systemLocale: Intl.DateTimeFormat().resolvedOptions().locale,
+  })
   if (options.yes && !options.fix) throw new Error('--yes requires --fix')
   if (options.json && options.fix && !options.yes) throw new Error('--json --fix requires --yes because a prompt would corrupt JSON output')
   if (options.help) {
-    process.stdout.write(HELP)
+    process.stdout.write(help(language))
   } else if (options.version) {
     const here = dirname(fileURLToPath(import.meta.url))
     const manifest = JSON.parse(readFileSync(resolve(here, '..', 'package.json'), 'utf8'))
@@ -71,15 +100,22 @@ async function main() {
     let repairs = []
     if (options.fix) {
       const actions = repairsFromReport(report)
+      if (actions.length === 0 && report.context.dshCli?.commandRepairNeeded && !report.context.dshCli.available) {
+        throw new Error(language === 'zh'
+          ? '未找到可用的 DSH CLI，无法执行命令型修复；请使用 --dsh-command 指定当前安装的 dsh 或 lib/bin.js'
+          : 'no working DSH CLI was found; pass the active dsh executable or lib/bin.js with --dsh-command')
+      }
       if (actions.length > 0) {
         let confirmed = options.yes === true
-        if (!confirmed) {
+        const plan = formatRepairPlan(actions, { language, prompt: !confirmed })
+        if (confirmed) {
+          process.stderr.write(`${plan}\n`)
+        } else {
           if (!process.stdin.isTTY) throw new Error('--fix needs an interactive terminal or explicit --yes')
-          const prompt = formatRepairPlan(actions)
           const reader = createInterface({ input: process.stdin, output: process.stderr })
-          const answer = await reader.question(prompt)
+          const answer = await reader.question(plan)
           reader.close()
-          confirmed = /^y(?:es)?$/i.test(answer.trim())
+          confirmed = /^(?:y(?:es)?|是|确认)$/i.test(answer.trim())
         }
         if (confirmed) {
           repairs = applyRepairs(actions)
@@ -90,7 +126,7 @@ async function main() {
     const output = options.fix ? { ...report, repairs } : report
     process.stdout.write(options.json
       ? `${JSON.stringify(output, null, 2)}\n`
-      : `${formatReport(report, { color: process.stdout.isTTY })}${repairs.length > 0 ? `Repairs: ${JSON.stringify(repairs, null, 2)}\n` : ''}`)
+      : `${formatReport(report, { color: process.stdout.isTTY, language })}${repairs.length > 0 ? `${language === 'zh' ? '修复结果' : 'Repairs'}: ${JSON.stringify(repairs, null, 2)}\n` : ''}`)
     process.exitCode = repairs.some(item => item.status === 'failed') ? 2 : report.summary.errors > 0 ? 1 : 0
   }
 }

package/src/doctor.mjs

@@ -1,9 +1,11 @@
-import { existsSync, readFileSync, readdirSync, realpathSync, statSync } from 'node:fs'
+import { accessSync, constants, existsSync, readFileSync, readdirSync, realpathSync, statSync } from 'node:fs'
+import { builtinModules } from 'node:module'
 import { homedir } from 'node:os'
-import { dirname, isAbsolute, join, relative, resolve, sep } from 'node:path'
+import { delimiter, dirname, isAbsolute, join, relative, resolve, sep } from 'node:path'
 import yaml from 'js-yaml'
 import semver from 'semver'
 import { parseDocument } from 'yaml'
+import { languageName, localizedFinding } from './i18n.mjs'
 
 export const PLATFORM_MODULES = new Set([
   'react',
@@ -15,6 +17,7 @@ export const PLATFORM_MODULES = new Set([
   '@deepseek-ai/dsh-client-ui-slots',
   '@deepseek-ai/dsh-client-ui-primitives',
 ])
+const BUILTIN_MODULES = new Set(builtinModules.map(name => name.replace(/^node:/, '')))
 
 const SEVERITY_ORDER = { error: 0, warning: 1, info: 2 }
 const JS_EXPRESSION = new yaml.Type('tag:yaml.org,2002:js', {
@@ -70,6 +73,7 @@ function readJson(file, subject, findings) {
 }
 
 function packagePathParts(name) {
+  if (typeof name !== 'string') return undefined
   if (name.startsWith('@')) {
     const parts = name.split('/')
     return parts.length === 2
@@ -93,7 +97,7 @@ function packageManifestAt(directory, expectedName, findings, source) {
       suggestion: 'Reinstall the dependency so its directory and package name agree.',
     }))
   }
-  return { directory, file, manifest }
+  return { directory, file, manifest, requestedName: expectedName }
 }
 
 function findHarnessRoot(start) {
@@ -108,6 +112,120 @@ function findHarnessRoot(start) {
   }
 }
 
+function executable(file) {
+  try {
+    accessSync(file, process.platform === 'win32' ? constants.F_OK : constants.X_OK)
+    return true
+  } catch {
+    return false
+  }
+}
+
+function regularFile(file) {
+  try {
+    return statSync(file).isFile()
+  } catch {
+    return false
+  }
+}
+
+function executableOnPath(name, env) {
+  const path = env.PATH ?? env.Path ?? env.path ?? ''
+  const extensions = process.platform === 'win32'
+    ? (env.PATHEXT ?? '.COM;.EXE;.BAT;.CMD').split(';')
+    : ['']
+  for (const directory of path.split(delimiter).filter(Boolean)) {
+    for (const extension of extensions) {
+      const candidate = join(directory, process.platform === 'win32' ? `${name}${extension}` : name)
+      if (executable(candidate)) return candidate
+    }
+  }
+  return undefined
+}
+
+function manifestBin(packageDir) {
+  const file = join(packageDir, 'package.json')
+  if (!existsSync(file)) return undefined
+  try {
+    const manifest = JSON.parse(readFileSync(file, 'utf8'))
+    if (manifest?.name !== '@deepseek-ai/dsh') return undefined
+    const declared = typeof manifest.bin === 'string' ? manifest.bin : manifest.bin?.dsh
+    if (typeof declared !== 'string') return undefined
+    const bin = resolve(packageDir, declared)
+    const rel = relative(packageDir, bin)
+    if (rel === '..' || rel.startsWith(`..${sep}`) || isAbsolute(rel) || !existsSync(bin) || !statSync(bin).isFile()) return undefined
+    return { bin, version: manifest.version }
+  } catch {
+    return undefined
+  }
+}
+
+function localDshPackage(start) {
+  let current = resolve(start)
+  while (true) {
+    const packageDir = join(current, 'node_modules', '@deepseek-ai', 'dsh')
+    if (manifestBin(packageDir) !== undefined) return packageDir
+    const parent = dirname(current)
+    if (parent === current) return undefined
+    current = parent
+  }
+}
+
+function commandFromValue(value, env, cwd) {
+  const expanded = value === '~'
+    ? homedir()
+    : value.startsWith('~/') || value.startsWith('~\\')
+      ? resolve(homedir(), value.slice(2))
+      : value
+  const looksLikePath = isAbsolute(expanded) || expanded.includes('/') || expanded.includes('\\') || expanded.startsWith('.')
+  const file = looksLikePath ? resolve(cwd, expanded) : executableOnPath(expanded, env)
+  if (file === undefined) return undefined
+  if (!regularFile(file)) return undefined
+  if (/\.(?:c?js|mjs)$/i.test(file)) return { command: [process.execPath, file], path: file }
+  return executable(file) ? { command: [file], path: file } : undefined
+}
+
+function resolveDshCli(options, harness, home) {
+  const env = options.env ?? process.env
+  const cwd = options.cwd ?? process.cwd()
+  const explicit = options.dshCommand ?? env.DSH_DOCTOR_DSH_COMMAND
+  if (explicit !== undefined) {
+    const resolved = commandFromValue(explicit, env, cwd)
+    if (resolved === undefined) throw new Error(`DSH command ${JSON.stringify(explicit)} does not exist or is not executable`)
+    return { ...resolved, source: 'explicit' }
+  }
+
+  if (options.harnessRoot !== undefined && harness.root !== undefined) {
+    for (const packageDir of [harness.root, join(harness.root, 'apps', 'cli')]) {
+      const bin = manifestBin(packageDir)
+      if (bin !== undefined) return { command: [process.execPath, bin.bin], path: bin.bin, source: 'checkout', version: bin.version }
+    }
+  }
+
+  const sharedPackage = join(home, 'profiles', 'node_modules', '@deepseek-ai', 'dsh')
+  if (existsSync(sharedPackage)) {
+    const bin = manifestBin(realpathSync(sharedPackage))
+    if (bin !== undefined) return { command: [process.execPath, bin.bin], path: bin.bin, source: 'profile', version: bin.version }
+  }
+
+  const localPackage = localDshPackage(cwd)
+  if (localPackage !== undefined) {
+    const bin = manifestBin(localPackage)
+    return { command: [process.execPath, bin.bin], path: bin.bin, source: 'project', version: bin.version }
+  }
+
+  const pathCommand = executableOnPath('dsh', env)
+  if (pathCommand !== undefined) return { command: [pathCommand], path: pathCommand, source: 'path' }
+
+  if (harness.root !== undefined) {
+    for (const packageDir of [harness.root, join(harness.root, 'apps', 'cli')]) {
+      const bin = manifestBin(packageDir)
+      if (bin !== undefined) return { command: [process.execPath, bin.bin], path: bin.bin, source: 'checkout', version: bin.version }
+    }
+  }
+  return undefined
+}
+
 function workspacePackageDirectories(root) {
   const directories = []
   const addChildren = (parent) => {
@@ -135,7 +253,14 @@ function indexWorkspace(root, findings) {
   for (const directory of workspacePackageDirectories(root)) {
     const file = join(directory, 'package.json')
     if (!existsSync(file)) continue
-    const manifest = readJson(file, 'Harness workspace package manifest', findings)
+    const manifestFindings = []
+    const manifest = readJson(file, 'Harness workspace package manifest', manifestFindings)
+    for (const item of manifestFindings) {
+      findings.push(finding('warning', 'INVALID_WORKSPACE_MANIFEST', 'A Harness workspace package manifest was ignored because it is invalid.', {
+        evidence: item.evidence ?? file,
+        suggestion: 'Repair this workspace package manifest to include it in compatibility checks.',
+      }))
+    }
     if (typeof manifest?.name === 'string') packages.set(manifest.name, { directory, file, manifest })
   }
   return packages
@@ -149,10 +274,10 @@ function resolveHarnessContext(home, explicitRoot, findings) {
         evidence: root,
         suggestion: 'Pass the DeepSeek Harness repository root to --harness-root.',
       }))
-      return { root, packages: new Map(), version: undefined, authoritative: true }
+      return { root, packages: new Map(), version: undefined, authoritative: false }
     }
     const manifest = readJson(join(root, 'package.json'), 'Harness root manifest', findings)
-    return { root, packages: indexWorkspace(root, findings), version: manifest?.version, authoritative: true }
+    return { root, packages: indexWorkspace(root, findings), version: manifest?.version, authoritative: manifest !== undefined }
   }
 
   const sharedDsh = join(home, 'profiles', 'node_modules', '@deepseek-ai', 'dsh')
@@ -194,8 +319,9 @@ function packageResolver(profileDir, home, harnessPackages, findings) {
       return resolved
     }
     const workspace = harnessPackages.get(name)
-    cache.set(name, workspace)
-    return workspace
+    const resolved = workspace === undefined ? undefined : { ...workspace, requestedName: name }
+    cache.set(name, resolved)
+    return resolved
   }
 }
 
@@ -238,14 +364,14 @@ function dependencyEntries(value, field, file, findings) {
   return Object.entries(record)
 }
 
-function updateRepair(profile, name) {
-  return {
-    id: `update-package:${name}`,
-    kind: 'command',
-    risk: 'medium',
-    description: `Update ${name} in profile ${profile}.`,
-    command: ['dsh', 'plugin', '--profile', profile, 'update', name],
-  }
+function updateRepair(profile, name, commandRepair) {
+  if (packagePathParts(name) === undefined) return undefined
+  return commandRepair(
+    `update-package:${name}`,
+    `Update ${name} in profile ${profile}.`,
+    ['plugin', '--profile', profile, 'update', name],
+    { package: name, profile },
+  )
 }
 
 function safePackageFile(packageDir, exported) {
@@ -259,11 +385,11 @@ function safePackageFile(packageDir, exported) {
 export function extractStaticRequires(source) {
   const values = new Set()
   const code = codePositions(source)
-  const pattern = /\brequire\s*\(\s*(['"])([^'"\\\r\n]+)\1\s*\)/g
+  const pattern = /(?<![\w$.])require\s*\(\s*(['"])([^'"\\\r\n]+)\1\s*\)/g
   for (const match of source.matchAll(pattern)) {
     if (!code[match.index]) continue
     const specifier = match[2]
-    if (specifier.startsWith('.') || specifier.startsWith('/') || specifier.startsWith('node:')) continue
+    if (specifier.startsWith('.') || specifier.startsWith('/') || specifier.startsWith('node:') || BUILTIN_MODULES.has(specifier)) continue
     if (packagePathParts(specifier) !== undefined || specifier.startsWith('@')) values.add(specifier)
   }
   return [...values].sort()
@@ -316,10 +442,10 @@ function stringArray(value) {
 
 function inspectClientPackage(record, context) {
   const {
-    findings, harnessPackages, harnessPackagesAuthoritative, profile, resolvePackage,
+    commandRepair, findings, harnessPackages, harnessPackagesAuthoritative, profile, resolvePackage,
   } = context
-  const name = record.manifest.name
-  const disableSuggestion = `Upgrade ${name}; if no compatible release exists, run dsh plugin --profile ${profile} remove ${name}.`
+  const name = record.requestedName ?? record.manifest.name
+  const disableSuggestion = `Upgrade ${name}; if no compatible release exists, remove it through the same DSH installation.`
   const declaration = record.manifest?.dsh?.client
   if (declaration === undefined) return
   if (declaration === null || typeof declaration !== 'object') {
@@ -327,7 +453,7 @@ function inspectClientPackage(record, context) {
       package: name,
       evidence: record.file,
       suggestion: disableSuggestion,
-      repair: updateRepair(profile, name),
+      repair: updateRepair(profile, name, commandRepair),
     }))
     return
   }
@@ -337,7 +463,7 @@ function inspectClientPackage(record, context) {
       package: name,
       evidence: record.file,
       suggestion: disableSuggestion,
-      repair: updateRepair(profile, name),
+      repair: updateRepair(profile, name, commandRepair),
     }))
     return
   }
@@ -346,7 +472,7 @@ function inspectClientPackage(record, context) {
       package: name,
       evidence: record.file,
       suggestion: disableSuggestion,
-      repair: updateRepair(profile, name),
+      repair: updateRepair(profile, name, commandRepair),
     }))
   }
   if (declaration.platform !== 'web') return
@@ -358,7 +484,7 @@ function inspectClientPackage(record, context) {
       package: name,
       evidence: record.file,
       suggestion: disableSuggestion,
-      repair: updateRepair(profile, name),
+      repair: updateRepair(profile, name, commandRepair),
     }))
   }
   if (declaration.inject !== undefined && inject === undefined) {
@@ -366,7 +492,7 @@ function inspectClientPackage(record, context) {
       package: name,
       evidence: record.file,
       suggestion: disableSuggestion,
-      repair: updateRepair(profile, name),
+      repair: updateRepair(profile, name, commandRepair),
     }))
   }
 
@@ -380,12 +506,12 @@ function inspectClientPackage(record, context) {
     return
   }
   const file = safePackageFile(record.directory, exported)
-  if (file === undefined || !existsSync(file) || !statSync(file).isFile()) {
+  if (file === undefined || !regularFile(file)) {
     findings.push(finding('error', 'CLIENT_BUNDLE_MISSING', `${name} client bundle is missing.`, {
       package: name,
       evidence: file ?? `${record.file}: exports["./client"] = ${JSON.stringify(exported)}`,
-      suggestion: `Reinstall or rebuild ${name}; if it remains broken, run dsh plugin --profile ${profile} remove ${name}.`,
-      repair: updateRepair(profile, name),
+      suggestion: `Reinstall or rebuild ${name}; if it remains broken, remove it through the same DSH installation.`,
+      repair: updateRepair(profile, name, commandRepair),
     }))
     return
   }
@@ -409,7 +535,7 @@ function inspectClientPackage(record, context) {
         package: name,
         evidence: file,
         suggestion: disableSuggestion,
-        repair: updateRepair(profile, name),
+        repair: updateRepair(profile, name, commandRepair),
       }))
     }
   }
@@ -432,7 +558,7 @@ function inspectClientPackage(record, context) {
         package: name,
         evidence: record.file,
         suggestion: disableSuggestion,
-        repair: updateRepair(profile, name),
+        repair: updateRepair(profile, name, commandRepair),
       }))
     }
   }
@@ -445,7 +571,7 @@ function inspectClientPackage(record, context) {
           package: name,
           evidence: record.file,
           suggestion: disableSuggestion,
-          repair: updateRepair(profile, name),
+          repair: updateRepair(profile, name, commandRepair),
         }))
       }
     }
@@ -467,7 +593,7 @@ function inspectBundle(name, record, findings) {
   if (record === undefined) {
     findings.push(finding('error', 'BUNDLE_NOT_INSTALLED', `Profile bundle ${name} is not installed.`, {
       package: name,
-      suggestion: `Run dsh plugin --profile <profile> install, upgrade the bundle, or remove it from the profile.`,
+      suggestion: 'Install the profile dependencies with the active DSH installation, upgrade the bundle, or remove it from the profile.',
     }))
     return
   }
@@ -481,7 +607,7 @@ function inspectBundle(name, record, findings) {
     return
   }
   const file = safePackageFile(record.directory, patch)
-  if (file === undefined || !existsSync(file) || !statSync(file).isFile()) {
+  if (file === undefined || !regularFile(file)) {
     findings.push(finding('error', 'BUNDLE_PATCH_MISSING', `${name} bundle patch is missing.`, {
       package: name,
       evidence: file ?? `${record.file}: dsh.bundle.patch = ${JSON.stringify(patch)}`,
@@ -580,7 +706,7 @@ function inspectPatchFileIfPresent(file, subject, findings) {
 }
 
 function inspectCompatibility(record, context) {
-  const { findings, harnessPackages, profile, resolvePackage } = context
+  const { commandRepair, findings, harnessPackages, profile, resolvePackage } = context
   const peers = dependencyEntries(record.manifest.peerDependencies, 'peerDependencies', record.file, findings)
   const mismatches = []
   for (const [name, range] of peers) {
@@ -593,18 +719,19 @@ function inspectCompatibility(record, context) {
     mismatches.push(`${name} ${range} (active ${version})`)
   }
   if (mismatches.length > 0) {
-    findings.push(finding('warning', 'HARNESS_PEER_VERSION_MISMATCH', `${record.manifest.name} has Harness peer ranges that do not accept the active versions.`, {
-      package: record.manifest.name,
+    const name = record.requestedName ?? record.manifest.name
+    findings.push(finding('warning', 'HARNESS_PEER_VERSION_MISMATCH', `${name} has Harness peer ranges that do not accept the active versions.`, {
+      package: name,
       evidence: mismatches.join(', '),
-      suggestion: `Update ${record.manifest.name} to a release compatible with the active Harness.`,
-      repair: updateRepair(profile, record.manifest.name),
+      suggestion: `Update ${name} to a release compatible with the active Harness.`,
+      repair: updateRepair(profile, name, commandRepair),
     }))
   }
 }
 
 export function defaultDshHome(env = process.env) {
-  const configured = env.DSH_HOME
-  if (configured !== undefined && configured.trim().length > 0) {
+  const configured = env.DSH_HOME?.trim()
+  if (configured !== undefined && configured.length > 0) {
     if (configured === '~') return homedir()
     if (configured.startsWith('~/') || configured.startsWith('~\\')) return resolve(homedir(), configured.slice(2))
     return resolve(configured)
@@ -625,7 +752,7 @@ export function diagnose(options = {}) {
   if (!existsSync(profileManifestFile)) {
     findings.push(finding('error', 'PROFILE_NOT_FOUND', `Profile ${profile} does not exist.`, {
       evidence: profileDir,
-      suggestion: `Start the profile once or initialize it with dsh plugin --profile ${profile} install.`,
+      suggestion: 'Start the profile once or initialize it with the plugin install command from the same DSH installation.',
     }))
     return finish({ home, profile, profileDir, harness: {}, packages: [] }, findings)
   }
@@ -635,19 +762,50 @@ export function diagnose(options = {}) {
   }
 
   const harness = resolveHarnessContext(home, options.harnessRoot, findings)
+  const dshCli = resolveDshCli(options, harness, home)
+  let commandRepairNeeded = false
+  const commandRepair = (id, description, args, metadata = {}) => {
+    commandRepairNeeded = true
+    return dshCli === undefined ? undefined : {
+      id,
+      kind: 'command',
+      risk: 'medium',
+      description,
+      command: [...dshCli.command, ...args],
+      env: { DSH_HOME: home },
+      ...metadata,
+    }
+  }
   const resolvePackage = packageResolver(profileDir, home, harness.packages, findings)
   const resolveBundle = bundleResolver(profileDir, home, harness.packages, findings)
   const dependencyEntriesList = dependencyEntries(profileManifest.dependencies, 'dependencies', profileManifestFile, findings)
   const dependencyNames = dependencyEntriesList.map(([name]) => name)
-  const bundles = profileManifest?.dsh?.profile?.bundles
+  const dshConfig = profileManifest.dsh
+  const dshConfigValid = dshConfig === undefined || objectRecord(dshConfig) !== undefined
+  if (!dshConfigValid) {
+    findings.push(finding('error', 'INVALID_DSH_CONFIGURATION', 'dsh must be an object when present.', {
+      evidence: profileManifestFile,
+      suggestion: 'Repair the dsh configuration object before starting Harness.',
+    }))
+  }
+  const profileConfigValue = objectRecord(dshConfig)?.profile
+  const profileConfigValid = profileConfigValue === undefined || objectRecord(profileConfigValue) !== undefined
+  if (dshConfigValid && !profileConfigValid) {
+    findings.push(finding('error', 'INVALID_PROFILE_CONFIGURATION', 'dsh.profile must be an object when present.', {
+      evidence: profileManifestFile,
+      suggestion: 'Repair the dsh.profile configuration object before starting Harness.',
+    }))
+  }
+  const profileConfig = objectRecord(profileConfigValue)
+  const bundles = profileConfig?.bundles
   if (bundles !== undefined && (!Array.isArray(bundles) || !bundles.every(item => typeof item === 'string'))) {
     findings.push(finding('error', 'INVALID_BUNDLE_LIST', 'dsh.profile.bundles must be a string array.', {
       evidence: profileManifestFile,
       suggestion: 'Repair the profile manifest before starting Harness.',
     }))
   }
-  const bundleNames = Array.isArray(bundles) ? bundles.filter(item => typeof item === 'string') : []
-  const patchReload = profileManifest?.dsh?.profile?.patchReload
+  const bundleNames = Array.isArray(bundles) ? [...new Set(bundles.filter(item => typeof item === 'string'))] : []
+  const patchReload = profileConfig?.patchReload
   if (patchReload !== undefined && patchReload !== 'live' && patchReload !== 'startup') {
     findings.push(finding('error', 'INVALID_PATCH_RELOAD', 'dsh.profile.patchReload must be "live" or "startup".', {
       evidence: profileManifestFile,
@@ -671,14 +829,13 @@ export function diagnose(options = {}) {
       findings.push(finding('error', 'DEPENDENCY_NOT_INSTALLED', `Profile dependency ${name} is not installed.`, {
         package: name,
         evidence: profileManifestFile,
-        suggestion: `Run dsh plugin --profile ${profile} install.`,
-        repair: {
-          id: `install-profile:${profile}`,
-          kind: 'command',
-          risk: 'medium',
-          description: `Install the declared dependencies for profile ${profile}.`,
-          command: ['dsh', 'plugin', '--profile', profile, 'install'],
-        },
+        suggestion: 'Use the exact command shown below to install the declared profile dependencies.',
+        repair: commandRepair(
+          `install-profile:${profile}`,
+          `Install the declared dependencies for profile ${profile}.`,
+          ['plugin', '--profile', profile, 'install'],
+          { profile },
+        ),
       }))
       continue
     }
@@ -690,17 +847,17 @@ export function diagnose(options = {}) {
       findings.push(finding('warning', 'PROFILE_DEPENDENCY_VERSION_MISMATCH', `Profile requests ${name} ${declared}, but ${installed} is installed.`, {
         package: name,
         evidence: record.file,
-        suggestion: `Reconcile the profile installation with dsh plugin --profile ${profile} install.`,
-        repair: {
-          id: `install-profile:${profile}`,
-          kind: 'command',
-          risk: 'medium',
-          description: `Install the declared dependencies for profile ${profile}.`,
-          command: ['dsh', 'plugin', '--profile', profile, 'install'],
-        },
+        suggestion: 'Use the exact command shown below to reconcile the profile installation.',
+        repair: commandRepair(
+          `install-profile:${profile}`,
+          `Install the declared dependencies for profile ${profile}.`,
+          ['plugin', '--profile', profile, 'install'],
+          { profile },
+        ),
       }))
     }
-    if (record.manifest?.dsh?.bundle?.patch !== undefined && !bundleNames.includes(name)) {
+    if (dshConfigValid && profileConfigValid
+      && record.manifest?.dsh?.bundle?.patch !== undefined && !bundleNames.includes(name)) {
       findings.push(finding('warning', 'INSTALLED_BUNDLE_INACTIVE', `${name} is installed as a bundle but is absent from dsh.profile.bundles.`, {
         package: name,
         evidence: profileManifestFile,
@@ -729,6 +886,7 @@ export function diagnose(options = {}) {
   for (const record of thirdPartyRecords) {
     inspectClientPackage(record, {
       findings,
+      commandRepair,
       harnessPackages: harness.packages,
       harnessPackagesAuthoritative: harness.authoritative,
       profile,
@@ -736,6 +894,7 @@ export function diagnose(options = {}) {
     })
     inspectCompatibility(record, {
       findings,
+      commandRepair,
       profile,
       resolvePackage,
       harnessPackages: harness.packages,
@@ -747,8 +906,11 @@ export function diagnose(options = {}) {
     profile,
     profileDir,
     harness: { root: harness.root, version: harness.version },
+    dshCli: dshCli === undefined
+      ? { available: false, commandRepairNeeded }
+      : { available: true, commandRepairNeeded, ...dshCli },
     packages: thirdPartyRecords.map(record => ({
-      name: record.manifest.name,
+      name: record.requestedName ?? record.manifest.name,
       version: record.manifest.version,
       directory: record.directory,
       client: record.manifest?.dsh?.client !== undefined,
@@ -772,32 +934,49 @@ function finish(context, findings) {
 
 export function formatReport(report, options = {}) {
   const color = options.color ?? false
+  const language = options.language ?? 'en'
+  const zh = language === 'zh'
   const paint = (severity, value) => {
     if (!color) return value
     const code = severity === 'error' ? 31 : severity === 'warning' ? 33 : 36
     return `\u001B[${code}m${value}\u001B[0m`
   }
+  const quote = value => /^[a-zA-Z0-9_@./:\\-]+$/.test(value) ? value : JSON.stringify(value)
+  const cli = report.context.dshCli
+  const cliText = cli?.available
+    ? `${cli.source}${cli.version ? ` ${cli.version}` : ''} (${cli.command.map(quote).join(' ')})`
+    : zh ? '未找到（命令型修复已禁用）' : 'not found (command-based repairs disabled)'
   const lines = [
     'DSH Doctor',
-    `Profile: ${report.context.profile}`,
-    `Home: ${report.context.home}`,
+    `${zh ? 'Profile' : 'Profile'}: ${report.context.profile}`,
+    `${zh ? 'DSH 主目录' : 'Home'}: ${report.context.home}`,
     `Harness: ${report.context.harness.version ?? 'unknown'}${report.context.harness.root ? ` (${report.context.harness.root})` : ''}`,
-    `Checked third-party packages: ${String(report.context.packages.length)}`,
+    `${zh ? 'DSH CLI' : 'DSH CLI'}: ${cliText}`,
+    `${zh ? '已检查第三方包' : 'Checked third-party packages'}: ${String(report.context.packages.length)}`,
+    `${zh ? '输出语言' : 'Output language'}: ${languageName(language)}`,
     '',
   ]
   if (report.findings.length === 0) {
-    lines.push(paint('info', 'OK  No problems found by the MVP checks.'))
+    lines.push(paint('info', zh ? '正常  当前检查范围内未发现问题。' : 'OK  No problems found by the MVP checks.'))
   } else {
-    for (const item of report.findings) {
-      const label = item.severity === 'error' ? 'ERROR' : item.severity === 'warning' ? 'WARN ' : 'INFO '
+    for (const original of report.findings) {
+      const item = localizedFinding(original, language)
+      const label = zh
+        ? item.severity === 'error' ? '错误' : item.severity === 'warning' ? '警告' : '信息'
+        : item.severity === 'error' ? 'ERROR' : item.severity === 'warning' ? 'WARN ' : 'INFO '
       lines.push(paint(item.severity, `${label} [${item.code}] ${item.message}`))
-      if (item.package !== undefined) lines.push(`      Package: ${item.package}`)
-      if (item.evidence !== undefined) lines.push(`      Evidence: ${item.evidence}`)
-      if (item.suggestion !== undefined) lines.push(`      Action: ${item.suggestion}`)
+      if (item.package !== undefined) lines.push(`      ${zh ? '包' : 'Package'}: ${item.package}`)
+      if (item.evidence !== undefined) lines.push(`      ${zh ? '证据' : 'Evidence'}: ${item.evidence}`)
+      if (item.suggestion !== undefined) lines.push(`      ${zh ? '建议' : 'Action'}: ${item.suggestion}`)
+      if (item.repair?.kind === 'command') lines.push(`      ${zh ? '更新命令' : 'Update command'}: ${item.repair.command.map(quote).join(' ')}`)
       lines.push('')
     }
   }
-  lines.push(`Summary: ${String(report.summary.errors)} error(s), ${String(report.summary.warnings)} warning(s)`)
-  if (report.summary.errors > 0) lines.push('Harness may fail to start. Upgrade or disable the error-producing plugin first.')
+  lines.push(zh
+    ? `汇总：${String(report.summary.errors)} 个错误，${String(report.summary.warnings)} 个警告`
+    : `Summary: ${String(report.summary.errors)} error(s), ${String(report.summary.warnings)} warning(s)`)
+  if (report.summary.errors > 0) lines.push(zh
+    ? 'Harness 可能无法启动。请优先更新或停用产生错误的插件。'
+    : 'Harness may fail to start. Upgrade or disable the error-producing plugin first.')
   return `${lines.join('\n')}\n`
 }

package/src/i18n.mjs

@@ -0,0 +1,155 @@
+import { existsSync, readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { parseDocument } from 'yaml'
+
+const SUPPORTED = new Map([
+  ['en', 'en'],
+  ['en-us', 'en'],
+  ['en_us', 'en'],
+  ['zh', 'zh'],
+  ['zh-cn', 'zh'],
+  ['zh_cn', 'zh'],
+  ['zh-hans', 'zh'],
+])
+
+function normalizedLanguage(value) {
+  if (typeof value !== 'string') return undefined
+  const cleaned = value.trim().split('.')[0].toLowerCase()
+  if (cleaned === '' || cleaned === 'auto' || cleaned === 'c' || cleaned === 'posix') return undefined
+  return SUPPORTED.get(cleaned) ?? SUPPORTED.get(cleaned.split(/[-_]/)[0])
+}
+
+function dshPreference(home) {
+  const file = join(home, 'settings.yaml')
+  if (!existsSync(file)) return undefined
+  try {
+    const document = parseDocument(readFileSync(file, 'utf8'), { prettyErrors: false })
+    if (document.errors.length > 0) return undefined
+    return document.toJS()?.locale?.preference
+  } catch {
+    return undefined
+  }
+}
+
+export function resolveLanguage({ requested, env = process.env, home, systemLocale } = {}) {
+  if (requested !== undefined && requested !== 'auto') {
+    const language = normalizedLanguage(requested)
+    if (language === undefined) throw new Error(`unsupported language ${JSON.stringify(requested)}; expected auto, zh, or en`)
+    return language
+  }
+  const configured = normalizedLanguage(env.DSH_DOCTOR_LANG)
+  if (configured !== undefined) return configured
+  const preference = normalizedLanguage(home === undefined ? undefined : dshPreference(home))
+  if (preference !== undefined) return preference
+  for (const value of [env.LC_ALL, env.LC_MESSAGES, env.LANG, env.LANGUAGE, systemLocale]) {
+    const language = normalizedLanguage(value)
+    if (language !== undefined) return language
+  }
+  return 'en'
+}
+
+function captured(message, pattern, index = 1) {
+  return message.match(pattern)?.[index]
+}
+
+const ZH_MESSAGES = {
+  FILE_READ_FAILED: item => `无法读取${captured(item.message, /^Cannot read (.+)\.$/) ?? '文件'}。`,
+  INVALID_JSON_OBJECT: item => `${captured(item.message, /^(.+) must contain a JSON object\.$/) ?? '该文件'}必须包含 JSON 对象。`,
+  INVALID_JSON: item => `${captured(item.message, /^(.+) is not valid JSON\.$/) ?? '该文件'}不是有效的 JSON。`,
+  PACKAGE_NAME_MISMATCH: item => `${item.package ?? '依赖'}解析到了名称不匹配的包。`,
+  INVALID_HARNESS_ROOT: () => '指定的 Harness 根目录不是有效的源码工作区。',
+  INVALID_WORKSPACE_MANIFEST: () => '已忽略一个无效的 Harness workspace 包清单。',
+  HARNESS_INSTALLATION_UNKNOWN: () => '无法定位这个 DSH Home 实际使用的 Harness。',
+  INVALID_DEPENDENCY_MAP: item => `${captured(item.message, /^(\S+) must be/) ?? '依赖字段'}必须是“包名到版本范围”的对象。`,
+  INVALID_CLIENT_DECLARATION: item => `${item.package} 的 dsh.client 声明无效。`,
+  INVALID_CLIENT_PLATFORM: item => `${item.package} 的 dsh.client.platform 必须是字符串。`,
+  INVALID_CLIENT_IMMEDIATELY: item => `${item.package} 的 dsh.client.immediately 必须是布尔值。`,
+  INVALID_CLIENT_EXTERNAL: item => `${item.package} 的 dsh.client.external 必须是字符串数组。`,
+  INVALID_CLIENT_INJECT: item => `${item.package} 的 dsh.client.inject 必须是字符串数组。`,
+  CLIENT_EXPORT_MISSING: item => `${item.package} 声明了 dsh.client，但没有导出 ./client 入口。`,
+  CLIENT_BUNDLE_MISSING: item => `${item.package} 的客户端 bundle 缺失。`,
+  CLIENT_BUNDLE_UNREADABLE: item => `无法读取 ${item.package} 的客户端 bundle。`,
+  UNDECLARED_CLIENT_REQUIRE: item => `${item.package} 引用了 ${captured(item.message, / requires (.+) but does not/) ?? '未声明模块'}，但没有在 dsh.client.external 中声明。`,
+  REDUNDANT_CLIENT_EXTERNAL: item => `${item.package} 把平台模块 ${captured(item.message, / module (.+) as an external/) ?? ''} 重复声明为 external。`,
+  CLIENT_EXTERNAL_WITHOUT_SUPPLIER: item => `${item.package} 请求了 ${captured(item.message, / requests (.+), but/) ?? '客户端模块'}，但当前 Harness 没有对应的模块提供方。`,
+  REMOVED_CLIENT_INJECT: item => `${item.package} 注入了 ${captured(item.message, / injects (.+), which/) ?? '已移除的模块'}，但当前 Harness 源码中已不存在该模块。`,
+  LEGACY_HARNESS_PEERS: item => `${item.package} 仍声明了当前 Harness 源码中已不存在的旧包。`,
+  BUNDLE_NOT_INSTALLED: item => `配置中的 bundle ${item.package} 尚未安装。`,
+  BUNDLE_DECLARATION_MISSING: item => `${item.package} 被列为 profile bundle，但没有声明 dsh.bundle.patch。`,
+  BUNDLE_PATCH_MISSING: item => `${item.package} 的 bundle patch 文件缺失。`,
+  INVALID_PATCH_YAML: item => `${captured(item.message, /^(.+) cannot be parsed\.$/) ?? 'Patch 文件'}无法解析。`,
+  INVALID_PATCH_LIST: item => `${captured(item.message, /^(.+) must be/) ?? 'Patch 文件'}的顶层必须是由映射组成的 YAML 数组。`,
+  INVALID_SETTINGS_DOCUMENT: () => 'Harness 设置文件无法解析。',
+  INVALID_SETTINGS_ROOT: () => 'Harness 设置文件顶层必须是命名空间映射。',
+  INVALID_CREDENTIALS_DOCUMENT: () => 'Harness 凭据文件无法解析。',
+  INVALID_CREDENTIALS_ROOT: () => 'Harness 凭据文件顶层必须是映射。',
+  INVALID_CREDENTIALS_LAYOUT: () => 'Harness 凭据文件不是受支持的 version 1 结构。',
+  HARNESS_PEER_VERSION_MISMATCH: item => `${item.package} 声明的 Harness peer 版本范围不接受当前已安装版本。`,
+  INVALID_PROFILE_NAME: item => `Profile 名称无效：${captured(item.message, /^Invalid profile name (.+)\.$/) ?? ''}`,
+  PROFILE_NOT_FOUND: item => `Profile ${captured(item.message, /^Profile (.+) does not exist\.$/) ?? ''} 不存在。`,
+  INVALID_DSH_CONFIGURATION: () => 'dsh 字段存在时必须是对象。',
+  INVALID_PROFILE_CONFIGURATION: () => 'dsh.profile 字段存在时必须是对象。',
+  INVALID_BUNDLE_LIST: () => 'dsh.profile.bundles 必须是字符串数组。',
+  INVALID_PATCH_RELOAD: () => 'dsh.profile.patchReload 必须是 “live” 或 “startup”。',
+  DEPENDENCY_NOT_INSTALLED: item => `Profile 依赖 ${item.package} 尚未安装。`,
+  PROFILE_DEPENDENCY_VERSION_MISMATCH: item => `${item.package} 的声明版本范围与当前安装版本不兼容。`,
+  INSTALLED_BUNDLE_INACTIVE: item => `${item.package} 已作为 bundle 安装，但不在 dsh.profile.bundles 中。`,
+}
+
+const ZH_SUGGESTIONS = {
+  INVALID_JSON_OBJECT: () => '启动 Harness 前，请恢复有效的 package manifest 对象。',
+  INVALID_JSON: () => '启动该 profile 前，请先修复 JSON。',
+  PACKAGE_NAME_MISMATCH: () => '重新安装依赖，使目录位置与包名一致。',
+  INVALID_HARNESS_ROOT: () => '诊断源码工作区时，请把 DeepSeek Harness 仓库根目录传给 --harness-root。',
+  INVALID_WORKSPACE_MANIFEST: () => '修复该 workspace 包清单后，Doctor 才能把它纳入兼容性检查。',
+  HARNESS_INSTALLATION_UNKNOWN: () => '若使用源码工作区，请通过 --harness-root 明确指定；若使用独立 CLI，请通过 --dsh-command 指定。',
+  INVALID_DEPENDENCY_MAP: () => '管理或启动 profile 前，请先修复这个依赖字段。',
+  INVALID_CLIENT_DECLARATION: update,
+  INVALID_CLIENT_PLATFORM: update,
+  INVALID_CLIENT_IMMEDIATELY: update,
+  INVALID_CLIENT_EXTERNAL: update,
+  INVALID_CLIENT_INJECT: update,
+  CLIENT_EXPORT_MISSING: update,
+  CLIENT_BUNDLE_MISSING: update,
+  UNDECLARED_CLIENT_REQUIRE: update,
+  CLIENT_EXTERNAL_WITHOUT_SUPPLIER: update,
+  REMOVED_CLIENT_INJECT: update,
+  REDUNDANT_CLIENT_EXTERNAL: () => '插件作者应删除重复的 dsh.client.external 条目。',
+  LEGACY_HARNESS_PEERS: () => '该插件存在兼容风险，请在下次升级 Harness 前更新。',
+  BUNDLE_NOT_INSTALLED: () => '使用当前 DSH 安装补齐 profile 依赖、升级 bundle，或从 profile 中移除它。',
+  BUNDLE_DECLARATION_MISSING: () => '升级该 bundle，或把它从 dsh.profile.bundles 中移除。',
+  BUNDLE_PATCH_MISSING: () => '重新安装或升级该 bundle，或者从 profile 中移除它。',
+  INVALID_PATCH_YAML: () => '启动该 profile 前，请修复 YAML 语法。',
+  INVALID_PATCH_LIST: () => '启动该 profile 前，请修复 patch 顶层结构。',
+  INVALID_SETTINGS_DOCUMENT: () => '修复设置文件语法；Doctor 不会猜测凭据或模型配置值。',
+  INVALID_SETTINGS_ROOT: () => '把顶层标量或数组替换为映射。',
+  INVALID_CREDENTIALS_DOCUMENT: () => '只修复报告的结构；Doctor 永远不会输出或重写秘密值。',
+  INVALID_CREDENTIALS_LAYOUT: () => '迁移文档结构，不要暴露或修改秘密值。',
+  HARNESS_PEER_VERSION_MISMATCH: item => `把 ${item.package} 更新到兼容当前 Harness 的版本。`,
+  PROFILE_NOT_FOUND: () => '先启动一次该 profile，或用当前 DSH 安装初始化它。',
+  INVALID_DSH_CONFIGURATION: () => '启动 Harness 前，请先修复 dsh 配置对象。',
+  INVALID_PROFILE_CONFIGURATION: () => '启动 Harness 前，请先修复 dsh.profile 配置对象。',
+  INVALID_BUNDLE_LIST: () => '启动 Harness 前，请修复 profile manifest。',
+  INVALID_PATCH_RELOAD: () => '选择该 profile 需要的 reload 生命周期。',
+  DEPENDENCY_NOT_INSTALLED: () => '使用下方精确命令安装该 profile 声明的依赖。',
+  PROFILE_DEPENDENCY_VERSION_MISMATCH: () => '使用下方精确命令重新同步该 profile 的安装。',
+  INSTALLED_BUNDLE_INACTIVE: () => '重新执行匹配的插件添加或更新操作，或者移除未使用的依赖。',
+}
+
+function update(item) {
+  return `更新 ${item.package}；如果没有兼容版本，再通过同一个 DSH 安装移除该插件。`
+}
+
+export function localizedFinding(item, language) {
+  if (language !== 'zh') return item
+  const message = ZH_MESSAGES[item.code]?.(item) ?? item.message
+  const suggestion = item.suggestion === undefined ? undefined : (ZH_SUGGESTIONS[item.code]?.(item) ?? item.suggestion)
+  const evidence = typeof item.evidence === 'string'
+    ? item.evidence.replaceAll('(active ', '(当前 ').replace(/ at line (\d+), column (\d+)/g, '，第 $1 行第 $2 列')
+    : item.evidence
+  return { ...item, message, suggestion, evidence }
+}
+
+export function languageName(language) {
+  return language === 'zh' ? '中文' : 'English'
+}

package/src/repair.mjs

@@ -22,15 +22,30 @@ export function repairsFromReport(report) {
   })
 }
 
-export function formatRepairPlan(actions) {
-  const lines = ['Proposed repairs:', '']
+export function formatRepairPlan(actions, options = {}) {
+  const zh = options.language === 'zh'
+  const lines = [zh ? '建议执行以下修复：' : 'Proposed repairs:', '']
   actions.forEach((action, index) => {
-    lines.push(`${String(index + 1)}. [${action.risk.toUpperCase()}] ${action.description}`)
-    if (action.kind === 'command') lines.push(`   Command: ${action.command.map(quoteArgument).join(' ')}`)
-    else lines.push(`   File: ${action.file}`, `   Backup: ${action.file}.dsh-doctor-<timestamp>.bak`)
+    const risk = zh ? action.risk === 'low' ? '低风险' : action.risk === 'medium' ? '中风险' : '高风险' : action.risk.toUpperCase()
+    lines.push(`${String(index + 1)}. [${risk}] ${localizedDescription(action, zh)}`)
+    if (action.kind === 'command') {
+      lines.push(`   ${zh ? '命令' : 'Command'}: ${action.command.map(quoteArgument).join(' ')}`)
+      if (action.env !== undefined) lines.push(`   ${zh ? '环境' : 'Environment'}: ${Object.entries(action.env).map(([key, value]) => `${key}=${quoteArgument(value)}`).join(' ')}`)
+    } else lines.push(`   ${zh ? '文件' : 'File'}: ${action.file}`, `   ${zh ? '备份' : 'Backup'}: ${action.file}.dsh-doctor-<timestamp>.bak`)
     lines.push('')
   })
-  return `${lines.join('\n')}Apply these repairs? [y/N] `
+  const plan = lines.join('\n')
+  return options.prompt === false
+    ? plan.trimEnd()
+    : `${plan}${zh ? '执行这些修复吗？[y/N] ' : 'Apply these repairs? [y/N] '}`
+}
+
+function localizedDescription(action, zh) {
+  if (!zh) return action.description
+  if (action.id.startsWith('update-package:')) return `更新 profile ${action.profile} 中的 ${action.package}。`
+  if (action.id.startsWith('install-profile:')) return `安装 profile ${action.profile} 声明的依赖。`
+  if (action.id.startsWith('activate-bundle:')) return `把 ${action.operation.name} 加入 dsh.profile.bundles。`
+  return action.description
 }
 
 function quoteArgument(value) {
@@ -44,8 +59,19 @@ function applyJsonEdit(action) {
   }
   const manifest = JSON.parse(current)
   if (action.operation.type !== 'add-bundle') throw new Error(`unsupported JSON repair ${action.operation.type}`)
-  const bundles = manifest?.dsh?.profile?.bundles
-  if (!Array.isArray(bundles)) throw new Error(`${action.file} no longer has a valid dsh.profile.bundles array`)
+  if (manifest.dsh === undefined) manifest.dsh = {}
+  if (manifest.dsh === null || typeof manifest.dsh !== 'object' || Array.isArray(manifest.dsh)) {
+    throw new Error(`${action.file} no longer has a valid dsh object`)
+  }
+  if (manifest.dsh.profile === undefined) manifest.dsh.profile = {}
+  if (manifest.dsh.profile === null || typeof manifest.dsh.profile !== 'object' || Array.isArray(manifest.dsh.profile)) {
+    throw new Error(`${action.file} no longer has a valid dsh.profile object`)
+  }
+  if (manifest.dsh.profile.bundles === undefined) manifest.dsh.profile.bundles = []
+  const bundles = manifest.dsh.profile.bundles
+  if (!Array.isArray(bundles) || !bundles.every(item => typeof item === 'string')) {
+    throw new Error(`${action.file} no longer has a valid dsh.profile.bundles array`)
+  }
   if (!bundles.includes(action.operation.name)) bundles.push(action.operation.name)
   const stamp = new Date().toISOString().replace(/[:.]/g, '-')
   const backup = `${action.file}.dsh-doctor-${stamp}.bak`
@@ -58,9 +84,16 @@ function applyJsonEdit(action) {
 
 function applyCommand(action) {
   const [command, ...args] = action.command
-  const result = crossSpawn.sync(command, args, { stdio: 'inherit' })
+  const result = crossSpawn.sync(command, args, {
+    stdio: 'inherit',
+    env: action.env === undefined ? process.env : { ...process.env, ...action.env },
+  })
   if (result.error != null) throw result.error
-  if (result.status !== 0) throw new Error(`${command} exited with status ${String(result.status)}`)
+  if (result.status !== 0) {
+    throw new Error(result.signal === null
+      ? `${command} exited with status ${String(result.status)}`
+      : `${command} was terminated by signal ${result.signal}`)
+  }
   return { id: action.id, status: 'applied' }
 }