@neocompose/cli 0.10.0 → 0.10.2

package/CHANGELOG.md

@@ -1,9 +1,35 @@
 # Changelog
 
-## [Unreleased]
+## [0.10.2] - 2026-07-25
+
+### Fixed
+
+- Read `required` and an override's `extendsMemberId` from source instead of
+  carrying the pulled value forward. A member whose stored `required`
+  contradicted its own return type, and an override pointing past the member
+  it directly overrides, are corrected on the next push.
+- Persist a class's `schemaKeyOrder` only where the declaration order differs
+  from the one its schema map already implies. An equivalent order is stored
+  as absent rather than spelled out, and the answer no longer depends on
+  having pulled the class.
+- Restore the server-owned envelope on reconstructed records before
+  prospective animation validation, so a workspace with animation schema no
+  longer reports every class as malformed. Validation failures now name the
+  offending record.
+
+## [0.10.1] - 2026-07-25
 
 ### Changed
 
+- Derive a collection's hidden entry member id from the member that declares
+  it, instead of carrying it forward from the manifest cache. A workspace that
+  pushes without `neo/obj/` no longer re-mints every list and dictionary entry
+  member, and any workspace declaring the same collection reproduces the same
+  id. Every override in a collection family resolves to its declaring member's
+  one entry, which is what the hardcoded world entry-id table used to
+  approximate; an override that tries to change a collection's element type is
+  now an error rather than a silent collapse onto whichever member lowered
+  first.
 - Document the final relation-only world layer-link contract and keep the
   format-4 Hello World corpus free of the retired value-side binding field.
 

package/dist/neo.mjs

@@ -28844,6 +28844,19 @@ var init_ui_action_source = __esm({
   }
 });
 
+// ../src/models/members/entry-member-id.ts
+function derivedEntryMemberId(declaringMemberId) {
+  return v5_default(declaringMemberId, NEO_ENTRY_MEMBER_NAMESPACE);
+}
+var NEO_ENTRY_MEMBER_NAMESPACE;
+var init_entry_member_id = __esm({
+  "../src/models/members/entry-member-id.ts"() {
+    "use strict";
+    init_dist_node();
+    NEO_ENTRY_MEMBER_NAMESPACE = "4d1c4a2f-1a0f-5f3e-9a5c-2b7d6e8f0c31";
+  }
+});
+
 // src/project-source/lower-members.ts
 function lowerClass(context, declaration) {
   const id2 = materializedId(declaration, "class", declaration.name);
@@ -28902,11 +28915,7 @@ function lowerClass(context, declaration) {
       selectionSpan: span(parameter3.identity)
     };
   });
-  const baseEffectiveOrder = base?.schemaKeyOrder ?? (base ? Object.keys(base.schema) : []);
-  const baseOwnOrder = baseEffectiveOrder.filter(
-    (name) => Object.hasOwn(base?.schema ?? {}, name)
-  );
-  const persistedSchemaOrder = base && JSON.stringify(baseOwnOrder) === JSON.stringify(schemaKeyOrder) ? base.schemaKeyOrder : schemaKeyOrder;
+  const persistedSchemaOrder = isImpliedSchemaKeyOrder(schemaKeyOrder) ? null : schemaKeyOrder;
   return {
     id: id2,
     source: sourceIdentity2(declaration, "class", declaration.name),
@@ -29107,7 +29116,7 @@ function projectSchemaJsonValue(value) {
 }
 function memberCommon(context, ownerClass, declaration, id2, owner, base) {
   const storage = annotation(declaration.annotations, "storage");
-  const inheritedId = declaration.modifiers.includes("override") || declaration.modifiers.includes("sealed") ? base?.overrideOf ?? inheritedMemberId(context, ownerClass, declaration.name) : null;
+  const inheritedId = declaration.modifiers.includes("override") || declaration.modifiers.includes("sealed") ? inheritedMemberId(context, ownerClass, declaration.name) : null;
   return {
     id: id2,
     source: sourceIdentity2(declaration, "member", declaration.name),
@@ -29122,7 +29131,10 @@ function memberCommon(context, ownerClass, declaration, id2, owner, base) {
     accessModifier: owner.kind === "classMember" ? effectiveSourceAccessModifier(declaration.modifiers, "class") : "public",
     modifier: memberModifier2(declaration.modifiers, base?.modifier),
     locked: hasAnnotation(declaration.annotations, "locked"),
-    required: declaration.kind === "field" ? !declaration.type.nullable : base?.required ?? false,
+    // Every declaration kind carries a type, and its nullability is the whole
+    // of what `required` means. Properties and getters used to fall back to
+    // the pulled value, which left a fresh workspace calling them optional.
+    required: !declaration.type.nullable,
     defaultValue: null,
     overrideOf: inheritedId,
     system: systemMetadata(declaration.annotations),
@@ -29271,7 +29283,9 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
         multiselect: true
       };
     }
-    const entryId = base?.kind === "list" ? base.entryMemberId : pendingDerivedId("member-entry", id2);
+    const entryId = derivedEntryMemberId(
+      declaringCollectionMemberId(context, id2, common.overrideOf)
+    );
     lowerCollectionEntry(context, ownerClass, entryType, entryId, id2);
     return {
       ...common,
@@ -29288,7 +29302,9 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
     }
     const keyType = requiredTypeArgument(fieldType, 0);
     const entryType = requiredTypeArgument(fieldType, 1);
-    const entryId = base?.kind === "dictionary" ? base.entryMemberId : pendingDerivedId("member-entry", id2);
+    const entryId = derivedEntryMemberId(
+      declaringCollectionMemberId(context, id2, common.overrideOf)
+    );
     lowerCollectionEntry(context, ownerClass, entryType, entryId, id2);
     return {
       ...common,
@@ -29413,7 +29429,39 @@ function assertListAnnotationPlacement(ownerClass, declaration, loweredKind) {
     );
   }
 }
+function declaringCollectionMemberId(context, memberId, overrideOf) {
+  const visited = /* @__PURE__ */ new Set([memberId]);
+  let declaring = memberId;
+  let parent = overrideOf;
+  while (parent !== null && !visited.has(parent)) {
+    visited.add(parent);
+    declaring = parent;
+    parent = overrideParentMemberId(context, parent);
+  }
+  return declaring;
+}
+function overrideParentMemberId(context, memberId) {
+  const lowered = context.loweredMembers.get(memberId);
+  if (lowered !== void 0) return lowered.overrideOf;
+  const persisted = context.baseMembers.get(memberId);
+  if (persisted !== void 0) return persisted.overrideOf;
+  const placement = context.sourceMembersById.get(memberId);
+  if (placement === void 0) return null;
+  const { ownerClass, member } = placement;
+  const overrides = member.modifiers.includes("override") || member.modifiers.includes("sealed");
+  return overrides ? inheritedMemberId(context, ownerClass, member.name) : null;
+}
 function lowerCollectionEntry(context, ownerClass, entryType, entryId, parentMemberId) {
+  const already = context.entryTypesByEntryId.get(entryId);
+  if (already !== void 0) {
+    if (JSON.stringify(already) !== JSON.stringify(entryType)) {
+      throw new Error(
+        `Collection member ${ownerClass.name}.${parentMemberId} declares entry type ${entryType.name}, but the member it overrides declares ${already.name}. An override cannot change a collection's element type.`
+      );
+    }
+    return;
+  }
+  context.entryTypesByEntryId.set(entryId, entryType);
   if (context.loweredMembers.has(entryId)) return;
   const base = context.baseMembers.get(entryId);
   if (base) {
@@ -29425,7 +29473,7 @@ function lowerCollectionEntry(context, ownerClass, entryType, entryId, parentMem
   }
   const declaration = {
     id: entryId,
-    state: entryId.startsWith("__pending__:") ? "pending" : "stable",
+    state: "stable",
     source: {
       uri: ownerClass.source.uri,
       range: ownerClass.source.range
@@ -30112,6 +30160,9 @@ function referenceId(raw) {
     return null;
   }
 }
+function isImpliedSchemaKeyOrder(order) {
+  return order.every((key, index) => index === 0 || order[index - 1] <= key);
+}
 function memberModifier2(modifiers, baseModifier) {
   if (modifiers.includes("override")) {
     if (modifiers.includes("abstract")) return "abstractOverride";
@@ -30251,6 +30302,7 @@ var init_lower_members = __esm({
     init_src();
     init_lower_support();
     init_ui_action_source();
+    init_entry_member_id();
     UNSET_LIST_COLUMN_WIDTH = -1;
     primitiveMemberKinds = /* @__PURE__ */ new Set([
       "null",
@@ -30645,6 +30697,7 @@ function lowerProjectSchemaV4(base, analysis, options = {}) {
     genericParametersByClass,
     enumOptionsByName,
     loweredMembers: /* @__PURE__ */ new Map(),
+    entryTypesByEntryId: /* @__PURE__ */ new Map(),
     placements: /* @__PURE__ */ new Map(),
     staticValueIdsBySymbol: options.staticValueIdsBySymbol ?? /* @__PURE__ */ new Map(),
     templateIdsByName: new Map(
@@ -35714,47 +35767,7 @@ function worldAnimationChildOverrideBindingMemberId(classId) {
     WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAMESPACE
   );
 }
-function canonicalWorldSystemListEntryMemberId(args) {
-  const baseMemberId = args.extendsMemberId ?? args.id;
-  if (baseMemberId === WORLD_GRID_CHILDREN_MEMBER_ID) {
-    return WORLD_GRID_CHILDREN_ENTRY_MEMBER_ID;
-  }
-  if (baseMemberId === WORLD_OBJECT_CHILDREN_MEMBER_ID) {
-    return WORLD_OBJECT_CHILDREN_ENTRY_MEMBER_ID;
-  }
-  if (baseMemberId === WORLD_OBJECT_PLACEMENT_TILES_MEMBER_ID) {
-    return WORLD_OBJECT_PLACEMENT_TILES_ENTRY_MEMBER_ID;
-  }
-  if (baseMemberId === WORLD_OBJECT_LAYER_LINK_OBJECTS_MEMBER_ID) {
-    return WORLD_OBJECT_LAYER_LINK_OBJECT_ENTRY_MEMBER_ID;
-  }
-  if (baseMemberId === WORLD_SMART_TILE_RULES_MEMBER_ID) {
-    return WORLD_SMART_TILE_RULES_ENTRY_MEMBER_ID;
-  }
-  if (baseMemberId === WORLD_SMART_TILE_RULE_NEIGHBORS_MEMBER_ID) {
-    return WORLD_SMART_TILE_RULE_NEIGHBORS_ENTRY_MEMBER_ID;
-  }
-  if (baseMemberId === WORLD_SMART_TILE_RULE_SPRITES_MEMBER_ID) {
-    return WORLD_SMART_TILE_RULE_SPRITES_ENTRY_MEMBER_ID;
-  }
-  if (baseMemberId === WORLD_ANIMATION_CLIP_FRAMES_MEMBER_ID) {
-    return WORLD_ANIMATION_CLIP_FRAMES_ENTRY_MEMBER_ID;
-  }
-  if (baseMemberId === WORLD_ANIMATION_CLIP_TRACKS_MEMBER_ID) {
-    return WORLD_ANIMATION_CLIP_TRACKS_ENTRY_MEMBER_ID;
-  }
-  if (baseMemberId === WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_MEMBER_ID) {
-    return WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_ENTRY_MEMBER_ID;
-  }
-  if (baseMemberId === WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_ENTRY_MEMBER_ID) {
-    return WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_ENTRY_MEMBER_ID;
-  }
-  if (baseMemberId === WORLD_ANIMATION_FRAME_ACTIONS_MEMBER_ID) {
-    return WORLD_ANIMATION_FRAME_ACTIONS_ENTRY_MEMBER_ID;
-  }
-  return args.entryMemberId;
-}
-var WORLD_SORTING_LAYERS_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, ANIMATION_WORLD_KINDS;
 var init_world_system_classes = __esm({
   "../src/models/classes/world-system-classes.ts"() {
     "use strict";
@@ -35762,7 +35775,11 @@ var init_world_system_classes = __esm({
     init_member_storage();
     init_core();
     init_dist_node();
+    init_entry_member_id();
     WORLD_SORTING_LAYERS_MEMBER_ID = "7ec79ef8-a216-407f-8886-9f770bc9895b";
+    WORLD_SORTING_LAYER_ENTRY_MEMBER_ID = derivedEntryMemberId(
+      WORLD_SORTING_LAYERS_MEMBER_ID
+    );
     WORLD_SORTING_LAYER_NAME_MEMBER_ID = "e963862e-6228-4594-8220-8ef06098c253";
     WORLD_LAYER_NAME_MEMBER_ID = "788a3dbc-6167-4320-83aa-1e884924f776";
     WORLD_LAYER_SORTING_LAYER_MEMBER_ID = "89dbb12e-1d7c-42ad-b872-63fc7fe8bd5b";
@@ -35770,7 +35787,9 @@ var init_world_system_classes = __esm({
     WORLD_SORTING_ORDER_MIN = -32768;
     WORLD_SORTING_ORDER_MAX = 32767;
     WORLD_GRID_CHILDREN_MEMBER_ID = "98578ba3-a70e-4397-9283-996a898d44c8";
-    WORLD_GRID_CHILDREN_ENTRY_MEMBER_ID = "f1d89b43-7de6-4d50-9614-342bcdf85531";
+    WORLD_GRID_CHILDREN_ENTRY_MEMBER_ID = derivedEntryMemberId(
+      WORLD_GRID_CHILDREN_MEMBER_ID
+    );
     WORLD_ASSET_NAME_MEMBER_ID = "3b02422f-1ef2-4a50-8386-155d5001082b";
     WORLD_TILE_SPRITE_MEMBER_ID = "cbd6db9a-f473-44b5-b913-7cdc06452f35";
     WORLD_OBJECT_BASE_NAME_MEMBER_ID = "b21bfd01-1234-4f49-ab6b-889f829cb148";
@@ -35779,31 +35798,37 @@ var init_world_system_classes = __esm({
     WORLD_SPRITE_OBJECT_NAME_MEMBER_ID = "441cb790-a45f-4488-a5a9-6f375af6c369";
     WORLD_SPRITE_OBJECT_SPRITE_MEMBER_ID = "e9288ba9-f5a2-4485-8443-6afb155b31e0";
     WORLD_OBJECT_CHILDREN_MEMBER_ID = "bb5d2cf1-a0dd-4eba-a62e-0e1bf0177071";
-    WORLD_OBJECT_CHILDREN_ENTRY_MEMBER_ID = "b3280478-f039-47a2-aa18-918175818bcb";
+    WORLD_OBJECT_CHILDREN_ENTRY_MEMBER_ID = derivedEntryMemberId(
+      WORLD_OBJECT_CHILDREN_MEMBER_ID
+    );
     WORLD_OBJECT_COLLIDER_MEMBER_ID = "a0083c92-72f7-405f-8863-ff86f995d36d";
     WORLD_OBJECT_PLACEMENT_TILES_MEMBER_ID = "5a9ca1f5-a21b-4d4e-8c55-00341af594b4";
-    WORLD_OBJECT_PLACEMENT_TILES_ENTRY_MEMBER_ID = "c2bf0c92-1d24-4950-bea3-37d5f195728d";
+    WORLD_OBJECT_PLACEMENT_TILES_ENTRY_MEMBER_ID = derivedEntryMemberId(WORLD_OBJECT_PLACEMENT_TILES_MEMBER_ID);
     WORLD_OBJECT_PLACEMENT_TILE_CELL_MEMBER_ID = "b0b3c45c-a87d-4218-b056-7418ef46aac5";
     WORLD_TILE_INSTANCE_CELL_MEMBER_ID = "f4be2707-74f5-4833-9784-e81bb2474330";
     WORLD_TILE_LAYER_LINK_LAYER_MEMBER_ID = "325dba0e-5967-4e18-937e-5c6800b68abc";
     WORLD_TILE_LAYER_LINK_TILES_MEMBER_ID = "98655d2b-ad0b-45e2-a901-62600b4d3a22";
-    WORLD_TILE_LAYER_LINK_TILE_ENTRY_MEMBER_ID = "04383910-20a1-4c7f-ad90-f87e165083ba";
+    WORLD_TILE_LAYER_LINK_TILE_ENTRY_MEMBER_ID = derivedEntryMemberId(
+      WORLD_TILE_LAYER_LINK_TILES_MEMBER_ID
+    );
     WORLD_OBJECT_LAYER_LINK_LAYER_MEMBER_ID = "9cc0ab67-e138-4d11-8011-fab7d7a75b13";
     WORLD_OBJECT_LAYER_LINK_OBJECTS_MEMBER_ID = "f8e217b1-da89-4819-9c8d-e9c9da2bdfb2";
-    WORLD_OBJECT_LAYER_LINK_OBJECT_ENTRY_MEMBER_ID = "934a2525-f95d-4c09-9504-b71da30b9186";
+    WORLD_OBJECT_LAYER_LINK_OBJECT_ENTRY_MEMBER_ID = derivedEntryMemberId(WORLD_OBJECT_LAYER_LINK_OBJECTS_MEMBER_ID);
     WORLD_TILE_SMART_TILE_SCHEMA_KEY = "SmartTile";
     WORLD_TILE_SMART_TILE_MEMBER_ID = "96cda8f5-3100-45b5-adcb-0552d21504dd";
     WORLD_SMART_TILE_DEFAULT_COLLIDER_SCHEMA_KEY = "DefaultCollider";
     WORLD_SMART_TILE_DEFAULT_COLLIDER_MEMBER_ID = "0a51bdef-4b3e-49d6-913b-11cbea98bced";
     WORLD_SMART_TILE_RULES_SCHEMA_KEY = "Rules";
     WORLD_SMART_TILE_RULES_MEMBER_ID = "97cb9d95-2d54-4809-ae88-0b0ba7859248";
-    WORLD_SMART_TILE_RULES_ENTRY_MEMBER_ID = "fa146cb3-b0d5-4a87-a781-918b78307b20";
+    WORLD_SMART_TILE_RULES_ENTRY_MEMBER_ID = derivedEntryMemberId(
+      WORLD_SMART_TILE_RULES_MEMBER_ID
+    );
     WORLD_SMART_TILE_RULE_NEIGHBORS_SCHEMA_KEY = "Neighbors";
     WORLD_SMART_TILE_RULE_NEIGHBORS_MEMBER_ID = "8bfadaa8-14e9-4488-a103-ee688c1cc9c4";
-    WORLD_SMART_TILE_RULE_NEIGHBORS_ENTRY_MEMBER_ID = "11873fad-7426-46cf-97d6-47b45bd1c091";
+    WORLD_SMART_TILE_RULE_NEIGHBORS_ENTRY_MEMBER_ID = derivedEntryMemberId(WORLD_SMART_TILE_RULE_NEIGHBORS_MEMBER_ID);
     WORLD_SMART_TILE_RULE_SPRITES_SCHEMA_KEY = "Sprites";
     WORLD_SMART_TILE_RULE_SPRITES_MEMBER_ID = "fd3a7f0f-cff8-4069-9b19-004015a6aca1";
-    WORLD_SMART_TILE_RULE_SPRITES_ENTRY_MEMBER_ID = "2cd93779-d755-4368-b064-2361463526ea";
+    WORLD_SMART_TILE_RULE_SPRITES_ENTRY_MEMBER_ID = derivedEntryMemberId(WORLD_SMART_TILE_RULE_SPRITES_MEMBER_ID);
     WORLD_SMART_TILE_RULE_OUTPUT_SCHEMA_KEY = "Output";
     WORLD_SMART_TILE_RULE_OUTPUT_MEMBER_ID = "9b22d8df-ea41-4c76-9d2e-a6c64c95a64a";
     WORLD_SMART_TILE_RULE_COLLIDER_SCHEMA_KEY = "Collider";
@@ -35834,15 +35859,19 @@ var init_world_system_classes = __esm({
     WORLD_ANIMATION_CLIP_FPS_MEMBER_ID = "af2d8db8-817b-46f0-adbe-cf9113b77155";
     WORLD_ANIMATION_CLIP_DURATION_MEMBER_ID = "e1a1ba86-2599-43dc-a19a-46d08a2e4256";
     WORLD_ANIMATION_CLIP_FRAMES_MEMBER_ID = "485b0f05-ec7b-4e61-ba80-9a5d7d262b39";
-    WORLD_ANIMATION_CLIP_FRAMES_ENTRY_MEMBER_ID = "9a08b7e8-9d75-4945-8648-b2ce916cea1a";
+    WORLD_ANIMATION_CLIP_FRAMES_ENTRY_MEMBER_ID = derivedEntryMemberId(
+      WORLD_ANIMATION_CLIP_FRAMES_MEMBER_ID
+    );
     WORLD_ANIMATION_CLIP_TRACKS_MEMBER_ID = "eb602654-04a9-4766-860f-300b443be86e";
-    WORLD_ANIMATION_CLIP_TRACKS_ENTRY_MEMBER_ID = "cb7b2bbc-3c66-458f-9ed5-362715c09ece";
+    WORLD_ANIMATION_CLIP_TRACKS_ENTRY_MEMBER_ID = derivedEntryMemberId(
+      WORLD_ANIMATION_CLIP_TRACKS_MEMBER_ID
+    );
     WORLD_ANIMATION_FRAME_INDEX_MEMBER_ID = "0dbdd0f9-9dd2-4b4b-9403-50180c1500dd";
     WORLD_ANIMATION_FRAME_OVERRIDES_MEMBER_ID = "8ab7bb00-a475-43f0-8579-1b08f133d658";
     WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_MEMBER_ID = "a5905750-c472-46a8-89e9-f04f0bf66696";
-    WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_ENTRY_MEMBER_ID = "bf62d243-5184-4b09-98e0-8682827cb66d";
+    WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_ENTRY_MEMBER_ID = derivedEntryMemberId(WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_MEMBER_ID);
     WORLD_ANIMATION_FRAME_ACTIONS_MEMBER_ID = "23e05410-6428-4bd1-b085-c0390ed7fcb7";
-    WORLD_ANIMATION_FRAME_ACTIONS_ENTRY_MEMBER_ID = "4c195860-4fb3-4e09-b33c-fb5a37601c25";
+    WORLD_ANIMATION_FRAME_ACTIONS_ENTRY_MEMBER_ID = derivedEntryMemberId(WORLD_ANIMATION_FRAME_ACTIONS_MEMBER_ID);
     WORLD_ANIMATION_CHILD_OVERRIDE_CHILD_MEMBER_ID = "6e15db41-a6f2-43fd-9793-c52fe4f3d0f8";
     WORLD_ANIMATION_CHILD_OVERRIDE_OVERRIDES_MEMBER_ID = "819b3743-0c3d-4896-b679-9aeeb73255f4";
     WORLD_ANIMATION_CHILD_TRACK_CHILD_MEMBER_ID = "29abc85e-2d38-4cef-a200-88915d176d06";
@@ -37144,12 +37173,7 @@ function isAnimationChildOverrideEntrySlot(slotMember, members) {
     const id2 = getOptionalString(current, "id");
     if (id2 === void 0 || visited.has(id2)) return false;
     visited.add(id2);
-    const canonicalId = canonicalWorldSystemListEntryMemberId({
-      entryMemberId: id2,
-      extendsMemberId: current.extendsMemberId,
-      id: id2
-    });
-    if (canonicalId === WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_ENTRY_MEMBER_ID) {
+    if (id2 === WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_MEMBER_ID || id2 === WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_ENTRY_MEMBER_ID) {
       return true;
     }
     current = typeof current.extendsMemberId === "string" ? membersById.get(current.extendsMemberId) : void 0;
@@ -48893,28 +48917,28 @@ function validateProspectiveAnimationRecordsV4(records2) {
     if (record3.recordKind === "project") {
       if (!isProject(record3.data)) {
         throw new Error(
-          "Prospective animation validation received an invalid project record."
+          `Prospective animation validation received an invalid project record ${recordLabel(record3.data)}.`
         );
       }
       project = record3.data;
     } else if (record3.recordKind === "class") {
       if (!isNeoSchemaClass(record3.data)) {
         throw new Error(
-          "Prospective animation validation received an invalid class record."
+          `Prospective animation validation received an invalid class record ${recordLabel(record3.data)}.`
         );
       }
       classes.push(record3.data);
     } else if (record3.recordKind === "member") {
       if (!isMember(record3.data)) {
         throw new Error(
-          "Prospective animation validation received an invalid member record."
+          `Prospective animation validation received an invalid member record ${recordLabel(record3.data)}.`
         );
       }
       members.push(record3.data);
     } else if (record3.recordKind === "value") {
       if (!isMemberValue(record3.data)) {
         throw new Error(
-          "Prospective animation validation received an invalid value record."
+          `Prospective animation validation received an invalid value record ${recordLabel(record3.data)}.`
         );
       }
       values.push(record3.data);
@@ -48923,6 +48947,18 @@ function validateProspectiveAnimationRecordsV4(records2) {
   if (project === void 0) return;
   assertAnimationClipDocumentValid({ project, classes, members, values });
 }
+function serverEnvelope(stored) {
+  if (!isObjectRecord2(stored)) return {};
+  const envelope = {};
+  for (const field of ["projectId", "createdAt", "updatedAt"]) {
+    if (stored[field] !== void 0) envelope[field] = stored[field];
+  }
+  return envelope;
+}
+function recordLabel(data) {
+  const id2 = typeof data.id === "string" ? data.id : "<no id>";
+  return typeof data.name === "string" ? `${id2} ("${data.name}")` : id2;
+}
 function prospectiveAnimationRecords(base, reconstructed3, changes, seeds) {
   const prospective = /* @__PURE__ */ new Map();
   for (const [key, state] of Object.entries(base)) {
@@ -48935,16 +48971,25 @@ function prospectiveAnimationRecords(base, reconstructed3, changes, seeds) {
     const key = recordStateKey(change.recordKind, change.recordId);
     if (change.kind === "delete") prospective.delete(key);
   }
-  for (const [key, record3] of reconstructed3) {
-    prospective.set(key, {
-      recordKind: record3.recordKind,
-      data: record3.fullData
-    });
-  }
-  const projectId = [...prospective.values()].find(
+  const projectRecord = [...prospective.values()].find(
     (record3) => record3.recordKind === "project"
-  )?.data.id;
+  ) ?? [...reconstructed3.values()].filter((record3) => record3.recordKind === "project").map((record3) => ({
+    recordKind: record3.recordKind,
+    data: record3.fullData
+  }))[0];
+  const projectId = projectRecord?.data.id;
   const seedEnvelope = typeof projectId === "string" ? { projectId, createdAt: 0, updatedAt: 0 } : {};
+  for (const [key, record3] of reconstructed3) {
+    const envelope = {
+      ...seedEnvelope,
+      ...serverEnvelope(prospective.get(key)?.data)
+    };
+    const data = { ...record3.fullData };
+    for (const [field, value] of Object.entries(envelope)) {
+      if (data[field] === void 0) data[field] = value;
+    }
+    prospective.set(key, { recordKind: record3.recordKind, data });
+  }
   for (const [memberId, seed] of seeds) {
     for (const bindingMember of seed.bindingMembers ?? []) {
       prospective.set(recordStateKey("member", bindingMember.id), {

package/package.json

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