@neocompose/cli 0.89.5 → 0.89.7

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.5",
+      cliVersion: "0.89.7",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -38831,7 +38831,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 +39071,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 +39173,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 +39228,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 +39280,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 +39301,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 +39314,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 +40331,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 +40369,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,
@@ -41733,7 +41814,8 @@ function evalInstructions(instructions, scope, ctx, options) {
               target.pointer,
               scope,
               ctx,
-              destination
+              destination,
+              value
             );
             const through = genericSlotReference(
               member,
@@ -41757,7 +41839,8 @@ function evalInstructions(instructions, scope, ctx, options) {
                 target.pointer,
                 scope,
                 ctx,
-                destination
+                destination,
+                value
               );
             }
             if (target.structuredLeafKind !== void 0 && destination !== void 0)
@@ -41774,6 +41857,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 +41918,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 +42593,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 +42625,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);
+      Reflect.set(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 +42674,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 +42694,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);
@@ -42611,16 +42733,25 @@ function applyOverlayAssignment(target, targetTypeInfo, value, scope, ctx, desti
     }
     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;
   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);
@@ -43534,7 +43665,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 +43690,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 +43968,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 +43994,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 +44048,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 +44101,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 +44113,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 +44180,7 @@ function evalCollectionMutationInstruction(ins, scope, ctx, options) {
           targetValue.reference,
           ctx
         );
-        indexedAppend = indexRuntimeCollectionAppend(
+        indexedAppend = indexRuntimeCollectionChange(
           targetValue.source,
           overlayArgs[0],
           ctx
@@ -43974,6 +44190,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 +44226,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 +44237,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 +44248,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 +44259,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 +44355,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 +44372,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 +44416,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 +44438,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 +44509,7 @@ function storedSetEntryMember(collection, ctx) {
   }
   return substituteMember(
     entry,
-    runtimeGenericEnvForValueRow(container, ctx),
+    rowGenericEnv(container, ctx),
     ctx.vm.members
   );
 }
@@ -46345,7 +46624,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 +47759,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 +48102,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 +48129,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;
@@ -53262,7 +53567,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(
@@ -53672,6 +53977,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 +54056,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 +55228,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 +55327,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();
@@ -57142,6 +57539,7 @@ function rowGenericEnvironment(document, row, contextualRootMember) {
   for (const [paramId, binding] of envFromStamp(row.genericBindings)) {
     env.set(paramId, binding);
   }
+  closeForwardedGenericParams(env);
   return env;
 }
 function tryResolveTypeInfo(document, rawTypeInfo, env) {
@@ -141732,8 +142130,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) => {
@@ -141746,21 +142144,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 = [];
@@ -141775,7 +142173,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,
@@ -141807,6 +142213,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
@@ -141818,13 +142234,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;
   };
@@ -141876,10 +142295,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();
   }
 });
 
@@ -239893,7 +240314,7 @@ var releaseWorkspaceLock = () => void 0;
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.89.5");
+    console.log("0.89.7");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {