@nudojs/cli 0.2.0 → 0.2.1

package/src/index.ts

@@ -1,18 +1,35 @@
 import { readFileSync, existsSync, watch, readdirSync, statSync, writeFileSync } from "node:fs";
-import { resolve, dirname, relative, extname, join } from "node:path";
+import { resolve, dirname, relative, join, basename } from "node:path";
 import { Command } from "commander";
 import {
   T,
   typeValueToString,
-  simplifyUnion,
   createEnvironment,
-  isSubtypeOf,
-  isTemplate,
-  getTemplateParts,
+  mockHelperToTypeValue,
 } from "@nudojs/core";
 import type { TypeValue } from "@nudojs/core";
 import { parse, extractDirectives, parseTypeValueExpr } from "@nudojs/parser";
-import { evaluateFunction, evaluateFunctionFull, evaluateProgram, setModuleResolver, setCurrentFileDir, resetMemo } from "./evaluator.ts";
+import { evaluateFunctionFull, evaluateProgram, setModuleResolver, setCurrentFileDir, resetMemo } from "./evaluator.ts";
+import {
+  typeValueToZodSchema,
+  generateGuardFunction,
+  generateFunctionDtsLines,
+  analyzeFileAsync,
+  buildModuleGraph,
+  computeDirtySet,
+  topoSortDirty,
+  collectCallRecords,
+  stripGeneratedCaseDirectives,
+  insertGeneratedCaseDirectives,
+  unifiedDiff,
+  type CallRecord,
+  type CaseResult,
+  type FunctionAnalysis,
+  type AnalysisResult,
+  type EmitResult,
+} from "@nudojs/service";
+import { harvestDts, emitEnvModule } from "@nudojs/harvester";
+import { resolveNpmNudo } from "./resolve-npm.ts";
 
 const program = new Command();
 
@@ -28,7 +45,20 @@ function applyMocks(
 ): void {
   for (const d of directives) {
     if (d.kind !== "mock") continue;
-    if (d.expression) {
+    if (d.arrowFn) {
+      // Create a function TypeValue from the parsed arrow function
+      const fnType = T.fn(d.arrowFn.params, d.arrowFn.body, env);
+      (fnType as any)._paramPatterns = d.arrowFn.paramPatterns;
+      env.bind(d.name, fnType);
+    } else if (d.nudoMock) {
+      // Handle Nudo mock helpers (stub, spy, mock)
+      const typeVal = mockHelperToTypeValue(d.nudoMock, env);
+      env.bind(d.name, typeVal);
+    } else if (d.sinonExpr) {
+      // Handle sinon expressions
+      const sinonType = createSinonTypeValue(d.sinonExpr);
+      env.bind(d.name, sinonType);
+    } else if (d.expression) {
       env.bind(d.name, parseTypeValueExpr(d.expression));
     } else if (d.fromPath) {
       const mockPath = resolve(dirname(filePath), d.fromPath);
@@ -42,13 +72,45 @@ function applyMocks(
   }
 }
 
-function resolveModule(source: string, fromDir: string): { ast: ReturnType<typeof parse>; filePath: string } | null {
+function createSinonTypeValue(sinonExpr: { type: string; returnValue?: TypeValue; resolvedValue?: TypeValue; rejectedValue?: TypeValue }): TypeValue {
+  const body = { type: "BlockStatement", body: [] } as any;
+  const fn = T.fn(["...args"], body, createEnvironment());
+
+  if (sinonExpr.returnValue) {
+    (fn as any)._directReturn = sinonExpr.returnValue;
+  } else if (sinonExpr.resolvedValue) {
+    (fn as any)._directReturn = T.promise(sinonExpr.resolvedValue);
+  } else if (sinonExpr.rejectedValue) {
+    (fn as any)._directReturn = T.never;
+  } else {
+    (fn as any)._directReturn = T.unknown;
+  }
+
+  return fn;
+}
+
+function resolveModule(source: string, fromDir: string): { ast: ReturnType<typeof parse>; filePath: string; json?: unknown } | null {
   const extensions = [".js", ".ts", ".mjs"];
+
+  const nudoPath = resolveNpmNudo(source, fromDir);
+  if (nudoPath) {
+    const src = readFileSync(nudoPath, "utf-8");
+    return { ast: parse(src), filePath: nudoPath };
+  }
+
   const basePath = resolve(fromDir, source);
 
   for (const ext of ["", ...extensions]) {
     const candidate = basePath + ext;
     if (existsSync(candidate)) {
+      // .json 模块：CJS require('../package.json') 等常见模式——按 JSON 求值
+      if (candidate.endsWith(".json")) {
+        try {
+          return { ast: parse("module.exports = undefined;"), filePath: candidate, json: JSON.parse(readFileSync(candidate, "utf-8")) };
+        } catch {
+          return null;
+        }
+      }
       const src = readFileSync(candidate, "utf-8");
       return { ast: parse(src), filePath: candidate };
     }
@@ -56,92 +118,92 @@ function resolveModule(source: string, fromDir: string): { ast: ReturnType<typeo
   return null;
 }
 
-function typeValueToTSType(tv: TypeValue): string {
-  switch (tv.kind) {
-    case "literal": {
-      const v = tv.value;
-      if (v === null) return "null";
-      if (v === undefined) return "undefined";
-      if (typeof v === "string") return JSON.stringify(v);
-      return String(v);
-    }
-    case "primitive":
-      return tv.type;
-    case "refined": {
-      if (isTemplate(tv)) {
-        const parts = getTemplateParts(tv)!;
-        const inner = parts
-          .map((p) => (p.kind === "literal" && typeof p.value === "string" ? p.value : `\${${typeValueToTSType(p)}}`))
-          .join("");
-        return `\`${inner}\``;
-      }
-      return typeValueToTSType(tv.base);
-    }
-    case "object": {
-      const entries = Object.entries(tv.properties);
-      if (entries.length === 0) return "{}";
-      const inner = entries.map(([k, v]) => `${k}: ${typeValueToTSType(v)}`).join("; ");
-      return `{ ${inner} }`;
+/** `--emit-cases` 的编排选项：mode 决定 add/update 两条固化路径 */
+type EmitCasesOptions = { mode: "add" | "update"; dryRun: boolean; exitOnDiff: boolean };
+
+/**
+ * update 固化路径的编排：剥离旧生成指令（call@ 前缀）→ 以剥离后的源码
+ * 重新分析（合成 case 反映当前真实调用形状）→ 重新插入生成指令。
+ * infer --emit-cases=update 与 doctor 的 drift 判定共用此链路。
+ * 注意是否有变化必须比较 emitOut.source 与原始 source（EmitResult.changed
+ * 以 stripped 基准恒真）；removed 供指令数统计。
+ */
+async function reemitUpdate(
+  filePath: string,
+  source: string,
+  callsites?: CallRecord[],
+): Promise<{ result: AnalysisResult; emitOut: EmitResult; removed: string[] }> {
+  const stripped = stripGeneratedCaseDirectives(source);
+  const result = await analyzeFileAsync(filePath, stripped.source, undefined, callsites);
+  const emitOut = insertGeneratedCaseDirectives(stripped.source, result);
+  return { result, emitOut, removed: stripped.removed };
+}
+
+/**
+ * --callsites 公共采集：路径可为文件或目录（目录递归收 .js），逐文件
+ * collectCallRecords 汇总为外部调用记录。找不到的路径报错并置退出码 1
+ * （不中断其余路径）；一条都收不到时返回 undefined（与未传等价）。
+ */
+function collectExternalRecords(sites: string[]): CallRecord[] | undefined {
+  const records: CallRecord[] = [];
+  for (const site of sites) {
+    const sitePath = resolve(site);
+    if (!existsSync(sitePath)) {
+      console.error(`Callsite file not found: ${sitePath}`);
+      process.exitCode = 1;
+      continue;
     }
-    case "array": {
-      const el = typeValueToTSType(tv.element);
-      return tv.element.kind === "union" ? `(${el})[]` : `${el}[]`;
+    const siteFiles = statSync(sitePath).isDirectory() ? collectNudoFiles(sitePath) : [sitePath];
+    for (const sf of siteFiles) {
+      records.push(...collectCallRecords(sf, readFileSync(sf, "utf-8")));
     }
-    case "tuple":
-      return `[${tv.elements.map(typeValueToTSType).join(", ")}]`;
-    case "function":
-      return `(${tv.params.map((p) => `${p}: unknown`).join(", ")}) => unknown`;
-    case "promise":
-      return `Promise<${typeValueToTSType(tv.value)}>`;
-    case "instance":
-      return tv.className;
-    case "union":
-      return tv.members.map(typeValueToTSType).join(" | ");
-    case "never":
-      return "never";
-    case "unknown":
-      return "unknown";
   }
+  return records.length > 0 ? records : undefined;
 }
 
-function runInfer(file: string, options: { dts?: boolean; showLoc?: boolean } = {}): void {
+async function runInfer(
+  file: string,
+  options: { dts?: boolean; showLoc?: boolean; callsites?: CallRecord[]; emit?: EmitCasesOptions } = {},
+): Promise<void> {
   const filePath = resolve(file);
   const source = readFileSync(filePath, "utf-8");
-  const ast = parse(source);
-  const functions = extractDirectives(ast);
+  let result = await analyzeFileAsync(filePath, source, undefined, options.callsites);
+
+  // 调用点固化：add 直接把已算好的合成 case 插回源码；update 先剥离旧生成指令，
+  // 在剥离后的源码上重算分析再插入，后续打印/摘要都基于重算结果（反映刚固化的形状）
+  let emitOut: EmitResult | undefined;
+  if (options.emit) {
+    if (options.emit.mode === "update") {
+      const re = await reemitUpdate(filePath, source, options.callsites);
+      result = re.result;
+      emitOut = re.emitOut;
+    } else {
+      emitOut = insertGeneratedCaseDirectives(source, result);
+    }
+  }
 
-  if (functions.length === 0) {
+  if (result.functions.length === 0 && !(result.externalFunctions?.length)) {
     console.log("No functions with @nudo:case directives found.");
     return;
   }
 
-  resetMemo();
-  setModuleResolver(resolveModule);
-  setCurrentFileDir(dirname(filePath));
-
-  const globalEnv = createEnvironment();
-  evaluateProgram(ast, globalEnv);
-
   const dtsLines: string[] = [];
 
-  for (const fn of functions) {
-    const loc = fn.node.loc;
-    const locStr = loc ? `${relative(process.cwd(), filePath)}:${loc.start.line}:${loc.start.column}` : relative(process.cwd(), filePath);
+  for (const fn of result.functions) {
+    const loc = fn.loc;
+    const locStr = `${relative(process.cwd(), filePath)}:${loc.start.line}:${loc.start.column}`;
     const header = options.showLoc ? `=== ${fn.name} (${locStr}) ===` : `=== ${fn.name} ===`;
     console.log(`${header}\n`);
 
-    applyMocks(fn.directives, globalEnv, filePath);
-
-    const isPure = fn.directives.some((d) => d.kind === "pure");
-    const skipDirective = fn.directives.find((d) => d.kind === "skip");
-    const returnsDirective = fn.directives.find((d) => d.kind === "returns");
+    // .d.ts 与 service 级 generateDts 共用同一实现（单一 widen 主签名 +
+    // JSDoc case 说明；真实参数名；noDeclaration 函数排除），两条路径行为一致
+    if (options.dts) {
+      dtsLines.push(...generateFunctionDtsLines(fn));
+    }
 
-    if (skipDirective && skipDirective.kind === "skip") {
-      if (skipDirective.returns) {
-        console.log(`Skipped (declared): ${typeValueToString(skipDirective.returns)}`);
-        if (options.dts) {
-          dtsLines.push(`export declare function ${fn.name}(...args: unknown[]): ${typeValueToTSType(skipDirective.returns)};`);
-        }
+    if (fn.skipped) {
+      if (fn.combined) {
+        console.log(`Skipped (declared): ${typeValueToString(fn.combined)}`);
       } else {
         console.log("Skipped (no return type declared)");
       }
@@ -149,66 +211,58 @@ function runInfer(file: string, options: { dts?: boolean; showLoc?: boolean } =
       continue;
     }
 
-    if (isPure) {
-      const fnVal = globalEnv.has(fn.name) ? globalEnv.lookup(fn.name) : null;
-      if (fnVal && fnVal.kind === "function") {
-        (fnVal as any)._memoize = fn.name;
-      }
+    for (const c of fn.cases) {
+      const argsStr = c.args.map(typeValueToString).join(", ");
+      let line = `Case "${c.name}": (${argsStr}) => ${typeValueToString(c.result)}`;
+      if (c.throws.kind !== "never") line += ` throws ${typeValueToString(c.throws)}`;
+      console.log(line);
     }
 
-    const caseDirectives = fn.directives.filter((d) => d.kind === "case");
-    const caseResults: { name: string; args: TypeValue[]; argsStr: string; result: string; resultTV: TypeValue; throws?: string }[] = [];
-
-    for (const directive of caseDirectives) {
-      const fullResult = evaluateFunctionFull(fn.node, directive.args, globalEnv);
-      const argsStr = directive.args.map(typeValueToString).join(", ");
-      const resultStr = typeValueToString(fullResult.value);
-      const throwsStr = fullResult.throws.kind !== "never" ? typeValueToString(fullResult.throws) : undefined;
-      caseResults.push({
-        name: directive.name,
-        args: directive.args,
-        argsStr,
-        result: resultStr,
-        resultTV: fullResult.value,
-        throws: throwsStr,
-      });
-      let line = `Case "${directive.name}": (${argsStr}) => ${resultStr}`;
-      if (throwsStr) line += ` throws ${throwsStr}`;
-      console.log(line);
+    if (fn.entryOnly) {
+      console.log("# no call sites found; parameters default to unknown");
     }
 
-    if (caseResults.length > 1) {
-      const allResults = caseDirectives.map((d) =>
-        evaluateFunctionFull(fn.node, d.args, globalEnv),
-      );
-      const combined = simplifyUnion(allResults.map((r) => r.value));
-      console.log(`\nCombined: ${typeValueToString(combined)}`);
+    if (fn.cases.length > 1 && fn.combined) {
+      console.log(`\nCombined: ${typeValueToString(fn.combined)}`);
     }
 
-    if (returnsDirective && returnsDirective.kind === "returns") {
-      for (const directive of caseDirectives) {
-        const result = evaluateFunction(fn.node, directive.args, globalEnv);
-        const matches = isSubtypeOf(result, returnsDirective.expected);
-        if (!matches) {
-          console.log(`\n⚠ @nudo:returns assertion failed for case "${directive.name}": expected ${typeValueToString(returnsDirective.expected)}, got ${typeValueToString(result)}`);
-        }
+    if (fn.assertionErrors && fn.assertionErrors.length > 0) {
+      for (const err of fn.assertionErrors) {
+        console.log(`\n⚠ ${err}`);
       }
     }
 
-    if (options.dts) {
-      if (caseResults.length === 1) {
-        const c = caseResults[0];
-        const params = c.args.map((a, i) => `arg${i}: ${typeValueToTSType(a)}`).join(", ");
-        dtsLines.push(`export declare function ${fn.name}(${params}): ${typeValueToTSType(c.resultTV)};`);
-      } else {
-        for (const c of caseResults) {
-          const params = c.args.map((a, i) => `arg${i}: ${typeValueToTSType(a)}`).join(", ");
-          dtsLines.push(`export declare function ${fn.name}(${params}): ${typeValueToTSType(c.resultTV)};`);
+    console.log();
+  }
+
+  // Imported functions inferred from this file's cross-file call sites.
+  // d.ts generation skips them on purpose: they belong to another file's
+  // declaration boundary, not this one.
+  if (result.externalFunctions && result.externalFunctions.length > 0) {
+    const byModule = new Map<string, FunctionAnalysis[]>();
+    for (const fn of result.externalFunctions) {
+      const mod = fn.fromModule ?? "";
+      const list = byModule.get(mod);
+      if (list) list.push(fn);
+      else byModule.set(mod, [fn]);
+    }
+    for (const [mod, fns] of byModule) {
+      const rel = relative(process.cwd(), mod) || mod;
+      console.log(`--- ${rel} (imported) ---\n`);
+      for (const fn of fns) {
+        console.log(`=== ${fn.name} ===\n`);
+        for (const c of fn.cases) {
+          const argsStr = c.args.map(typeValueToString).join(", ");
+          let line = `Case "${c.name}": (${argsStr}) => ${typeValueToString(c.result)}`;
+          if (c.throws.kind !== "never") line += ` throws ${typeValueToString(c.throws)}`;
+          console.log(line);
+        }
+        if (fn.cases.length > 1 && fn.combined) {
+          console.log(`\nCombined: ${typeValueToString(fn.combined)}`);
         }
+        console.log();
       }
     }
-
-    console.log();
   }
 
   if (options.dts && dtsLines.length > 0) {
@@ -218,17 +272,327 @@ function runInfer(file: string, options: { dts?: boolean; showLoc?: boolean } =
     console.log(`Generated: ${relative(process.cwd(), dtsPath)}`);
   }
 
-  setModuleResolver(null);
+  if (result.diagnostics.length > 0) {
+    console.log("Diagnostics:\n");
+    for (const d of result.diagnostics) {
+      const loc = `${relative(process.cwd(), filePath)}:${d.range.start.line}:${d.range.start.column}`;
+      console.log(`  [${d.severity}] ${loc} ${d.message}${d.code ? ` (${d.code})` : ""}`);
+      if (d.origin) {
+        console.log(`    → value originates at ${d.origin.line}:${d.origin.column}`);
+      }
+    }
+    console.log();
+  }
+
+  // 调用点固化收尾：摘要 / diff / 写盘。是否"有变化"以最终源码与原源码比对为准
+  // （update 会先剥离再插回，剥离后重写的相同指令不构成变化）
+  if (options.emit && emitOut) {
+    const relPath = relative(process.cwd(), filePath) || filePath;
+    const skippedLines = emitOut.skipped.map((s) => `  ${s.fn}: ${s.reason}${s.detail ? ` (${s.detail})` : ""}`);
+
+    if (emitOut.source === source) {
+      console.log("No changes.");
+      for (const line of skippedLines) console.log(line);
+      return;
+    }
+
+    if (options.emit.dryRun) {
+      console.log(`Would emit cases → ${relPath} (dry run)`);
+      for (const w of emitOut.written) console.log(`  ${w.fn}: ${w.cases.join(", ")}`);
+      for (const line of skippedLines) console.log(line);
+      console.log();
+      process.stdout.write(unifiedDiff(source, emitOut.source, relPath));
+      if (options.emit.exitOnDiff) process.exitCode = 1;
+      return;
+    }
+
+    writeFileSync(filePath, emitOut.source, "utf-8");
+    const directiveCount = emitOut.written.reduce((n, w) => n + w.cases.length, 0);
+    console.log(
+      `Emitted cases → ${relPath} (${directiveCount} directive(s) across ${emitOut.written.length} function(s))`,
+    );
+    for (const w of emitOut.written) console.log(`  ${w.fn}: ${w.cases.join(", ")}`);
+    for (const line of skippedLines) console.log(line);
+  }
+}
+
+async function runInferJson(file: string, externalRecords?: CallRecord[]): Promise<void> {
+  const filePath = resolve(file);
+  const source = readFileSync(filePath, "utf-8");
+  const result = await analyzeFileAsync(filePath, source, undefined, externalRecords);
+
+  const jsonOutput = {
+    functions: result.functions.map((f) => ({
+      name: f.name,
+      loc: f.loc,
+      cases: f.cases.map((c) => ({
+        name: c.name,
+        args: c.args.map(typeValueToString),
+        result: typeValueToString(c.result),
+        throws: c.throws.kind !== "never" ? typeValueToString(c.throws) : null,
+        source: c.source ?? null,
+      })),
+      entryOnly: f.entryOnly ?? false,
+      assertionErrors: f.assertionErrors,
+    })),
+    externalFunctions: result.externalFunctions?.map((f) => ({
+      name: f.name,
+      fromModule: f.fromModule,
+      cases: f.cases.map((c) => ({
+        name: c.name,
+        args: c.args.map(typeValueToString),
+        result: typeValueToString(c.result),
+        throws: c.throws.kind !== "never" ? typeValueToString(c.throws) : null,
+        source: c.source ?? null,
+      })),
+    })),
+    diagnostics: result.diagnostics.map((d) => ({
+      range: d.range,
+      severity: d.severity,
+      message: d.message,
+      code: d.code,
+      suggestions: d.suggestions,
+      tags: d.tags,
+      origin: d.origin,
+    })),
+  };
+
+  console.log(JSON.stringify(jsonOutput, null, 2));
 }
 
 program
   .command("infer")
-  .description("Infer types from a JS file with @nudo: directives")
+  .description("Infer types from a JS file — functions with @nudo:case directives use them; all other functions are inferred from call sites (whole-program analysis)")
   .argument("<file>", "Path to the JS file")
   .option("--dts", "Generate .d.ts file")
   .option("--loc", "Show source locations in output")
-  .action((file: string, opts: { dts?: boolean; loc?: boolean }) => {
-    runInfer(file, { dts: opts.dts, showLoc: opts.loc });
+  .option("--json", "Output as JSON")
+  .option("--callsites <paths...>", "Usage-site files (tests/apps) to harvest real call shapes from; their calls to this file's exports become synthesized cases")
+  .option("--emit-cases [mode]", "Write synthesized call-site cases back into the source as @nudo:case directives (call@ prefix); mode: update (default: add)")
+  .option("--dry-run", "With --emit-cases: print a unified diff instead of writing to disk")
+  .option("--exit-on-diff", "With --dry-run: exit with code 1 when the diff is non-empty")
+  .action(
+    async (
+      file: string,
+      opts: {
+        dts?: boolean;
+        loc?: boolean;
+        json?: boolean;
+        callsites?: string[];
+        emitCases?: boolean | string;
+        dryRun?: boolean;
+        exitOnDiff?: boolean;
+      },
+    ) => {
+      // --emit-cases 只允许省略（=add）或 =update 两种形态
+      let emit: EmitCasesOptions | undefined;
+      if (opts.emitCases !== undefined) {
+        let mode: "add" | "update";
+        if (opts.emitCases === true) mode = "add";
+        else if (opts.emitCases === "update") mode = "update";
+        else {
+          console.error(`Invalid --emit-cases value: ${opts.emitCases} (expected: =update, or omit the value for add)`);
+          process.exitCode = 1;
+          return;
+        }
+        if (opts.json) {
+          console.error("--emit-cases cannot be combined with --json");
+          process.exitCode = 1;
+          return;
+        }
+        emit = { mode, dryRun: opts.dryRun === true, exitOnDiff: opts.exitOnDiff === true };
+      }
+      if (opts.exitOnDiff && !opts.dryRun) {
+        console.error("--exit-on-diff requires --dry-run");
+        process.exitCode = 1;
+        return;
+      }
+    let externalRecords: CallRecord[] | undefined;
+    if (opts.callsites?.length) {
+      externalRecords = collectExternalRecords(opts.callsites);
+    }
+    if (opts.json) {
+      await runInferJson(file, externalRecords);
+    } else {
+      await runInfer(file, { dts: opts.dts, showLoc: opts.loc, callsites: externalRecords, emit });
+    }
+  });
+
+async function runCheck(file: string): Promise<void> {
+  const filePath = resolve(file);
+  const source = readFileSync(filePath, "utf-8");
+  const result = await analyzeFileAsync(filePath, source);
+
+  if (result.diagnostics.length === 0) {
+    console.log("No issues found.");
+    return;
+  }
+
+  for (const d of result.diagnostics) {
+    const loc = `${relative(process.cwd(), filePath)}:${d.range.start.line}:${d.range.start.column}`;
+    console.log(`[${d.severity}] ${loc} ${d.message}${d.code ? ` (${d.code})` : ""}`);
+    if (d.origin) {
+      console.log(`    → value originates at ${d.origin.line}:${d.origin.column}`);
+    }
+  }
+
+  if (result.diagnostics.some((d) => d.severity === "error")) {
+    process.exitCode = 1;
+  }
+}
+
+program
+  .command("check")
+  .description("Check a JS file for type errors — exits with code 1 when errors are found")
+  .argument("<file>", "Path to the JS file")
+  .action(async (file: string) => {
+    await runCheck(file);
+  });
+
+// ---------------------------------------------------------------------------
+// doctor — 项目健康检查：uncovered 函数 / 调用点固化漂移 / 分析报错
+// ---------------------------------------------------------------------------
+
+/** doctor 单文件体检结果：uncovered 为信息级，drift/error 决定退出码 */
+type DoctorReport = {
+  file: string;
+  functions: number;
+  entryOnly: number;
+  uncovered: string[];
+  drift?: { added: number; removed: number };
+  error?: string;
+};
+
+/** 展示路径：cwd 内取相对路径，cwd 外（如 /tmp fixture）直接用绝对路径，避免 ../ 链 */
+const displayPath = (p: string): string => {
+  const rel = relative(process.cwd(), p);
+  return rel === "" || rel.startsWith("..") ? p : rel;
+};
+
+/**
+ * 单文件体检。三项检查：
+ *  a) uncovered —— 零 case 且非 skipped/entryOnly 的函数（信息级，不影响退出码）；
+ *  b) drift —— 给了调用记录时按 infer --emit-cases=update 的 dry-run 编排
+ *     （剥离 → 重析 → 重插）重算固化结果，最终源码与原源码不一致即漂移，
+ *     指令数按 removed/新增 written 计；
+ *  c) 报错 —— 读取/分析抛异常即记（含 update dry-run 阶段）。
+ */
+async function doctorFile(filePath: string, records?: CallRecord[]): Promise<DoctorReport> {
+  const report: DoctorReport = { file: displayPath(filePath), functions: 0, entryOnly: 0, uncovered: [] };
+  let source: string;
+  try {
+    source = readFileSync(filePath, "utf-8");
+  } catch (err) {
+    report.error = (err as Error).message;
+    return report;
+  }
+  try {
+    const result = await analyzeFileAsync(filePath, source, undefined, records);
+    report.functions = result.functions.length;
+    report.entryOnly = result.functions.filter((fn) => fn.entryOnly).length;
+    report.uncovered = result.functions
+      .filter((fn) => fn.cases.length === 0 && !fn.skipped && !fn.entryOnly)
+      .map((fn) => fn.name);
+    if (records) {
+      const { emitOut, removed } = await reemitUpdate(filePath, source, records);
+      if (emitOut.source !== source) {
+        report.drift = {
+          added: emitOut.written.reduce((n, w) => n + w.cases.length, 0),
+          removed: removed.length,
+        };
+      }
+    }
+  } catch (err) {
+    report.error = (err as Error).message;
+  }
+  return report;
+}
+
+async function runDoctor(paths: string[], opts: { callsites?: string[]; json?: boolean }): Promise<void> {
+  const targetPaths = paths.length > 0 ? paths : ["."];
+  const externalRecords = opts.callsites?.length ? collectExternalRecords(opts.callsites) : undefined;
+
+  // 目标展开：文件直接体检，目录递归收 .js（与 --callsites 同一规则）；
+  // 不存在的路径直接记为报错
+  const files: string[] = [];
+  const reports: DoctorReport[] = [];
+  for (const p of targetPaths) {
+    const abs = resolve(p);
+    if (!existsSync(abs)) {
+      reports.push({ file: displayPath(abs), functions: 0, entryOnly: 0, uncovered: [], error: `File not found: ${abs}` });
+      continue;
+    }
+    files.push(...(statSync(abs).isDirectory() ? collectNudoFiles(abs) : [abs]));
+  }
+  for (const filePath of files) {
+    reports.push(await doctorFile(filePath, externalRecords));
+  }
+
+  const driftCount = reports.filter((r) => r.drift).length;
+  const errorCount = reports.filter((r) => r.error).length;
+  const uncoveredTotal = reports.reduce((n, r) => n + r.uncovered.length, 0);
+  const failed = driftCount > 0 || errorCount > 0;
+
+  if (opts.json) {
+    console.log(
+      JSON.stringify(
+        {
+          // ok 与退出码一致：drift/报错 → false；uncovered 仅为信息级不影响
+          ok: !failed,
+          files: reports.map((r) => ({
+            file: r.file,
+            functions: r.functions,
+            entryOnly: r.entryOnly,
+            uncovered: r.uncovered,
+            ...(r.drift ? { drift: r.drift } : {}),
+            ...(r.error ? { error: r.error } : {}),
+          })),
+          summary: { files: reports.length, drift: driftCount, errors: errorCount, uncovered: uncoveredTotal },
+        },
+        null,
+        2,
+      ),
+    );
+  } else {
+    if (reports.length === 0) {
+      console.log("No files to check.");
+      return;
+    }
+    for (const r of reports) {
+      console.log(`${r.file}`);
+      if (r.error) {
+        console.log(`  ✗ error: ${r.error}`);
+        continue;
+      }
+      const entryInfo = r.entryOnly > 0 ? `, ${r.entryOnly} entry-only` : "";
+      console.log(`  · ${r.functions} function(s)${entryInfo}`);
+      if (r.uncovered.length > 0) {
+        console.log(`  ⚠ uncovered (no cases): ${r.uncovered.join(", ")}`);
+      }
+      if (r.drift) {
+        const refresh = `nudo infer ${r.file} --callsites ${(opts.callsites ?? []).join(" ")} --emit-cases=update`;
+        console.log(
+          `  ✗ drift: ${r.drift.added + r.drift.removed} directive(s) changed (+${r.drift.added} new, -${r.drift.removed} removed) — refresh with: ${refresh.trim()}`,
+        );
+      }
+    }
+    console.log(
+      `\nSummary: ${reports.length} file(s) · ${driftCount} drift · ${errorCount} error(s) · ${uncoveredTotal} uncovered function(s)`,
+    );
+    console.log(failed ? "Result: FAIL (drift or errors found)" : "Result: OK (uncovered function(s) are informational only)");
+  }
+
+  if (failed) process.exitCode = 1;
+}
+
+program
+  .command("doctor")
+  .description("Health-check JS files: functions without cases, call-site solidification drift (--callsites), analysis errors — exits 1 on drift/errors")
+  .argument("[paths...]", "File(s) or directory(s) to check (default: current directory)")
+  .option("--callsites <paths...>", "Usage-site files (tests/apps): re-solidify per current call shapes and report drift when directives would change")
+  .option("--json", "Output as JSON")
+  .action(async (paths: string[], opts: { callsites?: string[]; json?: boolean }) => {
+    await runDoctor(paths, opts);
   });
 
 program
@@ -245,31 +609,78 @@ program
       return collectNudoFiles(resolved);
     };
 
-    const runAll = () => {
+    let graph = buildModuleGraph(getFiles());
+
+    const runAll = async () => {
       console.clear();
       console.log(`[${new Date().toLocaleTimeString()}] Analyzing...\n`);
       for (const f of getFiles()) {
         try {
-          runInfer(f, { dts: opts.dts, showLoc: true });
+          await runInfer(f, { dts: opts.dts, showLoc: true });
+        } catch (err) {
+          console.error(`Error analyzing ${relative(process.cwd(), f)}:`, (err as Error).message);
+        }
+      }
+      graph = buildModuleGraph(getFiles());
+      console.log(`[${new Date().toLocaleTimeString()}] Watching for changes...`);
+    };
+
+    const runIncremental = async (changedFiles: string[]) => {
+      const files = getFiles();
+      const tracked = new Set(files);
+
+      // 合并多文件变更的脏集（union）：每个变更文件的脏集 = 自身 + 传递依赖方
+      const dirtyUnion = new Set<string>();
+      for (const cf of changedFiles) {
+        for (const d of computeDirtySet(graph.dependents, cf)) dirtyUnion.add(d);
+      }
+      const dirty = [...dirtyUnion].filter((f) => tracked.has(f));
+      if (dirty.length === 0) return;
+
+      // 依赖先析：moduleCache 中未重析依赖的类型可被复用
+      const ordered = topoSortDirty(graph.imports, dirty);
+
+      console.clear();
+      console.log(`[${new Date().toLocaleTimeString()}] Analyzing (incremental)...\n`);
+      const t0 = performance.now();
+      // 缓存失效：callMemo 按名键陈旧 + moduleCache 嵌入旧类型
+      resetMemo();
+      for (const f of ordered) {
+        try {
+          await runInfer(f, { dts: opts.dts, showLoc: true });
         } catch (err) {
           console.error(`Error analyzing ${relative(process.cwd(), f)}:`, (err as Error).message);
         }
       }
+      const elapsed = Math.round(performance.now() - t0);
+      console.log(`Incremental: re-analyzed ${ordered.length}, skipped ${files.length - ordered.length} (${elapsed}ms)`);
       console.log(`[${new Date().toLocaleTimeString()}] Watching for changes...`);
+
+      // 重建全图：文件数少时开销可忽略，选简单路线
+      graph = buildModuleGraph(getFiles());
     };
 
-    runAll();
+    runAll().catch(() => { /* per-file errors already reported */ });
 
     let debounceTimer: ReturnType<typeof setTimeout> | null = null;
     const watchTarget = isDir ? resolved : dirname(resolved);
 
+    const pendingChanged = new Set<string>();
+
     watch(watchTarget, { recursive: isDir }, (_event, filename) => {
       if (!filename) return;
       const fullPath = isDir ? join(watchTarget, filename) : resolved;
       if (!fullPath.endsWith(".js")) return;
+      if (!existsSync(fullPath)) return; // deleted
+
+      pendingChanged.add(fullPath);
 
       if (debounceTimer) clearTimeout(debounceTimer);
-      debounceTimer = setTimeout(runAll, 200);
+      debounceTimer = setTimeout(() => {
+        const changedFiles = [...pendingChanged];
+        pendingChanged.clear();
+        runIncremental(changedFiles).catch(() => { /* per-file errors already reported */ });
+      }, 200);
     });
   });
 
@@ -280,13 +691,241 @@ function collectNudoFiles(dir: string): string[] {
     if (entry.isDirectory() && entry.name !== "node_modules") {
       results.push(...collectNudoFiles(fullPath));
     } else if (entry.isFile() && entry.name.endsWith(".js")) {
-      const content = readFileSync(fullPath, "utf-8");
-      if (/@nudo:(case|mock|pure|skip|sample|returns)\b/.test(content)) {
-        results.push(fullPath);
-      }
+      // 全程序推断：无指令的纯 JS 文件也能推导类型，无需 @nudo: 过滤
+      results.push(fullPath);
     }
   }
   return results;
 }
 
-program.parse();
+// ---------------------------------------------------------------------------
+// generate 命令的 FunctionAnalysis 组装件：dts 分支复用 service 的
+// generateFunctionDtsLines（与 infer --dts / service generateDts 同一实现），
+// loc 与参数名提取与 analyzer 的 locFromNode/extractParamNames 保持同构，
+// 保证两条路径对同一文件输出一致
+// ---------------------------------------------------------------------------
+
+type DirectiveFnNode = ReturnType<typeof extractDirectives>[number]["node"];
+
+function nodeLoc(node: DirectiveFnNode): FunctionAnalysis["loc"] {
+  return {
+    start: { line: node.loc?.start.line ?? 1, column: node.loc?.start.column ?? 0 },
+    end: { line: node.loc?.end.line ?? 1, column: node.loc?.end.column ?? 0 },
+  };
+}
+
+function fnParamNames(node: DirectiveFnNode): string[] {
+  const fn = node.type === "ExportDefaultDeclaration" ? node.declaration : node;
+  const paramListOf = (params: readonly any[]): string[] =>
+    params.map((p: any) => {
+      if (p.type === "Identifier") return p.name;
+      if (p.type === "AssignmentPattern" && p.left.type === "Identifier") return p.left.name;
+      if (p.type === "RestElement" && p.argument.type === "Identifier") return `...${p.argument.name}`;
+      return "_";
+    });
+  if (fn.type === "FunctionDeclaration" || fn.type === "FunctionExpression" || fn.type === "ArrowFunctionExpression") {
+    return paramListOf(fn.params);
+  }
+  if (fn.type === "VariableDeclaration") {
+    const init = fn.declarations[0].init;
+    if (init?.type === "FunctionExpression" || init?.type === "ArrowFunctionExpression") {
+      return paramListOf(init.params);
+    }
+  }
+  return [];
+}
+
+program
+  .command("generate")
+  .description("Generate runtime validators from inferred types")
+  .argument("<file>", "JavaScript file to analyze")
+  .option("--format <format>", "Output format: zod, guard, dts, all", "all")
+  .option("--output <dir>", "Output directory", ".")
+  .action((file: string, options: { format: string; output: string }) => {
+    const filePath = resolve(file);
+    const source = readFileSync(filePath, "utf-8");
+    const ast = parse(source);
+    const functions = extractDirectives(ast);
+
+    if (functions.length === 0) {
+      console.log("No functions with @nudo:case directives found.");
+      return;
+    }
+
+    resetMemo();
+    setModuleResolver(resolveModule);
+    setCurrentFileDir(dirname(filePath));
+
+    const globalEnv = createEnvironment();
+    evaluateProgram(ast, globalEnv);
+
+    for (const fn of functions) {
+      applyMocks(fn.directives, globalEnv, filePath);
+
+      const caseDirectives = fn.directives.filter((d) => d.kind === "case");
+      if (caseDirectives.length === 0) continue;
+
+      const caseResults: CaseResult[] = caseDirectives.map((directive) => {
+        const fullResult = evaluateFunctionFull(fn.node, directive.args, globalEnv);
+        return {
+          name: directive.name,
+          args: directive.args,
+          result: fullResult.value,
+          throws: fullResult.throws,
+          source: "directive",
+        };
+      });
+
+      const baseName = fn.name;
+
+      if (options.format === "zod" || options.format === "all") {
+        console.log(`\n// === ${baseName} Zod Schemas ===`);
+        for (const c of caseResults) {
+          const inputSchemas = c.args.map((a, i) => `arg${i}: ${typeValueToZodSchema(a)}`).join(", ");
+          const outputSchema = typeValueToZodSchema(c.result);
+          console.log(`// Case "${c.name}":`);
+          console.log(`// Input: { ${inputSchemas} }`);
+          console.log(`// Output: ${outputSchema}`);
+        }
+      }
+
+      if (options.format === "guard" || options.format === "all") {
+        console.log(`\n// === ${baseName} Type Guards ===`);
+        for (const c of caseResults) {
+          const guard = generateGuardFunction(`is${baseName}${c.name.charAt(0).toUpperCase() + c.name.slice(1)}Output`, c.result);
+          console.log(guard);
+        }
+      }
+
+      if (options.format === "dts" || options.format === "all") {
+        console.log(`\n// === ${baseName} TypeScript Declarations ===`);
+        // 与 infer --dts / service 级 generateDts 共用 generateFunctionDtsLines：
+        // 单一 widen 主签名 + JSDoc 保留 case 精度 + 真实参数名（取自解析产物）。
+        // 旧的逐 case `argN: 字面量` 签名会拦截合法调用（tsc TS2769）
+        const analysis: FunctionAnalysis = {
+          name: baseName,
+          loc: nodeLoc(fn.node),
+          paramNames: fnParamNames(fn.node),
+          cases: caseResults,
+        };
+        for (const line of generateFunctionDtsLines(analysis)) {
+          console.log(line);
+        }
+      }
+    }
+
+    setModuleResolver(null);
+  });
+
+// ---------------------------------------------------------------------------
+// harvest — convert @types/<pkg> .d.ts into a Nudo env module
+// ---------------------------------------------------------------------------
+
+const HARVEST_MAX_FILES = 200;
+
+const REFERENCE_PATH_REGEX = /<reference\s+path=["']([^"']+)["']\s*\/>/g;
+const RELATIVE_FROM_REGEX = /\bfrom\s+["'](\.[^"']+)["']/g;
+
+function collectDtsFiles(entry: string): string[] {
+  const files: string[] = [];
+  const seen = new Set<string>();
+  const queue: string[] = [entry];
+
+  while (queue.length > 0 && files.length < HARVEST_MAX_FILES) {
+    const current = queue.shift()!;
+    if (seen.has(current) || !existsSync(current)) continue;
+    seen.add(current);
+    if (!current.endsWith(".d.ts")) continue;
+    files.push(current);
+
+    let text: string;
+    try {
+      text = readFileSync(current, "utf-8");
+    } catch {
+      continue;
+    }
+
+    const dir = dirname(current);
+    for (const match of text.matchAll(REFERENCE_PATH_REGEX)) {
+      queue.push(resolve(dir, match[1]));
+    }
+    for (const match of text.matchAll(RELATIVE_FROM_REGEX)) {
+      const base = resolve(dir, match[1]);
+      for (const candidate of [`${base}.d.ts`, join(base, "index.d.ts")]) {
+        if (existsSync(candidate)) {
+          queue.push(candidate);
+          break;
+        }
+      }
+    }
+  }
+
+  return files;
+}
+
+function runHarvest(pkg: string, outOpt?: string): void {
+  const typesDir = resolve(process.cwd(), "node_modules", "@types", pkg);
+  if (!existsSync(typesDir)) {
+    console.error(`Error: ${relative(process.cwd(), typesDir)} not found.`);
+    console.error(`Install the package first, e.g. pnpm add -D @types/${pkg}`);
+    process.exitCode = 1;
+    return;
+  }
+
+  let entry = join(typesDir, "index.d.ts");
+  const pkgJsonPath = join(typesDir, "package.json");
+  if (existsSync(pkgJsonPath)) {
+    try {
+      const pkgJson = JSON.parse(readFileSync(pkgJsonPath, "utf-8")) as { types?: string; typings?: string };
+      const declared = pkgJson.types ?? pkgJson.typings;
+      if (typeof declared === "string") {
+        const candidate = resolve(typesDir, declared);
+        if (existsSync(candidate)) entry = candidate;
+      }
+    } catch {
+      // malformed package.json — fall back to index.d.ts
+    }
+  }
+  if (!existsSync(entry)) {
+    console.error(`Error: no .d.ts entry found in ${relative(process.cwd(), typesDir)} (tried ${basename(entry)}).`);
+    process.exitCode = 1;
+    return;
+  }
+
+  const files = collectDtsFiles(entry);
+  if (files.length === 0) {
+    console.error(`Error: no .d.ts files collected from ${relative(process.cwd(), entry)}.`);
+    process.exitCode = 1;
+    return;
+  }
+
+  const env = harvestDts(files);
+  const code = emitEnvModule(env, `@types/${pkg}`);
+
+  const out = resolve(outOpt ?? `nudo-harvest-${pkg}.ts`);
+  writeFileSync(out, code, "utf-8");
+
+  console.log(`Harvested @types/${pkg} → ${relative(process.cwd(), out) || out}`);
+  console.log(`  files:    ${env.stats.files}`);
+  console.log(`  symbols:  ${env.stats.symbols}`);
+  console.log(`  skipped:  ${env.stats.skipped}`);
+  console.log(`\nUsage — add this directive at the top of your JS file:`);
+  const outDir = dirname(out);
+  const hintPath =
+    resolve(process.cwd()) === outDir ? basename(out) : out;
+  console.log(`  /// @nudo:env ${hintPath}`);
+}
+
+program
+  .command("harvest")
+  .description("Convert @types/<pkg> .d.ts declarations into a Nudo env file (TS source using T.* constructors)")
+  .argument("<pkg>", "Package name under @types (e.g. node)")
+  .option("--out <file>", "Output .ts env file (default: ./nudo-harvest-<pkg>.ts)")
+  .action((pkg: string, opts: { out?: string }) => {
+    runHarvest(pkg, opts.out);
+  });
+
+program.parseAsync(process.argv).catch((err: unknown) => {
+  console.error(err instanceof Error ? (process.env.NUDO_DEBUG ? err.stack : err.message) : err);
+  process.exitCode = 1;
+});