@neocompose/cli 0.58.0 → 0.58.2

package/dist/neo.mjs

@@ -3672,7 +3672,8 @@ var init_executable_parser = __esm({
           return {
             kind: "annotated",
             annotations,
-            expression: this.parsePostfix(),
+            // Unary, so `@id("…") -3` annotates the negative entry.
+            expression: this.parseUnary(),
             pos: at(t)
           };
         }
@@ -45372,17 +45373,12 @@ function lowerDictionaryKey(expression, keyEnum, path) {
   if (keyEnum === null) {
     throw new Error(`Dictionary ${path} requires string keys.`);
   }
-  let optionName;
-  if (expression.kind === "contextualEnum") {
-    optionName = expression.name;
-  } else if (expression.kind === "member" && expression.receiver.kind === "ident") {
-    if (expression.receiver.name !== keyEnum.name) {
-      throw new Error(
-        `Dictionary key at ${path} names enum ${JSON.stringify(expression.receiver.name)}, expected ${JSON.stringify(keyEnum.name)}.`
-      );
-    }
-    optionName = expression.name;
-  } else {
+  const optionName = enumOptionSpelling(
+    expression,
+    keyEnum.name,
+    `Dictionary key at ${path}`
+  );
+  if (optionName === null) {
     throw new Error(
       `Dictionary key at ${path} must be .Option, ${keyEnum.name}.Option, or a quoted option ID.`
     );
@@ -45395,6 +45391,17 @@ function lowerDictionaryKey(expression, keyEnum, path) {
   }
   return optionId;
 }
+function enumOptionSpelling(expression, enumName, subject) {
+  if (expression.kind === "contextualEnum") return expression.name;
+  if (expression.kind !== "member") return null;
+  if (expression.receiver.kind !== "ident") return null;
+  if (expression.receiver.name !== enumName) {
+    throw new Error(
+      `${subject} names enum ${JSON.stringify(expression.receiver.name)}, expected ${JSON.stringify(enumName)}.`
+    );
+  }
+  return expression.name;
+}
 function emitDictionaryKey(key, options) {
   const name = options?.get(key)?.name;
   return name === void 0 ? quoteNeoString(key) : `.${name}`;
@@ -64310,9 +64317,9 @@ var init_dialogue_sources = __esm({
         if (typeof memberId !== "string") return null;
         const nameMember = this.members.get(memberId);
         if (nameMember?.kind !== 3) return null;
-        const childValueId = value.value[memberName];
-        if (typeof childValueId !== "string") return null;
-        const child = this.values.get(childValueId);
+        const childValueId2 = value.value[memberName];
+        if (typeof childValueId2 !== "string") return null;
+        const child = this.values.get(childValueId2);
         if (typeof child?.value !== "string") return null;
         const localizedText = this.localizedTexts.get(child.value);
         const localeValues = isObjectRecord2(localizedText?.localeValues) ? localizedText.localeValues : null;
@@ -67652,13 +67659,13 @@ function resolveOwnerMembersForValues(document, targetValueIds, additionalRoots,
       const env = overlayStamp(instanceEnv, body.genericBindings);
       for (const entry of merged) {
         if (entry.memberId === null) continue;
-        const childValueId = body.value[entry.schemaKey];
-        if (childValueId === void 0) continue;
+        const childValueId2 = body.value[entry.schemaKey];
+        if (childValueId2 === void 0) continue;
         const childMember = membersById.get(entry.memberId);
         if (childMember === void 0) continue;
         const substituted = trySubstituteMember(childMember, env);
         if (substituted === null) continue;
-        searchRow(substituted, childValueId, rootOwner, env, rootKind);
+        searchRow(substituted, childValueId2, rootOwner, env, rootKind);
       }
       return;
     }
@@ -67669,8 +67676,8 @@ function resolveOwnerMembersForValues(document, targetValueIds, additionalRoots,
       const entryEnv = overlayStamp(ambientEnv, body.genericBindings);
       const entryMember = trySubstituteMember(entryMemberRecord, entryEnv);
       if (entryMember === null) return;
-      for (const childValueId of Object.values(body.value)) {
-        searchRow(entryMember, childValueId, rootOwner, entryEnv, rootKind);
+      for (const childValueId2 of Object.values(body.value)) {
+        searchRow(entryMember, childValueId2, rootOwner, entryEnv, rootKind);
       }
       return;
     }
@@ -67688,9 +67695,9 @@ function resolveOwnerMembersForValues(document, targetValueIds, additionalRoots,
         return;
       }
       if (!Array.isArray(body.value)) return;
-      for (const childValueId of body.value) {
-        if (typeof childValueId !== "string") continue;
-        searchRow(entryMember, childValueId, rootOwner, entryEnv, rootKind);
+      for (const childValueId2 of body.value) {
+        if (typeof childValueId2 !== "string") continue;
+        searchRow(entryMember, childValueId2, rootOwner, entryEnv, rootKind);
       }
       return;
     }
@@ -67811,14 +67818,14 @@ function findOwningMembersForValues(document, valueIds, additionalRoots, travers
       args.genericBindings
     );
     for (const entry of merged) {
-      const childValueId = args.record[entry.schemaKey];
-      if (childValueId === void 0) continue;
+      const childValueId2 = args.record[entry.schemaKey];
+      if (childValueId2 === void 0) continue;
       const childMember = membersById.get(entry.memberId);
       if (childMember === void 0) continue;
       queue.push({
         member: substituteMember(childMember, env, document.members),
         memberRecordId: childMember.id,
-        id: childValueId,
+        id: childValueId2,
         parentValueId: args.parentValueId,
         env,
         // Descending through `Overrides` opens an override graph, and every
@@ -67978,11 +67985,11 @@ function findOwningMembersForValues(document, valueIds, additionalRoots, travers
         env,
         document.members
       );
-      for (const childValueId of Object.values(storedValue.value)) {
+      for (const childValueId2 of Object.values(storedValue.value)) {
         queue.push({
           member: entryMember,
           memberRecordId: entryMemberRecord.id,
-          id: childValueId,
+          id: childValueId2,
           // An entry inherits its collection's position: a Dictionary is not
           // itself a way into an override graph.
           insideAnimationOverrideGraph: current.insideAnimationOverrideGraph,
@@ -68002,11 +68009,11 @@ function findOwningMembersForValues(document, valueIds, additionalRoots, travers
         document.members
       );
       const childValueIds = listKindOf(current.member) === 1 /* Unordered */ ? (rowsByContainerId.get(storedValue.id) ?? []).map((row) => row.id) : isStringListValue(storedValue.value) ? storedValue.value : [];
-      for (const childValueId of childValueIds) {
+      for (const childValueId2 of childValueIds) {
         queue.push({
           member: entryMember,
           memberRecordId: entryMemberRecord.id,
-          id: childValueId,
+          id: childValueId2,
           // An entry inherits its collection's position: a List is not itself
           // a way into an override graph.
           insideAnimationOverrideGraph: current.insideAnimationOverrideGraph,
@@ -81750,16 +81757,16 @@ function createStoredValuePlacementTraversal(args, trackReferences = false) {
             if (settled === null || Object.hasOwn(value.value, settled.schemaKey)) {
               continue;
             }
-            const childValueId = value.constructorArgs[constructorActionParameterId(constructor2, index)];
-            if (typeof childValueId === "string") {
-              settledChildrenBySchemaKey.set(settled.schemaKey, childValueId);
+            const childValueId2 = value.constructorArgs[constructorActionParameterId(constructor2, index)];
+            if (typeof childValueId2 === "string") {
+              settledChildrenBySchemaKey.set(settled.schemaKey, childValueId2);
             }
           }
         }
         for (const entry of storedSchema(classId)) {
           const childMember = membersById.get(entry.memberId);
-          const childValueId = value.value[entry.schemaKey] ?? settledChildrenBySchemaKey.get(entry.schemaKey);
-          if (childMember === void 0 || typeof childValueId !== "string") {
+          const childValueId2 = value.value[entry.schemaKey] ?? settledChildrenBySchemaKey.get(entry.schemaKey);
+          if (childMember === void 0 || typeof childValueId2 !== "string") {
             continue;
           }
           if (memberAccessOf(childMember) !== 0 /* Public */) continue;
@@ -81767,7 +81774,7 @@ function createStoredValuePlacementTraversal(args, trackReferences = false) {
             memberId: childMember.id,
             parentValueId: value.id,
             source: { kind: "classField", schemaKey: entry.schemaKey },
-            valueId: childValueId
+            valueId: childValueId2
           });
         }
         continue;
@@ -81779,16 +81786,16 @@ function createStoredValuePlacementTraversal(args, trackReferences = false) {
       if (entryMember === void 0) continue;
       if (isMemberDictionaryBase(member)) {
         if (!isStringRecord4(value.value)) continue;
-        for (const [key, childValueId] of Object.entries(value.value)) {
+        for (const [key, childValueId2] of Object.entries(value.value)) {
           queue.push({
             memberId: entryMember.id,
             parentValueId: value.id,
             source: {
               kind: "collectionEntry",
               containerMemberId: storedMember.id,
-              entry: { kind: "dict", key, valueId: childValueId }
+              entry: { kind: "dict", key, valueId: childValueId2 }
             },
-            valueId: childValueId
+            valueId: childValueId2
           });
         }
         continue;
@@ -81796,9 +81803,9 @@ function createStoredValuePlacementTraversal(args, trackReferences = false) {
       const entries = listKindOf(member) === 1 /* Unordered */ ? args.indexedRows === void 0 ? unorderedEntriesByContainerId.get(value.id) ?? [] : args.indexedRows.unorderedListEntryIds(value.id).flatMap((id2) => {
         const row = valuesById.get(id2);
         return row === void 0 ? [] : [row];
-      }) : Array.isArray(value.value) ? value.value.flatMap((childValueId) => {
-        if (typeof childValueId !== "string") return [];
-        const childValue = valuesById.get(childValueId);
+      }) : Array.isArray(value.value) ? value.value.flatMap((childValueId2) => {
+        if (typeof childValueId2 !== "string") return [];
+        const childValue = valuesById.get(childValueId2);
         return childValue === void 0 ? [] : [childValue];
       }) : [];
       for (const [index, childValue] of entries.entries()) {
@@ -92486,7 +92493,8 @@ function planCommitPreparationLoadedClosureScope(args) {
     if (rules.has("ancestor-paths") && record6.parentRecordKind !== null && record6.parentRecordKind !== void 0 && record6.parentRecordId !== null && record6.parentRecordId !== void 0) {
       rememberExact(record6.parentRecordKind, record6.parentRecordId);
     }
-    const canOwnStoredDescendants = record6.recordKind !== "value" || !isLiteralValueContent(record6.data) || !["string", "number", "boolean"].includes(typeof record6.data.value) || typeof record6.data.classId === "string" || isVirtualInstanceRootShape(record6.data);
+    const memberWithoutStoredChildren = record6.recordKind === "member" && isMemberBase(record6.data) && getOptionalString(record6.data, "valueId") === void 0 && record6.data.defaultValue === void 0;
+    const canOwnStoredDescendants = !memberWithoutStoredChildren && (record6.recordKind !== "value" || !isLiteralValueContent(record6.data) || !["string", "number", "boolean"].includes(typeof record6.data.value) || typeof record6.data.classId === "string" || isVirtualInstanceRootShape(record6.data));
     if (rules.has("descendants") && record6.includeDescendants !== false && canOwnStoredDescendants && (record6.recordKind === "member" || record6.recordKind === "value" || record6.recordKind === "class" || record6.recordKind === "variant")) {
       rememberRange({
         rangeKind: "children",
@@ -93979,8 +93987,8 @@ function findParentValues(valueId, values) {
       continue;
     }
     if (!isStringRecord6(value.value)) continue;
-    for (const [key, childValueId] of Object.entries(value.value)) {
-      if (childValueId === valueId) parents.push({ value, key });
+    for (const [key, childValueId2] of Object.entries(value.value)) {
+      if (childValueId2 === valueId) parents.push({ value, key });
     }
   }
   return parents;
@@ -96651,8 +96659,8 @@ function inspectClass(options, member) {
       options.index.members
     );
     if (!memberKindSupportsStorage(childMember.kind)) continue;
-    const childValueId = body[entry.schemaKey];
-    if (childValueId === void 0) {
+    const childValueId2 = body[entry.schemaKey];
+    if (childValueId2 === void 0) {
       if (isRequiredMember2(childMember) && !options.allowMissingRequiredClassFields) {
         fail(
           `${options.path} is missing required schema key "${entry.schemaKey}".`
@@ -96662,7 +96670,7 @@ function inspectClass(options, member) {
     }
     children.push({
       member: childMember,
-      valueId: childValueId,
+      valueId: childValueId2,
       path: `${options.path}.${entry.schemaKey}`,
       genericEnv: environment,
       insideAnimationOverrideGraph: options.insideAnimationOverrideGraph || entersAnimationOverrideGraph(entry.memberId)
@@ -106731,10 +106739,10 @@ function repointedChildValueIds(document, change) {
   if (!isPlainRecord4(change.nextData)) return [];
   const after = change.nextData.value;
   if (!isPlainRecord4(after)) return [];
-  return Object.entries(before).flatMap(([schemaKey, childValueId]) => {
-    if (typeof childValueId !== "string") return [];
-    if (after[schemaKey] === childValueId) return [];
-    return [childValueId];
+  return Object.entries(before).flatMap(([schemaKey, childValueId2]) => {
+    if (typeof childValueId2 !== "string") return [];
+    if (after[schemaKey] === childValueId2) return [];
+    return [childValueId2];
   });
 }
 function authoredFieldsEqual(recordKind, base, next) {
@@ -115996,12 +116004,12 @@ function buildStoredValuePlacementIndexV4(records2) {
     const classId = typeof value.classId === "string" ? value.classId : null;
     const body = value.value;
     if (isObjectRecord2(body)) {
-      for (const [schemaKey, childValueId] of Object.entries(body)) {
-        if (typeof childValueId !== "string" || !values.has(childValueId)) {
+      for (const [schemaKey, childValueId2] of Object.entries(body)) {
+        if (typeof childValueId2 !== "string" || !values.has(childValueId2)) {
           continue;
         }
         add({
-          childValueId,
+          childValueId: childValueId2,
           memberId: classId === null ? null : memberIdForSchemaKey(classId, schemaKey),
           parentValueId,
           schemaKey,
@@ -116029,8 +116037,8 @@ function buildStoredValuePlacementIndexV4(records2) {
         continue;
       }
       const parameterId = constructorActionParameterId(constructor2, index);
-      const childValueId = constructorArgs[parameterId];
-      if (typeof childValueId !== "string" || !values.has(childValueId) || !memberStoresAggregate(
+      const childValueId2 = constructorArgs[parameterId];
+      if (typeof childValueId2 !== "string" || !values.has(childValueId2) || !memberStoresAggregate(
         memberDataById.get(settled.memberId),
         value,
         memberDataById,
@@ -116041,7 +116049,7 @@ function buildStoredValuePlacementIndexV4(records2) {
         continue;
       }
       add({
-        childValueId,
+        childValueId: childValueId2,
         memberId: settled.memberId,
         parentValueId,
         schemaKey: settled.schemaKey,
@@ -117766,16 +117774,7 @@ function computeWorkspaceStatus(workspace, options) {
     projectSources.push({ uri: relPath, source, kind: sourceKind });
   }
   if (conflictedFiles.length > 0) {
-    return {
-      changes: [],
-      conflictedFiles,
-      parseErrors,
-      parseWarnings,
-      reconstructed: /* @__PURE__ */ new Map(),
-      authoredValueSeeds: /* @__PURE__ */ new Map(),
-      binaryChanges: [],
-      binaryFiles: []
-    };
+    return refusedStatus(conflictedFiles, parseErrors, parseWarnings);
   }
   const { records: loweringRecords, residency: packedResidency } = logicalValueBaseRecordsV4(loweringBaseRecords(workspace.state.records));
   const baseDocuments = schemaBaseDocuments(workspace);
@@ -117907,16 +117906,7 @@ function computeWorkspaceStatus(workspace, options) {
         1
       )
     );
-    return {
-      changes: [],
-      conflictedFiles,
-      parseErrors,
-      parseWarnings,
-      reconstructed: /* @__PURE__ */ new Map(),
-      authoredValueSeeds: /* @__PURE__ */ new Map(),
-      binaryChanges: [],
-      binaryFiles: []
-    };
+    return refusedStatus(conflictedFiles, parseErrors, parseWarnings);
   }
   const sourceByKey = manifestRecordSources(manifest);
   const documents = projectSchemaManifestToDocuments(
@@ -118219,8 +118209,7 @@ function computeWorkspaceStatus(workspace, options) {
     if (reconstructed3.has(key)) continue;
     if (brokenFiles.has(recordFile)) continue;
     if (recordState.conflictServerHash === null) continue;
-    if (recordState.recordKind === "localized-text" && isLocalizedText(recordState.data) && recordState.data.memberSource !== void 0)
-      continue;
+    if (isSharedMemberText(recordState)) continue;
     if (recordState.recordKind === "value") {
       deletedValueIds.add(recordState.recordId);
     }
@@ -118234,6 +118223,9 @@ function computeWorkspaceStatus(workspace, options) {
       casBaseHash: recordState.conflictServerHash !== void 0 ? recordState.conflictServerHash : recordState.contentHash
     });
   }
+  const sourceTextByUri = new Map(
+    sourceEntries.map((entry) => [entry.relPath, entry.source])
+  );
   const referenceFailures = drainValueReferenceObligationsV4(
     prospectiveState,
     manifest,
@@ -118241,9 +118233,7 @@ function computeWorkspaceStatus(workspace, options) {
       registry: valueLowerRegistry,
       analysis: projectAnalysisV4,
       deletedValueIds,
-      sourceTextByUri: new Map(
-        sourceEntries.map((entry) => [entry.relPath, entry.source])
-      )
+      sourceTextByUri
     }
   );
   for (const failure of referenceFailures) {
@@ -118260,16 +118250,7 @@ function computeWorkspaceStatus(workspace, options) {
   }
   reportPhase("record-diff-references", "Checking packed values\u2026");
   if (referenceFailures.length > 0) {
-    return {
-      changes: [],
-      conflictedFiles,
-      parseErrors,
-      parseWarnings,
-      reconstructed: /* @__PURE__ */ new Map(),
-      authoredValueSeeds: /* @__PURE__ */ new Map(),
-      binaryChanges: [],
-      binaryFiles: []
-    };
+    return refusedStatus(conflictedFiles, parseErrors, parseWarnings);
   }
   const unanchoredValueDeletes = unanchoredValueDeleteIds({
     records: workspace.state.records,
@@ -118293,16 +118274,7 @@ function computeWorkspaceStatus(workspace, options) {
           "value-base-desync"
         )
       );
-      return {
-        changes: [],
-        conflictedFiles,
-        parseErrors,
-        parseWarnings,
-        reconstructed: /* @__PURE__ */ new Map(),
-        authoredValueSeeds: /* @__PURE__ */ new Map(),
-        binaryChanges: [],
-        binaryFiles: []
-      };
+      return refusedStatus(conflictedFiles, parseErrors, parseWarnings);
     }
     parseWarnings.push(
       new SchemaSourceError(
@@ -118315,6 +118287,23 @@ function computeWorkspaceStatus(workspace, options) {
       )
     );
   }
+  if (valueLowerRegistry.storedRowClaims.size > 0) {
+    for (const claim of valueLowerRegistry.storedRowClaims.values()) {
+      const position = composeReferenceSitePosition(
+        claim.site,
+        sourceTextByUri
+      );
+      parseErrors.push(
+        new SchemaSourceError(
+          claim.message,
+          position.file,
+          position.line,
+          position.column
+        )
+      );
+    }
+    return refusedStatus(conflictedFiles, parseErrors, parseWarnings);
+  }
   for (let index = changes.length - 1; index >= 0; index -= 1) {
     const change = changes[index];
     if (change === void 0 || change.kind !== "update") continue;
@@ -119501,6 +119490,21 @@ function summarizeFieldDiff(baseData3, nextData) {
   }
   return lines;
 }
+function isSharedMemberText(record6) {
+  return record6.recordKind === "localized-text" && isLocalizedText(record6.data) && record6.data.memberSource !== void 0;
+}
+function refusedStatus(conflictedFiles, parseErrors, parseWarnings) {
+  return {
+    changes: [],
+    conflictedFiles,
+    parseErrors,
+    parseWarnings,
+    reconstructed: /* @__PURE__ */ new Map(),
+    authoredValueSeeds: /* @__PURE__ */ new Map(),
+    binaryChanges: [],
+    binaryFiles: []
+  };
+}
 var ANIMATION_DOCUMENT_RECORD_KINDS, ANIMATION_REPLAY_RECORD_KINDS, PROSPECTIVE_ANIMATION_RECORD_KINDS;
 var init_workspace_status_core = __esm({
   "src/project-source/workspace-status-core.ts"() {
@@ -121562,8 +121566,8 @@ function animationConstructorProjectionTargetValueIds(context, classId, value) {
       classId,
       projection.memberId
     );
-    const childValueId = schemaKey === null ? void 0 : value.value[schemaKey];
-    const childValue = typeof childValueId === "string" ? context.values.get(childValueId) : void 0;
+    const childValueId2 = schemaKey === null ? void 0 : value.value[schemaKey];
+    const childValue = typeof childValueId2 === "string" ? context.values.get(childValueId2) : void 0;
     const projectedMember = context.members.get(projection.memberId);
     if (childValue !== void 0 && projectedMember !== void 0 && numberField(projectedMember, "kind") === 9 /* Lookup */ && Array.isArray(childValue.value) && typeof childValue.value[0] === "string") {
       targetIds.push(childValue.value[0]);
@@ -121716,6 +121720,8 @@ function createValueLowerRegistryV4(options = {}) {
     referenceObligations: [],
     initAuthoredRowIds: /* @__PURE__ */ new Map(),
     loweringFailures: [],
+    storedRowClaims: /* @__PURE__ */ new Map(),
+    placedStoredRowIds: /* @__PURE__ */ new Set(),
     pendingValueIdentitySites: /* @__PURE__ */ new Map(),
     initializerReconciliations: /* @__PURE__ */ new Map()
   };
@@ -121848,6 +121854,8 @@ function buildValueLowerContext(state, manifest, options = {}) {
     ),
     referenceObligations: registry.referenceObligations,
     loweringFailures: registry.loweringFailures,
+    storedRowClaims: registry.storedRowClaims,
+    placedStoredRowIds: registry.placedStoredRowIds,
     pendingValueIdentitySites: registry.pendingValueIdentitySites,
     initializerReconciliations: registry.initializerReconciliations,
     materializedConstructorExpressions: registry.materializedConstructorExpressions,
@@ -121953,14 +121961,16 @@ function entrySliceRequiresEvaluation(entry, declaredConstructors2, entryClassNa
   }
 }
 function indexAuthoredRowIds(index, initSource, owner) {
-  const pattern = /@id\(\s*"((?:[^"\\]|\\.)*)"\s*\)/g;
-  let match = pattern.exec(initSource);
-  while (match !== null) {
+  for (const authored of authoredRowIds(initSource)) {
+    index.set(authored, owner);
+  }
+}
+function* authoredRowIds(initSource) {
+  for (const match of initSource.matchAll(
+    /@id\(\s*"((?:[^"\\]|\\.)*)"\s*\)/g
+  )) {
     const authored = match[1];
-    if (authored !== void 0 && authored.length > 0) {
-      index.set(authored, owner);
-    }
-    match = pattern.exec(initSource);
+    if (authored !== void 0 && authored.length > 0) yield authored;
   }
 }
 function indexDeclaredInitializers(analysis) {
@@ -123537,7 +123547,8 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
         expressionPosition: {
           line: sourceExpression.pos.line,
           column: sourceExpression.pos.column
-        }
+        },
+        nestedListEntries: idlessNestedListEntries(context, expression)
       });
     }
     const code = initializerExpressionSlice(authoredSlice);
@@ -123653,9 +123664,9 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
         );
       }
       const childPath = `${path}.${schemaKey}`;
-      const childValueId = pendingNestedValueId(source, childPath);
-      if (rows.has(childValueId)) {
-        throw new Error(`Value construction reuses identity ${childValueId}.`);
+      const childValueId2 = pendingNestedValueId(source, childPath);
+      if (rows.has(childValueId2)) {
+        throw new Error(`Value construction reuses identity ${childValueId2}.`);
       }
       if (projectedMember.kind === "lookup") {
         if (argument2.kind !== "litString") {
@@ -123853,6 +123864,13 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
   registerSeedRow(context, rows, row, source, sourceExpression);
   return row;
 }
+function* storedRowIdsRecreatedBy(context, row) {
+  if (context.state[`value:${row.id}`] !== void 0) yield row.id;
+  if (row.nodeType !== "initializer") return;
+  for (const authored of authoredRowIds(row.code)) {
+    if (context.state[`value:${authored}`] !== void 0) yield authored;
+  }
+}
 function registerSeedRow(context, rows, row, source, expression) {
   if (rows.has(row.id)) {
     throw new Error(`Value construction reuses identity ${row.id}.`);
@@ -123865,6 +123883,15 @@ function registerSeedRow(context, rows, row, source, expression) {
     rows.set(row.id, row);
     return;
   }
+  if (!context.structuralConstruction) {
+    for (const storedId of storedRowIdsRecreatedBy(context, row)) {
+      if (context.storedRowClaims.has(storedId)) continue;
+      context.storedRowClaims.set(storedId, {
+        message: `Value ${source.label} names existing row @id(${JSON.stringify(storedId)}) inside a new row. A row keeps its parent: drop the @id to create a new row.`,
+        site: referenceSite(source, expression)
+      });
+    }
+  }
   rows.set(row.id, row);
   context.pendingValues.set(row.id, row);
   if (row.containerId !== void 0) {
@@ -124781,8 +124808,8 @@ function lowerConstructorProjections(context, schemaClass2, expression, base, ba
     argument: argument2,
     argumentIndex
   } of resolved) {
-    const childValueId = baseBody[schemaKey];
-    if (typeof childValueId !== "string") {
+    const childValueId2 = baseBody[schemaKey];
+    if (typeof childValueId2 !== "string") {
       throw new Error(
         `Class value ${String(base.id)}.${schemaKey} has no existing structural row.`
       );
@@ -124793,27 +124820,27 @@ function lowerConstructorProjections(context, schemaClass2, expression, base, ba
           `Class value ${String(base.id)}.${schemaKey} requires a value-row id string literal.`
         );
       }
-      const projectedBase = valueBase(context, childValueId);
+      const projectedBase = valueBase(context, childValueId2);
       addReconstructed(
         context,
         "value",
-        childValueId,
+        childValueId2,
         { ...valueFileFields(projectedBase), value: [argument2.value] },
         source.source
       );
-      body[schemaKey] = childValueId;
+      body[schemaKey] = childValueId2;
       continue;
     }
     lowerValueRow(
       context,
       projectedMember,
       argument2,
-      childValueId,
+      childValueId2,
       source,
       environment,
       argumentSlices[argumentIndex]
     );
-    body[schemaKey] = childValueId;
+    body[schemaKey] = childValueId2;
   }
 }
 function classInheritanceChain(classes, classId) {
@@ -125324,6 +125351,12 @@ function lowerListValue(context, member, expression, base, source, inheritedEnvi
       );
       continue;
     }
+    recordRepeatedRow(
+      context,
+      itemId,
+      `List ${member.name}`,
+      referenceSite(source, element)
+    );
     const child = valueBase(context, itemId);
     if (member.listKind === "unordered" && child.containerId !== base.id) {
       throw new Error(
@@ -125347,6 +125380,16 @@ function lowerListValue(context, member, expression, base, source, inheritedEnvi
     value: member.listKind === "unordered" ? [] : ids
   };
 }
+function recordRepeatedRow(context, rowId, collection, site) {
+  if (!context.placedStoredRowIds.has(rowId)) {
+    context.placedStoredRowIds.add(rowId);
+    return;
+  }
+  context.loweringFailures.push({
+    message: `${collection} places existing row @id(${JSON.stringify(rowId)}), which source already places elsewhere. A row has one position: drop the @id on the copy to create a new row.`,
+    site
+  });
+}
 function lowerPendingListItem(context, member, expression, source, path, containerId, environment, authoredSlice) {
   const rows = /* @__PURE__ */ new Map();
   const localizedTexts = /* @__PURE__ */ new Map();
@@ -125414,6 +125457,12 @@ function lowerDictionaryValue(context, member, expression, base, source, inherit
         `Dictionary ${member.name}[${JSON.stringify(key)}] has no existing row. New dictionary entries are not implemented by this slice.`
       );
     }
+    recordRepeatedRow(
+      context,
+      valueId,
+      `Dictionary ${member.name}`,
+      referenceSite(source, entry.value)
+    );
     body[key] = lowerValueRow(
       context,
       entryMember,
@@ -125485,14 +125534,20 @@ function lowerEnum2(context, member, expression) {
     throw new Error(`Enum member ${member.name} requires [...].`);
   const options = context.enumOptions.get(member.enumId);
   if (options === void 0) throw new Error(`Unknown enum ${member.enumId}.`);
+  const enumName = context.enumNames.get(member.enumId);
+  if (enumName === void 0) {
+    throw new Error(`Enum ${member.enumId} has no manifest name.`);
+  }
+  const subject = `Enum member ${member.name}`;
   return elements.map((entry) => {
-    if (entry.kind !== "contextualEnum") {
+    const optionName = enumOptionSpelling(entry, enumName, subject);
+    if (optionName === null) {
       throw new Error(
-        `Enum member ${member.name} requires contextual .Option values.`
+        `${subject} requires .Option or ${enumName}.Option values.`
       );
     }
-    const id2 = options.get(entry.name);
-    if (id2 === void 0) throw new Error(`Enum has no option ${entry.name}.`);
+    const id2 = options.get(optionName);
+    if (id2 === void 0) throw new Error(`Enum has no option ${optionName}.`);
     return id2;
   });
 }
@@ -126078,17 +126133,17 @@ function indexValuePlacements(state, options = {}) {
     }
     const body = isObjectRecord2(row.body) ? row.body : null;
     if (body === null) continue;
-    for (const [memberName, childValueId] of Object.entries(body)) {
-      if (typeof childValueId !== "string") continue;
-      const placementKey = `${memberName}:${childValueId}`;
+    for (const [memberName, childValueId2] of Object.entries(body)) {
+      if (typeof childValueId2 !== "string") continue;
+      const placementKey = `${memberName}:${childValueId2}`;
       if (!containerBodyByPlacement.has(placementKey)) {
         containerBodyByPlacement.set(placementKey, body);
       }
       const placed = mutablePlacedValueIds.get(memberName) ?? /* @__PURE__ */ new Set();
-      placed.add(childValueId);
+      placed.add(childValueId2);
       mutablePlacedValueIds.set(memberName, placed);
       const placement = {
-        valueId: childValueId,
+        valueId: childValueId2,
         schemaKey: memberName,
         containerValueId: row.id,
         containerClassId: row.classId
@@ -126096,9 +126151,9 @@ function indexValuePlacements(state, options = {}) {
       const byKey = placementsBySchemaKey.get(memberName) ?? [];
       byKey.push(placement);
       placementsBySchemaKey.set(memberName, byKey);
-      const byValue = placementsByValueId.get(childValueId) ?? [];
+      const byValue = placementsByValueId.get(childValueId2) ?? [];
       byValue.push(placement);
-      placementsByValueId.set(childValueId, byValue);
+      placementsByValueId.set(childValueId2, byValue);
     }
   }
   const valueIdByMemberId = /* @__PURE__ */ new Map();
@@ -126569,6 +126624,68 @@ function fileTargetId(context, expression, registry) {
   }
   return null;
 }
+function idlessNestedListEntries(context, expression) {
+  const entries = [];
+  let spellable = true;
+  const visit = (node, path) => {
+    const { expression: unwrapped } = annotatedValue(node);
+    if (unwrapped.kind === "new") {
+      for (const field of unwrapped.initializer ?? []) {
+        visit(field.value, [...path, field.name]);
+      }
+      return;
+    }
+    if (unwrapped.kind === "litDict") {
+      for (const entry of unwrapped.entries) {
+        if (entry.key.kind === "litString") {
+          visit(entry.value, [...path, entry.key.value]);
+          continue;
+        }
+        const before = entries.length;
+        visit(entry.value, path);
+        if (entries.length > before) spellable = false;
+      }
+      return;
+    }
+    if (unwrapped.kind !== "litList") return;
+    unwrapped.elements.forEach((element, index) => {
+      const entryPath = [...path, index];
+      if (annotatedValue(element).id === null && sourceValueSymbol(context, element) === null) {
+        const start = stampableEntryStart(element);
+        if (start === null) spellable = false;
+        else {
+          entries.push({
+            path: entryPath,
+            expressionPosition: { line: start.line, column: start.column }
+          });
+        }
+      }
+      visit(element, entryPath);
+    });
+  };
+  visit(expression, []);
+  return spellable ? entries : null;
+}
+function stampableEntryStart(expression) {
+  switch (expression.kind) {
+    case "member":
+    case "index":
+      return stampableEntryStart(expression.receiver);
+    case "call":
+      return stampableEntryStart(expression.callee);
+    case "force":
+      return stampableEntryStart(expression.operand);
+    case "binary":
+    case "coalesce":
+    case "conditional":
+    case "is":
+    case "lambda":
+    case "annotated":
+      return null;
+    default:
+      return expression.pos;
+  }
+}
 function memberPath2(expression) {
   if (expression.kind === "ident") return expression.name;
   if (expression.kind !== "member") return null;
@@ -128005,10 +128122,10 @@ function constructorProjectionSource(context, classId, body, visited, environmen
       classId,
       projection.memberId
     );
-    const childValueId = schemaKey === null ? void 0 : body[schemaKey];
-    const childValue = typeof childValueId === "string" ? context.values.get(childValueId) : void 0;
+    const childValueId2 = schemaKey === null ? void 0 : body[schemaKey];
+    const childValue = typeof childValueId2 === "string" ? context.values.get(childValueId2) : void 0;
     const projectedMember = context.members.get(projection.memberId);
-    if (schemaKey === null || typeof childValueId !== "string" || childValue === void 0 || projectedMember === void 0) {
+    if (schemaKey === null || typeof childValueId2 !== "string" || childValue === void 0 || projectedMember === void 0) {
       throw new Error(
         `Class ${context.manifestClasses.get(classId)?.name ?? classId} constructor projection ${projection.parameterName} has no stored projected value.`
       );
@@ -128023,7 +128140,7 @@ function constructorProjectionSource(context, classId, body, visited, environmen
           `Class ${context.manifestClasses.get(classId)?.name ?? classId} constructor projection ${projection.parameterName} requires exactly one referenced value.`
         );
       }
-      visited.add(childValueId);
+      visited.add(childValueId2);
       targetValueIds.push(targetIds[0]);
       argumentsValue.push(
         `${projection.parameterName}: ${quote5(targetIds[0])}`
@@ -128034,7 +128151,7 @@ function constructorProjectionSource(context, classId, body, visited, environmen
       `${projection.parameterName}: ${emitValue(
         context,
         projectedMember,
-        childValueId,
+        childValueId2,
         {
           definitionSite: true,
           writeIdentity: false,
@@ -130949,6 +131066,35 @@ var init_push_hook = __esm({
   }
 });
 
+// src/concurrency.ts
+async function mapWithConcurrency(values, concurrency, run) {
+  let nextIndex = 0;
+  let failure;
+  const results = new Array(values.length);
+  const worker = async () => {
+    while (failure === void 0) {
+      const index = nextIndex;
+      nextIndex += 1;
+      if (index >= values.length) return;
+      try {
+        results[index] = await run(values[index], index);
+      } catch (error) {
+        failure ??= { error };
+      }
+    }
+  };
+  await Promise.all(
+    Array.from({ length: Math.min(concurrency, values.length) }, worker)
+  );
+  if (failure !== void 0) throw failure.error;
+  return results;
+}
+var init_concurrency = __esm({
+  "src/concurrency.ts"() {
+    "use strict";
+  }
+});
+
 // src/project-source/project-file-push.ts
 import { basename as basename2, join as join9 } from "node:path";
 import { readFileSync as readFileSync11 } from "node:fs";
@@ -131377,28 +131523,6 @@ async function waitForRetry(attempt, signal) {
     signal.addEventListener("abort", abort, { once: true });
   });
 }
-async function mapWithConcurrency(values, concurrency, run) {
-  let nextIndex = 0;
-  let firstError;
-  const results = new Array(values.length);
-  const worker = async () => {
-    while (firstError === void 0) {
-      const index = nextIndex;
-      nextIndex += 1;
-      if (index >= values.length) return;
-      try {
-        results[index] = await run(values[index]);
-      } catch (error) {
-        firstError ??= error;
-      }
-    }
-  };
-  await Promise.all(
-    Array.from({ length: Math.min(concurrency, values.length) }, worker)
-  );
-  if (firstError !== void 0) throw firstError;
-  return results;
-}
 function combineSignals(...signals) {
   const defined = signals.filter(
     (signal) => signal !== void 0
@@ -131429,6 +131553,7 @@ var UPLOAD_CONCURRENCY, PRESIGN_BATCH_SIZE, MULTIPART_PART_CONCURRENCY, PRESIGN_
 var init_project_file_push = __esm({
   "src/project-source/project-file-push.ts"() {
     "use strict";
+    init_concurrency();
     init_project_files();
     init_projection();
     init_src();
@@ -133949,7 +134074,10 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
     workspace,
     replacements.exact,
     localStatus.pendingValueIdentitySites,
-    { sourceSnapshot: localStatus.sourceSnapshot }
+    {
+      sourceSnapshot: localStatus.sourceSnapshot,
+      committedValueAtPath: committedValueAtPathReader(nextRecords)
+    }
   );
   const localRecords = rewriteReconstructedRecords(
     localStatus.reconstructed,
@@ -133977,7 +134105,8 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
   for (const [key, state] of Object.entries(nextRecords)) {
     const prior = previousRecords[key];
     const local = localRecords.get(key);
-    if (local === void 0 && prior?.file !== void 0) continue;
+    if (local === void 0 && prior?.file !== void 0 && !isSharedMemberText(state))
+      continue;
     const submitted = submittedByKey.get(key);
     const emitData = local === void 0 ? state.data : changedKeys.has(key) && submitted !== void 0 ? mergeCommittedRecordWithLaterLocalEdits(
       state.recordKind,
@@ -134516,12 +134645,10 @@ function materializeAssignedSchemaIdsInAuthoredSource(workspace, replacements, p
         entry.identity.source.range.start.line,
         entry.identity.source.range.start.character
       );
-      const indentation = sourceIndentationAt(source, start);
-      const newline = source.includes("\r\n") ? "\r\n" : "\n";
       edits.push({
         start,
         end: start,
-        text: `@id(${JSON.stringify(assignedId)})${newline}${indentation}`
+        text: idStampText(source, start, assignedId)
       });
     } else {
       const quotedPendingId = JSON.stringify(pendingId2);
@@ -134559,15 +134686,18 @@ function materializeAssignedSchemaIdsInAuthoredSource(workspace, replacements, p
       site.expressionPosition.column
     );
     if (expressionOffset === null) continue;
-    const insertion = initializerOffset + expressionOffset;
-    const indentation = sourceIndentationAt(source, insertion);
-    const newline = source.includes("\r\n") ? "\r\n" : "\n";
-    const edits = editsByUri.get(site.uri) ?? [];
-    edits.push({
-      start: insertion,
-      end: insertion,
-      text: `@id(${JSON.stringify(assignedId)})${newline}${indentation}`
+    const stamp = (offset, id2) => ({
+      start: offset,
+      end: offset,
+      text: idStampText(source, offset, id2)
     });
+    const entryStamps = options.committedValueAtPath === void 0 ? [] : nestedListEntryStamps(site, assignedId, options.committedValueAtPath);
+    if (entryStamps === null) continue;
+    const edits = editsByUri.get(site.uri) ?? [];
+    edits.push(stamp(initializerOffset + expressionOffset, assignedId));
+    for (const entry of entryStamps) {
+      edits.push(stamp(initializerOffset + entry.offset, entry.id));
+    }
     editsByUri.set(site.uri, edits);
     const handled = handledByUri.get(site.uri) ?? /* @__PURE__ */ new Set();
     handled.add(pendingId2);
@@ -134601,6 +134731,49 @@ function materializeAssignedSchemaIdsInAuthoredSource(workspace, replacements, p
   }
   return preserved;
 }
+function nestedListEntryStamps(site, rowId, committedValueAtPath) {
+  if (site.nestedListEntries === null) return null;
+  const stamps = [];
+  for (const entry of site.nestedListEntries) {
+    const id2 = committedValueAtPath(rowId, entry.path);
+    if (id2 === null) return null;
+    const offset = sourceOffsetInsideInitializer(
+      site.initializer,
+      entry.expressionPosition.line,
+      entry.expressionPosition.column
+    );
+    if (offset === null) return null;
+    if (precedingNonWhitespace(site.initializer, offset) === "(") return null;
+    stamps.push({ offset, id: id2 });
+  }
+  return stamps;
+}
+function precedingNonWhitespace(text, offset) {
+  let index = offset - 1;
+  while (index >= 0 && /\s/u.test(text[index] ?? "")) index -= 1;
+  return text[index];
+}
+function committedValueAtPathReader(records2) {
+  let rows;
+  return (rootId, path) => {
+    rows ??= storedValueRowsByIdV4(Object.values(records2));
+    let id2 = rootId;
+    for (const key of path) {
+      const next = childValueId(rows.get(id2)?.value, key);
+      if (next === null) return null;
+      id2 = next;
+    }
+    return id2;
+  };
+}
+function childValueId(body, key) {
+  if (typeof key === "number") {
+    const entry = Array.isArray(body) ? body[key] : void 0;
+    return typeof entry === "string" ? entry : null;
+  }
+  const child = isObjectRecord2(body) ? body[key] : void 0;
+  return typeof child === "string" ? child : null;
+}
 function sourceOffsetInsideInitializer(source, oneBasedLine, oneBasedColumn) {
   if (oneBasedLine < 1 || oneBasedColumn < 1) return null;
   let offset = 0;
@@ -134630,9 +134803,13 @@ function sourceOffsetAt2(source, line, character) {
   }
   return Math.min(offset + character, source.length);
 }
-function sourceIndentationAt(source, offset) {
+function idStampText(source, offset, id2) {
+  const annotation2 = `@id(${JSON.stringify(id2)})`;
   const lineStart = source.lastIndexOf("\n", Math.max(0, offset - 1)) + 1;
-  return /^[\t ]*/u.exec(source.slice(lineStart, offset))?.[0] ?? "";
+  const prefix = source.slice(lineStart, offset);
+  if (!/^[\t ]*$/u.test(prefix)) return `${annotation2} `;
+  const newline = source.includes("\r\n") ? "\r\n" : "\n";
+  return `${annotation2}${newline}${prefix}`;
 }
 async function buildPostPushCompileSchema(workspace, status) {
   const byKind = /* @__PURE__ */ new Map();
@@ -136077,11 +136254,19 @@ var init_reset = __esm({
 });
 
 // src/project-source/project-file-pull.ts
-import { existsSync as existsSync11, rmSync as rmSync7 } from "node:fs";
+import {
+  existsSync as existsSync11,
+  mkdtempSync,
+  readFileSync as readFileSync15,
+  rmSync as rmSync7,
+  writeFileSync as writeFileSync10
+} from "node:fs";
+import { tmpdir } from "node:os";
 import { join as join13 } from "node:path";
 async function pullProjectBinariesV4(args) {
   const resolvePath = createWorkspaceSourcePathResolver(args.workspace.root);
-  let client = args.client ?? null;
+  const plans = /* @__PURE__ */ new Map();
+  const downloads = [];
   const localById = new Map(
     (args.localBinaries ?? []).map((binary) => [binary.fileId, binary])
   );
@@ -136095,7 +136280,14 @@ async function pullProjectBinariesV4(args) {
       throw new Error(`project-file:${record6.recordId} must be an object.`);
     }
     if (record6.data.status !== "uploaded") continue;
-    client ??= NeoApiClient.forBaseUrl(args.workspace.config.apiBaseUrl);
+    const existing = plans.get(record6.recordId);
+    if (existing !== void 0) {
+      if (existing.contentHash !== record6.contentHash)
+        throw new Error(
+          `Project file ${record6.recordId} appears with conflicting content hashes in the pulled document.`
+        );
+      continue;
+    }
     const key = `project-file:${record6.recordId}`;
     const previous = args.previousRecords[key];
     const localStatus = localById.get(record6.recordId);
@@ -136108,7 +136300,6 @@ async function pullProjectBinariesV4(args) {
       record6.data,
       `project-file:${record6.recordId} metadata`
     );
-    let remoteBytes = null;
     let action = planBinaryMergeV4({
       baseDigest,
       localDigest,
@@ -136119,98 +136310,142 @@ async function pullProjectBinariesV4(args) {
     if (args.destructive === true) {
       action = localDigest === remoteDigest ? "unchanged" : "download";
     }
-    if (action === "download" || action === "conflict") {
-      if (remoteBytes === null) {
-        const response = await download(
-          record6.data,
-          record6.recordId,
-          client,
-          args.workspace
-        );
-        remoteBytes = response.bytes;
-        if (response.sha256 !== remoteDigest) {
+    const plan = {
+      key,
+      fileId: record6.recordId,
+      contentHash: record6.contentHash,
+      data: record6.data,
+      previous,
+      path,
+      baseDigest,
+      remoteDigest,
+      action
+    };
+    plans.set(record6.recordId, plan);
+    if (action === "download" || action === "conflict") downloads.push(plan);
+  }
+  let stagingDirectory;
+  try {
+    const stagedPaths = /* @__PURE__ */ new Map();
+    if (downloads.length > 0) {
+      stagingDirectory = mkdtempSync(join13(tmpdir(), "neo-pull-files-"));
+      const directory = stagingDirectory;
+      const client = args.client ?? NeoApiClient.forBaseUrl(args.workspace.config.apiBaseUrl);
+      await mapWithConcurrency(
+        downloads,
+        DOWNLOAD_CONCURRENCY,
+        async (plan, index) => {
+          const response = await download(
+            plan.data,
+            plan.fileId,
+            client,
+            args.workspace
+          );
+          if (response.sha256 !== plan.remoteDigest) {
+            throw new Error(
+              `Project file ${plan.fileId} content changed while pull was in progress (${plan.remoteDigest} -> ${response.sha256}). Pull again against a stable version head.`
+            );
+          }
+          const stagedPath = join13(directory, String(index));
+          writeFileSync10(stagedPath, response.bytes);
+          stagedPaths.set(plan.fileId, stagedPath);
+        }
+      );
+    }
+    for (const plan of plans.values()) {
+      const {
+        key,
+        fileId,
+        data,
+        previous,
+        path,
+        baseDigest,
+        remoteDigest,
+        action
+      } = plan;
+      const absolute = resolvePath(path);
+      const stagedPath = stagedPaths.get(fileId);
+      const remoteBytes = stagedPath === void 0 ? null : readFileSync15(stagedPath);
+      if (action === "download") {
+        if (remoteBytes === null) {
           throw new Error(
-            `Project file ${record6.recordId} content changed while pull was in progress (${remoteDigest} -> ${response.sha256}). Pull again against a stable version head.`
+            `Project file ${fileId} download plan has no verified remote bytes.`
           );
         }
+        writeVerifiedBinaryDownloadV4(absolute, remoteBytes, remoteDigest);
+        downloaded += 1;
+        states.set(key, binaryState(path, remoteDigest, data));
+        continue;
       }
-    }
-    if (action === "download") {
-      if (remoteBytes === null) {
-        throw new Error(
-          `Project file ${record6.recordId} download plan has no verified remote bytes.`
-        );
+      if (action === "conflict") {
+        if (remoteBytes === null) {
+          throw new Error(
+            `Project file ${fileId} conflict plan has no verified remote bytes.`
+          );
+        }
+        const artifactPath = writeBinaryConflictArtifactV4(
+          args.workspace.root,
+          fileId,
+          fileName(data),
+          remoteBytes,
+          remoteDigest
+        );
+        const state = binaryState(path, baseDigest, data);
+        states.set(key, {
+          ...state,
+          conflict: {
+            action: "conflict",
+            remoteSha256: remoteDigest,
+            artifactPath
+          }
+        });
+        conflicts.push(path);
+        conflicted += 1;
+        continue;
       }
-      writeVerifiedBinaryDownloadV4(absolute, remoteBytes, remoteDigest);
-      downloaded += 1;
-      states.set(key, binaryState(path, remoteDigest, record6.data));
-      continue;
-    }
-    if (action === "conflict") {
-      if (remoteBytes === null) {
-        throw new Error(
-          `Project file ${record6.recordId} conflict plan has no verified remote bytes.`
-        );
+      if (action === "converged" || action === "unchanged") {
+        states.set(key, binaryState(path, remoteDigest, data));
+        removePreviousConflict(args.workspace.root, previous?.projectBinary);
+        continue;
       }
-      const artifactPath = writeBinaryConflictArtifactV4(
-        args.workspace.root,
-        record6.recordId,
-        fileName(record6.data),
-        remoteBytes,
-        remoteDigest
-      );
-      const state = binaryState(path, baseDigest, record6.data);
-      states.set(key, {
-        ...state,
-        conflict: {
-          action: "conflict",
-          remoteSha256: remoteDigest,
-          artifactPath
-        }
-      });
-      conflicts.push(path);
-      conflicted += 1;
-      continue;
-    }
-    if (action === "converged" || action === "unchanged") {
-      states.set(key, binaryState(path, remoteDigest, record6.data));
-      removePreviousConflict(args.workspace.root, previous?.projectBinary);
-      continue;
-    }
-    states.set(key, binaryState(path, baseDigest, record6.data));
-  }
-  for (const [key, previous] of Object.entries(args.previousRecords)) {
-    if (previous.recordKind !== "project-file") continue;
-    if (args.document.records.has(key)) continue;
-    const localStatus = localById.get(previous.recordId);
-    const path = localStatus?.path ?? previous.projectBinary?.path ?? canonicalProjectBinaryPathV42(previous.data);
-    const absolute = resolvePath(path);
-    const localDigest = existsSync11(absolute) ? sha256File(absolute) : null;
-    const baseDigest = previous.projectBinary?.sha256 ?? readSha256(previous.data) ?? null;
-    const action = planBinaryMergeV4({
-      baseDigest,
-      localDigest,
-      remoteDigest: null,
-      declarationPresent: localStatus !== void 0,
-      hadLocalBytes: previous.projectBinary !== void 0
-    });
-    if (action === "delete-modify") {
-      const data = isObjectRecord2(previous.data) ? previous.data : {};
-      states.set(key, {
-        ...binaryState(path, baseDigest, data),
-        conflict: {
-          action: "delete-modify",
-          remoteSha256: null
-        }
+      states.set(key, binaryState(path, baseDigest, data));
+    }
+    for (const [key, previous] of Object.entries(args.previousRecords)) {
+      if (previous.recordKind !== "project-file") continue;
+      if (args.document.records.has(key)) continue;
+      const localStatus = localById.get(previous.recordId);
+      const path = localStatus?.path ?? previous.projectBinary?.path ?? canonicalProjectBinaryPathV42(previous.data);
+      const absolute = resolvePath(path);
+      const localDigest = existsSync11(absolute) ? sha256File(absolute) : null;
+      const baseDigest = previous.projectBinary?.sha256 ?? readSha256(previous.data) ?? null;
+      const action = planBinaryMergeV4({
+        baseDigest,
+        localDigest,
+        remoteDigest: null,
+        declarationPresent: localStatus !== void 0,
+        hadLocalBytes: previous.projectBinary !== void 0
       });
-      conflicts.push(path);
-      conflicted += 1;
-      continue;
+      if (action === "delete-modify") {
+        const data = isObjectRecord2(previous.data) ? previous.data : {};
+        states.set(key, {
+          ...binaryState(path, baseDigest, data),
+          conflict: {
+            action: "delete-modify",
+            remoteSha256: null
+          }
+        });
+        conflicts.push(path);
+        conflicted += 1;
+        continue;
+      }
+      rmSync7(absolute, { force: true });
+      removePreviousConflict(args.workspace.root, previous.projectBinary);
     }
-    rmSync7(absolute, { force: true });
-    removePreviousConflict(args.workspace.root, previous.projectBinary);
+    return { states, downloaded, conflicted, conflicts };
+  } finally {
+    if (stagingDirectory !== void 0)
+      rmSync7(stagingDirectory, { recursive: true, force: true });
   }
-  return { states, downloaded, conflicted, conflicts };
 }
 async function download(data, fileId, client, workspace) {
   const version = typeof data.storageETag === "string" ? `?v=${encodeURIComponent(data.storageETag)}` : "";
@@ -136279,13 +136514,16 @@ function removePreviousConflict(root, state) {
   if (state?.conflict?.artifactPath === void 0) return;
   rmSync7(join13(root, state.conflict.artifactPath), { force: true });
 }
+var DOWNLOAD_CONCURRENCY;
 var init_project_file_pull = __esm({
   "src/project-source/project-file-pull.ts"() {
     "use strict";
     init_workspace_source_path();
+    init_concurrency();
     init_http();
     init_projection();
     init_project_files();
+    DOWNLOAD_CONCURRENCY = 8;
   }
 });
 
@@ -136410,10 +136648,10 @@ __export(pull_exports, {
 });
 import {
   mkdirSync as mkdirSync10,
-  writeFileSync as writeFileSync10,
+  writeFileSync as writeFileSync11,
   rmSync as rmSync8,
   existsSync as existsSync12,
-  readFileSync as readFileSync15
+  readFileSync as readFileSync16
 } from "node:fs";
 import { dirname as dirname9 } from "node:path";
 async function runPull(workspace, options, progress = spinner("Checking local workspace\u2026")) {
@@ -136574,8 +136812,7 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
       baseState.data,
       mainLocale
     );
-    const locallyDeleted = hasBaseline && baseState.file !== void 0 && local === void 0 && // Member-owned texts survive losing their last inline source reference.
-    !(serverRecord.recordKind === "localized-text" && isLocalizedText(baseState.data) && baseState.data.memberSource !== void 0);
+    const locallyDeleted = hasBaseline && baseState.file !== void 0 && local === void 0 && !isSharedMemberText(baseState);
     if (!serverChanged) {
       plans.set(key, {
         emitData: locallyDeleted ? void 0 : local === void 0 ? serverRecord.data : mergeProjectDocumentRecord(
@@ -136881,7 +137118,7 @@ async function finishFormat4Pull(args) {
   let written = 0;
   for (const path of emittedPaths) {
     const absolute = resolveSourcePath(path);
-    const existing = existsSync12(absolute) ? readFileSync15(absolute, "utf8") : null;
+    const existing = existsSync12(absolute) ? readFileSync16(absolute, "utf8") : null;
     const unprojectedConflictKeys = authoredLocalConflictKeysByPath.get(path) ?? [];
     if (unprojectedConflictKeys.length > 0 && existing === null) {
       throw new Error(
@@ -136903,7 +137140,7 @@ async function finishFormat4Pull(args) {
     mkdirSync10(dirname9(absolute), { recursive: true });
     if (existing !== null && !marked && !rewritePaths.has(path)) continue;
     if (existing !== content) {
-      writeFileSync10(absolute, content, "utf8");
+      writeFileSync11(absolute, content, "utf8");
       written += 1;
     }
   }
@@ -137303,7 +137540,6 @@ var init_pull = __esm({
   "src/commands/pull.ts"() {
     "use strict";
     init_push();
-    init_localization2();
     init_source_layout();
     init_project_read_base();
     init_document();
@@ -137338,7 +137574,7 @@ var init_exports = {};
 __export(init_exports, {
   runInit: () => runInit
 });
-import { existsSync as existsSync13, mkdirSync as mkdirSync11, readFileSync as readFileSync16, writeFileSync as writeFileSync11 } from "node:fs";
+import { existsSync as existsSync13, mkdirSync as mkdirSync11, readFileSync as readFileSync17, writeFileSync as writeFileSync12 } from "node:fs";
 import { join as join14, resolve as resolve3 } from "node:path";
 async function runInit(options) {
   let projectId = options.projectId;
@@ -137463,13 +137699,13 @@ async function runInit(options) {
 }
 function ensurePrivateStateIgnored(root) {
   const path = join14(root, ".gitignore");
-  const existing = existsSync13(path) ? readFileSync16(path, "utf8") : "";
+  const existing = existsSync13(path) ? readFileSync17(path, "utf8") : "";
   if (existing.split(/\r?\n/u).some((line) => line.trim() === ".neo/" || line.trim() === ".neo")) {
     return;
   }
   const prefix = existing.length === 0 || existing.endsWith("\n") ? existing : `${existing}
 `;
-  writeFileSync11(path, `${prefix}.neo/
+  writeFileSync12(path, `${prefix}.neo/
 `, "utf8");
 }
 var init_init = __esm({
@@ -138873,7 +139109,7 @@ __export(script_exports, {
   readDocumentArrays: () => readDocumentArrays,
   runScript: () => runScript
 });
-import { readFileSync as readFileSync17 } from "node:fs";
+import { readFileSync as readFileSync18 } from "node:fs";
 function readDocumentArrays(raw) {
   const arrayOf2 = (field) => {
     const value = raw[field];
@@ -139393,9 +139629,9 @@ function buildRootValue(document, lookups) {
 }
 function readSource(options, fallback) {
   if (options.source !== null) return options.source;
-  if (options.file !== null) return readFileSync17(options.file, "utf8");
+  if (options.file !== null) return readFileSync18(options.file, "utf8");
   if (fallback !== void 0) return fallback;
-  const stdin = readFileSync17(0, "utf8");
+  const stdin = readFileSync18(0, "utf8");
   if (stdin.trim().length === 0) {
     throw new Error(
       "Provide NeoScript source as an argument, --file, or stdin."
@@ -140444,7 +140680,7 @@ var init_registry2 = __esm({
   "schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.58.0",
+      cliVersion: "0.58.2",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -141872,12 +142108,12 @@ import {
   existsSync as existsSync14,
   mkdirSync as mkdirSync12,
   readdirSync as readdirSync4,
-  readFileSync as readFileSync18,
+  readFileSync as readFileSync19,
   realpathSync as realpathSync2,
   renameSync as renameSync7,
   rmSync as rmSync9,
   statSync as statSync2,
-  writeFileSync as writeFileSync12
+  writeFileSync as writeFileSync13
 } from "node:fs";
 import {
   basename as basename3,
@@ -142091,7 +142327,7 @@ function preparedHookCandidate(workspace) {
       );
     }
     const parsed = JSON.parse(
-      readFileSync18(join15(directory, "candidate.json"), "utf8")
+      readFileSync19(join15(directory, "candidate.json"), "utf8")
     );
     if (!isRecord10(parsed)) {
       throw new NeoTestPreparedCandidateError(
@@ -142161,7 +142397,7 @@ function testCandidateCachePath(workspace, inputFingerprint) {
 function cachedTestCandidate(workspace, inputFingerprint) {
   try {
     const candidatePath = testCandidateCachePath(workspace, inputFingerprint);
-    const parsed = JSON.parse(readFileSync18(candidatePath, "utf8"));
+    const parsed = JSON.parse(readFileSync19(candidatePath, "utf8"));
     if (!isRecord10(parsed)) return null;
     if (parsed.version !== 1) return null;
     if (parsed.candidateRevision !== TEST_CANDIDATE_CACHE_REVISION) return null;
@@ -142172,7 +142408,7 @@ function cachedTestCandidate(workspace, inputFingerprint) {
       return null;
     }
     if (typeof parsed.documentSha256 !== "string") return null;
-    const documentJson = readFileSync18(
+    const documentJson = readFileSync19(
       join15(dirname10(candidatePath), "document.json"),
       "utf8"
     );
@@ -142212,7 +142448,7 @@ function cacheTestCandidate(workspace, inputFingerprint, candidate) {
 function compileSpec(workspace, document, absolutePath, projectCompilationHash2) {
   const scriptDocument = readDocumentArrays(document);
   const path = relative8(workspace.root, absolutePath).split(sep8).join("/");
-  const source = readFileSync18(absolutePath, "utf8");
+  const source = readFileSync19(absolutePath, "utf8");
   const sourceHash = createHash11("sha256").update(source).digest("hex");
   const artifactPath = join15(
     workspace.root,
@@ -142223,7 +142459,7 @@ function compileSpec(workspace, document, absolutePath, projectCompilationHash2)
     `${sourceHash}.json`
   );
   try {
-    const cached = JSON.parse(readFileSync18(artifactPath, "utf8"));
+    const cached = JSON.parse(readFileSync19(artifactPath, "utf8"));
     if (isRecord10(cached) && cached.version === 1 && cached.compilerRevision === NEOSCRIPT_COMPILER_REVISION && cached.projectCompilationHash === projectCompilationHash2 && cached.sourceHash === sourceHash && isRecord10(cached.action) && typeof cached.artifactSha256 === "string" && createHash11("sha256").update(JSON.stringify(cached.action)).digest("hex") === cached.artifactSha256 && cached.action.compilerRevision === NEOSCRIPT_COMPILER_REVISION && Array.isArray(cached.action.parameters) && Array.isArray(cached.action.instructions) && isRecord10(cached.action.typeInfo)) {
       return {
         path,
@@ -143040,7 +143276,7 @@ async function executeRegisteredSpec(registered, document, selected, timeoutMs,
 function atomicWrite(path, content) {
   mkdirSync12(dirname10(path), { recursive: true });
   const temporary = `${path}.tmp-${String(process.pid)}-${randomUUID6()}`;
-  writeFileSync12(temporary, content, "utf8");
+  writeFileSync13(temporary, content, "utf8");
   renameSync7(temporary, path);
 }
 function testBuildFiles(root) {
@@ -143586,7 +143822,7 @@ import {
   constants as fsConstants,
   accessSync,
   existsSync as existsSync15,
-  readFileSync as readFileSync19
+  readFileSync as readFileSync20
 } from "node:fs";
 import { extname as extname2, isAbsolute as isAbsolute4, join as join16, relative as relative9, sep as sep9 } from "node:path";
 function inspectNeoDoctor(workspace) {
@@ -143671,7 +143907,7 @@ function inspectSourceContract(workspace) {
   );
   try {
     const inputs = files.map((file, index) => {
-      const text = readFileSync19(file, "utf8");
+      const text = readFileSync20(file, "utf8");
       return {
         uri: relativeFiles[index],
         kind: requiredProjectSourceKindV4(relativeFiles[index], text),
@@ -143719,7 +143955,7 @@ function inspectExtensionContract(root) {
     };
   }
   try {
-    const value = JSON.parse(readFileSync19(cachePath, "utf8"));
+    const value = JSON.parse(readFileSync20(cachePath, "utf8"));
     assertProjectSourceAnalysisV4(value);
     return {
       id: NEO_VSCODE_EXTENSION_ID,
@@ -144065,7 +144301,7 @@ __export(migrate_exports, {
   runMigrate: () => runMigrate
 });
 import { randomUUID as randomUUID7 } from "node:crypto";
-import { existsSync as existsSync16, mkdirSync as mkdirSync13, readFileSync as readFileSync20, writeFileSync as writeFileSync13 } from "node:fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync13, readFileSync as readFileSync21, writeFileSync as writeFileSync14 } from "node:fs";
 import { join as join17, relative as relative10 } from "node:path";
 async function runMigrate(workspace, subcommand, positional, targetRef, json, dependencies = {}) {
   if (subcommand === "new") {
@@ -144079,7 +144315,7 @@ async function runMigrate(workspace, subcommand, positional, targetRef, json, de
     mkdirSync13(migrationsDir, { recursive: true });
     let nextOrder = 1;
     for (const path of listProjectSourceFilesV4(workspace.root)) {
-      const source = readFileSync20(path, "utf8");
+      const source = readFileSync21(path, "utf8");
       if (neoProjectSourceKind(path, source) !== "migration") continue;
       const migration = parseMigrationFile(
         source,
@@ -144102,7 +144338,7 @@ async function runMigrate(workspace, subcommand, positional, targetRef, json, de
       target === "project" ? "// Runs once with root context. Write the NeoScript action below." : `// Runs once per ${target} value; \`this\` is the instance.`,
       ""
     ].join("\n");
-    writeFileSync13(absolute, template, "utf8");
+    writeFileSync14(absolute, template, "utf8");
     console.log(`Created ${relPath} \u2014 edit the action body, then "neo push".`);
     console.log("(The id is assigned at push, same as schema creates.)");
     return;
@@ -144977,8 +145213,8 @@ function collectClassInstances(document, targetClassId, memberById2, valueById,
       const schema = schemaClass2 !== void 0 && isObjectRecord2(schemaClass2.schema) ? schemaClass2.schema : {};
       const instanceValue = valueRecord.value;
       if (isObjectRecord2(instanceValue)) {
-        for (const [key, childValueId] of Object.entries(instanceValue)) {
-          walk(schema[key], childValueId);
+        for (const [key, childValueId2] of Object.entries(instanceValue)) {
+          walk(schema[key], childValueId2);
         }
       }
       return;
@@ -144986,8 +145222,8 @@ function collectClassInstances(document, targetClassId, memberById2, valueById,
     if (memberKind === 6) {
       const entries = valueRecord.value;
       if (Array.isArray(entries)) {
-        for (const childValueId of entries) {
-          walk(member.entryMemberId, childValueId);
+        for (const childValueId2 of entries) {
+          walk(member.entryMemberId, childValueId2);
         }
       }
       return;
@@ -144995,8 +145231,8 @@ function collectClassInstances(document, targetClassId, memberById2, valueById,
     if (memberKind === 5) {
       const entries = valueRecord.value;
       if (isObjectRecord2(entries)) {
-        for (const childValueId of Object.values(entries)) {
-          walk(member.entryMemberId, childValueId);
+        for (const childValueId2 of Object.values(entries)) {
+          walk(member.entryMemberId, childValueId2);
         }
       }
     }
@@ -146265,7 +146501,7 @@ __export(content_exports, {
   makeContentContext: () => makeContentContext,
   runLoc: () => runLoc
 });
-import { readFileSync as readFileSync21 } from "node:fs";
+import { readFileSync as readFileSync22 } from "node:fs";
 import { randomUUID as randomUUID8 } from "node:crypto";
 function versionPath2(workspace, suffix) {
   return `/api/projects/${workspace.config.projectId}/versions/${workspace.config.versionId}/${suffix}`;
@@ -146273,9 +146509,9 @@ function versionPath2(workspace, suffix) {
 function readBatch(file) {
   let raw = null;
   if (file !== null) {
-    raw = readFileSync21(file, "utf8");
+    raw = readFileSync22(file, "utf8");
   } else if (!process.stdin.isTTY) {
-    raw = readFileSync21(0, "utf8");
+    raw = readFileSync22(0, "utf8");
     if (raw.trim().length === 0) raw = null;
   }
   if (raw === null) return null;
@@ -147012,10 +147248,10 @@ function dryrunOwnership(document, valueById, saveBindings = /* @__PURE__ */ new
       const childMemberByKey = new Map(
         storageResolver.mergedSchema(classId).map((entry) => [entry.schemaKey, entry.memberId])
       );
-      for (const [key, childValueId] of Object.entries(value.value)) {
+      for (const [key, childValueId2] of Object.entries(value.value)) {
         const childMemberId = childMemberByKey.get(key);
-        if (childMemberId !== void 0 && typeof childValueId === "string") {
-          walkOwnedGraph([...memberPath3, childMemberId], childValueId);
+        if (childMemberId !== void 0 && typeof childValueId2 === "string") {
+          walkOwnedGraph([...memberPath3, childMemberId], childValueId2);
         }
       }
       return;
@@ -147024,9 +147260,9 @@ function dryrunOwnership(document, valueById, saveBindings = /* @__PURE__ */ new
     if (unorderedList && (Array.isArray(value.value) || includeHistoricalNullLists && membership.has(valueId))) {
       const entryMemberId = storageResolver.resolvedEntryMemberId(memberId);
       if (entryMemberId === void 0) return;
-      for (const childValueId of membership.get(valueId) ?? []) {
-        if (typeof childValueId === "string") {
-          walkOwnedGraph([...memberPath3, entryMemberId], childValueId);
+      for (const childValueId2 of membership.get(valueId) ?? []) {
+        if (typeof childValueId2 === "string") {
+          walkOwnedGraph([...memberPath3, entryMemberId], childValueId2);
         }
       }
       return;
@@ -147035,9 +147271,9 @@ function dryrunOwnership(document, valueById, saveBindings = /* @__PURE__ */ new
       const entryMemberId = storageResolver.resolvedEntryMemberId(memberId);
       if (entryMemberId === void 0) return;
       const childIds = Array.isArray(value.value) ? value.value : Object.values(value.value);
-      for (const childValueId of childIds) {
-        if (typeof childValueId === "string") {
-          walkOwnedGraph([...memberPath3, entryMemberId], childValueId);
+      for (const childValueId2 of childIds) {
+        if (typeof childValueId2 === "string") {
+          walkOwnedGraph([...memberPath3, entryMemberId], childValueId2);
         }
       }
     }
@@ -147523,9 +147759,9 @@ import { createHash as createHash12 } from "node:crypto";
 import {
   existsSync as existsSync17,
   mkdirSync as mkdirSync14,
-  readFileSync as readFileSync22,
+  readFileSync as readFileSync23,
   unlinkSync,
-  writeFileSync as writeFileSync14
+  writeFileSync as writeFileSync15
 } from "node:fs";
 import { dirname as dirname11, join as join18 } from "node:path";
 function validatePath(path) {
@@ -147536,7 +147772,7 @@ function validatePath(path) {
 }
 function readManifest(path) {
   if (!existsSync17(path)) return null;
-  const data = JSON.parse(readFileSync22(path, "utf8"));
+  const data = JSON.parse(readFileSync23(path, "utf8"));
   if (data === null || typeof data !== "object" || !("schemaVersion" in data) || data.schemaVersion !== 1)
     throw new Error(`Invalid generated-file manifest version: ${path}`);
   if (!("files" in data) || !Array.isArray(data.files) || data.files.length === 0)
@@ -147616,7 +147852,7 @@ function writeUnityGeneratedFiles(directory, projectId, files) {
       const meta = join18(directory, old.path + ".meta");
       operations.push([
         path + ".meta",
-        existsSync17(meta) ? readFileSync22(meta, "utf8") : null
+        existsSync17(meta) ? readFileSync23(meta, "utf8") : null
       ]);
     }
     operations.push([path, file.content]);
@@ -147643,7 +147879,7 @@ function writeUnityGeneratedFiles(directory, projectId, files) {
     if (!previous.has(key))
       previous.set(key, {
         path,
-        content: existsSync17(path) ? readFileSync22(path, "utf8") : null
+        content: existsSync17(path) ? readFileSync23(path, "utf8") : null
       });
   }
   const write = (path, content) => {
@@ -147651,13 +147887,13 @@ function writeUnityGeneratedFiles(directory, projectId, files) {
       if (existsSync17(path)) unlinkSync(path);
     } else {
       mkdirSync14(dirname11(path), { recursive: true });
-      writeFileSync14(path, content);
+      writeFileSync15(path, content);
     }
   };
   const changed = [];
   try {
     for (const [path, content] of operations) {
-      const current = existsSync17(path) ? readFileSync22(path, "utf8") : null;
+      const current = existsSync17(path) ? readFileSync23(path, "utf8") : null;
       if (current === content) continue;
       changed.push(path);
       write(path, content);
@@ -147670,7 +147906,7 @@ function writeUnityGeneratedFiles(directory, projectId, files) {
       restored.add(key);
       const original = previous.get(key);
       if (original.path !== path && existsSync17(path)) unlinkSync(path);
-      const current = existsSync17(original.path) ? readFileSync22(original.path, "utf8") : null;
+      const current = existsSync17(original.path) ? readFileSync23(original.path, "utf8") : null;
       if (current !== original.content) write(original.path, original.content);
     }
     throw error;
@@ -147687,7 +147923,7 @@ var export_exports = {};
 __export(export_exports, {
   runExportUnity: () => runExportUnity
 });
-import { mkdirSync as mkdirSync15, writeFileSync as writeFileSync15 } from "node:fs";
+import { mkdirSync as mkdirSync15, writeFileSync as writeFileSync16 } from "node:fs";
 import { join as join19 } from "node:path";
 async function runExportUnity(workspace, outDir) {
   if (outDir === null) {
@@ -147710,9 +147946,9 @@ async function runExportUnity(workspace, outDir) {
     response.projectId,
     response.generatedFiles
   );
-  writeFileSync15(join19(resourcesDir, "project.json"), response.projectJson);
+  writeFileSync16(join19(resourcesDir, "project.json"), response.projectJson);
   for (const file of response.localizationFiles ?? []) {
-    writeFileSync15(join19(localizationDir, file.fileName), file.content);
+    writeFileSync16(join19(localizationDir, file.fileName), file.content);
   }
   console.log(`wrote ${join19(resourcesDir, "project.json")}`);
   console.log(`synchronized generated files in ${scriptsDir}`);
@@ -147911,7 +148147,7 @@ __export(resolve_exports, {
   resolveMarkers: () => resolveMarkers,
   runResolve: () => runResolve
 });
-import { readFileSync as readFileSync23, rmSync as rmSync10, writeFileSync as writeFileSync16 } from "node:fs";
+import { readFileSync as readFileSync24, rmSync as rmSync10, writeFileSync as writeFileSync17 } from "node:fs";
 import { join as join21, relative as relative11 } from "node:path";
 function runResolve(workspace, side) {
   const marked = readMarkedProjectSourcesV4(workspace.root);
@@ -147922,7 +148158,7 @@ function runResolve(workspace, side) {
   const resolvedRecords = adoptServerConflictBases(workspace);
   let resolvedFiles = 0;
   for (const file of marked) {
-    writeFileSync16(file.absolutePath, resolveMarkers(file.source, side), "utf8");
+    writeFileSync17(file.absolutePath, resolveMarkers(file.source, side), "utf8");
     resolvedFiles += 1;
   }
   let resolvedBinaries = 0;
@@ -147935,7 +148171,7 @@ function runResolve(workspace, side) {
       if (conflict2.remoteSha256 !== null && conflict2.artifactPath !== void 0) {
         writeVerifiedBinaryDownloadV4(
           destination,
-          readFileSync23(join21(workspace.root, conflict2.artifactPath)),
+          readFileSync24(join21(workspace.root, conflict2.artifactPath)),
           conflict2.remoteSha256
         );
         binary.sha256 = conflict2.remoteSha256;
@@ -147964,7 +148200,7 @@ function runResolve(workspace, side) {
 function readMarkedProjectSourcesV4(root) {
   const files = [];
   for (const absolutePath of listProjectSourceFilesV4(root)) {
-    const source = readFileSync23(absolutePath, "utf8");
+    const source = readFileSync24(absolutePath, "utf8");
     if (detectConflictMarkers(source) === null) continue;
     files.push({
       path: normalizeWorkspaceSourcePath(relative11(root, absolutePath)),
@@ -148265,7 +148501,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.58.0");
+    console.log("0.58.2");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {