@neocompose/cli 0.10.4 → 0.10.6

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [0.10.6] - 2026-07-26
+
+### Changed
+
+- Derive the member id that carries one type argument of a constructed
+  generic, instead of reading it off the pulled record. `List<NeoAnimationChildOverride<NeoObjectBase>>`
+  binds its entry's parameter to a hidden member with no source syntax of its
+  own, so a workspace pushing without `neo/obj/` re-minted it under a
+  `__pending__:generic-argument:` id and created a second record. The id is now
+  a function of the slot that owns it -- the declaring member or class, plus
+  the parameter being bound -- which is the same fix `0.10.0` applied to entry
+  members. Argument members that already exist move onto the derivation
+  through P39's reconciler.
+
+## [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

@@ -28860,6 +28860,22 @@ var init_entry_member_id = __esm({
   }
 });
 
+// ../src/models/members/generic-argument-member-id.ts
+function derivedGenericArgumentMemberId(parentRecordId, genericParamId) {
+  return v5_default(
+    `${encodeURIComponent(parentRecordId)}:${encodeURIComponent(genericParamId)}`,
+    NEO_GENERIC_ARGUMENT_MEMBER_NAMESPACE
+  );
+}
+var NEO_GENERIC_ARGUMENT_MEMBER_NAMESPACE;
+var init_generic_argument_member_id = __esm({
+  "../src/models/members/generic-argument-member-id.ts"() {
+    "use strict";
+    init_dist_node();
+    NEO_GENERIC_ARGUMENT_MEMBER_NAMESPACE = "6a4e1d38-9b52-5c0f-8d71-3e2a7f4b6c19";
+  }
+});
+
 // src/project-source/lower-members.ts
 function lowerClass(context, declaration) {
   const id2 = materializedId(declaration, "class", declaration.name);
@@ -29355,13 +29371,7 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
       classId,
       ...partial ? { partial: true } : {},
       schemaKeyOrder: base?.kind === "class" ? base.schemaKeyOrder : null,
-      classArguments: lowerClassArguments(
-        context,
-        ownerClass,
-        id2,
-        fieldType,
-        base
-      )
+      classArguments: lowerClassArguments(context, ownerClass, id2, fieldType)
     };
   }
   throw new Error(
@@ -29921,7 +29931,7 @@ function genericParameterName(context, genericParamId) {
   }
   return "object";
 }
-function lowerClassArguments(context, ownerClass, ownerMemberId, type, base) {
+function lowerClassArguments(context, ownerClass, ownerMemberId, type) {
   const classId = context.classIdsByName.get(type.name);
   if (!classId) return {};
   const parameters = [
@@ -29937,12 +29947,7 @@ function lowerClassArguments(context, ownerClass, ownerMemberId, type, base) {
       result[parameterId] = { kind: "generic", genericParamId: ownerParameter };
       continue;
     }
-    const pulledBinding = base?.kind === "class" ? base.classArguments[parameterId] : void 0;
-    const pulledMember = pulledBinding?.kind === "member" ? context.baseMembers.get(pulledBinding.memberId) : void 0;
-    const memberId = pulledBinding?.kind === "member" && pulledMember !== void 0 && JSON.stringify(manifestTypeForMember(context, pulledMember)) === JSON.stringify(argumentType) ? pulledBinding.memberId : pendingDerivedId(
-      "generic-argument",
-      `${ownerMemberId}:${parameterId}`
-    );
+    const memberId = derivedGenericArgumentMemberId(ownerMemberId, parameterId);
     result[parameterId] = { kind: "member", memberId };
     lowerGenericArgument(
       context,
@@ -29962,7 +29967,6 @@ function lowerExtendsBindings(context, declaration, baseClassId, argumentsValue)
   ];
   const result = {};
   const declarationId = materializedId(declaration, "class", declaration.name);
-  const pulledClass = context.baseClasses.get(declarationId);
   for (const [[parameterName, parameterId], argumentType] of zip(
     parameters,
     argumentsValue
@@ -29972,11 +29976,7 @@ function lowerExtendsBindings(context, declaration, baseClassId, argumentsValue)
       result[parameterId] = { kind: "generic", genericParamId: local };
       continue;
     }
-    const pulledBinding = pulledClass?.extendsGenericBindings[parameterId];
-    const memberId = pulledBinding?.kind === "member" ? pulledBinding.memberId : pendingDerivedId(
-      "generic-argument",
-      `${declarationId}:${parameterId}`
-    );
+    const memberId = derivedGenericArgumentMemberId(declarationId, parameterId);
     result[parameterId] = { kind: "member", memberId };
     lowerGenericArgument(
       context,
@@ -30100,9 +30100,6 @@ function resolveQualifiedMemberId(context, expression) {
   );
   return member === void 0 ? null : materializedId(member, "member", `${sourceClass.name}.${member.name}`);
 }
-function pendingDerivedId(kind, ownerId) {
-  return `__pending__:${kind}:${encodeURIComponent(ownerId)}`;
-}
 function hasAnnotation(annotations, name) {
   return annotation(annotations, name) !== void 0;
 }
@@ -30306,6 +30303,7 @@ var init_lower_members = __esm({
     init_lower_support();
     init_ui_action_source();
     init_entry_member_id();
+    init_generic_argument_member_id();
     UNSET_LIST_COLUMN_WIDTH = -1;
     primitiveMemberKinds = /* @__PURE__ */ new Set([
       "null",
@@ -35770,7 +35768,7 @@ function worldAnimationChildOverrideBindingMemberId(classId) {
     WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAMESPACE
   );
 }
-var WORLD_SORTING_LAYERS_MEMBER_ID, WORLD_SORTING_LAYER_ENTRY_MEMBER_ID, WORLD_SORTING_LAYER_NAME_MEMBER_ID, WORLD_LAYER_NAME_MEMBER_ID, WORLD_LAYER_SORTING_LAYER_MEMBER_ID, WORLD_LAYER_SORTING_ORDER_MEMBER_ID, WORLD_SORTING_ORDER_MIN, WORLD_SORTING_ORDER_MAX, WORLD_GRID_CHILDREN_MEMBER_ID, WORLD_GRID_CHILDREN_ENTRY_MEMBER_ID, WORLD_ASSET_NAME_MEMBER_ID, WORLD_TILE_SPRITE_MEMBER_ID, WORLD_OBJECT_BASE_NAME_MEMBER_ID, WORLD_OBJECT_BASE_POSITION_MEMBER_ID, WORLD_OBJECT_BASE_SIZE_MEMBER_ID, WORLD_SPRITE_OBJECT_NAME_MEMBER_ID, WORLD_SPRITE_OBJECT_SPRITE_MEMBER_ID, WORLD_OBJECT_CHILDREN_MEMBER_ID, WORLD_OBJECT_CHILDREN_ENTRY_MEMBER_ID, WORLD_OBJECT_COLLIDER_MEMBER_ID, WORLD_OBJECT_PLACEMENT_TILES_MEMBER_ID, WORLD_OBJECT_PLACEMENT_TILES_ENTRY_MEMBER_ID, WORLD_OBJECT_PLACEMENT_TILE_CELL_MEMBER_ID, WORLD_TILE_INSTANCE_CELL_MEMBER_ID, WORLD_TILE_LAYER_LINK_LAYER_MEMBER_ID, WORLD_TILE_LAYER_LINK_TILES_MEMBER_ID, WORLD_TILE_LAYER_LINK_TILE_ENTRY_MEMBER_ID, WORLD_OBJECT_LAYER_LINK_LAYER_MEMBER_ID, WORLD_OBJECT_LAYER_LINK_OBJECTS_MEMBER_ID, WORLD_OBJECT_LAYER_LINK_OBJECT_ENTRY_MEMBER_ID, WORLD_TILE_SMART_TILE_SCHEMA_KEY, WORLD_TILE_SMART_TILE_MEMBER_ID, WORLD_SMART_TILE_DEFAULT_COLLIDER_SCHEMA_KEY, WORLD_SMART_TILE_DEFAULT_COLLIDER_MEMBER_ID, WORLD_SMART_TILE_RULES_SCHEMA_KEY, WORLD_SMART_TILE_RULES_MEMBER_ID, WORLD_SMART_TILE_RULES_ENTRY_MEMBER_ID, WORLD_SMART_TILE_RULE_NEIGHBORS_SCHEMA_KEY, WORLD_SMART_TILE_RULE_NEIGHBORS_MEMBER_ID, WORLD_SMART_TILE_RULE_NEIGHBORS_ENTRY_MEMBER_ID, WORLD_SMART_TILE_RULE_SPRITES_SCHEMA_KEY, WORLD_SMART_TILE_RULE_SPRITES_MEMBER_ID, WORLD_SMART_TILE_RULE_SPRITES_ENTRY_MEMBER_ID, WORLD_SMART_TILE_RULE_OUTPUT_SCHEMA_KEY, WORLD_SMART_TILE_RULE_OUTPUT_MEMBER_ID, WORLD_SMART_TILE_RULE_COLLIDER_SCHEMA_KEY, WORLD_SMART_TILE_RULE_COLLIDER_MEMBER_ID, WORLD_SMART_TILE_RULE_TRANSFORM_SCHEMA_KEY, WORLD_SMART_TILE_RULE_TRANSFORM_MEMBER_ID, WORLD_SMART_TILE_RULE_MIN_ANIMATION_SPEED_SCHEMA_KEY, WORLD_SMART_TILE_RULE_MIN_ANIMATION_SPEED_MEMBER_ID, WORLD_SMART_TILE_RULE_MAX_ANIMATION_SPEED_SCHEMA_KEY, WORLD_SMART_TILE_RULE_MAX_ANIMATION_SPEED_MEMBER_ID, WORLD_SMART_TILE_NEIGHBOR_CELL_SCHEMA_KEY, WORLD_SMART_TILE_NEIGHBOR_CELL_MEMBER_ID, WORLD_SMART_TILE_NEIGHBOR_CONDITION_SCHEMA_KEY, WORLD_SMART_TILE_NEIGHBOR_CONDITION_MEMBER_ID, WORLD_SMART_TILE_CONDITION_ENUM_ID, WORLD_SMART_TILE_OUTPUT_ENUM_ID, WORLD_SMART_TILE_COLLIDER_ENUM_ID, WORLD_SMART_TILE_TRANSFORM_ENUM_ID, WORLD_SMART_TILE_CONDITION_THIS_OPTION_ID, WORLD_SMART_TILE_OUTPUT_SINGLE_OPTION_ID, WORLD_SMART_TILE_COLLIDER_SPRITE_OPTION_ID, WORLD_SMART_TILE_TRANSFORM_FIXED_OPTION_ID, WORLD_ANIMATION_CLIP_TARGET_PARAM_ID, WORLD_ANIMATION_FRAME_TARGET_PARAM_ID, WORLD_ANIMATION_CHILD_OVERRIDE_ENTRY_PARAM_ID, WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAME, WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAMESPACE, WORLD_ANIMATION_CLIP_FPS_MEMBER_ID, WORLD_ANIMATION_CLIP_DURATION_MEMBER_ID, WORLD_ANIMATION_CLIP_FRAMES_MEMBER_ID, WORLD_ANIMATION_CLIP_FRAMES_ENTRY_MEMBER_ID, WORLD_ANIMATION_CLIP_TRACKS_MEMBER_ID, WORLD_ANIMATION_CLIP_TRACKS_ENTRY_MEMBER_ID, WORLD_ANIMATION_FRAME_INDEX_MEMBER_ID, WORLD_ANIMATION_FRAME_OVERRIDES_MEMBER_ID, WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_MEMBER_ID, WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_ENTRY_MEMBER_ID, WORLD_ANIMATION_FRAME_ACTIONS_MEMBER_ID, WORLD_ANIMATION_FRAME_ACTIONS_ENTRY_MEMBER_ID, WORLD_ANIMATION_CHILD_OVERRIDE_CHILD_MEMBER_ID, WORLD_ANIMATION_CHILD_OVERRIDE_OVERRIDES_MEMBER_ID, WORLD_ANIMATION_CHILD_TRACK_CHILD_MEMBER_ID, WORLD_ANIMATION_CHILD_TRACK_CLIP_KEY_MEMBER_ID, WORLD_ANIMATION_CHILD_TRACK_START_FRAME_MEMBER_ID, WORLD_ANIMATION_OBJECT_BASE_BINDING_MEMBER_ID, WORLD_SYSTEM_CLASS_DEFINITIONS, ANIMATION_WORLD_KINDS;
+var WORLD_SORTING_LAYERS_MEMBER_ID, WORLD_SORTING_LAYER_ENTRY_MEMBER_ID, WORLD_SORTING_LAYER_NAME_MEMBER_ID, WORLD_LAYER_NAME_MEMBER_ID, WORLD_LAYER_SORTING_LAYER_MEMBER_ID, WORLD_LAYER_SORTING_ORDER_MEMBER_ID, WORLD_SORTING_ORDER_MIN, WORLD_SORTING_ORDER_MAX, WORLD_GRID_CHILDREN_MEMBER_ID, WORLD_GRID_CHILDREN_ENTRY_MEMBER_ID, WORLD_ASSET_NAME_MEMBER_ID, WORLD_TILE_SPRITE_MEMBER_ID, WORLD_OBJECT_BASE_NAME_MEMBER_ID, WORLD_OBJECT_BASE_POSITION_MEMBER_ID, WORLD_OBJECT_BASE_SIZE_MEMBER_ID, WORLD_SPRITE_OBJECT_NAME_MEMBER_ID, WORLD_SPRITE_OBJECT_SPRITE_MEMBER_ID, WORLD_OBJECT_CHILDREN_MEMBER_ID, WORLD_OBJECT_CHILDREN_ENTRY_MEMBER_ID, WORLD_OBJECT_COLLIDER_MEMBER_ID, WORLD_OBJECT_PLACEMENT_TILES_MEMBER_ID, WORLD_OBJECT_PLACEMENT_TILES_ENTRY_MEMBER_ID, WORLD_OBJECT_PLACEMENT_TILE_CELL_MEMBER_ID, WORLD_TILE_INSTANCE_CELL_MEMBER_ID, WORLD_TILE_LAYER_LINK_LAYER_MEMBER_ID, WORLD_TILE_LAYER_LINK_TILES_MEMBER_ID, WORLD_TILE_LAYER_LINK_TILE_ENTRY_MEMBER_ID, WORLD_OBJECT_LAYER_LINK_LAYER_MEMBER_ID, WORLD_OBJECT_LAYER_LINK_OBJECTS_MEMBER_ID, WORLD_OBJECT_LAYER_LINK_OBJECT_ENTRY_MEMBER_ID, WORLD_TILE_SMART_TILE_SCHEMA_KEY, WORLD_TILE_SMART_TILE_MEMBER_ID, WORLD_SMART_TILE_DEFAULT_COLLIDER_SCHEMA_KEY, WORLD_SMART_TILE_DEFAULT_COLLIDER_MEMBER_ID, WORLD_SMART_TILE_RULES_SCHEMA_KEY, WORLD_SMART_TILE_RULES_MEMBER_ID, WORLD_SMART_TILE_RULES_ENTRY_MEMBER_ID, WORLD_SMART_TILE_RULE_NEIGHBORS_SCHEMA_KEY, WORLD_SMART_TILE_RULE_NEIGHBORS_MEMBER_ID, WORLD_SMART_TILE_RULE_NEIGHBORS_ENTRY_MEMBER_ID, WORLD_SMART_TILE_RULE_SPRITES_SCHEMA_KEY, WORLD_SMART_TILE_RULE_SPRITES_MEMBER_ID, WORLD_SMART_TILE_RULE_SPRITES_ENTRY_MEMBER_ID, WORLD_SMART_TILE_RULE_OUTPUT_SCHEMA_KEY, WORLD_SMART_TILE_RULE_OUTPUT_MEMBER_ID, WORLD_SMART_TILE_RULE_COLLIDER_SCHEMA_KEY, WORLD_SMART_TILE_RULE_COLLIDER_MEMBER_ID, WORLD_SMART_TILE_RULE_TRANSFORM_SCHEMA_KEY, WORLD_SMART_TILE_RULE_TRANSFORM_MEMBER_ID, WORLD_SMART_TILE_RULE_MIN_ANIMATION_SPEED_SCHEMA_KEY, WORLD_SMART_TILE_RULE_MIN_ANIMATION_SPEED_MEMBER_ID, WORLD_SMART_TILE_RULE_MAX_ANIMATION_SPEED_SCHEMA_KEY, WORLD_SMART_TILE_RULE_MAX_ANIMATION_SPEED_MEMBER_ID, WORLD_SMART_TILE_NEIGHBOR_CELL_SCHEMA_KEY, WORLD_SMART_TILE_NEIGHBOR_CELL_MEMBER_ID, WORLD_SMART_TILE_NEIGHBOR_CONDITION_SCHEMA_KEY, WORLD_SMART_TILE_NEIGHBOR_CONDITION_MEMBER_ID, WORLD_SMART_TILE_CONDITION_ENUM_ID, WORLD_SMART_TILE_OUTPUT_ENUM_ID, WORLD_SMART_TILE_COLLIDER_ENUM_ID, WORLD_SMART_TILE_TRANSFORM_ENUM_ID, WORLD_SMART_TILE_CONDITION_THIS_OPTION_ID, WORLD_SMART_TILE_OUTPUT_SINGLE_OPTION_ID, WORLD_SMART_TILE_COLLIDER_SPRITE_OPTION_ID, WORLD_SMART_TILE_TRANSFORM_FIXED_OPTION_ID, WORLD_ANIMATION_CLIP_TARGET_PARAM_ID, WORLD_ANIMATION_FRAME_TARGET_PARAM_ID, WORLD_ANIMATION_CHILD_OVERRIDE_ENTRY_PARAM_ID, WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAME, WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAMESPACE, WORLD_ANIMATION_CLIP_FPS_MEMBER_ID, WORLD_ANIMATION_CLIP_DURATION_MEMBER_ID, WORLD_ANIMATION_CLIP_FRAMES_MEMBER_ID, WORLD_ANIMATION_CLIP_FRAMES_ENTRY_MEMBER_ID, WORLD_ANIMATION_CLIP_TRACKS_MEMBER_ID, WORLD_ANIMATION_CLIP_TRACKS_ENTRY_MEMBER_ID, WORLD_ANIMATION_FRAME_INDEX_MEMBER_ID, WORLD_ANIMATION_FRAME_OVERRIDES_MEMBER_ID, WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_MEMBER_ID, WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_ENTRY_MEMBER_ID, WORLD_ANIMATION_FRAME_ACTIONS_MEMBER_ID, WORLD_ANIMATION_FRAME_ACTIONS_ENTRY_MEMBER_ID, WORLD_ANIMATION_CHILD_OVERRIDE_CHILD_MEMBER_ID, WORLD_ANIMATION_CHILD_OVERRIDE_OVERRIDES_MEMBER_ID, WORLD_ANIMATION_CHILD_TRACK_CHILD_MEMBER_ID, WORLD_ANIMATION_CHILD_TRACK_CLIP_KEY_MEMBER_ID, WORLD_ANIMATION_CHILD_TRACK_START_FRAME_MEMBER_ID, WORLD_ANIMATION_OBJECT_BASE_BINDING_MEMBER_ID, WORLD_SYSTEM_CLASS_DEFINITIONS, WORLD_SYSTEM_ANIMATION_KINDS, WORLD_SYSTEM_ALL_KINDS, WORLD_SYSTEM_SCHEMA_FIELD_SITES_BY_MEMBER_ID;
 var init_world_system_classes = __esm({
   "../src/models/classes/world-system-classes.ts"() {
     "use strict";
@@ -35779,6 +35777,7 @@ var init_world_system_classes = __esm({
     init_core();
     init_dist_node();
     init_entry_member_id();
+    init_generic_argument_member_id();
     WORLD_SORTING_LAYERS_MEMBER_ID = "7ec79ef8-a216-407f-8886-9f770bc9895b";
     WORLD_SORTING_LAYER_ENTRY_MEMBER_ID = derivedEntryMemberId(
       WORLD_SORTING_LAYERS_MEMBER_ID
@@ -35880,7 +35879,10 @@ var init_world_system_classes = __esm({
     WORLD_ANIMATION_CHILD_TRACK_CHILD_MEMBER_ID = "29abc85e-2d38-4cef-a200-88915d176d06";
     WORLD_ANIMATION_CHILD_TRACK_CLIP_KEY_MEMBER_ID = "2c816624-0281-46d3-9ed5-d20bd43519f4";
     WORLD_ANIMATION_CHILD_TRACK_START_FRAME_MEMBER_ID = "5af60692-74a0-45ea-a9ba-747854989b2a";
-    WORLD_ANIMATION_OBJECT_BASE_BINDING_MEMBER_ID = "45d30ad2-e066-4017-8982-ec9c92655b19";
+    WORLD_ANIMATION_OBJECT_BASE_BINDING_MEMBER_ID = derivedGenericArgumentMemberId(
+      WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_ENTRY_MEMBER_ID,
+      WORLD_ANIMATION_CHILD_OVERRIDE_ENTRY_PARAM_ID
+    );
     WORLD_SYSTEM_CLASS_DEFINITIONS = [
       {
         name: "NeoTileGrid",
@@ -36090,10 +36092,8 @@ var init_world_system_classes = __esm({
           {
             memberId: "ec5b5d5e-7053-4378-87d1-9cceec30ff1a",
             memberKind: "vector2",
-            // Offsets share Unity's BoxCollider2D model: cells from the
-            // object's origin-cell corner, so (0.5, 0.5) centers a 1×1
-            // collider on the origin cell.
             defaultValue: { x: 0.5, y: 0.5 },
+            docsText: "Offset from the object's origin-cell corner, measured in cells, matching Unity's BoxCollider2D model. (0.5, 0.5) centers a 1x1 collider on the origin cell.",
             name: "Offset",
             required: false,
             schemaKey: "offset"
@@ -36667,12 +36667,25 @@ var init_world_system_classes = __esm({
         worldKind: NeoWorldSystemClassKind.AnimationChildTrack
       }
     ];
-    ANIMATION_WORLD_KINDS = /* @__PURE__ */ new Set([
+    WORLD_SYSTEM_ANIMATION_KINDS = /* @__PURE__ */ new Set([
       NeoWorldSystemClassKind.AnimationClip,
       NeoWorldSystemClassKind.AnimationFrame,
       NeoWorldSystemClassKind.AnimationChildOverride,
       NeoWorldSystemClassKind.AnimationChildTrack
     ]);
+    WORLD_SYSTEM_ALL_KINDS = new Set(
+      WORLD_SYSTEM_CLASS_DEFINITIONS.map((definition2) => definition2.worldKind)
+    );
+    WORLD_SYSTEM_SCHEMA_FIELD_SITES_BY_MEMBER_ID = new Map(
+      WORLD_SYSTEM_CLASS_DEFINITIONS.flatMap(
+        (definition2) => (definition2.schemaFields ?? []).map(
+          (field) => [
+            field.memberId,
+            { worldKind: definition2.worldKind, schemaKey: field.schemaKey }
+          ]
+        )
+      )
+    );
   }
 });
 
@@ -42179,6 +42192,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 +42274,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 +42726,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 +42775,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 +44476,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 +44500,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 +44584,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 +44893,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 +44920,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 +45138,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 +45268,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 +66604,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 +68628,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.6",
   "description": "Neo Compose native project-source CLI with bidirectional sync.",
   "license": "MIT",
   "type": "module",