@sungen/driver-data-factory 3.2.12-beta.2 → 3.2.12-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sungen/driver-data-factory",
-  "version": "3.2.12-beta.2",
+  "version": "3.2.12-beta.4",
   "description": "Sungen Data Factory capability — standardized test-data generation from a field-type + security knowledge catalog (valid/boundary/invalid + traceability), the .overwrite merge layer, and (opt-in) @dataFactory runtime seeding. Design-time knowledge is runtime-free. Plugs into @sun-asterisk/sungen via the capability SPI.",
   "main": "src/index.ts",
   "types": "src/index.ts",
@@ -9,12 +9,12 @@
   },
   "scripts": {
     "build": "rm -rf dist && tsc -p tsconfig.json",
-    "test": "tsx tests/run.ts"
+    "test": "tsx tests/run.ts && tsx tests/golden.ts"
   },
   "author": "eqe team (engineer & quality) — Sun Asterisk",
   "license": "MIT",
   "dependencies": {
-    "@sun-asterisk/sungen": "3.2.12-beta.2",
+    "@sun-asterisk/sungen": "3.2.12-beta.4",
     "yaml": "^2.4.0"
   },
   "files": [

package/src/boundary.ts

@@ -0,0 +1,260 @@
+/**
+ * Data Factory — structured boundary expansion + the deterministic validity oracle.
+ *
+ * This replaces the old prose-parsing (`hint.includes('min')`) that produced semantically WRONG data:
+ *   - password `< min` (minLength 7) synthesized a 7-char string — which is VALID, not the invalid
+ *     "below minimum" case it claims to be;
+ *   - integer `min / min+1` collapsed to a single value, dropping one of the two boundary cases.
+ *
+ * A boundary/invalid hint is tokenized into one or more BoundaryPoints — one case per point
+ * (`min / min+1` → two, `min-1 / max+1` → two) — each carrying the value AND its expected validity,
+ * computed by the same oracle that later re-checks the value. So "the rule says valid" and "the value
+ * actually satisfies the constraints" can never silently disagree (that disagreement is a golden-test
+ * failure). Pure, deterministic; no runtime, no LLM.
+ */
+
+export type Validity = 'valid' | 'invalid';
+
+export interface BoundaryPoint {
+  /** Id suffix so one catalog point can expand to several: '' (first), 'b', 'c', … */
+  suffix: string;
+  value: string | null;
+  /** What the oracle expects this value to be — locked by golden tests against the real check. */
+  validity: Validity;
+  /** Human label for the point, e.g. 'min', 'min+1', 'max+1', 'length-1'. */
+  label: string;
+  todo?: string;
+}
+
+const STR_TYPES = new Set(['string', 'password', 'phone', 'postcode', 'katakana']);
+const NUM_TYPES = new Set(['number-integer', 'number-float', 'currency']);
+
+/** Deterministic filler: a string of exactly `n` chars from a charset seed. */
+export function fillLen(n: number, base = 'a'): string {
+  if (!Number.isFinite(n) || n <= 0) return '';
+  return base.repeat(Math.ceil(n / base.length)).slice(0, n);
+}
+
+/** Password seed that satisfies upper+lower+digit for any length ≥ 3. */
+function fillPassword(n: number): string {
+  if (n <= 0) return '';
+  // Prefix guarantees the character classes; pad with lowercase to reach n.
+  const prefix = 'Aa1';
+  if (n <= prefix.length) return prefix.slice(0, n);
+  return prefix + 'a'.repeat(n - prefix.length);
+}
+
+function seedFor(type: string): string {
+  return type === 'password' ? 'PW' : type === 'katakana' ? 'ア' : type === 'phone' || type === 'postcode' ? '0' : 'a';
+}
+
+function fillString(type: string, n: number): string {
+  return type === 'password' ? fillPassword(n) : fillLen(n, seedFor(type));
+}
+
+/** Precision step for a numeric type: 1 for integers/currency(0dp), 10^-dp for floats. */
+function step(type: string, c: Record<string, any>): number {
+  if (type === 'number-float' || (type === 'currency' && Number.isFinite(c.decimalPlaces) && c.decimalPlaces > 0)) {
+    const dp = Number.isFinite(c.decimalPlaces) ? c.decimalPlaces : 2;
+    return Number((1 / Math.pow(10, dp)).toFixed(dp));
+  }
+  return 1;
+}
+
+/** Round to the type's decimal places so we don't emit float noise like 999999.9899999999. */
+function fmtNum(type: string, c: Record<string, any>, n: number): string {
+  if (type === 'number-float' || (type === 'currency' && c.decimalPlaces > 0)) {
+    const dp = Number.isFinite(c.decimalPlaces) ? c.decimalPlaces : 2;
+    return n.toFixed(dp);
+  }
+  return String(Math.round(n));
+}
+
+/** Split a prose hint into per-point segments: "min / min+1" → ["min","min+1"]. */
+function segments(hint: string): string[] {
+  return hint
+    .split(/[/,]/)
+    .map((s) => s.trim())
+    .filter(Boolean);
+}
+
+/** Resolve a single segment to a signed offset off min/max: "< min" → {base:'min',off:-1}. */
+function readOffset(seg: string): { base: 'min' | 'max' | 'length' | null; off: number; label: string } {
+  const s = seg.toLowerCase();
+  const base: 'min' | 'max' | 'length' | null =
+    /\bmax\b|maximum|maxlength|maxlocal|maxtotal/.test(s) ? 'max'
+    : /\bmin\b|minimum|minlength/.test(s) ? 'min'
+    : /exact|length|byte/.test(s) ? 'length'
+    : null;
+  // Offset: explicit ±1 wins; then relational (< / over / exceeds → out-of-range).
+  let off = 0;
+  if (/\+\s*1|plus one|one extra/.test(s)) off = 1;
+  else if (/-\s*1|minus one/.test(s)) off = -1;
+  else if (/<|below|under|less than|shorter/.test(s)) off = -1;
+  else if (/>|over|above|exceed|greater than|longer|too long/.test(s)) off = 1;
+  const sign = off > 0 ? '+1' : off < 0 ? '-1' : '';
+  const label = (base || 'bound') + sign;
+  return { base, off, label };
+}
+
+/**
+ * Expand a length-bounded string hint into one BoundaryPoint per segment.
+ * min/max come from the constraints; a point OUTSIDE [min,max] is invalid, inside/on-edge is valid.
+ */
+function expandLength(type: string, hint: string, c: Record<string, any>): BoundaryPoint[] {
+  const min = c.minLength ?? c.length ?? c.minlength;
+  const max = c.maxLength ?? c.length ?? c.maxlength;
+  const segs = segments(hint);
+  const out: BoundaryPoint[] = [];
+  let idx = 0;
+  for (const seg of segs) {
+    const { base, off, label } = readOffset(seg);
+    const anchor = base === 'max' ? max : base === 'length' ? (c.length ?? max ?? min) : min;
+    if (!Number.isFinite(anchor)) {
+      out.push({ suffix: suffixOf(idx++), value: null, validity: base === null ? 'valid' : 'valid', label, todo: 'minLength/maxLength/length' });
+      continue;
+    }
+    const n = anchor + off;
+    const lo = Number.isFinite(min) ? min : 0;
+    const hi = Number.isFinite(max) ? max : Infinity;
+    const validity: Validity = n >= lo && n <= hi && n >= 1 ? 'valid' : 'invalid';
+    out.push({ suffix: suffixOf(idx++), value: fillString(type, Math.max(0, n)), validity, label });
+  }
+  return out.length ? out : [{ suffix: '', value: null, validity: 'valid', label: 'bound', todo: 'minLength/maxLength' }];
+}
+
+/** Expand a numeric value hint. Float/currency use a precision step, not a fixed ±1. */
+function expandNumeric(type: string, hint: string, c: Record<string, any>): BoundaryPoint[] {
+  const min = c.min, max = c.max;
+  const st = step(type, c);
+  const segs = segments(hint);
+  const out: BoundaryPoint[] = [];
+  let idx = 0;
+  for (const seg of segs) {
+    const s = seg.toLowerCase();
+    // Decimal-places boundary (float): "exact decimal places" valid; "one extra digit" invalid.
+    if (/decimal|precision|extra digit/.test(s)) {
+      const dp = Number.isFinite(c.decimalPlaces) ? c.decimalPlaces : 2;
+      if (/extra|one extra|\+1|too many/.test(s)) {
+        out.push({ suffix: suffixOf(idx++), value: '0.' + '1'.repeat(dp + 1), validity: 'invalid', label: `decimalPlaces+1` });
+      } else {
+        out.push({ suffix: suffixOf(idx++), value: '0.' + '1'.repeat(Math.max(1, dp)), validity: 'valid', label: `decimalPlaces` });
+      }
+      continue;
+    }
+    const { base, off, label } = readOffset(seg);
+    const anchor = base === 'max' ? max : min;
+    if (!Number.isFinite(anchor)) {
+      out.push({ suffix: suffixOf(idx++), value: null, validity: 'valid', label, todo: 'min/max' });
+      continue;
+    }
+    const n = anchor + off * st;
+    const lo = Number.isFinite(min) ? min : -Infinity;
+    const hi = Number.isFinite(max) ? max : Infinity;
+    const validity: Validity = n >= lo && n <= hi ? 'valid' : 'invalid';
+    out.push({ suffix: suffixOf(idx++), value: fmtNum(type, c, n), validity, label });
+  }
+  return out.length ? out : [{ suffix: '', value: null, validity: 'valid', label: 'bound', todo: 'min/max' }];
+}
+
+/** Build an email at a target local or total length while honoring BOTH maxLocal and maxTotal. */
+function synthEmail(c: Record<string, any>, which: 'maxLocal' | 'maxTotal', off: number): string | null {
+  const maxLocal = Number(c.maxLocal);
+  const maxTotal = Number(c.maxTotal);
+  if (which === 'maxLocal') {
+    if (!Number.isFinite(maxLocal)) return null;
+    const localLen = Math.max(1, maxLocal + off);
+    return fillLen(localLen) + '@example.com';
+  }
+  // maxTotal: keep the local part ≤ maxLocal, pad the DOMAIN to reach the total length.
+  if (!Number.isFinite(maxTotal)) return null;
+  const total = maxTotal + off;
+  const localLen = Number.isFinite(maxLocal) ? Math.min(maxLocal, 24) : 24;
+  const fixed = 1 /* @ */ + 4 /* .com */;
+  const subLen = total - localLen - fixed;
+  if (subLen < 1) return fillLen(Math.max(1, total - fixed)) + '@x.io'.slice(0, Math.max(4, fixed));
+  return fillLen(localLen) + '@' + fillLen(subLen) + '.com';
+}
+
+/** Expand an email length hint (single point per catalog entry today, but honors both constraints). */
+function expandEmail(hint: string, c: Record<string, any>): BoundaryPoint[] {
+  const segs = segments(hint);
+  const out: BoundaryPoint[] = [];
+  let idx = 0;
+  for (const seg of segs) {
+    const { off, label } = readOffset(seg);
+    const s = seg.toLowerCase();
+    const which: 'maxLocal' | 'maxTotal' = /total/.test(s) ? 'maxTotal' : 'maxLocal';
+    const value = synthEmail(c, which, off);
+    if (value == null) { out.push({ suffix: suffixOf(idx++), value: null, validity: 'valid', label, todo: which }); continue; }
+    const validity: Validity = satisfiesEmail(value, c) ? 'valid' : 'invalid';
+    out.push({ suffix: suffixOf(idx++), value, validity, label: `${which}${off > 0 ? '+1' : off < 0 ? '-1' : ''}` });
+  }
+  return out.length ? out : [{ suffix: '', value: null, validity: 'valid', label: 'bound', todo: 'maxLocal/maxTotal' }];
+}
+
+function suffixOf(i: number): string {
+  return i === 0 ? '' : String.fromCharCode(96 + i); // 0→'' , 1→'a', 2→'b', … (id becomes CHK-INT-B1, CHK-INT-B1a, …)
+}
+
+/**
+ * Public entry: expand a boundary/invalid hint into structured points.
+ * Returns one point per segment; each carries the value AND the oracle's expected validity.
+ */
+export function expandBoundaryHint(hint: string, type: string, c: Record<string, any>): BoundaryPoint[] {
+  if (type === 'email') return expandEmail(hint, c);
+  if (STR_TYPES.has(type)) return expandLength(type, hint, c);
+  if (NUM_TYPES.has(type)) return expandNumeric(type, hint, c);
+  return [{ suffix: '', value: null, validity: 'valid', label: 'bound', todo: 'value/gen not resolvable' }];
+}
+
+// ---- The validity oracle: does a value structurally satisfy the constraints? --------------------
+
+export function satisfiesEmail(value: string, c: Record<string, any>): boolean {
+  const at = value.indexOf('@');
+  if (at <= 0 || at === value.length - 1) return false;
+  const local = value.slice(0, at);
+  if (Number.isFinite(c.maxLocal) && local.length > c.maxLocal) return false;
+  if (Number.isFinite(c.maxTotal) && value.length > c.maxTotal) return false;
+  return true;
+}
+
+function satisfiesLength(type: string, value: string, c: Record<string, any>): boolean {
+  const min = c.minLength ?? c.length;
+  const max = c.maxLength ?? c.length;
+  if (Number.isFinite(min) && value.length < min) return false;
+  if (Number.isFinite(max) && value.length > max) return false;
+  return true;
+}
+
+function satisfiesNumeric(type: string, value: string, c: Record<string, any>): boolean {
+  const n = Number(value);
+  if (!Number.isFinite(n)) return false;
+  if (Number.isFinite(c.min) && n < c.min) return false;
+  if (Number.isFinite(c.max) && n > c.max) return false;
+  if ((type === 'number-integer') && !Number.isInteger(n)) return false;
+  if ((type === 'number-float' || type === 'currency') && Number.isFinite(c.decimalPlaces)) {
+    const dec = (value.split('.')[1] || '').length;
+    if (dec > c.decimalPlaces) return false;
+  }
+  return true;
+}
+
+/**
+ * The oracle. Given a concrete value and the constraints, decide whether it structurally satisfies
+ * them (length/range/precision — NOT charset/format, which the catalog encodes as literal invalids).
+ * Returns null when the type has no numeric/length constraint to check against (nothing to assert).
+ */
+export function satisfiesConstraints(type: string, value: string | null, c: Record<string, any>): boolean | null {
+  if (value == null) return null;
+  if (type === 'email') return satisfiesEmail(value, c);
+  if (STR_TYPES.has(type)) {
+    if (!Number.isFinite(c.minLength ?? c.length) && !Number.isFinite(c.maxLength ?? c.length)) return null;
+    return satisfiesLength(type, value, c);
+  }
+  if (NUM_TYPES.has(type)) {
+    if (!Number.isFinite(c.min) && !Number.isFinite(c.max) && !Number.isFinite(c.decimalPlaces)) return null;
+    return satisfiesNumeric(type, value, c);
+  }
+  return null;
+}

package/src/catalog-loader.ts

@@ -14,7 +14,7 @@ import { readFileSync, readdirSync, existsSync, statSync } from 'fs';
 import { join } from 'path';
 import { createHash } from 'crypto';
 import { parse as parseYaml } from 'yaml';
-import type { Catalog, FieldType, SecurityBank, Technique, DataPoint, OverwriteWarning } from './types';
+import type { Catalog, FieldType, SecurityBank, Technique, DataPoint, OverwriteWarning, CatalogProvenance, FieldTypeProvenance } from './types';
 
 /** Resolve the packaged `common/` dir (works from src/ in dev via tsx and from dist/ when built). */
 export function commonDir(): string {
@@ -52,27 +52,63 @@ export function loadShippedCatalog(root = commonDir()): Catalog {
   return { fieldTypes, security, techniques };
 }
 
-/** Merge a field-type's group by DataPoint.id — overlay entries replace same-id, new ids append. */
-function mergeGroup(base: DataPoint[] = [], overlay: DataPoint[] = []): DataPoint[] {
+/**
+ * Merge a field-type group by DataPoint.id, honoring three explicit operations:
+ *   - EXTEND: an overlay id not in `base` is appended (`added`).
+ *   - REPLACE: an overlay id already in `base` wins (`replaced`).
+ *   - DISABLE: an id in `disableSet` is dropped (`disabled`).
+ * Records provenance and stamps each point's `source` so a reader can trace where it came from.
+ */
+function mergeGroup(
+  base: DataPoint[] = [],
+  overlay: DataPoint[] = [],
+  disableSet: Set<string>,
+  prov: FieldTypeProvenance,
+): DataPoint[] {
   const byId = new Map<string, DataPoint>();
-  for (const dp of base) byId.set(dp.id, dp);
-  for (const dp of overlay) byId.set(dp.id, { ...byId.get(dp.id), ...dp });
+  for (const dp of base) byId.set(dp.id, { ...dp, source: 'shipped' });
+  for (const dp of overlay) {
+    if (byId.has(dp.id)) prov.replaced.push(dp.id);
+    else prov.added.push(dp.id);
+    byId.set(dp.id, { ...byId.get(dp.id), ...dp, source: 'overwrite' });
+  }
+  for (const id of disableSet) {
+    if (byId.delete(id)) prov.disabled.push(id);
+  }
   return [...byId.values()];
 }
 
-function mergeFieldType(base: FieldType, overlay: Partial<FieldType>): FieldType {
+/** An overlay field-type entry may carry a `disable:` list of ids alongside partial field-type data. */
+type FieldTypeOverlay = Partial<FieldType> & { disable?: string[] };
+
+function mergeFieldType(base: FieldType, overlay: FieldTypeOverlay, prov: FieldTypeProvenance): FieldType {
+  const disableSet = new Set(overlay.disable || []);
+  const constraintsOverridden = Object.keys(overlay.constraints || {}).filter(
+    (k) => (base.constraints || {})[k] !== (overlay.constraints || {})[k],
+  );
+  prov.constraintsOverridden = constraintsOverridden;
+  prov.securityChanged = overlay.uses_security != null;
+  const { disable: _disable, ...rest } = overlay;
   return {
     ...base,
-    ...overlay,
+    ...rest,
     constraints: { ...(base.constraints || {}), ...(overlay.constraints || {}) },
     uses_security: overlay.uses_security ?? base.uses_security,
-    valid: mergeGroup(base.valid, overlay.valid),
-    boundary: mergeGroup(base.boundary, overlay.boundary),
-    invalid: mergeGroup(base.invalid, overlay.invalid),
+    valid: mergeGroup(base.valid, overlay.valid, disableSet, prov),
+    boundary: mergeGroup(base.boundary, overlay.boundary, disableSet, prov),
+    invalid: mergeGroup(base.invalid, overlay.invalid, disableSet, prov),
     notes: [...(base.notes || []), ...(overlay.notes || [])],
   };
 }
 
+/** Merge a security bank by payload id (same rules: replace same-id, append new). */
+function mergeSecurity(base: SecurityBank, overlay: Partial<SecurityBank>): SecurityBank {
+  const byId = new Map<string, any>();
+  for (const p of base.payloads || []) byId.set(p.id, p);
+  for (const p of overlay.payloads || []) byId.set(p.id, { ...byId.get(p.id), ...p });
+  return { ...base, ...overlay, payloads: [...byId.values()] };
+}
+
 /**
  * Load the effective catalog = shipped common + project overwrite overlay.
  * `projectDir` is the QA repo root; overlay is read from `qa/data-factory/common.overwrite.yaml`.
@@ -80,22 +116,32 @@ function mergeFieldType(base: FieldType, overlay: Partial<FieldType>): FieldType
 export function loadEffectiveCatalog(projectDir: string, root = commonDir()): {
   catalog: Catalog;
   warnings: OverwriteWarning[];
+  provenance: CatalogProvenance;
 } {
   const shipped = loadShippedCatalog(root);
   const overlayPath = join(projectDir, 'qa', 'data-factory', 'common.overwrite.yaml');
   const warnings: OverwriteWarning[] = [];
-  if (!existsSync(overlayPath)) return { catalog: shipped, warnings };
+  const provenance: CatalogProvenance = { fieldTypes: {}, newFieldTypes: [], security: { added: [], replaced: [] }, techniques: { added: [], replaced: [] } };
+  if (!existsSync(overlayPath)) return { catalog: shipped, warnings, provenance };
 
   const overlay = parseYaml(readFileSync(overlayPath, 'utf8')) || {};
-  const overlayFieldTypes: Record<string, Partial<FieldType>> = overlay.fieldTypes || overlay['field-types'] || {};
+  const overlayFieldTypes: Record<string, FieldTypeOverlay> = overlay.fieldTypes || overlay['field-types'] || {};
   const merged: Catalog = {
     fieldTypes: { ...shipped.fieldTypes },
     security: { ...shipped.security },
     techniques: { ...shipped.techniques },
   };
+
   for (const [type, ov] of Object.entries(overlayFieldTypes)) {
     if (merged.fieldTypes[type]) {
-      merged.fieldTypes[type] = mergeFieldType(merged.fieldTypes[type], ov);
+      const prov: FieldTypeProvenance = { type, disabled: [], replaced: [], added: [], constraintsOverridden: [], securityChanged: false };
+      // Warn on a disable target that does not exist in the shipped field-type (likely a typo/stale id).
+      const known = new Set([...(merged.fieldTypes[type].valid || []), ...(merged.fieldTypes[type].boundary || []), ...(merged.fieldTypes[type].invalid || [])].map((d) => d.id));
+      for (const id of ov.disable || []) {
+        if (!known.has(id)) warnings.push({ fieldType: type, detail: `disable target "${id}" does not exist in the shipped "${type}" catalog`, suggestion: `remove the stale id from the "${type}".disable list in qa/data-factory/common.overwrite.yaml` });
+      }
+      merged.fieldTypes[type] = mergeFieldType(merged.fieldTypes[type], ov, prov);
+      provenance.fieldTypes[type] = prov;
       // Drift warning: overlay references a security bank the shipped common no longer has.
       for (const bank of ov.uses_security || []) {
         if (!merged.security[bank]) {
@@ -108,10 +154,45 @@ export function loadEffectiveCatalog(projectDir: string, root = commonDir()): {
       }
     } else {
       // Wholly new field-type from the user — accept as-is (project-specific type).
-      merged.fieldTypes[type] = ov as FieldType;
+      const { disable: _d, ...rest } = ov;
+      merged.fieldTypes[type] = rest as FieldType;
+      provenance.newFieldTypes.push(type);
     }
   }
-  return { catalog: merged, warnings };
+
+  // Security-bank overrides (`security:` in the overwrite) — replace same-id payloads, append new banks.
+  const overlaySecurity: Record<string, Partial<SecurityBank>> = overlay.security || {};
+  for (const [cls, ov] of Object.entries(overlaySecurity)) {
+    if (merged.security[cls]) { merged.security[cls] = mergeSecurity(merged.security[cls], ov); provenance.security.replaced.push(cls); }
+    else { merged.security[cls] = { class: cls, payloads: [], ...ov } as SecurityBank; provenance.security.added.push(cls); }
+  }
+
+  // Technique overrides (`techniques:` in the overwrite) — shallow replace/add by name.
+  const overlayTech: Record<string, Partial<Technique>> = overlay.techniques || {};
+  for (const [name, ov] of Object.entries(overlayTech)) {
+    if (merged.techniques[name]) { merged.techniques[name] = { ...merged.techniques[name], ...ov }; provenance.techniques.replaced.push(name); }
+    else { merged.techniques[name] = { technique: name, ...ov } as Technique; provenance.techniques.added.push(name); }
+  }
+
+  return { catalog: merged, warnings, provenance };
+}
+
+/** Human-readable one-liners describing what `.overwrite` changed (for lint/sensor "no silent overwrite"). */
+export function describeProvenance(p: CatalogProvenance): string[] {
+  const lines: string[] = [];
+  for (const ft of Object.values(p.fieldTypes)) {
+    const parts: string[] = [];
+    if (ft.disabled.length) parts.push(`disabled ${ft.disabled.join(', ')}`);
+    if (ft.replaced.length) parts.push(`replaced ${ft.replaced.join(', ')}`);
+    if (ft.added.length) parts.push(`added ${ft.added.join(', ')}`);
+    if (ft.constraintsOverridden.length) parts.push(`constraints[${ft.constraintsOverridden.join(', ')}]`);
+    if (ft.securityChanged) parts.push('uses_security replaced');
+    if (parts.length) lines.push(`${ft.type}: ${parts.join('; ')}`);
+  }
+  for (const t of p.newFieldTypes) lines.push(`${t}: new project field-type`);
+  if (p.security.replaced.length || p.security.added.length) lines.push(`security: ${[...p.security.replaced.map((s) => `replaced ${s}`), ...p.security.added.map((s) => `added ${s}`)].join('; ')}`);
+  if (p.techniques.replaced.length || p.techniques.added.length) lines.push(`techniques: ${[...p.techniques.replaced.map((s) => `replaced ${s}`), ...p.techniques.added.map((s) => `added ${s}`)].join('; ')}`);
+  return lines;
 }
 
 /** Stable hash of the shipped common — recorded in df-manifest.json to detect update drift. */

package/src/cli.ts

@@ -10,9 +10,10 @@ import { readFileSync, writeFileSync, existsSync, readdirSync, mkdirSync } from
 import { join, dirname } from 'path';
 import { createInterface } from 'readline';
 import { parse as parseYaml, stringify as stringifyYaml } from 'yaml';
-import { loadEffectiveCatalog } from './catalog-loader';
+import { loadEffectiveCatalog, describeProvenance } from './catalog-loader';
 import { expandFieldMap, renderTestData, type FieldMap } from './generator';
 import { lintFieldMap, summarize } from './lint';
+import { validateGenerated } from './validate';
 import { generateFixture } from './fixture';
 import { ensureDataFactoryReadme } from './readme';
 
@@ -50,8 +51,9 @@ function loadFieldMap(cwd: string, name: string): FieldMap | null {
 async function genOne(cwd: string, name: string, opts: { force?: boolean }): Promise<'written' | 'skipped' | 'missing'> {
   const map = loadFieldMap(cwd, name);
   if (!map) { console.error(`  ✗ ${name}: no field-map at qa/data-factory/${name}.fields.yaml (author it first, e.g. via /sungen:create-data-test)`); return 'missing'; }
-  const { catalog, warnings } = loadEffectiveCatalog(cwd);
+  const { catalog, warnings, provenance } = loadEffectiveCatalog(cwd);
   for (const w of warnings) console.warn(`  ⚠ overwrite: ${w.detail} → ${w.suggestion}`);
+  for (const line of describeProvenance(provenance)) console.log(`  ⟲ .overwrite → ${line}`);
 
   const expanded = expandFieldMap(map, catalog);
   const out = testDataPath(cwd, name);
@@ -146,6 +148,50 @@ export function registerDataFactoryCommand(program: any): void {
       if (totalErrors) process.exitCode = 1;
     });
 
+  data
+    .command('validate')
+    .description('Verify every generated value is semantically correct (valid values satisfy the constraints; synthesized invalid values violate them)')
+    .option('--screen <name>', 'Validate one unit (default: all field-maps)')
+    .action((opts: { screen?: string }) => {
+      const cwd = process.cwd();
+      ensureDataFactoryReadme(cwd);
+      const names = opts.screen ? [opts.screen] : listFieldMaps(cwd);
+      if (names.length === 0) { console.error('No field-maps under qa/data-factory/*.fields.yaml.'); process.exitCode = 1; return; }
+      const { catalog } = loadEffectiveCatalog(cwd);
+      let totalErrors = 0;
+      for (const name of names) {
+        const map = loadFieldMap(cwd, name);
+        if (!map) { console.error(`✗ ${name}: no field-map`); totalErrors++; continue; }
+        const findings = validateGenerated(map, catalog);
+        const errors = findings.filter((f) => f.severity === 'error').length;
+        const warns = findings.filter((f) => f.severity === 'warn').length;
+        totalErrors += errors;
+        const badge = errors ? '✗' : warns ? '⚠' : '✓';
+        console.log(`${badge} ${name}: ${errors} error · ${warns} warn`);
+        for (const f of findings) {
+          console.log(`${f.severity === 'error' ? '  ✗' : '  ⚠'} [${f.field}] ${f.code}: ${f.message}`);
+        }
+      }
+      if (totalErrors) process.exitCode = 1;
+    });
+
+  data
+    .command('provenance')
+    .description('Show what qa/data-factory/common.overwrite.yaml changed vs the shipped company catalog (extend/replace/disable) — "no silent overwrite"')
+    .action(() => {
+      const cwd = process.cwd();
+      ensureDataFactoryReadme(cwd);
+      const { provenance, warnings } = loadEffectiveCatalog(cwd);
+      const lines = describeProvenance(provenance);
+      if (lines.length === 0) {
+        console.log('No project overrides — the effective catalog is the shipped company common as-is.');
+      } else {
+        console.log('Project overrides (qa/data-factory/common.overwrite.yaml):');
+        for (const l of lines) console.log(`  ⟲ ${l}`);
+      }
+      for (const w of warnings) console.warn(`  ⚠ ${w.detail} → ${w.suggestion}`);
+    });
+
   data
     .command('fixture')
     .description('Generate a CSV import fixture from the field-map (bulk-import / file-upload testing)')

package/src/generator.ts

@@ -10,6 +10,7 @@
  * same output (determinism is an asset). Nothing here reads a live page or an LLM.
  */
 import type { Catalog, FieldType, DataPoint } from './types';
+import { expandBoundaryHint, satisfiesConstraints, type Validity } from './boundary';
 
 export interface FieldDef {
   name: string;
@@ -57,6 +58,21 @@ export interface ExpandedPoint {
   open?: boolean;
   /** Value could not be synthesized deterministically (missing constraint) — needs input. */
   todo?: string;
+  /**
+   * The generator's expectation for this value: does it satisfy the field's constraints (`valid`) or
+   * violate them (`invalid`)? Computed by the boundary oracle for synthesized points; `valid` for the
+   * happy-path group and `invalid` for declared-invalid values. `validateGenerated` re-checks it — a
+   * mismatch (a `valid`-expected value that fails the constraints, or vice versa) is a defect.
+   */
+  expectedValidity?: Validity;
+  /**
+   * True when the VALUE was synthesized from a numeric/length boundary (so its whole validity claim is
+   * about range). The validator only second-guesses an `invalid` point when it is synthesized — a
+   * literal charset/format invalid (or a security payload) legitimately satisfies the length oracle.
+   */
+  synthesized?: boolean;
+  /** Provenance: `overwrite` when the project's `.overwrite` replaced/added this point (else shipped). */
+  source?: 'shipped' | 'overwrite';
 }
 
 export interface ExpandedField {
@@ -70,76 +86,32 @@ export interface ExpandedField {
   dependsOn?: { field: string; value?: string };
 }
 
-/** Deterministic filler: a string of exactly `n` chars from a charset seed. */
-function fillLen(n: number, base = 'a'): string {
-  if (!Number.isFinite(n) || n <= 0) return '';
-  return base.repeat(n).slice(0, n);
-}
-
-/** Build an email of a given total or local length (half-width), with a boundary offset (-1/0/+1). */
-function synthEmail(constraints: Record<string, any>, which: 'maxLocal' | 'maxTotal', offset = 0): string | null {
-  const domain = '@example.com';
-  if (which === 'maxLocal' && Number.isFinite(constraints.maxLocal)) {
-    return fillLen(constraints.maxLocal + offset) + domain;
-  }
-  if (which === 'maxTotal' && Number.isFinite(constraints.maxTotal)) {
-    const localLen = Math.max(1, constraints.maxTotal + offset - domain.length);
-    return fillLen(localLen) + domain;
+/**
+ * Coerce an out-of-range numeric VALID literal into range, so a project's `valid` representative is
+ * actually valid for its constraints (a generic catalog example like `123` under `max: 100` becomes
+ * `100`). Returns null when in range already, or the type isn't numeric (non-numeric mismatches are
+ * left for the validator to flag — the field-map should supply a fitting value).
+ */
+function coerceValidNumeric(type: string, value: string, c: Record<string, any>): string | null {
+  if (!['number-integer', 'number-float', 'currency'].includes(type)) return null;
+  const n = Number(value);
+  if (!Number.isFinite(n)) return null;
+  let out = n;
+  if (Number.isFinite(c.min) && out < c.min) out = c.min;
+  if (Number.isFinite(c.max) && out > c.max) out = c.max;
+  if (out === n) return null; // already in range
+  if (type === 'number-float' || (type === 'currency' && c.decimalPlaces > 0)) {
+    const dp = Number.isFinite(c.decimalPlaces) ? c.decimalPlaces : 2;
+    return out.toFixed(dp);
   }
-  return null;
+  return String(Math.round(out));
 }
 
-/** Try to synthesize a boundary/gen value from constraints. Returns null when data is insufficient. */
-function synthesize(dp: DataPoint, type: string, c: Record<string, any>): { value: string | null; todo?: string } {
-  if (dp.value != null) return { value: dp.value };
-  const hint = `${dp.gen || ''} ${dp.note || ''}`.toLowerCase();
-
-  // Email length boundaries. `>` / "over" → over-boundary (invalid, offset +1).
-  if (type === 'email') {
-    const over = hint.includes('>') || hint.includes('over');
-    const offset = over ? 1 : hint.includes('-1') ? -1 : hint.includes('+1') ? 1 : 0;
-    if (hint.includes('maxlocal') || (hint.includes('local') && (hint.includes('max') || over))) {
-      const v = synthEmail(c, 'maxLocal', offset); return v ? { value: v } : { value: null, todo: 'maxLocal' };
-    }
-    if (hint.includes('maxtotal') || hint.includes('total')) {
-      const v = synthEmail(c, 'maxTotal', offset); return v ? { value: v } : { value: null, todo: 'maxTotal' };
-    }
-  }
-
-  // String-length types: min / max length boundaries.
-  const strTypes = ['string', 'password', 'phone', 'postcode', 'katakana'];
-  if (strTypes.includes(type)) {
-    const min = c.minLength ?? c.length;
-    const max = c.maxLength ?? c.length;
-    if (hint.includes('min') && Number.isFinite(min)) {
-      const n = hint.includes('+1') ? min + 1 : min;
-      return { value: fillLen(n, type === 'password' ? 'Aa1' : 'a') };
-    }
-    if (hint.includes('max') && Number.isFinite(max)) {
-      const n = hint.includes('-1') ? max - 1 : max;
-      return { value: fillLen(n, type === 'password' ? 'Aa1' : 'a') };
-    }
-    return { value: null, todo: 'minLength/maxLength' };
-  }
-
-  // Numeric types: min / max value boundaries.
-  const numTypes = ['number-integer', 'number-float', 'currency'];
-  if (numTypes.includes(type)) {
-    const min = c.min, max = c.max;
-    if (hint.includes('min') && Number.isFinite(min)) {
-      if (hint.includes('-1')) return { value: String(min - 1) };
-      if (hint.includes('+1')) return { value: String(min + 1) };
-      return { value: String(min) };
-    }
-    if (hint.includes('max') && Number.isFinite(max)) {
-      if (hint.includes('+1')) return { value: String(max + 1) };
-      if (hint.includes('-1')) return { value: String(max - 1) };
-      return { value: String(max) };
-    }
-    return { value: null, todo: 'min/max' };
-  }
-
-  return { value: null, todo: 'value/gen not resolvable' };
+/** A gen hint that references a numeric/length boundary the generator can expand structurally. */
+function isBoundaryHint(hint: string): boolean {
+  return /\bmin\b|\bmax\b|minimum|maximum|length|byte|exact|decimal|precision|local|total|over|below|under|exceed|\+\s*1|-\s*1|<|>/.test(
+    hint.toLowerCase(),
+  );
 }
 
 function resolveError(dp: DataPoint, errorMap?: Record<string, string>): { expectedError?: string; open?: boolean } {
@@ -179,26 +151,77 @@ export function expandField(field: FieldDef, catalog: Catalog): ExpandedField {
   if (!ft) return { name: field.name, type: field.type, blindSpot: true, points: [], ...(field.dependsOn ? { dependsOn: field.dependsOn } : {}) };
 
   const c = { ...(ft.constraints || {}), ...(field.constraints || {}) };
+  const type = field.type as string;
   const points: ExpandedPoint[] = [];
 
-  const push = (dp: DataPoint, group: ExpandedPoint['group']) => {
-    const s = synthesize(dp, field.type, c);
-    // Uniqueness: only the VALID (happy-path create) value gets a fresh-per-run suffix. Boundary/invalid
-    // stay literal — they test rules, not record creation.
-    const value = group === 'valid' && field.unique && s.value != null
-      ? makeUnique(s.value, field.type)
-      : s.value;
-    points.push({
+  // Default validity for a group: the happy path is valid; the invalid group is invalid; a boundary
+  // point's validity is decided per-point by the oracle (in/out of range).
+  const groupValidity = (group: ExpandedPoint['group']): Validity => (group === 'invalid' ? 'invalid' : 'valid');
+
+  const emit = (p: Omit<ExpandedPoint, 'expectedValidity'> & { expectedValidity: Validity }) => points.push(p);
+
+  const pushLiteral = (dp: DataPoint, group: ExpandedPoint['group'], value: string | null, opts: { validity?: Validity; label?: string; todo?: string } = {}) => {
+    // A valid representative must be valid for the project: clamp an out-of-range numeric literal.
+    let coerceNote: string | undefined;
+    if (group === 'valid' && value != null && satisfiesConstraints(type, value, c) === false) {
+      const fixed = coerceValidNumeric(type, value, c);
+      if (fixed != null) { value = fixed; coerceNote = 'adjusted to fit constraints'; }
+    }
+    const isUniqueValid = group === 'valid' && field.unique && value != null;
+    const v = isUniqueValid ? makeUnique(value!, type) : value;
+    // Expected validity reflects INTENT by group, so the validator (validateGenerated) can catch a
+    // mismatch against the oracle instead of the mismatch being silently absorbed here:
+    //   - valid group   → `valid` (a value that actually violates the constraints is a VALUE_NOT_VALID).
+    //   - invalid group → `invalid` (declared: charset/format/blocklist/behavior — the length oracle
+    //     cannot "prove" such a literal valid, so it must NOT flip it to valid).
+    //   - boundary group → the oracle decides (that group is precisely about range).
+    let validity: Validity;
+    if (dp.validity) validity = dp.validity;
+    else if (group === 'boundary') {
+      const oracle = satisfiesConstraints(type, isUniqueValid ? value : v, c);
+      validity = oracle == null ? (opts.validity ?? 'valid') : oracle ? 'valid' : 'invalid';
+    } else validity = opts.validity ?? groupValidity(group);
+    emit({
       id: dp.id,
       group,
-      value,
-      todo: s.todo,
+      value: v,
+      todo: opts.todo,
       reason: dp.reason,
-      note: field.unique && group === 'valid' && s.value != null ? `${dp.note ? dp.note + ' · ' : ''}fresh per run` : dp.note,
+      note: isUniqueValid ? `${dp.note ? dp.note + ' · ' : ''}fresh per run` : coerceNote ? `${dp.note ? dp.note + ' · ' : ''}${coerceNote}` : (opts.label ? `${dp.note ? dp.note + ' · ' : ''}${opts.label}` : dp.note),
+      expectedValidity: validity,
+      ...(dp.source === 'overwrite' ? { source: 'overwrite' as const } : {}),
       ...resolveError(dp, field.errorMap),
     });
   };
 
+  const push = (dp: DataPoint, group: ExpandedPoint['group']) => {
+    // Literal value in the catalog/overwrite → one point (oracle still judges its validity).
+    if (dp.value != null) return pushLiteral(dp, group, dp.value);
+
+    const hint = `${dp.gen || ''} ${dp.note || ''}`.trim();
+    // A boundary/length/numeric hint → expand to one case PER boundary point, each with its validity.
+    if (hint && isBoundaryHint(hint)) {
+      const pts = expandBoundaryHint(hint, type, c);
+      for (const bp of pts) {
+        emit({
+          id: dp.id + bp.suffix,
+          group,
+          value: bp.value,
+          todo: bp.todo,
+          reason: dp.reason,
+          note: bp.label && !bp.todo ? `${dp.note ? dp.note + ' · ' : ''}${bp.label}` : dp.note,
+          expectedValidity: dp.validity ?? bp.validity,
+          synthesized: bp.value != null,
+          ...(dp.source === 'overwrite' ? { source: 'overwrite' as const } : {}),
+          ...resolveError(dp, field.errorMap),
+        });
+      }
+      return;
+    }
+    // A non-boundary gen (charset/full-width/format) — can't synthesize deterministically; keep open.
+    pushLiteral(dp, group, null, { validity: groupValidity(group), todo: dp.gen ? `synthesize: ${dp.gen}` : 'value/gen not resolvable' });
+  };
+
   for (const dp of ft.valid || []) push(dp, 'valid');
   for (const dp of ft.boundary || []) push(dp, 'boundary');
   for (const dp of ft.invalid || []) {
@@ -218,6 +241,8 @@ export function expandField(field: FieldDef, catalog: Catalog): ExpandedField {
         todo: p.value == null ? `security technique: ${p.technique || bank}` : undefined,
         reason: `${bank}: ${(p.reason as string) || (p.kind as string) || (p.technique as string) || ''}`.trim(),
         note: b.oracle,
+        // Adversarial payloads are treated as invalid input (must be rejected/escaped, never accepted).
+        expectedValidity: 'invalid',
       });
     }
   }
@@ -259,8 +284,8 @@ function renderOne(f: ExpandedField): Record<string, any> {
   return {
     ...dep,
     valid: valid[0]?.value ?? null,
-    boundary: boundary.map((p) => trim({ id: p.id, value: p.value, note: p.note, todo: p.todo })),
-    invalid: invalid.map((p) => trim({ id: p.id, value: p.value, expected_error: p.expectedError, open: p.open, reason: p.reason, todo: p.todo })),
+    boundary: boundary.map((p) => trim({ id: p.id, value: p.value, expected: p.expectedValidity, via: p.source === 'overwrite' ? '.overwrite' : undefined, note: p.note, todo: p.todo })),
+    invalid: invalid.map((p) => trim({ id: p.id, value: p.value, expected: p.expectedValidity, via: p.source === 'overwrite' ? '.overwrite' : undefined, expected_error: p.expectedError, open: p.open, reason: p.reason, todo: p.todo })),
   };
 }
 

package/src/index.ts

@@ -18,17 +18,21 @@ import { registerDataFactoryCommand } from './cli';
 import { dataFactoryCoverageSensor } from './sensor';
 import { dfPreconditionCodegen } from './precondition';
 
-export { loadShippedCatalog, loadEffectiveCatalog, shippedCommonHash, commonDir } from './catalog-loader';
+export { loadShippedCatalog, loadEffectiveCatalog, shippedCommonHash, commonDir, describeProvenance } from './catalog-loader';
 export { expandField, expandFieldMap, renderTestData } from './generator';
 export type { FieldDef, FieldMap, ExpandedField, ExpandedPoint } from './generator';
 export { lintFieldMap, summarize } from './lint';
 export type { LintIssue } from './lint';
+export { validateGenerated, validatePoints } from './validate';
+export type { ValidationFinding } from './validate';
+export { expandBoundaryHint, satisfiesConstraints } from './boundary';
+export type { Validity, BoundaryPoint } from './boundary';
 export { registerDataFactoryCommand } from './cli';
 export { generateFixture } from './fixture';
 export type { FixtureResult } from './fixture';
 export { dataFactoryCoverageSensor } from './sensor';
 export { dfPreconditionCodegen } from './precondition';
-export type { Catalog, FieldType, SecurityBank, Technique, DataPoint, OverwriteWarning } from './types';
+export type { Catalog, FieldType, SecurityBank, Technique, DataPoint, OverwriteWarning, CatalogProvenance, FieldTypeProvenance } from './types';
 
 /** Register the Data Factory capability. */
 export function register(registry: CapabilityRegistry): void {

package/src/sensor.ts

@@ -17,6 +17,7 @@ import { parse as parseYaml } from 'yaml';
 import type { Sensor } from '@sun-asterisk/sungen';
 import { loadEffectiveCatalog } from './catalog-loader';
 import { lintFieldMap, summarize } from './lint';
+import { validateGenerated } from './validate';
 import type { FieldMap } from './generator';
 
 export const dataFactoryCoverageSensor: Sensor<{ dir: string; cwd: string }> = {
@@ -49,6 +50,17 @@ export const dataFactoryCoverageSensor: Sensor<{ dir: string; cwd: string }> = {
         severity: 'warn',
       });
     }
+    // Semantic validity (M1): a value labeled valid that violates the constraints (or a synthesized
+    // boundary that lands in-range) — the "structurally right but semantically wrong" class.
+    for (const v of validateGenerated(map, catalog)) {
+      findings.push({
+        sensorId: 'data-factory-coverage',
+        capability: 'data-factory',
+        scenario: v.field,
+        message: `DATA-FACTORY-${v.code}: ${v.message}`,
+        severity: v.severity,
+      });
+    }
     if (findings.length) {
       const s = summarize(issues);
       findings.unshift({

package/src/types.ts

@@ -18,6 +18,18 @@ export interface DataPoint {
   /** Pull values from a security bank (e.g. `security/sqli`) into this group. */
   from?: string;
   note?: string;
+  /**
+   * Optional explicit validity for this point (`valid` | `invalid`). Normally the generator's oracle
+   * computes it from the constraints; set this only to pin an intent the constraints can't express
+   * (e.g. a format-invalid value whose length happens to sit inside the range).
+   */
+  validity?: 'valid' | 'invalid';
+  /**
+   * Where this point ended up coming from after the `.overwrite` merge — `shipped` (company common) or
+   * `overwrite` (the project replaced/added it). Set by the loader; carried through to the generated
+   * value so a reader can answer "why is this value here?". Not authored by hand.
+   */
+  source?: 'shipped' | 'overwrite';
 }
 
 export interface FieldType {
@@ -60,3 +72,27 @@ export interface OverwriteWarning {
   detail: string;
   suggestion: string;
 }
+
+/** What the `.overwrite` layer changed for one field-type (provenance — "no silent overwrite"). */
+export interface FieldTypeProvenance {
+  type: string;
+  /** Ids removed via `disable:` (an id that was not in the shipped common is reported as a warning). */
+  disabled: string[];
+  /** Ids that existed in shipped AND the overlay — the overlay value won. */
+  replaced: string[];
+  /** Ids new from the overlay (a project-specific case). */
+  added: string[];
+  /** Constraint keys the overlay changed. */
+  constraintsOverridden: string[];
+  /** True when the overlay replaced `uses_security`. */
+  securityChanged: boolean;
+}
+
+/** Catalog-wide provenance of the shipped-common → project-overwrite merge. */
+export interface CatalogProvenance {
+  fieldTypes: Record<string, FieldTypeProvenance>;
+  /** Wholly new field-types added by the project (not in shipped common). */
+  newFieldTypes: string[];
+  security: { added: string[]; replaced: string[] };
+  techniques: { added: string[]; replaced: string[] };
+}

package/src/validate.ts

@@ -0,0 +1,77 @@
+/**
+ * Data Factory — the deterministic data-quality validator (the Driver's contribution to the harness).
+ *
+ * `lint.ts` answers "is the coverage enough?" (≥1 valid, boundary present, error codes mapped).
+ * This module answers the harder question both reviews flagged: "is each generated value SEMANTICALLY
+ * correct?" — i.e. does a value labeled `valid` actually satisfy the constraints, and does a value
+ * labeled `invalid` actually violate them? It is the machine oracle a future Master "Data Gate"
+ * (see docs/spec/data-factory-quality-roadmap.md) calls; today it powers the golden tests and the
+ * `sungen data validate` CLI. Pure + deterministic — no AI, no runtime.
+ */
+import type { Catalog } from './types';
+import { expandFieldMap, type FieldMap, type FieldDef, type ExpandedField, type ExpandedPoint } from './generator';
+import { satisfiesConstraints } from './boundary';
+
+export interface ValidationFinding {
+  field: string;
+  pointId: string;
+  severity: 'error' | 'warn';
+  code: 'VALUE_NOT_VALID' | 'INVALID_LOOKS_VALID';
+  message: string;
+}
+
+/** Validate the values a set of expanded points, given the effective constraints for that field. */
+export function validatePoints(field: string, type: string | undefined, points: ExpandedPoint[], c: Record<string, any>): ValidationFinding[] {
+  const out: ValidationFinding[] = [];
+  if (!type) return out;
+  for (const p of points) {
+    if (p.value == null) continue; // open/todo — lint handles these
+    const oracle = satisfiesConstraints(type, p.value, c);
+    if (oracle == null) continue; // no length/range constraint to judge against
+    if (p.expectedValidity === 'valid' && oracle === false) {
+      out.push({
+        field, pointId: p.id, severity: 'error', code: 'VALUE_NOT_VALID',
+        message: `${p.id}: value ${JSON.stringify(p.value)} is expected VALID but violates the field constraints (${describe(type, c)})`,
+      });
+    } else if (p.expectedValidity === 'invalid' && oracle === true && p.synthesized) {
+      // Only second-guess a SYNTHESIZED (boundary/range) invalid: its whole claim is about range, so
+      // satisfying the range means the boundary was mis-synthesized. Literal charset/format invalids and
+      // security payloads legitimately pass the length oracle — not a finding.
+      out.push({
+        field, pointId: p.id, severity: 'warn', code: 'INVALID_LOOKS_VALID',
+        message: `${p.id}: value ${JSON.stringify(p.value)} is expected INVALID (out of range) but satisfies the constraints (${describe(type, c)}) — the boundary was mis-synthesized`,
+      });
+    }
+  }
+  return out;
+}
+
+function describe(type: string, c: Record<string, any>): string {
+  const parts: string[] = [];
+  if (Number.isFinite(c.minLength ?? c.length)) parts.push(`minLen=${c.minLength ?? c.length}`);
+  if (Number.isFinite(c.maxLength ?? c.length)) parts.push(`maxLen=${c.maxLength ?? c.length}`);
+  if (Number.isFinite(c.min)) parts.push(`min=${c.min}`);
+  if (Number.isFinite(c.max)) parts.push(`max=${c.max}`);
+  if (Number.isFinite(c.maxLocal)) parts.push(`maxLocal=${c.maxLocal}`);
+  if (Number.isFinite(c.maxTotal)) parts.push(`maxTotal=${c.maxTotal}`);
+  if (Number.isFinite(c.decimalPlaces)) parts.push(`decimalPlaces=${c.decimalPlaces}`);
+  return parts.join(', ') || type;
+}
+
+/** Validate a whole field-map: expand it, then check every value against its expected validity. */
+export function validateGenerated(map: FieldMap, catalog: Catalog): ValidationFinding[] {
+  const expanded = expandFieldMap(map, catalog);
+  const out: ValidationFinding[] = [];
+  const walk = (efs: ExpandedField[], defs: FieldDef[], prefix: string) => {
+    for (const ef of efs) {
+      const def = defs.find((d) => d.name === ef.name);
+      const path = prefix ? `${prefix}.${ef.name}` : ef.name;
+      if (ef.children) { walk(ef.children, def?.fields || [], path); continue; }
+      const ft = ef.type ? catalog.fieldTypes[ef.type] : undefined;
+      const c = { ...(ft?.constraints || {}), ...(def?.constraints || {}) };
+      out.push(...validatePoints(path, ef.type, ef.points, c));
+    }
+  };
+  walk(expanded, map.fields, '');
+  return out;
+}