@davidorex/pi-context 0.26.0 → 0.28.0

package/dist/schema-validator.d.ts

@@ -72,5 +72,6 @@ export declare function validateFromFile(schemaPath: string, data: unknown, labe
  * Out of scope: writing the migrated form back to disk — call sites that need
  * persistence handle that themselves via the block-write surface.
  */
+export declare function validateBlockWithMigrationForDir(substrateDir: string, schemaName: string, data: unknown, registry?: MigrationRegistry): unknown;
 export declare function validateBlockWithMigration(cwd: string, schemaName: string, data: unknown, registry?: MigrationRegistry): unknown;
 //# sourceMappingURL=schema-validator.d.ts.map

package/dist/schema-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-validator.d.ts","sourceRoot":"","sources":["../src/schema-validator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAIvC,OAAO,EAAE,KAAK,iBAAiB,EAAiB,MAAM,wBAAwB,CAAC;AAsE/E;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,KAAK;IACzC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;gBAEnB,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE;CAOhD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAqB/F;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAMjF;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAgB1F;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,0BAA0B,CACzC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,OAAO,EACb,QAAQ,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAgCT"}
+{"version":3,"file":"schema-validator.d.ts","sourceRoot":"","sources":["../src/schema-validator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAIvC,OAAO,EAAE,KAAK,iBAAiB,EAAiB,MAAM,wBAAwB,CAAC;AAuE/E;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,KAAK;IACzC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;gBAEnB,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE;CAOhD;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAqB/F;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAMjF;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAgB1F;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,gCAAgC,CAC/C,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,OAAO,EACb,QAAQ,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAgCT;AAED,wBAAgB,0BAA0B,CACzC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,OAAO,EACb,QAAQ,CAAC,EAAE,iBAAiB,GAC1B,OAAO,CAET"}

package/dist/schema-validator.js

@@ -3,7 +3,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import _Ajv from "ajv";
 import _addFormats from "ajv-formats";
-import { schemaPath as schemaPathHelper } from "./context-dir.js";
+import { resolveContextDir, schemaPathForDir as schemaPathForDirHelper } from "./context-dir.js";
 import { runMigrations } from "./schema-migrations.js";
 // Node16 module resolution + CJS interop: default import is the module namespace
 const Ajv = _Ajv.default ?? _Ajv;
@@ -33,6 +33,7 @@ const FRAMEWORK_SCHEMA_NAMES = [
     "config",
     "relations",
     "bootstrap",
+    "context-registry",
     "priority",
     "status",
     "severity",
@@ -191,8 +192,8 @@ export function validateFromFile(schemaPath, data, label) {
  * Out of scope: writing the migrated form back to disk — call sites that need
  * persistence handle that themselves via the block-write surface.
  */
-export function validateBlockWithMigration(cwd, schemaName, data, registry) {
-    const schemaPath = schemaPathHelper(cwd, schemaName);
+export function validateBlockWithMigrationForDir(substrateDir, schemaName, data, registry) {
+    const schemaPath = schemaPathForDirHelper(substrateDir, schemaName);
     if (!fs.existsSync(schemaPath)) {
         throw new Error(`validateBlockWithMigration: schema file not found at ${schemaPath}`);
     }
@@ -216,4 +217,7 @@ export function validateBlockWithMigration(cwd, schemaName, data, registry) {
     }
     return validate(schema, toValidate, schemaName);
 }
+export function validateBlockWithMigration(cwd, schemaName, data, registry) {
+    return validateBlockWithMigrationForDir(resolveContextDir(cwd), schemaName, data, registry);
+}
 //# sourceMappingURL=schema-validator.js.map

package/dist/schema-validator.js.map

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

package/dist/schema-write.d.ts

@@ -30,10 +30,65 @@
 import type { DispatchContext } from "./dispatch-context.js";
 import { ValidationError } from "./schema-validator.js";
 /**
- * Read a schema from `<contextDir>/schemas/<schemaName>.schema.json` and
- * return the parsed object. Returns `null` when the file does not exist —
- * absence is a normal pre-write state, not an error. Throws when the file
- * exists but is unreadable or contains invalid JSON.
+ * The dotted key-paths of every array property at nesting depth ≥ 1 (reachable
+ * only by descending through ≥1 enclosing array's `items`) whose item shape
+ * declares an `"id"` property. A NESTED id-bearing array is a
+ * relationship-as-embedding — an id-bearing item that should be a top-level
+ * entity joined by a closure-table membership edge, not embedded inside another
+ * item's array (content-addressed substrate identity, Cycle 9.2). Depth-0
+ * (top-level) id arrays are the normal block-item shape and are NOT flagged;
+ * nested NON-id arrays (e.g. a list of strings, or objects with no `id`) are NOT
+ * flagged.
+ *
+ * Trigger = an `"id"` DECLARATION on the nested array's item shape — NOT a
+ * full identity-field declaration (`collectArrayItemIdentityDecisions` keys on
+ * the IDENTITY_DECLARATION_FIELDS union; this guard keys on `id` alone, because
+ * an embedded item carrying any local `id` is the relationship-as-embedding
+ * smell regardless of whether it also declares oid/content_hash). An `id` is
+ * detected however it is declared (Cycle 9.3 hardening over the 9.2 form, which
+ * keyed only on `items.properties.id` + one-level local `$ref`):
+ *   - `items.properties.id`;
+ *   - `id` in `items.required` (no `properties.id` needed);
+ *   - any `anyOf`/`oneOf`/`allOf` branch of the item shape declaring an `id`
+ *     (recursive, any-branch — the branch may itself declare it via `required`);
+ *   - tuple-form `items` (an array of subschemas) where ANY member declares an `id`;
+ *   - a one-level `#/definitions/*` | `#/$defs/*` `$ref` resolving to a target
+ *     that declares an `id` via any of the above.
+ *
+ * The walk mirrors `collectArrayItemIdentityDecisions` (block-api.ts) —
+ * `properties.*` + recurse into array `items` + recurse into object-valued
+ * props — extended to traverse composition branches + tuple-`items` members, and
+ * carries a `depth` incremented ONLY when it descends through an array's `items`.
+ * `$ref` resolution mirrors `resolveBlockItemSchema` (block-api.ts) and is
+ * cycle-guarded (a per-path visited set keyed on the resolved pointer string,
+ * plus a recursion-depth backstop) so self-referential / mutually-recursive
+ * `$defs` cannot loop. Unresolvable / external / unsupported `$ref`s are treated
+ * as opaque nodes; the pass NEVER throws (lint pass, not a load-time gate).
+ */
+export declare function findNestedIdBearingArrays(schema: Record<string, unknown>): string[];
+/**
+ * Throw when `schema` declares any nested id-bearing array (see
+ * `findNestedIdBearingArrays`). The message names every offending dotted
+ * key-path so the author knows exactly which embedded array to promote to a
+ * top-level entity + membership edge. Mirrors the meta-reject throw convention
+ * (a plain `Error` carrying a labeled message). A schema with no nested
+ * id-bearing array is a no-op.
+ */
+export declare function assertNoNestedIdBearingArray(schema: Record<string, unknown>, label: string): void;
+/**
+ * Dir-targeted twin of `readSchema`: read a schema from
+ * `<substrateDir>/schemas/<schemaName>.schema.json` and return the parsed
+ * object. Returns `null` when absent (a normal pre-write state). Throws when the
+ * file exists but is unreadable or holds invalid JSON. Does NOT meta-validate
+ * (mirrors `readSchema`).
+ */
+export declare function readSchemaForDir(substrateDir: string, schemaName: string): object | null;
+/**
+ * Read a schema from `<resolveContextDir(cwd)>/schemas/<schemaName>.schema.json`
+ * and return the parsed object. Thin cwd wrapper over `readSchemaForDir` — the
+ * read/parse logic lives in the ForDir body. Returns `null` when the file does
+ * not exist — absence is a normal pre-write state, not an error. Throws when the
+ * file exists but is unreadable or contains invalid JSON.
  *
  * Note: this reader does NOT meta-validate. Callers that need a guarantee
  * the file holds a valid schema should pipe the result through
@@ -53,6 +108,18 @@ export declare function readSchema(cwd: string, schemaName: string): object | nu
  * Overwrites any existing schema at the target path; callers that need
  * mutate-in-place semantics should use `updateSchema`.
  */
+/**
+ * Dir-targeted twin of `writeSchema`: atomically write `schema` to
+ * `<substrateDir>/schemas/<schemaName>.schema.json` after meta-validation + the
+ * nested-id guard. Carries the full validate-then-write body; `writeSchema`
+ * delegates here via `resolveContextDir(cwd)`. Cross-substrate consumers (Cycle
+ * H migration / land-identity-fields) target a non-active substrate directly.
+ *
+ * `ctx` is accepted and IGNORED: schema files carry no author-attestation
+ * fields (mirrors `writeSchemaChecked`'s ctx parameter). Present for call-site
+ * parity with the attestation-aware block-write surfaces.
+ */
+export declare function writeSchemaForDir(substrateDir: string, schemaName: string, schema: object, ctx?: DispatchContext): void;
 export declare function writeSchema(cwd: string, schemaName: string, schema: object): void;
 /**
  * Op-correct create-or-replace of a whole schema body, layered over
@@ -95,6 +162,13 @@ export declare function writeSchema(cwd: string, schemaName: string, schema: obj
  * supplied body and returns `{ written: false }` without touching disk —
  * keeping ONE validation path (no re-implemented validation for the preview).
  */
+export declare function writeSchemaCheckedForDir(substrateDir: string, schemaName: string, schema: object, operation: "create" | "replace", ctx?: DispatchContext, opts?: {
+    dryRun?: boolean;
+}): {
+    written: boolean;
+    operation: "create" | "replace";
+    schemaPath: string;
+};
 export declare function writeSchemaChecked(cwd: string, schemaName: string, schema: object, operation: "create" | "replace", ctx?: DispatchContext, opts?: {
     dryRun?: boolean;
 }): {

package/dist/schema-write.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-write.d.ts","sourceRoot":"","sources":["../src/schema-write.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAA6B,MAAM,uBAAuB,CAAC;AAgBnF;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAgBzE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAuBjF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAgB,kBAAkB,CACjC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,QAAQ,GAAG,SAAS,EAC/B,GAAG,CAAC,EAAE,eAAe,EACrB,IAAI,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GACzB;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAgC3E;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAoBxG;AAID,OAAO,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"schema-write.d.ts","sourceRoot":"","sources":["../src/schema-write.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAKH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAA6B,MAAM,uBAAuB,CAAC;AAEnF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAyLnF;AAED;;;;;;;GAOG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAOjG;AAgBD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAgBxF;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAEzE;AAED;;;;;;;;;;;;GAYG;AACH;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAChC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,GAAG,CAAC,EAAE,eAAe,GACnB,IAAI,CA+BN;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAEjF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAgB,wBAAwB,CACvC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,QAAQ,GAAG,SAAS,EAC/B,GAAG,CAAC,EAAE,eAAe,EACrB,IAAI,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GACzB;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAoC3E;AAED,wBAAgB,kBAAkB,CACjC,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,QAAQ,GAAG,SAAS,EAC/B,GAAG,CAAC,EAAE,eAAe,EACrB,IAAI,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GACzB;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,QAAQ,GAAG,SAAS,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAE3E;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAoBxG;AAID,OAAO,EAAE,eAAe,EAAE,CAAC"}

package/dist/schema-write.js

@@ -29,33 +29,254 @@
  */
 import fs from "node:fs";
 import path from "node:path";
-import { schemaPath } from "./context-dir.js";
+import { resolveContextDir, schemaPathForDir } from "./context-dir.js";
 import { ValidationError, validateSchemaAgainstMeta } from "./schema-validator.js";
 /**
- * `<resolveContextDir(cwd)>/schemas/<schemaName>.schema.json` — canonical schema
- * path, routed through `schemaPath` (context-dir) so write resolution is
- * BYTE-IDENTICAL to read resolution (FGAP-079 / DEC-0045). Previously this was
- * based on a config.root-honoring path-builder, which diverged from the
- * pointer-canonical read side (`schemaPath` / `validateBlockWithMigration`) under
- * a non-default `config.root` — schemas would be written where reads/validation
- * could not find them. Delegating to `schemaPath` collapses the two paths to one
- * source AND inherits its `assertSubstrateName` guard (path-traversal rejection).
+ * The dotted key-paths of every array property at nesting depth ≥ 1 (reachable
+ * only by descending through ≥1 enclosing array's `items`) whose item shape
+ * declares an `"id"` property. A NESTED id-bearing array is a
+ * relationship-as-embedding — an id-bearing item that should be a top-level
+ * entity joined by a closure-table membership edge, not embedded inside another
+ * item's array (content-addressed substrate identity, Cycle 9.2). Depth-0
+ * (top-level) id arrays are the normal block-item shape and are NOT flagged;
+ * nested NON-id arrays (e.g. a list of strings, or objects with no `id`) are NOT
+ * flagged.
+ *
+ * Trigger = an `"id"` DECLARATION on the nested array's item shape — NOT a
+ * full identity-field declaration (`collectArrayItemIdentityDecisions` keys on
+ * the IDENTITY_DECLARATION_FIELDS union; this guard keys on `id` alone, because
+ * an embedded item carrying any local `id` is the relationship-as-embedding
+ * smell regardless of whether it also declares oid/content_hash). An `id` is
+ * detected however it is declared (Cycle 9.3 hardening over the 9.2 form, which
+ * keyed only on `items.properties.id` + one-level local `$ref`):
+ *   - `items.properties.id`;
+ *   - `id` in `items.required` (no `properties.id` needed);
+ *   - any `anyOf`/`oneOf`/`allOf` branch of the item shape declaring an `id`
+ *     (recursive, any-branch — the branch may itself declare it via `required`);
+ *   - tuple-form `items` (an array of subschemas) where ANY member declares an `id`;
+ *   - a one-level `#/definitions/*` | `#/$defs/*` `$ref` resolving to a target
+ *     that declares an `id` via any of the above.
+ *
+ * The walk mirrors `collectArrayItemIdentityDecisions` (block-api.ts) —
+ * `properties.*` + recurse into array `items` + recurse into object-valued
+ * props — extended to traverse composition branches + tuple-`items` members, and
+ * carries a `depth` incremented ONLY when it descends through an array's `items`.
+ * `$ref` resolution mirrors `resolveBlockItemSchema` (block-api.ts) and is
+ * cycle-guarded (a per-path visited set keyed on the resolved pointer string,
+ * plus a recursion-depth backstop) so self-referential / mutually-recursive
+ * `$defs` cannot loop. Unresolvable / external / unsupported `$ref`s are treated
+ * as opaque nodes; the pass NEVER throws (lint pass, not a load-time gate).
  */
-function schemaWritePath(cwd, schemaName) {
-    return schemaPath(cwd, schemaName);
+export function findNestedIdBearingArrays(schema) {
+    const hits = [];
+    // Backstop against pathological array-nesting depth even when the cycle-guard's
+    // pointer set fails to catch a loop (e.g. an unbounded chain of distinct inline
+    // subschemas reached by descending through array `items`).
+    const MAX_DEPTH = 256;
+    // SEPARATE structural-recursion backstop. `MAX_DEPTH` only counts array-`items`
+    // descents — composition-branch descent (anyOf/oneOf/allOf) and object-property
+    // recursion deliberately do NOT increment array-depth, so a pure-inline chain of
+    // distinct composition subschemas (no `$ref` at all, e.g. allOf nested 500 deep)
+    // would never trip MAX_DEPTH and would recurse unbounded. This counter increments
+    // on EVERY structural recursion (object-property + array-items + composition) and
+    // bounds total descent regardless of how depth is (or isn't) advanced. The
+    // pointer-`visited` guard already terminates ALL `$ref` cycles; this counter only
+    // backstops a finite-but-pathologically-deep PURE-INLINE chain (no `$ref`), itself
+    // bounded by the finite schema-file size — so the bound can be small with no
+    // practical downside, and small is what keeps termination stack-INdependent.
+    //
+    // Native ceiling, measured in this counter's own units (one `recursion++` per
+    // structural step) for the deepest single-recursion-per-level inline chain:
+    //   - default node stack (~984 KB): RangeError past ~1562 recursion units
+    //   - `node --stack-size=512`:      RangeError past ~976 units
+    //   - `node --stack-size=256`:      RangeError past ~390 units
+    // A bound of 1024 therefore does NOT engage before native overflow on a 512 KB or
+    // smaller stack — termination would be stack-dependent. 128 sits with large margin
+    // below even the ~390-unit ceiling of a 256 KB stack (~67% headroom), so the
+    // counter RETURNS before any `RangeError` can escape regardless of stack size,
+    // preserving the lint-never-throws contract for a hostile pure-inline chain. It
+    // still vastly exceeds any realistic authored nesting (deepest shipped schema nests
+    // ~2 levels; real schemas stay well under ~20), and bounds recursion DEPTH per path
+    // only — breadth is unbounded, so a schema with hundreds of sibling id-bearing
+    // nested arrays still flags every one. Verified empirically at default and
+    // constrained (`--stack-size=512`/`256`) stacks against a 5000-deep inline chain.
+    const MAX_STRUCT_RECURSION = 128;
+    // Resolve a one-level local `$ref` on a schema node, mirroring
+    // resolveBlockItemSchema's supported refs (#/definitions/* | #/$defs/*).
+    // Unresolvable / unsupported / external refs are returned as the original node
+    // (opaque — the caller then finds no shape-bearing keys and stops). A `$ref`
+    // whose resolved pointer has already been seen on this descent path returns an
+    // empty object so a self-referential / mutually-recursive `$defs` cannot loop.
+    // Never throws — this is a lint pass, not a load-time validation gate. On a
+    // successful resolution the resolved pointer string is recorded in `visited`
+    // (which the caller passes as a path-local clone so sibling uses of the same
+    // `$ref` are not pruned — only cycles along one path are stopped).
+    function deref(node, visited) {
+        const ref = typeof node.$ref === "string" ? node.$ref : undefined;
+        if (!ref)
+            return node;
+        const m = /^#\/(definitions|\$defs)\/(.+)$/.exec(ref);
+        if (!m)
+            return node;
+        if (visited.has(ref))
+            return {};
+        const bag = schema[m[1]];
+        const target = bag?.[m[2]];
+        if (!target || typeof target !== "object")
+            return node;
+        visited.add(ref);
+        return target;
+    }
+    // The composition keywords whose members are arrays of subschemas; an `id`
+    // (or a deeper nested array) can be buried inside any branch.
+    function compositionBranches(node) {
+        const out = [];
+        for (const key of ["anyOf", "oneOf", "allOf"]) {
+            const arr = node[key];
+            if (Array.isArray(arr)) {
+                for (const member of arr) {
+                    if (member && typeof member === "object")
+                        out.push(member);
+                }
+            }
+        }
+        return out;
+    }
+    // True iff this subschema declares an `id` — directly via `properties.id`, via
+    // `required` membership, or through ANY anyOf/oneOf/allOf branch (recursive,
+    // any-branch). Cycle-guarded through `deref`; the visited set is cloned per
+    // descent so it stops loops without pruning sibling references.
+    function declaresId(nodeRaw, visited, depth) {
+        if (!nodeRaw || typeof nodeRaw !== "object" || depth > MAX_DEPTH)
+            return false;
+        const node = deref(nodeRaw, visited);
+        const props = node.properties;
+        if (props && Object.hasOwn(props, "id"))
+            return true;
+        if (Array.isArray(node.required) && node.required.includes("id"))
+            return true;
+        for (const branch of compositionBranches(node)) {
+            if (declaresId(branch, new Set(visited), depth + 1))
+                return true;
+        }
+        return false;
+    }
+    // True iff the `items` of an array property is id-bearing: an object subschema →
+    // `declaresId`; a tuple (array of subschemas) → ANY member `declaresId`.
+    function itemsDeclareId(itemsRaw, visited) {
+        if (Array.isArray(itemsRaw)) {
+            return itemsRaw.some((member) => member !== null &&
+                typeof member === "object" &&
+                declaresId(member, new Set(visited), 0));
+        }
+        if (itemsRaw && typeof itemsRaw === "object") {
+            return declaresId(itemsRaw, new Set(visited), 0);
+        }
+        return false;
+    }
+    // Structural descent. From a (deref'd) node, visit every shape that can host a
+    // nested array: own `properties`, each composition branch's `properties`, and
+    // each tuple-`items` member. `depth` increments ONLY when descending through an
+    // array's `items`; an array property is the forbidden relationship-as-embedding
+    // when it is reached at `depth >= 1` AND its items declare an `id`. `recursion`
+    // increments on EVERY structural step (checked in `walk` AND at the composition
+    // loop entry) so a composition chain that never advances `depth` still terminates.
+    function descendShape(node, depth, keyPath, visited, recursion) {
+        const props = node.properties;
+        if (props) {
+            for (const [k, vRaw] of Object.entries(props)) {
+                if (!vRaw || typeof vRaw !== "object")
+                    continue;
+                const v = vRaw;
+                if (v.type === "array" && v.items) {
+                    // The id-peek uses a FRESH cycle-guard, independent of the structural
+                    // `visited` set. "Does this item declare an id" is a distinct question
+                    // from "have I already structurally walked this $ref"; reusing the
+                    // polluted structural set would short-circuit a $ref back to a $def that
+                    // declares the id (the descent already added that pointer), yielding a
+                    // false negative on $ref-cyclic id-bearing schemas. `declaresId` has its
+                    // own per-branch clone + MAX_DEPTH backstop and only recurses through
+                    // composition (not arbitrary properties), so a fresh seed cannot loop.
+                    if (depth >= 1 && itemsDeclareId(v.items, new Set())) {
+                        hits.push(`${keyPath}${k}`);
+                    }
+                    // Descend into the array's items at depth+1 to catch deeper nesting,
+                    // whether `items` is a single subschema or a tuple of subschemas.
+                    const itemMembers = Array.isArray(v.items) ? v.items : [v.items];
+                    for (const memberRaw of itemMembers) {
+                        if (memberRaw && typeof memberRaw === "object") {
+                            walk(memberRaw, depth + 1, `${keyPath}${k}.`, new Set(visited), recursion + 1);
+                        }
+                    }
+                }
+                else {
+                    // Object-valued (non-array) property: recurse at the SAME depth so a
+                    // nested object wrapper does not by itself count as array nesting.
+                    walk(v, depth, `${keyPath}${k}.`, new Set(visited), recursion + 1);
+                }
+            }
+        }
+        // A nested array can be buried inside a composition branch; traverse each at
+        // the SAME `depth` (a branch is not itself an array `items` descent). Route the
+        // composition descent through `walk` — NOT a direct `descendShape` self-call — so
+        // the recursion is bounded by `walk`'s MAX_DEPTH / MAX_STRUCT_RECURSION backstops
+        // just like every other path, and pass the SAME running `visited` (a path-local
+        // clone that PRESERVES the ancestor refs already seen). `walk`'s `deref` then both
+        // records the resolved pointer into that clone AND checks `visited.has(ref)` on it,
+        // so a composition-routed `$ref` back to an ancestor `$def` already on this path
+        // resolves to `{}` (cycle caught) rather than recursing forever. A pure-inline
+        // composition chain (no `$ref`, so the pointer guard never fires) is instead bounded
+        // by MAX_STRUCT_RECURSION, which `walk` increments on entry.
+        for (const branch of compositionBranches(node)) {
+            if (branch && typeof branch === "object") {
+                walk(branch, depth, keyPath, new Set(visited), recursion + 1);
+            }
+        }
+    }
+    function walk(node, depth, keyPath, visited, recursion) {
+        if (!node || typeof node !== "object" || depth > MAX_DEPTH || recursion > MAX_STRUCT_RECURSION)
+            return;
+        descendShape(deref(node, visited), depth, keyPath, visited, recursion);
+    }
+    walk(schema, 0, "", new Set(), 0);
+    return hits;
 }
 /**
- * Read a schema from `<contextDir>/schemas/<schemaName>.schema.json` and
- * return the parsed object. Returns `null` when the file does not exist —
- * absence is a normal pre-write state, not an error. Throws when the file
- * exists but is unreadable or contains invalid JSON.
- *
- * Note: this reader does NOT meta-validate. Callers that need a guarantee
- * the file holds a valid schema should pipe the result through
- * `validateSchemaAgainstMeta` themselves; `updateSchema` already does.
+ * Throw when `schema` declares any nested id-bearing array (see
+ * `findNestedIdBearingArrays`). The message names every offending dotted
+ * key-path so the author knows exactly which embedded array to promote to a
+ * top-level entity + membership edge. Mirrors the meta-reject throw convention
+ * (a plain `Error` carrying a labeled message). A schema with no nested
+ * id-bearing array is a no-op.
  */
-export function readSchema(cwd, schemaName) {
-    const p = schemaWritePath(cwd, schemaName);
+export function assertNoNestedIdBearingArray(schema, label) {
+    const paths = findNestedIdBearingArrays(schema);
+    if (paths.length) {
+        throw new Error(`${label}: nested id-bearing arrays are forbidden (id-bearing items must be top-level blocks joined by membership edges, not embedded): ${paths.join(", ")}`);
+    }
+}
+/**
+ * `<substrateDir>/schemas/<schemaName>.schema.json` — canonical schema path for
+ * an EXPLICIT substrate directory, routed through `schemaPathForDir`
+ * (context-dir) so write resolution is BYTE-IDENTICAL to read resolution
+ * (FGAP-079 / DEC-0045) and inherits its `assertSubstrateName` guard
+ * (path-traversal rejection). This is the dir-targeted twin of the cwd-resolved
+ * write path; the cwd forms below delegate here via `resolveContextDir(cwd)`,
+ * so a cwd call lands BYTE-IDENTICALLY where it did when this routed through the
+ * cwd-resolving `schemaPath`.
+ */
+function schemaWritePathForDir(substrateDir, schemaName) {
+    return schemaPathForDir(substrateDir, schemaName);
+}
+/**
+ * Dir-targeted twin of `readSchema`: read a schema from
+ * `<substrateDir>/schemas/<schemaName>.schema.json` and return the parsed
+ * object. Returns `null` when absent (a normal pre-write state). Throws when the
+ * file exists but is unreadable or holds invalid JSON. Does NOT meta-validate
+ * (mirrors `readSchema`).
+ */
+export function readSchemaForDir(substrateDir, schemaName) {
+    const p = schemaWritePathForDir(substrateDir, schemaName);
     if (!fs.existsSync(p))
         return null;
     let raw;
@@ -63,15 +284,29 @@ export function readSchema(cwd, schemaName) {
         raw = fs.readFileSync(p, "utf-8");
     }
     catch (err) {
-        throw new Error(`readSchema: failed to read ${p}: ${err instanceof Error ? err.message : String(err)}`);
+        throw new Error(`readSchemaForDir: failed to read ${p}: ${err instanceof Error ? err.message : String(err)}`);
     }
     try {
         return JSON.parse(raw);
     }
     catch (err) {
-        throw new Error(`readSchema: invalid JSON in ${p}: ${err instanceof Error ? err.message : String(err)}`);
+        throw new Error(`readSchemaForDir: invalid JSON in ${p}: ${err instanceof Error ? err.message : String(err)}`);
     }
 }
+/**
+ * Read a schema from `<resolveContextDir(cwd)>/schemas/<schemaName>.schema.json`
+ * and return the parsed object. Thin cwd wrapper over `readSchemaForDir` — the
+ * read/parse logic lives in the ForDir body. Returns `null` when the file does
+ * not exist — absence is a normal pre-write state, not an error. Throws when the
+ * file exists but is unreadable or contains invalid JSON.
+ *
+ * Note: this reader does NOT meta-validate. Callers that need a guarantee
+ * the file holds a valid schema should pipe the result through
+ * `validateSchemaAgainstMeta` themselves; `updateSchema` already does.
+ */
+export function readSchema(cwd, schemaName) {
+    return readSchemaForDir(resolveContextDir(cwd), schemaName);
+}
 /**
  * Atomically write `schema` to `<contextDir>/schemas/<schemaName>.schema.json`
  * after validating it against the JSON Schema draft-07 meta-schema.
@@ -85,10 +320,28 @@ export function readSchema(cwd, schemaName) {
  * Overwrites any existing schema at the target path; callers that need
  * mutate-in-place semantics should use `updateSchema`.
  */
-export function writeSchema(cwd, schemaName, schema) {
-    const p = schemaWritePath(cwd, schemaName);
+/**
+ * Dir-targeted twin of `writeSchema`: atomically write `schema` to
+ * `<substrateDir>/schemas/<schemaName>.schema.json` after meta-validation + the
+ * nested-id guard. Carries the full validate-then-write body; `writeSchema`
+ * delegates here via `resolveContextDir(cwd)`. Cross-substrate consumers (Cycle
+ * H migration / land-identity-fields) target a non-active substrate directly.
+ *
+ * `ctx` is accepted and IGNORED: schema files carry no author-attestation
+ * fields (mirrors `writeSchemaChecked`'s ctx parameter). Present for call-site
+ * parity with the attestation-aware block-write surfaces.
+ */
+export function writeSchemaForDir(substrateDir, schemaName, schema, ctx) {
+    void ctx; // accepted for call-site parity; schema files carry no author fields.
+    const p = schemaWritePathForDir(substrateDir, schemaName);
     // (1) Meta-schema validation BEFORE any disk activity.
     validateSchemaAgainstMeta(schema, `schema '${schemaName}'`);
+    // (1b) Substrate-shape guard: reject a schema that embeds an id-bearing item
+    // inside another item's array (nested id-bearing array) — a
+    // relationship-as-embedding that must be a top-level entity + membership edge
+    // (content-addressed substrate identity, Cycle 9.2). Runs after meta-validation
+    // (so the body is structurally a schema) and before any disk activity.
+    assertNoNestedIdBearingArray(schema, `schema '${schemaName}'`);
     // (2) Ensure the schemas/ directory exists.
     fs.mkdirSync(path.dirname(p), { recursive: true });
     // (3) Atomic write: tmp + rename.
@@ -105,9 +358,12 @@ export function writeSchema(cwd, schemaName, schema) {
             /* best-effort cleanup — surface the original error below */
         }
         const msg = err instanceof Error ? err.message : String(err);
-        throw new Error(`writeSchema: failed to write ${p}: ${msg}`);
+        throw new Error(`writeSchemaForDir: failed to write ${p}: ${msg}`);
     }
 }
+export function writeSchema(cwd, schemaName, schema) {
+    writeSchemaForDir(resolveContextDir(cwd), schemaName, schema);
+}
 /**
  * Op-correct create-or-replace of a whole schema body, layered over
  * `writeSchema` (FGAP-077 — the Pi-tool / CLI-facing schema-write op).
@@ -149,30 +405,37 @@ export function writeSchema(cwd, schemaName, schema) {
  * supplied body and returns `{ written: false }` without touching disk —
  * keeping ONE validation path (no re-implemented validation for the preview).
  */
-export function writeSchemaChecked(cwd, schemaName, schema, operation, ctx, opts) {
+export function writeSchemaCheckedForDir(substrateDir, schemaName, schema, operation, ctx, opts) {
     void ctx; // accepted for call-site parity; schema files carry no author fields.
-    const target = schemaWritePath(cwd, schemaName);
+    const target = schemaWritePathForDir(substrateDir, schemaName);
     // (1) Operation discriminator — reject unknown ops before any disk read.
     if (operation !== "create" && operation !== "replace") {
         throw new Error(`writeSchemaChecked: unknown operation '${operation}' — expected create | replace`);
     }
-    // (2) Presence guard — readSchema returns null when the file is absent.
-    const existing = readSchema(cwd, schemaName);
+    // (2) Presence guard — readSchemaForDir returns null when the file is absent.
+    const existing = readSchemaForDir(substrateDir, schemaName);
     if (operation === "create" && existing !== null) {
         throw new Error(`writeSchemaChecked: create collision — schema '${schemaName}' already exists at ${target}; use operation 'replace' to overwrite`);
     }
     if (operation === "replace" && existing === null) {
         throw new Error(`writeSchemaChecked: replace target missing — schema '${schemaName}' does not exist at ${target}; use operation 'create'`);
     }
-    // (3) Dry-run: meta-validate via the SAME validator writeSchema uses, no write.
+    // (3) Dry-run: meta-validate via the SAME validator the write path uses, no
+    // write. The dry-run branch does NOT route through writeSchemaForDir (which
+    // carries the nested-id guard), so the guard is applied here too — a --dry-run
+    // preview of a nested-id schema must reject identically to a committing write.
     if (opts?.dryRun) {
         validateSchemaAgainstMeta(schema, `schema '${schemaName}' (dry-run)`);
+        assertNoNestedIdBearingArray(schema, `schema '${schemaName}' (dry-run)`);
         return { written: false, operation, schemaPath: target };
     }
-    // (4) Commit: writeSchema re-meta-validates + writes atomically (tmp + rename).
-    writeSchema(cwd, schemaName, schema);
+    // (4) Commit: writeSchemaForDir re-meta-validates + writes atomically (tmp + rename).
+    writeSchemaForDir(substrateDir, schemaName, schema, ctx);
     return { written: true, operation, schemaPath: target };
 }
+export function writeSchemaChecked(cwd, schemaName, schema, operation, ctx, opts) {
+    return writeSchemaCheckedForDir(resolveContextDir(cwd), schemaName, schema, operation, ctx, opts);
+}
 /**
  * Read the current schema at `<contextDir>/schemas/<schemaName>.schema.json`,
  * pass it to `mutator`, meta-validate the result, and atomically write it
@@ -191,7 +454,7 @@ export function writeSchemaChecked(cwd, schemaName, schema, operation, ctx, opts
 export function updateSchema(cwd, schemaName, mutator) {
     const current = readSchema(cwd, schemaName);
     if (current === null) {
-        throw new Error(`updateSchema: schema '${schemaName}' does not exist at ${schemaWritePath(cwd, schemaName)}; use writeSchema to create it`);
+        throw new Error(`updateSchema: schema '${schemaName}' does not exist at ${schemaWritePathForDir(resolveContextDir(cwd), schemaName)}; use writeSchema to create it`);
     }
     const next = mutator(current);
     // validateSchemaAgainstMeta will throw ValidationError on a malformed result;