aontu 0.53.0 → 0.55.0

package/dist/val/GraphAtomVal.js

@@ -0,0 +1,184 @@
+"use strict";
+/* Copyright (c) 2025 Richard Rodger, MIT License */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InverseFuncVal = exports.AcyclicFuncVal = exports.GraphAtomVal = void 0;
+exports.relDecls = relDecls;
+const type_1 = require("../type");
+const err_1 = require("../err");
+const FuncBaseVal_1 = require("./FuncBaseVal");
+const FeatureVal_1 = require("./FeatureVal");
+const unify_1 = require("../unify");
+const utility_1 = require("../utility");
+function relDecls(ctx) {
+    return ctx._reldecls;
+}
+class GraphAtomVal extends FeatureVal_1.FeatureVal {
+    constructor(spec, ctx) {
+        super(spec, ctx);
+        this.isGraphAtom = true;
+        this.isGenable = true;
+        // AFTER rel() (45000): the atoms say nothing about the value.
+        this.cjo = 46000;
+        this.akind = spec.akind ?? 'acyclic';
+        this.invname = spec.invname;
+        this.held = spec.held;
+        // A settled residual, like an unmet rel(): the bare atom is its
+        // own value, and a type() body carrying one must settle. Holding
+        // an unsettled value, it is exactly as done as the value.
+        this.dc = undefined === this.held || true === this.held.done
+            ? type_1.DONE : 0;
+    }
+    clone(ctx, spec) {
+        const out = super.clone(ctx, spec);
+        out.akind = this.akind;
+        out.invname = this.invname;
+        out.held = this.held;
+        out.dc = this.dc;
+        return out;
+    }
+    // A rebuilt atom around a new held, at this atom's position.
+    carry(ctx, held) {
+        const out = new GraphAtomVal({ akind: this.akind, invname: this.invname, held }, ctx);
+        (0, utility_1.propagateMarks)(this, out);
+        out.site = this.site;
+        out.path = this.path;
+        return out;
+    }
+    // The predicate is the key the atom sits on -- and a predicate is a
+    // D-1 NAME, by exactly fieldkey's rule: an atom landed anywhere
+    // else declares nothing. Registration is idempotent (the
+    // declaration set is a set) and happens at every drive, so
+    // whichever pass first sees the atom at its landed position records
+    // it.
+    register(ctx) {
+        const seg = this.path[this.path.length - 1];
+        if ('string' !== typeof seg || !GRAPH_ATOM_NAME.test(seg)) {
+            return;
+        }
+        const decls = relDecls(ctx);
+        let d = decls.get(seg);
+        if (undefined === d) {
+            d = { inverses: new Set() };
+            decls.set(seg, d);
+        }
+        if ('acyclic' === this.akind) {
+            d.acyclic = true;
+        }
+        else if (undefined !== this.invname) {
+            d.inverses.add(this.invname);
+        }
+    }
+    unify(peer, ctx) {
+        const p = peer;
+        this.register(ctx);
+        // The self-drive: unite's tail calls unify(top) directly on any
+        // not-done result, and the held is what still has work to do.
+        // (A null/nil peer never arrives -- unite's ladder absorbs both.)
+        if (null == peer || true === p.isTop) {
+            if (undefined === this.held) {
+                return this;
+            }
+            if (true === this.held.done) {
+                // Doneness is monotone, so recording it in place is safe --
+                // and without it the bag walk keeps asking and generation
+                // refuses a finished value.
+                this.dc = type_1.DONE;
+                return this;
+            }
+            // The self-drive refines IN PLACE (the MapVal top-peer
+            // pattern): a fresh atom per pass changes object identity, so
+            // spread apply-once stamps and the entity merge's fast paths
+            // stop holding, and the enclosing bags re-open every pass --
+            // the service catalog never converged.
+            const held = (0, unify_1.unite)(ctx, this.held, undefined, 'atom-drive');
+            if (true === held.isNil) {
+                return held;
+            }
+            this.held = held;
+            if (true === held.done) {
+                this.dc = type_1.DONE;
+            }
+            return this;
+        }
+        // The SAME declaration twice is one declaration; their helds
+        // merge.
+        if (true === p.isGraphAtom &&
+            p.akind === this.akind && p.invname === this.invname) {
+            const held = undefined === this.held ? p.held
+                : undefined === p.held ? this.held
+                    : (0, unify_1.unite)(ctx, this.held, p.held, 'atom-dup');
+            if (undefined !== held && true === held.isNil) {
+                return held;
+            }
+            return undefined === held ? this : this.carry(ctx, held);
+        }
+        // Anything else -- the rel, the container, a different atom -- is
+        // ABSORBED: the atom carries the value and the fold's pairwise
+        // walk merges across it.
+        const held = undefined === this.held ? peer
+            : (0, unify_1.unite)(ctx, this.held, peer, 'atom-held');
+        return true === held.isNil ? held : this.carry(ctx, held);
+    }
+    get canon() {
+        const own = 'acyclic' === this.akind
+            ? 'acyclic()'
+            : 'inverse(' + JSON.stringify(this.invname) + ')';
+        return undefined === this.held ? own : this.held.canon + '&' + own;
+    }
+    gen(ctx) {
+        // The atom is transparent at generation -- its verdict is global
+        // (relationVerdict), never a value at this field -- and a BARE
+        // atom is silent, exactly as an unmet rel() is.
+        return undefined === this.held ? undefined : this.held.gen(ctx);
+    }
+}
+exports.GraphAtomVal = GraphAtomVal;
+// D-1 (docs/design/RELATIONS.0.md): the name grammar shared by entity
+// names, edge predicates and inverse names.
+const GRAPH_ATOM_NAME = /^[_a-zA-Z][-_a-zA-Z0-9]*$/;
+class AcyclicFuncVal extends FuncBaseVal_1.FuncBaseVal {
+    constructor(spec, ctx) {
+        super(spec, ctx);
+        this.isAcyclicFunc = true;
+    }
+    make(_ctx, spec) {
+        return new AcyclicFuncVal(spec);
+    }
+    funcname() {
+        return 'acyclic';
+    }
+    resolve(ctx, _args) {
+        const out = new GraphAtomVal({ akind: 'acyclic' }, ctx);
+        out.site = this.site;
+        out.path = this.path;
+        return out;
+    }
+}
+exports.AcyclicFuncVal = AcyclicFuncVal;
+class InverseFuncVal extends FuncBaseVal_1.FuncBaseVal {
+    constructor(spec, ctx) {
+        super(spec, ctx);
+        this.isInverseFunc = true;
+    }
+    make(_ctx, spec) {
+        return new InverseFuncVal(spec);
+    }
+    funcname() {
+        return 'inverse';
+    }
+    resolve(ctx, args) {
+        const a = args[0];
+        // The mirroring predicate is a NAME -- D-1, spelled bare or
+        // quoted. A relation is a vocabulary term, not an address.
+        if (true !== a?.isScalar || 'string' !== typeof a.peg
+            || !GRAPH_ATOM_NAME.test(a.peg)) {
+            return (0, err_1.makeNilErr)(ctx, 'inverse_name', this, undefined, 'inverse');
+        }
+        const out = new GraphAtomVal({ akind: 'inverse', invname: a.peg }, ctx);
+        out.site = this.site;
+        out.path = this.path;
+        return out;
+    }
+} /* node:coverage ignore next 7 */
+exports.InverseFuncVal = InverseFuncVal;
+//# sourceMappingURL=GraphAtomVal.js.map

package/dist/val/GraphAtomVal.js.map

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

package/dist/val/JunctionVal.js

@@ -17,12 +17,29 @@ class JunctionVal extends FeatureVal_1.FeatureVal {
     }
     clone(ctx, spec) {
         let out = super.clone(ctx, spec);
-        // The instantiation flag descends with the mark (ADR-005): a
-        // junction inside a template clones its members as instances (the
-        // instantiation sites re-path the whole clone afterwards — see
-        // repathInstance in Val.ts).
+        // A JUNCTION'S MEMBERS SIT AT THE JUNCTION'S OWN POSITION. That is
+        // the rule `repathInstance` (Val.ts) states for the instance walk
+        // -- a conjunct's members occupy the conjunct's position, which is
+        // what `A & B` means -- and it holds for every clone, not only for
+        // marked ones.
+        //
+        // Val.clone's ctx cut cannot derive it: MapVal.clone hands a child
+        // its path through the SPEC rather than by descending the ctx, so
+        // a member left to the cut takes the DRIVING context's path -- the
+        // map's -- and loses the field key it sits under. A conjunct
+        // member reached through a reference into a position at least as
+        // deep as its definition then carried the entity's path, and every
+        // reader of `Val.path` was told the wrong position: a rel()-minted
+        // link took the ENTITY's key as its predicate, so `inverse(n)`
+        // looked for a mirror under a relation nobody declared and
+        // reported a written mirror missing.
+        //
+        // The instantiation flag still descends with the mark (ADR-005).
+        // Go states the same invariant directly (go/clone.go, cloneAt), so
+        // this restores parity rather than inventing a behaviour.
         const childspec = spec?.mark || spec?.dup ?
-            { mark: spec?.mark, dup: spec?.dup } : {};
+            { mark: spec?.mark, dup: spec?.dup, path: out.path }
+            : { path: out.path };
         out.peg = this.peg.map((entry) => entry.clone(ctx, childspec));
         return out;
     }

package/dist/val/JunctionVal.js.map

@@ -1 +1 @@
-{"version":3,"file":"JunctionVal.js","sourceRoot":"","sources":["../../src/val/JunctionVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAYzD,6CAAyC;AAGzC,iFAAiF;AACjF,gCAAgC;AAChC,MAAe,WAAY,SAAQ,uBAAU;IAG3C,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QANlB,eAAU,GAAG,IAAI,CAAA;IAOjB,CAAC;IAED,kBAAkB;IAClB,MAAM,CAAC,IAAS;QACd,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,GAAiB,EAAE,IAAc;QACrC,IAAI,GAAG,GAAI,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAiB,CAAA;QACjD,6DAA6D;QAC7D,kEAAkE;QAClE,+DAA+D;QAC/D,6BAA6B;QAC7B,MAAM,SAAS,GAAG,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC;YACzC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAC3C,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;QACnE,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE;YAC7B,OAAQ,CAAS,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACxE,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA,CAAC,uBAAuB;QACzD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA,CAAC,4CAA4C;IAChF,CAAC;CAIF,CAAC,iCAAiC;QAIjC,WAAW"}
+{"version":3,"file":"JunctionVal.js","sourceRoot":"","sources":["../../src/val/JunctionVal.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAYzD,6CAAyC;AAGzC,iFAAiF;AACjF,gCAAgC;AAChC,MAAe,WAAY,SAAQ,uBAAU;IAG3C,YACE,IAAa,EACb,GAAkB;QAElB,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QANlB,eAAU,GAAG,IAAI,CAAA;IAOjB,CAAC;IAED,kBAAkB;IAClB,MAAM,CAAC,IAAS;QACd,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,GAAiB,EAAE,IAAc;QACrC,IAAI,GAAG,GAAI,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAiB,CAAA;QACjD,mEAAmE;QACnE,kEAAkE;QAClE,mEAAmE;QACnE,mEAAmE;QACnE,eAAe;QACf,EAAE;QACF,mEAAmE;QACnE,kEAAkE;QAClE,mEAAmE;QACnE,6DAA6D;QAC7D,iEAAiE;QACjE,mEAAmE;QACnE,mEAAmE;QACnE,+DAA+D;QAC/D,2DAA2D;QAC3D,qCAAqC;QACrC,EAAE;QACF,iEAAiE;QACjE,mEAAmE;QACnE,0DAA0D;QAC1D,MAAM,SAAS,GAAQ,IAAI,EAAE,IAAI,IAAI,IAAI,EAAE,GAAG,CAAC,CAAC;YAC9C,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE;YACpD,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAA;QACtB,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;QACnE,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE;YAC7B,OAAQ,CAAS,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACxE,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA,CAAC,uBAAuB;QACzD,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA,CAAC,4CAA4C;IAChF,CAAC;CAIF,CAAC,iCAAiC;QAIjC,WAAW"}

package/dist/val/ListVal.js

@@ -8,7 +8,6 @@ const utility_1 = require("../utility");
 const err_1 = require("../err");
 const top_1 = require("./top");
 const ConjunctVal_1 = require("./ConjunctVal");
-const NilVal_1 = require("./NilVal");
 const BagVal_1 = require("./BagVal");
 const Val_1 = require("./Val");
 const provenance_1 = require("../provenance");
@@ -33,21 +32,6 @@ class ListVal extends BagVal_1.BagVal {
                             new ConjunctVal_1.ConjunctVal({ peg: spread.v }, ctx) :
                             spread.v[0] :
                         spread.v;
-                // Clearing rule 3 (G4 phase 1): a CONSTANT id in the template
-                // would declare every child to be one entity. The refusal
-                // replaces the template, so it reaches every child and the
-                // bag itself (see the isNil arm where the spread is applied)
-                // as ONE nil identity — made here, once, rather than per
-                // pass, so the report names it once.
-                const idfn = (0, utility_1.constantIdFunc)(this.spread.cj);
-                if (undefined !== idfn) {
-                    const nil = new NilVal_1.NilVal({ why: 'id_spread' }, ctx);
-                    nil.site.row = idfn.site.row;
-                    nil.site.col = idfn.site.col;
-                    nil.site.url = idfn.site.url;
-                    nil.primary = idfn;
-                    this.spread.cj = nil;
-                }
                 // let tmv = Array.isArray(spread.v) ? spread.v : [spread.v]
                 // this.spread.cj = new ConjunctVal({ peg: tmv }, ctx)
             }
@@ -56,6 +40,11 @@ class ListVal extends BagVal_1.BagVal {
     // NOTE: order of keys is not preserved!
     // not possible in any case - consider {a,b} unify {b,a}
     unify(peer, ctx) {
+        // A rel() peer drives: the relation constraint rewrites this list
+        // leaf by leaf (RELATIONS.0.md §3.2); see the twin arm in MapVal.
+        if (true === peer?.isRel) {
+            return peer.unify(this, ctx);
+        }
         const TOP = (0, top_1.top)();
         peer = peer ?? TOP;
         // A sizing residual (`length`, `unique`) sorts AFTER containers in a
@@ -67,6 +56,18 @@ class ListVal extends BagVal_1.BagVal {
         if (true === peer.isConstraint) {
             return peer.unify(this, ctx);
         }
+        // A DISJUNCT ALTERNATIVE MATCHES ITS OWN LENGTH (BUGS.md §52
+        // regime 4, the X-C3 adjudication): in a trial, a literal list
+        // with no spread admits only a peer list of the same length -- a
+        // spread makes it variadic. Outside trials the ordinary
+        // elementwise merge stands (two statements of one list are one
+        // list), so `[] | [&: T]` stops admitting every list through the
+        // empty arm while `a: [] a: [1]` still merges.
+        if (true === ctx._trialMode && true === peer.isList
+            && null == this.spread.cj && null == peer.spread.cj
+            && this.peg.length !== peer.peg.length) {
+            return (0, err_1.makeNilErr)(ctx, 'list_length', this, peer);
+        }
         const te = ctx.explain && (0, utility_1.explainOpen)(ctx, ctx.explain, 'List', this, peer);
         let done = true;
         let exit = false;
@@ -90,20 +91,6 @@ class ListVal extends BagVal_1.BagVal {
         if (!exit) {
             out.dc = this.dc + 1;
             let spread_cj = out.spread.cj || TOP;
-            // The template REFUSED at construction (clearing rule 3, G4
-            // phase 1): the bag itself is that refusal. Returning the nil
-            // here rather than only letting it reach the children is what
-            // makes an EMPTY bag with a bad template an error too — there
-            // are no children to carry it.
-            //
-            // Narrow to THIS code on purpose. A nil spread from any other
-            // cause keeps its existing behaviour of driving every key
-            // (coverage3 `nil-spread-drives-every-key`): a template that has
-            // merely not resolved yet must not permanently kill the bag that
-            // holds it.
-            if ('id_spread' === spread_cj.why) {
-                return spread_cj;
-            }
             // Always unify children first
             for (let key in this.peg) {
                 const keyctx = ctx.descend(key);
@@ -115,7 +102,7 @@ class ListVal extends BagVal_1.BagVal {
                 // instead of having the template met into it a second time.
                 // Re-applying is the identity for a template that has already
                 // RESOLVED, which is why the missing guard went unnoticed here
-                // — but a template that residuates (`&: id(key(1))`, G8 phase
+                // — but a template that residuates (`&: {k: key(1)}`, G8 phase
                 // 0) is not yet a value to be idempotent about, so each pass
                 // conjoined another copy and the element's canon DOUBLED per
                 // pass. The old `ctx.cc < 3` key delay hid it by ending the
@@ -124,10 +111,10 @@ class ListVal extends BagVal_1.BagVal {
                 // does.
                 let oval;
                 if (!spread_cj.isTop
-                    && child._spr === spread_cj.id) {
+                    && child._spr === (0, Val_1.spreadId)(spread_cj)) {
                     oval = child.done ? child :
                         (0, unify_1.unite)(te ? keyctx.clone({ explain: (0, utility_1.ec)(te, 'PEG:' + key) }) : keyctx, child, TOP, 'list-own');
-                    oval._spr = spread_cj.id;
+                    oval._spr = (0, Val_1.spreadId)(spread_cj);
                 }
                 else {
                     const key_spread_cj = spread_cj.spreadClone(keyctx);
@@ -152,7 +139,7 @@ class ListVal extends BagVal_1.BagVal {
                                         (0, unify_1.unite)(te ? keyctx.clone({ explain: (0, utility_1.ec)(te, 'PEG:' + key) }) : keyctx, child, key_spread_cj, 'list-own');
                     if (!spread_cj.isTop && !oval.isNil) {
                         ;
-                        oval._spr = spread_cj.id;
+                        oval._spr = (0, Val_1.spreadId)(spread_cj);
                     }
                 }
                 out.peg[key] = oval;
@@ -188,6 +175,12 @@ class ListVal extends BagVal_1.BagVal {
                     done = (done && type_1.DONE === oval.dc);
                 }
             }
+            else if (true === peer.isContainerKind) {
+                // The container KIND delegates to its own arm, exactly as a
+                // scalar delegates to a ScalarKindVal peer (MapVal has the
+                // same arm).
+                out = peer.unify(this, ctx);
+            }
             else if (!peer.isTop) {
                 out = (0, err_1.makeNilErr)(ctx, 'list', this, peer);
             }

package/dist/val/ListVal.js.map

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

package/dist/val/MapVal.d.ts

@@ -4,6 +4,7 @@ import { BagVal } from './BagVal';
 declare class MapVal extends BagVal {
     isMap: boolean;
     constructor(spec: ValSpec, ctx?: AontuContext);
+    aliasDeclarationsAreRooted(ctx: AontuContext): Val | undefined;
     unify(peer: Val, ctx: AontuContext): Val;
     spreadClone(ctx: AontuContext): Val;
     clone(ctx: AontuContext, spec?: ValSpec): Val;

package/dist/val/MapVal.js

@@ -7,6 +7,7 @@ const unify_1 = require("../unify");
 const utility_1 = require("../utility");
 const err_1 = require("../err");
 const top_1 = require("./top");
+const RefVal_1 = require("./RefVal");
 const ConjunctVal_1 = require("./ConjunctVal");
 const NilVal_1 = require("./NilVal");
 const BagVal_1 = require("./BagVal");
@@ -44,6 +45,15 @@ function snapshotRefSpread(cj, ctx) {
         // so a type-wrapped ref behaves like a plain-map ref spread.
         if (tgt && tgt.isTypeFunc)
             tgt = tgt.peg?.[0];
+        // A pending type()/hide() CALL is not yet a value to snapshot
+        // (ADR-005, the same rule find's non-snap path defers on): cached
+        // here it resolves at every destination and STAMPS marks the
+        // clearing walk ran too early to clear -- a mutual recursive
+        // schema's members vanished from generation this way. No cache;
+        // retry once the wrapper has resolved at its own field.
+        if (tgt && (0, RefVal_1.pendingMarkWrapper)(tgt)) {
+            return undefined;
+        }
         // Only snapshot a found, path-dependent target. If the target is not
         // present yet (it may be introduced by a later conjunct/merge), do
         // NOT cache — retry on the next fixpoint pass.
@@ -86,28 +96,39 @@ class MapVal extends BagVal_1.BagVal {
                             new ConjunctVal_1.ConjunctVal({ peg: spread.v }, ctx) :
                             spread.v[0] :
                         spread.v;
-                // Clearing rule 3 (G4 phase 1): a CONSTANT id in the template
-                // would declare every child to be one entity. The refusal
-                // replaces the template, so it reaches every child and the
-                // bag itself (see the isNil arm where the spread is applied)
-                // as ONE nil identity — made here, once, rather than per
-                // pass, so the report names it once.
-                const idfn = (0, utility_1.constantIdFunc)(this.spread.cj);
-                if (undefined !== idfn) {
-                    const nil = new NilVal_1.NilVal({ why: 'id_spread' }, ctx);
-                    nil.site.row = idfn.site.row;
-                    nil.site.col = idfn.site.col;
-                    nil.site.url = idfn.site.url;
-                    nil.primary = idfn;
-                    this.spread.cj = nil;
-                }
             }
         }
         // console.log('MAPVAL-ctor', this.type, spec)
     }
     // NOTE: order of keys is not preserved!
     // not possible in any case - consider {a,b} unify {b,a}
+    // ALIAS DECLARATIONS MUST SIT AT THE DOCUMENT ROOT. Stated on the
+    // VALUE rather than at the parse, because the parse cannot see it: an
+    // INCLUDED file's declarations are at the root of their own text, and
+    // only once the loaded map is placed does it become apparent that
+    // root is not the document's. `%name` is spelled as a reference from
+    // the document root, so an included file's own `%b` would otherwise
+    // reach the INCLUDER's `%b` -- cross-file capture, the hazard the
+    // sigil exists to prevent, one level up.
+    //
+    // P1 is single-file by construction; carrying a name ACROSS files is
+    // what `export` and the destructure are for (P2, not built), and this
+    // refusal is what keeps the two from being confused meanwhile. Pathed
+    // at the DECLARATION, which is what is wrong, not at the map.
+    aliasDeclarationsAreRooted(ctx) {
+        if (0 === this.aliasKeys.length || 0 === this.path.length) {
+            return undefined;
+        }
+        const nv = new NilVal_1.NilVal({ why: 'alias_not_toplevel' }, ctx);
+        nv.site = this.site;
+        nv.path = [...this.path, this.aliasKeys[0]];
+        return nv;
+    }
     unify(peer, ctx) {
+        const arooted = this.aliasDeclarationsAreRooted(ctx);
+        if (undefined !== arooted) {
+            return arooted;
+        }
         // console.log('MAPVAL-UNIFY', this.id, this.canon, peer.id, peer.canon)
         const TOP = (0, top_1.top)();
         peer = peer ?? TOP;
@@ -127,8 +148,16 @@ class MapVal extends BagVal_1.BagVal {
         let out = (peer.isTop ? this : new MapVal({ peg: {} }, ctx));
         out.closed = this.closed;
         out.optionalKeys = [...this.optionalKeys];
+        out.aliasKeys = [...this.aliasKeys];
         out.spread.cj = this.spread.cj;
         out.site = this.site;
+        // A rel() peer DRIVES whichever side the fold hands it on: the
+        // relation constraint rewrites this container leaf by leaf
+        // (RELATIONS.0.md §3.2), exactly as a sizing residual takes the
+        // driver's seat above.
+        if (true === peer?.isRel) {
+            return peer.unify(this, te ? ctx.clone({ explain: (0, utility_1.ec)(te, 'REL') }) : ctx);
+        }
         if (peer instanceof MapVal) {
             if (!this.closed && peer.closed) {
                 out = peer.unify(this, te ? ctx.clone({ explain: (0, utility_1.ec)(te, 'PMC') }) : ctx);
@@ -176,20 +205,6 @@ class MapVal extends BagVal_1.BagVal {
             out.dc = this.dc + 1;
             // let newtype = this.type || peer.type
             let spread_cj = out.spread.cj ?? TOP;
-            // The template REFUSED at construction (clearing rule 3, G4
-            // phase 1): the bag itself is that refusal. Returning the nil
-            // here rather than only letting it reach the children is what
-            // makes an EMPTY bag with a bad template an error too — there
-            // are no children to carry it.
-            //
-            // Narrow to THIS code on purpose. A nil spread from any other
-            // cause keeps its existing behaviour of driving every key
-            // (coverage3 `nil-spread-drives-every-key`): a template that has
-            // merely not resolved yet must not permanently kill the bag that
-            // holds it.
-            if ('id_spread' === spread_cj.why) {
-                return spread_cj;
-            }
             // Snapshot a path-dependent *ref* spread to its structural target
             // once (while inner key()/path() funcs are still unresolved), so
             // later fixpoint passes don't re-resolve the ref against the mutated
@@ -226,10 +241,10 @@ class MapVal extends BagVal_1.BagVal {
                 // No `undefined !== child` here: propagateMarks above already
                 // dereferenced it, so a missing child would have thrown there.
                 if (!spread_cj.isTop
-                    && child._spr === spread_cj.id) {
+                    && child._spr === (0, Val_1.spreadId)(spread_cj)) {
                     oval = child.done ? child :
                         (0, unify_1.unite)(te ? keyctx.clone({ explain: (0, utility_1.ec)(te, 'KEY:' + key) }) : keyctx, child, TOP, 'map-own');
-                    oval._spr = spread_cj.id;
+                    oval._spr = (0, Val_1.spreadId)(spread_cj);
                 }
                 else {
                     const key_spread_cj = spread_cj.spreadClone(keyctx);
@@ -255,7 +270,7 @@ class MapVal extends BagVal_1.BagVal {
                                         (0, unify_1.unite)(te ? keyctx.clone({ explain: (0, utility_1.ec)(te, 'KEY:' + key) }) : keyctx, child, key_spread_cj, 'map-own');
                     if (!spread_cj.isTop && !oval.isNil) {
                         ;
-                        oval._spr = spread_cj.id;
+                        oval._spr = (0, Val_1.spreadId)(spread_cj);
                     }
                 }
                 out.peg[key] = oval;
@@ -274,6 +289,12 @@ class MapVal extends BagVal_1.BagVal {
                     if (upeer.optionalKeys.includes(peerkey) && !out.optionalKeys.includes(peerkey)) {
                         out.optionalKeys.push(peerkey);
                     }
+                    // ... and so is an alias declaration, for the same reason:
+                    // two statements for one map are one map, and a name declared
+                    // in either is declared in the result.
+                    if (upeer.aliasKeys.includes(peerkey) && !out.aliasKeys.includes(peerkey)) {
+                        out.aliasKeys.push(peerkey);
+                    }
                     let child = out.peg[peerkey];
                     const peerctx = ctx.descend(peerkey);
                     let oval = out.peg[peerkey] =
@@ -298,13 +319,24 @@ class MapVal extends BagVal_1.BagVal {
                         // Same apply-once discipline as the own-key loop: once the
                         // constraint is merged into the value (marked with the
                         // constraint's id), later passes only self-unify.
-                        if (oval._spr !== spread_cj.id) {
+                        if (oval._spr !== (0, Val_1.spreadId)(spread_cj)) {
                             let key_spread_cj = spread_cj.spreadClone(peerctx);
+                            // A SPREAD IS A SPREAD FROM EITHER SIDE. The own-key loop
+                            // above marks its template so `why` can say the
+                            // contribution came from `&:` rather than from the key;
+                            // this arm did not, so the SAME document reported the
+                            // role or dropped it depending on whether the template
+                            // and the keys were written in one statement or two --
+                            // `services: &: {..}` plus `services: {web:{}}` took the
+                            // peer path and lost `(spread)` (use-cases/BUGS.md §55).
+                            if (undefined !== peerctx.prov) {
+                                (0, provenance_1.markSpread)(key_spread_cj);
+                            }
                             oval = out.peg[peerkey] =
                                 (0, unify_1.unite)(te ? peerctx.clone({ explain: (0, utility_1.ec)(te, 'PSP:' + peerkey) }) : peerctx, oval, key_spread_cj, 'map-peer-spread');
                             if (!spread_cj.isTop && !oval.isNil) {
                                 ;
-                                oval._spr = spread_cj.id;
+                                oval._spr = (0, Val_1.spreadId)(spread_cj);
                             }
                         }
                     }
@@ -312,6 +344,12 @@ class MapVal extends BagVal_1.BagVal {
                     done = (done && type_1.DONE === oval.dc);
                 }
             }
+            else if (true === peer.isContainerKind) {
+                // The container KIND delegates to its own arm, exactly as a
+                // scalar delegates to a ScalarKindVal peer: the kind knows to
+                // admit this map, and this map knows nothing about kinds.
+                out = peer.unify(this, ctx);
+            }
             else if (!peer.isTop) {
                 out = (0, err_1.makeNilErr)(ctx, 'map', this, peer);
             }
@@ -378,6 +416,7 @@ class MapVal extends BagVal_1.BagVal {
         };
         out.closed = this.closed;
         out.optionalKeys = [...this.optionalKeys];
+        out.aliasKeys = [...this.aliasKeys];
         return out;
     }
     clone(ctx, spec) {
@@ -402,6 +441,7 @@ class MapVal extends BagVal_1.BagVal {
         }
         out.closed = this.closed;
         out.optionalKeys = [...this.optionalKeys];
+        out.aliasKeys = [...this.aliasKeys];
         // out.from = this.from
         // console.log('MAPVAL-CLONE', this.canon, '->', out.canon)
         return out;
@@ -411,7 +451,14 @@ class MapVal extends BagVal_1.BagVal {
         // independent of insertion/unification order and matches the Go
         // port. A bare .sort() is UTF-16 code-unit order, which puts an
         // astral key ahead of everything in U+E000-U+FFFF -- see cmpCodePoint.
-        let keys = Object.keys(this.peg).sort(keyorder_1.cmpCodePoint);
+        // An alias declaration is not part of the document, so canon does
+        // not render it: a document with aliases and the document with
+        // every alias written out longhand must produce the same text and
+        // therefore the same `aon1-` hash. That is the sharpest statement
+        // of what an alias IS -- a name for a value, and nothing more.
+        let keys = Object.keys(this.peg)
+            .filter(k => !this.aliasKeys.includes(k))
+            .sort(keyorder_1.cmpCodePoint);
         return '' +
             // this.errcanon() +
             // (this.mark.type ? '<type>' : '') +