@neocompose/cli 0.89.12 → 0.89.13

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.89.13
+
+### Patch Changes
+
+- ca52724: Keep named aggregate values and their descendants at the same identities when owning collections are edited before the first push. Local exports no longer give an inserted value the identity of a different named value, and push retains the exported identities. Aliases share their terminal declaration; scalar locals keep independent owning occurrences. Constructor-backed owners preserve these identities through computed arguments, nested named values, and unordered collections without changing constructor execution.
+
+  Unpushed named values from earlier local exports receive new identity reservations. Saves tied to the earlier provisional IDs may need to be recreated.
+
 ## 0.89.12
 
 ### Patch Changes

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.12",
+      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 {
@@ -57427,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())
@@ -57750,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,
@@ -57829,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,
@@ -57881,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()
@@ -58598,7 +58648,7 @@ function buildVirtualInstanceMaterializedIndex(args) {
   return {
     rows,
     rowsById,
-    graph: new MaterializedValueGraphContext(
+    graph: args.materializedGraph ?? new MaterializedValueGraphContext(
       { ...args.document, values: rows },
       rowsById
     ),
@@ -59081,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);
@@ -60671,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,
@@ -60685,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;
@@ -60738,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(
@@ -60752,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,
@@ -60766,7 +60941,8 @@ function sparsifyConstructedInstance(args) {
   try {
     plan = planCollapseVirtualInstance({
       graph,
-      pinnedValueIds: protectedValueIds
+      pinnedValueIds: protectedValueIds,
+      nestedRootValueIds: namedRootIds
     });
   } catch (error) {
     if (!(error instanceof OpenGenericComparisonError)) throw error;
@@ -60776,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,
@@ -60797,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(
@@ -60812,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,
@@ -60832,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
@@ -60899,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);
@@ -61082,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;
@@ -64044,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 },
@@ -118624,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);
@@ -123566,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,
@@ -123599,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();
@@ -148047,6 +148425,7 @@ function* prepareServerOwnedSchemaCommitPasses(args) {
   });
   materializePreparedInstanceInitializers({
     referenceOwners: args.initializerReferenceOwners,
+    constructionIdentities: args.constructionIdentities,
     document: args.document,
     physicalValues: args.document.physicalValues,
     prepared,
@@ -148422,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
@@ -148485,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,
@@ -160240,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,
@@ -160814,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
@@ -160852,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.`;
@@ -160872,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;
@@ -161412,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();
@@ -161500,6 +161904,7 @@ function sourceCommitPreparation(args) {
     }),
     authoredValueSeeds: args.authoredValueSeeds,
     initializerReferenceOwners: args.initializerReferenceOwners,
+    constructionIdentities: args.constructionIdentities,
     forceRecompile: args.forceRecompile,
     scriptSources: args.scriptSources,
     serverTimestamp: args.serverTimestamp
@@ -161783,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 }
@@ -166874,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,
@@ -167618,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,
@@ -167668,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,
@@ -167847,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,
@@ -169441,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,
@@ -171426,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
@@ -175763,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,
@@ -175995,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
@@ -176038,6 +176474,7 @@ function materializeInitializersLocallyV4(args) {
             pinnedSchemaKeysByValueId: /* @__PURE__ */ new Map()
           };
           const evaluated2 = replayStoredConstructionV4({
+            captureConstructionEntries: constructionIdentities.has(sourceValueId),
             readTracking,
             records: records3,
             document,
@@ -176117,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,
@@ -176177,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 };
@@ -188867,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 [];
@@ -224398,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) => {
@@ -224543,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 = {};
@@ -225459,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,
@@ -225475,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)) {
@@ -225501,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");
@@ -225510,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,
@@ -225533,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 ? [] : [
@@ -225621,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,
@@ -225869,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(
@@ -226219,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.`
@@ -226778,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 */) {
@@ -226793,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)
@@ -227610,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();
@@ -243158,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.12");
+    console.log("0.89.13");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/dist/test-worker.mjs

@@ -37246,6 +37246,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;
         }
@@ -40459,6 +40466,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(
@@ -40468,6 +40478,7 @@ function materializeConstructorArgumentValue(args) {
         args.ctx.__valueOverlay
       ) !== null) {
         ids.push(rawEntry);
+        authoredEntries?.push(rawEntry);
         continue;
       }
       const entryValue = constructorCollectionEntryValue(
@@ -40489,6 +40500,7 @@ function materializeConstructorArgumentValue(args) {
         },
         destinationName: `${args.member.name}[${index}]`
       });
+      authoredEntries?.push(child.id);
       if (listKindOf(args.member) === 1 /* Unordered */) {
         child.containerId = row.id;
       } else {
@@ -43306,7 +43318,16 @@ var MaterializedValueGraphContext = class _MaterializedValueGraphContext {
   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())
@@ -46238,6 +46259,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,
@@ -46317,7 +46339,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,
@@ -46369,6 +46393,7 @@ function materializeInitializerValue(args) {
   return {
     root,
     createdValues,
+    constructionEntryIds,
     snapshot: evaluated.snapshot,
     pinnedRootSchemaKeys: evaluated.pinnedRootSchemaKeys ?? /* @__PURE__ */ new Set(),
     pinnedSchemaKeysByValueId: evaluated.pinnedSchemaKeysByValueId ?? /* @__PURE__ */ new Map()
@@ -46838,7 +46863,7 @@ function buildVirtualInstanceMaterializedIndex(args) {
   return {
     rows,
     rowsById,
-    graph: new MaterializedValueGraphContext(
+    graph: args.materializedGraph ?? new MaterializedValueGraphContext(
       { ...args.document, values: rows },
       rowsById
     ),
@@ -47314,7 +47339,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);
@@ -48648,6 +48675,7 @@ function indexExpansion(args) {
     discoveredNodes?.push(node);
     nodesByPath.set(pathKey, node);
     appendChildPath(parentPath, pathKey);
+    if (args.opaquePaths?.has(pathKey)) return;
     if (isClassTypedMember(member)) {
       const record4 = stringRecord(row.value);
       const classId = row.classId ?? member.classId;
@@ -51152,6 +51180,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 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.89.12",
+  "version": "0.89.13",
   "description": "Neo Compose native project-source CLI with bidirectional sync.",
   "license": "MIT",
   "type": "module",

package/skills/neocompose-cli/SKILL.md

@@ -9,7 +9,7 @@ description: >-
   `@neocompose/cli` or `node cli/bin/neo.mjs` in the neo-compose repository.
 ---
 
-<!-- reviewed-through-cli: 0.89.12 -->
+<!-- reviewed-through-cli: 0.89.13 -->
 
 # Neo Compose CLI
 

package/skills/neocompose-cli/references/cli-development.md

@@ -143,7 +143,7 @@ The marker near the top of `SKILL.md` must exactly match the package version,
 and this quoted copy is checked too:
 
 ```html
-<!-- reviewed-through-cli: 0.89.12 -->
+<!-- reviewed-through-cli: 0.89.13 -->
 ```
 
 Keep this skill on current behavior. Upgrade steps, rollout prerequisites,

package/skills/neocompose-cli/references/values/identities.md

@@ -63,6 +63,13 @@ Quest HardAsStone = new Quest() { Name = "Hard as stone" };
 form above. Never put an ID in both places. A local keeps its concrete type
 when a base-typed member consumes it.
 
+Before its first push, a named aggregate in an owning graph reserves its
+identity by its terminal local declaration. Inserting or reordering other list
+entries keeps that value and its descendants stable across local exports.
+Aliases share the terminal declaration's identity. Scalar locals remain reusable
+values, so each owning occurrence gets its own identity. Keep the assigned
+`@id` when renaming or moving a declaration after push.
+
 ## Locals as constructor arguments
 
 In constructor arguments and executable operands, a class local names its one