@neocompose/cli 0.36.8 → 0.36.10

package/dist/neo.mjs

@@ -45228,6 +45228,21 @@ function findSchemaPlacement(memberId, classes) {
   }
   return null;
 }
+function findNearestAncestorSchemaPlacement(ownerClass, schemaKey, classesById) {
+  const visited = /* @__PURE__ */ new Set([ownerClass.id]);
+  let ancestorId = ownerClass.extendsClassId;
+  while (typeof ancestorId === "string") {
+    if (visited.has(ancestorId)) return null;
+    visited.add(ancestorId);
+    const ancestor = classesById.get(ancestorId);
+    if (ancestor === void 0) return null;
+    if (typeof ancestor.schema[schemaKey] === "string") {
+      return { ownerClass: ancestor, schemaKey };
+    }
+    ancestorId = ancestor.extendsClassId;
+  }
+  return null;
+}
 function walkExtendsMemberChain(startId, members, pick, options) {
   const requireKind = options?.requireKind;
   const maxHops = options?.maxHops ?? 16;
@@ -57224,6 +57239,104 @@ var init_dialogue_sources = __esm({
   }
 });
 
+// ../src/models/variants/variants.ts
+function isNonEmptyString2(value) {
+  if (typeof value !== "string") return false;
+  return value.length > 0;
+}
+function isNeoClassVariant(value) {
+  if (typeof value !== "object" || value === null) return false;
+  if (Array.isArray(value)) return false;
+  const v = value;
+  if (!isNonEmptyString2(v.id)) return false;
+  if (!isNonEmptyString2(v.classId)) return false;
+  if (!isNonEmptyString2(v.name)) return false;
+  if (!isNonEmptyString2(v.valueId)) return false;
+  if (v.folderId !== null && !isNonEmptyString2(v.folderId)) return false;
+  return true;
+}
+function isNeoClassVariantFolder(value) {
+  if (typeof value !== "object" || value === null) return false;
+  if (Array.isArray(value)) return false;
+  const v = value;
+  if (!isNonEmptyString2(v.id)) return false;
+  if (!isNonEmptyString2(v.classId)) return false;
+  if (typeof v.path !== "string") return false;
+  if (v.binding === void 0 || v.binding === null) return v.path.length > 0;
+  if (typeof v.binding !== "object" || Array.isArray(v.binding)) return false;
+  const binding = v.binding;
+  if (!isNonEmptyString2(binding.collectionMemberId)) return false;
+  if (!isNonEmptyString2(binding.collectionValueId)) return false;
+  return true;
+}
+var NEO_VARIANT_INITIALIZE_SCHEMA_KEY, NEO_VARIANT_APPLY_SCHEMA_KEY, NEO_VARIANT_OVERRIDES_SCHEMA_KEY, NEO_VARIANT_CHILD_OVERRIDES_SCHEMA_KEY;
+var init_variants = __esm({
+  "../src/models/variants/variants.ts"() {
+    "use strict";
+    NEO_VARIANT_INITIALIZE_SCHEMA_KEY = "Initialize";
+    NEO_VARIANT_APPLY_SCHEMA_KEY = "Apply";
+    NEO_VARIANT_OVERRIDES_SCHEMA_KEY = "Overrides";
+    NEO_VARIANT_CHILD_OVERRIDES_SCHEMA_KEY = "ChildOverrides";
+  }
+});
+
+// ../src/models/variants/variant-member.ts
+function neoVariantSystemClass(classes, lookup = false) {
+  const declared = classes.find(
+    (item) => item.system?.worldKind === (lookup ? NeoWorldSystemClassKind.LookupVariant : NeoWorldSystemClassKind.Variant)
+  );
+  if (declared === void 0) return null;
+  const targetParamId = declared.genericParams?.[0]?.id;
+  if (targetParamId === void 0) return null;
+  const valueParamId = declared.genericParams?.[1]?.id;
+  return {
+    classId: declared.id,
+    targetParamId,
+    ...valueParamId === void 0 ? {} : { valueParamId }
+  };
+}
+var init_variant_member = __esm({
+  "../src/models/variants/variant-member.ts"() {
+    "use strict";
+    init_core();
+    init_member_kind_enum();
+  }
+});
+
+// ../src/models/variants/variant-naming.ts
+var init_variant_naming = __esm({
+  "../src/models/variants/variant-naming.ts"() {
+    "use strict";
+  }
+});
+
+// ../src/models/variants/variant-write.ts
+var init_variant_write = __esm({
+  "../src/models/variants/variant-write.ts"() {
+    "use strict";
+  }
+});
+
+// ../src/models/variants/variant-initialize-source.ts
+var init_variant_initialize_source = __esm({
+  "../src/models/variants/variant-initialize-source.ts"() {
+    "use strict";
+    init_member_kind_enum();
+  }
+});
+
+// ../src/models/variants/index.ts
+var init_variants2 = __esm({
+  "../src/models/variants/index.ts"() {
+    "use strict";
+    init_variants();
+    init_variant_member();
+    init_variant_naming();
+    init_variant_write();
+    init_variant_initialize_source();
+  }
+});
+
 // src/project-source/lower-support.ts
 function identityMap(declarations, kind) {
   return new Map(
@@ -61184,99 +61297,6 @@ var init_member_value_id = __esm({
   }
 });
 
-// ../src/models/variants/variants.ts
-function isNonEmptyString2(value) {
-  if (typeof value !== "string") return false;
-  return value.length > 0;
-}
-function isNeoClassVariant(value) {
-  if (typeof value !== "object" || value === null) return false;
-  if (Array.isArray(value)) return false;
-  const v = value;
-  if (!isNonEmptyString2(v.id)) return false;
-  if (!isNonEmptyString2(v.classId)) return false;
-  if (!isNonEmptyString2(v.name)) return false;
-  if (!isNonEmptyString2(v.valueId)) return false;
-  if (v.folderId !== null && !isNonEmptyString2(v.folderId)) return false;
-  return true;
-}
-function isNeoClassVariantFolder(value) {
-  if (typeof value !== "object" || value === null) return false;
-  if (Array.isArray(value)) return false;
-  const v = value;
-  if (!isNonEmptyString2(v.id)) return false;
-  if (!isNonEmptyString2(v.classId)) return false;
-  if (typeof v.path !== "string") return false;
-  if (v.binding === void 0 || v.binding === null) return v.path.length > 0;
-  if (typeof v.binding !== "object" || Array.isArray(v.binding)) return false;
-  const binding = v.binding;
-  if (!isNonEmptyString2(binding.collectionMemberId)) return false;
-  if (!isNonEmptyString2(binding.collectionValueId)) return false;
-  return true;
-}
-var init_variants = __esm({
-  "../src/models/variants/variants.ts"() {
-    "use strict";
-  }
-});
-
-// ../src/models/variants/variant-member.ts
-function neoVariantSystemClass(classes, lookup = false) {
-  const declared = classes.find(
-    (item) => item.system?.worldKind === (lookup ? NeoWorldSystemClassKind.LookupVariant : NeoWorldSystemClassKind.Variant)
-  );
-  if (declared === void 0) return null;
-  const targetParamId = declared.genericParams?.[0]?.id;
-  if (targetParamId === void 0) return null;
-  const valueParamId = declared.genericParams?.[1]?.id;
-  return {
-    classId: declared.id,
-    targetParamId,
-    ...valueParamId === void 0 ? {} : { valueParamId }
-  };
-}
-var init_variant_member = __esm({
-  "../src/models/variants/variant-member.ts"() {
-    "use strict";
-    init_core();
-    init_member_kind_enum();
-  }
-});
-
-// ../src/models/variants/variant-naming.ts
-var init_variant_naming = __esm({
-  "../src/models/variants/variant-naming.ts"() {
-    "use strict";
-  }
-});
-
-// ../src/models/variants/variant-write.ts
-var init_variant_write = __esm({
-  "../src/models/variants/variant-write.ts"() {
-    "use strict";
-  }
-});
-
-// ../src/models/variants/variant-initialize-source.ts
-var init_variant_initialize_source = __esm({
-  "../src/models/variants/variant-initialize-source.ts"() {
-    "use strict";
-    init_member_kind_enum();
-  }
-});
-
-// ../src/models/variants/index.ts
-var init_variants2 = __esm({
-  "../src/models/variants/index.ts"() {
-    "use strict";
-    init_variants();
-    init_variant_member();
-    init_variant_naming();
-    init_variant_write();
-    init_variant_initialize_source();
-  }
-});
-
 // ../src/models/project/project-root-members.ts
 function buildRootStorageMap(project) {
   const map = /* @__PURE__ */ new Map();
@@ -82093,6 +82113,16 @@ function neoScriptMemberContractProjection(value) {
     defaultPresent: value.defaultValue != null
   };
 }
+function transactionImpactsAnyOwnerMember(scope, impactedIds) {
+  for (const member of scope.document.members) {
+    if (impactedIds.has(member.id)) return true;
+  }
+  for (const root of scope.roots) {
+    const ownerId = Reflect.get(root.member, "id");
+    if (typeof ownerId === "string" && impactedIds.has(ownerId)) return true;
+  }
+  return false;
+}
 function collectNeoScriptRecompileTargets(args) {
   if (args.forceRecompile === true) return completeTargets(args.postDocument);
   const explicit = explicitTargetIds(args.changes);
@@ -82156,15 +82186,17 @@ function collectNeoScriptRecompileTargets(args) {
       args.postDocument,
       args.postDocument.variants ?? []
     );
-    const ownerByValueId = resolveOwnerMembersForValues(
-      scope.document,
-      new Set(postValues.map((record3) => record3.id)),
-      scope.roots
-    );
-    for (const [valueId, owner] of ownerByValueId) {
-      const ownerId = Reflect.get(owner, "id");
-      if (typeof ownerId === "string" && impactedIds.has(ownerId)) {
-        valueIds.add(valueId);
+    if (transactionImpactsAnyOwnerMember(scope, impactedIds)) {
+      const ownerByValueId = resolveOwnerMembersForValues(
+        scope.document,
+        new Set(postValues.map((record3) => record3.id)),
+        scope.roots
+      );
+      for (const [valueId, owner] of ownerByValueId) {
+        const ownerId = Reflect.get(owner, "id");
+        if (typeof ownerId === "string" && impactedIds.has(ownerId)) {
+          valueIds.add(valueId);
+        }
       }
     }
   }
@@ -88544,6 +88576,56 @@ var init_project_version_transaction_types = __esm({
   }
 });
 
+// ../src/database/project-version-relation-sweep-trigger.ts
+function stagedChangesAffectClassRelations(current, changes) {
+  const classesById = new Map(
+    (current.classes ?? []).map((schemaClass2) => [schemaClass2.id, schemaClass2])
+  );
+  const valuesById = new Map(
+    (current.values ?? []).map((value) => [value.id, value])
+  );
+  for (const change of changes) {
+    if (change.recordKind === "internal-record-relation") return true;
+    if (change.recordKind === "class") {
+      if (change.operation !== "update") return true;
+      if (change.deleted === true) return true;
+      const before2 = classesById.get(change.recordId);
+      if (before2 === void 0) return true;
+      const after = change.nextData;
+      if (!isPlainRecord(after)) return true;
+      if (before2.extendsClassId !== after.extendsClassId) return true;
+      continue;
+    }
+    if (change.recordKind !== "value") continue;
+    const before = valuesById.get(change.recordId);
+    if (valueCreateCannotAffectClassRelations(change, before)) continue;
+    if (relationEndpointClassId(before) !== relationEndpointClassId(change.nextData)) {
+      return true;
+    }
+  }
+  return false;
+}
+function valueCreateCannotAffectClassRelations(change, before) {
+  if (change.operation !== "create") return false;
+  if (change.deleted === true) return false;
+  return before === void 0;
+}
+function relationEndpointClassId(record3) {
+  if (!isPlainRecord(record3)) return void 0;
+  if (typeof record3.classId === "string") return record3.classId;
+  if (typeof record3.typeId === "string") return record3.typeId;
+  return void 0;
+}
+function isPlainRecord(value) {
+  if (value === null || typeof value !== "object") return false;
+  return !Array.isArray(value);
+}
+var init_project_version_relation_sweep_trigger = __esm({
+  "../src/database/project-version-relation-sweep-trigger.ts"() {
+    "use strict";
+  }
+});
+
 // ../src/database/project-version-transaction-planning.ts
 function variantRootValueId2(data) {
   if (typeof data !== "object" || data === null) return null;
@@ -88565,7 +88647,7 @@ function addProjectVersionTransactionBudgets(left, right) {
     returnBytes: left.returnBytes + right.returnBytes
   };
 }
-var KIB, MIB, PROJECT_TRANSACTION_CHUNK_PAYLOAD_TARGET_BYTES, PROJECT_TRANSACTION_IMMEDIATE_BUDGET, PROJECT_TRANSACTION_WORKER_BUDGET, PROJECT_TRANSACTION_SINGLE_CHANGE_NATIVE_BUDGET, EMPTY_BUDGET, CHUNK_GRAPH_VALIDATION_RESERVE, CHUNK_FIXED_COST, IMMEDIATE_FIXED_COST, WHOLE_GRAPH_VALIDATION_SURCHARGE;
+var KIB, MIB, PROJECT_TRANSACTION_CHUNK_PAYLOAD_TARGET_BYTES, PROJECT_TRANSACTION_IMMEDIATE_BUDGET, PROJECT_TRANSACTION_WORKER_BUDGET, PROJECT_TRANSACTION_SINGLE_CHANGE_NATIVE_BUDGET, EMPTY_BUDGET, CHUNK_GRAPH_VALIDATION_RESERVE, CHUNK_FIXED_COST, IMMEDIATE_FIXED_COST, WHOLE_GRAPH_VALIDATION_SURCHARGE, CHANGE_BYTES_READ_OVERHEAD, CHANGE_BYTES_WRITTEN_OVERHEAD;
 var init_project_version_transaction_planning = __esm({
   "../src/database/project-version-transaction-planning.ts"() {
     "use strict";
@@ -88579,8 +88661,8 @@ var init_project_version_transaction_planning = __esm({
       bytesWritten: 4 * MIB,
       documentsRead: 4e3,
       documentsWritten: 1400,
-      databaseQueries: 420,
-      indexRanges: 320,
+      databaseQueries: 800,
+      indexRanges: 800,
       functionsScheduled: 24,
       scheduledFunctionArgsBytes: 64 * KIB,
       returnBytes: 4 * MIB
@@ -88591,8 +88673,8 @@ var init_project_version_transaction_planning = __esm({
       bytesWritten: 4 * MIB,
       documentsRead: 4e3,
       documentsWritten: 900,
-      databaseQueries: 420,
-      indexRanges: 320,
+      databaseQueries: 700,
+      indexRanges: 700,
       functionsScheduled: 8,
       scheduledFunctionArgsBytes: 32 * KIB,
       returnBytes: 128 * KIB
@@ -88628,9 +88710,9 @@ var init_project_version_transaction_planning = __esm({
       bytesRead: 32 * KIB,
       bytesWritten: 48 * KIB,
       documentsRead: 4,
-      documentsWritten: 4,
-      databaseQueries: 10,
-      indexRanges: 8,
+      documentsWritten: 5,
+      databaseQueries: 97,
+      indexRanges: 105,
       functionsScheduled: 2,
       scheduledFunctionArgsBytes: 2 * KIB,
       returnBytes: 2 * KIB
@@ -88639,21 +88721,23 @@ var init_project_version_transaction_planning = __esm({
       argumentBytes: 2 * KIB,
       bytesRead: 96 * KIB,
       bytesWritten: 64 * KIB,
-      documentsRead: 12,
-      documentsWritten: 4,
+      documentsRead: 18,
+      documentsWritten: 8,
       databaseQueries: 34,
-      indexRanges: 24,
+      indexRanges: 34,
       functionsScheduled: 4,
       scheduledFunctionArgsBytes: 8 * KIB,
       returnBytes: 8 * KIB
     };
     WHOLE_GRAPH_VALIDATION_SURCHARGE = {
       ...EMPTY_BUDGET,
-      bytesRead: 512 * KIB,
-      documentsRead: 400,
-      databaseQueries: 300,
-      indexRanges: 200
+      bytesRead: 336 * KIB,
+      documentsRead: 782,
+      databaseQueries: 410,
+      indexRanges: 410
     };
+    CHANGE_BYTES_READ_OVERHEAD = 4 * KIB;
+    CHANGE_BYTES_WRITTEN_OVERHEAD = 4 * KIB;
   }
 });
 
@@ -89764,6 +89848,97 @@ var init_localizable_member_value_writes = __esm({
 });
 
 // ../src/database/project-version-schema-commit.ts
+function indexRecordsById(records2) {
+  const recordsById2 = /* @__PURE__ */ new Map();
+  for (const record3 of records2) recordsById2.set(record3.id, record3);
+  return recordsById2;
+}
+function indexLiveContentHashesByRecordId(heads, recordKind) {
+  const hashes = /* @__PURE__ */ new Map();
+  for (const head of heads) {
+    if (head.recordKind !== recordKind || head.deleted) continue;
+    hashes.set(head.recordId, head.contentHash);
+  }
+  return hashes;
+}
+function indexLiveContentHashesByRecordKey(heads) {
+  const hashes = /* @__PURE__ */ new Map();
+  for (const head of heads) {
+    if (head.deleted) continue;
+    hashes.set(`${head.recordKind}:${head.recordId}`, head.contentHash);
+  }
+  return hashes;
+}
+function indexChangesByRecordId(changes, recordKind) {
+  const indexes = /* @__PURE__ */ new Map();
+  for (let index = 0; index < changes.length; index += 1) {
+    const change = changes[index];
+    if (change?.recordKind === recordKind) indexes.set(change.recordId, index);
+  }
+  return indexes;
+}
+function reconcileDirectOverrideChains(args) {
+  if (!args.changes.some(
+    (change) => change.recordKind === "class" || change.recordKind === "member"
+  )) {
+    return;
+  }
+  const postDocument = applyProjectVersionWriteChanges(
+    args.document,
+    args.changes
+  );
+  const postClassesById = indexRecordsById(postDocument.classes);
+  const postMembersById = indexRecordsById(postDocument.members);
+  const changeIndexByMemberId = indexChangesByRecordId(args.changes, "member");
+  let baseHashByMemberId = null;
+  for (const schemaClass2 of postDocument.classes) {
+    for (const [schemaKey, memberId] of Object.entries(schemaClass2.schema)) {
+      const member = postMembersById.get(memberId);
+      if (member === void 0 || typeof member.extendsMemberId !== "string") {
+        continue;
+      }
+      const expectedPlacement = findNearestAncestorSchemaPlacement(
+        schemaClass2,
+        schemaKey,
+        postClassesById
+      );
+      const expected = expectedPlacement?.ownerClass.schema[expectedPlacement.schemaKey];
+      if (expected === member.extendsMemberId) continue;
+      if (typeof expected !== "string") continue;
+      const nextMember = { ...member, extendsMemberId: expected };
+      postMembersById.set(member.id, nextMember);
+      const existingIndex = changeIndexByMemberId.get(member.id);
+      if (existingIndex !== void 0) {
+        const existing = args.changes[existingIndex];
+        if (existing !== void 0) {
+          args.changes[existingIndex] = { ...existing, nextData: nextMember };
+        }
+        continue;
+      }
+      baseHashByMemberId ??= indexLiveContentHashesByRecordId(
+        args.contentHashHeads,
+        "member"
+      );
+      const expectedBaseContentHash = baseHashByMemberId.get(member.id);
+      if (expectedBaseContentHash === void 0) {
+        throw new Error(
+          `Cannot safely repair override chain for member "${member.name}" (${member.id}): its current content hash is unavailable.`
+        );
+      }
+      changeIndexByMemberId.set(member.id, args.changes.length);
+      args.changes.push({
+        recordKind: "member",
+        recordId: member.id,
+        operation: "update",
+        nextData: nextMember,
+        expectedBaseContentHash,
+        intent: createProjectVersionIntent("member.update", {
+          source: "server-direct-override-chain-reconcile"
+        })
+      });
+    }
+  }
+}
 function prepareServerOwnedSchemaCommit(args) {
   if (args.forceRecompile === true) clearNeoScriptBodyCompileCache();
   assertUniqueChanges(args.changes);
@@ -89784,6 +89959,18 @@ function prepareServerOwnedSchemaCommit(args) {
     ),
     changes: authoredChanges
   });
+  const explicitlyChangedMemberIds = /* @__PURE__ */ new Set();
+  for (const change of authoredChanges) {
+    if (change.recordKind !== "member" || change.operation === "delete") {
+      continue;
+    }
+    explicitlyChangedMemberIds.add(change.recordId);
+  }
+  reconcileDirectOverrideChains({
+    document: args.document,
+    changes: authoredChanges,
+    contentHashHeads: args.contentHashHeads
+  });
   assertNoLegacyWorldLayerBindingFields(authoredChanges);
   const hasSchemaChange = authoredChanges.some(
     (change) => SCHEMA_RECORD_KINDS.has(change.recordKind)
@@ -89812,11 +89999,6 @@ function prepareServerOwnedSchemaCommit(args) {
     additionalImpactedIds: args.additionalImpactedIds,
     forceRecompile: args.forceRecompile
   });
-  const explicitlyChangedMemberIds = new Set(
-    authoredChanges.filter(
-      (change) => change.recordKind === "member" && change.operation !== "delete"
-    ).map((change) => change.recordId)
-  );
   const currentById = new Map(
     args.document.members.map((member) => [member.id, member])
   );
@@ -89875,9 +90057,12 @@ function prepareServerOwnedSchemaCommit(args) {
   const compiledById = new Map(
     sourceMembers.map((member) => [member.id, member])
   );
-  const explicitMemberIds = new Set(
-    authoredChanges.filter((change) => change.recordKind === "member").map((change) => change.recordId)
-  );
+  const explicitMemberIds = /* @__PURE__ */ new Set();
+  for (const change of authoredChanges) {
+    if (change.recordKind === "member") {
+      explicitMemberIds.add(change.recordId);
+    }
+  }
   const prepared = authoredChanges.map((change) => {
     if (change.recordKind !== "member" || change.operation === "delete") {
       return change;
@@ -89890,9 +90075,7 @@ function prepareServerOwnedSchemaCommit(args) {
     }
     return { ...change, nextData: compiled };
   });
-  const hashByKey = new Map(
-    args.contentHashHeads.filter((head) => !head.deleted).map((head) => [`${head.recordKind}:${head.recordId}`, head.contentHash])
-  );
+  const hashByKey = indexLiveContentHashesByRecordKey(args.contentHashHeads);
   for (const compiled of sourceMembers) {
     if (!recompileTargets.memberIds.has(compiled.id)) continue;
     if (explicitMemberIds.has(compiled.id)) continue;
@@ -89946,11 +90129,16 @@ function prepareServerOwnedSchemaCommit(args) {
   if (listIndexErrors.length > 0) {
     throw new Error(listIndexErrors[0].message);
   }
-  validateInternalRecordRelations({
-    relations: postDocument.internalRecordRelations ?? [],
-    endpoints: collectProjectDocumentRelationEndpoints(postDocument),
-    classes: postDocument.classes
-  });
+  if (stagedChangesAffectClassRelations(args.document, [
+    ...prepared,
+    ...readOnlyConversionChanges
+  ])) {
+    validateInternalRecordRelations({
+      relations: postDocument.internalRecordRelations ?? [],
+      endpoints: collectProjectDocumentRelationEndpoints(postDocument),
+      classes: postDocument.classes
+    });
+  }
   const accessModifierErrors = validateDocumentAccessModifiers({
     members: postDocument.members,
     classes: postDocument.classes,
@@ -90097,10 +90285,6 @@ function orderVariantRootValuesWithVariants(prepared) {
   return ordered;
 }
 function materializePreparedInstanceInitializers(args) {
-  const compiledDocument = applyProjectVersionWriteChanges(
-    args.document,
-    args.prepared
-  );
   const sites = /* @__PURE__ */ new Map();
   for (let index = 0; index < args.prepared.length; index += 1) {
     const change = args.prepared[index];
@@ -90115,6 +90299,10 @@ function materializePreparedInstanceInitializers(args) {
     });
   }
   if (sites.size === 0) return;
+  const compiledDocument = applyProjectVersionWriteChanges(
+    args.document,
+    args.prepared
+  );
   const existingValueById = new Map(
     args.document.values.map((value) => [value.id, value])
   );
@@ -91496,6 +91684,15 @@ function normalizeClientBindingMemberCreates(args) {
     };
   }
 }
+function stampsAbsentBindingMember(value, existingMemberIds) {
+  const stamp = value.genericBindings;
+  if (stamp === void 0 || stamp === null) return false;
+  for (const bindingMemberId of Object.values(stamp)) {
+    if (typeof bindingMemberId !== "string") continue;
+    if (!existingMemberIds.has(bindingMemberId)) return true;
+  }
+  return false;
+}
 function materializeVariantChildOverrideBindingMembers(args) {
   normalizeClientBindingMemberCreates(args);
   const postDocument = applyProjectVersionWriteChanges(
@@ -91504,6 +91701,13 @@ function materializeVariantChildOverrideBindingMembers(args) {
   );
   const variants = postDocument.variants ?? [];
   if (variants.length === 0) return;
+  const existingMemberIds = new Set(
+    postDocument.members.map((member) => member.id)
+  );
+  const candidates = postDocument.values.filter(
+    (value) => stampsAbsentBindingMember(value, existingMemberIds)
+  );
+  if (candidates.length === 0) return;
   const graphValueIds = collectVariantGraphValueIds({
     document: postDocument,
     variants,
@@ -91516,11 +91720,8 @@ function materializeVariantChildOverrideBindingMembers(args) {
       schemaClass2.id
     ])
   );
-  const existingMemberIds = new Set(
-    postDocument.members.map((member) => member.id)
-  );
   const minted = /* @__PURE__ */ new Set();
-  for (const value of postDocument.values) {
+  for (const value of candidates) {
     if (!graphValueIds.has(value.id)) continue;
     const stamp = value.genericBindings;
     if (stamp === void 0 || stamp === null) continue;
@@ -93209,32 +93410,17 @@ function reconcileVariantConstructorArgs(args) {
   );
   const variants = postDocument.variants ?? [];
   if (variants.length === 0) return;
-  const valueById = new Map(
-    postDocument.values.map((value) => [value.id, value])
-  );
-  const classById = new Map(
-    postDocument.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
-  );
-  const memberById = new Map(
-    postDocument.members.map((member) => [member.id, member])
-  );
-  const constructorById = new Map(
-    (postDocument.constructors ?? []).map((record3) => [record3.id, record3])
-  );
-  const changeIndexByValueId = /* @__PURE__ */ new Map();
-  args.prepared.forEach((change, index) => {
-    if (change.recordKind !== "value") return;
-    changeIndexByValueId.set(change.recordId, index);
-  });
-  const baseHashByValueId = new Map(
-    args.contentHashHeads.filter((head) => head.recordKind === "value" && !head.deleted).map((head) => [head.recordId, head.contentHash])
-  );
+  const valueById = indexRecordsById(postDocument.values);
+  const classById = indexRecordsById(postDocument.classes);
+  const memberById = indexRecordsById(postDocument.members);
+  const constructorById = indexRecordsById(postDocument.constructors ?? []);
+  const changeIndexByValueId = indexChangesByRecordId(args.prepared, "value");
+  let baseHashByValueId = null;
   for (const variant of variants) {
     const root = valueById.get(variant.valueId);
     if (root === void 0) continue;
     if (!isLiteralValueContent(root)) continue;
-    const existingArgs = root.constructorArgs;
-    if (existingArgs === void 0 || existingArgs === null) continue;
+    const existingArgs = root.constructorArgs ?? {};
     const rootClassId = root.classId;
     if (typeof rootClassId !== "string") continue;
     const schemaClass2 = classById.get(rootClassId);
@@ -93245,37 +93431,46 @@ function reconcileVariantConstructorArgs(args) {
     if (constructorRecord === void 0) continue;
     if (typeof root.value !== "object" || root.value === null) continue;
     if (Array.isArray(root.value)) continue;
-    const nextArgs = { ...existingArgs };
-    let changed = false;
-    constructorRecord.argumentTypes.forEach((argument2, index) => {
+    const nextArgs = {};
+    for (let index = 0; index < constructorRecord.argumentTypes.length; index += 1) {
+      const argument2 = constructorRecord.argumentTypes[index];
+      if (argument2 === void 0) continue;
       const parameterId = constructorActionParameterId(
         constructorRecord,
         index
       );
-      if (!(parameterId in nextArgs)) return;
-      const schemaKey = Object.keys(schemaClass2.schema).find(
-        (key) => key.toLowerCase() === argument2.name.toLowerCase()
+      const schemaKey = NEO_VARIANT_SCHEMA_KEY_BY_ARGUMENT_NAME.get(
+        argument2.name.toLowerCase()
       );
-      if (schemaKey === void 0) return;
+      if (schemaKey === void 0) continue;
       const memberId = schemaClass2.schema[schemaKey];
       const member = memberId === void 0 ? void 0 : memberById.get(memberId);
-      if (member?.kind !== 25 /* NSDelegate */) return;
+      if (member === void 0) continue;
       const childId = root.value[schemaKey];
-      if (typeof childId !== "string") return;
+      if (typeof childId !== "string") continue;
       const childRow = valueById.get(childId);
-      if (childRow === void 0 || !isLiteralValueContent(childRow)) return;
+      if (childRow === void 0 || !isLiteralValueContent(childRow)) continue;
       const rowValue = childRow.value;
-      if (typeof rowValue !== "object" || rowValue === null) return;
-      if (Array.isArray(rowValue)) return;
-      const rowCode = rowValue.code;
-      if (typeof rowCode !== "string") return;
-      const derived = { code: rowCode };
-      if (canonicalJsonStringify(nextArgs[parameterId]) === canonicalJsonStringify(derived)) {
-        return;
+      if (variantConstructorArgumentIsRestValue(schemaKey, rowValue)) {
+        continue;
       }
-      nextArgs[parameterId] = derived;
-      changed = true;
-    });
+      if (member.kind === 25 /* NSDelegate */) {
+        if (typeof rowValue !== "object" || rowValue === null) continue;
+        if (Array.isArray(rowValue)) continue;
+        const rowCode = rowValue.code;
+        if (typeof rowCode !== "string") continue;
+        nextArgs[parameterId] = { code: rowCode };
+        continue;
+      }
+      if (member.kind === 7 /* Class */ || member.kind === 22 /* Interface */ || member.kind === 21 /* Generic */ || member.kind === 6 /* List */ || member.kind === 5 /* Dictionary */) {
+        nextArgs[parameterId] = childId;
+        continue;
+      }
+      const defaultValue = argument2.defaultValue?.value;
+      if (canonicallyEqual2(rowValue, defaultValue)) continue;
+      nextArgs[parameterId] = rowValue;
+    }
+    const changed = !canonicallyEqual2(existingArgs, nextArgs);
     if (!changed) continue;
     const nextRoot = { ...root, constructorArgs: nextArgs };
     const existingIndex = changeIndexByValueId.get(root.id);
@@ -93286,8 +93481,13 @@ function reconcileVariantConstructorArgs(args) {
       }
       continue;
     }
+    baseHashByValueId ??= indexLiveContentHashesByRecordId(
+      args.contentHashHeads,
+      "value"
+    );
     const baseContentHash = baseHashByValueId.get(root.id);
     if (baseContentHash === void 0) continue;
+    changeIndexByValueId.set(root.id, args.prepared.length);
     args.prepared.push({
       recordKind: "value",
       recordId: root.id,
@@ -93300,6 +93500,13 @@ function reconcileVariantConstructorArgs(args) {
     });
   }
 }
+function variantConstructorArgumentIsRestValue(schemaKey, value) {
+  if (value === null) return true;
+  if (schemaKey === NEO_VARIANT_OVERRIDES_SCHEMA_KEY) {
+    return typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length === 0;
+  }
+  return schemaKey === NEO_VARIANT_CHILD_OVERRIDES_SCHEMA_KEY && Array.isArray(value) && value.length === 0;
+}
 function appendVariantGraphCascadeDeletes(args) {
   const deletedVariantIds = /* @__PURE__ */ new Set();
   for (const change of args.prepared) {
@@ -93313,11 +93520,13 @@ function appendVariantGraphCascadeDeletes(args) {
     variants: args.document.variants ?? [],
     variantIds: deletedVariantIds
   });
-  const alreadyChanged = new Set(
-    args.prepared.filter((change) => change.recordKind === "value").map((change) => change.recordId)
-  );
-  const baseHashByValueId = new Map(
-    args.contentHashHeads.filter((head) => head.recordKind === "value").map((head) => [head.recordId, head.contentHash])
+  const alreadyChanged = /* @__PURE__ */ new Set();
+  for (const change of args.prepared) {
+    if (change.recordKind === "value") alreadyChanged.add(change.recordId);
+  }
+  const baseHashByValueId = indexLiveContentHashesByRecordId(
+    args.contentHashHeads,
+    "value"
   );
   for (const valueId of valueIds) {
     if (alreadyChanged.has(valueId)) continue;
@@ -93339,7 +93548,7 @@ function appendVariantGraphCascadeDeletes(args) {
     });
   }
 }
-var SERVER_COMPILATION_PROJECT_CACHE_LIMIT, serverCompilationProjectCache, READ_ONLY_SOURCE_CONVERSION_INTENT_SOURCE, SCHEMA_RECORD_KINDS, DIALOGUE_SOURCE_RECORD_KINDS;
+var SERVER_COMPILATION_PROJECT_CACHE_LIMIT, serverCompilationProjectCache, READ_ONLY_SOURCE_CONVERSION_INTENT_SOURCE, SCHEMA_RECORD_KINDS, DIALOGUE_SOURCE_RECORD_KINDS, NEO_VARIANT_SCHEMA_KEY_BY_ARGUMENT_NAME;
 var init_project_version_schema_commit = __esm({
   "../src/database/project-version-schema-commit.ts"() {
     "use strict";
@@ -93352,6 +93561,7 @@ var init_project_version_schema_commit = __esm({
     init_project2();
     init_member_access_modifier_validation();
     init_variant_value_graph();
+    init_variants2();
     init_localization2();
     init_internal_record_relations();
     init_project_content_hash();
@@ -93364,6 +93574,7 @@ var init_project_version_schema_commit = __esm({
     init_general_function_call_ir_source_recompile();
     init_projectDocumentDialogueMaterialization();
     init_project_version_transaction_types();
+    init_project_version_relation_sweep_trigger();
     init_project_version_transaction_planning();
     init_project_version_static_value_writes();
     init_localizable_member_value_writes();
@@ -93393,12 +93604,18 @@ var init_project_version_schema_commit = __esm({
       "dialogue-node",
       "dialogue-group"
     ]);
+    NEO_VARIANT_SCHEMA_KEY_BY_ARGUMENT_NAME = /* @__PURE__ */ new Map([
+      ["initialize", NEO_VARIANT_INITIALIZE_SCHEMA_KEY],
+      ["apply", NEO_VARIANT_APPLY_SCHEMA_KEY],
+      ["overrides", NEO_VARIANT_OVERRIDES_SCHEMA_KEY],
+      ["childoverrides", NEO_VARIANT_CHILD_OVERRIDES_SCHEMA_KEY]
+    ]);
   }
 });
 
 // ../src/database/project-record-semantics.ts
 function projectRecordSemanticData(value) {
-  if (!isPlainRecord(value)) return value;
+  if (!isPlainRecord2(value)) return value;
   const semantic = {};
   for (const [key, child] of Object.entries(value)) {
     if (SERVER_MANAGED_PROJECT_RECORD_FIELDS.has(key)) continue;
@@ -93435,7 +93652,7 @@ function toCanonicalJsonValue2(value) {
   if (Array.isArray(value)) {
     return value.map((item) => toCanonicalJsonValue2(item) ?? null);
   }
-  if (!isPlainRecord(value)) {
+  if (!isPlainRecord2(value)) {
     throw new Error("Cannot canonicalize a non-plain object.");
   }
   const canonical = {};
@@ -93449,7 +93666,7 @@ function toCanonicalJsonValue2(value) {
   }
   return canonical;
 }
-function isPlainRecord(value) {
+function isPlainRecord2(value) {
   if (value === null || typeof value !== "object") return false;
   const prototype = Object.getPrototypeOf(value);
   return prototype === Object.prototype || prototype === null;
@@ -93558,7 +93775,7 @@ function systemProtectedWriteInheritedRecordId(write) {
   if (write.baseData !== void 0) return null;
   if (write.deleted) return null;
   if (!isSystemBearingRecordKind(write.recordKind)) return null;
-  if (!isPlainRecord2(write.nextData)) return null;
+  if (!isPlainRecord3(write.nextData)) return null;
   if (readSystemMetadata(write.nextData) === null) return null;
   const extendsMemberId = write.nextData.extendsMemberId;
   if (typeof extendsMemberId !== "string") return null;
@@ -93578,7 +93795,7 @@ function assertSystemProtectedRecordWriteValid(write) {
   assertSystemMetadataUnchanged(write, base);
 }
 function readBaseRecord(write) {
-  if (!isPlainRecord2(write.baseData)) return null;
+  if (!isPlainRecord3(write.baseData)) return null;
   return {
     recordKind: write.recordKind,
     data: write.baseData,
@@ -93591,7 +93808,7 @@ function collectSystemBearingBaseRecords(document) {
     const stored = document[collection];
     if (!Array.isArray(stored)) continue;
     for (const record3 of stored) {
-      if (!isPlainRecord2(record3)) continue;
+      if (!isPlainRecord3(record3)) continue;
       const id2 = record3.id;
       if (typeof id2 !== "string") continue;
       records2.set(baseKey(recordKind, id2), {
@@ -93605,7 +93822,7 @@ function collectSystemBearingBaseRecords(document) {
 }
 function assertCreateDeclaresNoSystemMetadata(write) {
   if (!isSystemBearingRecordKind(write.recordKind)) return;
-  if (!isPlainRecord2(write.nextData)) return;
+  if (!isPlainRecord3(write.nextData)) return;
   const system = readSystemMetadata(write.nextData);
   if (system === null) return;
   if (inheritsLegacyEmittedSystemMetadata(write, system)) return;
@@ -93631,7 +93848,7 @@ function assertProtectedRecordNotEdited(change, base) {
   )) {
     return;
   }
-  if (!isPlainRecord2(change.nextData)) return;
+  if (!isPlainRecord3(change.nextData)) return;
   if (authoredFieldsEqual(change.recordKind, base.data, change.nextData)) {
     return;
   }
@@ -93640,7 +93857,7 @@ function assertProtectedRecordNotEdited(change, base) {
   );
 }
 function assertSystemMetadataUnchanged(change, base) {
-  if (!isPlainRecord2(change.nextData)) return;
+  if (!isPlainRecord3(change.nextData)) return;
   const next = readSystemMetadata(change.nextData);
   if (systemMetadataEqual(base.system, next)) return;
   throw new Error(
@@ -93688,10 +93905,10 @@ function repointedChildValueIds(document, change) {
   );
   if (baseValue === void 0) return [];
   const before = baseValue.value;
-  if (!isPlainRecord2(before)) return [];
-  if (!isPlainRecord2(change.nextData)) return [];
+  if (!isPlainRecord3(before)) return [];
+  if (!isPlainRecord3(change.nextData)) return [];
   const after = change.nextData.value;
-  if (!isPlainRecord2(after)) return [];
+  if (!isPlainRecord3(after)) return [];
   return Object.entries(before).flatMap(([schemaKey, childValueId]) => {
     if (typeof childValueId !== "string") return [];
     if (after[schemaKey] === childValueId) return [];
@@ -93726,7 +93943,7 @@ function isSystemBearingRecordKind(recordKind) {
   );
 }
 function readSystemMetadata(record3) {
-  if (!isPlainRecord2(record3)) return null;
+  if (!isPlainRecord3(record3)) return null;
   const system = record3.system;
   if (!isSystemMetadata(system)) return null;
   return system;
@@ -93745,11 +93962,11 @@ function systemReason(system) {
   return SYSTEM_PROTECTION_RULES[system.kind].serverReason;
 }
 function describeChangedRecord(recordKind, recordId, record3) {
-  const name = isPlainRecord2(record3) ? record3.name : void 0;
+  const name = isPlainRecord3(record3) ? record3.name : void 0;
   if (typeof name !== "string") return `Record ${recordKind} "${recordId}"`;
   return `Record ${recordKind} "${name}" (${recordId})`;
 }
-function isPlainRecord2(value) {
+function isPlainRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function baseKey(recordKind, recordId) {
@@ -93863,7 +94080,7 @@ function readWorldReferenceList(args) {
     args.keyCandidates
   );
   if (schemaKey === null) return [];
-  if (!isPlainRecord3(args.ownerValue.value)) return [];
+  if (!isPlainRecord4(args.ownerValue.value)) return [];
   const listValueId = args.ownerValue.value[schemaKey];
   if (typeof listValueId !== "string") return [];
   const listValue2 = args.graph.valuesById.get(listValueId);
@@ -93929,18 +94146,18 @@ function worldReferenceClassInherits(graph, classId, ancestorClassId) {
   return false;
 }
 function toWorldReferenceClassRecord(value) {
-  if (!isPlainRecord3(value)) return null;
+  if (!isPlainRecord4(value)) return null;
   const id2 = stringField2(value, "id");
   if (id2 === null) return null;
   return {
     id: id2,
     extendsClassId: nullableStringField(value, "extendsClassId"),
     schema: isStringRecord5(value.schema) ? value.schema : void 0,
-    system: isPlainRecord3(value.system) ? value.system : null
+    system: isPlainRecord4(value.system) ? value.system : null
   };
 }
 function toWorldReferenceValueRecord(value) {
-  if (!isPlainRecord3(value)) return null;
+  if (!isPlainRecord4(value)) return null;
   const id2 = stringField2(value, "id");
   if (id2 === null) return null;
   return {
@@ -93954,10 +94171,10 @@ function worldReferenceValueClassId(value) {
   return typeof value.classId === "string" && value.classId.length > 0 ? value.classId : null;
 }
 function isStringRecord5(value) {
-  if (!isPlainRecord3(value)) return false;
+  if (!isPlainRecord4(value)) return false;
   return Object.values(value).every((entry) => typeof entry === "string");
 }
-function isPlainRecord3(value) {
+function isPlainRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function stringField2(value, key) {
@@ -94256,31 +94473,6 @@ function assertStagedInternalRecordRelationsValid(current, projected, changes) {
     classes: projected.classes
   });
 }
-function stagedChangesAffectClassRelations(current, changes) {
-  const classesById = new Map(
-    current.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
-  );
-  const valuesById = new Map(current.values.map((value) => [value.id, value]));
-  for (const change of changes) {
-    if (change.recordKind === "internal-record-relation") return true;
-    if (change.recordKind === "class") {
-      if (change.operation !== "update") return true;
-      if (change.deleted === true) return true;
-      const before2 = classesById.get(change.recordId);
-      if (before2 === void 0) return true;
-      const after = change.nextData;
-      if (!isPlainRecord4(after)) return true;
-      if (before2.extendsClassId !== after.extendsClassId) return true;
-      continue;
-    }
-    if (change.recordKind !== "value") continue;
-    const before = valuesById.get(change.recordId);
-    if (relationEndpointClassId(before) !== relationEndpointClassId(change.nextData)) {
-      return true;
-    }
-  }
-  return false;
-}
 function assertStagedWorldContentLayerBindingsValid(current, projected, changes) {
   if (!stagedChangesRequireWorldLayerBindingValidation(current, changes)) {
     return;
@@ -94327,7 +94519,7 @@ function stagedChangesRequireWorldLayerBindingValidation(current, changes) {
     const before = classesById.get(change.recordId);
     if (before === void 0) return true;
     const after = change.nextData;
-    if (!isPlainRecord4(after)) return true;
+    if (!isPlainRecord(after)) return true;
     if (before.extendsClassId !== after.extendsClassId) return true;
     if (before.isAbstract !== after.isAbstract) return true;
     if (!worldClassSystemBlockIsEqual(before.system, after.system)) return true;
@@ -94378,7 +94570,7 @@ function stagedAffectedWorldLayerLinkClassIds(args) {
       change.nextData
     ];
     for (const candidate of candidates) {
-      if (!isPlainRecord4(candidate)) continue;
+      if (!isPlainRecord(candidate)) continue;
       const relationKind = candidate.relationKind;
       if (typeof relationKind !== "string") continue;
       if (!isStagedWorldLayerLinkTargetRelationKind(relationKind)) continue;
@@ -94421,21 +94613,11 @@ function worldClassSystemBlockIsEqual(before, after) {
   );
 }
 function hasWorldLayerOverrideMetadata(record3) {
-  if (!isPlainRecord4(record3)) return false;
+  if (!isPlainRecord(record3)) return false;
   const value = record3.value;
-  if (!isPlainRecord4(value)) return false;
+  if (!isPlainRecord(value)) return false;
   return typeof value.layerOverrideValueId === "string";
 }
-function relationEndpointClassId(record3) {
-  if (!isPlainRecord4(record3)) return void 0;
-  if (typeof record3.classId === "string") return record3.classId;
-  if (typeof record3.typeId === "string") return record3.typeId;
-  return void 0;
-}
-function isPlainRecord4(value) {
-  if (value === null || typeof value !== "object") return false;
-  return !Array.isArray(value);
-}
 function assertStagedProjectInterfaceValid(projected, changes) {
   const relevant = changes.filter(
     (change) => INTERFACE_VALIDATED_RECORD_KINDS.has(change.recordKind)
@@ -94569,7 +94751,7 @@ function candidateActionListenerRowIds(projected, actions) {
   }
   if (actionSchemaKeys.size === 0) return candidates;
   for (const row of projected.values) {
-    if (!isPlainRecord4(row.value)) continue;
+    if (!isPlainRecord(row.value)) continue;
     for (const schemaKey of actionSchemaKeys) {
       const childId = row.value[schemaKey];
       if (typeof childId === "string") candidates.add(childId);
@@ -94579,7 +94761,7 @@ function candidateActionListenerRowIds(projected, actions) {
 }
 function storedRowActionListeners(row) {
   const body = row.value;
-  if (!isPlainRecord4(body)) return [];
+  if (!isPlainRecord(body)) return [];
   const listeners = body.listeners;
   return Array.isArray(listeners) ? listeners : [];
 }
@@ -94657,7 +94839,7 @@ function authoredActionListeners(action) {
   if (defaultValue === void 0 || defaultValue === null) return [];
   if (!isLiteralValueContent(defaultValue)) return [];
   const body = defaultValue.value;
-  if (!isPlainRecord4(body)) return [];
+  if (!isPlainRecord(body)) return [];
   const listeners = body.listeners;
   return Array.isArray(listeners) ? listeners : [];
 }
@@ -94997,7 +95179,7 @@ function candidateVariantRowIds(projected, variantMembers) {
   }
   if (schemaKeys.size === 0) return candidates;
   for (const row of projected.values) {
-    if (!isPlainRecord4(row.value)) continue;
+    if (!isPlainRecord(row.value)) continue;
     for (const schemaKey of schemaKeys) {
       const childId = row.value[schemaKey];
       if (typeof childId === "string") candidates.add(childId);
@@ -95034,6 +95216,7 @@ var init_project_version_whole_graph_validation = __esm({
     init_world_system_classes();
     init_project_world_reference_graph();
     init_project_record_semantics();
+    init_project_version_relation_sweep_trigger();
     INTERFACE_VALIDATED_RECORD_KINDS = /* @__PURE__ */ new Set([
       "member",
       "class",
@@ -97826,15 +98009,15 @@ function emitVariantValueSourcesV4(records2, manifest) {
         visited
       });
     };
-    const initialize = argument2("Initialize");
+    const initialize = argument2(NEO_VARIANT_INITIALIZE_SCHEMA_KEY);
     if (initialize === null) {
       throw new Error(
         `Variant "${variant.id}" has no Initialize row; every variant constructs a fresh instance.`
       );
     }
-    const apply = argument2("Apply");
-    const overrides = argument2("Overrides");
-    const childOverrides = argument2("ChildOverrides");
+    const apply = argument2(NEO_VARIANT_APPLY_SCHEMA_KEY);
+    const overrides = argument2(NEO_VARIANT_OVERRIDES_SCHEMA_KEY);
+    const childOverrides = argument2(NEO_VARIANT_CHILD_OVERRIDES_SCHEMA_KEY);
     const authored = [["initialize", initialize]];
     if (apply !== null && apply !== "null") authored.push(["apply", apply]);
     if (overrides !== null && overrides !== "new {}") {
@@ -102887,6 +103070,12 @@ function storedConstructorCallSource(context, schemaClass2, value, className, en
         `Stored construction for ${className} is missing evaluated argument ${key}.`
       );
     }
+    const settledMember = settledMemberForConstructorArgument(
+      context,
+      schemaClass2,
+      value,
+      constructorArgs[key]
+    );
     return `${argument2.name}: ${storedConstructorArgumentSource(
       context,
       argument2.type,
@@ -102894,24 +103083,23 @@ function storedConstructorCallSource(context, schemaClass2, value, className, en
       environment,
       visited,
       cloneAggregateArguments,
-      settledMemberIsPartial(context, schemaClass2, value, constructorArgs[key])
+      settledMember?.partial === true,
+      settledMember !== void 0
     )}`;
   });
   return argumentsValue.length === 0 && targetTyped ? "new()" : constructorCallSource(`new ${className}`, argumentsValue);
 }
-function settledMemberIsPartial(context, schemaClass2, value, argument2) {
-  if (typeof argument2 !== "string") return false;
+function settledMemberForConstructorArgument(context, schemaClass2, value, argument2) {
+  if (typeof argument2 !== "string") return void 0;
   const body = value.value;
-  if (!isObjectRecord2(body)) return false;
+  if (!isObjectRecord2(body)) return void 0;
   const schemaKey = Object.entries(body).find(
     ([, rowId]) => rowId === argument2
   )?.[0];
-  if (schemaKey === void 0) return false;
+  if (schemaKey === void 0) return void 0;
   const schema = isObjectRecord2(schemaClass2.schema) ? schemaClass2.schema : {};
   const memberId = schema[schemaKey];
-  if (typeof memberId !== "string") return false;
-  const member = context.members.get(memberId);
-  return member?.partial === true;
+  return typeof memberId === "string" ? context.members.get(memberId) : void 0;
 }
 function constructorCallSource(callee, argumentsValue) {
   const inline = `${callee}(${argumentsValue.join(", ")})`;
@@ -102950,7 +103138,7 @@ function storedValueConstructor(context, schemaClass2, constructorArgs) {
   }
   return selected;
 }
-function storedConstructorArgumentSource(context, type, value, environment, visited, cloneAggregateArguments = false, partial = false) {
+function storedConstructorArgumentSource(context, type, value, environment, visited, cloneAggregateArguments = false, partial = false, constructorOwnsGraph = false) {
   if (value === null) {
     if (!type.nullable) {
       throw new Error("Required constructor argument stores null.");
@@ -103033,7 +103221,8 @@ function storedConstructorArgumentSource(context, type, value, environment, visi
         environment,
         visited,
         false,
-        partial
+        partial,
+        constructorOwnsGraph
       );
     }
     case "generic": {
@@ -103057,7 +103246,8 @@ function storedConstructorArgumentSource(context, type, value, environment, visi
         environment,
         visited,
         cloneAggregateArguments,
-        partial
+        partial,
+        constructorOwnsGraph
       );
     }
     case "interface":
@@ -103077,7 +103267,9 @@ function storedConstructorArgumentSource(context, type, value, environment, visi
         value,
         environment,
         visited,
-        false
+        false,
+        false,
+        constructorOwnsGraph
       );
     case "lookup":
       return referenceValue(
@@ -103351,7 +103543,7 @@ function storedSchemaTypeName(context, type, environment, valueId) {
       return "null";
   }
 }
-function storedTypedRowSource(context, type, valueId, environment, visited, writeIdentity, partial = false) {
+function storedTypedRowSource(context, type, valueId, environment, visited, writeIdentity, partial = false, constructorOwnsGraph = false) {
   const symbol = context.symbolsByValueId.get(valueId);
   if (symbol !== void 0) return symbol;
   const row = context.values.get(valueId);
@@ -103360,6 +103552,9 @@ function storedTypedRowSource(context, type, valueId, environment, visited, writ
       `Stored ${type.kind} constructor argument references missing value row ${valueId}.`
     );
   }
+  if (!constructorOwnsGraph && context.readMaterializedGraph().independentlyOwnedValueIds.has(valueId)) {
+    return `Reference<${storedSchemaTypeName(context, type, environment, valueId)}>(id: ${quote5(valueId)})`;
+  }
   if (visited.has(valueId)) {
     throw new Error(
       `Stored constructor argument containment cycle reaches ${valueId}.`
@@ -103410,7 +103605,9 @@ ${ids.map(
             id2,
             environment,
             visited,
-            true
+            true,
+            false,
+            constructorOwnsGraph
           ),
           2
         )
@@ -103438,7 +103635,9 @@ ${entries.flatMap(
               id2,
               environment,
               visited,
-              false
+              false,
+              false,
+              constructorOwnsGraph
             )}`,
             2
           )
@@ -104201,6 +104400,7 @@ var init_value_sources = __esm({
     "use strict";
     init_src();
     init_projection();
+    init_variants2();
     init_project_file_source();
     init_lower_members();
     init_lower_variants();
@@ -111889,10 +112089,20 @@ async function downloadProjectVersionTransactionResult(args) {
     }
     changedRecords.push(...page.changedRecords);
     if (page.isDone) {
+      if (args.status.totalChangeCount === null) {
+        throw new Error(
+          `Project transaction "${args.transactionId}" reported no total change count after committing; its result download cannot be checked for completeness.`
+        );
+      }
+      if (changedRecords.length !== args.status.totalChangeCount) {
+        throw new Error(
+          `Project transaction "${args.transactionId}" committed ${args.status.totalChangeCount} changes but its result download returned ${changedRecords.length}.`
+        );
+      }
       return {
         kind: "committed",
         transactionId: args.transactionId,
-        totalChangeCount: args.status.totalChangeCount ?? changedRecords.length,
+        totalChangeCount: args.status.totalChangeCount,
         totalChunkCount: args.status.totalChunkCount ?? 0,
         assignments,
         changedRecords
@@ -114185,7 +114395,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.14",
-      cliVersion: "0.36.8",
+      cliVersion: "0.36.10",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -120501,7 +120711,7 @@ __export(resolve_exports, {
 import { readFileSync as readFileSync19, rmSync as rmSync8, writeFileSync as writeFileSync14 } from "node:fs";
 import { join as join21 } from "node:path";
 function runResolve(workspace, side) {
-  const resolvedRecords = acceptSourceEquivalentConflictBases(workspace);
+  const resolvedRecords = adoptServerConflictBases(workspace);
   let resolvedFiles = 0;
   for (const filePath of listProjectSourceFilesV4(workspace.root)) {
     const source = readFileSync19(filePath, "utf8");
@@ -120546,6 +120756,22 @@ function runResolve(workspace, side) {
     `Resolved ${resolvedFiles} source file(s), ${resolvedRecords} record conflict(s), and ${resolvedBinaries} binary file(s) keeping the "${side}" side. Review with "neo diff", then "neo push".`
   );
 }
+function adoptServerConflictBases(workspace) {
+  let adopted = 0;
+  for (const [key, record3] of Object.entries(workspace.state.records)) {
+    if (typeof record3.conflictServerHash !== "string") continue;
+    const next = {
+      ...record3,
+      contentHash: record3.conflictServerHash,
+      data: record3.conflictServerData
+    };
+    delete next.conflictServerHash;
+    delete next.conflictServerData;
+    workspace.state.records[key] = next;
+    adopted += 1;
+  }
+  return adopted;
+}
 function resolveMarkers(source, side) {
   const lines = source.split("\n");
   const output = [];
@@ -120592,7 +120818,6 @@ var init_resolve = __esm({
     init_workspace_status();
     init_source_diagnostics();
     init_project_files();
-    init_source_record_comparison();
   }
 });
 
@@ -120789,7 +121014,7 @@ There is no --keep-current: preserving current semantic state defines flatten.
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.36.8");
+    console.log("0.36.10");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {