@neocompose/cli 0.36.10 → 0.36.12

package/dist/neo.mjs

@@ -572,6 +572,7 @@ var init_login = __esm({
       "project:version:create",
       "project:version:status:read",
       "project:version:changelog:read",
+      "project:version:changelog:write",
       "project:record:schema:read",
       "project:record:schema:write",
       "project:record:values:read",
@@ -32528,7 +32529,7 @@ function projectSchemaManifest(input, options = {}) {
     manifest.constructors ?? [],
     "ProjectSchemaManifest.constructors"
   );
-  const memberById = indexById(members, "ProjectSchemaManifest.members");
+  const memberById2 = indexById(members, "ProjectSchemaManifest.members");
   const schemaClassById = indexById(classes, "ProjectSchemaManifest.classes");
   const interfaceById = indexById(
     interfaces,
@@ -32555,7 +32556,7 @@ function projectSchemaManifest(input, options = {}) {
   const rootMemberIds2 = options.rootMemberIds ?? inferRootMemberIds(members);
   const environment = {
     sourceUri: options.sourceUri ?? defaultSourceUri,
-    members: memberById,
+    members: memberById2,
     classes: schemaClassById,
     interfaces: interfaceById,
     enums: indexById(enums, "ProjectSchemaManifest.enums"),
@@ -32765,10 +32766,10 @@ function inferRootMemberIds(members) {
   };
 }
 function effectiveMemberWritability(members, classes, roots) {
-  const memberById = /* @__PURE__ */ new Map();
+  const memberById2 = /* @__PURE__ */ new Map();
   for (const member of members) {
     if (typeof member.id === "string") {
-      memberById.set(member.id, member);
+      memberById2.set(member.id, member);
     }
   }
   const classById = /* @__PURE__ */ new Map();
@@ -32780,7 +32781,7 @@ function effectiveMemberWritability(members, classes, roots) {
   const declaredStorage = (memberId, seen = /* @__PURE__ */ new Set()) => {
     if (seen.has(memberId)) return null;
     seen.add(memberId);
-    const member = memberById.get(memberId);
+    const member = memberById2.get(memberId);
     if (!member) return null;
     if (member.storage === "immutable" || member.storage === "save" || member.storage === "session") {
       return member.storage;
@@ -32849,7 +32850,7 @@ function effectiveMemberWritability(members, classes, roots) {
   if (typeof roots.session === "string") {
     rootStorage.set(roots.session, "session");
   }
-  for (const [memberId, member] of memberById) {
+  for (const [memberId, member] of memberById2) {
     const root = rootStorage.get(memberId);
     const declared = declaredStorage(memberId);
     let storage = root ?? declared;
@@ -32866,7 +32867,7 @@ function effectiveMemberWritability(members, classes, roots) {
   let changed = true;
   while (changed) {
     changed = false;
-    for (const memberId of memberById.keys()) {
+    for (const memberId of memberById2.keys()) {
       if (anchored.has(memberId)) continue;
       const next = new Set(effective.get(memberId) ?? []);
       for (const parentId of parents.get(memberId) ?? []) {
@@ -35199,6 +35200,19 @@ var init_names = __esm({
 function isObjectRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function effectiveRecordData(record3) {
+  return record3.conflictServerHash !== void 0 && isObjectRecord2(record3.conflictServerData) ? record3.conflictServerData : record3.data;
+}
+function loweringBaseRecords(records2) {
+  let normalized = null;
+  for (const [key, record3] of Object.entries(records2)) {
+    const effective = effectiveRecordData(record3);
+    if (effective === record3.data) continue;
+    if (normalized === null) normalized = { ...records2 };
+    normalized[key] = { ...record3, data: effective };
+  }
+  return normalized ?? records2;
+}
 function splitRecordFields(data, serverOwnedFields) {
   const fileFields = {};
   const volatileValues = {};
@@ -54576,7 +54590,7 @@ function globalId(global, kind) {
 }
 function baseData(state, kind, id2) {
   const entry = state[`${kind}:${id2}`];
-  return entry?.conflictServerHash !== void 0 ? entry.conflictServerData : entry?.data;
+  return entry === void 0 ? void 0 : effectiveRecordData(entry);
 }
 function optionalBase(value) {
   return isObjectRecord2(value) ? value : {};
@@ -64258,7 +64272,7 @@ function constructorActionParameterId(constructor2, index) {
   }
   return `__arg_${index}__`;
 }
-function createTypedValueNormalizer(rows, document, childrenByContainerId, parameterTypesForRow, memberById, memberTypeInfo) {
+function createTypedValueNormalizer(rows, document, childrenByContainerId, parameterTypesForRow, memberById2, memberTypeInfo) {
   const visiting = /* @__PURE__ */ new Set();
   const normalizeLiteral = (value) => {
     if (Array.isArray(value)) return value.map(normalizeLiteral);
@@ -64341,7 +64355,7 @@ function createTypedValueNormalizer(rows, document, childrenByContainerId, param
     const childTypeBySchemaKey = /* @__PURE__ */ new Map();
     for (const entry of merged) {
       if (entry.memberId === null) continue;
-      const member = memberById(entry.memberId);
+      const member = memberById2(entry.memberId);
       if (member === void 0) continue;
       const childType = memberTypeInfo(member, env);
       if (childType !== null) {
@@ -64534,6 +64548,11 @@ var init_constructor_argument_ownership = __esm({
     init_compile_ns_property();
     init_value_row_owner_members();
     MaterializedValueGraphContext = class {
+      /**
+       * P79 §7a. Generic in the caller's document view so a pass typed against a
+       * narrowed view does not get the whole document handed back on the first
+       * line it reads `graph.document`.
+       */
       document;
       valuesById;
       childrenByContainerId;
@@ -72144,9 +72163,9 @@ function constructionInitEvaluator(ctx, createdValues, argumentScopes, construct
     let currentId = memberId;
     while (currentId !== void 0 && !visited.has(currentId)) {
       visited.add(currentId);
-      const declaringClassIds = indexes.declaringClassIdsByMemberId.get(currentId);
+      const declaringClassIds2 = indexes.declaringClassIdsByMemberId.get(currentId);
       const owner = inheritanceChain.find(
-        (schemaClass2) => declaringClassIds?.has(schemaClass2.id)
+        (schemaClass2) => declaringClassIds2?.has(schemaClass2.id)
       );
       if (owner !== void 0) return owner.id;
       currentId = indexes.containerMemberIdByEntryId.get(currentId) ?? indexes.memberById.get(currentId)?.extendsMemberId;
@@ -72261,7 +72280,7 @@ function buildConstructorInitializerIndexes(vm) {
       declaringClassIdsByMemberId.set(memberId, owners);
     }
   }
-  const memberById = new Map(vm.members.map((member) => [member.id, member]));
+  const memberById2 = new Map(vm.members.map((member) => [member.id, member]));
   const containerMemberIdByEntryId = /* @__PURE__ */ new Map();
   for (const member of vm.members) {
     if (isMemberList(member) || isMemberDictionary(member)) {
@@ -72271,7 +72290,7 @@ function buildConstructorInitializerIndexes(vm) {
   return {
     initializerScopeMemberIds,
     declaringClassIdsByMemberId,
-    memberById,
+    memberById: memberById2,
     containerMemberIdByEntryId
   };
 }
@@ -79912,7 +79931,7 @@ function baseData2(state, kind, id2) {
   return record3 ? effectiveData(record3) : {};
 }
 function effectiveData(record3) {
-  const data = record3.conflictServerHash !== void 0 ? record3.conflictServerData : record3.data;
+  const data = effectiveRecordData(record3);
   return isObjectRecord2(data) ? data : {};
 }
 function requiredDestination(value, owner) {
@@ -81930,7 +81949,7 @@ function variantOwnershipRoots(args) {
   const folderById = new Map(
     (args.variantFolders ?? []).map((folder) => [folder.id, folder])
   );
-  const memberById = new Map(
+  const memberById2 = new Map(
     (args.members ?? []).map((member) => [member.id, member])
   );
   const roots = [];
@@ -81971,7 +81990,7 @@ function variantOwnershipRoots(args) {
       })
     );
     const lookupParameterId = variantClass.genericParams?.[1]?.id;
-    const lookupCollection = lookupFolder?.binding == null ? void 0 : memberById.get(lookupFolder.binding.collectionMemberId);
+    const lookupCollection = lookupFolder?.binding == null ? void 0 : memberById2.get(lookupFolder.binding.collectionMemberId);
     const lookupBinding = lookupParameterId !== void 0 && isMemberListBase(lookupCollection) ? {
       [lookupParameterId]: {
         kind: "member",
@@ -82126,8 +82145,17 @@ function transactionImpactsAnyOwnerMember(scope, impactedIds) {
 function collectNeoScriptRecompileTargets(args) {
   if (args.forceRecompile === true) return completeTargets(args.postDocument);
   const explicit = explicitTargetIds(args.changes);
-  const { impactedIds, impactedTypeNames, constructedClassIds } = collectChangedContractIds(args);
+  const {
+    impactedIds,
+    changedValueIds,
+    impactedTypeNames,
+    constructedClassIds
+  } = collectChangedContractIds(args);
   for (const id2 of args.additionalImpactedIds ?? []) impactedIds.add(id2);
+  for (const id2 of args.additionalChangedValueIds ?? []) {
+    changedValueIds.add(id2);
+    explicit.valueIds.add(id2);
+  }
   includeDerivedConstructionContracts(
     constructedClassIds,
     args.postDocument.classes
@@ -82144,7 +82172,7 @@ function collectNeoScriptRecompileTargets(args) {
       dependentsById.set(dependencyId, dependents);
     }
   }
-  const queue = [...impactedIds];
+  const queue = [...impactedIds, ...changedValueIds];
   for (let index = 0; index < queue.length; index += 1) {
     const dependencyId = queue[index];
     if (dependencyId === void 0) continue;
@@ -82153,22 +82181,24 @@ function collectNeoScriptRecompileTargets(args) {
     }
   }
   const constructorOwnerById = constructorOwners(args.postDocument);
-  const impactedSourceNames = collectImpactedSourceNames({
-    currentDocument: args.currentDocument,
-    postDocument: args.postDocument,
+  const gradesSourceOnlyBodies = impactedIds.size > 0 || impactedTypeNames.size > 0;
+  const impactScope = {
     impactedIds,
+    changedValueIds,
     impactedTypeNames,
-    constructedClassIds
-  });
-  const memberIds = new Set(explicit.memberIds);
-  for (const member of args.postDocument.members) {
-    if (recordDependsOnChangedContract(
-      member,
+    constructedClassIds,
+    impactedSourceNames: gradesSourceOnlyBodies ? collectImpactedSourceNames({
+      currentDocument: args.currentDocument,
+      postDocument: args.postDocument,
       impactedIds,
+      changedValueIds,
       impactedTypeNames,
-      constructedClassIds,
-      impactedSourceNames
-    )) {
+      constructedClassIds
+    }) : /* @__PURE__ */ new Set()
+  };
+  const memberIds = new Set(explicit.memberIds);
+  for (const member of args.postDocument.members) {
+    if (recordDependsOnChangedContract(member, impactScope)) {
       memberIds.add(member.id);
     }
   }
@@ -82176,10 +82206,7 @@ function collectNeoScriptRecompileTargets(args) {
   const valueIds = selectedRecordIds(
     postValues,
     explicit.valueIds,
-    impactedIds,
-    impactedTypeNames,
-    constructedClassIds,
-    impactedSourceNames
+    impactScope
   );
   if (impactedIds.size > 0 && postValues.length > 0) {
     const scope = withVariantOwnershipRoots(
@@ -82206,35 +82233,23 @@ function collectNeoScriptRecompileTargets(args) {
     constructorIds: selectedRecordIds(
       args.postDocument.constructors ?? [],
       explicit.constructorIds,
-      impactedIds,
-      impactedTypeNames,
-      constructedClassIds,
-      impactedSourceNames,
+      impactScope,
       (record3) => constructorOwnerById.get(record3.id) ?? null
     ),
     migrationIds: selectedRecordIds(
       args.postDocument.migrations ?? [],
       explicit.migrationIds,
-      impactedIds,
-      impactedTypeNames,
-      constructedClassIds,
-      impactedSourceNames
+      impactScope
     ),
     dialogueNodeIds: selectedRecordIds(
       args.postDocument.dialogueNodes ?? [],
       explicit.dialogueNodeIds,
-      impactedIds,
-      impactedTypeNames,
-      constructedClassIds,
-      impactedSourceNames
+      impactScope
     ),
     dialogueGroupIds: selectedRecordIds(
       args.postDocument.dialogueGroups ?? [],
       explicit.dialogueGroupIds,
-      impactedIds,
-      impactedTypeNames,
-      constructedClassIds,
-      impactedSourceNames
+      impactScope
     ),
     valueIds
   };
@@ -82310,6 +82325,7 @@ function isCompilerReferenceField(field) {
 }
 function collectChangedContractIds(args) {
   const impactedIds = /* @__PURE__ */ new Set();
+  const changedValueIds = /* @__PURE__ */ new Set();
   const impactedTypeNames = /* @__PURE__ */ new Set();
   const constructedClassIds = /* @__PURE__ */ new Set();
   const currentMembers = new Map(
@@ -82370,7 +82386,7 @@ function collectChangedContractIds(args) {
       const current2 = currentValues.get(change.recordId);
       const next2 = postValues.get(change.recordId);
       if (current2 === void 0 || next2 === void 0 || Reflect.get(current2, "classId") !== Reflect.get(next2, "classId")) {
-        impactedIds.add(change.recordId);
+        changedValueIds.add(change.recordId);
       }
       continue;
     }
@@ -82416,7 +82432,12 @@ function collectChangedContractIds(args) {
       }
     }
   }
-  return { impactedIds, impactedTypeNames, constructedClassIds };
+  return {
+    impactedIds,
+    changedValueIds,
+    impactedTypeNames,
+    constructedClassIds
+  };
 }
 function generatedConstructorMemberContractChanged(current, next) {
   if (current === void 0 || next === void 0) return true;
@@ -82603,50 +82624,51 @@ function explicitTargetIds(changes) {
   }
   return result;
 }
-function selectedRecordIds(records2, explicitIds, impactedIds, impactedTypeNames, constructedClassIds, impactedSourceNames, ownerId = () => null) {
+function selectedRecordIds(records2, explicitIds, scope, ownerId = () => null) {
   const selected = new Set(explicitIds);
   for (const record3 of records2) {
     const owner = ownerId(record3);
-    if (owner !== null && impactedIds.has(owner) || recordDependsOnChangedContract(
-      record3,
-      impactedIds,
-      impactedTypeNames,
-      constructedClassIds,
-      impactedSourceNames
-    )) {
+    if (owner !== null && scope.impactedIds.has(owner) || recordDependsOnChangedContract(record3, scope)) {
       selected.add(record3.id);
     }
   }
   return selected;
 }
-function recordDependsOnChangedContract(record3, impactedIds, impactedTypeNames, constructedClassIds, impactedSourceNames) {
+function recordDependsOnChangedContract(record3, scope) {
   const recordId = isObjectRecord4(record3) ? record3.id : void 0;
-  if (typeof recordId === "string" && impactedIds.has(recordId)) return true;
-  if (intersects(collectCompilerReferenceIds(record3), impactedIds)) return true;
-  if (intersects(collectCompilerReferenceNames(record3), impactedTypeNames)) {
+  if (typeof recordId === "string" && scope.impactedIds.has(recordId)) {
     return true;
   }
-  if (intersects(collectConstructedClassIds(record3), constructedClassIds)) {
+  const referenceIds = collectCompilerReferenceIds(record3);
+  if (intersects(referenceIds, scope.impactedIds)) return true;
+  if (intersects(referenceIds, scope.changedValueIds)) return true;
+  if (intersects(collectCompilerReferenceNames(record3), scope.impactedTypeNames)) {
     return true;
   }
-  if (impactedIds.size === 0 && impactedTypeNames.size === 0) return false;
+  if (intersects(collectConstructedClassIds(record3), scope.constructedClassIds)) {
+    return true;
+  }
+  if (scope.impactedIds.size === 0 && scope.impactedTypeNames.size === 0) {
+    return false;
+  }
   if (!containsAuthoredNeoScriptSource(record3)) return false;
   if (containsCompiledNeoScriptBody(record3)) return false;
-  if (impactedSourceNames === null) return true;
+  if (scope.impactedSourceNames === null) return true;
   const sourceIdentifiers = collectAuthoredNeoScriptSourceIdentifiers(record3);
   if (sourceIdentifiers === null) return true;
-  return intersects(sourceIdentifiers, impactedSourceNames);
+  return intersects(sourceIdentifiers, scope.impactedSourceNames);
 }
 function collectImpactedSourceNames(args) {
   const names = new Set(args.impactedTypeNames);
   let recoveredContract = args.impactedTypeNames.size > 0;
+  const isImpactedRecordId = (id2) => args.impactedIds.has(id2) || args.changedValueIds.has(id2);
   const collectDocument = (document) => {
     const classById = new Map(
       document.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
     );
     const ownerByConstructorId = constructorOwners(document);
     const impactedValueIds = new Set(
-      (document.values ?? []).filter((value) => args.impactedIds.has(value.id)).map((value) => value.id)
+      (document.values ?? []).filter((value) => isImpactedRecordId(value.id)).map((value) => value.id)
     );
     const scope = withVariantOwnershipRoots(document, document.variants ?? []);
     const ownerByValueId = resolveOwnerMembersForValues(
@@ -82675,7 +82697,7 @@ function collectImpactedSourceNames(args) {
       ...document.values ?? []
     ];
     for (const record3 of records2) {
-      if (!args.impactedIds.has(record3.id)) continue;
+      if (!isImpactedRecordId(record3.id)) continue;
       recoveredContract = true;
       collectDeclaredSourceNames(record3, names);
       const ownerClassId = ownerByConstructorId.get(record3.id);
@@ -87398,7 +87420,7 @@ function validateCreatedMigrationGraph(args) {
     }
     createdById.set(row.id, row);
   }
-  const memberById = new Map(args.members.map((member) => [member.id, member]));
+  const memberById2 = new Map(args.members.map((member) => [member.id, member]));
   const classById = new Map(
     args.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
   );
@@ -87497,7 +87519,7 @@ function validateCreatedMigrationGraph(args) {
           );
         }
         const childMemberId = schema.get(schemaKey);
-        const childMember = childMemberId === void 0 ? void 0 : memberById.get(childMemberId);
+        const childMember = childMemberId === void 0 ? void 0 : memberById2.get(childMemberId);
         if (childMember === void 0) {
           throw graphError(
             args,
@@ -87513,7 +87535,7 @@ function validateCreatedMigrationGraph(args) {
       return;
     }
     if (member !== void 0 && isMemberListBase(member)) {
-      const entryMember = memberById.get(member.entryMemberId);
+      const entryMember = memberById2.get(member.entryMemberId);
       if (entryMember === void 0) {
         throw graphError(
           args,
@@ -87541,7 +87563,7 @@ function validateCreatedMigrationGraph(args) {
       return;
     }
     if (member !== void 0 && isMemberDictionaryBase(member)) {
-      const entryMember = memberById.get(member.entryMemberId);
+      const entryMember = memberById2.get(member.entryMemberId);
       if (entryMember === void 0) {
         throw graphError(
           args,
@@ -88765,13 +88787,13 @@ function lookupTargetClassContractViolation(args) {
   }
   return null;
 }
-function lookupEntryClassId(member, memberById) {
-  const collection = memberById.get(member.collectionMemberId);
+function lookupEntryClassId(member, memberById2) {
+  const collection = memberById2.get(member.collectionMemberId);
   if (collection === void 0) return null;
   if (!isMemberListBase(collection) && !isMemberDictionaryBase(collection)) {
     return null;
   }
-  const entry = memberById.get(collection.entryMemberId);
+  const entry = memberById2.get(collection.entryMemberId);
   if (entry === void 0) return null;
   return isMemberClassBase(entry) ? entry.classId : null;
 }
@@ -88795,8 +88817,8 @@ function classAssignableToClass(actualClassId, expectedClassId, classById) {
 function classDisplayName(classId, classById) {
   return classById.get(classId)?.name ?? classId;
 }
-function collectionMemberName(member, memberById, classes) {
-  const collection = memberById.get(member.collectionMemberId);
+function collectionMemberName(member, memberById2, classes) {
+  const collection = memberById2.get(member.collectionMemberId);
   if (collection === void 0) return member.collectionMemberId;
   const owner = classes.find(
     (schemaClass2) => Object.values(schemaClass2.schema).includes(member.collectionMemberId)
@@ -89984,7 +90006,7 @@ function prepareServerOwnedSchemaCommit(args) {
   const hasValueChange = authoredChanges.some(
     (change) => change.recordKind === "value"
   );
-  const hasAdditionalContractImpact = (args.additionalImpactedIds?.size ?? 0) > 0;
+  const hasAdditionalContractImpact = (args.additionalImpactedIds?.size ?? 0) > 0 || (args.additionalChangedValueIds?.size ?? 0) > 0;
   if (!hasSchemaChange && !hasMigrationChange && !hasDialogueSourceChange && !hasValueChange && !hasAdditionalContractImpact) {
     return authoredChanges;
   }
@@ -89997,6 +90019,7 @@ function prepareServerOwnedSchemaCommit(args) {
     postDocument: authoredPostDocument,
     changes: authoredChanges,
     additionalImpactedIds: args.additionalImpactedIds,
+    additionalChangedValueIds: args.additionalChangedValueIds,
     forceRecompile: args.forceRecompile
   });
   const currentById = new Map(
@@ -90306,7 +90329,8 @@ function materializePreparedInstanceInitializers(args) {
   const existingValueById = new Map(
     args.document.values.map((value) => [value.id, value])
   );
-  const currentGraph = new MaterializedValueGraphContext(args.document);
+  let currentGraph = null;
+  const requireCurrentGraph = () => currentGraph ??= new MaterializedValueGraphContext(args.document);
   const rootKinds = /* @__PURE__ */ new Map();
   const materializationScope = withVariantOwnershipRoots(
     compiledDocument,
@@ -90346,7 +90370,7 @@ function materializePreparedInstanceInitializers(args) {
     if (existingConstructedRoot) {
       if (!isLiteralValueContent(materialized.root) || existingRoot.classId !== materialized.root.classId || !replayedCreationDataMatches({
         currentDocument: args.document,
-        currentGraph,
+        currentGraph: requireCurrentGraph(),
         currentRoot: existingRoot,
         replayRoot: materialized.root,
         replayCreated: materialized.createdValues
@@ -91336,9 +91360,46 @@ function drainConstructedGraphValidations(args) {
     });
   }
 }
+function indexAuthoredSeedDocument(document) {
+  const declaringClassIdsByMemberId = /* @__PURE__ */ new Map();
+  for (const schemaClass2 of document.classes) {
+    const declared = /* @__PURE__ */ new Set();
+    for (const memberId of Object.values(schemaClass2.schema)) {
+      if (typeof memberId !== "string") continue;
+      if (declared.has(memberId)) continue;
+      declared.add(memberId);
+      const owners = declaringClassIdsByMemberId.get(memberId);
+      if (owners === void 0) {
+        declaringClassIdsByMemberId.set(memberId, [schemaClass2.id]);
+        continue;
+      }
+      owners.push(schemaClass2.id);
+    }
+  }
+  return {
+    valuesById: indexRecordsById(document.values),
+    membersById: indexRecordsById(document.members),
+    localizedTextIds: new Set(
+      (document.localizedTexts ?? []).map((text) => text.id)
+    ),
+    declaringClassIdsByMemberId
+  };
+}
+function declaringClassIds(index, memberId) {
+  return index.declaringClassIdsByMemberId.get(memberId) ?? [];
+}
+function hasLiveMemberChange(prepared) {
+  return prepared.some(
+    (change) => change.recordKind === "member" && change.operation !== "delete" && change.nextData !== void 0
+  );
+}
 function materializeAuthoredValueSeeds(args) {
+  if (args.authoredValueSeeds.length === 0 && !hasLiveMemberChange(args.prepared)) {
+    return;
+  }
   const pendingGraphValidations = [];
   materializeStaticSeedBindingMembers(args);
+  const documentIndex = indexAuthoredSeedDocument(args.document);
   const seedByMemberId = new Map(
     args.authoredValueSeeds.map((seed) => [seed.memberId, seed])
   );
@@ -91358,6 +91419,7 @@ function materializeAuthoredValueSeeds(args) {
       consumedSeedMemberIds.add(member.id);
       materializeInstanceDefaultSeed({
         document: args.document,
+        documentIndex,
         prepared: args.prepared,
         pendingGraphValidations,
         memberChange: { index, change },
@@ -91380,9 +91442,7 @@ function materializeAuthoredValueSeeds(args) {
         `Static Generic member "${member.name}" (${member.id}) cannot materialize a value.`
       );
     }
-    const owners = args.document.classes.filter(
-      (schemaClass2) => Object.values(schemaClass2.schema).includes(member.id)
-    );
+    const owners = declaringClassIds(documentIndex, member.id);
     if (owners.length !== 1) {
       throw new Error(
         `Stored static member "${member.name}" (${member.id}) must have exactly one direct declaring class; found ${owners.length}.`
@@ -91390,7 +91450,7 @@ function materializeAuthoredValueSeeds(args) {
     }
     if (change.operation === "update" && seed === void 0) continue;
     if (change.operation === "create" && seed === void 0 && typeof member.valueId === "string") {
-      if (!args.document.values.some((value) => value.id === member.valueId)) {
+      if (!documentIndex.valuesById.has(member.valueId)) {
         throw new Error(
           `Stored static member "${member.name}" (${member.id}) binds missing value "${member.valueId}".`
         );
@@ -91414,6 +91474,7 @@ function materializeAuthoredValueSeeds(args) {
       member: materializationMember
     }) : materializeAuthoredStaticSeed({
       document: args.document,
+      documentIndex,
       member: materializationMember,
       // P61 must leave a computed static root as an init-backed prepared
       // row until `materializePreparedInstanceInitializers` runs. The
@@ -91423,7 +91484,7 @@ function materializeAuthoredValueSeeds(args) {
       seed: { ...seed, values: seed.values ?? [] }
     });
     const { createdValues, localizedTexts, storageKeyDeclarations, rootValue } = materialized;
-    const ownedValueId = args.document.members.find((candidate) => candidate.id === member.id)?.valueId ?? derivedMemberValueId(member.id);
+    const ownedValueId = documentIndex.membersById.get(member.id)?.valueId ?? derivedMemberValueId(member.id);
     if (seed?.valueId !== void 0 && seed.valueId !== ownedValueId) {
       throw new Error(
         `Static value seed for member "${member.name}" (${member.id}) binds value "${seed.valueId}", but the member owns value "${ownedValueId}".`
@@ -91436,7 +91497,7 @@ function materializeAuthoredValueSeeds(args) {
     }
     if (seed?.values === void 0 && rootValue.id !== ownedValueId) {
       assertMintedRootValueIdIsFree({
-        document: args.document,
+        documentIndex,
         prepared: args.prepared,
         member,
         valueId: ownedValueId
@@ -91458,7 +91519,7 @@ function materializeAuthoredValueSeeds(args) {
           rootValue.id,
           {
             mapKey: null,
-            classId: owners[0].id
+            classId: owners[0]
           }
         ]
       ])
@@ -91506,12 +91567,11 @@ function materializeAuthoredValueSeeds(args) {
   }
   for (const seed of args.authoredValueSeeds) {
     if (consumedSeedMemberIds.has(seed.memberId)) continue;
-    const member = args.document.members.find(
-      (candidate) => candidate.id === seed.memberId
-    );
+    const member = documentIndex.membersById.get(seed.memberId);
     if (member !== void 0 && member.isStatic !== true && !isProjectRootMember(args.document.project, member.id)) {
       materializeInstanceDefaultSeed({
         document: args.document,
+        documentIndex,
         prepared: args.prepared,
         pendingGraphValidations,
         memberChange: null,
@@ -91523,6 +91583,7 @@ function materializeAuthoredValueSeeds(args) {
     }
     materializeExistingAuthoredValueSeed({
       document: args.document,
+      documentIndex,
       prepared: args.prepared,
       pendingGraphValidations,
       seed,
@@ -91537,9 +91598,7 @@ function materializeAuthoredValueSeeds(args) {
   });
 }
 function materializeExistingAuthoredValueSeed(args) {
-  const member = args.document.members.find(
-    (candidate) => candidate.id === args.seed.memberId
-  );
+  const member = args.documentIndex.membersById.get(args.seed.memberId);
   if (member === void 0) {
     throw new Error(
       `Member value seed "${args.seed.memberId}" does not target a stored member in this schema commit.`
@@ -91561,9 +91620,7 @@ function materializeExistingAuthoredValueSeed(args) {
       `Existing value graph seed for member "${member.name}" (${member.id}) targets value "${args.seed.valueId}", but the member binds "${String(member.valueId)}".`
     );
   }
-  const owners = args.document.classes.filter(
-    (schemaClass2) => Object.values(schemaClass2.schema).includes(member.id)
-  );
+  const owners = declaringClassIds(args.documentIndex, member.id);
   if (!isRootMember && owners.length !== 1) {
     throw new Error(
       `Stored static member "${member.name}" (${member.id}) must have exactly one direct declaring class; found ${owners.length}.`
@@ -91571,6 +91628,7 @@ function materializeExistingAuthoredValueSeed(args) {
   }
   const materialized = materializeAuthoredStaticSeed({
     document: args.document,
+    documentIndex: args.documentIndex,
     member,
     seed: { ...args.seed, values: args.seed.values },
     allowExistingRows: true
@@ -91591,7 +91649,7 @@ function materializeExistingAuthoredValueSeed(args) {
           mapKey: null,
           // A root member's row has no enclosing class, so declared storage
           // keys below it resolve against no parent class.
-          classId: owners[0]?.id
+          classId: owners[0]
         }
       ]
     ])
@@ -91610,9 +91668,7 @@ function materializeExistingAuthoredValueSeed(args) {
   });
   for (const value of materialized.createdValues) {
     if (materialized.existingValueIds.has(value.id)) {
-      if (isInitValueContent(value) && !isInitValueContent(
-        args.document.values.find((candidate) => candidate.id === value.id)
-      )) {
+      if (isInitValueContent(value) && !isInitValueContent(args.documentIndex.valuesById.get(value.id))) {
         args.prepared.push({
           recordKind: "value",
           recordId: value.id,
@@ -91816,9 +91872,7 @@ function materializeInstanceDefaultSeed(args) {
       `Constructed default seed for member "${args.member.name}" (${args.member.id}) requires a root value id and explicit value rows.`
     );
   }
-  const owners = args.document.classes.filter(
-    (schemaClass2) => Object.values(schemaClass2.schema).includes(args.member.id)
-  );
+  const owners = declaringClassIds(args.documentIndex, args.member.id);
   if (owners.length !== 1) {
     throw new Error(
       `Constructed default member "${args.member.name}" (${args.member.id}) must have exactly one direct declaring class; found ${owners.length}.`
@@ -91836,6 +91890,7 @@ function materializeInstanceDefaultSeed(args) {
     existingValueIds
   } = materializeAuthoredStaticSeed({
     document: args.document,
+    documentIndex: args.documentIndex,
     member: materializationMember,
     seed: { ...args.seed, values: args.seed.values },
     allowExistingRows: args.memberChange === null || args.memberChange.change.operation === "update"
@@ -91849,7 +91904,7 @@ function materializeInstanceDefaultSeed(args) {
         rootValue.id,
         {
           mapKey: null,
-          classId: owners[0].id
+          classId: owners[0]
         }
       ]
     ])
@@ -91940,7 +91995,7 @@ function materializeDefaultStaticSeed(args) {
   };
 }
 function assertMintedRootValueIdIsFree(args) {
-  if (args.document.values.some((value) => value.id === args.valueId)) {
+  if (args.documentIndex.valuesById.has(args.valueId)) {
     throw new Error(
       `Member "${args.member.name}" (${args.member.id}) owns value "${args.valueId}", which already exists in this version.`
     );
@@ -91977,7 +92032,7 @@ function materializeAuthoredStaticSeed(args) {
   const requestedIds = /* @__PURE__ */ new Set([requestedRootId, ...authoredRows.keys()]);
   const existingValueIds = /* @__PURE__ */ new Set();
   for (const id2 of requestedIds) {
-    const existing = args.document.values.find((value) => value.id === id2);
+    const existing = args.documentIndex.valuesById.get(id2);
     if (existing === void 0) continue;
     if (args.allowExistingRows !== true) {
       throw new Error(`Value "${id2}" already exists.`);
@@ -91995,6 +92050,7 @@ function materializeAuthoredStaticSeed(args) {
   const usedRows = /* @__PURE__ */ new Set();
   const rootValue = materializeAuthoredSeedRow({
     document: args.document,
+    documentIndex: args.documentIndex,
     member: args.member,
     row: seedRootRow(args.member, args.seed, requestedRootId),
     authoredRows,
@@ -92022,6 +92078,7 @@ function materializeAuthoredStaticSeed(args) {
   }
   const seededLocalizedTexts = materializeStaticLocalizedTexts({
     document: args.document,
+    documentIndex: args.documentIndex,
     seeds: args.seed.localizedTexts ?? [],
     createdValues
   });
@@ -92157,9 +92214,7 @@ function materializeStaticLocalizedTexts(args) {
       throw new Error(`Localized text seed repeats id "${seed.id}".`);
     }
     seen.add(seed.id);
-    if ((args.document.localizedTexts ?? []).some(
-      (text) => text.id === seed.id
-    ) || args.document.values.some((value) => value.id === seed.id)) {
+    if (args.documentIndex.localizedTextIds.has(seed.id) || args.documentIndex.valuesById.has(seed.id)) {
       throw new Error(`Localized text "${seed.id}" already exists.`);
     }
     const owner = args.createdValues.find((value) => value.id === seed.valueId);
@@ -92235,7 +92290,7 @@ function materializeAuthoredSeedRow(args) {
     ...isMemberClassBase(resolvedStoredMember) && args.row.classId !== null ? { topLevelClassId: args.row.classId } : {}
   });
   renameCreatedValueId({
-    document: args.document,
+    documentIndex: args.documentIndex,
     createdValues: args.createdValues,
     storageKeyDeclarations: args.storageKeyDeclarations,
     generatedId: generatedRoot.id,
@@ -92323,7 +92378,7 @@ function materializeAuthoredClassFields(args) {
         `Class "${effectiveClassId}" has no stored member "${schemaKey}".`
       );
     }
-    const childMember = requireDocumentMember(args.document, childMemberId);
+    const childMember = requireSeedMember(args.documentIndex, childMemberId);
     const currentBody = isStringValueRecord(args.rootValue.value) ? args.rootValue.value : {};
     const previousId = currentBody[schemaKey];
     if (previousId !== void 0 && previousId !== childId) {
@@ -92352,8 +92407,8 @@ function materializeAuthoredListItems(args) {
   if (!Array.isArray(args.row.value)) {
     throw new Error(`List value "${args.row.id}" requires an array body.`);
   }
-  const entryMember = requireDocumentMember(
-    args.document,
+  const entryMember = requireSeedMember(
+    args.documentIndex,
     args.member.entryMemberId
   );
   const unordered = listKindOf(args.member) === "unordered";
@@ -92384,8 +92439,8 @@ function materializeAuthoredDictionaryEntries(args) {
       `Dictionary value "${args.row.id}" requires an object body.`
     );
   }
-  const entryMember = requireDocumentMember(
-    args.document,
+  const entryMember = requireSeedMember(
+    args.documentIndex,
     args.member.entryMemberId
   );
   const body = {};
@@ -92403,9 +92458,7 @@ function materializeAuthoredChild(args) {
   if (authored !== void 0) {
     return materializeAuthoredSeedRow({ ...args, row: authored });
   }
-  const existing = args.document.values.find(
-    (value) => value.id === args.childId
-  );
+  const existing = args.documentIndex.valuesById.get(args.childId);
   if (existing === void 0) {
     throw new Error(
       `Authored value graph references missing row "${args.childId}".`
@@ -92415,7 +92468,7 @@ function materializeAuthoredChild(args) {
 }
 function renameCreatedValueId(args) {
   if (args.generatedId === args.requestedId) return;
-  if (args.document.values.some((value2) => value2.id === args.requestedId) && !args.replaceExistingIds.has(args.requestedId) || args.createdValues.some(
+  if (args.documentIndex.valuesById.has(args.requestedId) && !args.replaceExistingIds.has(args.requestedId) || args.createdValues.some(
     (value2) => value2.id === args.requestedId && value2.id !== args.generatedId
   )) {
     throw new Error(`Value "${args.requestedId}" already exists.`);
@@ -92487,10 +92540,8 @@ function collectStringReferences2(value, output) {
     collectStringReferences2(entry, output);
   }
 }
-function requireDocumentMember(document, memberId) {
-  const member = document.members.find(
-    (candidate) => candidate.id === memberId
-  );
+function requireSeedMember(documentIndex, memberId) {
+  const member = documentIndex.membersById.get(memberId);
   if (member === void 0) throw new Error(`Member "${memberId}" is missing.`);
   return member;
 }
@@ -92748,6 +92799,18 @@ function prepareServerOwnedValueInitializerBodies(args) {
     });
   }
 }
+function collectDelegateSweepRows(args) {
+  if (args.targetIds.size === 0) return [];
+  const preparedValueIds = indexChangesByRecordId(args.prepared, "value");
+  const sweepRows = [];
+  for (const value of args.postDocument.values) {
+    if (!args.targetIds.has(value.id)) continue;
+    if (preparedValueIds.has(value.id)) continue;
+    const row = delegateValueRow(value);
+    if (row !== null) sweepRows.push(row);
+  }
+  return sweepRows;
+}
 function delegateValueRow(value) {
   if (!isMemberValue(value) || !isLiteralValueContent(value)) return null;
   if (!isNSDelegateClosureValueDraft(value.value) && !isNSDelegateClosureValue(value.value)) {
@@ -92765,11 +92828,7 @@ function prepareServerOwnedDelegateValueBodies(args) {
     const row = delegateValueRow(change.nextData);
     if (row !== null) explicitRows.set(index, row);
   }
-  const sweepRows = args.postDocument.values.filter(
-    (value) => args.targetIds.has(value.id) && delegateValueRow(value) !== null && !args.prepared.some(
-      (change) => change.recordKind === "value" && change.recordId === value.id
-    )
-  );
+  const sweepRows = collectDelegateSweepRows(args);
   if (explicitRows.size === 0 && sweepRows.length === 0) return;
   const committedDocument = applyProjectVersionWriteChanges(
     args.postDocument,
@@ -93292,8 +93351,7 @@ function applyProjectVersionWriteChanges(document, changes) {
   const hasGranularDialogueNodes = document.dialogueNodes !== void 0 || changes.some((change) => change.recordKind === "dialogue-node");
   const dialogueRecords = hasGranularDialogueRecords ? applyArrayChanges(document.dialogueRecords ?? [], changes, "dialogue") : void 0;
   const dialogueNodes = hasGranularDialogueNodes ? applyArrayChanges(document.dialogueNodes ?? [], changes, "dialogue-node") : void 0;
-  return {
-    ...document,
+  const projected = {
     project: applySingletonChange(document.project, changes, "project"),
     members: applyArrayChanges(document.members, changes, "member"),
     classes: applyArrayChanges(document.classes, changes, "class"),
@@ -93347,8 +93405,6 @@ function applyProjectVersionWriteChanges(document, changes) {
     ),
     enums: applyArrayChanges(document.enums, changes, "enum"),
     interfaces: applyArrayChanges(document.interfaces, changes, "interface"),
-    ...dialogueRecords === void 0 ? {} : { dialogueRecords },
-    ...dialogueNodes === void 0 ? {} : { dialogueNodes },
     dialogues: dialogueRecords === void 0 || dialogueNodes === void 0 ? document.dialogues : materializeDialogues(
       dialogueRecords,
       dialogueNodes
@@ -93364,6 +93420,15 @@ function applyProjectVersionWriteChanges(document, changes) {
       "migration"
     )
   };
+  return {
+    ...document,
+    ...projected,
+    ...dialogueRecords === void 0 ? {} : { dialogueRecords },
+    ...dialogueNodes === void 0 ? {} : { dialogueNodes }
+    // The document spread above carries every bucket the caller's view declares
+    // beyond the projected ones, so the result is the same view; TypeScript
+    // cannot prove that of an object literal built over a type parameter.
+  };
 }
 function applySingletonChange(current, changes, recordKind) {
   const change = changes.find(
@@ -93404,6 +93469,16 @@ function canonicallyEqual2(left, right) {
   return canonicalJsonStringify(left) === canonicalJsonStringify(right);
 }
 function reconcileVariantConstructorArgs(args) {
+  const changeIndexByValueId = indexChangesByRecordId(args.prepared, "value");
+  const commitTouchesProjectionSchema = variantConstructorArgsSchemaIsTouched(
+    args.prepared
+  );
+  if (changeIndexByValueId.size === 0 && !commitTouchesProjectionSchema) {
+    return;
+  }
+  if ((args.document.variants ?? []).length === 0 && !args.prepared.some((change) => change.recordKind === "variant")) {
+    return;
+  }
   const postDocument = applyProjectVersionWriteChanges(
     args.document,
     args.prepared
@@ -93412,9 +93487,8 @@ function reconcileVariantConstructorArgs(args) {
   if (variants.length === 0) return;
   const valueById = indexRecordsById(postDocument.values);
   const classById = indexRecordsById(postDocument.classes);
-  const memberById = indexRecordsById(postDocument.members);
+  const memberById2 = indexRecordsById(postDocument.members);
   const constructorById = indexRecordsById(postDocument.constructors ?? []);
-  const changeIndexByValueId = indexChangesByRecordId(args.prepared, "value");
   let baseHashByValueId = null;
   for (const variant of variants) {
     const root = valueById.get(variant.valueId);
@@ -93431,6 +93505,9 @@ function reconcileVariantConstructorArgs(args) {
     if (constructorRecord === void 0) continue;
     if (typeof root.value !== "object" || root.value === null) continue;
     if (Array.isArray(root.value)) continue;
+    if (!commitTouchesProjectionSchema && !variantConstructorArgsAreTouched(root, changeIndexByValueId)) {
+      continue;
+    }
     const nextArgs = {};
     for (let index = 0; index < constructorRecord.argumentTypes.length; index += 1) {
       const argument2 = constructorRecord.argumentTypes[index];
@@ -93444,7 +93521,7 @@ function reconcileVariantConstructorArgs(args) {
       );
       if (schemaKey === void 0) continue;
       const memberId = schemaClass2.schema[schemaKey];
-      const member = memberId === void 0 ? void 0 : memberById.get(memberId);
+      const member = memberId === void 0 ? void 0 : memberById2.get(memberId);
       if (member === void 0) continue;
       const childId = root.value[schemaKey];
       if (typeof childId !== "string") continue;
@@ -93500,6 +93577,21 @@ function reconcileVariantConstructorArgs(args) {
     });
   }
 }
+function variantConstructorArgsSchemaIsTouched(prepared) {
+  return prepared.some(
+    (change) => VARIANT_CONSTRUCTOR_ARGS_SCHEMA_RECORD_KINDS.has(change.recordKind)
+  );
+}
+function variantConstructorArgsAreTouched(root, changeIndexByValueId) {
+  if (changeIndexByValueId.has(root.id)) return true;
+  const body = root.value;
+  for (const schemaKey of NEO_VARIANT_SCHEMA_KEY_BY_ARGUMENT_NAME.values()) {
+    const childId = body[schemaKey];
+    if (typeof childId !== "string") continue;
+    if (changeIndexByValueId.has(childId)) return true;
+  }
+  return false;
+}
 function variantConstructorArgumentIsRestValue(schemaKey, value) {
   if (value === null) return true;
   if (schemaKey === NEO_VARIANT_OVERRIDES_SCHEMA_KEY) {
@@ -93548,7 +93640,7 @@ function appendVariantGraphCascadeDeletes(args) {
     });
   }
 }
-var SERVER_COMPILATION_PROJECT_CACHE_LIMIT, serverCompilationProjectCache, READ_ONLY_SOURCE_CONVERSION_INTENT_SOURCE, SCHEMA_RECORD_KINDS, DIALOGUE_SOURCE_RECORD_KINDS, NEO_VARIANT_SCHEMA_KEY_BY_ARGUMENT_NAME;
+var SERVER_COMPILATION_PROJECT_CACHE_LIMIT, serverCompilationProjectCache, READ_ONLY_SOURCE_CONVERSION_INTENT_SOURCE, SCHEMA_RECORD_KINDS, DIALOGUE_SOURCE_RECORD_KINDS, NEO_VARIANT_SCHEMA_KEY_BY_ARGUMENT_NAME, VARIANT_CONSTRUCTOR_ARGS_SCHEMA_RECORD_KINDS;
 var init_project_version_schema_commit = __esm({
   "../src/database/project-version-schema-commit.ts"() {
     "use strict";
@@ -93610,6 +93702,9 @@ var init_project_version_schema_commit = __esm({
       ["overrides", NEO_VARIANT_OVERRIDES_SCHEMA_KEY],
       ["childoverrides", NEO_VARIANT_CHILD_OVERRIDES_SCHEMA_KEY]
     ]);
+    VARIANT_CONSTRUCTOR_ARGS_SCHEMA_RECORD_KINDS = /* @__PURE__ */ new Set(
+      ["constructor", "class", "member", "variant"]
+    );
   }
 });
 
@@ -95236,6 +95331,52 @@ var init_project_version_whole_graph_validation = __esm({
   }
 });
 
+// src/project-source/value-base-desync.ts
+function unanchoredValueDeleteIds(args) {
+  const { records: records2, deletedValueIds } = args;
+  if (deletedValueIds.size === 0) return [];
+  const anchored = /* @__PURE__ */ new Set();
+  for (const [key, record3] of Object.entries(records2)) {
+    collectAnchoredMentions(record3.data, key, deletedValueIds, anchored);
+  }
+  const unanchored = [];
+  for (const id2 of deletedValueIds) {
+    if (anchored.has(id2)) continue;
+    const data = records2[recordStateKey("value", id2)]?.data;
+    const containerId = isObjectRecord2(data) ? data.containerId : void 0;
+    if (typeof containerId === "string" && records2[recordStateKey("value", containerId)] !== void 0) {
+      continue;
+    }
+    unanchored.push(id2);
+  }
+  return unanchored;
+}
+function collectAnchoredMentions(value, mentioningKey, candidates, anchored) {
+  if (typeof value === "string") {
+    if (!candidates.has(value)) return;
+    if (recordStateKey("value", value) === mentioningKey) return;
+    anchored.add(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const element of value) {
+      collectAnchoredMentions(element, mentioningKey, candidates, anchored);
+    }
+    return;
+  }
+  if (!isObjectRecord2(value)) return;
+  for (const nested of Object.values(value)) {
+    collectAnchoredMentions(nested, mentioningKey, candidates, anchored);
+  }
+}
+var init_value_base_desync = __esm({
+  "src/project-source/value-base-desync.ts"() {
+    "use strict";
+    init_projection();
+    init_workspace();
+  }
+});
+
 // src/project-source/workspace-status-core.ts
 function listVirtualProjectSourceFilesV4(files) {
   const selected = files.filter((file) => {
@@ -95305,6 +95446,7 @@ function computeWorkspaceStatus(workspace, options) {
       binaryFiles: []
     };
   }
+  const loweringRecords = loweringBaseRecords(workspace.state.records);
   const baseDocuments = schemaBaseDocuments(workspace);
   const staticMemberOwnershipRecoveries = [];
   const baseManifest = baseDocuments.length === 0 ? void 0 : documentsToProjectSchemaManifest(baseDocuments, {
@@ -95372,7 +95514,7 @@ function computeWorkspaceStatus(workspace, options) {
       };
     }
     try {
-      validateProjectRootEnvelopeV4(workspace.state.records, analysis);
+      validateProjectRootEnvelopeV4(loweringRecords, analysis);
     } catch (error) {
       const root = analysis.configuration.globals.find(
         (global) => global.type.name === "Root"
@@ -95397,20 +95539,15 @@ function computeWorkspaceStatus(workspace, options) {
       };
     }
     manifest = lowerProjectSchemaV4(baseManifest, analysis, {
-      staticValueIdsBySymbol: staticValueIdsBySymbol(workspace.state.records),
-      projectFileIdsBySymbol: projectFileIdsBySymbol(
-        workspace.state.records,
-        analysis
-      ),
-      rowBackedDefaultMemberIds: rowBackedDefaultMemberIdsV4(
-        workspace.state.records
-      ),
+      staticValueIdsBySymbol: staticValueIdsBySymbol(loweringRecords),
+      projectFileIdsBySymbol: projectFileIdsBySymbol(loweringRecords, analysis),
+      rowBackedDefaultMemberIds: rowBackedDefaultMemberIdsV4(loweringRecords),
       rootValueTargetsByPath: rootValueTargetsByPath(
-        Object.values(workspace.state.records)
+        Object.values(loweringRecords)
       )
     });
     memberDefaults = lowerMemberDefaultSourcesV4(
-      workspace.state.records,
+      loweringRecords,
       analysis,
       manifest,
       { registry: valueLowerRegistry }
@@ -95488,7 +95625,7 @@ function computeWorkspaceStatus(workspace, options) {
     );
   }
   const staticValues = lowerStaticValueSourcesV4(
-    workspace.state.records,
+    loweringRecords,
     projectAnalysisV4,
     manifest,
     { registry: valueLowerRegistry }
@@ -95499,7 +95636,7 @@ function computeWorkspaceStatus(workspace, options) {
   ]);
   staticMemberValueIds = staticValues.memberValueIds;
   const rootValues = lowerProjectRootSourceV4(
-    workspace.state.records,
+    loweringRecords,
     projectAnalysisV4,
     manifest,
     { registry: valueLowerRegistry }
@@ -95507,7 +95644,7 @@ function computeWorkspaceStatus(workspace, options) {
   reportPhase("documents-static-root");
   authoredValueSeeds = new Map([...authoredValueSeeds, ...rootValues.seeds]);
   const rootPathResolutionState = overlayProspectiveSourceRecords(
-    workspace.state.records,
+    loweringRecords,
     documents,
     [...staticValues.records, ...memberDefaults.records, ...rootValues.records],
     staticMemberValueIds
@@ -95635,18 +95772,18 @@ function computeWorkspaceStatus(workspace, options) {
   }
   const rootRecords = rootValues.records;
   const variantValues = lowerVariantValueSourcesV4(
-    workspace.state.records,
+    loweringRecords,
     manifest,
     variantValueBindingsV4(manifest, projectAnalysisV4),
     { analysis: projectAnalysisV4, registry: valueLowerRegistry }
   );
   const supplementalRecords = options.lowerSupplementalRecords(
-    workspace.state.records,
+    loweringRecords,
     projectAnalysisV4,
     options.trustedPendingProjectFiles
   );
   const prospectiveState = overlayProspectiveSourceRecords(
-    workspace.state.records,
+    loweringRecords,
     documents,
     [
       ...staticValues.records,
@@ -95795,6 +95932,50 @@ function computeWorkspaceStatus(workspace, options) {
       binaryFiles: []
     };
   }
+  const unanchoredValueDeletes = unanchoredValueDeleteIds({
+    records: workspace.state.records,
+    deletedValueIds
+  });
+  if (unanchoredValueDeletes.length > 0) {
+    const mintedRowCount = valueLowerRegistry.pendingValues.size + authoredValueSeeds.size;
+    const named = unanchoredValueDeletes.slice(0, 3).join(", ");
+    const remainder = Math.max(0, unanchoredValueDeletes.length - 3);
+    const sample = remainder === 0 ? named : `${named}, +${remainder} more`;
+    const deleteFile = changes.find(
+      (change) => change.kind === "delete" && change.recordKind === "value" && change.recordId === unanchoredValueDeletes[0]
+    )?.file;
+    if (mintedRowCount > 0) {
+      parseErrors.push(
+        new SchemaSourceError(
+          `This push would delete ${unanchoredValueDeletes.length} value row(s) no record in the workspace base holds (${sample}) while minting ${mintedRowCount} replacement row(s): the workspace base disagrees with its own file projection \u2014 run "neo pull" before pushing.`,
+          deleteFile ?? "<project>",
+          1,
+          1,
+          "value-base-desync"
+        )
+      );
+      return {
+        changes: [],
+        conflictedFiles,
+        parseErrors,
+        parseWarnings,
+        reconstructed: /* @__PURE__ */ new Map(),
+        authoredValueSeeds: /* @__PURE__ */ new Map(),
+        binaryChanges: [],
+        binaryFiles: []
+      };
+    }
+    parseWarnings.push(
+      new SchemaSourceError(
+        `This push deletes ${unanchoredValueDeletes.length} value row(s) no record in the workspace base holds (${sample}): the workspace base disagrees with its own file projection \u2014 run "neo pull" before pushing.`,
+        deleteFile ?? "<project>",
+        1,
+        1,
+        "value-base-desync",
+        "warning"
+      )
+    );
+  }
   for (let index = changes.length - 1; index >= 0; index -= 1) {
     const change = changes[index];
     if (change === void 0 || change.kind !== "update") continue;
@@ -96137,7 +96318,7 @@ function replayAnimationDeclarationInitializersV4(records2, document, fallbackDo
 }
 function animationRecordsFromState(records2) {
   return Object.values(records2).flatMap((record3) => {
-    const data = record3.conflictServerHash !== void 0 && isObjectRecord2(record3.conflictServerData) ? record3.conflictServerData : record3.data;
+    const data = effectiveRecordData(record3);
     return isObjectRecord2(data) ? [{ recordKind: record3.recordKind, data }] : [];
   });
 }
@@ -96280,7 +96461,7 @@ function recordLabel(data) {
 function prospectiveAnimationRecords(base, reconstructed3, changes, seeds) {
   const prospective = /* @__PURE__ */ new Map();
   for (const [key, state] of Object.entries(base)) {
-    const data = state.conflictServerHash !== void 0 && isObjectRecord2(state.conflictServerData) ? state.conflictServerData : state.data;
+    const data = effectiveRecordData(state);
     if (isObjectRecord2(data)) {
       prospective.set(key, { recordKind: state.recordKind, data });
     }
@@ -96412,7 +96593,8 @@ function overlayProspectiveSourceRecords(base, schemaDocuments, authored, static
   for (const record3 of authored) {
     const key = recordStateKey(record3.recordKind, record3.recordId);
     const previous = result[key];
-    const previousData = previous?.conflictServerHash !== void 0 && isObjectRecord2(previous.conflictServerData) ? previous.conflictServerData : isObjectRecord2(previous?.data) ? previous.data : {};
+    const effectivePrevious = previous === void 0 ? void 0 : effectiveRecordData(previous);
+    const previousData = isObjectRecord2(effectivePrevious) ? effectivePrevious : {};
     put(record3.recordKind, record3.recordId, {
       ...previousData,
       ...record3.fileFields
@@ -96424,7 +96606,7 @@ function schemaBaseDocuments(workspace) {
   const records2 = [];
   for (const state of Object.values(workspace.state.records)) {
     if (!isSchemaRecordKindV4(state.recordKind)) continue;
-    const effectiveBase = state.conflictServerHash !== void 0 && isObjectRecord2(state.conflictServerData) ? state.conflictServerData : state.data;
+    const effectiveBase = effectiveRecordData(state);
     if (!isObjectRecord2(effectiveBase)) {
       throw new Error(
         `Schema base ${state.recordKind}:${state.recordId} must contain an object document. Run \`neo pull --reset\` to repair the workspace state.`
@@ -96565,6 +96747,7 @@ var init_workspace_status_core = __esm({
     init_compile_ns_property();
     init_materialized_construction_cache();
     init_project_version_whole_graph_validation();
+    init_value_base_desync();
   }
 });
 
@@ -98378,6 +98561,7 @@ function buildValueLowerContext(state, manifest, options = {}) {
     parsedInitializers,
     declaredInitializers: indexDeclaredInitializers(options.analysis),
     reconstructed: /* @__PURE__ */ new Map(),
+    retainedReconstructedKeys: /* @__PURE__ */ new Set(),
     pendingValues: registry.pendingValues,
     pendingLocalizedTexts: registry.pendingLocalizedTexts,
     loweredMemberIdByValueId: /* @__PURE__ */ new Map(),
@@ -100852,10 +101036,16 @@ function lowerClassValue(context, member, expression, base, source, outerEnviron
     );
   }
   if (materializedConstruction !== "lower") {
-    for (const childId of Object.values(baseBody)) {
-      if (typeof childId === "string") {
-        retainStoredValueSubgraph(context, childId, source.source, /* @__PURE__ */ new Set());
-      }
+    const storedMemberIds = storedClassSchemaMemberIds(context, currentClassId);
+    for (const [schemaKey, childId] of Object.entries(baseBody)) {
+      if (typeof childId !== "string") continue;
+      retainStoredValueSubgraph(
+        context,
+        childId,
+        source.source,
+        /* @__PURE__ */ new Set(),
+        memberById(context, storedMemberIds.get(schemaKey))
+      );
     }
     if (materializedConstruction === "preserve" && isObjectRecord2(base.constructorArgs)) {
       const constructor2 = storedValueConstructor(
@@ -100863,12 +101053,25 @@ function lowerClassValue(context, member, expression, base, source, outerEnviron
         schemaClass2,
         base.constructorArgs
       );
+      const authoredArguments = constructorArgumentExpressions(expression);
       for (let index = 0; index < constructor2.arguments.length; index += 1) {
         const argument2 = constructor2.arguments[index];
+        if (argument2 === void 0) continue;
         const valueId = base.constructorArgs[`__arg_${index}__`];
-        if (argument2 !== void 0 && typeof valueId === "string" && constructorArgumentOwnsRow(argument2.type)) {
-          retainStoredValueSubgraph(context, valueId, source.source, /* @__PURE__ */ new Set());
+        if (typeof valueId !== "string") continue;
+        if (!constructorArgumentOwnsRow(
+          argument2.type,
+          authoredArguments.get(argument2.name)
+        )) {
+          continue;
         }
+        retainStoredValueSubgraph(
+          context,
+          valueId,
+          source.source,
+          /* @__PURE__ */ new Set(),
+          null
+        );
       }
     }
   }
@@ -100878,45 +101081,106 @@ function lowerClassValue(context, member, expression, base, source, outerEnviron
     ...classId === currentClassId ? {} : { classId }
   };
 }
-function constructorArgumentOwnsRow(type) {
-  return type.kind === "class" || type.kind === "interface" || type.kind === "generic" || type.kind === "list" || type.kind === "dictionary";
+function constructorArgumentOwnsRow(type, authoredArgument) {
+  if (type.kind !== "class" && type.kind !== "interface" && type.kind !== "generic" && type.kind !== "list" && type.kind !== "dictionary") {
+    return false;
+  }
+  return !namesExistingRow(authoredArgument);
+}
+function constructorArgumentExpressions(expression) {
+  const byName = /* @__PURE__ */ new Map();
+  const names = expression.argumentNames ?? [];
+  for (const [index, argument2] of expression.args.entries()) {
+    const name = names[index];
+    if (typeof name !== "string") continue;
+    if (byName.has(name)) continue;
+    byName.set(name, argument2);
+  }
+  return byName;
+}
+function namesExistingRow(expression) {
+  if (expression === void 0) return false;
+  const unwrapped = annotatedValue(expression).expression;
+  if (unwrapped.kind !== "call") return false;
+  if (unwrapped.callee.kind !== "ident") return false;
+  return unwrapped.callee.name === "Reference";
+}
+function memberPointsAtForeignRows(member) {
+  return member.kind === "lookup" || member.kind === "dialogueLookup";
+}
+function memberById(context, memberId) {
+  if (memberId === void 0) return null;
+  return context.members.get(memberId) ?? null;
+}
+function collectionEntryMember(context, member) {
+  if (member === null) return null;
+  if (member.kind !== "list" && member.kind !== "dictionary") return null;
+  return memberById(context, member.entryMemberId);
+}
+function storedRowPlacementMember(context, valueId) {
+  for (const placement of context.valuePlacements.placementsByValueId.get(
+    valueId
+  ) ?? []) {
+    if (placement.containerClassId === null) continue;
+    const memberId = storedClassSchemaMemberIds(
+      context,
+      placement.containerClassId
+    ).get(placement.schemaKey);
+    const member = memberById(context, memberId);
+    if (member !== null) return member;
+  }
+  return null;
 }
-function retainStoredValueSubgraph(context, valueId, source, visited) {
+function retainStoredValueSubgraph(context, valueId, source, visited, member) {
   if (visited.has(valueId)) return;
   visited.add(valueId);
   const state = context.state[`value:${valueId}`];
   if (state === void 0 || !isObjectRecord2(state.data)) return;
-  const key = `value:${valueId}`;
-  if (!context.reconstructed.has(key)) {
-    addReconstructed(
-      context,
-      "value",
-      valueId,
-      valueFileFields(state.data),
-      source
-    );
-  }
-  const referenced = /* @__PURE__ */ new Set();
-  const collect = (value) => {
+  addReconstructed(
+    context,
+    "value",
+    valueId,
+    valueFileFields(state.data),
+    source,
+    { retained: true }
+  );
+  const owningMember = member ?? storedRowPlacementMember(context, valueId);
+  if (owningMember !== null && memberPointsAtForeignRows(owningMember)) return;
+  const referenced = /* @__PURE__ */ new Map();
+  const add = (id2, childMember) => {
+    if (context.state[`value:${id2}`] === void 0) return;
+    if (referenced.has(id2)) return;
+    referenced.set(id2, childMember);
+  };
+  const collect = (value, childMember) => {
     if (typeof value === "string") {
-      if (context.state[`value:${value}`] !== void 0) referenced.add(value);
+      add(value, childMember);
       return;
     }
     if (Array.isArray(value)) {
-      for (const entry of value) collect(entry);
+      for (const entry of value) collect(entry, childMember);
       return;
     }
     if (!isObjectRecord2(value)) return;
-    for (const entry of Object.values(value)) collect(entry);
+    for (const entry of Object.values(value)) collect(entry, childMember);
   };
-  collect(state.data.value);
+  const body = state.data.value;
+  const storedClassId = stringOrNull(state.data.classId);
+  if (isObjectRecord2(body) && storedClassId !== null) {
+    const storedMemberIds = storedClassSchemaMemberIds(context, storedClassId);
+    for (const [schemaKey, child] of Object.entries(body)) {
+      collect(child, memberById(context, storedMemberIds.get(schemaKey)));
+    }
+  } else {
+    collect(body, collectionEntryMember(context, owningMember));
+  }
   for (const childId of context.valuePlacements.valueIdsByContainerId.get(
     valueId
   ) ?? []) {
-    referenced.add(childId);
+    add(childId, collectionEntryMember(context, owningMember));
   }
-  for (const childId of referenced) {
-    retainStoredValueSubgraph(context, childId, source, visited);
+  for (const [childId, childMember] of referenced) {
+    retainStoredValueSubgraph(context, childId, source, visited, childMember);
   }
 }
 function lowerConstructorProjections(context, schemaClass2, expression, base, baseBody, body, source, environment, authoredSlice) {
@@ -102371,7 +102635,7 @@ function dialogueTargetsBySymbol(analysis) {
 }
 function indexSourceStaticTargets(targets, state, analysis, manifest, parsedInitializers) {
   if (!analysis) return;
-  const memberById = new Map(
+  const memberById2 = new Map(
     manifest.members.map((member) => [member.id, member])
   );
   for (let pass = 0; pass < 2; pass += 1) {
@@ -102388,7 +102652,7 @@ function indexSourceStaticTargets(targets, state, analysis, manifest, parsedInit
         if (declaration.kind !== "field" || declaration.initializer === null)
           continue;
         const memberId = sourceIdentityId(declaration, "member", symbol);
-        if (!memberById.has(memberId)) continue;
+        if (!memberById2.has(memberId)) continue;
         const expression = parseCachedInitializer(
           parsedInitializers,
           declaration.initializer
@@ -102651,21 +102915,30 @@ function annotationId2(annotations) {
   }
   return value.value;
 }
-function addReconstructed(context, recordKind, recordId, fileFields, source) {
+function addReconstructed(context, recordKind, recordId, fileFields, source, options = {}) {
   const key = `${recordKind}:${recordId}`;
   const existing = context.reconstructed.get(key);
+  const line = source.range.start.line + 1;
   if (existing !== void 0) {
-    if (!canonicallyEqual(existing.fileFields, fileFields)) {
-      throw new Error(`Source reconstructs ${key} with different content.`);
+    if (options.retained === true) return;
+    if (context.retainedReconstructedKeys.has(key)) {
+      context.retainedReconstructedKeys.delete(key);
+    } else {
+      if (!canonicallyEqual(existing.fileFields, fileFields)) {
+        throw new Error(
+          `Source reconstructs ${key} with different content: ${existing.file}:${existing.line} and ${source.uri}:${line} each lower this record from a different body.`
+        );
+      }
+      return;
     }
-    return;
   }
+  if (options.retained === true) context.retainedReconstructedKeys.add(key);
   context.reconstructed.set(key, {
     recordKind,
     recordId,
     fileFields,
     file: source.uri,
-    line: source.range.start.line + 1,
+    line,
     sourceSpan: {
       path: source.uri,
       start: source.range.start,
@@ -109650,14 +109923,14 @@ function resolveNSFunctionReceiverValue(thisRef, target, document) {
 }
 function buildRootValue(document) {
   const rootValue = {};
-  const memberById = new Map(
+  const memberById2 = new Map(
     document.members.map((entry) => [entry.id, entry])
   );
   const valueById = new Map(document.values.map((entry) => [entry.id, entry]));
   for (const { root, memberId } of projectRootMembersInDisplayOrder(
     document.project
   )) {
-    const member = memberById.get(memberId);
+    const member = memberById2.get(memberId);
     const valueId = member !== void 0 && typeof member.valueId === "string" ? member.valueId : null;
     rootValue[root.key] = valueId !== null ? valueById.get(valueId)?.value ?? null : null;
   }
@@ -110377,7 +110650,7 @@ function neoScriptCheckErrorMessage(error) {
 function resolveLocalScriptMember(manifest, memberRef) {
   if (memberRef === null) return null;
   const scripted = manifest.members.filter(isLocalScriptMember);
-  const memberById = new Map(scripted.map((member2) => [member2.id, member2]));
+  const memberById2 = new Map(scripted.map((member2) => [member2.id, member2]));
   const separator = memberRef.lastIndexOf(".");
   if (separator > 0 && separator < memberRef.length - 1) {
     const classRef = memberRef.slice(0, separator);
@@ -110400,7 +110673,7 @@ function resolveLocalScriptMember(manifest, memberRef) {
     while (!visited.has(current.id)) {
       visited.add(current.id);
       for (const [schemaKey, memberId] of Object.entries(current.schema)) {
-        const member2 = memberById.get(memberId);
+        const member2 = memberById2.get(memberId);
         if (member2 !== void 0 && (schemaKey === memberName || localMemberMatchesMember(member2, memberName))) {
           return { member: member2, receiverClassId: receiver.id };
         }
@@ -114395,7 +114668,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.14",
-      cliVersion: "0.36.10",
+      cliVersion: "0.36.12",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -118222,7 +118495,7 @@ async function runPendingMigrations(workspace, client, raw, migrations, onlyRef,
       }
     }
   }
-  const memberById = new Map(
+  const memberById2 = new Map(
     document.members.map((member) => [member.id, member])
   );
   const valueById = new Map(
@@ -118293,7 +118566,7 @@ async function runPendingMigrations(workspace, client, raw, migrations, onlyRef,
       },
       null
     );
-    const instances = targetClassId === null ? [null] : collectClassInstances(document, targetClassId, memberById, valueById);
+    const instances = targetClassId === null ? [null] : collectClassInstances(document, targetClassId, memberById2, valueById);
     let instanceEditCount = 0;
     for (const instance of instances) {
       let result;
@@ -118499,7 +118772,7 @@ async function runPendingMigrations(workspace, client, raw, migrations, onlyRef,
     `Applied ${pending.length} migration(s). Run "neo pull" to refresh the working copy.`
   );
 }
-function collectClassInstances(document, targetClassId, memberById, valueById) {
+function collectClassInstances(document, targetClassId, memberById2, valueById) {
   const classById = new Map(
     document.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
   );
@@ -118508,7 +118781,7 @@ function collectClassInstances(document, targetClassId, memberById, valueById) {
   const walk = (memberId, valueId) => {
     if (typeof valueId !== "string" || seen.has(valueId)) return;
     seen.add(valueId);
-    const member = typeof memberId === "string" ? memberById.get(memberId) : void 0;
+    const member = typeof memberId === "string" ? memberById2.get(memberId) : void 0;
     const valueRecord = valueById.get(valueId);
     if (member === void 0 || valueRecord === void 0) return;
     const memberKind = member.kind;
@@ -119732,7 +120005,7 @@ function buildWorld(document, raw) {
   const valueById = new Map(
     document.values.map((value) => [String(value.id), value])
   );
-  const memberById = new Map(
+  const memberById2 = new Map(
     document.members.map((member) => [String(member.id), member])
   );
   const saveOwned = /* @__PURE__ */ new Set();
@@ -119750,7 +120023,7 @@ function buildWorld(document, raw) {
     if (visitedPlacements.has(visitKey)) return;
     visitedPlacements.add(visitKey);
     const value = valueById.get(valueId);
-    const member = memberById.get(memberId);
+    const member = memberById2.get(memberId);
     if (value === void 0 || member === void 0) return;
     const storage = storageResolver.effectiveStorageForPath(memberPath2);
     if (storage === "save" /* Save */) saveOwned.add(valueId);
@@ -119783,7 +120056,7 @@ function buildWorld(document, raw) {
   for (const { memberId } of projectRootMembersInDisplayOrder(
     document.project
   )) {
-    const member = memberById.get(memberId);
+    const member = memberById2.get(memberId);
     if (member !== void 0 && typeof member.valueId === "string") {
       walkOwnedGraph([memberId], member.valueId);
     }
@@ -121014,7 +121287,7 @@ There is no --keep-current: preserving current semantic state defines flatten.
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.36.10");
+    console.log("0.36.12");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {