@moonquake2004/dsh-doctor 0.4.5 → 0.4.7

package/README.md

@@ -53,6 +53,7 @@ With `--envelope` (doctor-contract mode): `0` = all pass · `1` = any WARN · `2
 | P13 | client-half `provide` service name clashes with core client services (`chatFileMentions` etc. from `@deepseek-ai/dsh-client-*`, warn) or cross-bundle same-name grabs (browser-side "service already registered" → UI white screen, server logs see nothing) | [#2752](https://github.com/deepseek-ai/deepseek-harness/discussions/2752) |
 | P14 | declared `bin` executability (target file present + shebang required for text `bin`; exec-bit alone does not identify the interpreter → ENOEXEC on direct run, #1846) | [#1846](https://github.com/deepseek-ai/deepseek-harness/discussions/1846) |
 | P16 | plugin imports a named export the installed package does not provide (warn; boot fails hard on one bad entry) | [#5864](https://github.com/deepseek-ai/deepseek-harness/discussions/5864) |
+| P17 | client-side `require()` of a specifier the host module table cannot serve (platform seeds ∪ installed graph rows ∪ declared externals) — warn-only; catches the browser `Failed to load plugins` white screen | [#5719](https://github.com/deepseek-ai/deepseek-harness/discussions/5719) |
 
 ### session
 | ID | Checks | Discussion |

package/README.zh.md

@@ -48,6 +48,7 @@ node dsh-doctor.mjs --no-catalog         # 不拉远程目录（只用内置副
 | P13 | client 半 `provide` 服务名抢注核心客户端服务（`chatFileMentions` 等 `@deepseek-ai/dsh-client-*`，warn）或跨 bundle 同名（浏览器端 service already registered → UI 白屏、服务端日志无感知） | [#2752](https://github.com/deepseek-ai/deepseek-harness/discussions/2752) |
 | P14 | 声明 `bin` 可执行性（目标文件在位 + 文本 bin 必须带 shebang；仅可执行位不识别解释器 → 直接执行 ENOEXEC，#1846） | [#1846](https://github.com/deepseek-ai/deepseek-harness/discussions/1846) |
 | P16 | 插件导入了已装包未提供的命名导出（warn；单条坏 entry 即 boot 硬失败） | [#5864](https://github.com/deepseek-ai/deepseek-harness/discussions/5864) |
+| P17 | client 端 `require()` 的模块宿主模块表无法服务（平台种子 ∪ 已装图行 ∪ 声明的 external）——warn 级；抓浏览器 `Failed to load plugins` 白屏 | [#5719](https://github.com/deepseek-ai/deepseek-harness/discussions/5719) |
 
 ### session
 | ID | 检查 | 对应讨论 |

package/dsh-doctor.mjs

@@ -15,6 +15,7 @@
  *     P10 inject 引用客户端专属服务（#1947：@deepseek-ai/dsh-client-* 服务端永不提供 → Fiber 永久 PENDING → web boot 失败）
  *     P11 已装 bundle 的 main 入口产物缺失（#1965：市场装未构建源码树 → ERR_MODULE_NOT_FOUND → boot 崩）
  *     P13 client 端 provide 服务名抢注核心客户端服务 / 跨 bundle 同名（#2752：浏览器端 service already registered → UI 白屏，服务端日志无感知）
+ *     P17 client 端 require 不在宿主模块表（#5719：warn 级，种子表自省自 web-frontend 产物）
  *     P16 命名导入的导出缺失（#5864：warn 级，静态自省已装包导出面）
  *     P14 declared bin 可执行性（#1846：打包成功但 bin 缺 shebang/产物 → 直接执行 ENOEXEC；与 P11 互补）
  *     P12 `installed_bundle`（#1719 v1.1 词汇：profile 内 bundle 版本 vs 运行 CLI 版本——web 面板/API 跑的是 profile 里装的 bundle，可与独立 CLI 版本不一致）
@@ -147,7 +148,7 @@ function pickNewestSessionLib(libs) {
 function sessionTableFrom(lib) {
   try {
     const s = readFileSync(lib, 'utf8');
-    const m = /const KNOWN_SESSION_EVENT_TYPES = new Set\(\[(.*?)\]\);/.exec(s);
+    const m = /const KNOWN_SESSION_EVENT_TYPES = new Set\(\[([\s\S]*?)\]\);/.exec(s);
     if (!m) return null;
     const items = [...m[1].matchAll(/"([^"]+)"/g)].map((x) => x[1]);
     return items.length ? new Set(items) : null;
@@ -957,27 +958,145 @@ function packageNamedExports(pkgDir) {
   } else {
     report('profile', 'P16', true, '插件命名导入均在已装包的导出里（静态可判定的部分）', undefined);
   }
+
+  /* P17：client 端 require 的 specifier 不在宿主模块表（#5719：dsh-client-modules 的 makeRequire 硬 throw
+   * → 浏览器端 Failed to load plugins / 白屏，服务端 HTTP 200 且日志零感知）。
+   * 可服务 ⟺ 平台种子 ∪ 图行（已装包同时有 dsh.client 与 exports["./client"]）∪ 该包声明的 external/inject。
+   * 防误报（#5719 实测得出）：必须先剥注释（JSDoc 里的 require("picomatch") 示例会误报）、只认双引号形态、
+   * 排除模板插值/相对路径/Node 内置、归一 /client 后缀、跳过自引用。warn 级（静态近似，宁可漏报不误报）。 */
+  const p17Issues = [];
+  const composedRows = new Set();
+  {
+    const roots = [];
+    try { roots.push(join(resolveProfile(profileArg), 'node_modules')); } catch { /* 无 profile */ }
+    for (const lib of SESSION_LIBS) roots.push(lib.slice(0, lib.indexOf(join('@deepseek-ai', 'dsh-session'))));
+    for (const nm of roots) {
+      if (!existsSync(nm)) continue;
+      const pkgs = [];
+      for (const d of readdirSync(nm)) {
+        if (d.startsWith('.')) continue;
+        if (d.startsWith('@')) {                       // scoped：@scope/name 两层
+          const scopeDir = join(nm, d);
+          try { for (const n of readdirSync(scopeDir)) pkgs.push(join(scopeDir, n)); } catch { /* 忽略 */ }
+        } else pkgs.push(join(nm, d));
+      }
+      for (const dir of pkgs) {
+        const pj = join(dir, 'package.json');
+        if (!existsSync(pj)) continue;
+        try {
+          const pkg = JSON.parse(readFileSync(pj, 'utf8'));
+          if (pkg.name && pkg.dsh?.client && pkg.exports?.['./client']) { composedRows.add(pkg.name); composedRows.add(`${pkg.name}/client`); }
+        } catch { /* 忽略 */ }
+      }
+    }
+  }
+  const stripClientSuffix = (s) => s.replace(/\/client$/, '');
+  for (const [b, d] of bundleDirs) {
+    const declared = new Set();
+    try {
+      const pkg = JSON.parse(readFileSync(join(d, 'package.json'), 'utf8'));
+      for (const k of ['external', 'inject']) {
+        const v = pkg.dsh?.client?.[k];
+        if (Array.isArray(v)) for (const x of v) if (typeof x === 'string') declared.add(x);
+      }
+    } catch { /* 无 manifest */ }
+    const misses = new Map();
+    for (const f of collectClientJsFiles(d)) {
+      let code = readJs(f);
+      code = code.replace(/\/\*[\s\S]*?\*\//g, '');          // 块注释（JSDoc 示例会误报）
+      code = code.replace(/(^|[^:])\/\/[^\n]*/g, '$1');       // 行注释（避开 https://）
+      for (const m of code.matchAll(/require\(\s*"([^"]+)"\s*\)/g)) { // 打包产物用双引号；单引号多为文档示例
+        const spec = m[1];
+        if (!spec || spec.includes('${') || spec.startsWith('.') || spec.startsWith('/') || spec.startsWith('node:')) continue;
+        if (NODE_BUILTINS.has(spec)) continue;
+        const id = stripClientSuffix(spec);
+        if (CLIENT_SEEDS.has(spec) || CLIENT_SEEDS.has(id)) continue;
+        if (composedRows.has(spec) || composedRows.has(id)) continue;
+        if (declared.has(spec) || declared.has(id)) continue;
+        if (id === b || spec === b) continue; // 自引用 → 打包内联
+        misses.set(spec, relative(d, f));
+      }
+    }
+    if (misses.size) p17Issues.push(`${b}（${[...misses].map(([s, f]) => `require("${s}") [${f}]`).join('; ')}）`);
+  }
+  if (p17Issues.length) {
+    report('profile', 'P17', false, `client 端 require 的模块不在宿主模块表（#5719：makeRequire 硬 throw → 浏览器白屏且服务端无感知）: ${p17Issues.join('; ')}`, `改用宿主提供的模块名；若确由宿主提供，在本包 package.json 的 dsh.client.external/inject 里声明；平台种子当前 ${CLIENT_SEEDS.size} 项、已装图行 ${composedRows.size} 项`);
+  } else {
+    report('profile', 'P17', true, `client 端 require 的 specifier 均可服务（平台种子 ${CLIENT_SEEDS.size} 项 + 已装图行 ${composedRows.size} 项）`, undefined);
+  }
+}
+
+/* ---- 会话日志定位（世代感知，规范见 dsh-security/docs/session-shape-v3.md §1） ----
+ * 命名：^session(?:\.v([1-9][0-9]*))?\.jsonl(\.zstd)?$（与 dsh-session-format 的
+ * CANONICAL_LOG_FILENAME 一致）；v0 = 无 .vN 的旧名，vN = 当前世代（本机为 v3）。
+ * 规则：① 同一会话目录内取**最高世代**；② 跨目录按 **mtime** 取最新；
+ *      ③ 忽略 session.lock（不匹配正则）；④ 目录名任意（含 _no-cwd / 无 session- 前缀）；
+ *      ⑤ 同世代同时存在 .zstd 与裸 .jsonl 时**优先 .zstd**（与旧实现
+ *         `existsSync(zstd) ? zstd : plain` 一致；真实 store 遇到两种编码并存会抛
+ *         encodingMismatch，这里只是让诊断仍能看到日志）。
+ * 旧实现只认 session.jsonl[.zstd]，v3 上线后每次 S 检查都在分析 2 天前的旧世代日志。 */
+const SESSION_LOG_RE = /^session(?:\.v([1-9][0-9]*))?\.jsonl(\.zstd)?$/;
+
+/** 解析一个文件名 → { gen, zstd }；非会话日志（含 session.lock）→ null。 */
+function parseSessionLogName(name) {
+  const m = SESSION_LOG_RE.exec(name);
+  if (!m) return null;
+  return { gen: m[1] === undefined ? 0 : Number(m[1]), zstd: m[2] === '.zstd' };
+}
+
+/** 单个会话目录 → 该目录的权威日志（最高世代；同世代 .zstd 优先）；无 → null。 */
+function pickSessionLogIn(dir) {
+  let names;
+  try { names = readdirSync(dir); } catch { return null; }
+  let best = null;
+  for (const n of names) {
+    const g = parseSessionLogName(n);
+    if (!g) continue;
+    if (!best || g.gen > best.gen || (g.gen === best.gen && g.zstd && !best.zstd)) best = { ...g, f: join(dir, n) };
+  }
+  return best ? { f: best.f, gen: best.gen } : null;
+}
+
+/** 会话库全量定位：三层 sessions/<project>/<session-id>/session*.jsonl*。
+ *  loose=true 时额外接受两层散文件 sessions/<project>/session*.jsonl*——这是
+ *  "取最新会话"（S 检查默认目标 / 安全层 SR/SS）旧有的兼容行为；S11/S12 的全库扫描
+ *  旧实现只走三层，保持 loose=false，避免把散文件误当会话（那会引入误报）。
+ *  返回 [{ f, gen, m }]（m = mtimeMs，按 mtime 降序）。 */
+function listSessionLogs(root, { loose = false } = {}) {
+  const out = [];
+  let users;
+  try { users = readdirSync(root, { withFileTypes: true }); } catch { return out; }
+  const add = (hit) => {
+    try { out.push({ f: hit.f, gen: hit.gen, m: statSync(hit.f).mtimeMs }); } catch { /* race */ }
+  };
+  for (const u of users) {
+    if (!u.isDirectory()) continue; // root 下的散文件不在旧实现语义内，不扩权
+    const sd = join(root, u.name);
+    // 两层散文件（sessions/<user>/session.jsonl[.zstd]）
+    if (loose) { const l = pickSessionLogIn(sd); if (l) add(l); }
+    // 三层：sessions/<user>/<session-id>/session*.jsonl*
+    let subs;
+    try { subs = readdirSync(sd, { withFileTypes: true }); } catch { continue; }
+    for (const s of subs) {
+      if (!s.isDirectory()) continue;
+      const hit = pickSessionLogIn(join(sd, s.name));
+      if (hit) add(hit);
+    }
+  }
+  out.sort((a, b) => b.m - a.m);
+  return out;
+}
+
+/** 最新会话日志路径（世代感知；含两层散文件兼容；无 → null）。 */
+function latestSessionLog(root = join(HOME, 'sessions')) {
+  const logs = listSessionLogs(root, { loose: true });
+  return logs.length ? logs[0].f : null;
 }
 
 /* ================= session ================= */
 function checkSession(targetPath) {
   if (!wants('session')) return;
-  const target = targetPath || (() => {
-    let best = null, bestM = -1;
-    const root = join(HOME, 'sessions');
-    if (!existsSync(root)) return null;
-    for (const u of readdirSync(root)) {
-      const sd = join(root, u);
-      if (!existsSync(sd)) continue;
-      for (const s of readdirSync(sd)) {
-        const f = existsSync(join(sd, s, 'session.jsonl.zstd')) ? join(sd, s, 'session.jsonl.zstd') : join(sd, s, 'session.jsonl');
-        if (!existsSync(f)) continue;
-        const m = statSync(f).mtimeMs;
-        if (m > bestM) { bestM = m; best = f; }
-      }
-    }
-    return best;
-  })();
+  const target = targetPath || latestSessionLog();
   if (!target || !existsSync(target)) { report('session', 'S0', true, '无会话日志，跳过单会话检查（可用 --session <path> 指定）', undefined); return; }
   let text;
   try {
@@ -1174,6 +1293,37 @@ function loadFormatCatalog() {
 }
 const FORMAT_CATALOG = loadFormatCatalog();
 
+/* P17：平台种子表 + Node 内置模块（#5719）
+ * 种子 = 浏览器端 require 的"平台种子词"，由宿主 web-frontend 构建产物决定；自省失败回退常量。 */
+const CLIENT_PLATFORM_SEEDS_FALLBACK = new Set([
+  'react', 'react/jsx-runtime', 'react-dom', 'react-dom/client', '@deepseek-ai/cordis',
+  '@deepseek-ai/dsh-client-store', '@deepseek-ai/dsh-client-ui-slots',
+  '@deepseek-ai/dsh-client-ui-primitives', '@deepseek-ai/dsh-client-ui-dockkit',
+]);
+function clientPlatformSeeds() {
+  for (const lib of SESSION_LIBS) {
+    const nm = lib.slice(0, lib.indexOf(join('@deepseek-ai', 'dsh-session')));
+    const assets = join(nm, '@deepseek-ai', 'dsh-web-frontend', 'dist', 'assets');
+    if (!existsSync(assets)) continue;
+    for (const f of readdirSync(assets)) {
+      if (!/^index-.*\.js$/.test(f) && !/\.js$/.test(f)) continue;
+      try {
+        const s = readFileSync(join(assets, f), 'utf8');
+        const i = s.indexOf('dsh-client-ui-dockkit');
+        if (i < 0) continue;
+        const win = s.slice(Math.max(0, i - 1400), i + 60);
+        const keys = [...win.matchAll(/["']?([A-Za-z@][^"':,{}]*)["']?\s*:\s*[A-Za-z_$][\w$]*/g)]
+          .map((m) => m[1].trim()).filter((k) => /^(react|react-dom|@deepseek-ai\/)/.test(k));
+        if (keys.length >= 8) return new Set(keys);
+      } catch { /* 试下一个资产 */ }
+    }
+  }
+  return CLIENT_PLATFORM_SEEDS_FALLBACK;
+}
+const CLIENT_SEEDS = clientPlatformSeeds();
+const NODE_BUILTINS = new Set(['url','path','fs','util','events','stream','buffer','crypto','os','zlib','assert','worker_threads','perf_hooks','querystring','string_decoder','timers','tty','net','http','https','child_process','process','module','v8','vm','tls','dns','readline','repl','cluster','constants','domain','punycode','sys','timers/promises','fs/promises','stream/web','stream/promises','util/types','dns/promises']);
+
+
 /** 用**真实迁移链**在内存里跑一遍：返回 null = 可恢复，否则返回拒载原因（截断）。
  *  比复刻规则更准（上游每条 fail-closed 规则都覆盖，且自动跟随版本变化）。 */
 function realChainRefusal(text) {
@@ -1224,15 +1374,8 @@ function scanMigrationRefusals() {
   }
   const root = join(HOME, 'sessions');
   if (!existsSync(root)) { reportSkip('session', 'S12', '无会话目录，迁移拒载预检不适用', undefined); return; }
-  const files = [];
-  for (const u of readdirSync(root)) {
-    const sd = join(root, u);
-    if (!existsSync(sd)) continue;
-    for (const s of readdirSync(sd)) {
-      const f = existsSync(join(sd, s, 'session.jsonl.zstd')) ? join(sd, s, 'session.jsonl.zstd') : join(sd, s, 'session.jsonl');
-      if (existsSync(f)) files.push(f);
-    }
-  }
+  // 世代感知：每个会话目录只取权威世代（v3 优先于 v0），与 store 的会话列表对齐
+  const files = listSessionLogs(root).map((x) => x.f);
   if (files.length === 0) { reportSkip('session', 'S12', '未发现会话日志', undefined); return; }
   const refused = [];
   let viaChain = 0;
@@ -1267,15 +1410,8 @@ function scanAllSessions() {
   if (!wants('session')) return;
   const root = join(HOME, 'sessions');
   if (!existsSync(root)) { report('session', 'S11', true, '无会话目录，跳过全会话扫描', undefined); return; }
-  const files = [];
-  for (const u of readdirSync(root)) {
-    const sd = join(root, u);
-    if (!existsSync(sd)) continue;
-    for (const s of readdirSync(sd)) {
-      const f = existsSync(join(sd, s, 'session.jsonl.zstd')) ? join(sd, s, 'session.jsonl.zstd') : join(sd, s, 'session.jsonl');
-      if (existsSync(f)) files.push(f);
-    }
-  }
+  // 世代感知：每个会话目录只取权威世代（v3 优先于 v0），与 store 的会话列表对齐
+  const files = listSessionLogs(root).map((x) => x.f);
   if (files.length === 0) { report('session', 'S11', true, '未发现会话日志', undefined); return; }
   const corrupt = []; const oversized = []; const clean = [];
   let totalDS = 0; let totalEvents = 0;
@@ -1361,6 +1497,7 @@ catalogSeverity.set('P13', 'warn');
 catalogSeverity.set('P14', 'warn');
 catalogSeverity.set('P15', 'error');
 catalogSeverity.set('P16', 'warn');
+catalogSeverity.set('P17', 'warn');
 
 function bundledCatalog() {
   const p = new URL('./checks.json', import.meta.url);
@@ -1764,31 +1901,11 @@ async function run() {
           }
         } catch { /* 配置损坏不影响检查 */ }
         // 获取最新会话文件（供 SR*/SS* 检查使用）
-        // 复审修复：对齐 S11 的两层布局 sessions/<user>/<session>/session.jsonl[.zstd]，
-        // 按 mtime 取最新；旧实现只扫顶层 *.jsonl，真实部署下永远返回 null → 运行时层全跳过
+        // 世代感知定位（与 S11 同一规则）：三层 sessions/<user>/<session>/session*.jsonl*，
+        // 目录内取最高世代（v0/v3 并存时取 v3），跨目录按 mtime 取最新，忽略 session.lock
         const findLatestSession = () => {
           if (sessionArg) return sessionArg;
-          try {
-            const root = join(HOME, 'sessions');
-            const candidates = [];
-            for (const u of readdirSync(root)) {
-              const sd = join(root, u);
-              let subs = [];
-              try { subs = readdirSync(sd); } catch { continue; }
-              for (const s of subs) {
-                const zstdPath = join(sd, s, 'session.jsonl.zstd');
-                const plainPath = join(sd, s, 'session.jsonl');
-                const f = existsSync(zstdPath) ? zstdPath : (existsSync(plainPath) ? plainPath : null);
-                if (!f) continue;
-                try { candidates.push({ f, m: statSync(f).mtimeMs }); } catch { /* race */ }
-              }
-              // 兼容直接放在用户目录下的散文件
-              const loose = join(sd, 'session.jsonl');
-              if (existsSync(loose)) { try { candidates.push({ f: loose, m: statSync(loose).mtimeMs }); } catch { /* race */ } }
-            }
-            candidates.sort((a, b) => b.m - a.m);
-            return candidates.length ? candidates[0].f : null;
-          } catch { return null; }
+          try { return latestSessionLog(); } catch { return null; }
         };
 
         const { results: secResults, exitCode: secExit, summary: secSummary } = await registry.runAll(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moonquake2004/dsh-doctor",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "Offline diagnostic for DeepSeek Harness — 28 built-in + 5 catalog checks across env/profile/session (Layer A checks-as-data), self-update (Layer B), and a semi-automatic LLM observer (Layer C, --observe); Doctor panel in web UI settings.",
   "main": "lib/index.js",
   "files": [