@moonquake2004/dsh-doctor 0.2.4 → 0.2.6

package/checks.json

@@ -8,8 +8,17 @@
       "severity": "error",
       "title": "dsh 可执行文件在 PATH 中",
       "discussion": "#1270",
-      "when": { "os": ["darwin", "linux", "win32"] },
-      "probe": { "type": "command-exists", "cmd": "dsh" },
+      "when": {
+        "os": [
+          "darwin",
+          "linux",
+          "win32"
+        ]
+      },
+      "probe": {
+        "type": "command-exists",
+        "cmd": "dsh"
+      },
       "detailOk": "dsh 在 PATH 中可用",
       "detailFail": "dsh 不在 PATH（插件/CLI 安装链路不可用，#1270 同族）",
       "fix": "安装 dsh 并将 node_modules/.bin 加入 PATH"
@@ -20,7 +29,13 @@
       "severity": "warn",
       "title": "workspace-root profile 的 .npmrc 安装开关",
       "discussion": "#20",
-      "when": { "os": ["darwin", "linux", "win32"] },
+      "when": {
+        "os": [
+          "darwin",
+          "linux",
+          "win32"
+        ]
+      },
       "probe": {
         "type": "text-contains",
         "path": "{profile}/.npmrc",
@@ -37,7 +52,13 @@
       "severity": "error",
       "title": "patch insert name 含空格（Windows 参数 lint）",
       "discussion": "#1420",
-      "when": { "os": ["darwin", "linux", "win32"] },
+      "when": {
+        "os": [
+          "darwin",
+          "linux",
+          "win32"
+        ]
+      },
       "probe": {
         "type": "text-not-contains",
         "path": "{profile}/cordis.patch.yml",
@@ -55,11 +76,43 @@
       "severity": "error",
       "title": "config 目录 JSON 文件合法性",
       "discussion": "#1357",
-      "when": { "os": ["darwin", "linux", "win32"] },
-      "probe": { "type": "json-valid", "path": "{home}/config/workspace.json", "required": false },
+      "when": {
+        "os": [
+          "darwin",
+          "linux",
+          "win32"
+        ]
+      },
+      "probe": {
+        "type": "json-valid",
+        "path": "{home}/config/workspace.json",
+        "required": false
+      },
       "detailOk": "config/workspace.json 为合法 JSON",
       "detailFail": "config/workspace.json 不是合法 JSON（#1357 并发写乱码类，工作区列表会消失）",
       "fix": "排查多实例并发写；修复或删除损坏文件"
+    },
+    {
+      "id": "E11-settings-writable",
+      "section": "env",
+      "severity": "error",
+      "title": "settings.yaml 可写性（sudo 属主问题）",
+      "discussion": "#1719",
+      "when": {
+        "os": [
+          "darwin",
+          "linux",
+          "win32"
+        ]
+      },
+      "probe": {
+        "type": "file-writable",
+        "path": "{home}/settings.yaml",
+        "required": false
+      },
+      "detailOk": "settings.yaml 可写",
+      "detailFail": "settings.yaml 不可写（sudo 安装遗留的属主/权限问题），dsh 无法持久化设置",
+      "fix": "把属主改回当前用户：sudo chown <当前用户> ~/.dsh/settings.yaml（或删掉让 dsh 重建）"
     }
   ]
 }

package/dsh-doctor.mjs

@@ -10,6 +10,8 @@
  *     P4  file: 依赖指向不存在的目录（#1197：悬空 file: 链接）
  *     P5  profile 顶层 @deepseek-ai/* 与框架重复（#1486：双模块实例 → Symbol 不匹配）
  *     P7  cordis.patch.yml 结构 lint（#1724：~ insert: 是 YAML null → parsePatchList 崩溃 → UI 打不开；tab 缩进/缺冒号同族）
+ *     P8  adapter provider 注册冲突（#1904②：两 bundle 抢注同一 provider → boot 时 DUPLICATE_ADAPTER 崩溃）
+ *     P9  ctx.settings 未声明 inject: ['settings']（#1904⑤：先于 settings 就绪激活 → namespace not registered）
  *   [session]
  *     S1  孤儿 tool_call（#1363：assistant tool_calls 无对应 tool 结果 → INVALID_REQUEST）
  *     S2  未闭合 turn（#466/#1265：turn/start 无 turn/end → 会话永久"运行中"）
@@ -44,7 +46,7 @@
  * 退出码：0 = 全部通过；1 = 发现可修复问题（内置 + catalog severity=error）；warn 级失败不改退出码。
  */
 import { execFileSync, spawnSync } from 'node:child_process';
-import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, statSync, writeFileSync } from 'node:fs';
+import { closeSync, existsSync, lstatSync, mkdirSync, openSync, readFileSync, readdirSync, realpathSync, statSync, writeFileSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import net from 'node:net';
 import { basename, delimiter as PATH_DELIM, dirname, join } from 'node:path';
@@ -398,6 +400,84 @@ function checkProfile(name) {
   }
   if (yamlProblems.length) report('profile', 'P7', false, `cordis.patch.yml 结构错误（boot 会崩，UI 打不开 #1724）: ${yamlProblems.join('; ')}`, 'patch 必须是顶层纯列表（只有 - insert: / - id: 条目）：删掉顶层 key: value 行；~ 是 YAML null；缩进用空格不用 tab');
   else report('profile', 'P7', true, 'cordis.patch.yml 结构正常（无 tab / 无 ~ insert / 无映射-序列混排）', undefined);
+
+  // P8/P9 需要扫描 bundle 构建产物：收集目录下有限深度的 .js 文件（lib/dist/根 + main 入口，跳过 node_modules）
+  const bundleDirs = new Map(); // bundle 名 → 目录（可解析的）
+  for (const b of bundles) {
+    const d = findPkg(b);
+    if (d) bundleDirs.set(b, d);
+  }
+  const collectJsFiles = (root, maxDepth = 3) => {
+    const out = [];
+    const walk = (dir, depth) => {
+      if (depth > maxDepth) return;
+      let entries;
+      try { entries = readdirSync(dir, { withFileTypes: true }); } catch { return; }
+      for (const e of entries) {
+        if (e.name === 'node_modules' || e.name.startsWith('.')) continue;
+        // client/web 是浏览器端产物，不在宿主进程运行（避免 ctx.settings 误报）
+        if (e.isDirectory() && (e.name === 'client' || e.name === 'web')) continue;
+        const fp = join(dir, e.name);
+        if (e.isDirectory()) walk(fp, depth + 1);
+        else if (e.name.endsWith('.js') && e.name !== 'cordis.patch.yml') out.push(fp);
+      }
+    };
+    walk(root, 0);
+    // 主入口（main 指向的 .js）单独兜底
+    try {
+      const pkg = JSON.parse(readFileSync(join(root, 'package.json'), 'utf8'));
+      if (typeof pkg.main === 'string' && pkg.main.endsWith('.js')) {
+        const mp = join(root, pkg.main);
+        if (existsSync(mp) && !out.includes(mp)) out.push(mp);
+      }
+    } catch { /* 无 manifest */ }
+    return out;
+  };
+  const readJs = (fp) => { try { return readFileSync(fp, 'utf8'); } catch { return ''; } };
+
+  // P8：adapter provider 注册冲突（#1904②：两个 bundle 抢注同一 provider → boot 时 DUPLICATE_ADAPTER 崩溃）
+  const providerRegs = new Map(); // provider → Set(bundle)
+  for (const [b, d] of bundleDirs) {
+    for (const f of collectJsFiles(d)) {
+      const src = readJs(f);
+      for (const m of src.matchAll(/registerAdapter\s*\(\s*\[([^\]]*)\]/g)) {
+        for (const pm of m[1].matchAll(/['"]([^'"]+)['"]/g)) {
+          if (!providerRegs.has(pm[1])) providerRegs.set(pm[1], new Set());
+          providerRegs.get(pm[1]).add(b);
+        }
+      }
+    }
+  }
+  const adapterConflicts = [...providerRegs].filter(([, v]) => v.size > 1);
+  if (adapterConflicts.length) {
+    report('profile', 'P8', false, `adapter provider 注册冲突（#1904②：boot 时 DUPLICATE_ADAPTER 崩溃）: ${adapterConflicts.map(([p, v]) => `${p}（${[...v].join(' ↔ ')}}）`).join('; ')}`, '冲突 provider 只能注册一次：让第三方路由插件用 registerConfigurableProviders 或只注册新路由，移除抢注一方');
+  } else {
+    report('profile', 'P8', true, '无 adapter provider 注册冲突', undefined);
+  }
+
+  // P9：ctx.settings/ctx.get('settings') 未声明 settings 依赖（#1904⑤：先于 settings 就绪激活 → namespace not registered）
+  // 注意边界：sctx.settings 不算（sctx 是别的变量）；ctx.inject(["settings"], cb) 运行时声明算满足
+  const injectIssues = [];
+  for (const [b, d] of bundleDirs) {
+    const files = collectJsFiles(d);
+    const all = files.map(readJs).join('\n');
+    const usesSettings = /(?<![A-Za-z0-9_$])ctx\.(?:get\(\s*['"]settings['"]\s*\)|settings\b)/.test(all);
+    if (!usesSettings) continue;
+    const declared = [];
+    // 收集全部 inject 声明（bundle 里可能混有内部模块的 inject；任一含 settings 即满足）
+    for (const m of all.matchAll(/inject\s*=\s*\[([^\]]*)\]/gs)) {
+      declared.push(...[...m[1].matchAll(/['"]([^'"]+)['"]/g)].map((x) => x[1]));
+    }
+    for (const m of all.matchAll(/ctx\.inject\s*\(\s*\[([^\]]*)\]/g)) {
+      declared.push(...[...m[1].matchAll(/['"]([^'"]+)['"]/g)].map((x) => x[1]));
+    }
+    const uniq = declared.filter((v, i) => declared.indexOf(v) === i);
+    if (!uniq.includes('settings')) {
+      injectIssues.push(`${b}（用 ctx.settings 但 settings 依赖未声明${uniq.length ? `，全部 inject: [${uniq.join(', ')}]` : '，未找到任何 inject 声明'}）`);
+    }
+  }
+  if (injectIssues.length) report('profile', 'P9', false, `插件用 ctx.settings 但未声明 settings 依赖（#1904⑤：激活时 settings 可能未就绪 → namespace not registered）: ${injectIssues.join('; ')}`, '在插件代码加 export const inject = ["settings"]（或对可选服务做 undefined 处理）');
+  else report('profile', 'P9', true, 'bundle 的 ctx.settings 用法均声明了 settings 依赖（模块 inject 或 ctx.inject）', undefined);
 }
 
 /* ================= session ================= */
@@ -796,6 +876,16 @@ export function runCatalogCheck(check, ctx) {
       if (count > max) return { ok: false, detail: check.detailFail ?? `${probe.pattern} 匹配 ${count} 个（> ${max}）` };
       return { ok: true, detail: check.detailOk ?? `${probe.pattern} 匹配 ${count} 个（${min}..${max}）` };
     }
+    case 'file-writable': {
+      const fp = p(probe.path);
+      if (!existsSync(fp)) return probe.required === false
+        ? { ok: true, detail: check.detailOk ?? `${fp} 不存在（跳过）` }
+        : { ok: false, detail: check.detailFail ?? `${fp} 缺失` };
+      let writable = false;
+      try { const fd = openSync(fp, 'a'); closeSync(fd); writable = true; } catch { /* 只读/属主问题 */ }
+      return writable ? { ok: true, detail: check.detailOk ?? `${fp} 可写` }
+                      : { ok: false, detail: check.detailFail ?? `${fp} 不可写（sudo 属主或只读权限，#1719）` };
+    }
     default:
       return { ok: true, skipped: true, detail: `探测原语 ${probe.type} 本引擎不支持，已跳过（需更新插件）` };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moonquake2004/dsh-doctor",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Offline diagnostic for DeepSeek Harness — 19 built-in checks + self-updating catalog (Layer A) + self-update check (Layer B); 'Doctor' panel in web UI settings.",
   "main": "lib/index.js",
   "files": [