@neocompose/cli 0.41.0 → 0.42.0

package/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [0.42.0] - 2026-09-02
+
+### Fixed
+
+- `neo pull --reset` and `neo pull --regenerate-source-names` rewrote every
+  dialogue binding to its type name. Binding names are derived from a value's
+  `Name` child, and the placement index read the pulled rows as stored rather
+  than expanding packed subtree storage first, so a packed `Name` resolved to
+  nothing and `Outpost CaelusAnchorpoint` came back as `Outpost Outpost`. Every
+  linked dialogue and node then showed up as an update in `neo status` whose
+  only difference was the regenerated name. The index now expands packed
+  children into the logical rows they are.
+- `neo pull` left a member declared by more than one class disagreeing with
+  itself. A changed record was rewritten in the single file the emission
+  attributes it to, so a change to a shared member updated one class and
+  froze the others at their previously emitted text, and the next command
+  refused the CLI's own output with "Shared member id … has inconsistent
+  declarations." Pull now rewrites every file that declares a changed record.
+
+### Removed
+
+- `neo migrate rekey`. The canonical value-id migration it served has run on
+  every deployment and the server no longer serves the old-to-canonical
+  mapping page it read, so the command had nothing left to rewrite.
+  `neo migrate` keeps `new | list | check | run | prune`.
+
 ## [0.41.0] - 2026-09-01
 
 ### Added

package/dist/neo.mjs

@@ -59305,6 +59305,7 @@ var init_dialogue_sources = __esm({
     "use strict";
     init_src();
     init_dialogue();
+    init_members();
     init_projection();
     init_member_records();
     init_neoscript_source_rewrite();
@@ -59340,6 +59341,16 @@ var init_dialogue_sources = __esm({
           else if (record3.recordKind === "localized-text")
             this.localizedTexts.set(record3.recordId, recordData2(record3));
         }
+        const physicalValues = [
+          ...this.values.values()
+        ];
+        const logicalValues = expandPackedValueRows(physicalValues);
+        if (logicalValues !== physicalValues) {
+          for (const row of logicalValues) {
+            const id2 = optionalString2(row.id);
+            if (id2) this.values.set(id2, row);
+          }
+        }
         const localization = records2.find(
           (record3) => record3.recordKind === "localization-config"
         );
@@ -70102,7 +70113,7 @@ function withEvaluationRuntime(ctx, writes) {
     ctx.__runtimeSessionValues
   );
   const referencesAlreadyRemapped = ctx.__valueOverlay !== void 0 && ctx.__runtimeReferenceRemap !== void 0;
-  const remap2 = (value) => referencesAlreadyRemapped ? value : remapRuntimeReferences(
+  const remap = (value) => referencesAlreadyRemapped ? value : remapRuntimeReferences(
     value,
     overlay,
     referenceRemap,
@@ -70110,11 +70121,11 @@ function withEvaluationRuntime(ctx, writes) {
   );
   return {
     ...ctx,
-    thisValue: remap2(ctx.thisValue),
-    rootValue: remap2(ctx.rootValue),
+    thisValue: remap(ctx.thisValue),
+    rootValue: remap(ctx.rootValue),
     dialogueContext: ctx.dialogueContext === void 0 || ctx.dialogueContext === null ? ctx.dialogueContext : {
-      primary: remap2(ctx.dialogueContext.primary),
-      trigger: remap2(ctx.dialogueContext.trigger)
+      primary: remap(ctx.dialogueContext.primary),
+      trigger: remap(ctx.dialogueContext.trigger)
     },
     __runtimeSessionValues: runtimeSessionValues,
     __saveStaticBindings: ctx.__saveStaticBindings ?? staticBindingMap(ctx.saveStaticBindings),
@@ -79776,12 +79787,12 @@ function sparsifyConstructedInstance(args) {
       ) ?? virtualId
     );
   }
-  const remap2 = (value) => {
+  const remap = (value) => {
     if (typeof value === "string") return nextIdById.get(value) ?? value;
-    if (Array.isArray(value)) return value.map(remap2);
+    if (Array.isArray(value)) return value.map(remap);
     if (typeof value !== "object" || value === null) return value;
     return Object.fromEntries(
-      Object.entries(value).map(([key, entry]) => [key, remap2(entry)])
+      Object.entries(value).map(([key, entry]) => [key, remap(entry)])
     );
   };
   const rewrite = (row) => {
@@ -79789,9 +79800,9 @@ function sparsifyConstructedInstance(args) {
     return {
       ...literal2,
       id: nextIdById.get(row.id) ?? row.id,
-      value: remap2(updatedValueById.get(row.id) ?? literal2.value),
+      value: remap(updatedValueById.get(row.id) ?? literal2.value),
       ...literal2.constructorArgs === void 0 ? {} : {
-        constructorArgs: remap2(literal2.constructorArgs)
+        constructorArgs: remap(literal2.constructorArgs)
       },
       ...typeof row.containerId === "string" ? { containerId: nextIdById.get(row.containerId) ?? row.containerId } : {}
     };
@@ -116639,20 +116650,20 @@ async function finishFormat4Pull(args) {
     ...[...conflictPaths].filter((path) => serverByPath.has(path)),
     ...authoredLocalConflictKeysByPath.keys()
   ]);
+  const localRecordFiles = declaringSourcePathsV4(localResult);
   const rewritePaths = projectSourcePathsRequiringRewriteV4({
     destructive,
     localStatus,
     plans,
-    localRecordFiles: localResult.recordFiles,
-    serverRecordFiles: serverResult?.recordFiles ?? /* @__PURE__ */ new Map(),
+    localRecordFiles,
+    serverRecordFiles: serverResult === null ? /* @__PURE__ */ new Map() : declaringSourcePathsV4(serverResult),
     previousRecords: workspace.state.records,
     conflictPaths,
     emittedPaths,
     mainLocale: workspaceMainLocale(workspace.state.records)
   });
   for (const key of regeneratedRecordKeys) {
-    const path = localResult.recordFiles.get(key);
-    if (path !== void 0) rewritePaths.add(path);
+    for (const path of localRecordFiles.get(key) ?? []) rewritePaths.add(path);
   }
   const resolveSourcePath = createWorkspaceSourcePathResolver(workspace.root);
   let written = 0;
@@ -116949,14 +116960,30 @@ function cursorsEqual(left, right) {
     (transactionId, index) => transactionId === right.transactionIds[index]
   );
 }
+function declaringSourcePathsV4(emission) {
+  const paths = /* @__PURE__ */ new Map();
+  const add = (key, path) => {
+    const existing = paths.get(key);
+    if (existing === void 0) {
+      paths.set(key, [path]);
+      return;
+    }
+    if (!existing.includes(path)) existing.push(path);
+  };
+  for (const file of emission.files) {
+    for (const key of file.recordKeys) add(key, file.path);
+  }
+  for (const [key, path] of emission.recordFiles) add(key, path);
+  return paths;
+}
 function projectSourcePathsRequiringRewriteV4(args) {
   if (args.destructive || args.localStatus === null) {
     return new Set(args.emittedPaths);
   }
   const result = new Set(args.conflictPaths);
   for (const [key, plan] of args.plans) {
-    const path = args.localRecordFiles.get(key) ?? args.serverRecordFiles.get(key);
-    if (path === void 0) continue;
+    const paths = args.localRecordFiles.get(key) ?? args.serverRecordFiles.get(key);
+    if (paths === void 0) continue;
     const local = args.localStatus.reconstructed.get(key)?.fullData;
     const kind = args.previousRecords[key]?.recordKind ?? key.split(":", 1)[0] ?? "";
     if (plan.emitData === void 0 ? local !== void 0 : local === void 0 || !sourceAuthoredRecordsSemanticallyEqual(
@@ -116965,7 +116992,7 @@ function projectSourcePathsRequiringRewriteV4(args) {
       local,
       args.mainLocale
     )) {
-      result.add(path);
+      for (const path of paths) result.add(path);
     }
   }
   for (const [key, previous] of Object.entries(args.previousRecords)) {
@@ -124160,7 +124187,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 4,
       contractVersion: "4.1",
-      cliVersion: "0.41.0",
+      cliVersion: "0.42.0",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -127632,440 +127659,6 @@ var init_doctor = __esm({
   }
 });
 
-// ../src/database/p76-canonical-value-id-plan.ts
-function rewriteP76CanonicalValueIds(args) {
-  if (args.newByOldValueId.size === 0) return args.data;
-  return rewriteRecord(args.recordKind, args.data, args.newByOldValueId);
-}
-function rewriteRecord(recordKind, data, newByOldValueId) {
-  if (!isPlainRecord5(data)) return data;
-  return mapRecord(data, (field, child) => {
-    if (field === "id") {
-      return recordKind === ProjectRecordKind.Value ? remap(child, newByOldValueId) : child;
-    }
-    if (field === "sourceValueId") return child;
-    if (ROW_CONTENT_FIELDS.has(field)) {
-      return rewriteRowContent(child, newByOldValueId);
-    }
-    if (isRelationEndpoint(recordKind, data, field)) {
-      return remap(child, newByOldValueId);
-    }
-    return rewriteByFieldName(child, field, newByOldValueId);
-  });
-}
-function isRelationEndpoint(recordKind, data, field) {
-  if (recordKind !== ProjectRecordKind.InternalRecordRelation) return false;
-  if (field === "sourceRecordId") {
-    return data.sourceRecordKind === ProjectRecordKind.Value;
-  }
-  if (field === "targetRecordId") {
-    return data.targetRecordKind === ProjectRecordKind.Value;
-  }
-  return false;
-}
-function rewriteRowContent(node, newByOldValueId) {
-  if (typeof node === "string") return remap(node, newByOldValueId);
-  if (Array.isArray(node)) {
-    return mapArray(node, (entry) => rewriteRowContent(entry, newByOldValueId));
-  }
-  if (!isPlainRecord5(node)) return node;
-  if (Object.hasOwn(node, STRUCTURED_LEAF_PARTIAL_KEY)) return node;
-  const packed = node[PACKED_VALUE_ENTRY_KEY];
-  if (packed !== void 0) {
-    const rewritten = rewritePackedEntry(packed, newByOldValueId);
-    if (rewritten === packed) return node;
-    return { ...node, [PACKED_VALUE_ENTRY_KEY]: rewritten };
-  }
-  return mapRecord(
-    node,
-    (_field, child) => rewriteRowContent(child, newByOldValueId)
-  );
-}
-function rewritePackedEntry(entry, newByOldValueId) {
-  if (!isPlainRecord5(entry)) return entry;
-  return mapRecord(entry, (field, child) => {
-    if (field === "id") return remap(child, newByOldValueId);
-    if (field === "sourceValueId") return child;
-    if (ROW_CONTENT_FIELDS.has(field)) {
-      return rewriteRowContent(child, newByOldValueId);
-    }
-    return rewriteByFieldName(child, field, newByOldValueId);
-  });
-}
-function rewriteByFieldName(node, field, newByOldValueId) {
-  if (typeof node === "string") {
-    if (isCompilerReferenceField(field)) return remap(node, newByOldValueId);
-    if (AUTHORED_VALUE_ID_FIELDS.has(field)) {
-      return remap(node, newByOldValueId);
-    }
-    return node;
-  }
-  if (Array.isArray(node)) {
-    return mapArray(
-      node,
-      (entry) => rewriteByFieldName(entry, field, newByOldValueId)
-    );
-  }
-  if (!isPlainRecord5(node)) return node;
-  if (Object.hasOwn(node, STRUCTURED_LEAF_PARTIAL_KEY)) return node;
-  return mapRecord(node, (childField, child) => {
-    if (childField === "sourceValueId") return child;
-    if (ROW_CONTENT_FIELDS.has(childField)) {
-      return rewriteRowContent(child, newByOldValueId);
-    }
-    return rewriteByFieldName(child, childField, newByOldValueId);
-  });
-}
-function remap(node, newByOldValueId) {
-  if (typeof node !== "string") return node;
-  return newByOldValueId.get(node) ?? node;
-}
-function mapRecord(record3, rewrite) {
-  let changed = false;
-  const next = {};
-  for (const [field, child] of Object.entries(record3)) {
-    const rewritten = rewrite(field, child);
-    if (rewritten !== child) changed = true;
-    next[field] = rewritten;
-  }
-  return changed ? next : record3;
-}
-function mapArray(entries, rewrite) {
-  let changed = false;
-  const next = new Array(entries.length);
-  for (const [index, entry] of entries.entries()) {
-    const rewritten = rewrite(entry);
-    if (rewritten !== entry) changed = true;
-    next[index] = rewritten;
-  }
-  return changed ? next : entries;
-}
-function isPlainRecord5(value) {
-  if (typeof value !== "object" || value === null) return false;
-  return !Array.isArray(value);
-}
-var P76_CANONICAL_VALUE_ID_USE_SITES, AUTHORED_VALUE_ID_FIELDS, ROW_CONTENT_FIELDS;
-var init_p76_canonical_value_id_plan = __esm({
-  "../src/database/p76-canonical-value-id-plan.ts"() {
-    "use strict";
-    init_inheritance();
-    init_instance_provenance();
-    init_member_kinds();
-    init_member_value_id();
-    init_packed_value_encoding();
-    init_stored_value_placement_index();
-    init_structured_leaf_fields();
-    init_project2();
-    init_neo_script_recompile_scope();
-    init_virtual_instance_values();
-    P76_CANONICAL_VALUE_ID_USE_SITES = [
-      "value.id",
-      "value.containerId",
-      "value.instanceVariantRowValueId",
-      "value.sourceValueId",
-      "value.constructorArgs.*",
-      "value.value.*",
-      `value.value.${PACKED_VALUE_ENTRY_KEY}.id`,
-      `value.value.${PACKED_VALUE_ENTRY_KEY}.value.*`,
-      `value.value.${PACKED_VALUE_ENTRY_KEY}.constructorArgs.*`,
-      `value.value.${PACKED_VALUE_ENTRY_KEY}.instanceVariantRowValueId`,
-      `value.value.${PACKED_VALUE_ENTRY_KEY}.sourceValueId`,
-      "value.init.**",
-      "member.valueId",
-      "member.collectionValueId",
-      "member.defaultValue.*",
-      "member.getter.**",
-      "member.setter.**",
-      "member.action.**",
-      "member.uiAction.**",
-      "variant.valueId",
-      "variant-folder.binding.collectionValueId",
-      "constructor.action.**",
-      "constructor.compiledBaseArguments.**",
-      "constructor.compiledBaseInitializerFields.**",
-      "dialogue.primaryLinkedValueId",
-      "dialogue.linkedValues.*.valueId",
-      "dialogue-node.primaryLinkedValueId",
-      "dialogue-node.linkedValues.*.valueId",
-      "dialogue-node.dialogueGroupSettings.lookupValueId",
-      "dialogue-node.**",
-      "dialogue-group.collectionValueId",
-      "dialogue-group.conditions.**",
-      "localized-text.links.*.valueId",
-      "internal-record-relation.sourceRecordId",
-      "internal-record-relation.targetRecordId"
-    ];
-    AUTHORED_VALUE_ID_FIELDS = /* @__PURE__ */ new Set([
-      "assetValueId",
-      "containerId",
-      "instanceVariantRowValueId",
-      "lookupValueId",
-      "rowValueId"
-    ]);
-    ROW_CONTENT_FIELDS = /* @__PURE__ */ new Set([
-      "value",
-      "constructorArgs"
-    ]);
-  }
-});
-
-// src/commands/migrate-rekey.ts
-import { readFileSync as readFileSync18, rmSync as rmSync8, writeFileSync as writeFileSync12 } from "node:fs";
-import { join as join17, relative as relative8, sep as sep8 } from "node:path";
-import { ConvexError as ConvexError2 } from "convex/values";
-function rekeyCanonicalValueIdsInSource(text, newByOldValueId) {
-  let pins = 0;
-  let references = 0;
-  const pinned = text.replace(
-    ID_PIN_PATTERN,
-    (match, open, oldId, close) => {
-      const newId = newByOldValueId.get(oldId);
-      if (newId === void 0) return match;
-      pins += 1;
-      return `${open}${newId}${close}`;
-    }
-  );
-  const rewritten = pinned.replace(
-    REFERENCE_ID_PATTERN,
-    (match, open, oldId, close) => {
-      const newId = newByOldValueId.get(oldId);
-      if (newId === void 0) return match;
-      references += 1;
-      return `${open}${newId}${close}`;
-    }
-  );
-  return { text: rewritten, pins, references };
-}
-function assertNoOldValueIdsInSource(files, oldValueIds) {
-  for (const file of files) {
-    for (const match of file.text.matchAll(QUOTED_STRING_PATTERN)) {
-      const quoted = match[1];
-      if (quoted === void 0) continue;
-      if (!oldValueIds.has(quoted)) continue;
-      const line = file.text.slice(0, match.index).split("\n").length;
-      throw new Error(
-        `${file.path}:${String(line)} still quotes pre-migration value id "${quoted}" outside an @id pin or Reference(id:) literal. Rewrite that use by hand, then rerun "neo migrate rekey".`
-      );
-    }
-  }
-}
-function rekeyWorkspaceState(state, newByOldValueId) {
-  const nextRecords = {};
-  let recordsRekeyed = 0;
-  let recordsDataRewritten = 0;
-  for (const [key, record3] of Object.entries(state.records)) {
-    if (!isProjectRecordKind(record3.recordKind)) {
-      throw new Error(
-        `Workspace state entry "${key}" has unknown record kind "${record3.recordKind}".`
-      );
-    }
-    const data = rewriteP76CanonicalValueIds({
-      recordKind: record3.recordKind,
-      data: record3.data,
-      newByOldValueId
-    });
-    if (data !== record3.data) recordsDataRewritten += 1;
-    const newValueId = record3.recordKind === ProjectRecordKind.Value ? newByOldValueId.get(record3.recordId) : void 0;
-    if (newValueId === void 0) {
-      nextRecords[key] = { ...record3, data };
-      continue;
-    }
-    const nextKey = recordStateKey(record3.recordKind, newValueId);
-    if (Object.hasOwn(state.records, nextKey)) {
-      throw new Error(
-        `Workspace state entry "${key}" rekeys to "${nextKey}", which the working copy already tracks.`
-      );
-    }
-    if (Object.hasOwn(nextRecords, nextKey)) {
-      throw new Error(
-        `Workspace state entry "${key}" rekeys to "${nextKey}", which another entry already claimed.`
-      );
-    }
-    nextRecords[nextKey] = { ...record3, data, recordId: newValueId };
-    recordsRekeyed += 1;
-  }
-  state.records = nextRecords;
-  delete state.documentRevisionCursor;
-  delete state.headTransactionHash;
-  return { recordsRekeyed, recordsDataRewritten };
-}
-async function runMigrateRekey(workspace, dependencies = {}) {
-  const mappings = await (dependencies.fetchMappings ?? fetchCanonicalValueIdMappings)(workspace);
-  if (mappings.length === 0) {
-    console.log("Nothing to rekey.");
-    return;
-  }
-  const newByOldValueId = new Map(
-    mappings.map((mapping) => [mapping.oldValueId, mapping.newValueId])
-  );
-  const status = (dependencies.computeStatus ?? computeWorkspaceStatus2)(
-    workspace
-  );
-  if (status.conflictedFiles.length > 0) {
-    throw new Error(
-      `Resolve conflict markers before rekeying canonical value ids: ${status.conflictedFiles.join(", ")}`
-    );
-  }
-  for (const [key, record3] of Object.entries(workspace.state.records)) {
-    if (record3.conflictServerHash === void 0) continue;
-    throw new Error(
-      `Workspace state entry "${key}" holds an unresolved pull conflict; run "neo resolve" before rekeying canonical value ids.`
-    );
-  }
-  const rewrites = rewriteTrackedSources(workspace.root, newByOldValueId);
-  assertNoOldValueIdsInSource(
-    rewrites.map((rewrite) => ({
-      path: rewrite.path,
-      text: rewrite.text
-    })),
-    new Set(newByOldValueId.keys())
-  );
-  const changedFiles = rewrites.filter(
-    (rewrite) => rewrite.text !== rewrite.original
-  );
-  if (changedFiles.length > 0) {
-    assertRekeyedSourceCompiles(rewrites, newByOldValueId);
-  }
-  const stateResult = rekeyWorkspaceState(workspace.state, newByOldValueId);
-  if (changedFiles.length === 0 && stateResult.recordsRekeyed === 0 && stateResult.recordsDataRewritten === 0) {
-    console.log("Already rekeyed \u2014 no pre-migration value ids remain.");
-    return;
-  }
-  for (const rewrite of changedFiles) {
-    writeFileSync12(join17(workspace.root, rewrite.path), rewrite.text, "utf8");
-  }
-  writeWorkspaceState(workspace.root, workspace.state);
-  for (const path of DERIVED_CACHE_PATHS) {
-    rmSync8(join17(workspace.root, path), { force: true });
-  }
-  let pins = 0;
-  let references = 0;
-  for (const file of changedFiles) {
-    pins += file.pins;
-    references += file.references;
-  }
-  console.log(
-    `Rekeyed ${String(changedFiles.length)} source file(s): ${String(pins)} @id pin(s), ${String(references)} Reference(id:) literal(s).`
-  );
-  console.log(
-    `Rekeyed ${String(stateResult.recordsRekeyed)} state record(s) and rewrote ids in ${String(stateResult.recordsDataRewritten)}. Run "neo pull" next.`
-  );
-}
-function rewriteTrackedSources(root, newByOldValueId) {
-  const rewrites = [];
-  const collect = (absolutePaths, production) => {
-    for (const absolutePath of absolutePaths) {
-      const original = readFileSync18(absolutePath, "utf8");
-      rewrites.push({
-        path: relative8(root, absolutePath).split(sep8).join("/"),
-        original,
-        production,
-        ...rekeyCanonicalValueIdsInSource(original, newByOldValueId)
-      });
-    }
-  };
-  collect(listProjectSourceFilesV4(root), true);
-  collect(listProjectTestFilesV1(root), false);
-  return rewrites;
-}
-function assertRekeyedSourceCompiles(rewrites, newByOldValueId) {
-  const production = rewrites.filter((rewrite) => rewrite.production);
-  const inputs = production.map((rewrite) => ({
-    uri: rewrite.path,
-    kind: requiredProjectSourceKindV4(rewrite.path),
-    text: rewrite.original
-  }));
-  const before = new Set(
-    blockingDiagnostics(compileNeoProjectSources(inputs)).map(
-      (diagnostic) => diagnosticSignature(diagnostic, newByOldValueId)
-    )
-  );
-  const introduced = blockingDiagnostics(
-    compileNeoProjectSources(
-      inputs.map((input, index) => ({
-        ...input,
-        text: production[index].text
-      }))
-    )
-  ).filter(
-    (diagnostic) => !before.has(diagnosticSignature(diagnostic, newByOldValueId))
-  );
-  if (introduced.length === 0) return;
-  throw new Error(
-    `Canonical value-id rekey produced invalid source:
-${introduced.map(
-      (diagnostic) => `  ${diagnostic.uri}:${String(diagnostic.range.start.line + 1)}:${String(diagnostic.range.start.character + 1)} ${diagnostic.message}`
-    ).join("\n")}`
-  );
-}
-function blockingDiagnostics(analysis) {
-  return analysis.diagnostics.filter(
-    (diagnostic) => diagnostic.severity === "error" && !isPullRecoveryDiagnosticCode(diagnostic.code)
-  );
-}
-function diagnosticSignature(diagnostic, newByOldValueId) {
-  const message = diagnostic.message.replace(
-    /[A-Za-z0-9_-]+/g,
-    (token) => newByOldValueId.get(token) ?? token
-  );
-  return `${diagnostic.uri} ${diagnostic.code ?? ""} ${message}`;
-}
-async function fetchCanonicalValueIdMappings(workspace) {
-  const convex = await createConvexClient(workspace);
-  const mappings = [];
-  let cursor = null;
-  for (; ; ) {
-    const page = await queryMappingsPage(convex, workspace, cursor);
-    for (const mapping of page.page) mappings.push(mapping);
-    if (page.isDone) break;
-    cursor = page.continueCursor;
-  }
-  return mappings;
-}
-async function queryMappingsPage(convex, workspace, cursor) {
-  try {
-    return await convex.query(
-      api2.projectDocuments.getCanonicalValueIdMappingsPage,
-      {
-        projectId: workspace.config.projectId,
-        versionId: workspace.config.versionId,
-        paginationOpts: { cursor, numItems: MAPPING_PAGE_SIZE }
-      }
-    );
-  } catch (error) {
-    if (error instanceof ConvexError2 && typeof error.data === "string") {
-      throw new Error(error.data);
-    }
-    throw error;
-  }
-}
-var MAPPING_PAGE_SIZE, ID_PIN_PATTERN, REFERENCE_ID_PATTERN, QUOTED_STRING_PATTERN, DERIVED_CACHE_PATHS;
-var init_migrate_rekey = __esm({
-  "src/commands/migrate-rekey.ts"() {
-    "use strict";
-    init_src();
-    init_p76_canonical_value_id_plan();
-    init_project2();
-    init_convex();
-    init_materialized_construction_cache();
-    init_project_document_cache();
-    init_project_documents();
-    init_source_diagnostics();
-    init_workspace_status();
-    init_workspace();
-    MAPPING_PAGE_SIZE = 512;
-    ID_PIN_PATTERN = /(@id\s*\(\s*")([^"]*)("\s*\))/g;
-    REFERENCE_ID_PATTERN = /(Reference\s*\(\s*id\s*:\s*")([^"]*)(")/g;
-    QUOTED_STRING_PATTERN = /"([^"\n]*)"/g;
-    DERIVED_CACHE_PATHS = [
-      PROJECT_SOURCE_ANALYSIS_V4_CACHE_PATH,
-      PROJECT_SOURCE_BUILD_CACHE_PATH,
-      PROJECT_SOURCE_DOCUMENT_BUILD_CACHE_PATH,
-      MATERIALIZED_CONSTRUCTION_BUILD_CACHE_PATH
-    ];
-  }
-});
-
 // src/commands/migrate.ts
 var migrate_exports = {};
 __export(migrate_exports, {
@@ -128076,8 +127669,8 @@ __export(migrate_exports, {
   runMigrate: () => runMigrate
 });
 import { randomUUID as randomUUID4 } from "node:crypto";
-import { existsSync as existsSync15, mkdirSync as mkdirSync12, readdirSync as readdirSync6, writeFileSync as writeFileSync13 } from "node:fs";
-import { join as join18 } from "node:path";
+import { existsSync as existsSync15, mkdirSync as mkdirSync12, readdirSync as readdirSync6, writeFileSync as writeFileSync12 } from "node:fs";
+import { join as join17 } from "node:path";
 async function runMigrate(workspace, subcommand, positional, targetRef, json, dependencies = {}) {
   if (subcommand === "new") {
     const name = positional[0];
@@ -128086,7 +127679,7 @@ async function runMigrate(workspace, subcommand, positional, targetRef, json, de
         "Usage: neo migrate new <name> [--target <ClassName|project>]"
       );
     }
-    const migrationsDir = join18(workspace.root, "Migrations");
+    const migrationsDir = join17(workspace.root, "Migrations");
     mkdirSync12(migrationsDir, { recursive: true });
     let nextOrder = 1;
     if (existsSync15(migrationsDir)) {
@@ -128098,7 +127691,7 @@ async function runMigrate(workspace, subcommand, positional, targetRef, json, de
       }
     }
     const relPath = migrationFileName(nextOrder, name);
-    const absolute = join18(workspace.root, relPath);
+    const absolute = join17(workspace.root, relPath);
     if (existsSync15(absolute)) {
       throw new Error(`"${relPath}" already exists.`);
     }
@@ -128110,18 +127703,11 @@ 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");
+    writeFileSync12(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;
   }
-  if (subcommand === "rekey") {
-    await runMigrateRekey(workspace, {
-      ...dependencies.fetchCanonicalValueIdMappings === void 0 ? {} : { fetchMappings: dependencies.fetchCanonicalValueIdMappings },
-      ...dependencies.computeStatus === void 0 ? {} : { computeStatus: dependencies.computeStatus }
-    });
-    return;
-  }
   const { raw } = await (dependencies.fetchDocument ?? fetchProjectDocument)(
     workspace
   );
@@ -129244,7 +128830,6 @@ var init_migrate = __esm({
     init_virtual_instance_values();
     init_script();
     init_project_migration_created_values();
-    init_migrate_rekey();
   }
 });
 
@@ -129857,7 +129442,7 @@ __export(content_exports, {
   makeContentContext: () => makeContentContext,
   runLoc: () => runLoc
 });
-import { readFileSync as readFileSync19 } from "node:fs";
+import { readFileSync as readFileSync18 } from "node:fs";
 import { randomUUID as randomUUID5 } from "node:crypto";
 function versionPath2(workspace, suffix) {
   return `/api/projects/${workspace.config.projectId}/versions/${workspace.config.versionId}/${suffix}`;
@@ -129865,9 +129450,9 @@ function versionPath2(workspace, suffix) {
 function readBatch(file) {
   let raw = null;
   if (file !== null) {
-    raw = readFileSync19(file, "utf8");
+    raw = readFileSync18(file, "utf8");
   } else if (!process.stdin.isTTY) {
-    raw = readFileSync19(0, "utf8");
+    raw = readFileSync18(0, "utf8");
     if (raw.trim().length === 0) raw = null;
   }
   if (raw === null) return null;
@@ -130899,8 +130484,8 @@ var export_exports = {};
 __export(export_exports, {
   runExportUnity: () => runExportUnity
 });
-import { mkdirSync as mkdirSync13, writeFileSync as writeFileSync14 } from "node:fs";
-import { join as join19 } from "node:path";
+import { mkdirSync as mkdirSync13, writeFileSync as writeFileSync13 } from "node:fs";
+import { join as join18 } from "node:path";
 async function runExportUnity(workspace, outDir) {
   if (outDir === null) {
     throw new Error(
@@ -130912,23 +130497,23 @@ async function runExportUnity(workspace, outDir) {
     `/api/projects/${workspace.config.projectId}/export`,
     { versionId: workspace.config.versionId }
   );
-  const resourcesDir = join19(outDir, "Resources", "Neo");
-  const localizationDir = join19(resourcesDir, "Localization");
-  const scriptsDir = join19(outDir, "Scripts", "Neo");
+  const resourcesDir = join18(outDir, "Resources", "Neo");
+  const localizationDir = join18(resourcesDir, "Localization");
+  const scriptsDir = join18(outDir, "Scripts", "Neo");
   mkdirSync13(localizationDir, { recursive: true });
   mkdirSync13(scriptsDir, { recursive: true });
-  writeFileSync14(join19(resourcesDir, "project.json"), response.projectJson);
-  writeFileSync14(
-    join19(scriptsDir, "NeoGeneratedTypes.cs"),
+  writeFileSync13(join18(resourcesDir, "project.json"), response.projectJson);
+  writeFileSync13(
+    join18(scriptsDir, "NeoGeneratedTypes.cs"),
     response.generatedTypes
   );
   for (const file of response.localizationFiles ?? []) {
-    writeFileSync14(join19(localizationDir, file.fileName), file.content);
+    writeFileSync13(join18(localizationDir, file.fileName), file.content);
   }
-  console.log(`wrote ${join19(resourcesDir, "project.json")}`);
-  console.log(`wrote ${join19(scriptsDir, "NeoGeneratedTypes.cs")}`);
+  console.log(`wrote ${join18(resourcesDir, "project.json")}`);
+  console.log(`wrote ${join18(scriptsDir, "NeoGeneratedTypes.cs")}`);
   for (const file of response.localizationFiles ?? []) {
-    console.log(`wrote ${join19(localizationDir, file.fileName)}`);
+    console.log(`wrote ${join18(localizationDir, file.fileName)}`);
   }
   const diagnostics = response.diagnostics ?? [];
   for (const diagnostic of diagnostics) {
@@ -130951,7 +130536,7 @@ __export(dev_exports, {
   runDev: () => runDev
 });
 import { watch } from "node:fs";
-import { join as join20 } from "node:path";
+import { join as join19 } from "node:path";
 import { emitKeypressEvents } from "node:readline";
 import { ConvexClient } from "convex/browser";
 function isSchemaSignal(value) {
@@ -131061,7 +130646,7 @@ async function runDev(workspace, options) {
   };
   for (const dir of ["Classes", "Enums"]) {
     try {
-      watch(join20(workspace.root, dir), { persistent: true }, onFileChange);
+      watch(join19(workspace.root, dir), { persistent: true }, onFileChange);
     } catch {
     }
   }
@@ -131116,16 +130701,16 @@ __export(resolve_exports, {
   runResolve: () => runResolve,
   workspaceFilePath: () => workspaceFilePath
 });
-import { readFileSync as readFileSync20, rmSync as rmSync9, writeFileSync as writeFileSync15 } from "node:fs";
-import { join as join21 } from "node:path";
+import { readFileSync as readFileSync19, rmSync as rmSync8, writeFileSync as writeFileSync14 } from "node:fs";
+import { join as join20 } from "node:path";
 function runResolve(workspace, side) {
   const resolvedRecords = adoptServerConflictBases(workspace);
   let resolvedFiles = 0;
   for (const filePath of listProjectSourceFilesV4(workspace.root)) {
-    const source = readFileSync20(filePath, "utf8");
+    const source = readFileSync19(filePath, "utf8");
     if (detectConflictMarkers(source) === null) continue;
     const resolved = resolveMarkers(source, side);
-    writeFileSync15(filePath, resolved, "utf8");
+    writeFileSync14(filePath, resolved, "utf8");
     resolvedFiles += 1;
   }
   let resolvedBinaries = 0;
@@ -131133,22 +130718,22 @@ function runResolve(workspace, side) {
     const binary = state.projectBinary;
     const conflict2 = binary?.conflict;
     if (binary === void 0 || conflict2 === void 0) continue;
-    const destination = join21(workspace.root, binary.path);
+    const destination = join20(workspace.root, binary.path);
     if (side === "theirs") {
       if (conflict2.remoteSha256 !== null && conflict2.artifactPath !== void 0) {
         writeVerifiedBinaryDownloadV4(
           destination,
-          readFileSync20(join21(workspace.root, conflict2.artifactPath)),
+          readFileSync19(join20(workspace.root, conflict2.artifactPath)),
           conflict2.remoteSha256
         );
         binary.sha256 = conflict2.remoteSha256;
       } else {
-        rmSync9(destination, { force: true });
+        rmSync8(destination, { force: true });
         binary.sha256 = null;
       }
     }
     if (conflict2.artifactPath !== void 0) {
-      rmSync9(join21(workspace.root, conflict2.artifactPath), { force: true });
+      rmSync8(join20(workspace.root, conflict2.artifactPath), { force: true });
     }
     delete binary.conflict;
     resolvedBinaries += 1;
@@ -131217,7 +130802,7 @@ function resolveMarkers(source, side) {
   return output.join("\n");
 }
 function workspaceFilePath(workspace, file) {
-  return join21(workspace.root, file);
+  return join20(workspace.root, file);
 }
 var init_resolve = __esm({
   "src/commands/resolve.ts"() {
@@ -131288,7 +130873,7 @@ ${h("Content & scripts")}
   loc       ${d("locales | list | set | create | delete | archive | restore | ...")}
   dialogue  ${d("dryrun <ref> [--json]")}
   script    ${d("check | eval | compile [--mode getter|action|setter|nsfunction] [--member <id-or-name>]")}
-  migrate   ${d("new | list | check | run | prune | rekey")}
+  migrate   ${d("new | list | check | run | prune")}
   export    ${d("unity [--out <path>]")}
 
 Run any command with missing arguments in a terminal and ${h("neo")} will ask.
@@ -131422,7 +131007,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.41.0");
+    console.log("0.42.0");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {
@@ -131539,7 +131124,7 @@ async function main() {
       const sub = args.positional[0];
       if (sub === void 0) {
         throw new Error(
-          "neo migrate requires a subcommand: new | list | check | run | prune | rekey."
+          "neo migrate requires a subcommand: new | list | check | run | prune."
         );
       }
       const { runMigrate: runMigrate2 } = await Promise.resolve().then(() => (init_migrate(), migrate_exports));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "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.41.0 -->
+<!-- reviewed-through-cli: 0.42.0 -->
 
 # 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.41.0 -->
+<!-- reviewed-through-cli: 0.42.0 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale

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

@@ -329,15 +329,5 @@ neo migrate run [--dry-run] [--skip-invalid]
 neo migrate prune
 ```
 
-`neo migrate rekey` is different: a one-time source refactor, not an action.
-After the server's canonical value-id migration, it reads the version's
-old-to-canonical id mapping, rewrites `@id` pins and `Reference(id: ...)`
-literals in tracked `.neo` and `.spec.neo` source, and moves `.neo/state.json`
-bases onto the new ids, so the next `pull` merges field by field instead of
-reporting every rekeyed value as a delete plus a create. It writes nothing
-while conflict markers or unresolved pull conflicts remain, when an old id
-survives outside those two positions, or when the rewrite would introduce a
-source error. A second run is a no-op.
-
 Run checks before migration execution. Review storage ownership and every write
 intent; do not assume an action body is writable merely because it compiled.