@neocompose/cli 0.31.9 → 0.31.10

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.31.10] - 2026-08-17
+
+### Fixed
+
+- Allow a normal pull to merge remote changes while local source contains new
+  members whose server-owned identity envelope has not been assigned yet.
+- Recompile locally edited constructors after pull merge instead of rejecting
+  stale server IR compiled for their previous parameter list.
+
 ## [0.31.9] - 2026-08-17
 
 ### Added

package/dist/neo.mjs

@@ -95005,10 +95005,40 @@ function readPulledProjectDocumentV4(records2) {
   const raw = structuredClone(
     pulledProjectDocumentRaw(replayWorkspace(records2))
   );
-  return readProjectDocument(completeProspectiveLocalizedTexts(raw), {
-    constructors: "authored-or-compiled",
-    identities: "prospective"
-  });
+  return readProjectDocument(
+    completeProspectiveMemberCreateEnvelopes(
+      completeProspectiveLocalizedTexts(raw)
+    ),
+    {
+      constructors: "authored-or-compiled",
+      identities: "prospective"
+    }
+  );
+}
+function completeProspectiveMemberCreateEnvelopes(raw) {
+  const members = raw.members;
+  if (!Array.isArray(members)) return raw;
+  if (!members.some(isPendingMemberWithoutCreateEnvelope)) return raw;
+  const project = raw.project;
+  if (!isObjectRecord2(project) || typeof project.id !== "string") {
+    throw new Error(
+      "Pending source-authored members need the server create envelope, but the project record has no id."
+    );
+  }
+  return {
+    ...raw,
+    members: members.map(
+      (member) => isPendingMemberWithoutCreateEnvelope(member) ? {
+        projectId: project.id,
+        createdAt: 0,
+        updatedAt: 0,
+        ...member
+      } : member
+    )
+  };
+}
+function isPendingMemberWithoutCreateEnvelope(value) {
+  return isObjectRecord2(value) && typeof value.id === "string" && value.id.startsWith("__pending__:") && (typeof value.projectId !== "string" || typeof value.createdAt !== "number" || typeof value.updatedAt !== "number");
 }
 function completeProspectiveLocalizedTexts(raw) {
   const localizedTexts = raw.localizedTexts;
@@ -104634,16 +104664,45 @@ function buildEmitRecordSet(document, plans, side) {
     if (data === void 0) continue;
     const serverRecord = document.records.get(key);
     const [recordKind, recordId] = key.split(/:(.+)/, 2);
+    const resolvedRecordKind = serverRecord?.recordKind ?? recordKind;
+    const resolvedRecordId = serverRecord?.recordId ?? recordId;
     records2.set(key, {
-      recordKind: serverRecord?.recordKind ?? recordKind,
-      recordId: serverRecord?.recordId ?? recordId,
+      recordKind: resolvedRecordKind,
+      recordId: resolvedRecordId,
       contentHash: plan.serverHash,
       deleted: false,
-      data
+      data: side === "emit" ? composeProspectivePullRecord(
+        resolvedRecordKind,
+        resolvedRecordId,
+        data,
+        serverRecord
+      ) : data
     });
   }
   return records2;
 }
+function composeProspectivePullRecord(recordKind, recordId, data, serverRecord) {
+  if (!isSchemaRecordKindV4(recordKind) || !isObjectRecord2(data)) return data;
+  let baseRecord = null;
+  if (serverRecord !== void 0) {
+    if (!isObjectRecord2(serverRecord.data)) {
+      throw new Error(
+        `Cannot compose pulled ${recordKind} record ${JSON.stringify(recordId)} because its server payload is not an object.`
+      );
+    }
+    baseRecord = {
+      recordKind,
+      recordId,
+      data: serverRecord.data
+    };
+  }
+  return composeDocumentRecord(
+    recordKind,
+    recordId,
+    partitionDocumentFields(recordKind, data).authored,
+    baseRecord
+  ).data;
+}
 var init_pull = __esm({
   "src/commands/pull.ts"() {
     "use strict";
@@ -111415,7 +111474,7 @@ var init_registry2 = __esm({
     PROJECT_SCHEMA_CONTRACT = Object.freeze({
       formatVersion: 3,
       contractVersion: "3.13",
-      cliVersion: "0.31.9",
+      cliVersion: "0.31.10",
       projectFileUploadBatchSize: 32,
       documentRecords: {
         member: {
@@ -118010,7 +118069,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.31.9");
+    console.log("0.31.10");
     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.31.9",
+  "version": "0.31.10",
   "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.31.9 -->
+<!-- reviewed-through-cli: 0.31.10 -->
 
 # 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.31.9 -->
+<!-- reviewed-through-cli: 0.31.10 -->
 ```
 
 The quoted version above is checked too, so this instruction cannot go stale