@neocompose/cli 0.51.0 → 0.51.1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [0.51.1] - 2026-09-16
+
+- Refresh compiler-only changes with ordinary `neo pull` before compiling the local workspace. Preserve authored source, local edits, custom paths, and managed binaries while adopting the current server compilation.
+- Refuse a normal pull when the baseline is missing but authored source files remain, preventing duplicate declarations and overwritten local edits. An explicit forced refresh recovers custom file paths from the existing declarations.
+
 ## [0.51.0] - 2026-09-15
 
 Compiler revision 14 requires Unity SDK 0.37.0. The server migration recompiles stored scripts and retained history.

package/dist/neo.mjs

@@ -87329,6 +87329,44 @@ function stampUILogicBody(logic, bodyKey) {
   body.compilerRevision = NEOSCRIPT_COMPILER_REVISION;
   return true;
 }
+function stampUILogicBodies(recordKind, data) {
+  const record5 = asRecord2(data);
+  if (record5 === null) return false;
+  if (recordKind === "dialogue-group") {
+    return stampConditionList(record5.conditions);
+  }
+  if (recordKind !== "dialogue-node") return false;
+  let changed = stampConditionList(record5.conditions);
+  if (Array.isArray(record5.actions)) {
+    for (const actionValue2 of record5.actions) {
+      const logic = asRecord2(asRecord2(actionValue2)?.logic);
+      changed = stampUILogicBody(logic, "action") || changed;
+    }
+  }
+  if (Array.isArray(record5.outcomes)) {
+    for (const outcomeValue of record5.outcomes) {
+      changed = stampConditionList(asRecord2(outcomeValue)?.conditions) || changed;
+    }
+  }
+  const options = asRecord2(record5.optionSettings)?.options;
+  if (Array.isArray(options)) {
+    for (const optionValue of options) {
+      const settings = asRecord2(asRecord2(optionValue)?.settings);
+      if (settings === null) continue;
+      changed = stampConditionList(settings.conditions) || changed;
+      changed = stampConditionList(settings.selectableConditions) || changed;
+    }
+  }
+  return changed;
+}
+function stampConditionList(value) {
+  if (!Array.isArray(value)) return false;
+  let changed = false;
+  for (const conditionValue of value) {
+    changed = stampUILogicBody(asRecord2(conditionValue), "getter") || changed;
+  }
+  return changed;
+}
 function asRecord2(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value)) {
     return null;
@@ -126661,6 +126699,14 @@ var init_convex = __esm({
 // src/project-source/source-layout.ts
 import { readFileSync as readFileSync8 } from "node:fs";
 import { relative as relative4, sep as sep4 } from "node:path";
+function workspaceForSourceLayoutV4(workspace, document) {
+  if (Object.keys(workspace.state.records).length > 0) return workspace;
+  const records2 = {};
+  for (const [key, record5] of document.records) {
+    if (!record5.deleted) records2[key] = record5;
+  }
+  return { ...workspace, state: { ...workspace.state, records: records2 } };
+}
 function readWorkspaceRecordFilesV4(workspace) {
   const paths = /* @__PURE__ */ new Map();
   const keysById = /* @__PURE__ */ new Map();
@@ -127446,17 +127492,7 @@ import {
 import { dirname as dirname7, join as join8, relative as relative5, sep as sep5 } from "node:path";
 function prepareWorkspaceResetV4(workspace, document, options = {}) {
   const emissionRecords = options.regenerateSourceNames ? regenerateDialogueSourceNamesV4(document.records) : document.records;
-  let layoutWorkspace = workspace;
-  if (Object.keys(workspace.state.records).length === 0) {
-    const records2 = {};
-    for (const [key, record5] of document.records) {
-      if (!record5.deleted) records2[key] = record5;
-    }
-    layoutWorkspace = {
-      ...workspace,
-      state: { ...workspace.state, records: records2 }
-    };
-  }
+  const layoutWorkspace = workspaceForSourceLayoutV4(workspace, document);
   const status = listProjectSourceFilesV4(workspace.root).length === 0 ? null : readWorkspaceLayoutStatusV4(layoutWorkspace);
   const localValues = status?.localValues ?? workspace.state.localValues;
   const emitted = emitProjectDocumentFilesV4(emissionRecords, {
@@ -127874,6 +127910,40 @@ var init_static_value_seed_records = __esm({
   }
 });
 
+// src/project-sync/compiler-metadata.ts
+function compilerMetadataChangedKeys(previous, document, changedKeys) {
+  const keys = changedKeys ?? /* @__PURE__ */ new Set([...Object.keys(previous), ...document.records.keys()]);
+  const refreshed = /* @__PURE__ */ new Set();
+  for (const key of keys) {
+    const before = previous[key];
+    const after = document.records.get(key);
+    if (before === void 0 || after === void 0 || after.deleted || before.recordId !== after.recordId || before.recordKind !== after.recordKind || !isProjectRecordKind(after.recordKind))
+      return null;
+    if (before.contentHash === after.contentHash) continue;
+    if (!isObjectRecord2(before.data) || !isObjectRecord2(after.data) || !canonicallyEqual(
+      authoredCompilerInput(after.recordKind, before.data),
+      authoredCompilerInput(after.recordKind, after.data)
+    ))
+      return null;
+    refreshed.add(key);
+  }
+  return refreshed.size === 0 ? null : refreshed;
+}
+function authoredCompilerInput(kind, data) {
+  const result = stripClientDerivedBodies(kind, data);
+  stampUILogicBodies(kind, result);
+  if (isObjectRecord2(result)) delete result.updatedAt;
+  return result;
+}
+var init_compiler_metadata = __esm({
+  "src/project-sync/compiler-metadata.ts"() {
+    "use strict";
+    init_project2();
+    init_neo_script_derived_bodies();
+    init_projection();
+  }
+});
+
 // src/commands/pull.ts
 var pull_exports = {};
 __export(pull_exports, {
@@ -127903,7 +127973,15 @@ async function runPull(workspace, options, progress = spinner("Checking local wo
 async function runNormalPull(workspace, options, progress) {
   const destructive = options.force;
   const hasBaseline = Object.keys(workspace.state.records).length > 0;
+  if (!destructive && !hasBaseline && listProjectSourceFilesV4(workspace.root).length > 0) {
+    throw new Error(
+      "Cannot merge existing Neo sources without a pull baseline in .neo/state.json. Restore that file to preserve local edits, or back up your sources and run `neo pull --force` to replace them with the server version while preserving their paths."
+    );
+  }
   const mainLocale = workspaceMainLocale(workspace.state.records);
+  const hadConflicts = Object.values(workspace.state.records).some(
+    (record5) => record5.conflictServerHash !== void 0 || record5.conflictFiles !== void 0 || record5.projectBinary?.conflict !== void 0
+  );
   if (acceptSourceEquivalentConflictBases(workspace, mainLocale) > 0) {
     writeWorkspaceState(workspace.root, workspace.state);
   }
@@ -127961,6 +128039,28 @@ async function runNormalPull(workspace, options, progress) {
     document = await fetchProjectDocument(workspace);
     nextCursor = document.revision === void 0 ? null : cursorFromRevision(document.revision);
   }
+  const compilerRefreshKeys = !destructive && hasBaseline && !hadConflicts && !options.regenerateSourceNames ? compilerMetadataChangedKeys(
+    workspace.state.records,
+    document,
+    changedRecordKeys
+  ) : null;
+  if (compilerRefreshKeys !== null) {
+    if (changedRecordKeys === null) {
+      await updateFullPullSyncMetadata(workspace, document);
+      observedHeadTransactionHash = workspace.state.headTransactionHash;
+      observedDerivedEdgeVersion = workspace.state.derivedEdgeVersion;
+    }
+    finishRecordOnlyDeltaPull({
+      workspace,
+      document,
+      changedRecordKeys: compilerRefreshKeys,
+      nextCursor,
+      observedHeadTransactionHash,
+      observedDerivedEdgeVersion,
+      progress
+    });
+    return;
+  }
   let localByKey = /* @__PURE__ */ new Map();
   let localStatus = null;
   if (hasBaseline && !destructive) {
@@ -128151,18 +128251,7 @@ async function runResetPull(workspace, progress) {
       if (record5) record5.projectBinary = state;
     }
     progress.update("Finalizing pull state\u2026");
-    try {
-      const convex = await createConvexClient(workspace);
-      const signal = await convex.query(api2.projectExportData.schemaSignal, {
-        projectId: workspace.config.projectId,
-        versionId: workspace.config.versionId
-      });
-      workspace.state.headTransactionHash = document.revision !== void 0 && signal?.transactionId === document.revision.latestTransactionId ? signal.transactionHash : null;
-      workspace.state.derivedEdgeVersion = signal?.derivedEdgeVersion ?? null;
-    } catch {
-      workspace.state.headTransactionHash = null;
-      delete workspace.state.derivedEdgeVersion;
-    }
+    await updateFullPullSyncMetadata(workspace, document);
     if (document.revision !== void 0) {
       workspace.state.documentRevisionCursor = mutableCursor(
         cursorFromRevision(document.revision)
@@ -128234,11 +128323,12 @@ async function finishFormat4Pull(args) {
       ([key, record5]) => localRecords.get(key) === record5 ? [] : [key]
     )
   );
-  const recordFiles = readWorkspaceRecordFilesV4(workspace);
+  const layoutWorkspace = workspaceForSourceLayoutV4(workspace, document);
+  const recordFiles = readWorkspaceRecordFilesV4(layoutWorkspace);
   for (const [key, record5] of localStatus?.reconstructed ?? []) {
     if (record5.file != null) recordFiles.set(key, record5.file);
   }
-  const layoutStatus = localStatus ?? (destructive ? readWorkspaceLayoutStatusV4(workspace) : null);
+  const layoutStatus = localStatus ?? (destructive ? readWorkspaceLayoutStatusV4(layoutWorkspace) : null);
   const localValues = layoutStatus?.localValues ?? workspace.state.localValues;
   const binaryPaths = workspaceBinaryPathsV4(
     workspace,
@@ -128256,6 +128346,16 @@ async function finishFormat4Pull(args) {
     buildEmitRecordSet(document, plans, "server"),
     { recordFiles, localValues, binaryPaths }
   );
+  const resolveSourcePath = createWorkspaceSourcePathResolver(workspace.root);
+  if (!destructive && Object.keys(workspace.state.records).length === 0) {
+    for (const file of localResult.files) {
+      if (existsSync8(resolveSourcePath(file.path))) {
+        throw new Error(
+          `Cannot replace existing source ${JSON.stringify(file.path)} without a pull baseline in .neo/state.json. Restore that file to preserve local edits, or back up your sources and run \`neo pull --force\` to replace them with the server version.`
+        );
+      }
+    }
+  }
   const binaries = await pullProjectBinariesV4({
     workspace,
     document,
@@ -128309,7 +128409,6 @@ async function finishFormat4Pull(args) {
   for (const key of regeneratedRecordKeys) {
     for (const path of localRecordFiles.get(key) ?? []) rewritePaths.add(path);
   }
-  const resolveSourcePath = createWorkspaceSourcePathResolver(workspace.root);
   const markedPaths = /* @__PURE__ */ new Set();
   let written = 0;
   for (const path of emittedPaths) {
@@ -128415,18 +128514,7 @@ async function finishFormat4Pull(args) {
   if (observedHeadTransactionHash !== void 0) {
     workspace.state.headTransactionHash = observedHeadTransactionHash;
   } else {
-    try {
-      const convex = await createConvexClient(workspace);
-      const signal = await convex.query(api2.projectExportData.schemaSignal, {
-        projectId: workspace.config.projectId,
-        versionId: workspace.config.versionId
-      });
-      workspace.state.headTransactionHash = document.revision !== void 0 && signal?.transactionId === document.revision.latestTransactionId ? signal.transactionHash : null;
-      workspace.state.derivedEdgeVersion = signal?.derivedEdgeVersion ?? null;
-    } catch {
-      workspace.state.headTransactionHash = null;
-      delete workspace.state.derivedEdgeVersion;
-    }
+    await updateFullPullSyncMetadata(workspace, document);
   }
   if (observedDerivedEdgeVersion !== void 0) {
     workspace.state.derivedEdgeVersion = observedDerivedEdgeVersion;
@@ -128598,6 +128686,20 @@ function finishRecordOnlyDeltaPull(args) {
     `Pulled ${args.changedRecordKeys.size} changed record(s) \u2014 0 file(s) updated \u2014 0 removed.`
   );
 }
+async function updateFullPullSyncMetadata(workspace, document) {
+  try {
+    const convex = await createConvexClient(workspace);
+    const signal = await convex.query(api2.projectExportData.schemaSignal, {
+      projectId: workspace.config.projectId,
+      versionId: workspace.config.versionId
+    });
+    workspace.state.headTransactionHash = document.revision !== void 0 && signal?.transactionId === document.revision.latestTransactionId ? signal.transactionHash : null;
+    workspace.state.derivedEdgeVersion = signal?.derivedEdgeVersion ?? null;
+  } catch {
+    workspace.state.headTransactionHash = null;
+    delete workspace.state.derivedEdgeVersion;
+  }
+}
 function cursorFromRevision(revision) {
   return {
     readBase: revision.readBase,
@@ -128755,6 +128857,7 @@ var init_pull = __esm({
     init_static_value_seed_records();
     init_static_member_ownership_recovery();
     init_value_base_desync();
+    init_compiler_metadata();
   }
 });
 
@@ -136399,7 +136502,7 @@ var init_registry2 = __esm({
   "schema-contract/registry.mjs"() {
     "use strict";
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
-      cliVersion: "0.51.0",
+      cliVersion: "0.51.1",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -143628,7 +143731,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.51.0");
+    console.log("0.51.1");
     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.51.0",
+  "version": "0.51.1",
   "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.51.0 -->
+<!-- reviewed-through-cli: 0.51.1 -->
 
 # Neo Compose CLI
 

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

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

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

@@ -40,9 +40,17 @@ without compiling it; use `neo status` to inspect local edits and diagnostics.
 An undo/reset metadata change invalidates the cursor and causes a safe
 full-snapshot fallback.
 
-If a compiler upgrade rejects the cached snapshot, save local edits outside the
-checkout, run `neo pull --force`, then reapply the edits. Normal pull cannot
-merge against a snapshot whose compiler revision is no longer supported.
+After a compiler upgrade, run `neo pull` with `.neo/state.json` intact. When
+remote changes affect only compiler-owned bodies or timestamps, pull refreshes
+the cached records before local compilation and leaves authored files and
+managed binaries untouched. It handles both changed-record pulls and full
+snapshot refreshes. Added or deleted records, authored changes, and unresolved
+conflicts still require the normal merge path.
+
+Keep `.neo/state.json`: it holds the merge baseline and source placements.
+Normal pull refuses existing production sources without that baseline. To
+deliberately replace a checkout whose state is gone, back it up first and use
+`neo pull --force`; the CLI recovers custom paths from the remaining declarations.
 The force pull replaces local source with the server version.
 
 Pull pins every page and snapshot batch to one published generation and logical