@neocompose/cli 0.10.4 → 0.10.5

package/CHANGELOG.md

@@ -1,5 +1,24 @@
 # 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

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
       })
@@ -42689,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());
@@ -42738,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);
 }
@@ -44429,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)) {
@@ -44453,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}`;
 }
@@ -44537,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
       })}`
     );
@@ -44845,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
@@ -44871,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
@@ -45088,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;
@@ -45217,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}.`
       );
@@ -66552,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;
@@ -68569,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.4",
+  "version": "0.10.5",
   "description": "Neo Compose native project-source CLI with bidirectional sync.",
   "license": "MIT",
   "type": "module",