@neocompose/cli 0.36.9 → 0.36.10

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.36.10] - 2026-08-21
+
+### Fixed
+
+- Apply large committed pushes again. A push big enough for the durable commit
+  path could commit server-side but fail its result download, leaving the
+  workspace reporting the same record and value seed pending forever. The
+  server now spreads pending-id assignments across result chunks instead of
+  returning them as one map, and `neo push` refuses a result download whose
+  record count disagrees with the committed total instead of applying a
+  partial result.
+- Make `neo resolve --mine`/`--theirs` adopt the server side as the new base
+  for every conflict they settle. A stale base after resolution made the next
+  status plan deletions for rows the server document still contains — up to
+  the entire content of a just-pushed value seed.
+
 ## [0.36.9] - 2026-08-20
 
 ### Fixed

package/dist/neo.mjs

@@ -82113,6 +82113,16 @@ function neoScriptMemberContractProjection(value) {
     defaultPresent: value.defaultValue != null
   };
 }
+function transactionImpactsAnyOwnerMember(scope, impactedIds) {
+  for (const member of scope.document.members) {
+    if (impactedIds.has(member.id)) return true;
+  }
+  for (const root of scope.roots) {
+    const ownerId = Reflect.get(root.member, "id");
+    if (typeof ownerId === "string" && impactedIds.has(ownerId)) return true;
+  }
+  return false;
+}
 function collectNeoScriptRecompileTargets(args) {
   if (args.forceRecompile === true) return completeTargets(args.postDocument);
   const explicit = explicitTargetIds(args.changes);
@@ -82176,15 +82186,17 @@ function collectNeoScriptRecompileTargets(args) {
       args.postDocument,
       args.postDocument.variants ?? []
     );
-    const ownerByValueId = resolveOwnerMembersForValues(
-      scope.document,
-      new Set(postValues.map((record3) => record3.id)),
-      scope.roots
-    );
-    for (const [valueId, owner] of ownerByValueId) {
-      const ownerId = Reflect.get(owner, "id");
-      if (typeof ownerId === "string" && impactedIds.has(ownerId)) {
-        valueIds.add(valueId);
+    if (transactionImpactsAnyOwnerMember(scope, impactedIds)) {
+      const ownerByValueId = resolveOwnerMembersForValues(
+        scope.document,
+        new Set(postValues.map((record3) => record3.id)),
+        scope.roots
+      );
+      for (const [valueId, owner] of ownerByValueId) {
+        const ownerId = Reflect.get(owner, "id");
+        if (typeof ownerId === "string" && impactedIds.has(ownerId)) {
+          valueIds.add(valueId);
+        }
       }
     }
   }
@@ -88564,6 +88576,56 @@ var init_project_version_transaction_types = __esm({
   }
 });
 
+// ../src/database/project-version-relation-sweep-trigger.ts
+function stagedChangesAffectClassRelations(current, changes) {
+  const classesById = new Map(
+    (current.classes ?? []).map((schemaClass2) => [schemaClass2.id, schemaClass2])
+  );
+  const valuesById = new Map(
+    (current.values ?? []).map((value) => [value.id, value])
+  );
+  for (const change of changes) {
+    if (change.recordKind === "internal-record-relation") return true;
+    if (change.recordKind === "class") {
+      if (change.operation !== "update") return true;
+      if (change.deleted === true) return true;
+      const before2 = classesById.get(change.recordId);
+      if (before2 === void 0) return true;
+      const after = change.nextData;
+      if (!isPlainRecord(after)) return true;
+      if (before2.extendsClassId !== after.extendsClassId) return true;
+      continue;
+    }
+    if (change.recordKind !== "value") continue;
+    const before = valuesById.get(change.recordId);
+    if (valueCreateCannotAffectClassRelations(change, before)) continue;
+    if (relationEndpointClassId(before) !== relationEndpointClassId(change.nextData)) {
+      return true;
+    }
+  }
+  return false;
+}
+function valueCreateCannotAffectClassRelations(change, before) {
+  if (change.operation !== "create") return false;
+  if (change.deleted === true) return false;
+  return before === void 0;
+}
+function relationEndpointClassId(record3) {
+  if (!isPlainRecord(record3)) return void 0;
+  if (typeof record3.classId === "string") return record3.classId;
+  if (typeof record3.typeId === "string") return record3.typeId;
+  return void 0;
+}
+function isPlainRecord(value) {
+  if (value === null || typeof value !== "object") return false;
+  return !Array.isArray(value);
+}
+var init_project_version_relation_sweep_trigger = __esm({
+  "../src/database/project-version-relation-sweep-trigger.ts"() {
+    "use strict";
+  }
+});
+
 // ../src/database/project-version-transaction-planning.ts
 function variantRootValueId2(data) {
   if (typeof data !== "object" || data === null) return null;
@@ -88585,7 +88647,7 @@ function addProjectVersionTransactionBudgets(left, right) {
     returnBytes: left.returnBytes + right.returnBytes
   };
 }
-var KIB, MIB, PROJECT_TRANSACTION_CHUNK_PAYLOAD_TARGET_BYTES, PROJECT_TRANSACTION_IMMEDIATE_BUDGET, PROJECT_TRANSACTION_WORKER_BUDGET, PROJECT_TRANSACTION_SINGLE_CHANGE_NATIVE_BUDGET, EMPTY_BUDGET, CHUNK_GRAPH_VALIDATION_RESERVE, CHUNK_FIXED_COST, IMMEDIATE_FIXED_COST, WHOLE_GRAPH_VALIDATION_SURCHARGE;
+var KIB, MIB, PROJECT_TRANSACTION_CHUNK_PAYLOAD_TARGET_BYTES, PROJECT_TRANSACTION_IMMEDIATE_BUDGET, PROJECT_TRANSACTION_WORKER_BUDGET, PROJECT_TRANSACTION_SINGLE_CHANGE_NATIVE_BUDGET, EMPTY_BUDGET, CHUNK_GRAPH_VALIDATION_RESERVE, CHUNK_FIXED_COST, IMMEDIATE_FIXED_COST, WHOLE_GRAPH_VALIDATION_SURCHARGE, CHANGE_BYTES_READ_OVERHEAD, CHANGE_BYTES_WRITTEN_OVERHEAD;
 var init_project_version_transaction_planning = __esm({
   "../src/database/project-version-transaction-planning.ts"() {
     "use strict";
@@ -88599,8 +88661,8 @@ var init_project_version_transaction_planning = __esm({
       bytesWritten: 4 * MIB,
       documentsRead: 4e3,
       documentsWritten: 1400,
-      databaseQueries: 420,
-      indexRanges: 320,
+      databaseQueries: 800,
+      indexRanges: 800,
       functionsScheduled: 24,
       scheduledFunctionArgsBytes: 64 * KIB,
       returnBytes: 4 * MIB
@@ -88611,8 +88673,8 @@ var init_project_version_transaction_planning = __esm({
       bytesWritten: 4 * MIB,
       documentsRead: 4e3,
       documentsWritten: 900,
-      databaseQueries: 420,
-      indexRanges: 320,
+      databaseQueries: 700,
+      indexRanges: 700,
       functionsScheduled: 8,
       scheduledFunctionArgsBytes: 32 * KIB,
       returnBytes: 128 * KIB
@@ -88648,9 +88710,9 @@ var init_project_version_transaction_planning = __esm({
       bytesRead: 32 * KIB,
       bytesWritten: 48 * KIB,
       documentsRead: 4,
-      documentsWritten: 4,
-      databaseQueries: 10,
-      indexRanges: 8,
+      documentsWritten: 5,
+      databaseQueries: 97,
+      indexRanges: 105,
       functionsScheduled: 2,
       scheduledFunctionArgsBytes: 2 * KIB,
       returnBytes: 2 * KIB
@@ -88659,21 +88721,23 @@ var init_project_version_transaction_planning = __esm({
       argumentBytes: 2 * KIB,
       bytesRead: 96 * KIB,
       bytesWritten: 64 * KIB,
-      documentsRead: 12,
-      documentsWritten: 4,
+      documentsRead: 18,
+      documentsWritten: 8,
       databaseQueries: 34,
-      indexRanges: 24,
+      indexRanges: 34,
       functionsScheduled: 4,
       scheduledFunctionArgsBytes: 8 * KIB,
       returnBytes: 8 * KIB
     };
     WHOLE_GRAPH_VALIDATION_SURCHARGE = {
       ...EMPTY_BUDGET,
-      bytesRead: 512 * KIB,
-      documentsRead: 400,
-      databaseQueries: 300,
-      indexRanges: 200
+      bytesRead: 336 * KIB,
+      documentsRead: 782,
+      databaseQueries: 410,
+      indexRanges: 410
     };
+    CHANGE_BYTES_READ_OVERHEAD = 4 * KIB;
+    CHANGE_BYTES_WRITTEN_OVERHEAD = 4 * KIB;
   }
 });
 
@@ -90065,11 +90129,16 @@ function prepareServerOwnedSchemaCommit(args) {
   if (listIndexErrors.length > 0) {
     throw new Error(listIndexErrors[0].message);
   }
-  validateInternalRecordRelations({
-    relations: postDocument.internalRecordRelations ?? [],
-    endpoints: collectProjectDocumentRelationEndpoints(postDocument),
-    classes: postDocument.classes
-  });
+  if (stagedChangesAffectClassRelations(args.document, [
+    ...prepared,
+    ...readOnlyConversionChanges
+  ])) {
+    validateInternalRecordRelations({
+      relations: postDocument.internalRecordRelations ?? [],
+      endpoints: collectProjectDocumentRelationEndpoints(postDocument),
+      classes: postDocument.classes
+    });
+  }
   const accessModifierErrors = validateDocumentAccessModifiers({
     members: postDocument.members,
     classes: postDocument.classes,
@@ -90216,10 +90285,6 @@ function orderVariantRootValuesWithVariants(prepared) {
   return ordered;
 }
 function materializePreparedInstanceInitializers(args) {
-  const compiledDocument = applyProjectVersionWriteChanges(
-    args.document,
-    args.prepared
-  );
   const sites = /* @__PURE__ */ new Map();
   for (let index = 0; index < args.prepared.length; index += 1) {
     const change = args.prepared[index];
@@ -90234,6 +90299,10 @@ function materializePreparedInstanceInitializers(args) {
     });
   }
   if (sites.size === 0) return;
+  const compiledDocument = applyProjectVersionWriteChanges(
+    args.document,
+    args.prepared
+  );
   const existingValueById = new Map(
     args.document.values.map((value) => [value.id, value])
   );
@@ -91615,6 +91684,15 @@ function normalizeClientBindingMemberCreates(args) {
     };
   }
 }
+function stampsAbsentBindingMember(value, existingMemberIds) {
+  const stamp = value.genericBindings;
+  if (stamp === void 0 || stamp === null) return false;
+  for (const bindingMemberId of Object.values(stamp)) {
+    if (typeof bindingMemberId !== "string") continue;
+    if (!existingMemberIds.has(bindingMemberId)) return true;
+  }
+  return false;
+}
 function materializeVariantChildOverrideBindingMembers(args) {
   normalizeClientBindingMemberCreates(args);
   const postDocument = applyProjectVersionWriteChanges(
@@ -91623,6 +91701,13 @@ function materializeVariantChildOverrideBindingMembers(args) {
   );
   const variants = postDocument.variants ?? [];
   if (variants.length === 0) return;
+  const existingMemberIds = new Set(
+    postDocument.members.map((member) => member.id)
+  );
+  const candidates = postDocument.values.filter(
+    (value) => stampsAbsentBindingMember(value, existingMemberIds)
+  );
+  if (candidates.length === 0) return;
   const graphValueIds = collectVariantGraphValueIds({
     document: postDocument,
     variants,
@@ -91635,11 +91720,8 @@ function materializeVariantChildOverrideBindingMembers(args) {
       schemaClass2.id
     ])
   );
-  const existingMemberIds = new Set(
-    postDocument.members.map((member) => member.id)
-  );
   const minted = /* @__PURE__ */ new Set();
-  for (const value of postDocument.values) {
+  for (const value of candidates) {
     if (!graphValueIds.has(value.id)) continue;
     const stamp = value.genericBindings;
     if (stamp === void 0 || stamp === null) continue;
@@ -93492,6 +93574,7 @@ var init_project_version_schema_commit = __esm({
     init_general_function_call_ir_source_recompile();
     init_projectDocumentDialogueMaterialization();
     init_project_version_transaction_types();
+    init_project_version_relation_sweep_trigger();
     init_project_version_transaction_planning();
     init_project_version_static_value_writes();
     init_localizable_member_value_writes();
@@ -93532,7 +93615,7 @@ var init_project_version_schema_commit = __esm({
 
 // ../src/database/project-record-semantics.ts
 function projectRecordSemanticData(value) {
-  if (!isPlainRecord(value)) return value;
+  if (!isPlainRecord2(value)) return value;
   const semantic = {};
   for (const [key, child] of Object.entries(value)) {
     if (SERVER_MANAGED_PROJECT_RECORD_FIELDS.has(key)) continue;
@@ -93569,7 +93652,7 @@ function toCanonicalJsonValue2(value) {
   if (Array.isArray(value)) {
     return value.map((item) => toCanonicalJsonValue2(item) ?? null);
   }
-  if (!isPlainRecord(value)) {
+  if (!isPlainRecord2(value)) {
     throw new Error("Cannot canonicalize a non-plain object.");
   }
   const canonical = {};
@@ -93583,7 +93666,7 @@ function toCanonicalJsonValue2(value) {
   }
   return canonical;
 }
-function isPlainRecord(value) {
+function isPlainRecord2(value) {
   if (value === null || typeof value !== "object") return false;
   const prototype = Object.getPrototypeOf(value);
   return prototype === Object.prototype || prototype === null;
@@ -93692,7 +93775,7 @@ function systemProtectedWriteInheritedRecordId(write) {
   if (write.baseData !== void 0) return null;
   if (write.deleted) return null;
   if (!isSystemBearingRecordKind(write.recordKind)) return null;
-  if (!isPlainRecord2(write.nextData)) return null;
+  if (!isPlainRecord3(write.nextData)) return null;
   if (readSystemMetadata(write.nextData) === null) return null;
   const extendsMemberId = write.nextData.extendsMemberId;
   if (typeof extendsMemberId !== "string") return null;
@@ -93712,7 +93795,7 @@ function assertSystemProtectedRecordWriteValid(write) {
   assertSystemMetadataUnchanged(write, base);
 }
 function readBaseRecord(write) {
-  if (!isPlainRecord2(write.baseData)) return null;
+  if (!isPlainRecord3(write.baseData)) return null;
   return {
     recordKind: write.recordKind,
     data: write.baseData,
@@ -93725,7 +93808,7 @@ function collectSystemBearingBaseRecords(document) {
     const stored = document[collection];
     if (!Array.isArray(stored)) continue;
     for (const record3 of stored) {
-      if (!isPlainRecord2(record3)) continue;
+      if (!isPlainRecord3(record3)) continue;
       const id2 = record3.id;
       if (typeof id2 !== "string") continue;
       records2.set(baseKey(recordKind, id2), {
@@ -93739,7 +93822,7 @@ function collectSystemBearingBaseRecords(document) {
 }
 function assertCreateDeclaresNoSystemMetadata(write) {
   if (!isSystemBearingRecordKind(write.recordKind)) return;
-  if (!isPlainRecord2(write.nextData)) return;
+  if (!isPlainRecord3(write.nextData)) return;
   const system = readSystemMetadata(write.nextData);
   if (system === null) return;
   if (inheritsLegacyEmittedSystemMetadata(write, system)) return;
@@ -93765,7 +93848,7 @@ function assertProtectedRecordNotEdited(change, base) {
   )) {
     return;
   }
-  if (!isPlainRecord2(change.nextData)) return;
+  if (!isPlainRecord3(change.nextData)) return;
   if (authoredFieldsEqual(change.recordKind, base.data, change.nextData)) {
     return;
   }
@@ -93774,7 +93857,7 @@ function assertProtectedRecordNotEdited(change, base) {
   );
 }
 function assertSystemMetadataUnchanged(change, base) {
-  if (!isPlainRecord2(change.nextData)) return;
+  if (!isPlainRecord3(change.nextData)) return;
   const next = readSystemMetadata(change.nextData);
   if (systemMetadataEqual(base.system, next)) return;
   throw new Error(
@@ -93822,10 +93905,10 @@ function repointedChildValueIds(document, change) {
   );
   if (baseValue === void 0) return [];
   const before = baseValue.value;
-  if (!isPlainRecord2(before)) return [];
-  if (!isPlainRecord2(change.nextData)) return [];
+  if (!isPlainRecord3(before)) return [];
+  if (!isPlainRecord3(change.nextData)) return [];
   const after = change.nextData.value;
-  if (!isPlainRecord2(after)) return [];
+  if (!isPlainRecord3(after)) return [];
   return Object.entries(before).flatMap(([schemaKey, childValueId]) => {
     if (typeof childValueId !== "string") return [];
     if (after[schemaKey] === childValueId) return [];
@@ -93860,7 +93943,7 @@ function isSystemBearingRecordKind(recordKind) {
   );
 }
 function readSystemMetadata(record3) {
-  if (!isPlainRecord2(record3)) return null;
+  if (!isPlainRecord3(record3)) return null;
   const system = record3.system;
   if (!isSystemMetadata(system)) return null;
   return system;
@@ -93879,11 +93962,11 @@ function systemReason(system) {
   return SYSTEM_PROTECTION_RULES[system.kind].serverReason;
 }
 function describeChangedRecord(recordKind, recordId, record3) {
-  const name = isPlainRecord2(record3) ? record3.name : void 0;
+  const name = isPlainRecord3(record3) ? record3.name : void 0;
   if (typeof name !== "string") return `Record ${recordKind} "${recordId}"`;
   return `Record ${recordKind} "${name}" (${recordId})`;
 }
-function isPlainRecord2(value) {
+function isPlainRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function baseKey(recordKind, recordId) {
@@ -93997,7 +94080,7 @@ function readWorldReferenceList(args) {
     args.keyCandidates
   );
   if (schemaKey === null) return [];
-  if (!isPlainRecord3(args.ownerValue.value)) return [];
+  if (!isPlainRecord4(args.ownerValue.value)) return [];
   const listValueId = args.ownerValue.value[schemaKey];
   if (typeof listValueId !== "string") return [];
   const listValue2 = args.graph.valuesById.get(listValueId);
@@ -94063,18 +94146,18 @@ function worldReferenceClassInherits(graph, classId, ancestorClassId) {
   return false;
 }
 function toWorldReferenceClassRecord(value) {
-  if (!isPlainRecord3(value)) return null;
+  if (!isPlainRecord4(value)) return null;
   const id2 = stringField2(value, "id");
   if (id2 === null) return null;
   return {
     id: id2,
     extendsClassId: nullableStringField(value, "extendsClassId"),
     schema: isStringRecord5(value.schema) ? value.schema : void 0,
-    system: isPlainRecord3(value.system) ? value.system : null
+    system: isPlainRecord4(value.system) ? value.system : null
   };
 }
 function toWorldReferenceValueRecord(value) {
-  if (!isPlainRecord3(value)) return null;
+  if (!isPlainRecord4(value)) return null;
   const id2 = stringField2(value, "id");
   if (id2 === null) return null;
   return {
@@ -94088,10 +94171,10 @@ function worldReferenceValueClassId(value) {
   return typeof value.classId === "string" && value.classId.length > 0 ? value.classId : null;
 }
 function isStringRecord5(value) {
-  if (!isPlainRecord3(value)) return false;
+  if (!isPlainRecord4(value)) return false;
   return Object.values(value).every((entry) => typeof entry === "string");
 }
-function isPlainRecord3(value) {
+function isPlainRecord4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function stringField2(value, key) {
@@ -94390,31 +94473,6 @@ function assertStagedInternalRecordRelationsValid(current, projected, changes) {
     classes: projected.classes
   });
 }
-function stagedChangesAffectClassRelations(current, changes) {
-  const classesById = new Map(
-    current.classes.map((schemaClass2) => [schemaClass2.id, schemaClass2])
-  );
-  const valuesById = new Map(current.values.map((value) => [value.id, value]));
-  for (const change of changes) {
-    if (change.recordKind === "internal-record-relation") return true;
-    if (change.recordKind === "class") {
-      if (change.operation !== "update") return true;
-      if (change.deleted === true) return true;
-      const before2 = classesById.get(change.recordId);
-      if (before2 === void 0) return true;
-      const after = change.nextData;
-      if (!isPlainRecord4(after)) return true;
-      if (before2.extendsClassId !== after.extendsClassId) return true;
-      continue;
-    }
-    if (change.recordKind !== "value") continue;
-    const before = valuesById.get(change.recordId);
-    if (relationEndpointClassId(before) !== relationEndpointClassId(change.nextData)) {
-      return true;
-    }
-  }
-  return false;
-}
 function assertStagedWorldContentLayerBindingsValid(current, projected, changes) {
   if (!stagedChangesRequireWorldLayerBindingValidation(current, changes)) {
     return;
@@ -94461,7 +94519,7 @@ function stagedChangesRequireWorldLayerBindingValidation(current, changes) {
     const before = classesById.get(change.recordId);
     if (before === void 0) return true;
     const after = change.nextData;
-    if (!isPlainRecord4(after)) return true;
+    if (!isPlainRecord(after)) return true;
     if (before.extendsClassId !== after.extendsClassId) return true;
     if (before.isAbstract !== after.isAbstract) return true;
     if (!worldClassSystemBlockIsEqual(before.system, after.system)) return true;
@@ -94512,7 +94570,7 @@ function stagedAffectedWorldLayerLinkClassIds(args) {
       change.nextData
     ];
     for (const candidate of candidates) {
-      if (!isPlainRecord4(candidate)) continue;
+      if (!isPlainRecord(candidate)) continue;
       const relationKind = candidate.relationKind;
       if (typeof relationKind !== "string") continue;
       if (!isStagedWorldLayerLinkTargetRelationKind(relationKind)) continue;
@@ -94555,21 +94613,11 @@ function worldClassSystemBlockIsEqual(before, after) {
   );
 }
 function hasWorldLayerOverrideMetadata(record3) {
-  if (!isPlainRecord4(record3)) return false;
+  if (!isPlainRecord(record3)) return false;
   const value = record3.value;
-  if (!isPlainRecord4(value)) return false;
+  if (!isPlainRecord(value)) return false;
   return typeof value.layerOverrideValueId === "string";
 }
-function relationEndpointClassId(record3) {
-  if (!isPlainRecord4(record3)) return void 0;
-  if (typeof record3.classId === "string") return record3.classId;
-  if (typeof record3.typeId === "string") return record3.typeId;
-  return void 0;
-}
-function isPlainRecord4(value) {
-  if (value === null || typeof value !== "object") return false;
-  return !Array.isArray(value);
-}
 function assertStagedProjectInterfaceValid(projected, changes) {
   const relevant = changes.filter(
     (change) => INTERFACE_VALIDATED_RECORD_KINDS.has(change.recordKind)
@@ -94703,7 +94751,7 @@ function candidateActionListenerRowIds(projected, actions) {
   }
   if (actionSchemaKeys.size === 0) return candidates;
   for (const row of projected.values) {
-    if (!isPlainRecord4(row.value)) continue;
+    if (!isPlainRecord(row.value)) continue;
     for (const schemaKey of actionSchemaKeys) {
       const childId = row.value[schemaKey];
       if (typeof childId === "string") candidates.add(childId);
@@ -94713,7 +94761,7 @@ function candidateActionListenerRowIds(projected, actions) {
 }
 function storedRowActionListeners(row) {
   const body = row.value;
-  if (!isPlainRecord4(body)) return [];
+  if (!isPlainRecord(body)) return [];
   const listeners = body.listeners;
   return Array.isArray(listeners) ? listeners : [];
 }
@@ -94791,7 +94839,7 @@ function authoredActionListeners(action) {
   if (defaultValue === void 0 || defaultValue === null) return [];
   if (!isLiteralValueContent(defaultValue)) return [];
   const body = defaultValue.value;
-  if (!isPlainRecord4(body)) return [];
+  if (!isPlainRecord(body)) return [];
   const listeners = body.listeners;
   return Array.isArray(listeners) ? listeners : [];
 }
@@ -95131,7 +95179,7 @@ function candidateVariantRowIds(projected, variantMembers) {
   }
   if (schemaKeys.size === 0) return candidates;
   for (const row of projected.values) {
-    if (!isPlainRecord4(row.value)) continue;
+    if (!isPlainRecord(row.value)) continue;
     for (const schemaKey of schemaKeys) {
       const childId = row.value[schemaKey];
       if (typeof childId === "string") candidates.add(childId);
@@ -95168,6 +95216,7 @@ var init_project_version_whole_graph_validation = __esm({
     init_world_system_classes();
     init_project_world_reference_graph();
     init_project_record_semantics();
+    init_project_version_relation_sweep_trigger();
     INTERFACE_VALIDATED_RECORD_KINDS = /* @__PURE__ */ new Set([
       "member",
       "class",
@@ -112040,10 +112089,20 @@ async function downloadProjectVersionTransactionResult(args) {
     }
     changedRecords.push(...page.changedRecords);
     if (page.isDone) {
+      if (args.status.totalChangeCount === null) {
+        throw new Error(
+          `Project transaction "${args.transactionId}" reported no total change count after committing; its result download cannot be checked for completeness.`
+        );
+      }
+      if (changedRecords.length !== args.status.totalChangeCount) {
+        throw new Error(
+          `Project transaction "${args.transactionId}" committed ${args.status.totalChangeCount} changes but its result download returned ${changedRecords.length}.`
+        );
+      }
       return {
         kind: "committed",
         transactionId: args.transactionId,
-        totalChangeCount: args.status.totalChangeCount ?? changedRecords.length,
+        totalChangeCount: args.status.totalChangeCount,
         totalChunkCount: args.status.totalChunkCount ?? 0,
         assignments,
         changedRecords
@@ -114336,7 +114395,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.14",
-      cliVersion: "0.36.9",
+      cliVersion: "0.36.10",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -120652,7 +120711,7 @@ __export(resolve_exports, {
 import { readFileSync as readFileSync19, rmSync as rmSync8, writeFileSync as writeFileSync14 } from "node:fs";
 import { join as join21 } from "node:path";
 function runResolve(workspace, side) {
-  const resolvedRecords = acceptSourceEquivalentConflictBases(workspace);
+  const resolvedRecords = adoptServerConflictBases(workspace);
   let resolvedFiles = 0;
   for (const filePath of listProjectSourceFilesV4(workspace.root)) {
     const source = readFileSync19(filePath, "utf8");
@@ -120697,6 +120756,22 @@ function runResolve(workspace, side) {
     `Resolved ${resolvedFiles} source file(s), ${resolvedRecords} record conflict(s), and ${resolvedBinaries} binary file(s) keeping the "${side}" side. Review with "neo diff", then "neo push".`
   );
 }
+function adoptServerConflictBases(workspace) {
+  let adopted = 0;
+  for (const [key, record3] of Object.entries(workspace.state.records)) {
+    if (typeof record3.conflictServerHash !== "string") continue;
+    const next = {
+      ...record3,
+      contentHash: record3.conflictServerHash,
+      data: record3.conflictServerData
+    };
+    delete next.conflictServerHash;
+    delete next.conflictServerData;
+    workspace.state.records[key] = next;
+    adopted += 1;
+  }
+  return adopted;
+}
 function resolveMarkers(source, side) {
   const lines = source.split("\n");
   const output = [];
@@ -120743,7 +120818,6 @@ var init_resolve = __esm({
     init_workspace_status();
     init_source_diagnostics();
     init_project_files();
-    init_source_record_comparison();
   }
 });
 
@@ -120940,7 +121014,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.9");
+    console.log("0.36.10");
     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.9",
+  "version": "0.36.10",
   "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.9 -->
+<!-- reviewed-through-cli: 0.36.10 -->
 
 # Neo Compose CLI
 

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.9 -->
+<!-- reviewed-through-cli: 0.36.10 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale