interaqt 4.0.2 → 4.0.3

package/dist/index.js

@@ -1,11 +1,11 @@
-import { AsyncLocalStorage as xi } from "node:async_hooks";
+import { AsyncLocalStorage as Ai } from "node:async_hooks";
 import { AsyncLocalStorage as Or } from "async_hooks";
-import { createHash as Fr } from "node:crypto";
-function Lr(s) {
+import { createHash as Lr } from "node:crypto";
+function Fr(s) {
   return s !== null && typeof s == "object";
 }
-function at(s) {
-  if (!Lr(s)) return !1;
+function nt(s) {
+  if (!Fr(s)) return !1;
   const e = Object.getPrototypeOf(s);
   return e === null ? !0 : e === Object.prototype || e === null;
 }
@@ -16,10 +16,10 @@ function $o(s, e) {
   return t;
 }
 function Ia(s) {
-  return Lr(s) && !at(s) && typeof s.uuid == "string" && typeof s._type == "string";
+  return Fr(s) && !nt(s) && typeof s.uuid == "string" && typeof s._type == "string";
 }
 function se(s) {
-  return typeof s == "function" ? `func::${s.toString()}` : Array.isArray(s) ? s.map((e) => se(e)) : Ia(s) ? `uuid::${s.uuid}` : at(s) ? Object.fromEntries(Object.entries(s).map(([e, t]) => [e, se(t)])) : s;
+  return typeof s == "function" ? `func::${s.toString()}` : Array.isArray(s) ? s.map((e) => se(e)) : Ia(s) ? `uuid::${s.uuid}` : nt(s) ? Object.fromEntries(Object.entries(s).map(([e, t]) => [e, se(t)])) : s;
 }
 function B(s, e) {
   const t = {};
@@ -36,17 +36,17 @@ function B(s, e) {
   return JSON.stringify(i);
 }
 function M(s) {
-  return typeof s == "string" && s.startsWith("func::") ? new Function("return " + s.substring(6))() : Array.isArray(s) ? s.map((e) => M(e)) : at(s) ? Object.fromEntries(Object.entries(s).map(([e, t]) => [e, M(t)])) : s;
+  return typeof s == "string" && s.startsWith("func::") ? new Function("return " + s.substring(6))() : Array.isArray(s) ? s.map((e) => M(e)) : nt(s) ? Object.fromEntries(Object.entries(s).map(([e, t]) => [e, M(t)])) : s;
 }
-function gt(s, e) {
+function bt(s, e) {
   if (s == null || typeof s != "object") return s;
-  if (Array.isArray(s)) return s.map((i) => gt(i, e));
-  if (at(s))
-    return Object.fromEntries(Object.entries(s).map(([i, r]) => [i, gt(r, e)]));
+  if (Array.isArray(s)) return s.map((i) => bt(i, e));
+  if (nt(s))
+    return Object.fromEntries(Object.entries(s).map(([i, r]) => [i, bt(r, e)]));
   if (s instanceof Set)
-    return new Set(Array.from(s.values()).map((i) => gt(i, e)));
+    return new Set(Array.from(s.values()).map((i) => bt(i, e)));
   if (s instanceof Map)
-    return new Map(Array.from(s.entries()).map(([i, r]) => [i, gt(r, e)]));
+    return new Map(Array.from(s.entries()).map(([i, r]) => [i, bt(r, e)]));
   const t = s;
   return e && t._type && t.constructor?.clone ? t.constructor.clone(s, e) : s;
 }
@@ -54,13 +54,13 @@ function ko(...s) {
   for (const e of s)
     e.instances.length = 0;
 }
-const Dt = /* @__PURE__ */ new Map();
+const Ot = /* @__PURE__ */ new Map();
 function Vr(s, e) {
-  e && e.isKlass && e.displayName && Dt.set(s, e);
+  e && e.isKlass && e.displayName && Ot.set(s, e);
 }
 function To() {
   const s = [];
-  return Array.from(Dt.entries()).forEach(([, e]) => {
+  return Array.from(Ot.entries()).forEach(([, e]) => {
     e.instances && Array.isArray(e.instances) && e.stringify && s.push(...e.instances.map((t) => e.stringify(t)));
   }), `[${s.join(",")}]`;
 }
@@ -71,7 +71,7 @@ function Co(s) {
 function Pa(s) {
   const e = /* @__PURE__ */ new Map();
   for (const u of s) {
-    if (!Dt.get(u.type))
+    if (!Ot.get(u.type))
       throw new Error(`Cannot create instance of unknown class "${u.type}". Make sure the class is registered via registerKlass (see core/init.ts and builtins/init.ts).`);
     if (e.has(u.uuid))
       throw new Error(`Duplicate uuid "${u.uuid}" in serialized instances`);
@@ -102,7 +102,7 @@ function Pa(s) {
         d[m] = f;
       })), l(d);
     }
-    if (at(u)) {
+    if (nt(u)) {
       const d = {};
       return Object.entries(u).forEach(([h, m]) => a(m, (f) => {
         d[h] = f;
@@ -115,18 +115,18 @@ function Pa(s) {
     const { type: l, options: d = {}, uuid: h, public: m } = u, f = t.get(h);
     if (f) return f;
     i.add(h);
-    const p = Dt.get(l), y = {};
+    const p = Ot.get(l), y = {};
     let b;
-    Object.entries(m || {}).forEach(([w, N]) => {
+    Object.entries(m || {}).forEach(([w, R]) => {
       if (n.has(w)) {
         o.push(() => {
-          a(N, (S) => {
+          a(R, (S) => {
             b[w] = S;
           });
         });
         return;
       }
-      a(N, (S) => {
+      a(R, (S) => {
         b ? b[w] = S : y[w] = S;
       });
     }), b = p.create(y, { ...d, uuid: h }), i.delete(h), t.set(h, b);
@@ -157,7 +157,7 @@ function _r(s, e, t) {
     r.add(a.name);
   }
 }
-const ii = /^[a-zA-Z0-9_]+$/;
+const ri = /^[a-zA-Z0-9_]+$/;
 class j {
   constructor(e, t) {
     this._type = "Entity", this._options = t, this.uuid = q(t), this.name = e.name, this.properties = e.properties || [], this.computation = e.computation, this.baseEntity = e.baseEntity, this.matchExpression = e.matchExpression, this.inputEntities = e.inputEntities, this.commonProperties = e.commonProperties, this.constraints = e.constraints;
@@ -177,7 +177,7 @@ class j {
         type: "string",
         required: !0,
         constraints: {
-          nameFormat: ({ name: e }) => ii.test(e)
+          nameFormat: ({ name: e }) => ri.test(e)
         }
       },
       properties: {
@@ -230,8 +230,8 @@ class j {
     };
   }
   static create(e, t) {
-    if (typeof e.name != "string" || !ii.test(e.name))
-      throw new Error(`Entity name "${e.name}" is invalid. Entity names must match ${ii} (letters, numbers and underscore only).`);
+    if (typeof e.name != "string" || !ri.test(e.name))
+      throw new Error(`Entity name "${e.name}" is invalid. Entity names must match ${ri} (letters, numbers and underscore only).`);
     if (e.baseEntity && !e.matchExpression)
       throw new Error(`Filtered entity "${e.name}" declares baseEntity but no matchExpression. A filtered entity is a predicate view over its base — declare matchExpression, or use the base entity directly.`);
     if (e.matchExpression && !e.baseEntity)
@@ -274,9 +274,9 @@ class j {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-var Ai = /* @__PURE__ */ ((s) => (s.String = "string", s.Number = "number", s.Boolean = "boolean", s.Timestamp = "timestamp", s))(Ai || {});
-const ri = /^[a-zA-Z0-9_]+$/;
-class Ii {
+var Ii = /* @__PURE__ */ ((s) => (s.String = "string", s.Number = "number", s.Boolean = "boolean", s.Timestamp = "timestamp", s))(Ii || {});
+const ai = /^[a-zA-Z0-9_]+$/;
+class Pi {
   constructor(e, t) {
     this._type = "Dictionary", this._options = t, this.uuid = q(t), this.name = e.name, this.type = e.type, this.collection = e.collection ?? !1, this.args = e.args, this.defaultValue = e.defaultValue, this.computation = e.computation;
   }
@@ -296,14 +296,14 @@ class Ii {
         required: !0,
         collection: !1,
         constraints: {
-          format: ({ name: e }) => ri.test(e)
+          format: ({ name: e }) => ai.test(e)
         }
       },
       type: {
         type: "string",
         required: !0,
         collection: !1,
-        options: Array.from(Object.values(Ai))
+        options: Array.from(Object.values(Ii))
       },
       collection: {
         type: "boolean",
@@ -329,9 +329,9 @@ class Ii {
     };
   }
   static create(e, t) {
-    if (typeof e.name != "string" || !ri.test(e.name))
-      throw new Error(`Dictionary name "${e.name}" is invalid. Dictionary names must match ${ri} (letters, numbers and underscore only).`);
-    const i = new Ii(e, t);
+    if (typeof e.name != "string" || !ai.test(e.name))
+      throw new Error(`Dictionary name "${e.name}" is invalid. Dictionary names must match ${ai} (letters, numbers and underscore only).`);
+    const i = new Pi(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Dictionary`);
     return this.instances.push(i), i;
@@ -358,7 +358,7 @@ class Ii {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-const ai = /^[a-zA-Z0-9_]+$/;
+const ni = /^[a-zA-Z0-9_]+$/;
 class x {
   constructor(e, t) {
     this._type = "Property", this._options = t, this.uuid = q(t), this.name = e.name, this.type = e.type, this.collection = e.collection, this.defaultValue = e.defaultValue, this.computed = e.computed, this.computation = e.computation;
@@ -378,13 +378,13 @@ class x {
         type: "string",
         required: !0,
         constraints: {
-          format: ({ name: e }) => ai.test(e)
+          format: ({ name: e }) => ni.test(e)
         }
       },
       type: {
         type: "string",
         required: !0,
-        options: () => Object.values(Ai)
+        options: () => Object.values(Ii)
       },
       collection: {
         type: "boolean",
@@ -406,8 +406,8 @@ class x {
     };
   }
   static create(e, t) {
-    if (typeof e.name != "string" || !ai.test(e.name))
-      throw new Error(`Property name "${e.name}" is invalid. Property names must match ${ai} (letters, numbers and underscore only).`);
+    if (typeof e.name != "string" || !ni.test(e.name))
+      throw new Error(`Property name "${e.name}" is invalid. Property names must match ${ni} (letters, numbers and underscore only).`);
     if (e.computed && e.computation)
       throw new Error(`Property "${e.name}" declares both computed and computation. They are competing write channels for the same column (computed re-evaluates on every write and silently overwrites the computation's output) — keep exactly one.`);
     const i = new x(e, t);
@@ -437,7 +437,7 @@ class x {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-const Fe = /^[a-zA-Z0-9_]+$/, sr = ["1:1", "1:n", "n:1", "n:n"];
+const Le = /^[a-zA-Z0-9_]+$/, sr = ["1:1", "1:n", "n:1", "n:n"];
 class Y {
   constructor(e, t) {
     if (this._type = "Relation", this._options = t, this.uuid = q(t), e.inputRelations && e.baseRelation)
@@ -603,12 +603,12 @@ class Y {
     };
   }
   static create(e, t) {
-    if (e.name !== void 0 && (typeof e.name != "string" || !Fe.test(e.name)))
-      throw new Error(`Relation name "${e.name}" is invalid. Relation names must match ${Fe} (letters, numbers and underscore only).`);
-    if (e.sourceProperty !== void 0 && !Fe.test(e.sourceProperty))
-      throw new Error(`Relation sourceProperty "${e.sourceProperty}" is invalid. Property names must match ${Fe} (letters, numbers and underscore only).`);
-    if (e.targetProperty !== void 0 && !Fe.test(e.targetProperty))
-      throw new Error(`Relation targetProperty "${e.targetProperty}" is invalid. Property names must match ${Fe} (letters, numbers and underscore only).`);
+    if (e.name !== void 0 && (typeof e.name != "string" || !Le.test(e.name)))
+      throw new Error(`Relation name "${e.name}" is invalid. Relation names must match ${Le} (letters, numbers and underscore only).`);
+    if (e.sourceProperty !== void 0 && !Le.test(e.sourceProperty))
+      throw new Error(`Relation sourceProperty "${e.sourceProperty}" is invalid. Property names must match ${Le} (letters, numbers and underscore only).`);
+    if (e.targetProperty !== void 0 && !Le.test(e.targetProperty))
+      throw new Error(`Relation targetProperty "${e.targetProperty}" is invalid. Property names must match ${Le} (letters, numbers and underscore only).`);
     if (e.type !== void 0 && !sr.includes(e.type))
       throw new Error(`Relation type "${e.type}" is invalid. Valid types: ${sr.map((a) => `'${a}'`).join(", ")}.`);
     _r(e.name ?? `${e.source?.name}_${e.sourceProperty}_${e.targetProperty}_${e.target?.name}`, e.properties, "Relation");
@@ -653,7 +653,7 @@ class Y {
   }
 }
 const Qe = /^[a-zA-Z0-9_]+$/;
-class Ht {
+class Kt {
   constructor(e, t) {
     this._type = "UniqueConstraint", this._options = t, this.uuid = q(t), this.name = e.name, this.properties = e.properties, this.where = e.where, this.violationCode = e.violationCode;
   }
@@ -699,7 +699,7 @@ class Ht {
   static create(e, t) {
     if (typeof e.name != "string" || !Qe.test(e.name))
       throw new Error(`UniqueConstraint name "${e.name}" is invalid. Constraint names must match ${Qe} (letters, numbers and underscore only).`);
-    const i = new Ht(e, t);
+    const i = new Kt(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, UniqueConstraint`);
     return this.instances.push(i), i;
@@ -726,7 +726,7 @@ class Ht {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class Pi {
+class Mi {
   constructor(e, t) {
     this._type = "NonNullConstraint", this._options = t, this.uuid = q(t), this.name = e.name, this.property = e.property, this.violationCode = e.violationCode;
   }
@@ -761,7 +761,7 @@ class Pi {
   static create(e, t) {
     if (typeof e.name != "string" || !Qe.test(e.name))
       throw new Error(`NonNullConstraint name "${e.name}" is invalid. Constraint names must match ${Qe} (letters, numbers and underscore only).`);
-    const i = new Pi(e, t);
+    const i = new Mi(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, NonNullConstraint`);
     return this.instances.push(i), i;
@@ -787,7 +787,7 @@ class Pi {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class Kt {
+class Wt {
   constructor(e, t) {
     if (this._type = "Custom", this._options = t, this.uuid = q(t), this.name = e.name, this.dataDeps = e.dataDeps, this.incrementalDataDeps = e.incrementalDataDeps, this.planIncremental = e.planIncremental, this.compute = e.compute, this.incrementalCompute = e.incrementalCompute, this.incrementalPatchCompute = e.incrementalPatchCompute, this.createState = e.createState, this.getInitialValue = e.getInitialValue, this.asyncReturn = e.asyncReturn, this.useLastValue = e.useLastValue, e.concurrency !== void 0 && e.concurrency !== "serializable" && e.concurrency !== "atomic-safe")
       throw new Error(`Invalid Custom concurrency '${e.concurrency}'. Expected 'serializable' or 'atomic-safe'.`);
@@ -867,7 +867,7 @@ class Kt {
     };
   }
   static create(e, t) {
-    const i = new Kt(e, t);
+    const i = new Wt(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Custom`);
     return this.instances.push(i), i;
@@ -955,7 +955,7 @@ class We {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class Mi {
+class qi {
   constructor(e, t) {
     this._type = "StateTransfer", this._options = t, this.uuid = q(t), this.trigger = e.trigger, this.current = e.current, this.next = e.next, this.computeTarget = e.computeTarget;
   }
@@ -993,7 +993,7 @@ class Mi {
     };
   }
   static create(e, t) {
-    const i = new Mi(e, t);
+    const i = new qi(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, StateTransfer`);
     return this.instances.push(i), i;
@@ -1020,7 +1020,7 @@ class Mi {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class nt {
+class st {
   constructor(e, t) {
     this._type = "StateMachine", this._options = t, this.uuid = q(t), this.states = e.states, this.transfers = e.transfers, this.initialState = e.initialState;
   }
@@ -1053,7 +1053,7 @@ class nt {
     };
   }
   static create(e, t) {
-    const i = new nt(e, t);
+    const i = new st(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, StateMachine`);
     return this.instances.push(i), i;
@@ -1079,7 +1079,7 @@ class nt {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class st {
+class ot {
   constructor(e, t) {
     this._type = "WeightedSummation", this._options = t, this.uuid = q(t), this.record = e.record, this.property = e.property, this.direction = e.direction, this.callback = e.callback, this.attributeQuery = e.attributeQuery, this.dataDeps = e.dataDeps;
   }
@@ -1127,7 +1127,7 @@ class st {
     };
   }
   static create(e, t) {
-    const i = new st(e, t);
+    const i = new ot(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, WeightedSummation`);
     return this.instances.push(i), i;
@@ -1156,7 +1156,7 @@ class st {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class ot {
+class ct {
   constructor(e, t) {
     this._type = "Count", this._options = t, this.uuid = q(t), this.record = e.record, this.property = e.property, this.direction = e.direction, this.callback = e.callback, this.attributeQuery = e.attributeQuery, this.dataDeps = e.dataDeps;
   }
@@ -1204,7 +1204,7 @@ class ot {
     };
   }
   static create(e, t) {
-    const i = new ot(e, t);
+    const i = new ct(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Count`);
     return this.instances.push(i), i;
@@ -1234,7 +1234,7 @@ class ot {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class ct {
+class ut {
   constructor(e, t) {
     this._type = "Summation", this._options = t, this.uuid = q(t), this.record = e.record, this.property = e.property, this.direction = e.direction, this.attributeQuery = e.attributeQuery;
   }
@@ -1272,7 +1272,7 @@ class ct {
     };
   }
   static create(e, t) {
-    const i = new ct(e, t);
+    const i = new ut(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Summation`);
     return this.instances.push(i), i;
@@ -1299,7 +1299,7 @@ class ct {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class ut {
+class lt {
   constructor(e, t) {
     this._type = "Average", this._options = t, this.uuid = q(t), this.record = e.record, this.property = e.property, this.direction = e.direction, this.attributeQuery = e.attributeQuery;
   }
@@ -1337,7 +1337,7 @@ class ut {
     };
   }
   static create(e, t) {
-    const i = new ut(e, t);
+    const i = new lt(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Average`);
     return this.instances.push(i), i;
@@ -1364,7 +1364,7 @@ class ut {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class lt {
+class dt {
   constructor(e, t) {
     this._type = "Every", this._options = t, this.uuid = q(t), this.record = e.record, this.property = e.property, this.direction = e.direction, this.callback = e.callback, this.attributeQuery = e.attributeQuery, this.dataDeps = e.dataDeps, this.notEmpty = e.notEmpty;
   }
@@ -1417,7 +1417,7 @@ class lt {
     };
   }
   static create(e, t) {
-    const i = new lt(e, t);
+    const i = new dt(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Every`);
     return this.instances.push(i), i;
@@ -1443,7 +1443,7 @@ class lt {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class dt {
+class ht {
   constructor(e, t) {
     this._type = "Any", this._options = t, this.uuid = q(t), this.record = e.record, this.property = e.property, this.direction = e.direction, this.callback = e.callback, this.attributeQuery = e.attributeQuery, this.dataDeps = e.dataDeps;
   }
@@ -1491,7 +1491,7 @@ class dt {
     };
   }
   static create(e, t) {
-    const i = new dt(e, t);
+    const i = new ht(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Any`);
     return this.instances.push(i), i;
@@ -1520,7 +1520,7 @@ class dt {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class Wt {
+class zt {
   constructor(e, t) {
     this._type = "Transform", this._options = t, this.uuid = q(t), this.record = e.record, this.eventDeps = e.eventDeps, this.attributeQuery = e.attributeQuery, this.callback = e.callback;
   }
@@ -1558,7 +1558,7 @@ class Wt {
     };
   }
   static create(e, t) {
-    const i = new Wt(e, t);
+    const i = new zt(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Transform`);
     return this.instances.push(i), i;
@@ -1585,7 +1585,7 @@ class Wt {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class ht {
+class pt {
   constructor(e, t) {
     this._type = "RealTimeValue", this._options = t, this.uuid = q(t), this.attributeQuery = e.attributeQuery, this.dataDeps = e.dataDeps, this.nextRecomputeTime = e.nextRecomputeTime, this.callback = e.callback;
   }
@@ -1623,7 +1623,7 @@ class ht {
     };
   }
   static create(e, t) {
-    const i = new ht(e, t);
+    const i = new pt(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, RealTimeValue`);
     return this.instances.push(i), i;
@@ -1648,7 +1648,7 @@ class ht {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class qi {
+class Di {
   constructor(e, t) {
     this._type = "SideEffect", this._options = t, this.uuid = q(t), this.name = e.name, this.handle = e.handle;
   }
@@ -1676,7 +1676,7 @@ class qi {
     };
   }
   static create(e, t) {
-    const i = new qi(e, t);
+    const i = new Di(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, SideEffect`);
     return this.instances.push(i), i;
@@ -1701,7 +1701,7 @@ class qi {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class zt {
+class Gt {
   constructor(e, t) {
     this._type = "BoolAtomData", this._options = t, this.uuid = q(t), this.type = e.type || "atom", this.data = e.data;
   }
@@ -1730,7 +1730,7 @@ class zt {
     };
   }
   static create(e, t) {
-    const i = new zt(e, t);
+    const i = new Gt(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, BoolAtomData`);
     return this.instances.push(i), i;
@@ -1755,7 +1755,7 @@ class zt {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class Gt {
+class Jt {
   constructor(e, t) {
     this._type = "BoolExpressionData", this._options = t, this.uuid = q(t), this.type = e.type || "expression", this.operator = e.operator || "and", this.left = e.left, this.right = e.right;
   }
@@ -1796,7 +1796,7 @@ class Gt {
     };
   }
   static create(e, t) {
-    const i = new Gt(e, t);
+    const i = new Jt(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, BoolExpressionData`);
     return this.instances.push(i), i;
@@ -1951,6 +1951,8 @@ class k {
         throw new Error("BoolExp.evaluate received a Promise from the atom handler. Use evaluateAsync for async handlers.");
       if (typeof n == "string")
         return { data: a, inverse: i, stack: t, error: n };
+      if (typeof n != "boolean")
+        return { data: a, inverse: i, stack: t, error: `atom handler returned ${n === void 0 ? "undefined" : JSON.stringify(n)} (${typeof n}); it must explicitly return a boolean or an error string (did you forget a return statement, or a !! coercion?)` };
       const o = n;
       return o && !i || !o && i ? !0 : { data: a, inverse: i, stack: t, error: "atom evaluate error" };
     }
@@ -1975,6 +1977,8 @@ class k {
       const a = this.raw.data, n = await e(a);
       if (typeof n == "string")
         return { data: a, inverse: i, stack: t, error: n };
+      if (typeof n != "boolean")
+        return { data: a, inverse: i, stack: t, error: `atom handler returned ${n === void 0 ? "undefined" : JSON.stringify(n)} (${typeof n}); it must explicitly return a boolean or an error string (did you forget a return statement, or a !! coercion?)` };
       const o = n;
       return o && !i || !o && i ? !0 : { data: a, inverse: i, stack: t, error: "atom evaluate error" };
     }
@@ -2005,7 +2009,7 @@ function Br(s) {
   }
   return e;
 }
-function $t(s, e) {
+function kt(s, e) {
   if (typeof s != "string" || !s || s.includes("..") || s.startsWith(".") || s.endsWith("."))
     throw new Error(`${e} must declare a stable path`);
   if (s.split(".").some((i) => !$e.test(i)))
@@ -2016,16 +2020,16 @@ function qa(s, e) {
   if (t.length !== 1 && !(t.length === 2 && t[1] === "id"))
     throw new Error(`${e} only supports top-level fields and ref id paths`);
 }
-function pi(s) {
+function mi(s) {
   if (s === null || typeof s != "object") return JSON.stringify(s);
-  if (Array.isArray(s)) return `[${s.map(pi).join(",")}]`;
+  if (Array.isArray(s)) return `[${s.map(mi).join(",")}]`;
   const e = s;
-  return `{${Object.keys(e).sort().map((t) => `${JSON.stringify(t)}:${pi(e[t])}`).join(",")}}`;
+  return `{${Object.keys(e).sort().map((t) => `${JSON.stringify(t)}:${mi(e[t])}`).join(",")}}`;
 }
 function Da(s) {
   return JSON.parse(JSON.stringify(s));
 }
-function Ne(s) {
+function Re(s) {
   if (s === void 0) return;
   const e = s instanceof k ? s.raw : s;
   if (!k.isExpressionData(e))
@@ -2033,13 +2037,13 @@ function Ne(s) {
   return Da(e);
 }
 function or(s) {
-  return pi(Ne(s));
+  return mi(Re(s));
 }
 function Oa(s) {
-  return Ne(s.initializeFrom?.match ?? s.match);
+  return Re(s.initializeFrom?.match ?? s.match);
 }
-function Fa(s, e) {
-  const t = Ne(s);
+function La(s, e) {
+  const t = Re(s);
   if (!t) return;
   const i = (r) => {
     if (r.type === "atom") {
@@ -2056,8 +2060,8 @@ function Fa(s, e) {
   i(t);
 }
 function cr(s, e) {
-  Fa(s, (t) => {
-    if ($t(t.key, `${e} atom key`), qa(t.key, `${e} atom key`), !Array.isArray(t.value) || t.value.length !== 2)
+  La(s, (t) => {
+    if (kt(t.key, `${e} atom key`), qa(t.key, `${e} atom key`), !Array.isArray(t.value) || t.value.length !== 2)
       throw new Error(`${e} atom value must be [operator, operand]`);
     const [i, r] = t.value;
     if (!["=", "!=", "is null", "is not null", "in", "not in"].includes(i))
@@ -2072,17 +2076,17 @@ function cr(s, e) {
     }
   });
 }
-function La(s) {
+function Fa(s) {
   return s.type === "ref" ? { ...s, base: Br(s.base) } : s;
 }
 function Va(s) {
   return s ? { ...s, record: Br(s.record) } : void 0;
 }
-class Ze {
+class et {
   constructor(e, t) {
-    this._type = "ScopedSequence", Ze.validate(e), this._options = t, this.uuid = q(t), this.name = e.name, this.scope = e.scope, this.match = Ne(e.match), this.initialValue = e.initialValue, this.step = e.step, this.allowManualValue = e.allowManualValue, this.initializeFrom = e.initializeFrom ? {
+    this._type = "ScopedSequence", et.validate(e), this._options = t, this.uuid = q(t), this.name = e.name, this.scope = e.scope, this.match = Re(e.match), this.initialValue = e.initialValue, this.step = e.step, this.allowManualValue = e.allowManualValue, this.initializeFrom = e.initializeFrom ? {
       ...e.initializeFrom,
-      match: Ne(e.initializeFrom.match)
+      match: Re(e.initializeFrom.match)
     } : void 0;
   }
   static {
@@ -2133,7 +2137,7 @@ class Ze {
     };
   }
   static create(e, t) {
-    const i = new Ze(e, t);
+    const i = new et(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, ScopedSequence`);
     return this.instances.push(i), i;
@@ -2149,7 +2153,7 @@ class Ze {
         throw new Error(`ScopedSequence scope item name "${i.name}" must match ${$e}`);
       if (t.has(i.name))
         throw new Error(`ScopedSequence scope item name "${i.name}" is duplicated`);
-      if (t.add(i.name), $t(i.path, `ScopedSequence scope item "${i.name}"`), i.type === "ref" && !i.base?.name)
+      if (t.add(i.name), kt(i.path, `ScopedSequence scope item "${i.name}"`), i.type === "ref" && !i.base?.name)
         throw new Error(`ScopedSequence ref scope item "${i.name}" must declare a base entity`);
     }
     if (e.step !== void 0 && (!Number.isInteger(e.step) || e.step <= 0))
@@ -2159,7 +2163,7 @@ class Ze {
     if (cr(e.match, "ScopedSequence.match"), e.initializeFrom) {
       if (!e.initializeFrom.record?.name)
         throw new Error("ScopedSequence initializeFrom.record must declare a source entity");
-      if ($t(e.initializeFrom.valuePath, "ScopedSequence initializeFrom.valuePath"), e.initializeFrom.aggregate !== "max")
+      if (kt(e.initializeFrom.valuePath, "ScopedSequence initializeFrom.valuePath"), e.initializeFrom.aggregate !== "max")
         throw new Error('ScopedSequence initializeFrom currently supports only aggregate "max"');
       if (!Array.isArray(e.initializeFrom.scope))
         throw new Error("ScopedSequence initializeFrom.scope must be an array");
@@ -2171,7 +2175,7 @@ class Ze {
           throw new Error(`ScopedSequence initializeFrom.scope item name "${a.name}" is duplicated`);
         if (r.add(a.name), !i.has(a.name))
           throw new Error(`ScopedSequence initializeFrom.scope item "${a.name}" is not declared in scope`);
-        $t(a.path, `ScopedSequence initializeFrom.scope item "${a.name}"`);
+        kt(a.path, `ScopedSequence initializeFrom.scope item "${a.name}"`);
       }
       for (const a of i)
         if (!r.has(a))
@@ -2189,7 +2193,7 @@ class Ze {
     return this.create({
       name: e.name,
       scope: [...e.scope],
-      match: Ne(e.match),
+      match: Re(e.match),
       initialValue: e.initialValue,
       step: e.step,
       allowManualValue: e.allowManualValue,
@@ -2206,12 +2210,12 @@ class Ze {
     const t = JSON.parse(e);
     return this.create({
       ...t.public,
-      scope: t.public.scope.map(La),
+      scope: t.public.scope.map(Fa),
       initializeFrom: Va(t.public.initializeFrom)
     }, { ...t.options, uuid: t.uuid });
   }
 }
-class Di {
+class Oi {
   constructor(e, t) {
     this._type = "EventSource", this._options = t, this.uuid = q(t), this.name = e.name, this.entity = e.entity, this.guard = e.guard, this.mapEventData = e.mapEventData, this.resolve = e.resolve, this.afterDispatch = e.afterDispatch, this.postCommit = e.postCommit;
   }
@@ -2264,7 +2268,7 @@ class Di {
     };
   }
   static create(e, t) {
-    const i = new Di(e, t);
+    const i = new Oi(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, EventSource`);
     return this.instances.push(i), i;
@@ -2302,31 +2306,31 @@ const _a = [
   j,
   Y,
   x,
-  Ht,
-  Pi,
   Kt,
-  We,
   Mi,
-  nt,
+  Wt,
+  We,
+  qi,
   st,
   ot,
   ct,
   ut,
   lt,
   dt,
-  Wt,
   ht,
-  qi,
-  Ii,
-  Ze,
   zt,
+  pt,
+  Di,
+  Pi,
+  et,
   Gt,
-  Di
+  Jt,
+  Oi
 ];
 _a.forEach((s) => {
   s && s.displayName && Vr(s.displayName, s);
 });
-class mi {
+class fi {
   constructor(e = [], t = []) {
     this.clonedEntities = /* @__PURE__ */ new Map(), this.clonedRelations = /* @__PURE__ */ new Map(), this.reverseEntityMap = /* @__PURE__ */ new Map(), this.reverseRelationMap = /* @__PURE__ */ new Map(), this.originalEntities = [...e], this.originalRelations = [...t], (e.length > 0 || t.length > 0) && this.initializeClones();
   }
@@ -2541,7 +2545,7 @@ function T(s, e) {
   if (!s)
     throw new Error(e);
 }
-function bt(s, e, t) {
+function wt(s, e, t) {
   const i = [...e];
   let r = s, a;
   const n = i.pop();
@@ -2549,14 +2553,14 @@ function bt(s, e, t) {
     r[a] || (r[a] = {}), r = r[a];
   return r[n] = t, !0;
 }
-function kt(s) {
-  return JSON.stringify(fi(s));
+function Tt(s) {
+  return JSON.stringify(yi(s));
 }
-function fi(s) {
-  if (Array.isArray(s)) return s.map((e) => fi(e));
+function yi(s) {
+  if (Array.isArray(s)) return s.map((e) => yi(e));
   if (s !== null && typeof s == "object" && Object.getPrototypeOf(s) === Object.prototype) {
     const e = s;
-    return Object.fromEntries(Object.keys(e).sort().map((t) => [t, fi(e[t])]));
+    return Object.fromEntries(Object.keys(e).sort().map((t) => [t, yi(e[t])]));
   }
   return s;
 }
@@ -2841,7 +2845,7 @@ class E {
         u = [];
       } else if (a?.toLowerCase() === "json" && (i[0] === "=" || i[0] === "!=")) {
         const h = o?.parseMatchExpression?.(t, i, r, a, e, this.getReferenceFieldValue.bind(this), n);
-        h ? (c = h.fieldValue, u = h.fieldParams || []) : (c = `${i[0]} ${n()}`, u = [kt(i[1])]);
+        h ? (c = h.fieldValue, u = h.fieldParams || []) : (c = `${i[0]} ${n()}`, u = [Tt(i[1])]);
       } else
         c = `${i[0]} ${n()}`, u = [i[1]];
     else if (d === "is null" || d === "is not null") {
@@ -2859,7 +2863,7 @@ class E {
         c = a?.toLowerCase() === "json" ? "IS NOT NULL AND 1=0" : "IN (NULL) AND 1=0", u = [];
       else if (a?.toLowerCase() === "json") {
         const h = o?.parseMatchExpression?.(t, i, r, a, e, this.getReferenceFieldValue.bind(this), n);
-        h ? (c = h.fieldValue, u = h.fieldParams || []) : (c = `IN (${i[1].map((m) => n()).join(",")})`, u = i[1].map((m) => kt(m)));
+        h ? (c = h.fieldValue, u = h.fieldParams || []) : (c = `IN (${i[1].map((m) => n()).join(",")})`, u = i[1].map((m) => Tt(m)));
       } else
         c = `IN (${i[1].map((h) => n()).join(",")})`, u = i[1];
     } else if (d === "not in") {
@@ -2869,12 +2873,16 @@ class E {
         c = a?.toLowerCase() === "json" ? "IS NULL OR 1=1" : "NOT IN (NULL) OR 1=1", u = [];
       else if (a?.toLowerCase() === "json") {
         const h = o?.parseMatchExpression?.(t, i, r, a, e, this.getReferenceFieldValue.bind(this), n);
-        h ? (c = h.fieldValue, u = h.fieldParams || []) : (c = `NOT IN (${i[1].map((m) => n()).join(",")})`, u = i[1].map((m) => kt(m)));
+        h ? (c = h.fieldValue, u = h.fieldParams || []) : (c = `NOT IN (${i[1].map((m) => n()).join(",")})`, u = i[1].map((m) => Tt(m)));
       } else
         c = `NOT IN (${i[1].map((h) => n()).join(",")})`, u = i[1];
     } else if (d === "between") {
       if (!Array.isArray(i[1]) || i[1].length !== 2)
         throw new Error(`match operator 'between' requires a two-element array value [min, max], got: ${JSON.stringify(i[1])} for key "${t}"`);
+      if (!e && (i[1][0] === null || i[1][0] === void 0 || i[1][1] === null || i[1][1] === void 0))
+        throw new Error(
+          `match operator 'between' does not support null/undefined bounds (got: ${JSON.stringify(i[1])} for key "${t}"). SQL evaluates BETWEEN with a NULL bound as UNKNOWN and silently matches no rows. Use ['>=', min] or ['<=', max] for a single-bounded range.`
+        );
       if (e) {
         const h = this.getReferenceFieldValue(i[1][0]), m = this.getReferenceFieldValue(i[1][1]);
         c = `BETWEEN "${h.split(".")[0]}"."${h.split(".")[1]}" AND "${m.split(".")[0]}"."${m.split(".")[1]}"`, u = [];
@@ -3218,7 +3226,7 @@ class K {
         let f = l, p = d;
         if (m.isLinkFiltered()) {
           f = m.getBaseAttributeInfo().attributeName;
-          const b = d.matchExpression, g = m.getLinkInfo().getBaseLinkInfo(), N = new E(g.name, this.map, m.getMatchExpression()).rebase(m.isRecordSource() ? "target" : "source"), S = b ? N.and(b) : N;
+          const b = d.matchExpression, g = m.getLinkInfo().getBaseLinkInfo(), R = new E(g.name, this.map, m.getMatchExpression()).rebase(m.isRecordSource() ? "target" : "source"), S = b ? R.and(b) : R;
           p = {
             ...d,
             matchExpression: S.data
@@ -3803,22 +3811,22 @@ class ja {
    * 这是一个辅助方法，实际的删除逻辑在 RecordQueryAgent 中
    */
 }
-const ni = /* @__PURE__ */ new WeakMap(), yi = /* @__PURE__ */ new WeakMap(), Le = /* @__PURE__ */ new WeakMap();
-function Tt(s) {
-  let e = yi.get(s);
-  return e || (e = /* @__PURE__ */ new Map(), yi.set(s, e)), e;
+const si = /* @__PURE__ */ new WeakMap(), gi = /* @__PURE__ */ new WeakMap(), Fe = /* @__PURE__ */ new WeakMap();
+function Ct(s) {
+  let e = gi.get(s);
+  return e || (e = /* @__PURE__ */ new Map(), gi.set(s, e)), e;
 }
-function si(s, e) {
+function oi(s, e) {
   return `${s}:${e}`;
 }
 function ur(s, e) {
-  !s || !e || s === e || yi.set(s, Tt(e));
+  !s || !e || s === e || gi.set(s, Ct(e));
 }
 class Ha {
   constructor(e, t) {
     this.map = e, this.queryAgent = t;
-    const i = ni.get(e.data);
-    i ? this.dependencies = i : (this.dependencies = /* @__PURE__ */ new Map(), ni.set(e.data, this.dependencies), this.initializeDependencies());
+    const i = si.get(e.data);
+    i ? this.dependencies = i : (this.dependencies = /* @__PURE__ */ new Map(), si.set(e.data, this.dependencies), this.initializeDependencies());
   }
   /**
    * 初始化所有 filtered entity 的依赖关系（每个 MapData 只计算一次）
@@ -3894,7 +3902,7 @@ class Ha {
    * 清除所有依赖关系（同时失效按 MapData 共享的缓存）
    */
   clear() {
-    this.dependencies.clear(), ni.delete(this.map.data);
+    this.dependencies.clear(), si.delete(this.map.data);
   }
   // ============ 成员资格求值（唯一真相源：SQL 谓词求值） ============
   /**
@@ -4003,7 +4011,7 @@ class Ha {
    */
   async settleMembershipChecks(e, t) {
     if (!t || !e.length) return;
-    const i = Tt(t);
+    const i = Ct(t);
     for (const r of e) {
       const { dependency: a, recordIds: n, beforeMemberIds: o } = r;
       if (!n.length) continue;
@@ -4021,7 +4029,7 @@ class Ha {
         a.matchExpression
       );
       for (const d of u) {
-        const h = si(a.filteredEntityName, d.id), m = l.has(d.id), f = i.has(h) ? i.get(h) : o.has(d.id);
+        const h = oi(a.filteredEntityName, d.id), m = l.has(d.id), f = i.has(h) ? i.get(h) : o.has(d.id);
         m !== f && t.push({
           type: m ? "create" : "delete",
           recordName: a.filteredEntityName,
@@ -4038,9 +4046,9 @@ class Ha {
     if (!r) return;
     const a = this.getFilteredEntitiesForBase(e);
     if (!a.length) return;
-    const n = Tt(r);
+    const n = Ct(r);
     for (const o of a) {
-      const c = si(o.name, t), u = await this.checkRecordMatchesFilter(t, e, o.matchExpression), l = n.has(c) ? n.get(c) : !1;
+      const c = oi(o.name, t), u = await this.checkRecordMatchesFilter(t, e, o.matchExpression), l = n.has(c) ? n.get(c) : !1;
       u && !l && r.push({
         type: "create",
         recordName: o.name,
@@ -4055,8 +4063,8 @@ class Ha {
    */
   enqueuePostWriteCreationCheck(e, t, i, r) {
     if (!e || !this.getFilteredEntitiesForBase(t).length) return;
-    let a = Le.get(e);
-    a || (a = [], Le.set(e, a)), a.push({ kind: "creation", recordName: t, recordId: i, fullRecord: r });
+    let a = Fe.get(e);
+    a || (a = [], Fe.set(e, a)), a.push({ kind: "creation", recordName: t, recordId: i, fullRecord: r });
   }
   /**
    * 登记一个行内记录的原地更新（同 id `&` 关系属性 / combined 嵌套值）。
@@ -4066,17 +4074,17 @@ class Ha {
     if (!e) return;
     const a = await this.collectMembershipChecks(t, [i], r, e);
     if (!a.length) return;
-    let n = Le.get(e);
-    n || (n = [], Le.set(e, n)), n.push({ kind: "update", checks: a });
+    let n = Fe.get(e);
+    n || (n = [], Fe.set(e, n)), n.push({ kind: "update", checks: a });
   }
   /**
    * 写入完成点：结算全部挂起的行内视图成员资格任务（顺序与登记顺序一致）。
    */
   async settlePostWriteChecks(e) {
     if (!e) return;
-    const t = Le.get(e);
+    const t = Fe.get(e);
     if (t?.length) {
-      Le.delete(e);
+      Fe.delete(e);
       for (const i of t)
         i.kind === "creation" ? await this.handleRecordCreation(i.recordName, i.recordId, i.fullRecord, e) : await this.settleMembershipChecks(i.checks, e);
     }
@@ -4161,10 +4169,10 @@ class Ha {
     if (!e || !a) return;
     const n = e.recordName === t ? e : e.children.find((c) => c.recordName === t);
     if (!n) return;
-    const o = Tt(a);
+    const o = Ct(a);
     for (const c of i)
       for (const [u, l] of n.membersByFilteredEntity) {
-        const d = si(u, c.id);
+        const d = oi(u, c.id);
         if (o.has(d) ? o.get(d) : l.has(c.id)) {
           const m = n.recordsById.get(c.id) || c;
           r.push({
@@ -4497,10 +4505,10 @@ WHERE "${a.idField}" = ${r()}
    *  依赖写入与匹配两侧的序列化一致，非规范形会让键序不同的等价对象匹配失败。
    */
   prepareFieldValue(e, t) {
-    return t?.toLowerCase() === "json" ? kt(e) : e;
+    return t?.toLowerCase() === "json" ? Tt(e) : e;
   }
 }
-const Ot = ":root";
+const Lt = ":root";
 class je {
   constructor(e, t, i = []) {
     this.label = e, this.parent = t, this.stack = i;
@@ -4520,7 +4528,7 @@ class je {
 }
 class za {
   constructor(e) {
-    this.recordQuery = e, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(Ot, e), this.recursiveSaveLabelledRecordQuery(e);
+    this.recordQuery = e, this.recordQueryByName = /* @__PURE__ */ new Map(), this.set(Lt, e), this.recursiveSaveLabelledRecordQuery(e);
   }
   recursiveSaveLabelledRecordQuery(e) {
     e.attributeQuery?.relatedRecords.forEach((t) => {
@@ -4572,7 +4580,7 @@ class Ga {
             throw new Error(`Failed to parse JSON field "${t}.${d.join(".")}": ${m instanceof Error ? m.message : String(m)}. Raw value: ${l.slice(0, 200)}`);
           }
         else typeof l == "number" && h === "boolean" && (l = l !== 0);
-        l !== null && bt(c, d, l);
+        l !== null && wt(c, d, l);
       }), c;
     });
   }
@@ -4594,7 +4602,7 @@ class Ga {
    * 查找记录（主查询方法）
    * CAUTION findRelatedRecords 中的递归调用会使得 includeRelationData 变为 true
    */
-  async findRecords(e, t = "", i, r = new je(Ot), a = !1) {
+  async findRecords(e, t = "", i, r = new je(Lt), a = !1) {
     if (i || (i = new za(e)), e.goto) {
       if (e.exit && await e.exit(r))
         return [];
@@ -4635,14 +4643,14 @@ FOR UPDATE OF "${e.recordName}"` : u,
     for (let b of e.attributeQuery.xToOneRecords)
       if (b.goto) {
         const w = this.map.getInfo(b.parentRecord, b.attributeName).getReverseInfo()?.attributeName;
-        for (let N of p) {
+        for (let R of p) {
           const S = b.matchExpression.and({
             key: `${w}.id`,
-            value: ["=", N.id]
-          }), R = b.derive({
+            value: ["=", R.id]
+          }), N = b.derive({
             matchExpression: S
-          }), $ = e.label ? y.concat(N) : y;
-          N[b.alias || b.attributeName] = await this.findRecords(R, t, i, $);
+          }), $ = e.label ? y.concat(R) : y;
+          R[b.alias || b.attributeName] = await this.findRecords(N, t, i, $);
         }
       }
     for (let b of e.attributeQuery.xToOneRecords) {
@@ -4650,22 +4658,22 @@ FOR UPDATE OF "${e.recordName}"` : u,
       if (g)
         for (let w of g.attributeQuery.xToManyRecords) {
           const S = this.map.getInfo(w.parentRecord, w.attributeName).getReverseInfo()?.attributeName;
-          for (let R of p) {
-            if (!R[b.attributeName]?.[v]) continue;
-            const $ = R[b.attributeName][v].id, I = w.derive({
+          for (let N of p) {
+            if (!N[b.attributeName]?.[v]) continue;
+            const $ = N[b.attributeName][v].id, I = w.derive({
               matchExpression: w.matchExpression.and({
                 key: `${S}.id`,
                 value: ["=", $]
               })
-            }), O = e.label ? y.concat(R) : y;
-            bt(
-              R,
+            }), D = e.label ? y.concat(N) : y;
+            wt(
+              N,
               [b.alias || b.attributeName, v, w.attributeName],
               await this.findRecords(
                 I,
                 `finding relation data: ${e.recordName}.${b.attributeName}.&.${w.attributeName}`,
                 i,
-                O
+                D
               )
             );
           }
@@ -4738,7 +4746,7 @@ FOR UPDATE OF "${e.recordName}"` : u,
     for (let y = 0; y < i.length; y += 500) {
       const b = i.slice(y, y + 500), g = r.matchExpression.and({
         key: `${u}.id`,
-        value: ["in", b.map((R) => R.id)]
+        value: ["in", b.map((N) => N.id)]
       }), w = new K(
         r.recordName,
         this.map,
@@ -4746,34 +4754,34 @@ FOR UPDATE OF "${e.recordName}"` : u,
         r.parentRecord,
         r.attributeName,
         p
-      ), N = r.derive({
+      ), R = r.derive({
         matchExpression: g,
         attributeQuery: w
       }), S = await this.findRecords(
-        N,
+        R,
         `finding related records in batch: ${r.parentRecord}.${r.attributeName}`,
         a,
         n
       );
-      for (const R of S) {
-        const $ = R[u]?.id, I = $ !== void 0 ? d.get(String($)) : void 0;
-        if (p ? (R[v] = R[u]?.[v], delete R[u]) : h || delete R[u], f)
-          for (let O of f.attributeQuery.xToManyRecords) {
-            const W = R[v].id;
-            bt(
-              R,
-              [v, O.attributeName],
+      for (const N of S) {
+        const $ = N[u]?.id, I = $ !== void 0 ? d.get(String($)) : void 0;
+        if (p ? (N[v] = N[u]?.[v], delete N[u]) : h || delete N[u], f)
+          for (let D of f.attributeQuery.xToManyRecords) {
+            const W = N[v].id;
+            wt(
+              N,
+              [v, D.attributeName],
               await this.findXToManyRelatedRecords(
-                O.parentRecord,
-                O.attributeName,
+                D.parentRecord,
+                D.attributeName,
                 W,
-                O,
+                D,
                 a,
                 n
               )
             );
           }
-        I && I[l].push(R);
+        I && I[l].push(N);
       }
     }
   }
@@ -4847,23 +4855,23 @@ FOR UPDATE OF "${e.recordName}"` : u,
       });
     else {
       const b = r.attributeQuery.data.find(
-        (R) => Array.isArray(R) && R[0] === v
-      )?.[1]?.attributeQuery || [], g = (R) => b.some(($) => $ === R || Array.isArray($) && $[0] === R), w = g("source"), N = g("target"), S = /* @__PURE__ */ new Set();
+        (N) => Array.isArray(N) && N[0] === v
+      )?.[1]?.attributeQuery || [], g = (N) => b.some(($) => $ === N || Array.isArray($) && $[0] === N), w = g("source"), R = g("target"), S = /* @__PURE__ */ new Set();
       m = [];
-      for (const R of h) {
+      for (const N of h) {
         const $ = (A, ne) => {
           if (!A?.id) return;
-          const L = ne ? A.source?.id : A.target?.id, ye = ne ? A.target?.id : A.source?.id;
-          return String(ye) === String(i) && String(L) === String(R.id) ? A : void 0;
-        }, I = $(R[`${c}:source`]?.[v], !0) ?? $(R[`${c}:target`]?.[v], !1);
+          const F = ne ? A.source?.id : A.target?.id, ye = ne ? A.target?.id : A.source?.id;
+          return String(ye) === String(i) && String(F) === String(N.id) ? A : void 0;
+        }, I = $(N[`${c}:source`]?.[v], !0) ?? $(N[`${c}:target`]?.[v], !1);
         if (!I) continue;
-        const O = `${R.id}::${I.id}`;
-        if (S.has(O)) continue;
-        S.add(O);
+        const D = `${N.id}::${I.id}`;
+        if (S.has(D)) continue;
+        S.add(D);
         const W = { ...I };
-        w || delete W.source, N || delete W.target;
+        w || delete W.source, R || delete W.target;
         const P = {
-          ...R,
+          ...N,
           [v]: W
         };
         delete P[`${c}:source`], delete P[`${c}:target`], m.push(P);
@@ -4874,7 +4882,7 @@ FOR UPDATE OF "${e.recordName}"` : u,
       for (let y of p.attributeQuery.xToManyRecords)
         for (let b of m) {
           const g = b[v].id, w = d.label ? f.concat(b) : f;
-          bt(
+          wt(
             b,
             [v, y.attributeName],
             await this.findXToManyRelatedRecords(
@@ -5128,17 +5136,17 @@ class Xa {
       if (h)
         for (const S of ["source", "target"]) {
           if (!Object.prototype.hasOwnProperty.call(i.rawData || {}, S)) continue;
-          const R = i.rawData[S];
-          if (!R?.id || f[S]?.id !== R.id)
+          const N = i.rawData[S];
+          if (!N?.id || f[S]?.id !== N.id)
             throw new Error(
-              `cannot change ${S} of relation record "${e}" through update (current ${S}.id: ${JSON.stringify(f[S]?.id)}, new: ${JSON.stringify(R?.id ?? R)}). Relation endpoints are immutable — remove the old relation and add a new one instead.`
+              `cannot change ${S} of relation record "${e}" through update (current ${S}.id: ${JSON.stringify(f[S]?.id)}, new: ${JSON.stringify(N?.id ?? N)}). Relation endpoints are immutable — remove the old relation and add a new one instead.`
             );
         }
       const p = Array.from(/* @__PURE__ */ new Set([
         ...d,
         ...i.getSameRowFieldAndValue(f).map((S) => S.name)
-      ])), y = await this.filteredEntityManager.collectMembershipChecks(u.recordName, [f.id], p, r), b = r ? await this.collectUpdateLinkChecks(i, r) : [], g = await this.agent.createRecordDependency(i, r), w = await this.updateSameRowData(u.recordName, f, g, r), N = await this.handleUpdateReliance(u.recordName, f, i, r);
-      await this.filteredEntityManager.settleMembershipChecks(y.concat(b), r), m.push({ ...i.getData(), ...w.getData(), ...N });
+      ])), y = await this.filteredEntityManager.collectMembershipChecks(u.recordName, [f.id], p, r), b = r ? await this.collectUpdateLinkChecks(i, r) : [], g = await this.agent.createRecordDependency(i, r), w = await this.updateSameRowData(u.recordName, f, g, r), R = await this.handleUpdateReliance(u.recordName, f, i, r);
+      await this.filteredEntityManager.settleMembershipChecks(y.concat(b), r), m.push({ ...i.getData(), ...w.getData(), ...R });
     }
     return m;
   }
@@ -5256,11 +5264,11 @@ class Ya {
    * 查找记录（主查询方法）- 委托给 QueryExecutor
    * CAUTION findRelatedRecords 中的递归调用会使得 includeRelationData 变为 true
    */
-  async findRecords(e, t = "", i, r = new je(Ot)) {
+  async findRecords(e, t = "", i, r = new je(Lt)) {
     return this.queryExecutor.findRecords(e, t, i, r);
   }
   async lockRecords(e, t = "") {
-    return this.queryExecutor.findRecords(e, t, void 0, new je(Ot), !0);
+    return this.queryExecutor.findRecords(e, t, void 0, new je(Lt), !0);
   }
   // 委托给 CreationExecutor
   async createRecordDependency(e, t) {
@@ -5312,7 +5320,13 @@ class Ya {
           id: f.id,
           source: { id: f.source?.id },
           target: { id: f.target?.id }
-        }, y = await this.filteredEntityManager.collectInlineDeletionSnapshot(e.recordName, [p], t);
+        };
+        m.push(...await this.filteredEntityManager.collectLinkMembershipChecks(
+          e.recordName,
+          { sourceIds: [f.source?.id], targetIds: [f.target?.id] },
+          t
+        ));
+        const y = await this.filteredEntityManager.collectInlineDeletionSnapshot(e.recordName, [p], t);
         t?.push({
           type: "delete",
           recordName: e.recordName,
@@ -5329,61 +5343,67 @@ class Ya {
           ));
           const y = f.id ? f[p.info?.attributeName][v] : void 0, b = y?.id ? await this.filteredEntityManager.collectInlineDeletionSnapshot(p.info.linkName, [y], t) : void 0, g = /* @__PURE__ */ new Map();
           if (h) {
-            const N = f[p.info?.attributeName], S = this.map.getRecordInfo(p.recordName);
-            for (const R of S.mergedRecordAttributes) {
-              if (R.linkName !== e.recordName) continue;
-              const $ = N[R.attributeName]?.[v];
-              if (!$?.id) continue;
-              const I = await this.filteredEntityManager.collectInlineDeletionSnapshot(R.linkName, [$], t);
-              I && g.set(R.attributeName, I);
+            const R = f[p.info?.attributeName], S = this.map.getRecordInfo(p.recordName);
+            for (const N of S.mergedRecordAttributes) {
+              if (N.linkName !== e.recordName) continue;
+              const $ = R[N.attributeName], I = $?.[v];
+              if (!I?.id) continue;
+              const D = await this.filteredEntityManager.collectInlineDeletionSnapshot(N.linkName, [I], t);
+              D && g.set(N.attributeName, D);
+              const W = !this.map.getLinkInfoByName(e.recordName).isRelationSource(p.recordName, N.attributeName);
+              m.push(...await this.filteredEntityManager.collectLinkMembershipChecks(
+                N.linkName,
+                W ? { sourceIds: [R.id], targetIds: [$.id] } : { sourceIds: [$.id], targetIds: [R.id] },
+                t
+              ));
             }
           }
-          if (await this.deleteRecordSameRowData(p.recordName, [{ id: f[p.info?.attributeName].id }]), f.id && (t?.push({
+          if (await this.deleteRecordSameRowData(p.recordName, [{ id: f[p.info?.attributeName].id }]), f.id && !p.info.isLinkSourceRelation() && (t?.push({
             type: "delete",
             recordName: p.info.linkName,
             record: f[p.info?.attributeName][v]
           }), t && b && this.filteredEntityManager.settleDeletionMemberships(b, p.info.linkName, [y], t, t)), T(!n[p.info?.attributeName], `should not have same combined record, conflict attribute: ${p.info?.attributeName}`), n[p.info?.attributeName] = {
             ...f[p.info?.attributeName]
           }, this.map.getRecordInfo(e.recordName).isRelation && this.map.data.links[e.recordName]) {
-            const N = n[p.info?.attributeName], S = this.map.getRecordInfo(p.recordName);
-            for (const R of S.mergedRecordAttributes) {
-              if (R.linkName !== e.recordName) continue;
-              const $ = N[R.attributeName];
+            const R = n[p.info?.attributeName], S = this.map.getRecordInfo(p.recordName);
+            for (const N of S.mergedRecordAttributes) {
+              if (N.linkName !== e.recordName) continue;
+              const $ = R[N.attributeName];
               if ($?.id === void 0) continue;
-              const I = $[v], O = !this.map.getLinkInfoByName(e.recordName).isRelationSource(p.recordName, R.attributeName), W = {
+              const I = $[v], D = !this.map.getLinkInfoByName(e.recordName).isRelationSource(p.recordName, N.attributeName), W = {
                 ...I || {},
-                source: O ? { id: N.id } : { id: $.id },
-                target: O ? { id: $.id } : { id: N.id }
+                source: D ? { id: R.id } : { id: $.id },
+                target: D ? { id: $.id } : { id: R.id }
               };
               t?.push({
                 type: "delete",
                 recordName: e.recordName,
                 record: W
               });
-              const P = g.get(R.attributeName);
-              t && P && this.filteredEntityManager.settleDeletionMemberships(P, e.recordName, [W], t, t), delete N[R.attributeName];
+              const P = g.get(N.attributeName);
+              t && P && this.filteredEntityManager.settleDeletionMemberships(P, e.recordName, [W], t, t), delete R[N.attributeName];
             }
           }
           if (!p.info.isLinkSourceRelation()) {
-            const N = { id: p.getRef().id }, S = { id: a ?? e.getData().id };
+            const R = { id: p.getRef().id }, S = { id: a ?? e.getData().id };
             n[p.info?.attributeName][v] = {
               ...p.linkRecordData?.getData() || {},
               id: await this.database.getAutoId(p.info.linkName)
             };
-            const R = {
+            const N = {
               ...n[p.info?.attributeName][v],
               [p.info.isRecordSource() ? "source" : "target"]: S,
-              [p.info.isRecordSource() ? "target" : "source"]: N
+              [p.info.isRecordSource() ? "target" : "source"]: R
             };
             t?.push({
               type: "create",
               recordName: p.info.linkName,
-              record: R
+              record: N
             }), this.filteredEntityManager.enqueuePostWriteCreationCheck(
               t,
               p.info.linkName,
-              R.id,
-              R
+              N.id,
+              N
             );
           }
         }
@@ -5458,19 +5478,19 @@ class Ya {
   }
 }
 const pe = "__type";
-function pt(s) {
+function mt(s) {
   return !("sourceProperty" in s);
 }
 function H(s) {
-  if (pt(s)) return s.name;
+  if (mt(s)) return s.name;
   const e = s;
   return e.name || `${e.source.name}_${e.sourceProperty}_${e.targetProperty}_${e.target.name}`;
 }
 function De(s) {
-  return pt(s) ? s.inputEntities : s.inputRelations;
+  return mt(s) ? s.inputEntities : s.inputRelations;
 }
 function Te(s) {
-  return pt(s) ? s.baseEntity : s.baseRelation;
+  return mt(s) ? s.baseEntity : s.baseRelation;
 }
 function Qr(s) {
   let e = s, t;
@@ -5497,7 +5517,7 @@ function lr(s) {
   return s.forEach(a), t;
 }
 function Za(s, e) {
-  const t = new mi(s, e), i = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Map(), n = [...s, ...e], o = /* @__PURE__ */ new Map();
+  const t = new fi(s, e), i = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), a = /* @__PURE__ */ new Map(), n = [...s, ...e], o = /* @__PURE__ */ new Map();
   for (const f of n) {
     const p = H(f), { root: y } = Qr(f);
     De(y) ? i.add(p) : o.set(p, H(y));
@@ -5555,47 +5575,47 @@ function en(s, e, t) {
 function hr(s, e, t, i, r, a, n, o, c) {
   const u = t === "entity", l = H(s), d = De(s) || [];
   if (s.commonProperties) {
-    const R = d.filter(($) => s.commonProperties.some((I) => !$.properties.some((O) => O.name === I.name && O.type === I.type)));
-    if (R.length > 0)
-      throw new Error(`Merged ${t} ${l} defined commonProperties, but these ${t}s do not have commonProperties: ${R.map(($) => H($)).join(", ")}`);
-  }
-  for (const R of d)
-    if (R.properties.some(($) => $.name === pe))
-      throw new Error(`Property name "${pe}" on ${t} "${H(R)}" conflicts with the merged ${t} discriminator column. Please rename the property.`);
-  const h = d.map((R) => ({
-    inputItem: R,
-    ...en(R, r, a)
+    const N = d.filter(($) => s.commonProperties.some((I) => !$.properties.some((D) => D.name === I.name && D.type === I.type)));
+    if (N.length > 0)
+      throw new Error(`Merged ${t} ${l} defined commonProperties, but these ${t}s do not have commonProperties: ${N.map(($) => H($)).join(", ")}`);
+  }
+  for (const N of d)
+    if (N.properties.some(($) => $.name === pe))
+      throw new Error(`Property name "${pe}" on ${t} "${H(N)}" conflicts with the merged ${t} discriminator column. Please rename the property.`);
+  const h = d.map((N) => ({
+    inputItem: N,
+    ...en(N, r, a)
   })), m = /* @__PURE__ */ new Set();
-  h.forEach((R) => R.hostedTypes.forEach(($) => m.add($)));
+  h.forEach((N) => N.hostedTypes.forEach(($) => m.add($)));
   let f = h[0]?.memberCondition;
-  for (let R = 1; R < h.length; R++)
-    f = f.or(h[R].memberCondition);
+  for (let N = 1; N < h.length; N++)
+    f = f.or(h[N].memberCondition);
   const p = u ? e.getEntityByName(l) : e.getRelationByName(l), y = [
     ...rn(p, i, e),
     tn(r),
     ...s.properties
-  ], b = d.some((R) => Te(R)), [g, w] = an(
+  ], b = d.some((N) => Te(N)), [g, w] = an(
     p,
     y,
     b ? f : void 0
   );
   e.replace(g, p);
-  let N = w;
-  w !== g && (N = e.add(w), pt(g) ? g.baseEntity = N : g.baseRelation = N, n.add(H(N))), a.set(l, {
+  let R = w;
+  w !== g && (R = e.add(w), mt(g) ? g.baseEntity = R : g.baseRelation = R, n.add(H(R))), a.set(l, {
     memberCondition: f,
     hostedTypes: m,
-    physicalBaseName: H(N)
-  }), o.add(H(N));
+    physicalBaseName: H(R)
+  }), o.add(H(R));
   const S = /* @__PURE__ */ new Map();
-  for (const { inputItem: R, memberCondition: $ } of h) {
-    const I = H(R);
-    c.set(I, pr(I, e, u)), mr(I, N, $, e, u);
+  for (const { inputItem: N, memberCondition: $ } of h) {
+    const I = H(N);
+    c.set(I, pr(I, e, u)), mr(I, R, $, e, u);
   }
-  for (const { rootToRebase: R } of h)
-    R && H(R) !== H(N) && S.set(H(R), R);
-  for (const [R] of S) {
-    const $ = E.atom({ key: pe, value: ["=", R] });
-    c.set(R, pr(R, e, u)), mr(R, N, $, e, u);
+  for (const { rootToRebase: N } of h)
+    N && H(N) !== H(R) && S.set(H(N), N);
+  for (const [N] of S) {
+    const $ = E.atom({ key: pe, value: ["=", N] });
+    c.set(N, pr(N, e, u)), mr(N, R, $, e, u);
   }
 }
 function pr(s, e, t) {
@@ -5673,7 +5693,7 @@ function rn(s, e, t) {
   return r;
 }
 function an(s, e, t) {
-  if (pt(s)) {
+  if (mt(s)) {
     const i = j.create({ name: s.name });
     if (t) {
       const r = j.create({
@@ -5709,7 +5729,7 @@ function an(s, e, t) {
     return a.properties = e, [a, a];
   }
 }
-class gi {
+class bi {
   constructor(e, t) {
     this.map = e, this.database = t, this.agent = new Ya(e, t);
   }
@@ -5842,7 +5862,7 @@ class gi {
     return this.map.getInfo(e, t).recordName;
   }
 }
-class et {
+class tt {
   constructor(e, t) {
     this.name = e, this.map = t, this.data = this.map.data.records[e];
   }
@@ -5915,7 +5935,7 @@ class et {
     return this.data.matchExpression;
   }
   get filteredBy() {
-    return this.data.filteredBy?.map((e) => new et(e, this.map));
+    return this.data.filteredBy?.map((e) => new tt(e, this.map));
   }
   get isFilteredEntity() {
     return this.data?.isFilteredEntity;
@@ -5965,10 +5985,10 @@ class Ft {
     return this.data.sourceRecord;
   }
   get sourceRecordInfo() {
-    return new et(this.data.sourceRecord, this.map);
+    return new tt(this.data.sourceRecord, this.map);
   }
   get targetRecordInfo() {
-    return new et(this.data.targetRecord, this.map);
+    return new tt(this.data.targetRecord, this.map);
   }
   get targetRecord() {
     return this.data.targetRecord;
@@ -6059,7 +6079,7 @@ class qe {
   }
   getRecordInfo(e) {
     let t = this.recordInfoCache.get(e);
-    return t || (t = new et(e, this), this.recordInfoCache.set(e, t)), t;
+    return t || (t = new tt(e, this), this.recordInfoCache.set(e, t)), t;
   }
   getInfo(e, t) {
     const i = this.getInfoByPath([e, ...t.split(".")]);
@@ -6135,8 +6155,8 @@ class qe {
         if (l.isMergedWithParent() || l.isLinkMergedWithParent())
           c = n;
         else if (l.isLinkIsolated()) {
-          const N = `REL_${g}`;
-          c = this.aliasManager?.registerTablePath(N) || N;
+          const R = `REL_${g}`;
+          c = this.aliasManager?.registerTablePath(R) || R;
         } else
           c = w;
         l.isMergedWithParent() || (n = w), a = l.table, r = b, o = l.getLinkInfo()?.table, u = !1;
@@ -6406,7 +6426,7 @@ function Q(s) {
 function ce(s, e) {
   return e.name === "mysql" ? `\`${s.replace(/`/g, "``")}\`` : `"${s.replace(/"/g, '""')}"`;
 }
-function wt(s, e) {
+function Nt(s, e) {
   return e.encodeLiteral(s);
 }
 function sn(s, e, t) {
@@ -6417,20 +6437,20 @@ function sn(s, e, t) {
     case "isNotNull":
       return `${i} IS NOT NULL`;
     case "equals":
-      return e.value === null ? `${i} IS NULL` : `${i} = ${wt(e.value, t)}`;
+      return e.value === null ? `${i} IS NULL` : `${i} = ${Nt(e.value, t)}`;
     case "notEquals":
-      return e.value === null ? `${i} IS NOT NULL` : `${i} != ${wt(e.value, t)}`;
+      return e.value === null ? `${i} IS NOT NULL` : `${i} != ${Nt(e.value, t)}`;
     case "in": {
       const r = e.value.filter((n) => n !== null), a = [];
-      return e.value.some((n) => n === null) && a.push(`${i} IS NULL`), r.length && a.push(`${i} IN (${r.map((n) => wt(n, t)).join(", ")})`), `(${a.join(" OR ")})`;
+      return e.value.some((n) => n === null) && a.push(`${i} IS NULL`), r.length && a.push(`${i} IN (${r.map((n) => Nt(n, t)).join(", ")})`), `(${a.join(" OR ")})`;
     }
     case "notIn": {
       const r = e.value.filter((n) => n !== null), a = [];
-      return e.value.some((n) => n === null) && a.push(`${i} IS NOT NULL`), r.length && a.push(`${i} NOT IN (${r.map((n) => wt(n, t)).join(", ")})`), `(${a.join(" AND ")})`;
+      return e.value.some((n) => n === null) && a.push(`${i} IS NOT NULL`), r.length && a.push(`${i} NOT IN (${r.map((n) => Nt(n, t)).join(", ")})`), `(${a.join(" AND ")})`;
     }
   }
 }
-function bi(s, e, t, i, r, a) {
+function wi(s, e, t, i, r, a) {
   const n = i.supportsCreateIndexIfNotExists ? " IF NOT EXISTS" : "", o = t.map((u) => ce(u, i)).join(", "), c = r ? `
 WHERE ${Object.entries(r).map(([u, l]) => {
     const d = a?.(u) ?? u;
@@ -6445,7 +6465,7 @@ function on(s, e, t) {
     throw new Error(`filtered unique constraints are not supported by ${e.name} schema dialect`);
   return {
     item: s,
-    sql: bi(
+    sql: wi(
       s.physicalName,
       s.tableName,
       s.fields,
@@ -7212,7 +7232,7 @@ ${Object.values(this.tables[e].columns).map((i) => `    "${i.name}" ${i.fieldTyp
       for (const a of r || []) {
         if (e.has(a.name))
           throw new Error(`duplicate constraint name "${a.name}"`);
-        if (e.add(a.name), Ht.is(a)) {
+        if (e.add(a.name), Kt.is(a)) {
           this.validateUniqueConstraintRecord(i, a);
           const n = a.properties.map((o) => this.resolveConstraintField(i, o));
           this.constraintSchemaItems.push({
@@ -7466,7 +7486,7 @@ class V extends ae {
     }), this.handleName = t.handleName, this.computationName = t.computationName, this.dataContext = t.dataContext, this.computationPhase = t.computationPhase, this.severity = t.severity || te.MEDIUM;
   }
 }
-class oi extends V {
+class ci extends V {
   constructor(e, t = {}) {
     super(e, {
       ...t,
@@ -7572,7 +7592,7 @@ function dn(s) {
     fields: i.map((a) => a.split(".").at(-1).replace(/^"|"$/g, ""))
   };
 }
-function Ct(s, e) {
+function xt(s, e) {
   const t = s && typeof s == "object" ? s : {}, i = s instanceof Error ? s.message : String(s), r = t.code ?? t.errno, a = ln(t, ["constraint", "constraintName", "index", "sqlMessage"]), n = dn(i), o = r === "23505" || r === "SQLITE_CONSTRAINT_UNIQUE" || r === "SQLITE_CONSTRAINT" || r === 1062 || i.includes("UNIQUE constraint failed") || i.includes("duplicate key value violates unique constraint") || i.includes("Duplicate entry");
   return {
     driver: e?.constructor?.name,
@@ -7615,7 +7635,7 @@ class br extends ae {
     }), this.sideEffectName = t.sideEffectName, this.recordName = t.recordName, this.mutationType = t.mutationType, this.severity = te.MEDIUM;
   }
 }
-class wi extends ae {
+class Ni extends ae {
   constructor(e, t) {
     super(e, {
       errorType: t.context?.errorType || "ConditionError",
@@ -7635,7 +7655,7 @@ class wi extends ae {
    */
   static payloadValidationFailed(e, t, i, r) {
     const a = `${e} ${t}`;
-    return new wi(`Payload validation failed for field '${e}': ${t}`, {
+    return new Ni(`Payload validation failed for field '${e}': ${t}`, {
       checkType: "payload",
       fieldName: e,
       payload: i,
@@ -7646,7 +7666,7 @@ class wi extends ae {
     });
   }
   static conditionCheckFailed(e, t) {
-    return new wi(`Condition check failed: ${e.data.name}`, {
+    return new Ni(`Condition check failed: ${e.data.name}`, {
       checkType: "condition",
       evaluationError: e,
       severity: te.HIGH,
@@ -7712,7 +7732,7 @@ class Wr {
     return this.data.transfers.filter((t) => wr(e, t.trigger));
   }
 }
-const Ao = 0, ci = 1, Io = 2;
+const Ao = 0, ui = 1, Io = 2;
 class zr {
   constructor(e, t) {
     this.controller = e, this.scheduler = t, this.sourceMaps = [], this.sourceMapTree = {}, this.filteredToPhysicalName = /* @__PURE__ */ new Map(), this.knownRecordNames = /* @__PURE__ */ new Set();
@@ -7823,7 +7843,7 @@ class zr {
               }
             );
           const o = this.convertDataDepToERMutationEventsSourceMap(a, n, i);
-          r[n.phase || ci].push(...o);
+          r[n.phase || ui].push(...o);
         }), i.dataContext.type === "property" && Object.values(i.dataDeps).some((a) => a.type === "global")) {
           const a = i.dataContext.host.name;
           if (!r.some(
@@ -7833,7 +7853,7 @@ class zr {
               type: "records",
               source: i.dataContext.host
             };
-            r[ci].push(...this.convertDataDepToERMutationEventsSourceMap("_self", o, i, "create"));
+            r[ui].push(...this.convertDataDepToERMutationEventsSourceMap("_self", o, i, "create"));
           }
         }
         r.forEach((a, n) => {
@@ -7842,7 +7862,7 @@ class zr {
       } else {
         const { eventDeps: r } = i;
         for (const a of Object.values(r))
-          t[a.phase || ci].push({
+          t[a.phase || ui].push({
             type: a.type,
             recordName: a.recordName,
             record: a.record,
@@ -8112,10 +8132,10 @@ class U {
     this.skip = () => new Oe();
   }
   static {
-    this.resolved = (e, t) => new Jt(e, t);
+    this.resolved = (e, t) => new Xt(e, t);
   }
   static {
-    this.async = (e) => new mt(e);
+    this.async = (e) => new ft(e);
   }
   static {
     this.fullRecompute = (e) => new Gr(e);
@@ -8128,17 +8148,17 @@ class Gr extends U {
     super(), this.reason = e;
   }
 }
-class mt extends U {
+class ft extends U {
   constructor(e) {
     super(), this.args = e;
   }
 }
-class Jt extends U {
+class Xt extends U {
   constructor(e, t) {
     super(), this.result = e, this.args = t;
   }
 }
-class D {
+class O {
   constructor(e, t) {
     this.defaultValue = e, this.record = t;
   }
@@ -8331,7 +8351,7 @@ function Xr(s, e, t) {
       c.has(m) || (h.has(m) && a(`trigger.keys ["${m}"] refers to a relation attribute. Relation replacement does not emit a host update event carrying this key, so the transfer would never fire. Declare the trigger on the relation record's create/delete events instead (e.g. { recordName: '<relationName>', type: 'create' }).`), a(`trigger.keys ["${m}"] does not match any declared property of "${r.recordName}", so the transfer would never fire. Declare the property or fix the key name.`));
   }
 }
-async function Lt(s, e, t, i, r) {
+async function Vt(s, e, t, i, r) {
   if (!e.computeValue) return e.name;
   const a = await e.computeValue.call(s, t, i);
   if (a === void 0)
@@ -8384,7 +8404,7 @@ class yn {
     }
   }
   static {
-    this.computationType = nt;
+    this.computationType = st;
   }
   static {
     this.contextType = "global";
@@ -8395,7 +8415,7 @@ class yn {
     };
   }
   async getInitialValue(e) {
-    return Lt(this.controller, this.initialState, void 0, e, () => this.describeContext());
+    return Vt(this.controller, this.initialState, void 0, e, () => this.describeContext());
   }
   describeContext() {
     return `of global dictionary "${this.dataContext.id?.name ?? String(this.dataContext.id)}"`;
@@ -8405,7 +8425,7 @@ class yn {
     if (!a) return U.skip();
     await this.state.currentState.setInternal(a.name);
     const n = await this.controller.retrieveLastValue(this.dataContext);
-    return Lt(this.controller, a, n, t, () => this.describeContext());
+    return Vt(this.controller, a, n, t, () => this.describeContext());
   }
 }
 class gn {
@@ -8424,14 +8444,14 @@ class gn {
     }
   }
   static {
-    this.computationType = nt;
+    this.computationType = st;
   }
   static {
     this.contextType = "property";
   }
   createState() {
     return {
-      currentState: new D(this.initialState.name)
+      currentState: new O(this.initialState.name)
     };
   }
   async getInitialValue(e) {
@@ -8442,7 +8462,7 @@ class gn {
 if you want to save the use the initial value, you need to define computeValue in initialState to save it.
 Or if you want to use state name as value, you should not set ${this.dataContext.host.name}.${this.dataContext.id.name} when ${this.dataContext.host.name} created.
 `
-    ), Lt(this.controller, this.initialState, t, void 0, () => this.describeContext());
+    ), Vt(this.controller, this.initialState, t, void 0, () => this.describeContext());
   }
   describeContext() {
     return `of property "${this.dataContext.host.name}.${this.dataContext.id.name}"`;
@@ -8466,7 +8486,7 @@ Or if you want to use state name as value, you should not set ${this.dataContext
     if (!n) return U.skip();
     await this.state.currentState.setInternal(r, n.name);
     const o = r[this.dataContext.id.name];
-    return Lt(this.controller, n, o, t, () => this.describeContext());
+    return Vt(this.controller, n, o, t, () => this.describeContext());
   }
   // 给外部用的，因为可能在 Transform 里面设置初始值。
   async createStateData(e) {
@@ -8475,17 +8495,17 @@ Or if you want to use state name as value, you should not set ${this.dataContext
     };
   }
 }
-const Fo = We.create({
+const Lo = We.create({
   name: "nonExistent",
   computeValue: () => null
-}), Lo = We.create({
+}), Fo = We.create({
   name: "nonDeleted",
   computeValue: () => !1
 }), Vo = We.create({
   name: "deleted",
   computeValue: () => !0
 }), bn = [yn, gn];
-function Xt(s, e) {
+function Yt(s, e) {
   const t = [];
   let i = s;
   for (; i; ) {
@@ -8701,12 +8721,12 @@ function Zr(s) {
   const e = Number(s.weight) * Number(s.value);
   return Number.isFinite(e) ? e : 0;
 }
-class Rn extends ze {
+class Nn extends ze {
   constructor(e, t, i) {
     super(e, t, i, { computationName: "WeightedSummation", requireCallback: !0 }), this.itemStateKey = "itemResult", this.emptyItemValue = 0;
   }
   static {
-    this.computationType = st;
+    this.computationType = ot;
   }
   static {
     this.contextType = "global";
@@ -8714,7 +8734,7 @@ class Rn extends ze {
   createState() {
     return {
       total: new me(0),
-      itemResult: new D(0, this.record.name)
+      itemResult: new O(0, this.record.name)
     };
   }
   getInitialValue() {
@@ -8731,20 +8751,20 @@ class Rn extends ze {
     return await this.state.total.setInternal(t), t;
   }
 }
-class Nn extends Ge {
+class Rn extends Ge {
   constructor(e, t, i) {
     super(e, t, i, { computationName: "WeightedSummation", requireCallback: !0 }), this.itemStateKey = "itemResult", this.emptyItemValue = 0;
   }
   static {
-    this.computationType = st;
+    this.computationType = ot;
   }
   static {
     this.contextType = "property";
   }
   createState() {
     return {
-      total: new D(0, this.dataContext.host.name),
-      itemResult: new D(0, this.relation.name)
+      total: new O(0, this.dataContext.host.name),
+      itemResult: new O(0, this.relation.name)
     };
   }
   getInitialValue() {
@@ -8761,13 +8781,13 @@ class Nn extends Ge {
     return await this.state.total.setInternal(e, i), i;
   }
 }
-const vn = [Rn, Nn];
+const vn = [Nn, Rn];
 class Sn extends ze {
   constructor(e, t, i) {
     super(e, t, i, { computationName: "Every", requireCallback: !0 }), this.itemStateKey = "isItemMatch", this.emptyItemValue = !1, this.defaultValue = !this.args.notEmpty;
   }
   static {
-    this.computationType = lt;
+    this.computationType = dt;
   }
   static {
     this.contextType = "global";
@@ -8775,7 +8795,7 @@ class Sn extends ze {
   createState() {
     return {
       aggregate: new me({ matchCount: 0, totalCount: 0 }),
-      isItemMatch: new D(!1, this.record.name)
+      isItemMatch: new O(!1, this.record.name)
     };
   }
   getInitialValue() {
@@ -8806,16 +8826,16 @@ class En extends Ge {
     super(e, t, i, { computationName: "Every", requireCallback: !0, requireXToMany: !0 }), this.itemStateKey = "isItemMatch", this.emptyItemValue = !1, this.defaultValue = !this.args.notEmpty;
   }
   static {
-    this.computationType = lt;
+    this.computationType = dt;
   }
   static {
     this.contextType = "property";
   }
   createState() {
     return {
-      matchCount: new D(0),
-      totalCount: new D(0),
-      isItemMatch: new D(!1, this.relation.name)
+      matchCount: new O(0),
+      totalCount: new O(0),
+      isItemMatch: new O(!1, this.relation.name)
     };
   }
   getInitialValue() {
@@ -8839,7 +8859,7 @@ class kn extends ze {
     super(e, t, i, { computationName: "Any", requireCallback: !0 }), this.itemStateKey = "isItemMatch", this.emptyItemValue = !1;
   }
   static {
-    this.computationType = dt;
+    this.computationType = ht;
   }
   static {
     this.contextType = "global";
@@ -8847,7 +8867,7 @@ class kn extends ze {
   createState() {
     return {
       matchCount: new me(0),
-      isItemMatch: new D(!1, this.record.name)
+      isItemMatch: new O(!1, this.record.name)
     };
   }
   getInitialValue() {
@@ -8870,15 +8890,15 @@ class Tn extends Ge {
     super(e, t, i, { computationName: "Any", requireCallback: !0, requireXToMany: !0 }), this.itemStateKey = "isItemMatch", this.emptyItemValue = !1;
   }
   static {
-    this.computationType = dt;
+    this.computationType = ht;
   }
   static {
     this.contextType = "property";
   }
   createState() {
     return {
-      matchCount: new D(0),
-      isItemMatch: new D(!1, this.relation.name)
+      matchCount: new O(0),
+      isItemMatch: new O(!1, this.relation.name)
     };
   }
   getInitialValue() {
@@ -8902,7 +8922,7 @@ class xn extends ze {
     super(e, t, i, { computationName: "Count" }), this.itemStateKey = "isItemMatch", this.emptyItemValue = !1;
   }
   static {
-    this.computationType = ot;
+    this.computationType = ct;
   }
   static {
     this.contextType = "global";
@@ -8910,7 +8930,7 @@ class xn extends ze {
   createState() {
     return {
       count: new me(0),
-      isItemMatch: new D(!1, this.record.name)
+      isItemMatch: new O(!1, this.record.name)
     };
   }
   getInitialValue() {
@@ -8937,7 +8957,7 @@ class An extends Ge {
     super(e, t, i, { computationName: "Count", allowRecordFallback: !0 }), this.emptyItemValue = !1;
   }
   static {
-    this.computationType = ot;
+    this.computationType = ct;
   }
   static {
     this.contextType = "property";
@@ -8951,9 +8971,9 @@ class An extends Ge {
   }
   createState() {
     return {
-      count: new D(0, this.dataContext.host.name),
+      count: new O(0, this.dataContext.host.name),
       ...this.callback ? {
-        isItemMatchCount: new D(!1, this.relation.name)
+        isItemMatchCount: new O(!1, this.relation.name)
       } : {}
     };
   }
@@ -8992,7 +9012,7 @@ class Pn extends ae {
     );
   }
 }
-class xt extends ae {
+class At extends ae {
   constructor(e) {
     super(
       `Transaction capability requirement is not satisfied: ${e.reason}`,
@@ -9032,8 +9052,8 @@ function On(s, e) {
 function _o(s, e) {
   return On(s, e) !== void 0;
 }
-const Rr = [10, 25, 60, 150, 350];
-function Fn(s) {
+const Nr = [10, 25, 60, 150, 350];
+function Ln(s) {
   return new Promise((e) => setTimeout(e, s));
 }
 function Rt(s, e, t, i) {
@@ -9043,7 +9063,7 @@ function Rt(s, e, t, i) {
     transactionName: i
   }), s;
 }
-class At extends Error {
+class It extends Error {
   constructor(e, t, i, r) {
     super(`Transaction retry exhausted for ${e} after ${t} attempts`, { cause: r }), this.name = "TransactionRetryExhaustedError", this.transactionAttempts = t, this.transactionIsolation = i, this.transactionName = e, Object.assign(this, {
       transactionAttempts: t,
@@ -9053,12 +9073,12 @@ class At extends Error {
   }
 }
 function Bo(s) {
-  return we(s).some((e) => e instanceof At);
+  return we(s).some((e) => e instanceof It);
 }
 function Uo(s) {
-  return we(s).some((e) => e instanceof xt);
+  return we(s).some((e) => e instanceof At);
 }
-async function Oi(s, e, t = {}) {
+async function Li(s, e, t = {}) {
   const i = t.maxAttempts ?? 5;
   let r = "READ COMMITTED", a = 0, n;
   for (; a < i; ) {
@@ -9068,7 +9088,7 @@ async function Oi(s, e, t = {}) {
     } catch (o) {
       if (n = o, Mn(o)) {
         if (r = "SERIALIZABLE", a < i) continue;
-        throw new At(
+        throw new It(
           s,
           a,
           r,
@@ -9077,11 +9097,11 @@ async function Oi(s, e, t = {}) {
       }
       if (Dn(o)) {
         if (a < i) {
-          const c = Rr[Math.min(a - 1, Rr.length - 1)], u = Math.floor(Math.random() * c);
-          await Fn(c + u);
+          const c = Nr[Math.min(a - 1, Nr.length - 1)], u = Math.floor(Math.random() * c);
+          await Ln(c + u);
           continue;
         }
-        throw new At(
+        throw new It(
           s,
           a,
           r,
@@ -9091,16 +9111,16 @@ async function Oi(s, e, t = {}) {
       throw Rt(o, a, r, s);
     }
   }
-  throw new At(s, a, r, Rt(n, a, r, s));
+  throw new It(s, a, r, Rt(n, a, r, s));
 }
-function Nt(s, e) {
+function vt(s, e) {
   if (s.id !== void 0 && s.id !== null)
     throw new V(
       `Transform callback for ${e.type} "${e.id.name}" returned a record with a top-level "id" field (${JSON.stringify(s.id)}). Derived record identity is managed by the framework; an explicit id collides with the target entity's own id sequence and silently corrupts data. Strip it before returning, e.g. callback: ({id: _, ...rest}) => ({...rest}).`,
       { computationName: "Transform", computationPhase: "transform-callback-result" }
     );
 }
-class Ln {
+class Fn {
   constructor(e, t, i) {
     this.controller = e, this.args = t, this.dataContext = i, this.useLastValue = !1, this.dataDeps = {}, this.primaryDataDepKeys = ["_source"], _(!(this.args.record && this.args.eventDeps), "Transform must have either record or eventDep"), this.transformCallback = this.args.callback.bind(this.controller), this.args.eventDeps ? this.eventDeps = this.args.eventDeps : this.dataDeps = {
       _source: {
@@ -9111,13 +9131,13 @@ class Ln {
     };
   }
   static {
-    this.computationType = Wt;
+    this.computationType = zt;
   }
   static {
     this.contextType = ["entity", "relation"];
   }
   createState() {
-    const e = new D(""), t = new D(0);
+    const e = new O(""), t = new O(0);
     return e.unique = !this.eventDeps, {
       sourceRecordId: e,
       transformIndex: t
@@ -9132,7 +9152,7 @@ class Ln {
     for (const i of e) {
       const r = await this.transformCallback.call(this.controller, i);
       (Array.isArray(r) ? r : [r]).forEach((n, o) => {
-        n && (Nt(n, this.dataContext), t.push({
+        n && (vt(n, this.dataContext), t.push({
           ...n,
           [this.state.sourceRecordId.key]: i.id,
           [this.state.transformIndex.key]: o
@@ -9153,7 +9173,7 @@ class Ln {
   async eventBasedIncrementalPatchCompute(e, t) {
     const i = [], r = await this.transformCallback.call(this.controller, t);
     return (Array.isArray(r) ? r : [r]).forEach((n, o) => {
-      n && (Nt(n, this.dataContext), i.push({
+      n && (vt(n, this.dataContext), i.push({
         type: "insert",
         data: {
           ...n,
@@ -9168,7 +9188,7 @@ class Ln {
     if (t.type === "create") {
       const a = E.atom({ key: "id", value: ["=", t.record.id] }), n = this.dataDeps._source, o = await this.controller.system.storage.findOne(n.source.name, a, void 0, n.attributeQuery), c = await this.transformCallback.call(this.controller, o);
       (Array.isArray(c) ? c : [c]).forEach((l, d) => {
-        l && (Nt(l, this.dataContext), r.push({
+        l && (vt(l, this.dataContext), r.push({
           type: "insert",
           data: {
             ...l,
@@ -9195,7 +9215,7 @@ class Ln {
       }
       const o = E.atom({ key: this.state.sourceRecordId.key, value: ["=", a] }), u = (await this.controller.system.storage.atomic.lockRows(i.id.name, o, ["*"])).reduce((l, d) => (l[Number(d[this.state.transformIndex.key])] = d, l), {});
       n.forEach((l, d) => {
-        l && (Nt(l, this.dataContext), u[d] ? (r.push({
+        l && (vt(l, this.dataContext), u[d] ? (r.push({
           type: "update",
           data: {
             ...l,
@@ -9221,7 +9241,7 @@ class Ln {
     return r;
   }
 }
-const Vn = [Ln];
+const Vn = [Fn];
 class J {
   constructor(e) {
     this.node = e;
@@ -9320,10 +9340,10 @@ class J {
     }
   }
   gt(e) {
-    return new Vt(this, ">", e);
+    return new _t(this, ">", e);
   }
   lt(e) {
-    return new Vt(this, "<", e);
+    return new _t(this, "<", e);
   }
   eq(e) {
     return new Fi(this, e);
@@ -9423,7 +9443,7 @@ class J {
     }
   }
 }
-class Vt {
+class _t {
   constructor(e, t, i) {
     this.left = e, this.operator = t, this.right = i;
   }
@@ -9520,7 +9540,7 @@ class _n {
     this.controller = e, this.args = t, this.dataContext = i, this.useLastValue = !1, this.dataDeps = this.args.dataDeps ?? {}, this.callback = (r, a) => this.args.callback.call(this.controller, r, a), this.nextRecomputeTime = this.args.nextRecomputeTime ? (r, a) => this.args.nextRecomputeTime.call(this.controller, r, a) : void 0;
   }
   static {
-    this.computationType = ht;
+    this.computationType = pt;
   }
   static {
     this.contextType = "global";
@@ -9537,7 +9557,7 @@ class _n {
   // TODO now 是不是应该用 dataDeps 动态注入？？？这样能手动测试。改成在哪里配置？
   async compute(e) {
     const t = await this.args.callback(J.variable("now"), e), i = Date.now();
-    if (!(t instanceof J) && !(t instanceof Vt) && !(t instanceof Fi))
+    if (!(t instanceof J) && !(t instanceof _t) && !(t instanceof Fi))
       throw new Error("Invalid result type");
     const r = t.evaluate({ now: i }), a = ea(t, i, e, this.nextRecomputeTime, `global:${this.dataContext.id?.name ?? String(this.dataContext.id)}`);
     return await this.state.lastRecomputeTime.setInternal(i), await this.state.nextRecomputeTime.setInternal(a), r;
@@ -9563,15 +9583,15 @@ class Bn {
     this.isResultNumber = this.dataContext.id.type === "number", this.callback = (r, a) => this.args.callback.call(this.controller, r, a), this.nextRecomputeTime = this.args.nextRecomputeTime ? (r, a) => this.args.nextRecomputeTime.call(this.controller, r, a) : void 0;
   }
   static {
-    this.computationType = ht;
+    this.computationType = pt;
   }
   static {
     this.contextType = "property";
   }
   createState() {
     return {
-      lastRecomputeTime: new D(null),
-      nextRecomputeTime: new D(null)
+      lastRecomputeTime: new O(null),
+      nextRecomputeTime: new O(null)
     };
   }
   getInitialValue() {
@@ -9580,7 +9600,7 @@ class Bn {
   // TODO now 是不是应该用 dataDeps 动态注入？？？这样能手动测试。改成在哪里配置？
   async compute(e, t) {
     const i = await this.args.callback(J.variable("now"), e), r = Date.now();
-    if (!(i instanceof J) && !(i instanceof Vt) && !(i instanceof Fi))
+    if (!(i instanceof J) && !(i instanceof _t) && !(i instanceof Fi))
       throw new Error("Invalid result type");
     const a = i.evaluate({ now: r }), n = ea(i, r, e, this.nextRecomputeTime, `property:${this.dataContext.host?.name ?? ""}.${this.dataContext.id?.name ?? String(this.dataContext.id)}`);
     return await this.state.lastRecomputeTime.setInternal(t, r), await this.state.nextRecomputeTime.setInternal(t, n), a;
@@ -9595,10 +9615,10 @@ function ta(s, e) {
 }
 class Qn extends ze {
   constructor(e, t, i) {
-    super(e, t, i, { computationName: "Summation", requireAttributeQueryField: !0 }), this.itemStateKey = "itemValue", this.emptyItemValue = 0, this.sumFieldPath = Xt(this.args.attributeQuery, () => `Summation computation of ${X(i)}`);
+    super(e, t, i, { computationName: "Summation", requireAttributeQueryField: !0 }), this.itemStateKey = "itemValue", this.emptyItemValue = 0, this.sumFieldPath = Yt(this.args.attributeQuery, () => `Summation computation of ${X(i)}`);
   }
   static {
-    this.computationType = ct;
+    this.computationType = ut;
   }
   static {
     this.contextType = "global";
@@ -9606,7 +9626,7 @@ class Qn extends ze {
   createState() {
     return {
       sum: new me(0),
-      itemValue: new D(0, this.record.name)
+      itemValue: new O(0, this.record.name)
     };
   }
   getInitialValue() {
@@ -9625,18 +9645,18 @@ class Qn extends ze {
 }
 class jn extends Ge {
   constructor(e, t, i) {
-    super(e, t, i, { computationName: "Summation", requireAttributeQueryField: !0 }), this.itemStateKey = "itemResult", this.emptyItemValue = 0, this.sumFieldPath = Xt(this.args.attributeQuery, () => `Summation computation of ${X(i)}`);
+    super(e, t, i, { computationName: "Summation", requireAttributeQueryField: !0 }), this.itemStateKey = "itemResult", this.emptyItemValue = 0, this.sumFieldPath = Yt(this.args.attributeQuery, () => `Summation computation of ${X(i)}`);
   }
   static {
-    this.computationType = ct;
+    this.computationType = ut;
   }
   static {
     this.contextType = "property";
   }
   createState() {
     return {
-      sum: new D(0, this.dataContext.host.name),
-      itemResult: new D(0, this.relation.name)
+      sum: new O(0, this.dataContext.host.name),
+      itemResult: new O(0, this.relation.name)
     };
   }
   getInitialValue() {
@@ -9662,10 +9682,10 @@ function ia(s, e) {
 }
 class Kn extends ze {
   constructor(e, t, i) {
-    super(e, t, i, { computationName: "Average", requireAttributeQueryField: !0 }), this.itemStateKey = "itemValue", this.emptyItemValue = 0, this.avgFieldPath = Xt(this.args.attributeQuery, () => `Average computation of ${X(i)}`);
+    super(e, t, i, { computationName: "Average", requireAttributeQueryField: !0 }), this.itemStateKey = "itemValue", this.emptyItemValue = 0, this.avgFieldPath = Yt(this.args.attributeQuery, () => `Average computation of ${X(i)}`);
   }
   static {
-    this.computationType = ut;
+    this.computationType = lt;
   }
   static {
     this.contextType = "global";
@@ -9673,7 +9693,7 @@ class Kn extends ze {
   createState() {
     return {
       aggregate: new me({ sum: 0, count: 0 }),
-      itemValue: new D(0, this.record.name)
+      itemValue: new O(0, this.record.name)
     };
   }
   getInitialValue() {
@@ -9701,19 +9721,19 @@ class Kn extends ze {
 }
 class Wn extends Ge {
   constructor(e, t, i) {
-    super(e, t, i, { computationName: "Average", requireAttributeQueryField: !0 }), this.itemStateKey = "itemResult", this.emptyItemValue = 0, this.avgFieldPath = Xt(this.args.attributeQuery, () => `Average computation of ${X(i)}`);
+    super(e, t, i, { computationName: "Average", requireAttributeQueryField: !0 }), this.itemStateKey = "itemResult", this.emptyItemValue = 0, this.avgFieldPath = Yt(this.args.attributeQuery, () => `Average computation of ${X(i)}`);
   }
   static {
-    this.computationType = ut;
+    this.computationType = lt;
   }
   static {
     this.contextType = "property";
   }
   createState() {
     return {
-      sum: new D(0, this.dataContext.host.name),
-      count: new D(0, this.dataContext.host.name),
-      itemResult: new D(0, this.relation.name)
+      sum: new O(0, this.dataContext.host.name),
+      count: new O(0, this.dataContext.host.name),
+      itemResult: new O(0, this.relation.name)
     };
   }
   getInitialValue() {
@@ -9732,7 +9752,7 @@ class Wn extends Ge {
   }
 }
 const zn = [Kn, Wn];
-class Yt {
+class Zt {
   constructor(e, t, i) {
     this.controller = e, this.args = t, this.dataContext = i, this.state = {}, this.dataDeps = {};
     const r = i.type === "entity" || i.type === "relation";
@@ -9796,7 +9816,7 @@ class Yt {
     }));
   }
   static {
-    this.computationType = Kt;
+    this.computationType = Wt;
   }
   createState() {
     if (this.createStateCallback) {
@@ -9843,22 +9863,22 @@ class Yt {
     };
   }
 }
-class Gn extends Yt {
+class Gn extends Zt {
   static {
     this.contextType = "global";
   }
 }
-class Jn extends Yt {
+class Jn extends Zt {
   static {
     this.contextType = "entity";
   }
 }
-class Xn extends Yt {
+class Xn extends Zt {
   static {
     this.contextType = "relation";
   }
 }
-class Yn extends Yt {
+class Yn extends Zt {
   static {
     this.contextType = "property";
   }
@@ -9879,7 +9899,7 @@ const Zn = [
   Xn,
   Yn
 ];
-function Ni(s, e) {
+function vi(s, e) {
   const t = e.split(".");
   let i = s;
   for (const r of t) {
@@ -9924,7 +9944,7 @@ function aa(s, e) {
 function es(s, e) {
   const t = [];
   for (const i of s)
-    t.push(aa(i.name, ra(i, Ni(e, i.path))));
+    t.push(aa(i.name, ra(i, vi(e, i.path))));
   return t;
 }
 function na(s, e) {
@@ -9938,11 +9958,11 @@ function na(s, e) {
 function Ee(s) {
   return s == null;
 }
-function Nr(s) {
+function Rr(s) {
   return typeof s == "object" && s !== null && "id" in s ? s.id : s;
 }
-function vt(s, e) {
-  return Nr(s) === Nr(e);
+function St(s, e) {
+  return Rr(s) === Rr(e);
 }
 function ts(s, e) {
   const t = e.split(".");
@@ -9963,16 +9983,16 @@ function is(s, e) {
     case "is not null":
       return !Ee(r);
     case "=":
-      return i === null ? Ee(r) : !Ee(r) && vt(r, i);
+      return i === null ? Ee(r) : !Ee(r) && St(r, i);
     case "!=":
-      return i === null ? !Ee(r) : !Ee(r) && !vt(r, i);
+      return i === null ? !Ee(r) : !Ee(r) && !St(r, i);
     case "in": {
       if (!Array.isArray(i)) throw new Error("ScopedSequence.match in value must be an array");
-      return Ee(r) ? i.includes(null) : i.some((a) => a !== null && vt(r, a));
+      return Ee(r) ? i.includes(null) : i.some((a) => a !== null && St(r, a));
     }
     case "not in": {
       if (!Array.isArray(i)) throw new Error("ScopedSequence.match not in value must be an array");
-      return Ee(r) ? !1 : i.every((a) => a === null || !vt(r, a));
+      return Ee(r) ? !1 : i.every((a) => a === null || !St(r, a));
     }
   }
 }
@@ -9984,11 +10004,11 @@ function _e(s, e) {
   throw new Error(`ScopedSequence.match has unsupported boolean operator "${String(s.operator)}"`);
 }
 function sa(s, e) {
-  const t = Ne(s);
+  const t = Re(s);
   return t ? _e(t, e) : !0;
 }
 function oa(s) {
-  const e = Ne(s), t = [];
+  const e = Re(s), t = [];
   if (!e) return t;
   const i = (r) => {
     if (r.type === "atom") {
@@ -10026,7 +10046,7 @@ class ns {
       throw new Error("ScopedSequence is not supported by the current storage driver");
   }
   static {
-    this.computationType = Ze;
+    this.computationType = et;
   }
   static {
     this.contextType = "property";
@@ -10064,16 +10084,16 @@ class ns {
   }
 }
 const ss = [ns];
-function vi(s) {
+function Si(s) {
   if (s === null || typeof s != "object")
     return typeof s == "function" ? "[Function]" : JSON.stringify(s);
   if (Array.isArray(s))
-    return `[${s.map(vi).join(",")}]`;
+    return `[${s.map(Si).join(",")}]`;
   const e = s;
-  return `{${Object.keys(e).sort().map((t) => `${JSON.stringify(t)}:${vi(e[t])}`).join(",")}}`;
+  return `{${Object.keys(e).sort().map((t) => `${JSON.stringify(t)}:${Si(e[t])}`).join(",")}}`;
 }
 function Sr(s) {
-  return Fr("sha256").update(vi(s)).digest("hex");
+  return Lr("sha256").update(Si(s)).digest("hex");
 }
 function os(s) {
   if (s._type !== "ScopedSequence") return;
@@ -10082,7 +10102,7 @@ function os(s) {
     type: r.type,
     path: r.path,
     base: r.type === "ref" ? r.base?.name : void 0
-  })), t = s.initializeFrom, i = Ne(s.match);
+  })), t = s.initializeFrom, i = Re(s.match);
   return {
     kind: "scoped-sequence",
     timing: "post-create-pre-commit",
@@ -10113,10 +10133,10 @@ function ca(s) {
 function cs(s, e) {
   return `computation:property:${s}.${e}:ScopedSequence`;
 }
-const ui = "_ASYNC_TASK_";
-class _t {
+const li = "_ASYNC_TASK_";
+class Bt {
   constructor(e, t, i, r, a) {
-    this.controller = e, this.computationsHandles = /* @__PURE__ */ new Map(), this.computationHandleMap = /* @__PURE__ */ new Map(), this.registeredMutationListeners = [], this.erMutationEventSources = [], this.dataSourceMapTree = {}, this.scopedSequenceScopeGuards = [], this.propagationContext = new xi(), this.sourceMapManager = new zr(this.controller, this), this.buildComputationHandleMap(a);
+    this.controller = e, this.computationsHandles = /* @__PURE__ */ new Map(), this.computationHandleMap = /* @__PURE__ */ new Map(), this.registeredMutationListeners = [], this.erMutationEventSources = [], this.dataSourceMapTree = {}, this.scopedSequenceScopeGuards = [], this.propagationContext = new Ai(), this.plainValuePropertyNamesBySource = /* @__PURE__ */ new WeakMap(), this.sourceMapManager = new zr(this.controller, this), this.buildComputationHandleMap(a);
     const n = [];
     r.forEach((o) => {
       o.computation && n.push({ dataContext: { type: "global", id: o }, args: o.computation });
@@ -10283,7 +10303,7 @@ class _t {
         const i = t.createState();
         e.push({ dataContext: t.dataContext, state: i }), t.state = i;
         for (let [r, a] of Object.entries(i))
-          if (a.controller = this.controller, a.key = this.getBoundStateName(t.dataContext, r, a), a instanceof D && !a.record)
+          if (a.controller = this.controller, a.key = this.getBoundStateName(t.dataContext, r, a), a instanceof O && !a.record)
             if (t.dataContext.type === "property")
               a.record = t.dataContext.host.name;
             else if (t.dataContext.type === "entity")
@@ -10447,10 +10467,10 @@ class _t {
   buildComputationMutationListener() {
     return this.sourceMapManager.initialize(new Set(this.computationsHandles.values())), this.dataSourceMapTree = this.sourceMapManager.getSourceMapTree(), this.buildScopedSequenceScopeGuards(), (async (e) => {
       const t = this.propagationContext.getStore(), i = (t?.depth ?? 0) + 1;
-      if (i > _t.MAX_COMPUTATION_PROPAGATION_DEPTH) {
+      if (i > Bt.MAX_COMPUTATION_PROPAGATION_DEPTH) {
         const a = (t?.trail ?? []).slice(-10).join(" -> ");
         throw new Be(
-          `Computation propagation exceeded the maximum depth of ${_t.MAX_COMPUTATION_PROPAGATION_DEPTH}. This almost always means circular computation dependencies (e.g. two Transforms deriving records from each other, or a computation whose dataDeps include its own output). Recent propagation trail: ${a}`,
+          `Computation propagation exceeded the maximum depth of ${Bt.MAX_COMPUTATION_PROPAGATION_DEPTH}. This almost always means circular computation dependencies (e.g. two Transforms deriving records from each other, or a computation whose dataDeps include its own output). Recent propagation trail: ${a}`,
           { schedulingPhase: "computation-propagation-depth-guard" }
         );
       }
@@ -10629,8 +10649,8 @@ class _t {
   getAsyncTaskRecordKey(e) {
     if (e.dataContext.type === "property") {
       const t = e.dataContext;
-      return `${ui}_${t.host.name}_${t.id.name}`;
-    } else return e.dataContext.type === "global" ? `${ui}_${e.dataContext.id.name}` : `${ui}_${e.dataContext.type}_${e.dataContext.id?.name}`;
+      return `${li}_${t.host.name}_${t.id.name}`;
+    } else return e.dataContext.type === "global" ? `${li}_${e.dataContext.id.name}` : `${li}_${e.dataContext.type}_${e.dataContext.id?.name}`;
   }
   getComputationName(e) {
     return e.args.name || e.args.constructor.displayName;
@@ -10650,54 +10670,101 @@ class _t {
     const t = e.modifier;
     return t.limit !== void 0 || t.offset !== void 0 || t.orderBy !== void 0;
   }
+  /**
+   * 从 match key 路径读取事件快照上的值。
+   * CAUTION 「键缺席」与「值为 null」必须区分（r21 F-1）：事件快照只携带写入时的字段——
+   *  computed 列、未涉及的关系属性都可能缺席但在库里有值。把缺席当 undefined 参与比较
+   *  会让本地判定与 SQL 判定分裂（`=` 误判 false → 错误 skip → 计算静默陈旧；
+   *  `!=` 误判 true → 幻影 entered → 计算多计）。
+   *  中段值为 null（快照如实携带的空关系）按 LEFT JOIN 语义解析为终端 NULL——
+   *  与 SQL 的三值逻辑照常比较。
+   */
   readMatchPath(e, t) {
-    if (!e) return;
     let i = e;
     for (const r of t.split(".")) {
-      if (i == null || typeof i != "object") return;
+      if (i === null) return { resolved: !0, value: null };
+      if (i === void 0 || typeof i != "object" || Array.isArray(i)) return { resolved: !1 };
+      if (!Object.prototype.hasOwnProperty.call(i, r)) return { resolved: !1 };
       i = i[r];
     }
-    return i;
+    return { resolved: !0, value: i === void 0 ? null : i };
   }
+  /**
+   * 本地比较必须与 SQL 谓词求值（MatchExp 编译结果 + 三值逻辑）语义一致，
+   * 不可判定时返回 undefined（上层走保守的 full recompute）。
+   * - `=`/`!=` 对 null 操作数按 IS NULL / IS NOT NULL（与 MatchExp 编译一致）；
+   *   NULL 行对非 null 操作数的任何比较都是 UNKNOWN（不匹配）。
+   * - in/not in 按 r20 编译期 null 拆分后的语义（in 含 null → IS NULL OR IN(非空集)；
+   *   not in 无论列表是否含 null，NULL 行都不匹配）。
+   * - like 的大小写敏感性因驱动而异（PG 敏感 / SQLite ASCII 不敏感）且 `_` 通配未实现——不可判定。
+   * - 对象/数组值（json 列、ref 对象、Date）无法在本地忠实模拟 SQL 比较——不可判定。
+   */
   compareMatchValue(e, t, i) {
-    switch (t.toLowerCase()) {
+    const r = typeof t == "string" ? t.toLowerCase() : t, a = (n) => typeof n == "string" || typeof n == "number" || typeof n == "boolean";
+    switch (r) {
       case "=":
       case "==":
-        return e === i;
+        return i === null ? e === null : e === null ? !1 : !a(e) || !a(i) ? void 0 : e === i;
       case "!=":
       case "<>":
-        return e !== i;
+        return i === null ? e !== null : e === null ? !1 : !a(e) || !a(i) ? void 0 : e !== i;
+      case "not":
+        return i === null ? e !== null : void 0;
+      case "is null":
+        return e === null;
+      case "is not null":
+        return e !== null;
       case ">":
-        return typeof e == "number" && typeof i == "number" ? e > i : void 0;
+        return e === null || i === null ? !1 : typeof e == "number" && typeof i == "number" ? e > i : void 0;
       case ">=":
-        return typeof e == "number" && typeof i == "number" ? e >= i : void 0;
+        return e === null || i === null ? !1 : typeof e == "number" && typeof i == "number" ? e >= i : void 0;
       case "<":
-        return typeof e == "number" && typeof i == "number" ? e < i : void 0;
+        return e === null || i === null ? !1 : typeof e == "number" && typeof i == "number" ? e < i : void 0;
       case "<=":
-        return typeof e == "number" && typeof i == "number" ? e <= i : void 0;
+        return e === null || i === null ? !1 : typeof e == "number" && typeof i == "number" ? e <= i : void 0;
       case "in":
-        return Array.isArray(i) ? i.includes(e) : void 0;
+        return Array.isArray(i) ? e === null ? i.includes(null) : a(e) ? i.includes(e) : void 0 : void 0;
       case "not in":
-        return Array.isArray(i) ? !i.includes(e) : void 0;
-      case "not":
-        return e !== i;
-      case "like":
-        return typeof e != "string" || typeof i != "string" ? void 0 : new RegExp(`^${i.split("%").map((r) => r.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join(".*")}$`).test(e);
+        return Array.isArray(i) ? e === null ? !1 : a(e) ? !i.includes(e) : void 0 : void 0;
       default:
         return;
     }
   }
-  evaluateRecordsMatch(e, t) {
+  getPlainValuePropertyNames(e) {
+    const t = this.plainValuePropertyNamesBySource.get(e);
+    if (t) return t;
+    const i = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), a = (n) => {
+      if (!n || typeof n != "object" || r.has(n)) return;
+      r.add(n);
+      const o = n;
+      for (const c of o.properties || [])
+        !c?.name || c.computed || c.computation || i.add(c.name);
+      a(o.baseEntity), a(o.baseRelation);
+      for (const c of o.inputEntities || []) a(c);
+      for (const c of o.inputRelations || []) a(c);
+    };
+    return a(e), this.plainValuePropertyNamesBySource.set(e, i), i;
+  }
+  evaluateRecordsMatch(e, t, i) {
     if (!e) return !0;
     if (!t) return;
-    const i = e, r = i.raw || i;
-    if (r.type === "atom") {
-      const a = r.data;
-      return !a || typeof a.key != "string" || !Array.isArray(a.value) ? void 0 : this.compareMatchValue(this.readMatchPath(t, a.key), a.value[0], a.value[1]);
+    const r = e, a = r.raw || r;
+    if (a.type === "atom") {
+      const n = a.data;
+      if (!n || typeof n.key != "string" || !Array.isArray(n.value) || n.isReferenceValue) return;
+      const o = this.readMatchPath(t, n.key);
+      let c;
+      if (o.resolved)
+        c = o.value;
+      else if (!n.key.includes(".") && i.has(n.key))
+        c = null;
+      else
+        return;
+      return this.compareMatchValue(c, n.value[0], n.value[1]);
     }
-    if (r.type === "expression") {
-      const a = this.evaluateRecordsMatch(r.left, t), n = r.right ? this.evaluateRecordsMatch(r.right, t) : void 0;
-      return r.operator === "and" ? a === void 0 || n === void 0 ? void 0 : a && n : r.operator === "or" ? a === void 0 || n === void 0 ? void 0 : a || n : r.operator === "not" ? a === void 0 ? void 0 : !a : void 0;
+    if (a.type === "expression") {
+      const n = this.evaluateRecordsMatch(a.left, t, i), o = a.right ? this.evaluateRecordsMatch(a.right, t, i) : void 0;
+      return a.operator === "and" ? n === !1 || o === !1 ? !1 : n === void 0 || o === void 0 ? void 0 : !0 : a.operator === "or" ? n === !0 || o === !0 ? !0 : n === void 0 || o === void 0 ? void 0 : !1 : a.operator === "not" ? n === void 0 ? void 0 : !n : void 0;
     }
   }
   buildMatchEventContext(e, t) {
@@ -10708,21 +10775,21 @@ class _t {
         requiresFullRecompute: !0,
         reason: "records match over related path requires full recompute"
       };
-    const i = t.oldRecord, r = t.type === "update" ? { ...t.oldRecord || {}, ...t.record || {} } : t.record, a = t.type === "create" ? !1 : this.evaluateRecordsMatch(e.match, i), n = t.type === "delete" ? !1 : this.evaluateRecordsMatch(e.match, r);
-    return a === void 0 || n === void 0 ? {
+    const i = this.getPlainValuePropertyNames(e.source), r = t.oldRecord, a = t.type === "update" ? { ...t.oldRecord || {}, ...t.record || {} } : t.record, n = t.type === "create" ? !1 : this.evaluateRecordsMatch(e.match, r, i), o = t.type === "delete" ? !1 : this.evaluateRecordsMatch(e.match, a, i);
+    return n === void 0 || o === void 0 ? {
       membershipChange: "unknown",
       requiresFullRecompute: !0,
       reason: "records match membership could not be evaluated locally"
-    } : !a && !n ? {
+    } : !n && !o ? {
       membershipChange: "none",
       requiresFullRecompute: !1,
       skip: !0,
       reason: "records match excludes mutation event"
-    } : !a && n ? {
+    } : !n && o ? {
       membershipChange: "entered",
       requiresFullRecompute: t.type === "update",
       reason: t.type === "update" ? "records match membership entered on update" : void 0
-    } : a && !n ? {
+    } : n && !o ? {
       membershipChange: "left",
       requiresFullRecompute: t.type === "update",
       reason: t.type === "update" ? "records match membership left on update" : void 0
@@ -10761,7 +10828,7 @@ class _t {
       try {
         return await this.controller.retrieveLastValue(e.dataContext, t);
       } catch (n) {
-        throw new oi("Failed to retrieve planned last value for incremental computation", {
+        throw new ci("Failed to retrieve planned last value for incremental computation", {
           handleName: e.constructor.name,
           computationName: e.args.constructor.displayName,
           dataContext: e.dataContext,
@@ -10883,7 +10950,7 @@ class _t {
       throw new Error(`Async computation for ${e.dataContext.type} is not implemented yet`);
   }
   async handleAsyncReturn(e, t) {
-    return Oi(`asyncReturn:${this.getAsyncTaskRecordKey(e)}`, async (i) => this.controller.system.storage.runInTransaction({ name: `asyncReturn:${this.getAsyncTaskRecordKey(e)}`, isolation: i }, async () => {
+    return Li(`asyncReturn:${this.getAsyncTaskRecordKey(e)}`, async (i) => this.controller.system.storage.runInTransaction({ name: `asyncReturn:${this.getAsyncTaskRecordKey(e)}`, isolation: i }, async () => {
       const r = this.getAsyncTaskRecordKey(e), a = e.dataContext.type === "property" ? ["*", ["record", { attributeQuery: ["id"] }]] : ["*"], n = await this.controller.system.storage.findOne(
         r,
         E.atom({ key: "id", value: ["=", t.id] }),
@@ -10959,7 +11026,7 @@ class _t {
             try {
               c = await this.controller.retrieveLastValue(e.dataContext, i);
             } catch (u) {
-              throw new oi("Failed to retrieve last value for incremental computation", {
+              throw new ci("Failed to retrieve last value for incremental computation", {
                 handleName: e.constructor.name,
                 computationName: e.args.constructor.displayName,
                 dataContext: e.dataContext,
@@ -10973,7 +11040,7 @@ class _t {
             try {
               c = await this.controller.retrieveLastValue(e.dataContext, i);
             } catch (u) {
-              throw new oi("Failed to retrieve last value for incremental patch computation", {
+              throw new ci("Failed to retrieve last value for incremental patch computation", {
                 handleName: e.constructor.name,
                 computationName: e.args.constructor.displayName,
                 dataContext: e.dataContext,
@@ -10999,7 +11066,7 @@ class _t {
       }
       if (a instanceof Oe)
         return;
-      if (a instanceof mt)
+      if (a instanceof ft)
         try {
           return await this.createAsyncTask(e, a.args, i);
         } catch (c) {
@@ -11012,7 +11079,7 @@ class _t {
           });
         }
       try {
-        const c = a instanceof Jt ? await e.asyncReturn(a.result, a.args) : a;
+        const c = a instanceof Xt ? await e.asyncReturn(a.result, a.args) : a;
         if (n === "patch") {
           if (this.requiresSerializablePatchApply(e) && this.controller.system.storage.getTransactionIsolation() !== "SERIALIZABLE")
             throw new de(`entity/relation patch from custom computation ${this.getComputationName(e)}`);
@@ -11131,37 +11198,37 @@ class _t {
     }
   }
 }
-const Li = new Or();
+const Vi = new Or();
 function us() {
-  return Li.getStore()?.effects;
+  return Vi.getStore()?.effects;
 }
 function Er(s) {
-  const e = Li.getStore();
+  const e = Vi.getStore();
   e?.effects && e.effects.push(...s);
 }
-const ls = new Or(), Vi = "_MigrationManifest_", _i = "current", It = "3", Zt = "_isDeleted_";
+const ls = new Or(), _i = "_MigrationManifest_", Bi = "current", Pt = "3", ei = "_isDeleted_";
 class C extends Error {
   constructor(e, t) {
     super(e), this.details = t, this.name = new.target.name;
   }
 }
-class Pt extends C {
+class Mt extends C {
 }
 class Qo extends C {
 }
-class tt extends C {
+class it extends C {
 }
-class Bi extends C {
+class Ui extends C {
 }
 class he extends C {
 }
 class ua extends C {
 }
-function Re(s) {
-  return Fr("sha256").update(fe(s)).digest("hex");
+function Ne(s) {
+  return Lr("sha256").update(fe(s)).digest("hex");
 }
 function ds(s) {
-  return Re(s);
+  return Ne(s);
 }
 function fe(s) {
   if (s === null || typeof s != "object")
@@ -11182,12 +11249,12 @@ function xe(s, e, t) {
     uuid: t
   };
 }
-function Si(s) {
+function Ei(s) {
   if (s === null || typeof s != "object") return s;
-  if (Array.isArray(s)) return s.map((i) => Si(i));
+  if (Array.isArray(s)) return s.map((i) => Ei(i));
   const e = s, t = {};
   for (const i of Object.keys(e))
-    i === "uuid" && "kind" in e && "namePath" in e && "key" in e || (t[i] = Si(e[i]));
+    i === "uuid" && "kind" in e && "namePath" in e && "key" in e || (t[i] = Ei(e[i]));
   return t;
 }
 function hs(s) {
@@ -11199,21 +11266,21 @@ function hs(s) {
     e.set(i, t);
   }
 }
-function F(s) {
+function L(s) {
   return s.type === "property" ? `property:${s.host.name}.${s.id.name}` : `${s.type}:${s.id.name}`;
 }
 function la(s) {
   const e = s.constructor?.computationType?.displayName || s.args._type || s.args.constructor?.displayName || s.constructor?.displayName;
   if (!e) {
-    const t = s.dataContext ? ` for ${F(s.dataContext)}` : "";
+    const t = s.dataContext ? ` for ${L(s.dataContext)}` : "";
     throw new ua(
       `Cannot derive a stable migration identity${t}: the computation type must declare an explicit name. Set a static 'displayName' on the computation type (or handle class), or an '_type' string on the computation args. Class names are not accepted because minified builds rewrite them.`
     );
   }
   return e;
 }
-function ft(s) {
-  return `computation:${F(s.dataContext)}:${la(s)}`;
+function yt(s) {
+  return `computation:${L(s.dataContext)}:${la(s)}`;
 }
 function ps(s) {
   if (s.allocation?.kind !== "scoped-sequence" || !s.allocation.initializeFrom) return;
@@ -11293,7 +11360,7 @@ function gs(s) {
 }
 function bs(s) {
   return Object.values(s.state || {}).map((e) => {
-    const t = "record" in e, i = e.defaultValue, r = typeof i == "function" ? `[Function:${Re(String(i))}]` : fe(i);
+    const t = "record" in e, i = e.defaultValue, r = typeof i == "function" ? `[Function:${Ne(String(i))}]` : fe(i);
     return {
       key: e.key,
       scope: t ? "record" : "global",
@@ -11303,23 +11370,23 @@ function bs(s) {
     };
   });
 }
-const Ui = ["Entity", "Relation", "Property", "Dictionary"], ha = {
+const Qi = ["Entity", "Relation", "Property", "Dictionary"], ha = {
   StateNode: ["computeValue"],
   StateTransfer: ["computeTarget"]
 };
-function Ei(s, e = /* @__PURE__ */ new WeakSet(), t = !0) {
+function $i(s, e = /* @__PURE__ */ new WeakSet(), t = !0) {
   if (typeof s == "function") return !0;
   if (s === null || typeof s != "object" || e.has(s)) return !1;
   e.add(s);
   const i = s;
   if (!t && typeof i._type == "string") {
-    if (Ui.includes(i._type)) return !1;
+    if (Qi.includes(i._type)) return !1;
     const r = ha[i._type];
     if (r) return r.some((a) => typeof i[a] == "function");
   }
-  return Array.isArray(s) ? s.some((r) => Ei(r, e, !1)) : Object.values(i).some((r) => Ei(r, e, !1));
+  return Array.isArray(s) ? s.some((r) => $i(r, e, !1)) : Object.values(i).some((r) => $i(r, e, !1));
 }
-function $i(s, e = "args", t = /* @__PURE__ */ new WeakSet()) {
+function ki(s, e = "args", t = /* @__PURE__ */ new WeakSet()) {
   if (typeof s == "function")
     return [{ path: e, text: s.toString() }];
   if (s === null || typeof s != "object") return [];
@@ -11327,19 +11394,19 @@ function $i(s, e = "args", t = /* @__PURE__ */ new WeakSet()) {
   t.add(s);
   const i = s;
   if (typeof i._type == "string") {
-    if (Ui.includes(i._type)) return [];
+    if (Qi.includes(i._type)) return [];
     const r = ha[i._type];
     if (r)
       return r.filter((a) => typeof i[a] == "function").map((a) => ({ path: `${e}.${a}`, text: i[a].toString() }));
   }
-  return Array.isArray(s) ? s.flatMap((r, a) => $i(r, `${e}[${a}]`, t)) : Object.keys(i).sort().flatMap((r) => $i(i[r], `${e}.${r}`, t));
+  return Array.isArray(s) ? s.flatMap((r, a) => ki(r, `${e}[${a}]`, t)) : Object.keys(i).sort().flatMap((r) => ki(i[r], `${e}.${r}`, t));
 }
 function ws(s, e = !1) {
-  const t = $i(s);
-  if (!(!t.length && !Ei(s)))
+  const t = ki(s);
+  if (!(!t.length && !$i(s)))
     return {
       hasFunction: t.length > 0,
-      hash: Re(t.map((i) => ({ path: i.path, text: i.text }))),
+      hash: Ne(t.map((i) => ({ path: i.path, text: i.text }))),
       text: e ? t.map((i) => `// ${i.path}
 ${i.text}`).join(`
 
@@ -11347,25 +11414,25 @@ ${i.text}`).join(`
       callbackPaths: t.map((i) => i.path)
     };
 }
-const Rs = /* @__PURE__ */ new Set(["uuid", "_type", "_options"]);
-function ki(s, e = /* @__PURE__ */ new WeakSet()) {
+const Ns = /* @__PURE__ */ new Set(["uuid", "_type", "_options"]);
+function Ti(s, e = /* @__PURE__ */ new WeakSet()) {
   if (typeof s == "function") return "[Function]";
   if (s === null || typeof s != "object") return s;
   if (e.has(s)) return "[Circular]";
-  if (e.add(s), Array.isArray(s)) return s.map((r) => ki(r, e));
+  if (e.add(s), Array.isArray(s)) return s.map((r) => Ti(r, e));
   const t = s;
-  if (typeof t._type == "string" && Ui.includes(t._type))
+  if (typeof t._type == "string" && Qi.includes(t._type))
     return `[${t._type}:${t.name ?? ""}]`;
   const i = {};
   for (const r of Object.keys(t).sort())
-    Rs.has(r) || (i[r] = ki(t[r], e));
+    Ns.has(r) || (i[r] = Ti(t[r], e));
   return i;
 }
-function Ns(s) {
-  return Re(ki(s));
+function Rs(s) {
+  return Ne(Ti(s));
 }
 function vs(s, e = !1) {
-  const t = s.args, i = ys(s), r = gs(s), a = bs(s), n = a.map((S) => S.key), o = ft(s), c = F(s.dataContext), u = s.dataContext.type === "entity" || s.dataContext.type === "relation" ? s.dataContext.id.name : void 0, l = la(s), d = xe("computation", o, s.args.uuid), h = ws(t, e), m = Ns(t), { allocation: f, scopeSignature: p, allocationSignature: y } = ca(t), b = Re({
+  const t = s.args, i = ys(s), r = gs(s), a = bs(s), n = a.map((S) => S.key), o = yt(s), c = L(s.dataContext), u = s.dataContext.type === "entity" || s.dataContext.type === "relation" ? s.dataContext.id.name : void 0, l = la(s), d = xe("computation", o, s.args.uuid), h = ws(t, e), m = Rs(t), { allocation: f, scopeSignature: p, allocationSignature: y } = ca(t), b = Ne({
     type: l,
     dataContext: c,
     dataDeps: i,
@@ -11374,7 +11441,7 @@ function vs(s, e = !1) {
     hasCompute: typeof s.compute == "function",
     hasIncrementalCompute: typeof s.incrementalCompute == "function",
     hasIncrementalPatchCompute: typeof s.incrementalPatchCompute == "function"
-  }), g = Re({ stateKeys: n, boundStates: a }), w = Re({
+  }), g = Ne({ stateKeys: n, boundStates: a }), w = Ne({
     type: l,
     dataContext: c,
     outputRecord: u,
@@ -11390,7 +11457,7 @@ function vs(s, e = !1) {
     hasCompute: typeof s.compute == "function",
     hasIncrementalCompute: typeof s.incrementalCompute == "function",
     hasIncrementalPatchCompute: typeof s.incrementalPatchCompute == "function"
-  }), N = Re({ structuralSignature: w, stateSignature: g, functionHash: h?.hash, allocationSignature: y });
+  }), R = Ne({ structuralSignature: w, stateSignature: g, functionHash: h?.hash, allocationSignature: y });
   return {
     id: o,
     identity: d,
@@ -11419,10 +11486,10 @@ function vs(s, e = !1) {
     allocation: f,
     allocationSignature: y,
     scopeSignature: p,
-    signature: N
+    signature: R
   };
 }
-function St(s, e = s.system.storage.schema, t = {}) {
+function Et(s, e = s.system.storage.schema, t = {}) {
   const i = [
     ...s.entities.map((l) => {
       const d = xe("entity", `entity:${l.name}`, l.uuid);
@@ -11498,11 +11565,11 @@ function St(s, e = s.system.storage.schema, t = {}) {
       ...l.functionSignature,
       text: void 0
     } : void 0
-  })), u = Si({ records: i, relations: r, dictionaries: a, computations: c, sequences: o, storage: e });
+  })), u = Ei({ records: i, relations: r, dictionaries: a, computations: c, sequences: o, storage: e });
   return {
     version: 2,
-    frameworkVersion: It,
-    modelHash: Re(u),
+    frameworkVersion: Pt,
+    modelHash: Ne(u),
     records: i,
     relations: r,
     dictionaries: a,
@@ -11519,10 +11586,10 @@ function jo(s, e) {
   });
 }
 function $r(s) {
-  if (s.frameworkVersion !== It)
-    throw new Pt(
-      `Migration manifest was written by an incompatible interaqt manifest generator (found '${s.frameworkVersion}', expected '${It}'). Verify that the current definitions match the existing schema, then re-baseline with controller.createMigrationBaseline().`,
-      { foundGeneratorVersion: s.frameworkVersion, expectedGeneratorVersion: It }
+  if (s.frameworkVersion !== Pt)
+    throw new Mt(
+      `Migration manifest was written by an incompatible interaqt manifest generator (found '${s.frameworkVersion}', expected '${Pt}'). Verify that the current definitions match the existing schema, then re-baseline with controller.createMigrationBaseline().`,
+      { foundGeneratorVersion: s.frameworkVersion, expectedGeneratorVersion: Pt }
     );
 }
 function re(s) {
@@ -11540,27 +11607,27 @@ function Ss(s) {
   const e = s.kind === "destructive-scope" && s.recordName || "";
   return s.kind === "empty-fact-record-removal" ? `${s.kind}:${s.recordName}` : `${s.kind}:${s.dataContext}:${e}`;
 }
-function Qi(s) {
+function ji(s) {
   return s.kind === "computation" ? `computation:${s.id}` : s.kind === "computation-takeover" ? `computation-takeover:${s.dataContext}` : s.kind === "empty-fact-record-removal" ? `empty-fact-record-removal:${s.recordName}` : s.kind === "dictionary" ? `dictionary:${s.id}` : s.kind === "record" ? `record:${s.id}` : s.kind === "property" ? `property:${s.id}` : s.kind === "relation" ? `relation:${s.id}` : `storage:${s.dataContext}`;
 }
 function Xe(s, e) {
   return (s?.decisions || []).some(e);
 }
-function Bt(s, e) {
+function Ut(s, e) {
   return (s?.decisions || []).find(e);
 }
 function pa(s, e) {
   return e ? s?.[e] : void 0;
 }
-function Mt(s, e) {
-  const t = Bt(s?.approvedDiff, (i) => i.kind === "event-rebuild-handler" && i.dataContext === e);
+function qt(s, e) {
+  const t = Ut(s?.approvedDiff, (i) => i.kind === "event-rebuild-handler" && i.dataContext === e);
   return pa(s?.handlers?.eventRebuild, t?.handlerRef);
 }
 function ma(s, e) {
-  const t = Bt(s?.approvedDiff, (i) => i.kind === "async-completion-handler" && i.dataContext === e);
+  const t = Ut(s?.approvedDiff, (i) => i.kind === "async-completion-handler" && i.dataContext === e);
   return pa(s?.handlers?.asyncCompletion, t?.handlerRef);
 }
-function ji(s, e) {
+function Hi(s, e) {
   return s?.decisions.find(
     (t) => t.kind === "computation-takeover" && t.dataContext === e
   );
@@ -11612,7 +11679,7 @@ function $s(s) {
   return s.kind === "unsupported-destructive-schema-change" && s.reason === "fact record was removed from the new schema" && s.oldPhysicalPath !== void 0;
 }
 async function ks(s, e, t, i) {
-  const r = /* @__PURE__ */ new Set(), a = new Map(e.changes.map((o) => [Qi(o), o])), n = new Map(e.requiredDecisions.map((o) => [re(o), o]));
+  const r = /* @__PURE__ */ new Set(), a = new Map(e.changes.map((o) => [ji(o), o])), n = new Map(e.requiredDecisions.map((o) => [re(o), o]));
   for (const o of e.safety.blockingChanges) {
     if (!$s(o)) continue;
     const c = o.logicalPath;
@@ -11653,14 +11720,14 @@ async function Ts(s, e, t, i, r) {
       (h) => h.kind === "computation" && h.id === o.id && h.recommendedDecision === "unrebuildable"
     )) continue;
     const u = i.computations.find((h) => h.id === o.id), l = u ? ms(u) : void 0;
-    !l || (await Ut(s, t, l.hostRecord, ["id"], r)).length !== 0 || (a.set(re(l), l), n = !0);
+    !l || (await Qt(s, t, l.hostRecord, ["id"], r)).length !== 0 || (a.set(re(l), l), n = !0);
   }
   return n && (e.requiredDecisions = Array.from(a.values()), e.summary = {
     ...e.summary,
     requiredDecisionCount: e.requiredDecisions.length
   }), e;
 }
-async function Ra(s, e, t) {
+async function Na(s, e, t) {
   const i = (e?.decisions || []).filter((a) => a.kind === "empty-fact-record-removal"), r = /* @__PURE__ */ new Set();
   for (const a of i) {
     if (a.expectedCount !== 0)
@@ -11679,12 +11746,12 @@ async function Cs(s, e, t, i) {
   for (const a of r) {
     if (a.expectedHostCount !== 0)
       throw new C(`Invalid scoped sequence no-seed expectedHostCount for ${a.dataContext}`);
-    if ((await Ut(s, t, a.hostRecord, ["id"], i)).length !== 0)
+    if ((await Qt(s, t, a.hostRecord, ["id"], i)).length !== 0)
       throw new C(`ScopedSequence ${a.sequenceName} no-seed decision requires empty host record ${a.hostRecord}`);
   }
 }
 async function xs(s, e, t) {
-  await Ra(s, e, t);
+  await Na(s, e, t);
 }
 function As(s, e) {
   return s.storage.records.filter((t) => e.has(t.recordName)).map((t) => ({
@@ -11704,9 +11771,9 @@ function kr(s, e) {
   if (!t) return;
   const i = s.system.storage.db || s.system.db;
   if (i)
-    return new gi(new qe(t.map, t.aliasManager), i);
+    return new bi(new qe(t.map, t.aliasManager), i);
 }
-async function Ut(s, e, t, i, r) {
+async function Qt(s, e, t, i, r) {
   if (r)
     return r.find(t, void 0, void 0, i);
   if (s.system.storage.queryHandle)
@@ -11715,27 +11782,27 @@ async function Ut(s, e, t, i, r) {
     throw new C(`Cannot read migration takeover scope for ${t} before storage query handle is initialized`);
   return [];
 }
-async function Na(s, e, t, i) {
+async function Ra(s, e, t, i) {
   if (e.startsWith("property:")) {
     const n = e.match(/^property:([^.]*)\.([^.]*)$/);
     if (!n) throw new C(`Invalid property data context for computation takeover: ${e}`);
-    const [, o, c] = n, u = await Ut(s, t, o, ["id", c], i);
+    const [, o, c] = n, u = await Qt(s, t, o, ["id", c], i);
     return {
       expectedExistingCount: u.filter((l) => l[c] !== void 0 && l[c] !== null).length,
       expectedHostCount: u.length
     };
   }
-  const [, r] = e.split(":"), a = await Ut(s, t, r, ["id"], i);
+  const [, r] = e.split(":"), a = await Qt(s, t, r, ["id"], i);
   return {
     expectedExistingCount: a.length,
     ids: a.map((n) => String(n.id)).sort()
   };
 }
 async function Is(s, e, t, i, r) {
-  const a = new Map(e.changes.map((c) => [Qi(c), c])), n = new Map(e.requiredDecisions.map((c) => [re(c), c])), o = new Map(e.safety.destructiveScopes.map((c) => [`${c.dataContext}:${c.recordName || ""}`, c]));
+  const a = new Map(e.changes.map((c) => [ji(c), c])), n = new Map(e.requiredDecisions.map((c) => [re(c), c])), o = new Map(e.safety.destructiveScopes.map((c) => [`${c.dataContext}:${c.recordName || ""}`, c]));
   for (const c of i.computations) {
     if (!fa(t, i, c)) continue;
-    const u = ya(c.dataContext), l = await Na(s, c.dataContext, t, r), d = {
+    const u = ya(c.dataContext), l = await Ra(s, c.dataContext, t, r), d = {
       kind: "computation-takeover",
       dataContext: c.dataContext,
       computationId: c.id,
@@ -11830,8 +11897,8 @@ function Ps(s, e, t, i) {
         reason: "property no longer exists in the new model"
       });
     for (const w of p.properties) {
-      const N = b.get(w.id);
-      N ? (N.name !== w.name || N.type !== w.type || N.collection !== w.collection || N.computed !== w.computed) && r.push({
+      const R = b.get(w.id);
+      R ? (R.name !== w.name || R.type !== w.type || R.collection !== w.collection || R.computed !== w.computed) && r.push({
         kind: "property",
         id: w.id,
         changeType: "changed",
@@ -11902,8 +11969,8 @@ function Ps(s, e, t, i) {
     });
   for (const p of e.computations) {
     const y = n.get(p.id), b = {
-      dataDepsChanged: y ? !it(y.deps, p.deps) : !0,
-      eventDepsChanged: y ? !it(y.eventDeps, p.eventDeps) : !0,
+      dataDepsChanged: y ? !rt(y.deps, p.deps) : !0,
+      eventDepsChanged: y ? !rt(y.eventDeps, p.eventDeps) : !0,
       outputSignatureChanged: y ? y.outputSignature !== p.outputSignature : !0,
       stateSignatureChanged: y ? y.stateSignature !== p.stateSignature : !0,
       allocationSignatureChanged: y ? y.allocationSignature !== p.allocationSignature : p.allocationSignature !== void 0,
@@ -11917,8 +11984,8 @@ function Ps(s, e, t, i) {
       needsEventRebuildHandler: p.eventDeps.length > 0,
       needsAsyncCompletionHandler: p.asyncReturn
     };
-    let g = "unchanged", w = "ignore", N = "unchanged", S = "computation is structurally unchanged";
-    if (y ? y.allocationSignature !== p.allocationSignature ? (g = "changed", w = "needs-review", N = "unrebuildable", S = "scoped allocation args changed") : y.structuralSignature !== p.structuralSignature ? (g = "changed", w = "needs-review", N = "changed", S = "computation structure changed") : y.stateSignature !== p.stateSignature && y.outputSignature === p.outputSignature ? (g = "state-only", w = "needs-review", N = "state-only", S = "computation state changed without output structure changes") : y.functionSignature?.hash !== p.functionSignature?.hash ? (g = "possibly-changed", w = "needs-review", N = "changed", S = "function text changed and requires human semantic review") : p.functionSignature?.hasFunction && (w = "needs-review", S = "function callback has closure risk and requires human review") : (g = "added", w = p.allocation?.kind === "scoped-sequence" ? "needs-review" : "rebuild", N = p.allocation?.kind === "scoped-sequence" ? "unrebuildable" : "changed", S = p.allocation?.kind === "scoped-sequence" ? "new scoped allocation computation requires approved sequence initialization" : "new computation requires approved rebuild"), r.push({
+    let g = "unchanged", w = "ignore", R = "unchanged", S = "computation is structurally unchanged";
+    if (y ? y.allocationSignature !== p.allocationSignature ? (g = "changed", w = "needs-review", R = "unrebuildable", S = "scoped allocation args changed") : y.structuralSignature !== p.structuralSignature ? (g = "changed", w = "needs-review", R = "changed", S = "computation structure changed") : y.stateSignature !== p.stateSignature && y.outputSignature === p.outputSignature ? (g = "state-only", w = "needs-review", R = "state-only", S = "computation state changed without output structure changes") : y.functionSignature?.hash !== p.functionSignature?.hash ? (g = "possibly-changed", w = "needs-review", R = "changed", S = "function text changed and requires human semantic review") : p.functionSignature?.hasFunction && (w = "needs-review", S = "function callback has closure risk and requires human review") : (g = "added", w = p.allocation?.kind === "scoped-sequence" ? "needs-review" : "rebuild", R = p.allocation?.kind === "scoped-sequence" ? "unrebuildable" : "changed", S = p.allocation?.kind === "scoped-sequence" ? "new scoped allocation computation requires approved sequence initialization" : "new computation requires approved rebuild"), r.push({
       kind: "computation",
       id: p.id,
       dataContext: p.dataContext,
@@ -11932,14 +11999,14 @@ function Ps(s, e, t, i) {
         kind: "computation",
         id: p.id,
         dataContext: p.dataContext,
-        recommendedDecision: N,
+        recommendedDecision: R,
         reason: S
       });
-      const R = ps(p);
-      R && a.push(R);
+      const N = ps(p);
+      N && a.push(N);
     }
   }
-  for (const p of Wi(s, e))
+  for (const p of zi(s, e))
     p.changeType === "predicate-changed" && r.push({
       kind: "storage",
       id: `filtered-predicate:${p.recordName}`,
@@ -11992,7 +12059,7 @@ function Ps(s, e, t, i) {
   };
 }
 function Ms(s, e, t) {
-  const i = Hi(e), r = new Map(s.requiredDecisions.map((a) => [re(a), a]));
+  const i = Ki(e), r = new Map(s.requiredDecisions.map((a) => [re(a), a]));
   for (const a of t) {
     if (!a.rebuildOutput) continue;
     const n = i.get(a.computationId);
@@ -12032,7 +12099,7 @@ function qs(s, e, t, i, r) {
   const a = r || s, n = new Set(s.requiredDecisions.map(re)), o = /* @__PURE__ */ new Set([
     ...a.requiredDecisions.map(re),
     ...n
-  ]), c = new Set(a.changes.map(Qi)), u = /* @__PURE__ */ new Set();
+  ]), c = new Set(a.changes.map(ji)), u = /* @__PURE__ */ new Set();
   for (const d of s.decisions) {
     const h = Ss(d);
     if (u.has(h))
@@ -12164,7 +12231,7 @@ function Os(s) {
     reason: e.reason
   }));
 }
-function Fs(s) {
+function Ls(s) {
   return s.decisions.filter((e) => e.kind === "scoped-sequence-no-seed").map((e) => ({
     id: e.id,
     dataContext: e.dataContext,
@@ -12176,13 +12243,13 @@ function Fs(s) {
     reason: e.reason
   }));
 }
-function Hi(s) {
-  return new Map(Array.from(s.scheduler.computationsHandles.values()).map((e) => [ft(e), e]));
+function Ki(s) {
+  return new Map(Array.from(s.scheduler.computationsHandles.values()).map((e) => [yt(e), e]));
 }
-function Et(s) {
+function $t(s) {
   return s.dataContext;
 }
-function Ls(s, e, t) {
+function Fs(s, e, t) {
   return s.relations.find(
     (i) => i.source === e && i.sourceProperty === t || i.target === e && i.targetProperty === t
   );
@@ -12201,21 +12268,21 @@ function va(s, e) {
   }
   return t;
 }
-function Qt(s, e) {
+function jt(s, e) {
   return va(s, e).map((t) => Vs(s, t));
 }
 function _s(s, e, t) {
   return va(s, e).flatMap((i) => {
     const r = s.records.find((n) => n.name === i);
-    return [...t.includes("*") ? (r?.properties || []).map((n) => `property:${i}.${n.name}`) : t.filter((n) => typeof n == "string" && n !== "*" && n !== "id").map((n) => `property:${i}.${n}`), ...Ki(s, i, t)];
+    return [...t.includes("*") ? (r?.properties || []).map((n) => `property:${i}.${n.name}`) : t.filter((n) => typeof n == "string" && n !== "*" && n !== "id").map((n) => `property:${i}.${n}`), ...Wi(s, i, t)];
   });
 }
-function Ki(s, e, t) {
+function Wi(s, e, t) {
   return t.flatMap((i) => {
     if (!Array.isArray(i) || typeof i[0] != "string") return [];
-    const r = Ls(s, e, i[0]);
+    const r = Fs(s, e, i[0]);
     if (!r) return [];
-    const a = r.source === e ? r.target : r.source, n = i[1], c = (Array.isArray(n?.attributeQuery) ? n.attributeQuery : []).flatMap((u) => typeof u == "string" && u !== "*" && u !== v ? [`property:${a}.${u}`] : Array.isArray(u) && u[0] === v ? [`relation:${r.name}`] : Array.isArray(u) ? Ki(s, a, [u]) : []);
+    const a = r.source === e ? r.target : r.source, n = i[1], c = (Array.isArray(n?.attributeQuery) ? n.attributeQuery : []).flatMap((u) => typeof u == "string" && u !== "*" && u !== v ? [`property:${a}.${u}`] : Array.isArray(u) && u[0] === v ? [`relation:${r.name}`] : Array.isArray(u) ? Wi(s, a, [u]) : []);
     return [`relation:${r.name}`, ...c];
   });
 }
@@ -12224,20 +12291,20 @@ function Tr(s, e, t) {
   if (s.type === "records" && s.source) {
     const i = Array.isArray(s.attributeQuery) ? s.attributeQuery : [];
     return [
-      ...Qt(t, s.source),
+      ...jt(t, s.source),
       ..._s(t, s.source, i)
     ];
   }
   if (s.type === "property") {
     const i = e.dataContext.match(/^property:([^.]*)\./);
     if (!i) return [];
-    const r = i[1], a = Array.isArray(s.attributeQuery) ? s.attributeQuery : [], n = Ki(t, r, a), c = [...a.filter((u) => typeof u == "string" && u !== "*").map((u) => `property:${r}.${u}`), ...n];
-    return c.length ? c : Qt(t, r);
+    const r = i[1], a = Array.isArray(s.attributeQuery) ? s.attributeQuery : [], n = Wi(t, r, a), c = [...a.filter((u) => typeof u == "string" && u !== "*").map((u) => `property:${r}.${u}`), ...n];
+    return c.length ? c : jt(t, r);
   }
   return [];
 }
 function Cr(s, e) {
-  const t = Qt(e, s.recordName);
+  const t = jt(e, s.recordName);
   if (s.type === "update") {
     const i = e.records.find((r) => r.name === s.recordName);
     t.push(...(i?.properties || []).map((r) => `property:${s.recordName}.${r.name}`));
@@ -12245,72 +12312,72 @@ function Cr(s, e) {
   return t;
 }
 function xr(s, e, t, i = [], r = {}) {
-  const a = new Map(e.computations.map((g) => [Et(g), g])), n = new Map(s.computations.map((g) => [g.id, g])), o = /* @__PURE__ */ new Map();
+  const a = new Map(e.computations.map((g) => [$t(g), g])), n = new Map(s.computations.map((g) => [g.id, g])), o = /* @__PURE__ */ new Map();
   for (const g of e.computations) {
     for (const w of g.deps)
-      for (const N of Tr(w, g, e))
-        o.has(N) || o.set(N, /* @__PURE__ */ new Set()), o.get(N).add(g.id);
+      for (const R of Tr(w, g, e))
+        o.has(R) || o.set(R, /* @__PURE__ */ new Set()), o.get(R).add(g.id);
     for (const w of g.eventDeps)
-      for (const N of Cr(w, e))
-        N !== g.dataContext && (o.has(N) || o.set(N, /* @__PURE__ */ new Set()), o.get(N).add(g.id));
+      for (const R of Cr(w, e))
+        R !== g.dataContext && (o.has(R) || o.set(R, /* @__PURE__ */ new Set()), o.get(R).add(g.id));
   }
   const c = (g) => {
     const w = g.match(/^property:([^.]*)\._isDeleted_$/);
-    return w ? Qt(e, w[1]) : [];
+    return w ? jt(e, w[1]) : [];
   }, u = /* @__PURE__ */ new Map();
   for (const g of e.computations)
     for (const w of c(g.dataContext))
       u.set(w, g);
   const l = (g) => {
-    const w = [], N = a.get(g);
-    N && w.push(N);
+    const w = [], R = a.get(g);
+    R && w.push(R);
     const S = u.get(g);
-    return S && S !== N && w.push(S), w;
+    return S && S !== R && w.push(S), w;
   }, d = new Set(t.map((g) => g.id)), m = [...t.filter((g) => {
     const w = n.get(g.id);
     return r.outputChangedIds?.has(g.id) || !w || w.outputSignature !== g.outputSignature;
-  }).flatMap((g) => [Et(g), ...c(Et(g))]), ...i];
+  }).flatMap((g) => [$t(g), ...c($t(g))]), ...i];
   for (; m.length; ) {
     const g = m.shift();
     for (const w of o.get(g) || []) {
       if (d.has(w)) continue;
       d.add(w);
-      const N = e.computations.find((S) => S.id === w);
-      N && m.push(Et(N));
+      const R = e.computations.find((S) => S.id === w);
+      R && m.push($t(R));
     }
   }
   const f = /* @__PURE__ */ new Set(), p = /* @__PURE__ */ new Set(), y = [], b = (g) => {
     if (p.has(g)) return;
     if (f.has(g))
-      throw new tt(`Migration detected a derived computation cycle at ${g}`);
+      throw new it(`Migration detected a derived computation cycle at ${g}`);
     f.add(g);
-    const w = e.computations.find((N) => N.id === g);
+    const w = e.computations.find((R) => R.id === g);
     if (w) {
-      for (const N of w.deps)
-        for (const S of Tr(N, w, e))
-          for (const R of l(S))
-            R.id !== g && d.has(R.id) && b(R.id);
-      for (const N of w.eventDeps)
-        for (const S of Cr(N, e))
+      for (const R of w.deps)
+        for (const S of Tr(R, w, e))
+          for (const N of l(S))
+            N.id !== g && d.has(N.id) && b(N.id);
+      for (const R of w.eventDeps)
+        for (const S of Cr(R, e))
           if (S !== w.dataContext)
-            for (const R of l(S))
-              R.id !== g && d.has(R.id) && b(R.id);
+            for (const N of l(S))
+              N.id !== g && d.has(N.id) && b(N.id);
     }
     f.delete(g), p.add(g), y.push(g);
   };
   return d.forEach(b), y.map((g) => {
-    const w = e.computations.find((O) => O.id === g), N = n.get(g), S = r.stateOnlyIds?.has(g) === !0, R = r.outputChangedIds?.has(g) || !N || N.outputSignature !== w.outputSignature, $ = !N || N.stateSignature !== w.stateSignature, I = t.some((O) => O.id === g);
+    const w = e.computations.find((D) => D.id === g), R = n.get(g), S = r.stateOnlyIds?.has(g) === !0, N = r.outputChangedIds?.has(g) || !R || R.outputSignature !== w.outputSignature, $ = !R || R.stateSignature !== w.stateSignature, I = t.some((D) => D.id === g);
     return {
       computationId: g,
       dataContext: w.dataContext,
       rebuildState: (S || $) && w.boundStates.length > 0,
-      rebuildOutput: S ? !1 : R || !I,
-      propagateOutputEvents: S ? !1 : R || !I,
+      rebuildOutput: S ? !1 : N || !I,
+      propagateOutputEvents: S ? !1 : N || !I,
       isSeed: I
     };
   });
 }
-function li(s, e) {
+function di(s, e) {
   return `${s || "?"}.${e || "?"}`;
 }
 function Ar(s, e) {
@@ -12344,7 +12411,7 @@ function Ar(s, e) {
         t.push({
           kind: "unsupported-destructive-schema-change",
           logicalPath: `${l.recordName}.${f.name}`,
-          oldPhysicalPath: li(f.tableName, f.fieldName || f.sourceField || f.targetField),
+          oldPhysicalPath: di(f.tableName, f.fieldName || f.sourceField || f.targetField),
           reason: y ? "computed attribute physical cleanup is not supported by compute-route schema migration" : "fact attribute was removed from the new schema"
         });
       }
@@ -12353,8 +12420,8 @@ function Ar(s, e) {
       !p || m(l.recordName, f.name, s) || m(u.recordName, f.name, e) || ((p.kind !== f.kind || p.tableName !== f.tableName || p.fieldName !== f.fieldName || p.sourceField !== f.sourceField || p.targetField !== f.targetField) && t.push({
         kind: "physical-path-move",
         logicalPath: `${u.recordName}.${f.name}`,
-        oldPhysicalPath: li(p.tableName, p.fieldName || p.sourceField || p.targetField),
-        newPhysicalPath: li(f.tableName, f.fieldName || f.sourceField || f.targetField),
+        oldPhysicalPath: di(p.tableName, p.fieldName || p.sourceField || p.targetField),
+        newPhysicalPath: di(f.tableName, f.fieldName || f.sourceField || f.targetField),
         reason: "fact attribute physical path changed"
       }), (p.type !== f.type || p.fieldType !== f.fieldType || p.collection !== f.collection) && t.push({
         kind: "unsupported-destructive-schema-change",
@@ -12372,15 +12439,15 @@ function Bs(s, e, t, i) {
   return r ? r.owner === "exclusive" && r.ownershipProof?.kind === "computed-output" && r.ownershipProof.owner === "exclusive" && r.ownershipProof.ownerComputationId === e && r.ownershipProof.dataContext === t && r.ownershipProof.outputRecord === r.outputRecord : !(i !== void 0 && (s.records.some((n) => n.name === i) || s.storage.records.some((n) => n.recordName === i)));
 }
 function Us(s, e, t, i) {
-  const r = ji(s.approvedDiff, i);
+  const r = Hi(s.approvedDiff, i);
   return !r || r.computationId !== t || r.oldDataStrategy !== "discard-and-rebuild" ? !1 : e === void 0 || e.computations.every((a) => a.dataContext !== i);
 }
 function Qs(s, e, t = {}, i) {
   const r = [], a = new Set(e.filter((n) => n.rebuildOutput).map((n) => n.computationId));
   for (const n of s.scheduler.computationsHandles.values()) {
-    const o = ft(n);
+    const o = yt(n);
     if (!a.has(o)) continue;
-    const c = F(n.dataContext);
+    const c = L(n.dataContext);
     if (n.args._type === "ScopedSequence") {
       const u = !!n.args.initializeFrom;
       if (u && Xe(
@@ -12398,7 +12465,7 @@ function Qs(s, e, t = {}, i) {
       });
       continue;
     }
-    if (n.dataContext.type === "property" && n.dataContext.id.name === Zt && !Xe(t.approvedDiff, (u) => u.kind === "destructive-scope" && u.dataContext === c) && r.push({ kind: "destructive-computed-output", logicalPath: c, reason: "destructive computed output requires an approved destructive-scope decision" }), n.asyncReturn && !ma(t, c) && r.push({ kind: "async-computation", logicalPath: c, reason: "async computation requires an approved async-completion-handler decision and runtime handler" }), (n.dataContext.type === "entity" || n.dataContext.type === "relation") && !n.compute && r.push({ kind: "unrebuildable-computation", logicalPath: c, reason: "entity/relation output lacks a full compute contract" }), n.dataContext.type === "entity" || n.dataContext.type === "relation") {
+    if (n.dataContext.type === "property" && n.dataContext.id.name === ei && !Xe(t.approvedDiff, (u) => u.kind === "destructive-scope" && u.dataContext === c) && r.push({ kind: "destructive-computed-output", logicalPath: c, reason: "destructive computed output requires an approved destructive-scope decision" }), n.asyncReturn && !ma(t, c) && r.push({ kind: "async-computation", logicalPath: c, reason: "async computation requires an approved async-completion-handler decision and runtime handler" }), (n.dataContext.type === "entity" || n.dataContext.type === "relation") && !n.compute && r.push({ kind: "unrebuildable-computation", logicalPath: c, reason: "entity/relation output lacks a full compute contract" }), n.dataContext.type === "entity" || n.dataContext.type === "relation") {
       const u = n.state?.sourceRecordId?.key, l = n.state?.transformIndex?.key;
       (!u || !l || typeof n.eventDeps == "object") && r.push({
         kind: "unrebuildable-computation",
@@ -12410,7 +12477,7 @@ function Qs(s, e, t = {}, i) {
       kind: "destructive-computed-output",
       logicalPath: c,
       reason: "entity/relation output replacement requires exclusive output ownership proof in the previous manifest"
-    }), typeof n.eventDeps == "object" && !Mt(t, c) && r.push({ kind: "unrebuildable-computation", logicalPath: c, reason: "event-based computation requires an approved event-rebuild-handler decision and runtime handler" });
+    }), typeof n.eventDeps == "object" && !qt(t, c) && r.push({ kind: "unrebuildable-computation", logicalPath: c, reason: "event-based computation requires an approved event-rebuild-handler decision and runtime handler" });
   }
   return r;
 }
@@ -12428,22 +12495,22 @@ async function js(s, e, t, i, r, a, n, o) {
   if (h.some((P) => !P)) return;
   const m = Q(c), f = (P) => ce(P, m), p = Hs(o, l, m);
   if (!p) return;
-  const y = f(u.tableName), b = f(d.fieldName), g = p.sql ? ` WHERE ${p.sql}` : "", N = (await c.query(
+  const y = f(u.tableName), b = f(d.fieldName), g = p.sql ? ` WHERE ${p.sql}` : "", R = (await c.query(
     `SELECT COUNT(*) AS ${f("__rowCount")}, COUNT(${b}) AS ${f("__validValueCount")} FROM ${y}${g}`,
     p.params
-  ))[0], S = Number(N?.__rowCount ?? 0), R = Number(N?.__validValueCount ?? 0);
-  if (S !== R)
+  ))[0], S = Number(R?.__rowCount ?? 0), N = Number(R?.__validValueCount ?? 0);
+  if (S !== N)
     throw new C(`ScopedSequence ${n} initializeFrom valuePath must be present for every matched host row`);
   if (S === 0) return [];
-  const $ = h.map((P, A) => `${f(P.fieldName)} AS ${f(`__scope_${A}`)}`), I = h.map((P) => f(P.fieldName)), O = await c.query(
+  const $ = h.map((P, A) => `${f(P.fieldName)} AS ${f(`__scope_${A}`)}`), I = h.map((P) => f(P.fieldName)), D = await c.query(
     `SELECT ${[...$, `MAX(${b}) AS ${f("__maxValue")}`].join(", ")} FROM ${y}${g} GROUP BY ${I.join(", ")}`,
     p.params
   ), W = new Map(a.map((P) => [String(P.name), P]));
-  return O.map((P) => {
+  return D.map((P) => {
     const A = /* @__PURE__ */ new Map();
-    r.forEach((L, ye) => {
-      if (!W.has(L.name)) throw new Error(`ScopedSequence ${n} initializeFrom scope "${L.name}" is not declared`);
-      A.set(L.name, P[`__scope_${ye}`]);
+    r.forEach((F, ye) => {
+      if (!W.has(F.name)) throw new Error(`ScopedSequence ${n} initializeFrom scope "${F.name}" is not declared`);
+      A.set(F.name, P[`__scope_${ye}`]);
     });
     const ne = Number(P.__maxValue);
     if (!Number.isFinite(ne))
@@ -12474,17 +12541,17 @@ function Hs(s, e, t) {
           return i.push(o(p)), f === "=" ? `(${y} IS NOT NULL AND ${y} = ${b})` : `(${y} IS NOT NULL AND ${y} != ${b})`;
         }
         if (f === "in" || f === "not in") {
-          if (!Array.isArray(p) || p.some((N) => N === void 0)) return;
-          const b = p.filter((N) => N !== null).map(o), g = p.length !== b.length;
+          if (!Array.isArray(p) || p.some((R) => R === void 0)) return;
+          const b = p.filter((R) => R !== null).map(o), g = p.length !== b.length;
           if (f === "in" && p.length === 0) return "1 = 0";
           if (f === "not in" && p.length === 0) return `${y} IS NOT NULL`;
-          const w = b.map((N) => {
+          const w = b.map((R) => {
             const S = a();
-            return i.push(N), S;
+            return i.push(R), S;
           });
           if (f === "in") {
-            const N = w.length ? `${y} IN (${w.join(", ")})` : "1 = 0";
-            return g ? `(${y} IS NULL OR ${N})` : `(${y} IS NOT NULL AND ${N})`;
+            const R = w.length ? `${y} IN (${w.join(", ")})` : "1 = 0";
+            return g ? `(${y} IS NULL OR ${R})` : `(${y} IS NOT NULL AND ${R})`;
           }
           return g && w.length === 0 ? `${y} IS NOT NULL` : g ? `(${y} IS NOT NULL AND ${y} NOT IN (${w.join(", ")}))` : `(${y} IS NOT NULL AND ${y} NOT IN (${w.join(", ")}))`;
         }
@@ -12507,7 +12574,7 @@ async function Ks(s, e, t) {
   for (const i of s.scheduler.computationsHandles.values()) {
     const r = i.args;
     if (r._type !== "ScopedSequence" || !r.initializeFrom) continue;
-    const a = ft(i), n = F(i.dataContext);
+    const a = yt(i), n = L(i.dataContext);
     if (!Xe(
       e,
       ($) => $.kind === "scoped-sequence-seed" && $.id === a && $.dataContext === n
@@ -12546,25 +12613,25 @@ async function Ks(s, e, t) {
       String(o.valuePath),
       ...m.map(($) => $.path),
       ...rs(p)
-    ])), g = b.includes("*") ? ["*"] : b, w = (await s.system.storage.find(c, void 0, void 0, g)).filter(($) => sa(p, $)), N = new Map(f.map(($) => [String($.name), $])), S = /* @__PURE__ */ new Map();
-    let R = 0;
+    ])), g = b.includes("*") ? ["*"] : b, w = (await s.system.storage.find(c, void 0, void 0, g)).filter(($) => sa(p, $)), R = new Map(f.map(($) => [String($.name), $])), S = /* @__PURE__ */ new Map();
+    let N = 0;
     for (const $ of w) {
-      const I = Ni($, String(o.valuePath));
+      const I = vi($, String(o.valuePath));
       if (I == null)
         throw new C(`ScopedSequence ${String(r.name)} initializeFrom valuePath must be present for every matched host row`);
-      const O = Number(I);
-      if (!Number.isFinite(O))
+      const D = Number(I);
+      if (!Number.isFinite(D))
         throw new Error(`ScopedSequence ${String(r.name)} initializeFrom valuePath must resolve to numbers`);
-      R += 1;
+      N += 1;
       const W = /* @__PURE__ */ new Map();
-      for (const L of m) {
-        if (!N.get(L.name)) throw new Error(`ScopedSequence ${String(r.name)} initializeFrom scope "${L.name}" is not declared`);
-        W.set(L.name, Ni($, L.path));
+      for (const F of m) {
+        if (!R.get(F.name)) throw new Error(`ScopedSequence ${String(r.name)} initializeFrom scope "${F.name}" is not declared`);
+        W.set(F.name, vi($, F.path));
       }
       const P = na(f, W), A = JSON.stringify(P), ne = S.get(A);
-      (!ne || O > ne.max) && S.set(A, { scope: P, max: O });
+      (!ne || D > ne.max) && S.set(A, { scope: P, max: D });
     }
-    if (R !== w.length)
+    if (N !== w.length)
       throw new C(`ScopedSequence ${String(r.name)} initializeFrom did not validate every matched host row`);
     for (const $ of S.values())
       await s.system.storage.atomic.seedSequenceValue({
@@ -12615,7 +12682,7 @@ async function Gs(s, e, t, i) {
       return [n, await i.find(o.source.name, o.match, o.modifier ?? {}, o.attributeQuery)];
     if (o.type === "property") {
       if (t?.id === void 0)
-        throw new C(`Record ID is required to resolve property data dependency '${n}' for ${F(e.dataContext)}`);
+        throw new C(`Record ID is required to resolve property data dependency '${n}' for ${L(e.dataContext)}`);
       const c = e.dataContext.host.name;
       return [n, await i.findOne(c, E.atom({ key: "id", value: ["=", t.id] }), {}, o.attributeQuery)];
     }
@@ -12625,12 +12692,12 @@ async function Gs(s, e, t, i) {
       const u = s.dict.find((l) => l.name === o.source.name);
       return [n, u?.defaultValue !== void 0 ? u.defaultValue() : void 0];
     }
-    throw new C(`Unknown data dependency type '${o.type}' for ${F(e.dataContext)}`);
+    throw new C(`Unknown data dependency type '${o.type}' for ${L(e.dataContext)}`);
   }));
   return Object.fromEntries(a);
 }
-async function Ti(s, e, t, i) {
-  const r = Hi(s), a = [], n = async (o) => {
+async function Ci(s, e, t, i) {
+  const r = Ki(s), a = [], n = async (o) => {
     if (s.system.storage.queryHandle)
       return s.system.storage.find(o, void 0, void 0, ["*"]);
     if (!t) return;
@@ -12643,7 +12710,7 @@ async function Ti(s, e, t, i) {
   };
   for (const o of e) {
     const c = r.get(o.computationId);
-    if (c?.dataContext.type === "property" && c.dataContext.id.name === Zt) {
+    if (c?.dataContext.type === "property" && c.dataContext.id.name === ei) {
       const u = c.dataContext.host.name, l = await n(u), d = [];
       if (l && typeof c.compute == "function")
         for (const h of l)
@@ -12652,7 +12719,7 @@ async function Ti(s, e, t, i) {
             h
           ) === !0 && d.push(String(h.id));
       a.push({
-        dataContext: F(c.dataContext),
+        dataContext: L(c.dataContext),
         recordName: u,
         ids: d,
         count: d.length || l?.length,
@@ -12667,7 +12734,7 @@ async function Ti(s, e, t, i) {
       if (!Array.isArray(h)) continue;
       const m = new Set(h.map((y) => `${y[l]}:${y[d]}`)), p = (await n(u) || []).filter((y) => !m.has(`${y[l]}:${y[d]}`)).map((y) => String(y.id));
       p.length && a.push({
-        dataContext: F(c.dataContext),
+        dataContext: L(c.dataContext),
         recordName: u,
         ids: p,
         count: p.length,
@@ -12691,7 +12758,7 @@ function Ea(s, e) {
 async function Ir(s, e, t, i) {
   const r = (e.approvedDiff?.decisions || []).filter((a) => a.kind === "computation-takeover");
   for (const a of r) {
-    const n = await Na(s, a.dataContext, t, i);
+    const n = await Ra(s, a.dataContext, t, i);
     if (n.expectedExistingCount !== a.expectedExistingCount)
       throw new he(`Computation takeover count mismatch for ${a.dataContext}`);
     if (a.expectedHostCount !== void 0 && n.expectedHostCount !== a.expectedHostCount)
@@ -12705,7 +12772,7 @@ async function Ir(s, e, t, i) {
     }
   }
 }
-function Wi(s, e) {
+function zi(s, e) {
   const t = new Map(s.storage.records.filter((r) => r.isFiltered).map((r) => [r.recordName, r])), i = [];
   for (const r of e.storage.records) {
     if (!r.isFiltered) continue;
@@ -12715,7 +12782,7 @@ function Wi(s, e) {
   return i;
 }
 function Pr(s, e) {
-  return Wi(s, e).map((t) => `${t.isRelation ? "relation" : "entity"}:${t.recordName}`);
+  return zi(s, e).map((t) => `${t.isRelation ? "relation" : "entity"}:${t.recordName}`);
 }
 function Js(s) {
   return s.map((e) => {
@@ -12725,23 +12792,23 @@ function Js(s) {
 }
 async function Mr(s) {
   const e = s.system;
-  return e.readMigrationManifest ? e.readMigrationManifest() : s.system.storage.get(Vi, _i);
+  return e.readMigrationManifest ? e.readMigrationManifest() : s.system.storage.get(_i, Bi);
 }
-async function di(s, e) {
+async function hi(s, e) {
   const t = s.system;
   if (t.writeMigrationManifest) {
     await t.writeMigrationManifest(e);
     return;
   }
-  await s.system.storage.set(Vi, _i, e);
+  await s.system.storage.set(_i, Bi, e);
 }
-function it(s, e) {
+function rt(s, e) {
   return fe(s) === fe(e);
 }
-async function zi(s, e, t, i, r = {}) {
-  const a = ma(r, F(e.dataContext));
+async function Gi(s, e, t, i, r = {}) {
+  const a = ma(r, L(e.dataContext));
   if (!a)
-    throw new Bi(`Migration cannot treat async task creation as completion for ${F(e.dataContext)}`);
+    throw new Ui(`Migration cannot treat async task creation as completion for ${L(e.dataContext)}`);
   return a({
     controller: s,
     dataContext: e.dataContext,
@@ -12757,19 +12824,19 @@ async function Ae(s, e, t, i, r = {}, a = {}) {
     if (s.system.storage.schema.constraints.some(
       (u) => u.kind === "non-null" && u.recordName === o.host.name && u.property === o.id.name
     ))
-      throw new C(`Computation takeover cannot keep old value for non-null property ${F(e.dataContext)} when computation returns skip`);
+      throw new C(`Computation takeover cannot keep old value for non-null property ${L(e.dataContext)} when computation returns skip`);
     t = null;
   }
-  if (t instanceof mt && (t = await zi(s, e, t, i, r)), t instanceof Jt)
-    throw new Bi(`Migration requires direct final output, not asyncReturn resolution, for ${F(e.dataContext)}`);
+  if (t instanceof ft && (t = await Gi(s, e, t, i, r)), t instanceof Xt)
+    throw new Ui(`Migration requires direct final output, not asyncReturn resolution, for ${L(e.dataContext)}`);
   const n = await s.retrieveLastValue(e.dataContext, i);
-  if (!(!a.forceMutationEvent && it(n, t)))
-    return it(n, t) || await s.applyResult(e.dataContext, t, i), $a(e.dataContext, t, n, i);
+  if (!(!a.forceMutationEvent && rt(n, t)))
+    return rt(n, t) || await s.applyResult(e.dataContext, t, i), $a(e.dataContext, t, n, i);
 }
 async function Xs(s, e, t, i, r = {}) {
   if (t instanceof Oe || t === void 0) return [];
-  if (t instanceof mt && (t = await zi(s, e, t, i, r)), t instanceof Jt)
-    throw new Bi(`Migration requires direct final output for ${F(e.dataContext)}`);
+  if (t instanceof ft && (t = await Gi(s, e, t, i, r)), t instanceof Xt)
+    throw new Ui(`Migration requires direct final output for ${L(e.dataContext)}`);
   const a = Array.isArray(t) ? t : [t], n = [];
   for (const o of a) {
     if (!o || typeof o != "object" || !("type" in o)) {
@@ -12779,7 +12846,7 @@ async function Xs(s, e, t, i, r = {}) {
     }
     const c = o;
     if (c.type === "delete" && (e.dataContext.type === "entity" || e.dataContext.type === "relation"))
-      throw new he(`Migration refuses delete patch for ${F(e.dataContext)} without explicit audited scope`);
+      throw new he(`Migration refuses delete patch for ${L(e.dataContext)} without explicit audited scope`);
     if (await s.applyResultPatch(e.dataContext, c, i), e.dataContext.type === "entity" || e.dataContext.type === "relation")
       n.push({
         recordName: e.dataContext.id.name,
@@ -12805,7 +12872,7 @@ function $a(s, e, t, i) {
       keys: ["value"]
     };
   if (s.type === "property" && i)
-    return s.id.name === Zt && e ? {
+    return s.id.name === ei && e ? {
       recordName: s.host.name,
       type: "delete",
       record: i
@@ -12829,21 +12896,21 @@ function Ye(s, e, t = /* @__PURE__ */ new WeakSet()) {
 async function Ys(s, e, t = {}) {
   if (e.dataContext.type !== "entity" && e.dataContext.type !== "relation") return [];
   let i = await e.compute(await s.scheduler.resolveDataDeps(e));
-  if (i instanceof mt && (i = await zi(s, e, i, void 0, t)), !Array.isArray(i))
-    throw new tt(`Entity/relation migration compute must return an array for ${F(e.dataContext)}`);
+  if (i instanceof ft && (i = await Gi(s, e, i, void 0, t)), !Array.isArray(i))
+    throw new it(`Entity/relation migration compute must return an array for ${L(e.dataContext)}`);
   const r = e.dataContext.id.name, a = e.state?.sourceRecordId?.key, n = e.state?.transformIndex?.key;
   if (!a || !n)
-    throw new tt(`Transform migration requires sourceRecordId and transformIndex state for ${F(e.dataContext)}`);
-  if (ji(t.approvedDiff, F(e.dataContext))?.targetType === e.dataContext.type) {
-    const d = Bt(
+    throw new it(`Transform migration requires sourceRecordId and transformIndex state for ${L(e.dataContext)}`);
+  if (Hi(t.approvedDiff, L(e.dataContext))?.targetType === e.dataContext.type) {
+    const d = Ut(
       t.approvedDiff,
-      (y) => y.kind === "destructive-scope" && y.dataContext === F(e.dataContext) && y.recordName === r
+      (y) => y.kind === "destructive-scope" && y.dataContext === L(e.dataContext) && y.recordName === r
     );
     if (!d)
       throw new he(`Migration takeover requires approved destructive scope before clearing ${r}`);
     const h = await s.system.storage.find(r, void 0, void 0, ["*"]), m = new Set(d.ids.map(String)), f = new Set(h.map((y) => String(y.id)));
     if (m.size !== f.size || [...f].some((y) => !m.has(y)))
-      throw new he(`Migration takeover destructive scope mismatch for ${F(e.dataContext)}`);
+      throw new he(`Migration takeover destructive scope mismatch for ${L(e.dataContext)}`);
     const p = [];
     for (const y of h)
       await s.system.storage.delete(r, E.atom({ key: "id", value: ["=", y.id] })), p.push({ recordName: r, type: "delete", record: y });
@@ -12857,16 +12924,16 @@ async function Ys(s, e, t = {}) {
   for (const d of i) {
     const h = `${d[a]}:${d[n]}`, m = u.get(h);
     if (u.delete(h), m)
-      it({ ...m, id: void 0 }, { ...d, id: void 0 }) || (await s.system.storage.update(r, E.atom({ key: "id", value: ["=", m.id] }), d), l.push({ recordName: r, type: "update", record: { ...m, ...d }, oldRecord: m, keys: Object.keys(d) }));
+      rt({ ...m, id: void 0 }, { ...d, id: void 0 }) || (await s.system.storage.update(r, E.atom({ key: "id", value: ["=", m.id] }), d), l.push({ recordName: r, type: "update", record: { ...m, ...d }, oldRecord: m, keys: Object.keys(d) }));
     else {
       const f = await s.system.storage.create(r, d);
       l.push({ recordName: r, type: "create", record: f });
     }
   }
   for (const d of u.values()) {
-    if (!Bt(
+    if (!Ut(
       t.approvedDiff,
-      (m) => m.kind === "destructive-scope" && m.dataContext === F(e.dataContext) && m.recordName === r
+      (m) => m.kind === "destructive-scope" && m.dataContext === L(e.dataContext) && m.recordName === r
     )?.ids.map(String).includes(String(d.id)))
       throw new he(`Migration would delete stale derived ${r} record ${d.id}; approve destructive scope before executing`);
     await s.system.storage.delete(r, E.atom({ key: "id", value: ["=", d.id] })), l.push({ recordName: r, type: "delete", record: d });
@@ -12874,11 +12941,11 @@ async function Ys(s, e, t = {}) {
   return l;
 }
 async function Zs(s, e, t = {}, i = [], r) {
-  return Ea(t, await Ti(s, e, r)), new eo(s, e, t, i).run();
+  return Ea(t, await Ci(s, e, r)), new eo(s, e, t, i).run();
 }
 class eo {
   constructor(e, t, i = {}, r = []) {
-    this.controller = e, this.rebuildPlan = t, this.options = i, this.initialEvents = r, this.handles = Hi(this.controller), this.sourceMapManager = new zr(this.controller, this.controller.scheduler), this.affectedIds = new Set(this.rebuildPlan.map((a) => a.computationId)), this.pendingEventsByComputation = /* @__PURE__ */ new Map(), this.sourceMapManager.initialize(new Set(
+    this.controller = e, this.rebuildPlan = t, this.options = i, this.initialEvents = r, this.handles = Ki(this.controller), this.sourceMapManager = new zr(this.controller, this.controller.scheduler), this.affectedIds = new Set(this.rebuildPlan.map((a) => a.computationId)), this.pendingEventsByComputation = /* @__PURE__ */ new Map(), this.sourceMapManager.initialize(new Set(
       Array.from(this.handles.entries()).filter(([a]) => this.affectedIds.has(a)).map(([, a]) => a)
     ));
   }
@@ -12888,10 +12955,10 @@ class eo {
     for (const t of this.rebuildPlan) {
       const i = this.handles.get(t.computationId);
       if (!i) continue;
-      if (i.dataContext.type === "property" && i.dataContext.id.name === Zt && !Xe(this.options.approvedDiff, (n) => n.kind === "destructive-scope" && n.dataContext === F(i.dataContext)))
-        throw new he(`Migration refuses to recompute destructive property ${F(i.dataContext)} without approved destructive scope`);
-      if (typeof i.compute != "function" && !Mt(this.options, F(i.dataContext)))
-        throw new tt(`Migration requires full compute support for ${F(i.dataContext)}`);
+      if (i.dataContext.type === "property" && i.dataContext.id.name === ei && !Xe(this.options.approvedDiff, (n) => n.kind === "destructive-scope" && n.dataContext === L(i.dataContext)))
+        throw new he(`Migration refuses to recompute destructive property ${L(i.dataContext)} without approved destructive scope`);
+      if (typeof i.compute != "function" && !qt(this.options, L(i.dataContext)))
+        throw new it(`Migration requires full compute support for ${L(i.dataContext)}`);
       if (t.rebuildState && !t.rebuildOutput) {
         await this.rebuildStateDefaults(i);
         continue;
@@ -12905,13 +12972,13 @@ class eo {
     for (const i of e) {
       const r = this.sourceMapManager.findSourceMapsForMutation(i);
       for (const a of r) {
-        const n = ft(a.computation);
+        const n = yt(a.computation);
         n === t || !this.affectedIds.has(n) || this.sourceMapManager.shouldTriggerUpdateComputation(a, i) && (!("dataDep" in a) && !this.sourceMapManager.shouldTriggerEventBasedComputation(a, i) || (this.pendingEventsByComputation.has(n) || this.pendingEventsByComputation.set(n, []), this.pendingEventsByComputation.get(n).push(i)));
       }
     }
   }
   async runFullRecompute(e) {
-    const t = ji(this.options.approvedDiff, F(e.dataContext)), i = t?.targetType === "property" ? { forceMutationEvent: !0, skipAsNull: !0 } : {}, r = Mt(this.options, F(e.dataContext));
+    const t = Hi(this.options.approvedDiff, L(e.dataContext)), i = t?.targetType === "property" ? { forceMutationEvent: !0, skipAsNull: !0 } : {}, r = qt(this.options, L(e.dataContext));
     if (r && typeof e.compute != "function") {
       if (e.dataContext.type === "property") {
         const l = e.dataContext.host.name, d = await this.controller.system.storage.find(l, void 0, void 0, ["*"]), h = [];
@@ -12960,9 +13027,9 @@ class eo {
       const n = this.sourceMapManager.findSourceMapsForMutation(a).filter((o) => o.computation === e);
       for (const o of n) {
         if (!("dataDep" in o)) {
-          const l = Mt(this.options, F(e.dataContext));
+          const l = qt(this.options, L(e.dataContext));
           if (!l)
-            throw new tt(`Event-based migration requires an approved event rebuild handler for ${F(e.dataContext)}`);
+            throw new it(`Event-based migration requires an approved event rebuild handler for ${L(e.dataContext)}`);
           if (e.dataContext.type === "property") {
             r || (r = !0, i.push(...await this.runFullRecompute(e)));
             continue;
@@ -12991,7 +13058,7 @@ class eo {
 }
 async function to(s, e, t) {
   const i = [], r = (a) => a ? k.fromValue(a) : void 0;
-  for (const a of Wi(e, t)) {
+  for (const a of zi(e, t)) {
     const n = a.newRecord, o = n.resolvedBaseRecordName;
     if (!o || !n.resolvedMatchExpression) continue;
     const c = await s.system.storage.find(o, r(n.resolvedMatchExpression), void 0, ["*"]);
@@ -13030,10 +13097,10 @@ class ka {
     return new ka(e);
   }
 }
-const qt = "_isDeleted_", qr = new xi(), Ko = {
+const Dt = "_isDeleted_", qr = new Ai(), Ko = {
   create() {
     return x.create({
-      name: qt,
+      name: Dt,
       type: "boolean"
     });
   }
@@ -13082,7 +13149,7 @@ class Wo {
       ...ss,
       ...c
     ];
-    this.scheduler = new _t(this, this.entities, this.relations, this.dict, h), o.forEach((m) => {
+    this.scheduler = new Bt(this, this.entities, this.relations, this.dict, h), o.forEach((m) => {
       let f = this.recordNameToSideEffects.get(m.record.name);
       f || this.recordNameToSideEffects.set(m.record.name, f = /* @__PURE__ */ new Set()), f.add(m);
     });
@@ -13100,16 +13167,16 @@ class Wo {
       const o = this.system, c = o.prepareMigrationSchema;
       if (typeof c != "function")
         throw new Error("Current system does not support migration manifest validation");
-      const u = await c.call(o, this.entities, this.relations, r, { internalRequirements: a }), l = St(this, u.schema), d = await Mr(this);
+      const u = await c.call(o, this.entities, this.relations, r, { internalRequirements: a }), l = Et(this, u.schema), d = await Mr(this);
       if (d && $r(d), d && d.modelHash !== l.modelHash)
-        throw new Error(`Model manifest mismatch. Call controller.generateMigrationDiff(), review it, then call controller.migrate({ approvedDiff }). Manifest key: ${Vi}/${_i}`);
+        throw new Error(`Model manifest mismatch. Call controller.generateMigrationDiff(), review it, then call controller.migrate({ approvedDiff }). Manifest key: ${_i}/${Bi}`);
       if (!d && await this.system.hasExistingData?.())
-        throw new Pt("Existing database has no migration manifest. Call controller.createMigrationBaseline() before normal setup or migration.");
+        throw new Mt("Existing database has no migration manifest. Call controller.createMigrationBaseline() before normal setup or migration.");
       await this.system.setup(this.entities, this.relations, r, { install: t, internalRequirements: a }), await this.scheduler.setup(t);
       return;
     }
     await this.system.setup(this.entities, this.relations, r, { install: t, internalRequirements: a });
-    const n = St(this);
+    const n = Et(this);
     try {
       await this.scheduler.setup(t);
     } catch (o) {
@@ -13121,7 +13188,7 @@ class Wo {
         }
       );
     }
-    t && await di(this, n);
+    t && await hi(this, n);
   }
   /**
    * Detach this controller from the system: unregister all reactive computation
@@ -13147,21 +13214,21 @@ class Wo {
     _(typeof i.prepareMigrationSchema == "function", "Current system does not support migration baseline");
     const r = await i.prepareMigrationSchema(this.entities, this.relations, e, { internalRequirements: t });
     if (r.preRecomputeDDL.length > 0 || r.blockingChanges.length > 0)
-      throw new Pt("Cannot create migration baseline because current definitions do not match the existing schema", {
+      throw new Mt("Cannot create migration baseline because current definitions do not match the existing schema", {
         missingDDL: r.preRecomputeDDL,
         blockingChanges: r.blockingChanges
       });
-    const a = St(this, r.schema);
-    return await di(this, a), a;
+    const a = Et(this, r.schema);
+    return await hi(this, a), a;
   }
   async prepareMigrationContext(e = {}) {
     const t = this.scheduler.createStates(), i = this.scheduler.createInternalSchemaRequirements(), r = this.system;
     _(typeof r.prepareMigrationSchema == "function", "Current system does not support schema migration planning");
     const a = await r.prepareMigrationSchema(this.entities, this.relations, t, { internalRequirements: i }), n = await Mr(this);
     if (!n)
-      throw new Pt("Migration baseline manifest not found. Run setup(true) with the current framework first or createMigrationBaseline().");
+      throw new Mt("Migration baseline manifest not found. Run setup(true) with the current framework first or createMigrationBaseline().");
     $r(n);
-    const o = St(this, a.schema, { includeFunctionText: e.includeFunctionText === !0 });
+    const o = Et(this, a.schema, { includeFunctionText: e.includeFunctionText === !0 });
     return { states: t, migrationSystem: r, schemaPlan: a, previousManifest: n, nextManifest: o };
   }
   async buildCurrentMigrationDiff(e, t, i, r = {}) {
@@ -13173,7 +13240,7 @@ class Wo {
       a,
       n,
       { outputChangedIds: new Set(a.map((p) => p.id)) }
-    ), c = Ar(t, i), u = kr(this, e), l = r.includeDestructiveScope === !0 ? await Ti(this, o, t, u) : [], d = {
+    ), c = Ar(t, i), u = kr(this, e), l = r.includeDestructiveScope === !0 ? await Ci(this, o, t, u) : [], d = {
       blockingChanges: [
         ...e.blockingChanges,
         ...c
@@ -13193,27 +13260,27 @@ class Wo {
     _(typeof r.applyMigrationSchema == "function", "Current system does not support schema migration application");
     const { schemaPlan: a, previousManifest: n, nextManifest: o } = i, c = await this.buildCurrentMigrationDiff(a, n, o, { includeDestructiveScope: !1 });
     qs(t.approvedDiff, n, o, t.handlers, c);
-    const u = t.approvedDiff, l = ds(u), d = Os(u), h = Fs(u), m = Ds(n, o, u), f = m.changedComputations, p = Pr(n, o), y = xr(n, o, f, p, {
+    const u = t.approvedDiff, l = ds(u), d = Os(u), h = Ls(u), m = Ds(n, o, u), f = m.changedComputations, p = Pr(n, o), y = xr(n, o, f, p, {
       outputChangedIds: m.outputChangedIds,
       stateOnlyIds: m.stateOnlyIds
-    }), b = await Ra(this, t.approvedDiff, n), g = As(n, b), w = {
+    }), b = await Na(this, t.approvedDiff, n), g = As(n, b), w = {
       ...a,
       postRecomputeDDL: [
         ...a.postRecomputeDDL,
         ...g
       ]
-    }, N = Ar(n, o).filter((L) => !(L.kind === "unsupported-destructive-schema-change" && b.has(L.logicalPath))), S = Qs(
+    }, R = Ar(n, o).filter((F) => !(F.kind === "unsupported-destructive-schema-change" && b.has(F.logicalPath))), S = Qs(
       this,
       y,
       t,
       n
-    ), R = [
+    ), N = [
       ...a.blockingChanges,
-      ...N,
+      ...R,
       ...m.blocking,
       ...S
-    ], $ = Js(R), I = kr(this, a), O = await Ti(this, y, n, I);
-    Ea(t, O), await Ir(this, t, n, I), await Cs(this, t.approvedDiff, n, I);
+    ], $ = Js(N), I = kr(this, a), D = await Ci(this, y, n, I);
+    Ea(t, D), await Ir(this, t, n, I), await Cs(this, t.approvedDiff, n, I);
     const W = Ws(this, n, o), P = {
       mode: "compute",
       dryRun: t.dryRun === !0,
@@ -13227,10 +13294,10 @@ class Wo {
         preRecomputeDDL: w.preRecomputeDDL,
         postRecomputeDDL: w.postRecomputeDDL,
         verificationDDL: w.verificationDDL,
-        blockingChanges: R
+        blockingChanges: N
       },
       blockingChanges: $,
-      deletionScope: O,
+      deletionScope: D,
       approvedDiffHash: l
     };
     if (P.dryRun) return P;
@@ -13239,9 +13306,9 @@ class Wo {
 ${$.join(`
 `)}`);
     let A;
-    const ne = (L, ye) => {
-      const ti = ["pending", "schema-applied", "computation-applied", "constraints-applied", "manifest-written", "succeeded"];
-      return ti.indexOf(L) >= ti.indexOf(ye);
+    const ne = (F, ye) => {
+      const ii = ["pending", "schema-applied", "computation-applied", "constraints-applied", "manifest-written", "succeeded"];
+      return ii.indexOf(F) >= ii.indexOf(ye);
     };
     this.scheduler.teardown(), this.scheduler.registerDictDefaults();
     try {
@@ -13251,28 +13318,28 @@ ${$.join(`
         u.summary,
         u.decisions.length
       );
-      const L = A?.phase || "pending";
-      await r.applyMigrationSchema(w, A?.id), ne(L, "schema-applied") || A && await r.updateMigrationPhase?.(A.id, "schema-applied"), ne(L, "manifest-written") || await this.system.storage.runInTransaction({ name: "migration recompute", isolation: "SERIALIZABLE" }, async () => {
-        if (!ne(L, "computation-applied")) {
+      const F = A?.phase || "pending";
+      await r.applyMigrationSchema(w, A?.id), ne(F, "schema-applied") || A && await r.updateMigrationPhase?.(A.id, "schema-applied"), ne(F, "manifest-written") || await this.system.storage.runInTransaction({ name: "migration recompute", isolation: "SERIALIZABLE" }, async () => {
+        if (!ne(F, "computation-applied")) {
           await zs(this, W);
           const Aa = await to(this, n, o);
           await Ir(this, t, n), await Zs(this, y, t, Aa, n), await Ks(this, u, n), A && await r.updateMigrationPhase?.(A.id, "computation-applied");
         }
-        ne(L, "constraints-applied") || (await xs(this, t.approvedDiff, n), await r.verifyMigrationSchema?.(w, A?.id), await r.applyMigrationPostSchema?.(w, A?.id), A && await r.updateMigrationPhase?.(A.id, "constraints-applied"));
+        ne(F, "constraints-applied") || (await xs(this, t.approvedDiff, n), await r.verifyMigrationSchema?.(w, A?.id), await r.applyMigrationPostSchema?.(w, A?.id), A && await r.updateMigrationPhase?.(A.id, "constraints-applied"));
         const ye = `manifest:current:${o.modelHash}:${l}`;
-        await r.isMigrationOperationComplete?.(A?.id, ye) || (await di(this, o), await r.markMigrationOperationComplete?.(A?.id, ye)), A && await r.updateMigrationPhase?.(A.id, "manifest-written");
+        await r.isMigrationOperationComplete?.(A?.id, ye) || (await hi(this, o), await r.markMigrationOperationComplete?.(A?.id, ye)), A && await r.updateMigrationPhase?.(A.id, "manifest-written");
       }), A && await r.finishMigration?.(A.id, "succeeded");
-    } catch (L) {
-      throw A && await r.finishMigration?.(A.id, "failed", L), L;
+    } catch (F) {
+      throw A && await r.finishMigration?.(A.id, "failed", F), F;
     }
     try {
       await this.scheduler.setup(!1);
-    } catch (L) {
+    } catch (F) {
       throw new Be(
         "Migration completed successfully (database schema, data and manifest are all migrated), but scheduler setup failed afterwards: the reactive computation layer is NOT active in this process. Fix the underlying error and call controller.setup() (without install) to register computation listeners; do NOT retry the migration.",
         {
           schedulingPhase: "post-migration-scheduler-setup",
-          causedBy: L instanceof Error ? L : new Error(String(L))
+          causedBy: F instanceof Error ? F : new Error(String(F))
         }
       );
     }
@@ -13312,7 +13379,7 @@ ${$.join(`
           await this.system.storage.create(r.id.name, n);
       } else {
         const r = e;
-        r.id.name === qt && t ? await this.system.storage.delete(r.host.name, k.atom({ key: "id", value: ["=", i.id] })) : await this.system.storage.update(r.host.name, k.atom({ key: "id", value: ["=", i.id] }), { [r.id.name]: t });
+        r.id.name === Dt && t ? await this.system.storage.delete(r.host.name, k.atom({ key: "id", value: ["=", i.id] })) : await this.system.storage.update(r.host.name, k.atom({ key: "id", value: ["=", i.id] }), { [r.id.name]: t });
       }
     }
   }
@@ -13339,7 +13406,7 @@ ${$.join(`
   }
   async applyInitialValue(e, t, i) {
     if (t instanceof Oe) return;
-    if (this.assertNotComputationEnvelope(e, t), e.id.name === qt && t) {
+    if (this.assertNotComputationEnvelope(e, t), e.id.name === Dt && t) {
       await this.system.storage.delete(e.host.name, k.atom({ key: "id", value: ["=", i.id] }));
       return;
     }
@@ -13380,7 +13447,7 @@ ${$.join(`
         }
       } else {
         const n = e;
-        n.id.name === qt && a.data ? (_(a.type !== "delete", "Hard deletion property cannot be deleted"), await this.system.storage.delete(n.host.name, k.atom({ key: "id", value: ["=", i.id] }))) : a.type === "insert" ? await this.system.storage.update(n.host.name, k.atom({ key: "id", value: ["=", i.id] }), { [n.id.name]: a.data }) : a.type === "update" ? await this.system.storage.update(n.host.name, k.atom({ key: "id", value: ["=", i.id] }), { [n.id.name]: a.data }) : a.type === "delete" && await this.system.storage.update(n.host.name, k.atom({ key: "id", value: ["=", i.id] }), { [n.id.name]: null });
+        n.id.name === Dt && a.data ? (_(a.type !== "delete", "Hard deletion property cannot be deleted"), await this.system.storage.delete(n.host.name, k.atom({ key: "id", value: ["=", i.id] }))) : a.type === "insert" ? await this.system.storage.update(n.host.name, k.atom({ key: "id", value: ["=", i.id] }), { [n.id.name]: a.data }) : a.type === "update" ? await this.system.storage.update(n.host.name, k.atom({ key: "id", value: ["=", i.id] }), { [n.id.name]: a.data }) : a.type === "delete" && await this.system.storage.update(n.host.name, k.atom({ key: "id", value: ["=", i.id] }), { [n.id.name]: null });
       }
     }
   }
@@ -13417,9 +13484,9 @@ ${$.join(`
     };
     let n;
     try {
-      n = await ls.run(a, () => Oi(e.name || "dispatch", async (o) => {
+      n = await ls.run(a, () => Li(e.name || "dispatch", async (o) => {
         const c = this.cloneDispatchArgs(t), u = { effects: [] };
-        return Li.run(u, async () => this.system.storage.runInTransaction({ name: e.name, isolation: o }, async () => qr.run({ eventSourceName: e.name }, async () => {
+        return Vi.run(u, async () => this.system.storage.runInTransaction({ name: e.name, isolation: o }, async () => qr.run({ eventSourceName: e.name }, async () => {
           !this.ignoreGuard && e.guard && await e.guard.call(this, c);
           const l = e.mapEventData ? await e.mapEventData(c) : {};
           await this.system.storage.create(e.entity.name, l);
@@ -13527,7 +13594,7 @@ class ro {
       records: [],
       tables: [],
       constraints: []
-    }, this.transactionContext = new xi(), this.dictDefaults = /* @__PURE__ */ new Map(), this.callbacks = /* @__PURE__ */ new Set(), this.transactionQueue = Promise.resolve(), this.dict = {
+    }, this.transactionContext = new Ai(), this.dictDefaults = /* @__PURE__ */ new Map(), this.callbacks = /* @__PURE__ */ new Set(), this.transactionQueue = Promise.resolve(), this.dict = {
       get: async (t) => {
         const i = E.atom({ key: "key", value: ["=", t] }), r = await this.queryHandle.findOne(Z, i, void 0, ["value"]);
         if (!r) {
@@ -13578,14 +13645,14 @@ class ro {
   async runInTransaction(e, t) {
     const i = e.isolation ?? "READ COMMITTED", r = this.getTransactionCapability();
     if (!r.transactions)
-      throw new xt({
+      throw new At({
         transactionName: e.name,
         requestedIsolation: i,
         capability: r,
         reason: "driver does not support transactions"
       });
     if (!r.isolationLevels.includes(i))
-      throw new xt({
+      throw new At({
         transactionName: e.name,
         requestedIsolation: i,
         capability: r,
@@ -13629,14 +13696,14 @@ class ro {
       throw new Error(`${e} requires an active transaction`);
   }
   async withAtomicTransaction(e, t) {
-    return this.isInTransaction() ? t() : Oi(e, (i) => this.runInTransaction({ name: e, isolation: i }, t));
+    return this.isInTransaction() ? t() : Li(e, (i) => this.runInTransaction({ name: e, isolation: i }, t));
   }
   normalizeSequenceScope(e) {
     return e.map((t) => ({ name: t.name, type: t.type, value: t.value }));
   }
   validateAtomicSequenceTarget(e) {
     if (!this.db.atomicSequenceCapability || typeof this.db.setupScopedSequenceState != "function")
-      throw new xt({
+      throw new At({
         transactionName: `atomic scoped sequence ${e.sequenceName || ""}`,
         requestedIsolation: this.getTransactionIsolation() || "READ COMMITTED",
         capability: this.getTransactionCapability(),
@@ -13720,7 +13787,7 @@ class ro {
         };
       }));
     }
-    this.queryHandle = new gi(new qe(a.map, a.aliasManager), this.db), this.map = a.map, this.constraintSchemaItems = a.constraintSchemaItems, this.schema = this.createSchemaMetadata(a);
+    this.queryHandle = new bi(new qe(a.map, a.aliasManager), this.db), this.map = a.map, this.constraintSchemaItems = a.constraintSchemaItems, this.schema = this.createSchemaMetadata(a);
   }
   async prepareMigrationAdditive(e, t, i) {
     await this.ensureDbOpenForSchemaRead(), this.db.setupInternalComputationState;
@@ -13807,7 +13874,7 @@ class ro {
         };
       }));
     }
-    this.queryHandle = new gi(new qe(i.map, i.aliasManager), this.db), this.map = i.map, this.constraintSchemaItems = i.constraintSchemaItems, this.schema = this.createSchemaMetadata(i);
+    this.queryHandle = new bi(new qe(i.map, i.aliasManager), this.db), this.map = i.map, this.constraintSchemaItems = i.constraintSchemaItems, this.schema = this.createSchemaMetadata(i);
   }
   async applyPostRecomputeSchemaPlan(e, t) {
     await this.applyMigrationOperations("constraints", e.postRecomputeDDL, t);
@@ -14030,7 +14097,7 @@ class ro {
             tableName: r.tableName,
             properties: r.kind === "unique" ? r.properties : [r.property],
             driver: this.db.constructor?.name,
-            rawCode: Ct(a, this.db).rawCode,
+            rawCode: xt(a, this.db).rawCode,
             causedBy: a instanceof Error ? a : void 0
           }
         );
@@ -14128,18 +14195,18 @@ RETURNING "numberValue" AS value`,
         async () => {
           const r = this.getPlaceholder();
           if (this.isRecordTarget(t)) {
-            const { tableName: y, idField: b, fieldName: g } = this.resolveRecordTarget(t), w = r(), N = await this.db.query(
+            const { tableName: y, idField: b, fieldName: g } = this.resolveRecordTarget(t), w = r(), R = await this.db.query(
               `SELECT "${g}" AS value FROM "${y}" WHERE "${b}" = ${w}${this.supportsForUpdate() ? " FOR UPDATE" : ""}`,
               [t.id],
               `atomic replace lock ${t.recordName}.${t.field}`
             );
-            if (!N.length) throw new Error(`Atomic replace target not found: ${t.recordName}.${String(t.id)}.${t.field}`);
-            const S = this.getPlaceholder(), R = S(), $ = S(), I = await this.db.query(
-              `UPDATE "${y}" SET "${g}" = ${R} WHERE "${b}" = ${$} RETURNING "${g}" AS value`,
+            if (!R.length) throw new Error(`Atomic replace target not found: ${t.recordName}.${String(t.id)}.${t.field}`);
+            const S = this.getPlaceholder(), N = S(), $ = S(), I = await this.db.query(
+              `UPDATE "${y}" SET "${g}" = ${N} WHERE "${b}" = ${$} RETURNING "${g}" AS value`,
               [i, t.id],
               `atomic replace ${t.recordName}.${t.field}`
             );
-            return { oldValue: N[0].value ?? null, newValue: I[0]?.value ?? i };
+            return { oldValue: R[0].value ?? null, newValue: I[0]?.value ?? i };
           }
           const a = this.resolveGlobalColumn(t, i), n = this.normalizeGlobalValue(i, a);
           await this.ensureGlobalStateRow(t, a);
@@ -14158,9 +14225,9 @@ RETURNING "numberValue" AS value`,
       compareAndSet: async (t, i, r, a) => {
         const n = this.getPlaceholder(), o = a?.defaultValue;
         if (this.isRecordTarget(t)) {
-          const { tableName: S, idField: R, fieldName: $ } = this.resolveRecordTarget(t), I = n(), O = n(), W = n(), P = n();
+          const { tableName: S, idField: N, fieldName: $ } = this.resolveRecordTarget(t), I = n(), D = n(), W = n(), P = n();
           return (await this.db.query(
-            `UPDATE "${S}" SET "${$}" = ${I} WHERE "${R}" = ${O} AND COALESCE("${$}", ${W}) = ${P} RETURNING "${$}" AS value`,
+            `UPDATE "${S}" SET "${$}" = ${I} WHERE "${N}" = ${D} AND COALESCE("${$}", ${W}) = ${P} RETURNING "${$}" AS value`,
             [r, t.id, o, i],
             `atomic compareAndSet ${t.recordName}.${t.field}`
           )).length > 0;
@@ -14315,7 +14382,7 @@ RETURNING "lastValue" AS value`,
     return this.callWithEvents(this.queryHandle.delete.bind(this.queryHandle), [e, t], i);
   }
   findConstraintForError(e) {
-    const t = Ct(e, this.db);
+    const t = xt(e, this.db);
     if (t.constraintName) {
       const r = this.constraintSchemaItems.find((a) => a.physicalName === t.constraintName || a.constraintName === t.constraintName);
       if (r) return r;
@@ -14329,7 +14396,7 @@ RETURNING "lastValue" AS value`,
   mapConstraintError(e) {
     const t = un(e);
     if (t) return t;
-    const i = Ct(e, this.db);
+    const i = xt(e, this.db);
     if (!i.isUniqueViolation) return e;
     const r = this.findConstraintForError(e);
     return new Hr(
@@ -14398,7 +14465,7 @@ RETURNING "lastValue" AS value`,
   }
 }
 var ao = /* @__PURE__ */ ((s) => (s[s.ERROR = 0] = "ERROR", s[s.INFO = 1] = "INFO", s))(ao || {});
-class Gi {
+class Ji {
   constructor(e = 0, t = {}) {
     this.level = e, this.fixed = t;
   }
@@ -14409,11 +14476,11 @@ class Gi {
     this.level >= 0 && console.error({ ...this.fixed, type: e, name: t, sql: i, params: r, error: a });
   }
   child(e = {}) {
-    return new Gi(this.level, { ...this.fixed, ...e });
+    return new Ji(this.level, { ...this.fixed, ...e });
   }
 }
 var no = /* @__PURE__ */ ((s) => (s[s.MUTE = -1] = "MUTE", s[s.ERROR = 0] = "ERROR", s[s.INFO = 1] = "INFO", s[s.DEBUG = 2] = "DEBUG", s))(no || {});
-class Ji {
+class Xi {
   constructor(e = 0, t = {}) {
     this.level = e, this.fixed = t;
   }
@@ -14427,10 +14494,10 @@ class Ji {
     this.level >= 2 && console.debug(`[DEBUG] ${e}: ${t}`, { ...this.fixed, ...i });
   }
   child(e) {
-    return new Ji(this.level, { ...this.fixed, ...e });
+    return new Xi(this.level, { ...this.fixed, ...e });
   }
 }
-const zo = new Gi(), so = new Ji();
+const zo = new Ji(), so = new Xi();
 class Go {
   constructor(e, t = so) {
     this.logger = t, this.conceptClass = /* @__PURE__ */ new Map(), this.storage = new ro(e);
@@ -14525,7 +14592,7 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
         "acquire migration lock"
       );
     } catch (r) {
-      throw Ct(r, this.db).isUniqueViolation ? new Error("Migration is already running (lock held by another process). If that process crashed, call controller.forceReleaseMigrationLock() after confirming no migration is actually running, then retry.") : r;
+      throw xt(r, this.db).isUniqueViolation ? new Error("Migration is already running (lock held by another process). If that process crashed, call controller.forceReleaseMigrationLock() after confirming no migration is actually running, then retry.") : r;
     }
   }
   async beginMigration(e, t, i, r = 0) {
@@ -14596,10 +14663,10 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
     await this.ensureMigrationManifestTable(), await this.storage.markMigrationOperationComplete(e, t);
   }
   async setup(e, t, i, r = !1) {
-    const a = typeof r == "boolean" ? r : r.install === !0, n = typeof r == "boolean" ? { install: a } : r, o = new mi(e, t), { entities: c, relations: u } = o.getAll();
+    const a = typeof r == "boolean" ? r : r.install === !0, n = typeof r == "boolean" ? { install: a } : r, o = new fi(e, t), { entities: c, relations: u } = o.getAll();
     i.forEach(({ dataContext: l, state: d }) => {
       Object.entries(d).forEach(([h, m]) => {
-        if (m instanceof D) {
+        if (m instanceof O) {
           if (!m.record)
             return;
           let f = o.getEntityByName(m.record);
@@ -14629,10 +14696,10 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
     ), await this.setupTransformUniqueIndexes(i);
   }
   prepareEntitiesForStorage(e, t, i) {
-    const r = new mi(e, t), { entities: a, relations: n } = r.getAll();
+    const r = new fi(e, t), { entities: a, relations: n } = r.getAll();
     return i.forEach(({ state: o }) => {
       Object.entries(o).forEach(([, c]) => {
-        if (c instanceof D) {
+        if (c instanceof O) {
           if (!c.record)
             return;
           let u = r.getEntityByName(c.record);
@@ -14693,11 +14760,11 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
   async setupTransformUniqueIndexes(e) {
     for (const { dataContext: t, state: i } of e) {
       const r = i.sourceRecordId, a = i.transformIndex;
-      if (!(r instanceof D) || !(a instanceof D) || r.unique === !1 || t.type !== "entity" && t.type !== "relation")
+      if (!(r instanceof O) || !(a instanceof O) || r.unique === !1 || t.type !== "entity" && t.type !== "relation")
         continue;
       const n = t.id.name, o = this.storage, c = o.queryHandle.map, u = c.getRecordInfo(n), [, l] = c.getTableAliasAndFieldName([n], r.key, !0), [, d] = c.getTableAliasAndFieldName([n], a.key, !0), h = `idx_transform_${this.hashIdentifier(`${u.table}_${l}_${d}`)}`, m = Q(o.db);
       await o.db.scheme(
-        bi(h, u.table, [l, d], m),
+        wi(h, u.table, [l, d], m),
         `setup transform unique index ${n}`
       );
     }
@@ -14708,12 +14775,12 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
     const r = new qe(i.map, i.aliasManager), a = Q(this.storage.db);
     return t.flatMap(({ dataContext: n, state: o }) => {
       const c = o.sourceRecordId, u = o.transformIndex;
-      if (!(c instanceof D) || !(u instanceof D) || c.unique === !1 || n.type !== "entity" && n.type !== "relation")
+      if (!(c instanceof O) || !(u instanceof O) || c.unique === !1 || n.type !== "entity" && n.type !== "relation")
         return [];
       const l = n.id.name, d = r.getRecordInfo(l), [, h] = r.getTableAliasAndFieldName([l], c.key, !0), [, m] = r.getTableAliasAndFieldName([l], u.key, !0), f = `idx_transform_${this.hashIdentifier(`${d.table}_${h}_${m}`)}`;
       return [{
         kind: "create-constraint",
-        sql: bi(f, d.table, [h, m], a),
+        sql: wi(f, d.table, [h, m], a),
         tableName: d.table,
         logicalPath: `${l}.${c.key}.${u.key}`,
         description: `migration setup transform unique index ${l}`
@@ -14724,7 +14791,7 @@ CREATE TABLE IF NOT EXISTS "__interaqt_migration_operation_log" (
     await this.storage.destroy();
   }
 }
-class ei {
+class ti {
   constructor(e, t) {
     this._type = "Action", this._options = t, this.uuid = q(t), this.name = e.name;
   }
@@ -14746,13 +14813,13 @@ class ei {
     };
   }
   static create(e, t) {
-    if (t?.uuid === jt) {
+    if (t?.uuid === Ht) {
       if (e.name !== "get")
         throw new Error(`Action with the reserved GetAction uuid must be named "get", got "${e.name}". The GET_ACTION_UUID identity is reserved for the built-in query action.`);
-      const a = this.instances.find((n) => n.uuid === jt);
+      const a = this.instances.find((n) => n.uuid === Ht);
       if (a) return a;
     }
-    const i = new ei(e, t);
+    const i = new ti(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Action`);
     return this.instances.push(i), i;
@@ -14784,25 +14851,25 @@ class ei {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-const jt = "interaqt:builtin:action:get", Jo = ei.create({ name: "get" }, { uuid: jt });
-function Ci(s) {
+const Ht = "interaqt:builtin:action:get", Jo = ti.create({ name: "get" }, { uuid: Ht });
+function xi(s) {
   if (!s) return;
   if (s.raw.type === "atom")
-    return zt.create({
+    return Gt.create({
       type: "atom",
       data: s.raw.data
     });
   const e = s.raw;
-  return Gt.create({
+  return Jt.create({
     type: "expression",
     operator: e.operator,
-    left: Ci(s.left),
-    right: Ci(s.right)
+    left: xi(s.left),
+    right: xi(s.right)
   });
 }
-class yt {
+class gt {
   constructor(e, t) {
-    this._type = "Conditions", this._options = t, this.uuid = q(t), e.content && e.content instanceof k ? this.content = Ci(e.content) : this.content = e.content;
+    this._type = "Conditions", this._options = t, this.uuid = q(t), e.content && e.content instanceof k ? this.content = xi(e.content) : this.content = e.content;
   }
   static {
     this.isKlass = !0;
@@ -14823,7 +14890,7 @@ class yt {
     };
   }
   static create(e, t) {
-    const i = new yt(e, t);
+    const i = new gt(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Conditions`);
     return this.instances.push(i), i;
@@ -14854,7 +14921,7 @@ class yt {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-const oo = "_Interaction_", Xi = j.create({
+const oo = "_Interaction_", Yi = j.create({
   name: oo,
   properties: [
     x.create({ name: "interactionId", type: "string", collection: !1 }),
@@ -14865,7 +14932,7 @@ const oo = "_Interaction_", Xi = j.create({
     x.create({ name: "context", type: "object", collection: !1 })
   ]
 });
-class Yi {
+class Zi {
   constructor(e, t) {
     this._type = "Interaction", this._options = t, this.uuid = q(t), this.name = e.name, this.conditions = e.conditions, this.action = e.action, this.payload = e.payload, this.data = e.data, this.dataPolicy = e.dataPolicy;
   }
@@ -14912,7 +14979,7 @@ class Yi {
     };
   }
   static create(e, t) {
-    if (yt.is(e.conditions) && !e.conditions.content)
+    if (gt.is(e.conditions) && !e.conditions.content)
       throw new Error(`Interaction "${e.name}" declares conditions with a Conditions instance that has no content. Provide content (a Condition BoolExp), or omit the conditions field.`);
     const i = e;
     for (const o of ["userAttributives", "userRef"])
@@ -14920,15 +14987,15 @@ class Yi {
         throw new Error(
           `Interaction "${e.name}" declares "${o}", but the Attributive concept has been removed. Express the check as a Condition (conditions receives the full event args: user, payload, activityId).`
         );
-    const r = e.action?.uuid === jt;
+    const r = e.action?.uuid === Ht;
     if (!r && (e.data !== void 0 || e.dataPolicy !== void 0)) {
       const o = e.action?.name === "get" ? ' An Action merely named "get" is not the query action.' : "";
       throw new Error(`Interaction "${e.name}" declares data/dataPolicy but its action "${e.action?.name}" is not the built-in query action.${o} Import { GetAction } from 'interaqt' and declare action: GetAction, or remove data/dataPolicy.`);
     }
-    const a = new Yi(e, t);
+    const a = new Zi(e, t);
     if (this.instances.find((o) => o.uuid === a.uuid))
       throw new Error(`duplicate uuid in options ${a.uuid}, Interaction`);
-    return a.entity = Xi, a.guard = co(a), a.mapEventData = uo(a), r && (a.resolve = lo(a)), this.instances.push(a), a;
+    return a.entity = Yi, a.guard = co(a), a.mapEventData = uo(a), r && (a.resolve = lo(a)), this.instances.push(a), a;
   }
   // CAUTION 必须走统一的 stringifyInstance 管线：嵌套的 Klass 实例（Action/Conditions/Payload/Entity 等）
   //  会被编码为 `uuid::` 引用、函数编码为 `func::`。此前手写的 JSON.stringify 会把嵌套实例内联成
@@ -14987,7 +15054,7 @@ async function Ta(s, e, t) {
 }
 async function ho(s, e, t) {
   if (!e.conditions) return;
-  const i = yt.is(e.conditions) ? new k(e.conditions.content) : k.atom(e.conditions), r = async (n) => {
+  const i = gt.is(e.conditions) ? new k(e.conditions.content) : k.atom(e.conditions), r = async (n) => {
     if (!n || !n.content)
       return `Condition '${n?.name ?? "(unnamed)"}' has no content to execute`;
     let o;
@@ -15089,7 +15156,7 @@ async function fo(s, e, t) {
     return s.system.storage.find(i, u, n, o);
   }
 }
-class Zi {
+class er {
   constructor(e, t) {
     this._type = "Activity", this._options = t, this.uuid = q(t), this.name = e.name, this.interactions = e.interactions || [], this.gateways = e.gateways || [], this.transfers = e.transfers || [], this.groups = e.groups || [], this.events = e.events || [];
   }
@@ -15137,7 +15204,7 @@ class Zi {
     };
   }
   static create(e, t) {
-    const i = new Zi(e, t);
+    const i = new er(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Activity`);
     return this.instances.push(i), i;
@@ -15241,7 +15308,7 @@ class He {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class er {
+class tr {
   constructor(e, t) {
     this._type = "Transfer", this._options = t, this.uuid = q(t), this.name = e.name, this.source = e.source, this.target = e.target;
   }
@@ -15274,7 +15341,7 @@ class er {
     };
   }
   static create(e, t) {
-    const i = new er(e, t);
+    const i = new tr(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Transfer`);
     return this.instances.push(i), i;
@@ -15322,7 +15389,7 @@ function Xo(s) {
 function Yo(s) {
   return null;
 }
-class tr {
+class ir {
   constructor(e, t) {
     this._type = "Condition", this._options = t, this.uuid = q(t), this.content = e.content, this.name = e.name;
   }
@@ -15352,7 +15419,7 @@ class tr {
       throw new Error(
         `Condition${e.name ? ` "${e.name}"` : ""} requires a function "content" (got ${e.content === void 0 ? "undefined" : typeof e.content}). Provide the guard callback, e.g. Condition.create({ name, content: async function(event) { return !!event.user.isAdmin } }).`
       );
-    const i = new tr(e, t);
+    const i = new ir(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Condition`);
     return this.instances.push(i), i;
@@ -15386,7 +15453,7 @@ class tr {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class ir {
+class rr {
   constructor(e, t) {
     this._type = "DataPolicy", this._options = t, this.uuid = q(t), this.match = e.match, this.modifier = e.modifier, this.attributeQuery = e.attributeQuery;
   }
@@ -15419,7 +15486,7 @@ class ir {
     };
   }
   static create(e, t) {
-    const i = new ir(e, t);
+    const i = new rr(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, DataPolicy`);
     return this.instances.push(i), i;
@@ -15444,7 +15511,7 @@ class ir {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class rt {
+class at {
   constructor(e, t) {
     this._type = "Gateway", this._options = t, this.uuid = q(t), this.name = e.name;
   }
@@ -15466,7 +15533,7 @@ class rt {
     };
   }
   static create(e, t) {
-    const i = new rt(e, t);
+    const i = new at(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Gateway`);
     return this.instances.push(i), i;
@@ -15498,7 +15565,7 @@ class rt {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class rr {
+class ar {
   constructor(e, t) {
     this._type = "Event", this._options = t, this.uuid = q(t), this.name = e.name;
   }
@@ -15520,7 +15587,7 @@ class rr {
     };
   }
   static create(e, t) {
-    const i = new rr(e, t);
+    const i = new ar(e, t);
     if (this.instances.find((a) => a.uuid === i.uuid))
       throw new Error(`duplicate uuid in options ${i.uuid}, Event`);
     return this.instances.push(i), i;
@@ -15552,7 +15619,7 @@ class rr {
     return this.create(M(t.public), { ...t.options, uuid: t.uuid });
   }
 }
-class ar {
+class Ze {
   constructor(e, t) {
     this._type = "PayloadItem", this._options = t, this.uuid = q(t), this.name = e.name, this.base = e.base, this.type = e.type, this.isRef = e.isRef ?? !1, this.required = e.required ?? !1, this.isCollection = e.isCollection ?? !1;
   }
@@ -15597,9 +15664,20 @@ class ar {
       }
     };
   }
+  static {
+    this.allowedTypes = ["string", "number", "boolean", "object", "Entity", "Relation"];
+  }
   static create(e, t) {
     if (e.isRef && !e.base)
       throw new Error(`PayloadItem '${e.name}' has isRef: true but no base. Declare base (the referenced Entity/Relation) so the guard can verify the referenced record exists.`);
+    if (e.type !== void 0 && !Ze.allowedTypes.includes(e.type))
+      throw new Error(
+        `PayloadItem '${e.name}' declares unsupported type "${e.type}". Runtime validation exists only for: ${Ze.allowedTypes.join(", ")}. An unknown type is silently unvalidated — declare one of the supported types, or omit type and validate the content with a Condition on the interaction.`
+      );
+    if ((e.type === "Entity" || e.type === "Relation") && !e.base)
+      throw new Error(
+        `PayloadItem '${e.name}' declares type: '${e.type}' but no base. Concept validation needs the Entity/Relation instance — declare base, or use a primitive type ('string'/'number'/'boolean'/'object') for plain data.`
+      );
     if (e.base !== void 0 && !j.is(e.base) && !Y.is(e.base))
       throw new Error(
         `PayloadItem '${e.name}' has an invalid base: expected an Entity or Relation instance. To validate payload contents, use the interaction's conditions instead.`
@@ -15610,7 +15688,7 @@ class ar {
         throw new Error(
           `PayloadItem '${e.name}' declares "${n}", but the Attributive concept has been removed. Express the check as a Condition on the interaction (conditions receives the full event args: user, payload, activityId).`
         );
-    const r = new ar(e, t);
+    const r = new Ze(e, t);
     if (this.instances.find((n) => n.uuid === r.uuid))
       throw new Error(`duplicate uuid in options ${r.uuid}, PayloadItem`);
     return this.instances.push(r), r;
@@ -15662,10 +15740,16 @@ class nr {
     };
   }
   static create(e, t) {
-    const i = new nr(e, t);
-    if (this.instances.find((a) => a.uuid === i.uuid))
-      throw new Error(`duplicate uuid in options ${i.uuid}, Payload`);
-    return this.instances.push(i), i;
+    const i = /* @__PURE__ */ new Set();
+    for (const n of e.items || []) {
+      if (i.has(n.name))
+        throw new Error(`Payload declares duplicate item name "${n.name}". Each payload item name must be unique.`);
+      i.add(n.name);
+    }
+    const r = new nr(e, t);
+    if (this.instances.find((n) => n.uuid === r.uuid))
+      throw new Error(`duplicate uuid in options ${r.uuid}, Payload`);
+    return this.instances.push(r), r;
   }
   // CAUTION 必须走统一的 stringifyInstance 管线：items 编码为 uuid:: 引用，
   //  否则 graph round-trip 后 items 变成与 PayloadItem 实例失去身份关联的裸对象。
@@ -15689,21 +15773,21 @@ class nr {
   }
 }
 const yo = [
-  Yi,
   Zi,
+  er,
   // CAUTION Transfer/ActivityGroup 必须注册：
   //  Activity.stringify 把 transfers/groups 编码为 `uuid::` 引用，
   //  未注册的类型在 createInstancesFromString（graph 级反序列化）中无法还原。
   He,
-  er,
   tr,
   ir,
-  ei,
-  rt,
   rr,
+  ti,
+  at,
   ar,
+  Ze,
   nr,
-  yt
+  gt
 ];
 yo.forEach((s) => {
   s && s.displayName && Vr(s.displayName, s);
@@ -15813,7 +15897,7 @@ class ee {
     this.parent.transferToNext(this.node.uuid);
   }
 }
-class hi {
+class pi {
   constructor(e, t) {
     this.graph = t, this.root = Ke.create(e, this.graph);
   }
@@ -15838,7 +15922,7 @@ class Ue {
     this.activity = e, this.uuidToNode = /* @__PURE__ */ new Map(), this.rawToNode = /* @__PURE__ */ new Map(), this.graph = this.buildGraph(e);
   }
   buildGraph(e, t) {
-    if (e.gateways?.length || e.transfers?.some((n) => rt.is(n.source) || rt.is(n.target)))
+    if (e.gateways?.length || e.transfers?.some((n) => at.is(n.source) || at.is(n.target)))
       throw new be(`Activity "${e.name}" uses Gateway nodes, which are not supported by the activity runtime. Model branching with ActivityGroup (type 'any'/'every'/'race') instead.`, { activityName: e.name });
     const i = {};
     for (let n of e.interactions) {
@@ -15882,7 +15966,7 @@ class Ue {
     this.ACTIVITY_RECORD = "_Activity_";
   }
   async create(e) {
-    const t = hi.createInitialState(this.graph.head);
+    const t = pi.createInitialState(this.graph.head);
     return {
       activityId: (await e.system.storage.create(Ue.ACTIVITY_RECORD, {
         name: this.activity.name,
@@ -15937,7 +16021,7 @@ class Ue {
     const r = await this.getState(e, t);
     if (!r)
       throw new Me(`activity ${t} not found for activity "${this.activity.name}"`, { activityName: this.activity.name, activityInstanceId: t });
-    if (!new hi(r, this).isInteractionAvailable(i))
+    if (!new pi(r, this).isInteractionAvailable(i))
       throw new Me(`interaction ${i} not available`, { activityName: this.activity.name, activityInstanceId: t, currentState: r });
   }
   // 与独立 interaction 的 guard 共用同一个 runner（runInteractionGuard），
@@ -15950,7 +16034,7 @@ class Ue {
     const r = await this.getActivity(e, t);
     if (!r)
       throw new Me(`activity ${t} not found for activity "${this.activity.name}"`, { activityName: this.activity.name, activityInstanceId: t });
-    const a = new hi(r.state, this);
+    const a = new pi(r.state, this);
     a.completeInteraction(i);
     const n = a.toJSON(), o = r.stateVersion ?? 0;
     if (!await e.system.storage.atomic.compareAndSet(
@@ -15988,8 +16072,8 @@ class wo extends ee {
   }
 }
 ee.GroupStateNodeType.set("race", wo);
-const Ro = "_Activity_", xa = j.create({
-  name: Ro,
+const No = "_Activity_", xa = j.create({
+  name: No,
   properties: [
     x.create({
       name: "name",
@@ -16014,17 +16098,17 @@ const Ro = "_Activity_", xa = j.create({
       collection: !1
     })
   ]
-}), No = Y.create({
+}), Ro = Y.create({
   name: "activityInteraction",
   source: xa,
   sourceProperty: "interaction",
-  target: Xi,
+  target: Yi,
   targetProperty: "activity",
   type: "1:n"
 });
 class Zo {
   constructor(e) {
-    this.activityCalls = /* @__PURE__ */ new Map(), this.activityCallsByName = /* @__PURE__ */ new Map(), this.activityEventSources = [], this.requiredEntities = [], this.requiredRelations = [], e.length > 0 && (this.requiredEntities.push(xa, Xi), this.requiredRelations.push(No)), e.forEach((t) => {
+    this.activityCalls = /* @__PURE__ */ new Map(), this.activityCallsByName = /* @__PURE__ */ new Map(), this.activityEventSources = [], this.requiredEntities = [], this.requiredRelations = [], e.length > 0 && (this.requiredEntities.push(xa, Yi), this.requiredRelations.push(Ro)), e.forEach((t) => {
       const i = new Ue(t);
       this.activityCalls.set(t.uuid, i), t.name && (_(!this.activityCallsByName.has(t.name), `activity name ${t.name} is duplicated`), this.activityCallsByName.set(t.name, i));
     });
@@ -16117,75 +16201,75 @@ class ec extends ae {
   }
 }
 export {
-  Ro as ACTIVITY_RECORD,
+  No as ACTIVITY_RECORD,
   Ba as ALL_ATTR_SYMBOL,
-  ui as ASYNC_TASK_RECORD,
-  ei as Action,
-  Zi as Activity,
+  li as ASYNC_TASK_RECORD,
+  ti as Action,
+  er as Activity,
   Ue as ActivityCall,
   be as ActivityError,
   He as ActivityGroup,
-  No as ActivityInteractionRelation,
+  Ro as ActivityInteractionRelation,
   Zo as ActivityManager,
   xa as ActivityStateEntity,
   Me as ActivityStateError,
   nn as AliasManager,
   ua as AmbiguousComputationSignatureError,
-  dt as Any,
+  ht as Any,
   Cn as AnyHandles,
-  Bi as AsyncMigrationComputationError,
+  Ui as AsyncMigrationComputationError,
   ke as AttributeInfo,
   K as AttributeQuery,
-  ut as Average,
+  lt as Average,
   zn as AverageHandles,
-  zt as BoolAtomData,
+  Gt as BoolAtomData,
   k as BoolExp,
-  Gt as BoolExpressionData,
+  Jt as BoolExpressionData,
   Se as ComputationDataDepError,
   V as ComputationError,
   z as ComputationProtocolError,
   U as ComputationResult,
-  mt as ComputationResultAsync,
+  ft as ComputationResultAsync,
   Gr as ComputationResultFullRecompute,
-  Jt as ComputationResultResolved,
+  Xt as ComputationResultResolved,
   Oe as ComputationResultSkip,
-  oi as ComputationStateError,
-  tr as Condition,
-  wi as ConditionError,
-  yt as Conditions,
+  ci as ComputationStateError,
+  ir as Condition,
+  Ni as ConditionError,
+  gt as Conditions,
   Ce as ConstraintSetupError,
   Hr as ConstraintViolationError,
   Wo as Controller,
-  ot as Count,
+  ct as Count,
   In as CountHandles,
   ja as CreationExecutor,
-  Kt as Custom,
+  Wt as Custom,
   Zn as CustomHandles,
-  Gi as DBConsoleLogger,
+  Ji as DBConsoleLogger,
   ao as DBLogLevel,
   le as DBSetup,
   fr as DEFAULT_SCHEMA_DIALECT,
   Vo as DELETED_STATE,
   Z as DICTIONARY_RECORD,
-  ir as DataPolicy,
+  rr as DataPolicy,
   he as DestructiveComputedOutputError,
-  Ii as Dictionary,
+  Pi as Dictionary,
   gr as DictionaryEntity,
   j as Entity,
   Jn as EntityCustomHandle,
-  gi as EntityQueryHandle,
+  bi as EntityQueryHandle,
   qe as EntityToTableMap,
   Fi as Equation,
   ve as ErrorCategory,
   te as ErrorSeverity,
-  rr as Event,
-  Di as EventSource,
-  lt as Every,
+  ar as Event,
+  Oi as EventSource,
+  dt as Every,
   $n as EveryHandles,
   J as Expression,
   ae as FrameworkError,
-  jt as GET_ACTION_UUID,
-  rt as Gateway,
+  Ht as GET_ACTION_UUID,
+  at as Gateway,
   Jo as GetAction,
   kn as GlobalAnyHandle,
   Kn as GlobalAverageHandle,
@@ -16196,36 +16280,36 @@ export {
   _n as GlobalRealTimeComputation,
   yn as GlobalStateMachineHandle,
   Qn as GlobalSumHandle,
-  Rn as GlobalWeightedSummationHandle,
-  qt as HARD_DELETION_PROPERTY_NAME,
+  Nn as GlobalWeightedSummationHandle,
+  Dt as HARD_DELETION_PROPERTY_NAME,
   Ko as HardDeletionProperty,
   Ie as ID_ATTR,
   oo as INTERACTION_RECORD,
-  Vt as Inequality,
-  Yi as Interaction,
-  Xi as InteractionEventEntity,
+  _t as Inequality,
+  Zi as Interaction,
+  Yi as InteractionEventEntity,
   ec as InteractionExecutionError,
   ge as InteractionGuardError,
-  Dt as KlassByName,
+  Ot as KlassByName,
   v as LINK_SYMBOL,
   Ft as LinkInfo,
-  Vi as MIGRATION_MANIFEST_CONCEPT,
-  _i as MIGRATION_MANIFEST_CURRENT_KEY,
+  _i as MIGRATION_MANIFEST_CONCEPT,
+  Bi as MIGRATION_MANIFEST_CURRENT_KEY,
   E as MatchExp,
-  Pt as MigrationBaselineError,
+  Mt as MigrationBaselineError,
   C as MigrationError,
   Ur as Modifier,
   Go as MonoSystem,
-  Lo as NON_DELETED_STATE,
-  Fo as NON_EXIST_STATE,
+  Fo as NON_DELETED_STATE,
+  Lo as NON_EXIST_STATE,
   Pn as NestedDispatchError,
   ie as NewRecordData,
-  Pi as NonNullConstraint,
+  Mi as NonNullConstraint,
   Io as PHASE_AFTER_ALL,
   Ao as PHASE_BEFORE_ALL,
-  ci as PHASE_NORMAL,
+  ui as PHASE_NORMAL,
   nr as Payload,
-  ar as PayloadItem,
+  Ze as PayloadItem,
   Qo as PhysicalLayoutChangeError,
   x as Property,
   Tn as PropertyAnyHandle,
@@ -16237,50 +16321,50 @@ export {
   ns as PropertyScopedSequenceHandle,
   gn as PropertyStateMachineHandle,
   jn as PropertySumHandle,
-  Ai as PropertyTypes,
-  Nn as PropertyWeightedSummationHandle,
+  Ii as PropertyTypes,
+  Rn as PropertyWeightedSummationHandle,
   Ga as QueryExecutor,
-  Ot as ROOT_LABEL,
+  Lt as ROOT_LABEL,
   Pe as ROW_ID_ATTR,
-  ht as RealTime,
+  pt as RealTime,
   Un as RealTimeHandles,
-  D as RecordBoundState,
-  et as RecordInfo,
+  O as RecordBoundState,
+  tt as RecordInfo,
   ka as RecordMutationSideEffect,
   G as RecordQuery,
   Ya as RecordQueryAgent,
   za as RecordQueryRef,
   oe as RecordQueryTree,
-  Ln as RecordsTransformHandle,
+  Fn as RecordsTransformHandle,
   je as RecursiveContext,
-  mi as RefContainer,
+  fi as RefContainer,
   Y as Relation,
   Xn as RelationCustomHandle,
   de as RequireSerializableRetry,
   Wa as SQLBuilder,
   Je as SYSTEM_RECORD,
-  _t as Scheduler,
-  Ze as ScopedSequence,
+  Bt as Scheduler,
+  et as ScopedSequence,
   ss as ScopedSequenceHandles,
-  qi as SideEffect,
-  nt as StateMachine,
+  Di as SideEffect,
+  st as StateMachine,
   bn as StateMachineHandles,
   We as StateNode,
-  Mi as StateTransfer,
-  ct as Summation,
+  qi as StateTransfer,
+  ut as Summation,
   Hn as SummationHandles,
-  Ji as SystemConsoleLogger,
+  Xi as SystemConsoleLogger,
   yr as SystemEntity,
   no as SystemLogLevel,
-  xt as TransactionCapabilityError,
-  At as TransactionRetryExhaustedError,
-  er as Transfer,
-  Wt as Transform,
+  At as TransactionCapabilityError,
+  It as TransactionRetryExhaustedError,
+  tr as Transfer,
+  zt as Transform,
   Vn as TransformHandles,
   Ho as USER_ENTITY,
-  Ht as UniqueConstraint,
-  tt as UnrebuildableComputationError,
-  st as WeightedSummation,
+  Kt as UniqueConstraint,
+  it as UnrebuildableComputationError,
+  ot as WeightedSummation,
   vn as WeightedSummationHandles,
   Is as addComputationTakeoverReview,
   ks as addEmptyFactRecordRemovalReview,
@@ -16294,7 +16378,7 @@ export {
   Ea as assertDestructiveScopeAllowed,
   $r as assertManifestGeneratorCurrent,
   Cs as assertScopedSequenceNoSeedDecisions,
-  Li as asyncEffectsContext,
+  Vi as asyncEffectsContext,
   ls as asyncInteractionContext,
   zs as backfillNewFactPropertyDefaults,
   xr as buildAffectedRebuildPlan,
@@ -16304,20 +16388,20 @@ export {
   mo as checkPayload,
   ko as clearAllInstances,
   we as collectErrorChain,
-  ft as computationManifestId,
+  yt as computationManifestId,
   As as createEmptyFactRecordRemovalOperations,
   Pa as createInstances,
   Co as createInstancesFromString,
-  St as createMigrationManifest,
+  Et as createMigrationManifest,
   kr as createMigrationReadHandle,
   cn as createNonNullConstraintStatement,
   Js as createPlanBlockingMessages,
   on as createUniqueConstraintStatement,
-  bi as createUniqueIndexSQL,
-  F as dataContextPath,
+  wi as createUniqueIndexSQL,
+  L as dataContextPath,
   zo as dbConsoleLogger,
   M as decodeFunctionValues,
-  gt as deepClone,
+  bt as deepClone,
   Jr as defaultDataBasedIncrementalPlan,
   jr as defaultEncodeLiteral,
   X as describeDataContext,
@@ -16330,42 +16414,42 @@ export {
   Yo as findRootActivity,
   Ca as forEachInteraction,
   q as generateUUID,
-  Ra as getApprovedEmptyFactRecordRemovals,
+  Na as getApprovedEmptyFactRecordRemovals,
   jo as getChangedComputations,
   Ds as getChangedComputationsFromApprovedDiff,
   us as getCurrentEffects,
-  Ti as getDestructiveDeletionScope,
+  Ci as getDestructiveDeletionScope,
   Oa as getEffectiveScopedSequenceInitializerMatch,
-  Wi as getFilteredRecordChanges,
+  zi as getFilteredRecordChanges,
   Xo as getInteractions,
   Ws as getNewFactPropertyBackfills,
   Pr as getNewFilteredDataContexts,
   Qs as getRecomputeBlockingChanges,
   Q as getSchemaDialect,
-  Fs as getScopedSequenceNoSeedOperations,
+  Ls as getScopedSequenceNoSeedOperations,
   Os as getScopedSequenceSeedOperations,
   Ar as getStorageBlockingChanges,
   _o as hasErrorCode,
   ds as hashMigrationDiff,
   $o as indexBy,
-  Lr as isObject,
-  at as isPlainObject,
+  Fr as isObject,
+  nt as isPlainObject,
   Mn as isRequireSerializableRetry,
   Dn as isRetryableTransactionError,
   Uo as isTransactionCapabilityError,
   Bo as isTransactionRetryExhaustedError,
   Mo as mapObject,
-  Ct as normalizeDatabaseError,
-  Ne as normalizeScopedSequenceMatchExpression,
+  xt as normalizeDatabaseError,
+  Re as normalizeScopedSequenceMatchExpression,
   sn as predicateSQLForOperator,
   ce as quoteIdentifier,
-  wt as quoteLiteral,
+  Nt as quoteLiteral,
   Mr as readMigrationManifest,
   Zs as recomputeChangedComputations,
   to as recomputeFilteredMemberships,
   Vr as registerKlass,
   Ta as runInteractionGuard,
-  Oi as runWithTransactionRetry,
+  Li as runWithTransactionRetry,
   Ks as seedScopedSequenceInitializers,
   Do as someAsync,
   xo as sqliteEncodeLiteral,
@@ -16375,6 +16459,6 @@ export {
   B as stringifyInstance,
   so as systemConsoleLogger,
   qs as validateApprovedDiff,
-  di as writeMigrationManifest
+  hi as writeMigrationManifest
 };
 //# sourceMappingURL=index.js.map