@neocompose/cli 0.38.5 → 0.38.6

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [0.38.6] - 2026-08-29
+
+### Fixed
+
+- Preserve locally edited nested records when the server deletes their owning
+  graph, restore kept records as explicit absent-CAS creates, and accept a
+  later server recreation cleanly after local deletion wins.
+- Warn during pull when a conflicted record's retained local base strands
+  newly downloaded descendant value rows, before a later push reaches the
+  stale-base safety refusal.
+
 ## [0.38.5] - 2026-08-29
 
 ### Fixed

package/dist/neo.mjs

@@ -100786,6 +100786,28 @@ var init_value_base_desync = __esm({
 });
 
 // src/project-source/workspace-status-core.ts
+function recordUpsertChange(args) {
+  if (args.base.conflictServerHash === null) {
+    return {
+      kind: "create",
+      recordKind: args.recordKind,
+      recordId: args.recordId,
+      file: args.file,
+      nextData: args.nextData
+    };
+  }
+  const inConflictState = typeof args.base.conflictServerHash === "string";
+  return {
+    kind: "update",
+    recordKind: args.recordKind,
+    recordId: args.recordId,
+    file: args.file,
+    nextData: args.nextData,
+    baseData: inConflictState ? args.base.conflictServerData : args.base.data,
+    baseContentHash: args.base.contentHash,
+    casBaseHash: inConflictState ? args.base.conflictServerHash : args.base.contentHash
+  };
+}
 function listVirtualProjectSourceFilesV4(files) {
   const selected = files.filter((file) => {
     const kind = neoProjectSourceKind(file.path);
@@ -101269,16 +101291,15 @@ function computeWorkspaceStatus(workspace, options) {
     }
     const inConflictState = baseState.conflictServerHash !== void 0;
     if (!recordsSemanticallyEqual(record3.recordKind, fullData, baseState.data) || inConflictState) {
-      changes.push({
-        kind: "update",
-        recordKind: record3.recordKind,
-        recordId: record3.recordId,
-        file: record3.file,
-        nextData: fullData,
-        baseData: inConflictState ? baseState.conflictServerData : baseState.data,
-        baseContentHash: baseState.contentHash,
-        casBaseHash: inConflictState ? baseState.conflictServerHash : baseState.contentHash
-      });
+      changes.push(
+        recordUpsertChange({
+          base: baseState,
+          recordKind: record3.recordKind,
+          recordId: record3.recordId,
+          file: record3.file,
+          nextData: fullData
+        })
+      );
     }
   }
   const deletedValueIds = /* @__PURE__ */ new Set();
@@ -101290,6 +101311,7 @@ function computeWorkspaceStatus(workspace, options) {
       (error) => error.file === recordFile && isBlockingSchemaSourceError(error)
     ) || conflictedFiles.includes(recordFile);
     if (fileStillBroken) continue;
+    if (recordState.conflictServerHash === null) continue;
     if (recordState.recordKind === "value") {
       deletedValueIds.add(recordState.recordId);
     }
@@ -101450,16 +101472,15 @@ function computeWorkspaceStatus(workspace, options) {
     )) {
       continue;
     }
-    changes.push({
-      kind: "update",
-      recordKind: "project-file",
-      recordId: fileId,
-      file: record3.file,
-      nextData: record3.fullData,
-      baseData: base.data,
-      baseContentHash: base.contentHash,
-      casBaseHash: base.contentHash
-    });
+    changes.push(
+      recordUpsertChange({
+        base,
+        recordKind: "project-file",
+        recordId: fileId,
+        file: record3.file,
+        nextData: record3.fullData
+      })
+    );
   }
   let binaryFiles = [];
   let binaryChanges = [];
@@ -113587,7 +113608,8 @@ ${blockingErrors.map((error) => `  ${error.message}`).join("\n")}`
     if (serverRecord.deleted) continue;
     const baseState = workspace.state.records[key];
     const local = localByKey.get(key);
-    if (destructive || baseState === void 0) {
+    const acceptedServerDeletionRecreated = baseState?.conflictServerHash === null && local === void 0;
+    if (destructive || baseState === void 0 || acceptedServerDeletionRecreated) {
       plans.set(key, {
         emitData: serverRecord.data,
         serverHash: serverRecord.contentHash,
@@ -113834,13 +113856,23 @@ async function finishFormat4Pull(args) {
     (serverResult?.files ?? []).map((file) => [file.path, file])
   );
   const conflictPaths = /* @__PURE__ */ new Set();
+  const authoredLocalConflictKeysByPath = /* @__PURE__ */ new Map();
   for (const key of conflictKeys) {
-    const path = localResult.recordFiles.get(key) ?? serverResult?.recordFiles.get(key);
+    const localPath = localResult.recordFiles.get(key);
+    const serverPath = serverResult?.recordFiles.get(key);
+    const path = localPath ?? serverPath ?? workspace.state.records[key]?.file;
     if (path) conflictPaths.add(path);
+    if (path === void 0 || localPath !== void 0 || serverPath !== void 0) {
+      continue;
+    }
+    const keys = authoredLocalConflictKeysByPath.get(path) ?? [];
+    keys.push(key);
+    authoredLocalConflictKeysByPath.set(path, keys);
   }
   const emittedPaths = /* @__PURE__ */ new Set([
     ...localByPath.keys(),
-    ...[...conflictPaths].filter((path) => serverByPath.has(path))
+    ...[...conflictPaths].filter((path) => serverByPath.has(path)),
+    ...authoredLocalConflictKeysByPath.keys()
   ]);
   const rewritePaths = projectSourcePathsRequiringRewriteV4({
     destructive,
@@ -113860,7 +113892,17 @@ async function finishFormat4Pull(args) {
   const resolveSourcePath = createWorkspaceSourcePathResolver(workspace.root);
   let written = 0;
   for (const path of emittedPaths) {
-    const local = localByPath.get(path)?.content;
+    const absolute = resolveSourcePath(path);
+    const existing = existsSync8(absolute) ? readFileSync9(absolute, "utf8") : null;
+    const unprojectedConflictKeys = authoredLocalConflictKeysByPath.get(path) ?? [];
+    if (unprojectedConflictKeys.length > 0 && existing === null) {
+      throw new Error(
+        `Cannot preserve deleted-server conflict ${unprojectedConflictKeys.join(
+          ", "
+        )}: its prior source file ${JSON.stringify(path)} no longer exists.`
+      );
+    }
+    const local = unprojectedConflictKeys.length > 0 ? existing ?? void 0 : localByPath.get(path)?.content;
     const server = serverByPath.get(path)?.content;
     const content = conflictPaths.has(path) ? renderConflictFileV4({
       localContent: local,
@@ -113868,9 +113910,7 @@ async function finishFormat4Pull(args) {
       versionId: workspace.config.versionId
     }) : local;
     if (content === void 0) continue;
-    const absolute = resolveSourcePath(path);
     mkdirSync8(dirname8(absolute), { recursive: true });
-    const existing = existsSync8(absolute) ? readFileSync9(absolute, "utf8") : null;
     if (existing !== null && !rewritePaths.has(path)) continue;
     if (existing !== content) {
       writeFileSync8(absolute, content, "utf8");
@@ -113892,6 +113932,7 @@ async function finishFormat4Pull(args) {
     }
   }
   const records2 = {};
+  const previousRecords = workspace.state.records;
   for (const [key, plan] of plans) {
     const baseState = workspace.state.records[key];
     const serverRecord = document.records.get(key);
@@ -113934,6 +113975,10 @@ async function finishFormat4Pull(args) {
     const record3 = records2[key];
     if (record3) record3.projectBinary = state;
   }
+  const staleConflictTears = conflictCount === 0 ? [] : findNewlyUnanchoredConflictValues({
+    previousRecords,
+    records: records2
+  });
   workspace.state.records = records2;
   if (nextCursor !== null) {
     workspace.state.documentRevisionCursor = mutableCursor(nextCursor);
@@ -113985,6 +114030,12 @@ async function finishFormat4Pull(args) {
       'Conflict markers were written into the affected files. Edit them to the desired final state and push \u2014 the push is the resolution. To keep one side everywhere, use "neo resolve --mine" or "neo resolve --theirs".'
     );
     for (const key of conflictKeys) console.log(`  ${sym.fail} ${key}`);
+    for (const tear of staleConflictTears) {
+      const rowLabel = tear.unanchoredValueCount === 1 ? "row" : "rows";
+      warn(
+        `Conflict ${tear.recordKind} "${tear.recordId}" retained a local base that does not anchor ${tear.unanchoredValueCount} newly pulled descendant value ${rowLabel}. Resolve it with "neo resolve --mine" or "neo resolve --theirs" before pushing.`
+      );
+    }
   }
   if (binaries.conflicted > 0) {
     warn(
@@ -113993,6 +114044,65 @@ async function finishFormat4Pull(args) {
     for (const path of binaries.conflicts) console.log(`  ${sym.fail} ${path}`);
   }
 }
+function findNewlyUnanchoredConflictValues(args) {
+  const newlyLandedValueIds = /* @__PURE__ */ new Set();
+  for (const [key, record3] of Object.entries(args.records)) {
+    if (args.previousRecords[key] !== void 0) continue;
+    if (record3.recordKind !== "value") continue;
+    if (record3.file === void 0) continue;
+    if (record3.conflictServerHash !== void 0) continue;
+    newlyLandedValueIds.add(record3.recordId);
+  }
+  if (newlyLandedValueIds.size === 0) return [];
+  const unanchored = new Set(
+    unanchoredValueDeleteIds({
+      records: args.records,
+      deletedValueIds: newlyLandedValueIds
+    })
+  );
+  if (unanchored.size === 0) return [];
+  const tears = [];
+  for (const conflict2 of Object.values(args.records)) {
+    if (typeof conflict2.conflictServerHash !== "string") continue;
+    if (conflict2.file === void 0) continue;
+    const serverAnchored = /* @__PURE__ */ new Set();
+    collectNamedCandidateValues(
+      conflict2.conflictServerData,
+      newlyLandedValueIds,
+      serverAnchored
+    );
+    let unanchoredValueCount = 0;
+    for (const valueId of serverAnchored) {
+      if (!unanchored.has(valueId)) continue;
+      const value = args.records[`value:${valueId}`];
+      if (value?.file !== conflict2.file) continue;
+      unanchoredValueCount += 1;
+    }
+    if (unanchoredValueCount === 0) continue;
+    tears.push({
+      recordKind: conflict2.recordKind,
+      recordId: conflict2.recordId,
+      unanchoredValueCount
+    });
+  }
+  return tears;
+}
+function collectNamedCandidateValues(value, candidates, found) {
+  if (typeof value === "string") {
+    if (candidates.has(value)) found.add(value);
+    return;
+  }
+  if (Array.isArray(value)) {
+    for (const element of value) {
+      collectNamedCandidateValues(element, candidates, found);
+    }
+    return;
+  }
+  if (!isObjectRecord2(value)) return;
+  for (const nested of Object.values(value)) {
+    collectNamedCandidateValues(nested, candidates, found);
+  }
+}
 function deltaRequiresSourceProjectionV4(args) {
   const mainLocale = workspaceMainLocale(args.workspace.state.records);
   for (const key of args.changedRecordKeys) {
@@ -114185,6 +114295,7 @@ var init_pull = __esm({
     init_dialogue_sources();
     init_static_value_seed_records();
     init_static_member_ownership_recovery();
+    init_value_base_desync();
   }
 });
 
@@ -114194,7 +114305,7 @@ __export(init_exports, {
   runInit: () => runInit
 });
 import { existsSync as existsSync9, mkdirSync as mkdirSync9, readFileSync as readFileSync10, writeFileSync as writeFileSync9 } from "node:fs";
-import { join as join11, resolve as resolve3 } from "node:path";
+import { join as join10, resolve as resolve3 } from "node:path";
 async function runInit(options) {
   let projectId = options.projectId;
   let projects = [];
@@ -114291,8 +114402,8 @@ async function runInit(options) {
     }) : "neo";
   }
   const root = resolve3(directory);
-  if (existsSync9(join11(root, NEO_CONFIG_FILE))) {
-    throw new Error(`"${join11(root, NEO_CONFIG_FILE)}" already exists.`);
+  if (existsSync9(join10(root, NEO_CONFIG_FILE))) {
+    throw new Error(`"${join10(root, NEO_CONFIG_FILE)}" already exists.`);
   }
   mkdirSync9(root, { recursive: true });
   ensurePrivateStateIgnored(root);
@@ -114317,7 +114428,7 @@ async function runInit(options) {
   });
 }
 function ensurePrivateStateIgnored(root) {
-  const path = join11(root, ".gitignore");
+  const path = join10(root, ".gitignore");
   const existing = existsSync9(path) ? readFileSync10(path, "utf8") : "";
   if (existing.split(/\r?\n/u).some((line) => line.trim() === ".neo/" || line.trim() === ".neo")) {
     return;
@@ -115724,7 +115835,7 @@ var init_save_overlay_resolution = __esm({
 
 // src/commands/push-body-diagnostics.ts
 import { existsSync as existsSync10, readFileSync as readFileSync11 } from "node:fs";
-import { join as join12 } from "node:path";
+import { join as join11 } from "node:path";
 function createNeoScriptBodySourceLocator(workspace, status) {
   const textByFile = /* @__PURE__ */ new Map();
   return {
@@ -115746,7 +115857,7 @@ function createNeoScriptBodySourceLocator(workspace, status) {
     textOf(file) {
       const cached = textByFile.get(file);
       if (cached !== void 0) return cached;
-      const path = join12(workspace.root, file);
+      const path = join11(workspace.root, file);
       const text = existsSync10(path) ? readFileSync11(path, "utf8") : null;
       textByFile.set(file, text);
       return text;
@@ -117550,25 +117661,25 @@ var init_project_source_identity = __esm({
 import { spawn } from "node:child_process";
 import { createHash as createHash9 } from "node:crypto";
 import { existsSync as existsSync11, readFileSync as readFileSync13, readdirSync as readdirSync4 } from "node:fs";
-import { join as join13, relative as relative4, sep as sep4 } from "node:path";
+import { join as join12, relative as relative4, sep as sep4 } from "node:path";
 function fingerprintPushInputs(workspace, options = {}) {
   const paths = /* @__PURE__ */ new Set([
-    join13(workspace.root, "neo.json"),
+    join12(workspace.root, "neo.json"),
     ...listProjectSourceFilesV4(workspace.root),
     ...options.includeTests === false ? [] : listProjectTestFilesV1(workspace.root),
-    ...workspace.config.unityConfigPath === void 0 ? [] : [join13(workspace.root, workspace.config.unityConfigPath)]
+    ...workspace.config.unityConfigPath === void 0 ? [] : [join12(workspace.root, workspace.config.unityConfigPath)]
   ]);
   const visitManaged = (directory) => {
     if (!existsSync11(directory)) return;
     for (const entry of readdirSync4(directory, { withFileTypes: true })) {
       if (entry.isSymbolicLink()) continue;
-      const path = join13(directory, entry.name);
+      const path = join12(directory, entry.name);
       if (entry.isDirectory()) visitManaged(path);
       else if (entry.isFile()) paths.add(path);
     }
   };
-  visitManaged(join13(workspace.root, "Files", "Images"));
-  visitManaged(join13(workspace.root, "Files", "AudioClips"));
+  visitManaged(join12(workspace.root, "Files", "Images"));
+  visitManaged(join12(workspace.root, "Files", "AudioClips"));
   const hash = createHash9("sha256");
   for (const path of [...paths].sort()) {
     const name = relative4(workspace.root, path).split(sep4).join("/");
@@ -117713,7 +117824,7 @@ var init_push_hook = __esm({
 });
 
 // src/project-source/project-file-push.ts
-import { basename as basename2, join as join14 } from "node:path";
+import { basename as basename2, join as join13 } from "node:path";
 import { readFileSync as readFileSync14 } from "node:fs";
 function ensureProjectFileBinaryChangesV4(args) {
   for (const binary of args.binaryChanges) {
@@ -117759,7 +117870,7 @@ function prepareProjectFilePushesV4(args) {
         `Project file ${recordId} has upload bytes but its source change has no record data.`
       );
     }
-    const absolute = join14(args.workspace.root, binary.path);
+    const absolute = join13(args.workspace.root, binary.path);
     const bytes = new Uint8Array(readFileSync14(absolute));
     const digest = sha256Bytes(bytes);
     if (binary.localSha256 !== null && digest !== binary.localSha256) {
@@ -118243,7 +118354,7 @@ import {
   readFileSync as readFileSync15,
   statSync as statSync2
 } from "node:fs";
-import { dirname as dirname9, join as join15, relative as relative5, sep as sep5 } from "node:path";
+import { dirname as dirname9, join as join14, relative as relative5, sep as sep5 } from "node:path";
 function assignPendingIds(changes, authoredValueSeeds, reconstructed3, localInitializerMaterialization) {
   const assigned = /* @__PURE__ */ new Map();
   const assign = (pendingId2) => {
@@ -119020,7 +119131,7 @@ async function runPush(workspace, options, preparationOverride) {
     );
   }
   if (options.noVerify !== true) {
-    const preparedBuildDir = configuredHook === void 0 ? void 0 : join15(
+    const preparedBuildDir = configuredHook === void 0 ? void 0 : join14(
       workspace.root,
       ".neo",
       "test-build",
@@ -119037,7 +119148,7 @@ async function runPush(workspace, options, preparationOverride) {
       const documentJson = JSON.stringify(candidate.document);
       mkdirSync10(preparedBuildDir, { recursive: true });
       writeFileSync10(
-        join15(preparedBuildDir, "candidate.json"),
+        join14(preparedBuildDir, "candidate.json"),
         `${JSON.stringify({
           version: 1,
           projectFingerprint: `sha256:${preparedLocal.source.sourceHash}`,
@@ -120296,7 +120407,7 @@ function authoredMemberFormsByFile(root, alternates) {
   for (const alternate of alternates) {
     let existing = contents.get(alternate.path);
     if (existing === void 0) {
-      const absolute = join15(root, alternate.path);
+      const absolute = join14(root, alternate.path);
       existing = existsSync12(absolute) ? readFileSync15(absolute, "utf8") : null;
       contents.set(alternate.path, existing);
     }
@@ -120867,16 +120978,13 @@ function prepareCompleteNeoScriptBodyChanges(workspace, status, schema, options
         `Cannot include server-derived NeoScript refresh for member "${compiled.id}": its reconstructed working-copy row is missing.`
       );
     }
-    const cascadeChange = {
-      kind: "update",
+    const cascadeChange = recordUpsertChange({
+      base,
       recordKind: "member",
       recordId: compiled.id,
       file: reconstructed3.file,
-      nextData,
-      baseData: base.data,
-      baseContentHash: base.contentHash,
-      casBaseHash: base.conflictServerHash ?? base.contentHash
-    };
+      nextData
+    });
     status.changes.push(cascadeChange);
     changesById.set(compiled.id, cascadeChange);
   }
@@ -120945,16 +121053,13 @@ function prepareNSPropertySetterChanges(workspace, status) {
           `Cannot cascade removal of NeoScript property setter to override "${memberId}": its working-copy state is missing.`
         );
       }
-      const cascadeChange = {
-        kind: "update",
+      const cascadeChange = recordUpsertChange({
+        base,
         recordKind: "member",
         recordId: memberId,
         file: reconstructed3.file,
-        nextData: next,
-        baseData: base.data,
-        baseContentHash: base.contentHash,
-        casBaseHash: base.conflictServerHash ?? base.contentHash
-      };
+        nextData: next
+      });
       status.changes.push(cascadeChange);
       changesById.set(memberId, cascadeChange);
     }
@@ -121021,16 +121126,13 @@ function prepareNSFunctionBodyChanges(workspace, status) {
         `Cannot recompile NeoScript function override "${memberId}": its working-copy state is missing.`
       );
     }
-    const cascadeChange = {
-      kind: "update",
+    const cascadeChange = recordUpsertChange({
+      base,
       recordKind: "member",
       recordId: memberId,
       file: reconstructed3.file,
-      nextData: member,
-      baseData: base.data,
-      baseContentHash: base.contentHash,
-      casBaseHash: base.conflictServerHash ?? base.contentHash
-    };
+      nextData: member
+    });
     status.changes.push(cascadeChange);
     changesById.set(memberId, cascadeChange);
   }
@@ -121241,7 +121343,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.15",
-      cliVersion: "0.38.5",
+      cliVersion: "0.38.6",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -122578,7 +122680,7 @@ import {
   basename as basename3,
   dirname as dirname10,
   isAbsolute as isAbsolute3,
-  join as join16,
+  join as join15,
   relative as relative6,
   resolve as resolve4,
   sep as sep6
@@ -122785,7 +122887,7 @@ function preparedHookCandidate(workspace) {
       );
     }
     const parsed = JSON.parse(
-      readFileSync16(join16(directory, "candidate.json"), "utf8")
+      readFileSync16(join15(directory, "candidate.json"), "utf8")
     );
     if (!isRecord10(parsed)) {
       throw new NeoTestPreparedCandidateError(
@@ -122842,7 +122944,7 @@ function fingerprintTestCandidateInputs(workspace) {
 }
 function testCandidateCachePath(workspace, inputFingerprint) {
   const cacheKey = createHash11("sha256").update(inputFingerprint).digest("hex");
-  return join16(
+  return join15(
     workspace.root,
     ".neo",
     "test-build",
@@ -122867,7 +122969,7 @@ function cachedTestCandidate(workspace, inputFingerprint) {
     }
     if (typeof parsed.documentSha256 !== "string") return null;
     const documentJson = readFileSync16(
-      join16(dirname10(candidatePath), "document.json"),
+      join15(dirname10(candidatePath), "document.json"),
       "utf8"
     );
     if (createHash11("sha256").update(documentJson).digest("hex") !== parsed.documentSha256) {
@@ -122888,7 +122990,7 @@ function cacheTestCandidate(workspace, inputFingerprint, candidate) {
   const documentJson = JSON.stringify(candidate.document);
   const documentSha256 = createHash11("sha256").update(documentJson).digest("hex");
   const candidatePath = testCandidateCachePath(workspace, inputFingerprint);
-  atomicWrite(join16(dirname10(candidatePath), "document.json"), documentJson);
+  atomicWrite(join15(dirname10(candidatePath), "document.json"), documentJson);
   atomicWrite(
     candidatePath,
     JSON.stringify({
@@ -122908,7 +123010,7 @@ function compileSpec(workspace, document, absolutePath, projectCompilationHash2)
   const path = relative6(workspace.root, absolutePath).split(sep6).join("/");
   const source = readFileSync16(absolutePath, "utf8");
   const sourceHash = createHash11("sha256").update(source).digest("hex");
-  const artifactPath = join16(
+  const artifactPath = join15(
     workspace.root,
     ".neo",
     "test-build",
@@ -123743,7 +123845,7 @@ function testBuildFiles(root) {
   const visit = (directory) => {
     for (const entry of readdirSync5(directory, { withFileTypes: true })) {
       if (entry.isSymbolicLink()) continue;
-      const path = join16(directory, entry.name);
+      const path = join15(directory, entry.name);
       if (entry.isDirectory()) visit(path);
       else if (entry.isFile()) {
         const stats = statSync3(path);
@@ -123804,7 +123906,7 @@ function formatStatusCounts(passed, failed, total, skipped = 0) {
 async function runTest(workspace, options, dependencies = {}) {
   const started = Date.now();
   const performanceStarted = performance.now();
-  const testBuildRoot = join16(workspace.root, ".neo", "test-build");
+  const testBuildRoot = join15(workspace.root, ".neo", "test-build");
   maintainNeoTestBuildCache(testBuildRoot);
   const startedAt = new Date(started).toISOString();
   let projectFingerprint = null;
@@ -123983,7 +124085,7 @@ async function runTest(workspace, options, dependencies = {}) {
       }))
     };
     atomicWrite(
-      join16(workspace.root, ".neo", "test-build", "v1", "manifest.json"),
+      join15(workspace.root, ".neo", "test-build", "v1", "manifest.json"),
       `${JSON.stringify(buildManifest, null, 2)}
 `
     );
@@ -124072,7 +124174,7 @@ async function runTest(workspace, options, dependencies = {}) {
   if (options.outputFile !== null) {
     try {
       atomicWrite(
-        isAbsolute3(options.outputFile) ? options.outputFile : join16(workspace.root, options.outputFile),
+        isAbsolute3(options.outputFile) ? options.outputFile : join15(workspace.root, options.outputFile),
         serialized
       );
     } catch (error) {
@@ -124286,7 +124388,7 @@ import {
   existsSync as existsSync14,
   readFileSync as readFileSync17
 } from "node:fs";
-import { extname as extname2, isAbsolute as isAbsolute4, join as join17, relative as relative7, sep as sep7 } from "node:path";
+import { extname as extname2, isAbsolute as isAbsolute4, join as join16, relative as relative7, sep as sep7 } from "node:path";
 function inspectNeoDoctor(workspace) {
   const formatCompatible = workspace.config.formatVersion === CURRENT_FORMAT_VERSION;
   const compiler = inspectCompilerContract();
@@ -124402,7 +124504,7 @@ function inspectSourceContract(workspace) {
   }
 }
 function inspectExtensionContract(root) {
-  const cachePath = join17(root, PROJECT_SOURCE_ANALYSIS_V4_CACHE_PATH);
+  const cachePath = join16(root, PROJECT_SOURCE_ANALYSIS_V4_CACHE_PATH);
   if (!existsSync14(cachePath)) {
     return {
       id: NEO_VSCODE_EXTENSION_ID,
@@ -124486,7 +124588,7 @@ function inspectTrackedBinary(root, record3, errors) {
       `Project file ${record3.recordId} has an invalid SHA-256 base digest.`
     );
   }
-  const absolute = join17(root, path);
+  const absolute = join16(root, path);
   if (existsSync14(absolute) && !canAccess(absolute, fsConstants.R_OK)) {
     errors.push(`Tracked project file ${path} is not readable.`);
   }
@@ -124629,7 +124731,7 @@ __export(migrate_exports, {
 });
 import { randomUUID as randomUUID4 } from "node:crypto";
 import { existsSync as existsSync15, mkdirSync as mkdirSync12, readdirSync as readdirSync6, writeFileSync as writeFileSync12 } from "node:fs";
-import { join as join18 } from "node:path";
+import { join as join17 } from "node:path";
 async function runMigrate(workspace, subcommand, positional, targetRef, json, dependencies = {}) {
   if (subcommand === "new") {
     const name = positional[0];
@@ -124638,7 +124740,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)) {
@@ -124650,7 +124752,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.`);
     }
@@ -127444,7 +127546,7 @@ __export(export_exports, {
   runExportUnity: () => runExportUnity
 });
 import { mkdirSync as mkdirSync13, writeFileSync as writeFileSync13 } from "node:fs";
-import { join as join19 } from "node:path";
+import { join as join18 } from "node:path";
 async function runExportUnity(workspace, outDir) {
   if (outDir === null) {
     throw new Error(
@@ -127456,23 +127558,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 });
-  writeFileSync13(join19(resourcesDir, "project.json"), response.projectJson);
+  writeFileSync13(join18(resourcesDir, "project.json"), response.projectJson);
   writeFileSync13(
-    join19(scriptsDir, "NeoGeneratedTypes.cs"),
+    join18(scriptsDir, "NeoGeneratedTypes.cs"),
     response.generatedTypes
   );
   for (const file of response.localizationFiles ?? []) {
-    writeFileSync13(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) {
@@ -127495,7 +127597,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) {
@@ -127605,7 +127707,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 {
     }
   }
@@ -127661,7 +127763,7 @@ __export(resolve_exports, {
   workspaceFilePath: () => workspaceFilePath
 });
 import { readFileSync as readFileSync19, rmSync as rmSync8, writeFileSync as writeFileSync14 } from "node:fs";
-import { join as join21 } from "node:path";
+import { join as join20 } from "node:path";
 function runResolve(workspace, side) {
   const resolvedRecords = adoptServerConflictBases(workspace);
   let resolvedFiles = 0;
@@ -127677,12 +127779,12 @@ 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,
-          readFileSync19(join21(workspace.root, conflict2.artifactPath)),
+          readFileSync19(join20(workspace.root, conflict2.artifactPath)),
           conflict2.remoteSha256
         );
         binary.sha256 = conflict2.remoteSha256;
@@ -127692,7 +127794,7 @@ function runResolve(workspace, side) {
       }
     }
     if (conflict2.artifactPath !== void 0) {
-      rmSync8(join21(workspace.root, conflict2.artifactPath), { force: true });
+      rmSync8(join20(workspace.root, conflict2.artifactPath), { force: true });
     }
     delete binary.conflict;
     resolvedBinaries += 1;
@@ -127761,7 +127863,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"() {
@@ -127966,7 +128068,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.38.5");
+    console.log("0.38.6");
     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.38.5",
+  "version": "0.38.6",
   "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.38.5 -->
+<!-- reviewed-through-cli: 0.38.6 -->
 
 # 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.38.5 -->
+<!-- reviewed-through-cli: 0.38.6 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale

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

@@ -94,6 +94,13 @@ rows its own file projection holds, so the plan would delete live server rows.
 Nothing is planned in that state; run `neo pull` and retry. The same message
 as a warning reports the inconsistency without blocking.
 
+When pull conflicts with a server-side deletion, keeping the authored record
+restores it as an explicit create guarded by an absent-record CAS check;
+removing it from the resolved source accepts the deletion without sending a
+write. Pull also warns immediately when a conflicted record's retained local
+base strands newly downloaded descendant value rows. Resolve that conflict
+with `neo resolve --mine` or `neo resolve --theirs` before pushing.
+
 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.