@lovrozagar/oat 0.9.1 → 0.11.0

package/dist/runtime/validate.js

@@ -7,6 +7,8 @@
  */
 import ajvModule from "ajv/dist/2020.js";
 import formatsModule from "ajv-formats";
+import { DEFS_ID } from "../spec/load.js";
+import { normalizeSchema } from "../spec/schema.js";
 const OK = { errors: [], ok: true };
 /* Both packages ship CJS with an interop default, so the callable lives on `.default` under
  * NodeNext resolution — but only at runtime, hence the cast. */
@@ -15,7 +17,8 @@ const addFormats = (formatsModule.default ?? formatsModule);
 export class SchemaValidator {
     ajv;
     cache = new Map();
-    constructor() {
+    /** `defs`: the recursive schemas a dereferenced document refers to (see `dereference`). */
+    constructor(defs = {}) {
         this.ajv = new Ajv2020({
             allErrors: true,
             /* Specs in the wild carry annotations AJV does not know; refusing to compile over a
@@ -24,6 +27,12 @@ export class SchemaValidator {
             validateFormats: true,
         });
         addFormats(this.ajv);
+        /* Recursive schemas are referenced as `oat-defs#/$defs/<name>`, so they are registered
+         * once under that id and every compiled schema can reach them. */
+        const $defs = {};
+        for (const [name, def] of Object.entries(defs))
+            $defs[name] = normalizeSchema(def, { direction: "response" });
+        this.ajv.addSchema({ $defs, $id: DEFS_ID });
     }
     /** Compiles the schema documented for this operation and status, if there is one. */
     compile(op, key, status) {
@@ -36,21 +45,24 @@ export class SchemaValidator {
             return null;
         }
         try {
-            const validate = this.ajv.compile(sanitise(schema));
+            const validate = this.ajv.compile(normalizeSchema(schema, { direction: "response" }));
             this.cache.set(key, validate);
             return validate;
         }
-        catch {
+        catch (error) {
             /* An uncompilable schema is a spec defect, surfaced by the caller as a gap rather than
-             * crashing the run. */
-            this.cache.set(key, null);
-            return null;
+             * crashing the run — and never as a pass. */
+            const failed = { failed: error instanceof Error ? error.message : String(error) };
+            this.cache.set(key, failed);
+            return failed;
         }
     }
     validate(operationId, op, status, body) {
         const validate = this.compile(op, `${operationId}:${status}`, status);
         if (validate === null)
             return OK;
+        if ("failed" in validate)
+            return { errors: [], ok: true, unchecked: validate.failed };
         if (validate(body) === true)
             return OK;
         const errors = (validate.errors ?? []).map((error) => {
@@ -78,34 +90,42 @@ function schemaFor(op, status) {
     }
     return null;
 }
+/* One AJV per set of definitions: each registers them under `oat-defs`, as the document names them. */
+const instanceAjvs = new WeakMap();
+const NO_DEFS = {};
+const instanceCache = new WeakMap();
+function ajvFor(defs) {
+    const existing = instanceAjvs.get(defs);
+    if (existing !== undefined)
+        return existing;
+    const ajv = new Ajv2020({ allErrors: true, strict: false, validateFormats: true });
+    addFormats(ajv);
+    const $defs = {};
+    for (const [name, def] of Object.entries(defs))
+        $defs[name] = normalizeSchema(def, { direction: "request" });
+    ajv.addSchema({ $defs, $id: DEFS_ID });
+    instanceAjvs.set(defs, ajv);
+    return ajv;
+}
 /**
- * Strips constructs that break AJV but carry no validation meaning here: OpenAPI's `nullable`
- * without a sibling `type` (invalid JSON Schema, emitted by several generators), and `example`
- * keys that collide with the `examples` keyword in draft 2020-12.
+ * Whether `value` satisfies an already-normalized `schema` — the self-check every generated body
+ * passes before it is sent. Returns AJV's complaints, or `[]`.
  */
-function sanitise(schema) {
-    const walk = (node) => {
-        if (Array.isArray(node))
-            return node.map(walk);
-        if (node === null || typeof node !== "object")
-            return node;
-        const out = {};
-        for (const [key, value] of Object.entries(node)) {
-            if (key === "nullable")
-                continue;
-            if (key === "example")
-                continue;
-            if (key === "discriminator")
-                continue;
-            out[key] = walk(value);
+export function instanceErrors(schema, value, defs = NO_DEFS) {
+    let compiled = instanceCache.get(schema);
+    if (compiled === undefined) {
+        try {
+            compiled = ajvFor(defs).compile(schema);
         }
-        /* `nullable: true` with a concrete type widens the type rather than being dropped. */
-        const original = node;
-        if (original.nullable === true && typeof original.type === "string") {
-            out.type = [original.type, "null"];
+        catch (error) {
+            compiled = { failed: error instanceof Error ? error.message : String(error) };
         }
-        return out;
-    };
-    return walk(schema);
+        instanceCache.set(schema, compiled);
+    }
+    if ("failed" in compiled)
+        return [`schema cannot be compiled: ${compiled.failed}`];
+    if (compiled(value) === true)
+        return [];
+    return (compiled.errors ?? []).map((error) => `${error.instancePath || "(root)"} ${error.message ?? "is invalid"}`);
 }
 //# sourceMappingURL=validate.js.map

package/dist/runtime/validate.js.map

@@ -1 +1 @@
-{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/runtime/validate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/runtime/validate.ts"],"names":[],"mappings":"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"}

package/dist/runtime/wait.d.ts

@@ -8,7 +8,7 @@ import type { Hooks } from "../config/define-config.ts";
 import type { WaitSpec } from "../spec/extensions.ts";
 import type { OperationModel } from "../spec/graph.ts";
 import type { Client, Exchange } from "./client.ts";
-export declare function readPointer(body: unknown, pointer: string): unknown;
+import { readPath as readPointer } from "./path.ts";
 /** Present enough to stop polling: not null, not "", not []. */
 export declare function pointerIsOccupied(value: unknown): boolean;
 export interface WaitOutcome {
@@ -29,4 +29,5 @@ export declare function driveWait(options: {
     awaitSideEffect?: Hooks["awaitSideEffect"];
     refreshIfStale?: (force?: boolean) => Promise<void>;
 }): Promise<WaitOutcome>;
+export { readPointer };
 //# sourceMappingURL=wait.d.ts.map

package/dist/runtime/wait.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../src/runtime/wait.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAInD,wBAAgB,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAgBnE;AAkBD,gEAAgE;AAChE,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIzD;AAED,MAAM,WAAW,WAAW;IAC3B,QAAQ,EAAE,OAAO,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,QAAQ,EAAE,CAAA;IACrB,OAAO,EAAE,OAAO,CAAA;CAChB;AAED,wBAAsB,SAAS,CAAC,OAAO,EAAE;IACxC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,cAAc,CAAA;IACtB,IAAI,EAAE,QAAQ,CAAA;IACd,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,OAAO,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,OAAO,CAAA;IACf,eAAe,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAC1C,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACnD,GAAG,OAAO,CAAC,WAAW,CAAC,CAuEvB"}
+{"version":3,"file":"wait.d.ts","sourceRoot":"","sources":["../../src/runtime/wait.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAA;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACtD,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,EAAE,QAAQ,IAAI,WAAW,EAAE,MAAM,WAAW,CAAA;AAInD,gEAAgE;AAChE,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAIzD;AAED,MAAM,WAAW,WAAW;IAC3B,QAAQ,EAAE,OAAO,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,QAAQ,EAAE,CAAA;IACrB,OAAO,EAAE,OAAO,CAAA;CAChB;AAED,wBAAsB,SAAS,CAAC,OAAO,EAAE;IACxC,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,cAAc,CAAA;IACtB,IAAI,EAAE,QAAQ,CAAA;IACd,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,OAAO,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,OAAO,CAAA;IACf,eAAe,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAC1C,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CACnD,GAAG,OAAO,CAAC,WAAW,CAAC,CAuEvB;AAED,OAAO,EAAE,WAAW,EAAE,CAAA"}

package/dist/runtime/wait.js

@@ -4,44 +4,9 @@
  * Queue consumers and webhook inboxes are not the same request. Timeout is a finding, not a
  * coverage gap — the document claimed the side effect would appear.
  */
+import { readPath as readPointer } from "./path.js";
 import { sleep } from "./poll.js";
 import { fillPath } from "./world.js";
-export function readPointer(body, pointer) {
-    if (pointer.startsWith("/"))
-        return readJsonPointer(body, pointer);
-    let node = body;
-    for (const segment of pointer
-        .replace(/^\$\.?/, "")
-        .split(".")
-        .filter(Boolean)) {
-        if (node === null || typeof node !== "object")
-            return undefined;
-        const index = Number.parseInt(segment, 10);
-        node = Array.isArray(node)
-            ? Number.isNaN(index)
-                ? undefined
-                : node[index]
-            : node[segment];
-    }
-    return node;
-}
-function readJsonPointer(body, pointer) {
-    if (pointer === "/")
-        return body;
-    let node = body;
-    for (const raw of pointer.slice(1).split("/")) {
-        const segment = raw.replace(/~1/g, "/").replace(/~0/g, "~");
-        if (node === null || typeof node !== "object")
-            return undefined;
-        const index = Number.parseInt(segment, 10);
-        node = Array.isArray(node)
-            ? Number.isNaN(index)
-                ? undefined
-                : node[index]
-            : node[segment];
-    }
-    return node;
-}
 /** Present enough to stop polling: not null, not "", not []. */
 export function pointerIsOccupied(value) {
     if (value === undefined || value === null || value === "")
@@ -122,4 +87,5 @@ export async function driveWait(options) {
         timedOut: true,
     };
 }
+export { readPointer };
 //# sourceMappingURL=wait.js.map

package/dist/runtime/wait.js.map

@@ -1 +1 @@
-{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/runtime/wait.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wait.js","sourceRoot":"","sources":["../../src/runtime/wait.ts"],"names":[],"mappings":"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"}

package/dist/runtime/world.d.ts

@@ -24,9 +24,14 @@ export declare class SeedError extends Error {
     readonly cause_: string;
     /** Status the failing request returned, when the failure was an HTTP response. */
     readonly status?: number | undefined;
+    /** The create that failed, when the failure was one — a parent's, not always the entity's own. */
+    readonly operationId?: string | undefined;
+    readonly exchange?: Exchange | undefined;
     constructor(cause_: string, message: string, 
     /** Status the failing request returned, when the failure was an HTTP response. */
-    status?: number | undefined);
+    status?: number | undefined, 
+    /** The create that failed, when the failure was one — a parent's, not always the entity's own. */
+    operationId?: string | undefined, exchange?: Exchange | undefined);
 }
 export declare function fillPath(template: string, values: Record<string, string>): string;
 /**
@@ -39,19 +44,33 @@ export declare function isPlanLimitResponse(status: number, body: unknown): bool
 /** Pulls the collection out of a list body the same way seed fallback and effect checks do. */
 export declare function recordsFromList(body: unknown, collectionKey: string | null): Record_[];
 /** Same-tenant records the list route already returns. Empty when the route cannot be resolved. */
-export declare function listExisting(listOp: OperationModel, client: Client, headers: Record<string, string> | (() => Record<string, string>), values: Record<string, string>): Promise<Record_[]>;
+export declare function listExisting(listOp: OperationModel, model: SpecModel, client: Client, headers: Record<string, string> | (() => Record<string, string>), values: Record<string, string>): Promise<Record_[]>;
 export interface WorldOptions {
     roots: Record<string, string>;
     seed: number;
+    /**
+     * Per-run token mixed into every value that must not collide with an earlier run's records —
+     * unique columns, above all. A seed alone repeats exactly, which is its job.
+     */
+    nonce?: string;
     cohortSize?: number;
     authHeaders: () => Record<string, string>;
     uploads?: UploadContext;
+    /**
+     * Called the moment a record exists, before anything else can fail. A record learned about
+     * only after the step that made it returns is dropped whenever a later step throws.
+     */
+    onCreate?: (entity: string, id: string, scope: Record<string, string>) => void;
+    /** Who is creating — keys the ancestor cache, since one principal's parent is not another's. */
+    principal?: string;
+    /** Ancestors already made in this run, by principal, operation and parent path. */
+    ancestors?: Map<string, string>;
 }
 /**
  * Resolves every path parameter an operation needs. Roots come from config; everything else is
  * created through the owning entity's create operation, depth-first.
  */
-export declare function resolveScope(op: OperationModel, model: SpecModel, client: Client, options: WorldOptions, scope?: Scope): Promise<Scope>;
+export declare function resolvePathScope(op: OperationModel, model: SpecModel, client: Client, options: WorldOptions, scope?: Scope): Promise<Scope>;
 export declare function requestSchemaOf(op: OperationModel, model: SpecModel): Record<string, unknown> | null;
 export interface SeededCohort {
     members: CohortMember[];
@@ -80,6 +99,15 @@ export interface SeededCohort {
     uniqueAdopted?: boolean;
     /** Set when extra cohort variants were dropped because unique values could not differ. */
     uniqueGap?: string;
+    /**
+     * Variants after the first whose create failed. The cohort carries on without them, and the
+     * run reports each: a 5xx is the backend's failure, a 4xx a variant the document permits and
+     * the backend refused.
+     */
+    failedVariants?: Array<{
+        variant: string;
+        exchange: Exchange;
+    }>;
 }
 /** Creates the cohort and returns the server's view of each instance. */
 export declare function seedCohort(createOp: OperationModel, model: SpecModel, client: Client, options: WorldOptions, scope: Scope): Promise<SeededCohort>;

package/dist/runtime/world.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"world.d.ts","sourceRoot":"","sources":["../../src/runtime/world.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"world.d.ts","sourceRoot":"","sources":["../../src/runtime/world.ts"],"names":[],"mappings":"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"}

package/dist/runtime/world.js

@@ -7,7 +7,7 @@
  * reported as BLOCKED against that single cause.
  */
 import { requestContent } from "../spec/collection.js";
-import { owningEntityName } from "../spec/graph.js";
+import { largestPageQuery, owningEntityName } from "../spec/graph.js";
 import { encodeForOperation } from "./body.js";
 import { forEachInvocation } from "./upload-each.js";
 import { buildCohort, ensureDistinctUniqueValues, isOverflowError, overflowFrom } from "./fixture.js";
@@ -16,12 +16,18 @@ import { describeFeatureGate, isDocumentedFeatureGateDenial } from "./feature-ga
 export class SeedError extends Error {
     cause_;
     status;
+    operationId;
+    exchange;
     constructor(cause_, message, 
     /** Status the failing request returned, when the failure was an HTTP response. */
-    status) {
+    status, 
+    /** The create that failed, when the failure was one — a parent's, not always the entity's own. */
+    operationId, exchange) {
         super(message);
         this.cause_ = cause_;
         this.status = status;
+        this.operationId = operationId;
+        this.exchange = exchange;
     }
 }
 export function fillPath(template, values) {
@@ -76,13 +82,16 @@ export function recordsFromList(body, collectionKey) {
     return [];
 }
 /** Same-tenant records the list route already returns. Empty when the route cannot be resolved. */
-export async function listExisting(listOp, client, headers, values) {
+export async function listExisting(listOp, model, client, headers, values) {
     for (const param of listOp.pathParams) {
         if (values[param] === undefined)
             return [];
     }
     try {
-        const exchange = await client.get(fillPath(listOp.path, values), { headers, query: { limit: 50 } });
+        const exchange = await client.get(fillPath(listOp.path, values), {
+            headers,
+            query: largestPageQuery(model, listOp),
+        });
         if (exchange.status >= 300)
             return [];
         return recordsFromList(exchange.responseBody, listOp.collection?.key ?? null);
@@ -95,7 +104,7 @@ export async function listExisting(listOp, client, headers, values) {
  * Resolves every path parameter an operation needs. Roots come from config; everything else is
  * created through the owning entity's create operation, depth-first.
  */
-export async function resolveScope(op, model, client, options, scope = { created: [], values: {} }) {
+export async function resolvePathScope(op, model, client, options, scope = { created: [], values: {} }) {
     for (const param of op.pathParams) {
         if (scope.values[param] !== undefined)
             continue;
@@ -115,28 +124,72 @@ export async function resolveScope(op, model, client, options, scope = { created
         const createOp = model.byOperationId.get(entity.create);
         if (createOp === undefined)
             throw new SeedError(param, `missing operation ${entity.create}`);
-        await resolveScope(createOp, model, client, options, scope);
-        const created = await createOne(createOp, model, client, options, scope);
-        const identity = entity.identity ?? "id";
-        const id = created[identity];
-        if (typeof id !== "string" && typeof id !== "number") {
-            throw new SeedError(param, `create for "${owner}" returned no usable "${identity}"`);
+        await resolvePathScope(createOp, model, client, options, scope);
+        /* One ancestor per principal and parent path: a row and its siblings share the table oat
+         * made for the first of them, instead of each leaving another table behind. */
+        const cacheKey = `${options.principal ?? ""}\u0000${createOp.operationId}\u0000${fillPath(createOp.path, scope.values)}`;
+        const cached = options.ancestors?.get(cacheKey);
+        if (cached !== undefined) {
+            scope.values[param] = cached;
+            continue;
+        }
+        /* Entities in parallel lanes can reach the same missing ancestor at once; the second
+         * waits for the first's create rather than making a twin. */
+        const pending = options.ancestors === undefined ? undefined : inflightAncestors(options.ancestors).get(cacheKey);
+        if (pending !== undefined) {
+            scope.values[param] = await pending;
+            continue;
+        }
+        const creating = (async () => {
+            const { record: created, adopted } = await createOne(createOp, model, client, options, scope);
+            const identity = entity.identity ?? "id";
+            const id = created[identity];
+            if (typeof id !== "string" && typeof id !== "number") {
+                throw new SeedError(param, `create for "${owner}" returned no usable "${identity}"`);
+            }
+            /* Adopted, not created: somebody else's record, never oat's to remove. */
+            if (!adopted)
+                options.onCreate?.(owner, String(id), { ...scope.values });
+            options.ancestors?.set(cacheKey, String(id));
+            return String(id);
+        })();
+        if (options.ancestors !== undefined)
+            inflightAncestors(options.ancestors).set(cacheKey, creating);
+        try {
+            scope.values[param] = await creating;
+        }
+        finally {
+            if (options.ancestors !== undefined)
+                inflightAncestors(options.ancestors).delete(cacheKey);
         }
-        scope.values[param] = String(id);
         scope.created.push({
             entity: owner,
-            id: String(id),
+            id: scope.values[param],
             path: fillPath(createOp.path, scope.values),
         });
     }
     return scope;
 }
+/** Ancestor creates under way, per ancestor cache. */
+const INFLIGHT = new WeakMap();
+function inflightAncestors(cache) {
+    let pending = INFLIGHT.get(cache);
+    if (pending === undefined) {
+        pending = new Map();
+        INFLIGHT.set(cache, pending);
+    }
+    return pending;
+}
 async function createOne(createOp, model, client, options, scope) {
     const schema = requestSchemaOf(createOp, model);
     let member;
     try {
         ;
-        [member] = buildCohort(schema ?? {}, options.seed, ["baseline"], createOp.operationId);
+        [member] = buildCohort(schema ?? {}, options.seed, ["baseline"], createOp.operationId, {
+            defs: model.defs,
+            distinct: new Set((createOp.unique ?? []).flat()),
+            ...(options.nonce === undefined ? {} : { nonce: options.nonce }),
+        });
     }
     catch (error) {
         if (isOverflowError(error))
@@ -147,7 +200,7 @@ async function createOne(createOp, model, client, options, scope) {
     if ((createOp.unique?.length ?? 0) > 0) {
         /* Ancestor creates share the entity seed with the entity's own cohort; unique columns
          * must not collide with a later seed of the same collection. */
-        body = uniquifyProbeBody(body, createOp.unique ?? [], schema, `anc${options.seed}`);
+        body = uniquifyProbeBody(body, createOp.unique ?? [], schema, `anc${options.seed}-${options.nonce ?? ""}`);
     }
     const encoded = await encodeForOperation(createOp, model, body, uploadContext(options), member?.variant ?? "baseline", 0);
     const exchange = await client.request("POST", fillPath(createOp.path, scope.values), {
@@ -162,16 +215,16 @@ async function createOne(createOp, model, client, options, scope) {
         if (isPlanLimitResponse(exchange.status, exchange.responseBody)) {
             const reused = await adoptExisting(createOp, model, client, options, scope);
             if (reused !== null)
-                return reused;
+                return { adopted: true, record: reused };
         }
         if (isUniqueConflictResponse(createOp, exchange.status)) {
             const reused = await adoptExisting(createOp, model, client, options, scope);
             if (reused !== null)
-                return reused;
+                return { adopted: true, record: reused };
         }
-        throw new SeedError(createOp.operationId, `${createOp.operationId} returned ${exchange.status}: ${JSON.stringify(exchange.responseBody).slice(0, 300)}`, exchange.status);
+        throw new SeedError(createOp.operationId, `${createOp.operationId} returned ${exchange.status}: ${JSON.stringify(exchange.responseBody).slice(0, 300)}`, exchange.status, createOp.operationId, exchange);
     }
-    return (exchange.responseBody ?? {});
+    return { adopted: false, record: (exchange.responseBody ?? {}) };
 }
 /** First listed record with a usable identity, or null — never synthesises a row. */
 async function adoptExisting(createOp, model, client, options, scope) {
@@ -184,7 +237,7 @@ async function adoptExisting(createOp, model, client, options, scope) {
     const listOp = model.byOperationId.get(entity.list);
     if (listOp === undefined)
         return null;
-    const records = await listExisting(listOp, client, options.authHeaders, { ...options.roots, ...scope.values });
+    const records = await listExisting(listOp, model, client, options.authHeaders, { ...options.roots, ...scope.values });
     const identity = entity.identity ?? "id";
     return (records.find((record) => {
         const id = record[identity];
@@ -205,8 +258,16 @@ export async function seedCohort(createOp, model, client, options, scope) {
     let members;
     let uniqueGap;
     try {
-        const generated = buildCohort(schema, options.seed, undefined, createOp.operationId).slice(0, options.cohortSize ?? 7);
-        const distinct = ensureDistinctUniqueValues(generated, createOp.unique ?? [], schema);
+        const generated = buildCohort(schema, options.seed, undefined, createOp.operationId, {
+            defs: model.defs,
+            distinct: new Set((createOp.unique ?? []).flat()),
+            ...(options.nonce === undefined ? {} : { nonce: options.nonce }),
+        }).slice(0, options.cohortSize ?? 7);
+        const distinct = ensureDistinctUniqueValues(generated, createOp.unique ?? [], schema, {
+            defs: model.defs,
+            distinct: new Set((createOp.unique ?? []).flat()),
+            ...(options.nonce === undefined ? {} : { nonce: options.nonce }),
+        });
         members = distinct.members;
         if (distinct.gap !== null)
             uniqueGap = distinct.gap;
@@ -214,12 +275,12 @@ export async function seedCohort(createOp, model, client, options, scope) {
         const listOp = entity?.list === undefined ? undefined : model.byOperationId.get(entity.list);
         const existing = listOp === undefined
             ? []
-            : await listExisting(listOp, client, options.authHeaders, { ...options.roots, ...scope.values });
+            : await listExisting(listOp, model, client, options.authHeaders, { ...options.roots, ...scope.values });
         if (existing.length > 0 && (createOp.unique?.length ?? 0) > 0) {
             members = members.map((member, index) => {
                 let body = member.body;
                 for (let token = 0; token < 8 && uniqueTupleCollides(body, createOp.unique ?? [], existing); token++) {
-                    body = uniquifyProbeBody(body, createOp.unique ?? [], schema, `ex${index}${token}`);
+                    body = uniquifyProbeBody(body, createOp.unique ?? [], schema, `ex${index}${token}-${options.nonce ?? ""}`);
                 }
                 return { ...member, body };
             });
@@ -234,6 +295,15 @@ export async function seedCohort(createOp, model, client, options, scope) {
     const path = fillPath(createOp.path, scope.values);
     const uploads = uploadContext(options);
     const seededMembers = [];
+    const identity = (createOp.entity === null ? undefined : model.entities.get(createOp.entity))?.identity ?? "id";
+    const created = (exchange) => {
+        const record = (exchange.responseBody ?? {});
+        const id = record[identity];
+        if (createOp.entity !== null && (typeof id === "string" || typeof id === "number")) {
+            options.onCreate?.(createOp.entity, String(id), { ...scope.values });
+        }
+        return record;
+    };
     const postMember = async (member, nextUploads) => {
         const encoded = await encodeForOperation(createOp, model, member.body, nextUploads, member.variant, records.length);
         return client.request("POST", path, {
@@ -244,7 +314,12 @@ export async function seedCohort(createOp, model, client, options, scope) {
             ...(nextUploads.fixture === undefined ? {} : { fixture: nextUploads.fixture.filename }),
         });
     };
-    const withGap = (cohort) => (uniqueGap === undefined ? cohort : { ...cohort, uniqueGap });
+    const failedVariants = [];
+    const withGap = (cohort) => ({
+        ...cohort,
+        ...(uniqueGap === undefined ? {} : { uniqueGap }),
+        ...(failedVariants.length === 0 ? {} : { failedVariants }),
+    });
     const failOrAdopt = async (member, exchange) => {
         if (records.length > 0)
             return withGap({ featureGate: null, members: seededMembers, records });
@@ -270,14 +345,14 @@ export async function seedCohort(createOp, model, client, options, scope) {
                 });
             }
             throw new SeedError(createOp.operationId, `seeding "${member.variant}" returned ${exchange.status}: ` +
-                JSON.stringify(exchange.responseBody).slice(0, 300), exchange.status);
+                JSON.stringify(exchange.responseBody).slice(0, 300), exchange.status, createOp.operationId, exchange);
         }
         if (isPlanLimitResponse(exchange.status, exchange.responseBody)) {
             const adopted = await adoptExisting(createOp, model, client, options, scope);
             if (adopted !== null)
                 return withGap({ adopted: true, featureGate: null, members: seededMembers, records: [adopted] });
         }
-        throw new SeedError(createOp.operationId, `seeding "${member.variant}" returned ${exchange.status}: ` + JSON.stringify(exchange.responseBody).slice(0, 300), exchange.status);
+        throw new SeedError(createOp.operationId, `seeding "${member.variant}" returned ${exchange.status}: ` + JSON.stringify(exchange.responseBody).slice(0, 300), exchange.status, createOp.operationId, exchange);
     };
     let lastFail;
     const outcomes = await forEachInvocation(createOp.operationId, uploads, async (nextUploads, slot) => {
@@ -290,15 +365,21 @@ export async function seedCohort(createOp, model, client, options, scope) {
                 return null;
             }
             seededMembers.push(member);
-            records.push((exchange.responseBody ?? {}));
+            records.push(created(exchange));
             return null;
         }
         for (const member of members) {
             const exchange = await postMember(member, nextUploads);
-            if (exchange.status >= 300)
-                return failOrAdopt(member, exchange);
+            if (exchange.status >= 300) {
+                /* The first create decides whether there is a cohort at all; a later one failing
+                 * is a variant lost, reported rather than ending the cohort in silence. */
+                if (records.length === 0)
+                    return failOrAdopt(member, exchange);
+                failedVariants.push({ exchange, variant: member.variant });
+                continue;
+            }
             seededMembers.push(member);
-            records.push((exchange.responseBody ?? {}));
+            records.push(created(exchange));
         }
         return null;
     });
@@ -325,7 +406,7 @@ export function probeCreateFixtures(model) {
             continue;
         const schema = requestSchemaOf(op, model) ?? {};
         try {
-            buildCohort(schema, 1, ["baseline"], op.operationId);
+            buildCohort(schema, 1, ["baseline"], op.operationId, { defs: model.defs });
         }
         catch (error) {
             if (isOverflowError(error)) {