@bruc3van/dsh-doctor 0.1.1 → 0.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bruc3van/dsh-doctor",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Diagnostics and confirmed recovery for DeepSeek Harness profiles and third-party plugins",
   "license": "MIT",
   "type": "module",

package/src/cli.mjs

@@ -107,11 +107,13 @@ async function main() {
       }
       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, { language })
           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())
         }

package/src/doctor.mjs

@@ -1,4 +1,5 @@
 import { accessSync, constants, existsSync, readFileSync, readdirSync, realpathSync, statSync } from 'node:fs'
+import { builtinModules } from 'node:module'
 import { homedir } from 'node:os'
 import { delimiter, dirname, isAbsolute, join, relative, resolve, sep } from 'node:path'
 import yaml from 'js-yaml'
@@ -16,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', {
@@ -71,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
@@ -94,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) {
@@ -118,6 +121,14 @@ function executable(file) {
   }
 }
 
+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'
@@ -168,10 +179,10 @@ function commandFromValue(value, env, cwd) {
       : value
   const looksLikePath = isAbsolute(expanded) || expanded.includes('/') || expanded.includes('\\') || expanded.startsWith('.')
   const file = looksLikePath ? resolve(cwd, expanded) : executableOnPath(expanded, env)
-  if (file === undefined || !existsSync(file)) return undefined
-  return /\.(?:c?js|mjs)$/i.test(file)
-    ? { command: [process.execPath, file], path: file }
-    : { command: [file], path: file }
+  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) {
@@ -242,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
@@ -256,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')
@@ -301,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
   }
 }
 
@@ -346,6 +365,7 @@ function dependencyEntries(value, field, file, findings) {
 }
 
 function updateRepair(profile, name, commandRepair) {
+  if (packagePathParts(name) === undefined) return undefined
   return commandRepair(
     `update-package:${name}`,
     `Update ${name} in profile ${profile}.`,
@@ -365,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()
@@ -424,7 +444,7 @@ function inspectClientPackage(record, context) {
   const {
     commandRepair, findings, harnessPackages, harnessPackagesAuthoritative, profile, resolvePackage,
   } = context
-  const name = record.manifest.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
@@ -486,7 +506,7 @@ 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)}`,
@@ -587,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)}`,
@@ -699,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, commandRepair),
+      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)
@@ -759,15 +780,32 @@ export function diagnose(options = {}) {
   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,
@@ -818,7 +856,8 @@ export function diagnose(options = {}) {
         ),
       }))
     }
-    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,
@@ -871,7 +910,7 @@ export function diagnose(options = {}) {
       ? { 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,

package/src/i18n.mjs

@@ -58,6 +58,7 @@ const ZH_MESSAGES = {
   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 声明无效。`,
@@ -86,6 +87,8 @@ const ZH_MESSAGES = {
   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} 尚未安装。`,
@@ -98,6 +101,7 @@ const ZH_SUGGESTIONS = {
   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,
@@ -123,6 +127,8 @@ const ZH_SUGGESTIONS = {
   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 声明的依赖。',

package/src/repair.mjs

@@ -34,7 +34,10 @@ export function formatRepairPlan(actions, options = {}) {
     } else lines.push(`   ${zh ? '文件' : 'File'}: ${action.file}`, `   ${zh ? '备份' : 'Backup'}: ${action.file}.dsh-doctor-<timestamp>.bak`)
     lines.push('')
   })
-  return `${lines.join('\n')}${zh ? '执行这些修复吗？[y/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) {
@@ -56,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`
@@ -75,7 +89,11 @@ function applyCommand(action) {
     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' }
 }