@neocompose/cli 0.10.3 → 0.10.5

package/CHANGELOG.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## [0.10.5] - 2026-07-26
+
+### Changed
+
+- Stop writing a second `@id` above every static and project-root initializer.
+  A member owns exactly one value row, so that row's identity is a function of
+  the declaration the annotation sat under and never needed to be authored.
+  `neo pull` now emits the binding without it, and lowering resolves the row
+  itself. An `@id` left in a file is accepted while it agrees with the row the
+  member already owns, so existing workspaces keep working until their next
+  pull; one that disagrees is rejected rather than pushing a create for a
+  second row.
+- Derive the row id for a binding that does not have one yet, instead of
+  minting it. A member declared for the first time has no durable id to derive
+  from, so it carries a `__pending__:member-value:` token that resolves to the
+  derivation once the push assigns the member; the server re-derives it rather
+  than accepting the client's answer. Rows that already exist keep the ids
+  they were minted with -- P39 moves those onto the derivation.
+
+## [0.10.4] - 2026-07-26
+
+### Fixed
+
+- Materialize the required keys a bare `new()` omits. A constructor body was
+  built from constructor projections and explicit assignments only, so
+  `Birthday = new()` lowered to `{}` and the commit was rejected with
+  `missing required schema key "Day"` -- naming a key whose default the source
+  declares one line away. Each omitted required key now lowers the member's own
+  declared initializer, so a nested `new()` recurses and a row-backed default
+  is copied rather than shared. Optional keys stay absent, and a required key
+  whose member declares no default is unchanged.
+
+- Stop rejecting the transaction status response over a field the server no
+  longer sends. `resultCursor` was removed from the status payload as dead --
+  it was hardcoded null and read only as the starting result-page cursor,
+  where an empty cursor means the same thing -- but push still required it to
+  be present, so every push large enough to go durable failed with
+  `resultCursor must be a string or null` after the write had already
+  committed.
+
 ## [0.10.3] - 2026-07-25
 
 ### Fixed

package/dist/neo.mjs

@@ -42179,6 +42179,27 @@ var init_dialogue_sources = __esm({
   }
 });
 
+// ../src/models/members/member-value-id.ts
+function derivedMemberValueId(memberId) {
+  return v5_default(memberId, NEO_MEMBER_VALUE_NAMESPACE);
+}
+function pendingMemberValueId(pendingMemberId) {
+  return `${PENDING_MEMBER_VALUE_PREFIX}${encodeURIComponent(pendingMemberId)}`;
+}
+function pendingMemberValueMemberId(token) {
+  if (!token.startsWith(PENDING_MEMBER_VALUE_PREFIX)) return null;
+  return decodeURIComponent(token.slice(PENDING_MEMBER_VALUE_PREFIX.length));
+}
+var NEO_MEMBER_VALUE_NAMESPACE, PENDING_MEMBER_VALUE_PREFIX;
+var init_member_value_id = __esm({
+  "../src/models/members/member-value-id.ts"() {
+    "use strict";
+    init_dist_node();
+    NEO_MEMBER_VALUE_NAMESPACE = "7f2b9c14-58d6-5a07-b3e1-4c9d0a6f8b25";
+    PENDING_MEMBER_VALUE_PREFIX = "__pending__:member-value:";
+  }
+});
+
 // src/project-source/value-sources.ts
 function inferredGenericClassBinding(classId) {
   return `${INFERRED_GENERIC_CLASS_PREFIX}${classId}`;
@@ -42240,7 +42261,10 @@ function emitStoredValueBindingSourcesV4(records2, memberIds, options) {
     initializers.set(
       memberId,
       emitValue(context, member, member.valueId, {
-        exposeIdentity: true,
+        definitionSite: true,
+        // The row is `derivedMemberValueId(memberId)` and the declaration
+        // above it already carries `@id(memberId)`.
+        writeIdentity: false,
         targetTyped: options.targetTypedRoot === true,
         visited
       })
@@ -42417,6 +42441,7 @@ function buildValueLowerContext(state, manifest, options = {}) {
     mainLocale: projectMainLocaleFromState(state),
     valuePlacements: indexValuePlacements(state),
     parsedInitializers,
+    declaredInitializers: indexDeclaredInitializers(options.analysis),
     reconstructed: /* @__PURE__ */ new Map(),
     pendingValues: /* @__PURE__ */ new Map(),
     pendingLocalizedTexts: /* @__PURE__ */ new Map(),
@@ -42424,6 +42449,27 @@ function buildValueLowerContext(state, manifest, options = {}) {
     pendingBindingMembersByClassId: /* @__PURE__ */ new Map()
   };
 }
+function indexDeclaredInitializers(analysis) {
+  const initializers = /* @__PURE__ */ new Map();
+  if (analysis === void 0) return initializers;
+  for (const sourceClass of analysis.schema.classes) {
+    for (const declaration of sourceClass.members) {
+      if (declaration.kind !== "field" || declaration.initializer === null) {
+        continue;
+      }
+      if (declaration.modifiers.includes("static")) continue;
+      initializers.set(
+        sourceIdentityId(
+          declaration,
+          "member",
+          `${sourceClass.name}.${declaration.name}`
+        ),
+        declaration.initializer
+      );
+    }
+  }
+  return initializers;
+}
 function lowerStoredValueBindingsV4(state, manifest, bindings, options = {}) {
   const context = buildValueLowerContext(state, manifest, options);
   const memberValueIds = /* @__PURE__ */ new Map();
@@ -42667,8 +42713,8 @@ function lowerStoredBinding(context, binding, memberValueIds, seeds) {
     preserveReboundValue(context, currentValueId, referenced, binding);
     return;
   }
-  const annotatedId = annotatedValue(expression).id;
-  const valueId = annotatedId ?? currentValueId ?? pendingValueId(binding, binding.label);
+  const valueId = currentValueId ?? memberValueId(binding.memberId);
+  assertAuthoredBindingIdMatches(expression, binding, valueId);
   memberValueIds.set(binding.memberId, valueId);
   if (currentValueId === valueId) {
     const existingReconstructedKeys = new Set(context.reconstructed.keys());
@@ -42716,6 +42762,16 @@ function lowerStoredBinding(context, binding, memberValueIds, seeds) {
   const seed = lowerStaticSeed(context, member, expression, binding, valueId);
   seeds.set(binding.memberId, { ...seed, valueId });
 }
+function assertAuthoredBindingIdMatches(expression, binding, valueId) {
+  const authoredId = annotatedValue(expression).id;
+  if (authoredId === null || authoredId === valueId) return;
+  throw new Error(
+    `Binding ${binding.label} is annotated with value id ${authoredId}, but the member owns value ${valueId}. Remove the @id \u2014 \`neo pull\` rewrites this file without it.`
+  );
+}
+function memberValueId(memberId) {
+  return isPendingId(memberId) ? pendingMemberValueId(memberId) : derivedMemberValueId(memberId);
+}
 function reconstructedOrStateValue(context, valueId) {
   return context.reconstructed.get(`value:${valueId}`)?.fileFields ?? valueBase(context, valueId);
 }
@@ -42889,6 +42945,17 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
         environment
       );
     }
+    materializeRequiredDefaults(
+      context,
+      resolvedMember,
+      effectiveClass,
+      body,
+      source,
+      path,
+      rows,
+      localizedTexts,
+      environment
+    );
     value = body;
   } else if (resolvedMember.kind === "list") {
     if (expression.kind === "litNull") {
@@ -42984,6 +43051,51 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
   context.pendingValues.set(valueId, row);
   return row;
 }
+function materializeRequiredDefaults(context, member, effectiveClass, body, source, path, rows, localizedTexts, environment) {
+  if (member.partial === true) return;
+  for (const [schemaKey, childMember] of storedSchemaEntries(
+    context,
+    effectiveClass
+  )) {
+    if (body[schemaKey] !== void 0) continue;
+    if (!childMember.required) continue;
+    if (childMember.kind === "class" && childMember.partial === true) continue;
+    const initializer = context.declaredInitializers.get(childMember.id);
+    if (initializer === void 0) continue;
+    body[schemaKey] = lowerSeedChild(
+      context,
+      recursivePartialMember(member, childMember),
+      parseCachedInitializer(context.parsedInitializers, initializer),
+      source,
+      `${path}.${schemaKey}`,
+      rows,
+      localizedTexts,
+      void 0,
+      environment
+    );
+  }
+}
+function storedSchemaEntries(context, schemaClass2) {
+  const entries = /* @__PURE__ */ new Map();
+  const visited = /* @__PURE__ */ new Set();
+  let current = schemaClass2;
+  while (current !== void 0 && !visited.has(current.id)) {
+    visited.add(current.id);
+    for (const [schemaKey, memberId] of Object.entries(current.schema)) {
+      if (entries.has(schemaKey)) continue;
+      const child = context.members.get(memberId);
+      if (child === void 0) continue;
+      if (!ownsValueRow(child)) continue;
+      entries.set(schemaKey, child);
+    }
+    current = current.extendsClassId === null ? void 0 : context.classes.get(current.extendsClassId);
+  }
+  return [...entries];
+}
+function ownsValueRow(member) {
+  if (member.isReadOnly) return false;
+  return member.kind !== "computed" && member.kind !== "function" && member.kind !== "scriptFunction";
+}
 function lowerSeedChild(context, member, expression, source, path, rows, localizedTexts, containerId, environment) {
   const symbolId = sourceValueSymbol(context, expression);
   if (symbolId !== null) return symbolId;
@@ -44351,7 +44463,7 @@ function projectMainLocaleFromState(state) {
 }
 function emitValue(context, member, valueId, options) {
   const externalSymbol = context.symbolsByValueId.get(valueId);
-  if (!options.exposeIdentity && externalSymbol !== void 0) {
+  if (!options.definitionSite && externalSymbol !== void 0) {
     return externalSymbol;
   }
   if (options.visited.has(valueId)) {
@@ -44375,7 +44487,7 @@ function emitValue(context, member, valueId, options) {
     options.targetTyped ?? false,
     options.environment
   );
-  const prefix = options.exposeIdentity ? `@id(${quote4(valueId)})
+  const prefix = options.writeIdentity ? `@id(${quote4(valueId)})
 ` : "";
   return `${prefix}${expression}`;
 }
@@ -44459,7 +44571,8 @@ function classValue(context, member, value, visited, targetTyped, outerEnvironme
     fields.push(
       `${key} = ${emitValue(context, emittedChildMember, childId, {
         environment,
-        exposeIdentity: !context.symbolsByValueId.has(childId) && context.referencedValueIds.has(childId),
+        definitionSite: !context.symbolsByValueId.has(childId),
+        writeIdentity: !context.symbolsByValueId.has(childId) && context.referencedValueIds.has(childId),
         visited
       })}`
     );
@@ -44767,7 +44880,8 @@ ${ids.map(
     (id2) => indentNeoSourceNonEmptyLines(
       emitValue(context, entryMember, id2, {
         environment,
-        exposeIdentity: context.symbolsByValueId.get(id2) === void 0,
+        definitionSite: context.symbolsByValueId.get(id2) === void 0,
+        writeIdentity: context.symbolsByValueId.get(id2) === void 0,
         visited
       }),
       2
@@ -44793,7 +44907,8 @@ ${entries.flatMap(
       indentNeoSourceNonEmptyLines(
         `${quote4(key)}: ${emitValue(context, entryMember, id2, {
           environment,
-          exposeIdentity: !context.symbolsByValueId.has(id2) && context.referencedValueIds.has(id2),
+          definitionSite: !context.symbolsByValueId.has(id2),
+          writeIdentity: !context.symbolsByValueId.has(id2) && context.referencedValueIds.has(id2),
           visited
         })}`,
         2
@@ -45010,6 +45125,7 @@ var init_value_sources = __esm({
     init_lower_members();
     init_source_format();
     init_world_system_classes();
+    init_member_value_id();
     INFERRED_GENERIC_CLASS_PREFIX = "__inferred_class__:";
     MEMBER_KIND_DICTIONARY = 5;
     MEMBER_KIND_LIST = 6;
@@ -45139,7 +45255,8 @@ function validateProjectRootEnvelopeV4(state, analysis) {
     const expression = parseExpression(slot.initializer);
     const annotation2 = expression.kind === "annotated" ? expression.annotations.find((entry) => entry.name === "id") : void 0;
     const authoredValueId = annotation2?.args[0];
-    if (authoredValueId?.kind !== "litString" || authoredValueId.value !== memberData.valueId) {
+    if (authoredValueId === void 0) return;
+    if (authoredValueId.kind !== "litString" || authoredValueId.value !== memberData.valueId) {
       throw new Error(
         `Root value root.${expected.name} must retain stable value id ${memberData.valueId}.`
       );
@@ -66474,6 +66591,13 @@ function assignPendingIds(changes, staticValueSeeds, reconstructed3) {
   const assign = (pendingId2) => {
     const existing = assigned.get(pendingId2);
     if (existing !== void 0) return existing;
+    const memberLocator = pendingMemberValueMemberId(pendingId2);
+    if (memberLocator !== null) {
+      const memberId = isPendingId(memberLocator) ? assign(memberLocator) : memberLocator;
+      const derived = derivedMemberValueId(memberId);
+      assigned.set(pendingId2, derived);
+      return derived;
+    }
     const fresh = randomUUID5();
     assigned.set(pendingId2, fresh);
     return fresh;
@@ -66668,10 +66792,6 @@ function readProjectVersionTransactionStatus(value, transactionId) {
     value.errorMessage,
     `Project transaction "${transactionId}" errorMessage`
   );
-  const resultCursor = readNullableString(
-    value.resultCursor,
-    `Project transaction "${transactionId}" resultCursor`
-  );
   return {
     transactionId,
     commitStatus: value.commitStatus,
@@ -66692,8 +66812,7 @@ function readProjectVersionTransactionStatus(value, transactionId) {
       `Project transaction "${transactionId}" appliedChunkCount`
     ),
     errorCode,
-    errorMessage: errorMessage3,
-    resultCursor
+    errorMessage: errorMessage3
   };
 }
 function readProjectVersionTransactionResultPage(value, transactionId) {
@@ -66901,7 +67020,7 @@ async function downloadProjectVersionTransactionResult(args) {
   const assignments = {};
   const changedRecords = [];
   const seenCursors = /* @__PURE__ */ new Set();
-  let cursor = args.status.resultCursor ?? "";
+  let cursor = "";
   for (; ; ) {
     if (seenCursors.has(cursor)) {
       throw new Error(
@@ -68496,6 +68615,7 @@ var init_push = __esm({
     init_project_documents();
     init_workspace_status();
     init_lower_support();
+    init_member_value_id();
     init_source_diagnostics();
     init_projection();
     init_project_file_push();

package/package.json

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