@neocompose/cli 0.81.0 → 0.81.2

package/dist/neo.mjs

@@ -1291,6 +1291,15 @@ function neoScriptRegistryEntryType(typeName) {
   }
   return REGISTRY_ENTRY_TYPES[typeName] ?? null;
 }
+function typeArgumentArityMessage(typeName, expected, provided) {
+  return `Type '${typeName}' expects ${expected} type argument${expected === 1 ? "" : "s"}, but ${provided} ${provided === 1 ? "was" : "were"} provided.`;
+}
+function genericParameterArgumentsMessage(name) {
+  return `Generic parameter '${name}' cannot receive type arguments.`;
+}
+function delegateArityMessage(provided) {
+  return `Type 'NeoDelegate' expects a return type followed by up to ${NEOSCRIPT_DELEGATE_MAX_PARAMETERS} parameter types, but ${provided} type arguments were provided.`;
+}
 function neoScriptRegistryReferenceType(entryTypeName) {
   for (const definition2 of Object.values(REGISTRY_ENTRY_TYPES)) {
     if (definition2.entryType === entryTypeName) return definition2.refType;
@@ -1376,7 +1385,7 @@ function vectorTypes() {
     members: structuredLeafFieldProperties(name)
   }));
 }
-var NEO_PROJECT_IGNORED_DIRECTORY_NAMES, NEOSCRIPT_KEYWORDS, NEOSCRIPT_INFERRED_LOCAL_KEYWORD, NEOSCRIPT_CONSTRUCTOR_KEYWORD, NEOSCRIPT_PRIMITIVE_TYPES, NEOSCRIPT_BUILTIN_ANNOTATION_TYPES, NEOSCRIPT_BUILTIN_NAMESPACES, NEOSCRIPT_BUILTIN_TYPES, NEO_VARIANT_TYPE_NAME, NEO_VARIANT_FOLDER_TYPE_NAME, NEO_LOOKUP_VARIANT_TYPE_NAME, NEO_LOOKUP_VARIANT_FOLDER_TYPE_NAME, NEO_VARIANT_SCOPE_NAME, NEO_VARIANT_RESERVED_NAME, NEO_VARIANT_FOLDER_PATH_SEPARATOR, NEOSCRIPT_OPERATORS, STRING_TYPE2, INT_TYPE2, FLOAT_TYPE, DECIMAL_TYPE, BOOL_TYPE2, IMAGE_REF_TYPE, SPRITE_INFO_TYPE, VECTOR2_TYPE, FLOAT_OPTIONAL_TYPE, NEOSCRIPT_STRUCTURED_LEAF_FIELDS, NEOSCRIPT_IMAGE_REGISTRY_TYPE, NEOSCRIPT_AUDIO_CLIP_REGISTRY_TYPE, NEOSCRIPT_PENDING_SYMBOL_ID_PREFIX, REGISTRY_ENTRY_TYPES, NEOSCRIPT_GLOBALS, NEOSCRIPT_SCALAR_METHODS, NEOSCRIPT_CLASS_ID_MEMBER, NEOSCRIPT_ON_CHANGED_MEMBER, NEOSCRIPT_CLASS_ID_SYMBOL, NEOSCRIPT_PRIMITIVE_DERIVED_MEMBERS, NEOSCRIPT_SPRITE_INFO_EMPTY_MEMBER_ID, NEOSCRIPT_SPRITE_INFO_EMPTY_VALUE, NEOSCRIPT_MATH_TYPE_ID, MATH_INFERENCE_RULE, MATH_INTEGRAL_RULE, NEOSCRIPT_LIST_TYPE_NAME, NEOSCRIPT_LIST_TYPE_ID, NEOSCRIPT_LIST_REPEAT_NAME, LIST_ENTRY_TYPE, NEOSCRIPT_BUILTIN_TYPE_SYMBOLS;
+var NEO_PROJECT_IGNORED_DIRECTORY_NAMES, NEOSCRIPT_KEYWORDS, NEOSCRIPT_INFERRED_LOCAL_KEYWORD, NEOSCRIPT_CONSTRUCTOR_KEYWORD, NEOSCRIPT_PRIMITIVE_TYPES, NEOSCRIPT_BUILTIN_ANNOTATION_TYPES, NEOSCRIPT_BUILTIN_NAMESPACES, NEOSCRIPT_BUILTIN_TYPES, NEO_VARIANT_TYPE_NAME, NEO_VARIANT_FOLDER_TYPE_NAME, NEO_LOOKUP_VARIANT_TYPE_NAME, NEO_LOOKUP_VARIANT_FOLDER_TYPE_NAME, NEO_VARIANT_SCOPE_NAME, NEO_VARIANT_RESERVED_NAME, NEO_VARIANT_FOLDER_PATH_SEPARATOR, NEOSCRIPT_OPERATORS, STRING_TYPE2, INT_TYPE2, FLOAT_TYPE, DECIMAL_TYPE, BOOL_TYPE2, IMAGE_REF_TYPE, SPRITE_INFO_TYPE, VECTOR2_TYPE, FLOAT_OPTIONAL_TYPE, NEOSCRIPT_STRUCTURED_LEAF_FIELDS, NEOSCRIPT_IMAGE_REGISTRY_TYPE, NEOSCRIPT_AUDIO_CLIP_REGISTRY_TYPE, NEOSCRIPT_PENDING_SYMBOL_ID_PREFIX, REGISTRY_ENTRY_TYPES, NEOSCRIPT_DELEGATE_MAX_PARAMETERS, NEOSCRIPT_GLOBALS, NEOSCRIPT_SCALAR_METHODS, NEOSCRIPT_CLASS_ID_MEMBER, NEOSCRIPT_ON_CHANGED_MEMBER, NEOSCRIPT_CLASS_ID_SYMBOL, NEOSCRIPT_PRIMITIVE_DERIVED_MEMBERS, NEOSCRIPT_SPRITE_INFO_EMPTY_MEMBER_ID, NEOSCRIPT_SPRITE_INFO_EMPTY_VALUE, NEOSCRIPT_MATH_TYPE_ID, MATH_INFERENCE_RULE, MATH_INTEGRAL_RULE, NEOSCRIPT_LIST_TYPE_NAME, NEOSCRIPT_LIST_TYPE_ID, NEOSCRIPT_LIST_REPEAT_NAME, LIST_ENTRY_TYPE, NEOSCRIPT_BUILTIN_TYPE_SYMBOLS;
 var init_language_spec = __esm({
   "../packages/neoscript-language/src/language-spec.ts"() {
     "use strict";
@@ -1652,6 +1661,7 @@ var init_language_spec = __esm({
         refType: { kind: "primitive", name: "AudioClipRef" }
       }
     };
+    NEOSCRIPT_DELEGATE_MAX_PARAMETERS = 16;
     NEOSCRIPT_GLOBALS = [
       builtinFunction(
         "VisitCount",
@@ -2910,6 +2920,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 +4932,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 +4960,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 +5966,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 +5997,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 +6029,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 +6061,8 @@ var init_instance_provenance = __esm({
       "instanceConstructorId",
       "instanceVariantId",
       "instanceVariantRowValueId",
+      "instanceAppliedVariantId",
+      "instanceAppliedVariantRowValueId",
       "genericBindings"
     ];
   }
@@ -6299,7 +6329,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 +6481,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
   )) {
@@ -12119,12 +12149,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) {
@@ -12457,15 +12483,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) {
@@ -12657,7 +12677,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,
@@ -12934,9 +12954,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)
     }
@@ -13246,6 +13264,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();
@@ -24236,7 +24255,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);
     }
@@ -30973,21 +30992,34 @@ function resolveNeoScriptType(type, context, project) {
       const declaringType = declaringTypeRef?.kind === "named" ? project.typeById.get(declaringTypeRef.typeId) : void 0;
       const byName = (candidate) => candidate.name === type.name;
       const typeParameter2 = context.typeParameters?.find(byName) ?? declaringType?.typeParameters?.find(byName);
+      const written = type.typeArguments?.length ?? 0;
       if (typeParameter2?.type.kind === "typeParameter") {
+        if (written > 0)
+          throw new CompileError(
+            genericParameterArgumentsMessage(type.name),
+            type.pos
+          );
         resolved = typeParameter2.type;
         break;
       }
       const builtin = namedPrimitive(type.name);
+      const registryReference = builtin ? null : neoScriptRegistryReferenceType(type.name);
+      if ((builtin || registryReference) && written > 0)
+        throw new CompileError(
+          typeArgumentArityMessage(type.name, 0, written),
+          type.pos
+        );
       if (builtin) {
         resolved = { kind: "primitive", name: builtin };
         break;
       }
-      const registryReference = neoScriptRegistryReferenceType(type.name);
       if (registryReference) {
         resolved = registryReference;
         break;
       }
       if (type.name === "NeoDelegate") {
+        if (written > NEOSCRIPT_DELEGATE_MAX_PARAMETERS + 1)
+          throw new CompileError(delegateArityMessage(written), type.pos);
         const [returnType, ...parameterTypes] = (type.typeArguments ?? []).map(
           (argument2) => resolveNeoScriptType(argument2, context, project)
         );
@@ -31005,6 +31037,7 @@ function resolveNeoScriptType(type, context, project) {
           renamedDialogueTypeMessage(type.name, "value") ?? `Unknown type '${type.name}'`,
           type.pos
         );
+      if (written > 0) assertTypeArgumentCount(named, written, type.pos);
       resolved = {
         kind: "named",
         typeId: named.id,
@@ -31073,6 +31106,14 @@ function assertDirectTypeParameterArguments(target, pos, project) {
   const message = wrappedTypeParameterMessage(target, project);
   if (message !== null) throw new CompileError(message, pos);
 }
+function assertTypeArgumentCount(declaring, count, pos) {
+  const expected = declaring.typeParameters?.length ?? 0;
+  if (count === expected) return;
+  throw new CompileError(
+    typeArgumentArityMessage(declaring.name, expected, count),
+    pos
+  );
+}
 function assertTypeArgumentConstraints(declaring, type, pos, project) {
   declaring.typeParameters?.forEach((parameter4, index) => {
     const argument2 = type.typeArguments?.[index];
@@ -35693,7 +35734,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)}`,
@@ -36840,13 +36881,12 @@ var init_strict_resolver = __esm({
         const typeArguments = expression.typeArguments?.map(
           (argument2) => this.resolveType(argument2)
         );
-        if (typeArguments !== void 0 && typeArguments.length !== (schemaClass2.typeParameters?.length ?? 0)) {
-          throw new CompileError(
-            `Class '${schemaClass2.name}' expects ${schemaClass2.typeParameters?.length ?? 0} type argument${schemaClass2.typeParameters?.length === 1 ? "" : "s"} but got ${typeArguments.length}.`,
+        if (typeArguments !== void 0) {
+          assertTypeArgumentCount(
+            schemaClass2,
+            typeArguments.length,
             expression.pos
           );
-        }
-        if (typeArguments !== void 0) {
           const target = {
             kind: "named",
             typeId: schemaClass2.id,
@@ -50937,20 +50977,20 @@ function validateTypeApplication(uri, type, genericParameters, environment, diag
         uri,
         type.range,
         "generic-parameter-arguments",
-        `Generic parameter '${type.name}' cannot receive type arguments.`
+        genericParameterArgumentsMessage(type.name)
       );
     }
     return;
   }
   const target = environment.declarations.get(type.name);
   if (type.name === "NeoDelegate") {
-    if (type.typeArguments.length < 1 || type.typeArguments.length > 17) {
+    if (type.typeArguments.length < 1 || type.typeArguments.length > NEOSCRIPT_DELEGATE_MAX_PARAMETERS + 1) {
       diagnose(
         diagnostics,
         uri,
         type.range,
         "generic-argument-arity",
-        `Type 'NeoDelegate' expects a return type followed by up to 16 parameter types, but ${type.typeArguments.length} type arguments were provided.`
+        delegateArityMessage(type.typeArguments.length)
       );
     }
     return;
@@ -50965,13 +51005,13 @@ function validateTypeApplication(uri, type, genericParameters, environment, diag
         "Type 'NeoAction' cannot use 'void' as a parameter type; spell a zero-argument action as bare 'NeoAction'."
       );
     }
-    if (type.typeArguments.length > 16) {
+    if (type.typeArguments.length > NEOSCRIPT_DELEGATE_MAX_PARAMETERS) {
       diagnose(
         diagnostics,
         uri,
         type.range,
         "generic-argument-arity",
-        `Type 'NeoAction' expects up to 16 parameter types, but ${type.typeArguments.length} type arguments were provided.`
+        `Type 'NeoAction' expects up to ${NEOSCRIPT_DELEGATE_MAX_PARAMETERS} parameter types, but ${type.typeArguments.length} type arguments were provided.`
       );
     }
     if (type.nullable) {
@@ -50993,7 +51033,7 @@ function validateTypeApplication(uri, type, genericParameters, environment, diag
       uri,
       type.range,
       "generic-argument-arity",
-      `Type '${type.name}' expects ${expected} type argument${expected === 1 ? "" : "s"}, but ${type.typeArguments.length} ${type.typeArguments.length === 1 ? "was" : "were"} provided.`,
+      typeArgumentArityMessage(type.name, expected, type.typeArguments.length),
       target ? related(target.location, "The type declaration is here.") : void 0
     );
     return;
@@ -54524,7 +54564,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.81.0",
+      cliVersion: "0.81.2",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -65746,7 +65786,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;
@@ -75948,6 +75988,7 @@ function makeUnindexedEvaluatorLookups(members, storedValues) {
     hasStoredValueId: (id2) => valueById.has(id2),
     unorderedListEntryIds: (containerValueId) => unorderedListMembership.get(containerValueId) ?? [],
     virtualInstanceRowsForValue: () => [],
+    virtualInstanceRootIdForValue: () => null,
     rowForValueReference: (value) => valueRefMap.get(value) ?? null
   };
 }
@@ -76000,6 +76041,7 @@ function createInitializerBatchLookups(document) {
     },
     rowForValueReference: (value) => build.result.rowByValueReference.get(value) ?? null,
     virtualInstanceRowsForValue: () => [],
+    virtualInstanceRootIdForValue: () => null,
     evaluatorIndexes: { ...build.result },
     constructorInitializerIndexes: constructorInitializerIndexes2
   });
@@ -76201,6 +76243,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 ? {} : {
@@ -76318,6 +76361,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
@@ -76723,13 +76767,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") {
@@ -77362,7 +77408,7 @@ function readNeoScriptRuntimeRow(ctx, valueId) {
 }
 function inspectNeoScriptValueReference(ctx, value, collection, index) {
   let id2 = findKnownRowIdByValueReference(value, ctx);
-  if (id2 === null && collection !== void 0 && index !== void 0 && typeof value === "string" && (findKnownRowIdByValueReference(collection, ctx) !== null || Array.isArray(collection) && typeof index === "number" && ctx.__unorderedListProjections?.referenceEntryIndexesByArray.get(collection)?.has(index) || typeof collection === "object" && collection !== null && typeof index === "string" && ctx.__unorderedListProjections?.referenceEntryKeysByRecord.get(collection)?.has(index))) {
+  if (id2 === null && collection !== void 0 && index !== void 0 && typeof value === "string" && isReferenceEntry(collectionReferences(collection, ctx), index)) {
     id2 = value;
   }
   if (id2 === null) return null;
@@ -79023,15 +79069,9 @@ function evalActionListenerInstruction(ins, scope, ctx, options) {
   }
   let destination;
   const target = ins.target.pointer;
-  const currentValue = target.type === "keyOf" /* keyOf */ ? evalKeyOf(
-    target.keyOf,
-    scope,
-    ctx,
-    target.optional === true,
-    (resolved) => {
-      destination = resolved;
-    }
-  ) : evalPointer(target, scope, ctx);
+  const currentValue = target.type === "keyOf" /* keyOf */ ? evalKeyOf(target, scope, ctx, (resolved) => {
+    destination = resolved;
+  }) : evalPointer(target, scope, ctx);
   const current = actionListenersOf(currentValue, () => `'${operator}' target`);
   const identity2 = nsActionListenerIdentity(listener);
   const present = current.some(
@@ -79102,38 +79142,26 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
         );
       }
       receiver[index] = referenceValueId;
-      setCollectionReferenceProvenance(receiver, index, true, ctx);
+      recordWrittenEntry(receiver, index, true, ctx);
       invalidateEvaluatorIndexes(ctx, receiver);
       return;
     }
-    if (ctx.__unorderedListProjections?.referenceEntryIndexesByArray.has(
-      receiver
-    ) === true) {
-      receiver[index] = value;
-      setCollectionReferenceProvenance(receiver, index, false, ctx);
-      invalidateEvaluatorIndexes(ctx, receiver);
+    if (collectionReferences(receiver, ctx) === 0 /* RowIds */ && replaceEntryRowValue(
+      receiver,
+      receiver[index],
+      value,
+      targetTypeInfo,
+      ctx
+    ))
       return;
-    }
-    const existing2 = receiver[index];
-    if (typeof existing2 === "string") {
-      const row = evalValueById(
-        ctx,
-        existing2,
-        ctx.__runtimeSessionValues,
-        ctx.__valueOverlay
-      );
-      if (row !== null) {
-        replaceRowValue(row, value, receiver, ctx);
-        updateUnorderedListProjectionAfterAssignment(row, value, ctx);
-        return;
-      }
-    }
     receiver[index] = value;
+    recordWrittenEntry(receiver, index, false, ctx);
     invalidateEvaluatorIndexes(ctx, receiver);
     return;
   }
   const object2 = objectArg(receiver, "Assignment target");
   const stringKey = String(key);
+  const field = target.memberId !== void 0;
   if (referenceValueId !== null) {
     const parentId = findKnownRowIdByValueReference(receiver, ctx);
     if (parentId !== null) {
@@ -79148,26 +79176,41 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
       );
     }
     object2[stringKey] = referenceValueId;
+    if (!field) recordWrittenEntry(object2, stringKey, true, ctx);
     invalidateEvaluatorIndexes(ctx, receiver);
     return;
   }
-  const existing = object2[stringKey];
-  if (typeof existing === "string") {
-    const row = evalValueById(
-      ctx,
-      existing,
-      ctx.__runtimeSessionValues,
-      ctx.__valueOverlay
-    );
-    if (row !== null) {
-      replaceRowValue(row, value, receiver, ctx);
-      updateUnorderedListProjectionAfterAssignment(row, value, ctx);
-      return;
-    }
-  }
+  if (collectionReferences(object2, ctx) === 0 /* RowIds */ && replaceEntryRowValue(object2, object2[stringKey], value, targetTypeInfo, ctx))
+    return;
   object2[stringKey] = value;
+  if (!field) recordWrittenEntry(object2, stringKey, false, ctx);
   invalidateEvaluatorIndexes(ctx, receiver);
 }
+function replaceEntryRowValue(receiver, existing, value, targetTypeInfo, ctx) {
+  if (typeof existing !== "string") return false;
+  const row = evalValueById(
+    ctx,
+    existing,
+    ctx.__runtimeSessionValues,
+    ctx.__valueOverlay
+  );
+  if (row === null) return false;
+  keepAssignedCollectionValues(value, targetTypeInfo, ctx);
+  replaceRowValue(row, value, receiver, ctx);
+  updateUnorderedListProjectionAfterAssignment(row, value, ctx);
+  return true;
+}
+function keepAssignedCollectionValues(value, targetTypeInfo, ctx) {
+  const cache = unorderedListProjectionCache(ctx);
+  if (Array.isArray(value) && (targetTypeInfo.type === 6 /* List */ || targetTypeInfo.type === 28 /* Set */)) {
+    if (!cache.referenceEntryIndexesByArray.has(value))
+      cache.referenceEntryIndexesByArray.set(value, /* @__PURE__ */ new Set());
+    return;
+  }
+  if (targetTypeInfo.type === 5 /* Dictionary */ && typeof value === "object" && value !== null && !cache.referenceEntryKeysByRecord.has(value)) {
+    cache.referenceEntryKeysByRecord.set(value, /* @__PURE__ */ new Set());
+  }
+}
 function replaceRowValue(row, value, receiver, ctx) {
   const indexes3 = ctx.__indexes;
   if (indexes3 === void 0 || ctx.__runtimeSessionValues?.get(row.id) !== row || !indexes3.indexedRowIds.has(row.id)) {
@@ -79605,9 +79648,11 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
     );
   }
   const unorderedEntriesBeforeMutation = unorderedContainerValueId === null || !Array.isArray(targetValue) || ins.mutation === "Add" /* Add */ ? null : [...targetValue];
-  if ((ins.mutation === "Add" /* Add */ || ins.mutation === "Insert" /* Insert */) && !isLookupSet) {
+  const writesEntry = (ins.mutation === "Add" /* Add */ || ins.mutation === "Insert" /* Insert */) && !isLookupSet;
+  let attachedValueId = null;
+  if (writesEntry) {
     const attachedValue = isArrayCollection(targetValue) && ins.mutation !== "Insert" /* Insert */ ? args[0] : args[1];
-    const attachedValueId = findKnownRowIdByValueReference(attachedValue, ctx);
+    attachedValueId = findKnownRowIdByValueReference(attachedValue, ctx);
     const parentId = findKnownRowIdByValueReference(targetValue, ctx);
     if (attachedValueId !== null && parentId !== null) {
       ctx.assertCollectionEntryAttachable?.(
@@ -79644,6 +79689,23 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
     removedIndex,
     ctx
   );
+  if (writesEntry && !(targetValue instanceof RuntimeSet)) {
+    const writtenAsRowId = attachedValueId !== null || unorderedContainerValueId !== null;
+    if (Array.isArray(targetValue))
+      recordWrittenEntry(
+        targetValue,
+        removedIndex ?? targetValue.length - 1,
+        writtenAsRowId,
+        ctx
+      );
+    else
+      recordWrittenEntry(
+        objectArg(targetValue, "Dictionary Add target"),
+        String(args[0]),
+        writtenAsRowId,
+        ctx
+      );
+  }
   if (unorderedEntriesBeforeMutation !== null && Array.isArray(targetValue)) {
     detachRemovedUnorderedScalarEntries(
       unorderedEntriesBeforeMutation,
@@ -79845,9 +79907,10 @@ function runtimeSet(array3, reference2, enumEntries, ctx) {
   const existing = sets.get(array3);
   if (existing !== void 0) return existing;
   const set = new RuntimeSet(array3, reference2, enumEntries);
+  const references = collectionReferences(array3, ctx);
   for (let index = 0; index < array3.length; index++) {
     const raw = array3[index];
-    const resolves = collectionEntryUsesReferenceResolution(array3, index, ctx);
+    const resolves = isReferenceEntry(references, index);
     const value = resolves ? resolveValueIfId(raw, ctx) : raw;
     const key = runtimeSetKey(value, set, ctx);
     set.add(key, enumEntries ? key : raw, !enumEntries && resolves);
@@ -79856,9 +79919,9 @@ function runtimeSet(array3, reference2, enumEntries, ctx) {
   (ctx.__dirtyRuntimeSets ??= /* @__PURE__ */ new Set()).add(set);
   return set;
 }
-function storedSetEntryMatch(raw, entryMember, ctx) {
+function storedSetEntryMatch(raw, reference2, entryMember, ctx) {
   const byIdentity = entryMember.kind === 7 /* Class */;
-  const row = byIdentity || typeof raw !== "string" ? null : evalValueById(ctx, raw, ctx.__runtimeSessionValues, ctx.__valueOverlay);
+  const row = byIdentity || !reference2 || typeof raw !== "string" ? null : evalValueById(ctx, raw, ctx.__runtimeSessionValues, ctx.__valueOverlay);
   const valueId = byIdentity && typeof raw === "string" ? raw : row?.id ?? null;
   const entry = row === null ? { id: "", value: raw } : { id: row.id, value: row.value };
   const key = byIdentity ? valueId ?? referenceIdOf(raw, ctx) : setEntryKey(entryMember, entry);
@@ -79869,8 +79932,14 @@ function storedSetEntries(set, entryMember, ctx) {
   const existing = indexes3.get(set);
   if (existing !== void 0) return existing;
   const entries = /* @__PURE__ */ new Map();
-  for (const raw of set) {
-    const match = storedSetEntryMatch(raw, entryMember, ctx);
+  const references = collectionReferences(set, ctx);
+  for (let index = 0; index < set.length; index++) {
+    const match = storedSetEntryMatch(
+      set[index],
+      isReferenceEntry(references, index),
+      entryMember,
+      ctx
+    );
     if (match !== null && !entries.has(match.key)) {
       entries.set(match.key, match);
     }
@@ -79882,7 +79951,13 @@ function syncStoredSetEntries(set, mutation, removed, entryMember, ctx) {
   const entries = ctx.__setEntryIndexes?.get(set);
   if (entries === void 0) return;
   if (entryMember !== null && mutation === "Add" /* Add */) {
-    const added = storedSetEntryMatch(set[set.length - 1], entryMember, ctx);
+    const index = set.length - 1;
+    const added = storedSetEntryMatch(
+      set[index],
+      isReferenceEntry(collectionReferences(set, ctx), index),
+      entryMember,
+      ctx
+    );
     if (added !== null) entries.set(added.key, added);
     return;
   }
@@ -79948,6 +80023,7 @@ function applyLocalCollectionMutation(targetValue, mutation, args, ctx, unique =
       return null;
     case "Remove" /* Remove */:
       if (Array.isArray(targetValue)) {
+        const references = resolveRemovalEntries ? collectionReferences(targetValue, ctx) : recordedReferenceEntries(targetValue, ctx) ?? 1 /* Values */;
         let index = -1;
         for (let candidate = 0; candidate < targetValue.length; candidate += 1) {
           const entry = targetValue[candidate];
@@ -79958,9 +80034,8 @@ function applyLocalCollectionMutation(targetValue, mutation, args, ctx, unique =
             }
             continue;
           }
-          const referenceEntry = ctx.__unorderedListProjections?.referenceEntryIndexesByArray.get(targetValue)?.has(candidate) === true;
           if (jsEqual(
-            resolveRemovalEntries || referenceEntry ? resolveCollectionEntry(targetValue, entry, candidate, ctx) : entry,
+            typeof entry === "string" && isReferenceEntry(references, candidate) ? resolveValueIfId(entry, ctx) : entry,
             args[0]
           )) {
             index = candidate;
@@ -79993,13 +80068,6 @@ function applyLocalCollectionMutation(targetValue, mutation, args, ctx, unique =
       return null;
   }
 }
-function setCollectionReferenceProvenance(targetValue, index, reference2, ctx) {
-  const cache = ctx.__unorderedListProjections;
-  const indexes3 = cache?.referenceEntryIndexesByArray.get(targetValue);
-  if (cache === void 0 || indexes3 === void 0) return;
-  if (reference2) indexes3.add(index);
-  else indexes3.delete(index);
-}
 function updateCollectionReferenceProvenance(targetValue, mutation, removedIndex, ctx) {
   if (!Array.isArray(targetValue)) return;
   const cache = ctx.__unorderedListProjections;
@@ -80273,7 +80341,7 @@ function evalPointerCore(pointer, scope, ctx, resultUsage = "value") {
     case "staticMember" /* staticMember */:
       return evalStaticMember(pointer.memberId, ctx);
     case "keyOf" /* keyOf */:
-      return evalKeyOf(pointer.keyOf, scope, ctx, pointer.optional === true);
+      return evalKeyOf(pointer, scope, ctx);
     case "operation" /* operation */:
       return evalOperation(pointer.operation, scope, ctx);
     case "function" /* function */:
@@ -80923,15 +80991,9 @@ function readActionWithOwner(pointer, scope, ctx) {
     return { action: evalPointer(pointer, scope, ctx), owner: null };
   }
   let owner = null;
-  const action = evalKeyOf(
-    pointer.keyOf,
-    scope,
-    ctx,
-    pointer.optional === true,
-    (destination) => {
-      owner = destination.receiver;
-    }
-  );
+  const action = evalKeyOf(pointer, scope, ctx, (destination) => {
+    owner = destination.receiver;
+  });
   return { action, owner };
 }
 function actionPointerLabel(pointer, ctx) {
@@ -81848,7 +81910,9 @@ function isRuntimeSpriteValue(value) {
   const sliceIndex = value.sliceIndex;
   return typeof sliceIndex === "number" && Number.isInteger(sliceIndex) && sliceIndex >= 0;
 }
-function evalKeyOf(keyOf, scope, ctx, optional2 = false, onDestination) {
+function evalKeyOf(pointer, scope, ctx, onDestination) {
+  const { keyOf } = pointer;
+  const optional2 = pointer.optional === true;
   const receiver = evalPointer(keyOf.pointer, scope, ctx);
   if (optional2 && (receiver === null || receiver === void 0)) {
     return null;
@@ -81909,7 +81973,7 @@ function evalKeyOf(keyOf, scope, ctx, optional2 = false, onDestination) {
     if (dispatched.kind === "ok") return dispatched.value;
     if (Object.prototype.hasOwnProperty.call(receiver, k)) {
       const at3 = receiver[k];
-      return resolveValueIfId(at3, ctx);
+      return typeof at3 === "string" && (pointer.memberId !== void 0 || isReferenceEntry(collectionReferences(receiver, ctx), k)) ? resolveValueIfId(at3, ctx) : at3;
     }
     const expanded = virtualExpandedRecordForReceiver(receiver, ctx);
     if (expanded !== null && Object.prototype.hasOwnProperty.call(expanded, k)) {
@@ -82641,7 +82705,7 @@ function evaluateSystemNative(memberId, receiver, args, ctx, typeArguments) {
           shift,
           accepts
         );
-        return { handled: true, value };
+        return { handled: true, value: referenceEntryList(value, ctx) };
       }
       if (memberId === NEO_OBJECT_GRID_MEMBER_IDS.GetTiles) {
         const value = index.tiles(
@@ -82651,7 +82715,7 @@ function evaluateSystemNative(memberId, receiver, args, ctx, typeArguments) {
           shift,
           accepts
         );
-        return { handled: true, value };
+        return { handled: true, value: referenceEntryList(value, ctx) };
       }
       const tile = index.tile(
         placement,
@@ -83260,7 +83324,17 @@ function evalDeclaredListIndex(info, scope, ctx) {
     collectionIndexes.set(cacheKey, index);
   }
   if (info.keyPointer === void 0) {
-    return Object.fromEntries(index);
+    const view = Object.fromEntries(index);
+    if (info.unique) {
+      unorderedListProjectionCache(ctx).referenceEntryKeysByRecord.set(
+        view,
+        new Set(index.keys())
+      );
+    } else {
+      for (const bucket of index.values())
+        if (Array.isArray(bucket)) referenceEntryList(bucket, ctx);
+    }
+    return view;
   }
   const key = evalPointer(info.keyPointer, scope, ctx);
   if (typeof key !== "string") {
@@ -83272,7 +83346,12 @@ function evalDeclaredListIndex(info, scope, ctx) {
   if (info.unique) {
     return typeof hit === "string" ? resolveValueIfId(hit, ctx) : null;
   }
-  return Array.isArray(hit) ? [...hit] : [];
+  return referenceEntryList(Array.isArray(hit) ? [...hit] : [], ctx);
+}
+function referenceEntryList(list, ctx) {
+  const indexes3 = unorderedListProjectionCache(ctx).referenceEntryIndexesByArray;
+  if (!indexes3.has(list)) indexes3.set(list, new Set(list.keys()));
+  return list;
 }
 function prepareCollectionCallback(callback, parentScope, ctx, isList, returnContract, onPredicateMatch) {
   const metrics = ctx.__collectionCallbackPreparationMetrics;
@@ -83836,7 +83915,7 @@ function evalFunction(fn, scope, ctx) {
       if (fn.info.reference === true) {
         return referenceIndexOf(c, target, ctx) !== null;
       }
-      const targetReferenceId = typeof target === "string" ? target : findKnownRowIdByValueReference(target, ctx);
+      const targetReferenceId = typeof target === "string" ? null : findKnownRowIdByValueReference(target, ctx);
       let containsResolvedEntry = false;
       iterateCollection(c, ctx, (entry, _key, valueId) => {
         if (valueId !== null && valueId === targetReferenceId || jsEqual(entry, target)) {
@@ -83857,7 +83936,7 @@ function evalFunction(fn, scope, ctx) {
         const index = referenceIndexOf(collection, target, ctx);
         return index === null ? -1 : numberArg(index, "IndexOf index");
       }
-      const targetReferenceId = typeof target === "string" ? target : findKnownRowIdByValueReference(target, ctx);
+      const targetReferenceId = typeof target === "string" ? null : findKnownRowIdByValueReference(target, ctx);
       let found = -1;
       iterateCollection(collection, ctx, (entry, key, valueId) => {
         if (valueId !== null && valueId === targetReferenceId || jsEqual(entry, target)) {
@@ -84999,6 +85078,8 @@ function evaluateDeclaredConstructorArguments(info, record7, scope, ctx) {
       );
     }
     const value = byName.get(parameter4.name);
+    if (parameter4.type === 9 /* Lookup */ && Array.isArray(value))
+      return referenceEntryList(value, ctx);
     if (typeof value !== "number") return value;
     if (parameter4.type === 4 /* Float */) return Math.fround(value);
     if (parameter4.type !== 20 /* Decimal */) return value;
@@ -85493,12 +85574,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,
@@ -86363,7 +86439,7 @@ function evalVariantInitialize(info, scope, ctx) {
       scope,
       ctx
     );
-    stampInstanceVariantProvenance(instance, selection2, ctx, true);
+    stampInstanceVariantProvenance(instance, selection2, ctx);
     return instance;
   }
   const graph = resolveVariantGraph(selection2, ctx);
@@ -86394,12 +86470,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) {
@@ -86411,12 +86491,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,
@@ -86425,13 +86505,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,
@@ -86441,17 +86526,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) {
@@ -86460,26 +86540,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(
@@ -86493,14 +86588,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;
@@ -86583,6 +86733,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) {
@@ -86623,7 +86774,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 {
@@ -87016,7 +87166,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),
@@ -87060,7 +87210,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)) {
@@ -87303,7 +87453,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,
@@ -87883,14 +88033,10 @@ function collectionLength(c) {
 }
 function snapshotCollectionMembership(collection, ctx) {
   const membership = [];
-  const valid = forEachRawCollectionEntry(collection, (entry) => {
+  const valid = forEachRawCollectionEntry(collection, ctx, (entry) => {
     membership.push({
       raw: entry.raw,
-      resolveAsReference: collectionEntryUsesReferenceResolution(
-        collection,
-        entry.key,
-        ctx
-      )
+      resolveAsReference: entry.valueId !== null
     });
     return 0 /* Continue */;
   });
@@ -87899,7 +88045,7 @@ function snapshotCollectionMembership(collection, ctx) {
     "NeoScript foreach requires a present collection."
   );
 }
-function forEachRawCollectionEntry(c, callback) {
+function forEachRawCollectionEntry(c, ctx, callback) {
   if (c instanceof RuntimeSet) {
     for (const [key, entry] of c.membership().entries()) {
       if (callback({
@@ -87911,35 +88057,34 @@ function forEachRawCollectionEntry(c, callback) {
     }
     return true;
   }
+  if (typeof c !== "object" || c === null) return false;
+  const references = collectionReferences(c, ctx);
   if (Array.isArray(c)) {
     for (let key = 0; key < c.length; key += 1) {
       const raw = c[key];
       const control = callback({
         raw,
         key,
-        valueId: typeof raw === "string" ? raw : null
+        valueId: typeof raw === "string" && isReferenceEntry(references, key) ? raw : null
       });
       if (control === 1 /* Break */) break;
     }
     return true;
   }
-  if (typeof c === "object" && c !== null) {
-    for (const [key, raw] of Object.entries(c)) {
-      const control = callback({
-        raw,
-        key,
-        valueId: typeof raw === "string" ? raw : null
-      });
-      if (control === 1 /* Break */) break;
-    }
-    return true;
+  for (const [key, raw] of Object.entries(c)) {
+    const control = callback({
+      raw,
+      key,
+      valueId: typeof raw === "string" && isReferenceEntry(references, key) ? raw : null
+    });
+    if (control === 1 /* Break */) break;
   }
-  return false;
+  return true;
 }
 function collectionEntries(c, ctx) {
   const entries = [];
-  forEachRawCollectionEntry(c, ({ raw, key }) => {
-    entries.push(resolveCollectionEntry(c, raw, key, ctx));
+  forEachRawCollectionEntry(c, ctx, ({ raw, valueId }) => {
+    entries.push(valueId === null ? raw : resolveValueIfId(valueId, ctx));
     return 0 /* Continue */;
   });
   return entries;
@@ -87947,7 +88092,7 @@ function collectionEntries(c, ctx) {
 function referenceIndexOf(c, target, ctx) {
   const targetId = target === null || target === void 0 ? null : referenceIdOf(target, ctx);
   let found = null;
-  forEachRawCollectionEntry(c, ({ raw, key }) => {
+  forEachRawCollectionEntry(c, ctx, ({ raw, key }) => {
     if (raw === target || targetId !== null && raw !== null && raw !== void 0 && referenceIdOf(raw, ctx) === targetId) {
       found = key;
       return 1 /* Break */;
@@ -87957,28 +88102,63 @@ function referenceIndexOf(c, target, ctx) {
   return found;
 }
 function iterateCollection(c, ctx, callback) {
-  forEachRawCollectionEntry(c, ({ raw, key, valueId }) => {
-    const effectiveValueId = collectionEntryUsesReferenceResolution(c, key, ctx) ? valueId : null;
-    return callback(
-      resolveCollectionEntry(c, raw, key, ctx),
+  forEachRawCollectionEntry(
+    c,
+    ctx,
+    ({ raw, key, valueId }) => callback(
+      valueId === null ? raw : resolveValueIfId(valueId, ctx),
       key,
-      effectiveValueId
-    );
-  });
+      valueId
+    )
+  );
 }
 function resolveCollectionEntry(collection, raw, key, ctx) {
-  return collectionEntryUsesReferenceResolution(collection, key, ctx) ? resolveValueIfId(raw, ctx) : raw;
+  return typeof raw === "string" && isReferenceEntry(collectionReferences(collection, ctx), key) ? resolveValueIfId(raw, ctx) : raw;
 }
-function collectionEntryUsesReferenceResolution(collection, key, ctx) {
-  if (collection instanceof RuntimeSet && typeof key === "number")
-    return collection.membership()[key]?.reference === true;
-  if (!Array.isArray(collection) || typeof key !== "number") return true;
-  const referenceIndexes = ctx.__unorderedListProjections?.referenceEntryIndexesByArray.get(
-    collection
-  );
-  return referenceIndexes === void 0 || referenceIndexes.has(key);
+function recordedReferenceEntries(collection, ctx) {
+  const cache = ctx.__unorderedListProjections;
+  if (Array.isArray(collection))
+    return cache?.referenceEntryIndexesByArray.get(collection);
+  if (typeof collection === "object" && collection !== null)
+    return cache?.referenceEntryKeysByRecord.get(collection);
+  return void 0;
+}
+function collectionReferences(collection, ctx) {
+  return recordedReferenceEntries(collection, ctx) ?? (findKnownRowIdByValueReference(collection, ctx) === null ? 1 /* Values */ : 0 /* RowIds */);
+}
+function isReferenceEntry(references, key) {
+  if (references === 0 /* RowIds */) return true;
+  if (references === 1 /* Values */) return false;
+  return references.has(key);
+}
+function recordWrittenEntry(collection, key, reference2, ctx) {
+  const references = collectionReferences(collection, ctx);
+  if (typeof references !== "object") {
+    if (reference2 === (references === 0 /* RowIds */)) return;
+    const written = Array.isArray(collection) ? collection[Number(key)] : collection[String(key)];
+    if (!reference2 && typeof written !== "string") return;
+  }
+  const rowIds = references === 0 /* RowIds */;
+  const cache = unorderedListProjectionCache(ctx);
+  if (Array.isArray(collection)) {
+    let indexes3 = cache.referenceEntryIndexesByArray.get(collection);
+    if (indexes3 === void 0) {
+      indexes3 = new Set(rowIds ? collection.keys() : []);
+      cache.referenceEntryIndexesByArray.set(collection, indexes3);
+    }
+    if (reference2) indexes3.add(Number(key));
+    else indexes3.delete(Number(key));
+    return;
+  }
+  let keys = cache.referenceEntryKeysByRecord.get(collection);
+  if (keys === void 0) {
+    keys = new Set(rowIds ? Object.keys(collection) : []);
+    cache.referenceEntryKeysByRecord.set(collection, keys);
+  }
+  if (reference2) keys.add(String(key));
+  else keys.delete(String(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";
@@ -88188,6 +88368,7 @@ var init_evaluateNSGetter = __esm({
     };
     DOUBLE_INTEGRAL_MAGNITUDE = 2 ** 53;
     EMPTY_SUPPLIED_CONSTRUCTOR_FIELDS = [];
+    variantResolutionCopiesByOverlay = /* @__PURE__ */ new WeakMap();
   }
 });
 
@@ -89880,6 +90061,8 @@ function expandStoredInstance(args) {
     instanceConstructorId: _instanceConstructorId,
     instanceVariantId: _instanceVariantId,
     instanceVariantRowValueId: _instanceVariantRowValueId,
+    instanceAppliedVariantId: _instanceAppliedVariantId,
+    instanceAppliedVariantRowValueId: _instanceAppliedVariantRowValueId,
     ...envelope
   } = instanceRoot;
   void _value;
@@ -89888,6 +90071,8 @@ function expandStoredInstance(args) {
   void _instanceConstructorId;
   void _instanceVariantId;
   void _instanceVariantRowValueId;
+  void _instanceAppliedVariantId;
+  void _instanceAppliedVariantRowValueId;
   const closedRootMember = closeClassArgumentsFromRowStamp(
     rootMember,
     instanceRoot
@@ -89969,11 +90154,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 {
@@ -89982,6 +90182,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;
@@ -90955,6 +91229,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;
@@ -91268,6 +91547,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);
@@ -91666,10 +91946,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(
@@ -92324,7 +92629,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 {
@@ -92622,40 +92929,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) {
@@ -92667,6 +92971,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({
@@ -92710,10 +93036,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) {
@@ -93040,6 +93371,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();
@@ -93142,6 +93474,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) => {
@@ -93197,6 +93530,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
@@ -93430,6 +93766,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,
@@ -93513,6 +93850,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,
@@ -93583,10 +93921,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) {
@@ -93609,9 +93950,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
@@ -93619,17 +93963,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 ? {} : {
@@ -93835,12 +94175,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) {
@@ -93863,7 +94198,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) {
@@ -93980,7 +94316,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({
@@ -93989,6 +94330,7 @@ var init_initializer_materialization = __esm({
     init_deep_clone_plain_data();
     init_members();
     init_inheritance();
+    init_instance_provenance();
     init_generics();
     init_evaluateInitializer();
     init_evaluateNSGetter();
@@ -94061,6 +94403,28 @@ function createTypedValueNormalizer(reader, document, childrenByContainerId, par
     }
     return normalizeLiteral(value);
   };
+  const bindingTypes = /* @__PURE__ */ new Map();
+  const bindingType = (memberId) => {
+    const member = memberById2(memberId);
+    if (member === void 0) return memberId;
+    try {
+      return genericBindingTypeInfo(member, /* @__PURE__ */ new Map(), document.members);
+    } catch {
+      return memberId;
+    }
+  };
+  const normalizeGenericBindings = (bindings) => {
+    const result = /* @__PURE__ */ Object.create(null);
+    for (const [paramId, memberId] of Object.entries(bindings)) {
+      let type = bindingTypes.get(memberId);
+      if (type === void 0) {
+        type = bindingType(memberId);
+        bindingTypes.set(memberId, type);
+      }
+      result[paramId] = type;
+    }
+    return result;
+  };
   const normalizeTypedRow = (valueId, typeInfo, placement, parentEnv = /* @__PURE__ */ new Map()) => {
     const row = reader.row(valueId, typeInfo, placement);
     if (row === void 0) return valueId;
@@ -94142,7 +94506,7 @@ function createTypedValueNormalizer(reader, document, childrenByContainerId, par
       const normalized = {
         ...rowIdentities?.has(valueId) ? { id: valueId } : {},
         ...typeof row.classId === "string" ? { classId: row.classId } : {},
-        ...row.genericBindings === void 0 ? {} : { genericBindings: row.genericBindings },
+        ...row.genericBindings === void 0 ? {} : { genericBindings: normalizeGenericBindings(row.genericBindings) },
         value,
         ...carriesSemanticConstructorArguments(row) ? {
           constructorArgs: normalizeConstructorArgs(
@@ -94179,7 +94543,7 @@ function createTypedValueNormalizer(reader, document, childrenByContainerId, par
       const normalized = {
         ...rowIdentities?.has(valueId) ? { id: valueId } : {},
         ...typeof row.classId === "string" ? { classId: row.classId } : {},
-        ...row.genericBindings === void 0 ? {} : { genericBindings: row.genericBindings },
+        ...row.genericBindings === void 0 ? {} : { genericBindings: normalizeGenericBindings(row.genericBindings) },
         // The containing Class schema proves this is an owned row edge, but an
         // unresolved generic member does not prove anything about strings in
         // the row's payload. Keep those strings literal instead of guessing
@@ -94531,10 +94895,15 @@ var init_effective_value_reader = __esm({
           return row;
         if (this.resolvedRoots.has(valueId)) return row;
         if (this.mode(valueId) === "partial") return row;
+        if (this.context.overrideRows === "constructed" && this.overrides.has(valueId) && !this.graph.valuesById.has(valueId))
+          return row;
         const schema = this.schema(classId);
-        if (schema.every(
-          (entry) => Object.prototype.hasOwnProperty.call(row.value, entry.schemaKey)
-        ))
+        const record7 = row.value;
+        if (schema.every((entry) => {
+          if (Object.hasOwn(record7, entry.schemaKey)) return true;
+          const member2 = this.memberForId(entry.memberId);
+          return member2 !== null && !memberKindOwnsStoredValue(member2.kind);
+        }))
           return row;
         this.resolvedRoots.add(valueId);
         const member = this.placementFor(valueId) ?? this.graph.ownerForValue(valueId) ?? {
@@ -94731,6 +95100,8 @@ var init_effective_value_reader = __esm({
           {
             ...this.context,
             containerMembership: options.containerMembership ?? this.context.containerMembership,
+            // Describes this reader's overrides, not a fork's.
+            overrideRows: void 0,
             ...options.readTracking === void 0 ? {} : { readTracking: options.readTracking }
           },
           this,
@@ -110382,7 +110753,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)
   );
@@ -113765,6 +114136,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({
@@ -114673,6 +115045,7 @@ function validateWorldPlacementSidecars(args) {
   validatePlacementVariantBinding({
     assetClassId,
     placementId: args.placement.id,
+    layer: "built",
     variantId: optionalNonEmptyString(
       args.isTile || !hasObjectSidecar ? getField(args.placement, "instanceVariantId") : record7.variantId
     ),
@@ -114681,12 +115054,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;
@@ -114694,19 +115080,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;
@@ -114718,7 +115109,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}".`
     );
   }
 }
@@ -117793,6 +118184,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()),
@@ -117840,7 +118237,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
@@ -117851,13 +118258,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,
@@ -117884,7 +118288,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,
@@ -117897,15 +118302,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,
@@ -119138,7 +119568,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) {
@@ -119155,7 +119589,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,
@@ -119281,6 +119715,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 },
@@ -129577,6 +130015,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,
@@ -129745,6 +130184,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 {
@@ -129842,17 +130282,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)
@@ -129911,7 +130342,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,
@@ -130015,6 +130446,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(
@@ -132320,22 +132763,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;
@@ -132609,7 +133037,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()) {
@@ -134127,7 +134555,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) {
@@ -134177,6 +134609,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()] }
@@ -135586,37 +136022,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 {
@@ -135625,6 +136039,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;
@@ -137672,6 +138243,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,
@@ -138142,15 +138714,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 };
 }
@@ -138446,7 +139019,7 @@ function classValueBody(context, member, value, visited, targetTyped, outerEnvir
       context,
       value.id,
       replayConstruction,
-      concreteClassMemberForReplay(member, environment)
+      concreteClassMemberForReplay(context, member, environment)
     );
     const replayRoot = replayRows === null || typeof value.id !== "string" ? void 0 : replayRows.get(value.id);
     const graph = replayRows === null || typeof value.id !== "string" ? null : context.readEffectiveValues().withRowOverrides(
@@ -138493,7 +139066,11 @@ function classValueBody(context, member, value, visited, targetTyped, outerEnvir
     if (!context.values.has(childId)) {
       const reader = context.readEffectiveValues();
       if (reader.row(childId) === void 0) {
-        const placement = concreteClassMemberForReplay(member, environment);
+        const placement = concreteClassMemberForReplay(
+          context,
+          member,
+          environment
+        );
         if (!isAnyMemberBase(placement))
           throw new Error(
             `Stored class ${name} has no typed member placement.`
@@ -138657,7 +139234,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)
@@ -138769,22 +139346,23 @@ function storedConstructionReplayRows(context, valueId, code, member) {
   context.constructionReplays.set(valueId, replay);
   return replay;
 }
-function concreteClassMemberForReplay(member, environment) {
+function concreteClassMemberForReplay(context, member, environment) {
   if (numberField(member, "kind") !== 7 /* Class */) return member;
   const classArguments2 = isObjectRecord2(member.classArguments) ? member.classArguments : {};
+  const parameters = context.manifestClasses.get(stringField2(member, "classId"))?.genericParameters ?? [];
   let changed = false;
-  const concreteArguments = Object.fromEntries(
-    Object.entries(classArguments2).map(([genericParamId, binding]) => {
-      const forwardedParamId = isObjectRecord2(binding) && (binding.kind === void 0 || binding.kind === 0 /* Generic */) && typeof binding.genericParamId === "string" ? binding.genericParamId : null;
-      const bindingMemberId = environment.get(genericParamId) ?? (forwardedParamId === null ? void 0 : environment.get(forwardedParamId));
-      if (bindingMemberId === void 0) return [genericParamId, binding];
-      changed = true;
-      return [
-        genericParamId,
-        { kind: 1 /* Member */, memberId: bindingMemberId }
-      ];
-    })
-  );
+  const concreteArguments = { ...classArguments2 };
+  for (const { id: genericParamId } of parameters) {
+    const binding = classArguments2[genericParamId];
+    const forwardedParamId = isObjectRecord2(binding) && (binding.kind === void 0 || binding.kind === 0 /* Generic */) && typeof binding.genericParamId === "string" ? binding.genericParamId : null;
+    const bindingMemberId = environment.get(genericParamId) ?? (forwardedParamId === null ? void 0 : environment.get(forwardedParamId));
+    if (bindingMemberId === void 0) continue;
+    changed = true;
+    concreteArguments[genericParamId] = {
+      kind: 1 /* Member */,
+      memberId: bindingMemberId
+    };
+  }
   return changed ? { ...member, classArguments: concreteArguments } : member;
 }
 function storedLookupIdentityIds(values, reader) {
@@ -139166,7 +139744,8 @@ function storedConstructorArgumentSource(context, type, value, environment, visi
         visited,
         false,
         false,
-        constructorOwnsGraph
+        constructorOwnsGraph,
+        cloneAggregateArguments
       );
     case "lookup":
       return referenceValue(
@@ -139501,7 +140080,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);
@@ -139510,6 +140089,31 @@ function storedTypedRowSource(context, type, valueId, environment, visited, writ
       `Stored ${type.kind} constructor argument references missing value row ${valueId}.`
     );
   }
+  if (type.kind === "generic" && typeof row.classId !== "string") {
+    return storedTypedRowSource(
+      context,
+      storedGenericArgumentType(context, type, environment),
+      valueId,
+      environment,
+      visited,
+      writeIdentity,
+      partial,
+      constructorOwnsGraph,
+      cloneAggregateArguments
+    );
+  }
+  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)})`;
   }
@@ -139522,8 +140126,8 @@ function storedTypedRowSource(context, type, valueId, environment, visited, writ
   visited.add(valueId);
   try {
     if (type.kind === "class" || type.kind === "interface" || type.kind === "generic") {
-      const classId = type.kind === "class" ? type.classId : typeof row.classId === "string" ? row.classId : null;
-      if (classId === null) {
+      const classId = type.kind === "class" ? type.classId : row.classId;
+      if (typeof classId !== "string") {
         throw new Error(
           `Stored ${type.kind} constructor argument ${valueId} has no concrete class.`
         );
@@ -139566,7 +140170,8 @@ ${ids.map(
             visited,
             true,
             false,
-            constructorOwnsGraph
+            constructorOwnsGraph,
+            cloneAggregateArguments
           ),
           2
         )
@@ -139595,7 +140200,8 @@ ${entries.flatMap(
               visited,
               false,
               false,
-              constructorOwnsGraph
+              constructorOwnsGraph,
+              cloneAggregateArguments
             )}`,
             2
           )
@@ -141205,8 +141811,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,
@@ -141284,7 +141890,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);
@@ -141296,11 +141901,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);
     }
   }
@@ -141367,26 +141968,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) {
@@ -141414,7 +141998,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,
@@ -141438,34 +142022,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;
@@ -141767,7 +142398,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,
@@ -141781,8 +142415,8 @@ function materializeInitializersLocallyV4(args) {
         compiledInitializer = init;
         compiledInitializers.set(sourceValueId, init);
       },
-      onPinnedRootSchemaKeys: (schemaKeys) => {
-        pinnedRootSchemaKeys = schemaKeys;
+      onPinnedSchemaKeys: (keys) => {
+        pinned = keys;
       }
     });
     const evaluatedRoot = evaluated.get(sourceValueId);
@@ -141846,7 +142480,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];
@@ -142035,6 +142670,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();
@@ -148912,23 +149548,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(
@@ -149405,6 +150046,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(
@@ -185144,7 +185837,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") {
@@ -185161,6 +185856,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
     }
   };
 }
@@ -201074,7 +201775,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.81.0");
+    console.log("0.81.2");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {