@neocompose/cli 0.36.7 → 0.36.8

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.36.8] - 2026-08-20
+
+### Fixed
+
+- Ignore server-compiled initializer IR when deciding whether both sides of a
+  pull changed authored value source, preventing compiler-only refreshes from
+  producing false conflicts.
+- Let `neo resolve --mine` and `neo resolve --theirs` clear metadata-only
+  record conflicts retained by older pulls even when no textual marker was
+  written.
+
 ## [0.36.7] - 2026-08-20
 
 ### Fixed

package/dist/neo.mjs

@@ -76389,6 +76389,23 @@ var init_workspace = __esm({
   }
 });
 
+// src/project-sync/value-record-comparison.ts
+function valueRecordComparisonBody(value) {
+  if (!isObjectRecord2(value)) return value;
+  const init = value.init;
+  const body = value.value;
+  const normalizedInit = isObjectRecord2(init) && init.compiled !== void 0 ? { ...init, compiled: void 0 } : init;
+  const normalizedBody = isObjectRecord2(body) && typeof body.code === "string" && body.action !== void 0 ? { ...body, action: void 0 } : body;
+  if (normalizedInit === init && normalizedBody === body) return value;
+  return { ...value, init: normalizedInit, value: normalizedBody };
+}
+var init_value_record_comparison = __esm({
+  "src/project-sync/value-record-comparison.ts"() {
+    "use strict";
+    init_projection();
+  }
+});
+
 // src/project-source/lower-configuration.ts
 function lowerConfiguration(base, analysis) {
   const globals = analysis.configuration.globals;
@@ -96308,15 +96325,6 @@ function recordsSemanticallyEqual(recordKind, left, right) {
   }
   return canonicallyEqual(left, right);
 }
-function valueRecordComparisonBody(value) {
-  if (!isObjectRecord2(value)) return value;
-  const init = value.init;
-  const body = value.value;
-  const normalizedInit = isObjectRecord2(init) && init.compiled !== void 0 ? { ...init, compiled: void 0 } : init;
-  const normalizedBody = isObjectRecord2(body) && typeof body.code === "string" && body.action !== void 0 ? { ...body, action: void 0 } : body;
-  if (normalizedInit === init && normalizedBody === body) return value;
-  return { ...value, init: normalizedInit, value: normalizedBody };
-}
 function describeChange(change) {
   const name = isObjectRecord2(change.nextData) && typeof change.nextData.name === "string" ? change.nextData.name : isObjectRecord2(change.baseData) && typeof change.baseData.name === "string" ? change.baseData.name : change.recordId;
   const location3 = change.file === null ? "" : ` (${change.file})`;
@@ -96347,6 +96355,7 @@ var init_workspace_status_core = __esm({
     init_source_diagnostics();
     init_migration_files();
     init_projection();
+    init_value_record_comparison();
     init_project_manifest();
     init_src();
     init_lower_schema();
@@ -105997,6 +106006,104 @@ var init_conflict_markers = __esm({
   }
 });
 
+// src/project-sync/source-record-comparison.ts
+function sourceAuthoredRecordsSemanticallyEqual(recordKind, left, right, mainLocale) {
+  if (isSchemaRecordKindV4(recordKind)) {
+    return schemaDocumentAuthoredSemanticallyEqual(recordKind, left, right);
+  }
+  return canonicallyEqual(
+    sourceComparableRecord(recordKind, left, mainLocale),
+    sourceComparableRecord(recordKind, right, mainLocale)
+  );
+}
+function sourceComparableObjectRecord(recordKind, value, mainLocale) {
+  const comparable = sourceComparableRecord(recordKind, value, mainLocale);
+  if (!isObjectRecord2(comparable)) {
+    throw new Error(
+      `Cannot merge ${recordKind} record because its source-comparable payload is not an object.`
+    );
+  }
+  return comparable;
+}
+function workspaceMainLocale(records2) {
+  const config = Object.values(records2).find(
+    (record3) => record3.recordKind === "localization-config"
+  );
+  const data = config?.data;
+  return isObjectRecord2(data) && typeof data.mainLocale === "string" ? data.mainLocale : "en-US";
+}
+function acceptSourceEquivalentConflictBases(workspace, mainLocale = workspaceMainLocale(workspace.state.records)) {
+  let accepted = 0;
+  for (const [key, record3] of Object.entries(workspace.state.records)) {
+    if (typeof record3.conflictServerHash !== "string") continue;
+    if (!sourceAuthoredRecordsSemanticallyEqual(
+      record3.recordKind,
+      record3.data,
+      record3.conflictServerData,
+      mainLocale
+    )) {
+      continue;
+    }
+    const next = {
+      ...record3,
+      contentHash: record3.conflictServerHash,
+      data: record3.conflictServerData
+    };
+    delete next.conflictServerHash;
+    delete next.conflictServerData;
+    workspace.state.records[key] = next;
+    accepted += 1;
+  }
+  return accepted;
+}
+function sourceComparableRecord(recordKind, value, mainLocale) {
+  return sourceComparableValue(
+    recordKind,
+    recordKind === "value" ? valueRecordComparisonBody(value) : value,
+    mainLocale
+  );
+}
+function sourceComparableValue(recordKind, value, mainLocale) {
+  if (Array.isArray(value)) {
+    return value.map(
+      (entry) => sourceComparableValue(recordKind, entry, mainLocale)
+    );
+  }
+  if (!isObjectRecord2(value)) return value;
+  const result = {};
+  const hasAuthoredCode = typeof value.code === "string" || typeof value.setterCode === "string";
+  for (const [key, entry] of Object.entries(value)) {
+    if (key === "projectId" || key === "createdAt" || key === "updatedAt") {
+      continue;
+    }
+    if (recordKind === "dialogue-node" && key === "layout") continue;
+    if (hasAuthoredCode && (key === "getter" || key === "setter" || key === "action")) {
+      continue;
+    }
+    if (recordKind === "localized-text" && key === "localeValues" && isObjectRecord2(entry)) {
+      result[key] = Object.hasOwn(entry, mainLocale) ? {
+        [mainLocale]: sourceComparableValue(
+          recordKind,
+          entry[mainLocale],
+          mainLocale
+        )
+      } : {};
+      continue;
+    }
+    result[key] = sourceComparableValue(recordKind, entry, mainLocale);
+  }
+  return result;
+}
+var init_source_record_comparison = __esm({
+  "src/project-sync/source-record-comparison.ts"() {
+    "use strict";
+    init_project_manifest();
+    init_project_documents();
+    init_projection();
+    init_value_record_comparison();
+  }
+});
+
 // src/project-source/reset.ts
 import {
   existsSync as existsSync5,
@@ -107162,77 +107269,6 @@ function projectSourcePathsRequiringRewriteV4(args) {
   }
   return result;
 }
-function sourceAuthoredRecordsSemanticallyEqual(recordKind, left, right, mainLocale) {
-  if (isSchemaRecordKindV4(recordKind)) {
-    return schemaDocumentAuthoredSemanticallyEqual(recordKind, left, right);
-  }
-  return canonicallyEqual(
-    sourceComparableRecord(recordKind, left, mainLocale),
-    sourceComparableRecord(recordKind, right, mainLocale)
-  );
-}
-function sourceComparableRecord(recordKind, value, mainLocale) {
-  if (Array.isArray(value)) {
-    return value.map(
-      (entry) => sourceComparableRecord(recordKind, entry, mainLocale)
-    );
-  }
-  if (!isObjectRecord2(value)) return value;
-  const result = {};
-  const hasAuthoredCode = typeof value.code === "string" || typeof value.setterCode === "string";
-  for (const [key, entry] of Object.entries(value)) {
-    if (key === "projectId" || key === "createdAt" || key === "updatedAt") {
-      continue;
-    }
-    if (recordKind === "dialogue-node" && key === "layout") continue;
-    if (hasAuthoredCode && (key === "getter" || key === "setter" || key === "action")) {
-      continue;
-    }
-    if (recordKind === "localized-text" && key === "localeValues" && isObjectRecord2(entry)) {
-      result[key] = Object.hasOwn(entry, mainLocale) ? {
-        [mainLocale]: sourceComparableRecord(
-          recordKind,
-          entry[mainLocale],
-          mainLocale
-        )
-      } : {};
-      continue;
-    }
-    result[key] = sourceComparableRecord(recordKind, entry, mainLocale);
-  }
-  return result;
-}
-function acceptSourceEquivalentConflictBases(workspace, mainLocale) {
-  let accepted = 0;
-  for (const [key, record3] of Object.entries(workspace.state.records)) {
-    if (typeof record3.conflictServerHash !== "string") continue;
-    if (!sourceAuthoredRecordsSemanticallyEqual(
-      record3.recordKind,
-      record3.data,
-      record3.conflictServerData,
-      mainLocale
-    )) {
-      continue;
-    }
-    const next = {
-      ...record3,
-      contentHash: record3.conflictServerHash,
-      data: record3.conflictServerData
-    };
-    delete next.conflictServerHash;
-    delete next.conflictServerData;
-    workspace.state.records[key] = next;
-    accepted += 1;
-  }
-  return accepted;
-}
-function workspaceMainLocale(records2) {
-  const config = Object.values(records2).find(
-    (record3) => record3.recordKind === "localization-config"
-  );
-  const data = config?.data;
-  return isObjectRecord2(data) && typeof data.mainLocale === "string" ? data.mainLocale : "en-US";
-}
 function mergeProjectDocumentRecord(recordKind, base, server, local, mainLocale) {
   if (isSchemaRecordKindV4(recordKind)) {
     return mergeSchemaDocumentRecord(recordKind, base, server, local);
@@ -107246,15 +107282,6 @@ function mergeProjectDocumentRecord(recordKind, base, server, local, mainLocale)
     }
   });
 }
-function sourceComparableObjectRecord(recordKind, value, mainLocale) {
-  const comparable = sourceComparableRecord(recordKind, value, mainLocale);
-  if (!isObjectRecord2(comparable)) {
-    throw new Error(
-      `Cannot merge ${recordKind} record because its source-comparable payload is not an object.`
-    );
-  }
-  return comparable;
-}
 function buildEmitRecordSet(document, plans, side) {
   const records2 = /* @__PURE__ */ new Map();
   for (const [key, plan] of plans) {
@@ -107313,6 +107340,7 @@ var init_pull = __esm({
     init_conflict_markers();
     init_merge();
     init_projection();
+    init_source_record_comparison();
     init_reset();
     init_project_documents();
     init_project_document_cache();
@@ -114157,7 +114185,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.14",
-      cliVersion: "0.36.7",
+      cliVersion: "0.36.8",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -120473,6 +120501,7 @@ __export(resolve_exports, {
 import { readFileSync as readFileSync19, rmSync as rmSync8, writeFileSync as writeFileSync14 } from "node:fs";
 import { join as join21 } from "node:path";
 function runResolve(workspace, side) {
+  const resolvedRecords = acceptSourceEquivalentConflictBases(workspace);
   let resolvedFiles = 0;
   for (const filePath of listProjectSourceFilesV4(workspace.root)) {
     const source = readFileSync19(filePath, "utf8");
@@ -120506,15 +120535,15 @@ function runResolve(workspace, side) {
     delete binary.conflict;
     resolvedBinaries += 1;
   }
-  if (resolvedBinaries > 0) {
+  if (resolvedRecords > 0 || resolvedBinaries > 0) {
     writeWorkspaceState(workspace.root, workspace.state);
   }
-  if (resolvedFiles === 0 && resolvedBinaries === 0) {
-    console.log("No conflict markers found.");
+  if (resolvedFiles === 0 && resolvedRecords === 0 && resolvedBinaries === 0) {
+    console.log("No conflicts found.");
     return;
   }
   console.log(
-    `Resolved ${resolvedFiles} source file(s) and ${resolvedBinaries} binary file(s) keeping the "${side}" side. Review with "neo diff", then "neo push".`
+    `Resolved ${resolvedFiles} source file(s), ${resolvedRecords} record conflict(s), and ${resolvedBinaries} binary file(s) keeping the "${side}" side. Review with "neo diff", then "neo push".`
   );
 }
 function resolveMarkers(source, side) {
@@ -120563,6 +120592,7 @@ var init_resolve = __esm({
     init_workspace_status();
     init_source_diagnostics();
     init_project_files();
+    init_source_record_comparison();
   }
 });
 
@@ -120759,7 +120789,7 @@ There is no --keep-current: preserving current semantic state defines flatten.
 async function main() {
   const args = parseArgs(process.argv.slice(2));
   if (args.command === "--version") {
-    console.log("0.36.7");
+    console.log("0.36.8");
     return;
   }
   if (args.command === null || args.command === "help" || args.command === "--help" || args.command === "-h") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neocompose/cli",
-  "version": "0.36.7",
+  "version": "0.36.8",
   "description": "Neo Compose native project-source CLI with bidirectional sync.",
   "license": "MIT",
   "type": "module",

package/skills/neocompose-cli/SKILL.md

@@ -9,7 +9,7 @@ description: >-
   `@neocompose/cli` or `node cli/bin/neo.mjs` in the neo-compose repository.
 ---
 
-<!-- reviewed-through-cli: 0.36.7 -->
+<!-- reviewed-through-cli: 0.36.8 -->
 
 # Neo Compose CLI
 
@@ -210,6 +210,11 @@ Conflict source deliberately fails compilation. Edit the desired final source,
 or use `neo resolve --mine|--theirs` as a whole-side convenience. Then pull,
 review, dry-run, and push again.
 
+Server-derived compilation metadata is not authored source and does not create
+a pull conflict by itself. If an older CLI retained such a metadata-only
+conflict without writing source markers, either `neo resolve` side accepts the
+newer server metadata as the base while preserving any real local source edit.
+
 `neo push` sends the authenticated semantic diff plus a deterministic source
 hash, while the server recompiles the changed NeoScript bodies and
 schema-affected callers and commits only that diff under CAS. Use

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

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

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

@@ -79,6 +79,11 @@ Resolve source conflicts by editing the final intended source. Use
 `neo resolve --mine` or `neo resolve --theirs` only for a deliberate whole-side
 choice. Pull, inspect, dry-run, and retry; there is no force-CAS path.
 
+Compiled initializer IR is server-owned and does not participate in authored
+three-way merge decisions. `neo resolve` also repairs metadata-only conflict
+bookkeeping left by an older pull when no source marker exists; accepting the
+newer server metadata does not overwrite the tracked source.
+
 For `base-hash-conflict`, pull and merge. For `version-bump-required`, inspect
 the classification and use `neo push --accept-bump` only when the bump is
 intended.