@neocompose/cli 0.36.10 → 0.36.11

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [0.36.11] - 2026-08-21
+
+### Fixed
+
+- Stop `neo status` reconstructing a referenced row twice. Retaining a stored
+  NeoScript construction followed reference members and `Reference(...)`
+  constructor arguments into rows it merely points at, so lowering order could
+  report a false "Source reconstructs value:… with different content" on a
+  healthy workspace. The retain sweep now stops at reference boundaries, and
+  an authored reconstruction always supersedes a retained copy.
+- Re-lower against the server side of an unresolved conflict. A conflicted
+  record whose base body was stale (for example after resolving markers by
+  hand without `neo resolve`) made the identity walk miss rows the server
+  still holds and re-mint them; the lowering now adopts the server body while
+  the push plan keeps comparing against the local base.
+- Refuse to plan value deletions the workspace base cannot explain. When a
+  planned delete's row is named by nothing in the base while the same push
+  mints replacement rows, `neo status`/`neo push` now report
+  `value-base-desync` and plan nothing instead of shipping deletes for live
+  server rows; the same shape with no re-mint is reported as a warning.
+
 ## [0.36.10] - 2026-08-21
 
 ### Fixed

package/dist/neo.mjs

@@ -32528,7 +32528,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 +32555,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 +32765,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 +32780,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 +32849,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 +32866,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 +35199,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 +54589,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 +64271,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 +64354,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) {
@@ -72261,7 +72274,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 +72284,7 @@ function buildConstructorInitializerIndexes(vm) {
   return {
     initializerScopeMemberIds,
     declaringClassIdsByMemberId,
-    memberById,
+    memberById: memberById2,
     containerMemberIdByEntryId
   };
 }
@@ -79912,7 +79925,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 +81943,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 +81984,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",
@@ -87398,7 +87411,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 +87510,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 +87526,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 +87554,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 +88778,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 +88808,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)
@@ -93412,7 +93425,7 @@ 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;
@@ -93444,7 +93457,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;
@@ -95236,6 +95249,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 +95364,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 +95432,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 +95457,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 +95543,7 @@ function computeWorkspaceStatus(workspace, options) {
     );
   }
   const staticValues = lowerStaticValueSourcesV4(
-    workspace.state.records,
+    loweringRecords,
     projectAnalysisV4,
     manifest,
     { registry: valueLowerRegistry }
@@ -95499,7 +95554,7 @@ function computeWorkspaceStatus(workspace, options) {
   ]);
   staticMemberValueIds = staticValues.memberValueIds;
   const rootValues = lowerProjectRootSourceV4(
-    workspace.state.records,
+    loweringRecords,
     projectAnalysisV4,
     manifest,
     { registry: valueLowerRegistry }
@@ -95507,7 +95562,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 +95690,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 +95850,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 +96236,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 +96379,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 +96511,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 +96524,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 +96665,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 +98479,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 +100954,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 +100971,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 +100999,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 retainStoredValueSubgraph(context, valueId, source, visited) {
+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, 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 +102553,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 +102570,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 +102833,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 +109841,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 +110568,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 +110591,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 +114586,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.14",
-      cliVersion: "0.36.10",
+      cliVersion: "0.36.11",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -118222,7 +118413,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 +118484,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 +118690,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 +118699,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 +119923,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 +119941,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 +119974,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 +121205,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.11");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.36.10",
+  "version": "0.36.11",
   "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.36.10 -->
+<!-- reviewed-through-cli: 0.36.11 -->
 
 # Neo Compose CLI
 
@@ -210,10 +210,13 @@ Conflict source deliberately fails compilation. Edit the desired final source,
 or use `neo resolve --mine|--theirs` as a whole-side convenience. Then pull,
 review, dry-run, and push again.
 
+Either `neo resolve` side adopts the server side as the new base for every
+conflict it settles, so the next push plans against what the server holds:
+`--theirs` reads clean afterwards, `--mine` reads as an ordinary local update.
 Server-derived compilation metadata is not authored source and does not create
-a pull conflict by itself. If an older CLI retained such a metadata-only
-conflict without writing source markers, either `neo resolve` side accepts the
-newer server metadata as the base while preserving any real local source edit.
+a pull conflict by itself; if an older CLI retained such a metadata-only
+conflict without writing source markers, either side settles it the same way
+while preserving any real local source edit.
 
 `neo push` sends the authenticated semantic diff plus a deterministic source
 hash, while the server recompiles the changed NeoScript bodies and

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

@@ -83,7 +83,7 @@ wrappers.
 The marker near the top of `SKILL.md` must exactly match the package version:
 
 ```html
-<!-- reviewed-through-cli: 0.36.10 -->
+<!-- reviewed-through-cli: 0.36.11 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale

package/skills/neocompose-cli/references/commands-and-sync.md

@@ -80,9 +80,17 @@ Resolve source conflicts by editing the final intended source. Use
 choice. Pull, inspect, dry-run, and retry; there is no force-CAS path.
 
 Compiled initializer IR is server-owned and does not participate in authored
-three-way merge decisions. `neo resolve` also repairs metadata-only conflict
-bookkeeping left by an older pull when no source marker exists; accepting the
-newer server metadata does not overwrite the tracked source.
+three-way merge decisions. Either `neo resolve` side adopts the server side as
+the new base for every conflict it settles — `--theirs` then reads clean, and
+`--mine` keeps the local text as an ordinary update on top of that base. That
+includes metadata-only conflict bookkeeping left by an older pull when no
+source marker exists; adopting the server base never overwrites tracked
+source.
+
+A `value-base-desync` error means the workspace base no longer names value
+rows its own file projection holds, so the plan would delete live server rows.
+Nothing is planned in that state; run `neo pull` and retry. The same message
+as a warning reports the inconsistency without blocking.
 
 For `base-hash-conflict`, pull and merge. For `version-bump-required`, inspect
 the classification and use `neo push --accept-bump` only when the bump is