@neocompose/cli 0.26.3 → 0.26.5

package/dist/neo.mjs

@@ -41382,8 +41382,8 @@ function envFromStamp(stamp) {
   }
   return env;
 }
-function substituteMember(member, env, members) {
-  const resolved = resolveMember2(member, members);
+function substituteMember(member, env, members, preResolvedMember) {
+  const resolved = preResolvedMember ?? resolveMember2(member, members);
   if (isMemberGenericBase(resolved)) {
     const binding = substituteMember(
       resolveTerminalBinding(
@@ -42342,6 +42342,12 @@ function stampCreatedValuesMapKey(values, mapKey) {
   }
 }
 function applyDeclaredStorageKeyOverrides(args) {
+  const boundaryValues = args.createdValues.filter(
+    (value) => normalizeStorageKeyDeclaration(
+      args.declarationByValueId.get(value.id)
+    ) !== STORAGE_KEY_INHERIT
+  );
+  if (boundaryValues.length === 0) return;
   const createdById = new Map(
     args.createdValues.map((value) => [value.id, value])
   );
@@ -42367,12 +42373,7 @@ function applyDeclaredStorageKeyOverrides(args) {
     }
     return depth;
   };
-  const boundaries = args.createdValues.filter((value) => {
-    const declaration = normalizeStorageKeyDeclaration(
-      args.declarationByValueId.get(value.id)
-    );
-    return declaration !== STORAGE_KEY_INHERIT;
-  }).sort((left, right) => depthOf(left) - depthOf(right));
+  const boundaries = boundaryValues.sort((left, right) => depthOf(left) - depthOf(right));
   for (const boundary of boundaries) {
     const parentCreated = parentOf.get(boundary.id);
     const parent = parentCreated !== void 0 ? {
@@ -43567,7 +43568,59 @@ function descendPositionThroughMember(position, memberId) {
 }
 function recordStorageKeyDeclaration(sink, valueId, member) {
   if (sink === void 0) return;
-  sink.set(valueId, normalizeStorageKeyDeclaration(member.storageKey));
+  const declaration = normalizeStorageKeyDeclaration(member.storageKey);
+  if (declaration === STORAGE_KEY_INHERIT) return;
+  sink.set(valueId, declaration);
+}
+function documentHasInitValueContent(document, value) {
+  return document.isInitValueContent?.(value) ?? isInitValueContent(value);
+}
+function createDocumentValueRow(document, projectId, body) {
+  return document.createValueRow?.(projectId, body) ?? buildNewValue(projectId, body);
+}
+function directScalarDefaultBody(document, member) {
+  if (member.kind !== 1 /* Bool */ && member.kind !== 2 /* Int */ && member.kind !== 4 /* Float */ && member.kind !== 3 /* String */ && member.kind !== 20 /* Decimal */ && member.kind !== 8 /* Enum */ && member.kind !== 0 /* Null */) {
+    return void 0;
+  }
+  if (!member.required && (member.defaultValue === void 0 || member.defaultValue === null)) {
+    return void 0;
+  }
+  if (documentHasInitValueContent(document, member.defaultValue)) {
+    return void 0;
+  }
+  const body = member.defaultValue ?? primitiveFallbackValue(document, member);
+  if (!isLiteralValueContent(body)) return void 0;
+  if (body.value !== null && typeof body.value !== "boolean" && typeof body.value !== "number" && typeof body.value !== "string") {
+    return void 0;
+  }
+  validateProjectDocumentFileMemberValue(
+    document,
+    member,
+    body,
+    DECLARATION_DEFAULT_POSITION
+  );
+  return { value: body.value, classId: body.classId };
+}
+function buildDefaultClassMaterializationPlan(document, classId, instanceEnv) {
+  const merged = document.storedInstanceSchema?.(classId) ?? mergeStoredInstanceSchema(classId, document.classes, document.members);
+  return merged.flatMap((entry) => {
+    if (entry.memberId === null) return [];
+    const childMember = findMemberInDocument(document, entry.memberId);
+    if (!memberKindOwnsStoredValue(childMember.kind)) return [];
+    const member = substituteMember(
+      childMember,
+      instanceEnv,
+      document.members,
+      document.resolvedMember?.(childMember)
+    );
+    return [
+      {
+        schemaKey: entry.schemaKey,
+        member,
+        directScalarBody: directScalarDefaultBody(document, member)
+      }
+    ];
+  });
 }
 function assertLookupInitializerLiteral(member, literal2) {
   if (!isMemberLookupBase(member)) return;
@@ -43589,7 +43642,6 @@ function assertLookupInitializerLiteral(member, literal2) {
 function evaluateLiteralContainer(args) {
   const body = args.body;
   if (body === void 0) return void 0;
-  if (!isInitValueContent(body)) return { literal: body };
   if (args.initEvaluator === void 0) {
     throw new Error(
       `Cannot materialize member "${args.member.name}": its value is a NeoScript initializer, which this builder cannot evaluate. Supply an initEvaluator.`
@@ -43621,9 +43673,16 @@ function evaluateLiteralContainer(args) {
   };
 }
 function buildDefaultMemberValue(args) {
-  const member = args.genericEnv !== void 0 ? substituteMember(args.member, args.genericEnv, args.document.members) : resolveMember2(args.member, args.document.members);
+  const resolvedMember = args.document.resolvedMember?.(args.member) ?? resolveMember2(args.member, args.document.members);
+  const member = args.genericEnv !== void 0 ? substituteMember(
+    args.member,
+    args.genericEnv,
+    args.document.members,
+    resolvedMember
+  ) : resolvedMember;
   const declaredDefault = member.defaultValue;
-  if (isInitValueContent(declaredDefault)) {
+  if (documentHasInitValueContent(args.document, declaredDefault)) {
+    const initializerCreatedValuesStart = args.createdValues.length;
     const evaluated = evaluateLiteralContainer({
       body: declaredDefault,
       member,
@@ -43637,13 +43696,17 @@ function buildDefaultMemberValue(args) {
     if (evaluated.existingValueRow !== void 0) {
       return evaluated.existingValueRow;
     }
-    const value2 = buildNewValue(args.projectId, evaluated.literal);
+    const value2 = createDocumentValueRow(
+      args.document,
+      args.projectId,
+      evaluated.literal
+    );
     if (evaluated.genericBindings !== void 0) {
       value2.genericBindings = { ...evaluated.genericBindings };
     }
     if (evaluated.provisionalRootId !== void 0) {
       retargetDelegateReceiverValueIds(
-        [value2, ...args.createdValues],
+        [value2, ...args.createdValues.slice(initializerCreatedValuesStart)],
         evaluated.provisionalRootId,
         value2.id
       );
@@ -43659,7 +43722,11 @@ function buildDefaultMemberValue(args) {
           `Required Class member "${member.name}" cannot have a null default.`
         );
       }
-      const value3 = buildNewValue(args.projectId, declaredDefault);
+      const value3 = createDocumentValueRow(
+        args.document,
+        args.projectId,
+        declaredDefault
+      );
       args.createdValues.push(value3);
       recordStorageKeyDeclaration(
         args.storageKeyDeclarations,
@@ -43685,7 +43752,7 @@ function buildDefaultMemberValue(args) {
         `Cannot create a value of abstract class "${effectiveClass.name}".`
       );
     }
-    const childEnv = resolveInstanceEnv(
+    const childEnv = args.document.instanceEnv?.(effectiveClassId, member.classArguments) ?? resolveInstanceEnv(
       effectiveClassId,
       member.classArguments,
       args.document.classes
@@ -43710,10 +43777,13 @@ function buildDefaultMemberValue(args) {
         );
       }
     }
-    const merged = mergeStoredInstanceSchema(
+    const materializationPlan = args.document.storedInstanceMaterializationPlan?.(
       effectiveClassId,
-      args.document.classes,
-      args.document.members
+      childEnv
+    ) ?? buildDefaultClassMaterializationPlan(
+      args.document,
+      effectiveClassId,
+      childEnv
     );
     const record3 = member.partial === true ? {} : cloneDefaultClassRecord({
       document: args.document,
@@ -43733,39 +43803,43 @@ function buildDefaultMemberValue(args) {
       position: DECLARATION_DEFAULT_POSITION
     });
     let anchorsParentClassPartition = false;
-    for (const entry of member.partial === true ? [] : merged) {
-      if (entry.memberId === null) continue;
-      const childMember = findMemberInDocument(args.document, entry.memberId);
-      if (!memberKindOwnsStoredValue(childMember.kind)) continue;
-      const resolvedChildMember = substituteMember(
-        childMember,
-        childEnv,
-        args.document.members
-      );
+    for (const {
+      schemaKey,
+      member: resolvedChildMember,
+      directScalarBody
+    } of member.partial === true ? [] : materializationPlan) {
       if (storageKeyReferencesParentClass(
         normalizeStorageKeyDeclaration(resolvedChildMember.storageKey)
       )) {
         anchorsParentClassPartition = true;
       }
-      if (record3[entry.schemaKey] !== void 0) continue;
-      if (args.authoredRoot?.suppliedSchemaKeys.has(entry.schemaKey) === true) {
+      if (record3[schemaKey] !== void 0) continue;
+      if (args.authoredRoot?.suppliedSchemaKeys.has(schemaKey) === true) {
         continue;
       }
       if (skipProvidedConstructorSchemaKey(
         args.constructorRoot,
-        entry.schemaKey,
-        resolvedChildMember
+        schemaKey,
+        resolvedChildMember,
+        documentHasInitValueContent(
+          args.document,
+          resolvedChildMember.defaultValue
+        )
       )) {
         continue;
       }
       if (!shouldMaterializeChildDefaultForRoot(
         args.constructorRoot,
-        resolvedChildMember
+        resolvedChildMember,
+        documentHasInitValueContent(
+          args.document,
+          resolvedChildMember.defaultValue
+        )
       )) {
         continue;
       }
       if (shouldSkipRequiredChildDefault(resolvedChildMember)) continue;
-      const childValue = buildDefaultMemberValue({
+      const childValue = directScalarBody === void 0 ? buildDefaultMemberValue({
         document: args.document,
         projectId: args.projectId,
         member: resolvedChildMember,
@@ -43773,13 +43847,29 @@ function buildDefaultMemberValue(args) {
         storageKeyDeclarations: args.storageKeyDeclarations,
         initEvaluator: args.initEvaluator,
         genericEnv: childEnv
-      });
-      record3[entry.schemaKey] = childValue.id;
+      }) : createDocumentValueRow(
+        args.document,
+        args.projectId,
+        directScalarBody
+      );
+      if (directScalarBody !== void 0) {
+        args.createdValues.push(childValue);
+        recordStorageKeyDeclaration(
+          args.storageKeyDeclarations,
+          childValue.id,
+          resolvedChildMember
+        );
+      }
+      record3[schemaKey] = childValue.id;
     }
-    const value2 = buildNewValue(args.projectId, {
-      value: record3,
-      classId: member.partial === true || effectiveClassId !== member.classId || anchorsParentClassPartition ? effectiveClassId : void 0
-    });
+    const value2 = createDocumentValueRow(
+      args.document,
+      args.projectId,
+      {
+        value: record3,
+        classId: member.partial === true || effectiveClassId !== member.classId || anchorsParentClassPartition ? effectiveClassId : void 0
+      }
+    );
     args.createdValues.push(value2);
     recordStorageKeyDeclaration(args.storageKeyDeclarations, value2.id, member);
     return value2;
@@ -43797,7 +43887,11 @@ function buildDefaultMemberValue(args) {
       path: /* @__PURE__ */ new Set(),
       position: DECLARATION_DEFAULT_POSITION
     });
-    const value2 = buildNewValue(args.projectId, record3);
+    const value2 = createDocumentValueRow(
+      args.document,
+      args.projectId,
+      record3
+    );
     stampGenericBindings(value2, member, args);
     args.createdValues.push(value2);
     recordStorageKeyDeclaration(args.storageKeyDeclarations, value2.id, member);
@@ -43816,14 +43910,20 @@ function buildDefaultMemberValue(args) {
       path: /* @__PURE__ */ new Set(),
       position: DECLARATION_DEFAULT_POSITION
     });
-    const value2 = buildNewValue(args.projectId, list);
+    const value2 = createDocumentValueRow(
+      args.document,
+      args.projectId,
+      list
+    );
     stampGenericBindings(value2, member, args);
     args.createdValues.push(value2);
     recordStorageKeyDeclaration(args.storageKeyDeclarations, value2.id, member);
     return value2;
   }
   if (isMemberNullBase(member)) {
-    const value2 = buildNewValue(args.projectId, { value: null });
+    const value2 = createDocumentValueRow(args.document, args.projectId, {
+      value: null
+    });
     args.createdValues.push(value2);
     recordStorageKeyDeclaration(args.storageKeyDeclarations, value2.id, member);
     return value2;
@@ -43843,30 +43943,33 @@ function buildDefaultMemberValue(args) {
       DECLARATION_DEFAULT_POSITION
     );
   }
-  const value = buildNewValue(args.projectId, clonedBody);
+  const value = createDocumentValueRow(
+    args.document,
+    args.projectId,
+    clonedBody
+  );
   args.createdValues.push(value);
   recordStorageKeyDeclaration(args.storageKeyDeclarations, value.id, member);
   return value;
 }
-function buildNewValue(projectId, body) {
+function buildNewValue(projectId, body, timestamp = Date.now()) {
   if (isInitValueContent(body)) {
     throw new Error(
       "Cannot build a value row from an initializer-backed container: the initializer must be evaluated into a literal value first."
     );
   }
-  const now = Date.now();
   const id2 = v4_default();
   const props = {
     id: id2,
     projectId,
     value: body.value,
     classId: body.classId ?? void 0,
-    ...body.constructorArgs === void 0 || body.constructorArgs === null ? {} : {
-      constructorArgs: cloneJsonValue(body.constructorArgs)
-    },
-    createdAt: now,
-    updatedAt: now
+    createdAt: timestamp,
+    updatedAt: timestamp
   };
+  if (body.constructorArgs !== void 0 && body.constructorArgs !== null) {
+    props.constructorArgs = cloneJsonValue(body.constructorArgs);
+  }
   return props;
 }
 function retargetDelegateReceiverValueIds(rows, fromValueId, toValueId) {
@@ -44009,9 +44112,11 @@ function cloneDefaultValueForMember(args) {
   const member = substituteMember(
     args.member,
     args.genericEnv,
-    args.document.members
+    args.document.members,
+    args.document.resolvedMember?.(args.member)
   );
-  if (isInitValueContent(sourceValue)) {
+  if (documentHasInitValueContent(args.document, sourceValue)) {
+    const initializerCreatedValuesStart = args.createdValues.length;
     const evaluated = evaluateLiteralContainer({
       body: sourceValue,
       member,
@@ -44026,13 +44131,20 @@ function cloneDefaultValueForMember(args) {
     if (evaluated.existingValueRow !== void 0) {
       return evaluated.existingValueRow;
     }
-    const evaluatedRow = buildNewValue(args.projectId, evaluated.literal);
+    const evaluatedRow = createDocumentValueRow(
+      args.document,
+      args.projectId,
+      evaluated.literal
+    );
     if (evaluated.genericBindings !== void 0) {
       evaluatedRow.genericBindings = { ...evaluated.genericBindings };
     }
     if (evaluated.provisionalRootId !== void 0) {
       retargetDelegateReceiverValueIds(
-        [evaluatedRow, ...args.createdValues],
+        [
+          evaluatedRow,
+          ...args.createdValues.slice(initializerCreatedValuesStart)
+        ],
         evaluated.provisionalRootId,
         evaluatedRow.id
       );
@@ -44049,7 +44161,7 @@ function cloneDefaultValueForMember(args) {
   let body;
   if (isMemberClassBase(member)) {
     const effectiveClassId = typeof sourceValue.classId === "string" ? sourceValue.classId : member.classId;
-    const childEnv = resolveInstanceEnv(
+    const childEnv = args.document.instanceEnv?.(effectiveClassId, member.classArguments) ?? resolveInstanceEnv(
       effectiveClassId,
       member.classArguments,
       args.document.classes
@@ -44107,7 +44219,7 @@ function cloneDefaultValueForMember(args) {
       args.position
     );
   }
-  const value = buildNewValue(args.projectId, body);
+  const value = createDocumentValueRow(args.document, args.projectId, body);
   value.sourceValueId = sourceValue.sourceValueId ?? sourceValue.id;
   if (isMemberListBase(member) || isMemberDictionaryBase(member)) {
     stampGenericBindings(value, member, args);
@@ -44130,9 +44242,7 @@ function formatDefaultReferenceLocation(memberName, key) {
 }
 function getSchemaEntryMap(document, classId) {
   return new Map(
-    mergeStoredInstanceSchema(classId, document.classes, document.members).map(
-      (entry) => [entry.schemaKey, entry]
-    )
+    (document.storedInstanceSchema?.(classId) ?? mergeStoredInstanceSchema(classId, document.classes, document.members)).map((entry) => [entry.schemaKey, entry])
   );
 }
 function cloneMemberValueBase(body) {
@@ -44189,26 +44299,26 @@ function shouldMaterializeChildDefault(member) {
   }
   return member.defaultValue !== void 0;
 }
-function shouldMaterializeConstructorChildDefault(member) {
-  if (isInitValueContent(member.defaultValue)) return true;
+function shouldMaterializeConstructorChildDefault(member, isInitializer = isInitValueContent(member.defaultValue)) {
+  if (isInitializer) return true;
   if (!member.required) return false;
   return shouldMaterializeChildDefault(member);
 }
-function skipProvidedConstructorSchemaKey(constructorRoot, schemaKey, member) {
+function skipProvidedConstructorSchemaKey(constructorRoot, schemaKey, member, isInitializer = isInitValueContent(member.defaultValue)) {
   if (constructorRoot === void 0) return false;
   if (!constructorRoot.providedSchemaKeys.has(schemaKey)) return false;
   if (constructorRoot.runsMemberInitializers !== true) {
-    return !isInitValueContent(member.defaultValue);
+    return !isInitializer;
   }
   return member.defaultValue === void 0;
 }
-function shouldMaterializeChildDefaultForRoot(constructorRoot, member) {
+function shouldMaterializeChildDefaultForRoot(constructorRoot, member, isInitializer = isInitValueContent(member.defaultValue)) {
   if (constructorRoot === void 0)
     return shouldMaterializeChildDefault(member);
   if (constructorRoot.runsMemberInitializers === true) {
     return shouldMaterializeChildDefault(member);
   }
-  return shouldMaterializeConstructorChildDefault(member);
+  return shouldMaterializeConstructorChildDefault(member, isInitializer);
 }
 function primitiveFallbackValue(document, member) {
   if (isMemberBoolBase(member)) return { value: false };
@@ -58443,6 +58553,7 @@ function buildEvaluatorBaseIndexes(members, values, valueById = new Map(
     ownershipRootIdsByRowId: /* @__PURE__ */ new Map(),
     ownershipDistancesByRowId: /* @__PURE__ */ new Map(),
     ownedValueAttachmentsByValueId: /* @__PURE__ */ new Map(),
+    constructorOwnershipDirtyValueIds: /* @__PURE__ */ new Set(),
     memberByRowId: /* @__PURE__ */ new Map()
   };
   const membersByValueId = /* @__PURE__ */ new Map();
@@ -58454,7 +58565,7 @@ function buildEvaluatorBaseIndexes(members, values, valueById = new Map(
       membersByValueId.set(member.valueId, bucket);
     }
   }
-  for (const row of values) indexEvaluatorRow(indexes, row);
+  indexEvaluatorRows(indexes, values);
   return {
     rows: values,
     valueById,
@@ -58498,6 +58609,7 @@ function evaluatorIndexes(ctx) {
     ownershipRootIdsByRowId: sharedOwnershipCaches?.ownershipRootIdsByRowId ?? /* @__PURE__ */ new Map(),
     ownershipDistancesByRowId: sharedOwnershipCaches?.ownershipDistancesByRowId ?? /* @__PURE__ */ new Map(),
     ownedValueAttachmentsByValueId: /* @__PURE__ */ new Map(),
+    constructorOwnershipDirtyValueIds: /* @__PURE__ */ new Set(),
     memberByRowId: /* @__PURE__ */ new Map()
   };
   if (base === void 0) {
@@ -58506,18 +58618,21 @@ function evaluatorIndexes(ctx) {
         indexes.memberByValueId.set(member.valueId, member);
       }
     }
-    for (const row of evaluatorValues(ctx)) indexEvaluatorRow(indexes, row);
+    indexEvaluatorRows(indexes, evaluatorValues(ctx));
   } else {
+    const localRows = [];
     for (const row of ctx.__runtimeSessionValues?.values() ?? []) {
       indexes.shadowedBaseRowIds.add(row.id);
-      indexEvaluatorRow(indexes, row, true);
+      localRows.push(row);
     }
     for (const row of ctx.__valueOverlay?.values() ?? []) {
       indexes.shadowedBaseRowIds.add(row.id);
-      indexEvaluatorRow(indexes, row, true);
+      localRows.push(row);
     }
+    indexEvaluatorRows(indexes, localRows, true);
   }
   syncLazyOverlayReferences(indexes, ctx.__valueOverlay);
+  indexes.constructorOwnershipDirtyValueIds.clear();
   ctx.__indexes = indexes;
   return indexes;
 }
@@ -58534,27 +58649,32 @@ function syncLazyOverlayReferences(indexes, overlay) {
   }
   indexes.indexedOverlayRowCount += materializedRows.length;
 }
-function indexEvaluatorRow(indexes, row, allowBaseShadow = false) {
+function indexEvaluatorRow(indexes, row, allowBaseShadow = false, sharedCachesAlreadyInvalidated = false) {
+  if (indexes.indexedRowIds.has(row.id) || !allowBaseShadow && indexes.baseIndexedRowIds?.has(row.id) === true) {
+    return;
+  }
+  if (!sharedCachesAlreadyInvalidated) {
+    indexes.ownershipRootIdsByRowId.clear();
+    indexes.ownershipDistancesByRowId.clear();
+    indexes.memberByRowId.clear();
+  }
   indexes.ownedValueAttachmentsByValueId.delete(row.id);
+  indexes.constructorOwnershipDirtyValueIds.add(row.id);
   if (Array.isArray(row.value)) {
     for (const childId of row.value) {
       if (typeof childId === "string") {
         indexes.ownedValueAttachmentsByValueId.delete(childId);
+        indexes.constructorOwnershipDirtyValueIds.add(childId);
       }
     }
   } else if (typeof row.value === "object" && row.value !== null) {
     for (const childId of Object.values(row.value)) {
       if (typeof childId === "string") {
         indexes.ownedValueAttachmentsByValueId.delete(childId);
+        indexes.constructorOwnershipDirtyValueIds.add(childId);
       }
     }
   }
-  indexes.ownershipRootIdsByRowId.clear();
-  indexes.ownershipDistancesByRowId.clear();
-  indexes.memberByRowId.clear();
-  if (indexes.indexedRowIds.has(row.id) || !allowBaseShadow && indexes.baseIndexedRowIds?.has(row.id) === true) {
-    return;
-  }
   indexes.indexedRowIds.add(row.id);
   if (typeof row.sourceValueId === "string") {
     const rows = indexes.rowsBySourceValueId.get(row.sourceValueId) ?? [];
@@ -58582,6 +58702,55 @@ function indexEvaluatorRow(indexes, row, allowBaseShadow = false) {
     }
   }
 }
+function indexEvaluatorRows(indexes, rows, allowBaseShadow = false) {
+  let sharedCachesInvalidated = false;
+  for (const row of rows) {
+    const alreadyIndexed = indexes.indexedRowIds.has(row.id) || !allowBaseShadow && indexes.baseIndexedRowIds?.has(row.id) === true;
+    if (alreadyIndexed) continue;
+    if (!sharedCachesInvalidated) {
+      indexes.ownershipRootIdsByRowId.clear();
+      indexes.ownershipDistancesByRowId.clear();
+      indexes.memberByRowId.clear();
+      sharedCachesInvalidated = true;
+    }
+    indexEvaluatorRow(indexes, row, allowBaseShadow, true);
+  }
+}
+function unindexEvaluatorRow(indexes, row) {
+  indexes.indexedRowIds.delete(row.id);
+  indexes.ownedValueAttachmentsByValueId.delete(row.id);
+  indexes.constructorOwnershipDirtyValueIds.delete(row.id);
+  indexes.parentLinksByChildId.delete(row.id);
+  if (typeof row.value === "object" && row.value !== null && indexes.rowByValueReference.get(row.value) === row) {
+    indexes.rowByValueReference.delete(row.value);
+  }
+  if (typeof row.sourceValueId === "string") {
+    const sourceRows = indexes.rowsBySourceValueId.get(row.sourceValueId);
+    if (sourceRows !== void 0) {
+      const retained = sourceRows.filter((candidate) => candidate !== row);
+      if (retained.length === 0) {
+        indexes.rowsBySourceValueId.delete(row.sourceValueId);
+      } else {
+        indexes.rowsBySourceValueId.set(row.sourceValueId, retained);
+      }
+    }
+  }
+  const childIds = Array.isArray(row.value) ? row.value : typeof row.value === "object" && row.value !== null ? Object.values(row.value) : [];
+  for (const childId of childIds) {
+    if (typeof childId !== "string") continue;
+    const links = indexes.parentLinksByChildId.get(childId);
+    if (links !== void 0) {
+      const retained = links.filter((link) => link.parentId !== row.id);
+      if (retained.length === 0) indexes.parentLinksByChildId.delete(childId);
+      else indexes.parentLinksByChildId.set(childId, retained);
+    }
+    indexes.ownedValueAttachmentsByValueId.delete(childId);
+    indexes.constructorOwnershipDirtyValueIds.add(childId);
+  }
+  indexes.ownershipRootIdsByRowId.clear();
+  indexes.ownershipDistancesByRowId.clear();
+  indexes.memberByRowId.clear();
+}
 function addEvaluatorParentLink(indexes, childId, parentId, key) {
   const links = indexes.parentLinksByChildId.get(childId) ?? [];
   links.push({ parentId, key });
@@ -58751,6 +58920,12 @@ function evaluatorResolutionCache(ctx) {
     compiledFunctionByMemberId: /* @__PURE__ */ new Map(),
     compiledGetterByMemberId: /* @__PURE__ */ new Map(),
     compiledSetterByMemberId: /* @__PURE__ */ new Map(),
+    resolvedMemberById: /* @__PURE__ */ new Map(),
+    storedInstanceSchemaByClassId: /* @__PURE__ */ new Map(),
+    instanceEnvByKey: /* @__PURE__ */ new Map(),
+    validatedConstructorDescriptorByInfo: /* @__PURE__ */ new WeakMap(),
+    validatedInitValueContents: /* @__PURE__ */ new WeakSet(),
+    storedInstanceMaterializationPlanByClassAndEnv: /* @__PURE__ */ new Map(),
     effectiveStorageResolver: void 0
   };
   resolutionCacheByMembers.set(members, {
@@ -58762,10 +58937,139 @@ function evaluatorResolutionCache(ctx) {
   ctx.__resolutionCache = cache;
   return cache;
 }
-function createdSessionValuesSince(session, existingIds) {
+function cachedResolvedMember(member, ctx) {
+  const memberId = member.id;
+  if (typeof memberId !== "string") {
+    return resolveMember2(member, ctx.vm.members);
+  }
+  const cache = evaluatorResolutionCache(ctx).resolvedMemberById;
+  const cached = cache.get(memberId);
+  if (cached !== void 0) return cached;
+  const resolved = resolveMember2(member, ctx.vm.members);
+  cache.set(memberId, resolved);
+  return resolved;
+}
+function cachedStoredInstanceSchema(classId, ctx) {
+  const cache = evaluatorResolutionCache(ctx).storedInstanceSchemaByClassId;
+  const cached = cache.get(classId);
+  if (cached !== void 0) return cached;
+  const merged = mergeStoredInstanceSchema(
+    classId,
+    ctx.vm.classes,
+    ctx.vm.members
+  );
+  cache.set(classId, merged);
+  return merged;
+}
+function cachedStoredInstanceMaterializationPlan(classId, instanceEnv, ctx) {
+  const cache = evaluatorResolutionCache(
+    ctx
+  ).storedInstanceMaterializationPlanByClassAndEnv;
+  let byEnvironment = cache.get(classId);
+  const cached = byEnvironment?.get(instanceEnv);
+  if (cached !== void 0) return cached;
+  const plan = buildDefaultClassMaterializationPlan(
+    {
+      project: ctx.vm.project,
+      members: ctx.vm.members,
+      classes: ctx.vm.classes,
+      enums: ctx.vm.enums,
+      values: ctx.vm.values,
+      memberById: ctx.vm.databaseVM?.memberById,
+      valueById: ctx.vm.databaseVM?.valueById,
+      resolvedMember: (member) => cachedResolvedMember(member, ctx),
+      storedInstanceSchema: (nestedClassId) => cachedStoredInstanceSchema(nestedClassId, ctx),
+      instanceEnv: (nestedClassId, classArguments2) => cachedInstanceEnv(nestedClassId, classArguments2, ctx),
+      isInitValueContent: (value) => cachedIsInitValueContent(value, ctx),
+      projectFiles: ctx.vm.projectFiles ?? [],
+      textureTemplates: ctx.vm.textureTemplates ?? []
+    },
+    classId,
+    instanceEnv
+  );
+  byEnvironment ??= /* @__PURE__ */ new WeakMap();
+  byEnvironment.set(instanceEnv, plan);
+  cache.set(classId, byEnvironment);
+  return plan;
+}
+function cachedInstanceEnv(classId, classArguments2, ctx) {
+  const key = `${classId}:${JSON.stringify(classArguments2 ?? null)}`;
+  const cache = evaluatorResolutionCache(ctx).instanceEnvByKey;
+  const cached = cache.get(key);
+  if (cached !== void 0) return cached;
+  const resolved = resolveInstanceEnv(classId, classArguments2, ctx.vm.classes);
+  cache.set(key, resolved);
+  return resolved;
+}
+function cachedIsInitValueContent(value, ctx) {
+  if (typeof value !== "object" || value === null) return false;
+  const cache = evaluatorResolutionCache(ctx).validatedInitValueContents;
+  if (cache.has(value)) return true;
+  if (!isInitValueContent(value)) return false;
+  cache.add(value);
+  return true;
+}
+function sessionCreationCheckpoint(ctx) {
+  if (ctx.__sessionCreationStrategy === "snapshot") {
+    return new Set(ctx.__runtimeSessionValues?.keys());
+  }
+  const state = ctx.__executionState;
+  if (state === void 0) {
+    throw new NSGetterRuntimeError(
+      "Created Session values require an effect-capable evaluator scope."
+    );
+  }
+  return state.sessionCreationJournal.length;
+}
+function registerRuntimeSessionValue(ctx, row) {
+  const session = ctx.__runtimeSessionValues;
+  const state = ctx.__executionState;
+  if (session === void 0 || state === void 0) {
+    throw new NSGetterRuntimeError(
+      "Session publication requires an effect-capable evaluator scope."
+    );
+  }
+  if (!state.knownSessionValueIds.has(row.id)) {
+    state.knownSessionValueIds.add(row.id);
+    state.sessionCreationJournal.push(row.id);
+  }
+  session.set(row.id, row);
+}
+function deleteRuntimeSessionValue(ctx, rowId) {
+  const session = ctx.__runtimeSessionValues;
+  if (session === void 0) return;
+  const row = session.get(rowId);
+  if (row !== void 0 && ctx.__indexes !== void 0) {
+    unindexEvaluatorRow(ctx.__indexes, row);
+  }
+  session.delete(rowId);
+}
+function createdSessionValuesSince(ctx, checkpoint) {
+  const session = ctx.__runtimeSessionValues;
+  const state = ctx.__executionState;
+  if (session === void 0 || state === void 0) {
+    throw new NSGetterRuntimeError(
+      "Created Session values require an effect-capable evaluator scope."
+    );
+  }
   const created = [];
-  for (const row of session.values()) {
-    if (existingIds.has(row.id)) continue;
+  if (typeof checkpoint !== "number") {
+    for (const row of session.values()) {
+      if (checkpoint.has(row.id)) continue;
+      if (!isLiteralValueContent(row)) {
+        throw new NSGetterRuntimeError(
+          `Evaluator Session row ${row.id} carries an unevaluated initializer instead of a value.`
+        );
+      }
+      created.push(row);
+    }
+    return created;
+  }
+  for (let index = checkpoint; index < state.sessionCreationJournal.length; index += 1) {
+    const rowId = state.sessionCreationJournal[index];
+    if (rowId === void 0) continue;
+    const row = session.get(rowId);
+    if (row === void 0) continue;
     if (!isLiteralValueContent(row)) {
       throw new NSGetterRuntimeError(
         `Evaluator Session row '${row.id}' carries an unevaluated initializer instead of a value.`
@@ -58784,7 +59088,7 @@ function evaluateNSGetterWithEffects(getter, ctx, argumentValues = []) {
   const runtimeCtx = withEvaluationRuntime(ctx, requestedWrites);
   consumeBudget(runtimeCtx, "workUnits", 1, "work unit");
   const writes = runtimeCtx.__executionState?.writes ?? requestedWrites;
-  const existingIds = new Set(runtimeCtx.__runtimeSessionValues.keys());
+  const creationCheckpoint = sessionCreationCheckpoint(runtimeCtx);
   const scope = createTopLevelScope(runtimeCtx);
   const parameters = getter.parameters.slice(2);
   if (parameters.length !== argumentValues.length) {
@@ -58816,8 +59120,8 @@ function evaluateNSGetterWithEffects(getter, ctx, argumentValues = []) {
       );
       result.value = preserveReadOnlyReturnIdentity(result.value, runtimeCtx);
       const createdSessionValues = createdSessionValuesSince(
-        runtimeCtx.__runtimeSessionValues,
-        existingIds
+        runtimeCtx,
+        creationCheckpoint
       );
       return createdSessionValues.length === 0 ? { value: result.value, writes } : { value: result.value, writes, createdSessionValues };
     }
@@ -58834,7 +59138,7 @@ function evaluateNSVoidBody(action, ctx) {
   const writes = [];
   const runtimeCtx = withEvaluationRuntime(ctx, writes);
   consumeBudget(runtimeCtx, "workUnits", 1, "work unit");
-  const existingIds = new Set(runtimeCtx.__runtimeSessionValues.keys());
+  const creationCheckpoint = sessionCreationCheckpoint(runtimeCtx);
   const scope = createTopLevelScope(runtimeCtx);
   try {
     const result = evalInstructions(action.instructions, scope, runtimeCtx, {
@@ -58855,8 +59159,8 @@ function evaluateNSVoidBody(action, ctx) {
     throw error;
   }
   const createdSessionValues = createdSessionValuesSince(
-    runtimeCtx.__runtimeSessionValues,
-    existingIds
+    runtimeCtx,
+    creationCheckpoint
   );
   return createdSessionValues.length === 0 ? { writes } : { writes, createdSessionValues };
 }
@@ -58865,7 +59169,7 @@ function evaluateNSFunction(action, ctx, args) {
   const writes = [];
   const runtimeCtx = withEvaluationRuntime(ctx, writes);
   consumeBudget(runtimeCtx, "workUnits", 1, "work unit");
-  const existingIds = new Set(runtimeCtx.__runtimeSessionValues.keys());
+  const creationCheckpoint = sessionCreationCheckpoint(runtimeCtx);
   const runtimeArgs = remapRuntimeArguments(args, runtimeCtx);
   let value;
   try {
@@ -58886,8 +59190,8 @@ function evaluateNSFunction(action, ctx, args) {
     throw error;
   }
   const createdSessionValues = createdSessionValuesSince(
-    runtimeCtx.__runtimeSessionValues,
-    existingIds
+    runtimeCtx,
+    creationCheckpoint
   );
   return createdSessionValues.length === 0 ? { value, writes } : { value, writes, createdSessionValues };
 }
@@ -58912,6 +59216,7 @@ function withEvaluationRuntime(ctx, writes) {
   }
   const overlay = ctx.__valueOverlay ?? (ctx.storedConstructionReplay === true ? /* @__PURE__ */ new Map() : buildValueOverlay(ctx.vm));
   const referenceRemap = ctx.__runtimeReferenceRemap ?? /* @__PURE__ */ new Map();
+  const runtimeSessionValues = ctx.__runtimeSessionValues ?? /* @__PURE__ */ new Map();
   const runtimeReferences = runtimeSessionValueReferences(
     ctx.__runtimeSessionValues
   );
@@ -58930,7 +59235,7 @@ function withEvaluationRuntime(ctx, writes) {
       primary: remap(ctx.dialogueContext.primary),
       trigger: remap(ctx.dialogueContext.trigger)
     },
-    __runtimeSessionValues: ctx.__runtimeSessionValues ?? /* @__PURE__ */ new Map(),
+    __runtimeSessionValues: runtimeSessionValues,
     __saveStaticBindings: ctx.__saveStaticBindings ?? staticBindingMap(ctx.saveStaticBindings),
     __sessionStaticBindings: ctx.__sessionStaticBindings ?? staticBindingMap(ctx.sessionStaticBindings),
     __valueOverlay: overlay,
@@ -58939,7 +59244,12 @@ function withEvaluationRuntime(ctx, writes) {
       writes,
       functionStack: [],
       delegateStack: [],
+      knownSessionValueIds: new Set(runtimeSessionValues.keys()),
+      sessionCreationJournal: [],
       constructorGroups: /* @__PURE__ */ new Map(),
+      constructorGroupByRowId: /* @__PURE__ */ new Map(),
+      constructorGroupDependencies: /* @__PURE__ */ new Map(),
+      constructionTimestamp: Date.now(),
       ownedValueAttachments: /* @__PURE__ */ new Map(),
       constructionStack: [],
       loopIterations: 0,
@@ -59098,10 +59408,22 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
   }
   const escapedRoots = /* @__PURE__ */ new Set();
   const scannedRows = /* @__PURE__ */ new Set();
+  const markConstructorGroupEscaped = (rootId) => {
+    if (escapedRoots.has(rootId)) return;
+    escapedRoots.add(rootId);
+    for (const dependencyRootId of state.constructorGroupDependencies.get(
+      rootId
+    ) ?? []) {
+      markConstructorGroupEscaped(dependencyRootId);
+    }
+  };
   const isOwnedRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
   const scanOwnedRow = (valueId, hintedMember) => {
     const groupRoot = groupByRowId.get(valueId);
-    if (groupRoot !== void 0) escapedRoots.add(groupRoot);
+    if (groupRoot !== void 0) {
+      markConstructorGroupEscaped(groupRoot);
+      return;
+    }
     if (scannedRows.has(valueId)) return;
     scannedRows.add(valueId);
     const row = evalValueById(
@@ -59213,7 +59535,10 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
   const scanReturnedValue = (value, typeInfo) => {
     if (typeof value === "object" && value !== null) {
       const direct = groupByValueReference.get(value);
-      if (direct !== void 0) escapedRoots.add(direct);
+      if (direct !== void 0) {
+        markConstructorGroupEscaped(direct);
+        return;
+      }
       const tracked = trackedRowForValueReference(value, ctx);
       if (tracked !== null) {
         scanOwnedRow(tracked.id);
@@ -59261,7 +59586,7 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
       if (typeof row?.value === "object" && row.value !== null) {
         collectedReferences.add(row.value);
       }
-      session.delete(rowId);
+      deleteRuntimeSessionValue(ctx, rowId);
       collectedIds.add(rowId);
     }
   }
@@ -59285,6 +59610,8 @@ function finalizeConstructorAllocations(ctx, returnValue, ownsInvocationState, r
     invalidateEvaluatorIndexes(ctx);
   }
   state.constructorGroups.clear();
+  state.constructorGroupByRowId.clear();
+  state.constructorGroupDependencies.clear();
 }
 function buildValueOverlay(vm) {
   return new LazyValueOverlay(vm);
@@ -60149,9 +60476,11 @@ function applyOverlayStaticAssignment(memberId, value, ctx) {
       "Static assignment requires an evaluator Session row registry."
     );
   }
+  if (ctx.__indexes !== void 0) {
+    indexEvaluatorRows(ctx.__indexes, createdValues);
+  }
   for (const created of createdValues) {
-    destination.set(created.id, created);
-    if (ctx.__indexes !== void 0) indexEvaluatorRow(ctx.__indexes, created);
+    registerRuntimeSessionValue(ctx, created);
   }
   bindings.set(member.id, row.id);
   invalidateEvaluatorIndexes(ctx);
@@ -61908,6 +62237,7 @@ function dispatchSchemaMember(receiver, schemaKey, ctx) {
     };
   }
   if (!Object.prototype.hasOwnProperty.call(receiver, schemaKey)) {
+    if (!member.required) return { kind: "ok", value: null };
     return { kind: "no-info", matchedMember: true };
   }
   const at = receiver[schemaKey];
@@ -62939,11 +63269,17 @@ function validateClassConstructorDescriptor(info, ctx, requireEveryRequiredField
   }
   const genericSlot = ctx.__constructionGenericSlots?.toReversed().find((slot) => slot.classId === classId) ?? ctx.__storedConstructionReplaySlot;
   const classArguments2 = genericSlot?.classId === classId ? genericSlot.classArguments : void 0;
-  const instanceEnv = resolveInstanceEnv(
-    classId,
-    classArguments2,
-    ctx.vm.classes
-  );
+  const descriptorCache = evaluatorResolutionCache(ctx).validatedConstructorDescriptorByInfo;
+  const descriptorCacheKey = `${requireEveryRequiredField}:${ctx.storedConstructionReplay === true}:${JSON.stringify(classArguments2 ?? null)}`;
+  const cachedDescriptor = descriptorCache.get(info)?.get(descriptorCacheKey);
+  if (cachedDescriptor !== void 0) return cachedDescriptor;
+  const cacheDescriptor = (descriptor) => {
+    const variants = descriptorCache.get(info) ?? /* @__PURE__ */ new Map();
+    variants.set(descriptorCacheKey, descriptor);
+    descriptorCache.set(info, variants);
+    return descriptor;
+  };
+  const instanceEnv = cachedInstanceEnv(classId, classArguments2, ctx);
   if (firstUnboundParamId(instanceEnv) !== null) {
     throw new NSGetterRuntimeError(
       `Cannot construct open generic Class '${schemaClass2.name}'.`
@@ -62956,11 +63292,7 @@ function validateClassConstructorDescriptor(info, ctx, requireEveryRequiredField
   }
   let mergedSchema;
   try {
-    mergedSchema = mergeStoredInstanceSchema(
-      classId,
-      ctx.vm.classes,
-      ctx.vm.members
-    );
+    mergedSchema = [...cachedStoredInstanceSchema(classId, ctx)];
   } catch (error) {
     throw new NSGetterRuntimeError(
       `Cannot validate constructor for '${schemaClass2.name}': ${error instanceof Error ? error.message : String(error)}`
@@ -63019,7 +63351,12 @@ function validateClassConstructorDescriptor(info, ctx, requireEveryRequiredField
     );
   }
   if (!requireEveryRequiredField) {
-    return { schemaClass: schemaClass2, fields, instanceEnv, classArguments: classArguments2 };
+    return cacheDescriptor({
+      schemaClass: schemaClass2,
+      fields,
+      instanceEnv,
+      classArguments: classArguments2
+    });
   }
   for (const entry of mergedSchema) {
     const rawMember = evalMemberById(ctx.vm, entry.memberId);
@@ -63031,7 +63368,8 @@ function validateClassConstructorDescriptor(info, ctx, requireEveryRequiredField
     const member = substituteMember(
       rawMember,
       instanceEnv,
-      ctx.vm.members
+      ctx.vm.members,
+      cachedResolvedMember(rawMember, ctx)
     );
     if (member.isStatic || !memberKindSupportsStorage(member.kind) || member.kind === 21 /* Generic */) {
       continue;
@@ -63042,7 +63380,7 @@ function validateClassConstructorDescriptor(info, ctx, requireEveryRequiredField
       );
     }
   }
-  return { schemaClass: schemaClass2, fields, instanceEnv, classArguments: classArguments2 };
+  return cacheDescriptor({ schemaClass: schemaClass2, fields, instanceEnv, classArguments: classArguments2 });
 }
 function assertConstructorFieldSlotWritable(args) {
   const surfaceEntry = mergeInstanceSchema(
@@ -63069,7 +63407,8 @@ function validateConstructorFieldSlot(args) {
   const member = substituteMember(
     rawMember,
     args.instanceEnv,
-    ctx.vm.members
+    ctx.vm.members,
+    cachedResolvedMember(rawMember, ctx)
   );
   if (member.isStatic || !memberKindSupportsStorage(member.kind) || member.kind === 21 /* Generic */) {
     throw new NSGetterRuntimeError(
@@ -63111,7 +63450,7 @@ function constructionGenericSlotsForMember(rawMember, ctx, instanceEnv, visitedM
   const entryMember = evalMemberById(ctx.vm, member.entryMemberId);
   if (entryMember === null) return [];
   return constructionGenericSlotsForMember(
-    resolveMember2(entryMember, ctx.vm.members),
+    cachedResolvedMember(entryMember, ctx),
     ctx,
     instanceEnv,
     nextVisited
@@ -63129,6 +63468,9 @@ function withConstructionGenericSlots(member, ctx, instanceEnv, evaluate) {
   }
 }
 function evaluateConstructorFields(descriptor, scope, ctx) {
+  if (descriptor.fields.length === 0) {
+    return EMPTY_SUPPLIED_CONSTRUCTOR_FIELDS;
+  }
   const schemaClass2 = descriptor.schemaClass;
   const evaluatedValues = descriptor.fields.map((validated) => {
     if (validated.valuePointer === null) {
@@ -63169,16 +63511,17 @@ function evaluateConstructorFields(descriptor, scope, ctx) {
   });
 }
 function syntheticConstructorMember(schemaClass2, classArguments2) {
-  return {
+  const member = {
     name: `new ${schemaClass2.name}`,
     kind: 7 /* Class */,
     classId: schemaClass2.id,
-    ...classArguments2 === void 0 ? {} : { classArguments: classArguments2 },
     locked: false,
     required: true,
     isStatic: false,
     accessModifierKind: "public"
   };
+  if (classArguments2 !== void 0) member.classArguments = classArguments2;
+  return member;
 }
 function stampConstructedRootGenericBindings(root, descriptor) {
   const stamp = {};
@@ -63315,37 +63658,19 @@ function stageConstructedRows(createdValues, ctx) {
     );
   }
   for (const row of createdValues) {
-    destination.set(row.id, row);
-    if (ctx.__indexes !== void 0) indexEvaluatorRow(ctx.__indexes, row);
+    registerRuntimeSessionValue(ctx, row);
+  }
+  if (ctx.__indexes !== void 0) {
+    indexEvaluatorRows(ctx.__indexes, createdValues);
   }
 }
-function bindConstructedDelegateTargets(rootId, ctx) {
-  const indexes = evaluatorIndexes(ctx);
-  const pending = [rootId];
-  const visited = /* @__PURE__ */ new Set();
-  while (pending.length > 0) {
-    const rowId = pending.pop();
-    if (rowId === void 0 || visited.has(rowId)) continue;
-    visited.add(rowId);
-    const row = evalValueById(
-      ctx,
-      rowId,
-      ctx.__runtimeSessionValues,
-      ctx.__valueOverlay
-    );
-    if (row === null) continue;
-    if (Array.isArray(row.value)) {
-      for (const childId of row.value) {
-        if (typeof childId === "string") pending.push(childId);
-      }
-    } else if (typeof row.value === "object" && row.value !== null) {
-      for (const childId of Object.values(row.value)) {
-        if (typeof childId === "string") pending.push(childId);
-      }
-    }
+function bindConstructedDelegateTargets(createdValues, ctx) {
+  let indexes;
+  for (const row of createdValues) {
     if (!isMemberDelegateTarget(row.value) || row.value.valueId !== null) {
       continue;
     }
+    indexes ??= evaluatorIndexes(ctx);
     const target = evalMemberById(ctx.vm, row.value.memberId);
     if (target === null || target.isStatic === true) continue;
     const placement = findSchemaPlacement(target.id, ctx.vm.classes);
@@ -63390,8 +63715,10 @@ function bindConstructedDelegateTargets(rootId, ctx) {
 function publishConstructedRows(args) {
   const { root, createdValues, ctx } = args;
   assertConstructorRowsHaveSingleStructuralOwner(createdValues, ctx);
-  const beforeRetain = new Set(createdValues.map((row) => row.id));
-  retainOnlyCreatedRowsReachableFrom(root.id, createdValues, ctx);
+  const beforeRetain = args.mayHaveOrphanedRows === false ? null : new Set(createdValues.map((row) => row.id));
+  if (beforeRetain !== null) {
+    retainOnlyCreatedRowsReachableFrom(root.id, createdValues, ctx);
+  }
   stampCreatedValuesMapKey(createdValues, null);
   applyDeclaredStorageKeyOverrides({
     createdValues,
@@ -63440,29 +63767,84 @@ function publishConstructedRows(args) {
     "produced collection entry"
   );
   const retained = retainedIds;
-  for (const rowId of beforeRetain) {
-    if (retained.has(rowId)) continue;
-    destination.delete(rowId);
+  if (beforeRetain !== null) {
+    for (const rowId of beforeRetain) {
+      if (retained.has(rowId)) continue;
+      deleteRuntimeSessionValue(ctx, rowId);
+    }
   }
   for (const row of createdValues) {
-    destination.set(row.id, row);
-    if (ctx.__indexes !== void 0) indexEvaluatorRow(ctx.__indexes, row);
+    registerRuntimeSessionValue(ctx, row);
+  }
+  if (ctx.__indexes !== void 0) {
+    indexEvaluatorRows(ctx.__indexes, createdValues);
+  }
+  bindConstructedDelegateTargets(createdValues, ctx);
+  let rootDependencies = state.constructorGroupDependencies.get(root.id);
+  for (const rowId of retained) {
+    if (rowId === root.id) continue;
+    const nestedDependencies = state.constructorGroupDependencies.get(rowId);
+    if (nestedDependencies === void 0) continue;
+    rootDependencies ??= /* @__PURE__ */ new Set();
+    for (const dependencyRootId of nestedDependencies) {
+      if (dependencyRootId !== root.id) {
+        rootDependencies.add(dependencyRootId);
+      }
+    }
+    state.constructorGroupDependencies.delete(rowId);
+  }
+  if (rootDependencies !== void 0) {
+    state.constructorGroupDependencies.set(root.id, rootDependencies);
   }
-  bindConstructedDelegateTargets(root.id, ctx);
   state.constructorGroups.set(root.id, retained);
+  for (const rowId of retained) {
+    state.constructorGroupByRowId.set(rowId, root.id);
+  }
+  if (ctx.__indexes !== void 0) {
+    for (const rowId of retained) {
+      ctx.__indexes.constructorOwnershipDirtyValueIds.delete(rowId);
+    }
+  }
   state.ownedValueAttachments.clear();
 }
 function assertConstructorRowsHaveSingleStructuralOwner(createdValues, ctx) {
-  const candidateIds = new Set(createdValues.map((row) => row.id));
-  for (const rowIds of ctx.__executionState?.constructorGroups.values() ?? []) {
-    for (const rowId of rowIds) candidateIds.add(rowId);
+  let indexes = ctx.__indexes;
+  const candidateIds = /* @__PURE__ */ new Set();
+  if (ctx.__constructorOwnershipStrategy === "cumulative") {
+    indexes ??= evaluatorIndexes(ctx);
+    for (const row of createdValues) candidateIds.add(row.id);
+    for (const rowIds of ctx.__executionState?.constructorGroups.values() ?? []) {
+      for (const rowId of rowIds) candidateIds.add(rowId);
+    }
+  } else if (indexes !== void 0) {
+    const state = ctx.__executionState;
+    for (const rowId of indexes.constructorOwnershipDirtyValueIds) {
+      if (ctx.__constructorPerformanceMetrics !== void 0) {
+        ctx.__constructorPerformanceMetrics.ownershipDirtyRowsVisited += 1;
+      }
+      const rootId = state?.constructorGroupByRowId.get(rowId);
+      if (rootId !== void 0 && state?.constructorGroups.has(rootId)) {
+        candidateIds.add(rowId);
+      } else {
+        indexes.constructorOwnershipDirtyValueIds.delete(rowId);
+      }
+    }
+  }
+  if (candidateIds.size === 0) return;
+  indexes ??= evaluatorIndexes(ctx);
+  if (ctx.__constructorPerformanceMetrics !== void 0) {
+    ctx.__constructorPerformanceMetrics.ownershipCandidateRowsValidated += candidateIds.size;
   }
   for (const valueId of candidateIds) {
     const owners = currentOwnedValueAttachments(valueId, ctx);
-    if (owners.length <= 1) continue;
-    throw new NSGetterRuntimeError(
-      `Constructed value '${valueId}' has multiple structural parents (${owners.map((owner) => owner.label).join(", ")}). Reuse its row in one field or call Clone() explicitly.`
-    );
+    if (owners.length > 1) {
+      throw new NSGetterRuntimeError(
+        `Constructed value '${valueId}' has multiple structural parents (${owners.map((owner) => owner.label).join(
+          ", "
+        )}). Reuse its row in one field or call Clone() explicitly.`
+      );
+    }
+    indexes.constructorOwnershipDirtyValueIds.delete(valueId);
   }
 }
 function assertImplicitConstructionAllowed(schemaClass2) {
@@ -63507,6 +63889,20 @@ function constructClassValueWithinFrame(descriptor, scope, ctx) {
         values: ctx.vm.values,
         memberById: ctx.vm.databaseVM?.memberById,
         valueById: ctx.vm.databaseVM?.valueById,
+        resolvedMember: (member) => member === syntheticMember ? syntheticMember : cachedResolvedMember(member, ctx),
+        storedInstanceSchema: (nestedClassId) => cachedStoredInstanceSchema(nestedClassId, ctx),
+        storedInstanceMaterializationPlan: (nestedClassId, instanceEnv) => cachedStoredInstanceMaterializationPlan(
+          nestedClassId,
+          instanceEnv,
+          ctx
+        ),
+        instanceEnv: (nestedClassId, classArguments2) => cachedInstanceEnv(nestedClassId, classArguments2, ctx),
+        isInitValueContent: (value) => cachedIsInitValueContent(value, ctx),
+        createValueRow: (projectId, body) => buildNewValue(
+          projectId,
+          body,
+          ctx.__executionState?.constructionTimestamp
+        ),
         projectFiles: ctx.vm.projectFiles ?? [],
         textureTemplates: ctx.vm.textureTemplates ?? []
       },
@@ -63542,19 +63938,21 @@ function constructClassValueWithinFrame(descriptor, scope, ctx) {
       );
     }
     const rootRecord = root.value;
-    applyConstructorFields({
-      supplied,
-      root,
-      rootRecord,
-      schemaClass: schemaClass2,
-      instanceEnv: descriptor.instanceEnv,
-      createdValues,
-      createdById: new Map(createdValues.map((row) => [row.id, row])),
-      storageKeyDeclarations,
-      // Generated C# factories pass null for an omitted optional parameter.
-      nullMeansOmit: true,
-      ctx
-    });
+    if (supplied.length > 0) {
+      applyConstructorFields({
+        supplied,
+        root,
+        rootRecord,
+        schemaClass: schemaClass2,
+        instanceEnv: descriptor.instanceEnv,
+        createdValues,
+        createdById: new Map(createdValues.map((row) => [row.id, row])),
+        storageKeyDeclarations,
+        // Generated C# factories pass null for an omitted optional parameter.
+        nullMeansOmit: true,
+        ctx
+      });
+    }
   } catch (error) {
     if (error instanceof NSGetterRuntimeError) throw error;
     throw new NSGetterRuntimeError(
@@ -63566,6 +63964,7 @@ function constructClassValueWithinFrame(descriptor, scope, ctx) {
     classId,
     createdValues,
     storageKeyDeclarations,
+    mayHaveOrphanedRows: supplied.some((entry) => entry.value !== null),
     ctx
   });
   return root.value;
@@ -64094,9 +64493,12 @@ function evaluateInitializerInContext(init, member, ctx, createdValues, argument
   const closeFrame = pushConstructionFrame(ctx, `${member.name} initializer`);
   let result;
   try {
+    const initializerCtx = ctx.thisValue === null ? ctx : Object.assign({}, ctx, {
+      thisValue: null
+    });
     result = evaluateNSGetterWithEffects(
       compiled,
-      { ...ctx, thisValue: null },
+      initializerCtx,
       argumentValues
     );
   } finally {
@@ -64124,9 +64526,8 @@ function evaluateInitializerInContext(init, member, ctx, createdValues, argument
     }
     return { value: result.value, classId: existingRuntimeClassId };
   }
-  ctx.__runtimeSessionValues?.delete(rootRow.id);
+  deleteRuntimeSessionValue(ctx, rootRow.id);
   ctx.__executionState?.constructorGroups.delete(rootRow.id);
-  invalidateEvaluatorIndexes(ctx);
   const constructorArgs = typeof result.value === "object" && result.value !== null ? ctx.__constructedArgumentsByValue.get(result.value) : void 0;
   return {
     value: result.value,
@@ -64145,10 +64546,9 @@ function encodeLookupInitializerResult(member, value, created, ctx) {
   );
   if (created.length > 0) {
     for (const row of created) {
-      ctx.__runtimeSessionValues?.delete(row.id);
+      deleteRuntimeSessionValue(ctx, row.id);
       ctx.__executionState?.constructorGroups.delete(row.id);
     }
-    invalidateEvaluatorIndexes(ctx);
   }
   return { value: selection, classId: null };
 }
@@ -64204,10 +64604,25 @@ function initializerRootRow(value, created) {
   return created.find((row) => row.value === value) ?? null;
 }
 function constructorGroupForRow(valueId, ctx) {
-  for (const [rootId, rowIds] of ctx.__executionState?.constructorGroups ?? []) {
-    if (rowIds.has(valueId)) return rootId;
-  }
-  return null;
+  const state = ctx.__executionState;
+  if (state === void 0) return null;
+  const rootId = state.constructorGroupByRowId.get(valueId);
+  return rootId !== void 0 && state.constructorGroups.has(rootId) ? rootId : null;
+}
+function recordConstructorGroupDependency(valueId, destination, ctx) {
+  if (!destination.identity.startsWith("value:")) return;
+  const state = ctx.__executionState;
+  if (state === void 0) return;
+  const dependencyRootId = constructorGroupForRow(valueId, ctx);
+  if (dependencyRootId === null) return;
+  const ownerRootId = constructorGroupForRow(destination.label, ctx) ?? destination.label;
+  if (ownerRootId === dependencyRootId) return;
+  let dependencies = state.constructorGroupDependencies.get(ownerRootId);
+  if (dependencies === void 0) {
+    dependencies = /* @__PURE__ */ new Set();
+    state.constructorGroupDependencies.set(ownerRootId, dependencies);
+  }
+  dependencies.add(dependencyRootId);
 }
 function encodeRequiredConstructorArgument(args) {
   const trackedId = findKnownRowIdByValueReference(args.value, args.ctx);
@@ -64341,6 +64756,10 @@ function constructDeclaredClassValueWithinFrame(descriptor, record3, info, scope
   );
   const createdValues = [];
   const storageKeyDeclarations = /* @__PURE__ */ new Map();
+  const syntheticMember = syntheticConstructorMember(
+    schemaClass2,
+    descriptor.classArguments
+  );
   let root;
   try {
     root = buildDefaultMemberValue({
@@ -64352,14 +64771,25 @@ function constructDeclaredClassValueWithinFrame(descriptor, record3, info, scope
         values: ctx.vm.values,
         memberById: ctx.vm.databaseVM?.memberById,
         valueById: ctx.vm.databaseVM?.valueById,
+        resolvedMember: (member) => member === syntheticMember ? syntheticMember : cachedResolvedMember(member, ctx),
+        storedInstanceSchema: (nestedClassId) => cachedStoredInstanceSchema(nestedClassId, ctx),
+        storedInstanceMaterializationPlan: (nestedClassId, instanceEnv) => cachedStoredInstanceMaterializationPlan(
+          nestedClassId,
+          instanceEnv,
+          ctx
+        ),
+        instanceEnv: (nestedClassId, classArguments2) => cachedInstanceEnv(nestedClassId, classArguments2, ctx),
+        isInitValueContent: (value) => cachedIsInitValueContent(value, ctx),
+        createValueRow: (projectId, body) => buildNewValue(
+          projectId,
+          body,
+          ctx.__executionState?.constructionTimestamp
+        ),
         projectFiles: ctx.vm.projectFiles ?? [],
         textureTemplates: ctx.vm.textureTemplates ?? []
       },
       projectId: ctx.vm.project.id,
-      member: syntheticConstructorMember(
-        schemaClass2,
-        descriptor.classArguments
-      ),
+      member: syntheticMember,
       topLevelClassId: classId,
       createdValues,
       storageKeyDeclarations,
@@ -64426,7 +64856,7 @@ function constructDeclaredClassValueWithinFrame(descriptor, record3, info, scope
     root.constructorArgs = structuredClone(encoded);
   }
   stageConstructedRows(createdValues, ctx);
-  bindConstructedDelegateTargets(root.id, ctx);
+  bindConstructedDelegateTargets(createdValues, ctx);
   if (record3 !== null) {
     runDeclaredConstructorChain({
       record: record3,
@@ -64464,20 +64894,22 @@ function constructDeclaredClassValueWithinFrame(descriptor, record3, info, scope
   }
   const supplied = evaluateConstructorFields(descriptor, scope, ctx);
   try {
-    applyConstructorFields({
-      supplied,
-      root,
-      rootRecord,
-      schemaClass: schemaClass2,
-      instanceEnv: descriptor.instanceEnv,
-      createdValues,
-      createdById: new Map(createdValues.map((row) => [row.id, row])),
-      storageKeyDeclarations,
-      // §6.1 step 4: these are initializer-block assignments, so an explicit
-      // null clears the slot rather than omitting the field.
-      nullMeansOmit: false,
-      ctx
-    });
+    if (supplied.length > 0) {
+      applyConstructorFields({
+        supplied,
+        root,
+        rootRecord,
+        schemaClass: schemaClass2,
+        instanceEnv: descriptor.instanceEnv,
+        createdValues,
+        createdById: new Map(createdValues.map((row) => [row.id, row])),
+        storageKeyDeclarations,
+        // §6.1 step 4: these are initializer-block assignments, so an explicit
+        // null clears the slot rather than omitting the field.
+        nullMeansOmit: false,
+        ctx
+      });
+    }
   } catch (error) {
     if (error instanceof NSGetterRuntimeError) throw error;
     throw new NSGetterRuntimeError(
@@ -64489,6 +64921,7 @@ function constructDeclaredClassValueWithinFrame(descriptor, record3, info, scope
     classId,
     createdValues,
     storageKeyDeclarations,
+    mayHaveOrphanedRows: record3 !== null || supplied.length > 0,
     ctx
   });
   return root.value;
@@ -64522,6 +64955,7 @@ function assertOwnedValueAttachable(valueId, destination, destinationName2, ctx,
     );
     if (constructorArgumentReservation && (destination.label === reserved.label || destinationConstructorGroup === reserved.label)) {
       ctx.__executionState?.ownedValueAttachments.set(valueId, destination);
+      recordConstructorGroupDependency(valueId, destination, ctx);
       return;
     }
     throw new NSGetterRuntimeError(
@@ -64531,11 +64965,15 @@ function assertOwnedValueAttachable(valueId, destination, destinationName2, ctx,
   if (reserveUntilPublished) {
     ctx.__executionState?.ownedValueAttachments.set(valueId, destination);
   }
+  recordConstructorGroupDependency(valueId, destination, ctx);
 }
 function currentOwnedValueAttachments(valueId, ctx) {
   const indexes = evaluatorIndexes(ctx);
   const cached = indexes.ownedValueAttachmentsByValueId.get(valueId);
   if (cached !== void 0) return [...cached];
+  if (ctx.__constructorPerformanceMetrics !== void 0) {
+    ctx.__constructorPerformanceMetrics.ownershipAttachmentCacheMisses += 1;
+  }
   const found = /* @__PURE__ */ new Map();
   const add = (attachment) => {
     found.set(attachment.identity, attachment);
@@ -65155,11 +65593,11 @@ function cloneClassValueGraph(receiver, expectedClassId, ctx) {
       `Class.Clone source value '${sourceId3}' has runtime Class '${runtimeClassId}', which is not assignable to '${expectedClassId}'.`
     );
   }
-  const destination = ctx.__runtimeSessionValues ?? (() => {
+  if (ctx.__runtimeSessionValues === void 0) {
     throw new NSGetterRuntimeError(
       "Class.Clone requires an evaluator Session value registry."
     );
-  })();
+  }
   const active = /* @__PURE__ */ new Set();
   const clonedBySourceId = /* @__PURE__ */ new Map();
   const constructorArgumentReferenceCounts = /* @__PURE__ */ new Map();
@@ -65189,7 +65627,7 @@ function cloneClassValueGraph(receiver, expectedClassId, ctx) {
       // parent explicitly supplies its fresh id.
       containerId: clonedContainerId ?? null
     };
-    destination.set(id2, clone);
+    registerRuntimeSessionValue(ctx, clone);
     clonedBySourceId.set(sourceRow.id, clone);
     if (typeof sourceRow.value === "object" && sourceRow.value !== null && !Array.isArray(sourceRow.value)) {
       const sourceRecord = sourceRow.value;
@@ -65458,7 +65896,7 @@ function iterateCollection(c, ctx, callback) {
     return callback(entry, key, valueId);
   });
 }
-var DELEGATE_LEXICAL_THIS, DELEGATE_LEXICAL_ROOT, NonCatchableNSGetterRuntimeError, NativeFunctionDelegateUnavailableError, CorruptNeoScriptIRError, NeoScriptResourceLimitError, NeoScriptWallClockTimeoutError, DEFAULT_NEO_SCRIPT_EXECUTION_BUDGET_LIMITS, liveListIndexesByProject, evaluatorOwnershipCachesByBase, MAX_CONSTRUCTION_DEPTH, MAX_LOOP_ITERATIONS, resolutionCacheByMembers, NO_SCHEMA_REVISION, LazyValueOverlay, READONLY_FOREACH_BINDING_ERROR, READONLY_CATCH_BINDING_ERROR;
+var DELEGATE_LEXICAL_THIS, DELEGATE_LEXICAL_ROOT, NonCatchableNSGetterRuntimeError, NativeFunctionDelegateUnavailableError, CorruptNeoScriptIRError, NeoScriptResourceLimitError, NeoScriptWallClockTimeoutError, DEFAULT_NEO_SCRIPT_EXECUTION_BUDGET_LIMITS, liveListIndexesByProject, evaluatorOwnershipCachesByBase, MAX_CONSTRUCTION_DEPTH, MAX_LOOP_ITERATIONS, resolutionCacheByMembers, NO_SCHEMA_REVISION, LazyValueOverlay, READONLY_FOREACH_BINDING_ERROR, READONLY_CATCH_BINDING_ERROR, EMPTY_SUPPLIED_CONSTRUCTOR_FIELDS;
 var init_evaluateNSGetter = __esm({
   "../src/view-models/neoscript-evaluator/evaluateNSGetter.ts"() {
     "use strict";
@@ -65602,6 +66040,7 @@ var init_evaluateNSGetter = __esm({
     };
     READONLY_FOREACH_BINDING_ERROR = "Cannot assign to a read-only foreach iterator binding.";
     READONLY_CATCH_BINDING_ERROR = "Cannot assign to a read-only catch message binding.";
+    EMPTY_SUPPLIED_CONSTRUCTOR_FIELDS = [];
   }
 });
 
@@ -83278,6 +83717,15 @@ function applyProjectVersionWriteChanges(document, changes) {
       "constructor"
     ),
     values: applyArrayChanges(document.values ?? [], changes, "value"),
+    // Project-file staging finalizes pending uploads before schema
+    // preparation. Defaults and authored instance graphs may reference a file
+    // created by the same source transaction, so every construction pass must
+    // see that finalized row in its post-write document.
+    projectFiles: applyArrayChanges(
+      document.projectFiles ?? [],
+      changes,
+      "project-file"
+    ),
     internalRecordRelations: applyArrayChanges(
       document.internalRecordRelations ?? [],
       changes,
@@ -87427,10 +87875,28 @@ function emitMemberDefaultSourcesV4(records2, manifest) {
       continue;
     }
     const member = record3.data;
+    const manifestMember = context.manifestMembers.get(record3.recordId);
+    const defaultValue = isObjectRecord2(member.defaultValue) ? member.defaultValue : {};
+    const linkedLocalizedTextId = defaultValue.value;
+    if (manifestMember?.kind === "string" && manifestMember.localizable && typeof linkedLocalizedTextId === "string" && context.localizedTexts.has(linkedLocalizedTextId)) {
+      const localizedText = context.localizedTexts.get(linkedLocalizedTextId);
+      const localeValues = isObjectRecord2(localizedText?.localeValues) ? localizedText.localeValues : {};
+      const mainLocale = localeValues[context.mainLocale];
+      const mainLocaleValue = isObjectRecord2(mainLocale) ? mainLocale.value : void 0;
+      initializers.set(
+        record3.recordId,
+        mainLocaleValue === null ? quote5(linkedLocalizedTextId) : quote5(localizedString(context, member, linkedLocalizedTextId))
+      );
+      recordKeysByMember.set(
+        record3.recordId,
+        /* @__PURE__ */ new Set([`localized-text:${linkedLocalizedTextId}`])
+      );
+      context.localizedTextIds.clear();
+      continue;
+    }
     const backed = rowBackedDefaultBody(member, (id2) => context.values.has(id2));
     if (backed === null) continue;
     const visited = /* @__PURE__ */ new Set();
-    const defaultValue = isObjectRecord2(member.defaultValue) ? member.defaultValue : {};
     const environment = declaringClassGenericEnvironment(context, member);
     let expression;
     if (backed.kind === "class") {
@@ -87787,6 +88253,39 @@ function lowerMemberDefaultSourcesV4(state, analysis, manifest, options = {}) {
         bindingRuntimeIdentifiers(context, binding)
       );
       const baseData3 = stateData(context, "member", memberId);
+      const annotatedExpression = annotatedValue(expression).expression;
+      const storedDefault = isObjectRecord2(baseData3?.defaultValue) ? baseData3.defaultValue : null;
+      const storedLocalizedTextId = storedDefault?.value;
+      const storedDefaultClassId = storedDefault?.classId;
+      const storedLocalizedText = typeof storedLocalizedTextId === "string" ? state[`localized-text:${storedLocalizedTextId}`]?.data : void 0;
+      const authoredLocalizedValue = annotatedExpression.kind === "litString" ? annotatedExpression.value : annotatedExpression.kind === "litNull" ? null : void 0;
+      if (member.kind === "string" && member.localizable && authoredLocalizedValue !== void 0 && typeof storedLocalizedTextId === "string" && isObjectRecord2(storedLocalizedText)) {
+        if (annotatedExpression.kind === "litString" && annotatedExpression.value === storedLocalizedTextId) {
+          addReconstructed(
+            context,
+            "localized-text",
+            storedLocalizedTextId,
+            nonVolatileFields(storedLocalizedText),
+            binding.source
+          );
+          memberDefaultValues.set(memberId, {
+            value: storedLocalizedTextId,
+            classId: typeof storedDefaultClassId === "string" ? storedDefaultClassId : null
+          });
+          continue;
+        }
+        const preservedTextId = lowerLinkedLocalizedText(
+          context,
+          storedLocalizedTextId,
+          authoredLocalizedValue,
+          binding
+        );
+        memberDefaultValues.set(memberId, {
+          value: preservedTextId,
+          classId: typeof storedDefaultClassId === "string" ? storedDefaultClassId : null
+        });
+        continue;
+      }
       const backed = baseData3 === null || requiresEvaluation ? null : rowBackedDefaultBody(baseData3, (id2) => pulledValueIds.has(id2));
       if (backed !== null && baseData3 !== null) {
         const existingReconstructedKeys = new Set(context.reconstructed.keys());
@@ -90290,6 +90789,18 @@ function lowerStringValue(context, member, expression, base, source) {
   if (!isObjectRecord2(textState?.data)) {
     return expression.value;
   }
+  return lowerLinkedLocalizedText(
+    context,
+    base.value,
+    expression.value,
+    source
+  );
+}
+function lowerLinkedLocalizedText(context, textId, value, source) {
+  const textState = context.state[`localized-text:${textId}`];
+  if (!isObjectRecord2(textState?.data)) {
+    throw new Error(`Localized text ${textId} was not pulled.`);
+  }
   const textBase = textState.data;
   const localeValues = isObjectRecord2(textBase.localeValues) ? textBase.localeValues : {};
   const currentValue = localeValues[context.mainLocale];
@@ -90297,17 +90808,17 @@ function lowerStringValue(context, member, expression, base, source) {
   addReconstructed(
     context,
     "localized-text",
-    base.value,
+    textId,
     {
       ...nonVolatileFields(textBase),
       localeValues: {
         ...localeValues,
-        [context.mainLocale]: { ...current, value: expression.value }
+        [context.mainLocale]: { ...current, value }
       }
     },
     source.source
   );
-  return base.value;
+  return textId;
 }
 function lowerEnum2(context, member, expression) {
   const elements = member.multiselect ? expression.kind === "litList" ? expression.elements : null : [expression];
@@ -93979,16 +94490,28 @@ var init_workspace_status = __esm({
 // src/project-source/status-output.ts
 function groupProjectStatusChangesV4(status) {
   const groups = /* @__PURE__ */ new Map();
+  const group = (source) => {
+    const existing = groups.get(source);
+    if (existing !== void 0) return existing;
+    const created = { changes: [], authoredValueSeeds: [] };
+    groups.set(source, created);
+    return created;
+  };
   for (const change of status.changes) {
     const reconstructed3 = status.reconstructed.get(
       recordStateKey(change.recordKind, change.recordId)
     );
     const source = reconstructed3?.sourceSpan?.path ?? change.file ?? "<unplaced>";
-    const entries = groups.get(source) ?? [];
-    entries.push(change);
-    groups.set(source, entries);
+    group(source).changes.push(change);
   }
-  return [...groups].sort(([left], [right]) => compareCodePoints(left, right)).map(([source, changes]) => ({ source, changes }));
+  for (const [memberId, seed] of status.authoredValueSeeds) {
+    const reconstructed3 = status.reconstructed.get(
+      recordStateKey("member", memberId)
+    );
+    const source = reconstructed3?.sourceSpan?.path ?? "<unplaced>";
+    group(source).authoredValueSeeds.push({ memberId, seed });
+  }
+  return [...groups].sort(([left], [right]) => compareCodePoints(left, right)).map(([source, entries]) => ({ source, ...entries }));
 }
 function projectStatusJsonV4(status, options) {
   return {
@@ -94030,7 +94553,18 @@ function projectStatusJsonV4(status, options) {
         mimeType: binary.mimeType
       } : null,
       conflictArtifactPath: binary.conflictArtifactPath ?? null
-    }))
+    })),
+    authoredValueSeeds: [...status.authoredValueSeeds].sort(([left], [right]) => compareCodePoints(left, right)).map(([memberId, seed]) => {
+      const reconstructed3 = status.reconstructed.get(
+        recordStateKey("member", memberId)
+      );
+      return {
+        operation: "create",
+        memberId,
+        valueId: seed.valueId ?? null,
+        sourceSpan: reconstructed3?.sourceSpan ?? null
+      };
+    })
   };
 }
 function recordChangeJsonV4(change, status, options) {
@@ -101055,7 +101589,11 @@ async function prepareLocalPushArtifactsV4(workspace, status, onPhase = () => vo
     );
     preparedChanges = assertServerPreparationSucceeds({
       workspace,
-      changes: transportChanges,
+      changes: completeLocallyStagedProjectFileChanges({
+        projectId: workspace.config.projectId,
+        changes: transportChanges,
+        stagedRecordIds: new Set(preparedFiles.map((file) => file.recordId))
+      }),
       authoredValueSeeds: transportSeeds,
       sourceByRecord: status.reconstructed,
       localInitializerMaterialization: pendingAssignment.localInitializerMaterialization,
@@ -101178,6 +101716,33 @@ async function prepareLocalCandidateV4(workspace, options = {}) {
     preparedLocal
   };
 }
+function completeLocallyStagedProjectFileChanges(args) {
+  return args.changes.map((change) => {
+    if (!args.stagedRecordIds.has(change.recordId)) return change;
+    if (change.recordKind !== "project-file") {
+      throw new Error(
+        `Staged project file ${change.recordId} matched a ${change.recordKind} change.`
+      );
+    }
+    if (!isObjectRecord2(change.nextData)) {
+      throw new Error(
+        `Staged project file ${change.recordId} has no local source record.`
+      );
+    }
+    const completed = {
+      ...change,
+      nextData: {
+        ...change.nextData,
+        id: change.recordId,
+        projectId: args.projectId,
+        status: "uploaded",
+        storageKey: `local-candidate/${change.recordId}`,
+        storageETag: "local-candidate"
+      }
+    };
+    return completed;
+  });
+}
 function transportChangesForStatus(status) {
   return status.changes.map((change) => ({
     recordKind: change.recordKind,
@@ -102632,7 +103197,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.9",
-      cliVersion: "0.26.3",
+      cliVersion: "0.26.5",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -109197,7 +109762,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.26.3");
+    console.log("0.26.5");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {
@@ -109612,17 +110177,17 @@ async function main() {
             `  ${paintChangeKind(change.kind)} ${describeChange(change).replace(`${change.kind} `, "")}`
           );
         }
+        if (group.authoredValueSeeds.length > 0) {
+          console.log(
+            `  ${paintChangeKind("create")} ${group.authoredValueSeeds.length} member value seed(s)`
+          );
+        }
       }
       for (const binary of status.binaryChanges ?? []) {
         console.log(
           `${paintChangeKind(binary.action === "create" ? "create" : "update")} project-file bytes ${binary.symbol} (${binary.path}) \u2014 ${binary.action}`
         );
       }
-      if (status.authoredValueSeeds.size > 0) {
-        console.log(
-          `  ${paintChangeKind("create")} ${status.authoredValueSeeds.size} member value seed(s)`
-        );
-      }
       if (status.conflictedFiles.length === 0 && status.parseErrors.length === 0 && status.changes.length === 0 && status.authoredValueSeeds.size === 0 && (status.binaryChanges?.length ?? 0) === 0) {
         console.log(`${sym.ok} Working copy is clean.`);
       }
@@ -109654,13 +110219,18 @@ async function main() {
             console.log(color.dim(`  ${line}`));
           }
         }
+        if (group.authoredValueSeeds.length > 0) {
+          console.log(
+            `  ${paintChangeKind("create")} ${group.authoredValueSeeds.length} member value seed(s)`
+          );
+        }
       }
       for (const binary of status.binaryChanges ?? []) {
         console.log(
           `${paintChangeKind(binary.action === "create" ? "create" : "update")} project-file bytes ${binary.symbol} (${binary.path}) \u2014 ${binary.action}`
         );
       }
-      if (status.changes.length === 0 && (status.binaryChanges?.length ?? 0) === 0) {
+      if (status.changes.length === 0 && status.authoredValueSeeds.size === 0 && (status.binaryChanges?.length ?? 0) === 0) {
         console.log(`${sym.ok} No local changes.`);
       }
       return;