@neocompose/cli 0.15.0 → 0.16.0

package/dist/neo.mjs

@@ -672,6 +672,11 @@ function toCanonical(value) {
 function isPendingId(id2) {
   return id2.startsWith(PENDING_ID_PREFIX);
 }
+function isUuidV4Id(id2) {
+  return /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/u.test(
+    id2
+  );
+}
 var PENDING_ID_PREFIX;
 var init_projection = __esm({
   "src/project-sync/projection.ts"() {
@@ -856,6 +861,7 @@ var init_document_contracts = __esm({
           "multiselect",
           "collectionMemberId",
           "collectionValueId",
+          "declaredTypeInfo",
           "dialogueGroupId",
           "code",
           "setterCode",
@@ -892,6 +898,7 @@ var init_document_contracts = __esm({
           partial: "missingIsFalseOnFullMember",
           multiselect: "missingIsFalseOnFullMember",
           collectionValueId: "missingIsNullOnFullMember",
+          declaredTypeInfo: "nullIsAbsent",
           dialogueGroupId: "missingIsNullOnFullMember",
           templateId: "missingIsNullOnFullMember",
           setterCode: "nullIsAbsent",
@@ -916,11 +923,13 @@ var init_document_contracts = __esm({
           "genericParams",
           "extendsGenericBindings",
           "constructorProjections",
-          "constructorIds"
+          "constructorIds",
+          "targetMemberId"
         ],
         derived: [],
         volatile: ["projectId", "createdAt", "updatedAt"],
         normalization: {
+          targetMemberId: "nullIsAbsent",
           schemaKeyOrder: "nullIsAbsent",
           extendsClassId: "nullIsAbsent",
           implementsInterfaceIds: "nullOrEmptyArrayIsAbsent",
@@ -12970,7 +12979,7 @@ var init_project_schema_contract_generated = __esm({
   "../packages/neoscript-language/src/project-schema-contract.generated.ts"() {
     "use strict";
     PROJECT_SCHEMA_MANIFEST_FORMAT_VERSION = 3;
-    PROJECT_SCHEMA_MANIFEST_CONTRACT_VERSION = "3.6";
+    PROJECT_SCHEMA_MANIFEST_CONTRACT_VERSION = "3.8";
     PROJECT_FILE_UPLOAD_BATCH_SIZE = 32;
     NEO_PROJECT_SOURCE_RECORD_CONTRACT = {
       "recordFields": {
@@ -13010,6 +13019,7 @@ var init_project_schema_contract_generated = __esm({
           "multiselect",
           "collectionMemberId",
           "collectionValueId",
+          "declaredTypeInfo",
           "dialogueGroupId",
           "code",
           "setterCode",
@@ -13037,7 +13047,8 @@ var init_project_schema_contract_generated = __esm({
           "genericParams",
           "extendsGenericBindings",
           "constructorProjections",
-          "constructorIds"
+          "constructorIds",
+          "targetMemberId"
         ],
         "constructor": [
           "id",
@@ -13247,7 +13258,14 @@ var init_project_schema_contract_generated = __esm({
           "AnimationClip",
           "AnimationFrame",
           "AnimationChildOverride",
-          "AnimationChildTrack"
+          "AnimationFrameBase",
+          "AnimationSegmentFrame",
+          "AnimationSegment",
+          "SpriteAnimationSegment",
+          "AnimationTrack",
+          "AnimationChildTrack",
+          "AnimationSegmentTrack",
+          "SpriteAnimationSegmentTrack"
         ],
         "NeoTextureType": [
           "Default",
@@ -14412,6 +14430,16 @@ var init_project_schema_contract_generated = __esm({
             }
           ]
         },
+        "NeoClassSchemaSettings": {
+          "constructors": [],
+          "properties": [
+            {
+              "type": "string",
+              "name": "TargetMember",
+              "default": "string.Empty"
+            }
+          ]
+        },
         "NeoDialogueSettings": {
           "constructors": [],
           "properties": [
@@ -15630,7 +15658,7 @@ function settingsFields(context) {
         { name: "saveOptionChoices", type: "bool" }
       ];
     }
-    return [];
+    return classSchemaSettingsFields();
   }
   if (context.kind === "member" && context.memberKind === "function") {
     return settingsClassFields("NeoFunctionSettings");
@@ -15918,6 +15946,12 @@ function lookupSettingsFields() {
     name: field.name === "collectionMember" ? "collection" : field.name === "collectionValueMember" ? "collectionValue" : field.name
   }));
 }
+function classSchemaSettingsFields() {
+  return settingsClassFields("NeoClassSchemaSettings").map((field) => ({
+    ...field,
+    name: field.name === "targetMember" ? "target" : field.name
+  }));
+}
 function mergeFields(...groups) {
   const fields = /* @__PURE__ */ new Map();
   for (const group of groups) {
@@ -16263,7 +16297,10 @@ function validateExpression(expression, expected, scope, environment, uri, range
       );
       validateExpression(
         entry.value,
-        field ? semanticType(field.type) : void 0,
+        field ? substituteSemanticType(
+          semanticType(field.member.type),
+          field.bindings
+        ) : void 0,
         scope,
         environment,
         uri,
@@ -16364,16 +16401,44 @@ function validateExpression(expression, expected, scope, environment, uri, range
 function sourceClassFieldByName(declaration, name, environment) {
   const visited = /* @__PURE__ */ new Set();
   let current = declaration;
+  let bindings = /* @__PURE__ */ new Map();
   while (current !== void 0 && !visited.has(current.name)) {
     visited.add(current.name);
     const member = current.members.find(
       (candidate) => candidate.kind === "field" && candidate.name === name
     );
-    if (member !== void 0) return member;
-    current = current.baseTypes.map((base) => environment.types.get(base.name)).find((candidate) => candidate !== void 0);
+    if (member !== void 0) return { member, bindings };
+    const base = current.baseTypes.find(
+      (candidate) => environment.types.has(candidate.name)
+    );
+    const next = base === void 0 ? void 0 : environment.types.get(base.name);
+    if (base !== void 0 && next !== void 0) {
+      bindings = new Map(
+        next.genericParameters.flatMap((parameter3, index) => {
+          const argument2 = base.typeArguments[index];
+          return argument2 === void 0 ? [] : [
+            [
+              parameter3.name,
+              substituteSemanticType(semanticType(argument2), bindings)
+            ]
+          ];
+        })
+      );
+    }
+    current = next;
   }
   return void 0;
 }
+function substituteSemanticType(type, bindings) {
+  const bound = bindings.get(type.name);
+  if (bound !== void 0 && (type.arguments ?? []).length === 0) {
+    return type.nullable === void 0 ? bound : { ...bound, nullable: type.nullable };
+  }
+  const argumentsList2 = (type.arguments ?? []).map(
+    (argument2) => substituteSemanticType(argument2, bindings)
+  );
+  return { ...type, arguments: argumentsList2 };
+}
 function semanticTypesAssignable(actual, expected) {
   if (actual.name === expected.name) return true;
   if (actual.name === "int" && (expected.name === "float" || expected.name === "decimal")) {
@@ -16484,6 +16549,37 @@ function validateReferenceExpression(expression, expected, environment, uri, ran
     malformed("Reference accepts at most one generic target type.");
     return;
   }
+  const keyIndex = names.findIndex((name) => name === "key");
+  if (keyIndex >= 0) {
+    const indexIndex = names.findIndex((name) => name === "index");
+    if (keyIndex !== 0) {
+      malformed("Reference key must be the first argument.");
+      return;
+    }
+    if (names.some((name) => name !== "key" && name !== "index")) {
+      malformed("Reference(key: ...) accepts only key: and index: arguments.");
+      return;
+    }
+    if (expression.args.length !== (indexIndex >= 0 ? 2 : 1)) {
+      malformed("Reference(key: ...) accepts only key: and index: arguments.");
+      return;
+    }
+    const keyArgument = expression.args[keyIndex];
+    if (keyArgument?.kind !== "litString" || keyArgument.value.length === 0) {
+      malformed("Reference key must be one non-empty string literal.");
+      return;
+    }
+    if (indexIndex >= 0 && expression.args[indexIndex]?.kind !== "ident") {
+      malformed("Reference index must name the indexed member.");
+      return;
+    }
+    if (!typeArguments[0]) {
+      malformed(
+        "Reference(key: ...) requires an explicit generic target type."
+      );
+    }
+    return;
+  }
   if (expression.args.length !== 1 || hasId && (idIndex !== 0 || names.some((name) => name !== "id")) || !hasId && names.some((name) => name !== null)) {
     malformed(
       "Reference requires exactly one symbol argument or one named id: string argument."
@@ -16512,6 +16608,7 @@ function validateReferenceExpression(expression, expected, environment, uri, ran
     return;
   }
   const path = referenceTargetPath(argument2);
+  if (path !== null && path.startsWith("root.")) return;
   const target = path ? environment.referenceTargets.get(path) : void 0;
   if (!target) {
     malformed(
@@ -18290,7 +18387,7 @@ function validateInterfaceMemberConflicts(ref, environment, diagnostics) {
         candidate.member,
         candidate.substitution,
         prior,
-        false,
+        "interface-inherited",
         environment
       ) === null) {
         continue;
@@ -18321,7 +18418,7 @@ function validateInterfaceMemberConflicts(ref, environment, diagnostics) {
       member,
       /* @__PURE__ */ new Map(),
       prior,
-      false,
+      "interface-inherited",
       environment
     );
     if (!mismatch) continue;
@@ -18348,7 +18445,7 @@ function validateAbstractInterfaceMembers(ref, environment, diagnostics) {
       implementation.member,
       implementation.substitution,
       contract,
-      true,
+      "interface-contract",
       environment
     );
     if (!mismatch) continue;
@@ -18570,9 +18667,8 @@ function validateClassOverrides(ref, environment, diagnostics) {
       member,
       identitySubstitution(ref),
       target,
-      false,
-      environment,
-      true
+      "class-override",
+      environment
     );
     const readOnlyContract = candidates.find(
       (candidate) => candidate.member.modifiers.includes("abstract") && candidate.member.modifiers.includes("readonly")
@@ -18620,10 +18716,15 @@ function validateClassOverrides(ref, environment, diagnostics) {
     }
   }
 }
+function isPlatformImplementedSystemMember(member) {
+  if (!member.modifiers.includes("protected")) return false;
+  return member.annotations.some((entry) => entry.name === "system");
+}
 function validateConcreteClass(ref, environment, diagnostics) {
   const effective = effectiveClassMembers(ref, environment);
   for (const member of effective.values()) {
     if (!member.member.modifiers.includes("abstract")) continue;
+    if (isPlatformImplementedSystemMember(member.member)) continue;
     diagnose(
       diagnostics,
       ref.uri,
@@ -18640,7 +18741,7 @@ function validateConcreteClass(ref, environment, diagnostics) {
       implementation.member,
       implementation.substitution,
       required2,
-      true,
+      "interface-contract",
       environment
     ) : null;
     if (implementation && !implementation.member.modifiers.includes("abstract") && !implementation.member.modifiers.includes("static") && mismatch === null) {
@@ -18770,13 +18871,35 @@ function interfaceMembers(view, environment) {
   visit(view);
   return members;
 }
-function memberCompatibility(implementation, implementationSubstitution, target, allowStoredInterfaceImplementation, environment, allowStoredOverrideNullability = false) {
+function isAbstractPropertyContract(target, accessors) {
+  if (target.kind !== "property") return false;
+  if (!target.modifiers.includes("abstract")) return false;
+  return accessors.get && !accessors.set;
+}
+function isClassTypedShape(type, environment, genericParameters, seen = /* @__PURE__ */ new Set()) {
+  if (environment.classes.has(type.name)) return true;
+  if (seen.has(type.name)) return false;
+  seen.add(type.name);
+  const constraint = genericParameters.get(type.name)?.constraint;
+  if (constraint === void 0) return false;
+  return isClassTypedShape(
+    typeShape(constraint),
+    environment,
+    genericParameters,
+    seen
+  );
+}
+function memberCompatibility(implementation, implementationSubstitution, target, mode, environment) {
+  const treatTargetAsContract = mode === "interface-contract";
+  const isClassOverride = mode === "class-override";
   const implementationFamily = implementation.kind === "function" ? "function" : "value";
   const targetFamily = target.member.kind === "function" ? "function" : "value";
   if (implementationFamily !== targetFamily) {
     return `expected a ${targetFamily} member, got ${implementationFamily}`;
   }
-  if (implementationFamily === "value" && implementation.kind !== target.member.kind && !allowStoredInterfaceImplementation) {
+  const targetAccessors = target.member.kind === "function" ? { get: false, set: false } : valueAccessors(target.member, environment);
+  const targetIsContract = treatTargetAsContract || isClassOverride && isAbstractPropertyContract(target.member, targetAccessors);
+  if (implementationFamily === "value" && implementation.kind !== target.member.kind && !targetIsContract) {
     return `expected a ${target.member.kind} member, got ${implementation.kind}`;
   }
   const implementationType = typeShape(
@@ -18784,13 +18907,23 @@ function memberCompatibility(implementation, implementationSubstitution, target,
     implementationSubstitution
   );
   const targetType = typeShape(target.member.type, target.substitution);
-  const targetAccessors = target.member.kind === "function" ? { get: false, set: false } : valueAccessors(target.member, environment);
-  const permitsCovariantGetter = allowStoredInterfaceImplementation && implementationFamily === "value" && targetAccessors.get && !targetAccessors.set;
-  const permitsStoredOverrideNullability = allowStoredOverrideNullability && implementation.kind === "field" && target.member.kind === "field" && typesEqual(
-    { ...implementationType, nullable: false },
-    { ...targetType, nullable: false }
+  const implementationGenericParameters = genericParameterMap(
+    environment.memberOwners.get(implementation)?.declaration.genericParameters ?? []
   );
-  if (!typesEqual(implementationType, targetType) && !(permitsCovariantGetter && isTypeAssignable(implementationType, targetType, environment, /* @__PURE__ */ new Map())) && !permitsStoredOverrideNullability) {
+  const permitsCovariantGetter = targetIsContract && implementationFamily === "value" && targetAccessors.get && !targetAccessors.set;
+  const permitsClassCovariance = isClassOverride && implementationFamily === "value" && isClassTypedShape(
+    implementationType,
+    environment,
+    implementationGenericParameters
+  ) && isClassTypedShape(targetType, environment, implementationGenericParameters);
+  const permitsStoredOverrideNullability = isClassOverride && implementation.kind === "field" && (target.member.kind === "field" || isAbstractPropertyContract(target.member, targetAccessors));
+  const comparableImplementationType = permitsStoredOverrideNullability ? { ...implementationType, nullable: targetType.nullable } : implementationType;
+  if (!typesEqual(comparableImplementationType, targetType) && !((permitsCovariantGetter || permitsClassCovariance) && isTypeAssignable(
+    comparableImplementationType,
+    targetType,
+    environment,
+    implementationGenericParameters
+  ))) {
     return `type '${formatType2(implementationType)}' does not match '${formatType2(targetType)}'`;
   }
   if (implementation.kind !== "function" || target.member.kind !== "function") {
@@ -24202,6 +24335,11 @@ function memberFromDocument(record3, members, owners, classNames, context) {
         field("multiselect", false),
         record3,
         "multiselect"
+      ),
+      declaredType: optionalDocumentType(
+        field("declaredTypeInfo", null),
+        record3,
+        "declaredTypeInfo"
       )
     };
   }
@@ -24382,6 +24520,9 @@ function memberToDocumentFields(member, baseData3) {
     fields.collectionMemberId = member.collectionMemberId;
     fields.collectionValueId = member.collectionValueId;
     fields.multiselect = member.multiselect;
+    if (member.declaredType !== null) {
+      fields.declaredTypeInfo = manifestTypeToDocument(member.declaredType);
+    }
   }
   if (member.kind === "dialogueLookup") {
     fields.dialogueGroupId = member.dialogueGroupId;
@@ -24507,6 +24648,10 @@ function documentArgumentsToManifest(value, record3, source) {
     };
   });
 }
+function optionalDocumentType(value, record3, path) {
+  if (value === null || value === void 0) return null;
+  return documentTypeToManifest(value, record3, path);
+}
 function documentReturnTypeToManifest(value, record3, path) {
   if (isRecord2(value) && value.type === "Void") {
     return { kind: "void", nullable: false };
@@ -24863,7 +25008,14 @@ function isSchemaSystemMetadata(value) {
     "animationClip",
     "animationFrame",
     "animationChildOverride",
-    "animationChildTrack"
+    "animationFrameBase",
+    "animationSegmentFrame",
+    "animationSegment",
+    "spriteAnimationSegment",
+    "animationTrack",
+    "animationChildTrack",
+    "animationSegmentTrack",
+    "spriteAnimationSegmentTrack"
   ]);
   return typeof value.kind === "string" && kinds.has(value.kind) && (value.worldKind === null || typeof value.worldKind === "string" && worlds.has(value.worldKind));
 }
@@ -25708,6 +25860,7 @@ function schemaClassFromDocument(record3, context) {
       record3,
       "extendsGenericBindings"
     ),
+    targetMemberId: optionalStringOrNull(data.targetMemberId),
     ...constructorProjections.length === 0 ? {} : { constructorProjections },
     ...constructorIds.length === 0 ? {} : { constructorIds }
   };
@@ -25733,7 +25886,8 @@ function schemaClassToDocument(schemaClass2) {
     })),
     extendsGenericBindings: schemaClass2.extendsGenericBindings,
     constructorProjections: schemaClass2.constructorProjections,
-    constructorIds: schemaClass2.constructorIds
+    constructorIds: schemaClass2.constructorIds,
+    targetMemberId: schemaClass2.targetMemberId
   });
 }
 function optionalDocsTextProperty(value, record3) {
@@ -26237,6 +26391,24 @@ function assertProjectSchemaManifest(value) {
   assertInternalRecordRelationInvariants(manifest);
   assertStaticMemberInvariants(manifest);
   assertConstructorInvariants(manifest);
+  assertClassTargetMemberInvariants(manifest);
+}
+function assertClassTargetMemberInvariants(manifest) {
+  const memberIds = new Set(
+    requireArray(manifest.members, "$.members").map(
+      (value, index) => String(requireRecord(value, `$.members[${index}]`).id)
+    )
+  );
+  requireArray(manifest.classes, "$.classes").forEach((value, index) => {
+    const schemaClass2 = requireRecord(value, `$.classes[${index}]`);
+    const targetMemberId = schemaClass2.targetMemberId;
+    if (typeof targetMemberId !== "string") return;
+    if (memberIds.has(targetMemberId)) return;
+    invalid(
+      `$.classes[${index}].targetMemberId`,
+      `class ${JSON.stringify(String(schemaClass2.name))} targets member ${JSON.stringify(targetMemberId)}, which this manifest does not declare.`
+    );
+  });
 }
 function assertConstructorInvariants(manifest) {
   const constructors = requireArray(
@@ -26925,7 +27097,8 @@ function assertNeoSchemaClass(value, path) {
       "allowedStorage",
       "allowedStorageKeys",
       "genericParameters",
-      "extendsGenericBindings"
+      "extendsGenericBindings",
+      "targetMemberId"
     ],
     ["docsText", "constructorProjections", "constructorIds"]
   );
@@ -26954,6 +27127,7 @@ function assertNeoSchemaClass(value, path) {
     type.extendsGenericBindings,
     `${path}.extendsGenericBindings`
   );
+  nullableNonEmptyString(type.targetMemberId, `${path}.targetMemberId`);
   if (type.constructorProjections !== void 0) {
     arrayOf(
       type.constructorProjections,
@@ -27169,6 +27343,9 @@ function assertMember2(value, path) {
       `${path}.collectionValueId`
     );
     booleanAt(member.multiselect, `${path}.multiselect`);
+    if (member.declaredType !== null) {
+      assertType2(member.declaredType, `${path}.declaredType`);
+    }
     return;
   }
   if (kind === "dialogueLookup") {
@@ -28358,7 +28535,14 @@ var init_validate = __esm({
       "animationClip",
       "animationFrame",
       "animationChildOverride",
-      "animationChildTrack"
+      "animationFrameBase",
+      "animationSegmentFrame",
+      "animationSegment",
+      "spriteAnimationSegment",
+      "animationTrack",
+      "animationChildTrack",
+      "animationSegmentTrack",
+      "spriteAnimationSegmentTrack"
     ]);
     MEMBER_COMMON_KEYS = [
       "id",
@@ -28394,7 +28578,12 @@ var init_validate = __esm({
       list: ["entryMemberId", "listKind", "indexes", "columns"],
       class: ["classId", "schemaKeyOrder", "classArguments"],
       enum: ["enumId", "multiselect"],
-      lookup: ["collectionMemberId", "collectionValueId", "multiselect"],
+      lookup: [
+        "collectionMemberId",
+        "collectionValueId",
+        "multiselect",
+        "declaredType"
+      ],
       dialogueLookup: ["dialogueGroupId", "multiselect"],
       computed: ["returnType", "script"],
       sprite: ["templateId"],
@@ -30914,10 +31103,17 @@ var init_world_system_kinds_generated = __esm({
       SmartTile: "smartTile",
       SmartTileRule: "smartTileRule",
       SmartTileNeighbor: "smartTileNeighbor",
+      AnimationFrameBase: "animationFrameBase",
       AnimationClip: "animationClip",
       AnimationFrame: "animationFrame",
+      AnimationSegmentFrame: "animationSegmentFrame",
+      AnimationSegment: "animationSegment",
+      SpriteAnimationSegment: "spriteAnimationSegment",
       AnimationChildOverride: "animationChildOverride",
-      AnimationChildTrack: "animationChildTrack"
+      AnimationTrack: "animationTrack",
+      AnimationChildTrack: "animationChildTrack",
+      AnimationSegmentTrack: "animationSegmentTrack",
+      SpriteAnimationSegmentTrack: "spriteAnimationSegmentTrack"
     };
     NEO_WORLD_SYSTEM_CLASS_KIND_VALUES = new Set(
       Object.values(NeoWorldSystemClassKind)
@@ -31995,7 +32191,7 @@ function isNeoSchemaClassBase(value) {
     (interfaceId) => typeof interfaceId === "string" && interfaceId.length > 0
   )) && typeof v?.hiddenInMemberSelector === "boolean" && typeof v?.isAbstract === "boolean" && (v.allowedStorage === void 0 || v.allowedStorage === null || isEffectiveMemberStorage(v.allowedStorage)) && (v.allowedStorageKeys === void 0 || v.allowedStorageKeys === null || Array.isArray(v.allowedStorageKeys) && v.allowedStorageKeys.every((key) => typeof key === "string")) && (v.genericParams === void 0 || v.genericParams === null || Array.isArray(v.genericParams) && v.genericParams.every(isGenericParamDeclaration)) && (v.extendsGenericBindings === void 0 || v.extendsGenericBindings === null || isGenericBindingsRecord(v.extendsGenericBindings)) && (v.constructorProjections === void 0 || v.constructorProjections === null || Array.isArray(v.constructorProjections) && v.constructorProjections.every(isNeoClassConstructorProjection) && v.system?.kind === SystemProtectionKind.WorldAuthoring) && (v.constructorIds === void 0 || v.constructorIds === null || Array.isArray(v.constructorIds) && v.constructorIds.every(
     (constructorId) => typeof constructorId === "string" && constructorId.length > 0
-  ) && new Set(v.constructorIds).size === v.constructorIds.length) && (v.system === void 0 || v.system === null || isSystemMetadata(v.system));
+  ) && new Set(v.constructorIds).size === v.constructorIds.length) && (v.targetMemberId === void 0 || v.targetMemberId === null || typeof v.targetMemberId === "string" && v.targetMemberId.length > 0) && (v.system === void 0 || v.system === null || isSystemMetadata(v.system));
 }
 function isNeoClassConstructorProjection(value) {
   if (value === null || typeof value !== "object" || Array.isArray(value)) {
@@ -32470,6 +32666,9 @@ function isMemberLookupBase(value) {
   if (v.collectionValueId !== void 0 && v.collectionValueId !== null && typeof v.collectionValueId !== "string") {
     return false;
   }
+  if (v.declaredTypeInfo !== void 0 && v.declaredTypeInfo !== null && !isNSTypeInfo(v.declaredTypeInfo)) {
+    return false;
+  }
   return typeof v.multiselect === "boolean";
 }
 function isMemberLookup(value) {
@@ -32498,6 +32697,14 @@ function isMemberNSPropertyBase(value) {
   if (v.setterCode !== void 0 && v.setterCode.length === 0) return false;
   return isNSTypeInfo(v.returnTypeInfo);
 }
+function isMemberNSPropertyContractBase(value) {
+  const v = asMemberBaseForKind(value, 10 /* NSProperty */);
+  if (v === null) return false;
+  if (v.isAbstract !== true) return false;
+  if (v.code !== void 0) return false;
+  if (v.setterCode !== void 0) return false;
+  return isNSTypeInfo(v.returnTypeInfo);
+}
 function isMemberNSProperty(value) {
   if (!isMemberNSPropertyBase(value)) return false;
   if (!isWithId(value)) return false;
@@ -32696,6 +32903,11 @@ function memberKindSupportsStorage(kind) {
   if (kind === 23 /* NSFunction */) return false;
   return kind !== 13 /* Function */;
 }
+function memberKindOwnsStoredValue(kind) {
+  if (kind === 10 /* NSProperty */) return false;
+  if (kind === 23 /* NSFunction */) return false;
+  return kind !== 13 /* Function */;
+}
 function hasValidStorageField(v) {
   if (v.storage === void 0) return true;
   if (v.storage === null) return true;
@@ -32712,7 +32924,7 @@ function isMemberBase(value) {
   if (partial !== void 0 && v?.kind !== 7 /* Class */ && v?.kind !== 21 /* Generic */) {
     return false;
   }
-  const matchesConcreteType = isMemberNullBase(value) || isMemberBoolBase(value) || isMemberIntBase(value) || isMemberStringBase(value) || isMemberFloatBase(value) || isMemberDictionaryBase(value) || isMemberListBase(value) || isMemberClassBase(value) || isMemberEnumBase(value) || isMemberLookupBase(value) || isMemberDialogueLookupBase(value) || isMemberNSPropertyBase(value) || isMemberSpriteBase(value) || isMemberAudioBase(value) || isMemberFunctionBase(value) || isMemberNSFunctionBase(value) || isMemberNSFunction(value) || isMemberFunctionRefBase(value) || isMemberVector2Base(value) || isMemberVector2IntBase(value) || isMemberVector3Base(value) || isMemberVector3IntBase(value) || isMemberColorBase(value) || isMemberDecimalBase(value) || isMemberGenericBase(value);
+  const matchesConcreteType = isMemberNullBase(value) || isMemberBoolBase(value) || isMemberIntBase(value) || isMemberStringBase(value) || isMemberFloatBase(value) || isMemberDictionaryBase(value) || isMemberListBase(value) || isMemberClassBase(value) || isMemberEnumBase(value) || isMemberLookupBase(value) || isMemberDialogueLookupBase(value) || isMemberNSPropertyBase(value) || isMemberNSPropertyContractBase(value) || isMemberSpriteBase(value) || isMemberAudioBase(value) || isMemberFunctionBase(value) || isMemberNSFunctionBase(value) || isMemberNSFunction(value) || isMemberFunctionRefBase(value) || isMemberVector2Base(value) || isMemberVector2IntBase(value) || isMemberVector3Base(value) || isMemberVector3IntBase(value) || isMemberColorBase(value) || isMemberDecimalBase(value) || isMemberGenericBase(value);
   if (!matchesConcreteType) return false;
   if (!isValidDocsText(v?.docsText)) return false;
   if (typeof v?.name !== "string") return false;
@@ -33167,11 +33379,10 @@ var init_inheritance = __esm({
 });
 
 // ../src/models/classes/world-system-classes.generated.ts
-var WORLD_GRID_CHILDREN_MEMBER_ID, WORLD_GRID_CHILDREN_ENTRY_MEMBER_ID, WORLD_OBJECT_CHILDREN_MEMBER_ID, WORLD_OBJECT_CHILDREN_ENTRY_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_TILES_MEMBER_ID, WORLD_TILE_LAYER_LINK_TILE_ENTRY_MEMBER_ID, WORLD_OBJECT_LAYER_LINK_OBJECTS_MEMBER_ID, WORLD_OBJECT_LAYER_LINK_OBJECT_ENTRY_MEMBER_ID, WORLD_ANIMATION_CLIP_TARGET_PARAM_ID, WORLD_ANIMATION_CHILD_OVERRIDE_ENTRY_PARAM_ID, WORLD_ANIMATION_CLIP_FPS_MEMBER_ID, WORLD_ANIMATION_CLIP_DURATION_MEMBER_ID, WORLD_ANIMATION_CLIP_FRAMES_MEMBER_ID, WORLD_ANIMATION_CLIP_TRACKS_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_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_SYSTEM_CLASS_DEFINITIONS;
+var WORLD_GRID_CHILDREN_MEMBER_ID, WORLD_GRID_CHILDREN_ENTRY_MEMBER_ID, WORLD_OBJECT_CHILDREN_MEMBER_ID, WORLD_OBJECT_CHILDREN_ENTRY_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_TILES_MEMBER_ID, WORLD_TILE_LAYER_LINK_TILE_ENTRY_MEMBER_ID, WORLD_OBJECT_LAYER_LINK_OBJECTS_MEMBER_ID, WORLD_OBJECT_LAYER_LINK_OBJECT_ENTRY_MEMBER_ID, WORLD_ANIMATION_CLIP_TARGET_PARAM_ID, WORLD_ANIMATION_CHILD_OVERRIDE_ENTRY_PARAM_ID, WORLD_ANIMATION_CLIP_FPS_MEMBER_ID, WORLD_ANIMATION_CLIP_DURATION_MEMBER_ID, WORLD_ANIMATION_CLIP_FRAMES_MEMBER_ID, WORLD_ANIMATION_CLIP_TRACKS_MEMBER_ID, WORLD_ANIMATION_FRAME_BASE_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_CHILD_OVERRIDE_CHILD_MEMBER_ID, WORLD_ANIMATION_CHILD_OVERRIDE_OVERRIDES_MEMBER_ID, WORLD_ANIMATION_TRACK_CHILD_MEMBER_ID, WORLD_ANIMATION_TRACK_START_FRAME_MEMBER_ID, WORLD_ANIMATION_TRACK_DIRECTION_MEMBER_ID, WORLD_ANIMATION_TRACK_OFFSET_START_INDEX_MEMBER_ID, WORLD_ANIMATION_TRACK_OFFSET_END_INDEX_MEMBER_ID, WORLD_ANIMATION_CHILD_TRACK_CLIP_KEY_MEMBER_ID, WORLD_ANIMATION_SEGMENT_DURATION_MEMBER_ID, WORLD_ANIMATION_SEGMENT_FRAMES_MEMBER_ID, WORLD_ANIMATION_SEGMENT_TRACK_CHILD_PARAM_ID, WORLD_ANIMATION_SEGMENT_TRACK_VALUE_PARAM_ID, WORLD_PLAY_DIRECTION_FORWARD_OPTION_ID, WORLD_PLAY_DIRECTION_REVERSE_OPTION_ID, WORLD_SYSTEM_CLASS_DEFINITIONS;
 var init_world_system_classes_generated = __esm({
   "../src/models/classes/world-system-classes.generated.ts"() {
     "use strict";
-    init_member_storage();
     WORLD_GRID_CHILDREN_MEMBER_ID = "system_98578ba3-a70e-4397-9283-996a898d44c8";
     WORLD_GRID_CHILDREN_ENTRY_MEMBER_ID = "system_c86da069-7ef9-5693-a54b-5c331755fde9";
     WORLD_OBJECT_CHILDREN_MEMBER_ID = "system_bb5d2cf1-a0dd-4eba-a62e-0e1bf0177071";
@@ -33190,16 +33401,25 @@ var init_world_system_classes_generated = __esm({
     WORLD_ANIMATION_CLIP_DURATION_MEMBER_ID = "system_e1a1ba86-2599-43dc-a19a-46d08a2e4256";
     WORLD_ANIMATION_CLIP_FRAMES_MEMBER_ID = "system_485b0f05-ec7b-4e61-ba80-9a5d7d262b39";
     WORLD_ANIMATION_CLIP_TRACKS_MEMBER_ID = "system_eb602654-04a9-4766-860f-300b443be86e";
-    WORLD_ANIMATION_FRAME_INDEX_MEMBER_ID = "system_0dbdd0f9-9dd2-4b4b-9403-50180c1500dd";
+    WORLD_ANIMATION_FRAME_BASE_INDEX_MEMBER_ID = "system_0dbdd0f9-9dd2-4b4b-9403-50180c1500dd";
     WORLD_ANIMATION_FRAME_OVERRIDES_MEMBER_ID = "system_8ab7bb00-a475-43f0-8579-1b08f133d658";
     WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_MEMBER_ID = "system_a5905750-c472-46a8-89e9-f04f0bf66696";
     WORLD_ANIMATION_FRAME_CHILD_OVERRIDES_ENTRY_MEMBER_ID = "system_86688965-6b26-529e-95f3-a4070f022582";
     WORLD_ANIMATION_FRAME_ACTIONS_MEMBER_ID = "system_23e05410-6428-4bd1-b085-c0390ed7fcb7";
     WORLD_ANIMATION_CHILD_OVERRIDE_CHILD_MEMBER_ID = "system_6e15db41-a6f2-43fd-9793-c52fe4f3d0f8";
     WORLD_ANIMATION_CHILD_OVERRIDE_OVERRIDES_MEMBER_ID = "system_819b3743-0c3d-4896-b679-9aeeb73255f4";
-    WORLD_ANIMATION_CHILD_TRACK_CHILD_MEMBER_ID = "system_29abc85e-2d38-4cef-a200-88915d176d06";
+    WORLD_ANIMATION_TRACK_CHILD_MEMBER_ID = "system_29abc85e-2d38-4cef-a200-88915d176d06";
+    WORLD_ANIMATION_TRACK_START_FRAME_MEMBER_ID = "system_5af60692-74a0-45ea-a9ba-747854989b2a";
+    WORLD_ANIMATION_TRACK_DIRECTION_MEMBER_ID = "system_75a314b5-c799-4af6-9e64-4cde6eae1b30";
+    WORLD_ANIMATION_TRACK_OFFSET_START_INDEX_MEMBER_ID = "system_c71caaab-df72-48c6-a291-2772288351eb";
+    WORLD_ANIMATION_TRACK_OFFSET_END_INDEX_MEMBER_ID = "system_6755f539-a459-46ec-b44a-cc74a18ad83e";
     WORLD_ANIMATION_CHILD_TRACK_CLIP_KEY_MEMBER_ID = "system_2c816624-0281-46d3-9ed5-d20bd43519f4";
-    WORLD_ANIMATION_CHILD_TRACK_START_FRAME_MEMBER_ID = "system_5af60692-74a0-45ea-a9ba-747854989b2a";
+    WORLD_ANIMATION_SEGMENT_DURATION_MEMBER_ID = "system_8a159870-36a4-40e4-98bf-15919410650a";
+    WORLD_ANIMATION_SEGMENT_FRAMES_MEMBER_ID = "system_40658ad2-b4a5-4404-bb6d-ed778088a772";
+    WORLD_ANIMATION_SEGMENT_TRACK_CHILD_PARAM_ID = "system_d4fe9f71-d9d9-4baf-bc52-8de16933b655";
+    WORLD_ANIMATION_SEGMENT_TRACK_VALUE_PARAM_ID = "system_03497842-3381-45a2-b2fa-b2dee36c2759";
+    WORLD_PLAY_DIRECTION_FORWARD_OPTION_ID = "system_2e4ca40e-f305-49c6-a91b-b99d56239ba0";
+    WORLD_PLAY_DIRECTION_REVERSE_OPTION_ID = "system_6478d195-3905-48db-befe-d276eb5478f0";
     WORLD_SYSTEM_CLASS_DEFINITIONS = [
       {
         classId: "system_b78f7f1d-f63c-4abb-ae65-852e69246534",
@@ -33784,11 +34004,27 @@ var init_world_system_classes_generated = __esm({
         ],
         worldKind: "smartTileNeighbor"
       },
+      {
+        classId: "system_6529416a-f68b-49a3-b3d2-2af8fda60cb4",
+        name: "NeoAnimationFrameBase",
+        docsText: "A row at a frame index. Rows are sparse: each one holds from its index\nuntil the next row you author, so you only author the frames where\nsomething changes.",
+        isAbstract: true,
+        schemaFields: [
+          {
+            memberId: "system_0dbdd0f9-9dd2-4b4b-9403-50180c1500dd",
+            memberKind: "int",
+            minValue: 0,
+            required: true,
+            schemaKey: "Index"
+          }
+        ],
+        worldKind: "animationFrameBase"
+      },
       {
         classId: "system_994b3886-7392-4bd2-8f9d-d5f7fd316a5a",
         name: "NeoAnimationClip",
+        docsText: "Composition and timing for one object and the children under it: how long\nit runs, how fast, the sparse frames that override values, and the tracks\nthat schedule other content onto the same timeline.\n\nEditing a clip while it plays takes effect the next time playback starts,\nand in the editor at the next preview recompute. Segments are the exception\n\u2014 they are re-read every frame.",
         isAbstract: false,
-        allowedStorage: "immutable" /* Immutable */,
         genericParams: [
           {
             id: "system_268e9d23-347b-4eb6-8bec-cf0edf326aa2",
@@ -33848,7 +34084,7 @@ var init_world_system_classes_generated = __esm({
             memberId: "system_f89776c0-a7ac-5e80-9fcb-df9a5a1033fc",
             memberKind: "class",
             defaultValue: {},
-            schemaClassWorldKind: "animationChildTrack",
+            schemaClassWorldKind: "animationTrack",
             required: true,
             schemaKey: "__TrackEntry"
           }
@@ -33858,8 +34094,9 @@ var init_world_system_classes_generated = __esm({
       {
         classId: "system_ba921c72-e4b2-47f9-861f-f30ac1156965",
         name: "NeoAnimationFrame",
+        docsText: "One row of a clip's timeline: the overrides, child overrides, and actions\nthat apply from its index until the next row you author.",
+        extendsWorldKind: "animationFrameBase",
         isAbstract: false,
-        allowedStorage: "immutable" /* Immutable */,
         genericParams: [
           {
             id: "system_d2194ea1-08ec-4a0c-b9a0-97877031d39b",
@@ -33868,13 +34105,6 @@ var init_world_system_classes_generated = __esm({
           }
         ],
         schemaFields: [
-          {
-            memberId: "system_0dbdd0f9-9dd2-4b4b-9403-50180c1500dd",
-            memberKind: "int",
-            minValue: 0,
-            required: true,
-            schemaKey: "Index"
-          },
           {
             memberId: "system_8ab7bb00-a475-43f0-8579-1b08f133d658",
             memberKind: "generic",
@@ -33930,11 +34160,96 @@ var init_world_system_classes_generated = __esm({
         ],
         worldKind: "animationFrame"
       },
+      {
+        classId: "system_9c4f3bfb-f0d8-4231-a7e7-9115bab8d5ab",
+        name: "NeoAnimationSegmentFrame",
+        docsText: "One value at a frame index inside a segment. It holds until the next row\nyou author, or until the segment's Duration runs out.",
+        extendsWorldKind: "animationFrameBase",
+        isAbstract: false,
+        genericParams: [
+          { id: "system_887b11d3-e56a-47ff-8d01-e2fcefb846a1", name: "T" }
+        ],
+        schemaFields: [
+          {
+            memberId: "system_b71d1f73-da72-49de-ab9a-911cc9bffa43",
+            memberKind: "generic",
+            genericParamId: "system_887b11d3-e56a-47ff-8d01-e2fcefb846a1",
+            required: false,
+            schemaKey: "Value"
+          }
+        ],
+        worldKind: "animationSegmentFrame"
+      },
+      {
+        classId: "system_2866011d-30fe-410a-8a04-d2ff291b77cd",
+        name: "NeoAnimationSegment",
+        docsText: "A sequence of one member's values over a frame index. Frames are sparse and\neach one holds until the next row or the end of Duration. A segment has no\nfps of its own \u2014 the clip that schedules it owns the clock.\n\nA segment can live anywhere: immutable catalog data, a save, or session\nstate a game writes at runtime. Its frames and its Duration are re-read on\nevery frame that plays, so a change made mid-playback shows on the next\nframe.",
+        isAbstract: true,
+        genericParams: [
+          { id: "system_a35d028e-bd71-49aa-9f9d-944b6e813b80", name: "T" }
+        ],
+        schemaFields: [
+          {
+            memberId: "system_8a159870-36a4-40e4-98bf-15919410650a",
+            memberKind: "int",
+            defaultValue: 1,
+            minValue: 1,
+            required: true,
+            schemaKey: "Duration"
+          },
+          {
+            memberId: "system_40658ad2-b4a5-4404-bb6d-ed778088a772",
+            memberKind: "list",
+            defaultValue: [],
+            entryMemberId: "system_da56f93b-d3a6-5feb-9f51-3a9fd029272a",
+            required: true,
+            schemaKey: "Frames"
+          }
+        ],
+        supportingFields: [
+          {
+            memberId: "system_da56f93b-d3a6-5feb-9f51-3a9fd029272a",
+            memberKind: "class",
+            schemaClassWorldKind: "animationSegmentFrame",
+            classArguments: {
+              "system_887b11d3-e56a-47ff-8d01-e2fcefb846a1": {
+                kind: "generic",
+                genericParamId: "system_a35d028e-bd71-49aa-9f9d-944b6e813b80"
+              }
+            },
+            required: true,
+            schemaKey: "__FrameEntry"
+          }
+        ],
+        worldKind: "animationSegment"
+      },
+      {
+        classId: "system_ffc766b3-f3ac-4c20-91cf-38ff7e8e88f3",
+        name: "NeoSpriteAnimationSegment",
+        docsText: "A sprite flipbook: which sprite to show at each frame index. This is the\nsegment to reach for when animating a sprite. To animate any other kind of\nvalue \u2014 a Vector3 bounce, a Color flash \u2014 declare your own segment class\nderiving from NeoAnimationSegment.",
+        extendsWorldKind: "animationSegment",
+        isAbstract: false,
+        extendsGenericBindings: {
+          "system_a35d028e-bd71-49aa-9f9d-944b6e813b80": {
+            kind: "member",
+            memberId: "system_f10bc0fd-9b8e-5901-9f4b-38e7cdc7a241"
+          }
+        },
+        supportingFields: [
+          {
+            memberId: "system_f10bc0fd-9b8e-5901-9f4b-38e7cdc7a241",
+            memberKind: "sprite",
+            required: true,
+            schemaKey: "__SpriteInfoTypeArgument"
+          }
+        ],
+        worldKind: "spriteAnimationSegment"
+      },
       {
         classId: "system_e2e88eba-5335-4a16-9dcf-2c0e1951e8bd",
         name: "NeoAnimationChildOverride",
+        docsText: "What one child looks like while a clip frame holds: which child, and the\nvalues to override on it.",
         isAbstract: false,
-        allowedStorage: "immutable" /* Immutable */,
         constructorProjections: [
           {
             memberId: "system_6e15db41-a6f2-43fd-9793-c52fe4f3d0f8",
@@ -33969,11 +34284,76 @@ var init_world_system_classes_generated = __esm({
         ],
         worldKind: "animationChildOverride"
       },
+      {
+        classId: "system_45755778-ecfe-4a6c-b65f-a08017a7fb56",
+        name: "NeoAnimationTrackBase",
+        docsText: "A lane on a clip's timeline: which child it plays against, when it starts,\nwhich way it runs, and which slice of the content to use. Both kinds of\ntrack derive from this, so playing a child clip reversed or cropped is\nsomething you author on the lane rather than pass in when you play it.",
+        isAbstract: true,
+        schemaFields: [
+          {
+            memberId: "system_29abc85e-2d38-4cef-a200-88915d176d06",
+            memberKind: "lookup",
+            collectionMemberId: "system_bb5d2cf1-a0dd-4eba-a62e-0e1bf0177071",
+            collectionValueId: null,
+            multiselect: false,
+            required: true,
+            schemaKey: "Child"
+          },
+          {
+            memberId: "system_5af60692-74a0-45ea-a9ba-747854989b2a",
+            memberKind: "int",
+            defaultValue: 0,
+            minValue: 0,
+            required: true,
+            schemaKey: "StartFrame"
+          },
+          {
+            memberId: "system_75a314b5-c799-4af6-9e64-4cde6eae1b30",
+            memberKind: "enum",
+            defaultValue: ["system_2e4ca40e-f305-49c6-a91b-b99d56239ba0"],
+            docsText: "Which way the scheduled content plays: forward, or last frame first. This is playback order, not a direction in the world.",
+            enumId: "system_705ccc39-e46e-4c9f-af3e-3ec8fd818709",
+            multiselect: false,
+            required: true,
+            schemaKey: "Direction"
+          },
+          {
+            memberId: "system_c71caaab-df72-48c6-a291-2772288351eb",
+            memberKind: "int",
+            defaultValue: 0,
+            docsText: "The first frame of the scheduled content to play, counted in that content's own frames. Dragging the left edge of a lane edits this.",
+            minValue: 0,
+            required: false,
+            schemaKey: "OffsetStartIndex"
+          },
+          {
+            memberId: "system_6755f539-a459-46ec-b44a-cc74a18ad83e",
+            memberKind: "int",
+            defaultValue: null,
+            docsText: "Where to stop, counted in the scheduled content's own frames. The frame at this index is not played. Leave it empty to run to the end. Dragging the right edge of a lane edits this.",
+            minValue: 1,
+            required: false,
+            schemaKey: "OffsetEndIndex"
+          },
+          {
+            memberId: "system_626f7a7a-66b7-4e54-aaaa-7174a74c9467",
+            memberKind: "computed",
+            accessModifierKind: "protected",
+            isAbstract: true,
+            docsText: "How long the scheduled content runs, in its own frames \u2014 the referenced clip's Duration on a child track, the segment's Duration on a segment track. Neo answers this for you; it is not a value you author.",
+            returnTypeInfo: { type: 2, required: true },
+            required: true,
+            schemaKey: "BaseDuration"
+          }
+        ],
+        worldKind: "animationTrack"
+      },
       {
         classId: "system_8dc78ecf-15b8-4b8a-86f3-7691a5b487d0",
         name: "NeoAnimationChildTrack",
+        docsText: "Plays another object's clip on this clip's timeline, looked up by name. The\nlane is as long as the clip it names.",
+        extendsWorldKind: "animationTrack",
         isAbstract: false,
-        allowedStorage: "immutable" /* Immutable */,
         constructorProjections: [
           {
             memberId: "system_29abc85e-2d38-4cef-a200-88915d176d06",
@@ -33982,31 +34362,110 @@ var init_world_system_classes_generated = __esm({
         ],
         schemaFields: [
           {
-            memberId: "system_29abc85e-2d38-4cef-a200-88915d176d06",
+            memberId: "system_2c816624-0281-46d3-9ed5-d20bd43519f4",
+            memberKind: "string",
+            localizable: false,
+            required: true,
+            schemaKey: "ClipKey"
+          }
+        ],
+        worldKind: "animationChildTrack"
+      },
+      {
+        classId: "system_fd551dd8-6e6b-4044-9f32-7445ab344200",
+        name: "NeoAnimationSegmentTrack",
+        docsText: "Plays a sequence of values onto one member of one child, on the owning\nclip's clock. Where a child track hands off to another clip, this lane is a\nleaf: it writes one value per frame to the member its subclass targets.\n\nDerive from it with the child type you author against, so that a Segment\ngetter can reach that child's own members.",
+        extendsWorldKind: "animationTrack",
+        isAbstract: true,
+        constructorProjections: [
+          {
+            memberId: "system_87900a74-0d7c-4dfc-a6f6-3bd204ebb8f6",
+            parameterName: "id"
+          }
+        ],
+        genericParams: [
+          {
+            id: "system_d4fe9f71-d9d9-4baf-bc52-8de16933b655",
+            name: "TChild",
+            constraintClassWorldKind: "objectBase"
+          },
+          { id: "system_03497842-3381-45a2-b2fa-b2dee36c2759", name: "TValue" }
+        ],
+        schemaFields: [
+          {
+            memberId: "system_87900a74-0d7c-4dfc-a6f6-3bd204ebb8f6",
             memberKind: "lookup",
+            extendsMemberId: "system_29abc85e-2d38-4cef-a200-88915d176d06",
+            docsText: "The child this lane plays against, typed as the child class you derived with, so a Segment getter can read that child's own members.",
             collectionMemberId: "system_bb5d2cf1-a0dd-4eba-a62e-0e1bf0177071",
             collectionValueId: null,
             multiselect: false,
+            declaredTypeInfo: {
+              type: 21,
+              required: true,
+              ownerClassId: "system_fd551dd8-6e6b-4044-9f32-7445ab344200",
+              genericParamId: "system_d4fe9f71-d9d9-4baf-bc52-8de16933b655"
+            },
             required: true,
             schemaKey: "Child"
           },
           {
-            memberId: "system_2c816624-0281-46d3-9ed5-d20bd43519f4",
-            memberKind: "string",
-            localizable: false,
+            memberId: "system_d2d0bf9b-211f-4b2f-bff3-3d6da5766abd",
+            memberKind: "computed",
+            isAbstract: true,
+            docsText: "The sequence of values this lane plays. Your subclass decides where it comes from \u2014 a value you store, a lookup, or a getter you write \u2014 and it is resolved again on every frame that plays.",
+            returnTypeInfo: {
+              type: 7,
+              required: true,
+              classId: "system_2866011d-30fe-410a-8a04-d2ff291b77cd",
+              typeArguments: {
+                "system_a35d028e-bd71-49aa-9f9d-944b6e813b80": {
+                  type: 21,
+                  required: true,
+                  ownerClassId: "system_fd551dd8-6e6b-4044-9f32-7445ab344200",
+                  genericParamId: "system_03497842-3381-45a2-b2fa-b2dee36c2759"
+                }
+              }
+            },
             required: true,
-            schemaKey: "ClipKey"
+            schemaKey: "Segment"
+          }
+        ],
+        worldKind: "animationSegmentTrack"
+      },
+      {
+        classId: "system_24b70585-0798-49ad-b650-4c118bac1eb1",
+        name: "NeoSpriteAnimationSegmentTrack",
+        docsText: "Plays a sprite segment onto a sprite child's Sprite member \u2014 the lane that\nanimates a sprite over time. Derive from it to say where the segment comes\nfrom; Segment is left for you to fill in, so every lane that plays is one of\nyour own classes.",
+        extendsWorldKind: "animationSegmentTrack",
+        isAbstract: true,
+        extendsGenericBindings: {
+          "system_d4fe9f71-d9d9-4baf-bc52-8de16933b655": {
+            kind: "generic",
+            genericParamId: "system_4de90637-6a3b-4bba-95ef-2ff9dfb05268"
           },
+          "system_03497842-3381-45a2-b2fa-b2dee36c2759": {
+            kind: "member",
+            memberId: "system_65388373-2b28-53f4-b821-8c74dada7c8c"
+          }
+        },
+        genericParams: [
           {
-            memberId: "system_5af60692-74a0-45ea-a9ba-747854989b2a",
-            memberKind: "int",
-            defaultValue: 0,
-            minValue: 0,
+            id: "system_4de90637-6a3b-4bba-95ef-2ff9dfb05268",
+            name: "TChild",
+            constraintClassWorldKind: "spriteObject"
+          }
+        ],
+        supportingFields: [
+          {
+            memberId: "system_65388373-2b28-53f4-b821-8c74dada7c8c",
+            memberKind: "sprite",
             required: true,
-            schemaKey: "StartFrame"
+            schemaKey: "__SpriteInfoTypeArgument"
           }
         ],
-        worldKind: "animationChildTrack"
+        targetMemberId: "system_e9288ba9-f5a2-4485-8443-6afb155b31e0",
+        worldKind: "spriteAnimationSegmentTrack"
       }
     ];
   }
@@ -34022,7 +34481,7 @@ function worldAnimationChildOverrideBindingMemberId(classId) {
     )
   );
 }
-var WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAME, WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAMESPACE, WORLD_SYSTEM_ANIMATION_KINDS, WORLD_SYSTEM_ALL_KINDS, WORLD_SYSTEM_CLASS_DEFINITION_BY_KIND, WORLD_SYSTEM_SCHEMA_FIELD_SITES_BY_MEMBER_ID;
+var WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAME, WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAMESPACE, WORLD_SYSTEM_ANIMATION_KIND_MARKER, WORLD_SYSTEM_ANIMATION_KINDS, GENERIC_WORLD_SYSTEM_CLASS_KINDS, WORLD_SYSTEM_ALL_KINDS, WORLD_SYSTEM_CLASS_DEFINITION_BY_KIND, WORLD_SYSTEM_SCHEMA_FIELD_SITES_BY_MEMBER_ID;
 var init_world_system_classes = __esm({
   "../src/models/classes/world-system-classes.ts"() {
     "use strict";
@@ -34034,12 +34493,19 @@ var init_world_system_classes = __esm({
     init_world_system_classes_generated();
     WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAME = "NeoAnimationChildBinding";
     WORLD_ANIMATION_CHILD_OVERRIDE_BINDING_MEMBER_NAMESPACE = "2048c3bb-8ae5-51cc-a1dc-15178cc41865";
-    WORLD_SYSTEM_ANIMATION_KINDS = /* @__PURE__ */ new Set([
-      NeoWorldSystemClassKind.AnimationClip,
-      NeoWorldSystemClassKind.AnimationFrame,
-      NeoWorldSystemClassKind.AnimationChildOverride,
-      NeoWorldSystemClassKind.AnimationChildTrack
-    ]);
+    WORLD_SYSTEM_ANIMATION_KIND_MARKER = "animation";
+    WORLD_SYSTEM_ANIMATION_KINDS = new Set(
+      WORLD_SYSTEM_CLASS_DEFINITIONS.map(
+        (definition2) => definition2.worldKind
+      ).filter(
+        (worldKind) => worldKind.toLowerCase().includes(WORLD_SYSTEM_ANIMATION_KIND_MARKER)
+      )
+    );
+    GENERIC_WORLD_SYSTEM_CLASS_KINDS = new Set(
+      WORLD_SYSTEM_CLASS_DEFINITIONS.filter(
+        (definition2) => (definition2.genericParams?.length ?? 0) > 0
+      ).map((definition2) => definition2.worldKind)
+    );
     WORLD_SYSTEM_ALL_KINDS = new Set(
       WORLD_SYSTEM_CLASS_DEFINITIONS.map((definition2) => definition2.worldKind)
     );
@@ -35990,10 +36456,7 @@ function buildDefaultMemberValue(args) {
     for (const entry of member.partial === true ? [] : merged) {
       if (entry.memberId === null) continue;
       const childMember = findMemberInDocument(args.document, entry.memberId);
-      if (isMemberNSPropertyBase(childMember)) continue;
-      if (childMember.kind === 13 /* Function */ || childMember.kind === 23 /* NSFunction */) {
-        continue;
-      }
+      if (!memberKindOwnsStoredValue(childMember.kind)) continue;
       const resolvedChildMember = substituteMember(
         childMember,
         childEnv,
@@ -37582,6 +38045,57 @@ var init_structured_leaf_source = __esm({
   }
 });
 
+// src/project-source/member-kind-type-names.ts
+function fixedSourceTypeNameForKind(kind) {
+  return MEMBER_KIND_SOURCE_TYPE_NAMES[kind] ?? null;
+}
+function fixedSourceTypeNameForKindNumber(kind) {
+  return SOURCE_TYPE_NAME_BY_MEMBER_KIND_NUMBER.get(kind) ?? null;
+}
+var MEMBER_KIND_SOURCE_TYPE_NAMES, MEMBER_KIND_NUMBERS, SOURCE_TYPE_NAME_BY_MEMBER_KIND_NUMBER;
+var init_member_kind_type_names = __esm({
+  "src/project-source/member-kind-type-names.ts"() {
+    "use strict";
+    init_members();
+    MEMBER_KIND_SOURCE_TYPE_NAMES = {
+      null: "null",
+      bool: "bool",
+      int: "int",
+      string: "string",
+      float: "float",
+      decimal: "decimal",
+      sprite: "SpriteInfo",
+      audio: "AudioClipInfo",
+      vector2: "Vector2",
+      vector2Int: "Vector2Int",
+      vector3: "Vector3",
+      vector3Int: "Vector3Int",
+      color: "Color"
+    };
+    MEMBER_KIND_NUMBERS = {
+      null: 0 /* Null */,
+      bool: 1 /* Bool */,
+      int: 2 /* Int */,
+      string: 3 /* String */,
+      float: 4 /* Float */,
+      decimal: 20 /* Decimal */,
+      sprite: 11 /* Sprite */,
+      audio: 12 /* Audio */,
+      vector2: 14 /* Vector2 */,
+      vector2Int: 15 /* Vector2Int */,
+      vector3: 16 /* Vector3 */,
+      vector3Int: 17 /* Vector3Int */,
+      color: 19 /* Color */
+    };
+    SOURCE_TYPE_NAME_BY_MEMBER_KIND_NUMBER = new Map(
+      Object.entries(MEMBER_KIND_NUMBERS).map(([slug, kind]) => [
+        kind,
+        MEMBER_KIND_SOURCE_TYPE_NAMES[slug]
+      ])
+    );
+  }
+});
+
 // src/project-source/lower-members.ts
 function lowerClass(context, declaration) {
   const id2 = materializedId(declaration, "class", declaration.name);
@@ -37626,6 +38140,7 @@ function lowerClass(context, declaration) {
     context.loweredMembers.set(memberId, existing ?? lowered);
   }
   const storage = annotation(declaration.annotations, "storage");
+  const targetMemberId = lowerClassTargetMemberId(context, declaration, base);
   const genericParameters = declaration.genericParameters.map((parameter3) => {
     const parameterId = materializedIdentityId(
       parameter3.identity,
@@ -37657,6 +38172,7 @@ function lowerClass(context, declaration) {
     // Class storage keys never exist in source. Retain only the historical
     // null representation while the clean-break record migration completes.
     allowedStorageKeys: null,
+    targetMemberId,
     genericParameters,
     extendsGenericBindings: extendsClassId && declaration.baseTypes[0]?.arguments.length ? lowerExtendsBindings(
       context,
@@ -37997,12 +38513,25 @@ function lowerFieldMember(context, ownerClass, declaration, id2, commonInput, ba
         `Lookup member ${ownerClass.name}.${declaration.name} has an unresolved collection.`
       );
     }
+    const multiselect = booleanArgument(settings, "multiselect") ?? false;
     return {
       ...common,
       kind: "lookup",
       collectionMemberId,
       collectionValueId: referenceIdArgument(settings, "collectionValue"),
-      multiselect: booleanArgument(settings, "multiselect") ?? false
+      multiselect,
+      // The spelled type, kept only when it narrows the collection entry —
+      // `normalizeLookupDeclaredTypes` clears the redundant ones once every
+      // member is lowered and the entry can be resolved in either direction.
+      declaredType: lookupDeclaredType(
+        context,
+        ownerClass,
+        // A multiselect lookup is spelled `List<T>` and stores the element
+        // type, which is what the emitter re-wraps. Keyed off the spelling
+        // rather than off `multiselect` so a mismatched pair reads the type it
+        // actually has instead of throwing for a missing type argument.
+        fieldType.name === "List" ? requiredTypeArgument(fieldType, 0) : fieldType
+      )
     };
   }
   if (name === "List") {
@@ -38323,6 +38852,44 @@ function lowerEnum(context, declaration) {
     system: systemMetadata(declaration.annotations) ?? base?.system ?? null
   };
 }
+function lookupDeclaredType(context, ownerClass, type) {
+  if (type.name === "object") return null;
+  const lowered = lowerType(context, type, ownerClass);
+  if (lowered.kind === "class" || lowered.kind === "generic" || lowered.kind === "interface") {
+    return lowered;
+  }
+  return null;
+}
+function normalizeLookupDeclaredTypes(context) {
+  for (const [memberId, member] of context.loweredMembers) {
+    if (member.kind !== "lookup") continue;
+    if (member.declaredType === null) continue;
+    if (!lookupDeclaredTypeNarrows(context, member)) {
+      context.loweredMembers.set(memberId, { ...member, declaredType: null });
+    }
+  }
+}
+function lookupDeclaredTypeNarrows(context, member) {
+  const declared = member.declaredType;
+  if (declared === null) return false;
+  const entry = lookupEntryMember(context, member.collectionMemberId);
+  if (entry === void 0) return false;
+  if (entry.kind === "class") {
+    return declared.kind !== "class" || declared.classId !== entry.classId;
+  }
+  if (entry.kind === "generic") {
+    return declared.kind !== "generic" || declared.genericParamId !== entry.genericParamId;
+  }
+  return true;
+}
+function lookupEntryMember(context, collectionMemberId) {
+  const collection = context.loweredMembers.get(collectionMemberId) ?? context.baseMembers.get(collectionMemberId);
+  if (collection === void 0) return void 0;
+  if (collection.kind !== "list" && collection.kind !== "dictionary") {
+    return void 0;
+  }
+  return context.loweredMembers.get(collection.entryMemberId) ?? context.baseMembers.get(collection.entryMemberId);
+}
 function lowerType(context, type, ownerClass) {
   const nullable = type.nullable;
   const primitive3 = primitiveTypeKind(type.name);
@@ -38412,14 +38979,56 @@ function lowerDefault(context, initializer, type, ownerClass, base, memberId, st
     classId: baseDefault && !("serverValueId" in baseDefault) && !("init" in baseDefault) ? baseDefault.classId : null
   };
 }
-function lowerExpressionValue(context, expression, expected, ownerClass, path) {
+function substituteGenericTypeNames(type, environment) {
+  if (environment.size === 0) return type;
+  const bound = environment.get(type.name);
+  if (bound !== void 0 && type.arguments.length === 0) {
+    return type.nullable && !bound.nullable ? { ...bound, nullable: true } : bound;
+  }
+  if (type.arguments.length === 0) return type;
+  return {
+    ...type,
+    arguments: type.arguments.map(
+      (argument2) => substituteGenericTypeNames(argument2, environment)
+    )
+  };
+}
+function constructedGenericEnvironment(context, classId, expression, expectedType, outer) {
+  const parameters = context.genericParametersByClass.get(classId);
+  if (parameters === void 0 || parameters.size === 0) return outer;
+  const authored = expression.className !== null && expression.className !== "Partial" ? expression.typeArguments : void 0;
+  const environment = new Map(outer);
+  [...parameters.keys()].forEach((parameterName, index) => {
+    const authoredArgument = authored?.[index];
+    const argument2 = authoredArgument !== void 0 ? manifestTypeFromAstType(authoredArgument) : expectedType.arguments[index];
+    if (argument2 === void 0) return;
+    environment.set(parameterName, substituteGenericTypeNames(argument2, outer));
+  });
+  return environment;
+}
+function manifestTypeFromAstType(type) {
+  if (type.kind !== "named") {
+    return { name: "object", nullable: false, arguments: [] };
+  }
+  return {
+    name: type.name,
+    nullable: false,
+    arguments: (type.typeArguments ?? []).map(manifestTypeFromAstType)
+  };
+}
+function lowerExpressionValue(context, expression, declaredExpected, ownerClass, path, genericEnvironment = EMPTY_GENERIC_TYPE_ENVIRONMENT) {
+  const expected = substituteGenericTypeNames(
+    declaredExpected,
+    genericEnvironment
+  );
   if (expression.kind === "annotated") {
     return lowerExpressionValue(
       context,
       expression.expression,
       expected,
       ownerClass,
-      path
+      path,
+      genericEnvironment
     );
   }
   switch (expression.kind) {
@@ -38443,7 +39052,8 @@ function lowerExpressionValue(context, expression, expected, ownerClass, path) {
         expression.operand,
         expected,
         ownerClass,
-        path
+        path,
+        genericEnvironment
       );
       if (typeof operand === "number") return -operand;
       if (expected.name === "decimal" && typeof operand === "string") {
@@ -38472,7 +39082,8 @@ function lowerExpressionValue(context, expression, expected, ownerClass, path) {
           element,
           entry,
           ownerClass,
-          `${path}[${index}]`
+          `${path}[${index}]`,
+          genericEnvironment
         )
       );
     }
@@ -38485,7 +39096,8 @@ function lowerExpressionValue(context, expression, expected, ownerClass, path) {
           entry.key,
           { name: "string", nullable: false, arguments: [] },
           ownerClass,
-          path
+          path,
+          genericEnvironment
         );
         if (typeof key !== "string")
           throw new Error("Dictionary keys must be strings.");
@@ -38494,7 +39106,8 @@ function lowerExpressionValue(context, expression, expected, ownerClass, path) {
           entry.value,
           valueType,
           ownerClass,
-          `${path}[${JSON.stringify(key)}]`
+          `${path}[${JSON.stringify(key)}]`,
+          genericEnvironment
         );
       }
       return value;
@@ -38535,31 +39148,35 @@ function lowerExpressionValue(context, expression, expected, ownerClass, path) {
       }
       if (expression.className === null && expression.initializer !== void 0 && expression.hasArgumentList !== true && !partialExpected) {
         throw new Error(
-          "Inferred `new { ... }` construction is only valid in a Partial position."
+          `Inferred new { ... } construction is only valid in a Partial position (${path}).`
         );
       }
       const className = explicitPartial ? expectedType.name : expression.className ?? expectedType.name;
       const classId = requiredName(context.classIdsByName, className, "class");
-      const target = context.baseClasses.get(classId);
-      const sourceTarget = context.sourceClasses.get(classId);
+      const innerEnvironment = constructedGenericEnvironment(
+        context,
+        classId,
+        expression,
+        expectedType,
+        genericEnvironment
+      );
       const result = {};
       for (const assignment of expression.initializer ?? []) {
-        const sourceMember = sourceTarget?.members.find(
-          (candidate) => candidate.name === assignment.name
+        const memberId = effectiveMemberIdByName(
+          context,
+          classId,
+          assignment.name
         );
-        const memberId = target?.schema[assignment.name] ?? (sourceMember ? materializedId(
-          sourceMember,
-          "member",
-          `${sourceTarget?.name ?? className}.${sourceMember.name}`
-        ) : void 0);
-        const member = memberId ? context.loweredMembers.get(memberId) ?? context.baseMembers.get(memberId) : void 0;
+        const member = memberId !== null ? context.loweredMembers.get(memberId) ?? context.baseMembers.get(memberId) : void 0;
+        const sourceMember = memberId !== null ? context.sourceMembersById.get(memberId)?.member : void 0;
         const declaredType = sourceMember?.type ?? (member ? manifestTypeForMember(context, member) : { name: "object", nullable: true, arguments: [] });
         result[assignment.name] = lowerExpressionValue(
           context,
           assignment.value,
           structuredLeafAssignmentType(partialExpected, declaredType),
           ownerClass,
-          `${path}.${assignment.name}`
+          `${path}.${assignment.name}`,
+          innerEnvironment
         );
       }
       return result;
@@ -38877,7 +39494,11 @@ function inheritedMemberId(context, ownerClass, name) {
   const directBase = ownerClass.baseTypes.find(
     (entry) => context.classIdsByName.has(entry.name)
   );
-  let classId = directBase ? requiredName(context.classIdsByName, directBase.name, "class") : null;
+  const classId = directBase ? requiredName(context.classIdsByName, directBase.name, "class") : null;
+  return effectiveMemberIdByName(context, classId, name);
+}
+function effectiveMemberIdByName(context, startClassId, name) {
+  let classId = startClassId;
   const visited = /* @__PURE__ */ new Set();
   while (classId !== null && !visited.has(classId)) {
     visited.add(classId);
@@ -38907,6 +39528,20 @@ function inheritedMemberId(context, ownerClass, name) {
   }
   return null;
 }
+function lowerClassTargetMemberId(context, declaration, base) {
+  const target = argument(
+    annotation(declaration.annotations, "settings"),
+    "target"
+  );
+  if (target === null) return base?.targetMemberId ?? null;
+  const memberId = resolveQualifiedMemberId(context, target);
+  if (memberId === null) {
+    throw new Error(
+      `Class ${declaration.name} declares @settings(target: ${target.trim()}), which names no member of a known class.`
+    );
+  }
+  return memberId;
+}
 function resolveQualifiedMemberId(context, expression) {
   const match = /^([A-Za-z_][A-Za-z0-9_]*)\.([A-Za-z_][A-Za-z0-9_]*)$/.exec(
     expression.trim()
@@ -38914,14 +39549,7 @@ function resolveQualifiedMemberId(context, expression) {
   if (!match) return referenceId(expression);
   const classId = context.classIdsByName.get(match[1]);
   if (!classId) return null;
-  const loweredClass = context.baseClasses.get(classId);
-  if (loweredClass !== void 0) return loweredClass.schema[match[2]] ?? null;
-  const sourceClass = context.sourceClasses.get(classId);
-  if (sourceClass === void 0) return null;
-  const member = sourceClass.members.find(
-    (candidate) => candidate.name === match[2]
-  );
-  return member === void 0 ? null : materializedId(member, "member", `${sourceClass.name}.${member.name}`);
+  return effectiveMemberIdByName(context, classId, match[2]);
 }
 function hasAnnotation(annotations, name) {
   return annotation(annotations, name) !== void 0;
@@ -38978,11 +39606,25 @@ function referenceId(raw) {
     }
     const index = expression.argumentNames?.findIndex((entry) => entry === "id") ?? -1;
     const value = expression.args[index >= 0 ? index : 0];
-    return value?.kind === "litString" ? value.value : null;
+    if (value?.kind === "litString") return value.value;
+    const path = value === void 0 ? null : rootValuePath(value);
+    return path === null ? null : `${PENDING_ID_PREFIX}root-path:${path}`;
   } catch {
     return null;
   }
 }
+function rootValuePath(expression) {
+  const segments = [];
+  let cursor = expression;
+  while (cursor.kind === "member") {
+    segments.unshift(cursor.name);
+    cursor = cursor.receiver;
+  }
+  if (cursor.kind !== "ident") return null;
+  if (cursor.name !== "root") return null;
+  if (segments.length === 0) return null;
+  return ["root", ...segments].join(".");
+}
 function isImpliedSchemaKeyOrder(order) {
   return order.every((key, index) => index === 0 || order[index - 1] <= key);
 }
@@ -39081,22 +39723,7 @@ function primitiveTypeKind(name) {
   return values[name] ?? null;
 }
 function memberKindTypeName(kind) {
-  const names = {
-    null: "null",
-    bool: "bool",
-    int: "int",
-    string: "string",
-    float: "float",
-    decimal: "decimal",
-    sprite: "SpriteInfo",
-    audio: "AudioClipInfo",
-    vector2: "Vector2",
-    vector2Int: "Vector2Int",
-    vector3: "Vector3",
-    vector3Int: "Vector3Int",
-    color: "Color"
-  };
-  return names[kind] ?? "object";
+  return fixedSourceTypeNameForKind(kind) ?? "object";
 }
 function requiredTypeArgument(type, index) {
   const value = type.arguments[index];
@@ -39113,20 +39740,23 @@ function* zip(left, right) {
     yield [left[index], right[index]];
   }
 }
-var UNSET_LIST_COLUMN_WIDTH, primitiveMemberKinds;
+var UNSET_LIST_COLUMN_WIDTH, EMPTY_GENERIC_TYPE_ENVIRONMENT, primitiveMemberKinds;
 var init_lower_members = __esm({
   "src/project-source/lower-members.ts"() {
     "use strict";
     init_src();
     init_lower_support();
     init_lower_constructors();
+    init_projection();
     init_declared_constructors2();
     init_init_source();
     init_ui_action_source();
     init_entry_member_id();
     init_generic_argument_member_id();
     init_structured_leaf_source();
+    init_member_kind_type_names();
     UNSET_LIST_COLUMN_WIDTH = -1;
+    EMPTY_GENERIC_TYPE_ENVIRONMENT = /* @__PURE__ */ new Map();
     primitiveMemberKinds = /* @__PURE__ */ new Set([
       "null",
       "bool",
@@ -39562,6 +40192,7 @@ function lowerProjectSchemaV4(base, analysis, options = {}) {
       (type, ownerClass) => lowerType(context, type, ownerClass)
     )
   );
+  normalizeLookupDeclaredTypes(context);
   for (const [memberId, placements] of context.placements) {
     const member = context.loweredMembers.get(memberId);
     if (!member) continue;
@@ -39851,6 +40482,7 @@ function emitProjectSourcesV4(manifest, options = {}) {
     staticInitializers: options.staticInitializers ?? /* @__PURE__ */ new Map(),
     defaultInitializers: options.defaultInitializers ?? /* @__PURE__ */ new Map(),
     fileSymbols: options.fileSymbols ?? /* @__PURE__ */ new Map(),
+    collectionValuePaths: options.collectionValuePaths ?? /* @__PURE__ */ new Map(),
     templateNames: new Map(
       [...manifest.textureTemplates, ...manifest.audioTemplates].map(
         (template) => [template.id, template.name]
@@ -40033,6 +40665,9 @@ function emitClass(context, schemaClass2, memberIds) {
     id(schemaClass2.id).trimEnd(),
     ...schemaClass2.hiddenInMemberSelector ? ["@hidden"] : [],
     ...schemaClass2.allowedStorage ? [`@storage(allowed: .${enumCase(schemaClass2.allowedStorage)})`] : [],
+    ...schemaClass2.targetMemberId ? [
+      `@settings(target: ${qualifiedMember(context, schemaClass2.targetMemberId)})`
+    ] : [],
     ...schemaClass2.system ? [systemAnnotation(schemaClass2.system)] : [],
     ...relationsAnnotations(context, schemaClass2)
   ];
@@ -40327,8 +40962,11 @@ function memberSettings(context, member) {
       `collection: ${qualifiedMember(context, member.collectionMemberId)}`
     );
     if (member.collectionValueId) {
+      const rootPath = context.collectionValuePaths.get(
+        member.collectionValueId
+      );
       settings.push(
-        `collectionValue: Reference(id: ${quote(member.collectionValueId)})`
+        rootPath === void 0 ? `collectionValue: Reference(id: ${quote(member.collectionValueId)})` : `collectionValue: Reference(${rootPath})`
       );
     }
     if (member.multiselect) settings.push("multiselect: true");
@@ -40462,13 +41100,7 @@ function renderMemberType(context, member) {
       break;
     }
     case "lookup": {
-      const collection = required(
-        context.members,
-        member.collectionMemberId,
-        "lookup collection"
-      );
-      const entry = collection.kind === "list" || collection.kind === "dictionary" ? required(context.members, collection.entryMemberId, "lookup entry") : void 0;
-      const target = entry ? renderMemberType(context, entry).replace(/\?$/, "") : "object";
+      const target = member.declaredType === null ? renderLookupEntryType(context, member.collectionMemberId) : renderType(context, member.declaredType).replace(/\?$/u, "");
       value = member.multiselect ? `List<${target}>` : target;
       break;
     }
@@ -40495,6 +41127,22 @@ function renderMemberType(context, member) {
   if (member.kind === "generic") return value;
   return nullable && value !== "null" ? `${value}?` : value;
 }
+function renderLookupEntryType(context, collectionMemberId) {
+  const collection = required(
+    context.members,
+    collectionMemberId,
+    "lookup collection"
+  );
+  if (collection.kind !== "list" && collection.kind !== "dictionary") {
+    return "object";
+  }
+  const entry = required(
+    context.members,
+    collection.entryMemberId,
+    "lookup entry"
+  );
+  return renderMemberType(context, entry).replace(/\?$/u, "");
+}
 function renderType(context, type) {
   let value;
   switch (type.kind) {
@@ -45471,7 +46119,17 @@ function qualifiedProjectFileSymbolsV4(records2) {
   }
   return result;
 }
-function lowerStaticValueSourcesV4(state, analysis, manifest) {
+function createValueLowerRegistryV4() {
+  return {
+    pendingValues: /* @__PURE__ */ new Map(),
+    pendingLocalizedTexts: /* @__PURE__ */ new Map(),
+    pendingBindingMembersByClassId: /* @__PURE__ */ new Map(),
+    referenceObligations: [],
+    initAuthoredRowIds: /* @__PURE__ */ new Map(),
+    loweringFailures: []
+  };
+}
+function lowerStaticValueSourcesV4(state, analysis, manifest, options = {}) {
   const bindings = [];
   for (const sourceClass of analysis.schema.classes) {
     for (const declaration of sourceClass.members) {
@@ -45493,9 +46151,13 @@ function lowerStaticValueSourcesV4(state, analysis, manifest) {
       });
     }
   }
-  return lowerStoredValueBindingsV4(state, manifest, bindings, { analysis });
+  return lowerStoredValueBindingsV4(state, manifest, bindings, {
+    analysis,
+    registry: options.registry
+  });
 }
 function buildValueLowerContext(state, manifest, options = {}) {
+  const registry = options.registry ?? createValueLowerRegistryV4();
   const members = new Map(
     manifest.members.map((member) => [member.id, member])
   );
@@ -45516,6 +46178,7 @@ function buildValueLowerContext(state, manifest, options = {}) {
   return {
     state,
     members,
+    memberOverrides: indexMemberOverrides(members),
     classes,
     classesByName,
     interfaceIdsByName: new Map(
@@ -45531,22 +46194,43 @@ function buildValueLowerContext(state, manifest, options = {}) {
     dialogueTargetsBySymbol: dialogueTargetsBySymbol(options.analysis),
     projectFileIdsBySymbol: projectFileIdsBySymbol(state, options.analysis),
     mainLocale: projectMainLocaleFromState(state),
-    valuePlacements: indexValuePlacements(state),
+    valuePlacements: options.valuePlacements ?? indexValuePlacements(state),
     parsedInitializers,
     declaredInitializers: indexDeclaredInitializers(options.analysis),
     reconstructed: /* @__PURE__ */ new Map(),
-    pendingValues: /* @__PURE__ */ new Map(),
-    pendingLocalizedTexts: /* @__PURE__ */ new Map(),
+    pendingValues: registry.pendingValues,
+    pendingLocalizedTexts: registry.pendingLocalizedTexts,
     loweredMemberIdByValueId: /* @__PURE__ */ new Map(),
-    pendingBindingMembersByClassId: /* @__PURE__ */ new Map(),
+    pendingBindingMembersByClassId: registry.pendingBindingMembersByClassId,
     declaredConstructors: declaredConstructorIndex,
-    initAuthoredRowIds: indexInitializerAuthoredRowIds(
-      options.analysis,
-      declaredConstructorIndex,
-      classesByName
-    )
+    initAuthoredRowIds: seedInitAuthoredRowIds(
+      registry.initAuthoredRowIds,
+      indexInitializerAuthoredRowIds(
+        options.analysis,
+        declaredConstructorIndex,
+        classesByName
+      )
+    ),
+    referenceObligations: registry.referenceObligations,
+    loweringFailures: registry.loweringFailures
   };
 }
+function indexMemberOverrides(members) {
+  const result = /* @__PURE__ */ new Map();
+  for (const member of members.values()) {
+    if (member.overrideOf === null) continue;
+    const overrides = result.get(member.overrideOf) ?? [];
+    overrides.push(member.id);
+    result.set(member.overrideOf, overrides);
+  }
+  return result;
+}
+function seedInitAuthoredRowIds(shared, discovered) {
+  for (const [id2, owner] of discovered) {
+    if (!shared.has(id2)) shared.set(id2, owner);
+  }
+  return shared;
+}
 function indexInitializerAuthoredRowIds(analysis, declaredConstructors2, classesByName) {
   const index = /* @__PURE__ */ new Map();
   if (analysis === void 0) return index;
@@ -45664,8 +46348,11 @@ function lowerStoredValueBindingsV4(state, manifest, bindings, options = {}) {
     seeds
   };
 }
-function lowerMemberDefaultSourcesV4(state, analysis, manifest) {
-  const context = buildValueLowerContext(state, manifest, { analysis });
+function lowerMemberDefaultSourcesV4(state, analysis, manifest, options = {}) {
+  const context = buildValueLowerContext(state, manifest, {
+    analysis,
+    registry: options.registry
+  });
   const pulledValueIds = /* @__PURE__ */ new Set();
   for (const record3 of Object.values(state)) {
     if (record3.recordKind === "value") pulledValueIds.add(record3.recordId);
@@ -45730,6 +46417,372 @@ function lowerMemberDefaultSourcesV4(state, analysis, manifest) {
     seeds
   };
 }
+function drainValueReferenceObligationsV4(state, manifest, options) {
+  const deletedValueIds = options.deletedValueIds ?? /* @__PURE__ */ new Set();
+  const survivingState = withoutDeletedValues(state, deletedValueIds);
+  const context = buildValueLowerContext(survivingState, manifest, {
+    analysis: options.analysis,
+    registry: options.registry,
+    valuePlacements: indexValuePlacements(survivingState, {
+      pendingValues: options.registry.pendingValues,
+      deletedValueIds
+    })
+  });
+  const failures = [];
+  for (const recorded of options.registry.loweringFailures) {
+    failures.push({
+      message: recorded.message,
+      ...composeReferenceSitePosition(recorded.site, options.sourceTextByUri)
+    });
+  }
+  for (const obligation of [
+    ...collectionValueObligations(manifest),
+    ...options.registry.referenceObligations
+  ]) {
+    const failure = settleReferenceObligation(
+      context,
+      obligation,
+      deletedValueIds
+    );
+    if (failure === null) continue;
+    failures.push({
+      message: failure,
+      ...composeReferenceSitePosition(obligation.site, options.sourceTextByUri)
+    });
+  }
+  return failures;
+}
+function withoutDeletedValues(state, deletedValueIds) {
+  if (deletedValueIds.size === 0) return state;
+  const surviving = { ...state };
+  for (const valueId of deletedValueIds) delete surviving[`value:${valueId}`];
+  return surviving;
+}
+function collectionValueObligations(manifest) {
+  const obligations = [];
+  for (const member of manifest.members) {
+    if (member.kind !== "lookup") continue;
+    if (typeof member.collectionValueId !== "string") continue;
+    obligations.push({
+      kind: "collectionValue",
+      site: {
+        uri: member.source.span.path,
+        declarationStart: member.source.span.start,
+        expression: null,
+        label: member.name
+      },
+      memberId: member.id,
+      collectionMemberId: member.collectionMemberId,
+      collectionValueId: member.collectionValueId
+    });
+  }
+  return obligations;
+}
+function settleReferenceObligation(context, obligation, deletedValueIds) {
+  try {
+    if (obligation.kind === "reference") {
+      settleReferenceMember(context, obligation, deletedValueIds);
+      return null;
+    }
+    if (obligation.kind === "constructorProjection") {
+      settleConstructorProjection(context, obligation, deletedValueIds);
+      return null;
+    }
+    settleCollectionValue(context, obligation);
+    return null;
+  } catch (error) {
+    return error instanceof Error ? error.message : String(error);
+  }
+}
+function settleReferenceMember(context, obligation, deletedValueIds) {
+  const member = context.members.get(obligation.memberId);
+  if (member?.kind !== "lookup" && member?.kind !== "dialogueLookup") {
+    throw new Error(
+      `Reference member ${obligation.site.label} no longer declares a lookup after this push.`
+    );
+  }
+  if (obligation.target.spelling === "key") {
+    settleKeyReference(context, member, obligation.target, obligation);
+    return;
+  }
+  const target = resolveObligationTarget(
+    context,
+    obligation.target,
+    deletedValueIds,
+    `Reference member ${member.name}`
+  );
+  validateReferenceContract(context, member, target, obligation.ownerValueId);
+}
+function settleKeyReference(context, member, spelling, obligation) {
+  if (member.kind !== "lookup") {
+    throw new Error(
+      `Reference member ${member.name} is a dialogue lookup, and the key form resolves through a value collection's unique index. Name the dialogue directly instead.`
+    );
+  }
+  const collection = context.members.get(member.collectionMemberId);
+  if (collection?.kind !== "list") {
+    throw new Error(
+      `Reference member ${member.name} uses the key form, but its declared collection ${collectionMemberName(context, member)} is not an indexed list.`
+    );
+  }
+  const schemaKey = keyIndexSchemaKey(context, member, collection, spelling);
+  const resolution = resolveLookupCollectionValueIds(
+    context,
+    member,
+    collection,
+    obligation.ownerValueId
+  );
+  if (resolution.valueIds.length === 0) {
+    throw new Error(
+      `Reference member ${member.name} key ${JSON.stringify(spelling.key)} cannot be resolved: collection ${collectionMemberName(context, member)} has no value row in the project after this push.`
+    );
+  }
+  const matches = [];
+  for (const collectionValueId of resolution.valueIds) {
+    for (const entryId of collectionEntryIds(
+      context,
+      collection,
+      collectionValueId
+    )) {
+      const entry = valueData(context, entryId);
+      if (!entry || !isObjectRecord2(entry.value)) continue;
+      const fieldRowId = entry.value[schemaKey];
+      if (typeof fieldRowId !== "string") continue;
+      if (valueData(context, fieldRowId)?.value !== spelling.key) continue;
+      matches.push(entryId);
+    }
+  }
+  if (matches.length === 0) {
+    throw new Error(
+      `Reference member ${member.name} key ${JSON.stringify(spelling.key)} matches no row of collection ${collectionMemberName(context, member)} under index ${schemaKey}.`
+    );
+  }
+  if (matches.length > 1) {
+    throw new Error(
+      `Collection ${collectionMemberName(context, member)} holds ${matches.length} rows whose ${schemaKey} is ${JSON.stringify(spelling.key)}, but that index is unique. Fix the duplicate rows; the key form needs exactly one.`
+    );
+  }
+  const targetId = matches[0];
+  if (targetId === void 0) {
+    throw new Error(
+      `Reference member ${member.name} key ${JSON.stringify(spelling.key)} resolved to no target id.`
+    );
+  }
+  const target = referenceTargetById(context, targetId, spelling.typeName);
+  if (target === null) {
+    throw new Error(
+      `Reference member ${member.name} key ${JSON.stringify(spelling.key)} resolved to ${targetId}, which names no value row in the project after this push.`
+    );
+  }
+  validateReferenceContract(context, member, target, obligation.ownerValueId);
+  spelling.patch.ids[spelling.patch.index] = targetId;
+  const patched = spelling.patch.ids.filter((id2) => !isPendingId(id2));
+  if (new Set(patched).size !== patched.length) {
+    throw new Error(
+      `Reference member ${member.name} cannot contain duplicate targets.`
+    );
+  }
+}
+function keyIndexSchemaKey(context, member, collection, spelling) {
+  const indexes = collection.indexes ?? [];
+  if (spelling.indexSchemaKey !== null) {
+    const named = indexes.find(
+      (candidate) => candidate.schemaKey === spelling.indexSchemaKey
+    );
+    if (named === void 0) {
+      throw new Error(
+        `Reference member ${member.name} names index ${spelling.indexSchemaKey}, which collection ${collectionMemberName(context, member)} does not declare.`
+      );
+    }
+    if (!named.unique) {
+      throw new Error(
+        `Reference member ${member.name} names index ${spelling.indexSchemaKey}, which is not unique. The key form resolves exactly one row, so it needs a unique index.`
+      );
+    }
+    return named.schemaKey;
+  }
+  const unique = indexes.filter((candidate) => candidate.unique);
+  if (unique.length === 0) {
+    throw new Error(
+      `Reference member ${member.name} uses the key form, but collection ${collectionMemberName(context, member)} declares no unique index.`
+    );
+  }
+  if (unique.length > 1) {
+    throw new Error(
+      `Reference member ${member.name} uses the bare key form, but collection ${collectionMemberName(context, member)} declares ${unique.length} unique indexes (${unique.map((candidate) => candidate.schemaKey).join(", ")}). Write index: to name one.`
+    );
+  }
+  const only = unique[0];
+  if (only === void 0) {
+    throw new Error(
+      `Reference member ${member.name} resolved no unique index for collection ${collectionMemberName(context, member)}.`
+    );
+  }
+  return only.schemaKey;
+}
+function collectionEntryIds(context, collection, collectionValueId) {
+  if (collection.listKind === "unordered") {
+    return [
+      ...context.valuePlacements.valueIdsByContainerId.get(
+        collectionValueId
+      ) ?? []
+    ];
+  }
+  const body = valueData(context, collectionValueId)?.value;
+  return Array.isArray(body) ? body.filter((entry) => typeof entry === "string") : [];
+}
+function settleConstructorProjection(context, obligation, deletedValueIds) {
+  const schemaClass2 = context.classes.get(obligation.schemaClassId);
+  if (schemaClass2 === void 0) {
+    throw new Error(
+      `Constructor projection ${obligation.parameterName} names class ${obligation.schemaClassId}, which this push does not declare.`
+    );
+  }
+  const projectedMember = context.members.get(obligation.projectedMemberId);
+  if (projectedMember?.kind !== "lookup") {
+    throw new Error(
+      `Class ${schemaClass2.name} constructor projection ${obligation.parameterName} does not resolve to a Lookup field.`
+    );
+  }
+  const target = referenceTargetById(context, obligation.targetId, "");
+  if (target === null || target.kind !== "value") {
+    const owner = context.initAuthoredRowIds.get(obligation.targetId);
+    if (owner !== void 0) {
+      throw new Error(
+        `Class ${schemaClass2.name} constructor argument ${obligation.parameterName} targets value ${obligation.targetId}, which is authored inside the computed initializer of ${owner} and therefore stores no row. Point it at a literal default's row instead.`
+      );
+    }
+    if (deletedValueIds.has(obligation.targetId)) {
+      throw new Error(
+        `Class ${schemaClass2.name} constructor argument ${obligation.parameterName} targets value ${obligation.targetId}, which this push deletes.`
+      );
+    }
+    throw new Error(
+      `Class ${schemaClass2.name} constructor argument ${obligation.parameterName} targets a missing value ${obligation.targetId}. No row in the project carries that id after this push.`
+    );
+  }
+  validateReferenceContract(
+    context,
+    projectedMember,
+    { ...target, genericTypeName: null },
+    obligation.ownerValueId
+  );
+  validateAnimationProjectionBinding(
+    context,
+    schemaClass2,
+    obligation.environment,
+    target.id
+  );
+}
+function settleCollectionValue(context, obligation) {
+  const collection = context.members.get(obligation.collectionMemberId);
+  if (collection?.kind !== "list" && collection?.kind !== "dictionary") {
+    throw new Error(
+      `Lookup member ${obligation.site.label} declares collectionValue ${obligation.collectionValueId} for a collection member that this push does not declare.`
+    );
+  }
+  const row = valueData(context, obligation.collectionValueId);
+  if (row === null) {
+    throw new Error(
+      `Lookup member ${obligation.site.label} declares collectionValue ${obligation.collectionValueId}, which names no value row in the project after this push. Searched the rows this push creates and the project's existing rows.`
+    );
+  }
+  const declaredMemberIds = declaredCollectionMemberIds(
+    context,
+    obligation.collectionMemberId
+  );
+  const owners = valueOwningMemberIds(context, obligation.collectionValueId);
+  if (owners.size === 0) return;
+  for (const owner of owners) {
+    if (declaredMemberIds.has(owner)) return;
+  }
+  throw new Error(
+    `Lookup member ${obligation.site.label} declares collectionValue ${obligation.collectionValueId}, which is a value of ${[...owners].map((owner) => context.members.get(owner)?.name ?? owner).join(", ")} rather than of collection ${collection.name}.`
+  );
+}
+function resolveObligationTarget(context, spelling, deletedValueIds, subject) {
+  if (spelling.spelling === "symbol") return spelling.resolved;
+  if (spelling.spelling === "key") {
+    throw new Error(
+      `${subject} carries a key spelling with no collection to resolve it against.`
+    );
+  }
+  const target = referenceTargetById(context, spelling.id, spelling.typeName);
+  if (target !== null) return target;
+  if (deletedValueIds.has(spelling.id)) {
+    throw new Error(
+      `${subject} targets ${spelling.id}, which this push deletes. Keep the declaration that creates that row, or point the reference at a row the push leaves behind.`
+    );
+  }
+  const owner = context.initAuthoredRowIds.get(spelling.id);
+  if (owner !== void 0) {
+    throw new Error(
+      `${subject} targets ${spelling.id}, which is authored inside the computed initializer of ${owner} and therefore stores no row. Point it at a literal default's row instead.`
+    );
+  }
+  throw new Error(
+    `${subject} targets ${spelling.id}, which names no value or dialogue row in the project after this push. Searched the rows this push creates and the project's existing rows.`
+  );
+}
+function composeReferenceSitePosition(site, sourceTextByUri) {
+  const declaration = {
+    file: site.uri,
+    line: site.declarationStart.line + 1,
+    column: site.declarationStart.character + 1
+  };
+  const text = sourceTextByUri?.get(site.uri);
+  if (site.expression === null || text === void 0) return declaration;
+  const declarationOffset = sourceOffsetAtPosition(text, site.declarationStart);
+  if (declarationOffset === null) return declaration;
+  const initializerOffset = text.indexOf(
+    site.expression.initializer,
+    declarationOffset
+  );
+  if (initializerOffset < 0) return declaration;
+  const origin = sourcePositionAtOffset(text, initializerOffset);
+  const { line, column } = site.expression.pos;
+  if (line === 1) {
+    return {
+      file: site.uri,
+      line: origin.line + 1,
+      column: origin.character + column
+    };
+  }
+  return { file: site.uri, line: origin.line + line, column };
+}
+function sourceOffsetAtPosition(text, position) {
+  let offset = 0;
+  for (let line = 0; line < position.line; line += 1) {
+    const next = text.indexOf("\n", offset);
+    if (next < 0) return null;
+    offset = next + 1;
+  }
+  const candidate = offset + position.character;
+  return candidate > text.length ? null : candidate;
+}
+function sourcePositionAtOffset(text, offset) {
+  let line = 0;
+  let lineStart = 0;
+  for (let cursor = 0; cursor < offset; cursor += 1) {
+    if (text[cursor] !== "\n") continue;
+    line += 1;
+    lineStart = cursor + 1;
+  }
+  return { line, character: offset - lineStart };
+}
+function declaredCollectionMemberIds(context, collectionMemberId) {
+  const ids = /* @__PURE__ */ new Set([collectionMemberId]);
+  const pending = [collectionMemberId];
+  while (pending.length > 0) {
+    const current = pending.pop();
+    for (const override of context.memberOverrides.get(current) ?? []) {
+      if (ids.has(override)) continue;
+      ids.add(override);
+      pending.push(override);
+    }
+  }
+  return ids;
+}
 function defaultRequiresOwnedRows(context, member, sourceExpression) {
   const expression = annotatedValue(sourceExpression).expression;
   if (initializerRequiresEvaluation(
@@ -45846,7 +46899,7 @@ function lowerRowBackedDefault(context, member, backed, baseData3, binding) {
     );
     for (const assignment of expression.initializer ?? []) {
       const childMember = classMemberByName(context, classId, assignment.name);
-      if (schemaClass2.constructorProjections?.some(
+      if (inheritedConstructorProjections(context.classes, schemaClass2.id).some(
         (projection) => projection.memberId === childMember.id
       )) {
         throw new Error(
@@ -46128,11 +47181,7 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
       ...containerId === void 0 ? {} : { containerId },
       ...initSourceValueId === null ? {} : { sourceValueId: initSourceValueId }
     };
-    if (rows.has(valueId)) {
-      throw new Error(`Value construction reuses identity ${valueId}.`);
-    }
-    rows.set(valueId, initRow);
-    context.pendingValues.set(valueId, initRow);
+    registerSeedRow(context, rows, initRow, source, sourceExpression);
     return initRow;
   }
   let value;
@@ -46194,7 +47243,8 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
       effectiveClass,
       expression,
       valueId,
-      environment
+      environment,
+      source
     )) {
       const childPath = `${path}.${schemaKey}`;
       const childValueId = pendingNestedValueId(source, childPath);
@@ -46220,9 +47270,10 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
         effectiveClass.id,
         assignment.name
       );
-      if (effectiveClass.constructorProjections?.some(
-        (projection) => projection.memberId === childMember.id
-      )) {
+      if (inheritedConstructorProjections(
+        context.classes,
+        effectiveClass.id
+      ).some((projection) => projection.memberId === childMember.id)) {
         throw new Error(
           `Class value ${path}.${assignment.name} is constructor-projected and must be set through its named constructor argument.`
         );
@@ -46351,13 +47402,24 @@ function lowerSeedRow(context, member, sourceExpression, source, valueId, path,
     ...genericBindings === void 0 ? {} : { genericBindings },
     ...sourceValueId === null ? {} : { sourceValueId }
   };
-  if (rows.has(valueId)) {
-    throw new Error(`Value construction reuses identity ${valueId}.`);
-  }
-  rows.set(valueId, row);
-  context.pendingValues.set(valueId, row);
+  registerSeedRow(context, rows, row, source, sourceExpression);
   return row;
 }
+function registerSeedRow(context, rows, row, source, expression) {
+  if (rows.has(row.id)) {
+    throw new Error(`Value construction reuses identity ${row.id}.`);
+  }
+  if (context.pendingValues.has(row.id)) {
+    context.loweringFailures.push({
+      message: `Value ${source.label} claims identity ${row.id}, which another value created by this push already owns. Two new rows cannot share one @id.`,
+      site: referenceSite(source, expression)
+    });
+    rows.set(row.id, row);
+    return;
+  }
+  rows.set(row.id, row);
+  context.pendingValues.set(row.id, row);
+}
 function materializeRequiredDefaults(context, member, effectiveClass, body, source, path, rows, localizedTexts, environment) {
   if (member.partial === true) return;
   for (const [schemaKey, childMember] of storedSchemaEntries(
@@ -46373,7 +47435,13 @@ function materializeRequiredDefaults(context, member, effectiveClass, body, sour
       context,
       recursivePartialMember(member, childMember),
       parseCachedInitializer(context.parsedInitializers, initializer),
-      source,
+      // P47 §1.6. This subtree's AST comes from the child member's own declared
+      // initializer, not the binding's, and every position in it is measured
+      // from there. Handing down a binding that names the text keeps "positions
+      // are relative to `source.initializer`" true everywhere, which is what
+      // `referenceSite` composes against. Identity derivation reads the uri and
+      // range, so the rows this produces are unchanged.
+      { ...source, initializer },
       `${path}.${schemaKey}`,
       rows,
       localizedTexts,
@@ -46544,7 +47612,8 @@ function lowerValueBody(context, member, expression, base, source, environment)
           context,
           member,
           expression,
-          typeof base.id === "string" ? base.id : null
+          typeof base.id === "string" ? base.id : null,
+          source
         )
       };
     case "sprite":
@@ -46642,7 +47711,7 @@ function lowerClassValue(context, member, expression, base, source, outerEnviron
   );
   for (const assignment of expression.initializer ?? []) {
     const childMember = classMemberByName(context, classId, assignment.name);
-    if (schemaClass2.constructorProjections?.some(
+    if (inheritedConstructorProjections(context.classes, schemaClass2.id).some(
       (projection) => projection.memberId === childMember.id
     )) {
       throw new Error(
@@ -46686,7 +47755,8 @@ function lowerConstructorProjections(context, schemaClass2, expression, base, ba
     schemaClass2,
     expression,
     typeof base.id === "string" ? base.id : null,
-    environment
+    environment,
+    source
   );
   for (const { schemaKey, target } of resolved) {
     const childValueId = baseBody[schemaKey];
@@ -46706,8 +47776,44 @@ function lowerConstructorProjections(context, schemaClass2, expression, base, ba
     body[schemaKey] = childValueId;
   }
 }
-function resolveConstructorProjectionArguments(context, schemaClass2, expression, ownerValueId, environment) {
-  const projections = schemaClass2.constructorProjections ?? [];
+function classInheritanceChain(classes, classId) {
+  const chain = [];
+  const visited = /* @__PURE__ */ new Set();
+  let current = classId;
+  while (current !== null && !visited.has(current)) {
+    visited.add(current);
+    const schemaClass2 = classes.get(current);
+    if (schemaClass2 === void 0) break;
+    chain.push(schemaClass2);
+    current = schemaClass2.extendsClassId;
+  }
+  return chain;
+}
+function inheritedConstructorProjections(classes, classId) {
+  const resolved = [];
+  const claimed = /* @__PURE__ */ new Set();
+  for (const schemaClass2 of classInheritanceChain(classes, classId)) {
+    for (const projection of schemaClass2.constructorProjections ?? []) {
+      if (claimed.has(projection.parameterName)) continue;
+      claimed.add(projection.parameterName);
+      resolved.push(projection);
+    }
+  }
+  return resolved;
+}
+function inheritedProjectionSchemaKey(classes, classId, memberId) {
+  for (const schemaClass2 of classInheritanceChain(classes, classId)) {
+    for (const [schemaKey, declared] of Object.entries(schemaClass2.schema)) {
+      if (declared === memberId) return schemaKey;
+    }
+  }
+  return null;
+}
+function resolveConstructorProjectionArguments(context, schemaClass2, expression, ownerValueId, environment, source) {
+  const projections = inheritedConstructorProjections(
+    context.classes,
+    schemaClass2.id
+  );
   if (projections.length === 0) {
     if (expression.args.length > 0) {
       throw new Error(
@@ -46751,44 +47857,32 @@ function resolveConstructorProjectionArguments(context, schemaClass2, expression
         `Class ${schemaClass2.name} constructor argument ${parameterName} must be a value-row id string.`
       );
     }
-    const schemaKey = Object.entries(schemaClass2.schema).find(
-      ([, memberId]) => memberId === projection.memberId
-    )?.[0];
+    const schemaKey = inheritedProjectionSchemaKey(
+      context.classes,
+      schemaClass2.id,
+      projection.memberId
+    );
     const projectedMember = context.members.get(projection.memberId);
-    if (schemaKey === void 0 || projectedMember?.kind !== "lookup") {
+    if (schemaKey === null || projectedMember?.kind !== "lookup") {
       throw new Error(
         `Class ${schemaClass2.name} constructor projection ${parameterName} does not resolve to a Lookup field.`
       );
     }
-    const target = referenceTargetById(context, argument2.value, "");
-    if (target === null || target.kind !== "value") {
-      const owner = context.initAuthoredRowIds.get(argument2.value);
-      if (owner !== void 0) {
-        throw new Error(
-          `Class ${schemaClass2.name} constructor argument ${parameterName} targets value ${argument2.value}, which is authored inside the computed initializer of ${owner} and therefore stores no row. Point it at a literal default's row instead.`
-        );
-      }
-      throw new Error(
-        `Class ${schemaClass2.name} constructor argument ${parameterName} targets a missing value ${argument2.value}.`
-      );
-    }
-    validateReferenceContract(
-      context,
-      projectedMember,
-      { ...target, genericTypeName: null },
-      ownerValueId
-    );
-    validateAnimationProjectionBinding(
-      context,
-      schemaClass2,
-      environment,
-      target.id
-    );
+    context.referenceObligations.push({
+      kind: "constructorProjection",
+      site: referenceSite(source, argument2),
+      schemaClassId: schemaClass2.id,
+      parameterName,
+      projectedMemberId: projectedMember.id,
+      targetId: argument2.value,
+      ownerValueId,
+      environment
+    });
     resolved.push({
       parameterName,
       projectedMember,
       schemaKey,
-      target: { id: target.id, kind: "value" }
+      target: { id: argument2.value, kind: "value" }
     });
   }
   return resolved;
@@ -46887,7 +47981,7 @@ function genericBindingClassId(context, bindingMemberId) {
   return rawBinding?.kind === 7 && typeof rawBinding.classId === "string" ? rawBinding.classId : null;
 }
 function validateConstructedGenericArguments(context, schemaClass2, expression, environment, path) {
-  const actual = expression.typeArguments ?? [];
+  const actual = expression.className === "Partial" ? [] : expression.typeArguments ?? [];
   const expected = schemaClass2.genericParameters;
   if (expected.length === 0) {
     if (actual.length > 0) {
@@ -46928,14 +48022,14 @@ function lowerRawMemberTypeName(context, memberId) {
   if (member.kind === 7 && typeof member.classId === "string") {
     return context.classes.get(member.classId)?.name ?? null;
   }
-  return typeof member.kind === "number" ? MEMBER_KIND_SOURCE_NAMES.get(member.kind) ?? null : null;
+  return typeof member.kind === "number" ? fixedSourceTypeNameForKindNumber(member.kind) : null;
 }
 function lowerSchemaMemberTypeName(context, member) {
   if (member.kind === "class") {
     return context.classes.get(member.classId)?.name ?? null;
   }
   if (member.kind === "generic") return null;
-  return member.kind;
+  return fixedSourceTypeNameForKind(member.kind) ?? member.kind;
 }
 function constructedClass(context, member, expression, currentClassId, path) {
   if (member.partial === true) {
@@ -46963,13 +48057,22 @@ function constructedClass(context, member, expression, currentClassId, path) {
     );
   }
   if (expression.className !== null) {
-    return requiredClassByName(context, expression.className);
+    const named = requiredClassByName(context, expression.className);
+    assertConstructedClassAssignable(context, named, member, path);
+    return named;
   }
   const target = context.classes.get(currentClassId);
   if (target === void 0)
     throw new Error(`Unknown value class ${currentClassId}.`);
   return target;
 }
+function assertConstructedClassAssignable(context, named, member, path) {
+  if (classAssignableToClass(context, named.id, member.classId)) return;
+  const declaredName = context.classes.get(member.classId)?.name ?? member.classId;
+  throw new Error(
+    `Class value ${path} constructs ${named.name}, which does not descend from the declared class ${declaredName}.`
+  );
+}
 function recursivePartialMember(parent, child) {
   if (parent.partial !== true) return child;
   if (child.kind === "class" || child.kind === "generic") {
@@ -47018,7 +48121,13 @@ function lowerListValue(context, member, expression, base, source, inheritedEnvi
       continue;
     }
     const itemId = annotatedItemId;
-    if (isPendingId(itemId) && context.state[`value:${itemId}`] === void 0) {
+    if (context.state[`value:${itemId}`] === void 0) {
+      if (!isPendingId(itemId) && !isUuidV4Id(itemId)) {
+        context.loweringFailures.push({
+          message: `List ${member.name} entry @id("${itemId}") names no existing row, and a new row's durable identity must be a UUID v4. Fix the id if it meant an existing row, or drop the @id to mint a fresh identity.`,
+          site: referenceSite(source, element)
+        });
+      }
       ids.push(
         lowerPendingListItem(
           context,
@@ -47173,19 +48282,37 @@ function lowerEnum2(context, member, expression) {
     return id2;
   });
 }
-function lowerReferences(context, member, expression, ownerValueId) {
+function lowerReferences(context, member, expression, ownerValueId, source) {
   const elements = member.multiselect ? expression.kind === "litList" ? expression.elements : null : [expression];
   if (elements === null) {
     throw new Error(`Reference member ${member.name} requires [...].`);
   }
-  const ids = elements.map((entry) => {
-    const target = resolveReferenceTarget(context, entry);
+  const ids = [];
+  for (const [index, entry] of elements.entries()) {
+    const target = referenceTargetSpelling(context, entry);
     if (target === null) {
       throw new Error(`Reference member ${member.name} has an invalid target.`);
     }
-    validateReferenceContract(context, member, target, ownerValueId);
-    return target.id;
-  });
+    if (target.spelling === "key") {
+      ids.push(`${PENDING_ID_PREFIX}reference-key:${source.label}:${index}`);
+      context.referenceObligations.push({
+        kind: "reference",
+        site: referenceSite(source, entry),
+        memberId: member.id,
+        ownerValueId,
+        target: { ...target, patch: { ids, index } }
+      });
+      continue;
+    }
+    context.referenceObligations.push({
+      kind: "reference",
+      site: referenceSite(source, entry),
+      memberId: member.id,
+      ownerValueId,
+      target
+    });
+    ids.push(target.spelling === "id" ? target.id : target.resolved.id);
+  }
   if (new Set(ids).size !== ids.length) {
     throw new Error(
       `Reference member ${member.name} cannot contain duplicate targets.`
@@ -47193,6 +48320,27 @@ function lowerReferences(context, member, expression, ownerValueId) {
   }
   return ids;
 }
+function referenceSite(source, expression) {
+  return {
+    uri: source.source.uri,
+    declarationStart: source.source.range.start,
+    expression: {
+      initializer: source.initializer,
+      pos: expressionAnchorPos(expression)
+    },
+    label: source.label
+  };
+}
+function expressionAnchorPos(expression) {
+  if (expression.kind === "annotated") {
+    return expressionAnchorPos(expression.expression);
+  }
+  if (expression.kind === "call") return expressionAnchorPos(expression.callee);
+  if (expression.kind === "member") {
+    return expressionAnchorPos(expression.receiver);
+  }
+  return { line: expression.pos.line, column: expression.pos.column };
+}
 function lowerFileValue(context, member, expression) {
   if (member.kind === "sprite") {
     if (expression.kind !== "call" || expression.callee.kind !== "member" || expression.callee.name !== "Slice") {
@@ -47281,24 +48429,53 @@ function sourceValueSymbol(context, expression) {
   const path = memberPath(unwrapped);
   return path === null ? null : context.staticValueIdsBySymbol.get(path) ?? null;
 }
-function resolveReferenceTarget(context, expression) {
+function referenceTargetSpelling(context, expression) {
   if (expression.kind !== "call" || expression.callee.kind !== "ident" || expression.callee.name !== "Reference") {
     return null;
   }
   if ((expression.typeArguments?.length ?? 0) > 1) return null;
   const genericTypeName = expression.typeArguments?.[0] ? astTypeName(expression.typeArguments[0]) : null;
+  const keyNamed = expression.argumentNames?.findIndex((name) => name === "key") ?? -1;
+  if (keyNamed >= 0) {
+    const keyArgument = expression.args[keyNamed];
+    if (keyArgument?.kind !== "litString" || !genericTypeName) return null;
+    const indexNamed = expression.argumentNames?.findIndex((name) => name === "index") ?? -1;
+    if (expression.args.length !== (indexNamed >= 0 ? 2 : 1)) return null;
+    if (indexNamed < 0) {
+      return {
+        spelling: "key",
+        key: keyArgument.value,
+        indexSchemaKey: null,
+        typeName: genericTypeName
+      };
+    }
+    const indexArgument = expression.args[indexNamed];
+    if (indexArgument?.kind !== "ident") return null;
+    return {
+      spelling: "key",
+      key: keyArgument.value,
+      indexSchemaKey: indexArgument.name,
+      typeName: genericTypeName
+    };
+  }
   const named = expression.argumentNames?.findIndex((name) => name === "id") ?? -1;
   const argument2 = expression.args[named >= 0 ? named : 0];
   if (expression.args.length !== 1 || !argument2) return null;
   if (named >= 0) {
     if (argument2.kind !== "litString" || !genericTypeName) return null;
-    return referenceTargetById(context, argument2.value, genericTypeName);
+    return { spelling: "id", id: argument2.value, typeName: genericTypeName };
   }
-  const path = argument2 ? memberPath(argument2) : null;
+  const resolved = referenceTargetBySymbol(context, argument2, genericTypeName);
+  const path = memberPath(argument2);
+  if (resolved === null || path === null) return null;
+  return { spelling: "symbol", path, resolved };
+}
+function referenceTargetBySymbol(context, argument2, genericTypeName) {
+  const path = memberPath(argument2);
   if (path === null) return null;
   const valueId = context.staticValueIdsBySymbol.get(path);
   if (valueId) {
-    const value = stateData(context, "value", valueId);
+    const value = valueData(context, valueId);
     return {
       id: valueId,
       kind: "value",
@@ -47365,7 +48542,7 @@ function validateReferenceContract(context, member, target, ownerValueId) {
     const actualClassId = targetData && typeof targetData.classId === "string" ? targetData.classId : null;
     if (expectedClassId && actualClassId && !classAssignableToClass(context, actualClassId, expectedClassId)) {
       throw new Error(
-        `Lookup member ${member.name} target ${target.id} has an incompatible value type.`
+        `Lookup member ${member.name} target ${target.id} is ${context.classes.get(actualClassId)?.name ?? actualClassId}, but collection ${collectionMemberName(context, member)} holds ${context.classes.get(expectedClassId)?.name ?? expectedClassId}.`
       );
     }
     if (target.genericTypeName && expectedTypeName && !referenceTypeNameAssignable(
@@ -47424,32 +48601,45 @@ function validateLookupMembership(context, member, targetId, ownerValueId) {
       `Lookup member ${member.name} references a missing collection member.`
     );
   }
-  const collectionValueIds = resolveLookupCollectionValueIds(
+  const resolution = resolveLookupCollectionValueIds(
     context,
     member,
     collection,
     ownerValueId
   );
-  if (collectionValueIds.length === 0) {
+  if (resolution.valueIds.length === 0) {
     throw new Error(
-      `Lookup member ${member.name} has no resolvable collection value for membership validation.`
+      `Lookup member ${member.name} target ${targetId} cannot be checked: collection ${collectionMemberName(context, member)} has no value row in the project after this push. Declare @settings(collectionValue: ...) to name the list this member selects from.`
     );
   }
-  const present = collectionValueIds.some((collectionValueId) => {
+  const present = resolution.valueIds.some((collectionValueId) => {
     const collectionValue = valueData(context, collectionValueId);
     if (!collectionValue) return false;
     const body = collectionValue.value;
     return collection.kind === "list" && collection.listKind === "unordered" ? valueData(context, targetId)?.containerId === collectionValueId : Array.isArray(body) ? body.includes(targetId) : isObjectRecord2(body) ? Object.values(body).includes(targetId) : false;
   });
-  if (!present) {
+  if (present) return;
+  if (resolution.origin === "nameScan") {
     throw new Error(
-      `Lookup member ${member.name} target ${targetId} is not a member of collection ${collectionValueIds.join(", ")}.`
+      `Lookup member ${member.name} target ${targetId} cannot be checked: collection ${collectionMemberName(context, member)} could not be resolved to a value row, and the rows found by searching for the name ${JSON.stringify(collection.name)} (${resolution.valueIds.join(", ")}) are not it. Declare @settings(collectionValue: ...) to name the list this member selects from.`
     );
   }
+  throw new Error(
+    `Lookup member ${member.name} target ${targetId} is not a member of collection ${collectionMemberName(context, member)} (${resolution.valueIds.join(", ")}).`
+  );
+}
+function collectionMemberName(context, member) {
+  const collection = context.members.get(member.collectionMemberId);
+  if (collection === void 0) return member.collectionMemberId;
+  const owner = collection.owner;
+  if (owner.kind !== "classMember") return collection.name;
+  const ownerClass = context.classes.get(owner.classId);
+  if (ownerClass === void 0) return collection.name;
+  return `${ownerClass.name}.${collection.name}`;
 }
 function resolveLookupCollectionValueIds(context, member, collection, ownerValueId) {
   if (typeof member.collectionValueId === "string") {
-    return [member.collectionValueId];
+    return { valueIds: [member.collectionValueId], origin: "declared" };
   }
   if (ownerValueId !== null) {
     const container = context.valuePlacements.containerBodyByPlacement.get(
@@ -47457,9 +48647,17 @@ function resolveLookupCollectionValueIds(context, member, collection, ownerValue
     );
     const siblingValueId = container?.[collection.name];
     if (typeof siblingValueId === "string") {
-      return [siblingValueId];
+      return { valueIds: [siblingValueId], origin: "sibling" };
     }
   }
+  const declaredRows = collectionRowsOfDeclaredMember(
+    context,
+    member.collectionMemberId,
+    collection.name
+  );
+  if (declaredRows.size > 0) {
+    return { valueIds: [...declaredRows], origin: "collectionMember" };
+  }
   const candidates = /* @__PURE__ */ new Set();
   const collectionState = context.state[`member:${member.collectionMemberId}`];
   const collectionMemberData = isObjectRecord2(collectionState?.data) ? collectionState.data : {};
@@ -47471,21 +48669,92 @@ function resolveLookupCollectionValueIds(context, member, collection, ownerValue
   ) ?? []) {
     candidates.add(placedValueId);
   }
-  return [...candidates];
+  return { valueIds: [...candidates], origin: "nameScan" };
+}
+function collectionRowsOfDeclaredMember(context, collectionMemberId, schemaKey) {
+  const declaredMemberIds = declaredCollectionMemberIds(
+    context,
+    collectionMemberId
+  );
+  const rows = /* @__PURE__ */ new Set();
+  for (const memberId of declaredMemberIds) {
+    for (const valueId of context.valuePlacements.valueIdsByMemberId.get(
+      memberId
+    ) ?? []) {
+      rows.add(valueId);
+    }
+    const bound = context.valuePlacements.valueIdByMemberId.get(memberId);
+    if (bound !== void 0) rows.add(bound);
+  }
+  for (const placement of context.valuePlacements.placementsBySchemaKey.get(
+    schemaKey
+  ) ?? []) {
+    if (placement.containerClassId === null) continue;
+    const placedMemberId = classSchemaMemberId(
+      context,
+      placement.containerClassId,
+      placement.schemaKey
+    );
+    if (placedMemberId === null) continue;
+    if (!declaredMemberIds.has(placedMemberId)) continue;
+    rows.add(placement.valueId);
+  }
+  return rows;
+}
+function valueOwningMemberIds(context, valueId) {
+  const owners = /* @__PURE__ */ new Set();
+  const pending = context.pendingValues.get(valueId);
+  if (pending !== void 0) owners.add(pending.memberId);
+  for (const memberId of context.valuePlacements.memberIdsByBoundValueId.get(
+    valueId
+  ) ?? []) {
+    owners.add(memberId);
+  }
+  for (const placement of context.valuePlacements.placementsByValueId.get(
+    valueId
+  ) ?? []) {
+    if (placement.containerClassId === null) continue;
+    const memberId = classSchemaMemberId(
+      context,
+      placement.containerClassId,
+      placement.schemaKey
+    );
+    if (memberId !== null) owners.add(memberId);
+  }
+  return owners;
+}
+function classSchemaMemberId(context, classId, schemaKey) {
+  let current = classId;
+  const visited = /* @__PURE__ */ new Set();
+  while (current !== null && !visited.has(current)) {
+    visited.add(current);
+    const schemaClass2 = context.classes.get(current);
+    if (schemaClass2 === void 0) return null;
+    const memberId = schemaClass2.schema[schemaKey];
+    if (typeof memberId === "string") return memberId;
+    current = schemaClass2.extendsClassId;
+  }
+  return null;
 }
-function indexValuePlacements(state) {
+function indexValuePlacements(state, options = {}) {
   const containerBodyByPlacement = /* @__PURE__ */ new Map();
   const mutablePlacedValueIds = /* @__PURE__ */ new Map();
   const valueIdsByContainerId = /* @__PURE__ */ new Map();
-  for (const record3 of Object.values(state)) {
-    if (record3.recordKind !== "value" || !isObjectRecord2(record3.data)) continue;
-    const containerId = record3.data.containerId;
-    if (typeof containerId === "string") {
-      const contained = valueIdsByContainerId.get(containerId) ?? /* @__PURE__ */ new Set();
-      contained.add(record3.recordId);
-      valueIdsByContainerId.set(containerId, contained);
-    }
-    const body = isObjectRecord2(record3.data.value) ? record3.data.value : null;
+  const mutableValueIdsByMemberId = /* @__PURE__ */ new Map();
+  const placementsBySchemaKey = /* @__PURE__ */ new Map();
+  const placementsByValueId = /* @__PURE__ */ new Map();
+  for (const row of unionValueRows(state, options)) {
+    if (row.containerId !== null) {
+      const contained = valueIdsByContainerId.get(row.containerId) ?? /* @__PURE__ */ new Set();
+      contained.add(row.id);
+      valueIdsByContainerId.set(row.containerId, contained);
+    }
+    if (row.memberId !== null) {
+      const owned = mutableValueIdsByMemberId.get(row.memberId) ?? [];
+      owned.push(row.id);
+      mutableValueIdsByMemberId.set(row.memberId, owned);
+    }
+    const body = isObjectRecord2(row.body) ? row.body : null;
     if (body === null) continue;
     for (const [memberName, childValueId] of Object.entries(body)) {
       if (typeof childValueId !== "string") continue;
@@ -47496,16 +48765,73 @@ function indexValuePlacements(state) {
       const placed = mutablePlacedValueIds.get(memberName) ?? /* @__PURE__ */ new Set();
       placed.add(childValueId);
       mutablePlacedValueIds.set(memberName, placed);
+      const placement = {
+        valueId: childValueId,
+        schemaKey: memberName,
+        containerValueId: row.id,
+        containerClassId: row.classId
+      };
+      const byKey = placementsBySchemaKey.get(memberName) ?? [];
+      byKey.push(placement);
+      placementsBySchemaKey.set(memberName, byKey);
+      const byValue = placementsByValueId.get(childValueId) ?? [];
+      byValue.push(placement);
+      placementsByValueId.set(childValueId, byValue);
     }
   }
+  const valueIdByMemberId = /* @__PURE__ */ new Map();
+  const memberIdsByBoundValueId = /* @__PURE__ */ new Map();
+  for (const record3 of Object.values(state)) {
+    if (record3.recordKind !== "member" || !isObjectRecord2(record3.data))
+      continue;
+    const valueId = record3.data.valueId;
+    if (typeof valueId !== "string") continue;
+    if (options.deletedValueIds?.has(valueId) === true) continue;
+    valueIdByMemberId.set(record3.recordId, valueId);
+    const bound = memberIdsByBoundValueId.get(valueId) ?? [];
+    bound.push(record3.recordId);
+    memberIdsByBoundValueId.set(valueId, bound);
+  }
   return {
     containerBodyByPlacement,
     placedValueIdsByMemberName: new Map(
       [...mutablePlacedValueIds].map(([name, ids]) => [name, [...ids]])
     ),
-    valueIdsByContainerId
+    valueIdsByContainerId,
+    valueIdsByMemberId: mutableValueIdsByMemberId,
+    placementsBySchemaKey,
+    placementsByValueId,
+    valueIdByMemberId,
+    memberIdsByBoundValueId
   };
 }
+function unionValueRows(state, options) {
+  const rows = [];
+  const pendingValues = options.pendingValues;
+  for (const record3 of Object.values(state)) {
+    if (record3.recordKind !== "value" || !isObjectRecord2(record3.data)) continue;
+    if (options.deletedValueIds?.has(record3.recordId) === true) continue;
+    if (pendingValues?.has(record3.recordId) === true) continue;
+    rows.push({
+      id: record3.recordId,
+      containerId: typeof record3.data.containerId === "string" ? record3.data.containerId : null,
+      body: record3.data.value,
+      memberId: typeof record3.data.memberId === "string" ? record3.data.memberId : null,
+      classId: typeof record3.data.classId === "string" ? record3.data.classId : null
+    });
+  }
+  for (const row of pendingValues?.values() ?? []) {
+    if (options.deletedValueIds?.has(row.id) === true) continue;
+    rows.push({
+      id: row.id,
+      containerId: row.containerId ?? null,
+      body: row.value,
+      memberId: row.memberId,
+      classId: row.classId ?? null
+    });
+  }
+  return rows;
+}
 function validateDialogueEligibility(context, member, dialogueId) {
   const dialogue = stateData(context, "dialogue", dialogueId);
   if (!dialogue) {
@@ -47960,7 +49286,6 @@ function classValue(context, member, value, visited, targetTyped, outerEnvironme
   const projection = constructorProjectionSource(
     context,
     classId,
-    schema,
     value.value,
     visited
   );
@@ -48061,23 +49386,28 @@ function manifestMemberTypeName(context, member) {
   if (member.kind === "scriptFunction" || member.kind === "function") {
     return "FunctionRef";
   }
-  return member.kind;
+  return fixedSourceTypeNameForKind(member.kind) ?? member.kind;
 }
-function constructorProjectionSource(context, classId, schema, body, visited) {
-  const projections = context.manifestClasses.get(classId)?.constructorProjections ?? [];
+function constructorProjectionSource(context, classId, body, visited) {
+  const projections = inheritedConstructorProjections(
+    context.manifestClasses,
+    classId
+  );
   const argumentsValue = [];
   const memberIds = /* @__PURE__ */ new Set();
   const targetValueIds = [];
   for (const projection of projections) {
-    const schemaKey = Object.entries(schema).find(
-      ([, memberId]) => memberId === projection.memberId
-    )?.[0];
-    const childValueId = schemaKey ? body[schemaKey] : void 0;
+    const schemaKey = inheritedProjectionSchemaKey(
+      context.manifestClasses,
+      classId,
+      projection.memberId
+    );
+    const childValueId = schemaKey === null ? void 0 : body[schemaKey];
     const childValue = typeof childValueId === "string" ? context.values.get(childValueId) : void 0;
     const targetIds = Array.isArray(childValue?.value) ? childValue.value.filter(
       (entry) => typeof entry === "string"
     ) : [];
-    if (schemaKey === void 0 || typeof childValueId !== "string" || targetIds.length !== 1) {
+    if (schemaKey === null || typeof childValueId !== "string" || targetIds.length !== 1) {
       throw new Error(
         `Class ${context.manifestClasses.get(classId)?.name ?? classId} constructor projection ${projection.parameterName} requires exactly one referenced value.`
       );
@@ -48364,10 +49694,62 @@ function referenceValue(context, member, body, dialogue) {
     const symbol = context.symbolsByValueId.get(id2);
     if (symbol !== void 0) return `Reference(${symbol})`;
     const type = dialogue ? "Dialogue" : memberReferenceType(context, member);
+    if (!dialogue) {
+      const key = uniqueIndexKeyForTarget(context, member, id2);
+      if (key !== null) return `Reference<${type}>(key: ${quote4(key)})`;
+    }
     return `Reference<${type}>(id: ${quote4(id2)})`;
   });
   return member.multiselect === true ? `[${values.join(", ")}]` : values[0] ?? "null";
 }
+function uniqueIndexKeyForTarget(context, member, targetId) {
+  const manifestMember = context.manifestMembers.get(stringField2(member, "id"));
+  if (manifestMember?.kind !== "lookup") return null;
+  const collection = context.manifestMembers.get(
+    manifestMember.collectionMemberId
+  );
+  if (collection?.kind !== "list") return null;
+  const unique = (collection.indexes ?? []).filter((index) => index.unique);
+  const only = unique.length === 1 ? unique[0] : void 0;
+  if (only === void 0) return null;
+  const key = indexedFieldValue(context, targetId, only.schemaKey);
+  if (key === null || key.length === 0) return null;
+  const siblings = collectionSiblingIds(context, collection, targetId);
+  let holders = 0;
+  for (const sibling of siblings) {
+    if (indexedFieldValue(context, sibling, only.schemaKey) === key) {
+      holders += 1;
+    }
+  }
+  return holders === 1 ? key : null;
+}
+function indexedFieldValue(context, rowId, schemaKey) {
+  const row = context.values.get(rowId);
+  const body = row?.value;
+  if (!isObjectRecord2(body)) return null;
+  const fieldRowId = body[schemaKey];
+  if (typeof fieldRowId !== "string") return null;
+  const fieldValue = context.values.get(fieldRowId)?.value;
+  return typeof fieldValue === "string" ? fieldValue : null;
+}
+function collectionSiblingIds(context, collection, targetId) {
+  if (collection.listKind === "unordered") {
+    const containerId = context.values.get(targetId)?.containerId;
+    if (typeof containerId !== "string") return [targetId];
+    const siblings = [];
+    for (const [id2, row] of context.values) {
+      if (row.containerId === containerId) siblings.push(id2);
+    }
+    return siblings;
+  }
+  for (const row of context.values.values()) {
+    const body = row.value;
+    if (!Array.isArray(body)) continue;
+    if (!body.includes(targetId)) continue;
+    return body.filter((entry) => typeof entry === "string");
+  }
+  return [targetId];
+}
 function functionReferenceValue(context, body) {
   if (!isObjectRecord2(body) || typeof body.functionMemberId !== "string") {
     throw new Error("FunctionRef value is missing functionMemberId.");
@@ -48571,7 +49953,7 @@ function numberOr2(value, fallback) {
 function quote4(value) {
   return quoteNeoString(value);
 }
-var INFERRED_GENERIC_CLASS_PREFIX, MEMBER_KIND_DICTIONARY, MEMBER_KIND_LIST, MEMBER_KIND_CLASS, MEMBER_KIND_SOURCE_NAMES;
+var INFERRED_GENERIC_CLASS_PREFIX, MEMBER_KIND_DICTIONARY, MEMBER_KIND_LIST, MEMBER_KIND_CLASS;
 var init_value_sources = __esm({
   "src/project-source/value-sources.ts"() {
     "use strict";
@@ -48586,18 +49968,11 @@ var init_value_sources = __esm({
     init_member_value_id();
     init_members();
     init_structured_leaf_source();
+    init_member_kind_type_names();
     INFERRED_GENERIC_CLASS_PREFIX = "__inferred_class__:";
     MEMBER_KIND_DICTIONARY = 5;
     MEMBER_KIND_LIST = 6;
     MEMBER_KIND_CLASS = 7;
-    MEMBER_KIND_SOURCE_NAMES = /* @__PURE__ */ new Map([
-      [0, "null"],
-      [1, "bool"],
-      [2, "int"],
-      [3, "string"],
-      [4, "float"],
-      [20, "decimal"]
-    ]);
   }
 });
 
@@ -48662,7 +50037,7 @@ ${declarations.join("\n\n")}
     ])
   };
 }
-function lowerProjectRootSourceV4(state, analysis, manifest) {
+function lowerProjectRootSourceV4(state, analysis, manifest, options = {}) {
   const validated = validateProjectRootEnvelopeV4(state, analysis);
   if (validated === null) {
     return { records: [], memberValueIds: /* @__PURE__ */ new Map(), seeds: /* @__PURE__ */ new Map() };
@@ -48675,7 +50050,10 @@ function lowerProjectRootSourceV4(state, analysis, manifest) {
     source: global.source,
     label: `root.${expected.name}`
   }));
-  return lowerStoredValueBindingsV4(state, manifest, bindings, { analysis });
+  return lowerStoredValueBindingsV4(state, manifest, bindings, {
+    analysis,
+    registry: options.registry
+  });
 }
 function validateProjectRootEnvelopeV4(state, analysis) {
   const project = Object.values(state).find(
@@ -48747,7 +50125,120 @@ function requiredObject(value, label) {
 function quote5(value) {
   return quoteNeoString(value);
 }
-var ROOT_PROJECT_FIELDS;
+function resolveRootPathCollectionValuesV4(args) {
+  const resolved = /* @__PURE__ */ new Map();
+  for (const member of args.manifest.members) {
+    if (member.kind !== "lookup") continue;
+    const spelled = member.collectionValueId;
+    if (typeof spelled !== "string") continue;
+    if (!spelled.startsWith(ROOT_PATH_PENDING_PREFIX)) continue;
+    const path = spelled.slice(ROOT_PATH_PENDING_PREFIX.length);
+    const site = args.siteForMember(member.id);
+    const fail = (message) => {
+      args.registry.loweringFailures.push({
+        message,
+        site: {
+          uri: site?.uri ?? "<schema>",
+          declarationStart: site?.start ?? { line: 1, character: 0 },
+          expression: null,
+          label: member.name
+        }
+      });
+    };
+    const target = walkRootValuePath(path, args.state, args.registry, fail);
+    if (target !== null) resolved.set(member.id, target);
+  }
+  return resolved;
+}
+function walkRootValuePath(path, state, registry, fail) {
+  const segments = path.split(".");
+  const slotName = segments[1];
+  if (segments[0] !== "root" || slotName === void 0) {
+    fail(
+      `collectionValue path ${path} must start at a root slot (root.Assets, root.Save, or root.Session).`
+    );
+    return null;
+  }
+  const slotIndex = PROJECT_ROOT_SOURCE_SLOTS.findIndex(
+    (slot) => slot.name === slotName
+  );
+  const project = Object.values(state).find(
+    (record3) => record3.recordKind === "project"
+  );
+  if (slotIndex < 0 || project === void 0 || !isObjectRecord2(project.data)) {
+    fail(
+      `collectionValue path ${path} names root slot ${slotName ?? "<none>"}, which is not Assets, Save, or Session.`
+    );
+    return null;
+  }
+  const memberId = rootMemberIds(project.data)[slotIndex];
+  const slotMember = memberId === void 0 ? void 0 : state[`member:${memberId}`];
+  const slotValueId = isObjectRecord2(slotMember?.data) ? slotMember.data.valueId : void 0;
+  if (typeof slotValueId !== "string") {
+    fail(
+      `collectionValue path ${path} cannot start: root slot ${slotName} has no stable value row.`
+    );
+    return null;
+  }
+  let cursor = slotValueId;
+  for (const segment of segments.slice(2)) {
+    const body = registry.pendingValues.get(cursor)?.value ?? (isObjectRecord2(state[`value:${cursor}`]?.data) ? (state[`value:${cursor}`]?.data).value : void 0);
+    if (Array.isArray(body)) {
+      fail(
+        `collectionValue path ${path} travels through a list at segment ${segment}; a path cannot choose a list entry. Name the row with Reference(id: ...) instead.`
+      );
+      return null;
+    }
+    if (!isObjectRecord2(body)) {
+      fail(
+        `collectionValue path ${path} stops before segment ${segment}: the row it reaches stores no single-valued members.`
+      );
+      return null;
+    }
+    const next = body[segment];
+    if (typeof next !== "string") {
+      fail(
+        `collectionValue path ${path} has no value at segment ${segment} after this push.`
+      );
+      return null;
+    }
+    cursor = next;
+  }
+  return cursor;
+}
+function rootValuePathsByValueId(records2) {
+  const paths = /* @__PURE__ */ new Map();
+  const project = [...records2.values()].find(
+    (record3) => record3.recordKind === "project"
+  );
+  if (project === void 0 || !isObjectRecord2(project.data)) return paths;
+  const queue = [];
+  ROOT_PROJECT_FIELDS.forEach((field, index) => {
+    const slot = PROJECT_ROOT_SOURCE_SLOTS[index];
+    const memberId = isObjectRecord2(project.data) ? project.data[field] : void 0;
+    if (slot === void 0 || typeof memberId !== "string") return;
+    const member = records2.get(`member:${memberId}`);
+    const valueId = isObjectRecord2(member?.data) ? member.data.valueId : void 0;
+    if (typeof valueId !== "string") return;
+    queue.push({ id: valueId, path: `root.${slot.name}` });
+  });
+  while (queue.length > 0) {
+    const next = queue.shift();
+    if (next === void 0) break;
+    if (paths.has(next.id)) continue;
+    paths.set(next.id, next.path);
+    const row = records2.get(`value:${next.id}`);
+    const body = isObjectRecord2(row?.data) ? row.data.value : void 0;
+    if (!isObjectRecord2(body)) continue;
+    for (const [schemaKey, child] of Object.entries(body)) {
+      if (typeof child !== "string") continue;
+      if (!records2.has(`value:${child}`)) continue;
+      queue.push({ id: child, path: `${next.path}.${schemaKey}` });
+    }
+  }
+  return paths;
+}
+var ROOT_PROJECT_FIELDS, ROOT_PATH_PENDING_PREFIX;
 var init_root_source = __esm({
   "src/project-source/root-source.ts"() {
     "use strict";
@@ -48760,6 +50251,7 @@ var init_root_source = __esm({
       "rootSaveFileMemberId",
       "rootSessionMemberId"
     ];
+    ROOT_PATH_PENDING_PREFIX = "__pending__:root-path:";
   }
 });
 
@@ -48788,7 +50280,8 @@ function emitProjectDocumentFilesV4(records2) {
     staticInitializers: staticValues.initializers,
     defaultInitializers: memberDefaults.initializers,
     fileSymbols: qualifiedProjectFileSymbolsV4(records2),
-    relationEndpointExpressions: relationEndpointExpressions(records2)
+    relationEndpointExpressions: relationEndpointExpressions(records2),
+    collectionValuePaths: rootValuePathsByValueId(records2)
   });
   const source = {
     ...baseSource,
@@ -51061,9 +52554,11 @@ function isWorldAnimationStructuralMember(memberId, members) {
 function assertAnimationClipDocumentValid(document) {
   const context = new AnimationValidationContext(document);
   context.validateConstructorProjections();
+  context.validateSegments();
   for (const member of document.members) {
     if (!isMemberClass(member)) continue;
     if (!context.classHasWorldKind(member.classId, "animationClip")) continue;
+    if (member.isAbstract === true) continue;
     context.validateClipMember(member);
   }
 }
@@ -51134,7 +52629,7 @@ var init_animation_clips = __esm({
           }
           const parameterNames = /* @__PURE__ */ new Set();
           const memberIds = /* @__PURE__ */ new Set();
-          const directMemberIds = new Set(Object.values(schemaClass2.schema));
+          const effectiveMemberIds = this.effectiveSchemaMemberIds(schemaClass2);
           for (const projection of projections) {
             if (parameterNames.has(projection.parameterName)) {
               throw new Error(
@@ -51146,9 +52641,9 @@ var init_animation_clips = __esm({
                 `Class "${schemaClass2.name}" projects multiple constructor parameters onto member "${projection.memberId}".`
               );
             }
-            if (!directMemberIds.has(projection.memberId)) {
+            if (!effectiveMemberIds.has(projection.memberId)) {
               throw new Error(
-                `Class "${schemaClass2.name}" constructor parameter "${projection.parameterName}" references member "${projection.memberId}" outside its direct schema.`
+                `Class "${schemaClass2.name}" constructor parameter "${projection.parameterName}" references member "${projection.memberId}", which is neither in its schema nor inherited.`
               );
             }
             parameterNames.add(projection.parameterName);
@@ -51156,6 +52651,27 @@ var init_animation_clips = __esm({
           }
         }
       }
+      /**
+       * Every member id a class resolves under a schema key — its own, then each
+       * ancestor's.
+       *
+       * A projection may name an inherited member: P48 §2.1 moved `Child` onto
+       * `NeoAnimationTrackBase`, and `new NeoAnimationChildTrack(id: "…")` still
+       * projects onto that one member from a class that no longer declares it.
+       */
+      effectiveSchemaMemberIds(schemaClass2) {
+        const memberIds = /* @__PURE__ */ new Set();
+        const visited = /* @__PURE__ */ new Set();
+        let current = schemaClass2;
+        while (current !== void 0 && !visited.has(current.id)) {
+          visited.add(current.id);
+          for (const memberId of Object.values(current.schema)) {
+            memberIds.add(memberId);
+          }
+          current = current.extendsClassId === void 0 ? void 0 : this.classById.get(current.extendsClassId);
+        }
+        return memberIds;
+      }
       classHasWorldKind(classId, worldKind) {
         const visited = /* @__PURE__ */ new Set();
         let current = this.classById.get(classId);
@@ -51172,16 +52688,8 @@ var init_animation_clips = __esm({
           WORLD_ANIMATION_CLIP_TARGET_PARAM_ID,
           `Animation clip "${clipMember.name}"`
         );
-        const effectiveStorages = this.storage.effectiveStorages(clipMember.id);
-        if (effectiveStorages.size === 0 || [...effectiveStorages].some(
-          (storage) => storage !== "immutable" /* Immutable */
-        )) {
-          throw new Error(
-            `Animation clip "${clipMember.name}" must resolve Immutable storage.`
-          );
-        }
         const clipNode = this.memberRootNode(clipMember);
-        const fps = this.requirePositiveIntegerField(
+        this.requirePositiveIntegerField(
           clipNode,
           clipMember.classId,
           WORLD_ANIMATION_CLIP_FPS_MEMBER_ID,
@@ -51210,7 +52718,7 @@ var init_animation_clips = __esm({
           const index = this.requireIntegerField(
             frameNode,
             frameClassId,
-            WORLD_ANIMATION_FRAME_INDEX_MEMBER_ID,
+            WORLD_ANIMATION_FRAME_BASE_INDEX_MEMBER_ID,
             `Animation clip "${clipMember.name}" frame Index`
           );
           if (index < 0 || index >= duration) {
@@ -51258,13 +52766,12 @@ var init_animation_clips = __esm({
             targetClassId
           });
         }
-        this.validateChildTracks({
+        this.validateTracks({
           clipName: clipMember.name,
           clipNode,
           clipClassId: clipMember.classId,
-          targetClassId,
           childIds: authoredChildren.ids,
-          fps,
+          childStoragePath: authoredChildren.storagePath,
           duration
         });
       }
@@ -51377,97 +52884,401 @@ var init_animation_clips = __esm({
           );
         }
       }
-      validateChildTracks(args) {
+      /**
+       * `NeoAnimationClip.Tracks` holds `NeoAnimationTrackBase` rows since P48
+       * §2.1, so a row's kind is a property of the row rather than of the list.
+       * Everything the base declares — `Child`, `StartFrame`, `Direction`, the
+       * crop window — is validated once here against the base member ids, which
+       * the segment track's covariant `Child` override still descends from; the
+       * per-kind passes below see an already-checked child.
+       */
+      validateTracks(args) {
         for (const track of this.requireListField(
           args.clipNode,
           args.clipClassId,
           WORLD_ANIMATION_CLIP_TRACKS_MEMBER_ID,
           `Animation clip "${args.clipName}" Tracks`
         )) {
-          const trackClassId = this.requireNodeClassId(
+          const row = this.requireTrackRow(track, args.clipName);
+          const label = `Animation clip "${args.clipName}" ${row.trackLabel} "${track.id}"`;
+          const child = this.validateTrackBase({
             track,
-            "animationChildTrack"
+            trackClassId: row.classId,
+            childIds: args.childIds,
+            duration: args.duration,
+            label
+          });
+          if (row.kind === "childClip") {
+            this.validateChildClipTrack({
+              track,
+              trackClassId: row.classId,
+              childId: child.childId,
+              childClassId: child.childClassId,
+              childNode: child.childNode,
+              label
+            });
+            continue;
+          }
+          this.validateSegmentTrack({
+            trackClassId: row.classId,
+            childClassId: child.childClassId,
+            childId: child.childId,
+            childStoragePath: args.childStoragePath,
+            label
+          });
+        }
+      }
+      /**
+       * A `Tracks` row's concrete kind. Dispatching on the row rather than on the
+       * list is the whole point of the base class, and a row that is neither
+       * shipped kind is named — with its class — rather than reported as "not a
+       * animationChildTrack row", which was true of every segment track too.
+       */
+      requireTrackRow(track, clipName) {
+        const classId = track.classId;
+        if (typeof classId !== "string") {
+          throw new Error(
+            `Animation clip "${clipName}" track value "${track.id}" has no class, so its track kind cannot be resolved.`
           );
-          const childId = this.requireSingleLookupField(
-            track,
-            trackClassId,
-            WORLD_ANIMATION_CHILD_TRACK_CHILD_MEMBER_ID,
-            `Animation clip "${args.clipName}" child track`
+        }
+        if (this.classHasWorldKind(classId, "animationChildTrack")) {
+          return { classId, kind: "childClip", trackLabel: "child track" };
+        }
+        if (this.classHasWorldKind(classId, "animationSegmentTrack")) {
+          return { classId, kind: "segment", trackLabel: "segment track" };
+        }
+        const className = this.classById.get(classId)?.name ?? classId;
+        throw new Error(
+          `Animation clip "${clipName}" track value "${track.id}" has class "${className}", which is neither a child clip track nor a segment track.`
+        );
+      }
+      /**
+       * The members `NeoAnimationTrackBase` declares, for either kind of row.
+       *
+       * P48 §2.3 deletes P29's fit error: content that runs past the owning clip's
+       * end truncates, because clipping is what a clip does. What survives is a row
+       * that can never play at all — a `StartFrame` outside the clip, or a crop
+       * window the author wrote empty or inverted. Crop bounds against the
+       * *resolved* content are runtime-clamped instead, since a lookup-backed
+       * segment's length is instance data this document does not have.
+       */
+      validateTrackBase(args) {
+        const childId = this.requireSingleLookupField(
+          args.track,
+          args.trackClassId,
+          WORLD_ANIMATION_TRACK_CHILD_MEMBER_ID,
+          args.label
+        );
+        if (!args.childIds.has(childId)) {
+          throw new Error(
+            `${args.label} references child "${childId}" outside the owner's authored Children graph.`
           );
-          if (!args.childIds.has(childId)) {
-            throw new Error(
-              `Animation clip "${args.clipName}" child track references child "${childId}" outside the owner's authored Children graph.`
-            );
-          }
-          const child = this.valueById.get(childId);
-          const childClassId = child?.classId;
-          if (child === void 0 || typeof childClassId !== "string") {
-            throw new Error(
-              `Animation clip "${args.clipName}" child track references missing class-backed child "${childId}".`
-            );
-          }
-          const clipKey = this.requireStringField(
-            track,
-            trackClassId,
-            WORLD_ANIMATION_CHILD_TRACK_CLIP_KEY_MEMBER_ID,
-            `Animation clip "${args.clipName}" child track ClipKey`
+        }
+        const childNode = this.valueById.get(childId);
+        const childClassId = childNode?.classId;
+        if (childNode === void 0 || typeof childClassId !== "string") {
+          throw new Error(
+            `${args.label} references missing class-backed child "${childId}".`
           );
-          const childClipEntry = mergeInstanceSurfaceSchema(
-            childClassId,
-            this.document.classes,
-            this.document.members
-          ).find((entry) => entry.schemaKey === clipKey);
-          if (childClipEntry === void 0) {
-            throw new Error(
-              `Animation clip "${args.clipName}" child track ClipKey "${clipKey}" does not resolve to a compatible clip on child "${childId}".`
-            );
-          }
-          const childClipMember = this.memberById.get(childClipEntry.memberId);
-          if (!isMemberClass(childClipMember) || !this.classHasWorldKind(childClipMember.classId, "animationClip") || this.requireClassBinding(
-            childClipMember,
-            WORLD_ANIMATION_CLIP_TARGET_PARAM_ID,
-            `Child clip "${clipKey}"`
-          ) !== childClassId) {
-            throw new Error(
-              `Animation clip "${args.clipName}" child track ClipKey "${clipKey}" does not resolve to a compatible clip on child "${childId}".`
-            );
-          }
-          const childClipNode = this.resolveDefinitionChild(
-            child,
-            childClipEntry.schemaKey,
-            childClipMember
+        }
+        const startFrame = this.requireIntegerField(
+          args.track,
+          args.trackClassId,
+          WORLD_ANIMATION_TRACK_START_FRAME_MEMBER_ID,
+          `${args.label} StartFrame`
+        );
+        if (startFrame < 0) {
+          throw new Error(`${args.label} StartFrame ${startFrame} is negative.`);
+        }
+        if (startFrame >= args.duration) {
+          throw new Error(
+            `${args.label} StartFrame ${startFrame} is at or past the owning clip's Duration ${args.duration}, so the row can never play.`
           );
-          if (childClipNode === null) {
-            throw new Error(
-              `Child clip "${clipKey}" on child "${childId}" has no value graph.`
-            );
+        }
+        this.validateTrackDirection(args.track, args.trackClassId, args.label);
+        this.validateTrackCropWindow(args.track, args.trackClassId, args.label);
+        return { childId, childClassId, childNode };
+      }
+      validateTrackDirection(track, trackClassId, label) {
+        const authored = this.scalarField(
+          track,
+          trackClassId,
+          WORLD_ANIMATION_TRACK_DIRECTION_MEMBER_ID
+        );
+        if (authored === void 0 || authored === null) return;
+        if (!Array.isArray(authored) || authored.length !== 1 || authored[0] !== WORLD_PLAY_DIRECTION_FORWARD_OPTION_ID && authored[0] !== WORLD_PLAY_DIRECTION_REVERSE_OPTION_ID) {
+          throw new Error(
+            `${label} Direction must be exactly one NeoPlayDirection option.`
+          );
+        }
+      }
+      validateTrackCropWindow(track, trackClassId, label) {
+        const start = this.optionalIntegerField(
+          track,
+          trackClassId,
+          WORLD_ANIMATION_TRACK_OFFSET_START_INDEX_MEMBER_ID,
+          `${label} OffsetStartIndex`
+        );
+        const end = this.optionalIntegerField(
+          track,
+          trackClassId,
+          WORLD_ANIMATION_TRACK_OFFSET_END_INDEX_MEMBER_ID,
+          `${label} OffsetEndIndex`
+        );
+        if (start !== null && start < 0) {
+          throw new Error(`${label} OffsetStartIndex ${start} is negative.`);
+        }
+        if (end !== null && end < 1) {
+          throw new Error(
+            `${label} OffsetEndIndex ${end} must be at least 1; a window has to contain a frame.`
+          );
+        }
+        if (start === null || end === null) return;
+        if (end <= start) {
+          throw new Error(
+            `${label} crop window [${start}, ${end}) is empty or inverted, so the row can never play.`
+          );
+        }
+      }
+      validateChildClipTrack(args) {
+        const clipKey = this.requireStringField(
+          args.track,
+          args.trackClassId,
+          WORLD_ANIMATION_CHILD_TRACK_CLIP_KEY_MEMBER_ID,
+          `${args.label} ClipKey`
+        );
+        const childClipEntry = mergeInstanceSurfaceSchema(
+          args.childClassId,
+          this.document.classes,
+          this.document.members
+        ).find((entry) => entry.schemaKey === clipKey);
+        if (childClipEntry === void 0) {
+          throw new Error(
+            `${args.label} ClipKey "${clipKey}" does not resolve to a compatible clip on child "${args.childId}".`
+          );
+        }
+        const childClipMember = this.memberById.get(childClipEntry.memberId);
+        if (!isMemberClass(childClipMember) || !this.classHasWorldKind(childClipMember.classId, "animationClip") || this.requireClassBinding(
+          childClipMember,
+          WORLD_ANIMATION_CLIP_TARGET_PARAM_ID,
+          `Child clip "${clipKey}"`
+        ) !== args.childClassId) {
+          throw new Error(
+            `${args.label} ClipKey "${clipKey}" does not resolve to a compatible clip on child "${args.childId}".`
+          );
+        }
+        const childClipNode = this.resolveDefinitionChild(
+          args.childNode,
+          childClipEntry.schemaKey,
+          childClipMember
+        );
+        if (childClipNode === null) {
+          throw new Error(
+            `Child clip "${clipKey}" on child "${args.childId}" has no value graph.`
+          );
+        }
+        this.requirePositiveIntegerField(
+          childClipNode,
+          childClipMember.classId,
+          WORLD_ANIMATION_CLIP_FPS_MEMBER_ID,
+          `Child clip "${clipKey}" FPS`
+        );
+        this.requirePositiveIntegerField(
+          childClipNode,
+          childClipMember.classId,
+          WORLD_ANIMATION_CLIP_DURATION_MEMBER_ID,
+          `Child clip "${clipKey}" Duration`
+        );
+      }
+      /**
+       * P48 §7's target rule, as much of it as the record layer can answer.
+       *
+       * The write target is schema metadata — `@settings(target: Class.Member)` on
+       * a concrete track class — so it is resolved from the row's class chain and
+       * checked against the class's *bound* `TChild`, not against whatever child
+       * this particular row happens to name. The instance side is checked too:
+       * a row whose `Child` is not a `TChild` would type-check a getter body
+       * against a class the row cannot deliver.
+       *
+       * What stays in the language (phase 2) is everything about the `Segment`
+       * implementation itself — that every concrete subclass has one, and that a
+       * getter body type-checks against `TChild`.
+       */
+      validateSegmentTrack(args) {
+        const trackClassName = this.classById.get(args.trackClassId)?.name ?? args.trackClassId;
+        const targetMemberId = this.resolveTargetMemberId(args.trackClassId);
+        if (targetMemberId === null) {
+          throw new Error(
+            `${args.label} class "${trackClassName}" declares no target member, so it has nothing to write.`
+          );
+        }
+        const env = resolveGenericEnv(args.trackClassId, this.document.classes);
+        const boundChildClassId = this.envClassBinding(
+          env,
+          WORLD_ANIMATION_SEGMENT_TRACK_CHILD_PARAM_ID
+        );
+        if (boundChildClassId === null) {
+          throw new Error(
+            `${args.label} class "${trackClassName}" does not bind its TChild generic to a Class member.`
+          );
+        }
+        if (!this.classDescendsFrom(args.childClassId, boundChildClassId)) {
+          const boundName = this.classById.get(boundChildClassId)?.name ?? boundChildClassId;
+          const childName = this.classById.get(args.childClassId)?.name ?? args.childClassId;
+          throw new Error(
+            `${args.label} plays against child "${args.childId}" of class "${childName}", which does not descend from the track's bound TChild "${boundName}".`
+          );
+        }
+        const targetEntry = mergeStoredInstanceSchema(
+          boundChildClassId,
+          this.document.classes,
+          this.document.members
+        ).find((entry) => this.memberDescendsFrom(entry.memberId, targetMemberId));
+        const boundChildName = this.classById.get(boundChildClassId)?.name ?? boundChildClassId;
+        if (targetEntry === void 0) {
+          throw new Error(
+            `${args.label} class "${trackClassName}" targets member "${targetMemberId}", which "${boundChildName}" does not declare.`
+          );
+        }
+        const targetMember = this.memberById.get(targetEntry.memberId);
+        if (targetMember === void 0) {
+          throw new Error(
+            `${args.label} target member "${targetEntry.memberId}" is not in this document.`
+          );
+        }
+        const valueBindingMember = this.envBindingMember(
+          env,
+          WORLD_ANIMATION_SEGMENT_TRACK_VALUE_PARAM_ID
+        );
+        if (valueBindingMember === null) {
+          throw new Error(
+            `${args.label} class "${trackClassName}" does not bind its TValue generic to a member.`
+          );
+        }
+        if (targetMember.kind !== valueBindingMember.kind) {
+          throw new Error(
+            `${args.label} targets "${boundChildName}.${targetEntry.schemaKey}" of kind ${MemberKind[targetMember.kind]}, but its segment plays ${MemberKind[valueBindingMember.kind]} values.`
+          );
+        }
+        if (!this.overrideLeafEligible(targetMember, [
+          ...args.childStoragePath,
+          targetMember.id
+        ])) {
+          throw new Error(
+            `${args.label} targets "${boundChildName}.${targetEntry.schemaKey}", which is not a writable Save/Session override leaf.`
+          );
+        }
+      }
+      /** The `@settings(target:)` member a track class or one of its bases names. */
+      resolveTargetMemberId(classId) {
+        const visited = /* @__PURE__ */ new Set();
+        let current = this.classById.get(classId);
+        while (current !== void 0 && !visited.has(current.id)) {
+          visited.add(current.id);
+          if (typeof current.targetMemberId === "string") {
+            return current.targetMemberId;
           }
-          const childFps = this.requirePositiveIntegerField(
-            childClipNode,
-            childClipMember.classId,
-            WORLD_ANIMATION_CLIP_FPS_MEMBER_ID,
-            `Child clip "${clipKey}" FPS`
+          current = current.extendsClassId ? this.classById.get(current.extendsClassId) : void 0;
+        }
+        return null;
+      }
+      envBindingMember(env, paramId) {
+        const entry = env.get(paramId);
+        if (entry === void 0 || entry.kind !== "member") return null;
+        if (typeof entry.memberId !== "string") return null;
+        return this.memberById.get(entry.memberId) ?? null;
+      }
+      envClassBinding(env, paramId) {
+        const member = this.envBindingMember(env, paramId);
+        return isMemberClass(member) ? member.classId : null;
+      }
+      classDescendsFrom(classId, baseClassId) {
+        const visited = /* @__PURE__ */ new Set();
+        let current = this.classById.get(classId);
+        while (current !== void 0 && !visited.has(current.id)) {
+          if (current.id === baseClassId) return true;
+          visited.add(current.id);
+          current = current.extendsClassId ? this.classById.get(current.extendsClassId) : void 0;
+        }
+        return false;
+      }
+      /**
+       * P48 §1 and §7's segment rules, for every segment the document holds.
+       *
+       * Segments are validated by *value*, not by clip: a segment is catalog data
+       * that no clip owns, and the same rows are reachable from every track that
+       * resolves through them. Both authoring shapes are walked — a member's own
+       * default graph and a standalone row — because a stored segment member and a
+       * segment sitting in a list are the same data written two ways.
+       *
+       * Storage is deliberately not asked about (§1.2): Immutable catalogs, Save
+       * files, and Session all hold segments, and a Session-stored `Duration` a
+       * game writes at runtime is a feature, not drift.
+       */
+      validateSegments() {
+        const visited = /* @__PURE__ */ new Set();
+        for (const member of this.document.members) {
+          if (!isMemberClass(member)) continue;
+          if (!this.classHasWorldKind(member.classId, "animationSegment")) continue;
+          const node = this.optionalMemberRootNode(member);
+          if (node === null) continue;
+          this.validateSegmentNode(
+            node,
+            member.classId,
+            `Animation segment "${member.name}"`,
+            visited
           );
-          const childDuration = this.requirePositiveIntegerField(
-            childClipNode,
-            childClipMember.classId,
-            WORLD_ANIMATION_CLIP_DURATION_MEMBER_ID,
-            `Child clip "${clipKey}" Duration`
+        }
+        for (const row of this.document.values) {
+          const classId = row.classId;
+          if (typeof classId !== "string") continue;
+          if (!this.classHasWorldKind(classId, "animationSegment")) continue;
+          this.validateSegmentNode(
+            row,
+            classId,
+            `Animation segment value "${row.id}"`,
+            visited
           );
-          const startFrame = this.requireIntegerField(
-            track,
-            trackClassId,
-            WORLD_ANIMATION_CHILD_TRACK_START_FRAME_MEMBER_ID,
-            `Animation clip "${args.clipName}" child track StartFrame`
+        }
+      }
+      validateSegmentNode(node, classId, label, visited) {
+        if (visited.has(node.id)) return;
+        visited.add(node.id);
+        const duration = this.requirePositiveIntegerField(
+          node,
+          classId,
+          WORLD_ANIMATION_SEGMENT_DURATION_MEMBER_ID,
+          `${label} Duration`
+        );
+        const frameValueIdByIndex = /* @__PURE__ */ new Map();
+        for (const frameNode of this.requireListField(
+          node,
+          classId,
+          WORLD_ANIMATION_SEGMENT_FRAMES_MEMBER_ID,
+          `${label} Frames`
+        )) {
+          const frameClassId = this.requireNodeClassId(
+            frameNode,
+            "animationSegmentFrame"
           );
-          const childLengthInParentFrames = Math.ceil(
-            childDuration * args.fps / childFps
+          const index = this.requireIntegerField(
+            frameNode,
+            frameClassId,
+            WORLD_ANIMATION_FRAME_BASE_INDEX_MEMBER_ID,
+            `${label} frame Index`
           );
-          if (startFrame < 0 || startFrame + childLengthInParentFrames > args.duration) {
+          if (index < 0 || index >= duration) {
             throw new Error(
-              `Animation clip "${args.clipName}" child track "${clipKey}" does not fit: StartFrame ${startFrame} + ${childLengthInParentFrames} parent frames exceeds Duration ${args.duration}.`
+              `${label} frame ${index} is outside Duration ${duration}; shrink operations must delete trailing frames.`
             );
           }
+          const priorFrameValueId = frameValueIdByIndex.get(index);
+          if (priorFrameValueId !== void 0) {
+            throw new Error(
+              `${label} has duplicate frame Index ${index} in values "${priorFrameValueId}" and "${frameNode.id}".`
+            );
+          }
+          frameValueIdByIndex.set(index, frameNode.id);
         }
       }
       validateSparseOverride(args) {
@@ -51868,6 +53679,20 @@ var init_animation_clips = __esm({
         }
         return value;
       }
+      /**
+       * {@link requireIntegerField} for a nullable int member such as the P48 §2.1
+       * crop window. `null` covers both "authored null" and "no value and no
+       * default"; anything that is neither null nor a safe integer still throws,
+       * so a garbage crop bound is not silently read as an open window.
+       */
+      optionalIntegerField(parent, classId, memberId, label) {
+        const value = this.scalarField(parent, classId, memberId);
+        if (value === null || value === void 0) return null;
+        if (typeof value !== "number" || !Number.isSafeInteger(value)) {
+          throw new Error(`${label} must be an integer or null.`);
+        }
+        return value;
+      }
       requireStringField(parent, classId, memberId, label) {
         const value = this.scalarField(parent, classId, memberId);
         if (typeof value !== "string" || value.length === 0) {
@@ -52269,6 +54094,7 @@ function computeWorkspaceStatus(workspace, options = {}) {
     seeds: /* @__PURE__ */ new Map()
   };
   let projectAnalysisV4 = null;
+  const valueLowerRegistry = createValueLowerRegistryV4();
   try {
     if (!baseManifest) {
       throw new Error(
@@ -52343,7 +54169,8 @@ function computeWorkspaceStatus(workspace, options = {}) {
     memberDefaults = lowerMemberDefaultSourcesV4(
       workspace.state.records,
       analysis,
-      manifest
+      manifest,
+      { registry: valueLowerRegistry }
     );
     if (memberDefaults.memberDefaultValues.size > 0) {
       manifest = {
@@ -52417,16 +54244,48 @@ function computeWorkspaceStatus(workspace, options = {}) {
   const staticValues = lowerStaticValueSourcesV4(
     workspace.state.records,
     projectAnalysisV4,
-    manifest
+    manifest,
+    { registry: valueLowerRegistry }
   );
   staticValueSeeds = new Map([...staticValues.seeds, ...memberDefaults.seeds]);
   staticMemberValueIds = staticValues.memberValueIds;
   const rootValues = lowerProjectRootSourceV4(
     workspace.state.records,
     projectAnalysisV4,
-    manifest
+    manifest,
+    { registry: valueLowerRegistry }
   );
   staticValueSeeds = new Map([...staticValueSeeds, ...rootValues.seeds]);
+  const resolvedCollectionPaths = resolveRootPathCollectionValuesV4({
+    manifest,
+    state: workspace.state.records,
+    registry: valueLowerRegistry,
+    siteForMember: (memberId) => {
+      const span2 = sourceByKey.get(recordStateKey("member", memberId))?.span;
+      return span2 === void 0 ? null : { uri: span2.path, start: span2.start };
+    }
+  });
+  if (resolvedCollectionPaths.size > 0) {
+    manifest = {
+      ...manifest,
+      members: manifest.members.map((member) => {
+        const resolvedId = resolvedCollectionPaths.get(member.id);
+        return resolvedId === void 0 || member.kind !== "lookup" ? member : { ...member, collectionValueId: resolvedId };
+      })
+    };
+    for (const [memberId, resolvedId] of resolvedCollectionPaths) {
+      const document = documentsByKey.get(recordStateKey("member", memberId));
+      if (document !== void 0 && isObjectRecord2(document.data)) {
+        document.data.collectionValueId = resolvedId;
+      }
+      const record3 = records2.find(
+        (candidate) => candidate.recordKind === "member" && candidate.recordId === memberId
+      );
+      if (record3 !== void 0 && typeof record3.fileFields.collectionValueId === "string") {
+        record3.fileFields.collectionValueId = resolvedId;
+      }
+    }
+  }
   const rootRecords = rootValues.records;
   const supplementalRecords = lowerSupplementalProjectSourcesV4(
     workspace.root,
@@ -52434,7 +54293,7 @@ function computeWorkspaceStatus(workspace, options = {}) {
     projectAnalysisV4,
     { trustedPendingFiles: options.trustedPendingProjectFiles }
   );
-  const dialogueState = overlayProspectiveSourceRecords(
+  const prospectiveState = overlayProspectiveSourceRecords(
     workspace.state.records,
     documents,
     [
@@ -52446,7 +54305,7 @@ function computeWorkspaceStatus(workspace, options = {}) {
     staticMemberValueIds
   );
   const dialogueRecords = lowerDialogueProjectSourcesV4(
-    dialogueState,
+    prospectiveState,
     projectAnalysisV4
   );
   records2.push(
@@ -52520,6 +54379,7 @@ function computeWorkspaceStatus(workspace, options = {}) {
       });
     }
   }
+  const deletedValueIds = /* @__PURE__ */ new Set();
   for (const [key, recordState] of Object.entries(workspace.state.records)) {
     if (recordState.file === void 0) continue;
     if (reconstructed3.has(key)) continue;
@@ -52527,6 +54387,9 @@ function computeWorkspaceStatus(workspace, options = {}) {
       (error) => error.file === recordState.file && isBlockingSchemaSourceError(error)
     ) || conflictedFiles.includes(recordState.file);
     if (fileStillBroken) continue;
+    if (recordState.recordKind === "value") {
+      deletedValueIds.add(recordState.recordId);
+    }
     changes.push({
       kind: "delete",
       recordKind: recordState.recordKind,
@@ -52537,6 +54400,52 @@ function computeWorkspaceStatus(workspace, options = {}) {
       casBaseHash: recordState.conflictServerHash !== void 0 ? recordState.conflictServerHash : recordState.contentHash
     });
   }
+  const referenceFailures = drainValueReferenceObligationsV4(
+    prospectiveState,
+    manifest,
+    {
+      registry: valueLowerRegistry,
+      analysis: projectAnalysisV4,
+      deletedValueIds,
+      sourceTextByUri: new Map(
+        sourceEntries.map((entry) => [entry.relPath, entry.source])
+      )
+    }
+  );
+  for (const failure of referenceFailures) {
+    parseErrors.push(
+      new SchemaSourceError(
+        failure.message,
+        failure.file,
+        failure.line,
+        failure.column
+      )
+    );
+  }
+  if (referenceFailures.length > 0) {
+    return {
+      changes: [],
+      conflictedFiles,
+      parseErrors,
+      reconstructed: /* @__PURE__ */ new Map(),
+      staticValueSeeds: /* @__PURE__ */ new Map(),
+      binaryChanges: [],
+      binaryFiles: []
+    };
+  }
+  for (let index = changes.length - 1; index >= 0; index -= 1) {
+    const change = changes[index];
+    if (change === void 0 || change.kind !== "update") continue;
+    const baseState = workspace.state.records[recordStateKey(change.recordKind, change.recordId)];
+    if (baseState?.conflictServerHash !== void 0) continue;
+    if (recordsSemanticallyEqual(
+      change.recordKind,
+      change.nextData,
+      change.baseData
+    )) {
+      changes.splice(index, 1);
+    }
+  }
   for (const fileId of options.trustedPendingProjectFiles?.keys() ?? []) {
     const key = `project-file:${fileId}`;
     const base = workspace.state.records[key];
@@ -52639,7 +54548,7 @@ function validateProspectiveAnimationRecordsV4(records2) {
 function prospectiveAnimationDocumentV4(records2) {
   const candidates = [...records2];
   const hasAnimationSchema = candidates.some(
-    (record3) => record3.recordKind === "class" && (Array.isArray(record3.data.constructorProjections) || isObjectRecord2(record3.data.system) && typeof record3.data.system.worldKind === "string" && record3.data.system.worldKind.startsWith("animation"))
+    (record3) => record3.recordKind === "class" && (Array.isArray(record3.data.constructorProjections) || declaresAnimationWorldKind(record3.data.system))
   );
   if (!hasAnimationSchema) return null;
   let project;
@@ -52680,6 +54589,13 @@ function prospectiveAnimationDocumentV4(records2) {
   if (project === void 0) return null;
   return { project, classes, members, values };
 }
+function declaresAnimationWorldKind(system) {
+  if (!isObjectRecord2(system)) return false;
+  const worldKind = system.worldKind;
+  if (typeof worldKind !== "string") return false;
+  if (!isNeoWorldSystemClassKind(worldKind)) return false;
+  return WORLD_SYSTEM_ANIMATION_KINDS.has(worldKind);
+}
 function serverEnvelope(stored) {
   if (!isObjectRecord2(stored)) return {};
   const envelope = {};
@@ -52956,6 +54872,7 @@ var init_workspace_status = __esm({
     init_project_files();
     init_dialogue_lower();
     init_world_system_classes();
+    init_core();
     init_value_sources();
     init_root_source();
     init_project_documents();
@@ -71206,6 +73123,11 @@ function verifyProjectSourceCommitAgainstStateV4(args) {
       first ? `Trusted source lowering failed: ${first.file}:${first.line}:${first.column} ${first.message}` : `Trusted source lowering found conflict markers in ${status.conflictedFiles[0]}.`
     );
   }
+  auditAuthoredSeedRowIdentities(
+    status.staticValueSeeds,
+    args.stateRecords,
+    assignments
+  );
   const usedAssignments = /* @__PURE__ */ new Set();
   const expectedChanges = status.changes.map((change) => {
     const rewrittenData = change.nextData === void 0 ? void 0 : rewritePending(change.nextData, assignments, usedAssignments);
@@ -71275,6 +73197,32 @@ function isDerivedOnlyRefresh(change, stateRecords) {
   if (!isObjectRecord2(base.data)) return false;
   return canonicalStringify(comparisonData(change.recordKind, change.nextData)) === canonicalStringify(comparisonData(change.recordKind, base.data));
 }
+function auditAuthoredSeedRowIdentities(seeds, stateRecords, assignments) {
+  const mintedIds = new Set(assignments.values());
+  const authoredCreates = /* @__PURE__ */ new Set();
+  for (const [memberId, seed] of seeds) {
+    for (const row of seed.values ?? []) {
+      if (isPendingId(row.id)) continue;
+      if (stateRecords[`value:${row.id}`] !== void 0) continue;
+      if (!isUuidV4Id(row.id)) {
+        throw new ProjectSourceCommitVerificationError(
+          `Static value seed for member ${memberId} creates row ${row.id}, which is not a UUID v4. A new row's authored identity must wear the same shape a minted one does.`
+        );
+      }
+      if (mintedIds.has(row.id)) {
+        throw new ProjectSourceCommitVerificationError(
+          `Static value seed for member ${memberId} creates row ${row.id}, which a pending id assignment in the same push also claims. Authored and minted identities draw from one pool.`
+        );
+      }
+      if (authoredCreates.has(row.id)) {
+        throw new ProjectSourceCommitVerificationError(
+          `Static value seed for member ${memberId} creates row ${row.id}, which another seed in the same push already creates. Two new rows cannot share one @id.`
+        );
+      }
+      authoredCreates.add(row.id);
+    }
+  }
+}
 function validateAssignments(value) {
   const assignments = /* @__PURE__ */ new Map();
   const assignedIds = /* @__PURE__ */ new Set();
@@ -71285,9 +73233,7 @@ function validateAssignments(value) {
       );
     }
     if (pendingMemberValueMemberId(pendingId2) === null) {
-      if (!/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/u.test(
-        assignedId
-      )) {
+      if (!isUuidV4Id(assignedId)) {
         throw new ProjectSourceCommitVerificationError(
           `Pending id assignment for ${pendingId2} is not a UUID v4.`
         );