@neocompose/cli 0.89.11 → 0.89.13

package/dist/neo-runtime.mjs

@@ -19377,7 +19377,7 @@ var init_registry = __esm({
   "../packages/manifest/schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.89.11",
+      cliVersion: "0.89.13",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -25194,6 +25194,10 @@ function* staticMembersInitializedByName(analysis, syntax) {
     }
   }
 }
+function pendingLocalValueId(global) {
+  const source = global.source;
+  return `__pending__:value:${encodeURIComponent(source.uri)}:${source.range.start.line}:${source.range.start.character}:${encodeURIComponent(global.name)}`;
+}
 function typeText(type2) {
   return type2.name + (type2.arguments.length === 0 ? "" : `<${type2.arguments.map(typeText).join(", ")}>`) + (type2.nullable ? "?" : "");
 }
@@ -25243,6 +25247,7 @@ var init_local_values = __esm({
       resolve(expression, source, valueId) {
         if (expression.kind !== "ident") return { expression, source };
         let text;
+        let pendingIdentity;
         for (const step of this.chain(expression.name)) {
           const global = step.global;
           if (valueId !== void 0) {
@@ -25264,8 +25269,9 @@ var init_local_values = __esm({
             source: global.source,
             label: global.name
           };
+          pendingIdentity = this.scalarTypes.has(global.type.name) ? void 0 : pendingLocalValueId(global);
         }
-        return { expression, source, text };
+        return { expression, source, text, pendingIdentity };
       }
       /**
        * The expression and text a bare local name stands for, through any alias
@@ -25303,7 +25309,7 @@ var init_local_values = __esm({
        * Compile authoring locals without introducing runtime globals. The splices
        * are the uses of `code` this replaced.
        */
-      executable(code, runtimeIdentifiers = /* @__PURE__ */ new Set(), materializationRoot, identity3, storedValueAtPath) {
+      executable(code, runtimeIdentifiers = /* @__PURE__ */ new Set(), materializationRoot, identity3) {
         if (this.definitions.size === 0 || !mayUseLocalInitializer(code, this.definitions))
           return { code, splices: [] };
         const terminalName = (name) => {
@@ -25380,23 +25386,40 @@ var init_local_values = __esm({
               const annotation2 = terminal2.expression.kind === "annotated" ? terminal2.expression.annotations.find(
                 (entry) => entry.name === "id"
               )?.args[0] : void 0;
-              const existingId = storedValueAtPath?.(
-                materializationRoot,
-                placementPath
-              );
-              if (annotation2?.kind === "litString" && existingId !== annotation2.value) {
-                throw new Error(
-                  `Local initializer ${terminal2.global.name} has an @id that does not identify its existing row inside this constructor-backed owner. Remove that @id and let preparation assign the owning tree, or place the value directly in its own static member.`
-                );
-              }
               const source = terminal2.global.source;
               const suffix = this.scalarTypes.has(terminal2.global.type.name) ? `:${encodeURIComponent(JSON.stringify([materializationRoot, placementPath]))}` : "";
-              const id2 = annotation2?.kind === "litString" ? annotation2.value : `__pending__:value:${encodeURIComponent(source.uri)}:${source.range.start.line}:${source.range.start.character}:${encodeURIComponent(terminal2.global.name)}${suffix}`;
+              const id2 = annotation2?.kind === "litString" ? annotation2.value : `${pendingLocalValueId(terminal2.global)}${suffix}`;
+              if (annotation2?.kind === "litString")
+                identity3?.validateAuthoredId?.(id2);
               for (const { global } of steps) {
                 const owners = this.owners.get(global.name) ?? /* @__PURE__ */ new Map();
-                owners.set(existingId ?? id2, global.name);
+                owners.set(id2, global.name);
                 this.owners.set(global.name, owners);
               }
+              const normalizeLocation = (rootId, path2) => {
+                const seen = /* @__PURE__ */ new Set();
+                let location4 = { rootId, path: path2 };
+                while (!seen.has(location4.rootId)) {
+                  seen.add(location4.rootId);
+                  const parent = identity3?.sites.get(location4.rootId)?.materializedLocation ?? identity3?.storedParent?.(location4.rootId);
+                  if (parent === void 0) break;
+                  location4 = {
+                    rootId: parent.rootId,
+                    path: [...parent.path, ...location4.path]
+                  };
+                }
+                return location4;
+              };
+              const location3 = normalizeLocation(
+                materializationRoot,
+                placementPath
+              );
+              const prior = identity3?.sites.get(id2)?.materializedLocation;
+              const priorLocation = prior === void 0 ? void 0 : normalizeLocation(prior.rootId, prior.path);
+              if (priorLocation !== void 0 && (priorLocation.rootId !== location3.rootId || JSON.stringify(priorLocation.path) !== JSON.stringify(location3.path)))
+                throw new Error(
+                  `Local value ${terminal2.global.name} has two owning assignments. Use Reference(${terminal2.global.name}) for a reference, or duplicate its initializer.`
+                );
               identity3?.sites.set(id2, {
                 id: id2,
                 uri: source.uri,
@@ -25406,8 +25429,10 @@ var init_local_values = __esm({
                 stampForm: 0 /* Prefix */,
                 nestedListEntries: identity3.localListEntries(terminal2.global),
                 materializedLocation: {
-                  rootId: materializationRoot,
-                  path: placementPath
+                  preserveIdentity: !this.scalarTypes.has(
+                    terminal2.global.type.name
+                  ),
+                  ...location3
                 },
                 stampIdentity: annotation2 === void 0 && !this.scalarTypes.has(terminal2.global.type.name)
               });
@@ -51098,6 +51123,13 @@ function applyConstructorFields(args) {
       let kept = 0;
       for (const row of createdValues) {
         if (row.id === keptId || row.containerId === keptId) {
+          if (row.containerId === keptId) {
+            if (ctx.__indexes !== void 0)
+              unindexEvaluatorRow(ctx.__indexes, row);
+            delete row.containerId;
+            if (ctx.__indexes !== void 0)
+              indexEvaluatorRow(ctx.__indexes, row);
+          }
           createdById.delete(row.id);
           continue;
         }
@@ -54309,6 +54341,9 @@ function materializeConstructorArgumentValue(args) {
       for (const entry of rows) sourceEntries.push(entry.value);
     }
     const ids = [];
+    const authoredEntries = args.ctx.__constructionEntryIds === void 0 ? void 0 : [];
+    if (authoredEntries !== void 0)
+      args.ctx.__constructionEntryIds?.set(row.id, authoredEntries);
     const references = recordedReferenceEntries(sourceEntries, args.ctx) ?? (args.collectionEntriesAreReferences === false ? 1 /* Values */ : collectionReferences(sourceEntries, args.ctx));
     for (const [index, rawEntry] of sourceEntries.entries()) {
       if (args.collectionOwnerId !== void 0 && args.collectionEntriesAreReferences !== false && isReferenceEntry(references, index) && typeof rawEntry === "string" && evalValueById(
@@ -54318,6 +54353,7 @@ function materializeConstructorArgumentValue(args) {
         args.ctx.__valueOverlay
       ) !== null) {
         ids.push(rawEntry);
+        authoredEntries?.push(rawEntry);
         continue;
       }
       const entryValue = constructorCollectionEntryValue(
@@ -54339,6 +54375,7 @@ function materializeConstructorArgumentValue(args) {
         },
         destinationName: `${args.member.name}[${index}]`
       });
+      authoredEntries?.push(child2.id);
       if (listKindOf(args.member) === 1 /* Unordered */) {
         child2.containerId = row.id;
       } else {
@@ -54884,11 +54921,13 @@ function cloneClassValueGraph(receiver, expected, ctx) {
         );
         clonedRecord[key] = clonedChild.id;
       }
-    } else if (Array.isArray(sourceRow.value) && (isMemberEntryCollectionBase(sourceMember) || sourceTypeInfo?.type === 6 /* List */ || sourceTypeInfo?.type === 28 /* Set */)) {
+    } else if (Array.isArray(sourceRow.value) && (isMemberEntryCollectionBase(sourceMember) || isMemberTupleBase(sourceMember) || sourceTypeInfo?.type === 30 /* Tuple */ || sourceTypeInfo?.type === 6 /* List */ || sourceTypeInfo?.type === 28 /* Set */)) {
       const entryMember = isMemberEntryCollectionBase(sourceMember) ? evalMemberById(ctx.vm, sourceMember.entryMemberId) : null;
       const entryTypeInfo = sourceTypeInfo?.type === 6 /* List */ || sourceTypeInfo?.type === 28 /* Set */ ? sourceTypeInfo.entryTypeInfo : void 0;
-      if (entryMember !== null || entryTypeInfo !== void 0) {
-        clone.value = sourceRow.value.map((childId) => {
+      const tuple = isMemberTupleBase(sourceMember) ? sourceMember : null;
+      const tupleType = sourceTypeInfo?.type === 30 /* Tuple */ ? sourceTypeInfo : null;
+      if (entryMember !== null || entryTypeInfo !== void 0 || tuple !== null || tupleType !== null) {
+        clone.value = sourceRow.value.map((childId, index) => {
           if (typeof childId !== "string") return childId;
           const child2 = evalValueById(
             ctx,
@@ -54897,11 +54936,17 @@ function cloneClassValueGraph(receiver, expected, ctx) {
             ctx.__valueOverlay
           );
           if (child2 === null) return childId;
+          const elementMember = tuple === null ? entryMember : evalMemberById(ctx.vm, tuple.elementMemberIds[index]);
+          const elementType = tupleType === null ? entryTypeInfo : tupleType.elements[index]?.typeInfo;
+          if (elementMember === null && elementType === void 0)
+            throw new NSGetterRuntimeError(
+              `Class.Clone tuple element ${index} has no type descriptor.`
+            );
           return cloneRow2(
             child2,
-            entryMember,
+            elementMember,
             child2.containerId === sourceRow.id ? id2 : void 0,
-            entryTypeInfo
+            elementType
           ).id;
         });
         ctx.onUnattributableValueRead?.(containerEntriesRead(sourceRow.id));
@@ -57419,7 +57464,16 @@ var init_constructor_argument_ownership = __esm({
       ownershipFacts() {
         if (this.ownership !== void 0) return this.ownership;
         const targetValueIds = new Set(this.valuesById.keys());
-        const owners = resolveOwnerMembersForValues(this.document, targetValueIds);
+        const owners = resolveOwnerMembersForValues(
+          this.document,
+          targetValueIds,
+          [...this.contextualRootMembersByValueId ?? []].map(
+            ([valueId, member]) => ({
+              valueId,
+              member: resolveMember(member, this.document.members)
+            })
+          )
+        );
         this.ownership = {
           owners,
           independentlyOwnedValueIds: new Set(owners.keys())
@@ -57742,6 +57796,7 @@ function evaluateInitializerMaterialization(args) {
   const createdValues = [];
   const storageKeyDeclarations = /* @__PURE__ */ new Map();
   const evaluated = args.evaluateInitializer({
+    constructionEntryIds: args.constructionEntryIds,
     randomSource: args.randomSource,
     genericEnv: args.genericEnv,
     init: args.init,
@@ -57821,7 +57876,9 @@ function finalizeMaterializedRoot(args) {
   });
 }
 function materializeInitializerValue(args) {
+  const constructionEntryIds = args.captureConstructionEntries ? /* @__PURE__ */ new Map() : void 0;
   const { evaluated, createdValues, storageKeyDeclarations } = evaluateInitializerMaterialization({
+    constructionEntryIds,
     randomSource: args.randomSource,
     evaluateInitializer: args.evaluateInitializer,
     init: args.row.init,
@@ -57873,6 +57930,7 @@ function materializeInitializerValue(args) {
   return {
     root,
     createdValues,
+    constructionEntryIds,
     snapshot: evaluated.snapshot,
     pinnedRootSchemaKeys: evaluated.pinnedRootSchemaKeys ?? /* @__PURE__ */ new Set(),
     pinnedSchemaKeysByValueId: evaluated.pinnedSchemaKeysByValueId ?? /* @__PURE__ */ new Map()
@@ -58590,7 +58648,7 @@ function buildVirtualInstanceMaterializedIndex(args) {
   return {
     rows,
     rowsById,
-    graph: new MaterializedValueGraphContext(
+    graph: args.materializedGraph ?? new MaterializedValueGraphContext(
       { ...args.document, values: rows },
       rowsById
     ),
@@ -59073,7 +59131,9 @@ function resolveVirtualInstanceGraph(args) {
       if (parent !== void 0 && isMemberEntryCollectionBase(parent.member) && listKindOf(parent.member) === 1 /* Unordered */)
         effective.containerId = parentId;
     }
-    if (isClassSlotMember(indexed.member) && effective.value !== null) {
+    if (args.opaquePaths?.has(pathKey)) {
+      effective.value = materialized?.value ?? indexed.expandedRow.value;
+    } else if (isClassSlotMember(indexed.member) && effective.value !== null) {
       const storedRecord = stringRecord(materialized?.value);
       const classId = rowClassId(indexed.member, effective);
       const constructedChildren = materialized === null ? /* @__PURE__ */ new Map() : settledAggregateChildren(materialized, classId, pathKey);
@@ -60663,6 +60723,16 @@ function keptRowReason(facts) {
   if (!facts.defaultEqual) return "provenanceOnly";
   return "pinnedOrReference";
 }
+function indexAuthoredConstructionIdentities(locations) {
+  const byRoot = /* @__PURE__ */ new Map();
+  for (const [id2, location3] of locations) {
+    if (!location3.preserveIdentity) continue;
+    const entries = byRoot.get(location3.rootId) ?? [];
+    entries.push({ id: id2, path: location3.path });
+    byRoot.set(location3.rootId, entries);
+  }
+  return byRoot;
+}
 function sparsifyConstructedInstance(args) {
   const materializedRows = [
     args.constructed.root,
@@ -60677,18 +60747,107 @@ function sparsifyConstructedInstance(args) {
     new Map(materializedRows.map((row) => [row.id, row])),
     /* @__PURE__ */ new Map([[args.constructed.root.id, args.rootMember]])
   );
+  const anchors = /* @__PURE__ */ new Map();
+  const authoredIds = /* @__PURE__ */ new Set();
+  for (const identity3 of args.authoredIdentities ?? []) {
+    let row = args.constructed.root;
+    for (const segment of identity3.path) {
+      const payload = row.value;
+      let childId;
+      if (Array.isArray(payload) && typeof segment === "number")
+        childId = args.constructionEntryIds?.get(row.id)?.[segment] ?? payload[segment];
+      else if (isObjectRecord(payload)) childId = payload[String(segment)];
+      if (typeof childId !== "string")
+        throw new Error(
+          `Named construction ${identity3.id} has no value at ${JSON.stringify(identity3.path)}.`
+        );
+      const child2 = materializedGraph.valuesById.get(childId);
+      if (child2 === void 0)
+        throw new Error(
+          `Named construction ${identity3.id} points to missing child ${childId}.`
+        );
+      row = child2;
+    }
+    if (anchors.has(row.id))
+      throw new Error(`Constructed row ${row.id} has multiple named owners.`);
+    if (authoredIds.has(identity3.id))
+      throw new Error(
+        `Named construction identity ${identity3.id} has multiple owning placements.`
+      );
+    if (identity3.id !== row.id && materializedGraph.valuesById.has(identity3.id))
+      throw new Error(
+        `Named construction identity ${identity3.id} collides with another constructed row.`
+      );
+    anchors.set(row.id, identity3.id);
+    authoredIds.add(identity3.id);
+  }
+  const rootId = args.constructed.root.id;
+  const boundaries = /* @__PURE__ */ new Map();
+  const namedPaths = namedConstructionPaths(
+    materializedGraph,
+    new Map([[rootId, rootId], ...anchors]),
+    args.constructionEntryIds,
+    boundaries
+  );
+  const materializedIndex = buildVirtualInstanceMaterializedIndex({
+    document: args.document,
+    materializedRows,
+    materializedGraph
+  });
   const graph = resolveVirtualInstanceGraph({
     document: args.document,
     instanceRoot: args.constructed.root,
     rootMember: args.rootMember,
     expandedRoot: args.baseline.root,
     expandedRows: [args.baseline.root, ...args.baseline.createdChildren],
-    materializedRows,
-    materializedGraph
-  });
-  const protectedValueIds = /* @__PURE__ */ new Set();
+    materializedIndex,
+    materializedGraph,
+    opaquePaths: boundaries.get(rootId)
+  });
+  const namedClaims = /* @__PURE__ */ new Map();
+  const namedIds2 = /* @__PURE__ */ new Map();
+  const scopedId = (rowId) => {
+    const anchor = anchors.get(rowId);
+    if (anchor !== void 0) return anchor;
+    const cached = namedIds2.get(rowId);
+    if (cached !== void 0) return cached;
+    const scope = namedPaths.get(rowId);
+    if (scope === void 0 || scope.id === rootId) return void 0;
+    const relativePath = scope.path;
+    const claims = namedClaims.get(scope.id) ?? /* @__PURE__ */ new Map();
+    namedClaims.set(scope.id, claims);
+    const claimed = claimVirtualIdentity({
+      claimedVirtualIds: claims,
+      instanceRootId: scope.id,
+      rawSourceIdentity: `materialized:${relativePath}`,
+      pathKey: relativePath
+    });
+    const id2 = args.virtualValueIdForSource?.(scope.id, claimed.sourceIdentity) ?? claimed.virtualId;
+    namedIds2.set(rowId, id2);
+    return id2;
+  };
+  const namedRootIds = new Set(anchors.keys());
+  const protectedValueIds = new Set(namedRootIds);
   if (args.snapshot)
     for (const row of materializedRows) protectedValueIds.add(row.id);
+  const pinNamedTarget = (id2) => {
+    const scope = namedPaths.get(id2);
+    if (scope !== void 0 && scope.id !== rootId) protectedValueIds.add(id2);
+  };
+  if (anchors.size > 0) {
+    for (const row of materializedRows) {
+      const owner = materializedGraph.ownerForValue(row.id);
+      if (owner?.kind === 9 /* Lookup */)
+        for (const id2 of materializedGraph.referencedValueIds(row))
+          pinNamedTarget(id2);
+      if (owner?.kind === 25 /* NSDelegate */ && isMemberDelegateTarget(row.value)) {
+        if (typeof row.value.valueId === "string")
+          pinNamedTarget(row.value.valueId);
+      }
+      for (const id2 of materializedGraph.referenceArgumentIds(row))
+        pinNamedTarget(id2);
+    }
+  }
   const localizedTextIds = args.localizedTextIds ?? new Set(args.document.localizedTexts?.map((text) => text.id));
   for (const location3 of graph.locationsByPath.values()) {
     const row = location3.materializedRow;
@@ -60730,11 +60889,13 @@ function sparsifyConstructedInstance(args) {
     for (const childId of materializedGraph.referencedValueIds(row))
       pinArgumentFields(childId);
   };
-  for (const edge of materializedGraph.constructorEdges(
-    args.constructed.root
-  )) {
-    protectArgument(edge.targetValueId, edge.typeInfo);
-    pinArgumentFields(edge.targetValueId);
+  for (const id2 of [args.constructed.root.id, ...anchors.keys()]) {
+    for (const edge of materializedGraph.constructorEdges(
+      materializedGraph.valuesById.get(id2)
+    )) {
+      protectArgument(edge.targetValueId, edge.typeInfo);
+      pinArgumentFields(edge.targetValueId);
+    }
   }
   for (const schemaKey of args.pinnedRootSchemaKeys ?? []) {
     const location3 = graph.locationsByPath.get(
@@ -60744,8 +60905,30 @@ function sparsifyConstructedInstance(args) {
       protectedValueIds.add(location3.materializedRow.id);
     }
   }
-  const rootId = args.constructed.root.id;
-  const locationValueId = (location3) => args.virtualValueIdForSource?.(rootId, location3.sourceIdentity) ?? location3.virtualRow.id;
+  const pinnedNamedCalls = /* @__PURE__ */ new Set();
+  const pinNamedCallFields = (id2) => {
+    if (pinnedNamedCalls.has(id2)) return;
+    pinnedNamedCalls.add(id2);
+    const row = materializedGraph.valuesById.get(id2);
+    if (row === void 0) return;
+    const member = materializedGraph.ownerForValue(id2);
+    if (member !== void 0 && (isMemberEntryCollectionBase(member) || isMemberDictionaryBase(member) || isMemberTupleBase(member))) {
+      for (const child2 of materializedGraph.referencedValueIds(row))
+        pinNamedCallFields(child2);
+      for (const child2 of materializedGraph.childrenByContainerId.get(id2) ?? [])
+        pinNamedCallFields(child2.id);
+      return;
+    }
+    if (!isObjectRecord(row.value)) return;
+    for (const key of args.pinnedSchemaKeysByValueId?.get(id2) ?? []) {
+      const child2 = row.value[key];
+      if (typeof child2 !== "string") continue;
+      protectedValueIds.add(child2);
+      pinNamedCallFields(child2);
+    }
+  };
+  for (const id2 of anchors.keys()) pinNamedCallFields(id2);
+  const locationValueId = (location3) => (location3.materializedRow === null ? void 0 : scopedId(location3.materializedRow.id)) ?? args.virtualValueIdForSource?.(rootId, location3.sourceIdentity) ?? location3.virtualRow.id;
   if (args.bindingTargets !== void 0)
     pinReferencedSlots(
       graph,
@@ -60758,7 +60941,8 @@ function sparsifyConstructedInstance(args) {
   try {
     plan = planCollapseVirtualInstance({
       graph,
-      pinnedValueIds: protectedValueIds
+      pinnedValueIds: protectedValueIds,
+      nestedRootValueIds: namedRootIds
     });
   } catch (error) {
     if (!(error instanceof OpenGenericComparisonError)) throw error;
@@ -60768,6 +60952,59 @@ function sparsifyConstructedInstance(args) {
   const updatedValueById = new Map(
     plan.updates.map((update) => [update.valueId, update.value])
   );
+  if (!args.snapshot) {
+    for (const [rowId, authoredId] of anchors) {
+      const root2 = materializedGraph.valuesById.get(rowId);
+      const placement = materializedGraph.ownerForValue(rowId);
+      if (placement === void 0)
+        throw new Error(
+          `Named construction ${authoredId} has no typed owning placement.`
+        );
+      const member = storedClassResolutionMember(
+        placement,
+        root2,
+        args.document.members
+      );
+      if (member === null) continue;
+      if (args.expandNamedRoot === void 0)
+        throw new Error(
+          "Named Class preparation requires its own construction expansion."
+        );
+      const baseline = args.expandNamedRoot(root2, member, materializedRows);
+      const ownGraph = resolveVirtualInstanceGraph({
+        document: args.document,
+        instanceRoot: root2,
+        rootMember: member,
+        expandedRoot: baseline.root,
+        expandedRows: baseline.rows,
+        pinnedRootSchemaKeys: args.pinnedSchemaKeysByValueId?.get(rowId),
+        materializedIndex,
+        materializedGraph,
+        opaquePaths: boundaries.get(authoredId)
+      });
+      for (const location3 of ownGraph.locationsByPath.values()) {
+        const row = location3.materializedRow;
+        if (row !== null && isMemberStringBase(location3.member) && isLocalizedStringMember(location3.member) && typeof row.value === "string" && row.value !== "" && !localizedTextIds.has(row.value))
+          protectedValueIds.add(row.id);
+      }
+      if (args.bindingTargets !== void 0)
+        pinReferencedSlots(
+          ownGraph,
+          authoredId,
+          args.bindingTargets,
+          locationValueId,
+          protectedValueIds
+        );
+      const ownPlan = planCollapseVirtualInstance({
+        graph: ownGraph,
+        pinnedValueIds: protectedValueIds,
+        nestedRootValueIds: namedRootIds
+      });
+      for (const id2 of ownPlan.deletes) deletedIds.add(id2);
+      for (const update of ownPlan.updates)
+        updatedValueById.set(update.valueId, update.value);
+    }
+  }
   restoreRowsRetainedRowsName(
     materializedGraph,
     materializedRows,
@@ -60789,6 +61026,10 @@ function sparsifyConstructedInstance(args) {
     );
   }
   nextIdById.set(args.constructed.root.id, args.constructed.root.id);
+  for (const row of retainedRows) {
+    const id2 = scopedId(row.id);
+    if (id2 !== void 0) nextIdById.set(row.id, id2);
+  }
   const unmappedRows = retainedRows.filter((row) => !nextIdById.has(row.id));
   const fallbackRows = (unmappedRows.length === 0 ? [] : (() => {
     const fallbackPaths = materializedFallbackPaths(
@@ -60804,6 +61045,11 @@ function sparsifyConstructedInstance(args) {
     (left, right) => left.path.localeCompare(right.path) || left.row.id.localeCompare(right.row.id)
   );
   for (const { row, path } of fallbackRows) {
+    const namedId = scopedId(row.id);
+    if (namedId !== void 0) {
+      nextIdById.set(row.id, namedId);
+      continue;
+    }
     const rawSourceIdentity = typeof row.sourceValueId === "string" && row.sourceValueId.length > 0 ? row.sourceValueId : `materialized:${path}`;
     const { sourceIdentity: sourceIdentity3, virtualId } = claimVirtualIdentity({
       claimedVirtualIds,
@@ -60824,6 +61070,8 @@ function sparsifyConstructedInstance(args) {
     if (retainedId !== void 0) return retainedId;
     const receiver = graph.locationsById.get(id2);
     if (receiver === void 0) return id2;
+    const named = scopedId(id2);
+    if (named !== void 0) return named;
     return args.virtualValueIdForSource?.(
       args.constructed.root.id,
       receiver.sourceIdentity
@@ -60891,6 +61139,54 @@ function restoreRowsRetainedRowsName(materializedGraph, rows, updatedValueById,
       restore(valueId);
   }
 }
+function namedConstructionPaths(graph, anchors, entries, boundaries) {
+  const paths = /* @__PURE__ */ new Map();
+  const queue = [];
+  for (const [rowId, id2] of anchors) {
+    paths.set(rowId, { id: id2, path: ROOT_PATH });
+    queue.push(rowId);
+  }
+  if (queue.length === 0) return paths;
+  const add = (childId, scope, segment) => {
+    if (typeof childId !== "string" || !graph.valuesById.has(childId)) return;
+    const path = appendVirtualValuePath(scope.path, segment);
+    if (anchors.has(childId)) {
+      const paths2 = boundaries.get(scope.id) ?? /* @__PURE__ */ new Set();
+      paths2.add(path);
+      boundaries.set(scope.id, paths2);
+      return;
+    }
+    if (paths.has(childId)) return;
+    paths.set(childId, { id: scope.id, path });
+    queue.push(childId);
+  };
+  for (let index = 0; index < queue.length; index++) {
+    const rowId = queue[index];
+    const row = graph.valuesById.get(rowId);
+    const scope = paths.get(rowId);
+    if (row === void 0) continue;
+    const member = graph.ownerForValue(rowId);
+    if (Array.isArray(row.value) && member !== void 0 && (isMemberEntryCollectionBase(member) || isMemberTupleBase(member))) {
+      const children3 = entries?.get(rowId) ?? (row.value.length > 0 ? row.value : graph.childrenByContainerId.get(rowId)?.map((child2) => child2.id) ?? []);
+      children3.forEach((id2, index2) => add(id2, scope, { kind: "list", index: index2 }));
+    } else if (isObjectRecord(row.value) && (typeof row.classId === "string" || member !== void 0 && (isClassSlotMember(member) || isMemberDictionaryBase(member)))) {
+      for (const [schemaKey, id2] of Object.entries(row.value))
+        add(
+          id2,
+          scope,
+          member !== void 0 && isMemberDictionaryBase(member) ? { kind: "dictionary", key: schemaKey } : { kind: "class", schemaKey }
+        );
+    }
+    for (const edge of graph.edgesByOwnerValueId.get(rowId) ?? []) {
+      if (graph.independentlyOwnedValueIds.has(edge.targetValueId)) continue;
+      add(edge.targetValueId, scope, {
+        kind: "class",
+        schemaKey: `@constructor:${edge.parameterId}`
+      });
+    }
+  }
+  return paths;
+}
 function materializedFallbackPaths(rows, graph, materializedGraph) {
   const rowsById = new Map(rows.map((row) => [row.id, row]));
   const unorderedEntriesByContainerId = buildUnorderedListMembershipIndex(rows);
@@ -61074,6 +61370,7 @@ function indexExpansion(args) {
     discoveredNodes?.push(node);
     nodesByPath.set(pathKey, node);
     appendChildPath(parentPath, pathKey);
+    if (args.opaquePaths?.has(pathKey)) return;
     if (isClassTypedMember(member)) {
       const record7 = stringRecord(row.value);
       const classId = row.classId ?? member.classId;
@@ -64036,6 +64333,7 @@ function evaluateMemberInitializer(args) {
   );
   const compiled = compileMemberInitializer(args, databaseVM);
   const ctx = {
+    __constructionEntryIds: args.constructionEntryIds,
     randomSource: args.randomSource,
     randomIdentity,
     ...args.sessionValues === void 0 ? {} : { __runtimeSessionValues: args.sessionValues },
@@ -75264,9 +75562,10 @@ var init_strict_resolver = __esm({
         if (outerEntry === null) return null;
         const existing = context.byOuterEntry.get(outerEntry);
         if (existing !== void 0) return existing;
+        const capturedType = context.outerScope.lookupNarrowedType(name, outerEntry) ?? outerEntry.type;
         const parameter4 = variable(
           `__capture_${context.serial}_${context.captures.length}__`,
-          outerEntry.type,
+          capturedType,
           void 0,
           this.project
         );
@@ -75274,7 +75573,7 @@ var init_strict_resolver = __esm({
           ...scopeVariable(
             name,
             parameter4,
-            outerEntry.type,
+            capturedType,
             "local" /* Local */,
             "local" /* Local */,
             outerEntry.writeRoot,
@@ -83014,7 +83313,9 @@ var init_strict_resolver = __esm({
         return literal(symbol.type, null);
       }
       hasValueReceiver(name, scope) {
-        return scope.lookup(name) !== null || this.implicitMember(name) !== null;
+        return scope.lookup(name) !== null || this.delegateCaptureContexts.some(
+          (context) => context.outerScope.lookup(name) !== null
+        ) || this.implicitMember(name) !== null;
       }
       implicitMember(name) {
         if (this.context.implicitMemberAccess !== true) return null;
@@ -99500,7 +99801,8 @@ function validateExpression(expression, expected, scope, environment, uri, range
   const sourceOnly = expected !== void 0 && (isNeoVariantTypeName(expected.name) || expected.name === "NeoAction" || expected.name === "ImageRef");
   let receiver = expression;
   while (receiver.kind === "member") receiver = receiver.receiver;
-  const computed = (environment.checkComputedInitializers || expected?.name === "NeoDelegate") && !sourceOnly && (expression.kind === "member" && (receiver.kind !== "ident" || receiver.typeQualifier !== void 0) || [
+  const executableMember = expression.kind === "member" && (receiver.kind !== "ident" || receiver.typeQualifier !== void 0);
+  const computed = (environment.checkComputedInitializers || expected?.name === "NeoDelegate") && !sourceOnly && (executableMember || expression.kind === "member" && expected?.name !== "NeoDelegate" || [
     "binary",
     "unary",
     "force",
@@ -99549,14 +99851,13 @@ function validateExpression(expression, expected, scope, environment, uri, range
       void 0,
       { allowPendingRegistryEntries: true }
     );
-    scopedResolver.validateInitializerExpression(
-      expression,
-      expected === void 0 ? void 0 : resolveNeoScriptType(
-        semanticAst(expected, expression.pos),
-        context,
-        environment.projectIndex
-      )
+    const storedMember = storedValue && expression.kind === "member" && !executableMember;
+    const expectedType = expected === void 0 || storedMember ? void 0 : resolveNeoScriptType(
+      semanticAst(expected, expression.pos),
+      context,
+      environment.projectIndex
     );
+    scopedResolver.validateInitializerExpression(expression, expectedType);
   } catch (error) {
     if (!(error instanceof CompileError)) throw error;
     pushDiagnostic(
@@ -104061,6 +104362,7 @@ function validateProjectSourceTypes(documents) {
   validateSetSpelling(documents, environment.typeKinds, diagnostics);
   return {
     diagnostics,
+    memberRelations: environment.memberRelations,
     overloadImplementations: overloadImplementations(environment)
   };
 }
@@ -104137,6 +104439,7 @@ function createEnvironment2(documents) {
   }
   return {
     declarations,
+    memberRelations: [],
     classes,
     interfaces,
     memberOwners,
@@ -105317,11 +105620,12 @@ function validateMembers(environment, diagnostics) {
 }
 function validateInterfaceMemberConflicts(ref, environment, diagnostics) {
   const inherited = /* @__PURE__ */ new Map();
+  const substitution = identitySubstitution(ref);
   for (const base of ref.declaration.baseTypes) {
     const target = environment.interfaces.get(base.name);
     if (!target) continue;
     for (const candidate of interfaceMembers(
-      { owner: target, substitution: /* @__PURE__ */ new Map() },
+      interfaceView(base, target, substitution),
       environment
     )) {
       const key = candidate.member.name.toLowerCase();
@@ -105338,6 +105642,10 @@ function validateInterfaceMemberConflicts(ref, environment, diagnostics) {
         "interface-inherited",
         environment
       ) === null) {
+        environment.memberRelations.push([
+          interfaceMemberLocation(prior),
+          interfaceMemberLocation(candidate)
+        ]);
         continue;
       }
       diagnose(
@@ -105359,7 +105667,6 @@ function validateInterfaceMemberConflicts(ref, environment, diagnostics) {
       );
     }
   }
-  const substitution = identitySubstitution(ref);
   for (const member of ref.declaration.members) {
     const prior = inherited.get(member.name.toLowerCase());
     if (!prior) continue;
@@ -105368,12 +105675,18 @@ function validateInterfaceMemberConflicts(ref, environment, diagnostics) {
     }
     const mismatch = memberCompatibility(
       member,
-      /* @__PURE__ */ new Map(),
+      substitution,
       prior,
       "interface-inherited",
       environment
     );
-    if (!mismatch) continue;
+    if (!mismatch) {
+      environment.memberRelations.push([
+        interfaceMemberLocation(prior),
+        { uri: ref.uri, range: member.nameRange }
+      ]);
+      continue;
+    }
     diagnose(
       diagnostics,
       ref.uri,
@@ -105405,7 +105718,13 @@ function validateAbstractInterfaceMembers(ref, environment, diagnostics) {
       "interface-contract",
       environment
     );
-    if (!mismatch) continue;
+    if (!mismatch) {
+      environment.memberRelations.push([
+        interfaceMemberLocation(contract),
+        memberLocation(implementation)
+      ]);
+      continue;
+    }
     diagnose(
       diagnostics,
       ref.uri,
@@ -106447,6 +106766,10 @@ function validateConcreteClass(ref, environment, diagnostics) {
       environment
     ) : null;
     if (implementation && !implementation.member.modifiers.includes("abstract") && !implementation.member.modifiers.includes("static") && mismatch === null) {
+      environment.memberRelations.push([
+        interfaceMemberLocation(required2),
+        memberLocation(implementation)
+      ]);
       continue;
     }
     diagnose(
@@ -107561,6 +107884,7 @@ function analyzeNeoProjectSources(inputs, parsedDocuments = /* @__PURE__ */ new
     compiledBodies: bodyCompilation.bodies,
     bodyContexts: bodyCompilation.contexts,
     overloadImplementations: typeValidation.overloadImplementations,
+    memberRelations: typeValidation.memberRelations,
     diagnostics
   };
 }
@@ -118590,6 +118914,43 @@ function storedValueAtPathV4(rows, rootId, path) {
   }
   return id2;
 }
+function storedValueOwnsPathV4(records3, rows, ownerForValue) {
+  const placements = buildStoredValuePlacementIndexV4(records3, rows);
+  const parents = /* @__PURE__ */ new Map();
+  for (const [id2, edge] of placements.placementByChildValueId)
+    parents.set(id2, { id: edge.parentValueId, key: edge.schemaKey });
+  for (const [id2, row] of rows) {
+    if (typeof row.containerId === "string")
+      parents.set(id2, { id: row.containerId, key: null });
+  }
+  for (const [id2, row] of rows) {
+    if (!Array.isArray(row.value)) continue;
+    const owner = ownerForValue(id2);
+    if (owner === void 0) continue;
+    if (!isMemberEntryCollectionBase(owner) && !isMemberTupleBase(owner))
+      continue;
+    row.value.forEach((child2, index) => {
+      if (typeof child2 !== "string") return;
+      const container = rows.get(child2)?.containerId;
+      if (container !== void 0 && container !== id2) return;
+      if (container === void 0 && parents.has(child2)) return;
+      parents.set(child2, { id: id2, key: index });
+    });
+  }
+  return (rootId, path, valueId) => {
+    let id2 = valueId;
+    for (let index = path.length - 1; index >= 0; index--) {
+      const parent = parents.get(id2);
+      if (parent === void 0) return false;
+      const key = path[index];
+      if (parent.key === null) {
+        if (typeof key !== "number") return false;
+      } else if (parent.key !== key) return false;
+      id2 = parent.id;
+    }
+    return id2 === rootId;
+  };
+}
 function buildStoredValuePlacementIndexV4(records3, logicalValues) {
   const live = [...records3].filter((record7) => record7.deleted !== true);
   const values = logicalValues ?? storedValueRowsByIdV4(live);
@@ -123532,6 +123893,14 @@ var init_project_migration_member_listeners = __esm({
 });
 
 // ../packages/neoscript-runtime/src/virtual-instance-values.ts
+function expandStoredClassValue2(args) {
+  return expandStoredClassValue({
+    ...args,
+    evaluateInitializer: evaluateMemberInitializer,
+    materializeInitializerValue,
+    materializeMemberDefaultValue: materializeMemberDefaultValue2
+  });
+}
 function expandStoredInstance2(args) {
   return expandStoredInstance({
     ...args,
@@ -123565,9 +123934,52 @@ function resolveStoredClassValue2(args) {
     materializeMemberDefaultValue: materializeMemberDefaultValue2
   });
 }
+function sparsifyConstructedInstance2(args) {
+  let document;
+  return sparsifyConstructedInstance({
+    ...args,
+    expandNamedRoot: (instanceRoot, rootMember, materializedRows) => {
+      if (document === void 0) {
+        if (!("project" in args.document))
+          throw new Error(
+            "Named Class preparation requires the project evaluation context."
+          );
+        const base = args.document;
+        const baseRows = initializerEvaluatorLookups(base).evaluatorIndexes?.valueById ?? new Map(base.values.map((row) => [row.id, row]));
+        const rows = new Map(materializedRows.map((row) => [row.id, row]));
+        const valuesById = new OverlayReadonlyMap(baseRows, rows, /* @__PURE__ */ new Set());
+        const values = lazyArray(() => valuesById.values());
+        const changedContainerIds = new Set(rows.keys());
+        for (const row of rows.values())
+          if (row.containerId) changedContainerIds.add(row.containerId);
+        document = {
+          ...base,
+          databaseVM: void 0,
+          indexedView: void 0,
+          evaluatorCache: void 0,
+          worldQueryCache: void 0,
+          values,
+          valueById: (id2) => valuesById.get(id2) ?? null,
+          evaluatorOverlay: {
+            base,
+            rows,
+            hiddenIds: /* @__PURE__ */ new Set(),
+            changedContainerIds,
+            values,
+            valuesById,
+            containerMembership: "merge"
+          }
+        };
+      }
+      return expandStoredClassValue2({ document, instanceRoot, rootMember });
+    }
+  });
+}
 var init_virtual_instance_values = __esm({
   "../packages/neoscript-runtime/src/virtual-instance-values.ts"() {
     "use strict";
+    init_overlay_readonly_map();
+    init_lazy_array();
     init_initializer_materialization();
     init_evaluateInitializer();
     init_virtual_instance_graph();
@@ -148013,6 +148425,7 @@ function* prepareServerOwnedSchemaCommitPasses(args) {
   });
   materializePreparedInstanceInitializers({
     referenceOwners: args.initializerReferenceOwners,
+    constructionIdentities: args.constructionIdentities,
     document: args.document,
     physicalValues: args.document.physicalValues,
     prepared,
@@ -148388,6 +148801,7 @@ function materializePreparedInstanceInitializers(args) {
     }
     const materialized = replay(
       (readTracking) => materializeInitializerValue2({
+        captureConstructionEntries: args.constructionIdentities?.has(valueId),
         readTracking,
         // Every site that survives the declaration-default guard is source for
         // a persisted instance construction. The trusted replay mode both
@@ -148451,9 +148865,12 @@ function materializePreparedInstanceInitializers(args) {
       constructionBaselineReplay: true,
       storedConstructionReplay: true
     });
-    const sparse2 = sparsifyConstructedInstance({
+    const authoredIdentities = args.constructionIdentities?.get(valueId);
+    const sparse2 = sparsifyConstructedInstance2({
+      authoredIdentities,
+      constructionEntryIds: materialized.constructionEntryIds,
       localizedTextIds,
-      document: currentDocument,
+      document: authoredIdentities?.length ? batch.comparisonDocument() : currentDocument,
       rootMember: member,
       constructed: {
         root: materialized.root,
@@ -149329,9 +149746,8 @@ function materializeVariantChildOverrideBindingMembers(args) {
         classId
       );
       args.serverMintedBindingMemberIds?.add(member.id);
-      if (isFrozenJsonData(args.document.members))
-        args.document.members = [...args.document.members, member];
-      else args.document.members.push(member);
+      if (minted.size === 0) args.document.members = [...args.document.members];
+      args.document.members.push(member);
       args.prepared.push({
         recordKind: "member",
         recordId: member.id,
@@ -149354,6 +149770,7 @@ function materializeStaticSeedBindingMembers(args) {
   if (ids.size !== bindings.length) {
     throw new Error("Schema commit contains duplicate generic binding seeds.");
   }
+  if (bindings.length > 0) args.document.members = [...args.document.members];
   for (const binding of bindings) {
     const expectedBindingId = worldAnimationChildOverrideBindingMemberId(
       binding.classId
@@ -149378,9 +149795,7 @@ function materializeStaticSeedBindingMembers(args) {
       binding.classId
     );
     args.serverMintedBindingMemberIds?.add(member.id);
-    if (isFrozenJsonData(args.document.members))
-      args.document.members = [...args.document.members, member];
-    else args.document.members.push(member);
+    args.document.members.push(member);
     args.prepared.push({
       recordKind: "member",
       recordId: member.id,
@@ -151663,7 +152078,6 @@ var init_project_version_schema_commit = __esm({
   "../src/database/project-version-schema-commit.ts"() {
     "use strict";
     init_members();
-    init_immutable_json2();
     init_commit_preparation_pass_cache();
     init_compiled_construction_types();
     init_member_kinds();
@@ -160209,6 +160623,7 @@ function preparationArgs(context) {
   return {
     document: context.document,
     initializerReferenceOwners: args.initializerReferenceOwners,
+    constructionIdentities: args.constructionIdentities,
     contentHashHeads: context.contentHashHeads,
     changes: args.changes,
     authoredValueSeeds: args.authoredValueSeeds,
@@ -160783,8 +161198,14 @@ function verifyProjectSourceCommitAgainstStateV4(args) {
 ${blockingErrors.map((error) => error.message).join("\n")}` : `Trusted source lowering found conflict markers in ${status.conflictedFiles.join(", ")}.`
     );
   }
+  const identitySeeds = new Map(status.authoredValueSeeds);
+  identitySeeds.set("source-owned constructions", {
+    values: [...status.pendingValueIdentitySites ?? []].flatMap(
+      ([id2, site]) => site.materializedLocation?.preserveIdentity === true ? [{ id: id2, value: null }] : []
+    )
+  });
   auditAuthoredSeedRowIdentities(
-    status.authoredValueSeeds,
+    identitySeeds,
     args.stateRecords,
     assignments,
     derivedSeedRowIds
@@ -160821,6 +161242,18 @@ ${blockingErrors.map((error) => error.message).join("\n")}` : `Trusted source lo
       ...rewrite(seed)
     })
   );
+  const constructionIdentities = indexAuthoredConstructionIdentities(
+    [...status.pendingValueIdentitySites ?? []].flatMap(([id2, site]) => {
+      const location3 = site.materializedLocation;
+      if (location3?.preserveIdentity !== true) return [];
+      return [
+        [
+          rewrite(id2),
+          { ...location3, rootId: rewrite(location3.rootId) }
+        ]
+      ];
+    })
+  );
   for (const pendingId2 of assignments.keys()) {
     if (!usedAssignments.has(pendingId2)) {
       const message = `Pending id assignment ${pendingId2} is not present in the verified source manifest.`;
@@ -160841,6 +161274,7 @@ ${blockingErrors.map((error) => error.message).join("\n")}` : `Trusted source lo
   });
   compareChanges(expectedChanges, verifiableChanges);
   compareSeeds(expectedSeeds, args.authoredValueSeeds);
+  return constructionIdentities;
 }
 function isDerivedOnlyRefresh(change, stateRecords) {
   if (change.operation !== "update") return false;
@@ -161381,6 +161815,7 @@ var ProjectSourceCommitVerificationError, ABSENT_DIFFERENCE_VALUE;
 var init_trusted_commit_verification = __esm({
   "src/project-source/trusted-commit-verification.ts"() {
     "use strict";
+    init_virtual_instance_values();
     init_animation_child_binding_id();
     init_world_system_classes();
     init_tuple_element_member_id();
@@ -161469,6 +161904,7 @@ function sourceCommitPreparation(args) {
     }),
     authoredValueSeeds: args.authoredValueSeeds,
     initializerReferenceOwners: args.initializerReferenceOwners,
+    constructionIdentities: args.constructionIdentities,
     forceRecompile: args.forceRecompile,
     scriptSources: args.scriptSources,
     serverTimestamp: args.serverTimestamp
@@ -161752,6 +162188,7 @@ function replayStoredConstructionV4(args) {
     // explicit typed descriptor for evaluation that compiled the replay.
     member: compileMember,
     row: evaluationRow,
+    captureConstructionEntries: args.captureConstructionEntries,
     storedConstructionReplay: true,
     ...args.omitConstructionFields === true ? { constructionBaselineReplay: true } : {},
     ...args.initializerArgumentValues === void 0 ? {} : { argumentValues: args.initializerArgumentValues }
@@ -166843,9 +167280,18 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
       valueId,
       {
         sites: context.pendingValueIdentitySites,
+        storedParent: (id2) => {
+          const edge = context.readStoredValuePlacements().placementByChildValueId.get(id2);
+          return edge === void 0 ? void 0 : { rootId: edge.parentValueId, path: [edge.schemaKey] };
+        },
+        validateAuthoredId: (id2) => {
+          if (!isPendingId(id2) && context.state[`value:${id2}`] === void 0 && !isUuidV4Id(id2))
+            throw new Error(
+              `New local value @id(${JSON.stringify(id2)}) requires a UUID v4.`
+            );
+        },
         localListEntries: (local2) => localNestedListEntries(context, local2)
-      },
-      context.storedValueAtPath
+      }
     );
     const settled = settleInitializerReferenceSpellings(
       executable.code,
@@ -167587,7 +168033,7 @@ function lowerSeedChild(context, member, expression, source, path, rows, localiz
       )
     });
   }
-  const valueId = annotatedId2 ?? context.structuralStoredIds.get(path) ?? pendingNestedValueId(source, path);
+  const valueId = annotatedId2 ?? context.structuralStoredIds.get(path) ?? local.pendingIdentity ?? pendingNestedValueId(source, path);
   if (!context.structuralConstruction && annotatedId2 !== null && context.state[`value:${annotatedId2}`] !== void 0) {
     const failure = storedClassMoveFailure(
       context,
@@ -167637,7 +168083,7 @@ function lowerSeedChild(context, member, expression, source, path, rows, localiz
     expression,
     source,
     valueId,
-    unorderedRowSubtreePath(valueId, path, containerId),
+    local.pendingIdentity === void 0 ? unorderedRowSubtreePath(valueId, path, containerId) : valueId,
     rows,
     localizedTexts,
     containerId,
@@ -167816,9 +168262,18 @@ function lowerAuthoredValueRow(context, member, sourceExpression, expectedValueI
       expectedValueId,
       {
         sites: context.pendingValueIdentitySites,
+        storedParent: (id3) => {
+          const edge = context.readStoredValuePlacements().placementByChildValueId.get(id3);
+          return edge === void 0 ? void 0 : { rootId: edge.parentValueId, path: [edge.schemaKey] };
+        },
+        validateAuthoredId: (id3) => {
+          if (!isPendingId(id3) && context.state[`value:${id3}`] === void 0 && !isUuidV4Id(id3))
+            throw new Error(
+              `New local value @id(${JSON.stringify(id3)}) requires a UUID v4.`
+            );
+        },
         localListEntries: (local2) => localNestedListEntries(context, local2)
-      },
-      context.storedValueAtPath
+      }
     );
     const settled = settleInitializerReferenceSpellings(
       executable.code,
@@ -169410,9 +169865,10 @@ function recordRepeatedRow(context, rowId, collection, site, placedIds = context
 function lowerPendingListItem(context, member, expression, source, path, containerId, environment, authoredSlice) {
   const rows = /* @__PURE__ */ new Map();
   const localizedTexts = /* @__PURE__ */ new Map();
-  const annotatedId2 = authoredRowId(context, expression, source);
-  const valueId = annotatedId2 ?? pendingNestedValueId(source, path);
-  const stablePath = isPendingId(valueId) ? valueId : unorderedRowSubtreePath(valueId, path, containerId);
+  const local = context.localValues.resolve(expression, source);
+  const annotatedId2 = annotatedValue(local.expression).id;
+  const valueId = annotatedId2 ?? local.pendingIdentity ?? pendingNestedValueId(source, path);
+  const stablePath = isPendingId(valueId) || local.pendingIdentity !== void 0 ? valueId : unorderedRowSubtreePath(valueId, path, containerId);
   lowerSeedRow(
     context,
     member,
@@ -171395,6 +171851,14 @@ function emitValue(context, member, valueId, options) {
     context.localizedTextIds = /* @__PURE__ */ new Set();
     const expression2 = emitValue(context, member, valueId, {
       ...options,
+      writeIdentity: options.writeIdentity || !context.symbolsByValueId.has(valueId) && member.valueId !== valueId && (typeof member.id !== "string" || memberValueId(member.id) !== valueId) && (!isObjectRecord(member.defaultValue) || member.defaultValue.id !== valueId) && [
+        7 /* Class */,
+        22 /* Interface */,
+        6 /* List */,
+        28 /* Set */,
+        5 /* Dictionary */,
+        30 /* Tuple */
+      ].includes(numberField(member, "kind")),
       localDefinition: true,
       visited,
       decorateLocal: void 0
@@ -175732,6 +176196,9 @@ function reconciliationRecords(workspace, changes, seeds = /* @__PURE__ */ new M
   });
 }
 function materializeInitializersLocallyV4(args) {
+  const constructionIdentities = indexAuthoredConstructionIdentities(
+    args.localReferenceLocations ?? []
+  );
   const records3 = prospectiveInitializerRecordsV4(args);
   const sourceRoots = initializerSourceRootIds(
     args.changes,
@@ -175964,7 +176431,7 @@ function materializeInitializersLocallyV4(args) {
               throw new PendingInitializerDependency(location3.rootId);
             if (pendingRoots.has(location3.rootId))
               throw new PendingInitializerDependency(location3.rootId);
-            const target = resolvedLocalIds.get(id2) ?? storedValueAtPathV4(
+            const target = resolvedLocalIds.get(id2) ?? (location3.preserveIdentity && batch.valuesById.has(id2) ? id2 : null) ?? storedValueAtPathV4(
               batch.valuesById,
               location3.rootId,
               location3.path
@@ -176007,6 +176474,7 @@ function materializeInitializersLocallyV4(args) {
             pinnedSchemaKeysByValueId: /* @__PURE__ */ new Map()
           };
           const evaluated2 = replayStoredConstructionV4({
+            captureConstructionEntries: constructionIdentities.has(sourceValueId),
             readTracking,
             records: records3,
             document,
@@ -176086,9 +176554,12 @@ function materializeInitializersLocallyV4(args) {
         }
         return [row];
       });
-      const sparse2 = sparsifyConstructedInstance({
+      const authoredIdentities = constructionIdentities.get(sourceValueId);
+      const sparse2 = sparsifyConstructedInstance2({
+        authoredIdentities,
+        constructionEntryIds: pinned.constructionEntryIds,
         localizedTextIds,
-        document,
+        document: authoredIdentities?.length ? comparisonDocument() : document,
         rootMember: rootOwner,
         constructed: {
           root: evaluatedRoot,
@@ -176146,11 +176617,7 @@ function materializeInitializersLocallyV4(args) {
   for (const [id2, location3] of args.localReferenceLocations ?? []) {
     if (resolvedLocalIds.has(id2)) continue;
     if (unavailableRootIds.has(location3.rootId)) continue;
-    const target = storedValueAtPathV4(
-      batch.valuesById,
-      location3.rootId,
-      location3.path
-    );
+    const target = location3.preserveIdentity && batch.valuesById.has(id2) ? id2 : storedValueAtPathV4(batch.valuesById, location3.rootId, location3.path);
     if (target !== null) resolvedLocalIds.set(id2, target);
   }
   return { roots, resolvedLocalIds, failures, unavailableRootIds };
@@ -188836,6 +189303,48 @@ function preserveProjectFileRegistrySource(existing, emitted, records3 = /* @__P
   if (registryOnly) emitted = existing;
   return applySourceEdits(emitted, replacements);
 }
+function augmentAuthoredProjectFileRegistries(existing, emitted) {
+  const authored = parseNeoProjectSource(existing, "definition");
+  const generated = parseNeoProjectSource(emitted, "definition");
+  const declarations = new Map(
+    authored.declarations.flatMap(
+      (declaration) => declaration.kind === "global" ? [[declaration.name, declaration]] : []
+    )
+  );
+  const edits = [];
+  const additions = [];
+  for (const declaration of generated.declarations) {
+    if (declaration.kind !== "global") continue;
+    if (!["ImageRegistry", "AudioClipRegistry"].includes(declaration.type.name))
+      continue;
+    const content = emitted.slice(
+      generated.syntax.source.offsetAt(declaration.range.start),
+      generated.syntax.source.offsetAt(declaration.range.end)
+    );
+    const prior = declarations.get(declaration.name);
+    if (prior === void 0) {
+      additions.push(content);
+      continue;
+    }
+    const start = authored.syntax.source.offsetAt(prior.range.start);
+    const end = authored.syntax.source.offsetAt(prior.range.end);
+    edits.push({
+      start,
+      end,
+      text: preserveProjectFileRegistrySource(
+        existing.slice(start, end),
+        content
+      )
+    });
+  }
+  if (additions.length > 0)
+    edits.push({
+      start: existing.length,
+      end: existing.length,
+      text: "\n" + additions.join("\n\n") + "\n"
+    });
+  return applySourceEdits(existing, edits);
+}
 function registries(document, source, templateIds) {
   if (document.diagnostics.some((diagnostic) => diagnostic.severity === "error"))
     return [];
@@ -189603,7 +190112,7 @@ function scriptFeatureIndex(snapshot) {
     typeAnnotations,
     tokens,
     tokenIndexes,
-    enclosingOpener: enclosingOpenerIndex(tokens),
+    enclosingOpener: receiverEnclosingOpeners(tokens),
     objectInitializers
   };
   SCRIPT_FEATURE_INDEX.set(snapshot, index);
@@ -192574,7 +193083,7 @@ function flowProbe(snapshot) {
   const tokens = scriptFeatureIndex(snapshot).tokens;
   const overloaded = overloadedFunctionNames(snapshot.project);
   if (!tokens.some(
-    (token) => token.text === "is" || token.text === "switch" || overloaded.has(token.text)
+    (token) => token.text === "is" || token.text === "=>" || token.text === "switch" || overloaded.has(token.text)
   ) && !hasGenericCall(snapshot))
     return result;
   const text = snapshot.source.text;
@@ -193921,6 +194430,8 @@ function expressionTokensBefore(tokens, endExclusive) {
       start = name;
       continue;
     }
+    if (depth === 0 && token.text === "when" && start < endExclusive - 1 && ![".", "?.", "!", "[", "<"].includes(tokens[start + 1]?.text ?? "") && followsSwitchPattern(tokens, start))
+      break;
     if (depth === 0 && (token.kind === "punctuation" && [";", "{", "}", ",", ":", "?"].includes(token.text) || // Only `?.` and `!` continue a receiver; every other operator
     // (`+=`, `==`, `<`, …) ends it.
     token.kind === "operator" && token.text !== "?." && token.text !== "!" || token.kind === "keyword" && ["return", "throw", "if", "else"].includes(token.text))) {
@@ -193929,6 +194440,24 @@ function expressionTokensBefore(tokens, endExclusive) {
   }
   return tokens.slice(start + 1, endExclusive);
 }
+function receiverEnclosingOpeners(tokens) {
+  let index = RECEIVER_ENCLOSING_OPENERS.get(tokens);
+  if (!index) {
+    index = enclosingOpenerIndex(tokens);
+    RECEIVER_ENCLOSING_OPENERS.set(tokens, index);
+  }
+  return index;
+}
+function followsSwitchPattern(tokens, index) {
+  const opener = receiverEnclosingOpeners(tokens)[index] ?? -1;
+  if (tokens[opener]?.text !== "{" || tokens[opener - 1]?.text !== "switch")
+    return false;
+  const previous = tokens[index - 1];
+  if (!previous) return false;
+  if (previous.text === "when")
+    return ["{", ","].includes(tokens[index - 2]?.text ?? "");
+  return previous.kind === "identifier" || previous.kind === "integer" || previous.kind === "float" || previous.kind === "type" || previous.kind === "string" || [")", "]", ">", "true", "false", "null"].includes(previous.text);
+}
 function genericCallNameIndex(tokens, close) {
   if (!["(", ".", "{"].includes(tokens[close + 1]?.text ?? "")) return -1;
   let depth = 0;
@@ -194082,7 +194611,7 @@ function isTypeAnnotationReference(snapshot, reference2) {
 function isConstructorTypeReference(snapshot, reference2) {
   return scriptFeatureIndex(snapshot).calls.get(reference2.start)?.kind === "constructor";
 }
-var SCRIPT_FEATURE_INDEX, assumedLambdaInputs, LIST_OPENERS, LIST_CLOSERS, TUPLE_LABEL_DECLARATIONS, NAMED_ARGUMENT_LABELS, NO_EXPECTED_VALUE, CONSTRUCTIONS, ANNOTATION_TYPE_NAMES, FLOW_PROBES, PATTERN_DECLARATIONS, OVERLOADED_FUNCTION_NAMES, GENERIC_CALL_NAMES, LOCAL_SCOPE_INDEX, NAMED_ITEM_INDEX, COLLECTION_FUNCTION_DOCUMENTATION, LOCAL_SYMBOL_CACHE, CALL_COMMIT_CHARACTERS, GENERIC_CALL_COMMIT_CHARACTERS, SETTER_VALUE_ID_SUFFIX, LAMBDA_BODY_INDEX;
+var SCRIPT_FEATURE_INDEX, assumedLambdaInputs, LIST_OPENERS, LIST_CLOSERS, TUPLE_LABEL_DECLARATIONS, NAMED_ARGUMENT_LABELS, NO_EXPECTED_VALUE, CONSTRUCTIONS, ANNOTATION_TYPE_NAMES, FLOW_PROBES, PATTERN_DECLARATIONS, OVERLOADED_FUNCTION_NAMES, GENERIC_CALL_NAMES, LOCAL_SCOPE_INDEX, NAMED_ITEM_INDEX, COLLECTION_FUNCTION_DOCUMENTATION, LOCAL_SYMBOL_CACHE, CALL_COMMIT_CHARACTERS, GENERIC_CALL_COMMIT_CHARACTERS, SETTER_VALUE_ID_SUFFIX, RECEIVER_ENCLOSING_OPENERS, LAMBDA_BODY_INDEX;
 var init_analyzer = __esm({
   "../packages/neoscript-language/src/analyzer.ts"() {
     "use strict";
@@ -194162,6 +194691,7 @@ var init_analyzer = __esm({
     CALL_COMMIT_CHARACTERS = ["("];
     GENERIC_CALL_COMMIT_CHARACTERS = ["<", "("];
     SETTER_VALUE_ID_SUFFIX = ":setter-value";
+    RECEIVER_ENCLOSING_OPENERS = /* @__PURE__ */ new WeakMap();
     LAMBDA_BODY_INDEX = /* @__PURE__ */ new WeakMap();
   }
 });
@@ -199770,19 +200300,22 @@ function projectReferenceFamily(analysis, target, index = buildProjectSymbolInde
   }
   if (target.kind !== "member" || !target.ownerName) return [target];
   const classes = /* @__PURE__ */ new Map();
-  for (const document of analysis.documents.values()) {
+  const declarations = /* @__PURE__ */ new Map();
+  for (const [uri, document] of analysis.documents) {
     for (const declaration of document.declarations) {
-      if (declaration.kind === "class")
-        classes.set(declaration.name, declaration);
+      if (declaration.kind !== "class") continue;
+      classes.set(declaration.name, declaration);
+      for (const member of declaration.members)
+        declarations.set(locationKey3({ uri, range: member.nameRange }), member);
     }
   }
   const joins = (member) => target.callable !== true || member?.kind === "function" && member.modifiers.some((modifier) => DISPATCH_MODIFIERS2.has(modifier));
-  const declared = (symbol) => classes.get(symbol.ownerName ?? "")?.members.find(
-    (member) => member.name === symbol.name && member.nameRange.start.line === symbol.location.range.start.line && member.nameRange.start.character === symbol.location.range.start.character
+  const declared = (symbol) => declarations.get(locationKey3(symbol.location));
+  const members2 = analysis.symbols.filter(
+    (symbol) => symbol.kind === "member" && symbol.name.toLowerCase() === target.name.toLowerCase()
   );
-  if (!joins(declared(target))) return [target];
   const symbols = new Map(
-    named.filter((symbol) => symbol.kind === "member" && joins(declared(symbol))).map((symbol) => [symbol.ownerName, symbol])
+    members2.filter((symbol) => symbol.kind === "member" && joins(declared(symbol))).map((symbol) => [symbol.ownerName, symbol])
   );
   const roots = /* @__PURE__ */ new Map();
   const root = (name) => {
@@ -199790,9 +200323,7 @@ function projectReferenceFamily(analysis, target, index = buildProjectSymbolInde
     roots.set(name, null);
     const declaration = classes.get(name);
     const own = symbols.get(name);
-    const member = declaration?.members.find(
-      (candidate) => candidate.name === target.name && joins(candidate)
-    );
+    const member = own ? declared(own) : void 0;
     if (own && !member?.modifiers.includes("override")) {
       roots.set(name, own);
       return own;
@@ -199802,11 +200333,43 @@ function projectReferenceFamily(analysis, target, index = buildProjectSymbolInde
     roots.set(name, resolved);
     return resolved;
   };
-  const selected = root(target.ownerName);
-  if (!selected) return [target];
-  return [...symbols.values()].filter(
-    (symbol) => symbol.ownerName && root(symbol.ownerName) === selected
+  const byLocation = new Map(
+    members2.map((symbol) => [locationKey3(symbol.location), symbol])
   );
+  const edges = /* @__PURE__ */ new Map();
+  const connect = (a, b) => {
+    const left = locationKey3(a);
+    const right = locationKey3(b);
+    if (!byLocation.has(left) || !byLocation.has(right)) return;
+    const add = (from, to) => {
+      let values = edges.get(from);
+      if (!values) edges.set(from, values = /* @__PURE__ */ new Set());
+      values.add(to);
+    };
+    add(left, right);
+    add(right, left);
+  };
+  for (const symbol of symbols.values()) {
+    const selected = symbol.ownerName ? root(symbol.ownerName) : null;
+    if (selected) connect(symbol.location, selected.location);
+  }
+  for (const [contract, implementation] of analysis.memberRelations)
+    connect(contract, implementation);
+  const visited = /* @__PURE__ */ new Set();
+  const pending = [locationKey3(target.location)];
+  const family = [];
+  while (pending.length > 0) {
+    const key = pending.pop();
+    if (visited.has(key)) continue;
+    visited.add(key);
+    const symbol = byLocation.get(key);
+    if (symbol) family.push(symbol);
+    for (const next of edges.get(key) ?? []) pending.push(next);
+  }
+  return family.length > 0 ? family : [target];
+}
+function locationKey3(location3) {
+  return `${location3.uri}:${location3.range.start.line}:${location3.range.start.character}`;
 }
 var DISPATCH_MODIFIERS2;
 var init_project_source_reference_family = __esm({
@@ -200069,7 +200632,7 @@ function sameLocationInList(target, locations) {
     (location3) => location3.uri === target.uri && location3.range.start.line === target.range.start.line && location3.range.start.character === target.range.start.character
   );
 }
-function locationKey3(location3) {
+function locationKey4(location3) {
   const { start, end } = location3.range;
   return JSON.stringify([
     location3.uri,
@@ -200636,8 +201199,9 @@ var init_service = __esm({
         if (!resolved) return [];
         const declaration = resolved.symbol;
         const family = projectReferenceFamily(analysis, declaration, index);
+        const familyNames = new Set(family.map((member) => member.name));
         const familyLocations = new Set(
-          family.map((member) => locationKey3(member.location))
+          family.map((member) => locationKey4(member.location))
         );
         const familyIds = new Set(
           family.flatMap((member) => member.id === null ? [] : [member.id])
@@ -200652,7 +201216,7 @@ var init_service = __esm({
           for (let tokenIndex = 0; tokenIndex < tokens.length; tokenIndex++) {
             const candidate = tokens[tokenIndex];
             if (!isProjectNameToken(candidate)) continue;
-            const matches = parameterName === null ? candidate.text === token.text : candidate.text === declaration.name || candidate.text.toLowerCase() === parameterName && isNamedArgumentLabel(tokens, tokenIndex);
+            const matches = parameterName === null ? familyNames.has(candidate.text) : candidate.text === declaration.name || candidate.text.toLowerCase() === parameterName && isNamedArgumentLabel(tokens, tokenIndex);
             if (!matches) continue;
             const candidateSymbol = projectSymbolAt(
               analysis,
@@ -200660,11 +201224,11 @@ var init_service = __esm({
               candidate.range.start,
               index
             )?.symbol;
-            if (!candidateSymbol || !familyLocations.has(locationKey3(candidateSymbol.location))) {
+            if (!candidateSymbol || !familyLocations.has(locationKey4(candidateSymbol.location))) {
               continue;
             }
             const location3 = { uri: state.document.uri, range: candidate.range };
-            if (!includeDeclaration && familyLocations.has(locationKey3(location3))) {
+            if (!includeDeclaration && familyLocations.has(locationKey4(location3))) {
               continue;
             }
             locations.push(location3);
@@ -200675,11 +201239,11 @@ var init_service = __esm({
           if (isProjectDocument(state.document, state.context)) continue;
           const snapshot = this.scriptSnapshot(state);
           for (const candidate of snapshot.parsed.references) {
-            if (candidate.name !== declaration.name) continue;
+            if (!familyNames.has(candidate.name)) continue;
             const symbolId = resolveReferenceSymbolId(snapshot, candidate);
             if (symbolId === null) continue;
             const matches = familyIds.has(symbolId) || definition(snapshot, candidate.range.start).some(
-              (location3) => familyLocations.has(locationKey3(location3))
+              (location3) => familyLocations.has(locationKey4(location3))
             );
             if (!matches) continue;
             locations.push({ uri: state.document.uri, range: candidate.range });
@@ -200687,7 +201251,7 @@ var init_service = __esm({
           if (declaration.kind !== "parameter") continue;
           for (const label of namedArgumentLabels(snapshot)) {
             const parameter4 = label.parameter.selectionLocation;
-            if (parameter4 && familyLocations.has(locationKey3(parameter4)))
+            if (parameter4 && familyLocations.has(locationKey4(parameter4)))
               locations.push({ uri: state.document.uri, range: label.range });
           }
         }
@@ -224312,7 +224876,7 @@ import {
   statSync as statSync7
 } from "node:fs";
 import { join as join22, relative as relative8, sep as sep9 } from "node:path";
-function assignPendingIds(changes, authoredValueSeeds, reconstructed3, previousLedger = {}, codePendingIdCandidates = []) {
+function assignPendingIds(changes, authoredValueSeeds, reconstructed3, previousLedger = {}, codePendingIdCandidates = [], authoredPendingIds = []) {
   const assigned = /* @__PURE__ */ new Map();
   const minted = /* @__PURE__ */ new Map();
   let mint = (pendingId2) => {
@@ -224457,6 +225021,7 @@ function assignPendingIds(changes, authoredValueSeeds, reconstructed3, previousL
     for (const change of changes) collectCodeIds(change.nextData);
     for (const seed of authoredValueSeeds.values()) collectCodeIds(seed);
   }
+  for (const id2 of authoredPendingIds) collect(id2);
   for (const root of roots) assign(root);
   const keys = identityLedgerKeys(minted.keys());
   const ledger = {};
@@ -225373,7 +225938,7 @@ async function prepareLocalPushArtifactsV4(workspace, status, onPhase = () => vo
   } : void 0;
   onPhase("Hashing project source\u2026");
   const source = projectSourceIdentityForStatus(status);
-  const verificationSource = options.fullValidation ? locatedPendingProjectSourceIdentity(workspace, status) : null;
+  const verificationSource = options.fullValidation ? authoredVerificationSource(workspace, status, source) : null;
   onPhase("Assigning pending value identities\u2026");
   const release = options.purpose === "evaluation" /* Evaluation */ ? await acquireWorkspaceLock(
     workspace.root,
@@ -225389,6 +225954,9 @@ async function prepareLocalPushArtifactsV4(workspace, status, onPhase = () => vo
       { ...options.identityLedger, ...latestLedger },
       [...status.pendingValueIdentitySites ?? []].flatMap(
         ([id2, site]) => site.materializedLocation !== void 0 && pendingVirtualValueIdentity(id2) !== null ? [id2] : []
+      ),
+      [...status.pendingValueIdentitySites ?? []].flatMap(
+        ([id2, site]) => site.materializedLocation?.preserveIdentity === true ? [id2] : []
       )
     );
     if (!mergeReservedIdentities(workspace.root, pendingAssignment.ledger)) {
@@ -225415,6 +225983,7 @@ async function prepareLocalPushArtifactsV4(workspace, status, onPhase = () => vo
     status.changes,
     localizedTextCreateEnvelopeConfig2(workspace, status.changes)
   );
+  let verifiedConstructionIdentities;
   try {
     if (verificationSource !== null) {
       onPhase("Verifying the assigned value-id stamps\u2026");
@@ -225424,8 +225993,8 @@ async function prepareLocalPushArtifactsV4(workspace, status, onPhase = () => vo
         status.pendingValueIdentitySites,
         { sourceSnapshot: status.sourceSnapshot, validateResult: true }
       );
-      onPhase("Verifying the complete source round trip\u2026");
-      verifyProjectSourceCommitAgainstStateV4({
+      onPhase("Verifying the authored source and ownership\u2026");
+      verifiedConstructionIdentities = verifyProjectSourceCommitAgainstStateV4({
         projectId: workspace.config.projectId,
         versionId: workspace.config.versionId,
         stateRecords: workspace.state.records,
@@ -225447,6 +226016,23 @@ async function prepareLocalPushArtifactsV4(workspace, status, onPhase = () => vo
   let prepared;
   try {
     const preparationArgs2 = {
+      constructionIdentities: verifiedConstructionIdentities ?? indexAuthoredConstructionIdentities(
+        [...status.pendingValueIdentitySites ?? []].flatMap(
+          ([id2, site]) => {
+            const location3 = site.materializedLocation;
+            if (location3 === void 0) return [];
+            return [
+              [
+                pendingAssignment.assigned.get(id2) ?? id2,
+                {
+                  ...location3,
+                  rootId: pendingAssignment.assigned.get(location3.rootId) ?? location3.rootId
+                }
+              ]
+            ];
+          }
+        )
+      ),
       initializerReferenceOwners: new Map(
         [...status.pendingValueIdentitySites ?? []].flatMap(
           ([id2, site]) => site.materializedLocation === void 0 ? [] : [
@@ -225535,17 +226121,6 @@ function locatePreparationError(error, status, assigned) {
   if (source === void 0) return error;
   return new Error(`${source.file}:${source.line} \u2014 ${error.message}`);
 }
-function locatedPendingProjectSourceIdentity(workspace, status) {
-  try {
-    return createPendingProjectSourceIdentityV4(
-      workspace,
-      status,
-      status.authoredValueSeeds
-    );
-  } catch (error) {
-    throw locatePreparationError(error, status, /* @__PURE__ */ new Map());
-  }
-}
 async function prepareLocalCandidateV4(workspace, options = {}) {
   const pushOptions = {
     dryRun: options.dryRun ?? true,
@@ -225783,6 +226358,30 @@ function reportDryRunFailure(error, json) {
   }
   console.error(`Dry run failed: ${message}`);
 }
+function authoredVerificationSource(workspace, status, source) {
+  let canonical;
+  try {
+    canonical = createPendingProjectSourceIdentityV4(
+      workspace,
+      status,
+      status.authoredValueSeeds
+    );
+  } catch (error) {
+    throw locatePreparationError(error, status, /* @__PURE__ */ new Map());
+  }
+  const files = new Map(source.files.map((file) => [file.path, file]));
+  for (const file of canonical.files) {
+    const prior = files.get(file.path);
+    const content = augmentAuthoredProjectFileRegistries(
+      prior?.content ?? "",
+      file.content
+    );
+    if (content === (prior?.content ?? "")) continue;
+    files.set(file.path, { ...file, content });
+  }
+  const result = [...files.values()];
+  return { files: result, sourceHash: hashProjectSourceFiles(result) };
+}
 function projectSourceIdentityForStatus(status) {
   if (status.sourceSnapshot === void 0) {
     throw new Error(
@@ -226133,11 +226732,46 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
     replacements.exact
   );
   const ownedLocalReplacements = new Map(replacements.exact);
+  let committedNamedRows;
+  let ownsCommittedPath;
   for (const [locator, site] of localStatus.pendingValueIdentitySites ?? []) {
     const location3 = site.materializedLocation;
     if (location3 === void 0) continue;
     const rootId = rewritePlacementValueId(location3.rootId, replacements);
-    const id2 = committedValueAtPath(rootId, location3.path);
+    const expectedId = rewritePlacementValueId(locator, replacements);
+    let id2 = committedValueAtPath(rootId, location3.path);
+    if (location3.preserveIdentity === true) {
+      committedNamedRows ??= storedValueRowsByIdV4(Object.values(nextRecords));
+      const row = committedNamedRows.get(expectedId);
+      if (row === void 0)
+        throw new Error(
+          `Committed named value ${locator} is missing its assigned identity ${expectedId}.`
+        );
+      if (id2 !== expectedId) {
+        if (ownsCommittedPath === void 0) {
+          const document = readProjectDocument(
+            pulledProjectDocumentRaw({
+              ...workspace,
+              state: { ...workspace.state, records: nextRecords }
+            })
+          );
+          const graph = new MaterializedValueGraphContext(document);
+          ownsCommittedPath = storedValueOwnsPathV4(
+            Object.values(nextRecords),
+            committedNamedRows,
+            (id3) => graph.ownerForValue(id3)
+          );
+        }
+        const path = location3.path.map(
+          (key) => typeof key === "string" ? replacements.exact.get(key) ?? key : key
+        );
+        if (!ownsCommittedPath(rootId, path, expectedId))
+          throw new Error(
+            `Committed named value ${locator} is absent from its owning path.`
+          );
+      }
+      id2 = expectedId;
+    }
     if (id2 === null)
       throw new Error(
         `Committed local value ${locator} has no row at its owning path.`
@@ -226692,8 +227326,13 @@ function materializeAssignedValueIdsInAuthoredSource(workspace, replacements, pe
       assignedId,
       options.committedValueAtPath
     );
-    if (entryStamps === null) continue;
-    if (site.stampIdentity !== false) {
+    if (entryStamps === null && !site.materializedLocation?.preserveIdentity)
+      continue;
+    if (site.stampIdentity !== false && site.materializedLocation?.preserveIdentity) {
+      file.edits.push(
+        idStamp(file, sourceOffset2(file, site.declarationStart), assignedId)
+      );
+    } else if (site.stampIdentity !== false) {
       const row = rowAt(file, expressionOffset);
       if (row === null) continue;
       if (row.slot === 0 /* Entry */) {
@@ -226707,7 +227346,7 @@ function materializeAssignedValueIdsInAuthoredSource(workspace, replacements, pe
         file.edits.push(...stamp);
       }
     }
-    file.edits.push(...entryStamps);
+    file.edits.push(...entryStamps ?? []);
   }
   const preserved = /* @__PURE__ */ new Map();
   for (const [uri, file] of files)
@@ -227524,6 +228163,8 @@ var compileNSVoidBody2, compileNSFunction2, compileNSGetter2, compileNSSetter2,
 var init_push = __esm({
   "src/commands/push.ts"() {
     "use strict";
+    init_constructor_argument_ownership();
+    init_virtual_instance_values();
     init_animation_child_binding_id();
     init_world_system_classes();
     init_local_project_file_storage();
@@ -243072,7 +243713,7 @@ var releaseWorkspaceLock = () => void 0;
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.89.11");
+    console.log("0.89.13");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {