@nudojs/cli 2.0.1 → 3.0.0

package/dist/index.js

@@ -21497,20 +21497,17 @@ function any() {
   return makeBuilder(void 0, []);
 }
 function array(item) {
-  if (!isConstraint(item))
-    throw new Error("nudo: array(item) \u671F\u671B\u7EA6\u675F\u503C\uFF08number()/string()/\u2026\u6216\u5176\u7EC4\u5408\u5B50\uFF09");
-  return makeBuilder(void 0, [], { element: item });
+  return makeBuilder(void 0, [], {
+    element: asNestedConstraint(item, "array(item)")
+  });
 }
 function shape(fields) {
   const mapped = {};
   for (const [k, v2] of Object.entries(fields)) {
-    if (!isConstraint(v2))
-      throw new Error(
-        `nudo: shape \u5B57\u6BB5 '${k}' \u671F\u671B\u7EA6\u675F\u503C\uFF08number()/string()/\u2026\u6216\u5176\u7EC4\u5408\u5B50\uFF09\uFF0C\u6536\u5230\u975E\u7EA6\u675F`
-      );
+    const constraint = asNestedConstraint(v2, `shape \u5B57\u6BB5 '${k}'`);
     mapped[k] = {
-      constraint: v2,
-      ...v2.isOptional ? { optional: true } : {}
+      constraint,
+      ...constraint.isOptional ? { optional: true } : {}
     };
   }
   return makeBuilder(void 0, [], { fields: mapped });
@@ -21535,19 +21532,32 @@ function lit3(v2) {
   const prim2 = typeof v2 === "number" ? "number" : typeof v2 === "string" ? "string" : typeof v2 === "boolean" ? "boolean" : void 0;
   return makeBuilder(prim2, [eq(selfTerm(), lit(v2))]);
 }
+function asNestedConstraint(x, ctx) {
+  if (isConstraint(x)) return toPlainConstraint(x);
+  if (x === null || x === void 0 || typeof x === "number" || typeof x === "string" || typeof x === "boolean") {
+    return toPlainConstraint(lit3(x));
+  }
+  throw new Error(
+    `nudo: ${ctx} \u671F\u671B\u7EA6\u675F\u503C\uFF08number()/string()/\u2026\uFF09\u6216\u5177\u4F53\u5B57\u9762\u91CF\uFF0C\u6536\u5230\u975E\u7EA6\u675F`
+  );
+}
 function union(...cs) {
   if (cs.length === 0)
     throw new Error("nudo union(): \u81F3\u5C11\u9700\u8981\u4E00\u4E2A\u6210\u5458\u7EA6\u675F");
-  return makeBuilder(void 0, [], { members: cs.map(toPlainConstraint) });
+  return makeBuilder(void 0, [], {
+    members: cs.map((c) => asNestedConstraint(c, "union \u6210\u5458"))
+  });
 }
 function fn(params, returns, opts) {
   const normalized = {};
-  for (const [k, v2] of Object.entries(params)) normalized[k] = toPlainConstraint(v2);
+  for (const [k, v2] of Object.entries(params)) {
+    normalized[k] = asNestedConstraint(v2, `fn \u53C2\u6570 '${k}'`);
+  }
   return makeBuilder(void 0, [], {
     fn: {
       params: normalized,
-      ...returns !== void 0 ? { returns: toPlainConstraint(returns) } : {},
-      ...opts?.throws !== void 0 ? { throws: toPlainConstraint(opts.throws) } : {}
+      ...returns !== void 0 ? { returns: asNestedConstraint(returns, "fn \u8FD4\u56DE\u503C") } : {},
+      ...opts?.throws !== void 0 ? { throws: asNestedConstraint(opts.throws, "fn throws") } : {}
     }
   });
 }
@@ -60675,10 +60685,6 @@ function absLit(v2) {
   if (v2 === null) return absNullLit();
   return absUndefLit();
 }
-function absUnion(members) {
-  if (members.length === 0) return absExact({ k: "never" });
-  return members.reduce((acc, m) => joinAbs(acc, m));
-}
 function tryParseConstraint(expr) {
   const s = expr.trim();
   if (!CONSTRAINT_EXPR_RE.test(s)) return void 0;
@@ -60707,15 +60713,15 @@ function flattenPreds(preds) {
 function constraintSelfEqLit(c, selfIds) {
   const leaves = flattenPreds(c.preds);
   const eqs = leaves.filter((p2) => p2.op === "eq");
-  if (eqs.length !== 1) return void 0;
+  if (eqs.length !== 1) return { found: false };
   const p = eqs[0];
-  if (p.op !== "eq") return void 0;
+  if (p.op !== "eq") return { found: false };
   const isSelf = (t) => t.op === "var" && typeof t.id === "string" && selfIds.includes(t.id);
   const a = p.a;
   const b = p.b;
-  if (isSelf(a) && b.op === "lit") return b.value;
-  if (isSelf(b) && a.op === "lit") return a.value;
-  return void 0;
+  if (isSelf(a) && b.op === "lit") return { found: true, value: b.value };
+  if (isSelf(b) && a.op === "lit") return { found: true, value: a.value };
+  return { found: false };
 }
 function constraintToCaseArgAbs(c) {
   if (c.members && c.members.length > 0) {
@@ -60724,10 +60730,32 @@ function constraintToCaseArgAbs(c) {
     return { shape: { k: "sum", members: parts }, conf: "path" };
   }
   const selfIds = [SELF, "__arg", "__nudo_self__"];
-  const lv = constraintSelfEqLit(c, selfIds);
-  if (typeof lv === "number" && !Number.isNaN(lv)) return numLit(lv);
-  if (typeof lv === "string") return strLit(lv);
-  if (typeof lv === "boolean") return boolLit(lv);
+  const litRes = constraintSelfEqLit(c, selfIds);
+  if (litRes.found) {
+    const lv = litRes.value;
+    if (typeof lv === "number" && !Number.isNaN(lv)) return numLit(lv);
+    if (typeof lv === "string") return strLit(lv);
+    if (typeof lv === "boolean") return boolLit(lv);
+    if (lv === null) return absNullLit();
+    return absUndefLit();
+  }
+  if (c.element) {
+    return absExact({ k: "arr", element: constraintToCaseArgAbs(c.element) });
+  }
+  if (c.fields) {
+    const slots = {};
+    for (const [key, field] of Object.entries(c.fields)) {
+      slots[key] = { value: constraintToCaseArgAbs(field.constraint) };
+    }
+    return absExact({ k: "obj", slots });
+  }
+  const bareScalar = !c.fields && !c.element && !c.members && !c.fn && c.int !== true && c.preds.length === 0;
+  if (bareScalar) {
+    if (c.prim === "number" || c.prim === "string" || c.prim === "boolean") {
+      return absExact({ k: "prim", type: c.prim });
+    }
+    if (!c.prim) return absUnknown2();
+  }
   return constraintToEntryAbs(c, "__arg");
 }
 function parseCaseArgExpr(expr) {
@@ -60739,49 +60767,16 @@ function parseCaseArgExpr(expr) {
       return absUnknown2();
     }
   }
-  return parseLegacyTypeExpr(expr);
+  return parseLiteralOrStructure(expr);
 }
-function parseLegacyTypeExpr(expr) {
+function parseLiteralOrStructure(expr) {
   const s = expr.trim();
-  if (s === "T.number") return num();
-  if (s === "T.string") return str();
-  if (s === "T.boolean") return bool();
-  if (s === "T.unknown") return absUnknown2();
-  if (s === "T.never") return absExact({ k: "never" });
-  if (s === "T.null") return absNullLit();
-  if (s === "T.undefined") return absUndefLit();
   if (s === "true") return absLit(true);
   if (s === "false") return absLit(false);
   if (s === "null") return absLit(null);
   if (s === "undefined") return absLit(void 0);
-  const literalMatch = s.match(/^T\.literal\((.+)\)$/);
-  if (literalMatch) {
-    return absLit(parsePrimitiveValue(literalMatch[1].trim()));
-  }
-  if (s.startsWith("T.union(") && s.endsWith(")")) {
-    const inner = s.slice("T.union(".length, -1);
-    const args = splitTopLevelArgs(inner);
-    return absUnion(args.map(parseLegacyTypeExpr));
-  }
-  if (s.startsWith("T.array(") && s.endsWith(")")) {
-    const inner = s.slice("T.array(".length, -1);
-    return absExact({ k: "arr", element: parseLegacyTypeExpr(inner) });
-  }
-  if (s.startsWith("T.tuple(") && s.endsWith(")")) {
-    const inner = s.slice("T.tuple(".length, -1).trim();
-    if (inner.startsWith("[") && inner.endsWith("]")) {
-      const elements = splitTopLevelArgs(inner.slice(1, -1));
-      return absExact({ k: "tuple", elements: elements.map(parseLegacyTypeExpr) });
-    }
-    return absExact({ k: "tuple", elements: [] });
-  }
-  if (s.startsWith("T.object(") && s.endsWith(")")) {
-    const inner = s.slice("T.object(".length, -1).trim();
-    if (inner.startsWith("{") && inner.endsWith("}")) {
-      return parseObjectLiteral(inner.slice(1, -1).trim());
-    }
-    return absExact({ k: "obj", slots: {} });
-  }
+  if (s === "unknown" || s === "any") return absUnknown2();
+  if (s === "never") return absExact({ k: "never" });
   if (findTopLevelArrow(s) !== -1 || /^function\s*[\w$]*\s*\(/.test(s)) {
     const fnExpr = parseArrowFunctionExpr(s);
     if (fnExpr) {
@@ -60799,7 +60794,7 @@ function parseLegacyTypeExpr(expr) {
     const content = s.slice(1, -1).trim();
     if (!content) return absExact({ k: "tuple", elements: [] });
     const elements = splitTopLevelArgs(content);
-    return absExact({ k: "tuple", elements: elements.map(parseLegacyTypeExpr) });
+    return absExact({ k: "tuple", elements: elements.map((e) => parseCaseArgExpr(e)) });
   }
   return absUnknown2();
 }
@@ -60812,21 +60807,10 @@ function parseObjectLiteral(content) {
     if (colonIdx === -1) continue;
     const key = entry.slice(0, colonIdx).trim().replace(/^["']|["']$/g, "");
     const val = entry.slice(colonIdx + 1).trim();
-    slots[key] = { value: parseLegacyTypeExpr(val) };
+    slots[key] = { value: parseCaseArgExpr(val) };
   }
   return absExact({ k: "obj", slots });
 }
-function parsePrimitiveValue(s) {
-  if (s === "true") return true;
-  if (s === "false") return false;
-  if (s === "null") return null;
-  if (s === "undefined") return void 0;
-  if (/^-?\d+(\.\d+)?$/.test(s)) return Number(s);
-  if (s.startsWith('"') && s.endsWith('"') || s.startsWith("'") && s.endsWith("'")) {
-    return s.slice(1, -1);
-  }
-  return s;
-}
 function splitTopLevelArgs(s) {
   const result = [];
   let depth = 0;
@@ -61239,7 +61223,7 @@ function findReplaceSeparator(raw) {
     }
     if (ch === " " && depth === 0) {
       const rest = raw.slice(i + 1).trimStart();
-      if (rest.startsWith("T.") || rest.startsWith("{") || rest.startsWith("[") || rest.startsWith('"') || rest.startsWith("'") || /^-?\d/.test(rest) || rest === "true" || rest === "false" || rest === "null" || rest === "undefined") {
+      if (CONSTRAINT_EXPR_RE.test(rest) || rest.startsWith("{") || rest.startsWith("[") || rest.startsWith('"') || rest.startsWith("'") || rest === "true" || rest === "false" || rest === "null" || rest === "undefined" || rest === "unknown" || rest === "any" || rest === "never" || /^-?\d+(\.\d+)?$/.test(rest) || rest.includes("=>") || /^function\s*[\w$]*\s*\(/.test(rest)) {
         return i;
       }
     }
@@ -61293,7 +61277,7 @@ var init_directives = __esm({
     PURE_REGEX = /@nudo:pure\b/g;
     SKIP_REGEX = /@nudo:skip(?:\s+(.+))?/g;
     SAMPLE_REGEX = /@nudo:sample\s+(\d+)/g;
-    CONSTRAINT_EXPR_RE = /^(number|string|boolean|array|shape|lit|union|fn|partial|pick|omit|record|required|readonly|nonNullable|and)\s*\(/;
+    CONSTRAINT_EXPR_RE = /^(number|string|boolean|any|array|shape|lit|union|fn|partial|pick|omit|record|required|readonly|nonNullable|and)\s*\(/;
     AS_REGEX = /^\s*@nudo:as\s+(.+)/;
     REPLACE_REGEX = /^\s*@nudo:replace\s+(.+)/;
     ENV_REGEX = /^\/\s*@nudo:env\s+(.+)/;
@@ -275512,7 +275496,7 @@ function absFnSig(paramTypes, returnType) {
     returnType
   });
 }
-function absUnion2(members) {
+function absUnion(members) {
   if (members.length === 0) return absNever();
   return members.reduce((acc, m) => joinAbs(acc, m));
 }
@@ -275827,7 +275811,7 @@ function materialize(ctx) {
           const ret = mapType(ctx, decl.type, 0);
           if (!isPlainUnknown(ret)) returns.push(ret);
         }
-        sig2.returnType = returns.length > 0 ? absUnion2(returns) : absUnknown3();
+        sig2.returnType = returns.length > 0 ? absUnion(returns) : absUnknown3();
       }
       rec[p.name] = value;
       continue;
@@ -275851,7 +275835,7 @@ function materialize(ctx) {
           if (ctor) {
             for (const param of ctor.parameters) {
               let type = param.type ? mapType(ctx, param.type, 0) : absUnknown3();
-              if (param.questionToken) type = absUnion2([type, absUndefLit2()]);
+              if (param.questionToken) type = absUnion([type, absUndefLit2()]);
               params.push(type);
             }
           }
@@ -275901,7 +275885,7 @@ function instanceFor(ctx, key) {
         const name = memberName(member);
         if (name === void 0) continue;
         let type = member.type ? mapType(ctx, member.type, 0) : absUnknown3();
-        if (member.questionToken) type = absUnion2([type, absUndefLit2()]);
+        if (member.questionToken) type = absUnion([type, absUndefLit2()]);
         properties[name] = type;
       } else if (import_typescript.default.isMethodSignature(member) || import_typescript.default.isMethodDeclaration(member)) {
         const name = memberName(member);
@@ -275929,7 +275913,7 @@ function signatureToFnSig(ctx, sig2) {
     } else {
       type = param.type ? mapType(ctx, param.type, 0) : absUnknown3();
     }
-    if (param.questionToken && !param.dotDotDotToken) type = absUnion2([type, absUndefLit2()]);
+    if (param.questionToken && !param.dotDotDotToken) type = absUnion([type, absUndefLit2()]);
     return type;
   });
   const returnType = sig2.type ? mapType(ctx, sig2.type, 0) : absUnknown3();
@@ -275942,7 +275926,7 @@ function mapTypeMembers(ctx, members, depth) {
       const name = memberName(member);
       if (name === void 0) continue;
       let type = member.type ? mapType(ctx, member.type, depth) : absUnknown3();
-      if (member.questionToken) type = absUnion2([type, absUndefLit2()]);
+      if (member.questionToken) type = absUnion([type, absUndefLit2()]);
       properties[name] = type;
     } else if (import_typescript.default.isMethodSignature(member)) {
       const name = memberName(member);
@@ -275984,7 +275968,7 @@ function mapType(ctx, node, depth) {
     return absUnknown3();
   }
   if (import_typescript.default.isUnionTypeNode(node)) {
-    return absUnion2(node.types.map((t) => mapType(ctx, t, depth)));
+    return absUnion(node.types.map((t) => mapType(ctx, t, depth)));
   }
   if (import_typescript.default.isIntersectionTypeNode(node)) {
     const members = node.types.map((t) => mapType(ctx, t, depth));
@@ -276018,7 +276002,7 @@ function mapType(ctx, node, depth) {
       const params = [];
       for (const param of ctor.parameters) {
         let type = param.type ? mapType(ctx, param.type, depth) : absUnknown3();
-        if (param.questionToken) type = absUnion2([type, absUndefLit2()]);
+        if (param.questionToken) type = absUnion([type, absUndefLit2()]);
         params.push(type);
       }
       return absFnSig(params, ctor.type ? mapType(ctx, ctor.type, depth) : absUnknown3());
@@ -277701,7 +277685,8 @@ function validateMockDirectives(directives, diagnostics) {
   for (const d of directives) {
     if (d.kind !== "mock" || !d.expression) continue;
     const expr = d.expression.trim();
-    if (expr.includes("(") && expr.includes(")") && !expr.startsWith("T.")) {
+    const isTypeExpr = /^(number|string|boolean|any|array|shape|lit|union|fn|partial|pick|omit|record|required|readonly|nonNullable|and)\s*\(/.test(expr) || expr === "unknown" || expr === "any" || expr === "never" || expr === "true" || expr === "false" || expr === "null" || expr === "undefined" || /^-?\d+(\.\d+)?$/.test(expr) || (expr.startsWith('"') && expr.endsWith('"') || expr.startsWith("'") && expr.endsWith("'")) || expr.startsWith("{") || expr.startsWith("[");
+    if (expr.includes("(") && expr.includes(")") && !isTypeExpr && !expr.includes("=>")) {
       diagnostics.push({
         range: { start: { line: 0, column: 0 }, end: { line: 0, column: 0 } },
         severity: "warning",
@@ -277709,7 +277694,8 @@ function validateMockDirectives(directives, diagnostics) {
         code: "nudo:mock-invalid",
         suggestions: [
           "Supported formats: stub(), stub().returns(value), spy(), mock()",
-          "Arrow functions: (args) => expression or (args) => { statements; return value; }"
+          "Arrow functions: (args) => expression or (args) => { statements; return value; }",
+          "Type expressions: number(), string(), shape({...}), union(...), or concrete literals"
         ]
       });
     }
@@ -278685,7 +278671,7 @@ function analyzeFileUncachedInner(filePath, source, activeCases, externalCallRec
             diagnostics.push({
               range: { start: { line: directive.commentLine, column: 0 }, end: { line: directive.commentLine, column: 999 } },
               severity: "error",
-              message: `Case "${directive.name}": expected ${formatShape(directive.expected)}, got ${formatShape(caseAbs)}. The inferred return type does not match the expected type declared in the @nudo:case directive`,
+              message: `debug "${directive.name}": expected ${formatShape(directive.expected)}, got ${formatShape(caseAbs)}. The inferred return type does not match the expected type declared in the @nudo:case witness`,
               code: "nudo:case-expected"
             });
           }
@@ -281177,15 +281163,15 @@ function serializeCaseArg(a) {
   }
   switch (s.k) {
     case "prim":
-      if (s.type === "number" || s.type === "string" || s.type === "boolean") {
-        return `T.${s.type}`;
-      }
+      if (s.type === "number") return "number()";
+      if (s.type === "string") return "string()";
+      if (s.type === "boolean") return "boolean()";
       return null;
     case "unknown":
     case "any":
-      return "T.unknown";
+      return "any()";
     case "never":
-      return "T.never";
+      return "never";
     case "sum": {
       const parts = [];
       for (const member of s.members) {
@@ -281193,11 +281179,11 @@ function serializeCaseArg(a) {
         if (ser === null) return null;
         parts.push(ser);
       }
-      return `T.union(${parts.join(", ")})`;
+      return `union(${parts.join(", ")})`;
     }
     case "arr": {
       const el = serializeCaseArg(s.element);
-      return el === null ? null : `T.array(${el})`;
+      return el === null ? null : `array(${el})`;
     }
     case "tuple": {
       const parts = [];
@@ -283843,7 +283829,7 @@ async function runInfer(file, options = {}) {
     }
   }
   if (result.functions.length === 0 && !result.externalFunctions?.length) {
-    console.log("No functions with @nudo:case directives found.");
+    console.log("No functions found to analyze.");
     return;
   }
   const dtsLines = [];
@@ -283867,7 +283853,8 @@ async function runInfer(file, options = {}) {
     }
     for (const c of fn2.cases) {
       const argsStr = c.argAbs.map(formatShape).join(", ");
-      let line = `Case "${c.name}": (${argsStr}) => ${formatShape(c.abs)}`;
+      const label = c.name.startsWith("call@") || c.name.startsWith("entry@") ? c.name : `debug "${c.name}"`;
+      let line = `${label}: (${argsStr}) => ${formatShape(c.abs)}`;
       if (c.throwsAbs.shape.k !== "never") line += ` throws ${formatShape(c.throwsAbs)}`;
       console.log(line);
       if (c.intension?.display) {
@@ -283888,7 +283875,7 @@ async function runInfer(file, options = {}) {
     }
     if (fn2.cases.length > 1 && fn2.combinedAbs) {
       console.log(`
-Combined: ${formatShape(fn2.combinedAbs)}`);
+Observed: ${formatShape(fn2.combinedAbs)}`);
     }
     console.log();
   }
@@ -283909,13 +283896,14 @@ Combined: ${formatShape(fn2.combinedAbs)}`);
 `);
         for (const c of fn2.cases) {
           const argsStr = c.argAbs.map(formatShape).join(", ");
-          let line = `Case "${c.name}": (${argsStr}) => ${formatShape(c.abs)}`;
+          const label = c.name.startsWith("call@") || c.name.startsWith("entry@") ? c.name : `debug "${c.name}"`;
+          let line = `${label}: (${argsStr}) => ${formatShape(c.abs)}`;
           if (c.throwsAbs.shape.k !== "never") line += ` throws ${formatShape(c.throwsAbs)}`;
           console.log(line);
         }
         if (fn2.cases.length > 1 && fn2.combinedAbs) {
           console.log(`
-Combined: ${formatShape(fn2.combinedAbs)}`);
+Observed: ${formatShape(fn2.combinedAbs)}`);
         }
         console.log();
       }
@@ -283971,7 +283959,7 @@ async function runInferJson(file, externalRecords) {
   const { serializeInferJson: serializeInferJson2 } = await Promise.resolve().then(() => (init_src4(), src_exports2));
   console.log(JSON.stringify(serializeInferJson2(result, filePath), null, 2));
 }
-program.command("infer").description("Infer types from a JS/TS file (or a directory of them) \u2014 functions with @nudo:case directives use them; all other functions are inferred from call sites (whole-program analysis)").argument("<file>", "Path to the JS/TS file (or directory)").option("--dts", "Generate .d.ts file").option("--loc", "Show source locations in output").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(
+program.command("infer").description("Infer types from a JS/TS file (or a directory) by executing observed call sites; optional @nudo:case witnesses are for debug / nudo test only").argument("<file>", "Path to the JS/TS file (or directory)").option("--dts", "Generate .d.ts file").option("--loc", "Show source locations in output").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]", "Debug solidification: write synthesized call-site witnesses back as @nudo:case directives (call@ prefix); not the interface product path. 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, opts) => {
     let emit;
     if (opts.emitCases !== void 0) {
@@ -284513,7 +284501,7 @@ program.command("interface").alias("refine").description(
     }
   }
 );
-program.command("test").description("Run @nudo:case directives as assertions (case-as-test); exit 1 on failure").argument("<file>", "Path to the JS/TS file or a directory of them").action(async (file) => {
+program.command("test").description("Run @nudo:case directives as debug assertions (case-as-test); exit 1 on failure").argument("<file>", "Path to the JS/TS file or a directory of them").action(async (file) => {
   const targets = resolveTargets(file);
   if (targets.length === 0) return;
   for (const filePath of targets) {
@@ -284657,12 +284645,12 @@ async function runDoctor(paths, opts) {
       const entryInfo = r.entryOnly > 0 ? `, ${r.entryOnly} entry-only` : "";
       console.log(`  \xB7 ${r.functions} function(s)${entryInfo}`);
       if (r.uncovered.length > 0) {
-        console.log(`  \u26A0 uncovered (no cases): ${r.uncovered.join(", ")}`);
+        console.log(`  \u26A0 uncovered (no call-site evidence): ${r.uncovered.join(", ")}`);
       }
       if (r.drift) {
         const refresh = `nudo infer ${r.file} --callsites ${(opts.callsites ?? []).join(" ")} --emit-cases=update`;
         console.log(
-          `  \u2717 drift: ${r.drift.added + r.drift.removed} directive(s) changed (+${r.drift.added} new, -${r.drift.removed} removed) \u2014 refresh with: ${refresh.trim()}`
+          `  \u2717 drift: ${r.drift.added + r.drift.removed} debug witness directive(s) changed (+${r.drift.added} new, -${r.drift.removed} removed) \u2014 optional refresh: ${refresh.trim()}`
         );
       }
       if ((r.interfaceDrift ?? 0) > 0) {
@@ -284809,18 +284797,16 @@ async function runGenerate(file, format, output) {
   const filePath = resolve12(file);
   const source = readFileSync15(filePath, "utf-8");
   const result = await analyzeFileAsync(filePath, source);
-  const functions = result.functions.filter(
-    (f) => f.cases.some((c) => c.source === "directive")
-  );
+  const functions = result.functions.filter((f) => f.cases.length > 0);
   if (functions.length === 0) {
-    console.log("No functions with @nudo:case directives found.");
+    console.log("No analyzed functions found.");
     return;
   }
   const zodChunks = [];
   const guardChunks = [];
   const dtsChunks = [];
   for (const fn2 of functions) {
-    const caseResults = fn2.cases.filter((c) => c.source === "directive");
+    const caseResults = fn2.cases;
     const baseName = fn2.name;
     if (format === "zod" || format === "all") {
       const lines = [`
@@ -284828,7 +284814,8 @@ async function runGenerate(file, format, output) {
       for (const c of caseResults) {
         const inputSchemas = c.argAbs.map((a, i) => `arg${i}: ${absToZodSchema(a)}`).join(", ");
         const outputSchema = absToZodSchema(c.abs);
-        lines.push(`// Case "${c.name}":`);
+        const label = c.name.startsWith("call@") || c.name.startsWith("entry@") ? c.name : `debug "${c.name}"`;
+        lines.push(`// ${label}:`);
         lines.push(`// Input: { ${inputSchemas} }`);
         lines.push(`// Output: ${outputSchema}`);
       }
@@ -284837,9 +284824,9 @@ async function runGenerate(file, format, output) {
     if (format === "guard" || format === "all") {
       const lines = [`
 // === ${baseName} Type Guards ===`];
-      for (const c of caseResults) {
-        const guardName = `is${baseName}${c.name.charAt(0).toUpperCase() + c.name.slice(1)}Output`;
-        lines.push(generateGuardFunctionFromAbs(guardName, c.abs));
+      const absForGuard = fn2.combinedAbs ?? caseResults[0]?.abs;
+      if (absForGuard) {
+        lines.push(generateGuardFunctionFromAbs(`is${baseName}Output`, absForGuard));
       }
       guardChunks.push(lines.join("\n"));
     }
@@ -284938,7 +284925,7 @@ Usage \u2014 add this directive at the top of your JS file:`);
   const hintPath = resolve12(process.cwd()) === outDir ? basename5(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)").option("--auto [dir]", "Scan directory (default .) for bare imports and report auto-harvestable @types packages").action(async (pkg, opts) => {
+program.command("harvest").description("Convert @types/<pkg> .d.ts declarations into a Nudo env file (constraint builders, not T.*)").argument("[pkg]", "Package name under @types (e.g. node)").option("--out <file>", "Output .ts env file (default: ./nudo-harvest-<pkg>.ts)").option("--auto [dir]", "Scan directory (default .) for bare imports and report auto-harvestable @types packages").action(async (pkg, opts) => {
   if (opts.auto !== void 0) {
     const dir = resolve12(typeof opts.auto === "string" ? opts.auto : ".");
     const files = existsSync16(dir) && statSync9(dir).isDirectory() ? collectNudoFiles(dir) : existsSync16(dir) ? [dir] : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nudojs/cli",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "engines": {
     "node": ">=20"
   },
@@ -43,11 +43,11 @@
   },
   "dependencies": {
     "commander": "^13.0.0",
-    "@nudojs/parser": "0.5.1",
-    "@nudojs/core": "2.0.1",
-    "@nudojs/service": "3.0.0",
-    "@nudojs/env": "0.4.0",
-    "@nudojs/harvester": "0.2.6"
+    "@nudojs/core": "2.1.0",
+    "@nudojs/parser": "1.0.0",
+    "@nudojs/service": "4.0.0",
+    "@nudojs/env": "0.4.1",
+    "@nudojs/harvester": "0.2.7"
   },
   "scripts": {
     "build": "tsup"