@neocompose/cli 0.89.6 → 0.89.8

package/dist/neo-runtime.mjs

@@ -19407,7 +19407,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.89.6",
+      cliVersion: "0.89.8",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -28481,15 +28481,7 @@ function calculateDeclarationSignature(ctx, projectionClassId, schemaKey, declar
     declarationClassId: declaration.classDef.id,
     memberId: declaration.memberId,
     isAbstract: isAbstractMember(member) === true,
-    isVirtual: isVirtualMember(member) !== false,
-    // Openness belongs to the DECLARING class, not to whoever is asking: a
-    // descendant that closes the param still has to see a declaration it is
-    // obliged to implement.
-    requiresClosingImplementation: lookupDeclaredTypeInfo(member) === null ? false : lookupNarrowingAwaitsClosingBinding(
-      ctx,
-      member,
-      resolveGenericEnvForEmission(ctx, declaration.classDef.id)
-    )
+    isVirtual: isVirtualMember(member) !== false
   };
   if (isCallableMemberForCodegen(member)) {
     const parameterTypes = member.argumentTypes.map(
@@ -28699,7 +28691,7 @@ function generatedInstanceMemberSignaturesEqual(left, right) {
   return false;
 }
 function emitsAbstractDeclaration(signature2) {
-  return signature2.isAbstract || signature2.requiresClosingImplementation;
+  return signature2.isAbstract;
 }
 function resolveGeneratedInstanceMemberPlan(ctx, classDef, schemaKey) {
   const declaration = ownInstanceMemberDeclaration(classDef, schemaKey);
@@ -30892,11 +30884,6 @@ function lookupHasRuntimeOwnership(member) {
 function lookupNarrowsThroughGenericParam(member) {
   return lookupDeclaredTypeInfo(member)?.type === 21 /* Generic */;
 }
-function lookupNarrowingAwaitsClosingBinding(ctx, member, env) {
-  if (!lookupNarrowsThroughGenericParam(member)) return false;
-  if (lookupProjection(ctx, member) !== "class" /* Class */) return false;
-  return lookupTargetClassProjection(ctx, member, env) === null;
-}
 function lookupTargetValueType(ctx, member, saved, env) {
   if (!isMemberLookupBase(member)) return "NeoLookupSelection";
   const targetSaved = lookupTargetSaved(ctx, member) ?? saved;
@@ -38831,7 +38818,8 @@ function blankEvaluatorIndexes(memberByValueId) {
   return {
     rowByValueReference: /* @__PURE__ */ new WeakMap(),
     memberByValueId,
-    parentLinksByChildId: /* @__PURE__ */ new Map(),
+    parentLinksByChildId: new EvaluatorParentLinks(),
+    placementParentLinksByChildId: /* @__PURE__ */ new Map(),
     indexedRowIds: /* @__PURE__ */ new Set(),
     indexedOverlayValues: /* @__PURE__ */ new Map(),
     indexedOverlayRowCount: 0,
@@ -39070,8 +39058,15 @@ function evaluatorIndexes(ctx) {
     rowByValueReference: /* @__PURE__ */ new WeakMap(),
     baseRowByValueReference: base?.rowByValueReference,
     memberByValueId: base?.memberByValueId ?? /* @__PURE__ */ new Map(),
-    parentLinksByChildId: /* @__PURE__ */ new Map(),
+    parentLinksByChildId: new EvaluatorParentLinks(),
+    placementParentLinksByChildId: /* @__PURE__ */ new Map(),
     baseParentLinksByChildId: base?.parentLinksByChildId,
+    isSelectionRow: (row) => {
+      const member = runtimeCollectionMember(row, ctx);
+      if (member === null || !isMemberLookupBase(member)) return false;
+      const direct = indexes4.memberByValueId.get(row.id);
+      return direct === void 0 || isMemberLookupBase(direct);
+    },
     indexedRowIds: /* @__PURE__ */ new Set(),
     baseIndexedRowIds: base?.indexedRowIds,
     indexedOverlayValues: /* @__PURE__ */ new Map(),
@@ -39165,7 +39160,13 @@ function indexEvaluatorRow(indexes4, row, allowBaseShadow = false, sharedCachesA
   visitEvaluatorRecordOwnershipEdges(indexes4, row, (childId, key) => {
     indexes4.ownedValueAttachmentsByValueId.delete(childId);
     indexes4.constructorOwnershipDirtyValueIds.add(childId);
-    addEvaluatorParentLink(indexes4, childId, row.id, key);
+    addEvaluatorParentLink(
+      indexes4,
+      childId,
+      row.id,
+      key,
+      indexes4.isSelectionRow?.(row) === true
+    );
   });
 }
 function indexEvaluatorRows(indexes4, rows, allowBaseShadow = false, liveOverlayRowById) {
@@ -39214,7 +39215,13 @@ function augmentEvaluatorOwnershipEdges(indexes4, row, liveRow) {
     if (links.some((link) => link.parentId === row.id && link.key === key)) {
       return;
     }
-    addEvaluatorParentLink(indexes4, childId, row.id, key);
+    addEvaluatorParentLink(
+      indexes4,
+      childId,
+      row.id,
+      key,
+      indexes4.isSelectionRow?.(row) === true
+    );
     indexes4.ownedValueAttachmentsByValueId.delete(childId);
     indexes4.constructorOwnershipDirtyValueIds.add(childId);
   });
@@ -39260,12 +39267,11 @@ function unindexEvaluatorRow(indexes4, row, preserveIncomingLinks = false) {
   indexes4.indexedRowIds.delete(row.id);
   indexes4.ownedValueAttachmentsByValueId.delete(row.id);
   indexes4.constructorOwnershipDirtyValueIds.delete(row.id);
-  if (!preserveIncomingLinks) indexes4.parentLinksByChildId.delete(row.id);
-  else if (typeof row.containerId === "string") {
-    const retained = indexes4.parentLinksByChildId.get(row.id)?.filter((link) => link.parentId !== row.containerId || link.key !== "");
-    if (retained === void 0 || retained.length === 0)
-      indexes4.parentLinksByChildId.delete(row.id);
-    else indexes4.parentLinksByChildId.set(row.id, retained);
+  if (!preserveIncomingLinks) {
+    indexes4.parentLinksByChildId.delete(row.id);
+    indexes4.placementParentLinksByChildId.delete(row.id);
+  } else if (typeof row.containerId === "string") {
+    removeEvaluatorParentLinks(indexes4, row.id, row.containerId, "");
   }
   if (typeof row.value === "object" && row.value !== null && indexes4.rowByValueReference.get(row.value) === row) {
     indexes4.rowByValueReference.delete(row.value);
@@ -39282,12 +39288,7 @@ function unindexEvaluatorRow(indexes4, row, preserveIncomingLinks = false) {
     }
   }
   visitEvaluatorRecordOwnershipEdges(indexes4, row, (childId) => {
-    const links = indexes4.parentLinksByChildId.get(childId);
-    if (links !== void 0) {
-      const retained = links.filter((link) => link.parentId !== row.id);
-      if (retained.length === 0) indexes4.parentLinksByChildId.delete(childId);
-      else indexes4.parentLinksByChildId.set(childId, retained);
-    }
+    removeEvaluatorParentLinks(indexes4, childId, row.id);
     indexes4.ownedValueAttachmentsByValueId.delete(childId);
     indexes4.constructorOwnershipDirtyValueIds.add(childId);
   });
@@ -39300,36 +39301,101 @@ function dropReconciledOwnershipRows(indexes4) {
   indexes4.reconciledOwnershipRows = /* @__PURE__ */ new WeakSet();
   indexes4.indexedVirtualRowSets = /* @__PURE__ */ new WeakSet();
 }
-function addEvaluatorParentLink(indexes4, childId, parentId, key) {
-  const links = indexes4.parentLinksByChildId.get(childId) ?? [];
-  links.push({ parentId, key });
-  indexes4.parentLinksByChildId.set(childId, links);
+function addEvaluatorParentLink(indexes4, childId, parentId, key, selectionOnly = false) {
+  const placements = indexes4.placementParentLinksByChildId.get(childId);
+  if (selectionOnly) {
+    if (placements === void 0) {
+      indexes4.placementParentLinksByChildId.set(childId, [
+        ...indexes4.parentLinksByChildId.get(childId) ?? []
+      ]);
+      indexes4.parentLinksByChildId.indexParents(childId);
+    }
+  } else {
+    placements?.push({ parentId, key });
+  }
+  indexes4.parentLinksByChildId.add(childId, { parentId, key });
+}
+function removeEvaluatorParentLinks(indexes4, childId, parentId, key) {
+  indexes4.parentLinksByChildId.remove(childId, parentId, key);
+  if (!indexes4.parentLinksByChildId.has(childId)) {
+    indexes4.placementParentLinksByChildId.delete(childId);
+    return;
+  }
+  const placements = indexes4.placementParentLinksByChildId.get(childId);
+  if (placements !== void 0)
+    indexes4.placementParentLinksByChildId.set(
+      childId,
+      placements.filter(
+        (link) => link.parentId !== parentId || key !== void 0 && link.key !== key
+      )
+    );
 }
-function indexRuntimeCollectionAppend(collection, entry, ctx) {
+function indexRuntimeCollectionChange(collection, entry, ctx, removedEntries = null, entryKey, change = "entry") {
   const indexes4 = ctx.__indexes;
   const row = indexes4?.rowByValueReference.get(collection);
   if (indexes4 === void 0 || indexes4.invalidated || row === void 0 || ctx.__runtimeSessionValues?.get(row.id) !== row || !indexes4.indexedRowIds.has(row.id))
     return false;
-  if (typeof entry === "string") {
-    addEvaluatorParentLink(indexes4, entry, row.id, "");
-    indexes4.ownedValueAttachmentsByValueId.delete(entry);
-    indexes4.constructorOwnershipDirtyValueIds.add(entry);
+  if (removedEntries !== null)
+    for (const removed of removedEntries) {
+      removeEvaluatorParentLinks(indexes4, removed, row.id, entryKey);
+      indexes4.ownedValueAttachmentsByValueId.delete(removed);
+      indexes4.constructorOwnershipDirtyValueIds.add(removed);
+    }
+  const addEdge = (childId, key) => {
+    addEvaluatorParentLink(
+      indexes4,
+      childId,
+      row.id,
+      key,
+      indexes4.isSelectionRow?.(row) === true
+    );
+    indexes4.ownedValueAttachmentsByValueId.delete(childId);
+    indexes4.constructorOwnershipDirtyValueIds.add(childId);
+  };
+  if (typeof entry === "string") addEdge(entry, entryKey ?? "");
+  else if (change === "contents")
+    visitEvaluatorRecordOwnershipEdges(indexes4, row, addEdge);
+  if (typeof entry === "string" || removedEntries !== null && removedEntries.length > 0) {
     indexes4.ownershipRootIdsByRowId.clear();
     indexes4.ownershipDistancesByRowId.clear();
     indexes4.memberByRowId.clear();
   }
-  forgetLocalListIndexes(ctx, collection);
+  if (Array.isArray(collection)) forgetLocalListIndexes(ctx, collection);
   markOverlayMutated(ctx, collection);
   if (ctx.__valueOverlay instanceof LazyValueOverlay)
     indexes4.overlayRevision = ctx.__valueOverlay.revision;
   return true;
 }
-function evaluatorParentLinks(indexes4, childId) {
+function indexRuntimeCollectionEntryWrite(collection, previous, value, key, ctx) {
+  if (!Array.isArray(collection))
+    return indexRuntimeCollectionChange(
+      collection,
+      value,
+      ctx,
+      typeof previous === "string" ? [previous] : [],
+      String(key)
+    );
+  if (typeof previous !== "string" && typeof value !== "string")
+    return indexRuntimeCollectionChange(collection, void 0, ctx);
+  const edges = collection.filter(
+    (entry) => typeof entry === "string"
+  );
+  if (typeof previous === "string") edges.push(previous);
+  return indexRuntimeCollectionChange(
+    collection,
+    void 0,
+    ctx,
+    edges,
+    void 0,
+    "contents"
+  );
+}
+function evaluatorParentLinks(indexes4, childId, placementOnly = false) {
   const unfilteredBase = indexes4.baseParentLinksByChildId?.get(childId) ?? [];
   const base = indexes4.shadowedBaseRowIds.size === 0 ? unfilteredBase : unfilteredBase.filter(
     (link) => !indexes4.shadowedBaseRowIds.has(link.parentId)
   );
-  const local = indexes4.parentLinksByChildId.get(childId) ?? [];
+  const local = (placementOnly ? indexes4.placementParentLinksByChildId.get(childId) : void 0) ?? indexes4.parentLinksByChildId.get(childId) ?? [];
   if (base.length === 0) return local;
   if (local.length === 0) return base;
   return [...base, ...local];
@@ -40252,6 +40318,7 @@ function withEvaluationRuntime(ctx, writes) {
     ctx.__setEntryIndexes ??= /* @__PURE__ */ new WeakMap();
     ctx.__runtimeSets ??= /* @__PURE__ */ new WeakMap();
     ctx.__collectionElementTypes ??= /* @__PURE__ */ new WeakMap();
+    ctx.__runtimeCollectionMembers ??= /* @__PURE__ */ new WeakMap();
     ctx.__dirtyRuntimeSets ??= /* @__PURE__ */ new Set();
     ctx.__runtimeClassOverrides ??= /* @__PURE__ */ new Map();
     ctx.__getterSubscriptions ??= getterSubscriptionsFor(ctx);
@@ -40289,6 +40356,7 @@ function withEvaluationRuntime(ctx, writes) {
     __setEntryIndexes: ctx.__setEntryIndexes ?? /* @__PURE__ */ new WeakMap(),
     __runtimeSets: ctx.__runtimeSets ?? /* @__PURE__ */ new WeakMap(),
     __collectionElementTypes: ctx.__collectionElementTypes ?? /* @__PURE__ */ new WeakMap(),
+    __runtimeCollectionMembers: ctx.__runtimeCollectionMembers ?? /* @__PURE__ */ new WeakMap(),
     __tupleHandleIdentity: ctx.__tupleHandleIdentity ??= new TupleHandleIdentity(),
     __dirtyRuntimeSets: ctx.__dirtyRuntimeSets ?? /* @__PURE__ */ new Set(),
     __runtimeReferenceRemap: referenceRemap,
@@ -40750,11 +40818,10 @@ function remapRuntimeReferences(value, overlay2, seen, preservedReferences) {
   const next = {};
   seen.set(value, next);
   for (const [key, entry] of Object.entries(value)) {
-    next[key] = remapRuntimeReferences(
-      entry,
-      overlay2,
-      seen,
-      preservedReferences
+    setOwnField(
+      next,
+      key,
+      remapRuntimeReferences(entry, overlay2, seen, preservedReferences)
     );
   }
   return next;
@@ -41733,7 +41800,8 @@ function evalInstructions(instructions, scope, ctx, options) {
               target.pointer,
               scope,
               ctx,
-              destination
+              destination,
+              value
             );
             const through = genericSlotReference(
               member,
@@ -41757,7 +41825,8 @@ function evalInstructions(instructions, scope, ctx, options) {
                 target.pointer,
                 scope,
                 ctx,
-                destination
+                destination,
+                value
               );
             }
             if (target.structuredLeafKind !== void 0 && destination !== void 0)
@@ -41774,6 +41843,11 @@ function evalInstructions(instructions, scope, ctx, options) {
               ctx
             );
             const lookupMember = member !== null && isMemberLookup(member) ? member : null;
+            const inlineReferenceValue = lookupMember !== null && target.pointer.type === "keyOf" /* keyOf */ && target.pointer.memberId === void 0 && destination !== void 0 && materializedCollectionEntryId(
+              destination.receiver,
+              destination.key,
+              ctx
+            ) === null ? { value } : void 0;
             if (lookupMember !== null) {
               materializeReferencedSlots(value, ctx);
               const holder = destination === void 0 ? null : trackedRowForValueReference(destination.receiver, ctx);
@@ -41830,7 +41904,8 @@ function evalInstructions(instructions, scope, ctx, options) {
                 value,
                 scope,
                 ctx,
-                destination
+                destination,
+                inlineReferenceValue
               );
             }
             const unorderedReplacement = assignedReferenceValueId === null && member !== null && isMemberEntryCollectionBase(member) && listKindOf(member) === 1 /* Unordered */ && Array.isArray(value) ? unorderedReplacementProjection(
@@ -42504,7 +42579,7 @@ function validateStructuredFieldAssignment(kind, field, value) {
       { errorClassId: NEO_ERROR_CLASS_IDS.NeoArgumentError }
     );
 }
-function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, destination) {
+function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, destination, inlineReferenceValue) {
   if (target.type === "staticMember" /* staticMember */) {
     if (ctx.storedConstructionReplay === true) {
       throw new NSGetterRuntimeError(
@@ -42536,8 +42611,32 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
     "assignment target",
     reattachesReplaySlot ? void 0 : key
   );
+  if (inlineReferenceValue !== void 0) {
+    const entryId = trackInsertedCollection(
+      inlineReferenceValue.value,
+      targetTypeInfo,
+      receiver,
+      ctx
+    );
+    if (entryId !== null) {
+      const collection = Array.isArray(receiver) ? receiver : objectArg(receiver, "Assignment target");
+      const entryKey = typeof key === "number" ? key : String(key);
+      setOwnField(collection, String(entryKey), entryId);
+      recordWrittenEntry(collection, entryKey, true, ctx);
+      if (!indexRuntimeCollectionChange(
+        collection,
+        entryId,
+        ctx,
+        null,
+        Array.isArray(collection) ? void 0 : String(entryKey)
+      ))
+        invalidateEvaluatorIndexes(ctx, receiver);
+      return;
+    }
+  }
   if (Array.isArray(receiver)) {
     const index = numberArg(key, "List assignment index");
+    const previous2 = receiver[index];
     if (referenceValueId !== null) {
       const parentId = findKnownRowIdByValueReference(receiver, ctx);
       if (parentId !== null) {
@@ -42561,10 +42660,17 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
       }
       receiver[index] = referenceValueId;
       recordWrittenEntry(receiver, index, true, ctx);
-      invalidateEvaluatorIndexes(ctx, receiver);
+      if (!indexRuntimeCollectionEntryWrite(
+        receiver,
+        previous2,
+        referenceValueId,
+        index,
+        ctx
+      ))
+        invalidateEvaluatorIndexes(ctx, receiver);
       return;
     }
-    if (collectionReferences(receiver, ctx) === 0 /* RowIds */ && replaceEntryRowValue(
+    if (isReferenceEntry(collectionReferences(receiver, ctx), index) && replaceEntryRowValue(
       receiver,
       receiver[index],
       value,
@@ -42574,11 +42680,13 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
       return;
     receiver[index] = value;
     recordWrittenEntry(receiver, index, false, ctx);
-    invalidateEvaluatorIndexes(ctx, receiver);
+    if (!indexRuntimeCollectionEntryWrite(receiver, previous2, value, index, ctx))
+      invalidateEvaluatorIndexes(ctx, receiver);
     return;
   }
   const object2 = objectArg(receiver, "Assignment target");
   const stringKey = String(key);
+  const previous = object2[stringKey];
   const field = target.memberId !== void 0;
   if (field && isTypeInfoWithEntries(targetTypeInfo)) {
     const slot = collectionSlotRow(target, { receiver, key }, ctx);
@@ -42609,18 +42717,27 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
       );
       noteDetachedRow(object2[stringKey], referenceValueId, ctx);
     }
-    object2[stringKey] = referenceValueId;
+    setOwnField(object2, stringKey, referenceValueId);
     if (!field) recordWrittenEntry(object2, stringKey, true, ctx);
-    invalidateEvaluatorIndexes(ctx, receiver);
+    if (field || !indexRuntimeCollectionEntryWrite(
+      object2,
+      previous,
+      referenceValueId,
+      stringKey,
+      ctx
+    ))
+      invalidateEvaluatorIndexes(ctx, receiver);
     return;
   }
-  if (collectionReferences(object2, ctx) === 0 /* RowIds */ && replaceEntryRowValue(object2, object2[stringKey], value, targetTypeInfo, ctx))
+  if (isReferenceEntry(collectionReferences(object2, ctx), stringKey) && replaceEntryRowValue(object2, object2[stringKey], value, targetTypeInfo, ctx))
     return;
   if (field && (targetTypeInfo.type === 7 /* Class */ || targetTypeInfo.type === 22 /* Interface */))
     noteDetachedRow(object2[stringKey], value, ctx);
-  object2[stringKey] = value;
+  setOwnField(object2, stringKey, value);
   if (!field) recordWrittenEntry(object2, stringKey, false, ctx);
-  invalidateEvaluatorIndexes(ctx, receiver);
+  const scalarField = (previous == null || typeof previous === "number" || typeof previous === "boolean" || typeof previous === "string") && (value == null || typeof value === "number" || typeof value === "boolean" || typeof value === "string");
+  if (field && !scalarField || !indexRuntimeCollectionEntryWrite(object2, previous, value, stringKey, ctx))
+    invalidateEvaluatorIndexes(ctx, receiver);
 }
 function keptCollectionSlotValue(target, targetTypeInfo, destination, value, ctx) {
   const sourceId3 = findKnownRowIdByValueReference(value, ctx);
@@ -42698,7 +42815,7 @@ function copiedCollectionContents(source, entryTypeInfo, slotId, ctx) {
       }
     }
     if (Array.isArray(copy)) copy.push(entry);
-    else copy[String(key)] = entry;
+    else setOwnField(copy, String(key), entry);
     return 0 /* Continue */;
   });
   const cache = unorderedListProjectionCache(ctx);
@@ -42767,107 +42884,6 @@ function keepAssignedCollectionValues(value, targetTypeInfo, row, ctx) {
     return 0 /* Continue */;
   });
 }
-function pendingConstructorRootsForRow(valueId, ctx) {
-  const roots = /* @__PURE__ */ new Set();
-  const open2 = ctx.__executionState?.openConstructions;
-  if (open2 === void 0 || open2.size === 0) return roots;
-  const visited = /* @__PURE__ */ new Set();
-  const pending = [valueId];
-  const parentEntries = /* @__PURE__ */ new Map();
-  const placingMembers = /* @__PURE__ */ new Map();
-  while (pending.length > 0) {
-    const id2 = pending.pop();
-    if (id2 === void 0 || visited.has(id2)) continue;
-    visited.add(id2);
-    const row = evalValueById(
-      ctx,
-      id2,
-      ctx.__runtimeSessionValues,
-      ctx.__valueOverlay
-    );
-    if (row === null) continue;
-    if (typeof row.value === "object" && row.value !== null && open2.has(row.value))
-      roots.add(id2);
-    for (const owner of currentOwnedValueAttachments(
-      id2,
-      ctx,
-      parentEntries,
-      placingMembers
-    )) {
-      if (!owner.identity.startsWith("value:")) continue;
-      const parent = evalValueById(
-        ctx,
-        owner.label,
-        ctx.__runtimeSessionValues,
-        ctx.__valueOverlay
-      );
-      if (parent === null) continue;
-      if (parent.classId === void 0 || parent.classId === null) {
-        const raw = placingMember(
-          parent,
-          ctx,
-          void 0,
-          0,
-          placingMembers,
-          parentEntries
-        );
-        if (raw === null) continue;
-        const member = raw.kind === 21 /* Generic */ ? substituteMember(raw, rowGenericEnv(parent, ctx), ctx.vm.members) : resolveMember(raw, ctx.vm.members);
-        if (isMemberWithEntries(member)) {
-          const rawEntry = evalMemberById(ctx.vm, member.entryMemberId);
-          if (rawEntry === null) continue;
-          const entry = rawEntry.kind === 21 /* Generic */ ? substituteMember(
-            rawEntry,
-            rowGenericEnv(parent, ctx),
-            ctx.vm.members
-          ) : resolveMember(rawEntry, ctx.vm.members);
-          if (entry.kind === 21 /* Generic */ || isMemberLookupBase(entry))
-            continue;
-        }
-      }
-      pending.push(owner.label);
-    }
-    for (const link of evaluatorParentLinks(evaluatorIndexes(ctx), id2)) {
-      const parent = evalValueById(
-        ctx,
-        link.parentId,
-        ctx.__runtimeSessionValues,
-        ctx.__valueOverlay
-      );
-      if (parent === null || !Array.isArray(parent.value)) continue;
-      const member = placingMember(
-        parent,
-        ctx,
-        void 0,
-        0,
-        placingMembers,
-        parentEntries
-      );
-      if (member === null || !isMemberTupleBase(member)) continue;
-      const positions = ownershipParentEntryKeys(
-        parent.value,
-        id2,
-        parentEntries
-      );
-      for (const position of positions ?? []) {
-        if (typeof position !== "number") continue;
-        const entryId = member.elementMemberIds[position];
-        const rawEntry = entryId === void 0 ? null : evalMemberById(ctx.vm, entryId);
-        if (rawEntry === null) continue;
-        const entry = rawEntry.kind === 21 /* Generic */ ? substituteMember(
-          rawEntry,
-          rowGenericEnv(parent, ctx),
-          ctx.vm.members
-        ) : resolveMember(rawEntry, ctx.vm.members);
-        if (entry.kind === 21 /* Generic */ || isMemberLookupBase(entry))
-          continue;
-        pending.push(parent.id);
-        break;
-      }
-    }
-  }
-  return roots;
-}
 function preflightAssignedCollection(collection, member, row, ctx) {
   if (member === null) return;
   const env = rowGenericEnv(row, ctx);
@@ -42880,8 +42896,6 @@ function preflightAssignedCollection(collection, member, row, ctx) {
   const attached = /* @__PURE__ */ new Set();
   const preflight = {
     parentEntries: /* @__PURE__ */ new Map(),
-    constructorRootIds: pendingConstructorRootsForRow(row.id, ctx),
-    constructorArgumentTransfers: /* @__PURE__ */ new Map(),
     dependencies: /* @__PURE__ */ new Map()
   };
   forEachRawCollectionEntry(collection, ctx, ({ raw, key, valueId }) => {
@@ -42904,8 +42918,6 @@ function preflightAssignedCollection(collection, member, row, ctx) {
     );
     return 0 /* Continue */;
   });
-  for (const [id2, destination] of preflight.constructorArgumentTransfers)
-    ctx.__executionState?.ownedValueAttachments.set(id2, destination);
   for (const [id2, destination] of preflight.dependencies)
     recordConstructorGroupDependency(id2, destination, ctx);
 }
@@ -43534,7 +43546,22 @@ function validateAssignmentTarget(target, scope, ctx, destination) {
   }
   return resolved;
 }
-function assignmentTargetMember(target, scope, ctx, destination) {
+function materializedCollectionEntryId(receiver, key, ctx) {
+  if (typeof receiver !== "object" || receiver === null) return null;
+  const entryKey = typeof key === "number" ? key : String(key);
+  if (!Object.prototype.hasOwnProperty.call(receiver, entryKey)) return null;
+  const raw = Reflect.get(receiver, String(entryKey));
+  if (typeof raw !== "string") return null;
+  if (!isReferenceEntry(collectionReferences(receiver, ctx), entryKey))
+    return null;
+  return evalValueById(
+    ctx,
+    raw,
+    ctx.__runtimeSessionValues,
+    ctx.__valueOverlay
+  ) === null ? null : raw;
+}
+function assignmentTargetMember(target, scope, ctx, destination, value) {
   if (target.type === "keyOf" /* keyOf */) {
     const receiver = destination === void 0 ? evalPointer(target.keyOf.pointer, scope, ctx) : destination.receiver;
     const key = destination === void 0 ? evalPointer(target.keyOf.key, scope, ctx) : destination.key;
@@ -43544,6 +43571,12 @@ function assignmentTargetMember(target, scope, ctx, destination) {
       ctx
     );
     if (runtimeMember2 !== null) return runtimeMember2;
+    const raw = typeof receiver === "object" && receiver !== null ? Reflect.get(receiver, String(key)) : void 0;
+    if (target.memberId === void 0 && typeof receiver === "object" && receiver !== null && (materializedCollectionEntryId(receiver, key, ctx) !== null || typeof raw !== "string" && findKnownRowIdByValueReference(value, ctx) !== null)) {
+      const contract = storedCollectionEntryContract(receiver, ctx);
+      if (contract !== null && isMemberLookupBase(contract.member))
+        return { ...contract.entry, ...contract.member };
+    }
   }
   if ((target.type === "keyOf" /* keyOf */ || target.type === "staticMember" /* staticMember */) && target.memberId !== void 0) {
     const member = evalMemberById(ctx.vm, target.memberId);
@@ -43816,14 +43849,17 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
     return;
   }
   validateCollectionMutation(targetValue, ins.mutation, args);
+  let insertedReferenceRowId = null;
   if (!isLookupSet && entryArgumentIndex !== null && (ins.mutation === "Add" /* Add */ || ins.mutation === "Insert" /* Insert */) && findKnownRowIdByValueReference(targetValue, ctx) !== null)
-    trackInsertedCollection(
+    insertedReferenceRowId = trackInsertedCollection(
       args[entryArgumentIndex],
       collectionEntryWriteType(ins.target.typeInfo, targetValue, ctx),
       targetValue,
       ctx
     );
   const overlayArgs = [...args];
+  let removedReferenceRowId = null;
+  let referenceRemoval = false;
   if ((ins.mutation === "Add" /* Add */ || ins.mutation === "Remove" /* Remove */) && isArrayCollection(targetValue)) {
     if (setMatch !== null) overlayArgs[0] = setMatch.entry;
     else if (isLookupSet)
@@ -43839,12 +43875,32 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
   } else if (ins.mutation === "Add" /* Add */ && !isArrayCollection(targetValue)) {
     overlayArgs[1] = findKnownRowIdByValueReference(args[1], ctx) ?? args[1];
   }
+  if (ins.mutation === "Remove" /* Remove */ && Array.isArray(targetValue) && !isLookupSet && setEntryMember === null) {
+    const contract = storedCollectionEntryContract(targetValue, ctx);
+    if (contract !== null && isMemberLookupBase(contract.member)) {
+      referenceRemoval = isMultiSelectionMember(contract.member) !== true;
+      const references = collectionReferences(targetValue, ctx);
+      const index = targetValue.findIndex(
+        (entry, index2) => referenceEqual(
+          isReferenceEntry(references, index2) ? resolveValueIfId(entry, ctx) : entry,
+          args[0],
+          ctx
+        )
+      );
+      if (index >= 0 && typeof targetValue[index] === "string") {
+        removedReferenceRowId = targetValue[index];
+        overlayArgs[0] = removedReferenceRowId;
+      }
+    }
+  }
+  if (insertedReferenceRowId !== null && entryArgumentIndex !== null)
+    overlayArgs[entryArgumentIndex] = insertedReferenceRowId;
   const unorderedEntriesBeforeMutation = unorderedContainerValueId === null || !Array.isArray(targetValue) || ins.mutation === "Add" /* Add */ ? null : [...targetValue];
   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];
-    attachedValueId = findKnownRowIdByValueReference(attachedValue, ctx);
+    attachedValueId = insertedReferenceRowId ?? findKnownRowIdByValueReference(attachedValue, ctx);
     const parentId = findKnownRowIdByValueReference(targetValue, ctx);
     if (attachedValueId !== null && parentId !== null) {
       assertInterfaceWriteAdmits(
@@ -43873,14 +43929,51 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
       );
     }
   }
-  if (ins.mutation === "Add" /* Add */ && isArrayCollection(targetValue) && unorderedContainerValueId !== null && !isLookupSet && findKnownRowIdByValueReference(args[0], ctx) === null) {
+  if (ins.mutation === "Add" /* Add */ && isArrayCollection(targetValue) && unorderedContainerValueId !== null && !isLookupSet && insertedReferenceRowId === null && findKnownRowIdByValueReference(args[0], ctx) === null) {
     overlayArgs[0] = createUnorderedScalarProjectionEntry(
       unorderedContainerValueId,
       args[0] instanceof NSSlotReference ? [args[0].targetId] : args[0],
       ctx
     );
   }
-  const removableRowIds = isLookupSet || ins.reference === true ? null : removableEntryRowIds(targetValue, ins.mutation, overlayArgs, ctx);
+  const removableRowIds = isLookupSet ? null : removableEntryRowIds(targetValue, ins.mutation, overlayArgs, ctx);
+  let previousEdges = null;
+  if (ins.mutation !== "Add" /* Add */ && ins.mutation !== "Insert" /* Insert */) {
+    const contents = targetValue instanceof RuntimeSet ? targetValue.source : targetValue;
+    const entries = Array.isArray(contents) ? contents : Object.values(objectArg(contents, "collection mutation target"));
+    previousEdges = entries.filter(
+      (entry) => typeof entry === "string"
+    );
+  }
+  const removedMembers = removableRowIds === null ? null : /* @__PURE__ */ new Map();
+  for (const [, id2] of removableRowIds ?? []) {
+    if (ins.mutation === "Remove" /* Remove */ && Array.isArray(targetValue) && id2 !== overlayArgs[0])
+      continue;
+    const row = evalValueById(
+      ctx,
+      id2,
+      ctx.__runtimeSessionValues,
+      ctx.__valueOverlay
+    );
+    if (row === null) continue;
+    const placed = memberForValueRow(row, ctx);
+    if (placed === null) continue;
+    const member = {
+      ...placed,
+      ...substituteMember(placed, rowGenericEnv(row, ctx), ctx.vm.members)
+    };
+    if (isMemberEntryCollectionBase(member) || isMemberDictionaryBase(member))
+      removedMembers?.set(id2, {
+        row,
+        contract: {
+          member,
+          members: ctx.vm.members,
+          classes: ctx.vm.classes,
+          bindings: row.genericBindings === void 0 ? void 0 : { ...row.genericBindings }
+        }
+      });
+  }
+  const replacedEntry = writesEntry && dictionary && isPlainRecord(targetValue) ? Reflect.get(targetValue, String(args[0])) : null;
   const previousSetSize = targetValue instanceof RuntimeSet ? targetValue.size : null;
   const removedIndex = applyLocalCollectionMutation(
     targetValue,
@@ -43889,7 +43982,7 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
     ctx,
     isLookupSet,
     ins.reference !== true && ins.mutation === "Remove" /* Remove */ && isArrayCollection(targetValue) && setEntryMember === null && !isLookupSet && findKnownRowIdByValueReference(args[0], ctx) === null,
-    ins.reference === true,
+    ins.reference === true || referenceRemoval || removedReferenceRowId !== null,
     setEntryMember === null && decimalEntries
   );
   updateCollectionReferenceProvenance(
@@ -43901,8 +43994,12 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
   if (removableRowIds !== null) {
     const key = Array.isArray(targetValue) ? removedIndex : String(args[0]);
     for (const [entryKey, rowId] of removableRowIds) {
-      if (ins.mutation === "Clear" /* Clear */ || entryKey === key)
+      if (ins.mutation === "Clear" /* Clear */ || entryKey === key) {
         noteDetachedRow(rowId, null, ctx);
+        const known = removedMembers?.get(rowId);
+        if (known !== void 0)
+          ctx.__runtimeCollectionMembers?.set(known.row, known.contract);
+      }
     }
   }
   if (writesEntry && !(targetValue instanceof RuntimeSet)) {
@@ -43964,7 +44061,7 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
           targetValue.reference,
           ctx
         );
-        indexedAppend = indexRuntimeCollectionAppend(
+        indexedAppend = indexRuntimeCollectionChange(
           targetValue.source,
           overlayArgs[0],
           ctx
@@ -43974,6 +44071,34 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
       exportRuntimeSetValue(targetValue, ctx);
     }
   }
+  if (writesEntry && !(targetValue instanceof RuntimeSet)) {
+    if (Array.isArray(targetValue))
+      indexedAppend = indexRuntimeCollectionChange(
+        targetValue,
+        ins.mutation === "Insert" /* Insert */ ? overlayArgs[1] : overlayArgs[0],
+        ctx
+      );
+    else if (dictionary && isPlainRecord(targetValue))
+      indexedAppend = indexRuntimeCollectionChange(
+        targetValue,
+        overlayArgs[1],
+        ctx,
+        typeof replacedEntry === "string" ? [replacedEntry] : [],
+        String(args[0])
+      );
+  }
+  if (previousEdges !== null) {
+    const collection = targetValue instanceof RuntimeSet ? targetValue.source : targetValue;
+    if (Array.isArray(collection) || isPlainRecord(collection))
+      indexedAppend = indexRuntimeCollectionChange(
+        collection,
+        void 0,
+        ctx,
+        previousEdges,
+        void 0,
+        "contents"
+      );
+  }
   if (!indexedAppend) invalidateEvaluatorIndexes(ctx, targetValue);
   switch (ins.mutation) {
     case "Insert" /* Insert */:
@@ -43982,7 +44107,7 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
         target: ins.target,
         index: numberArg(args[0], "Insert index"),
         value: args[1],
-        valueId: findKnownRowIdByValueReference(args[1], ctx) ?? void 0,
+        valueId: insertedReferenceRowId ?? findKnownRowIdByValueReference(args[1], ctx) ?? void 0,
         ...resolvedDestinationFieldsForContainer(targetValue, ctx)
       });
       return;
@@ -43993,7 +44118,7 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
           target: ins.target,
           value: isLookupSet ? overlayArgs[0] : args[0],
           ...!isLookupSet ? {
-            valueId: unorderedContainerValueId !== null && typeof overlayArgs[0] === "string" ? overlayArgs[0] : findKnownRowIdByValueReference(args[0], ctx) ?? void 0
+            valueId: insertedReferenceRowId ?? (unorderedContainerValueId !== null && typeof overlayArgs[0] === "string" ? overlayArgs[0] : findKnownRowIdByValueReference(args[0], ctx) ?? void 0)
           } : {},
           ...resolvedDestinationFieldsForContainer(targetValue, ctx)
         });
@@ -44004,7 +44129,7 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
         target: ins.target,
         key: String(args[0]),
         value: args[1],
-        valueId: findKnownRowIdByValueReference(args[1], ctx) ?? void 0,
+        valueId: insertedReferenceRowId ?? findKnownRowIdByValueReference(args[1], ctx) ?? void 0,
         ...resolvedDestinationFieldsForContainer(targetValue, ctx)
       });
       return;
@@ -44015,7 +44140,7 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
           target: ins.target,
           value: isLookupSet ? overlayArgs[0] : args[0],
           ...!isLookupSet ? {
-            valueId: setMatch?.valueId ?? findKnownRowIdByValueReference(args[0], ctx) ?? void 0
+            valueId: removedReferenceRowId ?? setMatch?.valueId ?? findKnownRowIdByValueReference(args[0], ctx) ?? void 0
           } : {},
           ...resolvedDestinationFieldsForContainer(targetValue, ctx)
         });
@@ -44111,7 +44236,15 @@ function sortCollectionInPlace(ins, value, scope, ctx, options) {
     references
   );
   forgetLocalListIndexes(ctx, list);
-  invalidateEvaluatorIndexes(ctx, list);
+  if (!indexRuntimeCollectionChange(
+    list,
+    void 0,
+    ctx,
+    list.filter((entry) => typeof entry === "string"),
+    void 0,
+    "contents"
+  ))
+    invalidateEvaluatorIndexes(ctx, list);
   if (id2 !== null)
     options.writes.push({
       kind: "reorder",
@@ -44120,18 +44253,36 @@ function sortCollectionInPlace(ins, value, scope, ctx, options) {
       ...resolvedDestinationFieldsForContainer(list, ctx)
     });
 }
-function trackInsertedCollection(value, type2, parentValue, ctx) {
-  if (!isTypeInfoWithEntries(type2) && type2.type !== 9 /* Lookup */ || value === null || typeof value !== "object" || findKnownRowIdByValueReference(value, ctx) !== null)
-    return;
-  const parent = trackedRowForValueReference(parentValue, ctx);
+function storedCollectionEntryContract(collection, ctx) {
+  const parent = trackedRowForValueReference(collection, ctx);
   const placement = parent === null ? null : memberForValueRow(parent, ctx);
-  if (parent === null || placement === null) return;
+  if (parent === null || placement === null) return null;
   const genericEnv = rowGenericEnv(parent, ctx);
   const parentMember = substituteMember(placement, genericEnv, ctx.vm.members);
-  if (!isMemberWithEntries(parentMember)) return;
+  if (!isMemberWithEntries(parentMember)) return null;
   const entry = evalMemberById(ctx.vm, parentMember.entryMemberId);
-  if (entry === null) return;
-  const member = substituteMember(entry, genericEnv, ctx.vm.members);
+  if (entry === null) return null;
+  return {
+    entry,
+    member: substituteMember(entry, genericEnv, ctx.vm.members),
+    genericEnv
+  };
+}
+function trackInsertedCollection(value, type2, parentValue, ctx) {
+  if (value !== null && typeof value !== "object" && type2.type !== 9 /* Lookup */)
+    return null;
+  const contract = storedCollectionEntryContract(parentValue, ctx);
+  if (contract === null) return null;
+  const { entry, member, genericEnv } = contract;
+  const referenceEntry = isMemberLookupBase(member);
+  if (referenceEntry && isMultiSelectionMember(member) !== true) {
+    const target = lookupTargetTypeInfo(member, null, ctx);
+    const localCollection = target.type === 6 /* List */ && Array.isArray(value) || (target.type === 28 /* Set */ || target.type === 9 /* Lookup */) && value instanceof RuntimeSet || target.type === 5 /* Dictionary */ && isPlainRecord(value);
+    if (localCollection && findKnownRowIdByValueReference(value, ctx) === null)
+      return null;
+  }
+  if (!referenceEntry && (!isTypeInfoWithEntries(type2) && type2.type !== 9 /* Lookup */ || value === null || typeof value !== "object" || findKnownRowIdByValueReference(value, ctx) !== null))
+    return null;
   const createdValues = [];
   const collectionAliases = /* @__PURE__ */ new Map();
   const reservations = /* @__PURE__ */ new Map();
@@ -44146,13 +44297,21 @@ function trackInsertedCollection(value, type2, parentValue, ctx) {
       storageKeyDeclarations: /* @__PURE__ */ new Map(),
       collectionEntriesAreReferences: false,
       collectionAliases,
-      attachmentReservations: reservations
+      attachmentReservations: reservations,
+      insertedCollections: /* @__PURE__ */ new Set()
     });
     row.genericBindings = computeGenericBindingsStamp(
       entry,
       genericEnv,
       ctx.vm.members
     );
+    if (referenceEntry)
+      ctx.__runtimeCollectionMembers?.set(row, {
+        member: { ...entry, ...member },
+        members: ctx.vm.members,
+        classes: ctx.vm.classes,
+        bindings: row.genericBindings === void 0 ? void 0 : { ...row.genericBindings }
+      });
     for (const [encoded, alias] of collectionAliases) {
       retainEncodedCollectionAlias(encoded, alias, ctx);
     }
@@ -44160,6 +44319,7 @@ function trackInsertedCollection(value, type2, parentValue, ctx) {
       registerRuntimeSessionValue(ctx, created);
     if (ctx.__indexes !== void 0)
       indexEvaluatorRows(ctx.__indexes, createdValues);
+    return referenceEntry ? row.id : null;
   } catch (error) {
     for (const created of createdValues)
       ctx.__executionState?.constructorGroupDependencies.delete(created.id);
@@ -44230,7 +44390,7 @@ function storedSetEntryMember(collection, ctx) {
   }
   return substituteMember(
     entry,
-    runtimeGenericEnvForValueRow(container, ctx),
+    rowGenericEnv(container, ctx),
     ctx.vm.members
   );
 }
@@ -44595,7 +44755,11 @@ function applyLocalCollectionMutation(targetValue, mutation, args, ctx, unique =
         }
         return null;
       }
-      objectArg(targetValue, "Dictionary Add target")[String(args[0])] = args[1];
+      setOwnField(
+        objectArg(targetValue, "Dictionary Add target"),
+        String(args[0]),
+        args[1]
+      );
       return null;
     case "Remove" /* Remove */:
       if (Array.isArray(targetValue)) {
@@ -46345,7 +46509,11 @@ function runtimeParentGenericEnv(row, ctx, visited, readRow) {
   ctx.onUnattributableValueRead?.(
     ownershipChainRead("generic-parent-resolution", row.id)
   );
-  for (const link of evaluatorParentLinks(evaluatorIndexes(ctx), row.id)) {
+  for (const link of evaluatorParentLinks(
+    evaluatorIndexes(ctx),
+    row.id,
+    true
+  )) {
     const parent = readRow === void 0 ? evalValueById(
       ctx,
       link.parentId,
@@ -47476,7 +47644,11 @@ function resolveValueIfId(at3, ctx) {
     ctx.__valueOverlay
   );
   if (!row) return at3;
-  const member = memberForValueRow(row, ctx);
+  const placed = memberForValueRow(row, ctx);
+  const member = placed?.kind === 21 /* Generic */ ? {
+    ...placed,
+    ...substituteMember(placed, rowGenericEnv(row, ctx), ctx.vm.members)
+  } : placed;
   if (member !== null && isMemberEntryCollectionBase(member) && listKindOf(member) === 1 /* Unordered */ && Array.isArray(row.value)) {
     return evaluatorUnorderedListEntryIds(row.id, ctx);
   }
@@ -47815,7 +47987,25 @@ function resolveMemberForValueRow(row, ctx, visited) {
     const member = memberForCustomSchemaValue(classId, link.key, ctx);
     if (member !== null) return member;
   }
-  return null;
+  return runtimeCollectionMember(row, ctx);
+}
+function runtimeCollectionMember(row, ctx) {
+  const known = ctx.__runtimeCollectionMembers?.get(row);
+  if (known === void 0) return null;
+  if (known.members !== ctx.vm.members || known.classes !== ctx.vm.classes)
+    return null;
+  const bindings = row.genericBindings;
+  if (Object.keys(bindings ?? {}).length !== Object.keys(known.bindings ?? {}).length)
+    return null;
+  for (const [id2, memberId] of Object.entries(known.bindings ?? {}))
+    if (bindings?.[id2] !== memberId) return null;
+  if (row.value !== null) {
+    if ((isMemberEntryCollectionBase(known.member) || isMemberLookupBase(known.member)) && !Array.isArray(row.value))
+      return null;
+    if (isMemberDictionaryBase(known.member) && !isPlainRecord(row.value))
+      return null;
+  }
+  return known.member;
 }
 function* evaluatorParentEdges(row, ctx, indexes4) {
   const cache = ctx.__unorderedListProjections;
@@ -47824,7 +48014,7 @@ function* evaluatorParentEdges(row, ctx, indexes4) {
     yield { parentId: writtenParentId, key: "" };
   }
   const written = cache?.writtenContainerIds;
-  for (const link of indexes4.parentLinksByChildId.get(row.id) ?? []) {
+  for (const link of indexes4.placementParentLinksByChildId.get(row.id) ?? indexes4.parentLinksByChildId.get(row.id) ?? []) {
     if (written?.has(link.parentId) !== true) yield link;
   }
   const database = ctx.vm.databaseVM;
@@ -50901,6 +51091,7 @@ function publishConstructedRows(args) {
   if (beforeRetain !== null) {
     for (const rowId of beforeRetain) {
       if (retained.has(rowId)) continue;
+      if (constructorGroupForRow(rowId, ctx) !== null) continue;
       deleteRuntimeSessionValue(ctx, rowId);
     }
   }
@@ -50986,16 +51177,55 @@ function assertImplicitConstructionAllowed(schemaClass2) {
     `Class '${schemaClass2.name}' declares a required constructor, so it cannot be constructed without one.`
   );
 }
+function constructionReplayContext(descriptor, ctx) {
+  if (ctx.storedConstructionReplay !== true) return ctx;
+  const target = ctx.__storedInitializerReplay;
+  let rowId;
+  let candidate;
+  if (target !== void 0) {
+    const row = storedReplayRowById(target.rowId, ctx);
+    if (row !== null && classIdForValueRow(row, ctx) === descriptor.schemaClass.id) {
+      rowId = target.rowId;
+      candidate = { reattached: false };
+      target.candidates.push(candidate);
+    }
+  } else if (ctx.__executionState?.constructionStack.length === 0 && ctx.__storedConstructionReplaySlot?.classId === descriptor.schemaClass.id) {
+    rowId = ctx.__storedConstructionReplayRowId;
+  }
+  return {
+    ...ctx,
+    __storedInitializerReplay: void 0,
+    __storedReplayCandidate: candidate,
+    __storedConstructionReplayRowId: rowId,
+    __storedConstructionReplayRootId: void 0,
+    __storedConstructionReplaySlot: rowId === void 0 ? ctx.__storedConstructionReplaySlot : {
+      classId: descriptor.schemaClass.id,
+      classArguments: descriptor.classArguments ?? {}
+    }
+  };
+}
+function rollbackStoredConstructionReplay(ctx, checkpoint) {
+  if (checkpoint === void 0) return;
+  for (const row of createdSessionValuesSince(ctx, checkpoint))
+    deleteRuntimeSessionValue(ctx, row.id);
+  if (ctx.__storedReplayCandidate !== void 0)
+    ctx.__storedReplayCandidate.reattached = false;
+}
 function constructClassValue(info, scope, ctx) {
   const descriptor = validateClassConstructorDescriptor(
     info,
     ctx,
     ctx.constructionBaselineReplay !== true
   );
+  ctx = constructionReplayContext(descriptor, ctx);
   assertImplicitConstructionAllowed(descriptor.schemaClass);
+  const replayCheckpoint = ctx.__storedConstructionReplayRowId === void 0 ? void 0 : sessionCreationCheckpoint(ctx);
   const closeFrame = pushConstructionFrame(ctx, descriptor.schemaClass.name);
   try {
     return constructClassValueWithinFrame(descriptor, scope, ctx);
+  } catch (error) {
+    rollbackStoredConstructionReplay(ctx, replayCheckpoint);
+    throw error;
   } finally {
     closeFrame();
   }
@@ -51095,6 +51325,8 @@ function constructClassValueWithinFrame(descriptor, scope, ctx) {
     });
     root.classId = classId;
     stampConstructedRootGenericBindings(root, descriptor);
+    if (ctx.__storedReplayCandidate !== void 0)
+      ctx.__storedReplayCandidate.value = root.value;
     if (typeof root.value !== "object" || root.value === null || Array.isArray(root.value)) {
       throw new Error(
         `Class constructor for '${schemaClass2.name}' produced a non-record root.`
@@ -51524,15 +51756,20 @@ function constructionInitEvaluator(ctx, createdValues, argumentScopes, construct
       sourceValueId: sourceValueId ?? null,
       compileMemberId: scopeMemberId
     });
+    const childId = storedInitializerChildId(member, ctx);
+    const initializerCtx = childId === void 0 ? ctx : {
+      ...ctx,
+      __storedInitializerReplay: { rowId: childId, candidates: [] }
+    };
     const evaluate = (argumentValues = []) => {
-      return withConstructionGenericSlots(
+      const result = withConstructionGenericSlots(
         member,
-        ctx,
+        initializerCtx,
         genericEnv,
         () => evaluateInitializerInContext(
           init,
           member,
-          ctx,
+          initializerCtx,
           createdValues,
           argumentValues,
           sourceValueId ?? null,
@@ -51540,6 +51777,17 @@ function constructionInitEvaluator(ctx, createdValues, argumentScopes, construct
           genericEnv
         )
       );
+      for (const candidate of initializerCtx.__storedInitializerReplay?.candidates ?? []) {
+        if (!candidate.reattached) continue;
+        if (candidate.value !== result.value) {
+          throw new NSGetterRuntimeError(
+            `Stored initializer '${member.name}' constructed an already owned value outside its returned child. Call Clone() explicitly.`
+          );
+        }
+        if (ctx.__storedReplayCandidate !== void 0)
+          ctx.__storedReplayCandidate.reattached = true;
+      }
+      return result;
     };
     const ownerClassId = scopeMemberId === null ? null : owningClassId(scopeMemberId);
     const expectedArgumentCount = compiled.parameters.slice(2).length;
@@ -51752,6 +52000,13 @@ function evaluateInitializerInContext(init, member, ctx, createdValues, argument
       (argument2) => trackedRowForValueReference(argument2, ctx)?.id === existingValueRow.id
     )) {
       assertInitializerPlacement(existingValueRow.id, member, ctx);
+      if (storedInitializerChildId(member, ctx) === existingValueRow.id) {
+        return {
+          value: result.value,
+          classId: existingRuntimeClassId,
+          existingValueRow
+        };
+      }
     }
     if (existingValueRow !== null && existingRuntimeClassId !== null && isClassSlotMember(member)) {
       const storage = constructorArgumentStorage(existingValueRow.id, ctx);
@@ -51955,18 +52210,14 @@ function encodeRequiredConstructorArgument(args) {
     args.ctx.__valueOverlay
   ) !== null ? args.value : null;
   const adoptTracked = (id2, suffix) => {
-    if (constructorGroupForRow(id2, args.ctx) !== null) {
-      assertOwnedValueAttachable(
-        id2,
-        {
-          identity: `value:${args.ownerRootId}:constructorArg:${args.parameterId}:${suffix}`,
-          label: args.ownerRootId
-        },
-        `constructor argument '${args.parameterId}'`,
-        args.ctx,
-        true
-      );
-    }
+    recordConstructorGroupDependency(
+      id2,
+      {
+        identity: `value:${args.ownerRootId}:constructorArg:${args.parameterId}:${suffix}`,
+        label: args.ownerRootId
+      },
+      args.ctx
+    );
     return id2;
   };
   if (args.typeInfo.type === 21 /* Generic */) {
@@ -52887,7 +53138,8 @@ function constructDeclaredClassValue(info, scope, ctx) {
   const descriptor = validateClassConstructorDescriptor(info, ctx, false);
   const schemaClass2 = descriptor.schemaClass;
   const record7 = resolveDeclaredConstructorRecord(info, schemaClass2, ctx);
-  const replayCheckpoint = ctx.storedConstructionReplay === true && ctx.__storedConstructionReplayRowId !== void 0 && ctx.__storedConstructionReplaySlot?.classId === schemaClass2.id && ctx.__executionState?.constructionStack.length === 0 ? sessionCreationCheckpoint(ctx) : void 0;
+  ctx = constructionReplayContext(descriptor, ctx);
+  const replayCheckpoint = ctx.storedConstructionReplay === true && ctx.__storedConstructionReplayRowId !== void 0 && ctx.__storedConstructionReplaySlot?.classId === schemaClass2.id ? sessionCreationCheckpoint(ctx) : void 0;
   const closeFrame = pushConstructionFrame(ctx, schemaClass2.name);
   try {
     return constructDeclaredClassValueWithinFrame(
@@ -52898,11 +53150,7 @@ function constructDeclaredClassValue(info, scope, ctx) {
       ctx
     );
   } catch (error) {
-    if (replayCheckpoint !== void 0) {
-      for (const row of createdSessionValuesSince(ctx, replayCheckpoint)) {
-        deleteRuntimeSessionValue(ctx, row.id);
-      }
-    }
+    rollbackStoredConstructionReplay(ctx, replayCheckpoint);
     throw error;
   } finally {
     closeFrame();
@@ -52963,6 +53211,8 @@ function constructDeclaredClassValueWithinFrame(descriptor, record7, info, scope
     });
     root.classId = classId;
     stampConstructedRootGenericBindings(root, descriptor);
+    if (ctx.__storedReplayCandidate !== void 0)
+      ctx.__storedReplayCandidate.value = root.value;
   } catch (error) {
     if (error instanceof NSGetterRuntimeError) {
       positionAtPassingArgument(error, info, record7, argumentValues, ctx);
@@ -52975,7 +53225,7 @@ function constructDeclaredClassValueWithinFrame(descriptor, record7, info, scope
       `Declared constructor for '${schemaClass2.name}' produced a non-record root.`
     );
   }
-  if (ctx.storedConstructionReplay === true && ctx.__storedConstructionReplayRowId !== void 0 && ctx.__storedConstructionReplaySlot?.classId === classId && ctx.__executionState?.constructionStack.length === 1) {
+  if (ctx.storedConstructionReplay === true && ctx.__storedConstructionReplayRowId !== void 0 && ctx.__storedConstructionReplaySlot?.classId === classId) {
     ctx = { ...ctx, __storedConstructionReplayRootId: root.id };
   }
   const rootRecord = root.value;
@@ -53139,8 +53389,13 @@ function assertOwnedValueAttachable(valueId, destination, destinationName2, ctx,
     ctx,
     preflight?.parentEntries
   )) {
-    if (mode === "assign" && ownedAttachmentIdentity(owner, ctx) === ownedAttachmentIdentity(destination, ctx))
+    if (mode === "assign" && ownedAttachmentIdentity(owner, ctx) === ownedAttachmentIdentity(destination, ctx)) {
+      if (ctx.__storedReplayCandidate !== void 0 && ctx.__storedConstructionReplayRowId !== void 0 && owner.identity.startsWith(
+        `value:${ctx.__storedConstructionReplayRowId}:slot:`
+      ))
+        ctx.__storedReplayCandidate.reattached = true;
       continue;
+    }
     const error = new NSGetterRuntimeError(
       `Aggregate value '${valueId}' is already owned by parent value '${owner.label}' and cannot be attached to '${destinationName2}'. Call Clone() explicitly.`
     );
@@ -53149,23 +53404,6 @@ function assertOwnedValueAttachable(valueId, destination, destinationName2, ctx,
   }
   const reserved = ctx.__executionState?.ownedValueAttachments.get(valueId);
   if (reserved !== void 0 && (mode === "insert" || reserved.identity !== destination.identity)) {
-    const constructorArgumentReservation = reserved.identity.startsWith(
-      `value:${reserved.label}:constructorArg:`
-    );
-    const destinationConstructorGroup = constructorGroupForRow(
-      destination.label,
-      ctx
-    );
-    if (constructorArgumentReservation && (destination.label === reserved.label || destinationConstructorGroup === reserved.label || preflight?.constructorRootIds.has(reserved.label) === true)) {
-      if (preflight === void 0) {
-        ctx.__executionState?.ownedValueAttachments.set(valueId, destination);
-        recordConstructorGroupDependency(valueId, destination, ctx);
-      } else {
-        preflight.constructorArgumentTransfers.set(valueId, destination);
-        preflight.dependencies.set(valueId, destination);
-      }
-      return;
-    }
     throw new NSGetterRuntimeError(
       `Aggregate value '${valueId}' is already owned by parent value '${reserved.label}' and cannot be attached to '${destinationName2}'. Call Clone() explicitly.`
     );
@@ -53177,6 +53415,29 @@ function assertOwnedValueAttachable(valueId, destination, destinationName2, ctx,
     recordConstructorGroupDependency(valueId, destination, ctx);
   else preflight.dependencies.set(valueId, destination);
 }
+function storedReplayRowById(id2, ctx) {
+  ctx.valueDependencies?.add(id2);
+  ctx.__getterReads?.add(id2);
+  const database = ctx.vm.databaseVM;
+  if (database?.storedValueById !== void 0)
+    return database.storedValueById(id2);
+  if (database?.evaluatorIndexes !== void 0)
+    return database.evaluatorIndexes.valueById.get(id2) ?? null;
+  return ctx.vm.values.find((row) => row.id === id2) ?? null;
+}
+function storedInitializerChildId(member, ctx) {
+  if (ctx.storedConstructionReplay !== true) return void 0;
+  const parentId = ctx.__storedConstructionReplayRowId;
+  const memberId = Reflect.get(member, "id");
+  if (parentId === void 0 || typeof memberId !== "string") return void 0;
+  const parent = storedReplayRowById(parentId, ctx);
+  if (parent?.value === null || typeof parent?.value !== "object")
+    return void 0;
+  const schemaKey = cachedSchemaKeyForMember(memberId, ctx);
+  if (schemaKey === null) return void 0;
+  const childId = Reflect.get(parent.value, schemaKey);
+  return typeof childId === "string" ? childId : void 0;
+}
 function assertInitializerPlacement(valueId, member, ctx) {
   const replayRowId = ctx.__storedConstructionReplayRowId;
   const memberId = Reflect.get(member, "id");
@@ -53213,7 +53474,7 @@ function ownershipParentEntryKeys(value, valueId, cache) {
   }
   return entries.get(valueId) ?? [];
 }
-function currentOwnedValueAttachments(valueId, ctx, parentEntries, placingMembers) {
+function currentOwnedValueAttachments(valueId, ctx, parentEntries) {
   const indexes4 = evaluatorIndexes(ctx);
   const cached = indexes4.ownedValueAttachmentsByValueId.get(valueId);
   if (cached !== void 0) return [...cached];
@@ -53262,7 +53523,7 @@ function currentOwnedValueAttachments(valueId, ctx, parentEntries, placingMember
     ownershipChainRead("owned-value-parents", valueId)
   );
   const parentIds = new Set(
-    evaluatorParentLinks(indexes4, valueId).map((link) => link.parentId)
+    evaluatorParentLinks(indexes4, valueId, true).map((link) => link.parentId)
   );
   for (const parentId of parentIds) {
     const parent = evalValueById(
@@ -53276,14 +53537,7 @@ function currentOwnedValueAttachments(valueId, ctx, parentEntries, placingMember
     let member = null;
     let classId = parent.classId;
     if (classId === void 0 || classId === null) {
-      member = activeStaticBindingRoot(parent.id, ctx)?.member ?? (placingMembers === void 0 ? memberForValueRow(parent, ctx) : placingMember(
-        parent,
-        ctx,
-        void 0,
-        0,
-        placingMembers,
-        parentEntries
-      ));
+      member = activeStaticBindingRoot(parent.id, ctx)?.member ?? memberForValueRow(parent, ctx);
       if (member !== null) {
         try {
           member = resolveMember(member, ctx.vm.members);
@@ -53672,6 +53926,35 @@ function materializeConstructorArgumentValue(args) {
       args.destinationName ?? args.member.name,
       args.ctx
     );
+  if (args.insertedCollections !== void 0 && (isMemberEntryCollectionBase(args.member) || isMemberDictionaryBase(args.member)) && typeof args.value === "object" && args.value !== null) {
+    const tracked = trackedRowForValueReference(args.value, args.ctx);
+    if (tracked !== null) {
+      if (args.owner === void 0)
+        throw new NSGetterRuntimeError(
+          "Inserted collection has no destination."
+        );
+      if (!args.attachmentReservations?.has(tracked.id))
+        args.attachmentReservations?.set(
+          tracked.id,
+          args.ctx.__executionState?.ownedValueAttachments.get(tracked.id)
+        );
+      assertOwnedValueAttachable(
+        tracked.id,
+        args.owner,
+        args.destinationName ?? args.member.name,
+        args.ctx,
+        true,
+        "insert"
+      );
+      return tracked;
+    }
+    const identity3 = args.value instanceof RuntimeSet ? args.value.source : args.value;
+    if (args.insertedCollections.has(identity3))
+      throw new NSGetterRuntimeError(
+        "Inserted collection graph contains a duplicate owned collection. Call Clone() explicitly."
+      );
+    args.insertedCollections.add(identity3);
+  }
   const collectionAlias = args.value;
   if (args.value instanceof RuntimeSet)
     args = {
@@ -53722,7 +54005,7 @@ function materializeConstructorArgumentValue(args) {
         args.ctx
       )
     );
-    if (collectionAlias instanceof RuntimeSet)
+    if (collectionAlias instanceof RuntimeSet && isMultiSelectionMember(args.member) === true)
       args.collectionAliases?.set(row, collectionAlias);
     return row;
   }
@@ -54894,7 +55177,7 @@ function validateRangeBound(value, name) {
   if (typeof value !== "number" || !Number.isSafeInteger(value))
     throw new NSGetterRuntimeError(`Range ${name} must be a safe int.`);
 }
-var DELEGATE_LEXICAL_THIS, DELEGATE_LEXICAL_ROOT, DELEGATE_LEXICAL_TYPE_ARGUMENTS, NonCatchableNSGetterRuntimeError, NativeFunctionDelegateUnavailableError, CorruptNeoScriptIRError, NeoScriptWallClockTimeoutError, liveListIndexesByProject, evaluatorOwnershipCachesByBase, MAX_CONSTRUCTION_DEPTH, resolutionCacheByMembers, NO_SCHEMA_REVISION, NO_INTERFACES, LazyValueOverlay, READONLY_FOREACH_BINDING_ERROR, READONLY_CATCH_BINDING_ERROR, DIALOGUE_CONTEXT_PARAMETER_ID, validatedExecutionBodies, validatedGeneratorSchemas, STRING_TYPE_INFO, INT_TYPE_INFO, STORE_LIFETIME, STORE_NAMES, FORWARDING_TYPE_ARGUMENTS, constantDeclarationRoots, UNKNOWN_LOOKUP_TARGET, MAX_AREA_DEPTH, getAreaNative, SYSTEM_NATIVE_HANDLERS, NS_MATH_OP_NAMES, DOUBLE_INTEGRAL_MAGNITUDE, orderedQueryResults, EMPTY_SUPPLIED_CONSTRUCTOR_FIELDS, variantResolutionCopiesByOverlay, NO_BOUND_MEMBERS, NO_GENERIC_ENV, RuntimeSequenceCursor, RuntimeSequence, RuntimeRange, RangeSequenceCursor, RuntimeGeneratorSequence, GeneratorSequenceCursor, CollectionSequenceCursor, sequenceProtocolPointers;
+var DELEGATE_LEXICAL_THIS, DELEGATE_LEXICAL_ROOT, DELEGATE_LEXICAL_TYPE_ARGUMENTS, NonCatchableNSGetterRuntimeError, NativeFunctionDelegateUnavailableError, CorruptNeoScriptIRError, NeoScriptWallClockTimeoutError, liveListIndexesByProject, EvaluatorParentLinks, evaluatorOwnershipCachesByBase, MAX_CONSTRUCTION_DEPTH, resolutionCacheByMembers, NO_SCHEMA_REVISION, NO_INTERFACES, LazyValueOverlay, READONLY_FOREACH_BINDING_ERROR, READONLY_CATCH_BINDING_ERROR, DIALOGUE_CONTEXT_PARAMETER_ID, validatedExecutionBodies, validatedGeneratorSchemas, STRING_TYPE_INFO, INT_TYPE_INFO, STORE_LIFETIME, STORE_NAMES, FORWARDING_TYPE_ARGUMENTS, constantDeclarationRoots, UNKNOWN_LOOKUP_TARGET, MAX_AREA_DEPTH, getAreaNative, SYSTEM_NATIVE_HANDLERS, NS_MATH_OP_NAMES, DOUBLE_INTEGRAL_MAGNITUDE, orderedQueryResults, EMPTY_SUPPLIED_CONSTRUCTOR_FIELDS, variantResolutionCopiesByOverlay, NO_BOUND_MEMBERS, NO_GENERIC_ENV, RuntimeSequenceCursor, RuntimeSequence, RuntimeRange, RangeSequenceCursor, RuntimeGeneratorSequence, GeneratorSequenceCursor, CollectionSequenceCursor, sequenceProtocolPointers;
 var init_evaluateNSGetter = __esm({
   "../packages/neoscript-runtime/src/neoscript/evaluateNSGetter.ts"() {
     "use strict";
@@ -54993,6 +55276,69 @@ var init_evaluateNSGetter = __esm({
       }
     };
     liveListIndexesByProject = /* @__PURE__ */ new WeakMap();
+    EvaluatorParentLinks = class {
+      ordinary = /* @__PURE__ */ new Map();
+      buckets = /* @__PURE__ */ new Map();
+      /** Only shared selection targets need direct parent removal. */
+      indexParents(childId) {
+        if (this.buckets.has(childId)) return;
+        const links = this.ordinary.get(childId) ?? [];
+        this.ordinary.delete(childId);
+        this.buckets.set(childId, { links: /* @__PURE__ */ new Set(), byParent: /* @__PURE__ */ new Map() });
+        for (const link of links) this.add(childId, link);
+      }
+      get(childId) {
+        const bucket = this.buckets.get(childId);
+        if (bucket === void 0) return this.ordinary.get(childId);
+        return bucket.snapshot ??= [...bucket.links];
+      }
+      has(childId) {
+        return this.buckets.has(childId) || this.ordinary.has(childId);
+      }
+      add(childId, link) {
+        const bucket = this.buckets.get(childId);
+        if (bucket === void 0) {
+          const links = this.ordinary.get(childId) ?? [];
+          links.push(link);
+          this.ordinary.set(childId, links);
+          return;
+        }
+        bucket.links.add(link);
+        let parent = bucket.byParent.get(link.parentId);
+        if (parent === void 0) {
+          parent = /* @__PURE__ */ new Set();
+          bucket.byParent.set(link.parentId, parent);
+        }
+        parent.add(link);
+        bucket.snapshot = void 0;
+      }
+      remove(childId, parentId, key) {
+        const bucket = this.buckets.get(childId);
+        if (bucket === void 0) {
+          const links = this.ordinary.get(childId)?.filter(
+            (link) => link.parentId !== parentId || key !== void 0 && link.key !== key
+          );
+          if (links === void 0 || links.length === 0)
+            this.ordinary.delete(childId);
+          else this.ordinary.set(childId, links);
+          return;
+        }
+        const parent = bucket.byParent.get(parentId);
+        if (parent === void 0) return;
+        for (const link of parent) {
+          if (key !== void 0 && link.key !== key) continue;
+          bucket.links.delete(link);
+          parent.delete(link);
+          bucket.snapshot = void 0;
+        }
+        if (parent.size === 0) bucket.byParent.delete(parentId);
+        if (bucket.links.size === 0) this.buckets.delete(childId);
+      }
+      delete(childId) {
+        this.ordinary.delete(childId);
+        this.buckets.delete(childId);
+      }
+    };
     evaluatorOwnershipCachesByBase = /* @__PURE__ */ new WeakMap();
     MAX_CONSTRUCTION_DEPTH = 64;
     resolutionCacheByMembers = /* @__PURE__ */ new WeakMap();
@@ -69469,8 +69815,8 @@ var init_strict_resolver = __esm({
           this.persistingMethodGroup = false;
         }
       }
-      /** P112 §2.2. Checks a stored default's `Reference(place)` the push can't settle. */
-      resolvePersistedReference(expression, expected) {
+      /** Check an initializer with its expected type, including contextual expressions. */
+      validateInitializerExpression(expression, expected) {
         const resolved = this.resolveExpression(
           expression,
           this.initialScope(),
@@ -75244,6 +75590,8 @@ var init_strict_resolver = __esm({
           }
           const staticType = this.project.typeByName.get(receiverAst.name);
           if (staticType && staticType.kind !== "enum") {
+            if (receiverAst.typeQualifier)
+              this.resolveType(receiverAst.typeQualifier);
             this.assertUserSafe(
               { kind: "named", typeId: staticType.id },
               "a static receiver",
@@ -75383,6 +75731,9 @@ var init_strict_resolver = __esm({
             pointer: listIndexPointer(receiver.pointer, index),
             type: viewType,
             writability: "readOnly" /* ReadOnly */,
+            ...receiver.entryWritability !== void 0 ? { entryWritability: receiver.entryWritability } : {},
+            entryUserData: receiver.entryUserData === true,
+            ...receiver.writeRoot !== void 0 ? { writeRoot: receiver.writeRoot } : {},
             indexDefinition: index,
             indexCollectionPointer: receiver.pointer
           };
@@ -75391,7 +75742,10 @@ var init_strict_resolver = __esm({
           return {
             pointer: receiver.pointer,
             type: { kind: "primitive", name: "unknown" },
-            indexSurface: receiver.type
+            indexSurface: receiver.type,
+            entryWritability: receiver.entryWritability ?? receiver.writability ?? "runtime" /* Runtime */,
+            entryUserData: receiver.entryWritability === void 0 ? receiver.userData === true : receiver.entryUserData === true,
+            writeRoot: this.expressionWriteRoot(receiver, scope)
           };
         }
         if ((name === "Keys" || name === "Values") && receiver.type.kind === "dictionary") {
@@ -75666,7 +76020,7 @@ var init_strict_resolver = __esm({
             pos
           );
         }
-        if (entry.id.startsWith(NEOSCRIPT_PENDING_SYMBOL_ID_PREFIX)) {
+        if (entry.id.startsWith(NEOSCRIPT_PENDING_SYMBOL_ID_PREFIX) && !this.options.allowPendingRegistryEntries) {
           throw new CompileError(
             `${registry.entryType} '${name}' has no @id, so it has never been pushed and has no project file to reference. Push the file before referencing it.`,
             pos
@@ -75794,7 +76148,10 @@ var init_strict_resolver = __esm({
               key.pointer
             ),
             type: resultType,
-            writability: "readOnly" /* ReadOnly */
+            writability: "readOnly" /* ReadOnly */,
+            ...receiver.entryWritability !== void 0 ? { entryWritability: receiver.entryWritability } : {},
+            entryUserData: receiver.entryUserData === true,
+            ...receiver.writeRoot !== void 0 ? { writeRoot: receiver.writeRoot } : {}
           };
         }
         const readonlyCollection = receiver.symbol?.readonlyDeclaration === true && receiver.initWritability !== void 0 ? {
@@ -76630,6 +76987,8 @@ var init_strict_resolver = __esm({
           }
           const staticType = this.project.typeByName.get(callee.receiver.name);
           if (staticType && staticType.kind !== "enum") {
+            if (callee.receiver.typeQualifier)
+              this.resolveType(callee.receiver.typeQualifier);
             this.assertUserSafe(
               { kind: "named", typeId: staticType.id },
               "a static receiver",
@@ -85231,7 +85590,10 @@ function formatNeoScript(text, options = {}) {
   const literalNewlines = /* @__PURE__ */ new Set();
   const delimiterTokensByLine = /* @__PURE__ */ new Map();
   const tokensByLine = /* @__PURE__ */ new Map();
-  const lambdaBraceOffsets = /* @__PURE__ */ new Set();
+  const braceHeaderLines = /* @__PURE__ */ new Map();
+  const parenthesisLines = [];
+  const genericLines = [];
+  let previousHeaderLine = 0;
   const genericOffsets = genericAngleOffsets(syntax.lexed.tokens);
   const continuationOperator = (token) => !genericOffsets.has(token.start) && isContinuationOperator(token);
   let annotationState = "none";
@@ -85267,9 +85629,22 @@ function formatNeoScript(text, options = {}) {
         tripleString = { token, previous: previousSignificantToken };
     }
     if (token.kind !== "comment" && token.kind !== "eof") {
-      if (token.kind === "punctuation" && token.text === "{" && previousSignificantToken?.kind === "operator" && previousSignificantToken.text === "=>") {
-        lambdaBraceOffsets.add(token.start);
-      }
+      let headerLine = token.range.start.line;
+      const followsTypeOrName = previousSignificantToken?.kind === "identifier" || previousSignificantToken?.text === "new" || previousSignificantToken?.text === ">" && genericOffsets.has(previousSignificantToken.start);
+      if (token.kind === "identifier" && previousSignificantToken?.text === "new" || token.text === "(" && followsTypeOrName)
+        headerLine = previousHeaderLine;
+      if (genericOffsets.has(token.start)) {
+        if (token.text === "<") genericLines.push(previousHeaderLine);
+        if (token.text === ">") headerLine = genericLines.pop() ?? headerLine;
+      }
+      if (token.text === "(") parenthesisLines.push(headerLine);
+      if (token.text === ")") headerLine = parenthesisLines.pop() ?? headerLine;
+      if (token.text === "{")
+        braceHeaderLines.set(
+          token.start,
+          previousSignificantToken?.text === ")" || previousSignificantToken?.text === "=>" || previousSignificantToken?.kind === "identifier" || previousSignificantToken?.text === ">" && genericOffsets.has(previousSignificantToken.start) ? previousHeaderLine : headerLine
+        );
+      previousHeaderLine = headerLine;
       let annotationEnd = false;
       if (token.kind === "punctuation" && token.text === "@" && annotationDepth === 0)
         annotationState = "name";
@@ -85298,6 +85673,8 @@ function formatNeoScript(text, options = {}) {
   }
   const formatted = [];
   const delimiters = [];
+  const lineDepths = /* @__PURE__ */ new Map();
+  const braceHeaderDepth = (token) => lineDepths.get(braceHeaderLines.get(token.start) ?? -1);
   const continuations = /* @__PURE__ */ new Set();
   let preceding;
   let aligning;
@@ -85331,14 +85708,21 @@ function formatNeoScript(text, options = {}) {
     const sectionDepth = switchSectionIndentDepth(syntax.parsed, contentOffset);
     const leadingState = cloneDelimiterStack(delimiters);
     for (const token of leadingClosers) {
-      applyDelimiterToken(leadingState, token, lambdaBraceOffsets);
+      applyDelimiterToken(leadingState, token);
     }
-    const depth = delimiterDepth(leadingState);
+    let depth = delimiterDepth(leadingState);
     const significant = tokensByLine.get(lineIndex) ?? [];
-    pruneContinuations(continuations, leadingState);
+    lineDepths.set(lineIndex, depth);
     const first = significant[0];
+    const continuationScope = leadingState.at(-1)?.openingOffset ?? -1;
+    if (first?.text === "{") {
+      applyDelimiterToken(leadingState, first, braceHeaderDepth(first));
+      depth = delimiterDepth(leadingState) - 1;
+      lineDepths.set(lineIndex, depth);
+    }
+    pruneContinuations(continuations, leadingState);
     if (leadingClosers.length === 0 && (first !== void 0 && continuationOperator(first) && preceding !== void 0 && canEndExpression(preceding) || preceding !== void 0 && continuationOperator(preceding)))
-      continuations.add(leadingState.at(-1)?.openingOffset ?? -1);
+      continuations.add(continuationScope);
     const lineDepth = depth + sectionDepth + continuations.size;
     const normalized = first?.range.start.character === firstContentCharacter ? normalizeControlHeaderSpacing(content) : content;
     const indent2 = indentUnit.repeat(lineDepth);
@@ -85349,7 +85733,7 @@ function formatNeoScript(text, options = {}) {
     if (standalone !== void 0 && standalone.closingIndent !== indent2)
       aligning = { ...standalone, indent: indent2 };
     for (const token of lineTokens) {
-      applyDelimiterToken(delimiters, token, lambdaBraceOffsets);
+      applyDelimiterToken(delimiters, token, braceHeaderDepth(token));
     }
     pruneContinuations(continuations, delimiters);
     const last = significant.at(-1);
@@ -85490,25 +85874,26 @@ function leadingClosingTokens(lineTokens, firstContentCharacter) {
   }
   return result;
 }
-function applyDelimiterToken(stack, token, lambdaBraceOffsets) {
+function applyDelimiterToken(stack, token, headerDepth) {
   if (isOpeningDelimiter(token.text)) {
-    let restores;
-    if (token.text === "{" && lambdaBraceOffsets.has(token.start)) {
-      for (let index = stack.length - 1; index >= 0; index--) {
+    const restores = [];
+    if (token.text === "{" && headerDepth !== void 0) {
+      let depth = delimiterDepth(stack);
+      for (let index = stack.length - 1; index >= 0 && depth > headerDepth; index--) {
         const candidate = stack[index];
-        if (candidate?.text === "(" && candidate.contributes && candidate.openingLine === token.range.start.line) {
-          restores = candidate;
-          break;
+        if (candidate?.text === "{") break;
+        if (candidate?.text === "(" && candidate.contributes) {
+          restores.push(candidate);
+          candidate.contributes = false;
+          depth--;
         }
       }
-      if (restores) restores.contributes = false;
     }
     stack.push({
       text: token.text,
-      openingLine: token.range.start.line,
       openingOffset: token.start,
       contributes: true,
-      ...restores ? { restores } : {}
+      ...restores.length > 0 ? { restores } : {}
     });
     return;
   }
@@ -85522,7 +85907,7 @@ function applyDelimiterToken(stack, token, lambdaBraceOffsets) {
   }
   if (frameIndex < 0) return;
   const [frame] = stack.splice(frameIndex, 1);
-  if (frame?.restores) frame.restores.contributes = true;
+  for (const restored of frame?.restores ?? []) restored.contributes = true;
 }
 function pruneContinuations(continuations, stack) {
   const scopes = /* @__PURE__ */ new Set([-1, ...stack.map((frame) => frame.openingOffset)]);
@@ -85533,20 +85918,11 @@ function delimiterDepth(stack) {
   return stack.filter((frame) => frame.contributes).length;
 }
 function cloneDelimiterStack(stack) {
-  const clones = stack.map((frame) => ({
+  return stack.map((frame) => ({
     text: frame.text,
-    openingLine: frame.openingLine,
     openingOffset: frame.openingOffset,
     contributes: frame.contributes
   }));
-  for (let index = 0; index < stack.length; index++) {
-    const restores = stack[index]?.restores;
-    if (!restores) continue;
-    const restoreIndex = stack.indexOf(restores);
-    if (restoreIndex < 0) continue;
-    clones[index] = { ...clones[index], restores: clones[restoreIndex] };
-  }
-  return clones;
 }
 function matchingOpeningDelimiter(value) {
   switch (value) {
@@ -97298,7 +97674,11 @@ function validateMember(uri, member, ownerName, documentKind, ownerScope, enviro
       member.initializer.text,
       memberType2,
       scope,
-      member.modifiers.includes("static") ? { ...environment, staticMember: true } : environment,
+      {
+        ...environment,
+        staticMember: member.modifiers.includes("static"),
+        checkComputedInitializers: true
+      },
       member.initializer.range,
       diagnostics,
       anchorOf(member.initializer),
@@ -98222,6 +98602,80 @@ function knownGeneratorExpression(expression, scope, environment) {
   return candidates !== void 0 && candidates.length > 0 && candidates.every((member) => member.generator === true);
 }
 function validateExpression(expression, expected, scope, environment, uri, range2, diagnostics, anchor, storedValue = true) {
+  const sourceOnly = expected !== void 0 && (isNeoVariantTypeName(expected.name) || expected.name === "NeoAction" || expected.name === "ImageRef");
+  let receiver = expression;
+  if (environment.checkComputedInitializers) {
+    while (receiver.kind === "member") receiver = receiver.receiver;
+  }
+  const computed = environment.checkComputedInitializers && !sourceOnly && (expression.kind === "member" && (receiver.kind !== "ident" || receiver.typeQualifier !== void 0) || [
+    "binary",
+    "unary",
+    "force",
+    "coalesce",
+    "conditional",
+    "switchExpression",
+    "is",
+    "lambda",
+    "index",
+    "litInterp",
+    "litTripleString",
+    "call"
+  ].includes(expression.kind)) && !isReferenceCall(expression);
+  const count = diagnostics.length;
+  validateStoredExpression(
+    expression,
+    expected,
+    scope,
+    computed || sourceOnly || expression.kind === "member" ? { ...environment, checkComputedInitializers: false } : environment,
+    uri,
+    range2,
+    diagnostics,
+    anchor,
+    storedValue
+  );
+  if (!computed || diagnostics.length !== count) return;
+  const { context, resolver, parameterNames, parameterTypes } = initializerResolver(
+    environment,
+    scope.get("this")?.name ?? "",
+    environment.staticMember,
+    "initializer"
+  );
+  try {
+    const reads = new Set(
+      collectIdentifierReads(expression, parameterNames).map(
+        (read) => read.name
+      )
+    );
+    const parameters = [...reads].map((name) => ({
+      name,
+      type: parameterTypes.get(name)
+    }));
+    const scopedResolver = parameters.length === 0 ? resolver : new StrictNeoScriptResolver(
+      { ...context, parameters },
+      environment.projectIndex,
+      void 0,
+      { allowPendingRegistryEntries: true }
+    );
+    scopedResolver.validateInitializerExpression(
+      expression,
+      expected === void 0 ? void 0 : resolveNeoScriptType(
+        semanticAst(expected, expression.pos),
+        context,
+        environment.projectIndex
+      )
+    );
+  } catch (error) {
+    if (!(error instanceof CompileError)) throw error;
+    pushDiagnostic(
+      diagnostics,
+      uri,
+      anchor ? anchorSpan(anchor, error, 1) : range2,
+      "invalid-computed-initializer",
+      error.message.replace(/^\d+:\d+: /, "")
+    );
+  }
+}
+function validateStoredExpression(expression, expected, scope, environment, uri, range2, diagnostics, anchor, storedValue = true) {
   if (anchor !== void 0 && expression.kind === "call") {
     const error = sourceCallBinding(expression, scope, environment)?.error;
     if (error?.message.includes(
@@ -98446,7 +98900,7 @@ function validateExpression(expression, expected, scope, environment, uri, range
         // Enum dictionaries also preserve quoted option IDs, including orphaned IDs.
         entry.key.kind === "litString" ? void 0 : key,
         scope,
-        environment,
+        { ...environment, checkComputedInitializers: false },
         uri,
         range2,
         diagnostics,
@@ -98628,6 +99082,17 @@ function validateExpression(expression, expected, scope, environment, uri, range
   }
   if (expression.kind === "new") {
     const typeName = expression.className ?? expected?.name;
+    if (typeName === "List" || typeName === "Set" || typeName === "Dictionary") {
+      const literal3 = typeName === "Dictionary" ? "{}" : "[]";
+      pushDiagnostic(
+        diagnostics,
+        uri,
+        anchor ? anchorSpan(anchor, expression.pos, 3) : range2,
+        "collection-construction",
+        `${typeName} has no constructor. Use ${literal3} for an empty collection.`
+      );
+      return;
+    }
     const declaration = typeName ? environment.types.get(typeName) : void 0;
     for (const entry of expression.initializer ?? []) {
       if (entry.name !== "layerClassId") continue;
@@ -99561,24 +100026,49 @@ function wrappedTypeParameterConstruction(declaration, typeArguments, scope, env
   }
   return target.kind === "named" ? wrappedTypeParameterMessage(target, environment.projectIndex) : null;
 }
-function initializerResolver(environment, thisName, staticMember) {
+function initializerResolver(environment, thisName, staticMember, kind = "initializerExpression") {
   const declaring = environment.projectIndex.typeByName.get(thisName);
-  const key = `${declaring?.id ?? ""}:${staticMember}`;
+  const key = `${declaring?.id ?? ""}:${staticMember}:${kind}`;
   let entry = environment.initializerResolvers.get(key);
   if (entry === void 0) {
     const declaringType = declaring ? { kind: "named", typeId: declaring.id } : void 0;
     const context = {
       project: environment.project,
-      kind: "initializerExpression",
+      kind,
       ...declaringType ? {
         declaringType,
         implicitMemberAccess: true,
         ...staticMember ? { staticMember } : { thisClass: declaringType }
       } : {}
     };
+    const parameterTypes = /* @__PURE__ */ new Map();
+    if (kind === "initializer" && !staticMember) {
+      const owner = environment.types.get(thisName);
+      for (const parameter4 of owner?.headerParameters ?? []) {
+        try {
+          parameterTypes.set(
+            parameter4.name,
+            resolveNeoScriptType(
+              semanticAst(semanticType(parameter4.type), { line: 1, column: 1 }),
+              context,
+              environment.projectIndex
+            )
+          );
+        } catch (error) {
+          if (!(error instanceof CompileError)) throw error;
+        }
+      }
+    }
     entry = {
       context,
-      resolver: new StrictNeoScriptResolver(context, environment.projectIndex)
+      parameterNames: new Set(parameterTypes.keys()),
+      parameterTypes,
+      resolver: new StrictNeoScriptResolver(
+        context,
+        environment.projectIndex,
+        void 0,
+        { allowPendingRegistryEntries: true }
+      )
     };
     environment.initializerResolvers.set(key, entry);
   }
@@ -100128,7 +100618,7 @@ function validatePlaceReference(expression, expected, thisName, environment, rep
     environment.staticMember
   );
   try {
-    resolver.resolvePersistedReference(
+    resolver.validateInitializerExpression(
       expression,
       expected === void 0 ? void 0 : resolveNeoScriptType(
         semanticAst(expected, expression.pos),
@@ -141733,8 +142223,8 @@ var init_project_commit_preparation_scoped_loader = __esm({
 // ../src/database/compiled-construction-types.ts
 function compiledConstructionTypeMembers(members2, bodies, projectId) {
   const created = [];
-  const createdKeys = [];
-  let existingIds;
+  const processedKeys = [];
+  let existingMembers;
   const byType = /* @__PURE__ */ new Map();
   const key = (type2) => canonicalJsonStringify(type2);
   const intern = (type2, slot) => {
@@ -141747,21 +142237,21 @@ function compiledConstructionTypeMembers(members2, bodies, projectId) {
       `neo:compiled-construction-type:${projectId}:${cacheKey}`,
       v5_default.URL
     );
-    existingIds ??= new Set(members2.map((member) => member.id));
-    if (existingIds.has(id2)) {
-      byType.set(cacheKey, id2);
-      return id2;
-    }
+    existingMembers ??= new Map(members2.map((member) => [member.id, member]));
+    const storedMember = existingMembers.get(id2);
+    const alreadyStored = storedMember !== void 0;
     const common = {
       id: id2,
       projectId,
       createdAt: 0,
       updatedAt: 0,
       name: slot?.name ?? "Type argument",
+      ...slot?.format === void 0 ? {} : { format: slot.format },
       kind: type2.type,
       requirement: type2.required ? 1 /* Required */ : 0 /* Optional */
     };
     const mark = created.length;
+    const processedMark = processedKeys.length;
     const fields = (() => {
       if (type2.type === 30 /* Tuple */) {
         const elementMemberIds = [];
@@ -141776,7 +142266,15 @@ function compiledConstructionTypeMembers(members2, bodies, projectId) {
         return { elementMemberIds };
       }
       if (type2.type === 6 /* List */ || type2.type === 28 /* Set */ || type2.type === 5 /* Dictionary */) {
-        const entryMemberId = intern(type2.entryTypeInfo);
+        const storedEntryId = getField(storedMember, "entryMemberId");
+        const entryMemberId = intern(
+          type2.entryTypeInfo,
+          type2.type === 28 /* Set */ && type2.entryTypeInfo.type === 3 /* String */ ? {
+            id: typeof storedEntryId === "string" ? storedEntryId : derivedEntryMemberId(id2),
+            name: "Item",
+            format: 1 /* Plain */
+          } : void 0
+        );
         if (entryMemberId === null) return null;
         return {
           entryMemberId,
@@ -141808,6 +142306,16 @@ function compiledConstructionTypeMembers(members2, bodies, projectId) {
       } else if (type2.type === 26 /* NSAction */) {
         return { argumentTypes: namedArguments2(type2.argumentTypes) };
       } else if (type2.type === 29 /* Reference */) {
+        const target = type2.targetTypeInfo;
+        if (target.type === 6 /* List */ || target.type === 5 /* Dictionary */ || target.type === 28 /* Set */) {
+          intern(target);
+        } else if (target.type === 9 /* Lookup */ && target.collectionMemberId === void 0 && target.collectionValueId === void 0 && target.entryTypeInfo.type !== NS_TYPE_UNKNOWN && target.entryTypeInfo.required && SET_ENTRY_MEMBER_KINDS.has(target.entryTypeInfo.type)) {
+          intern({
+            type: 28 /* Set */,
+            required: target.required,
+            entryTypeInfo: target.entryTypeInfo
+          });
+        }
         return {
           kind: 9 /* Lookup */,
           declaredTypeInfo: type2.targetTypeInfo
@@ -141819,13 +142327,16 @@ function compiledConstructionTypeMembers(members2, bodies, projectId) {
       }
     })();
     if (fields === null) {
-      for (const member of created.splice(mark)) existingIds.delete(member.id);
-      for (const key2 of createdKeys.splice(mark)) byType.delete(key2);
-      return null;
-    }
-    created.push({ ...common, ...fields });
-    createdKeys.push(cacheKey);
-    existingIds.add(id2);
+      for (const member of created.splice(mark))
+        existingMembers.delete(member.id);
+      for (const key2 of processedKeys.splice(processedMark)) byType.delete(key2);
+      if (!alreadyStored) return null;
+    } else if (!alreadyStored) {
+      const member = { ...common, ...fields };
+      created.push(member);
+      existingMembers.set(id2, member);
+    }
+    processedKeys.push(cacheKey);
     byType.set(cacheKey, id2);
     return id2;
   };
@@ -141877,10 +142388,12 @@ var init_compiled_construction_types = __esm({
     "use strict";
     init_dist_node();
     init_core();
+    init_set_entry_keys();
     init_neoscript_guards();
     init_neoscript();
     init_project_content_hash();
     init_tuple_element_member_id();
+    init_entry_member_id();
   }
 });
 
@@ -239894,7 +240407,7 @@ var releaseWorkspaceLock = () => void 0;
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.89.6");
+    console.log("0.89.8");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {