@neocompose/cli 0.80.0 → 0.81.1

package/dist/neo.mjs

@@ -715,11 +715,11 @@ var init_world_system_kinds_generated = __esm({
       ObjectCollider: "objectCollider",
       SortingGroup: "sortingGroup",
       LayerGroupBase: "layerGroupBase",
-      SpriteObject: "spriteObject",
       PlacementTile: "placementTile",
       TileLayerLink: "tileLayerLink",
       ObjectLayerLink: "objectLayerLink",
       Object: "object",
+      SpriteObject: "spriteObject",
       SmartTile: "smartTile",
       SmartTileRule: "smartTileRule",
       SmartTileNeighbor: "smartTileNeighbor",
@@ -2910,6 +2910,8 @@ function isNSFunctionVariantApply(value) {
   if (!isNSPointer(info.variantPointer)) return false;
   if (info.rowPointer !== void 0 && !isNSPointer(info.rowPointer))
     return false;
+  if (info.declarativeReplay !== void 0 && info.declarativeReplay !== true)
+    return false;
   return isNSTypeInfoClass(info.schemaClassInfo) && info.schemaClassInfo.required;
 }
 function isNSFunctionClassConstructor(value) {
@@ -4920,7 +4922,9 @@ function isLiteralValueContent(value) {
   for (const field of [
     "instanceConstructorId",
     "instanceVariantId",
-    "instanceVariantRowValueId"
+    "instanceVariantRowValueId",
+    "instanceAppliedVariantId",
+    "instanceAppliedVariantRowValueId"
   ]) {
     const provenance = getField(value, field);
     if (provenance !== void 0 && provenance !== null && (typeof provenance !== "string" || provenance.length === 0)) {
@@ -4946,6 +4950,9 @@ function isInitValueContent(value) {
   if (getField(value, "instanceConstructorId") !== void 0) return false;
   if (getField(value, "instanceVariantId") !== void 0) return false;
   if (getField(value, "instanceVariantRowValueId") !== void 0) return false;
+  if (getField(value, "instanceAppliedVariantId") !== void 0) return false;
+  if (getField(value, "instanceAppliedVariantRowValueId") !== void 0)
+    return false;
   const classIdField = getField(value, "classId");
   return classIdField === void 0 || classIdField === null;
 }
@@ -5949,7 +5956,11 @@ function encodeStoredValueNode(node) {
     ...node.constructorArgs === void 0 ? {} : { constructorArgs: node.constructorArgs },
     ...node.instanceConstructorId === void 0 ? {} : { instanceConstructorId: node.instanceConstructorId },
     ...node.instanceVariantId === void 0 ? {} : { instanceVariantId: node.instanceVariantId },
-    ...node.instanceVariantRowValueId === void 0 ? {} : { instanceVariantRowValueId: node.instanceVariantRowValueId }
+    ...node.instanceVariantRowValueId === void 0 ? {} : { instanceVariantRowValueId: node.instanceVariantRowValueId },
+    ...node.instanceAppliedVariantId === void 0 ? {} : { instanceAppliedVariantId: node.instanceAppliedVariantId },
+    ...node.instanceAppliedVariantRowValueId === void 0 ? {} : {
+      instanceAppliedVariantRowValueId: node.instanceAppliedVariantRowValueId
+    }
   };
 }
 function encodeStoredValueRowFields(row) {
@@ -5976,6 +5987,9 @@ function canonicalInstanceProvenanceViolation(value) {
   if ("instanceVariantRowValueId" in value && typeof value.instanceVariantRowValueId === "string" && typeof variantId !== "string") {
     return "variant-row-without-variant";
   }
+  if ("instanceAppliedVariantRowValueId" in value && typeof value.instanceAppliedVariantRowValueId === "string" && !("instanceAppliedVariantId" in value && typeof value.instanceAppliedVariantId === "string")) {
+    return "applied-variant-row-without-applied-variant";
+  }
   return null;
 }
 var init_value_graph = __esm({
@@ -6005,7 +6019,11 @@ function pickInstanceProvenance(source) {
     ...source.constructorArgs === void 0 ? {} : { constructorArgs: source.constructorArgs },
     ...source.instanceConstructorId === void 0 ? {} : { instanceConstructorId: source.instanceConstructorId },
     ...source.instanceVariantId === void 0 ? {} : { instanceVariantId: source.instanceVariantId },
-    ...source.instanceVariantRowValueId === void 0 ? {} : { instanceVariantRowValueId: source.instanceVariantRowValueId }
+    ...source.instanceVariantRowValueId === void 0 ? {} : { instanceVariantRowValueId: source.instanceVariantRowValueId },
+    ...source.instanceAppliedVariantId === void 0 ? {} : { instanceAppliedVariantId: source.instanceAppliedVariantId },
+    ...source.instanceAppliedVariantRowValueId === void 0 ? {} : {
+      instanceAppliedVariantRowValueId: source.instanceAppliedVariantRowValueId
+    }
   };
 }
 function isVirtualInstanceRootShape(value) {
@@ -6033,6 +6051,8 @@ var init_instance_provenance = __esm({
       "instanceConstructorId",
       "instanceVariantId",
       "instanceVariantRowValueId",
+      "instanceAppliedVariantId",
+      "instanceAppliedVariantRowValueId",
       "genericBindings"
     ];
   }
@@ -6299,7 +6319,7 @@ function decodeContentField(container, field, scope, children) {
       )
     };
   }
-  const decoded = {};
+  const decoded = /* @__PURE__ */ Object.create(null);
   for (const [key, entry] of Object.entries(
     container
   )) {
@@ -6451,7 +6471,7 @@ function encodeContentField(container, pending, scope) {
   }
   if (typeof container !== "object" || container === null) return null;
   let changed = false;
-  const encoded = {};
+  const encoded = /* @__PURE__ */ Object.create(null);
   for (const [key, entry] of Object.entries(
     container
   )) {
@@ -7675,64 +7695,6 @@ var init_world_system_classes_generated = __esm({
         modifier: 1 /* Abstract */,
         worldKind: "layerGroupBase"
       },
-      {
-        classId: "system_d48b66ab-4d59-47e7-a25a-591fe97062de",
-        name: "NeoSpriteObject",
-        extendsWorldKind: "objectBase",
-        schemaFields: [
-          {
-            memberId: "system_441cb790-a45f-4488-a5a9-6f375af6c369",
-            memberKind: "string",
-            defaultValue: "",
-            format: 1 /* Plain */,
-            distribution: 1 /* Packed */,
-            requirement: 1 /* Required */,
-            schemaKey: "Name"
-          },
-          {
-            memberId: "system_e9288ba9-f5a2-4485-8443-6afb155b31e0",
-            memberKind: "sprite",
-            defaultValue: { fileId: "", sliceIndex: 0 },
-            requirement: 1 /* Required */,
-            schemaKey: "Sprite"
-          },
-          {
-            memberId: "system_9fcab37a-9743-4e35-8eee-80cb560f1433",
-            memberKind: "bool",
-            defaultValue: false,
-            docsText: "Mirrors the sprite horizontally about its own centre. Maps to SpriteRenderer.flipX.",
-            requirement: 1 /* Required */,
-            schemaKey: "FlipX"
-          },
-          {
-            memberId: "system_ddd09f08-1656-4404-b36b-5570a4c01fcf",
-            memberKind: "bool",
-            defaultValue: false,
-            docsText: "Mirrors the sprite vertically about its own centre. Maps to SpriteRenderer.flipY.",
-            requirement: 1 /* Required */,
-            schemaKey: "FlipY"
-          },
-          {
-            memberId: "system_f2a8c86d-ace5-421b-9475-0f3f6f97b2a6",
-            memberKind: "enum",
-            defaultValue: ["system_9d607a4f-60c3-4347-94fc-f24b538bf468"],
-            docsText: "How this sprite reacts to sprite masks. Maps to SpriteRenderer.maskInteraction. The web canvas has no real sprite mask, so anything other than None previews as a distinguishable treatment rather than as the mask itself \u2014 only Unity renders the real thing.",
-            enumId: "system_4e6c4d6f-1d0b-402a-ad3a-be92242dceec",
-            requirement: 1 /* Required */,
-            schemaKey: "MaskInteraction"
-          },
-          {
-            memberId: "system_6f32f1f2-83ea-42fc-8647-34ed0946b7f1",
-            memberKind: "int",
-            defaultValue: null,
-            docsText: "Added to the object layer's sorting order; it does not replace it. The result competes with every renderer in the sorting layer, or in the enclosing sorting group, and among equal orders the renderer lower on screen draws in front. Leave unset to use the layer's order.",
-            minValue: -32768,
-            maxValue: 32767,
-            schemaKey: "SortingOrder"
-          }
-        ],
-        worldKind: "spriteObject"
-      },
       {
         classId: "system_ccc3330c-2db5-44dc-9c8e-5ebfe430dec9",
         name: "NeoPlacementTile",
@@ -7811,6 +7773,7 @@ var init_world_system_classes_generated = __esm({
             memberId: "system_5a9ca1f5-a21b-4d4e-8c55-00341af594b4",
             memberKind: "list",
             defaultValue: [],
+            docsText: "The cells this object occupies, as offsets from its placement cell. An empty list occupies nothing: the object blocks no placement and answers no cell query, but a placed object still has a Cell.",
             entryMemberId: "system_96c7650a-1805-5b27-ae99-d1e49d3cb207",
             requirement: 1 /* Required */,
             schemaKey: "PlacementTiles"
@@ -7995,6 +7958,64 @@ var init_world_system_classes_generated = __esm({
         ],
         worldKind: "object"
       },
+      {
+        classId: "system_d48b66ab-4d59-47e7-a25a-591fe97062de",
+        name: "NeoSpriteObject",
+        extendsWorldKind: "object",
+        schemaFields: [
+          {
+            memberId: "system_441cb790-a45f-4488-a5a9-6f375af6c369",
+            memberKind: "string",
+            defaultValue: "",
+            format: 1 /* Plain */,
+            distribution: 1 /* Packed */,
+            requirement: 1 /* Required */,
+            schemaKey: "Name"
+          },
+          {
+            memberId: "system_e9288ba9-f5a2-4485-8443-6afb155b31e0",
+            memberKind: "sprite",
+            defaultValue: { fileId: "", sliceIndex: 0 },
+            requirement: 1 /* Required */,
+            schemaKey: "Sprite"
+          },
+          {
+            memberId: "system_9fcab37a-9743-4e35-8eee-80cb560f1433",
+            memberKind: "bool",
+            defaultValue: false,
+            docsText: "Mirrors the sprite horizontally about its own centre. Maps to SpriteRenderer.flipX.",
+            requirement: 1 /* Required */,
+            schemaKey: "FlipX"
+          },
+          {
+            memberId: "system_ddd09f08-1656-4404-b36b-5570a4c01fcf",
+            memberKind: "bool",
+            defaultValue: false,
+            docsText: "Mirrors the sprite vertically about its own centre. Maps to SpriteRenderer.flipY.",
+            requirement: 1 /* Required */,
+            schemaKey: "FlipY"
+          },
+          {
+            memberId: "system_f2a8c86d-ace5-421b-9475-0f3f6f97b2a6",
+            memberKind: "enum",
+            defaultValue: ["system_9d607a4f-60c3-4347-94fc-f24b538bf468"],
+            docsText: "How this sprite reacts to sprite masks. Maps to SpriteRenderer.maskInteraction. The web canvas has no real sprite mask, so anything other than None previews as a distinguishable treatment rather than as the mask itself \u2014 only Unity renders the real thing.",
+            enumId: "system_4e6c4d6f-1d0b-402a-ad3a-be92242dceec",
+            requirement: 1 /* Required */,
+            schemaKey: "MaskInteraction"
+          },
+          {
+            memberId: "system_6f32f1f2-83ea-42fc-8647-34ed0946b7f1",
+            memberKind: "int",
+            defaultValue: null,
+            docsText: "Added to the object layer's sorting order; it does not replace it. The result competes with every renderer in the sorting layer, or in the enclosing sorting group, and among equal orders the renderer lower on screen draws in front. Leave unset to use the layer's order.",
+            minValue: -32768,
+            maxValue: 32767,
+            schemaKey: "SortingOrder"
+          }
+        ],
+        worldKind: "spriteObject"
+      },
       {
         classId: "system_9f34deed-2616-43c9-b614-d812da89ee51",
         name: "NeoSmartTile",
@@ -12118,12 +12139,8 @@ function evaluateLiteralContainer(args) {
   const literal3 = {
     value: evaluated.value,
     classId: evaluated.classId,
-    ...evaluated.constructorArgs === void 0 ? {} : { constructorArgs: deepClonePlainData(evaluated.constructorArgs) },
-    ...evaluated.instanceConstructorId === void 0 ? {} : { instanceConstructorId: evaluated.instanceConstructorId },
-    ...evaluated.instanceVariantId === void 0 ? {} : { instanceVariantId: evaluated.instanceVariantId },
-    ...evaluated.instanceVariantRowValueId === void 0 ? {} : {
-      instanceVariantRowValueId: evaluated.instanceVariantRowValueId
-    }
+    ...pickInstanceProvenance(evaluated),
+    ...evaluated.constructorArgs === void 0 ? {} : { constructorArgs: deepClonePlainData(evaluated.constructorArgs) }
   };
   if (isMemberLookupBase(args.member)) {
     if (evaluated.existingValueRow !== void 0) {
@@ -12456,15 +12473,9 @@ function buildNewValue(projectId, body, timestamp2 = Date.now()) {
   if (body.constructorArgs !== void 0 && body.constructorArgs !== null) {
     props.constructorArgs = deepClonePlainData(body.constructorArgs);
   }
-  if (body.instanceConstructorId !== void 0) {
-    props.instanceConstructorId = body.instanceConstructorId;
-  }
-  if (body.instanceVariantId !== void 0) {
-    props.instanceVariantId = body.instanceVariantId;
-  }
-  if (body.instanceVariantRowValueId !== void 0) {
-    props.instanceVariantRowValueId = body.instanceVariantRowValueId;
-  }
+  const { constructorArgs: _constructorArgs, ...provenance } = pickInstanceProvenance(body);
+  void _constructorArgs;
+  Object.assign(props, provenance);
   return props;
 }
 function retargetInitializerRootValueIds(rows, fromValueId, toValueId) {
@@ -12545,11 +12556,7 @@ function completeDefaultClassRecord(args) {
     if (!shouldMaterializeChildDefaultForRoot(
       args.constructorRoot,
       resolvedChildMember,
-      defaultSettlesConstruction2,
-      documentHasInitValueContent(
-        args.document,
-        resolvedChildMember.defaultValue
-      )
+      defaultSettlesConstruction2
     )) {
       continue;
     }
@@ -12660,7 +12667,7 @@ function cloneDefaultDictionaryRecord(args) {
     args.document,
     args.member.entryMemberId
   );
-  const value = {};
+  const value = /* @__PURE__ */ Object.create(null);
   for (const [key, sourceValueId] of Object.entries(sourceValue)) {
     value[key] = cloneDefaultValueForMember({
       document: args.document,
@@ -12937,9 +12944,7 @@ function cloneMemberValueBase(body) {
   return {
     value: deepClonePlainData(body.value),
     classId: body.classId,
-    ...body.instanceConstructorId === void 0 ? {} : { instanceConstructorId: body.instanceConstructorId },
-    ...body.instanceVariantId === void 0 ? {} : { instanceVariantId: body.instanceVariantId },
-    ...body.instanceVariantRowValueId === void 0 ? {} : { instanceVariantRowValueId: body.instanceVariantRowValueId },
+    ...pickInstanceProvenance({ ...body, constructorArgs: void 0 }),
     ...body.constructorArgs === void 0 || body.constructorArgs === null ? {} : {
       constructorArgs: deepClonePlainData(body.constructorArgs)
     }
@@ -12977,11 +12982,6 @@ function shouldMaterializeChildDefault(member) {
   }
   return member.defaultValue !== void 0;
 }
-function shouldMaterializeConstructorChildDefault(member, isInitializer = isInitValueContent(member.defaultValue)) {
-  if (isInitializer) return true;
-  if (!isRequiredMember(member)) return false;
-  return shouldMaterializeChildDefault(member);
-}
 function skipProvidedConstructorSchemaKey(constructorRoot, schemaKey, member, defaultSettlesConstruction2, isInitializer = isInitValueContent(member.defaultValue)) {
   if (constructorRoot === void 0) return false;
   if (!constructorRoot.providedSchemaKeys.has(schemaKey)) return false;
@@ -12990,16 +12990,11 @@ function skipProvidedConstructorSchemaKey(constructorRoot, schemaKey, member, de
   }
   return !isInitializer && !defaultSettlesConstruction2;
 }
-function shouldMaterializeChildDefaultForRoot(constructorRoot, member, defaultSettlesConstruction2, isInitializer = isInitValueContent(member.defaultValue)) {
-  if (constructorRoot === void 0)
-    return shouldMaterializeChildDefault(member);
-  if (constructorRoot.omitMissingRequired === true && !defaultSettlesConstruction2) {
+function shouldMaterializeChildDefaultForRoot(constructorRoot, member, defaultSettlesConstruction2) {
+  if (constructorRoot?.omitMissingRequired === true && !defaultSettlesConstruction2) {
     return false;
   }
-  if (constructorRoot.runsMemberInitializers === true) {
-    return shouldMaterializeChildDefault(member);
-  }
-  return shouldMaterializeConstructorChildDefault(member, isInitializer);
+  return shouldMaterializeChildDefault(member);
 }
 function primitiveFallbackValue(document, member) {
   if (isMemberBoolBase(member)) return { value: false };
@@ -13259,6 +13254,7 @@ var init_build_default_member_value = __esm({
   "../packages/models/src/members/build-default-member-value.ts"() {
     "use strict";
     init_member_value_id();
+    init_instance_provenance();
     init_member_change_listeners();
     init_construction_requirements();
     init_deep_clone_plain_data();
@@ -23052,10 +23048,6 @@ function validateInternalRecordRelations(args) {
   const classesById = new Map(
     args.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
   );
-  const worldKindsByClassId = indexWorldSystemClassKinds(
-    args.classes,
-    classesById
-  );
   const relationIds = /* @__PURE__ */ new Set();
   const edgeKeys = /* @__PURE__ */ new Set();
   const orderedKeys2 = /* @__PURE__ */ new Set();
@@ -23119,16 +23111,14 @@ function validateInternalRecordRelations(args) {
       contract,
       endpoint: "source",
       recordEndpoint: source,
-      classesById,
-      worldKindsByClassId
+      classesById
     });
     validateWorldEndpoint({
       relation,
       contract,
       endpoint: "target",
       recordEndpoint: target,
-      classesById,
-      worldKindsByClassId
+      classesById
     });
     const edgeKey = [
       relation.relationKind,
@@ -23439,8 +23429,7 @@ function validateWorldEndpoint(args) {
       `Internal record relation "${args.relation.id}" ${args.endpoint} ${classLabel} "${classId}" does not exist.`
     );
   }
-  const actualWorldKind = args.worldKindsByClassId.get(schemaClass2.id) ?? null;
-  if (actualWorldKind !== requiredWorldKind) {
+  if (!classInheritsWorldKind(schemaClass2.id, requiredWorldKind, args.classesById)) {
     throw new Error(
       `Internal record relation "${args.relation.id}" ${args.endpoint} ${classLabel} "${schemaClass2.id}" must extend world class kind "${requiredWorldKind}".`
     );
@@ -24256,7 +24245,7 @@ function toCanonical(value) {
   if (Array.isArray(value)) return value.map((item) => toCanonical(item));
   if (typeof value === "object") {
     const entries = Object.entries(value).filter(([, entryValue]) => entryValue !== void 0).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0);
-    const result = {};
+    const result = /* @__PURE__ */ Object.create(null);
     for (const [key, entryValue] of entries) {
       result[key] = toCanonical(entryValue);
     }
@@ -35713,7 +35702,7 @@ var init_strict_resolver = __esm({
         };
       }
       resolveDictionaryKey(expectedKey, keyAst, scope, pos, requireNonOptional, dictionaryLiteral = false) {
-        const key = this.resolveExpression(keyAst, scope);
+        const key = this.resolveExpression(keyAst, scope, expectedKey);
         if (requireNonOptional && isNullable(key.type)) {
           throw new CompileError(
             `Dictionary keys must be non-optional; got ${this.describe(key.type)}`,
@@ -54544,7 +54533,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.80.0",
+      cliVersion: "0.81.1",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -65766,7 +65755,7 @@ function toCanonicalJsonValue(value) {
     });
   }
   const entries = Object.entries(value).sort(([a], [b]) => a.localeCompare(b));
-  const canonicalObject = {};
+  const canonicalObject = /* @__PURE__ */ Object.create(null);
   for (const [key, entryValue] of entries) {
     const canonicalValue = toCanonicalJsonValue(entryValue);
     if (canonicalValue === void 0) continue;
@@ -75128,7 +75117,11 @@ function buildIndex(source) {
         }
         const placement = {
           valueId,
-          isNeoObject: kinds.get(row.classId) === NeoWorldSystemClassKind.Object,
+          isNeoObject: classInheritsWorldKind(
+            row.classId,
+            NeoWorldSystemClassKind.Object,
+            relations.classesById
+          ),
           classId: row.classId,
           gridId: root.id,
           layerId,
@@ -75964,6 +75957,7 @@ function makeUnindexedEvaluatorLookups(members, storedValues) {
     hasStoredValueId: (id2) => valueById.has(id2),
     unorderedListEntryIds: (containerValueId) => unorderedListMembership.get(containerValueId) ?? [],
     virtualInstanceRowsForValue: () => [],
+    virtualInstanceRootIdForValue: () => null,
     rowForValueReference: (value) => valueRefMap.get(value) ?? null
   };
 }
@@ -76016,6 +76010,7 @@ function createInitializerBatchLookups(document) {
     },
     rowForValueReference: (value) => build.result.rowByValueReference.get(value) ?? null,
     virtualInstanceRowsForValue: () => [],
+    virtualInstanceRootIdForValue: () => null,
     evaluatorIndexes: { ...build.result },
     constructorInitializerIndexes: constructorInitializerIndexes2
   });
@@ -76217,6 +76212,7 @@ function createEvaluatorLookupsBuild(members, storedValues, options = {}) {
         hasStoredValueId: (id2) => valueById.has(id2),
         unorderedListEntryIds: (containerValueId) => unorderedListMembership.get(containerValueId) ?? [],
         virtualInstanceRowsForValue: () => [],
+        virtualInstanceRootIdForValue: () => null,
         rowForValueReference: (value) => rowByValueReference.get(value) ?? null,
         evaluatorIndexes: indexes3.result,
         ...options.constructorInitializerDocument === void 0 ? {} : {
@@ -76334,6 +76330,7 @@ function layerEvaluatorLookups(base, overlay) {
     hasStoredValueId: (id2) => overlay.rows.has(id2) || !overlay.hiddenIds.has(id2) && (base.hasStoredValueId?.(id2) ?? false),
     unorderedListEntryIds: unorderedListEntryIds2,
     virtualInstanceRowsForValue: () => [],
+    virtualInstanceRootIdForValue: () => null,
     rowForValueReference: (value) => evaluatorIndexes2.rowByValueReference.get(value) ?? null,
     evaluatorIndexes: evaluatorIndexes2,
     constructorInitializerIndexes: constructorInitializerIndexes2
@@ -76739,13 +76736,15 @@ function bindThisValue(ctx, thisValue) {
 function observeValueWrite(ctx, row) {
   ctx.beforeValueWrite?.(row);
   ctx.__getterSubscriptions?.noteValueWrite(row.id);
+  forgetVariantResolutionCopy(ctx, row.id);
 }
 function assertStoredReplayMutableValue(value, ctx, label, key) {
-  const observesWrites = ctx.beforeValueWrite !== void 0 || ctx.__getterSubscriptions?.empty === false;
+  const observesWrites = ctx.beforeValueWrite !== void 0 || ctx.__getterSubscriptions?.empty === false || hasVariantResolutionCopies(ctx);
   if (ctx.storedConstructionReplay !== true && !ctx.assertValueWritable && !observesWrites)
     return;
   let rowId = findKnownRowIdByValueReference(value, ctx);
   if (rowId === null) return;
+  forgetVariantResolutionCopy(ctx, rowId);
   const container = ctx.beforeValueWrite && evalValueById(ctx, rowId, ctx.__runtimeSessionValues, ctx.__valueOverlay);
   if (container) ctx.beforeValueWrite?.(container);
   if (key !== void 0 && value !== null && typeof value === "object") {
@@ -85509,12 +85508,7 @@ function evaluateInitializerInContext(init, member, ctx, createdValues, argument
   deleteRuntimeSessionValue(ctx, rootRow.id);
   ctx.__executionState?.constructorGroups.delete(rootRow.id);
   const constructorArgs2 = typeof result.value === "object" && result.value !== null ? ctx.__constructedArgumentsByValue.get(result.value) ?? rootRow.constructorArgs ?? void 0 : void 0;
-  const provenance = pickInstanceProvenance({
-    constructorArgs: constructorArgs2,
-    instanceConstructorId: rootRow.instanceConstructorId,
-    instanceVariantId: rootRow.instanceVariantId,
-    instanceVariantRowValueId: rootRow.instanceVariantRowValueId
-  });
+  const provenance = pickInstanceProvenance({ ...rootRow, constructorArgs: constructorArgs2 });
   return {
     value: result.value,
     classId: rootRow.classId ?? null,
@@ -86379,7 +86373,7 @@ function evalVariantInitialize(info, scope, ctx) {
       scope,
       ctx
     );
-    stampInstanceVariantProvenance(instance, selection2, ctx, true);
+    stampInstanceVariantProvenance(instance, selection2, ctx);
     return instance;
   }
   const graph = resolveVariantGraph(selection2, ctx);
@@ -86410,12 +86404,16 @@ function evalVariantInitialize(info, scope, ctx) {
       ctx,
       ctx.__variantDeclarativeAnsweredValueIds
     );
-    stampInstanceVariantProvenance(instance, selection2, ctx, true);
+    stampInstanceVariantProvenance(instance, selection2, ctx);
     return instance;
   } finally {
     closeFrame();
   }
 }
+function isInsideAnotherExpansion(valueId, ctx) {
+  const ownerRootId = ctx.vm.databaseVM?.virtualInstanceRootIdForValue(valueId) ?? null;
+  return ownerRootId !== null && ownerRootId !== valueId;
+}
 function evalVariantApply(info, scope, ctx) {
   const receiver = evalPointer(info.receiverPointer, scope, ctx);
   if (receiver === null || receiver === void 0) {
@@ -86427,12 +86425,12 @@ function evalVariantApply(info, scope, ctx) {
     evalPointer(info.variantPointer, scope, ctx),
     "ToVariant argument"
   );
-  if (selection2.variantId === null) {
-    stampInstanceVariantProvenance(receiver, selection2, ctx);
+  const graph = selection2.variantId === null ? null : resolveVariantGraph(selection2, ctx);
+  if (info.declarativeReplay === true) {
+    if (graph !== null) applyVariantDeclarativeHalves(receiver, graph, ctx);
     return receiver;
   }
-  const graph = resolveVariantGraph(selection2, ctx);
-  const rowParameters = resolveVariantRowParameter({
+  const rowParameters = graph === null ? [] : resolveVariantRowParameter({
     graph,
     selection: selection2,
     explicitPointer: info.rowPointer,
@@ -86441,13 +86439,18 @@ function evalVariantApply(info, scope, ctx) {
   });
   const rootRow = trackedRowForValueReference(receiver, ctx);
   if (rootRow === null || !isLiteralValueContent(rootRow)) {
+    if (graph === null) return receiver;
     throw new NSGetterRuntimeError(
       "ToVariant receiver has no addressable instance root."
     );
   }
-  const priorInstanceRoot = ctx.__runtimeSessionValues?.has(rootRow.id) === true ? null : deepClonePlainData(rootRow);
-  const applyValue = graph.root.Apply;
-  if (applyValue !== void 0 && applyValue !== null) {
+  if (graph === null && typeof rootRow.instanceAppliedVariantId !== "string") {
+    return receiver;
+  }
+  const inPlace = ctx.__runtimeSessionValues?.has(rootRow.id) === true || isInsideAnotherExpansion(rootRow.id, ctx);
+  const priorInstanceRoot = inPlace ? null : deepClonePlainData(rootRow);
+  const applyValue = graph?.root.Apply;
+  if (graph !== null && applyValue !== void 0 && applyValue !== null) {
     invokeVariantClosure({
       closureValueId: applyValue,
       ctx,
@@ -86457,17 +86460,12 @@ function evalVariantApply(info, scope, ctx) {
     });
   }
   if (priorInstanceRoot === null) {
-    stampInstanceVariantProvenance(receiver, selection2, ctx);
-    applyVariantDeclarativeHalves(receiver, graph, ctx);
+    if (graph !== null) applyVariantDeclarativeHalves(receiver, graph, ctx);
     return receiver;
   }
   priorInstanceRoot.value = deepClonePlainData(rootRow.value);
-  const answeredSlots = collectVariantDeclarativeAnsweredSlots(
-    receiver,
-    graph,
-    ctx
-  );
-  stampInstanceVariantProvenance(receiver, selection2, ctx);
+  const answeredSlots = graph === null ? [] : collectVariantDeclarativeAnsweredSlots(receiver, graph, ctx);
+  stampAppliedVariantProvenance(rootRow, receiver, selection2, ctx);
   const resolver = ctx.vm.databaseVM?.resolveVariantInstanceGraph;
   if (resolver === void 0) {
     if (answeredSlots.length > 0) {
@@ -86476,26 +86474,41 @@ function evalVariantApply(info, scope, ctx) {
       );
     }
   } else {
+    const overlay = ctx.__valueOverlay;
+    const copies = overlay === void 0 ? void 0 : variantResolutionCopies(overlay);
     const resolution = resolver.call(ctx.vm.databaseVM, {
       priorInstanceRoot,
       nextInstanceRoot: deepClonePlainData(rootRow),
       answeredValueIds: [...new Set(answeredSlots.map((slot) => slot.valueId))],
       localRows: [
         ...ctx.__runtimeSessionValues?.values() ?? [],
-        ...ctx.__valueOverlay?.values() ?? []
-      ]
+        ...overlay?.values() ?? []
+      ],
+      virtualCopyIds: unwrittenVariantResolutionCopyIds(
+        overlay,
+        copies?.byRootId.get(rootRow.id)
+      )
     });
     for (const valueId of resolution.clearedValueIds) {
       const previous = readNeoScriptRuntimeRow(ctx, valueId);
       if (previous) observeValueWrite(ctx, previous);
       deleteRuntimeSessionValue(ctx, valueId);
-      ctx.__valueOverlay?.delete(valueId);
+      overlay?.delete(valueId);
     }
+    for (const valueId of copies?.byRootId.get(rootRow.id)?.keys() ?? []) {
+      forgetVariantResolutionCopy(ctx, valueId);
+    }
+    const virtualValueIds = new Set(resolution.virtualValueIds);
     for (const row of resolution.rows) {
       if (row.id === rootRow.id) continue;
       const previous = readNeoScriptRuntimeRow(ctx, row.id);
       if (previous) observeValueWrite(ctx, previous);
-      ctx.__valueOverlay?.set(row.id, deepClonePlainData(row));
+      if (overlay === void 0 || copies === void 0) continue;
+      const copy = deepClonePlainData(row);
+      overlay.set(row.id, copy);
+      if (virtualValueIds.has(row.id)) {
+        trackVariantResolutionCopy(copies, rootRow.id, copy);
+      }
     }
     if (typeof receiver !== "object" || receiver === null || Array.isArray(receiver) || typeof resolution.root.value !== "object" || resolution.root.value === null || Array.isArray(resolution.root.value)) {
       throw new NSGetterRuntimeError(
@@ -86509,14 +86522,69 @@ function evalVariantApply(info, scope, ctx) {
   }
   return receiver;
 }
-function stampInstanceVariantProvenance(instance, selection2, ctx, preserveLookupRow = false) {
+function variantResolutionCopies(overlay) {
+  let copies = variantResolutionCopiesByOverlay.get(overlay);
+  if (copies === void 0) {
+    copies = { byRootId: /* @__PURE__ */ new Map(), rootIdByValueId: /* @__PURE__ */ new Map() };
+    variantResolutionCopiesByOverlay.set(overlay, copies);
+  }
+  return copies;
+}
+function hasVariantResolutionCopies(ctx) {
+  const overlay = ctx.__valueOverlay;
+  if (overlay === void 0) return false;
+  const copies = variantResolutionCopiesByOverlay.get(overlay);
+  return copies !== void 0 && copies.rootIdByValueId.size > 0;
+}
+function trackVariantResolutionCopy(copies, rootId, copy) {
+  let rootCopies = copies.byRootId.get(rootId);
+  if (rootCopies === void 0) {
+    rootCopies = /* @__PURE__ */ new Map();
+    copies.byRootId.set(rootId, rootCopies);
+  }
+  rootCopies.set(copy.id, copy);
+  copies.rootIdByValueId.set(copy.id, rootId);
+}
+function unwrittenVariantResolutionCopyIds(overlay, rootCopies) {
+  if (overlay === void 0 || rootCopies === void 0) return [];
+  const ids = [];
+  for (const [id2, copy] of rootCopies) {
+    if (overlay.get(id2) === copy) ids.push(id2);
+  }
+  return ids;
+}
+function forgetVariantResolutionCopy(ctx, valueId) {
+  const overlay = ctx.__valueOverlay;
+  if (overlay === void 0) return;
+  const copies = variantResolutionCopiesByOverlay.get(overlay);
+  const rootId = copies?.rootIdByValueId.get(valueId);
+  if (copies === void 0 || rootId === void 0) return;
+  copies.rootIdByValueId.delete(valueId);
+  copies.byRootId.get(rootId)?.delete(valueId);
+}
+function stampInstanceVariantProvenance(instance, selection2, ctx) {
   const row = trackedRowForValueReference(instance, ctx);
   if (row === null || !isLiteralValueContent(row)) return;
-  if (preserveLookupRow && row.id === selection2.rowValueId) return;
+  if (row.id === selection2.rowValueId) return;
   assertStoredReplayMutableValue(instance, ctx, "variant provenance");
   row.instanceVariantId = selection2.variantId;
   row.instanceVariantRowValueId = selection2.rowValueId;
 }
+function stampAppliedVariantProvenance(rootRow, instance, selection2, ctx) {
+  const applied = typeof rootRow.instanceAppliedVariantId === "string";
+  const variantId = applied ? rootRow.instanceAppliedVariantId : rootRow.instanceVariantId ?? null;
+  const rowValueId = applied ? rootRow.instanceAppliedVariantRowValueId : rootRow.instanceVariantRowValueId;
+  if (variantId === selection2.variantId && (rowValueId ?? null) === selection2.rowValueId) {
+    return;
+  }
+  assertStoredReplayMutableValue(instance, ctx, "variant provenance");
+  if (!isVirtualInstanceRootShape(rootRow)) {
+    rootRow.instanceConstructorId = null;
+    rootRow.constructorArgs = {};
+  }
+  rootRow.instanceAppliedVariantId = selection2.variantId;
+  rootRow.instanceAppliedVariantRowValueId = selection2.rowValueId;
+}
 function constructDeclaredClassValue(info, scope, ctx) {
   const descriptor = validateClassConstructorDescriptor(info, ctx, false);
   const schemaClass2 = descriptor.schemaClass;
@@ -86599,6 +86667,7 @@ function constructDeclaredClassValueWithinFrame(descriptor, record7, info, scope
     );
   }
   const rootRecord = root.value;
+  recordConstructedFieldSchemaKeys(ctx, rootRecord, descriptor);
   if (record7 !== null) {
     const encoded = {};
     for (let index = 0; index < argumentValues.length; index += 1) {
@@ -86639,7 +86708,6 @@ function constructDeclaredClassValueWithinFrame(descriptor, record7, info, scope
     }
     const argumentsByValue = ctx.__constructedArgumentsByValue ?? (ctx.__constructedArgumentsByValue = /* @__PURE__ */ new WeakMap());
     argumentsByValue.set(rootRecord, encoded);
-    recordConstructedFieldSchemaKeys(ctx, rootRecord, descriptor);
     root.constructorArgs = deepClonePlainData(encoded);
     root.instanceConstructorId = record7.id;
   } else {
@@ -87032,7 +87100,7 @@ function cloneConstructorArgumentGraph(args) {
         member.classArguments,
         args.ctx.vm.classes
       );
-      const record7 = {};
+      const record7 = /* @__PURE__ */ Object.create(null);
       clone.value = record7;
       const sourceRecord = {
         ...virtualExpandedRecordForReceiver(source.value, args.ctx),
@@ -87076,7 +87144,7 @@ function cloneConstructorArgumentGraph(args) {
           `Constructor import references missing Dictionary entry member '${member.entryMemberId}'.`
         );
       }
-      const record7 = {};
+      const record7 = /* @__PURE__ */ Object.create(null);
       clone.value = record7;
       const entryEnv = envFromStamp(clone.genericBindings);
       for (const [key, childId] of Object.entries(source.value)) {
@@ -87319,7 +87387,7 @@ function materializeConstructorArgumentValue(args) {
       args.ctx.vm.members
     );
     const row = registerConstructorArgumentRow(args, {});
-    const record7 = {};
+    const record7 = /* @__PURE__ */ Object.create(null);
     for (const [key, rawEntry] of Object.entries(args.value)) {
       const entry = constructorCollectionEntryValue(
         rawEntry,
@@ -87994,7 +88062,7 @@ function collectionEntryUsesReferenceResolution(collection, key, ctx) {
   );
   return referenceIndexes === void 0 || referenceIndexes.has(key);
 }
-var DELEGATE_LEXICAL_THIS, DELEGATE_LEXICAL_ROOT, DELEGATE_LEXICAL_TYPE_ARGUMENTS, NonCatchableNSGetterRuntimeError, NativeFunctionDelegateUnavailableError, CorruptNeoScriptIRError, NeoScriptWallClockTimeoutError, liveListIndexesByProject, evaluatorOwnershipCachesByBase, MAX_CONSTRUCTION_DEPTH, resolutionCacheByMembers, NO_SCHEMA_REVISION, LazyValueOverlay, READONLY_FOREACH_BINDING_ERROR, READONLY_CATCH_BINDING_ERROR, DIALOGUE_CONTEXT_PARAMETER_ID, FORWARDING_TYPE_ARGUMENTS, constantDeclarationRoots, NS_MATH_OP_NAMES, DOUBLE_INTEGRAL_MAGNITUDE, EMPTY_SUPPLIED_CONSTRUCTOR_FIELDS;
+var DELEGATE_LEXICAL_THIS, DELEGATE_LEXICAL_ROOT, DELEGATE_LEXICAL_TYPE_ARGUMENTS, NonCatchableNSGetterRuntimeError, NativeFunctionDelegateUnavailableError, CorruptNeoScriptIRError, NeoScriptWallClockTimeoutError, liveListIndexesByProject, evaluatorOwnershipCachesByBase, MAX_CONSTRUCTION_DEPTH, resolutionCacheByMembers, NO_SCHEMA_REVISION, LazyValueOverlay, READONLY_FOREACH_BINDING_ERROR, READONLY_CATCH_BINDING_ERROR, DIALOGUE_CONTEXT_PARAMETER_ID, FORWARDING_TYPE_ARGUMENTS, constantDeclarationRoots, NS_MATH_OP_NAMES, DOUBLE_INTEGRAL_MAGNITUDE, EMPTY_SUPPLIED_CONSTRUCTOR_FIELDS, variantResolutionCopiesByOverlay;
 var init_evaluateNSGetter = __esm({
   "../packages/neoscript-runtime/src/neoscript/evaluateNSGetter.ts"() {
     "use strict";
@@ -88204,6 +88272,7 @@ var init_evaluateNSGetter = __esm({
     };
     DOUBLE_INTEGRAL_MAGNITUDE = 2 ** 53;
     EMPTY_SUPPLIED_CONSTRUCTOR_FIELDS = [];
+    variantResolutionCopiesByOverlay = /* @__PURE__ */ new WeakMap();
   }
 });
 
@@ -89896,6 +89965,8 @@ function expandStoredInstance(args) {
     instanceConstructorId: _instanceConstructorId,
     instanceVariantId: _instanceVariantId,
     instanceVariantRowValueId: _instanceVariantRowValueId,
+    instanceAppliedVariantId: _instanceAppliedVariantId,
+    instanceAppliedVariantRowValueId: _instanceAppliedVariantRowValueId,
     ...envelope
   } = instanceRoot;
   void _value;
@@ -89904,6 +89975,8 @@ function expandStoredInstance(args) {
   void _instanceConstructorId;
   void _instanceVariantId;
   void _instanceVariantRowValueId;
+  void _instanceAppliedVariantId;
+  void _instanceAppliedVariantRowValueId;
   const closedRootMember = closeClassArgumentsFromRowStamp(
     rootMember,
     instanceRoot
@@ -89985,11 +90058,26 @@ function expandStoredInstance(args) {
       }
     };
   };
-  const materialized = derivesContentFromMemberDefault({
+  const constructed = derivesContentFromMemberDefault({
     member: replayMember,
     instanceRoot,
     effectiveClassId: classId
   }) ? replayDeclaredDefault() : replay([]);
+  const appliedVariantId = instanceRoot.instanceAppliedVariantId;
+  const materialized = typeof appliedVariantId !== "string" ? constructed : trackMaterialization(
+    () => replayAppliedVariant({
+      evaluateInitializer: args.evaluateInitializer,
+      document: args.document,
+      member: replayMember,
+      constructed,
+      classId,
+      variantId: appliedVariantId,
+      variantRowValueId: instanceRoot.instanceAppliedVariantRowValueId ?? null,
+      ...readTracking === void 0 ? {} : { readTracking },
+      saveStaticBindings: args.saveStaticBindings,
+      sessionStaticBindings: args.sessionStaticBindings
+    })
+  );
   const rows = [materialized.root, ...materialized.createdValues];
   assertVirtualExpansionIsLiteral(rows);
   return {
@@ -89998,6 +90086,80 @@ function expandStoredInstance(args) {
     pinnedRootSchemaKeys: /* @__PURE__ */ new Set()
   };
 }
+function replayAppliedVariant(args) {
+  const rootId = args.constructed.root.id;
+  const sessionValues = /* @__PURE__ */ new Map();
+  sessionValues.set(rootId, args.constructed.root);
+  for (const row of args.constructed.createdValues)
+    sessionValues.set(row.id, row);
+  const variant2 = args.document.databaseVM?.variantById?.(args.variantId) ?? args.document.variants?.find((entry) => entry.id === args.variantId);
+  const variantClassId = variant2?.classId ?? args.classId;
+  const schemaClassInfo = {
+    type: 7 /* Class */,
+    required: true,
+    classId: args.classId
+  };
+  args.evaluateInitializer({
+    init: {
+      code: `virtual-applied-variant:${rootId}`,
+      compiled: {
+        compilerRevision: NEOSCRIPT_COMPILER_REVISION,
+        parameters: evaluatorEnvelopeParameters(),
+        instructions: [
+          {
+            type: "return" /* return */,
+            pointer: {
+              type: "function" /* function */,
+              function: {
+                type: "variantApply" /* variantApply */,
+                info: {
+                  receiverPointer: {
+                    type: "reference" /* reference */,
+                    valueId: rootId
+                  },
+                  variantPointer: {
+                    type: "variant" /* variant */,
+                    classId: variantClassId,
+                    variantId: args.variantId,
+                    rowValueId: args.variantRowValueId
+                  },
+                  schemaClassInfo,
+                  declarativeReplay: true
+                }
+              }
+            }
+          }
+        ],
+        typeInfo: schemaClassInfo
+      }
+    },
+    member: args.member,
+    document: args.document,
+    createdValues: [],
+    sessionValues,
+    storedConstructionReplay: true,
+    sourceValueId: rootId,
+    ...args.readTracking === void 0 ? {} : { readTracking: args.readTracking },
+    saveStaticBindings: args.saveStaticBindings,
+    sessionStaticBindings: args.sessionStaticBindings
+  });
+  const root = sessionValues.get(rootId);
+  if (root === void 0) {
+    throw new Error(
+      `Applied variant "${args.variantId}" replay lost instance root "${rootId}".`
+    );
+  }
+  sessionValues.delete(rootId);
+  return {
+    ...args.constructed,
+    root: {
+      ...root,
+      instanceAppliedVariantId: args.variantId,
+      instanceAppliedVariantRowValueId: args.variantRowValueId
+    },
+    createdValues: [...sessionValues.values()]
+  };
+}
 function resolveVirtualInstanceGraph(args) {
   const expansion = args.expansionIndex ?? indexExpansion(args);
   const recorder = args.readRecorder ?? null;
@@ -90971,6 +91133,11 @@ function expandStoredClassValue(args) {
     pinnedRootSchemaKeys: /* @__PURE__ */ new Set()
   };
 }
+function owningInstanceRootId(graph) {
+  let owner = graph;
+  while (owner?.containingGraph !== void 0) owner = owner.containingGraph;
+  return owner?.instanceRootId ?? null;
+}
 function isStoredClassResolutionRoot(value) {
   if (!isLiteralValueContent(value)) return false;
   if (isVirtualInstanceRootShape(value)) return true;
@@ -91284,6 +91451,7 @@ function planCollapseVirtualInstance(args) {
     if (provenance.sameRecipe) return true;
     if (typeof stored.instanceConstructorId === "string") return false;
     if (typeof stored.instanceVariantId === "string") return false;
+    if (typeof stored.instanceAppliedVariantId === "string") return false;
     const storedArgs = stored.constructorArgs;
     if (storedArgs != null && Object.keys(storedArgs).length > 0) return false;
     return !isInitValueContent(child2.member.defaultValue);
@@ -91682,10 +91850,35 @@ function sparsifyConstructedInstance(args) {
       if (typeof entryId === "string")
         protectArgument(entryId, type.entryTypeInfo);
   };
+  const argumentValueIds = /* @__PURE__ */ new Set();
+  const pinnedSubtreeIds = /* @__PURE__ */ new Set();
+  const pinSubtree = (valueId) => {
+    if (pinnedSubtreeIds.has(valueId)) return;
+    pinnedSubtreeIds.add(valueId);
+    protectedValueIds.add(valueId);
+    const row = materializedGraph.valuesById.get(valueId);
+    if (row === void 0) return;
+    for (const childId of materializedGraph.referencedValueIds(row))
+      pinSubtree(childId);
+  };
+  const pinArgumentFields = (valueId) => {
+    if (argumentValueIds.has(valueId)) return;
+    argumentValueIds.add(valueId);
+    const row = materializedGraph.valuesById.get(valueId);
+    if (row === void 0) return;
+    const fields = isObjectRecord2(row.value) ? row.value : {};
+    for (const schemaKey of args.pinnedSchemaKeysByValueId?.get(valueId) ?? []) {
+      const fieldId = fields[schemaKey];
+      if (typeof fieldId === "string") pinSubtree(fieldId);
+    }
+    for (const childId of materializedGraph.referencedValueIds(row))
+      pinArgumentFields(childId);
+  };
   for (const edge of materializedGraph.constructorEdges(
     args.constructed.root
   )) {
     protectArgument(edge.targetValueId, edge.typeInfo);
+    pinArgumentFields(edge.targetValueId);
   }
   for (const schemaKey of args.pinnedRootSchemaKeys ?? []) {
     const location3 = graph.locationsByPath.get(
@@ -92340,7 +92533,9 @@ function compareContextualCreationProvenance(left, right, context) {
       constructorArgs: literal3.constructorArgs ?? {},
       instanceConstructorId: literal3.instanceConstructorId ?? null,
       instanceVariantId: literal3.instanceVariantId ?? null,
-      instanceVariantRowValueId: literal3.instanceVariantRowValueId ?? null
+      instanceVariantRowValueId: literal3.instanceVariantRowValueId ?? null,
+      instanceAppliedVariantId: literal3.instanceAppliedVariantId ?? null,
+      instanceAppliedVariantRowValueId: literal3.instanceAppliedVariantRowValueId ?? null
     };
   };
   return {
@@ -92638,40 +92833,37 @@ function resolveVariantInstanceGraphForDocument(args) {
     rootMember,
     readRecorder: args.readRecorder
   });
-  const priorGraph = resolveVirtualInstanceGraph({
+  let priorInstanceRoot = args.priorInstanceRoot;
+  let nextInstanceRoot = args.nextInstanceRoot;
+  const resolvePriorGraph = () => resolveVirtualInstanceGraph({
     document,
-    instanceRoot: args.priorInstanceRoot,
+    instanceRoot: priorInstanceRoot,
     rootMember,
     expandedRoot: priorExpanded.root,
     expandedRows: priorExpanded.rows,
     materializedRows: [...materializedById.values()],
     readRecorder: args.readRecorder
   });
-  const priorAnsweredIds = [];
-  const incomingAnsweredIds = [];
-  for (const valueId of args.answeredValueIds) {
-    const bucket = priorGraph.locationsById.has(valueId) ? priorAnsweredIds : incomingAnsweredIds;
-    bucket.push(valueId);
-  }
   const clearedValueIds = /* @__PURE__ */ new Set();
-  let nextInstanceRoot = args.nextInstanceRoot;
-  const resetAnsweredValues = (graph, valueIds) => {
-    if (valueIds.length === 0) return;
-    const reset = planVirtualOverrideResets({ graph, valueIds });
+  const applyReset = (graph, reset) => {
     for (const valueId of reset.deletes) {
       clearedValueIds.add(valueId);
       materializedById.delete(valueId);
     }
     for (const update of reset.updates) {
       if (update.valueId === nextInstanceRoot.id) {
-        const nextRecord = { ...stringRecord2(nextInstanceRoot.value) };
         const resetRecord = stringRecord2(update.value);
         const priorRecord = stringRecord2(graph.root.materializedRow?.value);
-        for (const schemaKey of Object.keys(priorRecord)) {
-          if (!Object.hasOwn(resetRecord, schemaKey))
-            delete nextRecord[schemaKey];
-        }
-        nextInstanceRoot = { ...nextInstanceRoot, value: nextRecord };
+        const withoutReset = (root2) => {
+          const record7 = { ...stringRecord2(root2.value) };
+          for (const schemaKey of Object.keys(priorRecord)) {
+            if (!Object.hasOwn(resetRecord, schemaKey))
+              delete record7[schemaKey];
+          }
+          return { ...root2, value: record7 };
+        };
+        priorInstanceRoot = withoutReset(literalRow(priorInstanceRoot));
+        nextInstanceRoot = withoutReset(literalRow(nextInstanceRoot));
       }
       const existing = materializedById.get(update.valueId);
       if (existing !== void 0) {
@@ -92683,6 +92875,28 @@ function resolveVariantInstanceGraphForDocument(args) {
     }
     materializedById.set(nextInstanceRoot.id, nextInstanceRoot);
   };
+  let priorGraph = resolvePriorGraph();
+  if (args.virtualCopyIds !== void 0 && args.virtualCopyIds.length > 0) {
+    const collapse = planCollapseVirtualInstance({
+      graph: priorGraph,
+      removableValueIds: new Set(args.virtualCopyIds)
+    });
+    if (collapse.deletes.length > 0 || collapse.updates.length > 0) {
+      applyReset(priorGraph, collapse);
+      materializedById.set(priorInstanceRoot.id, priorInstanceRoot);
+      priorGraph = resolvePriorGraph();
+    }
+  }
+  const priorAnsweredIds = [];
+  const incomingAnsweredIds = [];
+  for (const valueId of args.answeredValueIds) {
+    const bucket = priorGraph.locationsById.has(valueId) ? priorAnsweredIds : incomingAnsweredIds;
+    bucket.push(valueId);
+  }
+  const resetAnsweredValues = (graph, valueIds) => {
+    if (valueIds.length === 0) return;
+    applyReset(graph, planVirtualOverrideResets({ graph, valueIds }));
+  };
   resetAnsweredValues(priorGraph, priorAnsweredIds);
   materializedById.set(nextInstanceRoot.id, nextInstanceRoot);
   const nextExpanded = expandStoredInstance({
@@ -92726,10 +92940,15 @@ function resolveVariantInstanceGraphForDocument(args) {
       `ToVariant failed to resolve instance root '${args.nextInstanceRoot.id}'.`
     );
   }
+  const virtualValueIds = /* @__PURE__ */ new Set();
+  for (const location3 of nextGraph.locationsById.values()) {
+    if (location3.materializedRow === null) virtualValueIds.add(location3.id);
+  }
   return {
     root,
     rows: [...nextGraph.rowsById.values()],
-    clearedValueIds: [...clearedValueIds]
+    clearedValueIds: [...clearedValueIds],
+    virtualValueIds: [...virtualValueIds]
   };
 }
 function variantSwapDeclaredMember(document, rootValueId) {
@@ -93056,6 +93275,7 @@ var KEPT_ROW_SAMPLE_LIMIT, VirtualExpansionUnsupportedError, ROOT_PATH, OpenGene
 var init_virtual_instance_graph = __esm({
   "../packages/neoscript-runtime/src/virtual-instance-graph.ts"() {
     "use strict";
+    init_value_comparison();
     init_listener_endpoint_projection();
     init_overlay_readonly_map();
     init_member_change_listeners();
@@ -93158,6 +93378,7 @@ function initializerEvaluatorLookups(document, readTracking) {
         return resolved;
       },
       virtualInstanceRowsForValue: (receiverValueId) => databaseVM.virtualInstanceRowsForValue(receiverValueId),
+      virtualInstanceRootIdForValue: (valueId) => databaseVM.virtualInstanceRootIdForValue(valueId),
       ...databaseVM.worldGridQueryIndex === void 0 ? {} : { worldGridQueryIndex: () => databaseVM.worldGridQueryIndex() },
       rowForValueReference: (value) => databaseVM.rowForValueReference?.(value) ?? null,
       resolveVariantInstanceGraph: (args) => {
@@ -93213,6 +93434,9 @@ function initializerEvaluatorLookups(document, readTracking) {
     valueById: (id2) => indexedLookups.valueById(id2) ?? headlessVirtualResolver.valueById(id2),
     rowForValueReference: (value) => indexedLookups.rowForValueReference?.(value) ?? headlessVirtualResolver.rowForValueReference(value),
     virtualInstanceRowsForValue: (receiverValueId) => headlessVirtualResolver.virtualInstanceRowsForValue(receiverValueId),
+    virtualInstanceRootIdForValue: (valueId) => owningInstanceRootId(
+      headlessVirtualResolver.virtualInstanceGraphForValue(valueId)
+    ),
     recordVirtualInstanceReads: (reads, read) => headlessVirtualResolver.recordReads(reads, read),
     // Headless hosts still evaluate `ToVariant` during
     // stored-construction replay — production's variant-constructed
@@ -93446,6 +93670,7 @@ function createInitializerMaterializationBatch(authoredDocument, pendingInitiali
           if (entry.global) globalReads.add(entry);
           return entry.rows;
         },
+        virtualInstanceRootIdForValue: (id2) => owningInstanceRootId(virtual().virtualInstanceGraphForValue(id2)),
         resolveVariantInstanceGraph: (args) => resolveVariantInstanceGraphForDocument({
           evaluateInitializer: evaluateMemberInitializer,
           document,
@@ -93529,6 +93754,7 @@ function evaluateMemberInitializer(args) {
   );
   const compiled = compileMemberInitializer(args, databaseVM);
   const ctx = {
+    ...args.sessionValues === void 0 ? {} : { __runtimeSessionValues: args.sessionValues },
     debugSink: args.document.debugSink,
     beforeValueAllocation: args.document.beforeValueAllocation,
     listenerDefaultCapture: args.document.listenerDefaultCapture,
@@ -93599,10 +93825,13 @@ function evaluateMemberInitializer(args) {
         args.argumentValues ?? [],
         {
           exportInitializerValues: true,
-          initializerResult: {
-            member: args.member,
-            genericEnv: args.genericEnv
-          }
+          // Seeded rows already hold their placement.
+          ...args.sessionValues === void 0 ? {
+            initializerResult: {
+              member: args.member,
+              genericEnv: args.genericEnv
+            }
+          } : {}
         }
       );
     } catch (error) {
@@ -93625,9 +93854,12 @@ function evaluateMemberInitializer(args) {
     );
   }
   const rootRow = initializerRootRow(result.value, created);
+  const pinnedSchemaKeysByValueId = /* @__PURE__ */ new Map();
   for (const row of created) {
     if (row === rootRow) continue;
     args.createdValues.push(row);
+    const keys = typeof row.value === "object" && row.value !== null ? ctx.__constructedFieldSchemaKeysByValue?.get(row.value) : void 0;
+    if (keys !== void 0) pinnedSchemaKeysByValueId.set(row.id, keys);
   }
   if (rootRow === null) return { value: result.value, classId: null };
   const constructorArgs2 = (typeof result.value === "object" && result.value !== null ? ctx.__constructedArgumentsByValue?.get(result.value) : void 0) ?? // An implicit `new()` records its empty args on the row rather than in
@@ -93635,17 +93867,13 @@ function evaluateMemberInitializer(args) {
   // origin or the recipe reads as an unrecorded overload.
   rootRow.constructorArgs ?? void 0;
   const pinnedRootSchemaKeys = typeof result.value === "object" && result.value !== null ? ctx.__constructedFieldSchemaKeysByValue?.get(result.value) : void 0;
-  const provenance = pickInstanceProvenance({
-    constructorArgs: constructorArgs2,
-    instanceConstructorId: rootRow.instanceConstructorId,
-    instanceVariantId: rootRow.instanceVariantId,
-    instanceVariantRowValueId: rootRow.instanceVariantRowValueId
-  });
+  const provenance = pickInstanceProvenance({ ...rootRow, constructorArgs: constructorArgs2 });
   return {
     value: result.value,
     classId: rootRow.classId ?? null,
     ...rootRow.genericBindings === void 0 ? {} : { genericBindings: { ...rootRow.genericBindings } },
     ...pinnedRootSchemaKeys === void 0 ? {} : { pinnedRootSchemaKeys },
+    ...pinnedSchemaKeysByValueId.size === 0 ? {} : { pinnedSchemaKeysByValueId },
     provisionalRootId: rootRow.id,
     ...provenance,
     ...provenance.constructorArgs === void 0 ? {} : {
@@ -93851,12 +94079,7 @@ function materializeInitializerValue(args) {
     value: evaluated.value,
     ...evaluated.classId === null ? {} : { classId: evaluated.classId },
     ...evaluated.genericBindings === void 0 ? {} : { genericBindings: { ...evaluated.genericBindings } },
-    ...evaluated.constructorArgs === void 0 ? {} : { constructorArgs: deepClonePlainData(evaluated.constructorArgs) },
-    ...evaluated.instanceConstructorId === void 0 ? {} : { instanceConstructorId: evaluated.instanceConstructorId },
-    ...evaluated.instanceVariantId === void 0 ? {} : { instanceVariantId: evaluated.instanceVariantId },
-    ...evaluated.instanceVariantRowValueId === void 0 ? {} : {
-      instanceVariantRowValueId: evaluated.instanceVariantRowValueId
-    }
+    ...deepClonePlainData(pickInstanceProvenance(evaluated))
   };
   const allCreated = [root, ...createdValues];
   if (evaluated.provisionalRootId !== void 0) {
@@ -93879,7 +94102,8 @@ function materializeInitializerValue(args) {
   return {
     root,
     createdValues,
-    pinnedRootSchemaKeys: evaluated.pinnedRootSchemaKeys ?? /* @__PURE__ */ new Set()
+    pinnedRootSchemaKeys: evaluated.pinnedRootSchemaKeys ?? /* @__PURE__ */ new Set(),
+    pinnedSchemaKeysByValueId: evaluated.pinnedSchemaKeysByValueId ?? /* @__PURE__ */ new Map()
   };
 }
 function materializeMemberDefaultValue(args) {
@@ -93996,7 +94220,12 @@ function materializeMemberDefaultValue(args) {
     storageKeyDeclarations,
     supersededRootId: built.id
   });
-  return { root, createdValues: interior, pinnedRootSchemaKeys: /* @__PURE__ */ new Set() };
+  return {
+    root,
+    createdValues: interior,
+    pinnedRootSchemaKeys: /* @__PURE__ */ new Set(),
+    pinnedSchemaKeysByValueId: /* @__PURE__ */ new Map()
+  };
 }
 var declarationInitializerContextByDocument, defaultValuePlansByDocument;
 var init_initializer_materialization = __esm({
@@ -94005,6 +94234,7 @@ var init_initializer_materialization = __esm({
     init_deep_clone_plain_data();
     init_members();
     init_inheritance();
+    init_instance_provenance();
     init_generics();
     init_evaluateInitializer();
     init_evaluateNSGetter();
@@ -110398,7 +110628,7 @@ function toCanonicalJsonValue2(value) {
   if (!isPlainRecord2(value)) {
     throw new Error("Cannot canonicalize a non-plain object.");
   }
-  const canonical = {};
+  const canonical = /* @__PURE__ */ Object.create(null);
   const entries = Object.entries(value).sort(
     ([left], [right]) => left.localeCompare(right)
   );
@@ -113781,6 +114011,7 @@ function headlessVirtualInstanceLookups(document, options = {}) {
     valueById: (id2) => indexed.valueById(id2) ?? virtual.valueById(id2),
     rowForValueReference: (value) => indexed.rowForValueReference(value) ?? virtual.rowForValueReference(value),
     virtualInstanceRowsForValue: (receiverValueId) => virtual.virtualInstanceRowsForValue(receiverValueId),
+    virtualInstanceRootIdForValue: (valueId) => owningInstanceRootId(virtual.virtualInstanceGraphForValue(valueId)),
     // Stored-construction replay evaluates `ToVariant`, and production's
     // variant-constructed placements collapse through exactly this path.
     resolveVariantInstanceGraph: (args) => resolveVariantInstanceGraphForDocument2({
@@ -114689,6 +114920,7 @@ function validateWorldPlacementSidecars(args) {
   validatePlacementVariantBinding({
     assetClassId,
     placementId: args.placement.id,
+    layer: "built",
     variantId: optionalNonEmptyString(
       args.isTile || !hasObjectSidecar ? getField(args.placement, "instanceVariantId") : record7.variantId
     ),
@@ -114697,12 +114929,25 @@ function validateWorldPlacementSidecars(args) {
     ),
     context: args.context
   });
+  validatePlacementVariantBinding({
+    assetClassId,
+    placementId: args.placement.id,
+    layer: "applied",
+    variantId: optionalNonEmptyString(
+      getField(args.placement, "instanceAppliedVariantId")
+    ),
+    rowValueId: optionalNonEmptyString(
+      getField(args.placement, "instanceAppliedVariantRowValueId")
+    ),
+    context: args.context
+  });
 }
 function validatePlacementVariantBinding(args) {
+  const noun = args.layer === "built" ? "variant" : "applied variant";
   if (args.variantId === null) {
     if (args.rowValueId !== null) {
       throw new Error(
-        `Placement value "${args.placementId}" binds row "${args.rowValueId}" without a variant.`
+        `Placement value "${args.placementId}" binds row "${args.rowValueId}" without a ${noun}.`
       );
     }
     return;
@@ -114710,19 +114955,24 @@ function validatePlacementVariantBinding(args) {
   const variant2 = args.context.variantsById.get(args.variantId);
   if (variant2 === void 0) {
     throw new Error(
-      `Placement value "${args.placementId}" references variant "${args.variantId}", which does not resolve to a live variant record.`
+      `Placement value "${args.placementId}" references ${noun} "${args.variantId}", which does not resolve to a live variant record.`
     );
   }
-  if (variant2.classId !== args.assetClassId) {
+  if (args.layer === "built" && variant2.classId !== args.assetClassId) {
     throw new Error(
       `Placement value "${args.placementId}" places class "${args.assetClassId}" but names variant "${args.variantId}" of class "${variant2.classId}"; variant lookup is not virtual.`
     );
   }
+  if (args.layer === "applied" && !args.context.relationResolver.classAncestry(args.assetClassId).includes(variant2.classId)) {
+    throw new Error(
+      `Placement value "${args.placementId}" places class "${args.assetClassId}" but applies variant "${args.variantId}" of class "${variant2.classId}", which is not that class or a base of it.`
+    );
+  }
   const lookupRows = variant2.lookupRowValueIds;
   if (lookupRows === void 0) {
     if (args.rowValueId !== null) {
       throw new Error(
-        `Placement value "${args.placementId}" binds a row to plain variant "${args.variantId}".`
+        `Placement value "${args.placementId}" binds a row to plain ${noun} "${args.variantId}".`
       );
     }
     return;
@@ -114734,7 +114984,7 @@ function validatePlacementVariantBinding(args) {
   }
   if (args.rowValueId === null || !rowIds.has(args.rowValueId)) {
     throw new Error(
-      `Placement value "${args.placementId}" must bind a live row from lookup variant "${args.variantId}".`
+      `Placement value "${args.placementId}" must bind a live row from lookup ${noun} "${args.variantId}".`
     );
   }
 }
@@ -114839,11 +115089,14 @@ function optionalNonEmptyString(value) {
   return typeof value === "string" && value.length > 0 ? value : null;
 }
 function consumeWorldPlacementSidecarKeys(args) {
-  const worldKind = args.worldKindsByClassId === void 0 ? resolveWorldSystemClassKind(args.classId, args.classes) : args.worldKindsByClassId.get(args.classId) ?? null;
-  if (worldKind === null) return /* @__PURE__ */ new Set();
-  const assetKind = WORLD_PLACEMENT_ASSET_KIND.get(worldKind);
-  if (assetKind === void 0) return /* @__PURE__ */ new Set();
   const classesById = args.classesById ?? new Map(args.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2]));
+  if (!classInheritsWorldKind(
+    args.classId,
+    NeoWorldSystemClassKind.Object,
+    classesById
+  )) {
+    return /* @__PURE__ */ new Set();
+  }
   const present = /* @__PURE__ */ new Set();
   for (const key of WORLD_PLACEMENT_SIDECAR_KEYS) {
     if (!Object.hasOwn(args.body, key)) continue;
@@ -114860,13 +115113,13 @@ function consumeWorldPlacementSidecarKeys(args) {
       classId: assetClassId,
       worldKindsByClassId: args.worldKindsByClassId ?? indexWorldSystemClassKinds(args.classes, classesById),
       classesById,
-      expectedKind: assetKind,
+      expectedKind: NeoWorldSystemClassKind.Object,
       label: `${args.label} assetClassId`
     });
   }
   return present;
 }
-var WORLD_PLACEMENT_SIDECAR_KEYS, TILE_CLASS_LEVEL_KEYS, WORLD_PLACEMENT_ASSET_KIND;
+var WORLD_PLACEMENT_SIDECAR_KEYS, TILE_CLASS_LEVEL_KEYS;
 var init_world_content_sidecar_validation = __esm({
   "../src/models/project/world-content-sidecar-validation.ts"() {
     "use strict";
@@ -114891,7 +115144,6 @@ var init_world_content_sidecar_validation = __esm({
     ).flatMap(
       (field) => field.mutability === 1 /* ReadOnly */ ? [field.schemaKey] : []
     );
-    WORLD_PLACEMENT_ASSET_KIND = /* @__PURE__ */ new Map([[NeoWorldSystemClassKind.Object, NeoWorldSystemClassKind.Object]]);
   }
 });
 
@@ -117807,6 +118059,12 @@ function materializePreparedInstanceInitializers(args) {
   );
   let currentReader = null;
   const requireCurrentReader = () => currentReader ??= new EffectiveValueReader(materializationScope.document);
+  let ownedValueCollector;
+  let valueHashes;
+  const liveValueHashes = () => valueHashes ??= indexLiveContentHashesByRecordId(
+    args.contentHashHeads,
+    "value"
+  );
   const owners = resolveSemanticOwnerMembersForValues(
     materializationScope.document,
     new Set(sites.keys()),
@@ -117854,7 +118112,17 @@ function materializePreparedInstanceInitializers(args) {
       storedConstructionReplay: true
     });
     if (existingConstructedRoot !== void 0) {
-      if (!isLiteralValueContent(materialized.root) || existingConstructedRoot.classId !== materialized.root.classId || !replayedCreationDataMatches({
+      if (!isLiteralValueContent(materialized.root)) {
+        throw new Error(
+          `construction-arguments-conflict: Value "${valueId}" is already materialized, and its construction no longer evaluates to a stored instance. Delete and recreate the value with the new construction.`
+        );
+      }
+      if (existingConstructedRoot.classId !== materialized.root.classId) {
+        throw new Error(
+          `construction-arguments-conflict: Value "${valueId}" is already materialized as class "${String(existingConstructedRoot.classId)}", and this construction builds class "${String(materialized.root.classId)}". Delete and recreate the value to change its class.`
+        );
+      }
+      if (replayedCreationDataMatches({
         // The synthetic variant binding members are part of the ownership
         // scope that compiled and evaluated this initializer. Stored replay
         // closes its generic slot from the same ephemeral member id, so its
@@ -117865,13 +118133,10 @@ function materializePreparedInstanceInitializers(args) {
         replayRoot: materialized.root,
         replayCreated: materialized.createdValues
       })) {
-        throw new Error(
-          `construction-arguments-conflict: Value "${valueId}" is already materialized, and this construction changes its original arguments. Edit the instance's members, or delete and recreate the value with the new construction.`
-        );
+        replayOnlyIndexes.push(site.index);
+        batch.upsert([existingConstructedRoot]);
+        return;
       }
-      replayOnlyIndexes.push(site.index);
-      batch.upsert([existingConstructedRoot]);
-      return;
     }
     const baseline = materializeInitializerValue2({
       document: currentDocument,
@@ -117898,7 +118163,8 @@ function materializePreparedInstanceInitializers(args) {
       // §4: a call-site field is an explicit override even when it equals
       // the class default, so the evaluated construction's own field list is
       // what pins rows against collapse.
-      pinnedRootSchemaKeys: materialized.pinnedRootSchemaKeys
+      pinnedRootSchemaKeys: materialized.pinnedRootSchemaKeys,
+      pinnedSchemaKeysByValueId: materialized.pinnedSchemaKeysByValueId
     });
     assertStoredClosuresKeepNoCaptures({
       sourceValueId: valueId,
@@ -117911,15 +118177,40 @@ function materializePreparedInstanceInitializers(args) {
       ...original,
       nextData: sparse2.root
     };
+    if (existingConstructedRoot !== void 0) {
+      const produced = new Set(sparse2.createdChildren.map((row) => row.id));
+      ownedValueCollector ??= createOwnedValueDeletionCollector(args.document);
+      for (const ownedId of ownedValueCollector.collect({
+        rootIds: [valueId],
+        rootMembers: /* @__PURE__ */ new Map([[valueId, member]])
+      })) {
+        if (ownedId === valueId || produced.has(ownedId)) continue;
+        const contentHash = liveValueHashes().get(ownedId);
+        if (contentHash === void 0) continue;
+        args.prepared.push({
+          recordKind: "value",
+          recordId: ownedId,
+          operation: "delete",
+          deleted: true,
+          expectedBaseContentHash: contentHash,
+          intent: createProjectVersionIntent("value.delete", {
+            source: "server-initializer-materialization",
+            sourceValueId: valueId
+          })
+        });
+        existingValueById.delete(ownedId);
+      }
+    }
     for (const created of sparse2.createdChildren) {
       const existing = existingValueById.get(created.id);
       if (existing !== void 0) {
         if (materializedValueRowsEqual(existing, created)) continue;
-        const contentHash = liveContentHash(
-          args.contentHashHeads,
-          "value",
-          created.id
-        );
+        const contentHash = liveValueHashes().get(created.id);
+        if (contentHash === void 0) {
+          throw new Error(
+            `Cannot reconcile materialized initializer row "${created.id}": its live content hash is unavailable.`
+          );
+        }
         args.prepared.push({
           recordKind: "value",
           recordId: created.id,
@@ -119152,7 +119443,11 @@ function seedRootRow(member, seed, rootId) {
     ...seed.constructorArgs === void 0 ? {} : { constructorArgs: seed.constructorArgs },
     ...seed.instanceConstructorId === void 0 ? {} : { instanceConstructorId: seed.instanceConstructorId },
     ...seed.instanceVariantId === void 0 ? {} : { instanceVariantId: seed.instanceVariantId },
-    ...seed.instanceVariantRowValueId === void 0 ? {} : { instanceVariantRowValueId: seed.instanceVariantRowValueId }
+    ...seed.instanceVariantRowValueId === void 0 ? {} : { instanceVariantRowValueId: seed.instanceVariantRowValueId },
+    ...seed.instanceAppliedVariantId === void 0 ? {} : { instanceAppliedVariantId: seed.instanceAppliedVariantId },
+    ...seed.instanceAppliedVariantRowValueId === void 0 ? {} : {
+      instanceAppliedVariantRowValueId: seed.instanceAppliedVariantRowValueId
+    }
   };
 }
 function authoredSeedRowMatchesValue(row, value) {
@@ -119169,7 +119464,7 @@ function authoredSeedRowMatchesValue(row, value) {
     return isLiteralValueContent(value);
   }
   if (isInitValueContent(value)) return false;
-  const seedDeclaresProvenance = row.constructorArgs !== void 0 || row.instanceConstructorId !== void 0 || row.instanceVariantId !== void 0 || row.instanceVariantRowValueId !== void 0;
+  const seedDeclaresProvenance = row.constructorArgs !== void 0 || row.instanceConstructorId !== void 0 || row.instanceVariantId !== void 0 || row.instanceVariantRowValueId !== void 0 || row.instanceAppliedVariantId !== void 0 || row.instanceAppliedVariantRowValueId !== void 0;
   return canonicallyEqual2(
     {
       value: row.value,
@@ -119295,6 +119590,10 @@ function materializeAuthoredSeedRow(args) {
     },
     ...args.row.instanceVariantId === void 0 ? {} : { instanceVariantId: args.row.instanceVariantId },
     ...args.row.instanceVariantRowValueId === void 0 ? {} : { instanceVariantRowValueId: args.row.instanceVariantRowValueId },
+    ...args.row.instanceAppliedVariantId === void 0 ? {} : { instanceAppliedVariantId: args.row.instanceAppliedVariantId },
+    ...args.row.instanceAppliedVariantRowValueId === void 0 ? {} : {
+      instanceAppliedVariantRowValueId: args.row.instanceAppliedVariantRowValueId
+    },
     ...args.row.containerId === void 0 ? {} : { containerId: args.row.containerId },
     ...args.row.genericBindings === void 0 ? {} : { genericBindings: { ...args.row.genericBindings } },
     ...args.row.sourceValueId === void 0 ? {} : { sourceValueId: args.row.sourceValueId },
@@ -128147,7 +128446,11 @@ function assertVariantMemberTargetValid(args) {
       `${label} targets class "${target.classId}", which is not in this project.`
     );
   }
-  if (resolveWorldKindFromClassMap(target.classId, classesById) !== NeoWorldSystemClassKind.Object) {
+  if (!classInheritsWorldKind(
+    target.classId,
+    NeoWorldSystemClassKind.Object,
+    classesById
+  )) {
     throw new Error(
       `${label} targets class "${targetClass.name}", which does not derive from NeoObject. Only NeoObject-derived classes declare variants (P67 \xA71).`
     );
@@ -129587,6 +129890,7 @@ function prepareClientPush(args) {
     if (change.recordKind !== "value" || change.operation !== "update") {
       continue;
     }
+    if (isInitValueContent(change.nextData)) continue;
     const refusal = valueDematerializationRefusal({
       valueId: change.recordId,
       baseData: args.base.records.get(`value:${change.recordId}`)?.data,
@@ -129755,6 +130059,7 @@ var init_server_preparation_preflight = __esm({
     init_project_document_read();
     init_project_snapshot_derived_edges();
     init_project_version_whole_graph_validation();
+    init_members();
     init_performance();
     init_trusted_commit_verification();
     ServerPreparationPreflightError = class extends Error {
@@ -129852,17 +130157,8 @@ function replayStoredConstructionV4(args) {
     createdAt: 0,
     updatedAt: 0
   };
-  const rootRecord = root;
-  const envelope = { ...rootRecord };
-  delete envelope.value;
-  delete envelope.classId;
-  delete envelope.constructorArgs;
-  delete envelope.instanceConstructorId;
-  delete envelope.instanceVariantId;
-  delete envelope.instanceVariantRowValueId;
-  delete envelope.init;
   const candidate = {
-    ...envelope,
+    ...withoutMaterializedInstanceFields(root),
     init: args.compiledInitializer ?? { code: args.code }
   };
   if (args.compiledInitializer === void 0)
@@ -129921,7 +130217,7 @@ function replayStoredConstructionV4(args) {
     ...args.omitConstructionFields === true ? { constructionBaselineReplay: true } : {},
     ...args.initializerArgumentValues === void 0 ? {} : { argumentValues: args.initializerArgumentValues }
   });
-  args.onPinnedRootSchemaKeys?.(materialized.pinnedRootSchemaKeys);
+  args.onPinnedSchemaKeys?.(materialized);
   return new Map(
     [materialized.root, ...materialized.createdValues].map((row) => [
       row.id,
@@ -130025,6 +130321,18 @@ function compilePulledProjectDocumentForEvaluationV4(document, compilationProjec
   }
   return compiled;
 }
+function withoutMaterializedInstanceFields(row) {
+  const envelope = { ...row };
+  delete envelope.value;
+  delete envelope.classId;
+  delete envelope.constructorArgs;
+  delete envelope.instanceConstructorId;
+  delete envelope.instanceVariantId;
+  delete envelope.instanceVariantRowValueId;
+  delete envelope.instanceAppliedVariantId;
+  delete envelope.instanceAppliedVariantRowValueId;
+  return envelope;
+}
 function assertPulledConstructorsCompiled(document, replayContext) {
   if (replayContext !== void 0 && replayContext.document !== document) {
     throw new Error(
@@ -132330,22 +132638,7 @@ function mergedOverStoredRow(base, lowered) {
     const code = storedInitCode(base, lowered.init.code);
     if (code !== lowered.init.code) merged.init = { ...lowered.init, code };
   }
-  const {
-    value: _value,
-    classId: _classId,
-    constructorArgs: _constructorArgs,
-    instanceConstructorId: _instanceConstructorId,
-    instanceVariantId: _instanceVariantId,
-    instanceVariantRowValueId: _instanceVariantRowValueId,
-    ...initializer
-  } = merged;
-  void _value;
-  void _classId;
-  void _constructorArgs;
-  void _instanceConstructorId;
-  void _instanceVariantId;
-  void _instanceVariantRowValueId;
-  return initializer;
+  return withoutMaterializedInstanceFields(merged);
 }
 function storedCompiledClosure(stored, lowered) {
   if (!isNSDelegateClosureValueDraft(lowered)) return null;
@@ -132619,7 +132912,7 @@ function lowerMemberDefaultSourcesV4(state, analysis, manifest, options = {}) {
           `Member default ${label} was classified as an owned literal graph but lowered as an initializer.`
         );
       }
-      const emptyInlineClassDefault = member.kind === "class" && isObjectRecord2(seed.value) && Object.keys(seed.value).length === 0 && (seed.constructorArgs === void 0 || Object.keys(seed.constructorArgs).length === 0) && seed.instanceConstructorId == null && seed.instanceVariantId == null && seed.instanceVariantRowValueId == null;
+      const emptyInlineClassDefault = member.kind === "class" && isObjectRecord2(seed.value) && Object.keys(seed.value).length === 0 && (seed.constructorArgs === void 0 || Object.keys(seed.constructorArgs).length === 0) && seed.instanceConstructorId == null && seed.instanceVariantId == null && seed.instanceVariantRowValueId == null && seed.instanceAppliedVariantId == null && seed.instanceAppliedVariantRowValueId == null;
       const matchesStoredDefault = storedDefault !== null && canonicallyEqual(seed.value, storedDefault.value) && (seed.classId ?? null) === (typeof storedDefaultClassId === "string" ? storedDefaultClassId : null);
       if ((emptyInlineClassDefault || matchesStoredDefault) && (seed.values === void 0 || seed.values.length === 0) && (seed.bindingMembers === void 0 || seed.bindingMembers.length === 0) && (seed.localizedTexts === void 0 || seed.localizedTexts.length === 0)) {
         for (const id2 of context.pendingValues.keys()) {
@@ -134137,7 +134430,11 @@ function readInstanceProvenance(value) {
     },
     instanceConstructorId: nullableString5(value.instanceConstructorId),
     instanceVariantId: nullableString5(value.instanceVariantId),
-    instanceVariantRowValueId: nullableString5(value.instanceVariantRowValueId)
+    instanceVariantRowValueId: nullableString5(value.instanceVariantRowValueId),
+    instanceAppliedVariantId: nullableString5(value.instanceAppliedVariantId),
+    instanceAppliedVariantRowValueId: nullableString5(
+      value.instanceAppliedVariantRowValueId
+    )
   };
 }
 function preserveReboundValue(context, currentValueId, nextValueId, binding) {
@@ -134187,6 +134484,10 @@ function lowerStaticSeed(context, member, sourceExpression, source, valueId) {
     ...root.instanceConstructorId === void 0 ? {} : { instanceConstructorId: root.instanceConstructorId },
     ...root.instanceVariantId === void 0 ? {} : { instanceVariantId: root.instanceVariantId },
     ...root.instanceVariantRowValueId === void 0 ? {} : { instanceVariantRowValueId: root.instanceVariantRowValueId },
+    ...root.instanceAppliedVariantId === void 0 ? {} : { instanceAppliedVariantId: root.instanceAppliedVariantId },
+    ...root.instanceAppliedVariantRowValueId === void 0 ? {} : {
+      instanceAppliedVariantRowValueId: root.instanceAppliedVariantRowValueId
+    },
     ...rows.size === 0 && member.kind !== "class" && member.kind !== "list" && member.kind !== "set" && member.kind !== "dictionary" && localizedTexts.size === 0 ? {} : { values: [...rows.values()] },
     ...bindingMembers.length === 0 ? {} : { bindingMembers },
     ...localizedTexts.size === 0 ? {} : { localizedTexts: [...localizedTexts.values()] }
@@ -135596,37 +135897,15 @@ function lowerClassValue(context, member, expression, base, source, outerEnviron
     }
   }
   if (materializedConstruction !== "lower") {
-    if (materializedConstruction === "preserve" && isObjectRecord2(base.constructorArgs) && // An explicit `null` IS the recorded identity of a parameterless
-    // construction, so it owns no argument rows to retain. Inferring an
-    // overload for it would resolve the wrong constructor or refuse the
-    // plan outright.
-    base.instanceConstructorId !== null) {
-      const constructor2 = storedValueConstructor(
+    if (materializedConstruction === "preserve" && classId === currentClassId) {
+      retainConstructionArguments(
         context,
+        base,
         schemaClass2,
-        recordedStoredConstructorId(base, schemaClass2)
-      );
-      const authoredArguments = constructorArgumentExpressions(expression);
-      for (let index = 0; index < constructor2.arguments.length; index += 1) {
-        const argument2 = constructor2.arguments[index];
-        if (argument2 === void 0) continue;
-        const valueId = base.constructorArgs[`__arg_${index}__`];
-        if (typeof valueId !== "string") continue;
-        if (!constructorArgumentOwnsRow(
-          argument2.type,
-          authoredArguments.get(argument2.name)
-        )) {
-          continue;
-        }
-        retainStoredValueSubgraph(
-          context,
-          valueId,
-          source.source,
-          /* @__PURE__ */ new Set(),
-          null,
-          environment
-        );
-      }
+        expression,
+        source.source,
+        environment
+      );
     }
   }
   return {
@@ -135635,6 +135914,163 @@ function lowerClassValue(context, member, expression, base, source, outerEnviron
     ...classId === currentClassId ? {} : { classId }
   };
 }
+function retainConstructionArguments(context, row, schemaClass2, expression, source, environment) {
+  const constructorArgs2 = row.constructorArgs;
+  if (!isObjectRecord2(constructorArgs2)) return;
+  if (row.instanceConstructorId === null) return;
+  const constructor2 = storedValueConstructor(
+    context,
+    schemaClass2,
+    recordedStoredConstructorId(row, schemaClass2)
+  );
+  const authoredArguments = constructorArgumentExpressions(expression);
+  const argumentEnvironment = valueGenericEnvironment(row, environment);
+  for (let index = 0; index < constructor2.arguments.length; index += 1) {
+    const argument2 = constructor2.arguments[index];
+    if (argument2 === void 0) continue;
+    const valueId = constructorArgs2[`__arg_${index}__`];
+    if (typeof valueId !== "string") continue;
+    const authored = authoredArguments.get(argument2.name);
+    if (!constructorArgumentOwnsRow(argument2.type, authored)) continue;
+    retainStoredValueSubgraph(
+      context,
+      valueId,
+      source,
+      /* @__PURE__ */ new Set(),
+      null,
+      argumentEnvironment
+    );
+    const building2 = authored === void 0 ? null : rowBuildingExpression(authored);
+    if (building2 === null) continue;
+    retainInlineConstructionArguments(
+      context,
+      valueId,
+      argument2.type,
+      building2,
+      source,
+      argumentEnvironment
+    );
+  }
+}
+function rowBuildingExpression(expression) {
+  const unwrapped = annotatedValue(expression).expression;
+  return unwrapped.kind === "new" || unwrapped.kind === "litList" || unwrapped.kind === "litDict" ? unwrapped : null;
+}
+function retainInlineConstructionArguments(context, valueId, slot, authored, source, environment) {
+  const row = context.state[`value:${valueId}`]?.data;
+  if (!isObjectRecord2(row)) return;
+  if (authored.kind === "new") {
+    const classId = stringOrNull2(row.classId);
+    const schemaClass2 = classId === null ? void 0 : context.classes.get(classId);
+    if (schemaClass2 === void 0) return;
+    retainConstructionArguments(
+      context,
+      row,
+      schemaClass2,
+      authored,
+      source,
+      environment
+    );
+    if (authored.initializer === void 0) return;
+    if (!isObjectRecord2(row.value)) return;
+    retainInitializerConstructionArguments(
+      context,
+      row,
+      row.value,
+      schemaClass2.id,
+      authored.initializer,
+      source,
+      environment
+    );
+    return;
+  }
+  const settled = settledArgumentSlot(context, slot, environment);
+  if (authored.kind === "litList" && settled.kind === "list" && Array.isArray(row.value)) {
+    const entrySlot = argumentSlotEntry(context, settled);
+    if (entrySlot === null) return;
+    for (const [index, element] of authored.elements.entries()) {
+      const entryId = row.value[index];
+      if (typeof entryId !== "string") continue;
+      const building2 = rowBuildingExpression(element);
+      if (building2 === null) continue;
+      retainInlineConstructionArguments(
+        context,
+        entryId,
+        entrySlot,
+        building2,
+        source,
+        environment
+      );
+    }
+    return;
+  }
+  if (authored.kind === "litDict" && settled.kind === "dictionary" && isObjectRecord2(row.value)) {
+    const entrySlot = argumentSlotEntry(context, settled);
+    if (entrySlot === null) return;
+    const keyEnumId = dictionarySlotKeyEnumId(settled);
+    const keyEnum = keyEnumId === null ? null : keyEnumById(context, keyEnumId);
+    for (const entry of authored.entries) {
+      const key = nestedDictionaryKey(entry.key, keyEnum);
+      const entryId = key === null ? void 0 : row.value[key];
+      if (typeof entryId !== "string") continue;
+      const building2 = rowBuildingExpression(entry.value);
+      if (building2 === null) continue;
+      retainInlineConstructionArguments(
+        context,
+        entryId,
+        entrySlot,
+        building2,
+        source,
+        environment
+      );
+    }
+  }
+}
+function settledArgumentSlot(context, slot, environment) {
+  if (slot.kind !== "generic") return slot;
+  if ("source" in slot) {
+    return resolveGenericSchemaMember(context, slot, environment);
+  }
+  return storedGenericArgumentType(
+    { manifestMembers: context.members },
+    slot,
+    environment
+  );
+}
+function argumentSlotEntry(context, slot) {
+  if ("entryType" in slot) return slot.entryType;
+  return memberById(context, slot.entryMemberId);
+}
+function dictionarySlotKeyEnumId(slot) {
+  if ("keyEnumId" in slot) return slot.keyEnumId;
+  return slot.key.kind === "enum" ? slot.key.enumId : null;
+}
+function retainInitializerConstructionArguments(context, row, body, classId, initializer, source, environment) {
+  const authoredMembers = /* @__PURE__ */ new Map();
+  for (const assignment of initializer) {
+    const building2 = rowBuildingExpression(assignment.value);
+    if (building2 !== null) authoredMembers.set(assignment.name, building2);
+  }
+  if (authoredMembers.size === 0) return;
+  const memberIds = storedClassSchemaMemberIds(context, classId);
+  const renames = renamedSchemaKeys(context, classId);
+  const memberEnvironment = valueGenericEnvironment(row, environment);
+  for (const [storedKey, childId] of Object.entries(body)) {
+    if (typeof childId !== "string") continue;
+    const building2 = authoredMembers.get(renames.get(storedKey) ?? storedKey);
+    if (building2 === void 0) continue;
+    const member = memberById(context, memberIds.get(storedKey));
+    if (member === null) continue;
+    retainInlineConstructionArguments(
+      context,
+      childId,
+      member,
+      building2,
+      source,
+      memberEnvironment
+    );
+  }
+}
 function constructorArgumentOwnsRow(type, authoredArgument) {
   if (type.kind !== "class" && type.kind !== "interface" && type.kind !== "generic" && type.kind !== "list" && type.kind !== "set" && type.kind !== "dictionary") {
     return false;
@@ -137682,6 +138118,7 @@ function freshChildReplaysDeclaredDefault(args) {
   if (child2.genericBindings !== void 0) return false;
   if (child2.instanceVariantId != null) return false;
   if (child2.instanceVariantRowValueId != null) return false;
+  if (child2.instanceAppliedVariantId != null) return false;
   if (context.collectionBindingMemberIds.has(childMember.id)) return false;
   const resolved = resolveGenericSchemaMember(
     context,
@@ -138152,15 +138589,16 @@ function requiredMember(context, id2) {
 }
 function dictionaryKeyEnum(context, member) {
   if (member.key.kind === "string") return null;
-  const name = context.enumNames.get(member.key.enumId);
-  const optionsByName = context.enumOptions.get(member.key.enumId);
+  return keyEnumById(context, member.key.enumId);
+}
+function keyEnumById(context, enumId) {
+  const name = context.enumNames.get(enumId);
+  const optionsByName = context.enumOptions.get(enumId);
   if (name === void 0) {
-    throw new Error(`Unknown dictionary key enum ${member.key.enumId}.`);
+    throw new Error(`Unknown dictionary key enum ${enumId}.`);
   }
   if (optionsByName === void 0) {
-    throw new Error(
-      `Dictionary key enum ${member.key.enumId} has no option index.`
-    );
+    throw new Error(`Dictionary key enum ${enumId} has no option index.`);
   }
   return { name, optionsByName };
 }
@@ -138667,7 +139105,7 @@ function storedReplayLeafValueMatches(type, value) {
 }
 function literalStoredReplayInitializer(context, valueId, code, member) {
   const value = context.values.get(valueId);
-  if (value === void 0 || typeof value.classId !== "string" || typeof value.instanceConstructorId !== "string" || typeof value.instanceVariantId === "string" || !isObjectRecord2(value.constructorArgs))
+  if (value === void 0 || typeof value.classId !== "string" || typeof value.instanceConstructorId !== "string" || typeof value.instanceVariantId === "string" || typeof value.instanceAppliedVariantId === "string" || !isObjectRecord2(value.constructorArgs))
     return void 0;
   const schemaClass2 = context.manifestClasses.get(value.classId);
   if (schemaClass2?.requiredConstructorId !== value.instanceConstructorId)
@@ -139176,7 +139614,8 @@ function storedConstructorArgumentSource(context, type, value, environment, visi
         visited,
         false,
         false,
-        constructorOwnsGraph
+        constructorOwnsGraph,
+        cloneAggregateArguments
       );
     case "lookup":
       return referenceValue(
@@ -139511,7 +139950,7 @@ function storedSchemaTypeName(context, type, environment, valueId) {
       return "null";
   }
 }
-function storedTypedRowSource(context, type, valueId, environment, visited, writeIdentity, partial = false, constructorOwnsGraph = false) {
+function storedTypedRowSource(context, type, valueId, environment, visited, writeIdentity, partial = false, constructorOwnsGraph = false, cloneAggregateArguments = false) {
   const symbol = context.symbolsByValueId.get(valueId);
   if (symbol !== void 0) return symbol;
   const row = context.values.get(valueId);
@@ -139520,6 +139959,18 @@ function storedTypedRowSource(context, type, valueId, environment, visited, writ
       `Stored ${type.kind} constructor argument references missing value row ${valueId}.`
     );
   }
+  if (cloneAggregateArguments) {
+    const settled = type.kind === "generic" ? storedGenericArgumentType(context, type, environment) : type;
+    if (settled.kind === "class" || settled.kind === "interface") {
+      return storedAggregateReplaySource(
+        context,
+        settled,
+        valueId,
+        environment,
+        constructorOwnsGraph
+      );
+    }
+  }
   if (isSharedConstructorArgument(context, valueId, constructorOwnsGraph)) {
     return `Reference<${storedSchemaTypeName(context, type, environment, valueId)}>(id: ${quote3(valueId)})`;
   }
@@ -139576,7 +140027,8 @@ ${ids.map(
             visited,
             true,
             false,
-            constructorOwnsGraph
+            constructorOwnsGraph,
+            cloneAggregateArguments
           ),
           2
         )
@@ -139605,7 +140057,8 @@ ${entries.flatMap(
               visited,
               false,
               false,
-              constructorOwnsGraph
+              constructorOwnsGraph,
+              cloneAggregateArguments
             )}`,
             2
           )
@@ -141215,8 +141668,8 @@ function initializerRecompileTargets(args) {
     })
   });
 }
-function materializedInitializerReconciliationFailuresV4(args) {
-  if (args.reconciliations.size === 0) return [];
+function reconcileMaterializedInitializersV4(args) {
+  if (args.reconciliations.size === 0) return { failures: [], rebuilds: [] };
   const records3 = reconciliationRecords(
     args.workspace,
     args.changes,
@@ -141294,7 +141747,6 @@ function materializedInitializerReconciliationFailuresV4(args) {
     }
   }
   const expressionsGrew = canonicalExpressions.size > (cached?.expressions.size ?? 0);
-  const authoredConstructionChangedByValueId = /* @__PURE__ */ new Map();
   const replayableValueIds = /* @__PURE__ */ new Set();
   for (const [valueId, reconciliation] of constructions) {
     const owner = candidateOwners.get(valueId);
@@ -141306,11 +141758,7 @@ function materializedInitializerReconciliationFailuresV4(args) {
       );
     }
     const authoredConstructionChanged = args.manifest !== void 0 && canonicalExpression !== reconciliation.construction;
-    authoredConstructionChangedByValueId.set(
-      valueId,
-      authoredConstructionChanged
-    );
-    if (reconciliation.kind === "storedArguments" && (authoredConstructionChanged || currentState().recompileTargets.valueIds.has(valueId))) {
+    if (authoredConstructionChanged || reconciliation.kind === "storedArguments" && currentState().recompileTargets.valueIds.has(valueId)) {
       replayableValueIds.add(valueId);
     }
   }
@@ -141377,26 +141825,9 @@ function materializedInitializerReconciliationFailuresV4(args) {
   }
   let currentRows;
   let currentReader;
+  let ownedValues;
+  const rebuilds = [];
   for (const reconciliation of constructions.values()) {
-    if (reconciliation.kind === "canonicalConstruction") {
-      if (authoredConstructionChangedByValueId.get(reconciliation.valueId) !== true) {
-        continue;
-      }
-      const position2 = composeReferenceSitePosition(
-        reconciliation.site,
-        args.sourceTextByUri
-      );
-      failures.push(
-        new SchemaSourceError(
-          `construction-arguments-conflict: Value "${reconciliation.valueId}" is already materialized without durable constructor arguments, and this construction no longer matches its pulled canonical projection. Delete and recreate the value to change its construction.`,
-          position2.file,
-          position2.line,
-          position2.column,
-          "construction-arguments-conflict"
-        )
-      );
-      continue;
-    }
     if (!replayableValueIds.has(reconciliation.valueId)) continue;
     const owner = candidateOwners.get(reconciliation.valueId);
     if (owner === void 0) {
@@ -141424,7 +141855,7 @@ function materializedInitializerReconciliationFailuresV4(args) {
       }
     } catch (error) {
       if (error instanceof NSGetterRuntimeError && error.source === void 0 && args.forceRecompile !== true) {
-        return materializedInitializerReconciliationFailuresV4({
+        return reconcileMaterializedInitializersV4({
           ...args,
           forceRecompile: true,
           useBuildCaches: false,
@@ -141448,34 +141879,81 @@ function materializedInitializerReconciliationFailuresV4(args) {
     );
     currentReader ??= new EffectiveValueReader(replayDocument, currentRows);
     const replay = replayRows.get(reconciliation.valueId);
-    const replayArgs = replay !== void 0 && isLiteralValueContent(replay) ? replay.constructorArgs : void 0;
+    if (replay === void 0) {
+      throw new Error(
+        `Construction replay for value "${reconciliation.valueId}" produced no root row.`
+      );
+    }
     const currentRoot = currentRows.get(reconciliation.valueId);
-    const [storedArgs, replayedArgs] = isObjectRecord2(replayArgs) ? withoutSharedArguments(reconciliation.storedConstructorArgs, replayArgs) : [reconciliation.storedConstructorArgs, replayArgs];
-    const currentNormalized = currentRoot === void 0 ? void 0 : currentReader.normalizeConstructorArguments(
-      storedArgs,
+    if (currentRoot === void 0) {
+      throw new Error(
+        `Cannot reconcile stored construction for value "${reconciliation.valueId}": its stored row is missing.`
+      );
+    }
+    if (replay.classId !== currentRoot.classId) {
+      const position = composeReferenceSitePosition(
+        reconciliation.site,
+        args.sourceTextByUri
+      );
+      failures.push(
+        new SchemaSourceError(
+          `construction-arguments-conflict: Value "${reconciliation.valueId}" is already materialized as another class. Delete and recreate the value to change its class.`,
+          position.file,
+          position.line,
+          position.column,
+          "construction-arguments-conflict"
+        )
+      );
+      continue;
+    }
+    if (reconciliation.kind === "storedArguments" && storedArgumentsMatch({
+      reader: currentReader,
+      stored: reconciliation.storedConstructorArgs,
       currentRoot,
+      replay,
+      replayRows,
       owner
-    );
-    const replayNormalized = replay === void 0 || !isObjectRecord2(replayedArgs) ? void 0 : currentReader.withRowOverrides(replayRows).normalizeConstructorArguments(replayedArgs, replay, owner);
-    const argumentsMatch = isObjectRecord2(replayArgs) && currentRoot !== void 0 && replay !== void 0 && effectiveValuesEqual(currentNormalized, replayNormalized);
-    if (argumentsMatch) {
+    })) {
       continue;
     }
-    const position = composeReferenceSitePosition(
-      reconciliation.site,
-      args.sourceTextByUri
-    );
-    failures.push(
-      new SchemaSourceError(
-        `construction-arguments-conflict: Value "${reconciliation.valueId}" is already materialized, and this construction changes its original arguments. Edit the instance's members, or delete and recreate the value with the new construction.`,
-        position.file,
-        position.line,
-        position.column,
-        "construction-arguments-conflict"
-      )
-    );
+    const stored = currentState().records.get(
+      `value:${reconciliation.valueId}`
+    )?.data;
+    if (!isObjectRecord2(stored)) {
+      throw new Error(
+        `Cannot rebuild construction for value "${reconciliation.valueId}": its pulled row is missing.`
+      );
+    }
+    ownedValues ??= createOwnedValueDeletionCollector(replayDocument);
+    rebuilds.push({
+      valueId: reconciliation.valueId,
+      row: rebuiltConstructionRow(stored, reconciliation.code),
+      ownedValueIds: ownedValues.collect({
+        rootIds: [reconciliation.valueId],
+        rootMembers: /* @__PURE__ */ new Map([[reconciliation.valueId, owner]])
+      })
+    });
   }
-  return failures;
+  return { failures, rebuilds };
+}
+function storedArgumentsMatch(args) {
+  const replayArgs = isLiteralValueContent(args.replay) ? args.replay.constructorArgs : void 0;
+  if (!isObjectRecord2(replayArgs)) return false;
+  const [storedArgs, replayedArgs] = withoutSharedArguments(
+    args.stored,
+    replayArgs
+  );
+  return effectiveValuesEqual(
+    args.reader.normalizeConstructorArguments(
+      storedArgs,
+      args.currentRoot,
+      args.owner
+    ),
+    args.reader.withRowOverrides(args.replayRows).normalizeConstructorArguments(replayedArgs, args.replay, args.owner)
+  );
+}
+function rebuiltConstructionRow(data, code) {
+  return { ...withoutMaterializedInstanceFields(data), init: { code } };
 }
 function retainedLiteralCompiles(document, retained, owners, rootOwners, stored) {
   if (retained.length === 0) return null;
@@ -141777,7 +142255,10 @@ function materializeInitializersLocallyV4(args) {
     });
     const code = initializerCode(records3, sourceValueId);
     let compiledInitializer;
-    let pinnedRootSchemaKeys = /* @__PURE__ */ new Set();
+    let pinned = {
+      pinnedRootSchemaKeys: /* @__PURE__ */ new Set(),
+      pinnedSchemaKeysByValueId: /* @__PURE__ */ new Map()
+    };
     const evaluated = replayStoredConstructionV4({
       records: records3,
       document,
@@ -141791,8 +142272,8 @@ function materializeInitializersLocallyV4(args) {
         compiledInitializer = init;
         compiledInitializers.set(sourceValueId, init);
       },
-      onPinnedRootSchemaKeys: (schemaKeys) => {
-        pinnedRootSchemaKeys = schemaKeys;
+      onPinnedSchemaKeys: (keys) => {
+        pinned = keys;
       }
     });
     const evaluatedRoot = evaluated.get(sourceValueId);
@@ -141856,7 +142337,8 @@ function materializeInitializersLocallyV4(args) {
       // §4: a call-site field is an explicit override even when it equals the
       // class default, so the evaluated construction's own field list is what
       // pins rows against collapse. Push preparation pins the same set.
-      pinnedRootSchemaKeys,
+      pinnedRootSchemaKeys: pinned.pinnedRootSchemaKeys,
+      pinnedSchemaKeysByValueId: pinned.pinnedSchemaKeysByValueId,
       virtualValueIdForSource: (instanceRootId, sourceIdentity3) => isPendingId(instanceRootId) || hasPendingVirtualSourceIdentity(sourceIdentity3) ? pendingVirtualValueId(instanceRootId, sourceIdentity3) : virtualValueId(instanceRootId, sourceIdentity3)
     });
     const evaluatedRows = [sparse2.root, ...sparse2.createdChildren];
@@ -142045,6 +142527,7 @@ var init_local_initializer_materialization = __esm({
     init_constructor_argument_ownership();
     init_neo_script_recompile_scope();
     init_compiler_adapter();
+    init_owned_value_deletion();
     init_compiled_construction_types();
     init_project_version_schema_commit();
     init_value_row_owner_members();
@@ -148922,23 +149405,28 @@ function computeStatus(workspace, options, conflictedFiles, parseErrors, parseWa
   }
   if (!parseErrors.some(isBlockingSchemaSourceError)) {
     try {
-      parseErrors.push(
-        ...materializedInitializerReconciliationFailuresV4({
-          workspace,
-          changes,
-          authoredValueSeeds,
-          reconciliations: valueLowerRegistry.initializerReconciliations,
-          canonicalConstructions: valueLowerRegistry.materializedConstructorExpressions,
-          localizedTextDependencies,
-          manifest,
-          analysis: projectAnalysisV4,
-          forceRecompile: options.forceRecompile,
-          useBuildCaches: options.useBuildCaches,
-          sourceTextByUri: new Map(
-            sourceEntries.map((entry) => [entry.relPath, entry.source])
-          )
-        })
-      );
+      const reconciliation = reconcileMaterializedInitializersV4({
+        workspace,
+        changes,
+        authoredValueSeeds,
+        reconciliations: valueLowerRegistry.initializerReconciliations,
+        canonicalConstructions: valueLowerRegistry.materializedConstructorExpressions,
+        localizedTextDependencies,
+        manifest,
+        analysis: projectAnalysisV4,
+        forceRecompile: options.forceRecompile,
+        useBuildCaches: options.useBuildCaches,
+        sourceTextByUri: new Map(
+          sourceEntries.map((entry) => [entry.relPath, entry.source])
+        )
+      });
+      parseErrors.push(...reconciliation.failures);
+      applyConstructionRebuildsV4({
+        workspace,
+        reconstructed: reconstructed3,
+        changes,
+        rebuilds: reconciliation.rebuilds
+      });
     } catch (error) {
       parseErrors.push(
         error instanceof SchemaSourceError ? error : new SchemaSourceError(
@@ -149415,6 +149903,58 @@ function expandProspectiveAnimationInstances(document) {
   }
   return [...byId.values()];
 }
+function applyConstructionRebuildsV4(args) {
+  if (args.rebuilds.length === 0) return;
+  const replanned = /* @__PURE__ */ new Set();
+  for (const rebuild of args.rebuilds) {
+    for (const id2 of rebuild.ownedValueIds) {
+      if (id2 === rebuild.valueId) continue;
+      const key = recordStateKey("value", id2);
+      replanned.add(key);
+      const base = args.workspace.state.records[key];
+      if (base === void 0) {
+        args.reconstructed.delete(key);
+        continue;
+      }
+      const reconstructed3 = args.reconstructed.get(key);
+      if (reconstructed3 === void 0) continue;
+      if (!isObjectRecord2(base.data)) {
+        throw new Error(
+          `Cannot replan value "${id2}" for a rebuilt construction: its pulled row is not an object.`
+        );
+      }
+      args.reconstructed.set(key, { ...reconstructed3, fullData: base.data });
+    }
+  }
+  const output = /* @__PURE__ */ new Map();
+  for (const change of args.changes) {
+    const key = recordStateKey(change.recordKind, change.recordId);
+    if (!replanned.has(key)) output.set(key, change);
+  }
+  for (const rebuild of args.rebuilds) {
+    const key = recordStateKey("value", rebuild.valueId);
+    const base = args.workspace.state.records[key];
+    if (base === void 0) {
+      throw new Error(
+        `Cannot rebuild construction for value "${rebuild.valueId}": it has no pulled row.`
+      );
+    }
+    const reconstructed3 = args.reconstructed.get(key);
+    if (reconstructed3 !== void 0)
+      args.reconstructed.set(key, { ...reconstructed3, fullData: rebuild.row });
+    output.set(
+      key,
+      recordUpsertChange({
+        base,
+        recordKind: "value",
+        recordId: rebuild.valueId,
+        file: reconstructed3?.file ?? output.get(key)?.file ?? null,
+        nextData: rebuild.row
+      })
+    );
+  }
+  args.changes.splice(0, args.changes.length, ...output.values());
+}
 function collapseLocalizedSourceRevertsV4(args) {
   const edited = args.changes.filter(
     (change) => change.recordKind === "value" && change.kind !== "delete" && isMemberValue(change.nextData) && typeof change.nextData.value === "string" && args.loweringRecords[recordStateKey("localized-text", change.nextData.value)] === void 0 && !recordsSemanticallyEqual(
@@ -171787,7 +172327,7 @@ function classExtendsClass(ctx, classId, ancestorClassId) {
 function generateClassBackedWorldMembers(ctx, classDef, className) {
   if (isAbstractClass(classDef)) return [];
   const worldKind = ctx.worldKinds.get(classDef.id) ?? null;
-  if (worldKind === NeoWorldSystemClassKind.Tile || worldKind === NeoWorldSystemClassKind.Object) {
+  if (worldKind === NeoWorldSystemClassKind.Tile || descendsFromWorldObject(ctx, classDef.id)) {
     return [
       `public static NeoClassRef<${className}> Definition { get; } = new NeoClassRef<${className}>("${escapeCSharpString(classDef.id)}");`
     ];
@@ -173537,9 +174077,10 @@ function objectSpawnHookClassMembers(classDef) {
     "",
     "/// <summary>",
     "/// Renderer spawn hook \u2014 override in a partial class to attach Unity",
-    "/// components (e.g. Rigidbody2D) to the instance's fully-built root",
-    `/// GameObject. See <see cref="${OBJECT_SPAWN_HOOKS_INTERFACE}"/> for timing and`,
-    "/// respawn semantics.",
+    "/// components (e.g. Rigidbody2D) to this object's GameObject. Runs on",
+    "/// the placed root and every object in its composition, parents first;",
+    "/// check behaviour.IsRoot for the placed instance. See",
+    `/// <see cref="${OBJECT_SPAWN_HOOKS_INTERFACE}"/> for timing and respawn semantics.`,
     "/// </summary>",
     "protected virtual void OnObjectSpawned(NeoObjectBehaviour behaviour)",
     "{",
@@ -173547,8 +174088,8 @@ function objectSpawnHookClassMembers(classDef) {
     "",
     "/// <summary>",
     "/// Renderer despawn hook \u2014 override in a partial class to release",
-    "/// per-GameObject state before the instance's root GameObject is",
-    "/// destroyed.",
+    "/// per-GameObject state before this object's GameObject is destroyed.",
+    "/// Children despawn before their parents.",
     "/// </summary>",
     "protected virtual void OnObjectDespawned(NeoObjectBehaviour behaviour)",
     "{",
@@ -181263,7 +181804,7 @@ var UNITY_CODEGEN_REVISION;
 var init_unity_codegen_revision = __esm({
   "../src/models/exports/unity-codegen-revision.ts"() {
     "use strict";
-    UNITY_CODEGEN_REVISION = "edfd4061dffcd1a747b234cd135b99beca6f4cf1958cb69715029c5935dd7f1b";
+    UNITY_CODEGEN_REVISION = "d4026a3848848c8507d45dd54b6d31c1a0588b17b64c35e3fe9b25c89eb2fc05";
   }
 });
 
@@ -185153,7 +185694,9 @@ function rewrittenSeedProvenance(memberId, seed) {
   for (const field of [
     "instanceConstructorId",
     "instanceVariantId",
-    "instanceVariantRowValueId"
+    "instanceVariantRowValueId",
+    "instanceAppliedVariantId",
+    "instanceAppliedVariantRowValueId"
   ]) {
     const candidate = seed[field];
     if (candidate !== void 0 && candidate !== null && typeof candidate !== "string") {
@@ -185170,6 +185713,12 @@ function rewrittenSeedProvenance(memberId, seed) {
     ...seed.instanceVariantId === void 0 ? {} : { instanceVariantId: seed.instanceVariantId },
     ...seed.instanceVariantRowValueId === void 0 ? {} : {
       instanceVariantRowValueId: seed.instanceVariantRowValueId
+    },
+    ...seed.instanceAppliedVariantId === void 0 ? {} : {
+      instanceAppliedVariantId: seed.instanceAppliedVariantId
+    },
+    ...seed.instanceAppliedVariantRowValueId === void 0 ? {} : {
+      instanceAppliedVariantRowValueId: seed.instanceAppliedVariantRowValueId
     }
   };
 }
@@ -201083,7 +201632,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.80.0");
+    console.log("0.81.1");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {